diff --git a/engine/movie/clear_save.asm b/engine/movie/oak_speech/clear_save.asm similarity index 100% rename from engine/movie/clear_save.asm rename to engine/movie/oak_speech/clear_save.asm diff --git a/engine/movie/init_player_data.asm b/engine/movie/oak_speech/init_player_data.asm similarity index 100% rename from engine/movie/init_player_data.asm rename to engine/movie/oak_speech/init_player_data.asm diff --git a/engine/movie/oak_speech.asm b/engine/movie/oak_speech/oak_speech.asm similarity index 100% rename from engine/movie/oak_speech.asm rename to engine/movie/oak_speech/oak_speech.asm diff --git a/engine/movie/oak_speech2.asm b/engine/movie/oak_speech/oak_speech2.asm similarity index 100% rename from engine/movie/oak_speech2.asm rename to engine/movie/oak_speech/oak_speech2.asm 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"