diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-02 21:03:52 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-02 21:03:52 -0700 |
| commit | 08e6fb5382bb4e2104d370783d15b4a2a3c65a2a (patch) | |
| tree | 9c71b110b696c3e0c285d1a5278c69cf78610369 /src/battle/battle_message.c | |
| parent | d783f420001b67c19f8d81bbc94d266af98e89ad (diff) | |
| parent | 24b1dee67f5d91272f432cd2aee4ee92125fcbcb (diff) | |
Merge pull request #453 from huderlem/battle_tower
Decompile battle_tower
Diffstat (limited to 'src/battle/battle_message.c')
| -rw-r--r-- | src/battle/battle_message.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index a3cc320ad..79855a614 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -1,6 +1,7 @@ #include "global.h" -#include "battle_message.h" #include "battle.h" +#include "battle_message.h" +#include "battle_tower.h" #include "item.h" #include "items.h" #include "pokemon.h" @@ -127,7 +128,6 @@ u8 GetBankSide(u8 bank); s32 sub_803FC34(u16); void get_trainer_name(u8* dst); u8 get_trainer_class_name_index(void); -u8 sub_8135FD8(void); u8 GetMultiplayerId(void); u8 GetBankByPlayerAI(u8 ID); u8 GetBankSide(u8 bank); @@ -632,7 +632,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) else if (gBattleTypeFlags & BATTLE_TYPE_BATTLE_TOWER) toCpy = gTrainerClassNames[get_trainer_class_name_index()]; else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) - toCpy = gTrainerClassNames[sub_8135FD8()]; + toCpy = gTrainerClassNames[GetEReaderTrainerClassNameIndex()]; else toCpy = gTrainerClassNames[gTrainers[gTrainerBattleOpponent].trainerClass]; break; @@ -661,7 +661,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) } else if (gBattleTypeFlags & BATTLE_TYPE_EREADER_TRAINER) { - sub_8135FF4(text); + SetEReaderTrainerName(text); toCpy = text; } else |