diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-05-31 23:37:33 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-31 23:37:33 +0100 |
| commit | 6cffcf0ee5f4e04ce4e79f30645938e0b58f4650 (patch) | |
| tree | 5afeb1fde81971ba32843e7119c8d9c3c9f8eb56 /arm9/src/script_buffers.c | |
| parent | b6ac07c654c6071067fc4b7c839c17fbe3f4b1ac (diff) | |
| parent | 901807cd6f693ffa9941ddd167ef0ad9a5cf3d51 (diff) | |
Merge branch 'master' into make_naix
Diffstat (limited to 'arm9/src/script_buffers.c')
| -rw-r--r-- | arm9/src/script_buffers.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/src/script_buffers.c b/arm9/src/script_buffers.c index 596056b1..1242d550 100644 --- a/arm9/src/script_buffers.c +++ b/arm9/src/script_buffers.c @@ -20,8 +20,8 @@ extern u32 GetCityNamesMsgdataIdByCountry(u32); extern void GetECWordIntoStringByIndex(u32 a0, struct String * a1); extern void StringCat_HandleTrainerName(struct String * dest, const struct String * src); extern void StrAddChar(struct String * str, u16 val); -extern void * FUN_02006BB0(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); -extern void * UncompressFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd); +extern void * GfGfxLoader_GetCharData(NarcId, s32, s32, struct UnkStruct_0200B870_sub **, u32); +extern void * GfGfxLoader_LoadFromNarc(NarcId narcId, s32 memberNo, BOOL isCompressed, u32 heap_id, BOOL allocAtEnd); const u16 UNK_020ECE6C[][2] = { { 0x0140, 0x0008 }, @@ -751,7 +751,7 @@ struct UnkStruct_0200B870 * MessagePrinter_new(u32 r5, u32 r6, u32 sp4, u32 r4) struct UnkStruct_0200B870 * sp8 = AllocFromHeap(r4, sizeof(struct UnkStruct_0200B870)); if (sp8 != NULL) { - sp8->unk_0 = FUN_02006BB0(NARC_GRAPHIC_FONT, 4, 1, &sp8->unk_4, r4); + sp8->unk_0 = GfGfxLoader_GetCharData(NARC_GRAPHIC_FONT, 4, 1, &sp8->unk_4, r4); int i; u8 * ptr = sp8->unk_4->unk_14; for (i = 0; i < sp8->unk_4->unk_10; i++) |