diff options
| author | Revo <projectrevotpp@hotmail.com> | 2021-06-27 12:34:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-06-27 12:34:13 -0400 |
| commit | 3eb05d47001de840cb6e8e99ca5181dc2ad67b32 (patch) | |
| tree | 73aed159b5ebe62b000ceb97c3443508257f3ccd /arm9/modules/16/asm/module_16.s | |
| parent | eb0aacbbaf3876a597d26255a48def2cb43c1d2c (diff) | |
| parent | eb17a2e3aa326e613e09c8f6300b2ab10b3f7389 (diff) | |
Merge pull request #417 from remicalixte/unk_020030E8
decompile unk_020030E8.s into palette.c
Diffstat (limited to 'arm9/modules/16/asm/module_16.s')
| -rw-r--r-- | arm9/modules/16/asm/module_16.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 480aa929..73e8460b 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -49734,7 +49734,7 @@ MOD16_021EE5D0: ; 0x021EE5D0 ldr r1, [r1] mov r2, #0x30 add r3, r7, #0 - bl FUN_02003974 + bl BlendPalette ldr r0, [sp, #4] mov r1, #1 bl NNS_G2dGetImagePaletteLocation @@ -49759,7 +49759,7 @@ MOD16_021EE5D0: ; 0x021EE5D0 ldr r1, [r1] mov r2, #0x50 add r3, r7, #0 - bl FUN_02003974 + bl BlendPalette ldr r0, [sp, #8] mov r1, #1 bl NNS_G2dGetImagePaletteLocation |