summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arm9/asm/unk_020142EC.s2
-rw-r--r--arm9/asm/unk_020144FC.s2
-rw-r--r--arm9/asm/unk_0206C700.s26
-rw-r--r--arm9/asm/unk_020859C0.s16
-rw-r--r--arm9/asm/unk_02086084.s16
-rw-r--r--arm9/asm/unk_02086414.s10
-rw-r--r--arm9/global.inc10
-rw-r--r--arm9/modules/07/asm/module_07.s4
-rw-r--r--arm9/modules/08/asm/module_08.s22
-rw-r--r--arm9/modules/09/asm/module_09.s22
-rw-r--r--arm9/modules/11/asm/module_11_thumb1.s28
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s20
-rw-r--r--arm9/modules/12/asm/module_12.s110
-rw-r--r--arm9/modules/61/asm/module_61.s22
-rw-r--r--arm9/modules/62/asm/module_62.s22
-rw-r--r--arm9/src/unk_02002F08.c50
-rw-r--r--arm9/src/unk_020030E8.c132
-rw-r--r--include/unk_02002F08.h36
-rw-r--r--include/unk_020030E8.h46
19 files changed, 298 insertions, 298 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}
diff --git a/arm9/global.inc b/arm9/global.inc
index 144d5c43..12a68207 100644
--- a/arm9/global.inc
+++ b/arm9/global.inc
@@ -245,11 +245,11 @@
.extern FUN_02002F9C
.extern FUN_02002FD0
.extern FUN_02002FEC
-.extern FUN_02003008
-.extern FUN_02003038
-.extern FUN_02003054
-.extern FUN_02003084
-.extern FUN_020030E8
+.extern PaletteData_AllocBuffers
+.extern PaletteData_FreeBuffers
+.extern PaletteData_LoadPalette
+.extern PaletteData_LoadFromNarc
+.extern PaletteData_LoadNarc
.extern FUN_02003108
.extern FUN_0200317C
.extern FUN_020031B8
diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s
index 234e29fe..dbf02f8d 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]
diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s
index 4a0a6d1c..902d44d7 100644
--- a/arm9/modules/08/asm/module_08.s
+++ b/arm9/modules/08/asm/module_08.s
@@ -35,7 +35,7 @@ MOD08_02211E7C: ; 0x02211E7C
add r0, r5, #0
add r2, r4, #0
lsr r3, r3, #0x10
- bl FUN_02003054
+ bl PaletteData_LoadPalette
pop {r3, r4, r5, pc}
.align 2, 0
@@ -3185,7 +3185,7 @@ _02213500:
ldr r1, [sp, #0x14]
ldr r2, [sp, #0x10]
ldr r3, [r5]
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3650,7 +3650,7 @@ _022138F0:
ldr r1, [sp, #0x18]
ldr r2, [sp, #0x14]
ldr r3, [r4]
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
_02213926:
ldr r0, [sp, #0xc]
lsl r5, r0, #2
@@ -4160,7 +4160,7 @@ MOD08_02213C94: ; 0x02213C94
ldr r0, [r0]
ldr r3, [r5]
mov r1, #7
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add r0, r5, #0
add r0, #0xc4
lsl r1, r4, #0x18
@@ -4663,7 +4663,7 @@ _02214078:
ldr r1, [r3, r1]
ldr r2, [r3, r2]
ldr r3, [r3]
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
_022140CC:
ldr r2, [r4, #0x48]
mov r0, #0
@@ -5039,7 +5039,7 @@ _0221436A:
ldr r1, [r3, r1]
ldr r2, [r3, r2]
ldr r3, [r3]
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
_022143BE:
ldr r2, [r4, #0x48]
mov r0, #0
@@ -7574,7 +7574,7 @@ MOD08_02215660: ; 0x02215660
mov r2, #0
ldr r0, [r0]
add r3, r2, #0
- bl FUN_02003054
+ bl PaletteData_LoadPalette
pop {r3, pc}
thumb_func_start MOD08_02215680
@@ -7875,7 +7875,7 @@ _022158C2:
ldr r1, [sp, #0x20]
ldr r2, [sp, #0x1c]
ldr r3, [r4]
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
_022158EC:
ldr r0, [sp, #0x24]
add r7, r7, #4
@@ -15602,7 +15602,7 @@ _02219228:
ldr r0, [r4, #0x34]
mov r1, #7
add r2, r6, #0
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r0, [r4, #0x30]
mov r1, #2
bl BgClearTilemapBufferAndCommit
@@ -16006,7 +16006,7 @@ _02219550:
ldr r0, [r4, #0x34]
mov r1, #7
add r2, r6, #0
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r0, [r4, #0x30]
mov r1, #2
bl BgClearTilemapBufferAndCommit
@@ -42756,7 +42756,7 @@ MOD08_02227068: ; 0x02227068
ldr r1, [r5]
ldr r2, [r2, r3]
add r3, r6, #0
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
lsl r1, r4, #0x18
ldr r0, [r5, #0x2c]
lsr r1, r1, #0x18
diff --git a/arm9/modules/09/asm/module_09.s b/arm9/modules/09/asm/module_09.s
index 07d0fa04..5ca32f7e 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2219,7 +2219,7 @@ MOD09_02212F8C: ; 0x02212F8C
ldr r3, [r3, #0xc]
mov r1, #0x48
mov r2, #0x17
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0x7a
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -2246,7 +2246,7 @@ MOD09_02212F8C: ; 0x02212F8C
ldr r3, [r3, #0xc]
mov r1, #0xe
mov r2, #6
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #1
str r0, [sp]
mov r0, #0x20
@@ -2259,7 +2259,7 @@ MOD09_02212F8C: ; 0x02212F8C
ldr r3, [r3, #0xc]
mov r1, #0xe
mov r2, #7
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r0, [r5]
ldr r0, [r0, #8]
bl MOD11_02230E44
@@ -2295,7 +2295,7 @@ MOD09_02212F8C: ; 0x02212F8C
ldr r0, [r5, r0]
ldr r3, [r3, #0xc]
mov r1, #0x26
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0x7a
lsl r0, r0, #2
ldr r0, [r5, r0]
@@ -2343,7 +2343,7 @@ MOD09_02212F8C: ; 0x02212F8C
str r0, [sp]
ldr r0, [r5, r2]
mov r2, #1
- bl FUN_02003054
+ bl PaletteData_LoadPalette
add r0, r4, #0
bl FreeToHeap
add sp, #0x14
@@ -12567,7 +12567,7 @@ MOD09_02218640: ; 0x02218640
add r1, r2, r1
mov r2, #1
mov r3, #0xc0
- bl FUN_02003054
+ bl PaletteData_LoadPalette
pop {r3, pc}
_02218662:
mov r0, #0x20
@@ -12579,7 +12579,7 @@ _02218662:
add r1, r2, r1
mov r2, #1
mov r3, #0xc0
- bl FUN_02003054
+ bl PaletteData_LoadPalette
pop {r3, pc}
nop
_0221867C: .word 0x00001F60
@@ -14029,7 +14029,7 @@ MOD09_022191C0: ; 0x022191C0
ldr r3, [r3, #0xc]
mov r1, #0x4d
mov r2, #3
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #1
str r0, [sp]
mov r0, #0x20
@@ -14041,7 +14041,7 @@ MOD09_022191C0: ; 0x022191C0
ldr r3, [r3, #0xc]
mov r1, #0xe
mov r2, #7
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r0, [r5]
ldr r0, [r0]
bl MOD11_02230E44
@@ -14073,7 +14073,7 @@ MOD09_022191C0: ; 0x022191C0
ldr r0, [r5, #8]
ldr r3, [r3, #0xc]
mov r1, #0x26
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0x14
pop {r4, r5, pc}
.align 2, 0
@@ -15664,7 +15664,7 @@ MOD09_02219F24: ; 0x02219F24
ldr r0, [r5, #8]
ldr r3, [r3, #0xc]
mov r1, #0x10
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0xc
pop {r4, r5, pc}
diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s
index 23f0a76c..3f932185 100644
--- a/arm9/modules/11/asm/module_11_thumb1.s
+++ b/arm9/modules/11/asm/module_11_thumb1.s
@@ -545,7 +545,7 @@ _0222D99A:
add r2, r3, r2
mov r1, #7
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add r0, r4, #0
bl FUN_0200CD64
add r2, r0, #0
@@ -558,7 +558,7 @@ _0222D99A:
ldr r0, [r5, #0x28]
mov r1, #0x26
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -569,7 +569,7 @@ _0222D99A:
mov r1, #0xe
mov r2, #7
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -723,24 +723,24 @@ MOD11_0222DB50: ; 0x0222DB50
mov r1, #0
lsl r2, r2, #8
mov r3, #5
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r1, #1
ldr r0, [r4, #0x28]
lsl r2, r1, #9
mov r3, #5
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r2, #7
ldr r0, [r4, #0x28]
mov r1, #2
lsl r2, r2, #6
mov r3, #5
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r2, #2
ldr r0, [r4, #0x28]
mov r1, #3
lsl r2, r2, #8
mov r3, #5
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r0, #5
bl BgConfig_Alloc
str r0, [r4, #4]
@@ -1290,16 +1290,16 @@ _0222E10A:
bl FreeToHeap
ldr r0, [r4, #0x28]
mov r1, #0
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x28]
mov r1, #1
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x28]
mov r1, #2
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x28]
mov r1, #3
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x28]
bl FUN_02002FEC
ldr r0, [r4, #0xc]
@@ -1565,7 +1565,7 @@ _0222E2F0:
mov r1, #7
add r2, r2, r6
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add r0, r7, #0
bl FUN_0200CD64
add r2, r0, #0
@@ -1578,7 +1578,7 @@ _0222E2F0:
ldr r0, [r5, #0x28]
mov r1, #0x26
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -1589,7 +1589,7 @@ _0222E2F0:
mov r1, #0xe
mov r2, #7
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s
index 9b184cfc..8af139bc 100644
--- a/arm9/modules/11/asm/module_11_thumb2.s
+++ b/arm9/modules/11/asm/module_11_thumb2.s
@@ -30,7 +30,7 @@ MOD11_0222F29C: ; 0x0222F29C
mov r1, #0
lsl r2, r2, #8
mov r3, #5
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r1, #0
mov r0, #1
str r1, [sp]
@@ -142,7 +142,7 @@ _0222F30E:
mov r1, #0xe
mov r2, #7
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add r0, r4, #0
bl FUN_0200CD64
add r2, r0, #0
@@ -155,7 +155,7 @@ _0222F30E:
ldr r0, [r5, #0xc]
mov r1, #0x26
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r1, #0
mov r0, #1
str r1, [sp]
@@ -805,7 +805,7 @@ MOD11_0222F93C: ; 0x0222F93C
bl FUN_0200E3A0
ldr r0, [r4, #0xc]
mov r1, #0
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0xc]
bl FUN_02002FEC
ldr r0, [r4, #8]
@@ -23844,7 +23844,7 @@ _0223AC50:
add r0, r7, #0
mov r1, #0x26
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #7
str r0, [sp]
mov r0, #0xe
@@ -84214,7 +84214,7 @@ _02258288:
add r2, r2, r3
ldrh r2, [r5, r2]
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #1
str r0, [sp]
ldr r0, [sp, #0x20]
@@ -84523,7 +84523,7 @@ _0225854E:
mov r1, #7
mov r2, #0xc3
mov r3, #5
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r0, [sp, #0x10]
mov r1, #1
bl FUN_020031FC
@@ -84881,7 +84881,7 @@ _02258874:
ldr r1, [r7, #0x58]
mov r2, #1
mov r3, #0
- bl FUN_02003054
+ bl PaletteData_LoadPalette
ldr r6, [sp, #0x2c]
mov r4, #0
_0225889A:
@@ -89160,7 +89160,7 @@ _0225AB62:
add r0, r6, #0
mov r2, #1
lsr r3, r3, #0x10
- bl FUN_02003054
+ bl PaletteData_LoadPalette
add r4, r4, #1
_0225AB96:
cmp r4, #4
@@ -89215,7 +89215,7 @@ MOD11_0225ABA4: ; 0x0225ABA4
add r0, r7, #0
mov r2, #1
lsr r3, r3, #0x10
- bl FUN_02003054
+ bl PaletteData_LoadPalette
add r0, r6, #0
mov r1, #4
bl ScheduleBgTilemapBufferTransfer
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 5cb61425..6c817679 100644
--- a/arm9/modules/12/asm/module_12.s
+++ b/arm9/modules/12/asm/module_12.s
@@ -76,24 +76,24 @@ MOD12_0222D5C0: ; 0x0222D5C0
mov r1, #0
lsl r2, r2, #8
mov r3, #0x15
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r1, #1
ldr r0, [r4, #0x5c]
lsl r2, r1, #9
mov r3, #0x15
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r2, #7
ldr r0, [r4, #0x5c]
mov r1, #2
lsl r2, r2, #6
mov r3, #0x15
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r2, #2
ldr r0, [r4, #0x5c]
mov r1, #3
lsl r2, r2, #8
mov r3, #0x15
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r0, #0x15
bl BgConfig_Alloc
str r0, [r4, #0x30]
@@ -483,16 +483,16 @@ MOD12_0222D9B0: ; 0x0222D9B0
bl FUN_020117BC
ldr r0, [r4, #0x5c]
mov r1, #0
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x5c]
mov r1, #1
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x5c]
mov r1, #2
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x5c]
mov r1, #3
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x5c]
bl FUN_02002FEC
ldr r0, [r4, #0x58]
@@ -1164,7 +1164,7 @@ MOD12_0222DFC4: ; 0x0222DFC4
mov r1, #0x2d
mov r2, #0x1d
mov r3, #0x15
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0x15
mov r1, #0x20
bl AllocFromHeap
@@ -3211,24 +3211,24 @@ MOD12_0222EF04: ; 0x0222EF04
mov r1, #0
lsl r2, r2, #8
mov r3, #0x16
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r1, #1
ldr r0, [r5, #0x50]
lsl r2, r1, #9
mov r3, #0x16
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r2, #7
ldr r0, [r5, #0x50]
mov r1, #2
lsl r2, r2, #6
mov r3, #0x16
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r2, #2
ldr r0, [r5, #0x50]
mov r1, #3
lsl r2, r2, #8
mov r3, #0x16
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r0, #0x16
bl BgConfig_Alloc
str r0, [r5, #0x30]
@@ -3654,16 +3654,16 @@ _0222F3AE:
bl FUN_02002CF8
ldr r0, [r4, #0x50]
mov r1, #0
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x50]
mov r1, #1
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x50]
mov r1, #2
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x50]
mov r1, #3
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x50]
bl FUN_02002FEC
ldr r0, [r4, #0x48]
@@ -4209,7 +4209,7 @@ MOD12_0222F834: ; 0x0222F834
mov r1, #0x2d
mov r2, #0x22
mov r3, #0x16
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -4220,7 +4220,7 @@ MOD12_0222F834: ; 0x0222F834
mov r1, #0x2d
mov r2, #0x23
mov r3, #0x16
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r1, [r5]
ldr r0, _0222F930 ; =0x00001988
ldr r0, [r1, r0]
@@ -4248,7 +4248,7 @@ MOD12_0222F834: ; 0x0222F834
ldr r0, [r5, #0x50]
mov r1, #0x26
mov r3, #0x16
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -4283,7 +4283,7 @@ MOD12_0222F834: ; 0x0222F834
mov r1, #0x2d
mov r2, #0x24
mov r3, #0x16
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0x10
pop {r3, r4, r5, pc}
.align 2, 0
@@ -4332,7 +4332,7 @@ MOD12_0222F938: ; 0x0222F938
mov r1, #0x2d
mov r2, #0x21
mov r3, #0x16
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0x10
pop {r4, pc}
@@ -5058,14 +5058,14 @@ MOD12_0222FE4C: ; 0x0222FE4C
mov r1, #0
lsl r2, r2, #8
mov r3, #0x17
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
add r0, r5, #0
add r0, #0xa4
mov r1, #1
ldr r0, [r0]
lsl r2, r1, #9
mov r3, #0x17
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
add r0, r5, #0
add r0, #0xa4
mov r2, #7
@@ -5073,7 +5073,7 @@ MOD12_0222FE4C: ; 0x0222FE4C
mov r1, #2
lsl r2, r2, #6
mov r3, #0x17
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
add r0, r5, #0
add r0, #0xa4
mov r2, #2
@@ -5081,7 +5081,7 @@ MOD12_0222FE4C: ; 0x0222FE4C
mov r1, #3
lsl r2, r2, #8
mov r3, #0x17
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r1, #2
mov r0, #0x17
lsl r1, r1, #8
@@ -5484,22 +5484,22 @@ _02230296:
add r0, #0xa4
ldr r0, [r0]
mov r1, #0
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xa4
ldr r0, [r0]
mov r1, #1
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xa4
ldr r0, [r0]
mov r1, #2
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xa4
ldr r0, [r0]
mov r1, #3
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xa4
ldr r0, [r0]
@@ -6207,7 +6207,7 @@ MOD12_022308F0: ; 0x022308F0
mov r1, #0x2d
mov r2, #0x1f
mov r3, #0x17
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -6220,7 +6220,7 @@ MOD12_022308F0: ; 0x022308F0
mov r1, #0x2d
mov r2, #0x23
mov r3, #0x17
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r1, [r5]
ldr r0, _022309C4 ; =0x00001988
ldr r0, [r1, r0]
@@ -6250,7 +6250,7 @@ MOD12_022308F0: ; 0x022308F0
ldr r0, [r0]
mov r1, #0x26
mov r3, #0x17
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add r0, r5, #0
bl MOD12_0223E734
add r0, r5, #0
@@ -8479,7 +8479,7 @@ _02231A98:
add r0, r6, #0
mov r1, #0x2d
mov r3, #0x15
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add r0, r6, #0
mov r1, #1
bl FUN_020031FC
@@ -8607,7 +8607,7 @@ _02231B90:
add r1, r7, r1
ldr r1, [r1, #0x34]
mov r3, #0
- bl FUN_02003054
+ bl PaletteData_LoadPalette
ldr r6, [sp, #0x14]
ldr r4, [sp, #0x10]
mov r5, #0
@@ -8910,7 +8910,7 @@ MOD12_02231D5C: ; 0x02231D5C
str r0, [sp, #0xc]
ldr r0, [r2, #0x50]
mov r2, #0x25
- bl FUN_02003084
+ bl PaletteData_LoadFromNarc
add sp, #0x1c
pop {r3, r4, r5, r6, pc}
nop
@@ -9143,7 +9143,7 @@ _02231FC0:
ldr r0, [r0, #0x50]
mov r2, #1
lsr r3, r3, #0x10
- bl FUN_02003054
+ bl PaletteData_LoadPalette
ldr r0, _022320A0 ; =0x000002E1
ldrb r0, [r6, r0]
cmp r0, #0xff
@@ -9927,7 +9927,7 @@ MOD12_022325AC: ; 0x022325AC
ldr r1, [r7, r1]
mov r2, #1
lsr r3, r3, #0x10
- bl FUN_02003054
+ bl PaletteData_LoadPalette
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
_022325EC:
@@ -9953,7 +9953,7 @@ _022325EC:
ldr r0, [r0, #0x50]
mov r2, #1
lsr r3, r3, #0x10
- bl FUN_02003054
+ bl PaletteData_LoadPalette
add sp, #0x18
pop {r3, r4, r5, r6, r7, pc}
nop
@@ -29230,7 +29230,7 @@ _0223B7D6:
ldr r1, [r1]
mov r2, #1
mov r3, #0
- bl FUN_02003054
+ bl PaletteData_LoadPalette
_0223B7F2:
ldr r4, [sp, #0x10]
mov r5, #0
@@ -41150,14 +41150,14 @@ MOD12_02241210: ; 0x02241210
mov r1, #0
lsl r2, r2, #8
mov r3, #0x18
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
add r0, r5, #0
add r0, #0xd0
mov r1, #1
ldr r0, [r0]
lsl r2, r1, #9
mov r3, #0x18
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
add r0, r5, #0
add r0, #0xd0
mov r2, #7
@@ -41165,7 +41165,7 @@ MOD12_02241210: ; 0x02241210
mov r1, #2
lsl r2, r2, #6
mov r3, #0x18
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
add r0, r5, #0
add r0, #0xd0
mov r2, #2
@@ -41173,7 +41173,7 @@ MOD12_02241210: ; 0x02241210
mov r1, #3
lsl r2, r2, #8
mov r3, #0x18
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r0, #0x18
bl BgConfig_Alloc
str r0, [r5, #0x30]
@@ -41519,22 +41519,22 @@ _022415D4:
add r0, #0xd0
ldr r0, [r0]
mov r1, #0
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xd0
ldr r0, [r0]
mov r1, #1
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xd0
ldr r0, [r0]
mov r1, #2
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xd0
ldr r0, [r0]
mov r1, #3
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
add r0, r4, #0
add r0, #0xd0
ldr r0, [r0]
@@ -42193,7 +42193,7 @@ MOD12_02241BA0: ; 0x02241BA0
mov r1, #0x2d
mov r2, #0x21
mov r3, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0x10
pop {r4, pc}
.align 2, 0
@@ -43656,7 +43656,7 @@ MOD12_022426BC: ; 0x022426BC
mov r1, #0x2d
mov r2, #0x22
mov r3, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -43669,7 +43669,7 @@ MOD12_022426BC: ; 0x022426BC
mov r1, #0x2d
mov r2, #0x23
mov r3, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r1, [r5]
ldr r0, _02242784 ; =0x00001988
ldr r0, [r1, r0]
@@ -43699,7 +43699,7 @@ MOD12_022426BC: ; 0x022426BC
ldr r0, [r0]
mov r1, #0x26
mov r3, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r0, [r5, #0x30]
mov r1, #2
bl BgClearTilemapBufferAndCommit
@@ -43826,7 +43826,7 @@ MOD12_02242804: ; 0x02242804
mov r1, #0x2d
mov r2, #0x26
mov r3, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -43839,7 +43839,7 @@ MOD12_02242804: ; 0x02242804
mov r1, #0x2d
mov r2, #0x23
mov r3, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
ldr r1, [r6]
ldr r0, _022429D0 ; =0x00001988
ldr r0, [r1, r0]
@@ -43869,7 +43869,7 @@ MOD12_02242804: ; 0x02242804
ldr r0, [r0]
mov r1, #0x26
mov r3, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0xc
mov r1, #0x18
bl String_ctor
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s
index cbb58d60..3a7d9e76 100644
--- a/arm9/modules/61/asm/module_61.s
+++ b/arm9/modules/61/asm/module_61.s
@@ -1134,12 +1134,12 @@ MOD61_021D7CE8: ; 0x021D7CE8
ldr r3, [r5]
mov r1, #0
mov r2, #0xe0
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
ldr r0, [r5, #0x30]
ldr r3, [r5]
mov r1, #2
mov r2, #0x60
- bl FUN_02003008
+ bl PaletteData_AllocBuffers
mov r0, #0x60
str r0, [sp]
ldr r1, [sp, #0x24]
@@ -1147,7 +1147,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
ldr r0, [r5, #0x30]
ldr r1, [r1, #0xc]
add r3, r2, #0
- bl FUN_02003054
+ bl PaletteData_LoadPalette
ldrb r0, [r5, #0xc]
cmp r0, #1
bne _021D7E00
@@ -1159,7 +1159,7 @@ MOD61_021D7CE8: ; 0x021D7CE8
mov r2, #0
add r1, #0x60
mov r3, #0x10
- bl FUN_02003054
+ bl PaletteData_LoadPalette
_021D7E00:
mov r0, #2
str r0, [sp]
@@ -1170,7 +1170,7 @@ _021D7E00:
ldr r0, [r5, #0x30]
ldr r3, [r5]
mov r1, #0x13
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -1181,7 +1181,7 @@ _021D7E00:
ldr r3, [r5]
mov r1, #0xe
mov r2, #6
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -1192,7 +1192,7 @@ _021D7E00:
ldr r3, [r5]
mov r1, #0xe
mov r2, #7
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -1203,7 +1203,7 @@ _021D7E00:
ldr r3, [r5]
mov r1, #0x26
mov r2, #0x18
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -1215,7 +1215,7 @@ _021D7E00:
ldr r3, [r5]
mov r1, #0x26
add r2, #0x19
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0x10
mov r1, #0
str r0, [sp]
@@ -1365,10 +1365,10 @@ MOD61_021D7FB4: ; 0x021D7FB4
bl FreeToHeap
ldr r0, [r4, #0x30]
mov r1, #2
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x30]
mov r1, #0
- bl FUN_02003038
+ bl PaletteData_FreeBuffers
ldr r0, [r4, #0x30]
bl FUN_02002FEC
mov r1, #0
diff --git a/arm9/modules/62/asm/module_62.s b/arm9/modules/62/asm/module_62.s
index 313e1dd9..35c6e17d 100644
--- a/arm9/modules/62/asm/module_62.s
+++ b/arm9/modules/62/asm/module_62.s
@@ -3115,7 +3115,7 @@ MOD62_0222ED34: ; 0x0222ED34
add r0, r4, #0
mov r1, #0x26
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x35
@@ -3136,7 +3136,7 @@ MOD62_0222ED34: ; 0x0222ED34
add r0, r4, #0
mov r1, #0x26
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x20
@@ -3147,7 +3147,7 @@ MOD62_0222ED34: ; 0x0222ED34
mov r1, #0xe
mov r2, #7
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0xc
pop {r3, r4, r5, r6, pc}
thumb_func_end MOD62_0222ED34
@@ -3180,7 +3180,7 @@ MOD62_0222EDBC: ; 0x0222EDBC
add r0, r4, #0
mov r1, #0x26
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
mov r0, #0x35
@@ -3201,7 +3201,7 @@ MOD62_0222EDBC: ; 0x0222EDBC
add r0, r4, #0
mov r1, #0x26
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #1
str r0, [sp]
mov r0, #0x20
@@ -3212,7 +3212,7 @@ MOD62_0222EDBC: ; 0x0222EDBC
mov r1, #0xe
mov r2, #7
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #1
str r0, [sp]
mov r0, #0x20
@@ -3223,7 +3223,7 @@ MOD62_0222EDBC: ; 0x0222EDBC
mov r1, #0xe
mov r2, #7
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #1
str r0, [sp]
mov r0, #0x20
@@ -3235,7 +3235,7 @@ MOD62_0222EDBC: ; 0x0222EDBC
add r0, r4, #0
add r2, #0xcb
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0xc
pop {r3, r4, r5, r6, pc}
.align 2, 0
@@ -3829,7 +3829,7 @@ MOD62_0222F2C8: ; 0x0222F2C8
ldr r0, [r0]
add r2, #0xc5
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
mov r0, #0
str r0, [sp]
str r0, [sp, #4]
@@ -3910,7 +3910,7 @@ MOD62_0222F36C: ; 0x0222F36C
ldr r0, [r4]
add r2, #0xc4
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0x10
pop {r4, pc}
.align 2, 0
@@ -3963,7 +3963,7 @@ MOD62_0222F3D4: ; 0x0222F3D4
ldr r0, [r4]
add r2, #0xc4
mov r3, #0x35
- bl FUN_020030E8
+ bl PaletteData_LoadNarc
add sp, #0x10
pop {r4, pc}
.align 2, 0
diff --git a/arm9/src/unk_02002F08.c b/arm9/src/unk_02002F08.c
index b81da622..20a22b7d 100644
--- a/arm9/src/unk_02002F08.c
+++ b/arm9/src/unk_02002F08.c
@@ -60,53 +60,53 @@ THUMB_FUNC s32 FUN_02002F9C(u32 param0, struct String *str)
UNK_02106FC8->unk94[param0], String_c_str(str));
}
-THUMB_FUNC struct UnkStruct_02002F08 *FUN_02002FD0(u32 heap_id)
+THUMB_FUNC struct PaletteData *FUN_02002FD0(u32 heap_id)
{
- struct UnkStruct_02002F08 *ptr = AllocFromHeap(heap_id, sizeof(struct UnkStruct_02002F08));
- MI_CpuFill8(ptr, 0, sizeof(struct UnkStruct_02002F08));
+ struct PaletteData *ptr = AllocFromHeap(heap_id, sizeof(struct PaletteData));
+ MI_CpuFill8(ptr, 0, sizeof(struct PaletteData));
return ptr;
}
-THUMB_FUNC void FUN_02002FEC(struct UnkStruct_02002F08 *ptr)
+THUMB_FUNC void FUN_02002FEC(struct PaletteData *ptr)
{
FreeToHeap(ptr);
}
-THUMB_FUNC void FUN_02002FF4(
- struct UnkStruct_02002F08 *param0, u32 param1, void *param2, void *param3, u32 size)
+THUMB_FUNC void PaletteData_SetBuffers(
+ struct PaletteData *paletteData, u32 index, void *unfadedBuf, void *fadedBuf, u32 size)
{
- param0->unk000[param1].unk00 = param2;
- param0->unk000[param1].unk04 = param3;
- param0->unk000[param1].unk08 = size;
+ paletteData->pltt[index].unfadedBuf = unfadedBuf;
+ paletteData->pltt[index].fadedBuf = fadedBuf;
+ paletteData->pltt[index].bufSize = size;
}
-THUMB_FUNC void FUN_02003008(struct UnkStruct_02002F08 *param0, u32 param1, u32 size, u32 heap_id)
+THUMB_FUNC void PaletteData_AllocBuffers(struct PaletteData *paletteData, u32 index, u32 size, u32 heap_id)
{
void *ptr = AllocFromHeap(heap_id, size);
void *ptr2 = AllocFromHeap(heap_id, size);
- FUN_02002FF4(param0, param1, ptr, ptr2, size);
+ PaletteData_SetBuffers(paletteData, index, ptr, ptr2, size);
}
-THUMB_FUNC void FUN_02003038(struct UnkStruct_02002F08 *param0, u32 param1)
+THUMB_FUNC void PaletteData_FreeBuffers(struct PaletteData *paletteData, u32 index)
{
- FreeToHeap(param0->unk000[param1].unk00);
- FreeToHeap(param0->unk000[param1].unk04);
+ FreeToHeap(paletteData->pltt[index].unfadedBuf);
+ FreeToHeap(paletteData->pltt[index].fadedBuf);
}
-THUMB_FUNC void FUN_02003054(
- struct UnkStruct_02002F08 *param0, const void *param1, u32 param2, u32 offset, u16 size)
+THUMB_FUNC void PaletteData_LoadPalette(
+ struct PaletteData *paletteData, const void *src, u32 index, u32 offset, u16 size)
{
- MIi_CpuCopy16(param1, param0->unk000[param2].unk00 + offset, size);
- MIi_CpuCopy16(param1, param0->unk000[param2].unk04 + offset, size);
+ MIi_CpuCopy16(src, paletteData->pltt[index].unfadedBuf + offset, size);
+ MIi_CpuCopy16(src, paletteData->pltt[index].fadedBuf + offset, size);
}
-THUMB_FUNC void FUN_02003084(struct UnkStruct_02002F08 *param0,
+THUMB_FUNC void PaletteData_LoadFromNarc(struct PaletteData *paletteData,
NarcId narcId,
s32 memberId,
u32 heap_id,
- u32 param4,
+ u32 index,
u32 size,
u16 offset,
u16 param7)
@@ -121,19 +121,19 @@ THUMB_FUNC void FUN_02003084(struct UnkStruct_02002F08 *param0,
size = pltData->szByte;
}
- GF_ASSERT(size + offset * 2 <= param0->unk000[param4].unk08);
+ GF_ASSERT(size + offset * 2 <= paletteData->pltt[index].bufSize);
- FUN_02003054(param0, pltData->pRawData + param7 * 2, param4, offset, (u16)size);
+ PaletteData_LoadPalette(paletteData, pltData->pRawData + param7 * 2, index, offset, (u16)size);
FreeToHeap(ptr);
}
-THUMB_FUNC void FUN_020030E8(struct UnkStruct_02002F08 *param0,
+THUMB_FUNC void PaletteData_LoadNarc(struct PaletteData *paletteData,
NarcId narcId,
s32 memberId,
u32 heap_id,
- u32 param4,
+ u32 index,
u32 size,
u16 offset)
{
- FUN_02003084(param0, narcId, memberId, heap_id, param4, size, offset, 0);
+ PaletteData_LoadFromNarc(paletteData, narcId, memberId, heap_id, index, size, offset, 0);
}
diff --git a/arm9/src/unk_020030E8.c b/arm9/src/unk_020030E8.c
index 697ffd19..74abf49b 100644
--- a/arm9/src/unk_020030E8.c
+++ b/arm9/src/unk_020030E8.c
@@ -10,9 +10,9 @@ extern void *FUN_02022308();
extern void *FUN_02022310();
extern int abs(int);
-THUMB_FUNC void FUN_02003108(struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u32 param3)
+THUMB_FUNC void FUN_02003108(struct PaletteData *param0, u32 param1, u16 param2, u32 param3)
{
- GF_ASSERT(param2 * 2 + param3 <= param0->unk000[param1].unk08);
+ GF_ASSERT(param2 * 2 + param3 <= param0->pltt[param1].bufSize);
u16 *r1;
switch (param1)
@@ -34,7 +34,7 @@ THUMB_FUNC void FUN_02003108(struct UnkStruct_02002F08 *param0, u32 param1, u16
return;
}
- FUN_02003054(param0, r1 + param2, param1, param2, (u16)param3);
+ PaletteData_LoadPalette(param0, r1 + param2, param1, param2, (u16)param3);
}
THUMB_FUNC void FUN_0200317C(
@@ -56,26 +56,26 @@ THUMB_FUNC void FUN_0200317C(
}
THUMB_FUNC void FUN_020031B8(
- struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u32 param3, u16 param4, u16 param5)
+ struct PaletteData *param0, u32 param1, u16 param2, u32 param3, u16 param4, u16 param5)
{
MI_CpuCopy16(
- param0->unk000[param1].unk00 + param2, param0->unk000[param3].unk00 + param4, param5);
+ param0->pltt[param1].unfadedBuf + param2, param0->pltt[param3].unfadedBuf + param4, param5);
MI_CpuCopy16(
- param0->unk000[param1].unk00 + param2, param0->unk000[param3].unk04 + param4, param5);
+ param0->pltt[param1].unfadedBuf + param2, param0->pltt[param3].fadedBuf + param4, param5);
}
-THUMB_FUNC u16 *FUN_020031FC(struct UnkStruct_02002F08 *param0, u32 param1)
+THUMB_FUNC u16 *FUN_020031FC(struct PaletteData *param0, u32 param1)
{
- return param0->unk000[param1].unk00;
+ return param0->pltt[param1].unfadedBuf;
}
-THUMB_FUNC u16 *FUN_02003204(struct UnkStruct_02002F08 *param0, u32 param1)
+THUMB_FUNC u16 *FUN_02003204(struct PaletteData *param0, u32 param1)
{
- return param0->unk000[param1].unk04;
+ return param0->pltt[param1].fadedBuf;
}
-THUMB_FUNC u32 FUN_02003210(struct UnkStruct_02002F08 *param0,
+THUMB_FUNC u32 FUN_02003210(struct PaletteData *param0,
u16 param1,
u16 param2,
s16 param3,
@@ -99,9 +99,9 @@ THUMB_FUNC u32 FUN_02003210(struct UnkStruct_02002F08 *param0,
continue;
}
- FUN_02003368(r4, &param0->unk000[r4], &param2);
+ FUN_02003368(r4, &param0->pltt[r4], &param2);
- FUN_020033A4(&param0->unk000[r4].unk0c, param2, param3, param6, param7, param8);
+ FUN_020033A4(&param0->pltt[r4].unk0c, param2, param3, param6, param7, param8);
FUN_02003328(param0, r4);
@@ -149,7 +149,7 @@ THUMB_FUNC u8 FUN_02003314(u16 param0, u16 param1)
return (u8)r3;
}
-THUMB_FUNC void FUN_02003328(struct UnkStruct_02002F08 *param0, u16 param1)
+THUMB_FUNC void FUN_02003328(struct PaletteData *param0, u16 param1)
{
if (FUN_02003314(param0->unk11a_0, param1) != 1)
{
@@ -157,16 +157,16 @@ THUMB_FUNC void FUN_02003328(struct UnkStruct_02002F08 *param0, u16 param1)
}
}
-THUMB_FUNC void FUN_02003368(s32 param0, struct UnkStruct_02002F08_sub *param1, u16 *param2)
+THUMB_FUNC void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2)
{
u8 r0;
if (param0 < 4)
{
- r0 = (u8)(param1->unk08 >> 5);
+ r0 = (u8)(param1->bufSize >> 5);
}
else
{
- r0 = (u8)(param1->unk08 >> 9);
+ r0 = (u8)(param1->bufSize >> 9);
}
u16 r4 = 0;
@@ -178,7 +178,7 @@ THUMB_FUNC void FUN_02003368(s32 param0, struct UnkStruct_02002F08_sub *param1,
*param2 &= r4;
}
-THUMB_FUNC void FUN_020033A4(struct UnkStruct_02002F08_sub_sub *param0,
+THUMB_FUNC void FUN_020033A4(struct PaletteControl *param0,
u16 param1,
s16 param2,
u8 param3,
@@ -211,7 +211,7 @@ THUMB_FUNC void FUN_020033A4(struct UnkStruct_02002F08_sub_sub *param0,
param0->unk04_f = 1;
}
-THUMB_FUNC void FUN_02003464(u32 param0, struct UnkStruct_02002F08 *param1)
+THUMB_FUNC void FUN_02003464(u32 param0, struct PaletteData *param1)
{
if (param1->unk11c == 1)
{
@@ -237,7 +237,7 @@ THUMB_FUNC void FUN_02003464(u32 param0, struct UnkStruct_02002F08 *param1)
}
}
-THUMB_FUNC void FUN_02003500(struct UnkStruct_02002F08 *param0)
+THUMB_FUNC void FUN_02003500(struct PaletteData *param0)
{
for (u8 i = 0; i < 4; i++)
{
@@ -245,7 +245,7 @@ THUMB_FUNC void FUN_02003500(struct UnkStruct_02002F08 *param0)
}
}
-THUMB_FUNC void FUN_02003520(struct UnkStruct_02002F08 *param0)
+THUMB_FUNC void FUN_02003520(struct PaletteData *param0)
{
for (u8 i = 4; i < 14; i++)
{
@@ -253,40 +253,40 @@ THUMB_FUNC void FUN_02003520(struct UnkStruct_02002F08 *param0)
}
}
-THUMB_FUNC void FUN_02003540(struct UnkStruct_02002F08 *param0, u8 param1, u32 param2)
+THUMB_FUNC void FUN_02003540(struct PaletteData *param0, u8 param1, u32 param2)
{
if (FUN_02003314(param0->unk118_2, param1) != 0)
{
- if (param0->unk000[param1].unk0c.unk06_4 < param0->unk000[param1].unk0c.unk02_0)
+ if (param0->pltt[param1].unk0c.unk06_4 < param0->pltt[param1].unk0c.unk02_0)
{
- param0->unk000[param1].unk0c.unk06_4++;
+ param0->pltt[param1].unk0c.unk06_4++;
return;
}
- param0->unk000[param1].unk0c.unk06_4 = 0;
+ param0->pltt[param1].unk0c.unk06_4 = 0;
FUN_0200359C(param0, param1, param2);
}
}
-THUMB_FUNC void FUN_0200359C(struct UnkStruct_02002F08 *param0, u32 param1, u32 param2)
+THUMB_FUNC void FUN_0200359C(struct PaletteData *param0, u32 param1, u32 param2)
{
for (u32 r6 = 0; r6 < 0x10; r6++)
{
- if (FUN_02003314(param0->unk000[param1].unk0c.unk00, (u16)r6) != 0)
+ if (FUN_02003314(param0->pltt[param1].unk0c.unk00, (u16)r6) != 0)
{
- FUN_020035F8(param0->unk000[param1].unk00 + param2 * r6,
- param0->unk000[param1].unk04 + param2 * r6,
- &param0->unk000[param1].unk0c,
+ FUN_020035F8(param0->pltt[param1].unfadedBuf + param2 * r6,
+ param0->pltt[param1].fadedBuf + param2 * r6,
+ &param0->pltt[param1].unk0c,
param2);
}
}
- FUN_02003684(param0, (u8)param1, &param0->unk000[param1].unk0c);
+ FUN_02003684(param0, (u8)param1, &param0->pltt[param1].unk0c);
}
THUMB_FUNC void FUN_020035F8(
- u16 *param0, u16 *param1, struct UnkStruct_02002F08_sub_sub *param2, u32 param3)
+ u16 *param0, u16 *param1, struct PaletteControl *param2, u32 param3)
{
for (u32 i = 0; i < param3; i++)
{
@@ -307,7 +307,7 @@ THUMB_FUNC void FUN_020035F8(
}
THUMB_FUNC void FUN_02003684(
- struct UnkStruct_02002F08 *param0, u8 param1, struct UnkStruct_02002F08_sub_sub *param2)
+ struct PaletteData *param0, u8 param1, struct PaletteControl *param2)
{
s16 r4;
if (param2->unk02_6 == param2->unk02_b)
@@ -345,7 +345,7 @@ THUMB_FUNC void FUN_02003684(
param2->unk02_6 = r4;
}
-THUMB_FUNC void FUN_0200372C(struct UnkStruct_02002F08 *param0)
+THUMB_FUNC void FUN_0200372C(struct PaletteData *param0)
{
if (param0->unk11a_f == 0 && param0->unk118_0 != 1)
{
@@ -355,72 +355,72 @@ THUMB_FUNC void FUN_0200372C(struct UnkStruct_02002F08 *param0)
for (s32 r5 = 0; r5 < 14; r5++)
{
if (param0->unk11a_f != 0 ||
- (param0->unk000[r5].unk04 != 0 && FUN_02003314(param0->unk11a_0, (u16)r5) != 0))
+ (param0->pltt[r5].fadedBuf != 0 && FUN_02003314(param0->unk11a_0, (u16)r5) != 0))
{
- DC_FlushRange(param0->unk000[r5].unk04, param0->unk000[r5].unk08);
+ DC_FlushRange(param0->pltt[r5].fadedBuf, param0->pltt[r5].bufSize);
switch (r5)
{
case 0:
- GX_LoadBGPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GX_LoadBGPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
break;
case 1:
- GXS_LoadBGPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GXS_LoadBGPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
break;
case 2:
- GX_LoadOBJPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GX_LoadOBJPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
break;
case 3:
- GXS_LoadOBJPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GXS_LoadOBJPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
break;
case 4:
GX_BeginLoadBGExtPltt();
- GX_LoadBGExtPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GX_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
GX_EndLoadBGExtPltt();
break;
case 5:
GX_BeginLoadBGExtPltt();
- GX_LoadBGExtPltt(param0->unk000[r5].unk04, 0x2000, param0->unk000[r5].unk08);
+ GX_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0x2000, param0->pltt[r5].bufSize);
GX_EndLoadBGExtPltt();
break;
case 6:
GX_BeginLoadBGExtPltt();
- GX_LoadBGExtPltt(param0->unk000[r5].unk04, 0x4000, param0->unk000[r5].unk08);
+ GX_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0x4000, param0->pltt[r5].bufSize);
GX_EndLoadBGExtPltt();
break;
case 7:
GX_BeginLoadBGExtPltt();
- GX_LoadBGExtPltt(param0->unk000[r5].unk04, 0x6000, param0->unk000[r5].unk08);
+ GX_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0x6000, param0->pltt[r5].bufSize);
GX_EndLoadBGExtPltt();
break;
case 8:
GXS_BeginLoadBGExtPltt();
- GXS_LoadBGExtPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GXS_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
GXS_EndLoadBGExtPltt();
break;
case 9:
GXS_BeginLoadBGExtPltt();
- GXS_LoadBGExtPltt(param0->unk000[r5].unk04, 0x2000, param0->unk000[r5].unk08);
+ GXS_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0x2000, param0->pltt[r5].bufSize);
GXS_EndLoadBGExtPltt();
break;
case 10:
GXS_BeginLoadBGExtPltt();
- GXS_LoadBGExtPltt(param0->unk000[r5].unk04, 0x4000, param0->unk000[r5].unk08);
+ GXS_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0x4000, param0->pltt[r5].bufSize);
GXS_EndLoadBGExtPltt();
break;
case 11:
GXS_BeginLoadBGExtPltt();
- GXS_LoadBGExtPltt(param0->unk000[r5].unk04, 0x6000, param0->unk000[r5].unk08);
+ GXS_LoadBGExtPltt(param0->pltt[r5].fadedBuf, 0x6000, param0->pltt[r5].bufSize);
GXS_EndLoadBGExtPltt();
break;
case 12:
GX_BeginLoadOBJExtPltt();
- GX_LoadOBJExtPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GX_LoadOBJExtPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
GX_EndLoadOBJExtPltt();
break;
case 13:
GXS_BeginLoadOBJExtPltt();
- GXS_LoadOBJExtPltt(param0->unk000[r5].unk04, 0, param0->unk000[r5].unk08);
+ GXS_LoadOBJExtPltt(param0->pltt[r5].fadedBuf, 0, param0->pltt[r5].bufSize);
GXS_EndLoadOBJExtPltt();
break;
}
@@ -434,28 +434,28 @@ THUMB_FUNC void FUN_0200372C(struct UnkStruct_02002F08 *param0)
}
}
-THUMB_FUNC u16 FUN_020038E4(struct UnkStruct_02002F08 *param0)
+THUMB_FUNC u16 FUN_020038E4(struct PaletteData *param0)
{
return param0->unk118_2;
}
-THUMB_FUNC void FUN_020038F0(struct UnkStruct_02002F08 *param0, u32 param1)
+THUMB_FUNC void FUN_020038F0(struct PaletteData *param0, u32 param1)
{
param0->unk11a_f = param1;
}
THUMB_FUNC void FUN_02003914(
- struct UnkStruct_02002F08 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5)
+ struct PaletteData *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5)
{
- GF_ASSERT(param5 * 2 <= param0->unk000[param1].unk08);
+ GF_ASSERT(param5 * 2 <= param0->pltt[param1].bufSize);
if (param2 - 1 <= 1)
{
- MI_CpuFill16(&param0->unk000[param1].unk00[param4], param3, (u32)((param5 - param4) * 2));
+ MI_CpuFill16(&param0->pltt[param1].unfadedBuf[param4], param3, (u32)((param5 - param4) * 2));
}
if (param2 == 0 || param2 == 2)
{
- MI_CpuFill16(&param0->unk000[param1].unk04[param4], param3, (u32)((param5 - param4) * 2));
+ MI_CpuFill16(&param0->pltt[param1].fadedBuf[param4], param3, (u32)((param5 - param4) * 2));
}
}
@@ -545,18 +545,18 @@ _020039E2:
#endif
THUMB_FUNC void FUN_020039E8(
- struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u16 param3, u8 param4, u16 param5)
+ struct PaletteData *param0, u32 param1, u16 param2, u16 param3, u8 param4, u16 param5)
{
BOOL r0 = FALSE;
- if (param0->unk000[param1].unk00 != 0 && param0->unk000[param1].unk04 != 0)
+ if (param0->pltt[param1].unfadedBuf != 0 && param0->pltt[param1].fadedBuf != 0)
{
r0 = TRUE;
}
GF_ASSERT(r0);
- FUN_02003974(param0->unk000[param1].unk00 + param2,
- param0->unk000[param1].unk04 + param2,
+ FUN_02003974(param0->pltt[param1].unfadedBuf + param2,
+ param0->pltt[param1].fadedBuf + param2,
param3,
param4,
param5);
@@ -578,11 +578,11 @@ THUMB_FUNC void FUN_02003A30(u16 *param0, u16 *param1, u16 param2, u8 param3, u1
}
THUMB_FUNC void FUN_02003A64(
- struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u8 param3, u16 param4)
+ struct PaletteData *param0, u32 param1, u16 param2, u8 param3, u16 param4)
{
u32 r4 = 0;
BOOL r0 = FALSE;
- if (param0->unk000[param1].unk00 != 0 && param0->unk000[param1].unk04 != 0)
+ if (param0->pltt[param1].unfadedBuf != 0 && param0->pltt[param1].fadedBuf != 0)
{
r0 = TRUE;
}
@@ -602,7 +602,7 @@ THUMB_FUNC void FUN_02003A64(
}
#ifdef NONMATCHING
-THUMB_FUNC void FUN_02003AC4(u16 *param0, u16 param1, u32 param2, u32 param3, u32 param4)
+THUMB_FUNC void FUN_02003AC4(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
{
s32 r4, lo, mid, hi, add;
for (r4 = 0; r4 < param1; r4++)
@@ -634,7 +634,7 @@ THUMB_FUNC void FUN_02003AC4(u16 *param0, u16 param1, u32 param2, u32 param3, u3
}
}
#else
-asm void FUN_02003AC4(u16 *param0, u16 param1, u32 param2, u32 param3, u32 param4)
+asm void FUN_02003AC4(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4)
{
// clang-format off
push {r3-r7, lr}
@@ -707,7 +707,7 @@ _02003B3C:
}
#endif
-THUMB_FUNC void FUN_02003B40(struct UnkStruct_02002F08 *param0,
+THUMB_FUNC void FUN_02003B40(struct PaletteData *param0,
NarcId narcId,
s32 memberId,
u32 heap_id,
@@ -728,7 +728,7 @@ THUMB_FUNC void FUN_02003B40(struct UnkStruct_02002F08 *param0,
}
FUN_02003AC4(pltData->pRawData, 0x10, param7, param8, param9);
- FUN_02003054(param0, pltData->pRawData, param4, param6, (u16)param5);
+ PaletteData_LoadPalette(param0, pltData->pRawData, param4, param6, (u16)param5);
FreeToHeap(ptr);
}
diff --git a/include/unk_02002F08.h b/include/unk_02002F08.h
index 859e44b0..d5553eb2 100644
--- a/include/unk_02002F08.h
+++ b/include/unk_02002F08.h
@@ -5,7 +5,7 @@
#include "gf_gfx_loader.h"
#include "string16.h"
-struct UnkStruct_02002F08_sub_sub
+struct PaletteControl
{
u16 unk00;
@@ -21,17 +21,17 @@ struct UnkStruct_02002F08_sub_sub
u16 unk06_a : 6;
};
-struct UnkStruct_02002F08_sub
+struct Palette
{
- u16 *unk00;
- u16 *unk04;
- u32 unk08;
- struct UnkStruct_02002F08_sub_sub unk0c;
+ u16 *unfadedBuf;
+ u16 *fadedBuf;
+ u32 bufSize;
+ struct PaletteControl unk0c;
};
-struct UnkStruct_02002F08
+struct PaletteData
{
- struct UnkStruct_02002F08_sub unk000[14];
+ struct Palette pltt[14];
u16 unk118_0 : 2;
u16 unk118_2 : 14;
@@ -48,15 +48,15 @@ u32 FUN_02002F40(u32 param0, struct String *str, u32 param2, u32 param3);
u32 FUN_02002F58(const u16 *str);
u32 FUN_02002F90(struct String *str);
s32 FUN_02002F9C(u32 param0, struct String *str);
-struct UnkStruct_02002F08 *FUN_02002FD0(u32 heap_id);
-void FUN_02002FEC(struct UnkStruct_02002F08 *ptr);
-void FUN_02002FF4(
- struct UnkStruct_02002F08 *param0, u32 param1, void *param2, void *param3, u32 size);
-void FUN_02003008(struct UnkStruct_02002F08 *param0, u32 param1, u32 size, u32 heap_id);
-void FUN_02003038(struct UnkStruct_02002F08 *param0, u32 param1);
-void FUN_02003054(
- struct UnkStruct_02002F08 *param0, const void *param1, u32 param2, u32 offset, u16 size);
-void FUN_02003084(struct UnkStruct_02002F08 *param0,
+struct PaletteData *FUN_02002FD0(u32 heap_id);
+void FUN_02002FEC(struct PaletteData *ptr);
+void PaletteData_SetBuffers(
+ struct PaletteData *param0, u32 param1, void *param2, void *param3, u32 size);
+void PaletteData_AllocBuffers(struct PaletteData *param0, u32 param1, u32 size, u32 heap_id);
+void PaletteData_FreeBuffers(struct PaletteData *param0, u32 param1);
+void PaletteData_LoadPalette(
+ struct PaletteData *param0, const void *param1, u32 param2, u32 offset, u16 size);
+void PaletteData_LoadFromNarc(struct PaletteData *param0,
NarcId narcId,
s32 memberId,
u32 heap_id,
@@ -64,7 +64,7 @@ void FUN_02003084(struct UnkStruct_02002F08 *param0,
u32 size,
u16 offset,
u16 param7);
-void FUN_020030E8(struct UnkStruct_02002F08 *param0,
+void PaletteData_LoadNarc(struct PaletteData *param0,
NarcId narcId,
s32 memberId,
u32 heap_id,
diff --git a/include/unk_020030E8.h b/include/unk_020030E8.h
index f211b611..346b9715 100644
--- a/include/unk_020030E8.h
+++ b/include/unk_020030E8.h
@@ -2,13 +2,13 @@
#include "filesystem.h"
#include "unk_02002F08.h"
-void FUN_02003108(struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u32 param3);
+void FUN_02003108(struct PaletteData *param0, u32 param1, u16 param2, u32 param3);
void FUN_0200317C(NarcId narcId, s32 memberId, u32 heap_id, u32 size, u16 offset, void *dest);
void FUN_020031B8(
- struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u32 param3, u16 param4, u16 param5);
-u16 *FUN_020031FC(struct UnkStruct_02002F08 *param0, u32 param1);
-u16 *FUN_02003204(struct UnkStruct_02002F08 *param0, u32 param1);
-u32 FUN_02003210(struct UnkStruct_02002F08 *param0,
+ struct PaletteData *param0, u32 param1, u16 param2, u32 param3, u16 param4, u16 param5);
+u16 *FUN_020031FC(struct PaletteData *param0, u32 param1);
+u16 *FUN_02003204(struct PaletteData *param0, u32 param1);
+u32 FUN_02003210(struct PaletteData *param0,
u16 param1,
u16 param2,
s16 param3,
@@ -16,34 +16,34 @@ u32 FUN_02003210(struct UnkStruct_02002F08 *param0,
u8 param7,
u16 param8);
u8 FUN_02003314(u16 param0, u16 param1);
-void FUN_02003328(struct UnkStruct_02002F08 *param0, u16 param1);
-void FUN_02003368(s32 param0, struct UnkStruct_02002F08_sub *param1, u16 *param2);
-void FUN_020033A4(struct UnkStruct_02002F08_sub_sub *param0,
+void FUN_02003328(struct PaletteData *param0, u16 param1);
+void FUN_02003368(s32 param0, struct Palette *param1, u16 *param2);
+void FUN_020033A4(struct PaletteControl *param0,
u16 param1,
s16 param2,
u8 param3,
u8 param4,
u16 param5);
-void FUN_02003464(u32 param0, struct UnkStruct_02002F08 *param1);
-void FUN_02003500(struct UnkStruct_02002F08 *param0);
-void FUN_02003520(struct UnkStruct_02002F08 *param0);
-void FUN_02003540(struct UnkStruct_02002F08 *param0, u8 param1, u32 param2);
-void FUN_0200359C(struct UnkStruct_02002F08 *param0, u32 param1, u32 param2);
-void FUN_020035F8(u16 *param0, u16 *param1, struct UnkStruct_02002F08_sub_sub *param2, u32 param3);
+void FUN_02003464(u32 param0, struct PaletteData *param1);
+void FUN_02003500(struct PaletteData *param0);
+void FUN_02003520(struct PaletteData *param0);
+void FUN_02003540(struct PaletteData *param0, u8 param1, u32 param2);
+void FUN_0200359C(struct PaletteData *param0, u32 param1, u32 param2);
+void FUN_020035F8(u16 *param0, u16 *param1, struct PaletteControl *param2, u32 param3);
void FUN_02003684(
- struct UnkStruct_02002F08 *param0, u8 param1, struct UnkStruct_02002F08_sub_sub *param2);
-void FUN_0200372C(struct UnkStruct_02002F08 *param0);
-u16 FUN_020038E4(struct UnkStruct_02002F08 *param0);
-void FUN_020038F0(struct UnkStruct_02002F08 *param0, u32 param1);
+ struct PaletteData *param0, u8 param1, struct PaletteControl *param2);
+void FUN_0200372C(struct PaletteData *param0);
+u16 FUN_020038E4(struct PaletteData *param0);
+void FUN_020038F0(struct PaletteData *param0, u32 param1);
void FUN_02003914(
- struct UnkStruct_02002F08 *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5);
+ struct PaletteData *param0, u32 param1, u32 param2, u16 param3, u16 param4, u16 param5);
void FUN_02003974(u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4);
void FUN_020039E8(
- struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u16 param3, u8 param4, u16 param5);
+ struct PaletteData *param0, u32 param1, u16 param2, u16 param3, u8 param4, u16 param5);
void FUN_02003A30(u16 *param0, u16 *param1, u16 param2, u8 param3, u16 param4);
-void FUN_02003A64(struct UnkStruct_02002F08 *param0, u32 param1, u16 param2, u8 param3, u16 param4);
-void FUN_02003AC4(u16 *param0, u16 param1, u32 param2, u32 param3, u32 param4);
-void FUN_02003B40(struct UnkStruct_02002F08 *param0,
+void FUN_02003A64(struct PaletteData *param0, u32 param1, u16 param2, u8 param3, u16 param4);
+void FUN_02003AC4(u16 *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+void FUN_02003B40(struct PaletteData *param0,
NarcId narcId,
s32 memberId,
u32 heap_id,
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 18:22:46 +0000