diff options
author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-27 10:37:38 +0200 |
---|---|---|
committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-06-27 10:37:38 +0200 |
commit | 9000931f5c47a0b6e8ee6f2ac0069db61868bd32 (patch) | |
tree | 719fd293e573b67f91d76d0230aee9e30f07f2d7 /arm9/modules | |
parent | 807fb0c97bb0edf6b6d288bf70aeb8aa934b7e08 (diff) |
document palette stuff from unk_02002F08.c
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/07/asm/module_07.s | 4 | ||||
-rw-r--r-- | arm9/modules/08/asm/module_08.s | 22 | ||||
-rw-r--r-- | arm9/modules/09/asm/module_09.s | 22 | ||||
-rw-r--r-- | arm9/modules/11/asm/module_11_thumb1.s | 28 | ||||
-rw-r--r-- | arm9/modules/11/asm/module_11_thumb2.s | 20 | ||||
-rw-r--r-- | arm9/modules/12/asm/module_12.s | 110 | ||||
-rw-r--r-- | arm9/modules/61/asm/module_61.s | 22 | ||||
-rw-r--r-- | arm9/modules/62/asm/module_62.s | 22 |
8 files changed, 125 insertions, 125 deletions
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 |