Merge branch 'weather'

audio/sfx.asm

@@ -4499,6 +4499,20 @@ Sfx_Thunder_Ch8:
 	noise_note 15, 15, 2, 84
 	sound_ret
 
+Sfx_Thunder_OW:
+	channel_count 1
+	channel 8, .Ch8
+
+.Ch8:
+	noise_note 10, 8, -7, 80
+	noise_note 15, 8, -7, 81
+	noise_note 8, 8, 2, 81
+	noise_note 6, 8, -7, 82
+	noise_note 6, 8, -7, 83
+	noise_note 8, 8, -7, 84
+	noise_note 15, 8, 2, 84
+	sound_ret
+
 Sfx_Supersonic_Ch5:
 	duty_cycle 2
 	square_note 15, 3, -7, 1984

audio/sfx_pointers.asm

@@ -38,6 +38,7 @@ SFX:
 	dba Sfx_Transaction
 	dba Sfx_ExitBuilding
 	dba Sfx_Bump
+	dba Sfx_Thunder_OW
 	dba Sfx_Save
 	dba Sfx_Pokeflute
 	dba Sfx_ElevatorEnd

constants/event_flags.asm

@@ -1710,10 +1710,10 @@
 	const EVENT_RADIO_TOWER_5F_ULTRA_BALL
 	const EVENT_DARK_CAVE_VIOLET_ENTRANCE_DIRE_HIT
 	const EVENT_BATTLE_TOWER_OPEN_CIVILIANS
-	const EVENT_SILVER_CAVE_CLIFF_SIDE_1F_GUARD_SPEC
-	const EVENT_SILVER_CAVE_CLIFF_SIDE_1F_CARBOS
-	const EVENT_SILVER_CAVE_CLIFF_SIDE_2F_HYPER_POTION
-	const EVENT_SILVER_CAVE_CLIFF_SIDE_2F_RARE_CANDY
+	const EVENT_SILVER_CAVE_LOWER_MOUNTAINSIDE_GUARD_SPEC
+	const EVENT_SILVER_CAVE_LOWER_MOUNTAINSIDE_CARBOS
+	const EVENT_SILVER_CAVE_UPPER_MOUNTAINSIDE_HYPER_POTION
+	const EVENT_SILVER_CAVE_UPPER_MOUNTAINSIDE_RARE_CANDY
 ; Unused: next 44 events
 
 	const_next 2044

constants/gfx_constants.asm

@@ -46,6 +46,11 @@ DEF SPRITE_GFX_LIST_CAPACITY EQU 32 ; see wUsedSprites
 
 DEF PHONE_OR_PAGER_HEIGHT EQU 4 ; pokegear
 
+; Used to prevent updating the OAM's palette (0-7) during the next anim frame,
+; useful when dynamically applying a palette, such as party menu sprites and overworld fly mon sprites.
+DEF SPRITEOAM_SKIP_PAL_APPLY       EQU -1
+DEF SPRITEOAM_SKIP_PAL_APPLY_XFLIP EQU -2 ; Same as above, but with X-flip attribute.
+
 ; PokeAnims indexes (see engine/gfx/pic_animation.asm)
 	const_def
 	const ANIM_MON_SLOW
@@ -57,3 +62,8 @@ DEF PHONE_OR_PAGER_HEIGHT EQU 4 ; pokegear
 	const ANIM_MON_HOF
 	const ANIM_MON_EGG1
 	const ANIM_MON_EGG2
+
+DEF OAM_YCOORD_HIDDEN EQU 160 ; hides an OAM offscreen
+
+DEF NUM_FLYFROM_ANIM_OAMS EQU 4 + 9 ; 4 for flymon, 9 for leaves
+DEF NUM_FLYTO_ANIM_OAMS   EQU 4 + 8 ; 4 for flymon, 8 for leaves

constants/map_constants.asm

@@ -538,8 +538,8 @@ ENDM
 
 	newgroup SAFARI_ZONE                                          ; 28
 	map_const SAFARI_ZONE_AREA_3,                          21, 17 ;  1
-	map_const SILVER_CAVE_CLIFF_SIDE_1F,                   15, 20 ;  2
-	map_const SILVER_CAVE_CLIFF_SIDE_2F,                   17, 18 ;  3
+	map_const SILVER_CAVE_LOWER_MOUNTAINSIDE,              15, 20 ;  2
+	map_const SILVER_CAVE_UPPER_MOUNTAINSIDE,              17, 18 ;  3
 	endgroup
 
 DEF NUM_MAP_GROUPS EQU const_value ; 26

constants/sfx_constants.asm

@@ -37,6 +37,7 @@
 	const SFX_TRANSACTION                 ; 22
 	const SFX_EXIT_BUILDING               ; 23
 	const SFX_BUMP                        ; 24
+	const SFX_THUNDER_OW                  ; 25
 	const SFX_SAVE                        ; 25
 	const SFX_POKEFLUTE                   ; 26
 	const SFX_ELEVATOR_END                ; 27

constants/sprite_anim_constants.asm

@@ -89,6 +89,7 @@ DEF NUM_SPRITEANIMDICT_ENTRIES EQU 10
 	const SPRITE_ANIM_OBJ_PAGER_MON_GREEN           ; 33
 	const SPRITE_ANIM_OBJ_PAGER_MON_BROWN           ; 34
 	const SPRITE_ANIM_OBJ_PAGER_MON_GREY            ; 35
+	const SPRITE_ANIM_OBJ_FLY_MON                   ; 36
 DEF NUM_SPRITE_ANIM_OBJS EQU const_value
 
 ; DoSpriteAnimFrame.Jumptable indexes (see engine/sprite_anims/functions.asm)
@@ -213,6 +214,7 @@ DEF NUM_SPRITE_ANIM_FUNCS EQU const_value
 	const SPRITE_ANIM_FRAMESET_PAGER_MON_GREEN           ; 49
 	const SPRITE_ANIM_FRAMESET_PAGER_MON_BROWN           ; 4a
 	const SPRITE_ANIM_FRAMESET_PAGER_MON_GREY            ; 4b
+	const SPRITE_ANIM_FRAMESET_FLY_MON                   ; 4c
 DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value
 
 ; SpriteAnimOAMData indexes (see data/sprite_anims/oam.asm)
@@ -369,6 +371,9 @@ DEF NUM_SPRITE_ANIM_FRAMESETS EQU const_value
 	const SPRITE_ANIM_OAMSET_GREY_WALK_2                 ; 95
 	const SPRITE_ANIM_OAMSET_GREEN_WALK_1                 ; 96
 	const SPRITE_ANIM_OAMSET_GREEN_WALK_2                 ; 97
+	const SPRITE_ANIM_OAMSET_FLY_MON_1                   ; 98
+	const SPRITE_ANIM_OAMSET_FLY_MON_2                   ; 99
+	const SPRITE_ANIM_OAMSET_FLY_MON_3                   ; 9a
 DEF NUM_SPRITE_ANIM_OAMSETS EQU const_value
 
 assert NUM_SPRITE_ANIM_OAMSETS <= FIRST_OAM_CMD, \

constants/sprite_data_constants.asm

@@ -41,24 +41,26 @@ ENDM
 	ow_npc_pal_const DECO_ITEM         ; 0e (blue)
 	ow_npc_pal_const KEY_ITEM          ; 0f (green)
 	ow_npc_pal_const TREE              ; 10
+	ow_npc_pal_const RAIN              ; 11
+	ow_npc_pal_const SAND              ; 12
 DEF NUM_OW_TIME_OF_DAY_PALS EQU const_value
-	ow_npc_pal_const EMOTE_GRAY        ; 11
-	ow_npc_pal_const EMOTE_BLACK       ; 12
-	ow_npc_pal_const EMOTE_GREEN       ; 13
-	ow_npc_pal_const EMOTE_PURPLE      ; 14
-	ow_npc_pal_const EMOTE_RED         ; 15
-	ow_npc_pal_const EMOTE_ORANGE      ; 16
-	ow_npc_pal_const EMOTE_BLUE        ; 17
+	ow_npc_pal_const EMOTE_GRAY        ; 13
+	ow_npc_pal_const EMOTE_BLACK       ; 14
+	ow_npc_pal_const EMOTE_GREEN       ; 15
+	ow_npc_pal_const EMOTE_PURPLE      ; 16
+	ow_npc_pal_const EMOTE_RED         ; 17
+	ow_npc_pal_const EMOTE_ORANGE      ; 18
+	ow_npc_pal_const EMOTE_BLUE        ; 19
 DEF NUM_OW_INDIVIDUAL_PALS EQU const_value - NUM_OW_TIME_OF_DAY_PALS
 DEF FIRST_COPY_BG_PAL EQU const_value
-	ow_npc_pal_const COPY_BG_GRAY      ; 18
-	ow_npc_pal_const COPY_BG_RED       ; 19
-	ow_npc_pal_const COPY_BG_GREEN     ; 1a
-	ow_npc_pal_const COPY_BG_WATER     ; 1b
-	ow_npc_pal_const COPY_BG_YELLOW    ; 1c
-	ow_npc_pal_const COPY_BG_BROWN     ; 1d
-	ow_npc_pal_const COPY_BG_ROOF      ; 1e
-	ow_npc_pal_const COPY_BG_TEXT      ; 1f
+	ow_npc_pal_const COPY_BG_GRAY      ; 1a
+	ow_npc_pal_const COPY_BG_RED       ; 1b
+	ow_npc_pal_const COPY_BG_GREEN     ; 1c
+	ow_npc_pal_const COPY_BG_WATER     ; 1d
+	ow_npc_pal_const COPY_BG_YELLOW    ; 1e
+	ow_npc_pal_const COPY_BG_BROWN     ; 1f
+	ow_npc_pal_const COPY_BG_ROOF      ; 20
+	ow_npc_pal_const COPY_BG_TEXT      ; 21
 DEF NUM_OW_BG_COPY_PALS EQU const_value - NUM_OW_INDIVIDUAL_PALS
 DEF NUM_OW_PALS EQU const_value
 
@@ -67,3 +69,6 @@ DEF PAL_NPC_ROCK EQU PAL_NPC_BROWN
 DEF PAL_OW_GREY EQU PAL_OW_GRAY
 DEF PAL_NPC_SILVER EQU PAL_NPC_GRAY
 DEF PAL_OW_SILVER EQU PAL_OW_GRAY
+
+; used by wLoadedObjPal0-7 to mark that no palette is loaded
+DEF NO_PAL_LOADED EQU -1

constants/tileset_constants.asm

@@ -36,7 +36,7 @@
 	const TILESET_KABUTO_WORD_ROOM     ; 22
 	const TILESET_OMANYTE_WORD_ROOM    ; 23
 	const TILESET_AERODACTYL_WORD_ROOM ; 24
-	const TILESET_CLIFF_SIDE           ; 25
+	const TILESET_MOUNTAINSIDE         ; 25
 DEF NUM_TILESETS EQU const_value - 1
 
 ; wTileset struct size

constants/weather_constants.asm

@@ -0,0 +1,14 @@
+; GetCurrentWeather return values
+	const_def
+	const OW_WEATHER_NONE
+	const OW_WEATHER_RAIN
+	const OW_WEATHER_SNOW
+	const OW_WEATHER_THUNDERSTORM
+	const OW_WEATHER_SANDSTORM
+DEF NUM_OW_WEATHERS EQU const_value - 1
+
+; wWeatherFlags
+	const_def
+	const OW_WEATHER_DO_FLY_F             ; 0
+	const OW_WEATHER_DISABLED_F           ; 1
+	const OW_WEATHER_LIGHTNING_DISABLED_F ; 2

constants/wram_constants.asm

@@ -394,7 +394,23 @@ DEF NUM_UNLOCKED_UNOWN_SETS EQU const_value
 
 ; wPalFlags
 	const_def
-	const NO_DYN_PAL_APPLY_F   ; 0
-	const SCAN_OBJECTS_FIRST_F ; 1
-	const USE_DAYTIME_PAL_F    ; 2
-	const DISABLE_DYN_PAL_F    ; 3
+	const NO_DYN_PAL_APPLY_ONCE_F        ; 0
+	const SCAN_OBJECTS_FIRST_F           ; 1
+	const USE_DAYTIME_PAL_F              ; 2
+	const DISABLE_DYN_PAL_F              ; 3
+	const NO_DYN_PAL_APPLY_UNTIL_RESET_F ; 4
+DEF NO_DYN_PAL_APPLY EQU (1 << NO_DYN_PAL_APPLY_ONCE_F) | (1 << NO_DYN_PAL_APPLY_UNTIL_RESET_F)
+
+; wPalFadeMode::
+DEF PALFADE_WHICH        EQU %11
+DEF PALFADE_FLASH_F      EQU 2
+DEF PALFADE_PARTIAL_F    EQU 3
+DEF PALFADE_SKIP_FIRST_F EQU 4
+
+; hBattlePalFadeMode::
+DEF PALFADE_BOTH       EQU %00
+DEF PALFADE_BG         EQU %01
+DEF PALFADE_OBJ        EQU %10
+DEF PALFADE_FLASH      EQU 1 << PALFADE_FLASH_F
+DEF PALFADE_PARTIAL    EQU 1 << PALFADE_PARTIAL_F
+DEF PALFADE_SKIP_FIRST EQU 1 << PALFADE_SKIP_FIRST_F

data/maps/attributes.asm

@@ -738,5 +738,5 @@ ENDM
 	map_attributes SafariRestHouseArea2, SAFARI_REST_HOUSE_AREA_2, $00, 0
 	map_attributes SafariRestHouseArea3, SAFARI_REST_HOUSE_AREA_3, $00, 0
 	map_attributes SafariRestHouseArea4, SAFARI_REST_HOUSE_AREA_4, $00, 0
-	map_attributes SilverCaveCliffSide1F, SILVER_CAVE_CLIFF_SIDE_1F, $48, 0
-	map_attributes SilverCaveCliffSide2F, SILVER_CAVE_CLIFF_SIDE_2F, $0c, 0
+	map_attributes SilverCaveLowerMountainSide, SILVER_CAVE_LOWER_MOUNTAINSIDE, $48, 0
+	map_attributes SilverCaveUpperMountainSide, SILVER_CAVE_UPPER_MOUNTAINSIDE, $0c, 0

data/maps/blocks.asm

@@ -997,9 +997,9 @@ SafariRestHouseArea4_Blocks:
 SafariZoneEntrance_Blocks:
 	INCBIN "maps/SafariZoneEntrance.blk"
 
-SilverCaveCliffSide1F_Blocks:
-	INCBIN "maps/SilverCaveCliffSide1F.blk"
+SilverCaveLowerMountainSide_Blocks:
+	INCBIN "maps/SilverCaveLowerMountainSide.blk"
 
-SilverCaveCliffSide2F_Blocks:
-	INCBIN "maps/SilverCaveCliffSide2F.blk"
+SilverCaveUpperMountainSide_Blocks:
+	INCBIN "maps/SilverCaveUpperMountainSide.blk"
 ENDSECTION

data/maps/maps.asm

@@ -578,6 +578,6 @@ MapGroup_SafariZoneGate:
 MapGroup_SafariZone:
 	table_width MAP_LENGTH, MapGroup_SafariZone
 	map SafariZoneArea3, TILESET_PARK, ROUTE, LANDMARK_SAFARI_ZONE, MUSIC_EVOLUTION, FALSE, PALETTE_AUTO, FISHGROUP_POND
-	map SilverCaveCliffSide1F, TILESET_CLIFF_SIDE, ROUTE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_AUTO, FISHGROUP_POND
-	map SilverCaveCliffSide2F, TILESET_CLIFF_SIDE, ROUTE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_AUTO, FISHGROUP_POND
+	map SilverCaveLowerMountainSide, TILESET_MOUNTAINSIDE, ROUTE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_AUTO, FISHGROUP_POND
+	map SilverCaveUpperMountainSide, TILESET_MOUNTAINSIDE, ROUTE, LANDMARK_SILVER_CAVE, MUSIC_LIGHTHOUSE, TRUE, PALETTE_AUTO, FISHGROUP_POND
 	assert_table_length NUM_SAFARI_ZONE_MAPS

data/maps/scripts.asm

@@ -520,7 +520,7 @@ INCLUDE "maps/SafariRestHouseArea2.asm"
 INCLUDE "maps/SafariRestHouseArea3.asm"
 INCLUDE "maps/SafariRestHouseArea4.asm"
 INCLUDE "maps/Route39.asm"
-INCLUDE "maps/SilverCaveCliffSide1F.asm"
-INCLUDE "maps/SilverCaveCliffSide2F.asm"
+INCLUDE "maps/SilverCaveLowerMountainSide.asm"
+INCLUDE "maps/SilverCaveUpperMountainSide.asm"
 
 ENDSECTION

data/maps/setup_script_pointers.asm

@@ -53,3 +53,6 @@ MapSetupCommands:
 	add_mapsetup DisableDynPalUpdates ; 2e
 	add_mapsetup EnableDynPalUpdates ; 2f
 	add_mapsetup EnableDynPalUpdatesNoApply ; 30
+	add_mapsetup ClearWeather ; 31
+	add_mapsetup SetCurrentWeather ; 32
+	add_mapsetup MapConnOWFadePalettesInit ; 33

data/maps/setup_scripts.asm

@@ -32,6 +32,8 @@ MapSetupScript_Warp:
 	mapsetup EnterMapSpawnPoint
 	mapsetup LoadMapAttributes
 	mapsetup HandleNewMap
+	mapsetup ClearWeather
+	mapsetup SetCurrentWeather
 	mapsetup SpawnPlayer
 	mapsetup RefreshPlayerCoords
 	mapsetup GetMapScreenCoords
@@ -56,6 +58,8 @@ MapSetupScript_BadWarp:
 	mapsetup EnterMapSpawnPoint
 	mapsetup LoadMapAttributes
 	mapsetup HandleNewMap
+	mapsetup ClearWeather
+	mapsetup SetCurrentWeather
 	mapsetup SpawnPlayer
 	mapsetup RefreshPlayerCoords
 	mapsetup GetMapScreenCoords
@@ -83,16 +87,17 @@ MapSetupScript_Connection:
 	mapsetup EnterMapConnection
 	mapsetup LoadMapAttributes
 	mapsetup HandleNewMap
+	mapsetup SetCurrentWeather
 	mapsetup RefreshPlayerCoords
 	mapsetup LoadBlockData
 	mapsetup LoadMapTileset
 	mapsetup SaveScreen
 	mapsetup LoadMapObjects
 	mapsetup FadeToMapMusic
 	mapsetup LoadMapPalettes
-	mapsetup EnableDynPalUpdates
+	mapsetup EnableDynPalUpdatesNoApply
+	mapsetup MapConnOWFadePalettesInit
 	mapsetup InitMapNameSign
-	mapsetup ApplyMapPalettes
 	mapsetup LoadWildMonData
 	mapsetup UpdateRoamMons
 	mapsetup ActivateMapAnims
@@ -107,6 +112,8 @@ MapSetupScript_Train:
 	mapsetup LoadMapAttributes
 	mapsetup GetWarpDestCoords
 	mapsetup HandleNewMap
+	mapsetup ClearWeather
+	mapsetup SetCurrentWeather
 	mapsetup RefreshPlayerCoords
 	mapsetup LoadBlockData
 	mapsetup BufferScreen
@@ -128,6 +135,7 @@ MapSetupScript_Train:
 	db -1 ; end
 
 MapSetupScript_ReloadMap:
+	mapsetup ClearWeather
 	mapsetup FadeMapMusicAndPalettes
 	mapsetup ClearBGPalettes
 	mapsetup DisableLCD
@@ -186,6 +194,8 @@ MapSetupScript_Continue:
 	mapsetup RefreshMapSprites
 	mapsetup PlayMapMusicBike
 	mapsetup FadeInPalettes
+	mapsetup ClearWeather
+	mapsetup SetCurrentWeather
 	mapsetup ActivateMapAnims
 	mapsetup LoadWildMonData
 	db -1 ; end

data/pokemon/base_stats/ampharos.asm

@@ -17,5 +17,5 @@
 	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, LOW_KICK, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, THUNDER, RETURN, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, LOW_KICK, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
 	; end

data/pokemon/base_stats/blissey.asm

@@ -17,5 +17,5 @@
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end

data/pokemon/base_stats/chansey.asm

@@ -17,5 +17,5 @@
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, EARTHQUAKE, RETURN, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SANDSTORM, FIRE_BLAST, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end

data/pokemon/base_stats/clefable.asm

@@ -17,5 +17,5 @@
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, HYPER_BEAM, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end

data/pokemon/base_stats/clefairy.asm

@@ -17,5 +17,5 @@
 	dn EGG_FAIRY, EGG_FAIRY ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROLLOUT, TOXIC, ZAP_CANNON, ROCK_SMASH, PSYCH_UP, HIDDEN_POWER, SUNNY_DAY, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, SOLARBEAM, IRON_TAIL, THUNDER, RETURN, DIG, PSYCHIC_M, SHADOW_BALL, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, FIRE_BLAST, SWIFT, DEFENSE_CURL, THUNDERPUNCH, DREAM_EATER, REST, ATTRACT, THIEF, FIRE_PUNCH, NIGHTMARE, STRENGTH, FLASH, FLAMETHROWER, THUNDERBOLT, ICE_BEAM
 	; end

data/pokemon/base_stats/croconaw.asm

@@ -17,5 +17,5 @@
 	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, LOW_KICK, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, LOW_KICK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end

data/pokemon/base_stats/donphan.asm

@@ -17,5 +17,5 @@
 	dn EGG_GROUND, EGG_GROUND ; egg groups
 
 	; tm/hm learnset
-	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, STRENGTH
+	tmhm HEADBUTT, CURSE, ROLLOUT, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SUNNY_DAY, SNORE, HYPER_BEAM, PROTECT, ENDURE, FRUSTRATION, IRON_TAIL, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SANDSTORM, DEFENSE_CURL, REST, ATTRACT, THIEF, STRENGTH
 	; end

data/pokemon/base_stats/feraligatr.asm

@@ -17,5 +17,5 @@
 	dn EGG_MONSTER, EGG_WATER_1 ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, LOW_KICK, REST, ATTRACT, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, ROAR, TOXIC, ROCK_SMASH, HIDDEN_POWER, SNORE, BLIZZARD, HYPER_BEAM, ICY_WIND, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, DRAGONBREATH, EARTHQUAKE, RETURN, DIG, MUD_SLAP, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, LOW_KICK, REST, ATTRACT, THIEF, FURY_CUTTER, CUT, SURF, STRENGTH, WHIRLPOOL, WATERFALL, ICE_BEAM
 	; end

data/pokemon/base_stats/flaaffy.asm

@@ -17,5 +17,5 @@
 	dn EGG_MONSTER, EGG_GROUND ; egg groups
 
 	; tm/hm learnset
-	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, LOW_KICK, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
+	tmhm DYNAMICPUNCH, HEADBUTT, CURSE, TOXIC, ZAP_CANNON, ROCK_SMASH, HIDDEN_POWER, SNORE, PROTECT, RAIN_DANCE, ENDURE, FRUSTRATION, IRON_TAIL, THUNDER, RETURN, DOUBLE_TEAM, ICE_PUNCH, SWAGGER, SLEEP_TALK, SWIFT, DEFENSE_CURL, THUNDERPUNCH, LOW_KICK, REST, ATTRACT, FIRE_PUNCH, STRENGTH, FLASH, THUNDERBOLT
 	; end