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/19 | |
parent | a2a17a9426f16ee601ff17840b8bb7851fef7138 (diff) | |
parent | 7e32d3758e7e36d7a67a1442cdb9386f9aa18a6e (diff) |
Merge branch 'master' into 0202A1E0
Diffstat (limited to 'arm9/modules/19')
-rw-r--r-- | arm9/modules/19/asm/module_19.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/19/asm/module_19.s b/arm9/modules/19/asm/module_19.s index 91c756c6..8f3a28ce 100644 --- a/arm9/modules/19/asm/module_19.s +++ b/arm9/modules/19/asm/module_19.s @@ -42,7 +42,7 @@ MOD19_02252440: ; 0x02252440 mov r1, #0xa add r2, r4, #0 mov r3, #4 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -54,7 +54,7 @@ MOD19_02252440: ; 0x02252440 mov r1, #0xb add r2, r4, #0 mov r3, #4 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0x20 str r0, [sp] mov r0, #8 @@ -63,7 +63,7 @@ MOD19_02252440: ; 0x02252440 add r1, r0, #0 mov r2, #4 mov r3, #0 - bl FUN_02006930 + bl GfGfxLoader_GXLoadPal ldr r2, _022524E0 ; =0x04001000 ldr r0, _022524EC ; =0xFFFF1FFF ldr r1, [r2] |