summaryrefslogtreecommitdiff
path: root/main.asm
diff options
context:
space:
mode:
authorRemy Oukaour <remy.oukaour@gmail.com>2018-01-06 18:53:30 -0500
committerRemy Oukaour <remy.oukaour@gmail.com>2018-01-06 18:53:30 -0500
commitbdd3a55333d0acd1d764327dcebb4a14d9586f05 (patch)
tree3e8f7bb7e6707f111f247c682b1e268600dfd64c /main.asm
parent9069a395db48fad1975f6ff153c12a736dfacb2f (diff)
Organize mobile/battle_tower_*.asm data and code
Diffstat (limited to 'main.asm')
-rw-r--r--main.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/main.asm b/main.asm
index 5c036e3d8..73b9403f0 100644
--- a/main.asm
+++ b/main.asm
@@ -244,7 +244,7 @@ INCLUDE "engine/stats_screen.asm"
INCLUDE "engine/events/catch_tutorial.asm"
INCLUDE "engine/evolution_animation.asm"
INCLUDE "engine/init_hof_credits.asm"
-INCLUDE "mobile/get_trainer_class.asm"
+INCLUDE "engine/events/battle_tower/get_trainer_class.asm"
INCLUDE "engine/battle/sliding_intro.asm"
INCLUDE "mobile/print_opp_message.asm"
INCLUDE "engine/battle/checkbattlescene.asm"
@@ -321,7 +321,7 @@ INCLUDE "mobile/mobile_22.asm"
INCLUDE "engine/events/crystal_unown.asm"
INCLUDE "engine/events/buena.asm"
INCLUDE "engine/events/dratini.asm"
-INCLUDE "engine/events/battle_tower_rules.asm"
+INCLUDE "engine/events/battle_tower/rules.asm"
INCLUDE "mobile/mobile_22_2.asm"
@@ -534,7 +534,7 @@ INCLUDE "mobile/mobile_46.asm"
SECTION "Battle Tower", ROMX
-INCLUDE "mobile/battle_tower_47.asm"
+INCLUDE "engine/events/battle_tower/trainer_text.asm"
SECTION "bank5B", ROMX
@@ -629,7 +629,7 @@ INCLUDE "text/battle_tower.asm"
SECTION "Battle Tower Trainer Data", ROMX
-INCLUDE "data/battle_tower_2.asm"
+INCLUDE "data/battle_tower/unknown.asm"
SECTION "Mobile News Data", ROMX
@@ -639,7 +639,7 @@ INCLUDE "mobile/news/news.asm"
SECTION "Crystal Events", ROMX
-INCLUDE "engine/events/battle_tower.asm"
+INCLUDE "engine/events/battle_tower/load_trainer.asm"
INCLUDE "engine/events/odd_egg.asm"