diff options
Diffstat (limited to 'arm9/asm')
-rw-r--r-- | arm9/asm/unk_020142EC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_020144FC.s | 2 | ||||
-rw-r--r-- | arm9/asm/unk_0206C700.s | 26 | ||||
-rw-r--r-- | arm9/asm/unk_020859C0.s | 16 | ||||
-rw-r--r-- | arm9/asm/unk_02086084.s | 16 | ||||
-rw-r--r-- | arm9/asm/unk_02086414.s | 10 |
6 files changed, 36 insertions, 36 deletions
diff --git a/arm9/asm/unk_020142EC.s b/arm9/asm/unk_020142EC.s index 5526b320..e7c3e769 100644 --- a/arm9/asm/unk_020142EC.s +++ b/arm9/asm/unk_020142EC.s @@ -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 diff --git a/arm9/asm/unk_020144FC.s b/arm9/asm/unk_020144FC.s index e3677eca..9d52898d 100644 --- a/arm9/asm/unk_020144FC.s +++ b/arm9/asm/unk_020144FC.s @@ -15,7 +15,7 @@ FUN_020144FC: ; 0x020144FC mov r2, #0x1 lsl r3, r3, #0x14 lsr r3, r3, #0x10 - bl FUN_02003054 + bl PaletteData_LoadPalette pop {r3, pc} .balign 4 diff --git a/arm9/asm/unk_0206C700.s b/arm9/asm/unk_0206C700.s index e742f202..90e19c61 100644 --- a/arm9/asm/unk_0206C700.s +++ b/arm9/asm/unk_0206C700.s @@ -94,24 +94,24 @@ FUN_0206C700: ; 0x0206C700 mov r1, #0x0 lsl r2, r2, #0x8 add r3, r5, #0x0 - bl FUN_02003008 + bl PaletteData_AllocBuffers mov r1, #0x1 ldr r0, [r4, #0x14] lsl r2, r1, #0x9 add r3, r5, #0x0 - bl FUN_02003008 + bl PaletteData_AllocBuffers mov r2, #0x7 ldr r0, [r4, #0x14] mov r1, #0x2 lsl r2, r2, #0x6 add r3, r5, #0x0 - bl FUN_02003008 + bl PaletteData_AllocBuffers mov r2, #0x2 ldr r0, [r4, #0x14] mov r1, #0x3 lsl r2, r2, #0x8 add r3, r5, #0x0 - bl FUN_02003008 + bl PaletteData_AllocBuffers add r0, r5, #0x0 bl BgConfig_Alloc str r0, [r4, #0x0] @@ -300,16 +300,16 @@ FUN_0206C92C: ; 0x0206C92C bl WindowArray_dtor ldr r0, [r4, #0x14] mov r1, #0x0 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x14] mov r1, #0x1 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x14] mov r1, #0x2 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x14] mov r1, #0x3 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x14] bl FUN_02002FEC ldr r0, [r4, #0x18] @@ -2386,7 +2386,7 @@ _0206DA26: ldr r3, [r5, #0x5c] mov r1, #0x76 mov r2, #0x8 - bl FUN_020030E8 + bl PaletteData_LoadNarc add r0, r6, #0x0 bl FUN_0200CD64 add r2, r0, #0x0 @@ -2399,7 +2399,7 @@ _0206DA26: ldr r0, [r5, #0x14] ldr r3, [r5, #0x5c] mov r1, #0x26 - bl FUN_020030E8 + bl PaletteData_LoadNarc mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x20 @@ -2410,7 +2410,7 @@ _0206DA26: ldr r3, [r5, #0x5c] mov r1, #0xe mov r2, #0x7 - bl FUN_020030E8 + bl PaletteData_LoadNarc ldr r0, [r5, #0x5c] mov r1, #0x2 str r0, [sp, #0x0] @@ -2429,7 +2429,7 @@ _0206DA26: ldr r0, [r5, #0x14] ldr r3, [r5, #0x5c] mov r1, #0x26 - bl FUN_020030E8 + bl PaletteData_LoadNarc mov r0, #0x0 str r0, [sp, #0x0] str r0, [sp, #0x4] @@ -2464,7 +2464,7 @@ _0206DA26: ldr r0, [r5, #0x14] ldr r3, [r5, #0x5c] add r2, r1, #0x0 - bl FUN_020030E8 + bl PaletteData_LoadNarc mov r0, #0x1 lsl r0, r0, #0x1a ldr r1, [r0, #0x0] diff --git a/arm9/asm/unk_020859C0.s b/arm9/asm/unk_020859C0.s index 162a8aca..c6e0a621 100644 --- a/arm9/asm/unk_020859C0.s +++ b/arm9/asm/unk_020859C0.s @@ -306,21 +306,21 @@ _02085A9A: mov r1, #0x0 lsl r2, r2, #0x8 mov r3, #0x35 - bl FUN_02003008 + bl PaletteData_AllocBuffers add r0, r4, #0x0 add r0, #0xe8 mov r1, #0x1 ldr r0, [r0, #0x0] lsl r2, r1, #0x9 mov r3, #0x35 - bl FUN_02003008 + bl PaletteData_AllocBuffers add r0, r4, #0x0 add r0, #0xe8 mov r1, #0x2 ldr r0, [r0, #0x0] lsl r2, r1, #0x8 mov r3, #0x35 - bl FUN_02003008 + bl PaletteData_AllocBuffers add r0, r4, #0x0 add r0, #0xe8 mov r2, #0x2 @@ -328,7 +328,7 @@ _02085A9A: mov r1, #0x3 lsl r2, r2, #0x8 mov r3, #0x35 - bl FUN_02003008 + bl PaletteData_AllocBuffers add r0, r4, #0x0 add r0, #0xe4 ldr r0, [r0, #0x0] @@ -510,22 +510,22 @@ FUN_02085C08: ; 0x02085C08 add r0, #0xe8 ldr r0, [r0, #0x0] mov r1, #0x0 - bl FUN_02003038 + bl PaletteData_FreeBuffers add r0, r4, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] mov r1, #0x1 - bl FUN_02003038 + bl PaletteData_FreeBuffers add r0, r4, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] mov r1, #0x2 - bl FUN_02003038 + bl PaletteData_FreeBuffers add r0, r4, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] mov r1, #0x3 - bl FUN_02003038 + bl PaletteData_FreeBuffers add r0, r4, #0x0 add r0, #0xe8 ldr r0, [r0, #0x0] diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index d110b7f1..3d88cc10 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -68,23 +68,23 @@ FUN_02086084: ; 0x02086084 mov r1, #0x0 lsl r2, r2, #0x8 mov r3, #0x47 - bl FUN_02003008 + bl PaletteData_AllocBuffers mov r1, #0x2 ldr r0, [r4, #0x8] lsl r2, r1, #0x8 mov r3, #0x47 - bl FUN_02003008 + bl PaletteData_AllocBuffers mov r1, #0x1 ldr r0, [r4, #0x8] lsl r2, r1, #0x9 mov r3, #0x47 - bl FUN_02003008 + bl PaletteData_AllocBuffers mov r2, #0x2 ldr r0, [r4, #0x8] mov r1, #0x3 lsl r2, r2, #0x8 mov r3, #0x47 - bl FUN_02003008 + bl PaletteData_AllocBuffers bl FUN_02086414 bl FUN_0208643C bl FUN_0208650C @@ -183,16 +183,16 @@ FUN_020861DC: ; 0x020861DC bl GX_EngineBToggleLayers ldr r0, [r4, #0x8] mov r1, #0x0 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x8] mov r1, #0x2 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x8] mov r1, #0x1 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x8] mov r1, #0x3 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #0x8] bl FUN_02002FEC ldr r0, [r4, #0x4] diff --git a/arm9/asm/unk_02086414.s b/arm9/asm/unk_02086414.s index f01e84e2..e041eec2 100644 --- a/arm9/asm/unk_02086414.s +++ b/arm9/asm/unk_02086414.s @@ -472,7 +472,7 @@ FUN_020866FC: ; 0x020866FC add r0, r4, #0x0 mov r1, #0x26 mov r3, #0x47 - bl FUN_020030E8 + bl PaletteData_LoadNarc mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x47 @@ -493,7 +493,7 @@ FUN_020866FC: ; 0x020866FC add r0, r4, #0x0 mov r1, #0x26 mov r3, #0x47 - bl FUN_020030E8 + bl PaletteData_LoadNarc mov r0, #0x0 str r0, [sp, #0x0] mov r0, #0x20 @@ -504,7 +504,7 @@ FUN_020866FC: ; 0x020866FC mov r1, #0xe mov r2, #0x7 mov r3, #0x47 - bl FUN_020030E8 + bl PaletteData_LoadNarc add sp, #0xc pop {r3-r6, pc} @@ -793,7 +793,7 @@ FUN_0208699C: ; 0x0208699C mov r1, #0x76 mov r2, #0x8 mov r3, #0x47 - bl FUN_020030E8 + bl PaletteData_LoadNarc add sp, #0x10 pop {r3-r5, pc} .balign 4 @@ -838,7 +838,7 @@ FUN_020869F0: ; 0x020869F0 add r0, r4, #0x0 add r2, r1, #0x0 mov r3, #0x47 - bl FUN_020030E8 + bl PaletteData_LoadNarc add sp, #0x10 pop {r3-r5, pc} |