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/script_buffers.c | |
| parent | 267cb812e827604d4829d3afe28a82b0970d3706 (diff) | |
| parent | 85a8a2bd43633e11af094d66a35f3c32dc7c8bfe (diff) | |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'arm9/src/script_buffers.c')
| -rw-r--r-- | arm9/src/script_buffers.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 431f63b4..e9a55051 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -11,11 +11,10 @@ #include "unk_0201B8B8.h" #include "trainer_data.h" #include "script_buffers.h" +#include "unk_02024E64.h" #pragma thumb on -extern void * FUN_02024EC0(struct SaveBlock2 * sav2); -extern u16 * FUN_02024EE8(void *); extern u32 GetCityNamesMsgdataIdByCountry(u32); extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1); extern void StringCat_HandleTrainerName(struct String * dest, const struct String * src); @@ -131,7 +130,7 @@ void BufferPlayersName(struct ScrStrBufs * mgr, u32 idx, struct PlayerData * dat void BufferRivalsName(struct ScrStrBufs * mgr, u32 idx, struct SaveBlock2 * sav2) { - u16 * name = FUN_02024EE8(FUN_02024EC0(sav2)); + u16 * name = GetRivalNamePtr(FUN_02024EC0(sav2)); CopyU16ArrayToString(mgr->tmpbuf, name); SetStringAsPlaceholder(mgr, idx, mgr->tmpbuf, NULL); } |