diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-09-25 13:56:50 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-25 13:56:50 -0400 |
| commit | 1d4234bd7e295c553485b7d676d42c838e4762c4 (patch) | |
| tree | 67ac4179d9978baf4e989ef55245e4be0d777c04 /src/trainer_tower.c | |
| parent | 7f6d86a8bf2afe349135d502debc2237bafafff5 (diff) | |
| parent | 931bf4ce4b4fd7ea63d00f36adfd2bf720831a80 (diff) | |
Merge branch 'master' into PIE2
Diffstat (limited to 'src/trainer_tower.c')
| -rw-r--r-- | src/trainer_tower.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/trainer_tower.c b/src/trainer_tower.c index 7194d2271..da3cf6dda 100644 --- a/src/trainer_tower.c +++ b/src/trainer_tower.c @@ -17,7 +17,7 @@ #include "battle_setup.h" #include "battle_transition.h" #include "battle.h" -#include "battle_2.h" +#include "battle_main.h" #include "overworld.h" #include "item.h" #include "window.h" @@ -626,12 +626,12 @@ void sub_815DA28(u8 * dest) StringCopyN(dest, gUnknown_203F45C->unk_00, 11); } -u8 sub_815DA3C(void) +u8 GetTrainerTowerTrainerFrontSpriteId(void) { return gFacilityClassToPicIndex[gUnknown_203F45C->unk_3D]; } -void sub_815DA54(void) +void InitTrainerTowerBattleStruct(void) { u16 r10; s32 r9; @@ -660,7 +660,7 @@ void sub_815DA54(void) sub_815DD2C(); } -void sub_815DBDC(void) +void FreeTrainerTowerBattleStruct(void) { Free(gUnknown_203F45C); gUnknown_203F45C = NULL; @@ -1122,7 +1122,7 @@ void sub_815E124(u8 taskId) void sub_815E160(void) { - gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_FACTORY; + gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_TRAINER_TOWER; if (gUnknown_203F458->unk_0004.trainers[gUnknown_203F458->unk_0000].unk_002 == 1) gBattleTypeFlags |= BATTLE_TYPE_DOUBLE; gTrainerBattleOpponent_A = 0; |