diff options
| -rw-r--r-- | ld_script.txt | 4 | ||||
| -rw-r--r-- | src/field/battle_tower.c (renamed from src/battle_tower.c) | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/ld_script.txt b/ld_script.txt index 16b09ed87..8bd51678a 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -231,7 +231,7 @@ SECTIONS { src/field/fldeff_softboiled.o(.text); src/field/decoration_inventory.o(.text); src/field/roamer.o(.text); - src/battle_tower.o(.text); + src/field/battle_tower.o(.text); src/field/use_pokeblock.o(.text); src/battle/battle_controller_wally.o(.text); src/field/player_pc.o(.text); @@ -444,7 +444,7 @@ SECTIONS { src/pokemon/learn_move.o(.rodata); src/field/decoration_inventory.o(.rodata); src/field/roamer.o(.rodata); - src/battle_tower.o(.rodata); + src/field/battle_tower.o(.rodata); src/field/use_pokeblock.o(.rodata); src/battle/battle_controller_wally.o(.rodata); src/field/player_pc.o(.rodata); diff --git a/src/battle_tower.c b/src/field/battle_tower.c index c85e1b8f5..90ecc457a 100644 --- a/src/battle_tower.c +++ b/src/field/battle_tower.c @@ -26,9 +26,9 @@ #include "vars.h" #if ENGLISH -#include "data/battle_tower/trainers.h" +#include "../data/battle_tower/trainers.h" #elif GERMAN -#include "data/battle_tower/trainers_de.h" +#include "../data/battle_tower/trainers_de.h" #endif static const u16 sBattleTowerHeldItems[] = { @@ -97,8 +97,8 @@ static const u16 sBattleTowerHeldItems[] = { ITEM_GANLON_BERRY, }; -#include "data/battle_tower/level_50_mons.h" -#include "data/battle_tower/level_100_mons.h" +#include "../data/battle_tower/level_50_mons.h" +#include "../data/battle_tower/level_100_mons.h" static const u8 sMaleTrainerClasses[] = { TRAINER_CLASS_RUIN_MANIAC, |