diff options
| author | red031000 <rubenru09@aol.com> | 2021-03-18 15:19:09 +0000 |
|---|---|---|
| committer | red031000 <rubenru09@aol.com> | 2021-03-18 15:19:09 +0000 |
| commit | 8b699fd13008875cf59601d6a8c9d55bd3f8ae08 (patch) | |
| tree | a5c9cb8bc44c13d396ff549a0b2928fd49c2e9cb /arm9/src/trainer_data.c | |
| parent | bee5e11870b47027235c63794f20dc4cccaac92e (diff) | |
| parent | 941451f6408b8f92f9e7f5f3d6650f1b2ad2293d (diff) | |
Merge branch 'master' of https://github.com/pret/pokediamond
Diffstat (limited to 'arm9/src/trainer_data.c')
| -rw-r--r-- | arm9/src/trainer_data.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arm9/src/trainer_data.c b/arm9/src/trainer_data.c index 7af4b2ce..f161b302 100644 --- a/arm9/src/trainer_data.c +++ b/arm9/src/trainer_data.c @@ -6,11 +6,10 @@ #include "proto.h" #include "msgdata.h" #include "constants/trainer_classes.h" +#include "unk_02024E64.h" #pragma thumb on -extern void * FUN_02024EC0(struct SaveBlock2 *); -extern u16 * FUN_02024EE8(void *); // Loads all battle opponents, including multi-battle partner if exists. void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2 * sav2, u32 heap_id) @@ -23,7 +22,7 @@ void EnemyTrainerSet_Init(struct BattleSetupStruct * enemies, struct SaveBlock2 // FIXME: String formatting in files/msgdata/msg/narc_0559.txt is abnormal. msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 559, heap_id); - rivalName = FUN_02024EE8(FUN_02024EC0(sav2)); + rivalName = GetRivalNamePtr(FUN_02024EC0(sav2)); for (i = 0; i < 4; i++) { if (enemies->trainer_idxs[i] != 0) |