198 files changed, 133 insertions, 136 deletions
diff --git a/engine/battle/ai/move.asm b/engine/battle/ai/move.asm
index dd4357fe2..dd4357fe2 100755..100644
--- a/engine/battle/ai/move.asm
+++ b/engine/battle/ai/move.asm
diff --git a/engine/battle/ai/redundant.asm b/engine/battle/ai/redundant.asm
index d09b4da73..d09b4da73 100755..100644
--- a/engine/battle/ai/redundant.asm
+++ b/engine/battle/ai/redundant.asm
diff --git a/engine/battle/ai/switch.asm b/engine/battle/ai/switch.asm
index d397c8d32..d397c8d32 100755..100644
--- a/engine/battle/ai/switch.asm
+++ b/engine/battle/ai/switch.asm
diff --git a/engine/battle/anim_hp_bar.asm b/engine/battle/anim_hp_bar.asm
index 5c453d0ff..5c453d0ff 100755..100644
--- a/engine/battle/anim_hp_bar.asm
+++ b/engine/battle/anim_hp_bar.asm
diff --git a/engine/battle/checkbattlescene.asm b/engine/battle/check_battle_scene.asm
index 577c36e33..577c36e33 100644
--- a/engine/battle/checkbattlescene.asm
+++ b/engine/battle/check_battle_scene.asm
diff --git a/engine/battle/consumehelditem.asm b/engine/battle/consume_held_item.asm
index d727a44e0..d727a44e0 100644
--- a/engine/battle/consumehelditem.asm
+++ b/engine/battle/consume_held_item.asm
diff --git a/engine/battle/link_result.asm b/engine/battle/link_result.asm
index 8f456da9b..8f456da9b 100755..100644
--- a/engine/battle/link_result.asm
+++ b/engine/battle/link_result.asm
diff --git a/engine/battle/menu.asm b/engine/battle/menu.asm
index 705df3729..705df3729 100755..100644
--- a/engine/battle/menu.asm
+++ b/engine/battle/menu.asm
diff --git a/engine/battle/move_effects/attract.asm b/engine/battle/move_effects/attract.asm
index 026176694..026176694 100755..100644
--- a/engine/battle/move_effects/attract.asm
+++ b/engine/battle/move_effects/attract.asm
diff --git a/engine/battle/move_effects/present.asm b/engine/battle/move_effects/present.asm
index a2ef5bc64..a2ef5bc64 100755..100644
--- a/engine/battle/move_effects/present.asm
+++ b/engine/battle/move_effects/present.asm
diff --git a/engine/battle/move_effects/transform.asm b/engine/battle/move_effects/transform.asm
index 5ae7c1511..5ae7c1511 100755..100644
--- a/engine/battle/move_effects/transform.asm
+++ b/engine/battle/move_effects/transform.asm
diff --git a/engine/battle/read_trainer_party.asm b/engine/battle/read_trainer_party.asm
index 3227236c1..3227236c1 100755..100644
--- a/engine/battle/read_trainer_party.asm
+++ b/engine/battle/read_trainer_party.asm
diff --git a/engine/battle/sliding_intro.asm b/engine/battle/sliding_intro.asm
index 667f18191..667f18191 100755..100644
--- a/engine/battle/sliding_intro.asm
+++ b/engine/battle/sliding_intro.asm
diff --git a/engine/battle/trainer_huds.asm b/engine/battle/trainer_huds.asm
index 0a18098ed..0a18098ed 100755..100644
--- a/engine/battle/trainer_huds.asm
+++ b/engine/battle/trainer_huds.asm
diff --git a/engine/routines/unreferenced_getgen1trainerclassname.asm b/engine/battle/unreferenced_getgen1trainerclassname.asm
index da8e98b61..da8e98b61 100644
--- a/engine/routines/unreferenced_getgen1trainerclassname.asm
+++ b/engine/battle/unreferenced_getgen1trainerclassname.asm
diff --git a/engine/battle/updatebattlehuds.asm b/engine/battle/update_battle_huds.asm
index 0c31f1c36..0c31f1c36 100644
--- a/engine/battle/updatebattlehuds.asm
+++ b/engine/battle/update_battle_huds.asm
diff --git a/engine/battle/used_move_text.asm b/engine/battle/used_move_text.asm
index f2182f378..f2182f378 100755..100644
--- a/engine/battle/used_move_text.asm
+++ b/engine/battle/used_move_text.asm
diff --git a/engine/battle_anims/core.asm b/engine/battle_anims/core.asm
index 11578f7f0..11578f7f0 100755..100644
--- a/engine/battle_anims/core.asm
+++ b/engine/battle_anims/core.asm
diff --git a/engine/battle_anims/functions.asm b/engine/battle_anims/functions.asm
index e0eedec86..e0eedec86 100755..100644
--- a/engine/battle_anims/functions.asm
+++ b/engine/battle_anims/functions.asm
diff --git a/engine/battle_anims/helpers.asm b/engine/battle_anims/helpers.asm
index 0a00b65a4..0a00b65a4 100755..100644
--- a/engine/battle_anims/helpers.asm
+++ b/engine/battle_anims/helpers.asm
diff --git a/engine/battle_anims/getpokeballwobble.asm b/engine/battle_anims/pokeball_wobble.asm
index d85240f08..d85240f08 100755..100644
--- a/engine/battle_anims/getpokeballwobble.asm
+++ b/engine/battle_anims/pokeball_wobble.asm
diff --git a/engine/events/basement_key.asm b/engine/events/basement_key.asm
index 879c86a34..879c86a34 100755..100644
--- a/engine/events/basement_key.asm
+++ b/engine/events/basement_key.asm
diff --git a/engine/events/battle_tower/battle_tower.asm b/engine/events/battle_tower/battle_tower.asm
index 9dace59b4..9dace59b4 100755..100644
--- a/engine/events/battle_tower/battle_tower.asm
+++ b/engine/events/battle_tower/battle_tower.asm
diff --git a/engine/events/battle_tower/trainer_text.asm b/engine/events/battle_tower/trainer_text.asm
index c4bcedf64..c4bcedf64 100755..100644
--- a/engine/events/battle_tower/trainer_text.asm
+++ b/engine/events/battle_tower/trainer_text.asm
diff --git a/engine/events/bug_contest/contest_2.asm b/engine/events/bug_contest/contest_2.asm
index 3e3b16b21..3e3b16b21 100755..100644
--- a/engine/events/bug_contest/contest_2.asm
+++ b/engine/events/bug_contest/contest_2.asm
diff --git a/engine/events/bug_contest/judging.asm b/engine/events/bug_contest/judging.asm
index a338e83ec..a338e83ec 100755..100644
--- a/engine/events/bug_contest/judging.asm
+++ b/engine/events/bug_contest/judging.asm
diff --git a/engine/events/card_key.asm b/engine/events/card_key.asm
index f4f36e402..f4f36e402 100755..100644
--- a/engine/events/card_key.asm
+++ b/engine/events/card_key.asm
diff --git a/engine/events/celebi.asm b/engine/events/celebi.asm
index 99c22f49f..99c22f49f 100755..100644
--- a/engine/events/celebi.asm
+++ b/engine/events/celebi.asm
diff --git a/engine/routines/checksave.asm b/engine/events/checksave.asm
index 2280f0e53..2280f0e53 100644
--- a/engine/routines/checksave.asm
+++ b/engine/events/checksave.asm
diff --git a/engine/routines/checktime.asm b/engine/events/checktime.asm
index 4c7d033ff..4c7d033ff 100644
--- a/engine/routines/checktime.asm
+++ b/engine/events/checktime.asm
diff --git a/engine/events/daycare.asm b/engine/events/daycare.asm
index 4b256da28..4b256da28 100755..100644
--- a/engine/events/daycare.asm
+++ b/engine/events/daycare.asm
diff --git a/engine/diploma.asm b/engine/events/diploma.asm
index 5d0482cc4..5d0482cc4 100644
--- a/engine/diploma.asm
+++ b/engine/events/diploma.asm
diff --git a/engine/events/elevator.asm b/engine/events/elevator.asm
index bcad170d4..bcad170d4 100755..100644
--- a/engine/events/elevator.asm
+++ b/engine/events/elevator.asm
diff --git a/engine/engine_flags.asm b/engine/events/engine_flags.asm
index acda9ede7..acda9ede7 100644
--- a/engine/engine_flags.asm
+++ b/engine/events/engine_flags.asm
diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 2fc30d25c..2fc30d25c 100755..100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
diff --git a/engine/events/loadfishinggfx.asm b/engine/events/fishing_gfx.asm
index 3d3ab0ba0..3d3ab0ba0 100644
--- a/engine/events/loadfishinggfx.asm
+++ b/engine/events/fishing_gfx.asm
diff --git a/engine/events/forced_movement.asm b/engine/events/forced_movement.asm
index 2d03659ff..2d03659ff 100755..100644
--- a/engine/events/forced_movement.asm
+++ b/engine/events/forced_movement.asm
diff --git a/engine/events/haircut.asm b/engine/events/haircut.asm
new file mode 100644
index 000000000..0e4400235
--- /dev/null
+++ b/engine/events/haircut.asm
@@ -0,0 +1,82 @@
+BillsGrandfather: ; 73f7
+	farcall SelectMonFromParty
+	jr c, .cancel
+	ld a, [wCurPartySpecies]
+	ld [wScriptVar], a
+	ld [wNamedObjectIndexBuffer], a
+	call GetPokemonName
+	jp CopyPokemonName_Buffer1_Buffer3
+
+.cancel
+	xor a
+	ld [wScriptVar], a
+	ret
+
+YoungerHaircutBrother: ; 7413
+	ld hl, HappinessData_YoungerHaircutBrother
+	jr HaircutOrGrooming
+
+OlderHaircutBrother: ; 7418
+	ld hl, HappinessData_OlderHaircutBrother
+	jr HaircutOrGrooming
+
+DaisysGrooming: ; 741d
+	ld hl, HappinessData_DaisysGrooming
+	; fallthrough
+
+HaircutOrGrooming: ; 7420
+	push hl
+	farcall SelectMonFromParty
+	pop hl
+	jr c, .nope
+	ld a, [wCurPartySpecies]
+	cp EGG
+	jr z, .egg
+	push hl
+	call GetCurNick
+	call CopyPokemonName_Buffer1_Buffer3
+	pop hl
+	call Random
+; Bug: Subtracting $ff from $ff fails to set c.
+; This can result in overflow into the next data array.
+; In the case of getting a grooming from Daisy, we bleed
+; into CopyPokemonName_Buffer1_Buffer3, which passes
+; $d0 to ChangeHappiness and returns $73 to the script.
+; The end result is that there is a 0.4% chance your
+; Pokemon's happiness will not change at all.
+.loop
+	sub [hl]
+	jr c, .ok
+	inc hl
+	inc hl
+	inc hl
+	jr .loop
+
+.ok
+	inc hl
+	ld a, [hli]
+	ld [wScriptVar], a
+	ld c, [hl]
+	call ChangeHappiness
+	ret
+
+.nope
+	xor a
+	ld [wScriptVar], a
+	ret
+
+.egg
+	ld a, 1
+	ld [wScriptVar], a
+	ret
+
+INCLUDE "data/events/happiness_probabilities.asm"
+
+CopyPokemonName_Buffer1_Buffer3: ; 746e
+	ld hl, wStringBuffer1
+	ld de, wStringBuffer3
+	ld bc, MON_NAME_LENGTH
+	jp CopyBytes
+
+DummyPredef1: ; 747a
+	ret
diff --git a/engine/events/halloffame.asm b/engine/events/halloffame.asm
index cf3831066..cf3831066 100755..100644
--- a/engine/events/halloffame.asm
+++ b/engine/events/halloffame.asm
diff --git a/engine/events/happiness_egg.asm b/engine/events/happiness_egg.asm
index 998e7e07a..998e7e07a 100755..100644
--- a/engine/events/happiness_egg.asm
+++ b/engine/events/happiness_egg.asm
diff --git a/engine/events/heal_machine_anim.asm b/engine/events/heal_machine_anim.asm
index 955449280..955449280 100755..100644
--- a/engine/events/heal_machine_anim.asm
+++ b/engine/events/heal_machine_anim.asm
diff --git a/engine/events/itemfinder.asm b/engine/events/itemfinder.asm
index 71aaa5b69..71aaa5b69 100755..100644
--- a/engine/events/itemfinder.asm
+++ b/engine/events/itemfinder.asm
diff --git a/engine/events/magnet_train.asm b/engine/events/magnet_train.asm
index 6f2aa2d1f..6f2aa2d1f 100755..100644
--- a/engine/events/magnet_train.asm
+++ b/engine/events/magnet_train.asm
diff --git a/engine/events/misc_scripts.asm b/engine/events/misc_scripts.asm
index b79889f72..b79889f72 100755..100644
--- a/engine/events/misc_scripts.asm
+++ b/engine/events/misc_scripts.asm
diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm
index de19a3674..de19a3674 100755..100644
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
diff --git a/engine/money.asm b/engine/events/money.asm
index 585c85618..585c85618 100755..100644
--- a/engine/money.asm
+++ b/engine/events/money.asm
diff --git a/engine/events/npc_trade.asm b/engine/events/npc_trade.asm
index d3991a28c..d3991a28c 100755..100644
--- a/engine/events/npc_trade.asm
+++ b/engine/events/npc_trade.asm
diff --git a/engine/events/overworld.asm b/engine/events/overworld.asm
index 60ed7cdf9..60ed7cdf9 100755..100644
--- a/engine/events/overworld.asm
+++ b/engine/events/overworld.asm
diff --git a/engine/routines/playslowcry.asm b/engine/events/play_slow_cry.asm
index 1f27a7ca4..1f27a7ca4 100644
--- a/engine/routines/playslowcry.asm
+++ b/engine/events/play_slow_cry.asm
diff --git a/engine/events/poisonstep.asm b/engine/events/poisonstep.asm
index 5ea094db9..5ea094db9 100755..100644
--- a/engine/events/poisonstep.asm
+++ b/engine/events/poisonstep.asm
diff --git a/engine/events/pokecenter_pc.asm b/engine/events/pokecenter_pc.asm
index 42284aeab..42284aeab 100755..100644
--- a/engine/events/pokecenter_pc.asm
+++ b/engine/events/pokecenter_pc.asm
diff --git a/engine/events/pokepic.asm b/engine/events/pokepic.asm
index e11c45f9b..e11c45f9b 100755..100644
--- a/engine/events/pokepic.asm
+++ b/engine/events/pokepic.asm
diff --git a/engine/events/print_photo.asm b/engine/events/print_photo.asm
index d8350a530..d8350a530 100755..100644
--- a/engine/events/print_photo.asm
+++ b/engine/events/print_photo.asm
diff --git a/engine/events/prof_oaks_pc.asm b/engine/events/prof_oaks_pc.asm
index b80efe75b..b80efe75b 100755..100644
--- a/engine/events/prof_oaks_pc.asm
+++ b/engine/events/prof_oaks_pc.asm
diff --git a/engine/events/sacred_ash.asm b/engine/events/sacred_ash.asm
index 2cb5e37a1..2cb5e37a1 100755..100644
--- a/engine/events/sacred_ash.asm
+++ b/engine/events/sacred_ash.asm
diff --git a/engine/events/specials_2.asm b/engine/events/shuckle.asm
index 9a83b982b..99fcd7924 100755..100644
--- a/engine/events/specials_2.asm
+++ b/engine/events/shuckle.asm
@@ -140,86 +140,3 @@ ReturnShuckle: ; 737e
 	ld a, SHUCKIE_FAINTED
 	ld [wScriptVar], a
 	ret
-
-BillsGrandfather: ; 73f7
-	farcall SelectMonFromParty
-	jr c, .cancel
-	ld a, [wCurPartySpecies]
-	ld [wScriptVar], a
-	ld [wNamedObjectIndexBuffer], a
-	call GetPokemonName
-	jp CopyPokemonName_Buffer1_Buffer3
-
-.cancel
-	xor a
-	ld [wScriptVar], a
-	ret
-
-YoungerHaircutBrother: ; 7413
-	ld hl, HappinessData_YoungerHaircutBrother
-	jr HaircutOrGrooming
-
-OlderHaircutBrother: ; 7418
-	ld hl, HappinessData_OlderHaircutBrother
-	jr HaircutOrGrooming
-
-DaisysGrooming: ; 741d
-	ld hl, HappinessData_DaisysGrooming
-	; fallthrough
-
-HaircutOrGrooming: ; 7420
-	push hl
-	farcall SelectMonFromParty
-	pop hl
-	jr c, .nope
-	ld a, [wCurPartySpecies]
-	cp EGG
-	jr z, .egg
-	push hl
-	call GetCurNick
-	call CopyPokemonName_Buffer1_Buffer3
-	pop hl
-	call Random
-; Bug: Subtracting $ff from $ff fails to set c.
-; This can result in overflow into the next data array.
-; In the case of getting a grooming from Daisy, we bleed
-; into CopyPokemonName_Buffer1_Buffer3, which passes
-; $d0 to ChangeHappiness and returns $73 to the script.
-; The end result is that there is a 0.4% chance your
-; Pokemon's happiness will not change at all.
-.loop
-	sub [hl]
-	jr c, .ok
-	inc hl
-	inc hl
-	inc hl
-	jr .loop
-
-.ok
-	inc hl
-	ld a, [hli]
-	ld [wScriptVar], a
-	ld c, [hl]
-	call ChangeHappiness
-	ret
-
-.nope
-	xor a
-	ld [wScriptVar], a
-	ret
-
-.egg
-	ld a, 1
-	ld [wScriptVar], a
-	ret
-
-INCLUDE "data/events/happiness_probabilities.asm"
-
-CopyPokemonName_Buffer1_Buffer3: ; 746e
-	ld hl, wStringBuffer1
-	ld de, wStringBuffer3
-	ld bc, MON_NAME_LENGTH
-	jp CopyBytes
-
-DummyPredef1: ; 747a
-	ret
diff --git a/engine/events/squirtbottle.asm b/engine/events/squirtbottle.asm
index f6ab00951..f6ab00951 100755..100644
--- a/engine/events/squirtbottle.asm
+++ b/engine/events/squirtbottle.asm
diff --git a/engine/events/sweet_scent.asm b/engine/events/sweet_scent.asm
index 509d9775d..509d9775d 100755..100644
--- a/engine/events/sweet_scent.asm
+++ b/engine/events/sweet_scent.asm
diff --git a/engine/events/treemons.asm b/engine/events/treemons.asm
index 6d55004f4..6d55004f4 100755..100644
--- a/engine/events/treemons.asm
+++ b/engine/events/treemons.asm
diff --git a/engine/events/whiteout.asm b/engine/events/whiteout.asm
index 4bf656055..4bf656055 100755..100644
--- a/engine/events/whiteout.asm
+++ b/engine/events/whiteout.asm
diff --git a/engine/card_flip.asm b/engine/games/card_flip.asm
index fbeb3e3b6..fbeb3e3b6 100755..100644
--- a/engine/card_flip.asm
+++ b/engine/games/card_flip.asm
diff --git a/engine/dummy_game.asm b/engine/games/dummy_game.asm
index 6d7e12196..6d7e12196 100755..100644
--- a/engine/dummy_game.asm
+++ b/engine/games/dummy_game.asm
diff --git a/engine/slot_machine.asm b/engine/games/slot_machine.asm
index 924c78924..924c78924 100755..100644
--- a/engine/slot_machine.asm
+++ b/engine/games/slot_machine.asm
diff --git a/engine/unown_puzzle.asm b/engine/games/unown_puzzle.asm
index 83527ea69..83527ea69 100755..100644
--- a/engine/unown_puzzle.asm
+++ b/engine/games/unown_puzzle.asm
diff --git a/engine/cgb_layouts.asm b/engine/gfx/cgb_layouts.asm
index b36dceeb6..b36dceeb6 100644
--- a/engine/cgb_layouts.asm
+++ b/engine/gfx/cgb_layouts.asm
diff --git a/engine/color.asm b/engine/gfx/color.asm
index b0bc653b0..6cf896ff4 100644
--- a/engine/color.asm
+++ b/engine/gfx/color.asm
@@ -1,4 +1,4 @@
-INCLUDE "engine/sgb_layouts.asm"
+INCLUDE "engine/gfx/sgb_layouts.asm"
 
 SHINY_ATK_BIT EQU 5
 SHINY_DEF_VAL EQU 10
@@ -445,7 +445,7 @@ LoadMailPalettes:
 .MailPals:
 INCLUDE "gfx/mail/mail.pal"
 
-INCLUDE "engine/cgb_layouts.asm"
+INCLUDE "engine/gfx/cgb_layouts.asm"
 
 Unreferenced_Function95f0:
 	ld hl, .Palette
diff --git a/engine/crystal_layouts.asm b/engine/gfx/crystal_layouts.asm
index d6b193e9d..71e2e4f56 100755..100644
--- a/engine/crystal_layouts.asm
+++ b/engine/gfx/crystal_layouts.asm
@@ -203,7 +203,7 @@ Function49496: ; 49496
 	ret
 ; 494ac
 
-INCLUDE "engine/tileset_palettes.asm"
+INCLUDE "engine/tilesets/tileset_palettes.asm"
 
 MG_Mobile_Layout02: ; 49706
 	ld hl, .Palette_49732
diff --git a/engine/dma_transfer.asm b/engine/gfx/dma_transfer.asm
index e22adf69a..e22adf69a 100755..100644
--- a/engine/dma_transfer.asm
+++ b/engine/gfx/dma_transfer.asm
diff --git a/engine/load_font.asm b/engine/gfx/load_font.asm
index 40dbb9c10..40dbb9c10 100644
--- a/engine/load_font.asm
+++ b/engine/gfx/load_font.asm
diff --git a/engine/routines/loadoverworldfont.asm b/engine/gfx/load_overworld_font.asm
index f23f01c4e..f23f01c4e 100644
--- a/engine/routines/loadoverworldfont.asm
+++ b/engine/gfx/load_overworld_font.asm
diff --git a/engine/load_pics.asm b/engine/gfx/load_pics.asm
index b533ee56b..b533ee56b 100755..100644
--- a/engine/load_pics.asm
+++ b/engine/gfx/load_pics.asm
diff --git a/engine/routines/loadpushoam.asm b/engine/gfx/load_push_oam.asm
index 95f67ff73..95f67ff73 100644
--- a/engine/routines/loadpushoam.asm
+++ b/engine/gfx/load_push_oam.asm
diff --git a/engine/mon_icons.asm b/engine/gfx/mon_icons.asm
index 5a26d2d7c..5a26d2d7c 100755..100644
--- a/engine/mon_icons.asm
+++ b/engine/gfx/mon_icons.asm
diff --git a/engine/pic_animation.asm b/engine/gfx/pic_animation.asm
index 8781c2fd0..8781c2fd0 100644
--- a/engine/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
diff --git a/engine/routines/placegraphic.asm b/engine/gfx/place_graphic.asm
index 21b914950..21b914950 100644
--- a/engine/routines/placegraphic.asm
+++ b/engine/gfx/place_graphic.asm
diff --git a/engine/player_gfx.asm b/engine/gfx/player_gfx.asm
index deb16ad3a..deb16ad3a 100644
--- a/engine/player_gfx.asm
+++ b/engine/gfx/player_gfx.asm
diff --git a/engine/sgb_layouts.asm b/engine/gfx/sgb_layouts.asm
index 24bdc952e..24bdc952e 100644
--- a/engine/sgb_layouts.asm
+++ b/engine/gfx/sgb_layouts.asm
diff --git a/engine/sprite_anims.asm b/engine/gfx/sprite_anims.asm
index 9353b71c9..9353b71c9 100755..100644
--- a/engine/sprite_anims.asm
+++ b/engine/gfx/sprite_anims.asm
diff --git a/engine/sprites.asm b/engine/gfx/sprites.asm
index 99d1d2ae4..63666c624 100755..100644
--- a/engine/sprites.asm
+++ b/engine/gfx/sprites.asm
@@ -552,7 +552,7 @@ Unreferenced_BrokenGetStdGraphics: ; 8d1ac
 
 INCLUDE "data/sprite_anims/sequences.asm"
 
-INCLUDE "engine/sprite_anims.asm"
+INCLUDE "engine/gfx/sprite_anims.asm"
 
 INCLUDE "data/sprite_anims/framesets.asm"
 
diff --git a/engine/routines/trademonfrontpic.asm b/engine/gfx/trademon_frontpic.asm
index d5f7b55de..d5f7b55de 100644
--- a/engine/routines/trademonfrontpic.asm
+++ b/engine/gfx/trademon_frontpic.asm
diff --git a/engine/buy_sell_toss.asm b/engine/items/buy_sell_toss.asm
index 84481d030..84481d030 100755..100644
--- a/engine/buy_sell_toss.asm
+++ b/engine/items/buy_sell_toss.asm
diff --git a/engine/item_effects.asm b/engine/items/item_effects.asm
index 0b5285608..0b5285608 100644
--- a/engine/item_effects.asm
+++ b/engine/items/item_effects.asm
diff --git a/engine/items.asm b/engine/items/items.asm
index c07042aed..c07042aed 100755..100644
--- a/engine/items.asm
+++ b/engine/items/items.asm
diff --git a/engine/mart.asm b/engine/items/mart.asm
index 911251f65..911251f65 100755..100644
--- a/engine/mart.asm
+++ b/engine/items/mart.asm
diff --git a/engine/pack.asm b/engine/items/pack.asm
index ea3a051ac..ea3a051ac 100644
--- a/engine/pack.asm
+++ b/engine/items/pack.asm
diff --git a/engine/routines/drawkrispackgfx.asm b/engine/items/pack_kris.asm
index 54a21e447..54a21e447 100644
--- a/engine/routines/drawkrispackgfx.asm
+++ b/engine/items/pack_kris.asm
diff --git a/engine/routines/printitemdescription.asm b/engine/items/print_item_description.asm
index 2a9007b97..2a9007b97 100644
--- a/engine/routines/printitemdescription.asm
+++ b/engine/items/print_item_description.asm
diff --git a/engine/switch_items.asm b/engine/items/switch_items.asm
index 77b635246..77b635246 100755..100644
--- a/engine/switch_items.asm
+++ b/engine/items/switch_items.asm
diff --git a/engine/tmhm2.asm b/engine/items/tmhm.asm
index 442f73cfa..442f73cfa 100755..100644
--- a/engine/tmhm2.asm
+++ b/engine/items/tmhm.asm
diff --git a/engine/tmhm.asm b/engine/items/tmhm2.asm
index 9db3dc291..9db3dc291 100755..100644
--- a/engine/tmhm.asm
+++ b/engine/items/tmhm2.asm
diff --git a/engine/routines/updateitemdescription.asm b/engine/items/update_item_description.asm
index fdb1e864d..fdb1e864d 100644
--- a/engine/routines/updateitemdescription.asm
+++ b/engine/items/update_item_description.asm
diff --git a/engine/routines/initlist.asm b/engine/link/init_list.asm
index 26c77b5bb..26c77b5bb 100644
--- a/engine/routines/initlist.asm
+++ b/engine/link/init_list.asm
diff --git a/engine/link.asm b/engine/link/link.asm
index c693e6919..f6f37619f 100755..100644
--- a/engine/link.asm
+++ b/engine/link/link.asm
@@ -2029,7 +2029,7 @@ Unreferenced_Function28f09: ; 28f09
 	ret
 ; 28f24
 
-INCLUDE "engine/trade_animation.asm"
+INCLUDE "engine/movie/trade_animation.asm"
 
 CheckTimeCapsuleCompatibility: ; 29bfb
 ; Checks to see if your party is compatible with the Gen 1 games.
diff --git a/engine/link_2.asm b/engine/link/link_2.asm
index e2fe47dc5..e2fe47dc5 100644
--- a/engine/link_2.asm
+++ b/engine/link/link_2.asm
diff --git a/engine/link_trade.asm b/engine/link/link_trade.asm
index 4c2af0842..4c2af0842 100755..100644
--- a/engine/link_trade.asm
+++ b/engine/link/link_trade.asm
diff --git a/engine/mystery_gift.asm b/engine/link/mystery_gift.asm
index c73e4246e..c73e4246e 100755..100644
--- a/engine/mystery_gift.asm
+++ b/engine/link/mystery_gift.asm
diff --git a/engine/mystery_gift_2.asm b/engine/link/mystery_gift_2.asm
index e0e2e88fd..e0e2e88fd 100755..100644
--- a/engine/mystery_gift_2.asm
+++ b/engine/link/mystery_gift_2.asm
diff --git a/engine/routines/placewaitingtext.asm b/engine/link/place_waiting_text.asm
index 9b2260722..9b2260722 100644
--- a/engine/routines/placewaitingtext.asm
+++ b/engine/link/place_waiting_text.asm
diff --git a/engine/time_capsule.asm b/engine/link/time_capsule.asm
index f90b7e249..f90b7e249 100755..100644
--- a/engine/time_capsule.asm
+++ b/engine/link/time_capsule.asm
diff --git a/engine/time_capsule_2.asm b/engine/link/time_capsule_2.asm
index a56e51785..a56e51785 100644
--- a/engine/time_capsule_2.asm
+++ b/engine/link/time_capsule_2.asm
diff --git a/engine/routines/getsquareroot.asm b/engine/math/get_square_root.asm
index 412fd04ff..412fd04ff 100644
--- a/engine/routines/getsquareroot.asm
+++ b/engine/math/get_square_root.asm
diff --git a/engine/math.asm b/engine/math/math.asm
index 0cd6b0b47..0cd6b0b47 100755..100644
--- a/engine/math.asm
+++ b/engine/math/math.asm
diff --git a/engine/printnum.asm b/engine/math/print_num.asm
index fec798d5c..fec798d5c 100755..100644
--- a/engine/printnum.asm
+++ b/engine/math/print_num.asm
diff --git a/engine/routines/sine.asm b/engine/math/sine.asm
index 23e86c015..23e86c015 100755..100644
--- a/engine/routines/sine.asm
+++ b/engine/math/sine.asm
diff --git a/engine/debug.asm b/engine/menus/debug.asm
index 4c3110fe1..4c3110fe1 100755..100644
--- a/engine/debug.asm
+++ b/engine/menus/debug.asm
diff --git a/engine/menus/delete_save.asm b/engine/menus/delete_save.asm
new file mode 100644
index 000000000..a86faf06a
--- /dev/null
+++ b/engine/menus/delete_save.asm
@@ -0,0 +1,36 @@
+_DeleteSaveData: ; 4d54c
+	farcall BlankScreen
+	ld b, SCGB_DIPLOMA
+	call GetSGBLayout
+	call LoadStandardFont
+	call LoadFontsExtra
+	ld de, MUSIC_MAIN_MENU
+	call PlayMusic
+	ld hl, .Text_ClearAllSaveData
+	call PrintText
+	ld hl, .NoYesMenuHeader
+	call CopyMenuHeader
+	call VerticalMenu
+	ret c
+	ld a, [wMenuCursorY]
+	cp $1
+	ret z
+	farcall EmptyAllSRAMBanks
+	ret
+
+.Text_ClearAllSaveData: ; 0x4d580
+	; Clear all save data?
+	text_jump UnknownText_0x1c564a
+	db "@"
+
+.NoYesMenuHeader: ; 0x4d585
+	db 0 ; flags
+	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
+	dw .MenuData
+	db 1 ; default option
+
+.MenuData: ; 0x4d58d
+	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
+	db 2 ; items
+	db "NO@"
+	db "YES@"
diff --git a/engine/routines/emptyallsrambanks.asm b/engine/menus/empty_sram.asm
index 8b060f3ef..8b060f3ef 100644
--- a/engine/routines/emptyallsrambanks.asm
+++ b/engine/menus/empty_sram.asm
diff --git a/engine/init_gender.asm b/engine/menus/init_gender.asm
index 8fd95bc85..8fd95bc85 100755..100644
--- a/engine/init_gender.asm
+++ b/engine/menus/init_gender.asm
diff --git a/engine/intro_menu.asm b/engine/menus/intro_menu.asm
index af6e0c09e..af6e0c09e 100755..100644
--- a/engine/intro_menu.asm
+++ b/engine/menus/intro_menu.asm
diff --git a/engine/main_menu.asm b/engine/menus/main_menu.asm
index d83ce873b..d83ce873b 100755..100644
--- a/engine/main_menu.asm
+++ b/engine/menus/main_menu.asm
diff --git a/engine/menu.asm b/engine/menus/menu.asm
index 51de2e1a4..51de2e1a4 100755..100644
--- a/engine/menu.asm
+++ b/engine/menus/menu.asm
diff --git a/engine/menu_2.asm b/engine/menus/menu_2.asm
index 16cce5348..16cce5348 100644
--- a/engine/menu_2.asm
+++ b/engine/menus/menu_2.asm
diff --git a/engine/naming_screen.asm b/engine/menus/naming_screen.asm
index a958e10eb..a958e10eb 100755..100644
--- a/engine/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
diff --git a/engine/options_menu.asm b/engine/menus/options_menu.asm
index c0a255cb0..c0a255cb0 100755..100644
--- a/engine/options_menu.asm
+++ b/engine/menus/options_menu.asm
diff --git a/engine/save.asm b/engine/menus/save.asm
index 7984c1612..7984c1612 100644
--- a/engine/save.asm
+++ b/engine/menus/save.asm
diff --git a/engine/routines/savemenu_copytilemapatonce.asm b/engine/menus/savemenu_copytilemapatonce.asm
index 9b50494a4..9b50494a4 100644
--- a/engine/routines/savemenu_copytilemapatonce.asm
+++ b/engine/menus/savemenu_copytilemapatonce.asm
diff --git a/engine/scrolling_menu.asm b/engine/menus/scrolling_menu.asm
index 3be3d839c..3be3d839c 100755..100644
--- a/engine/scrolling_menu.asm
+++ b/engine/menus/scrolling_menu.asm
diff --git a/engine/start_menu.asm b/engine/menus/start_menu.asm
index 037efd947..037efd947 100755..100644
--- a/engine/start_menu.asm
+++ b/engine/menus/start_menu.asm
diff --git a/engine/trainer_card.asm b/engine/menus/trainer_card.asm
index e84c1c9f3..e84c1c9f3 100755..100644
--- a/engine/trainer_card.asm
+++ b/engine/menus/trainer_card.asm
diff --git a/engine/credits.asm b/engine/movie/credits.asm
index 1aaecf64a..1aaecf64a 100644
--- a/engine/credits.asm
+++ b/engine/movie/credits.asm
diff --git a/engine/crystal_intro.asm b/engine/movie/crystal_intro.asm
index 56bb02750..56bb02750 100755..100644
--- a/engine/crystal_intro.asm
+++ b/engine/movie/crystal_intro.asm
diff --git a/engine/evolution_animation.asm b/engine/movie/evolution_animation.asm
index 978f9e968..978f9e968 100755..100644
--- a/engine/evolution_animation.asm
+++ b/engine/movie/evolution_animation.asm
diff --git a/engine/gbc_only.asm b/engine/movie/gbc_only.asm
index badd953aa..badd953aa 100644
--- a/engine/gbc_only.asm
+++ b/engine/movie/gbc_only.asm
diff --git a/engine/init_hof_credits.asm b/engine/movie/init_hof_credits.asm
index e8e98a0e1..e8e98a0e1 100644
--- a/engine/init_hof_credits.asm
+++ b/engine/movie/init_hof_credits.asm
diff --git a/engine/title.asm b/engine/movie/title.asm
index f311f2342..f311f2342 100644
--- a/engine/title.asm
+++ b/engine/movie/title.asm
diff --git a/engine/trade_animation.asm b/engine/movie/trade_animation.asm
index 04c31df80..04c31df80 100755..100644
--- a/engine/trade_animation.asm
+++ b/engine/movie/trade_animation.asm
diff --git a/engine/unused_title.asm b/engine/movie/unused_title.asm
index 8e52a71bb..8e52a71bb 100644
--- a/engine/unused_title.asm
+++ b/engine/movie/unused_title.asm
diff --git a/engine/decorations.asm b/engine/overworld/decorations.asm
index 33d0ca0cd..33d0ca0cd 100755..100644
--- a/engine/decorations.asm
+++ b/engine/overworld/decorations.asm
diff --git a/engine/events.asm b/engine/overworld/events.asm
index 35a54138b..cc2c8c574 100644
--- a/engine/events.asm
+++ b/engine/overworld/events.asm
@@ -1106,6 +1106,6 @@ ChangeDirectionScript: ; 9
 	end
 ; 96c56
 
-INCLUDE "engine/scripting.asm"
+INCLUDE "engine/overworld/scripting.asm"
 
-INCLUDE "engine/events_2.asm"
+INCLUDE "engine/overworld/events_2.asm"
diff --git a/engine/events_2.asm b/engine/overworld/events_2.asm
index 6e106541a..6e106541a 100644
--- a/engine/events_2.asm
+++ b/engine/overworld/events_2.asm
diff --git a/engine/init_map.asm b/engine/overworld/init_map.asm
index 2eb4998a6..2eb4998a6 100644
--- a/engine/init_map.asm
+++ b/engine/overworld/init_map.asm
diff --git a/engine/landmarks.asm b/engine/overworld/landmarks.asm
index f16f48e67..f16f48e67 100644
--- a/engine/landmarks.asm
+++ b/engine/overworld/landmarks.asm
diff --git a/engine/routines/loadmappart.asm b/engine/overworld/load_map_part.asm
index 2184ebf7e..2184ebf7e 100644
--- a/engine/routines/loadmappart.asm
+++ b/engine/overworld/load_map_part.asm
diff --git a/engine/map_object_action.asm b/engine/overworld/map_object_action.asm
index c82cd80a2..c82cd80a2 100755..100644
--- a/engine/map_object_action.asm
+++ b/engine/overworld/map_object_action.asm
diff --git a/engine/map_objects.asm b/engine/overworld/map_objects.asm
index 78d9062ef..8d6f4082f 100644
--- a/engine/map_objects.asm
+++ b/engine/overworld/map_objects.asm
@@ -185,7 +185,7 @@ _HandleObjectAction
 	ret
 ; 445f
 
-INCLUDE "engine/map_object_action.asm"
+INCLUDE "engine/overworld/map_object_action.asm"
 
 CopyNextCoordsTileToStandingCoordsTile: ; 4600
 	ld hl, OBJECT_NEXT_MAP_X
@@ -1990,7 +1990,7 @@ DoMovementFunction: ; 506b
 	ret
 ; 5075
 
-INCLUDE "engine/movement.asm"
+INCLUDE "engine/overworld/movement.asm"
 ; 54b8
 
 ApplyMovementToFollower: ; 54b8
diff --git a/engine/map_objects_2.asm b/engine/overworld/map_objects_2.asm
index 038e2b49b..038e2b49b 100644
--- a/engine/map_objects_2.asm
+++ b/engine/overworld/map_objects_2.asm
diff --git a/engine/map_setup.asm b/engine/overworld/map_setup.asm
index 268574de0..268574de0 100644
--- a/engine/map_setup.asm
+++ b/engine/overworld/map_setup.asm
diff --git a/engine/movement.asm b/engine/overworld/movement.asm
index 3dbb0b83a..3dbb0b83a 100644
--- a/engine/movement.asm
+++ b/engine/overworld/movement.asm
diff --git a/engine/npc_movement.asm b/engine/overworld/npc_movement.asm
index 5670935e8..5670935e8 100755..100644
--- a/engine/npc_movement.asm
+++ b/engine/overworld/npc_movement.asm
diff --git a/engine/overworld.asm b/engine/overworld/overworld.asm
index 381c2d89f..381c2d89f 100755..100644
--- a/engine/overworld.asm
+++ b/engine/overworld/overworld.asm
diff --git a/engine/player_movement.asm b/engine/overworld/player_movement.asm
index ef9afc7ad..ef9afc7ad 100755..100644
--- a/engine/player_movement.asm
+++ b/engine/overworld/player_movement.asm
diff --git a/engine/player_object.asm b/engine/overworld/player_object.asm
index 7d287dedb..7d287dedb 100755..100644
--- a/engine/player_object.asm
+++ b/engine/overworld/player_object.asm
diff --git a/engine/player_step.asm b/engine/overworld/player_step.asm
index 675c6553b..675c6553b 100755..100644
--- a/engine/player_step.asm
+++ b/engine/overworld/player_step.asm
diff --git a/engine/scripting.asm b/engine/overworld/scripting.asm
index f65f2f9c0..f65f2f9c0 100644
--- a/engine/scripting.asm
+++ b/engine/overworld/scripting.asm
diff --git a/engine/select_menu.asm b/engine/overworld/select_menu.asm
index 9898afda2..9898afda2 100755..100644
--- a/engine/select_menu.asm
+++ b/engine/overworld/select_menu.asm
diff --git a/engine/spawn_points.asm b/engine/overworld/spawn_points.asm
index 1a3d12441..1a3d12441 100644
--- a/engine/spawn_points.asm
+++ b/engine/overworld/spawn_points.asm
diff --git a/engine/tile_events.asm b/engine/overworld/tile_events.asm
index 705c0e427..705c0e427 100755..100644
--- a/engine/tile_events.asm
+++ b/engine/overworld/tile_events.asm
diff --git a/engine/time.asm b/engine/overworld/time.asm
index 0f83447cc..0f83447cc 100755..100644
--- a/engine/time.asm
+++ b/engine/overworld/time.asm
diff --git a/engine/variables.asm b/engine/overworld/variables.asm
index 89026fdba..89026fdba 100755..100644
--- a/engine/variables.asm
+++ b/engine/overworld/variables.asm
diff --git a/engine/warp_connection.asm b/engine/overworld/warp_connection.asm
index 069b72234..069b72234 100755..100644
--- a/engine/warp_connection.asm
+++ b/engine/overworld/warp_connection.asm
diff --git a/engine/wildmons.asm b/engine/overworld/wildmons.asm
index 494e8d2a4..494e8d2a4 100755..100644
--- a/engine/wildmons.asm
+++ b/engine/overworld/wildmons.asm
diff --git a/engine/routines/phonering_copytilemapatonce.asm b/engine/phone/phonering_copytilemapatonce.asm
index b0d4ffa1e..b0d4ffa1e 100644
--- a/engine/routines/phonering_copytilemapatonce.asm
+++ b/engine/phone/phonering_copytilemapatonce.asm
diff --git a/engine/pokedex/newpokedexentry.asm b/engine/pokedex/new_pokedex_entry.asm
index 365cf1b70..365cf1b70 100644
--- a/engine/pokedex/newpokedexentry.asm
+++ b/engine/pokedex/new_pokedex_entry.asm
diff --git a/engine/pokedex/unown_dex.asm b/engine/pokedex/unown_dex.asm
index a35a266b7..a35a266b7 100755..100644
--- a/engine/pokedex/unown_dex.asm
+++ b/engine/pokedex/unown_dex.asm
diff --git a/engine/pokegear.asm b/engine/pokegear/pokegear.asm
index f04276b2d..f04276b2d 100755..100644
--- a/engine/pokegear.asm
+++ b/engine/pokegear/pokegear.asm
diff --git a/engine/radio.asm b/engine/pokegear/radio.asm
index ffaef80f0..ffaef80f0 100644
--- a/engine/radio.asm
+++ b/engine/pokegear/radio.asm
diff --git a/engine/routines/townmap_convertlinebreakcharacters.asm b/engine/pokegear/townmap_convertlinebreakcharacters.asm
index 6ccd79aae..6ccd79aae 100644
--- a/engine/routines/townmap_convertlinebreakcharacters.asm
+++ b/engine/pokegear/townmap_convertlinebreakcharacters.asm
diff --git a/engine/billspc.asm b/engine/pokemon/bills_pc.asm
index 96d6ac310..96d6ac310 100755..100644
--- a/engine/billspc.asm
+++ b/engine/pokemon/bills_pc.asm
diff --git a/engine/billspctop.asm b/engine/pokemon/bills_pc_top.asm
index 1e808c02c..1e808c02c 100755..100644
--- a/engine/billspctop.asm
+++ b/engine/pokemon/bills_pc_top.asm
diff --git a/engine/breeding.asm b/engine/pokemon/breeding.asm
index 58b42953c..58b42953c 100755..100644
--- a/engine/breeding.asm
+++ b/engine/pokemon/breeding.asm
diff --git a/engine/routines/getbreedmonlevelgrowth.asm b/engine/pokemon/breedmon_level_growth.asm
index dc22db798..dc22db798 100644
--- a/engine/routines/getbreedmonlevelgrowth.asm
+++ b/engine/pokemon/breedmon_level_growth.asm
diff --git a/engine/caught_data.asm b/engine/pokemon/caught_data.asm
index 3bfacf539..3bfacf539 100644
--- a/engine/caught_data.asm
+++ b/engine/pokemon/caught_data.asm
diff --git a/engine/routines/checknickerrors.asm b/engine/pokemon/check_nick_errors.asm
index 87ebd6bb3..87ebd6bb3 100644
--- a/engine/routines/checknickerrors.asm
+++ b/engine/pokemon/check_nick_errors.asm
diff --git a/engine/routines/correcterrorsinplayerparty.asm b/engine/pokemon/correct_party_errors.asm
index e815aa4c8..cf60115ee 100644
--- a/engine/routines/correcterrorsinplayerparty.asm
+++ b/engine/pokemon/correct_party_errors.asm
@@ -1,4 +1,4 @@
-Unreferenced_CorrectErrorsInPlayerParty:
+Unreferenced_CorrectPartyErrors:
 	ld hl, wPartyCount
 	ld a, [hl]
 	and a
diff --git a/engine/european_mail.asm b/engine/pokemon/european_mail.asm
index 8f037cc43..8f037cc43 100644
--- a/engine/european_mail.asm
+++ b/engine/pokemon/european_mail.asm
diff --git a/engine/evolve.asm b/engine/pokemon/evolve.asm
index 5a7e75dfa..5a7e75dfa 100755..100644
--- a/engine/evolve.asm
+++ b/engine/pokemon/evolve.asm
diff --git a/engine/experience.asm b/engine/pokemon/experience.asm
index 6b94ed357..6b94ed357 100644
--- a/engine/experience.asm
+++ b/engine/pokemon/experience.asm
diff --git a/engine/health.asm b/engine/pokemon/health.asm
index cc47e8252..cc47e8252 100755..100644
--- a/engine/health.asm
+++ b/engine/pokemon/health.asm
diff --git a/engine/routines/knowsmove.asm b/engine/pokemon/knows_move.asm
index 4ec3da347..4ec3da347 100644
--- a/engine/routines/knowsmove.asm
+++ b/engine/pokemon/knows_move.asm
diff --git a/engine/learn.asm b/engine/pokemon/learn.asm
index fb62289a7..fb62289a7 100755..100644
--- a/engine/learn.asm
+++ b/engine/pokemon/learn.asm
diff --git a/engine/routines/leveluphappinessmod.asm b/engine/pokemon/level_up_happiness.asm
index 8c6dd92fe..8c6dd92fe 100644
--- a/engine/routines/leveluphappinessmod.asm
+++ b/engine/pokemon/level_up_happiness.asm
diff --git a/engine/mail.asm b/engine/pokemon/mail.asm
index b8685c0df..b8685c0df 100755..100644
--- a/engine/mail.asm
+++ b/engine/pokemon/mail.asm
diff --git a/engine/mail_2.asm b/engine/pokemon/mail_2.asm
index 6e326641b..6e326641b 100755..100644
--- a/engine/mail_2.asm
+++ b/engine/pokemon/mail_2.asm
diff --git a/engine/mon_menu.asm b/engine/pokemon/mon_menu.asm
index 088b1b1a3..088b1b1a3 100755..100644
--- a/engine/mon_menu.asm
+++ b/engine/pokemon/mon_menu.asm
diff --git a/engine/mon_stats.asm b/engine/pokemon/mon_stats.asm
index 2b5586c51..2b5586c51 100644
--- a/engine/mon_stats.asm
+++ b/engine/pokemon/mon_stats.asm
diff --git a/engine/move_mon.asm b/engine/pokemon/move_mon.asm
index 8ccf319f0..8ccf319f0 100755..100644
--- a/engine/move_mon.asm
+++ b/engine/pokemon/move_mon.asm
diff --git a/engine/move_mon_wo_mail.asm b/engine/pokemon/move_mon_wo_mail.asm
index 5d81da8a0..5d81da8a0 100755..100644
--- a/engine/move_mon_wo_mail.asm
+++ b/engine/pokemon/move_mon_wo_mail.asm
diff --git a/engine/party_menu.asm b/engine/pokemon/party_menu.asm
index fc1783c71..fc1783c71 100644
--- a/engine/party_menu.asm
+++ b/engine/pokemon/party_menu.asm
diff --git a/engine/search.asm b/engine/pokemon/search.asm
index 57b489a37..57b489a37 100755..100644
--- a/engine/search.asm
+++ b/engine/pokemon/search.asm
diff --git a/engine/search2.asm b/engine/pokemon/search2.asm
index b7112f1f8..b7112f1f8 100755..100644
--- a/engine/search2.asm
+++ b/engine/pokemon/search2.asm
diff --git a/engine/stats_screen.asm b/engine/pokemon/stats_screen.asm
index 59d96999f..59d96999f 100755..100644
--- a/engine/stats_screen.asm
+++ b/engine/pokemon/stats_screen.asm
diff --git a/engine/routines/switchpartymons.asm b/engine/pokemon/switchpartymons.asm
index b01178417..b01178417 100644
--- a/engine/routines/switchpartymons.asm
+++ b/engine/pokemon/switchpartymons.asm
diff --git a/engine/tempmon.asm b/engine/pokemon/tempmon.asm
index 723bfb1dd..723bfb1dd 100644
--- a/engine/tempmon.asm
+++ b/engine/pokemon/tempmon.asm
diff --git a/engine/types.asm b/engine/pokemon/types.asm
index dc0df61ae..dc0df61ae 100644
--- a/engine/types.asm
+++ b/engine/pokemon/types.asm
diff --git a/engine/print_party.asm b/engine/printer/print_party.asm
index 1095ce584..1095ce584 100755..100644
--- a/engine/print_party.asm
+++ b/engine/printer/print_party.asm
diff --git a/engine/printer.asm b/engine/printer/printer.asm
index b9e55ef2a..0264b4f7a 100755..100644
--- a/engine/printer.asm
+++ b/engine/printer/printer.asm
@@ -1,4 +1,4 @@
-INCLUDE "engine/printer_serial.asm"
+INCLUDE "engine/printer/printer_serial.asm"
 
 SendScreenToPrinter: ; 843f0
 .loop
diff --git a/engine/printer_serial.asm b/engine/printer/printer_serial.asm
index 4e0d10851..4e0d10851 100755..100644
--- a/engine/printer_serial.asm
+++ b/engine/printer/printer_serial.asm
diff --git a/engine/routines/printhoursmins.asm b/engine/rtc/print_hours_mins.asm
index eb7dc1619..eb7dc1619 100644
--- a/engine/routines/printhoursmins.asm
+++ b/engine/rtc/print_hours_mins.asm
diff --git a/engine/delete_save_change_clock.asm b/engine/rtc/reset_password.asm
index 431dc6034..fd5007ba7 100755..100644
--- a/engine/delete_save_change_clock.asm
+++ b/engine/rtc/reset_password.asm
@@ -257,40 +257,3 @@ ClockResetPassword: ; 4d41e
 	dec c
 	jr nz, .ComponentFromString
 	ret
-
-_DeleteSaveData: ; 4d54c
-	farcall BlankScreen
-	ld b, SCGB_DIPLOMA
-	call GetSGBLayout
-	call LoadStandardFont
-	call LoadFontsExtra
-	ld de, MUSIC_MAIN_MENU
-	call PlayMusic
-	ld hl, .Text_ClearAllSaveData
-	call PrintText
-	ld hl, .NoYesMenuHeader
-	call CopyMenuHeader
-	call VerticalMenu
-	ret c
-	ld a, [wMenuCursorY]
-	cp $1
-	ret z
-	farcall EmptyAllSRAMBanks
-	ret
-
-.Text_ClearAllSaveData: ; 0x4d580
-	; Clear all save data?
-	text_jump UnknownText_0x1c564a
-	db "@"
-
-.NoYesMenuHeader: ; 0x4d585
-	db 0 ; flags
-	menu_coords 14, 7, SCREEN_WIDTH - 1, TEXTBOX_Y - 1
-	dw .MenuData
-	db 1 ; default option
-
-.MenuData: ; 0x4d58d
-	db STATICMENU_CURSOR | STATICMENU_NO_TOP_SPACING ; flags
-	db 2 ; items
-	db "NO@"
-	db "YES@"
diff --git a/engine/clock_reset.asm b/engine/rtc/restart_clock.asm
index c05129349..5fbac80dd 100755..100644
--- a/engine/clock_reset.asm
+++ b/engine/rtc/restart_clock.asm
@@ -1,5 +1,4 @@
-
-ResetClock_GetWraparoundTime: ; 20000 (8:4000)
+RestartClock_GetWraparoundTime: ; 20000 (8:4000)
 	push hl
 	dec a
 	ld e, a
@@ -152,7 +151,7 @@ RestartClock: ; 20021 (8:4021)
 
 .pressed_up
 	ld a, [wBuffer1]
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [de]
 	inc a
 	ld [de], a
@@ -164,7 +163,7 @@ RestartClock: ; 20021 (8:4021)
 
 .pressed_down
 	ld a, [wBuffer1]
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [de]
 	dec a
 	ld [de], a
@@ -230,7 +229,7 @@ RestartClock: ; 20021 (8:4021)
 
 .PlaceChars: ; 20168 (8:4168)
 	push de
-	call ResetClock_GetWraparoundTime
+	call RestartClock_GetWraparoundTime
 	ld a, [wBuffer3]
 	dec a
 	ld b, a
diff --git a/engine/rtc.asm b/engine/rtc/rtc.asm
index 37e24c1ed..37e24c1ed 100755..100644
--- a/engine/rtc.asm
+++ b/engine/rtc/rtc.asm
diff --git a/engine/timeset.asm b/engine/rtc/timeset.asm
index eda3094e1..eda3094e1 100755..100644
--- a/engine/timeset.asm
+++ b/engine/rtc/timeset.asm
diff --git a/engine/routines/flagpredef.asm b/engine/smallflag.asm
index 2a6d91ee1..2a6d91ee1 100644
--- a/engine/routines/flagpredef.asm
+++ b/engine/smallflag.asm
diff --git a/engine/map_palettes.asm b/engine/tilesets/map_palettes.asm
index a9d2b382f..a9d2b382f 100644
--- a/engine/map_palettes.asm
+++ b/engine/tilesets/map_palettes.asm
diff --git a/engine/mapgroup_roofs.asm b/engine/tilesets/mapgroup_roofs.asm
index 58e5e7cfe..58e5e7cfe 100644
--- a/engine/mapgroup_roofs.asm
+++ b/engine/tilesets/mapgroup_roofs.asm
diff --git a/engine/tileset_anims.asm b/engine/tilesets/tileset_anims.asm
index bf0037e65..bf0037e65 100644
--- a/engine/tileset_anims.asm
+++ b/engine/tilesets/tileset_anims.asm
diff --git a/engine/tileset_palettes.asm b/engine/tilesets/tileset_palettes.asm
index e2c39c0ab..e2c39c0ab 100644
--- a/engine/tileset_palettes.asm
+++ b/engine/tilesets/tileset_palettes.asm
diff --git a/engine/timeofdaypals.asm b/engine/tilesets/timeofday_pals.asm
index b8d43d252..b8d43d252 100644
--- a/engine/timeofdaypals.asm
+++ b/engine/tilesets/timeofday_pals.asm