diff options
Diffstat (limited to 'arm9/modules')
43 files changed, 1613 insertions, 1581 deletions
diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 8bebb5b3..52073cac 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -424,7 +424,7 @@ MOD05_021D7894: ; 0x021D7894 asr r2, r1, #5 ldr r0, [r5, #0x28] add r1, r4, #0 - bl FUN_0203451C + bl MapMatrix_GetMapHeader add r4, r0, #0 ldr r0, [r5, #0x1c] ldr r6, [r0] @@ -542,7 +542,7 @@ MOD05_021D79B4: ; 0x021D79B4 add r5, r0, #0 ldr r0, [r5, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _021D79FE ldr r0, [r5, #0xc] diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index bda94277..7af8c0ec 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -2216,11 +2216,11 @@ MOD05_021D9290: ; 0x021D9290 beq _021D92DA ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #1 bne _021D931C ldr r0, [sp, #8] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 bne _021D931C ldr r0, [r4, #0x38] @@ -2246,11 +2246,11 @@ _021D92DA: beq _021D931C ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #1 bne _021D931C ldr r0, [sp, #8] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 bne _021D931C ldr r0, [r4, #0x38] diff --git a/arm9/modules/05/asm/mod05_021E1AD8.s b/arm9/modules/05/asm/mod05_021E1AD8.s index 79954077..20fc2752 100644 --- a/arm9/modules/05/asm/mod05_021E1AD8.s +++ b/arm9/modules/05/asm/mod05_021E1AD8.s @@ -2073,10 +2073,10 @@ MOD05_021E2AD4: ; 0x021E2AD4 bl NewString_ReadMsgData str r0, [sp, #0x10] ldr r0, [r6, #0xc] - bl FUN_0202A8D8 + bl SaveStruct23_GetSubstruct2 mov r1, #0 add r2, r1, #0 - bl FUN_0202A3B4 + bl SaveStruct23_Substruct2_SetField_0x0 add r2, r0, #0 mov r0, #1 str r0, [sp] 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/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 47360829..3cc1b9fe 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -11251,7 +11251,7 @@ MOD05_021EE114: ; 0x021EE114 cmp r0, r1 bge _021EE1D0 add r1, r2, #0 - bl FUN_02034660 + bl GetMapData add r1, r0, #0 ldr r0, _021EE1D4 ; =0x0000FFFF cmp r1, r0 @@ -11356,7 +11356,7 @@ MOD05_021EE1E4: ; 0x021EE1E4 mul r3, r2 cmp r0, r3 bge _021EE286 - bl FUN_02034660 + bl GetMapData add r1, r0, #0 ldr r0, _021EE298 ; =0x0000FFFF cmp r1, r0 @@ -11440,7 +11440,7 @@ MOD05_021EE2A4: ; 0x021EE2A4 cmp r1, r5 bge _021EE37A add r1, r3, #0 - bl FUN_02034660 + bl GetMapData add r1, r0, #0 ldr r0, _021EE380 ; =0x0000FFFF cmp r1, r0 @@ -11556,7 +11556,7 @@ MOD05_021EE38C: ; 0x021EE38C cmp r1, r2 bge _021EE43E add r1, r3, #0 - bl FUN_02034660 + bl GetMapData add r1, r0, #0 ldr r0, _021EE450 ; =0x0000FFFF cmp r1, r0 @@ -13633,17 +13633,17 @@ MOD05_021EF300: ; 0x021EF300 lsl r0, r0, #0x10 lsr r4, r0, #0x10 add r0, r7, #0 - bl FUN_020344FC + bl MapMatrix_GetWidth str r0, [sp, #8] add r0, r7, #0 - bl FUN_02034574 + bl MapMatrix_GetMatrixID add r1, r0, #0 ldr r0, [sp, #8] add r2, r6, #0 str r0, [sp] add r0, r7, #0 add r3, r4, #0 - bl FUN_02034578 + bl MapMatrix_GetMapAltitude lsl r0, r0, #0xf str r0, [r5, #4] ldr r1, [r5] @@ -13707,12 +13707,12 @@ _021EF3AE: add r0, #0xbc str r5, [r0] add r0, r5, #0 - bl FUN_020344FC + bl MapMatrix_GetWidth add r1, r4, #0 add r1, #0xc0 str r0, [r1] add r0, r5, #0 - bl FUN_0203450C + bl MapMatrix_GetHeight add r1, r4, #0 add r1, #0xc4 str r0, [r1] @@ -25857,7 +25857,7 @@ MOD05_021F5068: ; 0x021F5068 ldr r0, [r5, #0x28] add r7, r1, #0 add r1, r2, #0 - bl FUN_02034554 + bl MapMatrix_GetMapHeaderFromID bl MOD05_021F50FC add r4, r0, #0 cmp r4, #0x15 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index ad23df94..13b58921 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -4775,7 +4775,7 @@ MOD06_0223B9A8: ; 0x0223B9A8 ldr r0, [r0] add r6, r2, #0 add r7, r3, #0 - bl FUN_020349B8 + bl MapHeader_MapIsTrophyGarden cmp r0, #0 beq _0223B9FC add r1, sp, #0 @@ -5248,7 +5248,7 @@ _0223BD8A: ldr r0, [sp, #8] ldr r0, [r0, #0x1c] ldr r0, [r0] - bl FUN_020349AC + bl MapHeader_MapIsMtCoronetFeebasRoom cmp r0, #0 beq _0223BDFC ldr r0, [sp, #8] @@ -19893,17 +19893,17 @@ _022433A4: .word OS_ResetSystem thumb_func_start MOD06_022433A8 MOD06_022433A8: ; 0x022433A8 - ldr r3, _022433AC ; =FUN_0202A1E4 + ldr r3, _022433AC ; =SaveStruct23_Substruct1_Init bx r3 .align 2, 0 -_022433AC: .word FUN_0202A1E4 +_022433AC: .word SaveStruct23_Substruct1_Init thumb_func_start MOD06_022433B0 MOD06_022433B0: ; 0x022433B0 - ldr r3, _022433B4 ; =FUN_0202A398 + ldr r3, _022433B4 ; =SaveStruct23_Substruct1_GetFlag1 bx r3 .align 2, 0 -_022433B4: .word FUN_0202A398 +_022433B4: .word SaveStruct23_Substruct1_GetFlag1 thumb_func_start MOD06_022433B8 MOD06_022433B8: ; 0x022433B8 @@ -19965,26 +19965,26 @@ _02243414: MOD06_02243428: ; 0x02243428 push {r4, lr} add r4, r1, #0 - bl FUN_0202A8D8 + bl SaveStruct23_GetSubstruct2 cmp r4, #0 bne _0224343E mov r1, #5 mov r2, #2 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag pop {r4, pc} _0224343E: mov r1, #5 mov r2, #1 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag pop {r4, pc} thumb_func_start MOD06_02243448 MOD06_02243448: ; 0x02243448 push {r3, lr} - bl FUN_0202A8D8 + bl SaveStruct23_GetSubstruct2 mov r1, #5 mov r2, #0 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag lsl r0, r0, #0x10 lsr r0, r0, #0x10 pop {r3, pc} @@ -19993,15 +19993,15 @@ MOD06_02243448: ; 0x02243448 MOD06_0224345C: ; 0x0224345C push {r4, r5, r6, lr} add r5, r0, #0 - bl FUN_0202A8CC + bl SaveStruct23_GetSubstruct1 add r4, r0, #0 add r0, r5, #0 - bl FUN_0202A8D8 + bl SaveStruct23_GetSubstruct2 mov r1, #0 add r6, r0, #0 add r0, r4, #0 add r2, r1, #0 - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField lsl r0, r0, #0x18 lsr r4, r0, #0x18 cmp r4, #5 @@ -20015,11 +20015,11 @@ _02243484: add r0, r6, #0 lsr r1, r1, #0x10 mov r2, #2 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag add r0, r6, #0 add r1, r4, #0 mov r2, #2 - bl FUN_0202A538 + bl SaveStruct23_Substruct2_SetField_0xC cmp r4, #4 beq _022434A8 add r0, r5, #0 @@ -20031,8 +20031,8 @@ _022434A8: thumb_func_start MOD06_022434AC MOD06_022434AC: ; 0x022434AC push {r3, lr} - bl FUN_0202A8E4 - bl FUN_0202A744 + bl SaveStruct23_GetSubstruct4 + bl SaveStruct23_Substruct4_GetField_0xFE lsl r0, r0, #0x10 lsr r0, r0, #0x10 pop {r3, pc} @@ -20072,16 +20072,16 @@ MOD06_022434D0: ; 0x022434D0 mov r0, #0x3b str r0, [r4, #4] add r0, r6, #0 - bl FUN_0202A8CC + bl SaveStruct23_GetSubstruct1 str r0, [r4, #0x70] add r0, r6, #0 - bl FUN_0202A8D8 + bl SaveStruct23_GetSubstruct2 str r0, [r4, #0x74] ldr r0, _02243688 ; =0x12345678 mov r1, #0 str r0, [r4] ldr r0, [r4, #0x70] - bl FUN_0202A3A0 + bl SaveStruct23_Substruct1_SetFlag1 cmp r5, #0 bne _0224356C strb r7, [r4, #0xf] @@ -20114,25 +20114,25 @@ _02243544: cmp r2, #0xe blo _02243544 ldr r0, [r4, #0x70] - bl FUN_0202A1E4 + bl SaveStruct23_Substruct1_Init ldrb r1, [r4, #0xf] add r0, sp, #8 add r2, sp, #8 strb r1, [r0] ldr r0, [r4, #0x70] mov r1, #0 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField b _0224362A _0224356C: mov r1, #0 ldr r0, [r4, #0x70] add r2, r1, #0 - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField strb r0, [r4, #0xf] ldr r0, [r4, #0x70] mov r1, #1 mov r2, #0 - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField strb r0, [r4, #0xc] ldrb r0, [r4, #0xc] sub r0, r0, #1 @@ -20144,16 +20144,16 @@ _0224356C: ldr r0, [r4, #0x70] mov r1, #5 add r2, #0x2a - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField add r2, r4, #0 ldr r0, [r4, #0x70] mov r1, #8 add r2, #0x3e - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField ldr r0, [r4, #0x70] mov r1, #0xa mov r2, #0 - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField str r0, [r4, #8] ldrb r0, [r4, #0xf] cmp r0, #2 @@ -20161,7 +20161,7 @@ _0224356C: ldr r0, [r4, #0x70] mov r1, #9 mov r2, #0 - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField lsl r0, r0, #0x18 lsr r0, r0, #0x18 lsl r0, r0, #0x1d @@ -20180,14 +20180,14 @@ _0224356C: lsl r3, r3, #4 mov r1, #6 add r2, r2, r3 - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField ldrb r0, [r4, #0x10] mov r1, #7 mov r2, #0 lsl r0, r0, #0x18 lsr r5, r0, #0x1d ldr r0, [r4, #0x70] - bl FUN_0202A240 + bl SaveStruct23_Substruct1_GetField add r3, r0, #0 ldr r0, _02243690 ; =0x000007E8 mov r1, #0xa6 @@ -20226,7 +20226,7 @@ _0224362A: lsl r1, r1, #0x10 lsr r1, r1, #0x10 mov r2, #0 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag lsl r0, r0, #0x10 lsr r0, r0, #0x10 beq _02243668 @@ -20244,7 +20244,7 @@ _02243668: ldrb r1, [r4, #0xf] ldr r0, [r4, #0x74] mov r2, #0 - bl FUN_0202A538 + bl SaveStruct23_Substruct2_SetField_0xC strh r0, [r4, #0x1c] _0224367E: add r0, r4, #0 @@ -20707,17 +20707,17 @@ _022439B8: strb r1, [r0] ldr r0, [r5, #0x70] mov r1, #0 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField ldrb r1, [r5, #0xc] add r0, sp, #0 add r2, sp, #0 strb r1, [r0] ldr r0, [r5, #0x70] mov r1, #1 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField ldr r0, [r5, #0x74] ldr r1, [r5, #0x70] - bl FUN_0202A4B8 + bl SaveStruct23_Substruct2_SetField_0x16 _022439F6: pop {r3, r4, r5, r6, r7, pc} @@ -20771,7 +20771,7 @@ _02243A52: add r1, #8 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag lsl r0, r0, #0x10 lsr r0, r0, #0x10 beq _02243A74 @@ -20793,7 +20793,7 @@ _02243A7E: lsl r1, r1, #0x10 lsr r1, r1, #0x10 mov r2, #2 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag ldrb r2, [r5, #0xd] ldr r0, [sp, #4] mov r1, #0x1d @@ -20801,7 +20801,7 @@ _02243A7E: ldrb r1, [r5, #0xf] ldr r0, [r5, #0x74] mov r2, #2 - bl FUN_0202A538 + bl SaveStruct23_Substruct2_SetField_0xC ldr r0, [sp, #8] bl FUN_02029FC8 mov r1, #0xf @@ -20849,7 +20849,7 @@ MOD06_02243AD8: ; 0x02243AD8 lsr r1, r1, #0x10 mov r2, #0 add r4, #0x35 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag lsl r0, r0, #0x10 lsr r0, r0, #0x10 beq _02243B1A @@ -20872,7 +20872,7 @@ _02243B26: add r1, #8 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag add r0, r6, #0 add r1, r4, #0 bl FUN_0202A150 @@ -20887,7 +20887,7 @@ _02243B26: ldrb r1, [r5, #0xf] ldr r0, [r5, #0x74] mov r2, #3 - bl FUN_0202A538 + bl SaveStruct23_Substruct2_SetField_0xC add r0, r6, #0 mov r1, #0xf mov r2, #1 @@ -20933,19 +20933,19 @@ MOD06_02243BA8: ; 0x02243BA8 strb r1, [r0] ldr r0, [r4, #0x70] mov r1, #0 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField ldrb r1, [r4, #0xc] add r0, sp, #0 add r2, sp, #0 strb r1, [r0] ldr r0, [r4, #0x70] mov r1, #1 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField add r2, r4, #0 ldr r0, [r4, #0x70] mov r1, #5 add r2, #0x2a - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField ldrh r1, [r4, #0x28] ldrh r2, [r4, #0x24] ldrh r3, [r4, #0x26] @@ -20957,15 +20957,15 @@ MOD06_02243BA8: ; 0x02243BA8 ldr r0, [r4, #0x70] mov r1, #8 add r2, #0x3e - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField add r2, r4, #0 ldr r0, [r4, #0x70] mov r1, #0xa add r2, #8 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField ldr r0, [r4, #0x70] mov r1, #1 - bl FUN_0202A3A0 + bl SaveStruct23_Substruct1_SetFlag1 ldrb r0, [r4, #0xf] cmp r0, #2 bne _02243C4E @@ -20977,7 +20977,7 @@ MOD06_02243BA8: ; 0x02243BA8 strb r1, [r0] ldr r0, [r4, #0x70] mov r1, #9 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField ldrb r3, [r4, #0x10] ldr r2, _02243C54 ; =0x000007E8 ldr r0, [r4, #0x70] @@ -20987,7 +20987,7 @@ MOD06_02243BA8: ; 0x02243BA8 lsl r3, r3, #4 mov r1, #6 add r2, r2, r3 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField ldr r2, _02243C58 ; =0x00000838 ldr r0, [r4, #0x70] add r3, r4, r2 @@ -20996,7 +20996,7 @@ MOD06_02243BA8: ; 0x02243BA8 lsl r2, r2, #0x18 lsr r2, r2, #0x1d add r2, r3, r2 - bl FUN_0202A2C4 + bl SaveStruct23_Substruct1_SetField _02243C4E: add sp, #4 pop {r3, r4, pc} @@ -21234,13 +21234,13 @@ _02243DEE: ldr r0, [r4, #0x74] bne _02243E00 mov r1, #0 - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 ldr r1, _02243E2C ; =0x02250C5C ldrb r5, [r1, r0] b _02243E1E _02243E00: mov r2, #0 - bl FUN_0202A538 + bl SaveStruct23_Substruct2_SetField_0xC ldrb r1, [r4, #0x10] lsl r1, r1, #0x1d lsr r1, r1, #0x1e @@ -21259,7 +21259,7 @@ _02243E1E: ldr r0, [r4, #0x74] add r1, r5, #0 mov r2, #5 - bl FUN_0202A3B4 + bl SaveStruct23_Substruct2_SetField_0x0 add r0, r5, #0 pop {r3, r4, r5, pc} .align 2, 0 @@ -21283,7 +21283,7 @@ _02243E48: blo _02243E5E mov r1, #1 mov r2, #0 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag cmp r0, #0 beq _02243E6E mov r0, #0 @@ -21291,7 +21291,7 @@ _02243E48: _02243E5E: mov r1, #0 add r2, r1, #0 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag cmp r0, #0 beq _02243E6E mov r0, #0 @@ -21307,7 +21307,7 @@ MOD06_02243E74: ; 0x02243E74 add r6, r0, #0 add r0, r1, #0 add r5, r2, #0 - bl FUN_0202A8D8 + bl SaveStruct23_GetSubstruct2 add r4, r0, #0 cmp r5, #0 beq _02243E90 @@ -21318,15 +21318,15 @@ MOD06_02243E74: ; 0x02243E74 b _02243F10 _02243E90: mov r1, #0 - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 pop {r4, r5, r6, pc} _02243E98: mov r1, #4 mov r2, #2 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag add r0, r4, #0 mov r1, #0 - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 add r5, r0, #0 cmp r5, #0xa bne _02243EB2 @@ -21335,7 +21335,7 @@ _02243E98: _02243EB2: add r0, r4, #0 mov r1, #3 - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 add r0, r5, #1 cmp r0, #5 blt _02243EC8 @@ -21348,11 +21348,11 @@ _02243EC8: pop {r4, r5, r6, pc} _02243ECC: mov r1, #3 - bl FUN_0202A40C + bl SaveStruct23_Substruct2_SetField_0x2 add r5, r0, #0 add r0, r4, #0 mov r1, #0 - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 cmp r0, #1 bne _02243EE4 mov r0, #0 @@ -21365,14 +21365,14 @@ _02243EE4: blo _02243F0C add r0, r4, #0 mov r1, #4 - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 add r0, r4, #0 mov r1, #2 - bl FUN_0202A40C + bl SaveStruct23_Substruct2_SetField_0x2 add r0, r4, #0 mov r1, #4 mov r2, #2 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag mov r0, #1 pop {r4, r5, r6, pc} _02243F0C: @@ -21476,7 +21476,7 @@ MOD06_02243F9C: ; 0x02243F9C add r1, #8 lsl r1, r1, #0x10 lsr r1, r1, #0x10 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag lsl r0, r0, #0x18 lsr r0, r0, #0x18 bne _02243FC0 @@ -21749,7 +21749,7 @@ _022441B8: ldr r0, [r6, #0x74] ldr r1, [sp] ldr r2, [sp, #4] - bl FUN_0202A474 + bl SaveStruct23_Substruct2_SetArray ldr r0, [sp, #4] mov r1, #0 mov r2, #0xa8 @@ -21939,9 +21939,9 @@ MOD06_0224434C: ; 0x0224434C lsl r2, r2, #4 bl MI_CpuFill8 add r0, r6, #0 - bl FUN_0202A8E4 + bl SaveStruct23_GetSubstruct4 add r6, r0, #0 - bl FUN_0202A744 + bl SaveStruct23_Substruct4_GetField_0xFE cmp r0, #0 bne _0224437A add r0, r5, #0 @@ -22424,7 +22424,7 @@ _0224471C: ldr r0, [r6, #0x74] mov r1, #3 mov r2, #0 - bl FUN_0202A538 + bl SaveStruct23_Substruct2_SetField_0xC ldr r1, _02244754 ; =0x00000844 strh r0, [r6, r1] pop {r3, r4, r5, r6, r7, pc} @@ -23774,7 +23774,7 @@ MOD06_02245198: ; 0x02245198 lsl r2, r2, #0xb lsr r1, r1, #0x10 lsr r2, r2, #0x10 - bl FUN_020345FC + bl GetMapHeader b _022451D6 _022451BA: cmp r5, #5 @@ -23790,7 +23790,7 @@ _022451C2: ldr r0, [r0, #0x28] lsr r1, r1, #5 lsr r2, r2, #5 - bl FUN_0203451C + bl MapMatrix_GetMapHeader _022451D6: lsl r3, r5, #2 add r1, r4, r3 @@ -38544,7 +38544,7 @@ MOD06_0224C27C: ; 0x0224C27C strb r0, [r4, #0xe] strb r0, [r4, #0xf] ldr r0, [r5, #0x28] - bl FUN_020344FC + bl MapMatrix_GetWidth add r1, r0, #0 ldr r0, [sp] add r2, sp, #0x14 @@ -39797,7 +39797,7 @@ _0224CC80: add r2, sp, #0x14 bl FUN_020572B8 ldr r0, [r5, #0x28] - bl FUN_020344FC + bl MapMatrix_GetWidth str r0, [sp] mov r0, #0 str r0, [sp, #4] @@ -42943,7 +42943,7 @@ MOD06_0224E554: ; 0x0224E554 strb r0, [r4, #0xe] strb r0, [r4, #0xf] ldr r0, [r5, #0x28] - bl FUN_020344FC + bl MapMatrix_GetWidth add r1, r0, #0 ldr r0, [sp] add r2, sp, #0x14 diff --git a/arm9/modules/06/include/module_06.h b/arm9/modules/06/include/module_06.h index d9915f00..3942b1ce 100644 --- a/arm9/modules/06/include/module_06.h +++ b/arm9/modules/06/include/module_06.h @@ -1,14 +1,14 @@ -#ifndef POKEDIAMOND_MODULE_06_H
-#define POKEDIAMOND_MODULE_06_H
-
-enum MartType
-{
- MART_ITEMS = 0,
- MART_GOODS,
- MART_SEALS,
- MART_DECORATIONS = MART_GOODS,
-};
-
-void MOD06_0223D3D0(struct UnkStruct_0204639C *, struct UnkSavStruct80 *, const u16 *, enum MartType, u32);
-
-#endif //POKEDIAMOND_MODULE_06_H
+#ifndef POKEDIAMOND_MODULE_06_H +#define POKEDIAMOND_MODULE_06_H + +enum MartType +{ + MART_ITEMS = 0, + MART_GOODS, + MART_SEALS, + MART_DECORATIONS = MART_GOODS, +}; + +void MOD06_0223D3D0(struct UnkStruct_0204639C *, struct UnkSavStruct80 *, const u16 *, enum MartType, u32); + +#endif //POKEDIAMOND_MODULE_06_H diff --git a/arm9/modules/07/asm/module_07.s b/arm9/modules/07/asm/module_07.s index e4400e3e..bc0d71b9 100644 --- a/arm9/modules/07/asm/module_07.s +++ b/arm9/modules/07/asm/module_07.s @@ -156,7 +156,7 @@ MOD07_02211F34: ; 0x02211F34 mov r1, #0 ldr r3, [r3, #0x24] mov r2, #0x60 - bl FUN_02003008 + bl PaletteData_AllocBuffers ldr r0, _02211FEC ; =0x00000B82 mov r3, #0 strb r3, [r4, r0] @@ -1641,7 +1641,7 @@ _02212BA8: bl FUN_0201C29C ldr r0, [r4, #8] mov r1, #0 - bl FUN_02003038 + bl PaletteData_FreeBuffers ldr r0, [r4, #8] bl FUN_02002FEC ldr r0, [r4] @@ -5037,7 +5037,7 @@ MOD07_02214720: ; 0x02214720 mov r0, #0x57 lsl r0, r0, #2 ldr r0, [r1, r0] - bl FUN_02034998 + bl MapHeader_MapIsUnionRoom cmp r0, #1 bne _0221479C mov r0, #1 diff --git a/arm9/modules/08/asm/module_08.s b/arm9/modules/08/asm/module_08.s index 44194a24..acd698d5 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 e86aa9ee..c035be6d 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] @@ -5564,7 +5564,7 @@ MOD12_022303C0: ; 0x022303C0 str r2, [r4, r0] mov r0, #7 str r1, [r3, #4] - bl FUN_02004F64 + bl GF_SndPlayerGetTick ldr r1, _02230498 ; =0x00000AF8 ldr r1, [r4, r1] mul r0, r1 @@ -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..16b3c00d 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -71,7 +71,7 @@ _021D7546: str r0, [r4] mov r0, #1 mov r1, #0x2a - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 add sp, #0x20 pop {r3, r4, r5, pc} @@ -171,7 +171,7 @@ _021D7630: bl DestroyHeap mov r0, #1 mov r1, #0x7f - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021D7614 @@ -44271,7 +44271,7 @@ _021EBCD4: cmp r0, #1 bne _021EBCE6 mov r0, #0 - bl FUN_02004CA4 + bl GF_SndCaptureStopReverb _021EBCE6: ldr r0, [r4, #0x50] cmp r0, #2 @@ -44291,13 +44291,13 @@ _021EBD02: ldr r0, [r4, #0x50] cmp r0, #2 bne _021EBD0C - bl FUN_02004CFC + bl GF_SndCaptureStopEffect _021EBD0C: ldr r0, [r4, #0x50] cmp r0, #1 beq _021EBD1C mov r0, #0 - bl FUN_02004C80 + bl GF_SndCaptureStartReverb mov r0, #1 str r0, [r4, #0x50] _021EBD1C: @@ -44316,7 +44316,7 @@ _021EBD26: sub r0, r0, #1 _021EBD34: mov r1, #0 - bl FUN_02004CAC + bl GF_SndCaptureSetReverbVolume pop {r4, pc} thumb_func_end MOD16_021EBCC4 @@ -44710,12 +44710,12 @@ MOD16_021EC010: ; 0x021EC010 cmp r0, #1 bne _021EC020 mov r0, #0 - bl FUN_02004CA4 + bl GF_SndCaptureStopReverb _021EC020: ldr r0, [r4, #0x50] cmp r0, #2 bne _021EC02A - bl FUN_02004CFC + bl GF_SndCaptureStopEffect _021EC02A: mov r0, #0 str r0, [r4, #0x50] @@ -44855,7 +44855,7 @@ MOD16_021EC0E8: ; 0x021EC0E8 ldr r1, _021EC10C ; =0x0000FFFF ldr r2, [r4, #0x40] mov r0, #1 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan ldr r0, [r4, #0x44] bl MOD16_021EC110 _021EC108: @@ -44866,13 +44866,13 @@ _021EC10C: .word 0x0000FFFF thumb_func_start MOD16_021EC110 MOD16_021EC110: ; 0x021EC110 - ldr r3, _021EC11C ; =FUN_02004828 + ldr r3, _021EC11C ; =GF_SndPlayerMoveVolume add r1, r0, #0 mov r0, #8 mov r2, #0 bx r3 nop -_021EC11C: .word FUN_02004828 +_021EC11C: .word GF_SndPlayerMoveVolume thumb_func_end MOD16_021EC110 thumb_func_start MOD16_021EC120 @@ -44988,12 +44988,12 @@ MOD16_021EC1DC: ; 0x021EC1DC ldr r1, _021EC1F8 ; =0x0000FFFF mov r0, #1 add r2, r4, #0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch add r4, #0x14 ldr r1, _021EC1F8 ; =0x0000FFFF mov r0, #8 add r2, r4, #0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch pop {r4, pc} .align 2, 0 _021EC1F8: .word 0x0000FFFF @@ -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/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index e75f620e..f30d7e23 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -405,7 +405,7 @@ MOD18_02239994: ; 0x02239994 ldr r0, [r0] ldr r0, [r0] ldr r0, [r0, #0x28] - bl FUN_020344FC + bl MapMatrix_GetWidth sub r0, r0, #2 lsl r0, r0, #0x15 lsr r6, r0, #0x10 @@ -413,7 +413,7 @@ MOD18_02239994: ; 0x02239994 ldr r0, [r0] ldr r0, [r0] ldr r0, [r0, #0x28] - bl FUN_0203450C + bl MapMatrix_GetHeight sub r0, r0, #2 lsl r0, r0, #0x15 lsr r4, r0, #0x10 @@ -17263,7 +17263,7 @@ MOD18_02241AD0: ; 0x02241AD0 ldr r2, _02241D24 ; =MOD18_02241AB4 mov r3, #0 mov r0, #2 - bl FUN_02004928 + bl GF_MIC_DoSamplingAsync ldr r0, _02241D28 ; =0x022513A0 ldr r2, [r0, #4] ldr r0, _02241D2C ; =0x00000B3B @@ -20447,7 +20447,7 @@ _02243402: ldr r2, _02243530 ; =MOD18_02241AB4 mov r0, #2 mov r3, #0 - bl FUN_02004928 + bl GF_MIC_DoSamplingAsync ldr r0, [r5, #0x14] add r0, r0, #1 str r0, [r5, #0x14] diff --git a/arm9/modules/19/src/module_19.c b/arm9/modules/19/src/module_19.c index 1fc6197e..b8426d9f 100644 --- a/arm9/modules/19/src/module_19.c +++ b/arm9/modules/19/src/module_19.c @@ -1,47 +1,47 @@ -#include "global.h"
-#include "heap.h"
-#include "gx.h"
-#include "gf_gfx_loader.h"
-#include "bg_window.h"
-#include "graphic/poketch.naix"
-
-const struct BgTemplate MOD19_02252508 = {
- .x = 0,
- .y = 0,
- .bufferSize = 0x800,
- .baseTile = 0x000,
- .size = GF_BG_SCR_SIZE_256x256,
- .colorMode = GF_BG_CLR_4BPP,
- .screenBase = 12,
- .charBase = 0,
- .priority = 0,
- .areaOver = 0,
- .mosaic = 0
-};
-
-THUMB_FUNC void MOD19_02252440(struct BgConfig * bgConfig)
-{
- CreateHeap(3, 8, 0x18000);
- GXS_SetGraphicsMode(GX_BGMODE_0);
- GX_SetBankForSubBG(0x80);
- GX_SetBankForSubOBJ(0x100);
- GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K);
- InitBgFromTemplate(bgConfig, GF_BG_LYR_SUB_0, &MOD19_02252508, GF_BG_TYPE_TEXT);
- GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8);
- GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8);
- GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_BG_LYR_SUB_0, 0x00, 0x20, 8);
- GXS_SetVisibleWnd(GX_WNDMASK_NONE);
- GXS_SetVisiblePlane(GX_PLANEMASK_BG0);
-}
-
-THUMB_FUNC void MOD19_022524F4(struct BgConfig * bgConfig)
-{
- FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0);
- DestroyHeap(8);
-}
-
-THUMB_FUNC BOOL MOD19_02252504(struct BgConfig * bgConfig)
-{
-#pragma unused(bgConfig)
- return TRUE;
-}
+#include "global.h" +#include "heap.h" +#include "gx.h" +#include "gf_gfx_loader.h" +#include "bg_window.h" +#include "graphic/poketch.naix" + +const struct BgTemplate MOD19_02252508 = { + .x = 0, + .y = 0, + .bufferSize = 0x800, + .baseTile = 0x000, + .size = GF_BG_SCR_SIZE_256x256, + .colorMode = GF_BG_CLR_4BPP, + .screenBase = 12, + .charBase = 0, + .priority = 0, + .areaOver = 0, + .mosaic = 0 +}; + +THUMB_FUNC void MOD19_02252440(struct BgConfig * bgConfig) +{ + CreateHeap(3, 8, 0x18000); + GXS_SetGraphicsMode(GX_BGMODE_0); + GX_SetBankForSubBG(0x80); + GX_SetBankForSubOBJ(0x100); + GXS_SetOBJVRamModeChar(GX_OBJVRAMMODE_CHAR_1D_32K); + InitBgFromTemplate(bgConfig, GF_BG_LYR_SUB_0, &MOD19_02252508, GF_BG_TYPE_TEXT); + GfGfxLoader_LoadCharData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0010_NCGR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8); + GfGfxLoader_LoadScrnData(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0011_NSCR_lz, bgConfig, GF_BG_LYR_SUB_0, 0, 0, TRUE, 8); + GfGfxLoader_GXLoadPal(NARC_GRAPHIC_POKETCH, NARC_poketch_narc_0012_NCLR, GF_BG_LYR_SUB_0, 0x00, 0x20, 8); + GXS_SetVisibleWnd(GX_WNDMASK_NONE); + GXS_SetVisiblePlane(GX_PLANEMASK_BG0); +} + +THUMB_FUNC void MOD19_022524F4(struct BgConfig * bgConfig) +{ + FreeBgTilemapBuffer(bgConfig, GF_BG_LYR_SUB_0); + DestroyHeap(8); +} + +THUMB_FUNC BOOL MOD19_02252504(struct BgConfig * bgConfig) +{ +#pragma unused(bgConfig) + return TRUE; +} diff --git a/arm9/modules/21/src/mod21_02254854.c b/arm9/modules/21/src/mod21_02254854.c index 1c91afde..2b7e36ec 100644 --- a/arm9/modules/21/src/mod21_02254854.c +++ b/arm9/modules/21/src/mod21_02254854.c @@ -29,7 +29,7 @@ THUMB_FUNC BOOL MOD21_02254854(UnkStruct02254854 **param0, u32 param1, u32 param UnkStruct02254854 *alloced = (UnkStruct02254854 *)AllocFromHeap(8, sizeof(UnkStruct02254854)); if (alloced != NULL) { - if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, struct TextPrinter *))MOD21_02254930, (struct TextPrinter *)alloced, 1)) + if (MOD21_0225489C(alloced, param1, param2, param3) && FUN_0200CA44((void (*)(u32, void *))MOD21_02254930, (void *)alloced, 1)) { *param0 = alloced; return TRUE; diff --git a/arm9/modules/21/src/mod21_02254A6C.c b/arm9/modules/21/src/mod21_02254A6C.c index 45b11873..681186f2 100644 --- a/arm9/modules/21/src/mod21_02254A6C.c +++ b/arm9/modules/21/src/mod21_02254A6C.c @@ -1,6 +1,8 @@ +#include "mod21_02254A6C.h" + #include "global.h" #include "heap.h" -#include "mod21_02254A6C.h" +#include "registers.h" #include "MI_memory.h" extern void MOD20_022536F4(u32 *param0, u32 param1); diff --git a/arm9/modules/26/asm/module_26.s b/arm9/modules/26/asm/mod26_02254854.s index 251ea218..8f6576b7 100644 --- a/arm9/modules/26/asm/module_26.s +++ b/arm9/modules/26/asm/mod26_02254854.s @@ -493,289 +493,6 @@ _02254BCE: .align 2, 0 thumb_func_end MOD26_02254B98 - thumb_func_start MOD26_02254BD4 -MOD26_02254BD4: ; 0x02254BD4 - push {r4, r5, r6, lr} - add r5, r0, #0 - add r6, r1, #0 - mov r0, #8 - mov r1, #0x30 - bl AllocFromHeap - add r4, r0, #0 - beq _02254C00 - add r0, #8 - mov r1, #8 - bl MOD20_022536F4 - str r6, [r4] - bl MOD20_02252D34 - str r0, [r4, #4] - cmp r0, #0 - beq _02254C00 - str r4, [r5] - mov r0, #1 - pop {r4, r5, r6, pc} -_02254C00: - mov r0, #0 - pop {r4, r5, r6, pc} - thumb_func_end MOD26_02254BD4 - - thumb_func_start MOD26_02254C04 -MOD26_02254C04: ; 0x02254C04 - push {r3, lr} - cmp r0, #0 - beq _02254C0E - bl FreeToHeap -_02254C0E: - pop {r3, pc} - thumb_func_end MOD26_02254C04 - - thumb_func_start MOD26_02254C10 -MOD26_02254C10: ; 0x02254C10 - push {lr} - sub sp, #0xc - add r2, r0, #0 - add r0, #8 - str r0, [sp] - mov r0, #2 - str r0, [sp, #4] - mov r0, #8 - str r0, [sp, #8] - ldr r0, _02254C30 ; =MOD26_02254FF0 - ldr r3, [r2] - bl MOD20_022537E0 - add sp, #0xc - pop {pc} - nop -_02254C30: .word MOD26_02254FF0 - thumb_func_end MOD26_02254C10 - - thumb_func_start MOD26_02254C34 -MOD26_02254C34: ; 0x02254C34 - ldr r3, _02254C3C ; =MOD20_02253794 - add r0, #8 - bx r3 - nop -_02254C3C: .word MOD20_02253794 - thumb_func_end MOD26_02254C34 - - thumb_func_start MOD26_02254C40 -MOD26_02254C40: ; 0x02254C40 - ldr r3, _02254C48 ; =MOD20_022537B8 - add r0, #8 - bx r3 - nop -_02254C48: .word MOD20_022537B8 - thumb_func_end MOD26_02254C40 - - thumb_func_start MOD26_02254C4C -MOD26_02254C4C: ; 0x02254C4C - push {r4, lr} - add r4, r0, #0 - bl MOD20_022538A0 - add r0, #8 - add r1, r4, #0 - bl MOD20_02253888 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD26_02254C4C - - thumb_func_start MOD26_02254C60 -MOD26_02254C60: ; 0x02254C60 - push {r3, r4, r5, lr} - add r4, r1, #0 - add r0, r4, #0 - bl MOD20_022538A0 - add r5, r0, #0 - ldr r0, [r5, #4] - ldr r2, _02254CB8 ; =MOD26_02254FD4 - mov r1, #6 - mov r3, #0 - bl InitBgFromTemplate - ldr r0, [r5, #4] - bl MOD26_02254CC4 - ldr r0, [r5, #4] - ldr r1, [r5] - bl MOD26_02254DAC - mov r0, #0 - add r1, r0, #0 - bl MOD20_02252D7C - ldr r0, [r5, #4] - mov r1, #6 - bl BgCommitTilemapBufferToVram - ldr r1, _02254CBC ; =0x04001000 - ldr r0, _02254CC0 ; =0xFFFFE0FF - ldr r3, [r1] - ldr r2, [r1] - str r3, [sp] - and r0, r2 - lsl r2, r3, #0x13 - lsr r3, r2, #0x1b - mov r2, #4 - orr r2, r3 - lsl r2, r2, #8 - orr r0, r2 - str r0, [r1] - add r0, r4, #0 - bl MOD26_02254C4C - pop {r3, r4, r5, pc} - .align 2, 0 -_02254CB8: .word MOD26_02254FD4 -_02254CBC: .word 0x04001000 -_02254CC0: .word 0xFFFFE0FF - thumb_func_end MOD26_02254C60 - - thumb_func_start MOD26_02254CC4 -MOD26_02254CC4: ; 0x02254CC4 - push {r3, r4, r5, r6, r7, lr} - sub sp, #0x20 - str r0, [sp, #4] - mov r0, #8 - lsl r1, r0, #6 - bl AllocFromHeap - str r0, [sp, #0x1c] - cmp r0, #0 - beq _02254D68 - mov r0, #0 - str r0, [sp, #0x18] - str r0, [sp, #0x14] - str r0, [sp, #0x10] - str r0, [sp, #0xc] - str r0, [sp, #8] - add r7, r0, #0 - add r6, r0, #0 - add r4, r0, #0 - add r5, r0, #0 -_02254CEC: - ldr r1, [sp, #0xc] - ldr r0, [sp, #0x10] - ldr r2, [sp, #0x1c] - orr r1, r0 - ldr r0, [sp, #8] - orr r0, r1 - orr r0, r7 - orr r0, r6 - orr r0, r4 - add r1, r5, #0 - orr r1, r0 - ldr r0, [sp, #0x18] - orr r0, r1 - ldr r1, [sp, #0x14] - add r1, r2, r1 - mov r2, #0x20 - bl MIi_CpuClearFast - ldr r0, [sp, #0x14] - ldr r1, [sp, #0x10] - add r0, #0x20 - str r0, [sp, #0x14] - mov r0, #1 - lsl r0, r0, #0x18 - add r0, r1, r0 - str r0, [sp, #0x10] - mov r0, #1 - ldr r1, [sp, #0xc] - lsl r0, r0, #0x1c - add r0, r1, r0 - str r0, [sp, #0xc] - mov r0, #1 - ldr r1, [sp, #8] - lsl r0, r0, #0x14 - add r0, r1, r0 - str r0, [sp, #8] - mov r0, #1 - lsl r0, r0, #0x10 - add r7, r7, r0 - lsr r0, r0, #4 - add r6, r6, r0 - mov r0, #1 - lsl r0, r0, #8 - add r4, r4, r0 - ldr r0, [sp, #0x18] - add r5, #0x10 - add r0, r0, #1 - str r0, [sp, #0x18] - cmp r0, #0x10 - blt _02254CEC - mov r0, #0 - str r0, [sp] - mov r3, #2 - ldr r0, [sp, #4] - ldr r2, [sp, #0x1c] - mov r1, #6 - lsl r3, r3, #8 - bl BG_LoadCharTilesData - ldr r0, [sp, #0x1c] - bl FreeToHeap -_02254D68: - add sp, #0x20 - pop {r3, r4, r5, r6, r7, pc} - thumb_func_end MOD26_02254CC4 - - thumb_func_start MOD26_02254D6C -MOD26_02254D6C: ; 0x02254D6C - push {r3, r4, r5, lr} - add r5, r1, #0 - add r0, r5, #0 - bl MOD20_022538A0 - add r4, r0, #0 - ldr r0, [r4, #4] - ldr r1, [r4] - bl MOD26_02254DAC - ldr r0, [r4, #4] - mov r1, #6 - bl BgCommitTilemapBufferToVram - add r0, r5, #0 - bl MOD26_02254C4C - pop {r3, r4, r5, pc} - thumb_func_end MOD26_02254D6C - - thumb_func_start MOD26_02254D90 -MOD26_02254D90: ; 0x02254D90 - push {r4, lr} - add r4, r1, #0 - add r0, r4, #0 - bl MOD20_022538A0 - ldr r0, [r0, #4] - mov r1, #6 - bl FreeBgTilemapBuffer - add r0, r4, #0 - bl MOD26_02254C4C - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD26_02254D90 - - thumb_func_start MOD26_02254DAC -MOD26_02254DAC: ; 0x02254DAC - push {r3, r4, r5, r6, r7, lr} - add r4, r1, #0 - mov r1, #6 - bl GetBgTilemapBuffer - mov r5, #0 - ldr r1, _02254DE0 ; =MOD26_02254FD0 - add r0, #0x84 - add r2, r5, #0 -_02254DBE: - add r3, r2, #0 - add r6, r0, #0 -_02254DC2: - ldrb r7, [r4, r3] - add r3, r3, #1 - add r7, r1, r7 - sub r7, r7, #1 - ldrb r7, [r7] - strh r7, [r6] - add r6, r6, #2 - cmp r3, #0x18 - blt _02254DC2 - add r5, r5, #1 - add r0, #0x40 - add r4, #0x18 - cmp r5, #0x14 - blt _02254DBE - pop {r3, r4, r5, r6, r7, pc} - .align 2, 0 -_02254DE0: .word MOD26_02254FD0 - thumb_func_end MOD26_02254DAC - .section .rodata .global MOD26_02254DE4 @@ -804,19 +521,3 @@ MOD26_02254DF0: ; 0x02254DF0 .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 .byte 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 - - .global MOD26_02254FD0 -MOD26_02254FD0: ; 0x02254FD0 - .byte 0x04, 0x0F, 0x08, 0x01 - - .global MOD26_02254FD4 -MOD26_02254FD4: ; 0x02254FD4 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .global MOD26_02254FF0 -MOD26_02254FF0: ; 0x02254FF0 - .word 0x00, MOD26_02254C60, 0x00 - .word 0x01, MOD26_02254D6C, 0x00 - .word 0x02, MOD26_02254D90, 0x00 - .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/26/asm/mod26_02254BD4.s b/arm9/modules/26/asm/mod26_02254BD4.s new file mode 100644 index 00000000..b305807a --- /dev/null +++ b/arm9/modules/26/asm/mod26_02254BD4.s @@ -0,0 +1,305 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + .balign 4, 0 + + thumb_func_start MOD26_02254BD4 +MOD26_02254BD4: ; 0x02254BD4 + push {r4, r5, r6, lr} + add r5, r0, #0 + add r6, r1, #0 + mov r0, #8 + mov r1, #0x30 + bl AllocFromHeap + add r4, r0, #0 + beq _02254C00 + add r0, #8 + mov r1, #8 + bl MOD20_022536F4 + str r6, [r4] + bl MOD20_02252D34 + str r0, [r4, #4] + cmp r0, #0 + beq _02254C00 + str r4, [r5] + mov r0, #1 + pop {r4, r5, r6, pc} +_02254C00: + mov r0, #0 + pop {r4, r5, r6, pc} + thumb_func_end MOD26_02254BD4 + + thumb_func_start MOD26_02254C04 +MOD26_02254C04: ; 0x02254C04 + push {r3, lr} + cmp r0, #0 + beq _02254C0E + bl FreeToHeap +_02254C0E: + pop {r3, pc} + thumb_func_end MOD26_02254C04 + + thumb_func_start MOD26_02254C10 +MOD26_02254C10: ; 0x02254C10 + push {lr} + sub sp, #0xc + add r2, r0, #0 + add r0, #8 + str r0, [sp] + mov r0, #2 + str r0, [sp, #4] + mov r0, #8 + str r0, [sp, #8] + ldr r0, _02254C30 ; =MOD26_02254FF0 + ldr r3, [r2] + bl MOD20_022537E0 + add sp, #0xc + pop {pc} + nop +_02254C30: .word MOD26_02254FF0 + thumb_func_end MOD26_02254C10 + + thumb_func_start MOD26_02254C34 +MOD26_02254C34: ; 0x02254C34 + ldr r3, _02254C3C ; =MOD20_02253794 + add r0, #8 + bx r3 + nop +_02254C3C: .word MOD20_02253794 + thumb_func_end MOD26_02254C34 + + thumb_func_start MOD26_02254C40 +MOD26_02254C40: ; 0x02254C40 + ldr r3, _02254C48 ; =MOD20_022537B8 + add r0, #8 + bx r3 + nop +_02254C48: .word MOD20_022537B8 + thumb_func_end MOD26_02254C40 + + thumb_func_start MOD26_02254C4C +MOD26_02254C4C: ; 0x02254C4C + push {r4, lr} + add r4, r0, #0 + bl MOD20_022538A0 + add r0, #8 + add r1, r4, #0 + bl MOD20_02253888 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD26_02254C4C + + thumb_func_start MOD26_02254C60 +MOD26_02254C60: ; 0x02254C60 + push {r3, r4, r5, lr} + add r4, r1, #0 + add r0, r4, #0 + bl MOD20_022538A0 + add r5, r0, #0 + ldr r0, [r5, #4] + ldr r2, _02254CB8 ; =MOD26_02254FD4 + mov r1, #6 + mov r3, #0 + bl InitBgFromTemplate + ldr r0, [r5, #4] + bl MOD26_02254CC4 + ldr r0, [r5, #4] + ldr r1, [r5] + bl MOD26_02254DAC + mov r0, #0 + add r1, r0, #0 + bl MOD20_02252D7C + ldr r0, [r5, #4] + mov r1, #6 + bl BgCommitTilemapBufferToVram + ldr r1, _02254CBC ; =0x04001000 + ldr r0, _02254CC0 ; =0xFFFFE0FF + ldr r3, [r1] + ldr r2, [r1] + str r3, [sp] + and r0, r2 + lsl r2, r3, #0x13 + lsr r3, r2, #0x1b + mov r2, #4 + orr r2, r3 + lsl r2, r2, #8 + orr r0, r2 + str r0, [r1] + add r0, r4, #0 + bl MOD26_02254C4C + pop {r3, r4, r5, pc} + .align 2, 0 +_02254CB8: .word MOD26_02254FD4 +_02254CBC: .word 0x04001000 +_02254CC0: .word 0xFFFFE0FF + thumb_func_end MOD26_02254C60 + + thumb_func_start MOD26_02254CC4 +MOD26_02254CC4: ; 0x02254CC4 + push {r3, r4, r5, r6, r7, lr} + sub sp, #0x20 + str r0, [sp, #4] + mov r0, #8 + lsl r1, r0, #6 + bl AllocFromHeap + str r0, [sp, #0x1c] + cmp r0, #0 + beq _02254D68 + mov r0, #0 + str r0, [sp, #0x18] + str r0, [sp, #0x14] + str r0, [sp, #0x10] + str r0, [sp, #0xc] + str r0, [sp, #8] + add r7, r0, #0 + add r6, r0, #0 + add r4, r0, #0 + add r5, r0, #0 +_02254CEC: + ldr r1, [sp, #0xc] + ldr r0, [sp, #0x10] + ldr r2, [sp, #0x1c] + orr r1, r0 + ldr r0, [sp, #8] + orr r0, r1 + orr r0, r7 + orr r0, r6 + orr r0, r4 + add r1, r5, #0 + orr r1, r0 + ldr r0, [sp, #0x18] + orr r0, r1 + ldr r1, [sp, #0x14] + add r1, r2, r1 + mov r2, #0x20 + bl MIi_CpuClearFast + ldr r0, [sp, #0x14] + ldr r1, [sp, #0x10] + add r0, #0x20 + str r0, [sp, #0x14] + mov r0, #1 + lsl r0, r0, #0x18 + add r0, r1, r0 + str r0, [sp, #0x10] + mov r0, #1 + ldr r1, [sp, #0xc] + lsl r0, r0, #0x1c + add r0, r1, r0 + str r0, [sp, #0xc] + mov r0, #1 + ldr r1, [sp, #8] + lsl r0, r0, #0x14 + add r0, r1, r0 + str r0, [sp, #8] + mov r0, #1 + lsl r0, r0, #0x10 + add r7, r7, r0 + lsr r0, r0, #4 + add r6, r6, r0 + mov r0, #1 + lsl r0, r0, #8 + add r4, r4, r0 + ldr r0, [sp, #0x18] + add r5, #0x10 + add r0, r0, #1 + str r0, [sp, #0x18] + cmp r0, #0x10 + blt _02254CEC + mov r0, #0 + str r0, [sp] + mov r3, #2 + ldr r0, [sp, #4] + ldr r2, [sp, #0x1c] + mov r1, #6 + lsl r3, r3, #8 + bl BG_LoadCharTilesData + ldr r0, [sp, #0x1c] + bl FreeToHeap +_02254D68: + add sp, #0x20 + pop {r3, r4, r5, r6, r7, pc} + thumb_func_end MOD26_02254CC4 + + thumb_func_start MOD26_02254D6C +MOD26_02254D6C: ; 0x02254D6C + push {r3, r4, r5, lr} + add r5, r1, #0 + add r0, r5, #0 + bl MOD20_022538A0 + add r4, r0, #0 + ldr r0, [r4, #4] + ldr r1, [r4] + bl MOD26_02254DAC + ldr r0, [r4, #4] + mov r1, #6 + bl BgCommitTilemapBufferToVram + add r0, r5, #0 + bl MOD26_02254C4C + pop {r3, r4, r5, pc} + thumb_func_end MOD26_02254D6C + + thumb_func_start MOD26_02254D90 +MOD26_02254D90: ; 0x02254D90 + push {r4, lr} + add r4, r1, #0 + add r0, r4, #0 + bl MOD20_022538A0 + ldr r0, [r0, #4] + mov r1, #6 + bl FreeBgTilemapBuffer + add r0, r4, #0 + bl MOD26_02254C4C + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD26_02254D90 + + thumb_func_start MOD26_02254DAC +MOD26_02254DAC: ; 0x02254DAC + push {r3, r4, r5, r6, r7, lr} + add r4, r1, #0 + mov r1, #6 + bl GetBgTilemapBuffer + mov r5, #0 + ldr r1, _02254DE0 ; =MOD26_02254FD0 + add r0, #0x84 + add r2, r5, #0 +_02254DBE: + add r3, r2, #0 + add r6, r0, #0 +_02254DC2: + ldrb r7, [r4, r3] + add r3, r3, #1 + add r7, r1, r7 + sub r7, r7, #1 + ldrb r7, [r7] + strh r7, [r6] + add r6, r6, #2 + cmp r3, #0x18 + blt _02254DC2 + add r5, r5, #1 + add r0, #0x40 + add r4, #0x18 + cmp r5, #0x14 + blt _02254DBE + pop {r3, r4, r5, r6, r7, pc} + .align 2, 0 +_02254DE0: .word MOD26_02254FD0 + thumb_func_end MOD26_02254DAC + + .section .rodata + + .global MOD26_02254FD0 +MOD26_02254FD0: ; 0x02254FD0 + .byte 0x04, 0x0F, 0x08, 0x01 + + .global MOD26_02254FD4 +MOD26_02254FD4: ; 0x02254FD4 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + .byte 0x01, 0x00, 0x0E, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD26_02254FF0 +MOD26_02254FF0: ; 0x02254FF0 + .word 0x00, MOD26_02254C60, 0x00 + .word 0x01, MOD26_02254D6C, 0x00 + .word 0x02, MOD26_02254D90, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/33/asm/module_33.s b/arm9/modules/33/asm/mod33_02254854.s index a0c3782f..a3b102fb 100644 --- a/arm9/modules/33/asm/module_33.s +++ b/arm9/modules/33/asm/mod33_02254854.s @@ -205,194 +205,8 @@ _022549A6: .align 2, 0 thumb_func_end MOD33_02254978 - thumb_func_start MOD33_022549AC -MOD33_022549AC: ; 0x022549AC - push {r4, r5, r6, lr} - add r5, r0, #0 - add r6, r1, #0 - mov r0, #8 - mov r1, #0x30 - bl AllocFromHeap - add r4, r0, #0 - beq _022549D8 - add r0, #8 - mov r1, #8 - bl MOD20_022536F4 - str r6, [r4] - bl MOD20_02252D34 - str r0, [r4, #4] - cmp r0, #0 - beq _022549D8 - str r4, [r5] - mov r0, #1 - pop {r4, r5, r6, pc} -_022549D8: - mov r0, #0 - pop {r4, r5, r6, pc} - thumb_func_end MOD33_022549AC - - thumb_func_start MOD33_022549DC -MOD33_022549DC: ; 0x022549DC - push {r3, lr} - cmp r0, #0 - beq _022549E6 - bl FreeToHeap -_022549E6: - pop {r3, pc} - thumb_func_end MOD33_022549DC - - thumb_func_start MOD33_022549E8 -MOD33_022549E8: ; 0x022549E8 - push {lr} - sub sp, #0xc - add r2, r0, #0 - add r0, #8 - str r0, [sp] - mov r0, #2 - str r0, [sp, #4] - mov r0, #8 - str r0, [sp, #8] - ldr r0, _02254A08 ; =MOD33_02254B1C - ldr r3, [r2] - bl MOD20_022537E0 - add sp, #0xc - pop {pc} - nop -_02254A08: .word MOD33_02254B1C - thumb_func_end MOD33_022549E8 - - thumb_func_start MOD33_02254A0C -MOD33_02254A0C: ; 0x02254A0C - ldr r3, _02254A14 ; =MOD20_02253794 - add r0, #8 - bx r3 - nop -_02254A14: .word MOD20_02253794 - thumb_func_end MOD33_02254A0C - - thumb_func_start MOD33_02254A18 -MOD33_02254A18: ; 0x02254A18 - ldr r3, _02254A20 ; =MOD20_022537B8 - add r0, #8 - bx r3 - nop -_02254A20: .word MOD20_022537B8 - thumb_func_end MOD33_02254A18 - - thumb_func_start MOD33_02254A24 -MOD33_02254A24: ; 0x02254A24 - push {r4, lr} - add r4, r0, #0 - bl MOD20_022538A0 - add r0, #8 - add r1, r4, #0 - bl MOD20_02253888 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD33_02254A24 - - thumb_func_start MOD33_02254A38 -MOD33_02254A38: ; 0x02254A38 - push {r4, r5, lr} - sub sp, #0x14 - add r4, r1, #0 - add r0, r4, #0 - bl MOD20_022538A0 - add r5, r0, #0 - ldr r0, [r5, #4] - ldr r2, _02254ACC ; =MOD33_02254B00 - mov r1, #6 - mov r3, #0 - bl InitBgFromTemplate - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - str r0, [sp, #8] - mov r1, #8 - str r1, [sp, #0xc] - ldr r2, [r5, #4] - mov r0, #0xc - mov r3, #6 - bl GfGfxLoader_LoadCharData - mov r2, #0 - str r2, [sp] - mov r0, #0x20 - str r0, [sp, #4] - mov r0, #0x18 - str r0, [sp, #8] - str r2, [sp, #0xc] - ldr r0, [r5, #4] - mov r1, #6 - add r3, r2, #0 - bl FillBgTilemapRect - mov r0, #0x20 - str r0, [sp] - mov r0, #8 - str r0, [sp, #4] - mov r0, #0xc - mov r1, #9 - mov r2, #4 - mov r3, #0 - bl GfGfxLoader_GXLoadPal - ldr r0, [r5, #4] - mov r1, #0xc - mov r2, #6 - bl MOD20_02253AA4 - ldr r0, [r5, #4] - mov r1, #6 - bl BgCommitTilemapBufferToVram - ldr r1, _02254AD0 ; =0x04001000 - ldr r0, _02254AD4 ; =0xFFFFE0FF - ldr r3, [r1] - ldr r2, [r1] - str r3, [sp, #0x10] - and r0, r2 - lsl r2, r3, #0x13 - lsr r3, r2, #0x1b - mov r2, #4 - orr r2, r3 - lsl r2, r2, #8 - orr r0, r2 - str r0, [r1] - add r0, r4, #0 - bl MOD33_02254A24 - add sp, #0x14 - pop {r4, r5, pc} - nop -_02254ACC: .word MOD33_02254B00 -_02254AD0: .word 0x04001000 -_02254AD4: .word 0xFFFFE0FF - thumb_func_end MOD33_02254A38 - - thumb_func_start MOD33_02254AD8 -MOD33_02254AD8: ; 0x02254AD8 - push {r4, lr} - add r4, r1, #0 - add r0, r4, #0 - bl MOD20_022538A0 - ldr r0, [r0, #4] - mov r1, #6 - bl FreeBgTilemapBuffer - add r0, r4, #0 - bl MOD33_02254A24 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD33_02254AD8 - .section .rodata .global MOD33_02254AF4 MOD33_02254AF4: ; 0x02254AF4 .word MOD33_02254924, MOD33_02254964, MOD33_02254978 - - .global MOD33_02254B00 -MOD33_02254B00: ; 0x02254B00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .global MOD33_02254B1C -MOD33_02254B1C: ; 0x02254B1C - .word 0x00, MOD33_02254A38, 0x00 - .word 0x01, MOD33_02254AD8, 0x00 - .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/33/asm/mod33_022549AC.s b/arm9/modules/33/asm/mod33_022549AC.s new file mode 100644 index 00000000..c280b622 --- /dev/null +++ b/arm9/modules/33/asm/mod33_022549AC.s @@ -0,0 +1,192 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + .balign 4, 0 + + thumb_func_start MOD33_022549AC +MOD33_022549AC: ; 0x022549AC + push {r4, r5, r6, lr} + add r5, r0, #0 + add r6, r1, #0 + mov r0, #8 + mov r1, #0x30 + bl AllocFromHeap + add r4, r0, #0 + beq _022549D8 + add r0, #8 + mov r1, #8 + bl MOD20_022536F4 + str r6, [r4] + bl MOD20_02252D34 + str r0, [r4, #4] + cmp r0, #0 + beq _022549D8 + str r4, [r5] + mov r0, #1 + pop {r4, r5, r6, pc} +_022549D8: + mov r0, #0 + pop {r4, r5, r6, pc} + thumb_func_end MOD33_022549AC + + thumb_func_start MOD33_022549DC +MOD33_022549DC: ; 0x022549DC + push {r3, lr} + cmp r0, #0 + beq _022549E6 + bl FreeToHeap +_022549E6: + pop {r3, pc} + thumb_func_end MOD33_022549DC + + thumb_func_start MOD33_022549E8 +MOD33_022549E8: ; 0x022549E8 + push {lr} + sub sp, #0xc + add r2, r0, #0 + add r0, #8 + str r0, [sp] + mov r0, #2 + str r0, [sp, #4] + mov r0, #8 + str r0, [sp, #8] + ldr r0, _02254A08 ; =MOD33_02254B1C + ldr r3, [r2] + bl MOD20_022537E0 + add sp, #0xc + pop {pc} + nop +_02254A08: .word MOD33_02254B1C + thumb_func_end MOD33_022549E8 + + thumb_func_start MOD33_02254A0C +MOD33_02254A0C: ; 0x02254A0C + ldr r3, _02254A14 ; =MOD20_02253794 + add r0, #8 + bx r3 + nop +_02254A14: .word MOD20_02253794 + thumb_func_end MOD33_02254A0C + + thumb_func_start MOD33_02254A18 +MOD33_02254A18: ; 0x02254A18 + ldr r3, _02254A20 ; =MOD20_022537B8 + add r0, #8 + bx r3 + nop +_02254A20: .word MOD20_022537B8 + thumb_func_end MOD33_02254A18 + + thumb_func_start MOD33_02254A24 +MOD33_02254A24: ; 0x02254A24 + push {r4, lr} + add r4, r0, #0 + bl MOD20_022538A0 + add r0, #8 + add r1, r4, #0 + bl MOD20_02253888 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD33_02254A24 + + thumb_func_start MOD33_02254A38 +MOD33_02254A38: ; 0x02254A38 + push {r4, r5, lr} + sub sp, #0x14 + add r4, r1, #0 + add r0, r4, #0 + bl MOD20_022538A0 + add r5, r0, #0 + ldr r0, [r5, #4] + ldr r2, _02254ACC ; =MOD33_02254B00 + mov r1, #6 + mov r3, #0 + bl InitBgFromTemplate + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + mov r1, #8 + str r1, [sp, #0xc] + ldr r2, [r5, #4] + mov r0, #0xc + mov r3, #6 + bl GfGfxLoader_LoadCharData + mov r2, #0 + str r2, [sp] + mov r0, #0x20 + str r0, [sp, #4] + mov r0, #0x18 + str r0, [sp, #8] + str r2, [sp, #0xc] + ldr r0, [r5, #4] + mov r1, #6 + add r3, r2, #0 + bl FillBgTilemapRect + mov r0, #0x20 + str r0, [sp] + mov r0, #8 + str r0, [sp, #4] + mov r0, #0xc + mov r1, #9 + mov r2, #4 + mov r3, #0 + bl GfGfxLoader_GXLoadPal + ldr r0, [r5, #4] + mov r1, #0xc + mov r2, #6 + bl MOD20_02253AA4 + ldr r0, [r5, #4] + mov r1, #6 + bl BgCommitTilemapBufferToVram + ldr r1, _02254AD0 ; =0x04001000 + ldr r0, _02254AD4 ; =0xFFFFE0FF + ldr r3, [r1] + ldr r2, [r1] + str r3, [sp, #0x10] + and r0, r2 + lsl r2, r3, #0x13 + lsr r3, r2, #0x1b + mov r2, #4 + orr r2, r3 + lsl r2, r2, #8 + orr r0, r2 + str r0, [r1] + add r0, r4, #0 + bl MOD33_02254A24 + add sp, #0x14 + pop {r4, r5, pc} + nop +_02254ACC: .word MOD33_02254B00 +_02254AD0: .word 0x04001000 +_02254AD4: .word 0xFFFFE0FF + thumb_func_end MOD33_02254A38 + + thumb_func_start MOD33_02254AD8 +MOD33_02254AD8: ; 0x02254AD8 + push {r4, lr} + add r4, r1, #0 + add r0, r4, #0 + bl MOD20_022538A0 + ldr r0, [r0, #4] + mov r1, #6 + bl FreeBgTilemapBuffer + add r0, r4, #0 + bl MOD33_02254A24 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD33_02254AD8 + + .section .rodata + + .global MOD33_02254B00 +MOD33_02254B00: ; 0x02254B00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD33_02254B1C +MOD33_02254B1C: ; 0x02254B1C + .word 0x00, MOD33_02254A38, 0x00 + .word 0x01, MOD33_02254AD8, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 9e502906..3a2eb2e3 100644 --- a/arm9/modules/42/asm/module_42.s +++ b/arm9/modules/42/asm/module_42.s @@ -139,7 +139,7 @@ _02254932: add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _02254984 ldr r0, [r4, #0x1c] @@ -527,7 +527,7 @@ MOD42_02254C04: ; 0x02254C04 add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _02254C3C ldr r1, [r4, #0x1c] diff --git a/arm9/modules/43/asm/module_43.s b/arm9/modules/43/asm/module_43.s index 59f7e81d..cb9d4f4d 100644 --- a/arm9/modules/43/asm/module_43.s +++ b/arm9/modules/43/asm/module_43.s @@ -62,7 +62,7 @@ MOD43_0225489C: ; 0x0225489C add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _022548E0 ldr r0, [r4, #0x1c] @@ -395,7 +395,7 @@ MOD43_02254AF8: ; 0x02254AF8 add r7, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl MapHeader_MapIsOnOverworldMatrix + bl MapHeader_MapIsOnMainMatrix cmp r0, #0 beq _02254B36 ldr r1, [r4, #0x1c] diff --git a/arm9/modules/44/asm/mod44_02254854.s b/arm9/modules/44/asm/mod44_02254854.s new file mode 100644 index 00000000..5abb4074 --- /dev/null +++ b/arm9/modules/44/asm/mod44_02254854.s @@ -0,0 +1,297 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + .balign 4, 0 + + thumb_func_start MOD44_02254854 +MOD44_02254854: ; 0x02254854 + push {r3, r4, r5, r6, r7, lr} + add r5, r0, #0 + add r6, r1, #0 + mov r0, #8 + mov r1, #0x14 + add r7, r2, #0 + str r3, [sp] + bl AllocFromHeap + add r4, r0, #0 + beq _02254892 + ldr r3, [sp] + add r1, r6, #0 + add r2, r7, #0 + bl MOD44_0225489C + cmp r0, #0 + beq _0225488C + ldr r0, _02254898 ; =MOD44_022548EC + add r1, r4, #0 + mov r2, #1 + bl FUN_0200CA44 + cmp r0, #0 + beq _0225488C + str r4, [r5] + mov r0, #1 + pop {r3, r4, r5, r6, r7, pc} +_0225488C: + add r0, r4, #0 + bl FreeToHeap +_02254892: + mov r0, #0 + pop {r3, r4, r5, r6, r7, pc} + nop +_02254898: .word MOD44_022548EC + thumb_func_end MOD44_02254854 + + thumb_func_start MOD44_0225489C +MOD44_0225489C: ; 0x0225489C + push {r4, r5, r6, lr} + add r4, r1, #0 + add r5, r0, #0 + add r0, r4, #0 + add r6, r2, #0 + bl MOD20_02252C3C + str r0, [r5, #0x10] + bl Sav2_Poketch_GetScreenTint + str r0, [r5, #4] + strb r0, [r5, #3] + add r0, r5, #0 + add r0, #8 + add r1, r5, #4 + add r2, r6, #0 + bl MOD44_02254A54 + cmp r0, #0 + beq _022548D2 + mov r0, #0 + strb r0, [r5] + strb r0, [r5, #1] + strb r0, [r5, #2] + str r4, [r5, #0xc] + mov r0, #1 + pop {r4, r5, r6, pc} +_022548D2: + mov r0, #0 + pop {r4, r5, r6, pc} + .align 2, 0 + thumb_func_end MOD44_0225489C + + thumb_func_start MOD44_022548D8 +MOD44_022548D8: ; 0x022548D8 + push {r4, lr} + add r4, r0, #0 + ldr r0, [r4, #8] + bl MOD44_02254B00 + add r0, r4, #0 + bl FreeToHeap + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD44_022548D8 + + thumb_func_start MOD44_022548EC +MOD44_022548EC: ; 0x022548EC + push {r3, r4, r5, lr} + add r4, r1, #0 + ldrb r1, [r4] + add r5, r0, #0 + cmp r1, #3 + bhs _02254918 + lsl r2, r1, #2 + ldr r1, _0225491C ; =MOD44_02254C54 + add r0, r4, #0 + ldr r1, [r1, r2] + blx r1 + cmp r0, #0 + beq _02254918 + add r0, r4, #0 + bl MOD44_022548D8 + add r0, r5, #0 + bl FUN_0200CAB4 + ldr r0, [r4, #0xc] + bl MOD20_022529A0 +_02254918: + pop {r3, r4, r5, pc} + nop +_0225491C: .word MOD44_02254C54 + thumb_func_end MOD44_022548EC + + thumb_func_start MOD44_02254920 +MOD44_02254920: ; 0x02254920 + mov r1, #1 + strb r1, [r0, #2] + bx lr + .align 2, 0 + thumb_func_end MOD44_02254920 + + thumb_func_start MOD44_02254928 +MOD44_02254928: ; 0x02254928 + ldrb r2, [r0, #2] + cmp r2, #0 + bne _02254930 + b _02254932 +_02254930: + mov r1, #2 +_02254932: + strb r1, [r0] + mov r1, #0 + strb r1, [r0, #1] + bx lr + .align 2, 0 + thumb_func_end MOD44_02254928 + + thumb_func_start MOD44_0225493C +MOD44_0225493C: ; 0x0225493C + push {r4, lr} + add r4, r0, #0 + ldrb r0, [r4, #1] + cmp r0, #0 + beq _0225494C + cmp r0, #1 + beq _0225495C + b _02254976 +_0225494C: + ldr r0, [r4, #8] + mov r1, #0 + bl MOD44_02254B14 + ldrb r0, [r4, #1] + add r0, r0, #1 + strb r0, [r4, #1] + b _02254976 +_0225495C: + ldr r0, [r4, #8] + mov r1, #0 + bl MOD44_02254B38 + cmp r0, #0 + beq _02254976 + ldr r0, [r4, #0xc] + bl MOD20_0225298C + add r0, r4, #0 + mov r1, #1 + bl MOD44_02254928 +_02254976: + mov r0, #0 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD44_0225493C + + thumb_func_start MOD44_0225497C +MOD44_0225497C: ; 0x0225497C + push {r4, lr} + add r4, r0, #0 + ldrb r1, [r4, #2] + cmp r1, #0 + beq _02254990 + mov r1, #2 + bl MOD44_02254928 + mov r0, #0 + pop {r4, pc} +_02254990: + ldrb r1, [r4, #1] + cmp r1, #0 + beq _0225499C + cmp r1, #1 + beq _022549B4 + b _022549C4 +_0225499C: + bl MOD44_022549C8 + cmp r0, #0 + beq _022549C4 + ldr r0, [r4, #8] + mov r1, #2 + bl MOD44_02254B14 + ldrb r0, [r4, #1] + add r0, r0, #1 + strb r0, [r4, #1] + b _022549C4 +_022549B4: + ldr r0, [r4, #8] + mov r1, #2 + bl MOD44_02254B38 + cmp r0, #0 + beq _022549C4 + mov r0, #0 + strb r0, [r4, #1] +_022549C4: + mov r0, #0 + pop {r4, pc} + thumb_func_end MOD44_0225497C + + thumb_func_start MOD44_022549C8 +MOD44_022549C8: ; 0x022549C8 + push {r4, lr} + sub sp, #8 + add r4, r0, #0 + ldr r0, [r4, #0xc] + bl MOD20_02252C08 + cmp r0, #0 + bne _02254A18 + add r0, sp, #4 + add r1, sp, #0 + bl FUN_02020AB0 + cmp r0, #0 + beq _02254A18 + ldr r0, [sp] + cmp r0, #0x88 + blo _02254A18 + cmp r0, #0xa0 + bhs _02254A18 + ldr r0, [sp, #4] + cmp r0, #0x30 + blo _02254A18 + cmp r0, #0xb8 + bhs _02254A18 + sub r0, #0x30 + lsr r1, r0, #4 + cmp r1, #8 + blo _02254A02 + mov r1, #7 +_02254A02: + ldrb r0, [r4, #3] + cmp r1, r0 + beq _02254A18 + str r1, [r4, #4] + strb r1, [r4, #3] + ldr r0, [r4, #0x10] + bl Sav2_Poketch_SetScreenTint + add sp, #8 + mov r0, #1 + pop {r4, pc} +_02254A18: + mov r0, #0 + add sp, #8 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD44_022549C8 + + thumb_func_start MOD44_02254A20 +MOD44_02254A20: ; 0x02254A20 + push {r4, lr} + add r4, r0, #0 + ldrb r0, [r4, #1] + cmp r0, #0 + beq _02254A30 + cmp r0, #1 + beq _02254A40 + b _02254A4E +_02254A30: + ldr r0, [r4, #8] + mov r1, #1 + bl MOD44_02254B14 + ldrb r0, [r4, #1] + add r0, r0, #1 + strb r0, [r4, #1] + b _02254A4E +_02254A40: + ldr r0, [r4, #8] + bl MOD44_02254B44 + cmp r0, #0 + beq _02254A4E + mov r0, #1 + pop {r4, pc} +_02254A4E: + mov r0, #0 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD44_02254A20 + + .section .rodata + + .global MOD44_02254C54 +MOD44_02254C54: ; 0x02254C54 + .word MOD44_0225493C, MOD44_0225497C, MOD44_02254A20 diff --git a/arm9/modules/44/asm/module_44.s b/arm9/modules/44/asm/mod44_02254A54.s index b8f5aa0b..13d6529c 100644 --- a/arm9/modules/44/asm/module_44.s +++ b/arm9/modules/44/asm/mod44_02254A54.s @@ -3,293 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD44_02254854 -MOD44_02254854: ; 0x02254854 - push {r3, r4, r5, r6, r7, lr} - add r5, r0, #0 - add r6, r1, #0 - mov r0, #8 - mov r1, #0x14 - add r7, r2, #0 - str r3, [sp] - bl AllocFromHeap - add r4, r0, #0 - beq _02254892 - ldr r3, [sp] - add r1, r6, #0 - add r2, r7, #0 - bl MOD44_0225489C - cmp r0, #0 - beq _0225488C - ldr r0, _02254898 ; =MOD44_022548EC - add r1, r4, #0 - mov r2, #1 - bl FUN_0200CA44 - cmp r0, #0 - beq _0225488C - str r4, [r5] - mov r0, #1 - pop {r3, r4, r5, r6, r7, pc} -_0225488C: - add r0, r4, #0 - bl FreeToHeap -_02254892: - mov r0, #0 - pop {r3, r4, r5, r6, r7, pc} - nop -_02254898: .word MOD44_022548EC - thumb_func_end MOD44_02254854 - - thumb_func_start MOD44_0225489C -MOD44_0225489C: ; 0x0225489C - push {r4, r5, r6, lr} - add r4, r1, #0 - add r5, r0, #0 - add r0, r4, #0 - add r6, r2, #0 - bl MOD20_02252C3C - str r0, [r5, #0x10] - bl Sav2_Poketch_GetScreenTint - str r0, [r5, #4] - strb r0, [r5, #3] - add r0, r5, #0 - add r0, #8 - add r1, r5, #4 - add r2, r6, #0 - bl MOD44_02254A54 - cmp r0, #0 - beq _022548D2 - mov r0, #0 - strb r0, [r5] - strb r0, [r5, #1] - strb r0, [r5, #2] - str r4, [r5, #0xc] - mov r0, #1 - pop {r4, r5, r6, pc} -_022548D2: - mov r0, #0 - pop {r4, r5, r6, pc} - .align 2, 0 - thumb_func_end MOD44_0225489C - - thumb_func_start MOD44_022548D8 -MOD44_022548D8: ; 0x022548D8 - push {r4, lr} - add r4, r0, #0 - ldr r0, [r4, #8] - bl MOD44_02254B00 - add r0, r4, #0 - bl FreeToHeap - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD44_022548D8 - - thumb_func_start MOD44_022548EC -MOD44_022548EC: ; 0x022548EC - push {r3, r4, r5, lr} - add r4, r1, #0 - ldrb r1, [r4] - add r5, r0, #0 - cmp r1, #3 - bhs _02254918 - lsl r2, r1, #2 - ldr r1, _0225491C ; =MOD44_02254C54 - add r0, r4, #0 - ldr r1, [r1, r2] - blx r1 - cmp r0, #0 - beq _02254918 - add r0, r4, #0 - bl MOD44_022548D8 - add r0, r5, #0 - bl FUN_0200CAB4 - ldr r0, [r4, #0xc] - bl MOD20_022529A0 -_02254918: - pop {r3, r4, r5, pc} - nop -_0225491C: .word MOD44_02254C54 - thumb_func_end MOD44_022548EC - - thumb_func_start MOD44_02254920 -MOD44_02254920: ; 0x02254920 - mov r1, #1 - strb r1, [r0, #2] - bx lr - .align 2, 0 - thumb_func_end MOD44_02254920 - - thumb_func_start MOD44_02254928 -MOD44_02254928: ; 0x02254928 - ldrb r2, [r0, #2] - cmp r2, #0 - bne _02254930 - b _02254932 -_02254930: - mov r1, #2 -_02254932: - strb r1, [r0] - mov r1, #0 - strb r1, [r0, #1] - bx lr - .align 2, 0 - thumb_func_end MOD44_02254928 - - thumb_func_start MOD44_0225493C -MOD44_0225493C: ; 0x0225493C - push {r4, lr} - add r4, r0, #0 - ldrb r0, [r4, #1] - cmp r0, #0 - beq _0225494C - cmp r0, #1 - beq _0225495C - b _02254976 -_0225494C: - ldr r0, [r4, #8] - mov r1, #0 - bl MOD44_02254B14 - ldrb r0, [r4, #1] - add r0, r0, #1 - strb r0, [r4, #1] - b _02254976 -_0225495C: - ldr r0, [r4, #8] - mov r1, #0 - bl MOD44_02254B38 - cmp r0, #0 - beq _02254976 - ldr r0, [r4, #0xc] - bl MOD20_0225298C - add r0, r4, #0 - mov r1, #1 - bl MOD44_02254928 -_02254976: - mov r0, #0 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD44_0225493C - - thumb_func_start MOD44_0225497C -MOD44_0225497C: ; 0x0225497C - push {r4, lr} - add r4, r0, #0 - ldrb r1, [r4, #2] - cmp r1, #0 - beq _02254990 - mov r1, #2 - bl MOD44_02254928 - mov r0, #0 - pop {r4, pc} -_02254990: - ldrb r1, [r4, #1] - cmp r1, #0 - beq _0225499C - cmp r1, #1 - beq _022549B4 - b _022549C4 -_0225499C: - bl MOD44_022549C8 - cmp r0, #0 - beq _022549C4 - ldr r0, [r4, #8] - mov r1, #2 - bl MOD44_02254B14 - ldrb r0, [r4, #1] - add r0, r0, #1 - strb r0, [r4, #1] - b _022549C4 -_022549B4: - ldr r0, [r4, #8] - mov r1, #2 - bl MOD44_02254B38 - cmp r0, #0 - beq _022549C4 - mov r0, #0 - strb r0, [r4, #1] -_022549C4: - mov r0, #0 - pop {r4, pc} - thumb_func_end MOD44_0225497C - - thumb_func_start MOD44_022549C8 -MOD44_022549C8: ; 0x022549C8 - push {r4, lr} - sub sp, #8 - add r4, r0, #0 - ldr r0, [r4, #0xc] - bl MOD20_02252C08 - cmp r0, #0 - bne _02254A18 - add r0, sp, #4 - add r1, sp, #0 - bl FUN_02020AB0 - cmp r0, #0 - beq _02254A18 - ldr r0, [sp] - cmp r0, #0x88 - blo _02254A18 - cmp r0, #0xa0 - bhs _02254A18 - ldr r0, [sp, #4] - cmp r0, #0x30 - blo _02254A18 - cmp r0, #0xb8 - bhs _02254A18 - sub r0, #0x30 - lsr r1, r0, #4 - cmp r1, #8 - blo _02254A02 - mov r1, #7 -_02254A02: - ldrb r0, [r4, #3] - cmp r1, r0 - beq _02254A18 - str r1, [r4, #4] - strb r1, [r4, #3] - ldr r0, [r4, #0x10] - bl Sav2_Poketch_SetScreenTint - add sp, #8 - mov r0, #1 - pop {r4, pc} -_02254A18: - mov r0, #0 - add sp, #8 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD44_022549C8 - - thumb_func_start MOD44_02254A20 -MOD44_02254A20: ; 0x02254A20 - push {r4, lr} - add r4, r0, #0 - ldrb r0, [r4, #1] - cmp r0, #0 - beq _02254A30 - cmp r0, #1 - beq _02254A40 - b _02254A4E -_02254A30: - ldr r0, [r4, #8] - mov r1, #1 - bl MOD44_02254B14 - ldrb r0, [r4, #1] - add r0, r0, #1 - strb r0, [r4, #1] - b _02254A4E -_02254A40: - ldr r0, [r4, #8] - bl MOD44_02254B44 - cmp r0, #0 - beq _02254A4E - mov r0, #1 - pop {r4, pc} -_02254A4E: - mov r0, #0 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD44_02254A20 - thumb_func_start MOD44_02254A54 MOD44_02254A54: ; 0x02254A54 push {r4, r5, r6, lr} @@ -557,10 +270,6 @@ _02254C50: .word 0x00000663 .section .rodata - .global MOD44_02254C54 -MOD44_02254C54: ; 0x02254C54 - .word MOD44_0225493C, MOD44_0225497C, MOD44_02254A20 - .global MOD44_02254C60 MOD44_02254C60: ; 0x02254C60 .byte 0x00, 0x80, 0x03, 0x00 diff --git a/arm9/modules/46/asm/module_46.s b/arm9/modules/46/asm/mod46_02254854.s index aecfd51d..931d2e3e 100644 --- a/arm9/modules/46/asm/module_46.s +++ b/arm9/modules/46/asm/mod46_02254854.s @@ -205,194 +205,8 @@ _022549A6: .align 2, 0 thumb_func_end MOD46_02254978 - thumb_func_start MOD46_022549AC -MOD46_022549AC: ; 0x022549AC - push {r4, r5, r6, lr} - add r5, r0, #0 - add r6, r1, #0 - mov r0, #8 - mov r1, #0x30 - bl AllocFromHeap - add r4, r0, #0 - beq _022549D8 - add r0, #8 - mov r1, #8 - bl MOD20_022536F4 - str r6, [r4] - bl MOD20_02252D34 - str r0, [r4, #4] - cmp r0, #0 - beq _022549D8 - str r4, [r5] - mov r0, #1 - pop {r4, r5, r6, pc} -_022549D8: - mov r0, #0 - pop {r4, r5, r6, pc} - thumb_func_end MOD46_022549AC - - thumb_func_start MOD46_022549DC -MOD46_022549DC: ; 0x022549DC - push {r3, lr} - cmp r0, #0 - beq _022549E6 - bl FreeToHeap -_022549E6: - pop {r3, pc} - thumb_func_end MOD46_022549DC - - thumb_func_start MOD46_022549E8 -MOD46_022549E8: ; 0x022549E8 - push {lr} - sub sp, #0xc - add r2, r0, #0 - add r0, #8 - str r0, [sp] - mov r0, #2 - str r0, [sp, #4] - mov r0, #8 - str r0, [sp, #8] - ldr r0, _02254A08 ; =MOD46_02254B1C - ldr r3, [r2] - bl MOD20_022537E0 - add sp, #0xc - pop {pc} - nop -_02254A08: .word MOD46_02254B1C - thumb_func_end MOD46_022549E8 - - thumb_func_start MOD46_02254A0C -MOD46_02254A0C: ; 0x02254A0C - ldr r3, _02254A14 ; =MOD20_02253794 - add r0, #8 - bx r3 - nop -_02254A14: .word MOD20_02253794 - thumb_func_end MOD46_02254A0C - - thumb_func_start MOD46_02254A18 -MOD46_02254A18: ; 0x02254A18 - ldr r3, _02254A20 ; =MOD20_022537B8 - add r0, #8 - bx r3 - nop -_02254A20: .word MOD20_022537B8 - thumb_func_end MOD46_02254A18 - - thumb_func_start MOD46_02254A24 -MOD46_02254A24: ; 0x02254A24 - push {r4, lr} - add r4, r0, #0 - bl MOD20_022538A0 - add r0, #8 - add r1, r4, #0 - bl MOD20_02253888 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD46_02254A24 - - thumb_func_start MOD46_02254A38 -MOD46_02254A38: ; 0x02254A38 - push {r4, r5, lr} - sub sp, #0x14 - add r4, r1, #0 - add r0, r4, #0 - bl MOD20_022538A0 - add r5, r0, #0 - ldr r0, [r5, #4] - ldr r2, _02254ACC ; =MOD46_02254B00 - mov r1, #6 - mov r3, #0 - bl InitBgFromTemplate - mov r0, #0 - str r0, [sp] - str r0, [sp, #4] - str r0, [sp, #8] - mov r1, #8 - str r1, [sp, #0xc] - ldr r2, [r5, #4] - mov r0, #0xc - mov r3, #6 - bl GfGfxLoader_LoadCharData - mov r2, #0 - str r2, [sp] - mov r0, #0x20 - str r0, [sp, #4] - mov r0, #0x18 - str r0, [sp, #8] - str r2, [sp, #0xc] - ldr r0, [r5, #4] - mov r1, #6 - add r3, r2, #0 - bl FillBgTilemapRect - mov r0, #0x20 - str r0, [sp] - mov r0, #8 - str r0, [sp, #4] - mov r0, #0xc - mov r1, #9 - mov r2, #4 - mov r3, #0 - bl GfGfxLoader_GXLoadPal - ldr r0, [r5, #4] - mov r1, #0x1a - mov r2, #6 - bl MOD20_02253AA4 - ldr r0, [r5, #4] - mov r1, #6 - bl BgCommitTilemapBufferToVram - ldr r1, _02254AD0 ; =0x04001000 - ldr r0, _02254AD4 ; =0xFFFFE0FF - ldr r3, [r1] - ldr r2, [r1] - str r3, [sp, #0x10] - and r0, r2 - lsl r2, r3, #0x13 - lsr r3, r2, #0x1b - mov r2, #4 - orr r2, r3 - lsl r2, r2, #8 - orr r0, r2 - str r0, [r1] - add r0, r4, #0 - bl MOD46_02254A24 - add sp, #0x14 - pop {r4, r5, pc} - nop -_02254ACC: .word MOD46_02254B00 -_02254AD0: .word 0x04001000 -_02254AD4: .word 0xFFFFE0FF - thumb_func_end MOD46_02254A38 - - thumb_func_start MOD46_02254AD8 -MOD46_02254AD8: ; 0x02254AD8 - push {r4, lr} - add r4, r1, #0 - add r0, r4, #0 - bl MOD20_022538A0 - ldr r0, [r0, #4] - mov r1, #6 - bl FreeBgTilemapBuffer - add r0, r4, #0 - bl MOD46_02254A24 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD46_02254AD8 - .section .rodata .global MOD46_02254AF4 MOD46_02254AF4: ; 0x02254AF4 .word MOD46_02254924, MOD46_02254964, MOD46_02254978 - - .global MOD46_02254B00 -MOD46_02254B00: ; 0x02254B00 - .byte 0x00, 0x00, 0x00, 0x00 - .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 - .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - - .global MOD46_02254B1C -MOD46_02254B1C: ; 0x02254B1C - .word 0x00, MOD46_02254A38, 0x00 - .word 0x01, MOD46_02254AD8, 0x00 - .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/46/asm/mod46_022549AC.s b/arm9/modules/46/asm/mod46_022549AC.s new file mode 100644 index 00000000..d3290c07 --- /dev/null +++ b/arm9/modules/46/asm/mod46_022549AC.s @@ -0,0 +1,192 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + .balign 4, 0 + + thumb_func_start MOD46_022549AC +MOD46_022549AC: ; 0x022549AC + push {r4, r5, r6, lr} + add r5, r0, #0 + add r6, r1, #0 + mov r0, #8 + mov r1, #0x30 + bl AllocFromHeap + add r4, r0, #0 + beq _022549D8 + add r0, #8 + mov r1, #8 + bl MOD20_022536F4 + str r6, [r4] + bl MOD20_02252D34 + str r0, [r4, #4] + cmp r0, #0 + beq _022549D8 + str r4, [r5] + mov r0, #1 + pop {r4, r5, r6, pc} +_022549D8: + mov r0, #0 + pop {r4, r5, r6, pc} + thumb_func_end MOD46_022549AC + + thumb_func_start MOD46_022549DC +MOD46_022549DC: ; 0x022549DC + push {r3, lr} + cmp r0, #0 + beq _022549E6 + bl FreeToHeap +_022549E6: + pop {r3, pc} + thumb_func_end MOD46_022549DC + + thumb_func_start MOD46_022549E8 +MOD46_022549E8: ; 0x022549E8 + push {lr} + sub sp, #0xc + add r2, r0, #0 + add r0, #8 + str r0, [sp] + mov r0, #2 + str r0, [sp, #4] + mov r0, #8 + str r0, [sp, #8] + ldr r0, _02254A08 ; =MOD46_02254B1C + ldr r3, [r2] + bl MOD20_022537E0 + add sp, #0xc + pop {pc} + nop +_02254A08: .word MOD46_02254B1C + thumb_func_end MOD46_022549E8 + + thumb_func_start MOD46_02254A0C +MOD46_02254A0C: ; 0x02254A0C + ldr r3, _02254A14 ; =MOD20_02253794 + add r0, #8 + bx r3 + nop +_02254A14: .word MOD20_02253794 + thumb_func_end MOD46_02254A0C + + thumb_func_start MOD46_02254A18 +MOD46_02254A18: ; 0x02254A18 + ldr r3, _02254A20 ; =MOD20_022537B8 + add r0, #8 + bx r3 + nop +_02254A20: .word MOD20_022537B8 + thumb_func_end MOD46_02254A18 + + thumb_func_start MOD46_02254A24 +MOD46_02254A24: ; 0x02254A24 + push {r4, lr} + add r4, r0, #0 + bl MOD20_022538A0 + add r0, #8 + add r1, r4, #0 + bl MOD20_02253888 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD46_02254A24 + + thumb_func_start MOD46_02254A38 +MOD46_02254A38: ; 0x02254A38 + push {r4, r5, lr} + sub sp, #0x14 + add r4, r1, #0 + add r0, r4, #0 + bl MOD20_022538A0 + add r5, r0, #0 + ldr r0, [r5, #4] + ldr r2, _02254ACC ; =MOD46_02254B00 + mov r1, #6 + mov r3, #0 + bl InitBgFromTemplate + mov r0, #0 + str r0, [sp] + str r0, [sp, #4] + str r0, [sp, #8] + mov r1, #8 + str r1, [sp, #0xc] + ldr r2, [r5, #4] + mov r0, #0xc + mov r3, #6 + bl GfGfxLoader_LoadCharData + mov r2, #0 + str r2, [sp] + mov r0, #0x20 + str r0, [sp, #4] + mov r0, #0x18 + str r0, [sp, #8] + str r2, [sp, #0xc] + ldr r0, [r5, #4] + mov r1, #6 + add r3, r2, #0 + bl FillBgTilemapRect + mov r0, #0x20 + str r0, [sp] + mov r0, #8 + str r0, [sp, #4] + mov r0, #0xc + mov r1, #9 + mov r2, #4 + mov r3, #0 + bl GfGfxLoader_GXLoadPal + ldr r0, [r5, #4] + mov r1, #0x1a + mov r2, #6 + bl MOD20_02253AA4 + ldr r0, [r5, #4] + mov r1, #6 + bl BgCommitTilemapBufferToVram + ldr r1, _02254AD0 ; =0x04001000 + ldr r0, _02254AD4 ; =0xFFFFE0FF + ldr r3, [r1] + ldr r2, [r1] + str r3, [sp, #0x10] + and r0, r2 + lsl r2, r3, #0x13 + lsr r3, r2, #0x1b + mov r2, #4 + orr r2, r3 + lsl r2, r2, #8 + orr r0, r2 + str r0, [r1] + add r0, r4, #0 + bl MOD46_02254A24 + add sp, #0x14 + pop {r4, r5, pc} + nop +_02254ACC: .word MOD46_02254B00 +_02254AD0: .word 0x04001000 +_02254AD4: .word 0xFFFFE0FF + thumb_func_end MOD46_02254A38 + + thumb_func_start MOD46_02254AD8 +MOD46_02254AD8: ; 0x02254AD8 + push {r4, lr} + add r4, r1, #0 + add r0, r4, #0 + bl MOD20_022538A0 + ldr r0, [r0, #4] + mov r1, #6 + bl FreeBgTilemapBuffer + add r0, r4, #0 + bl MOD46_02254A24 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD46_02254AD8 + + .section .rodata + + .global MOD46_02254B00 +MOD46_02254B00: ; 0x02254B00 + .byte 0x00, 0x00, 0x00, 0x00 + .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x0E, 0x00 + .byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 + + .global MOD46_02254B1C +MOD46_02254B1C: ; 0x02254B1C + .word 0x00, MOD46_02254A38, 0x00 + .word 0x01, MOD46_02254AD8, 0x00 + .word 0x00, 0x00000000, 0x00 diff --git a/arm9/modules/50/asm/mod50_02254854.s b/arm9/modules/50/asm/mod50_02254854.s new file mode 100644 index 00000000..aeca2cc0 --- /dev/null +++ b/arm9/modules/50/asm/mod50_02254854.s @@ -0,0 +1,213 @@ + .include "asm/macros.inc" + .include "global.inc" + .section .text + .balign 4, 0 + + thumb_func_start MOD50_02254854 +MOD50_02254854: ; 0x02254854 + push {r3, r4, r5, r6, r7, lr} + add r6, r0, #0 + add r7, r1, #0 + mov r0, #8 + mov r1, #0x10 + str r2, [sp] + add r5, r3, #0 + bl AllocFromHeap + add r4, r0, #0 + beq _02254894 + ldr r2, [sp] + add r1, r7, #0 + add r3, r5, #0 + bl MOD50_0225489C + cmp r0, #0 + beq _0225488E + ldr r0, _02254898 ; =MOD50_022548D4 + add r1, r4, #0 + mov r2, #1 + bl FUN_0200CA44 + cmp r0, #0 + beq _0225488E + str r4, [r6] + str r5, [r4, #4] + mov r0, #1 + pop {r3, r4, r5, r6, r7, pc} +_0225488E: + add r0, r4, #0 + bl FreeToHeap +_02254894: + mov r0, #0 + pop {r3, r4, r5, r6, r7, pc} + .align 2, 0 +_02254898: .word MOD50_022548D4 + thumb_func_end MOD50_02254854 + + thumb_func_start MOD50_0225489C +MOD50_0225489C: ; 0x0225489C + push {r3, r4, r5, lr} + add r5, r0, #0 + add r4, r1, #0 + add r0, #8 + add r1, r5, #4 + bl MOD50_022549AC + cmp r0, #0 + beq _022548BC + mov r0, #0 + strb r0, [r5] + strb r0, [r5, #1] + strb r0, [r5, #2] + str r4, [r5, #0xc] + mov r0, #1 + pop {r3, r4, r5, pc} +_022548BC: + mov r0, #0 + pop {r3, r4, r5, pc} + thumb_func_end MOD50_0225489C + + thumb_func_start MOD50_022548C0 +MOD50_022548C0: ; 0x022548C0 + push {r4, lr} + add r4, r0, #0 + ldr r0, [r4, #8] + bl MOD50_022549E0 + add r0, r4, #0 + bl FreeToHeap + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD50_022548C0 + + thumb_func_start MOD50_022548D4 +MOD50_022548D4: ; 0x022548D4 + push {r3, r4, r5, lr} + add r4, r1, #0 + ldrb r1, [r4] + add r5, r0, #0 + cmp r1, #3 + bhs _02254900 + lsl r2, r1, #2 + ldr r1, _02254904 ; =MOD50_02254B04 + add r0, r4, #0 + ldr r1, [r1, r2] + blx r1 + cmp r0, #0 + beq _02254900 + add r0, r4, #0 + bl MOD50_022548C0 + add r0, r5, #0 + bl FUN_0200CAB4 + ldr r0, [r4, #0xc] + bl MOD20_022529A0 +_02254900: + pop {r3, r4, r5, pc} + nop +_02254904: .word MOD50_02254B04 + thumb_func_end MOD50_022548D4 + + thumb_func_start MOD50_02254908 +MOD50_02254908: ; 0x02254908 + mov r1, #1 + strb r1, [r0, #2] + bx lr + .align 2, 0 + thumb_func_end MOD50_02254908 + + thumb_func_start MOD50_02254910 +MOD50_02254910: ; 0x02254910 + ldrb r2, [r0, #2] + cmp r2, #0 + bne _02254918 + b _0225491A +_02254918: + mov r1, #2 +_0225491A: + strb r1, [r0] + mov r1, #0 + strb r1, [r0, #1] + bx lr + .align 2, 0 + thumb_func_end MOD50_02254910 + + thumb_func_start MOD50_02254924 +MOD50_02254924: ; 0x02254924 + push {r4, lr} + add r4, r0, #0 + ldrb r0, [r4, #1] + cmp r0, #0 + beq _02254934 + cmp r0, #1 + beq _02254944 + b _0225495E +_02254934: + ldr r0, [r4, #8] + mov r1, #0 + bl MOD50_022549F8 + ldrb r0, [r4, #1] + add r0, r0, #1 + strb r0, [r4, #1] + b _0225495E +_02254944: + ldr r0, [r4, #8] + mov r1, #0 + bl MOD50_02254A1C + cmp r0, #0 + beq _0225495E + ldr r0, [r4, #0xc] + bl MOD20_0225298C + add r0, r4, #0 + mov r1, #1 + bl MOD50_02254910 +_0225495E: + mov r0, #0 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD50_02254924 + + thumb_func_start MOD50_02254964 +MOD50_02254964: ; 0x02254964 + push {r3, lr} + ldrb r1, [r0, #2] + cmp r1, #0 + beq _02254972 + mov r1, #2 + bl MOD50_02254910 +_02254972: + mov r0, #0 + pop {r3, pc} + .align 2, 0 + thumb_func_end MOD50_02254964 + + thumb_func_start MOD50_02254978 +MOD50_02254978: ; 0x02254978 + push {r4, lr} + add r4, r0, #0 + ldrb r0, [r4, #1] + cmp r0, #0 + beq _02254988 + cmp r0, #1 + beq _02254998 + b _022549A6 +_02254988: + ldr r0, [r4, #8] + mov r1, #1 + bl MOD50_022549F8 + ldrb r0, [r4, #1] + add r0, r0, #1 + strb r0, [r4, #1] + b _022549A6 +_02254998: + ldr r0, [r4, #8] + bl MOD50_02254A28 + cmp r0, #0 + beq _022549A6 + mov r0, #1 + pop {r4, pc} +_022549A6: + mov r0, #0 + pop {r4, pc} + .align 2, 0 + thumb_func_end MOD50_02254978 + + .section .rodata + + .global MOD50_02254B04 +MOD50_02254B04: ; 0x02254B04 + .word MOD50_02254924, MOD50_02254964, MOD50_02254978 diff --git a/arm9/modules/50/asm/module_50.s b/arm9/modules/50/asm/mod50_022549AC.s index fc52f7fa..8051918a 100644 --- a/arm9/modules/50/asm/module_50.s +++ b/arm9/modules/50/asm/mod50_022549AC.s @@ -3,209 +3,6 @@ .section .text .balign 4, 0 - thumb_func_start MOD50_02254854 -MOD50_02254854: ; 0x02254854 - push {r3, r4, r5, r6, r7, lr} - add r6, r0, #0 - add r7, r1, #0 - mov r0, #8 - mov r1, #0x10 - str r2, [sp] - add r5, r3, #0 - bl AllocFromHeap - add r4, r0, #0 - beq _02254894 - ldr r2, [sp] - add r1, r7, #0 - add r3, r5, #0 - bl MOD50_0225489C - cmp r0, #0 - beq _0225488E - ldr r0, _02254898 ; =MOD50_022548D4 - add r1, r4, #0 - mov r2, #1 - bl FUN_0200CA44 - cmp r0, #0 - beq _0225488E - str r4, [r6] - str r5, [r4, #4] - mov r0, #1 - pop {r3, r4, r5, r6, r7, pc} -_0225488E: - add r0, r4, #0 - bl FreeToHeap -_02254894: - mov r0, #0 - pop {r3, r4, r5, r6, r7, pc} - .align 2, 0 -_02254898: .word MOD50_022548D4 - thumb_func_end MOD50_02254854 - - thumb_func_start MOD50_0225489C -MOD50_0225489C: ; 0x0225489C - push {r3, r4, r5, lr} - add r5, r0, #0 - add r4, r1, #0 - add r0, #8 - add r1, r5, #4 - bl MOD50_022549AC - cmp r0, #0 - beq _022548BC - mov r0, #0 - strb r0, [r5] - strb r0, [r5, #1] - strb r0, [r5, #2] - str r4, [r5, #0xc] - mov r0, #1 - pop {r3, r4, r5, pc} -_022548BC: - mov r0, #0 - pop {r3, r4, r5, pc} - thumb_func_end MOD50_0225489C - - thumb_func_start MOD50_022548C0 -MOD50_022548C0: ; 0x022548C0 - push {r4, lr} - add r4, r0, #0 - ldr r0, [r4, #8] - bl MOD50_022549E0 - add r0, r4, #0 - bl FreeToHeap - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD50_022548C0 - - thumb_func_start MOD50_022548D4 -MOD50_022548D4: ; 0x022548D4 - push {r3, r4, r5, lr} - add r4, r1, #0 - ldrb r1, [r4] - add r5, r0, #0 - cmp r1, #3 - bhs _02254900 - lsl r2, r1, #2 - ldr r1, _02254904 ; =MOD50_02254B04 - add r0, r4, #0 - ldr r1, [r1, r2] - blx r1 - cmp r0, #0 - beq _02254900 - add r0, r4, #0 - bl MOD50_022548C0 - add r0, r5, #0 - bl FUN_0200CAB4 - ldr r0, [r4, #0xc] - bl MOD20_022529A0 -_02254900: - pop {r3, r4, r5, pc} - nop -_02254904: .word MOD50_02254B04 - thumb_func_end MOD50_022548D4 - - thumb_func_start MOD50_02254908 -MOD50_02254908: ; 0x02254908 - mov r1, #1 - strb r1, [r0, #2] - bx lr - .align 2, 0 - thumb_func_end MOD50_02254908 - - thumb_func_start MOD50_02254910 -MOD50_02254910: ; 0x02254910 - ldrb r2, [r0, #2] - cmp r2, #0 - bne _02254918 - b _0225491A -_02254918: - mov r1, #2 -_0225491A: - strb r1, [r0] - mov r1, #0 - strb r1, [r0, #1] - bx lr - .align 2, 0 - thumb_func_end MOD50_02254910 - - thumb_func_start MOD50_02254924 -MOD50_02254924: ; 0x02254924 - push {r4, lr} - add r4, r0, #0 - ldrb r0, [r4, #1] - cmp r0, #0 - beq _02254934 - cmp r0, #1 - beq _02254944 - b _0225495E -_02254934: - ldr r0, [r4, #8] - mov r1, #0 - bl MOD50_022549F8 - ldrb r0, [r4, #1] - add r0, r0, #1 - strb r0, [r4, #1] - b _0225495E -_02254944: - ldr r0, [r4, #8] - mov r1, #0 - bl MOD50_02254A1C - cmp r0, #0 - beq _0225495E - ldr r0, [r4, #0xc] - bl MOD20_0225298C - add r0, r4, #0 - mov r1, #1 - bl MOD50_02254910 -_0225495E: - mov r0, #0 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD50_02254924 - - thumb_func_start MOD50_02254964 -MOD50_02254964: ; 0x02254964 - push {r3, lr} - ldrb r1, [r0, #2] - cmp r1, #0 - beq _02254972 - mov r1, #2 - bl MOD50_02254910 -_02254972: - mov r0, #0 - pop {r3, pc} - .align 2, 0 - thumb_func_end MOD50_02254964 - - thumb_func_start MOD50_02254978 -MOD50_02254978: ; 0x02254978 - push {r4, lr} - add r4, r0, #0 - ldrb r0, [r4, #1] - cmp r0, #0 - beq _02254988 - cmp r0, #1 - beq _02254998 - b _022549A6 -_02254988: - ldr r0, [r4, #8] - mov r1, #1 - bl MOD50_022549F8 - ldrb r0, [r4, #1] - add r0, r0, #1 - strb r0, [r4, #1] - b _022549A6 -_02254998: - ldr r0, [r4, #8] - bl MOD50_02254A28 - cmp r0, #0 - beq _022549A6 - mov r0, #1 - pop {r4, pc} -_022549A6: - mov r0, #0 - pop {r4, pc} - .align 2, 0 - thumb_func_end MOD50_02254978 - thumb_func_start MOD50_022549AC MOD50_022549AC: ; 0x022549AC push {r4, r5, r6, lr} @@ -391,10 +188,6 @@ MOD50_02254AE8: ; 0x02254AE8 .section .rodata - .global MOD50_02254B04 -MOD50_02254B04: ; 0x02254B04 - .word MOD50_02254924, MOD50_02254964, MOD50_02254978 - .global MOD50_02254B10 MOD50_02254B10: ; 0x02254B10 .byte 0x00, 0x00, 0x00, 0x00 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 6840cd32..8795cd7f 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -4440,7 +4440,7 @@ MOD54_021D9780: ; 0x021D9780 .word MOD54_021D9488, MOD54_021D94B4, MOD54_021D91B4, MOD54_021D9274 .word MOD54_021D94D0, MOD54_021D91BC, MOD54_021D92AC, MOD54_021D94E8 .word MOD54_021D91AC, MOD54_021D9238, MOD54_021D9500, FUN_0202B934 - .word MOD54_021D9518, MOD54_021D9520, FUN_0202A1E0, MOD54_021D9544 + .word MOD54_021D9518, MOD54_021D9520, SaveStruct23_Substruct4_Substruct1_sizeof, MOD54_021D9544 .word MOD54_021D956C .data diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 7e036d8c..61f44b88 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -8528,7 +8528,7 @@ _022161A8: mov r0, #7 mov r1, #0x12 mov r2, #0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume mov r0, #0x7f mov r1, #0x1e mov r2, #1 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 52ef15ff..bbf164b2 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -225,7 +225,7 @@ _021D76A8: bl FUN_02033F20 mov r0, #1 mov r1, #0x2a - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #6 str r0, [sp] mov r0, #1 @@ -564,7 +564,7 @@ MOD57_021D7944: ; 0x021D7944 bl DestroyHeap mov r0, #1 mov r1, #0x7f - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -4129,7 +4129,7 @@ _021D95FE: beq _021D9612 ldrb r0, [r5] add r0, r0, #3 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo cmp r0, #0 bne _021D9612 strb r6, [r5, #1] @@ -4279,7 +4279,7 @@ MOD57_021D96F4: ; 0x021D96F4 add r4, r1, #0 ldr r2, _021D9720 ; =0x00000694 add r1, r0, #0 - bl FUN_020048A0 + bl GF_SndArcPlayerStartSeqEx ldr r2, _021D9724 ; =0x021D9A00 lsl r3, r4, #1 ldrh r2, [r2, r3] @@ -4290,7 +4290,7 @@ MOD57_021D96F4: ; 0x021D96F4 ldr r1, _021D9728 ; =0x0000FFFF add r0, r5, #3 sub r2, r2, r3 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch pop {r4, r5, r6, pc} .align 2, 0 _021D9720: .word 0x00000694 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index bce93cc6..6d3eade4 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -205,7 +205,7 @@ _021D7680: ldrh r0, [r4, #0x18] lsl r0, r0, #0x1a lsr r0, r0, #0x1e - bl FUN_02004D60 + bl GF_SndSetMonoFlag ldrh r1, [r4, #0x18] mov r0, #0 lsl r1, r1, #0x16 @@ -1257,7 +1257,7 @@ _021D7F26: add r0, r0, r1 add r0, #0x5e ldrh r0, [r0] - bl FUN_02004D60 + bl GF_SndSetMonoFlag b _021D7F54 _021D7F3C: cmp r0, #4 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 diff --git a/arm9/modules/63/include/mod63_021DB450.h b/arm9/modules/63/include/mod63_021DB450.h index e5ecc7df..ac3da1b6 100644 --- a/arm9/modules/63/include/mod63_021DB450.h +++ b/arm9/modules/63/include/mod63_021DB450.h @@ -3,10 +3,10 @@ #include "global.h" -typedef struct UnkStruct63_021DB450 +typedef struct UnkStruct63_021DB450 //intro base struct type { - struct UnkStruct63_021DB450 * field_00; - u32 field_04[3]; + struct UnkStruct63_021DB450 * field_00; //oddly requires this to be set to progress past copyright/pokemon screen. + u32 field_04[3]; //mon animations? u32 field_10; void * field_14; void * field_18; diff --git a/arm9/modules/63/src/mod63_021DB450.c b/arm9/modules/63/src/mod63_021DB450.c index 4164ac76..31917596 100644 --- a/arm9/modules/63/src/mod63_021DB450.c +++ b/arm9/modules/63/src/mod63_021DB450.c @@ -69,12 +69,12 @@ THUMB_FUNC u32 MOD63_021DB498(void) return 32; } -THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) +THUMB_FUNC void Title_SetupMonAnimationSprites(struct UnkStruct63_021DB450 * arg0) //TODO: this does a lot more than setup anim sprites { struct UnkStruct63_021DB49C sp1C; int introMonArray[3] = {SPECIES_TURTWIG, SPECIES_CHIMCHAR, SPECIES_PIPLUP}; - arg0->field_00 = FUN_02006D98(76); + arg0->field_00 = FUN_02006D98(76); //this is needed to get into the world view, otherwise it is just black for (u8 i = 0; i < 3; i++) //some kind of animation assignment TODO: investigate further { diff --git a/arm9/modules/66/asm/module_66.s b/arm9/modules/66/asm/module_66.s index 95660bd2..ca8faeb0 100644 --- a/arm9/modules/66/asm/module_66.s +++ b/arm9/modules/66/asm/module_66.s @@ -259,7 +259,7 @@ _021D7694: add r1, #0x88 str r0, [r1] ldr r0, [r4, #4] - bl FUN_020345A8 + bl MapMatrix_MapData_New str r0, [r4, #0x30] ldr r0, _021D7744 ; =0x021D9AA0 ldr r1, [r4, #4] @@ -345,7 +345,7 @@ _021D7782: ldr r0, [r5, #0x40] bl MOD66_021D9544 ldr r0, [r5, #0x30] - bl FUN_020345DC + bl MapMatrix_MapData_Free add r0, r5, #0 add r0, #0x88 ldr r0, [r0] @@ -1648,7 +1648,7 @@ MOD66_021D818C: ; 0x021D818C ldr r0, [r5, #0x30] ldr r1, [r4, #0x18] ldr r2, [r4, #0x1c] - bl FUN_020345F0 + bl MapMatrix_MapData_GetData str r0, [r4, #0x20] ldrh r3, [r5, #2] ldr r0, [r5, #0x40] @@ -1932,7 +1932,7 @@ MOD66_021D8380: ; 0x021D8380 ldr r0, [r6, #0x30] ldr r1, [sp, #4] add r2, r7, #0 - bl FUN_020345F0 + bl MapMatrix_MapData_GetData add r1, r5, #0 add r2, r0, #0 ldr r3, [sp, #4] diff --git a/arm9/modules/74/asm/module_74.s b/arm9/modules/74/asm/module_74.s index 16e58c34..26a78f49 100644 --- a/arm9/modules/74/asm/module_74.s +++ b/arm9/modules/74/asm/module_74.s @@ -35,10 +35,10 @@ MOD74_021D74E0: ; 0x021D74E0 bl FUN_02029FC8 str r0, [r4, #0x1c] ldr r0, [r5] - bl FUN_0202A8D8 + bl SaveStruct23_GetSubstruct2 str r0, [r4, #0x20] ldr r0, [r5] - bl FUN_0202A8E4 + bl SaveStruct23_GetSubstruct4 str r0, [r4, #0x24] mov r0, #0x4a str r0, [r4] @@ -967,7 +967,7 @@ MOD74_021D7C10: ; 0x021D7C10 ldr r0, [r5, #0x20] lsr r1, r1, #0x10 mov r2, #0 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag lsl r2, r0, #0x10 add r0, sp, #0x18 ldrb r6, [r0, #0x10] @@ -1195,7 +1195,7 @@ _021D7E04: bl AddTextPrinterParameterized2 ldr r0, [r4, #0x20] mov r1, #0 - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 mov r1, #0 add r2, r0, #0 str r1, [sp] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index a1fe2ee3..fae0c264 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -15323,7 +15323,7 @@ _02234FFC: mov r0, #3 mov r1, #1 mov r2, #0 - bl FUN_02033F70 + bl ShowCommunicationError _02235006: mov r0, #3 pop {r3, r4, r5, pc} diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index b7ad2955..01d50253 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1400,7 +1400,7 @@ MOD82_0222E050: ; 0x0222E050 ldr r0, [r4] mov r1, #0 ldr r0, [r0] - bl FUN_0202A444 + bl SaveStruct23_Substruct2_SetField_0x3 str r0, [r4, #0x38] str r0, [r4, #0x3c] mov r0, #1 @@ -2629,7 +2629,7 @@ _0222EA38: lsr r1, r1, #0x18 lsr r2, r2, #0x18 add r3, sp, #0 - bl FUN_0202A6B4 + bl SaveStruct23_Substruct4_GetArrayFlag cmp r0, #0 beq _0222EA66 mov r0, #0x12 @@ -2795,7 +2795,7 @@ _0222EB94: add r1, #0x48 lsr r2, r2, #0x18 lsr r3, r3, #0x18 - bl FUN_0202A754 + bl SaveStruct23_Substruct4_SetSubstruct1 add r0, r4, #0 mov r1, #0x25 mov r2, #0x11 @@ -2812,7 +2812,7 @@ _0222EB94: lsr r1, r1, #0x18 lsr r2, r2, #0x18 add r3, sp, #0 - bl FUN_0202A60C + bl SaveStruct23_Substruct4_SetArrayFlag b _0222EC44 _0222EBD6: mov r1, #0x3b @@ -2995,7 +2995,7 @@ _0222ED32: mov r1, #5 ldr r0, [r0] mov r2, #2 - bl FUN_0202A578 + bl SaveStruct23_Substruct2_SetFlag add r0, r4, #0 mov r1, #0x25 mov r2, #0x1a diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index d58de0be..06fa49b6 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -2334,7 +2334,7 @@ _0222E7F8: pop {r3, pc} _0222E802: ldr r0, _0222E840 ; =MOD83_0223A8C4 - bl FUN_020224D8 + bl Reset_To_File pop {r3, pc} _0222E80A: bl FUN_0200541C |