diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-25 13:23:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-25 13:23:02 -0400 |
| commit | 5e0e326b75402a36c4d31502b8b5a05b862ac23c (patch) | |
| tree | 1b5807c1efb72dbdd9d01f329cefb41171913a64 /arm9/asm/unk_020142EC.s | |
| parent | 1f9d4503c898f9138422215132b53224571a281a (diff) | |
| parent | 68d7aa47cc52ef822220e0e35890863d7cad479f (diff) | |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'arm9/asm/unk_020142EC.s')
| -rw-r--r-- | arm9/asm/unk_020142EC.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/asm/unk_020142EC.s b/arm9/asm/unk_020142EC.s index 5526b320..3a0426d5 100644 --- a/arm9/asm/unk_020142EC.s +++ b/arm9/asm/unk_020142EC.s @@ -23,7 +23,7 @@ FUN_020142EC: ; 0x020142EC bne _02014320 add r0, r5, #0x0 mov r1, #0x0 - bl FUN_020031FC + bl PaletteData_GetUnfadedBuf str r0, [sp, #0x0] ldr r0, _02014398 ; =FUN_020144E0 str r0, [r4, #0x4] @@ -31,7 +31,7 @@ FUN_020142EC: ; 0x020142EC _02014320: add r0, r5, #0x0 mov r1, #0x1 - bl FUN_020031FC + bl PaletteData_GetUnfadedBuf str r0, [sp, #0x0] ldr r0, _0201439C ; =FUN_020144FC str r0, [r4, #0x4] @@ -288,6 +288,6 @@ FUN_020144E0: ; 0x020144E0 mov r2, #0x0 lsl r3, r3, #0x14 lsr r3, r3, #0x10 - bl FUN_02003054 + bl PaletteData_LoadPalette pop {r3, pc} .balign 4 |