summaryrefslogtreecommitdiff
path: root/arm9/modules
diff options
context:
space:
mode:
Diffstat (limited to 'arm9/modules')
-rw-r--r--arm9/modules/05/asm/mod05_021E3444.s2
-rw-r--r--arm9/modules/07/asm/module_07.s4
-rw-r--r--arm9/modules/08/asm/module_08.s48
-rw-r--r--arm9/modules/09/asm/module_09.s26
-rw-r--r--arm9/modules/11/asm/module_11_thumb1.s44
-rw-r--r--arm9/modules/11/asm/module_11_thumb2.s56
-rw-r--r--arm9/modules/12/asm/module_12.s168
-rw-r--r--arm9/modules/16/asm/module_16.s4
-rw-r--r--arm9/modules/61/asm/module_61.s32
-rw-r--r--arm9/modules/62/asm/module_62.s22
10 files changed, 203 insertions, 203 deletions
diff --git a/arm9/modules/05/asm/mod05_021E3444.s b/arm9/modules/05/asm/mod05_021E3444.s
index 9bd14da2..0537d0db 100644
--- a/arm9/modules/05/asm/mod05_021E3444.s
+++ b/arm9/modules/05/asm/mod05_021E3444.s
@@ -1474,7 +1474,7 @@ MOD05_021E3F68: ; 0x021E3F68
ldr r0, [sp, #4]
add r3, r7, #0
ldr r0, [r0, #0xc]
- bl FUN_02003974
+ bl BlendPalette
add r0, r6, #0
add r1, r5, #0
mov r2, #0x20
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..1cc36e88 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
@@ -4754,7 +4754,7 @@ _02214142:
ldr r0, [r0]
add r2, #0x64
mov r3, #0x10
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
b _022141B8
_02214180:
mov r3, #0
@@ -4782,7 +4782,7 @@ _02214180:
ldr r0, [r0]
add r2, #0x64
mov r3, #0x10
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
_022141B8:
ldrb r0, [r4, #5]
add r0, r0, #1
@@ -4917,7 +4917,7 @@ _02214286:
ldr r0, [r0]
lsr r2, r2, #0x10
mov r3, #0x10
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
b _022142FA
_022142C2:
mov r3, #0
@@ -4945,7 +4945,7 @@ _022142C2:
mov r1, #0
lsr r2, r2, #0x10
mov r3, #0x10
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
_022142FA:
ldrb r0, [r4, #5]
add r0, r0, #1
@@ -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
@@ -14563,7 +14563,7 @@ MOD08_02218A84: ; 0x02218A84
ldrh r3, [r4, #0xe]
ldr r0, [r4, #0x18]
ldr r1, [r4, #8]
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
ldrb r3, [r4, #0x13]
ldrb r1, [r4, #0x14]
cmp r1, r3
@@ -14728,7 +14728,7 @@ MOD08_02218BD4: ; 0x02218BD4
add r5, r0, #0
bl MOD08_02215504
mov r1, #0
- bl FUN_02003204
+ bl PaletteData_GetFadedBuf
add r4, r0, #0
add r0, r5, #0
bl MOD08_02212004
@@ -14763,7 +14763,7 @@ MOD08_02218C04: ; 0x02218C04
add r0, r4, #0
add r2, r1, #0
add r3, r1, #0
- bl FUN_020031B8
+ bl PaletteData_CopyPalette
add sp, #8
pop {r3, r4, r5, pc}
_02218C30:
@@ -14775,7 +14775,7 @@ _02218C30:
add r0, r4, #0
add r2, r1, #0
add r3, r1, #0
- bl FUN_020031B8
+ bl PaletteData_CopyPalette
add sp, #8
pop {r3, r4, r5, pc}
@@ -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
@@ -26031,7 +26031,7 @@ _0221E796:
mov r2, #0xff
mov r3, #0xa
str r1, [sp]
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
b _0221E7DA
_0221E7C8:
bl MOD08_02215504
@@ -26040,7 +26040,7 @@ _0221E7C8:
str r1, [sp]
mov r1, #0
mov r3, #0xa
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
_0221E7DA:
mov r0, #3
strb r0, [r4, #3]
@@ -26085,7 +26085,7 @@ _0221E810:
mov r2, #0xff
add r3, r1, #0
str r1, [sp]
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
_0221E832:
mov r6, #0
add r5, r4, #0
@@ -34520,7 +34520,7 @@ _02222DA6:
ldr r0, [r4, #0x18]
lsl r2, r2, #8
mov r3, #8
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
ldr r0, [r4]
ldr r1, _02222E18 ; =MOD08_02222BF4
add r2, r4, #0
@@ -38691,7 +38691,7 @@ MOD08_02224F74: ; 0x02224F74
mov r1, #2
lsr r2, r2, #0x10
mov r3, #8
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
add sp, #4
pop {r3, r4, pc}
.align 2, 0
@@ -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..c5b40b5e 100644
--- a/arm9/modules/09/asm/module_09.s
+++ b/arm9/modules/09/asm/module_09.s
@@ -2219,12 +2219,12 @@ 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]
mov r1, #1
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r2, r0, #0
ldr r0, _02213134 ; =0x00001F60
mov r1, #6
@@ -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,12 +2295,12 @@ 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]
mov r1, #1
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r6, r0, #0
ldr r0, [r5]
mov r1, #0x20
@@ -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..1040df95 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]
@@ -911,14 +911,14 @@ _0222DC42:
str r0, [r4, #0x18]
ldr r0, [r4, #0x28]
mov r1, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
ldr r1, _0222DF24 ; =0x00002224
mov r2, #0xe0
add r1, r4, r1
bl MIi_CpuCopy16
ldr r0, [r4, #0x28]
mov r1, #2
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
ldr r1, _0222DF28 ; =0x00002304
mov r2, #0xe0
add r1, r4, r1
@@ -942,7 +942,7 @@ _0222DC42:
mov r2, #2
lsl r3, r3, #0x10
lsr r3, r3, #0x10
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r0, #0xc0
str r0, [sp]
add r0, #0x40
@@ -960,7 +960,7 @@ _0222DC42:
lsl r3, r3, #0x10
mov r2, #2
lsr r3, r3, #0x10
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r0, #0
str r0, [sp]
mov r0, #0xdf
@@ -978,7 +978,7 @@ _0222DC42:
add r2, r1, #0
lsl r3, r3, #0x10
lsr r3, r3, #0x10
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r1, #0
mov r0, #0xa0
str r0, [sp]
@@ -987,7 +987,7 @@ _0222DC42:
ldr r0, [r4, #0x28]
add r2, r1, #0
add r3, r1, #0
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r2, #0
str r2, [sp]
mov r0, #0xff
@@ -995,7 +995,7 @@ _0222DC42:
ldr r0, [r4, #0x28]
ldr r3, _0222DF30 ; =0x0000FFFF
mov r1, #1
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r2, #0
str r2, [sp]
mov r0, #0xff
@@ -1003,7 +1003,7 @@ _0222DC42:
ldr r0, [r4, #0x28]
ldr r3, _0222DF30 ; =0x0000FFFF
mov r1, #3
- bl FUN_02003914
+ bl PaletteData_FillPalette
ldr r0, [r4, #0x28]
mov r1, #0
mov r2, #0xb
@@ -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..1905bce4 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]
@@ -39,7 +39,7 @@ MOD11_0222F29C: ; 0x0222F29C
ldr r0, [r5, #0xc]
mov r2, #2
add r3, r1, #0
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r0, #5
bl BgConfig_Alloc
str r0, [r5, #4]
@@ -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]
@@ -164,7 +164,7 @@ _0222F30E:
ldr r0, [r5, #0xc]
add r2, r1, #0
add r3, r1, #0
- bl FUN_02003914
+ bl PaletteData_FillPalette
bl GX_BothDispOn
mov r0, #0x10
mov r1, #1
@@ -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]
@@ -3859,7 +3859,7 @@ MOD11_02230FCC: ; 0x02230FCC
ldr r5, [r4, r0]
ldr r0, [r4, #0x28]
mov r1, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
mov r2, #2
add r1, r5, #0
lsl r2, r2, #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
@@ -73745,7 +73745,7 @@ _0225319A:
bne _02253286
add r0, r5, #0
mov r1, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r7, r0, #0
ldr r0, [r4]
bl MOD11_02231244
@@ -73758,7 +73758,7 @@ _0225319A:
bne _022531DC
add r0, r5, #0
mov r1, #2
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r7, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -73773,7 +73773,7 @@ _022531DC:
tst r0, r1
beq _02253200
add r0, r5, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r7, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -73789,7 +73789,7 @@ _02253200:
beq _02253226
add r0, r5, #0
mov r1, #2
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r7, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -73800,7 +73800,7 @@ _02253200:
_02253226:
add r0, r5, #0
mov r1, #2
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r7, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -73897,7 +73897,7 @@ _022532E4:
_022532F6:
add r0, r5, #0
mov r1, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r6, r0, #0
ldr r0, [r4]
bl MOD11_02231244
@@ -73910,7 +73910,7 @@ _022532F6:
bne _02253332
add r0, r5, #0
mov r1, #2
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r6, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -73925,7 +73925,7 @@ _02253332:
tst r0, r1
beq _02253356
add r0, r5, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r6, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -73941,7 +73941,7 @@ _02253356:
beq _0225337C
add r0, r5, #0
mov r1, #2
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r6, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -73952,7 +73952,7 @@ _02253356:
_0225337C:
add r0, r5, #0
mov r1, #2
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r6, r0, #0
ldr r0, [r4]
bl MOD11_02231250
@@ -83966,7 +83966,7 @@ _022580F2:
add r2, #0xf
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_02258112:
@@ -83995,7 +83995,7 @@ _0225812A:
add r2, #0xf
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
add sp, #8
pop {r3, r4, r5, r6, r7, pc}
_0225814A:
@@ -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,10 +84523,10 @@ _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
+ bl PaletteData_GetUnfadedBuf
mov r2, #2
ldr r1, [r6, #0x58]
lsl r2, r2, #8
@@ -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
@@ -90735,7 +90735,7 @@ MOD11_0225B794: ; 0x0225B794
ldr r0, _0225B81C ; =0x00007FFF
str r0, [sp, #4]
add r0, r4, #0
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
ldr r1, _0225B820 ; =0x000006A8
_0225B7C8:
ldrb r0, [r5, r1]
@@ -90805,7 +90805,7 @@ MOD11_0225B824: ; 0x0225B824
bne _0225B8A8
add r0, r4, #0
mov r1, #1
- bl FUN_02003204
+ bl PaletteData_GetFadedBuf
add r4, r0, #0
ldr r0, _0225B8AC ; =gMain + 0x40
ldrh r0, [r0, #0x22]
diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s
index 5cb61425..53833b86 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
@@ -1175,11 +1175,11 @@ MOD12_0222DFC4: ; 0x0222DFC4
str r0, [sp, #0x10]
ldr r0, [r5, #0x5c]
mov r1, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
add r4, r0, #0
ldr r0, [r5, #0x5c]
mov r1, #0
- bl FUN_02003204
+ bl PaletteData_GetFadedBuf
str r0, [sp, #0x14]
ldr r0, _0222E0EC ; =MOD12_022451D0
add r1, r7, #0
@@ -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]
@@ -3311,7 +3311,7 @@ MOD12_0222EF04: ; 0x0222EF04
ldr r0, [r5, #0x50]
ldr r3, _0222F17C ; =0x00007FFF
add r2, r1, #0
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r1, #1
add r0, r1, #0
str r1, [sp]
@@ -3320,7 +3320,7 @@ MOD12_0222EF04: ; 0x0222EF04
ldr r0, [r5, #0x50]
ldr r3, _0222F17C ; =0x00007FFF
mov r2, #0
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r2, #0
str r2, [sp]
mov r0, #0xe0
@@ -3328,7 +3328,7 @@ MOD12_0222EF04: ; 0x0222EF04
ldr r0, [r5, #0x50]
ldr r3, _0222F17C ; =0x00007FFF
mov r1, #2
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r2, #0
mov r0, #1
str r2, [sp]
@@ -3337,7 +3337,7 @@ MOD12_0222EF04: ; 0x0222EF04
ldr r0, [r5, #0x50]
ldr r3, _0222F17C ; =0x00007FFF
mov r1, #3
- bl FUN_02003914
+ bl PaletteData_FillPalette
bl FUN_02033E74
mov r0, #6
str r0, [sp]
@@ -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]
@@ -5670,7 +5670,7 @@ MOD12_022304B0: ; 0x022304B0
add r0, #0xa4
ldr r0, [r0]
mov r1, #0
- bl FUN_02003204
+ bl PaletteData_GetFadedBuf
add r4, r0, #0
mov r2, #2
ldr r0, [r5]
@@ -5689,7 +5689,7 @@ MOD12_022304B0: ; 0x022304B0
asr r3, r3, #8
lsl r3, r3, #0x18
lsr r3, r3, #0x18
- bl FUN_02003A30
+ bl BlendPalettes
ldrh r3, [r5, #0xa]
ldrh r1, [r5, #8]
cmp r1, r3
@@ -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,14 +6250,14 @@ 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
add r0, #0xa4
ldr r0, [r0]
mov r1, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
ldr r1, _022309C8 ; =0x0000110C
mov r2, #2
ldr r1, [r5, r1]
@@ -8479,10 +8479,10 @@ _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
+ bl PaletteData_GetUnfadedBuf
lsl r1, r5, #2
add r1, r4, r1
ldr r1, [r1, #0x34]
@@ -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
@@ -10644,7 +10644,7 @@ _02232B46:
mov r3, #0x10
lsl r2, r2, #0x14
lsr r2, r2, #0x10
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
cmp r4, #1
bne _02232B70
add r0, r5, #0
@@ -12129,7 +12129,7 @@ MOD12_02233648: ; 0x02233648
add r2, r2, #1
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
mov r1, #8
ldrsh r2, [r4, r1]
cmp r2, #0
@@ -15894,7 +15894,7 @@ _02235402:
str r0, [sp, #4]
ldr r0, [r4]
ldr r0, [r0, #0x5c]
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
add sp, #0x10
pop {r3, r4, r5, pc}
_0223541C:
@@ -15922,7 +15922,7 @@ _02235438:
str r0, [sp, #4]
ldr r0, [r4]
ldr r0, [r0, #0x5c]
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
add sp, #0x10
pop {r3, r4, r5, pc}
_02235452:
@@ -25922,14 +25922,14 @@ _02239E14:
ldr r2, _02239E8C ; =0x00001FFF
ldr r0, [r0, #0x50]
add r3, r1, #0
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
mov r3, #0
str r3, [sp]
ldr r0, [r4]
ldr r2, _02239E90 ; =0x00003FFF
ldr r0, [r0, #0x50]
mov r1, #2
- bl FUN_02003A64
+ bl BlendPalettesUnfaded
ldr r0, _02239E94 ; =0x000006EC
bl PlaySE
ldrb r0, [r4, #0x10]
@@ -28300,7 +28300,7 @@ _0223B06C:
add r2, r1, #0
ldr r0, [r0, #0x50]
add r3, r1, #0
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r2, #0
str r2, [sp]
mov r0, #0xe0
@@ -28309,7 +28309,7 @@ _0223B06C:
mov r1, #2
ldr r0, [r0, #0x50]
add r3, r2, #0
- bl FUN_02003914
+ bl PaletteData_FillPalette
ldrb r0, [r4, #0x10]
add sp, #8
add r0, r0, #1
@@ -29079,7 +29079,7 @@ MOD12_0223B4F8: ; 0x0223B4F8
mov r1, #0x1e
mov r2, #0x17
lsl r3, r3, #8
- bl FUN_0200317C
+ bl CopyPaletteFromNarc
ldr r0, [r4, #4]
mov r2, #0x17
ldr r1, [r0]
@@ -29096,7 +29096,7 @@ MOD12_0223B4F8: ; 0x0223B4F8
add r0, #0x40
str r0, [sp, #4]
mov r0, #0x2d
- bl FUN_0200317C
+ bl CopyPaletteFromNarc
mov r0, #0
mov r1, #0x20
add r4, #0xf0
@@ -29106,7 +29106,7 @@ MOD12_0223B4F8: ; 0x0223B4F8
str r0, [sp, #4]
mov r0, #0x2d
lsl r3, r1, #4
- bl FUN_0200317C
+ bl CopyPaletteFromNarc
add sp, #0x10
pop {r3, r4, r5, pc}
.align 2, 0
@@ -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
@@ -30553,7 +30553,7 @@ MOD12_0223C1F4: ; 0x0223C1F4
ldr r0, [r0]
mov r2, #0
mov r3, #0x40
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
add sp, #8
pop {r3, pc}
@@ -35423,7 +35423,7 @@ MOD12_0223E750: ; 0x0223E750
add r5, r1, #0
ldr r0, [r0]
mov r1, #0
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
ldr r3, _0223E77C ; =MOD12_0224620C
lsl r5, r5, #2
ldrh r1, [r3, r5]
@@ -35435,7 +35435,7 @@ MOD12_0223E750: ; 0x0223E750
lsl r3, r3, #0x18
ldr r1, [r4, r1]
lsr r3, r3, #0x18
- bl FUN_02003A30
+ bl BlendPalettes
pop {r3, r4, r5, pc}
.align 2, 0
_0223E77C: .word MOD12_0224620C
@@ -35646,7 +35646,7 @@ MOD12_0223E8EC: ; 0x0223E8EC
mov r1, #0
add r0, #0xa4
ldr r0, [r0]
- bl FUN_020031FC
+ bl PaletteData_GetUnfadedBuf
ldrb r1, [r4, #0xa]
lsl r3, r1, #1
ldr r1, _0223E94C ; =0x00007FFF
@@ -35661,7 +35661,7 @@ MOD12_0223E8EC: ; 0x0223E8EC
asr r3, r3, #8
lsl r3, r3, #0x18
lsr r3, r3, #0x18
- bl FUN_02003974
+ bl BlendPalette
ldrh r1, [r4, #8]
cmp r1, #0
bne _0223E932
@@ -36309,7 +36309,7 @@ _0223EE30:
add r0, #8
mov r2, #1
lsr r3, r3, #0x18
- bl FUN_02003974
+ bl BlendPalette
add r1, sp, #4
ldrh r1, [r1]
ldr r0, [r5]
@@ -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
@@ -44010,7 +44010,7 @@ MOD12_022429E0: ; 0x022429E0
ldr r0, [r0]
mov r1, #1
mov r2, #2
- bl FUN_02003914
+ bl PaletteData_FillPalette
mov r3, #0
mov r0, #1
str r3, [sp]
@@ -44020,7 +44020,7 @@ MOD12_022429E0: ; 0x022429E0
ldr r0, [r4]
mov r1, #3
mov r2, #2
- bl FUN_02003914
+ bl PaletteData_FillPalette
add sp, #8
pop {r4, pc}
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
diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s
index cbb58d60..d58310fa 100644
--- a/arm9/modules/61/asm/module_61.s
+++ b/arm9/modules/61/asm/module_61.s
@@ -466,7 +466,7 @@ _021D77F2:
add r2, #0x22
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
ldrb r0, [r5, #0x16]
strb r0, [r5, #0x17]
mov r0, #0
@@ -780,7 +780,7 @@ _021D7ABC:
lsl r2, r3, #0x10
lsr r2, r2, #0x10
mov r3, #1
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
ldrb r0, [r4, #0x16]
strb r0, [r4, #0x17]
mov r0, #0
@@ -798,7 +798,7 @@ _021D7AEA:
add r2, #0x22
lsl r2, r2, #0x10
lsr r2, r2, #0x10
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
ldrb r0, [r4, #0x15]
ldrb r1, [r4, #0x14]
cmp r0, #0
@@ -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]
@@ -1223,7 +1223,7 @@ _021D7E00:
ldr r0, [r5, #0x30]
add r2, r1, #0
mov r3, #0x70
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
mov r0, #0x10
str r0, [sp]
mov r2, #0
@@ -1231,7 +1231,7 @@ _021D7E00:
ldr r0, [r5, #0x30]
mov r1, #2
mov r3, #0x30
- bl FUN_020039E8
+ bl BlendPaletteUnfaded
ldr r0, [r5, #0x30]
mov r1, #1
bl FUN_020038F0
@@ -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
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-06 11:36:44 +0000