From 841866478a047e1879804eeee93a2f6113fa5295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Tue, 16 Mar 2021 11:15:23 +0100 Subject: cleanup --- arm9/src/script_buffers.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'arm9/src/script_buffers.c') diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 431f63b4..293c0bac 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); -- cgit v1.2.3 From b80100f71232394f72f2a278ff30c78e46b3ffd4 Mon Sep 17 00:00:00 2001 From: tgsm Date: Wed, 17 Mar 2021 00:33:05 -0400 Subject: unk_02024E64: use a struct for storing information Also add a missing include guard and name a couple of functions. --- arm9/src/script_buffers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arm9/src/script_buffers.c') diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 293c0bac..e9a55051 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -130,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); } -- cgit v1.2.3