113 files changed, 2 insertions, 93 deletions
diff --git a/engine/battle/bank_e_misc.asm b/engine/battle/misc.asm
index 33af6f6f..33af6f6f 100755
--- a/engine/battle/bank_e_misc.asm
+++ b/engine/battle/misc.asm
diff --git a/engine/battle/moveEffects/conversion_effect.asm b/engine/battle/move_effects/conversion.asm
index f23c3d70..f23c3d70 100644
--- a/engine/battle/moveEffects/conversion_effect.asm
+++ b/engine/battle/move_effects/conversion.asm
diff --git a/engine/battle/moveEffects/drain_hp_effect.asm b/engine/battle/move_effects/drain_hp.asm
index e5f4681a..e5f4681a 100644
--- a/engine/battle/moveEffects/drain_hp_effect.asm
+++ b/engine/battle/move_effects/drain_hp.asm
diff --git a/engine/battle/moveEffects/focus_energy_effect.asm b/engine/battle/move_effects/focus_energy.asm
index 16dad7bb..16dad7bb 100644
--- a/engine/battle/moveEffects/focus_energy_effect.asm
+++ b/engine/battle/move_effects/focus_energy.asm
diff --git a/engine/battle/moveEffects/haze_effect.asm b/engine/battle/move_effects/haze.asm
index 47723ba2..47723ba2 100644
--- a/engine/battle/moveEffects/haze_effect.asm
+++ b/engine/battle/move_effects/haze.asm
diff --git a/engine/battle/moveEffects/heal_effect.asm b/engine/battle/move_effects/heal.asm
index 2e68acc0..2e68acc0 100644
--- a/engine/battle/moveEffects/heal_effect.asm
+++ b/engine/battle/move_effects/heal.asm
diff --git a/engine/battle/moveEffects/leech_seed_effect.asm b/engine/battle/move_effects/leech_seed.asm
index f4d3ee9c..f4d3ee9c 100644
--- a/engine/battle/moveEffects/leech_seed_effect.asm
+++ b/engine/battle/move_effects/leech_seed.asm
diff --git a/engine/battle/moveEffects/mist_effect.asm b/engine/battle/move_effects/mist.asm
index 65070a3e..65070a3e 100644
--- a/engine/battle/moveEffects/mist_effect.asm
+++ b/engine/battle/move_effects/mist.asm
diff --git a/engine/battle/moveEffects/one_hit_ko_effect.asm b/engine/battle/move_effects/one_hit_ko.asm
index 827e2197..827e2197 100644
--- a/engine/battle/moveEffects/one_hit_ko_effect.asm
+++ b/engine/battle/move_effects/one_hit_ko.asm
diff --git a/engine/battle/moveEffects/paralyze_effect.asm b/engine/battle/move_effects/paralyze.asm
index 95979ae6..95979ae6 100644
--- a/engine/battle/moveEffects/paralyze_effect.asm
+++ b/engine/battle/move_effects/paralyze.asm
diff --git a/engine/battle/moveEffects/pay_day_effect.asm b/engine/battle/move_effects/pay_day.asm
index e5daf014..e5daf014 100644
--- a/engine/battle/moveEffects/pay_day_effect.asm
+++ b/engine/battle/move_effects/pay_day.asm
diff --git a/engine/battle/moveEffects/recoil_effect.asm b/engine/battle/move_effects/recoil.asm
index 0f2f087b..0f2f087b 100644
--- a/engine/battle/moveEffects/recoil_effect.asm
+++ b/engine/battle/move_effects/recoil.asm
diff --git a/engine/battle/moveEffects/reflect_light_screen_effect.asm b/engine/battle/move_effects/reflect_light_screen.asm
index 2805a969..2805a969 100644
--- a/engine/battle/moveEffects/reflect_light_screen_effect.asm
+++ b/engine/battle/move_effects/reflect_light_screen.asm
diff --git a/engine/battle/moveEffects/substitute_effect.asm b/engine/battle/move_effects/substitute.asm
index 1bb6c887..1bb6c887 100644
--- a/engine/battle/moveEffects/substitute_effect.asm
+++ b/engine/battle/move_effects/substitute.asm
diff --git a/engine/battle/moveEffects/transform_effect.asm b/engine/battle/move_effects/transform.asm
index 9a5de9cc..9a5de9cc 100644
--- a/engine/battle/moveEffects/transform_effect.asm
+++ b/engine/battle/move_effects/transform.asm
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 7755b50f..2850b9c2 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -279,7 +279,7 @@ INCLUDE "data/trainer_pic_money_pointers.asm"
 
 INCLUDE "text/trainer_names.asm"
 
-INCLUDE "engine/battle/bank_e_misc.asm"
+INCLUDE "engine/battle/misc.asm"
 
 INCLUDE "engine/battle/read_trainer_party.asm"
 
diff --git a/engine/debug1.asm b/engine/debug/debug_party.asm
index a5eb7dde..a5eb7dde 100644
--- a/engine/debug1.asm
+++ b/engine/debug/debug_party.asm
diff --git a/engine/test_battle.asm b/engine/debug/test_battle.asm
index d9dcf1fa..d9dcf1fa 100644
--- a/engine/test_battle.asm
+++ b/engine/debug/test_battle.asm
diff --git a/engine/black_out.asm b/engine/events/black_out.asm
index 6c358ce3..6c358ce3 100644
--- a/engine/black_out.asm
+++ b/engine/events/black_out.asm
diff --git a/engine/overworld/card_key.asm b/engine/events/card_key.asm
index c77d5fcd..c77d5fcd 100755
--- a/engine/overworld/card_key.asm
+++ b/engine/events/card_key.asm
diff --git a/engine/overworld/cinnabar_lab.asm b/engine/events/cinnabar_lab.asm
index e642840d..e642840d 100755
--- a/engine/overworld/cinnabar_lab.asm
+++ b/engine/events/cinnabar_lab.asm
diff --git a/engine/menu/diploma.asm b/engine/events/diploma.asm
index e53ef58f..e53ef58f 100755
--- a/engine/menu/diploma.asm
+++ b/engine/events/diploma.asm
diff --git a/engine/display_pokedex.asm b/engine/events/display_pokedex.asm
index d657ea85..d657ea85 100644
--- a/engine/display_pokedex.asm
+++ b/engine/events/display_pokedex.asm
diff --git a/engine/predefs7.asm b/engine/events/elevator.asm
index 752bdd1a..752bdd1a 100755
--- a/engine/predefs7.asm
+++ b/engine/events/elevator.asm
diff --git a/engine/evolve_trade.asm b/engine/events/evolve_trade.asm
index e17fc05c..e17fc05c 100755
--- a/engine/evolve_trade.asm
+++ b/engine/events/evolve_trade.asm
diff --git a/engine/give_pokemon.asm b/engine/events/give_pokemon.asm
index 03177e60..03177e60 100755
--- a/engine/give_pokemon.asm
+++ b/engine/events/give_pokemon.asm
diff --git a/engine/heal_party.asm b/engine/events/heal_party.asm
index 7aaa1bd1..7aaa1bd1 100644
--- a/engine/heal_party.asm
+++ b/engine/events/heal_party.asm
diff --git a/engine/overworld/hidden_items.asm b/engine/events/hidden_items.asm
index e40b0ac7..e40b0ac7 100755
--- a/engine/overworld/hidden_items.asm
+++ b/engine/events/hidden_items.asm
diff --git a/engine/hidden_object_functions14.asm b/engine/events/hidden_object_functions14.asm
index 9e14c6a7..9e14c6a7 100755
--- a/engine/hidden_object_functions14.asm
+++ b/engine/events/hidden_object_functions14.asm
diff --git a/engine/hidden_object_functions17.asm b/engine/events/hidden_object_functions17.asm
index bb2a358c..bb2a358c 100755
--- a/engine/hidden_object_functions17.asm
+++ b/engine/events/hidden_object_functions17.asm
diff --git a/engine/hidden_object_functions18.asm b/engine/events/hidden_object_functions18.asm
index c0e5aa34..c0e5aa34 100755
--- a/engine/hidden_object_functions18.asm
+++ b/engine/events/hidden_object_functions18.asm
diff --git a/engine/hidden_object_functions3.asm b/engine/events/hidden_object_functions3.asm
index 1237e960..1237e960 100755
--- a/engine/hidden_object_functions3.asm
+++ b/engine/events/hidden_object_functions3.asm
diff --git a/engine/hidden_object_functions7.asm b/engine/events/hidden_object_functions7.asm
index e18b9570..e18b9570 100755
--- a/engine/hidden_object_functions7.asm
+++ b/engine/events/hidden_object_functions7.asm
diff --git a/engine/in_game_trades.asm b/engine/events/in_game_trades.asm
index c01bc3c3..c01bc3c3 100755
--- a/engine/in_game_trades.asm
+++ b/engine/events/in_game_trades.asm
diff --git a/engine/overworld/oaks_aide.asm b/engine/events/oaks_aide.asm
index f5068fda..f5068fda 100755
--- a/engine/overworld/oaks_aide.asm
+++ b/engine/events/oaks_aide.asm
diff --git a/engine/overworld/pewter_guys.asm b/engine/events/pewter_guys.asm
index 532fa4bf..532fa4bf 100755
--- a/engine/overworld/pewter_guys.asm
+++ b/engine/events/pewter_guys.asm
diff --git a/engine/overworld/item.asm b/engine/events/pick_up_item.asm
index 9f19100a..9f19100a 100644
--- a/engine/overworld/item.asm
+++ b/engine/events/pick_up_item.asm
diff --git a/engine/overworld/poison.asm b/engine/events/poison.asm
index 5d8eb9fd..5d8eb9fd 100644
--- a/engine/overworld/poison.asm
+++ b/engine/events/poison.asm
diff --git a/engine/overworld/pokecenter.asm b/engine/events/pokecenter.asm
index f340e06d..f340e06d 100755
--- a/engine/overworld/pokecenter.asm
+++ b/engine/events/pokecenter.asm
diff --git a/engine/pokedex_rating.asm b/engine/events/pokedex_rating.asm
index f1aaf618..f1aaf618 100755
--- a/engine/pokedex_rating.asm
+++ b/engine/events/pokedex_rating.asm
diff --git a/engine/overworld/pokemart.asm b/engine/events/pokemart.asm
index 177e8a09..177e8a09 100755
--- a/engine/overworld/pokemart.asm
+++ b/engine/events/pokemart.asm
diff --git a/engine/menu/prize_menu.asm b/engine/events/prize_menu.asm
index 5e08bb8f..5e08bb8f 100755
--- a/engine/menu/prize_menu.asm
+++ b/engine/events/prize_menu.asm
diff --git a/engine/overworld/saffron_guards.asm b/engine/events/saffron_guards.asm
index 091cfa1a..091cfa1a 100755
--- a/engine/overworld/saffron_guards.asm
+++ b/engine/events/saffron_guards.asm
diff --git a/engine/overworld/set_blackout_map.asm b/engine/events/set_blackout_map.asm
index 14f0ba28..14f0ba28 100644
--- a/engine/overworld/set_blackout_map.asm
+++ b/engine/events/set_blackout_map.asm
diff --git a/engine/predefs17.asm b/engine/events/starter_dex.asm
index 21289c6a..21289c6a 100755
--- a/engine/predefs17.asm
+++ b/engine/events/starter_dex.asm
diff --git a/engine/menu/vending_machine.asm b/engine/events/vending_machine.asm
index 554c5d4f..554c5d4f 100755
--- a/engine/menu/vending_machine.asm
+++ b/engine/events/vending_machine.asm
diff --git a/engine/hp_bar.asm b/engine/gfx/hp_bar.asm
index 221bd7a9..221bd7a9 100755
--- a/engine/hp_bar.asm
+++ b/engine/gfx/hp_bar.asm
diff --git a/engine/load_pokedex_tiles.asm b/engine/gfx/load_pokedex_tiles.asm
index 70bcf04d..70bcf04d 100755
--- a/engine/load_pokedex_tiles.asm
+++ b/engine/gfx/load_pokedex_tiles.asm
diff --git a/engine/mon_party_sprites.asm b/engine/gfx/mon_icons.asm
index d2913715..d2913715 100755
--- a/engine/mon_party_sprites.asm
+++ b/engine/gfx/mon_icons.asm
diff --git a/engine/oam_dma.asm b/engine/gfx/oam_dma.asm
index b0d64675..b0d64675 100644
--- a/engine/oam_dma.asm
+++ b/engine/gfx/oam_dma.asm
diff --git a/engine/palettes.asm b/engine/gfx/palettes.asm
index 39991d48..39991d48 100755
--- a/engine/palettes.asm
+++ b/engine/gfx/palettes.asm
diff --git a/engine/predefs12.asm b/engine/gfx/screen_effects.asm
index 95f0ea25..95f0ea25 100755
--- a/engine/predefs12.asm
+++ b/engine/gfx/screen_effects.asm
diff --git a/engine/overworld/oam.asm b/engine/gfx/sprite_oam.asm
index 68128413..68128413 100644
--- a/engine/overworld/oam.asm
+++ b/engine/gfx/sprite_oam.asm
diff --git a/engine/get_bag_item_quantity.asm b/engine/items/get_bag_item_quantity.asm
index f10df1a0..f10df1a0 100644
--- a/engine/get_bag_item_quantity.asm
+++ b/engine/items/get_bag_item_quantity.asm
diff --git a/engine/items/items.asm b/engine/items/item_effects.asm
index 6e7bed1e..6e7bed1e 100755
--- a/engine/items/items.asm
+++ b/engine/items/item_effects.asm
diff --git a/engine/subtract_paid_money.asm b/engine/items/subtract_paid_money.asm
index fdefe3d6..fdefe3d6 100644
--- a/engine/subtract_paid_money.asm
+++ b/engine/items/subtract_paid_money.asm
diff --git a/engine/town_map.asm b/engine/items/town_map.asm
index 84a92994..84a92994 100755
--- a/engine/town_map.asm
+++ b/engine/items/town_map.asm
diff --git a/engine/cable_club.asm b/engine/link/cable_club.asm
index 141ed396..141ed396 100755
--- a/engine/cable_club.asm
+++ b/engine/link/cable_club.asm
diff --git a/engine/overworld/cable_club_npc.asm b/engine/link/cable_club_npc.asm
index bb0f7680..bb0f7680 100755
--- a/engine/overworld/cable_club_npc.asm
+++ b/engine/link/cable_club_npc.asm
diff --git a/engine/print_waiting_text.asm b/engine/link/print_waiting_text.asm
index c48459d3..c48459d3 100644
--- a/engine/print_waiting_text.asm
+++ b/engine/link/print_waiting_text.asm
diff --git a/engine/bcd.asm b/engine/math/bcd.asm
index 2d0b43df..2d0b43df 100644
--- a/engine/bcd.asm
+++ b/engine/math/bcd.asm
diff --git a/engine/multiply_divide.asm b/engine/math/multiply_divide.asm
index 6cdc6c87..6cdc6c87 100755
--- a/engine/multiply_divide.asm
+++ b/engine/math/multiply_divide.asm
diff --git a/engine/random.asm b/engine/math/random.asm
index 2fc83f6f..2fc83f6f 100755
--- a/engine/random.asm
+++ b/engine/math/random.asm
diff --git a/engine/menu/start_menu.asm b/engine/menu/start_menu.asm
deleted file mode 100755
index eb4b4f2d..00000000
--- a/engine/menu/start_menu.asm
+++ /dev/null
@@ -1,85 +0,0 @@
-DisplayStartMenu::
-	ld a, BANK(StartMenu_Pokedex)
-	ld [H_LOADEDROMBANK], a
-	ld [MBC1RomBank], a
-	ld a, [wWalkBikeSurfState] ; walking/biking/surfing
-	ld [wWalkBikeSurfStateCopy], a
-	ld a, SFX_START_MENU
-	call PlaySound
-
-RedisplayStartMenu::
-	callba DrawStartMenu
-	callba PrintSafariZoneSteps ; print Safari Zone info, if in Safari Zone
-	call UpdateSprites
-.loop
-	call HandleMenuInput
-	ld b, a
-.checkIfUpPressed
-	bit 6, a ; was Up pressed?
-	jr z, .checkIfDownPressed
-	ld a, [wCurrentMenuItem] ; menu selection
-	and a
-	jr nz, .loop
-	ld a, [wLastMenuItem]
-	and a
-	jr nz, .loop
-; if the player pressed tried to go past the top item, wrap around to the bottom
-	CheckEvent EVENT_GOT_POKEDEX
-	ld a, 6 ; there are 7 menu items with the pokedex, so the max index is 6
-	jr nz, .wrapMenuItemId
-	dec a ; there are only 6 menu items without the pokedex
-.wrapMenuItemId
-	ld [wCurrentMenuItem], a
-	call EraseMenuCursor
-	jr .loop
-.checkIfDownPressed
-	bit 7, a
-	jr z, .buttonPressed
-; if the player pressed tried to go past the bottom item, wrap around to the top
-	CheckEvent EVENT_GOT_POKEDEX
-	ld a, [wCurrentMenuItem]
-	ld c, 7 ; there are 7 menu items with the pokedex
-	jr nz, .checkIfPastBottom
-	dec c ; there are only 6 menu items without the pokedex
-.checkIfPastBottom
-	cp c
-	jr nz, .loop
-; the player went past the bottom, so wrap to the top
-	xor a
-	ld [wCurrentMenuItem], a
-	call EraseMenuCursor
-	jr .loop
-.buttonPressed ; A, B, or Start button pressed
-	call PlaceUnfilledArrowMenuCursor
-	ld a, [wCurrentMenuItem]
-	ld [wBattleAndStartSavedMenuItem], a ; save current menu selection
-	ld a, b
-	and %00001010 ; was the Start button or B button pressed?
-	jp nz, CloseStartMenu
-	call SaveScreenTilesToBuffer2 ; copy background from wTileMap to wTileMapBackup2
-	CheckEvent EVENT_GOT_POKEDEX
-	ld a, [wCurrentMenuItem]
-	jr nz, .displayMenuItem
-	inc a ; adjust position to account for missing pokedex menu item
-.displayMenuItem
-	cp 0
-	jp z, StartMenu_Pokedex
-	cp 1
-	jp z, StartMenu_Pokemon
-	cp 2
-	jp z, StartMenu_Item
-	cp 3
-	jp z, StartMenu_TrainerInfo
-	cp 4
-	jp z, StartMenu_SaveReset
-	cp 5
-	jp z, StartMenu_Option
-
-; EXIT falls through to here
-CloseStartMenu::
-	call Joypad
-	ld a, [hJoyPressed]
-	bit 0, a ; was A button newly pressed?
-	jr nz, CloseStartMenu
-	call LoadTextBoxTilePatterns
-	jp CloseTextDisplay
diff --git a/engine/display_text_id_init.asm b/engine/menus/display_text_id_init.asm
index 5043ad22..5043ad22 100644
--- a/engine/display_text_id_init.asm
+++ b/engine/menus/display_text_id_init.asm
diff --git a/engine/menu/draw_badges.asm b/engine/menus/draw_badges.asm
index 1888e32f..1888e32f 100644
--- a/engine/menu/draw_badges.asm
+++ b/engine/menus/draw_badges.asm
diff --git a/engine/menu/draw_start_menu.asm b/engine/menus/draw_start_menu.asm
index 21e444e9..21e444e9 100644
--- a/engine/menu/draw_start_menu.asm
+++ b/engine/menus/draw_start_menu.asm
diff --git a/engine/menu/league_pc.asm b/engine/menus/league_pc.asm
index 170c0ef3..170c0ef3 100755
--- a/engine/menu/league_pc.asm
+++ b/engine/menus/league_pc.asm
diff --git a/engine/menu/main_menu.asm b/engine/menus/main_menu.asm
index 8eda6744..8eda6744 100755
--- a/engine/menu/main_menu.asm
+++ b/engine/menus/main_menu.asm
diff --git a/engine/menu/naming_screen.asm b/engine/menus/naming_screen.asm
index 2b86d6f4..2b86d6f4 100755
--- a/engine/menu/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
diff --git a/engine/menu/oaks_pc.asm b/engine/menus/oaks_pc.asm
index 03c9b8f1..03c9b8f1 100755
--- a/engine/menu/oaks_pc.asm
+++ b/engine/menus/oaks_pc.asm
diff --git a/engine/menu/party_menu.asm b/engine/menus/party_menu.asm
index 41b6074b..41b6074b 100755
--- a/engine/menu/party_menu.asm
+++ b/engine/menus/party_menu.asm
diff --git a/engine/menu/pc.asm b/engine/menus/pc.asm
index 6ec45f2e..6ec45f2e 100755
--- a/engine/menu/pc.asm
+++ b/engine/menus/pc.asm
diff --git a/engine/menu/players_pc.asm b/engine/menus/players_pc.asm
index 403632fa..403632fa 100755
--- a/engine/menu/players_pc.asm
+++ b/engine/menus/players_pc.asm
diff --git a/engine/menu/pokedex.asm b/engine/menus/pokedex.asm
index 8e1fd480..8e1fd480 100755
--- a/engine/menu/pokedex.asm
+++ b/engine/menus/pokedex.asm
diff --git a/engine/save.asm b/engine/menus/save.asm
index 33a7ba8d..33a7ba8d 100755
--- a/engine/save.asm
+++ b/engine/menus/save.asm
diff --git a/engine/menu/start_sub_menus.asm b/engine/menus/start_sub_menus.asm
index b81769a2..b81769a2 100755
--- a/engine/menu/start_sub_menus.asm
+++ b/engine/menus/start_sub_menus.asm
diff --git a/engine/menu/swap_items.asm b/engine/menus/swap_items.asm
index 826fe60b..826fe60b 100644
--- a/engine/menu/swap_items.asm
+++ b/engine/menus/swap_items.asm
diff --git a/engine/menu/text_box.asm b/engine/menus/text_box.asm
index 00045959..00045959 100644
--- a/engine/menu/text_box.asm
+++ b/engine/menus/text_box.asm
diff --git a/engine/HoF_room_pc.asm b/engine/movie/credits.asm
index f820aae3..f820aae3 100755
--- a/engine/HoF_room_pc.asm
+++ b/engine/movie/credits.asm
diff --git a/engine/evolution.asm b/engine/movie/evolution.asm
index 731735c5..731735c5 100755
--- a/engine/evolution.asm
+++ b/engine/movie/evolution.asm
diff --git a/engine/gamefreak.asm b/engine/movie/gamefreak.asm
index 78e48384..78e48384 100755
--- a/engine/gamefreak.asm
+++ b/engine/movie/gamefreak.asm
diff --git a/engine/hall_of_fame.asm b/engine/movie/hall_of_fame.asm
index 3c9b1723..3c9b1723 100755
--- a/engine/hall_of_fame.asm
+++ b/engine/movie/hall_of_fame.asm
diff --git a/engine/intro.asm b/engine/movie/intro.asm
index 9a13c96f..9a13c96f 100755
--- a/engine/intro.asm
+++ b/engine/movie/intro.asm
diff --git a/engine/clear_save.asm b/engine/movie/oak_speech/clear_save.asm
index b47cd6c4..b47cd6c4 100755
--- a/engine/clear_save.asm
+++ b/engine/movie/oak_speech/clear_save.asm
diff --git a/engine/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm
index c576e65a..c576e65a 100644
--- a/engine/init_player_data.asm
+++ b/engine/movie/oak_speech/init_player_data.asm
diff --git a/engine/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
index b1acfb65..b1acfb65 100755
--- a/engine/oak_speech.asm
+++ b/engine/movie/oak_speech/oak_speech.asm
diff --git a/engine/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
index fdc9ffa3..fdc9ffa3 100755
--- a/engine/oak_speech2.asm
+++ b/engine/movie/oak_speech/oak_speech2.asm
diff --git a/engine/titlescreen.asm b/engine/movie/titlescreen.asm
index c30f83a9..c30f83a9 100755
--- a/engine/titlescreen.asm
+++ b/engine/movie/titlescreen.asm
diff --git a/engine/titlescreen2.asm b/engine/movie/titlescreen2.asm
index 2346fcc5..2346fcc5 100755
--- a/engine/titlescreen2.asm
+++ b/engine/movie/titlescreen2.asm
diff --git a/engine/trade.asm b/engine/movie/trade.asm
index 8bc8e3bc..8bc8e3bc 100755
--- a/engine/trade.asm
+++ b/engine/movie/trade.asm
diff --git a/engine/trade2.asm b/engine/movie/trade2.asm
index 2c79e077..2c79e077 100755
--- a/engine/trade2.asm
+++ b/engine/movie/trade2.asm
diff --git a/engine/overworld/npc_movement.asm b/engine/overworld/auto_movement.asm
index e478c9ad..e478c9ad 100755
--- a/engine/overworld/npc_movement.asm
+++ b/engine/overworld/auto_movement.asm
diff --git a/engine/overworld/ssanne.asm b/engine/overworld/dust_smoke.asm
index 6c26b712..6c26b712 100755
--- a/engine/overworld/ssanne.asm
+++ b/engine/overworld/dust_smoke.asm
diff --git a/engine/pathfinding.asm b/engine/overworld/pathfinding.asm
index ba052d38..ba052d38 100644
--- a/engine/pathfinding.asm
+++ b/engine/overworld/pathfinding.asm
diff --git a/engine/special_warps.asm b/engine/overworld/special_warps.asm
index eee85402..eee85402 100644
--- a/engine/special_warps.asm
+++ b/engine/overworld/special_warps.asm
diff --git a/engine/overworld/map_sprite_functions1.asm b/engine/overworld/sprite_collisions.asm
index 0e6b2d06..0e6b2d06 100644
--- a/engine/overworld/map_sprite_functions1.asm
+++ b/engine/overworld/sprite_collisions.asm
diff --git a/engine/overworld/tileset_header.asm b/engine/overworld/tilesets.asm
index 6e33974f..6e33974f 100644
--- a/engine/overworld/tileset_header.asm
+++ b/engine/overworld/tilesets.asm
diff --git a/engine/overworld/trainers.asm b/engine/overworld/trainer_sight.asm
index 5a68b627..5a68b627 100755
--- a/engine/overworld/trainers.asm
+++ b/engine/overworld/trainer_sight.asm
diff --git a/engine/turn_sprite.asm b/engine/overworld/turn_sprite.asm
index c7f7712b..c7f7712b 100755
--- a/engine/turn_sprite.asm
+++ b/engine/overworld/turn_sprite.asm
diff --git a/engine/add_mon.asm b/engine/pokemon/add_mon.asm
index 7627136b..7627136b 100644
--- a/engine/add_mon.asm
+++ b/engine/pokemon/add_mon.asm
diff --git a/engine/menu/bills_pc.asm b/engine/pokemon/bills_pc.asm
index 6f643228..e5855f1d 100644
--- a/engine/menu/bills_pc.asm
+++ b/engine/pokemon/bills_pc.asm
@@ -376,13 +376,7 @@ KnowsHMMove::
 	and a
 	ret
 
-HMMoveArray:
-	db CUT
-	db FLY
-	db SURF
-	db STRENGTH
-	db FLASH
-	db -1
+INCLUDE "data/hm_moves.asm"
 
 DisplayDepositWithdrawMenu:
 	coord hl, 9, 10
diff --git a/engine/evos_moves.asm b/engine/pokemon/evos_moves.asm
index f50f8081..f50f8081 100755
--- a/engine/evos_moves.asm
+++ b/engine/pokemon/evos_moves.asm
diff --git a/engine/experience.asm b/engine/pokemon/experience.asm
index 3ee4b2a8..3ee4b2a8 100755
--- a/engine/experience.asm
+++ b/engine/pokemon/experience.asm
diff --git a/engine/learn_move.asm b/engine/pokemon/learn_move.asm
index 53c7f87e..53c7f87e 100755
--- a/engine/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
diff --git a/engine/load_mon_data.asm b/engine/pokemon/load_mon_data.asm
index 480ab1ca..480ab1ca 100644
--- a/engine/load_mon_data.asm
+++ b/engine/pokemon/load_mon_data.asm
diff --git a/engine/remove_pokemon.asm b/engine/pokemon/remove_mon.asm
index 6f7e91d6..6f7e91d6 100644
--- a/engine/remove_pokemon.asm
+++ b/engine/pokemon/remove_mon.asm
diff --git a/engine/predefs17_2.asm b/engine/pokemon/set_types.asm
index e9235f13..e9235f13 100755
--- a/engine/predefs17_2.asm
+++ b/engine/pokemon/set_types.asm
diff --git a/engine/status_ailments.asm b/engine/pokemon/status_ailments.asm
index 3da1fc43..3da1fc43 100755
--- a/engine/status_ailments.asm
+++ b/engine/pokemon/status_ailments.asm
diff --git a/engine/menu/status_screen.asm b/engine/pokemon/status_screen.asm
index 20bee0ee..20bee0ee 100755
--- a/engine/menu/status_screen.asm
+++ b/engine/pokemon/status_screen.asm
diff --git a/engine/game_corner_slots.asm b/engine/slots/game_corner_slots.asm
index 2108695f..2108695f 100755
--- a/engine/game_corner_slots.asm
+++ b/engine/slots/game_corner_slots.asm
diff --git a/engine/game_corner_slots2.asm b/engine/slots/game_corner_slots2.asm
index 8f6e8374..8f6e8374 100755
--- a/engine/game_corner_slots2.asm
+++ b/engine/slots/game_corner_slots2.asm
diff --git a/engine/slot_machine.asm b/engine/slots/slot_machine.asm
index 0a92c69b..0a92c69b 100755
--- a/engine/slot_machine.asm
+++ b/engine/slots/slot_machine.asm