From f275790aec4a796ed969b099364abfdf25385967 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Thu, 2 Jul 2020 23:30:21 -0400
Subject: Add subdirectories to engine/ similar to pokecrystal

---
 main.asm | 218 +++++++++++++++++++++++++++++++--------------------------------
 1 file changed, 109 insertions(+), 109 deletions(-)

(limited to 'main.asm')

diff --git a/main.asm b/main.asm
index 126bf943..be29dfd7 100755
--- a/main.asm
+++ b/main.asm
@@ -4,46 +4,46 @@ INCLUDE "constants.asm"
 SECTION "bank1", ROMX
 
 INCLUDE "data/facing.asm"
-INCLUDE "engine/black_out.asm"
+INCLUDE "engine/events/black_out.asm"
 
 MewPicFront:: INCBIN "gfx/pokemon/front/mew.pic"
 MewPicBack::  INCBIN "gfx/pokemon/back/mewb.pic"
 INCLUDE "data/baseStats/mew.asm"
 
 INCLUDE "engine/battle/safari_zone.asm"
-INCLUDE "engine/titlescreen.asm"
-INCLUDE "engine/load_mon_data.asm"
+INCLUDE "engine/movie/titlescreen.asm"
+INCLUDE "engine/pokemon/load_mon_data.asm"
 INCLUDE "data/item_prices.asm"
 INCLUDE "text/item_names.asm"
 INCLUDE "text/unused_names.asm"
-INCLUDE "engine/overworld/oam.asm"
-INCLUDE "engine/oam_dma.asm"
-INCLUDE "engine/print_waiting_text.asm"
-INCLUDE "engine/overworld/map_sprite_functions1.asm"
-INCLUDE "engine/test_battle.asm"
-INCLUDE "engine/overworld/item.asm"
+INCLUDE "engine/gfx/sprite_oam.asm"
+INCLUDE "engine/gfx/oam_dma.asm"
+INCLUDE "engine/link/print_waiting_text.asm"
+INCLUDE "engine/overworld/sprite_collisions.asm"
+INCLUDE "engine/debug/test_battle.asm"
+INCLUDE "engine/events/pick_up_item.asm"
 INCLUDE "engine/overworld/movement.asm"
-INCLUDE "engine/cable_club.asm"
-INCLUDE "engine/menu/main_menu.asm"
-INCLUDE "engine/oak_speech.asm"
-INCLUDE "engine/special_warps.asm"
-INCLUDE "engine/debug1.asm"
-INCLUDE "engine/menu/naming_screen.asm"
-INCLUDE "engine/oak_speech2.asm"
-INCLUDE "engine/subtract_paid_money.asm"
-INCLUDE "engine/menu/swap_items.asm"
-INCLUDE "engine/overworld/pokemart.asm"
-INCLUDE "engine/learn_move.asm"
-INCLUDE "engine/overworld/pokecenter.asm"
-INCLUDE "engine/overworld/set_blackout_map.asm"
-INCLUDE "engine/display_text_id_init.asm"
-INCLUDE "engine/menu/draw_start_menu.asm"
-INCLUDE "engine/overworld/cable_club_npc.asm"
-INCLUDE "engine/menu/text_box.asm"
-INCLUDE "engine/battle/moveEffects/drain_hp_effect.asm"
-INCLUDE "engine/menu/players_pc.asm"
-INCLUDE "engine/remove_pokemon.asm"
-INCLUDE "engine/display_pokedex.asm"
+INCLUDE "engine/link/cable_club.asm"
+INCLUDE "engine/menus/main_menu.asm"
+INCLUDE "engine/movie/oak_speech.asm"
+INCLUDE "engine/overworld/special_warps.asm"
+INCLUDE "engine/debug/debug_party.asm"
+INCLUDE "engine/menus/naming_screen.asm"
+INCLUDE "engine/movie/oak_speech2.asm"
+INCLUDE "engine/items/subtract_paid_money.asm"
+INCLUDE "engine/menus/swap_items.asm"
+INCLUDE "engine/events/pokemart.asm"
+INCLUDE "engine/pokemon/learn_move.asm"
+INCLUDE "engine/events/pokecenter.asm"
+INCLUDE "engine/events/set_blackout_map.asm"
+INCLUDE "engine/menus/display_text_id_init.asm"
+INCLUDE "engine/menus/draw_start_menu.asm"
+INCLUDE "engine/link/cable_club_npc.asm"
+INCLUDE "engine/menus/text_box.asm"
+INCLUDE "engine/battle/move_effects/drain_hp.asm"
+INCLUDE "engine/menus/players_pc.asm"
+INCLUDE "engine/pokemon/remove_mon.asm"
+INCLUDE "engine/events/display_pokedex.asm"
 
 
 SECTION "bank3", ROMX
@@ -53,28 +53,28 @@ INCLUDE "data/map_songs.asm"
 INCLUDE "data/map_header_banks.asm"
 INCLUDE "engine/overworld/clear_variables.asm"
 INCLUDE "engine/overworld/player_state.asm"
-INCLUDE "engine/overworld/poison.asm"
-INCLUDE "engine/overworld/tileset_header.asm"
+INCLUDE "engine/events/poison.asm"
+INCLUDE "engine/overworld/tilesets.asm"
 INCLUDE "engine/overworld/daycare_exp.asm"
 INCLUDE "data/hide_show_data.asm"
 INCLUDE "engine/overworld/field_move_messages.asm"
 INCLUDE "engine/items/inventory.asm"
 INCLUDE "engine/overworld/wild_mons.asm"
-INCLUDE "engine/items/items.asm"
-INCLUDE "engine/menu/draw_badges.asm"
+INCLUDE "engine/items/item_effects.asm"
+INCLUDE "engine/menus/draw_badges.asm"
 INCLUDE "engine/overworld/update_map.asm"
 INCLUDE "engine/overworld/cut.asm"
 INCLUDE "engine/overworld/missable_objects.asm"
 INCLUDE "engine/overworld/push_boulder.asm"
-INCLUDE "engine/add_mon.asm"
+INCLUDE "engine/pokemon/add_mon.asm"
 INCLUDE "engine/flag_action.asm"
-INCLUDE "engine/heal_party.asm"
-INCLUDE "engine/bcd.asm"
-INCLUDE "engine/init_player_data.asm"
-INCLUDE "engine/get_bag_item_quantity.asm"
-INCLUDE "engine/pathfinding.asm"
-INCLUDE "engine/hp_bar.asm"
-INCLUDE "engine/hidden_object_functions3.asm"
+INCLUDE "engine/events/heal_party.asm"
+INCLUDE "engine/math/bcd.asm"
+INCLUDE "engine/movie/init_player_data.asm"
+INCLUDE "engine/items/get_bag_item_quantity.asm"
+INCLUDE "engine/overworld/pathfinding.asm"
+INCLUDE "engine/gfx/hp_bar.asm"
+INCLUDE "engine/events/hidden_object_functions3.asm"
 
 
 SECTION "Graphics (BANK 4)", ROMX
@@ -106,33 +106,33 @@ PlayerCharacterTitleGraphicsEnd:
 SECTION "Battle (BANK 4)", ROMX
 
 INCLUDE "engine/overworld/is_player_just_outside_map.asm"
-INCLUDE "engine/menu/status_screen.asm"
-INCLUDE "engine/menu/party_menu.asm"
+INCLUDE "engine/pokemon/status_screen.asm"
+INCLUDE "engine/menus/party_menu.asm"
 
 RedPicFront:: INCBIN "gfx/player/red.pic"
 ShrinkPic1::  INCBIN "gfx/player/shrink1.pic"
 ShrinkPic2::  INCBIN "gfx/player/shrink2.pic"
 
-INCLUDE "engine/turn_sprite.asm"
-INCLUDE "engine/menu/start_sub_menus.asm"
+INCLUDE "engine/overworld/turn_sprite.asm"
+INCLUDE "engine/menus/start_sub_menus.asm"
 INCLUDE "engine/items/tms.asm"
 INCLUDE "engine/battle/end_of_battle.asm"
 INCLUDE "engine/battle/wild_encounters.asm"
-INCLUDE "engine/battle/moveEffects/recoil_effect.asm"
-INCLUDE "engine/battle/moveEffects/conversion_effect.asm"
-INCLUDE "engine/battle/moveEffects/haze_effect.asm"
+INCLUDE "engine/battle/move_effects/recoil.asm"
+INCLUDE "engine/battle/move_effects/conversion.asm"
+INCLUDE "engine/battle/move_effects/haze.asm"
 INCLUDE "engine/battle/get_trainer_name.asm"
-INCLUDE "engine/random.asm"
+INCLUDE "engine/math/random.asm"
 
 
 SECTION "Battle (BANK 5)", ROMX
 
-INCLUDE "engine/load_pokedex_tiles.asm"
+INCLUDE "engine/gfx/load_pokedex_tiles.asm"
 INCLUDE "engine/overworld/map_sprites.asm"
 INCLUDE "engine/overworld/emotion_bubbles.asm"
-INCLUDE "engine/evolve_trade.asm"
-INCLUDE "engine/battle/moveEffects/substitute_effect.asm"
-INCLUDE "engine/menu/pc.asm"
+INCLUDE "engine/events/evolve_trade.asm"
+INCLUDE "engine/battle/move_effects/substitute.asm"
+INCLUDE "engine/menus/pc.asm"
 
 
 SECTION "bank6_1", ROMX
@@ -142,7 +142,7 @@ INCLUDE "engine/play_time.asm"
 
 SECTION "bank6_2", ROMX
 
-INCLUDE "engine/overworld/npc_movement.asm"
+INCLUDE "engine/overworld/auto_movement.asm"
 INCLUDE "engine/overworld/doors.asm"
 INCLUDE "engine/overworld/ledges.asm"
 
@@ -150,26 +150,26 @@ INCLUDE "engine/overworld/ledges.asm"
 SECTION "bank7_1", ROMX
 
 INCLUDE "text/monster_names.asm"
-INCLUDE "engine/clear_save.asm"
-INCLUDE "engine/predefs7.asm"
+INCLUDE "engine/movie/clear_save.asm"
+INCLUDE "engine/events/elevator.asm"
 
 
 SECTION "bank7_2", ROMX
 
-INCLUDE "engine/menu/oaks_pc.asm"
-INCLUDE "engine/hidden_object_functions7.asm"
+INCLUDE "engine/menus/oaks_pc.asm"
+INCLUDE "engine/events/hidden_object_functions7.asm"
 
 
 SECTION "Battle (BANK 9)", ROMX
 
 INCLUDE "engine/battle/print_type.asm"
 INCLUDE "engine/battle/save_trainer_name.asm"
-INCLUDE "engine/battle/moveEffects/focus_energy_effect.asm"
+INCLUDE "engine/battle/move_effects/focus_energy.asm"
 
 
 SECTION "Battle (BANK A)", ROMX
 
-INCLUDE "engine/battle/moveEffects/leech_seed_effect.asm"
+INCLUDE "engine/battle/move_effects/leech_seed.asm"
 
 
 SECTION "Battle (BANK B)", ROMX
@@ -184,24 +184,24 @@ BadgeNumbersTileGraphics:        INCBIN "gfx/trainer_card/badge_numbers.2bpp"
 
 INCLUDE "engine/items/tmhm.asm"
 INCLUDE "engine/battle/scale_sprites.asm"
-INCLUDE "engine/battle/moveEffects/pay_day_effect.asm"
-INCLUDE "engine/game_corner_slots2.asm"
+INCLUDE "engine/battle/move_effects/pay_day.asm"
+INCLUDE "engine/slots/game_corner_slots2.asm"
 
 
 SECTION "Battle (BANK C)", ROMX
 
-INCLUDE "engine/battle/moveEffects/mist_effect.asm"
-INCLUDE "engine/battle/moveEffects/one_hit_ko_effect.asm"
+INCLUDE "engine/battle/move_effects/mist.asm"
+INCLUDE "engine/battle/move_effects/one_hit_ko.asm"
 
 
 SECTION "Battle (BANK D)", ROMX
 
-INCLUDE "engine/titlescreen2.asm"
+INCLUDE "engine/movie/titlescreen2.asm"
 INCLUDE "engine/battle/link_battle_versus_text.asm"
-INCLUDE "engine/slot_machine.asm"
-INCLUDE "engine/overworld/pewter_guys.asm"
-INCLUDE "engine/multiply_divide.asm"
-INCLUDE "engine/game_corner_slots.asm"
+INCLUDE "engine/slots/slot_machine.asm"
+INCLUDE "engine/events/pewter_guys.asm"
+INCLUDE "engine/math/multiply_divide.asm"
+INCLUDE "engine/slots/game_corner_slots.asm"
 
 
 SECTION "bankE", ROMX
@@ -223,10 +223,10 @@ TradingAnimationGraphicsEnd:
 TradingAnimationGraphics2: INCBIN "gfx/trade/cable_ball.2bpp"
 TradingAnimationGraphics2End:
 
-INCLUDE "engine/evos_moves.asm"
-INCLUDE "engine/battle/moveEffects/heal_effect.asm"
-INCLUDE "engine/battle/moveEffects/transform_effect.asm"
-INCLUDE "engine/battle/moveEffects/reflect_light_screen_effect.asm"
+INCLUDE "engine/pokemon/evos_moves.asm"
+INCLUDE "engine/battle/move_effects/heal.asm"
+INCLUDE "engine/battle/move_effects/transform.asm"
+INCLUDE "engine/battle/move_effects/reflect_light_screen.asm"
 
 
 SECTION "bankF", ROMX
@@ -237,15 +237,15 @@ INCLUDE "engine/battle/effects.asm"
 
 SECTION "bank10", ROMX
 
-INCLUDE "engine/menu/pokedex.asm"
-INCLUDE "engine/trade.asm"
-INCLUDE "engine/intro.asm"
-INCLUDE "engine/trade2.asm"
+INCLUDE "engine/menus/pokedex.asm"
+INCLUDE "engine/movie/trade.asm"
+INCLUDE "engine/movie/intro.asm"
+INCLUDE "engine/movie/trade2.asm"
 
 
 SECTION "bank11_1", ROMX
 
-INCLUDE "engine/pokedex_rating.asm"
+INCLUDE "engine/events/pokedex_rating.asm"
 
 
 SECTION "bank11_2", ROMX
@@ -255,22 +255,22 @@ INCLUDE "engine/overworld/hidden_objects.asm"
 
 SECTION "bank12", ROMX
 
-INCLUDE "engine/predefs12.asm"
+INCLUDE "engine/gfx/screen_effects.asm"
 
 
 SECTION "bank13", ROMX
 
-INCLUDE "engine/give_pokemon.asm"
+INCLUDE "engine/events/give_pokemon.asm"
 INCLUDE "engine/predefs.asm"
 
 
 SECTION "bank14", ROMX
 
 INCLUDE "engine/battle/init_battle_variables.asm"
-INCLUDE "engine/battle/moveEffects/paralyze_effect.asm"
-INCLUDE "engine/overworld/card_key.asm"
-INCLUDE "engine/menu/prize_menu.asm"
-INCLUDE "engine/hidden_object_functions14.asm"
+INCLUDE "engine/battle/move_effects/paralyze.asm"
+INCLUDE "engine/events/card_key.asm"
+INCLUDE "engine/events/prize_menu.asm"
+INCLUDE "engine/events/hidden_object_functions14.asm"
 
 
 SECTION "bank15_1", ROMX
@@ -280,41 +280,41 @@ INCLUDE "engine/battle/experience.asm"
 
 SECTION "bank15_2", ROMX
 
-INCLUDE "engine/menu/diploma.asm"
-INCLUDE "engine/overworld/trainers.asm"
+INCLUDE "engine/events/diploma.asm"
+INCLUDE "engine/overworld/trainer_sight.asm"
 
 
 SECTION "bank16_1", ROMX
 
 INCLUDE "engine/battle/common_text.asm"
-INCLUDE "engine/experience.asm"
-INCLUDE "engine/overworld/oaks_aide.asm"
+INCLUDE "engine/pokemon/experience.asm"
+INCLUDE "engine/events/oaks_aide.asm"
 
 
 SECTION "bank16_2", ROMX
 
-INCLUDE "engine/overworld/saffron_guards.asm"
+INCLUDE "engine/events/saffron_guards.asm"
 
 
 SECTION "bank17_1", ROMX
 
-INCLUDE "engine/predefs17.asm"
+INCLUDE "engine/events/starter_dex.asm"
 
 
 SECTION "bank17_2", ROMX
 
-INCLUDE "engine/predefs17_2.asm"
-INCLUDE "engine/hidden_object_functions17.asm"
+INCLUDE "engine/pokemon/set_types.asm"
+INCLUDE "engine/events/hidden_object_functions17.asm"
 
 
 SECTION "bank18_1", ROMX
 
-INCLUDE "engine/overworld/cinnabar_lab.asm"
+INCLUDE "engine/events/cinnabar_lab.asm"
 
 
 SECTION "bank18_2", ROMX
 
-INCLUDE "engine/hidden_object_functions18.asm"
+INCLUDE "engine/events/hidden_object_functions18.asm"
 
 
 SECTION "bank1A", ROMX
@@ -333,42 +333,42 @@ Version_GFXEnd:
 
 SECTION "bank1C", ROMX
 
-INCLUDE "engine/gamefreak.asm"
-INCLUDE "engine/hall_of_fame.asm"
+INCLUDE "engine/movie/gamefreak.asm"
+INCLUDE "engine/movie/hall_of_fame.asm"
 INCLUDE "engine/overworld/healing_machine.asm"
 INCLUDE "engine/overworld/player_animations.asm"
 INCLUDE "engine/battle/ghost_marowak_anim.asm"
 INCLUDE "engine/battle/battle_transitions.asm"
-INCLUDE "engine/town_map.asm"
-INCLUDE "engine/mon_party_sprites.asm"
-INCLUDE "engine/in_game_trades.asm"
-INCLUDE "engine/palettes.asm"
-INCLUDE "engine/save.asm"
+INCLUDE "engine/items/town_map.asm"
+INCLUDE "engine/gfx/mon_icons.asm"
+INCLUDE "engine/events/in_game_trades.asm"
+INCLUDE "engine/gfx/palettes.asm"
+INCLUDE "engine/menus/save.asm"
 
 
 SECTION "bank1D_1", ROMX
 
-INCLUDE "engine/HoF_room_pc.asm"
-INCLUDE "engine/status_ailments.asm"
+INCLUDE "engine/movie/credits.asm"
+INCLUDE "engine/pokemon/status_ailments.asm"
 INCLUDE "engine/items/itemfinder.asm"
 
 
 SECTION "bank1D_2", ROMX
 
-INCLUDE "engine/menu/vending_machine.asm"
+INCLUDE "engine/events/vending_machine.asm"
 
 
 SECTION "bank1D_3", ROMX
 
-INCLUDE "engine/menu/league_pc.asm"
-INCLUDE "engine/overworld/hidden_items.asm"
+INCLUDE "engine/menus/league_pc.asm"
+INCLUDE "engine/events/hidden_items.asm"
 
 
 SECTION "bank1E", ROMX
 
 INCLUDE "engine/battle/animations.asm"
 INCLUDE "engine/overworld/cut2.asm"
-INCLUDE "engine/overworld/ssanne.asm"
+INCLUDE "engine/overworld/dust_smoke.asm"
 
 RedFishingTilesFront: INCBIN "gfx/overworld/red_fish_front.2bpp"
 RedFishingTilesBack:  INCBIN "gfx/overworld/red_fish_back.2bpp"
@@ -376,6 +376,6 @@ RedFishingTilesSide:  INCBIN "gfx/overworld/red_fish_side.2bpp"
 RedFishingRodTiles:   INCBIN "gfx/overworld/fishing_rod.2bpp"
 
 INCLUDE "data/animations.asm"
-INCLUDE "engine/evolution.asm"
+INCLUDE "engine/movie/evolution.asm"
 INCLUDE "engine/overworld/elevator.asm"
 INCLUDE "engine/items/tm_prices.asm"
-- 
cgit v1.3.1-sl0p


From 881e0059704b9134a80d30f203f54677a7c6fb89 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 3 Jul 2020 01:09:58 -0400
Subject: INCLUDE "engine/pokemon/bills_pc.asm" in main.asm, not audio.asm

---
 audio.asm   | 7 +++++--
 layout.link | 2 ++
 main.asm    | 5 +++++
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'main.asm')

diff --git a/audio.asm b/audio.asm
index effcb6f7..94d63f25 100644
--- a/audio.asm
+++ b/audio.asm
@@ -359,10 +359,13 @@ INCLUDE "audio/engine_1.asm"
 INCLUDE "audio/alternate_tempo.asm"
 
 
-SECTION "Audio Engine 2", ROMX
+SECTION "Low Health Alarm (Audio Engine 2)", ROMX
 
 INCLUDE "audio/low_health_alarm.asm"
-INCLUDE "engine/pokemon/bills_pc.asm"
+
+
+SECTION "Audio Engine 2", ROMX
+
 INCLUDE "audio/engine_2.asm"
 INCLUDE "audio/poke_flute.asm"
 
diff --git a/layout.link b/layout.link
index c9ad5839..6391c9d5 100644
--- a/layout.link
+++ b/layout.link
@@ -94,6 +94,8 @@ ROMX $8
 	"Sound Effect Headers 2"
 	"Music Headers 2"
 	"Sound Effects 2"
+	"Low Health Alarm (Audio Engine 2)"
+	"Bill's PC"
 	"Audio Engine 2"
 	"Music 2"
 
diff --git a/main.asm b/main.asm
index be29dfd7..50930bb4 100755
--- a/main.asm
+++ b/main.asm
@@ -160,6 +160,11 @@ INCLUDE "engine/menus/oaks_pc.asm"
 INCLUDE "engine/events/hidden_object_functions7.asm"
 
 
+SECTION "Bill's PC", ROMX
+
+INCLUDE "engine/pokemon/bills_pc.asm"
+
+
 SECTION "Battle (BANK 9)", ROMX
 
 INCLUDE "engine/battle/print_type.asm"
-- 
cgit v1.3.1-sl0p


From 87ef75c173b5d5f227912860487600b6f53d1d1f Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 3 Jul 2020 01:11:23 -0400
Subject: Add engine/movie/oak_speech/ subdirectory

---
 engine/movie/clear_save.asm                  |  23 ---
 engine/movie/init_player_data.asm            |  55 -------
 engine/movie/oak_speech.asm                  | 233 ---------------------------
 engine/movie/oak_speech/clear_save.asm       |  23 +++
 engine/movie/oak_speech/init_player_data.asm |  55 +++++++
 engine/movie/oak_speech/oak_speech.asm       | 233 +++++++++++++++++++++++++++
 engine/movie/oak_speech/oak_speech2.asm      | 219 +++++++++++++++++++++++++
 engine/movie/oak_speech2.asm                 | 219 -------------------------
 main.asm                                     |   8 +-
 9 files changed, 534 insertions(+), 534 deletions(-)
 delete mode 100755 engine/movie/clear_save.asm
 delete mode 100644 engine/movie/init_player_data.asm
 delete mode 100755 engine/movie/oak_speech.asm
 create mode 100755 engine/movie/oak_speech/clear_save.asm
 create mode 100644 engine/movie/oak_speech/init_player_data.asm
 create mode 100755 engine/movie/oak_speech/oak_speech.asm
 create mode 100755 engine/movie/oak_speech/oak_speech2.asm
 delete mode 100755 engine/movie/oak_speech2.asm

(limited to 'main.asm')

diff --git a/engine/movie/clear_save.asm b/engine/movie/clear_save.asm
deleted file mode 100755
index b47cd6c4..00000000
--- a/engine/movie/clear_save.asm
+++ /dev/null
@@ -1,23 +0,0 @@
-DoClearSaveDialogue:
-	call ClearScreen
-	call RunDefaultPaletteCommand
-	call LoadFontTilePatterns
-	call LoadTextBoxTilePatterns
-	ld hl, ClearSaveDataText
-	call PrintText
-	coord hl, 14, 7
-	lb bc, 8, 15
-	ld a, NO_YES_MENU
-	ld [wTwoOptionMenuID], a
-	ld a, TWO_OPTION_MENU
-	ld [wTextBoxID], a
-	call DisplayTextBoxID
-	ld a, [wCurrentMenuItem]
-	and a
-	jp z, Init
-	callba ClearSAV
-	jp Init
-
-ClearSaveDataText:
-	TX_FAR _ClearSaveDataText
-	db "@"
diff --git a/engine/movie/init_player_data.asm b/engine/movie/init_player_data.asm
deleted file mode 100644
index c576e65a..00000000
--- a/engine/movie/init_player_data.asm
+++ /dev/null
@@ -1,55 +0,0 @@
-InitPlayerData:
-InitPlayerData2:
-
-	call Random
-	ld a, [hRandomSub]
-	ld [wPlayerID], a
-
-	call Random
-	ld a, [hRandomAdd]
-	ld [wPlayerID + 1], a
-
-	ld a, $ff
-	ld [wUnusedD71B], a
-
-	ld hl, wPartyCount
-	call InitializeEmptyList
-	ld hl, wNumInBox
-	call InitializeEmptyList
-	ld hl, wNumBagItems
-	call InitializeEmptyList
-	ld hl, wNumBoxItems
-	call InitializeEmptyList
-
-START_MONEY EQU $3000
-	ld hl, wPlayerMoney + 1
-	ld a, START_MONEY / $100
-	ld [hld], a
-	xor a
-	ld [hli], a
-	inc hl
-	ld [hl], a
-
-	ld [wMonDataLocation], a
-
-	ld hl, wObtainedBadges
-	ld [hli], a
-
-	ld [hl], a
-
-	ld hl, wPlayerCoins
-	ld [hli], a
-	ld [hl], a
-
-	ld hl, wGameProgressFlags
-	ld bc, wGameProgressFlagsEnd - wGameProgressFlags
-	call FillMemory ; clear all game progress flags
-
-	jp InitializeMissableObjectsFlags
-
-InitializeEmptyList:
-	xor a ; count
-	ld [hli], a
-	dec a ; terminator
-	ld [hl], a
-	ret
diff --git a/engine/movie/oak_speech.asm b/engine/movie/oak_speech.asm
deleted file mode 100755
index b1acfb65..00000000
--- a/engine/movie/oak_speech.asm
+++ /dev/null
@@ -1,233 +0,0 @@
-SetDefaultNames:
-	ld a, [wLetterPrintingDelayFlags]
-	push af
-	ld a, [wOptions]
-	push af
-	ld a, [wd732]
-	push af
-	ld hl, wPlayerName
-	ld bc, wBoxDataEnd - wPlayerName
-	xor a
-	call FillMemory
-	ld hl, wSpriteStateData1
-	ld bc, $200
-	xor a
-	call FillMemory
-	pop af
-	ld [wd732], a
-	pop af
-	ld [wOptions], a
-	pop af
-	ld [wLetterPrintingDelayFlags], a
-	ld a, [wOptionsInitialized]
-	and a
-	call z, InitOptions
-	ld hl, NintenText
-	ld de, wPlayerName
-	ld bc, NAME_LENGTH
-	call CopyData
-	ld hl, SonyText
-	ld de, wRivalName
-	ld bc, NAME_LENGTH
-	jp CopyData
-
-OakSpeech:
-	ld a, $FF
-	call PlaySound ; stop music
-	ld a, BANK(Music_Routes2)
-	ld c, a
-	ld a, MUSIC_ROUTES2
-	call PlayMusic
-	call ClearScreen
-	call LoadTextBoxTilePatterns
-	call SetDefaultNames
-	predef InitPlayerData2
-	ld hl, wNumBoxItems
-	ld a, POTION
-	ld [wcf91], a
-	ld a, 1
-	ld [wItemQuantity], a
-	call AddItemToInventory  ; give one potion
-	ld a, [wDefaultMap]
-	ld [wDestinationMap], a
-	call SpecialWarpIn
-	xor a
-	ld [hTilesetType], a
-	ld a, [wd732]
-	bit 1, a ; possibly a debug mode bit
-	jp nz, .skipChoosingNames
-	ld de, ProfOakPic
-	lb bc, Bank(ProfOakPic), $00
-	call IntroDisplayPicCenteredOrUpperRight
-	call FadeInIntroPic
-	ld hl, OakSpeechText1
-	call PrintText
-	call GBFadeOutToWhite
-	call ClearScreen
-	ld a, NIDORINO
-	ld [wd0b5], a
-	ld [wcf91], a
-	call GetMonHeader
-	coord hl, 6, 4
-	call LoadFlippedFrontSpriteByMonIndex
-	call MovePicLeft
-	ld hl, OakSpeechText2
-	call PrintText
-	call GBFadeOutToWhite
-	call ClearScreen
-	ld de, RedPicFront
-	lb bc, Bank(RedPicFront), $00
-	call IntroDisplayPicCenteredOrUpperRight
-	call MovePicLeft
-	ld hl, IntroducePlayerText
-	call PrintText
-	call ChoosePlayerName
-	call GBFadeOutToWhite
-	call ClearScreen
-	ld de, Rival1Pic
-	lb bc, Bank(Rival1Pic), $00
-	call IntroDisplayPicCenteredOrUpperRight
-	call FadeInIntroPic
-	ld hl, IntroduceRivalText
-	call PrintText
-	call ChooseRivalName
-.skipChoosingNames
-	call GBFadeOutToWhite
-	call ClearScreen
-	ld de, RedPicFront
-	lb bc, Bank(RedPicFront), $00
-	call IntroDisplayPicCenteredOrUpperRight
-	call GBFadeInFromWhite
-	ld a, [wd72d]
-	and a
-	jr nz, .next
-	ld hl, OakSpeechText3
-	call PrintText
-.next
-	ld a, [H_LOADEDROMBANK]
-	push af
-	ld a, SFX_SHRINK
-	call PlaySound
-	pop af
-	ld [H_LOADEDROMBANK], a
-	ld [MBC1RomBank], a
-	ld c, 4
-	call DelayFrames
-	ld de, RedSprite
-	ld hl, vSprites
-	lb bc, BANK(RedSprite), $0C
-	call CopyVideoData
-	ld de, ShrinkPic1
-	lb bc, BANK(ShrinkPic1), $00
-	call IntroDisplayPicCenteredOrUpperRight
-	ld c, 4
-	call DelayFrames
-	ld de, ShrinkPic2
-	lb bc, BANK(ShrinkPic2), $00
-	call IntroDisplayPicCenteredOrUpperRight
-	call ResetPlayerSpriteData
-	ld a, [H_LOADEDROMBANK]
-	push af
-	ld a, BANK(Music_PalletTown)
-	ld [wAudioROMBank], a
-	ld [wAudioSavedROMBank], a
-	ld a, 10
-	ld [wAudioFadeOutControl], a
-	ld a, $FF
-	ld [wNewSoundID], a
-	call PlaySound ; stop music
-	pop af
-	ld [H_LOADEDROMBANK], a
-	ld [MBC1RomBank], a
-	ld c, 20
-	call DelayFrames
-	coord hl, 6, 5
-	ld b, 7
-	ld c, 7
-	call ClearScreenArea
-	call LoadTextBoxTilePatterns
-	ld a, 1
-	ld [wUpdateSpritesEnabled], a
-	ld c, 50
-	call DelayFrames
-	call GBFadeOutToWhite
-	jp ClearScreen
-OakSpeechText1:
-	TX_FAR _OakSpeechText1
-	db "@"
-OakSpeechText2:
-	TX_FAR _OakSpeechText2A
-	TX_CRY_NIDORINA
-	TX_FAR _OakSpeechText2B
-	db "@"
-IntroducePlayerText:
-	TX_FAR _IntroducePlayerText
-	db "@"
-IntroduceRivalText:
-	TX_FAR _IntroduceRivalText
-	db "@"
-OakSpeechText3:
-	TX_FAR _OakSpeechText3
-	db "@"
-
-FadeInIntroPic:
-	ld hl, IntroFadePalettes
-	ld b, 6
-.next
-	ld a, [hli]
-	ld [rBGP], a
-	ld c, 10
-	call DelayFrames
-	dec b
-	jr nz, .next
-	ret
-
-IntroFadePalettes:
-	db %01010100
-	db %10101000
-	db %11111100
-	db %11111000
-	db %11110100
-	db %11100100
-
-MovePicLeft:
-	ld a, 119
-	ld [rWX], a
-	call DelayFrame
-
-	ld a, %11100100
-	ld [rBGP], a
-.next
-	call DelayFrame
-	ld a, [rWX]
-	sub 8
-	cp $FF
-	ret z
-	ld [rWX], a
-	jr .next
-
-DisplayPicCenteredOrUpperRight:
-	call GetPredefRegisters
-IntroDisplayPicCenteredOrUpperRight:
-; b = bank
-; de = address of compressed pic
-; c: 0 = centred, non-zero = upper-right
-	push bc
-	ld a, b
-	call UncompressSpriteFromDE
-	ld hl, sSpriteBuffer1
-	ld de, sSpriteBuffer0
-	ld bc, $310
-	call CopyData
-	ld de, vFrontPic
-	call InterlaceMergeSpriteBuffers
-	pop bc
-	ld a, c
-	and a
-	coord hl, 15, 1
-	jr nz, .next
-	coord hl, 6, 4
-.next
-	xor a
-	ld [hStartTileID], a
-	predef_jump CopyUncompressedPicToTilemap
diff --git a/engine/movie/oak_speech/clear_save.asm b/engine/movie/oak_speech/clear_save.asm
new file mode 100755
index 00000000..b47cd6c4
--- /dev/null
+++ b/engine/movie/oak_speech/clear_save.asm
@@ -0,0 +1,23 @@
+DoClearSaveDialogue:
+	call ClearScreen
+	call RunDefaultPaletteCommand
+	call LoadFontTilePatterns
+	call LoadTextBoxTilePatterns
+	ld hl, ClearSaveDataText
+	call PrintText
+	coord hl, 14, 7
+	lb bc, 8, 15
+	ld a, NO_YES_MENU
+	ld [wTwoOptionMenuID], a
+	ld a, TWO_OPTION_MENU
+	ld [wTextBoxID], a
+	call DisplayTextBoxID
+	ld a, [wCurrentMenuItem]
+	and a
+	jp z, Init
+	callba ClearSAV
+	jp Init
+
+ClearSaveDataText:
+	TX_FAR _ClearSaveDataText
+	db "@"
diff --git a/engine/movie/oak_speech/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm
new file mode 100644
index 00000000..c576e65a
--- /dev/null
+++ b/engine/movie/oak_speech/init_player_data.asm
@@ -0,0 +1,55 @@
+InitPlayerData:
+InitPlayerData2:
+
+	call Random
+	ld a, [hRandomSub]
+	ld [wPlayerID], a
+
+	call Random
+	ld a, [hRandomAdd]
+	ld [wPlayerID + 1], a
+
+	ld a, $ff
+	ld [wUnusedD71B], a
+
+	ld hl, wPartyCount
+	call InitializeEmptyList
+	ld hl, wNumInBox
+	call InitializeEmptyList
+	ld hl, wNumBagItems
+	call InitializeEmptyList
+	ld hl, wNumBoxItems
+	call InitializeEmptyList
+
+START_MONEY EQU $3000
+	ld hl, wPlayerMoney + 1
+	ld a, START_MONEY / $100
+	ld [hld], a
+	xor a
+	ld [hli], a
+	inc hl
+	ld [hl], a
+
+	ld [wMonDataLocation], a
+
+	ld hl, wObtainedBadges
+	ld [hli], a
+
+	ld [hl], a
+
+	ld hl, wPlayerCoins
+	ld [hli], a
+	ld [hl], a
+
+	ld hl, wGameProgressFlags
+	ld bc, wGameProgressFlagsEnd - wGameProgressFlags
+	call FillMemory ; clear all game progress flags
+
+	jp InitializeMissableObjectsFlags
+
+InitializeEmptyList:
+	xor a ; count
+	ld [hli], a
+	dec a ; terminator
+	ld [hl], a
+	ret
diff --git a/engine/movie/oak_speech/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm
new file mode 100755
index 00000000..b1acfb65
--- /dev/null
+++ b/engine/movie/oak_speech/oak_speech.asm
@@ -0,0 +1,233 @@
+SetDefaultNames:
+	ld a, [wLetterPrintingDelayFlags]
+	push af
+	ld a, [wOptions]
+	push af
+	ld a, [wd732]
+	push af
+	ld hl, wPlayerName
+	ld bc, wBoxDataEnd - wPlayerName
+	xor a
+	call FillMemory
+	ld hl, wSpriteStateData1
+	ld bc, $200
+	xor a
+	call FillMemory
+	pop af
+	ld [wd732], a
+	pop af
+	ld [wOptions], a
+	pop af
+	ld [wLetterPrintingDelayFlags], a
+	ld a, [wOptionsInitialized]
+	and a
+	call z, InitOptions
+	ld hl, NintenText
+	ld de, wPlayerName
+	ld bc, NAME_LENGTH
+	call CopyData
+	ld hl, SonyText
+	ld de, wRivalName
+	ld bc, NAME_LENGTH
+	jp CopyData
+
+OakSpeech:
+	ld a, $FF
+	call PlaySound ; stop music
+	ld a, BANK(Music_Routes2)
+	ld c, a
+	ld a, MUSIC_ROUTES2
+	call PlayMusic
+	call ClearScreen
+	call LoadTextBoxTilePatterns
+	call SetDefaultNames
+	predef InitPlayerData2
+	ld hl, wNumBoxItems
+	ld a, POTION
+	ld [wcf91], a
+	ld a, 1
+	ld [wItemQuantity], a
+	call AddItemToInventory  ; give one potion
+	ld a, [wDefaultMap]
+	ld [wDestinationMap], a
+	call SpecialWarpIn
+	xor a
+	ld [hTilesetType], a
+	ld a, [wd732]
+	bit 1, a ; possibly a debug mode bit
+	jp nz, .skipChoosingNames
+	ld de, ProfOakPic
+	lb bc, Bank(ProfOakPic), $00
+	call IntroDisplayPicCenteredOrUpperRight
+	call FadeInIntroPic
+	ld hl, OakSpeechText1
+	call PrintText
+	call GBFadeOutToWhite
+	call ClearScreen
+	ld a, NIDORINO
+	ld [wd0b5], a
+	ld [wcf91], a
+	call GetMonHeader
+	coord hl, 6, 4
+	call LoadFlippedFrontSpriteByMonIndex
+	call MovePicLeft
+	ld hl, OakSpeechText2
+	call PrintText
+	call GBFadeOutToWhite
+	call ClearScreen
+	ld de, RedPicFront
+	lb bc, Bank(RedPicFront), $00
+	call IntroDisplayPicCenteredOrUpperRight
+	call MovePicLeft
+	ld hl, IntroducePlayerText
+	call PrintText
+	call ChoosePlayerName
+	call GBFadeOutToWhite
+	call ClearScreen
+	ld de, Rival1Pic
+	lb bc, Bank(Rival1Pic), $00
+	call IntroDisplayPicCenteredOrUpperRight
+	call FadeInIntroPic
+	ld hl, IntroduceRivalText
+	call PrintText
+	call ChooseRivalName
+.skipChoosingNames
+	call GBFadeOutToWhite
+	call ClearScreen
+	ld de, RedPicFront
+	lb bc, Bank(RedPicFront), $00
+	call IntroDisplayPicCenteredOrUpperRight
+	call GBFadeInFromWhite
+	ld a, [wd72d]
+	and a
+	jr nz, .next
+	ld hl, OakSpeechText3
+	call PrintText
+.next
+	ld a, [H_LOADEDROMBANK]
+	push af
+	ld a, SFX_SHRINK
+	call PlaySound
+	pop af
+	ld [H_LOADEDROMBANK], a
+	ld [MBC1RomBank], a
+	ld c, 4
+	call DelayFrames
+	ld de, RedSprite
+	ld hl, vSprites
+	lb bc, BANK(RedSprite), $0C
+	call CopyVideoData
+	ld de, ShrinkPic1
+	lb bc, BANK(ShrinkPic1), $00
+	call IntroDisplayPicCenteredOrUpperRight
+	ld c, 4
+	call DelayFrames
+	ld de, ShrinkPic2
+	lb bc, BANK(ShrinkPic2), $00
+	call IntroDisplayPicCenteredOrUpperRight
+	call ResetPlayerSpriteData
+	ld a, [H_LOADEDROMBANK]
+	push af
+	ld a, BANK(Music_PalletTown)
+	ld [wAudioROMBank], a
+	ld [wAudioSavedROMBank], a
+	ld a, 10
+	ld [wAudioFadeOutControl], a
+	ld a, $FF
+	ld [wNewSoundID], a
+	call PlaySound ; stop music
+	pop af
+	ld [H_LOADEDROMBANK], a
+	ld [MBC1RomBank], a
+	ld c, 20
+	call DelayFrames
+	coord hl, 6, 5
+	ld b, 7
+	ld c, 7
+	call ClearScreenArea
+	call LoadTextBoxTilePatterns
+	ld a, 1
+	ld [wUpdateSpritesEnabled], a
+	ld c, 50
+	call DelayFrames
+	call GBFadeOutToWhite
+	jp ClearScreen
+OakSpeechText1:
+	TX_FAR _OakSpeechText1
+	db "@"
+OakSpeechText2:
+	TX_FAR _OakSpeechText2A
+	TX_CRY_NIDORINA
+	TX_FAR _OakSpeechText2B
+	db "@"
+IntroducePlayerText:
+	TX_FAR _IntroducePlayerText
+	db "@"
+IntroduceRivalText:
+	TX_FAR _IntroduceRivalText
+	db "@"
+OakSpeechText3:
+	TX_FAR _OakSpeechText3
+	db "@"
+
+FadeInIntroPic:
+	ld hl, IntroFadePalettes
+	ld b, 6
+.next
+	ld a, [hli]
+	ld [rBGP], a
+	ld c, 10
+	call DelayFrames
+	dec b
+	jr nz, .next
+	ret
+
+IntroFadePalettes:
+	db %01010100
+	db %10101000
+	db %11111100
+	db %11111000
+	db %11110100
+	db %11100100
+
+MovePicLeft:
+	ld a, 119
+	ld [rWX], a
+	call DelayFrame
+
+	ld a, %11100100
+	ld [rBGP], a
+.next
+	call DelayFrame
+	ld a, [rWX]
+	sub 8
+	cp $FF
+	ret z
+	ld [rWX], a
+	jr .next
+
+DisplayPicCenteredOrUpperRight:
+	call GetPredefRegisters
+IntroDisplayPicCenteredOrUpperRight:
+; b = bank
+; de = address of compressed pic
+; c: 0 = centred, non-zero = upper-right
+	push bc
+	ld a, b
+	call UncompressSpriteFromDE
+	ld hl, sSpriteBuffer1
+	ld de, sSpriteBuffer0
+	ld bc, $310
+	call CopyData
+	ld de, vFrontPic
+	call InterlaceMergeSpriteBuffers
+	pop bc
+	ld a, c
+	and a
+	coord hl, 15, 1
+	jr nz, .next
+	coord hl, 6, 4
+.next
+	xor a
+	ld [hStartTileID], a
+	predef_jump CopyUncompressedPicToTilemap
diff --git a/engine/movie/oak_speech/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm
new file mode 100755
index 00000000..fdc9ffa3
--- /dev/null
+++ b/engine/movie/oak_speech/oak_speech2.asm
@@ -0,0 +1,219 @@
+ChoosePlayerName:
+	call OakSpeechSlidePicRight
+	ld de, DefaultNamesPlayer
+	call DisplayIntroNameTextBox
+	ld a, [wCurrentMenuItem]
+	and a
+	jr z, .customName
+	ld hl, DefaultNamesPlayerList
+	call GetDefaultName
+	ld de, wPlayerName
+	call OakSpeechSlidePicLeft
+	jr .done
+.customName
+	ld hl, wPlayerName
+	xor a ; NAME_PLAYER_SCREEN
+	ld [wNamingScreenType], a
+	call DisplayNamingScreen
+	ld a, [wcf4b]
+	cp "@"
+	jr z, .customName
+	call ClearScreen
+	call Delay3
+	ld de, RedPicFront
+	ld b, BANK(RedPicFront)
+	call IntroDisplayPicCenteredOrUpperRight
+.done
+	ld hl, YourNameIsText
+	jp PrintText
+
+YourNameIsText:
+	TX_FAR _YourNameIsText
+	db "@"
+
+ChooseRivalName:
+	call OakSpeechSlidePicRight
+	ld de, DefaultNamesRival
+	call DisplayIntroNameTextBox
+	ld a, [wCurrentMenuItem]
+	and a
+	jr z, .customName
+	ld hl, DefaultNamesRivalList
+	call GetDefaultName
+	ld de, wRivalName
+	call OakSpeechSlidePicLeft
+	jr .done
+.customName
+	ld hl, wRivalName
+	ld a, NAME_RIVAL_SCREEN
+	ld [wNamingScreenType], a
+	call DisplayNamingScreen
+	ld a, [wcf4b]
+	cp "@"
+	jr z, .customName
+	call ClearScreen
+	call Delay3
+	ld de, Rival1Pic
+	ld b, $13
+	call IntroDisplayPicCenteredOrUpperRight
+.done
+	ld hl, HisNameIsText
+	jp PrintText
+
+HisNameIsText:
+	TX_FAR _HisNameIsText
+	db "@"
+
+OakSpeechSlidePicLeft:
+	push de
+	coord hl, 0, 0
+	lb bc, 12, 11
+	call ClearScreenArea ; clear the name list text box
+	ld c, 10
+	call DelayFrames
+	pop de
+	ld hl, wcd6d
+	ld bc, NAME_LENGTH
+	call CopyData
+	call Delay3
+	coord hl, 12, 4
+	lb de, 6, 6 * SCREEN_WIDTH + 5
+	ld a, $ff
+	jr OakSpeechSlidePicCommon
+
+OakSpeechSlidePicRight:
+	coord hl, 5, 4
+	lb de, 6, 6 * SCREEN_WIDTH + 5
+	xor a
+
+OakSpeechSlidePicCommon:
+	push hl
+	push de
+	push bc
+	ld [hSlideDirection], a
+	ld a, d
+	ld [hSlideAmount], a
+	ld a, e
+	ld [hSlidingRegionSize], a
+	ld c, a
+	ld a, [hSlideDirection]
+	and a
+	jr nz, .next
+; If sliding right, point hl to the end of the pic's tiles.
+	ld d, 0
+	add hl, de
+.next
+	ld d, h
+	ld e, l
+.loop
+	xor a
+	ld [H_AUTOBGTRANSFERENABLED], a
+	ld a, [hSlideDirection]
+	and a
+	jr nz, .slideLeft
+; sliding right
+	ld a, [hli]
+	ld [hld], a
+	dec hl
+	jr .next2
+.slideLeft
+	ld a, [hld]
+	ld [hli], a
+	inc hl
+.next2
+	dec c
+	jr nz, .loop
+	ld a, [hSlideDirection]
+	and a
+	jr z, .next3
+; If sliding left, we need to zero the last tile in the pic (there is no need
+; to take a corresponding action when sliding right because hl initially points
+; to a 0 tile in that case).
+	xor a
+	dec hl
+	ld [hl], a
+.next3
+	ld a, 1
+	ld [H_AUTOBGTRANSFERENABLED], a
+	call Delay3
+	ld a, [hSlidingRegionSize]
+	ld c, a
+	ld h, d
+	ld l, e
+	ld a, [hSlideDirection]
+	and a
+	jr nz, .slideLeft2
+	inc hl
+	jr .next4
+.slideLeft2
+	dec hl
+.next4
+	ld d, h
+	ld e, l
+	ld a, [hSlideAmount]
+	dec a
+	ld [hSlideAmount], a
+	jr nz, .loop
+	pop bc
+	pop de
+	pop hl
+	ret
+
+DisplayIntroNameTextBox:
+	push de
+	coord hl, 0, 0
+	ld b, $a
+	ld c, $9
+	call TextBoxBorder
+	coord hl, 3, 0
+	ld de, .namestring
+	call PlaceString
+	pop de
+	coord hl, 2, 2
+	call PlaceString
+	call UpdateSprites
+	xor a
+	ld [wCurrentMenuItem], a
+	ld [wLastMenuItem], a
+	inc a
+	ld [wTopMenuItemX], a
+	ld [wMenuWatchedKeys], a ; A_BUTTON
+	inc a
+	ld [wTopMenuItemY], a
+	inc a
+	ld [wMaxMenuItem], a
+	jp HandleMenuInput
+
+.namestring
+	db "NAME@"
+
+INCLUDE "text/player_names.asm"
+
+GetDefaultName:
+; a = name index
+; hl = name list
+	ld b, a
+	ld c, 0
+.loop
+	ld d, h
+	ld e, l
+.innerLoop
+	ld a, [hli]
+	cp "@"
+	jr nz, .innerLoop
+	ld a, b
+	cp c
+	jr z, .foundName
+	inc c
+	jr .loop
+.foundName
+	ld h, d
+	ld l, e
+	ld de, wcd6d
+	ld bc, $14
+	jp CopyData
+
+INCLUDE "text/player_names_list.asm"
+
+TextTerminator_6b20:
+	db "@"
diff --git a/engine/movie/oak_speech2.asm b/engine/movie/oak_speech2.asm
deleted file mode 100755
index fdc9ffa3..00000000
--- a/engine/movie/oak_speech2.asm
+++ /dev/null
@@ -1,219 +0,0 @@
-ChoosePlayerName:
-	call OakSpeechSlidePicRight
-	ld de, DefaultNamesPlayer
-	call DisplayIntroNameTextBox
-	ld a, [wCurrentMenuItem]
-	and a
-	jr z, .customName
-	ld hl, DefaultNamesPlayerList
-	call GetDefaultName
-	ld de, wPlayerName
-	call OakSpeechSlidePicLeft
-	jr .done
-.customName
-	ld hl, wPlayerName
-	xor a ; NAME_PLAYER_SCREEN
-	ld [wNamingScreenType], a
-	call DisplayNamingScreen
-	ld a, [wcf4b]
-	cp "@"
-	jr z, .customName
-	call ClearScreen
-	call Delay3
-	ld de, RedPicFront
-	ld b, BANK(RedPicFront)
-	call IntroDisplayPicCenteredOrUpperRight
-.done
-	ld hl, YourNameIsText
-	jp PrintText
-
-YourNameIsText:
-	TX_FAR _YourNameIsText
-	db "@"
-
-ChooseRivalName:
-	call OakSpeechSlidePicRight
-	ld de, DefaultNamesRival
-	call DisplayIntroNameTextBox
-	ld a, [wCurrentMenuItem]
-	and a
-	jr z, .customName
-	ld hl, DefaultNamesRivalList
-	call GetDefaultName
-	ld de, wRivalName
-	call OakSpeechSlidePicLeft
-	jr .done
-.customName
-	ld hl, wRivalName
-	ld a, NAME_RIVAL_SCREEN
-	ld [wNamingScreenType], a
-	call DisplayNamingScreen
-	ld a, [wcf4b]
-	cp "@"
-	jr z, .customName
-	call ClearScreen
-	call Delay3
-	ld de, Rival1Pic
-	ld b, $13
-	call IntroDisplayPicCenteredOrUpperRight
-.done
-	ld hl, HisNameIsText
-	jp PrintText
-
-HisNameIsText:
-	TX_FAR _HisNameIsText
-	db "@"
-
-OakSpeechSlidePicLeft:
-	push de
-	coord hl, 0, 0
-	lb bc, 12, 11
-	call ClearScreenArea ; clear the name list text box
-	ld c, 10
-	call DelayFrames
-	pop de
-	ld hl, wcd6d
-	ld bc, NAME_LENGTH
-	call CopyData
-	call Delay3
-	coord hl, 12, 4
-	lb de, 6, 6 * SCREEN_WIDTH + 5
-	ld a, $ff
-	jr OakSpeechSlidePicCommon
-
-OakSpeechSlidePicRight:
-	coord hl, 5, 4
-	lb de, 6, 6 * SCREEN_WIDTH + 5
-	xor a
-
-OakSpeechSlidePicCommon:
-	push hl
-	push de
-	push bc
-	ld [hSlideDirection], a
-	ld a, d
-	ld [hSlideAmount], a
-	ld a, e
-	ld [hSlidingRegionSize], a
-	ld c, a
-	ld a, [hSlideDirection]
-	and a
-	jr nz, .next
-; If sliding right, point hl to the end of the pic's tiles.
-	ld d, 0
-	add hl, de
-.next
-	ld d, h
-	ld e, l
-.loop
-	xor a
-	ld [H_AUTOBGTRANSFERENABLED], a
-	ld a, [hSlideDirection]
-	and a
-	jr nz, .slideLeft
-; sliding right
-	ld a, [hli]
-	ld [hld], a
-	dec hl
-	jr .next2
-.slideLeft
-	ld a, [hld]
-	ld [hli], a
-	inc hl
-.next2
-	dec c
-	jr nz, .loop
-	ld a, [hSlideDirection]
-	and a
-	jr z, .next3
-; If sliding left, we need to zero the last tile in the pic (there is no need
-; to take a corresponding action when sliding right because hl initially points
-; to a 0 tile in that case).
-	xor a
-	dec hl
-	ld [hl], a
-.next3
-	ld a, 1
-	ld [H_AUTOBGTRANSFERENABLED], a
-	call Delay3
-	ld a, [hSlidingRegionSize]
-	ld c, a
-	ld h, d
-	ld l, e
-	ld a, [hSlideDirection]
-	and a
-	jr nz, .slideLeft2
-	inc hl
-	jr .next4
-.slideLeft2
-	dec hl
-.next4
-	ld d, h
-	ld e, l
-	ld a, [hSlideAmount]
-	dec a
-	ld [hSlideAmount], a
-	jr nz, .loop
-	pop bc
-	pop de
-	pop hl
-	ret
-
-DisplayIntroNameTextBox:
-	push de
-	coord hl, 0, 0
-	ld b, $a
-	ld c, $9
-	call TextBoxBorder
-	coord hl, 3, 0
-	ld de, .namestring
-	call PlaceString
-	pop de
-	coord hl, 2, 2
-	call PlaceString
-	call UpdateSprites
-	xor a
-	ld [wCurrentMenuItem], a
-	ld [wLastMenuItem], a
-	inc a
-	ld [wTopMenuItemX], a
-	ld [wMenuWatchedKeys], a ; A_BUTTON
-	inc a
-	ld [wTopMenuItemY], a
-	inc a
-	ld [wMaxMenuItem], a
-	jp HandleMenuInput
-
-.namestring
-	db "NAME@"
-
-INCLUDE "text/player_names.asm"
-
-GetDefaultName:
-; a = name index
-; hl = name list
-	ld b, a
-	ld c, 0
-.loop
-	ld d, h
-	ld e, l
-.innerLoop
-	ld a, [hli]
-	cp "@"
-	jr nz, .innerLoop
-	ld a, b
-	cp c
-	jr z, .foundName
-	inc c
-	jr .loop
-.foundName
-	ld h, d
-	ld l, e
-	ld de, wcd6d
-	ld bc, $14
-	jp CopyData
-
-INCLUDE "text/player_names_list.asm"
-
-TextTerminator_6b20:
-	db "@"
diff --git a/main.asm b/main.asm
index 50930bb4..1c3b5800 100755
--- a/main.asm
+++ b/main.asm
@@ -25,11 +25,11 @@ INCLUDE "engine/events/pick_up_item.asm"
 INCLUDE "engine/overworld/movement.asm"
 INCLUDE "engine/link/cable_club.asm"
 INCLUDE "engine/menus/main_menu.asm"
-INCLUDE "engine/movie/oak_speech.asm"
+INCLUDE "engine/movie/oak_speech/oak_speech.asm"
 INCLUDE "engine/overworld/special_warps.asm"
 INCLUDE "engine/debug/debug_party.asm"
 INCLUDE "engine/menus/naming_screen.asm"
-INCLUDE "engine/movie/oak_speech2.asm"
+INCLUDE "engine/movie/oak_speech/oak_speech2.asm"
 INCLUDE "engine/items/subtract_paid_money.asm"
 INCLUDE "engine/menus/swap_items.asm"
 INCLUDE "engine/events/pokemart.asm"
@@ -70,7 +70,7 @@ INCLUDE "engine/pokemon/add_mon.asm"
 INCLUDE "engine/flag_action.asm"
 INCLUDE "engine/events/heal_party.asm"
 INCLUDE "engine/math/bcd.asm"
-INCLUDE "engine/movie/init_player_data.asm"
+INCLUDE "engine/movie/oak_speech/init_player_data.asm"
 INCLUDE "engine/items/get_bag_item_quantity.asm"
 INCLUDE "engine/overworld/pathfinding.asm"
 INCLUDE "engine/gfx/hp_bar.asm"
@@ -150,7 +150,7 @@ INCLUDE "engine/overworld/ledges.asm"
 SECTION "bank7_1", ROMX
 
 INCLUDE "text/monster_names.asm"
-INCLUDE "engine/movie/clear_save.asm"
+INCLUDE "engine/movie/oak_speech/clear_save.asm"
 INCLUDE "engine/events/elevator.asm"
 
 
-- 
cgit v1.3.1-sl0p