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/modules/07 | |
| parent | 1f9d4503c898f9138422215132b53224571a281a (diff) | |
| parent | 68d7aa47cc52ef822220e0e35890863d7cad479f (diff) | |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'arm9/modules/07')
| -rw-r--r-- | arm9/modules/07/asm/module_07.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index e4400e3e..bc0d71b9 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -156,7 +156,7 @@ MOD07_02211F34: ; 0x02211F34 mov r1, #0 ldr r3, [r3, #0x24] mov r2, #0x60 - bl FUN_02003008 + bl PaletteData_AllocBuffers ldr r0, _02211FEC ; =0x00000B82 mov r3, #0 strb r3, [r4, r0] @@ -1641,7 +1641,7 @@ _02212BA8: bl FUN_0201C29C ldr r0, [r4, #8] mov r1, #0 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #8] bl FUN_02002FEC ldr r0, [r4] @@ -5037,7 +5037,7 @@ MOD07_02214720: ; 0x02214720 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FUN_02034998 + bl MapHeader_MapIsUnionRoom cmp r0, #1 bne _0221479C mov r0, #1 |