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/29 | |
| parent | a2a17a9426f16ee601ff17840b8bb7851fef7138 (diff) | |
| parent | 7e32d3758e7e36d7a67a1442cdb9386f9aa18a6e (diff) | |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'arm9/modules/29')
| -rw-r--r-- | arm9/modules/29/asm/module_29.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/29/asm/module_29.s b/arm9/modules/29/asm/module_29.s index 723e8449..9fb45a65 100644 --- a/arm9/modules/29/asm/module_29.s +++ b/arm9/modules/29/asm/module_29.s @@ -539,7 +539,7 @@ MOD29_02254C08: ; 0x02254C08 str r0, [sp, #8] mov r0, #0xc mov r1, #0x2a - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette add r2, r6, #0 ldr r0, [r6, #0x30] ldr r1, _02254C7C ; =MOD29_022550C0 @@ -684,7 +684,7 @@ MOD29_02254D10: ; 0x02254D10 mov r0, #0xc mov r1, #0x27 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -696,7 +696,7 @@ MOD29_02254D10: ; 0x02254D10 mov r0, #0xc mov r1, #0x26 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C |