diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-06-01 20:40:37 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-01 20:40:37 +0100 |
| commit | 389b33f7d8499cab5b3b9e2ba21d786b1059c059 (patch) | |
| tree | f02042907a117ce618b0a67c0b5cd82fc45cfcd7 /arm9/modules/31 | |
| parent | 5a73f4f645faf368cf8e20cfe4793e2b12672472 (diff) | |
| parent | f67d6fe193eeee8058a45934d08c3b883cc08eb9 (diff) | |
Merge branch 'master' into unkk_020851B8
Diffstat (limited to 'arm9/modules/31')
| -rw-r--r-- | arm9/modules/31/asm/module_31.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arm9/modules/31/asm/module_31.s b/arm9/modules/31/asm/module_31.s index 7dcd4e3a..5e45ce23 100644 --- a/arm9/modules/31/asm/module_31.s +++ b/arm9/modules/31/asm/module_31.s @@ -366,7 +366,7 @@ MOD31_02254AD4: ; 0x02254AD4 str r0, [sp, #8] mov r0, #0xc mov r1, #2 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #0 str r0, [sp] mov r2, #1 @@ -377,7 +377,7 @@ MOD31_02254AD4: ; 0x02254AD4 mov r0, #0xc mov r1, #0x34 lsl r3, r3, #8 - bl FUN_02006A34 + bl GfGfxLoader_LoadWholePalette mov r0, #8 str r0, [sp] add r0, r7, #0 @@ -538,7 +538,7 @@ MOD31_02254C0C: ; 0x02254C0C mov r0, #0xc mov r1, #0x31 mov r3, #6 - bl FUN_0200687C + bl GfGfxLoader_LoadCharData mov r0, #0 str r0, [sp] str r0, [sp, #4] @@ -550,7 +550,7 @@ MOD31_02254C0C: ; 0x02254C0C mov r0, #0xc mov r1, #0x30 mov r3, #6 - bl FUN_020068C8 + bl GfGfxLoader_LoadScrnData mov r0, #0 add r1, r0, #0 bl MOD20_02252D7C |