diff options
| author | who-knows-who <j.williams97@outlook.com> | 2021-04-17 12:48:19 +0100 |
|---|---|---|
| committer | who-knows-who <j.williams97@outlook.com> | 2021-04-17 12:48:19 +0100 |
| commit | 996d9d78106cf4ab601815550ba77a92ab678328 (patch) | |
| tree | 9a92b4f792a11466cdee719b18ed449dee2e27fc /arm9/src/trainer_data.c | |
| parent | 267cb812e827604d4829d3afe28a82b0970d3706 (diff) | |
| parent | 85a8a2bd43633e11af094d66a35f3c32dc7c8bfe (diff) | |
Merge branch 'master' into 0202A1E0
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) |