diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-02 22:13:57 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-02 22:13:57 +0100 |
| commit | 9d3d4a2acff67f43896e9e0dcd26e7aaeb55e3b3 (patch) | |
| tree | d707aa8fead427dadbbb29b886875e6c8961bd5a /arm9/modules/28 | |
| parent | a2a17a9426f16ee601ff17840b8bb7851fef7138 (diff) | |
| parent | 7e32d3758e7e36d7a67a1442cdb9386f9aa18a6e (diff) | |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'arm9/modules/28')
| -rw-r--r-- | arm9/modules/28/asm/module_28.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/28/asm/module_28.s b/arm9/modules/28/asm/module_28.s index 618309d1..04176ba5 100644 --- a/arm9/modules/28/asm/module_28.s +++ b/arm9/modules/28/asm/module_28.s @@ -559,7 +559,7 @@ MOD28_02254C18: ; 0x02254C18 mov r0, #0xc mov r1, #7 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r2, #0 str r2, [sp] mov r0, #0x20 @@ -623,7 +623,7 @@ MOD28_02254CB4: ; 0x02254CB4 mov r0, #0xc mov r1, #0x23 lsl r3, r0, #9 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0x13 mov r1, #8 bl NARC_ctor @@ -670,7 +670,7 @@ _02254D24: bl NARC_AllocAndReadWholeMember add r1, sp, #0x2c str r0, [sp, #0x20] - bl FUN_020B0088 + bl NNS_G2dGetUnpackedCharacterData ldr r0, [sp, #0x2c] mov r1, #1 ldr r0, [r0, #0x14] @@ -744,7 +744,7 @@ _02254D24: bl MOD20_02253F9C b _02254DE0 _02254DDC: - bl ErrorHandling + bl GF_AssertFail _02254DE0: ldrh r0, [r4, #8] mov r1, #0x1c ; BASE_FLIP |