diff options
35 files changed, 175 insertions, 202 deletions
diff --git a/arm9/asm/scrcmd_18.s b/arm9/asm/scrcmd_18.s index 4b0acb12..fe0e3aa9 100644 --- a/arm9/asm/scrcmd_18.s +++ b/arm9/asm/scrcmd_18.s @@ -678,7 +678,7 @@ FUN_020448D4: ; 0x020448D4 ldr r0, [r5, #0x0] ldr r0, [r0, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec add r7, r0, #0x0 ldr r0, [r6, #0xc] bl SavArray_PlayerParty_get diff --git a/arm9/asm/scrcmd_3.s b/arm9/asm/scrcmd_3.s index 28cbd7ac..28df2444 100644 --- a/arm9/asm/scrcmd_3.s +++ b/arm9/asm/scrcmd_3.s @@ -206,7 +206,7 @@ FUN_02040028: ; 0x02040028 ldr r0, [r0, #0x0] ldr r0, [r0, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec add r5, #0x80 ldr r3, [r5, #0x0] add r2, r0, #0x0 diff --git a/arm9/asm/unk_02028980.s b/arm9/asm/unk_02028980.s index ad0b1145..8c9178e7 100644 --- a/arm9/asm/unk_02028980.s +++ b/arm9/asm/unk_02028980.s @@ -2215,7 +2215,7 @@ FUN_02029880: ; 0x02029880 cmp r0, #0x1 bne _02029942 add r0, r4, #0x0 - bl FUN_02034824 + bl MapHeader_GetMapSec lsl r0, r0, #0x10 lsr r0, r0, #0x10 add r1, r6, #0x0 @@ -2248,7 +2248,7 @@ _020298DE: b _02029942 _020298EE: add r0, r4, #0x0 - bl FUN_02034824 + bl MapHeader_GetMapSec add r7, r0, #0x0 lsl r0, r7, #0x10 lsr r0, r0, #0x10 diff --git a/arm9/asm/unk_020343A8.s b/arm9/asm/unk_020343A8.s index fc2463b8..88fd2560 100644 --- a/arm9/asm/unk_020343A8.s +++ b/arm9/asm/unk_020343A8.s @@ -139,7 +139,7 @@ FUN_020344AC: ; 0x020344AC push {r4-r6, lr} add r5, r0, #0x0 add r4, r1, #0x0 - bl FUN_0203474C + bl MapHeader_GetMatrixId add r6, r0, #0x0 add r0, r4, #0x4 add r1, r6, #0x0 diff --git a/arm9/asm/unk_02034A28.s b/arm9/asm/unk_02034A28.s index d0cc2c05..e4c8097a 100644 --- a/arm9/asm/unk_02034A28.s +++ b/arm9/asm/unk_02034A28.s @@ -67,7 +67,7 @@ FUN_02034A98: ; 0x02034A98 push {r3-r5, lr} add r5, r0, #0x0 add r0, r1, #0x0 - bl FUN_02034810 + bl MapHeader_GetEventsBank add r4, r0, #0x0 mov r0, #0x20 add r1, r4, #0x0 @@ -406,11 +406,11 @@ FUN_02034CB4: ; 0x02034CB4 add r5, r0, #0x0 bl memset add r0, r4, #0x0 - bl FUN_020347D8 + bl MapHeader_HasWildEncounters cmp r0, #0x0 beq _02034CDE add r0, r4, #0x0 - bl FUN_020347FC + bl MapHeader_GetWildEncounterBank add r2, r0, #0x0 add r0, r5, #0x0 .ifdef DIAMOND @@ -436,7 +436,7 @@ FUN_02034CEC: ; 0x02034CEC push {r3-r5, lr} add r5, r0, #0x0 add r0, r1, #0x0 - bl FUN_0203479C + bl MapHeader_GetLevelScriptsBank mov r1, #0x82 lsl r1, r1, #0x4 mov r2, #0x1 diff --git a/arm9/asm/unk_02034FE4.s b/arm9/asm/unk_02034FE4.s index 2d66b396..8ff7abe0 100644 --- a/arm9/asm/unk_02034FE4.s +++ b/arm9/asm/unk_02034FE4.s @@ -128,7 +128,7 @@ FUN_02034FE4: ; 0x02034FE4 push {r3-r7, lr} add r7, r0, #0x0 add r0, r1, #0x0 - bl FUN_02034838 + bl MapHeader_GetWeatherType add r4, r0, #0x0 cmp r4, #0x18 blt _0203505C diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s index 810faa41..0c8e3612 100644 --- a/arm9/asm/unk_02035068.s +++ b/arm9/asm/unk_02035068.s @@ -67,7 +67,7 @@ FUN_02035068: ; 0x02035068 push {r3, lr} ldr r0, [r0, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec cmp r0, #0x0 beq _0203507A mov r0, #0x1 diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s index 7051e8ff..f8d30d92 100644 --- a/arm9/asm/unk_02038C78.s +++ b/arm9/asm/unk_02038C78.s @@ -1925,7 +1925,7 @@ ScriptRunByIndex: ; 0x02039484 thumb_func_start LoadScriptsForCurrentMap LoadScriptsForCurrentMap: ; 0x0203949C push {r3, lr} - bl MapHeader_GetScrSeqReleaseNo + bl MapHeader_GetScriptsBank add r1, r0, #0x0 mov r0, #0xa mov r2, #0xb diff --git a/arm9/asm/unk_020476CC.s b/arm9/asm/unk_020476CC.s index 8eac1942..7e25689f 100644 --- a/arm9/asm/unk_020476CC.s +++ b/arm9/asm/unk_020476CC.s @@ -525,7 +525,7 @@ FUN_02047A78: ; 0x02047A78 str r0, [r5, r1] ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec mov r1, #0x56 lsl r1, r1, #0x2 str r0, [r5, r1] @@ -1161,7 +1161,7 @@ FUN_0204806C: ; 0x0204806C add r6, r0, #0x0 ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034860 + bl MapHeader_GetField17_0 mov r1, #0x15 lsl r1, r1, #0x4 str r0, [r5, r1] diff --git a/arm9/asm/unk_02048904.s b/arm9/asm/unk_02048904.s index d9259556..1fcababe 100644 --- a/arm9/asm/unk_02048904.s +++ b/arm9/asm/unk_02048904.s @@ -223,14 +223,14 @@ _02048A82: bl FUN_02034E10 add r6, r0, #0x0 add r0, r7, #0x0 - bl FUN_0203484C + bl MapHeader_GetCameraType cmp r6, r0 beq _02048AB4 bl ErrorHandling b _02048AB4 _02048AA6: add r0, r7, #0x0 - bl FUN_0203484C + bl MapHeader_GetCameraType add r1, r0, #0x0 ldr r0, [sp, #0x4] bl FUN_02034E18 diff --git a/arm9/asm/unk_0204AB0C.s b/arm9/asm/unk_0204AB0C.s index 45702b12..bea4eefa 100644 --- a/arm9/asm/unk_0204AB0C.s +++ b/arm9/asm/unk_0204AB0C.s @@ -121,11 +121,11 @@ FUN_0204ABA8: ; 0x0204ABA8 cmp r0, #0x0 bne _0204ABBE add r0, r4, #0x0 - bl FUN_020347B0 + bl MapHeader_GetDayMusicId b _0204ABC4 _0204ABBE: add r0, r4, #0x0 - bl FUN_020347C4 + bl MapHeader_GetNightMusicId _0204ABC4: add r6, r0, #0x0 ldr r0, [r5, #0xc] @@ -338,11 +338,11 @@ FUN_0204AD44: ; 0x0204AD44 cmp r0, #0x0 bne _0204AD58 add r0, r4, #0x0 - bl FUN_020347B0 + bl MapHeader_GetDayMusicId pop {r4, pc} _0204AD58: add r0, r4, #0x0 - bl FUN_020347C4 + bl MapHeader_GetNightMusicId pop {r4, pc} thumb_func_start FUN_0204AD60 diff --git a/arm9/asm/unk_0205CE48.s b/arm9/asm/unk_0205CE48.s index 5ad7ca34..6e6f1f85 100644 --- a/arm9/asm/unk_0205CE48.s +++ b/arm9/asm/unk_0205CE48.s @@ -432,7 +432,7 @@ FUN_0205D170: ; 0x0205D170 push {r3-r5, lr} add r5, r0, #0x0 ldr r0, [r5, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec cmp r0, #0x0 bne _0205D184 mov r0, #0x0 @@ -440,7 +440,7 @@ FUN_0205D170: ; 0x0205D170 pop {r3-r5, pc} _0205D184: ldr r0, [r5, #0x0] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0x0 bne _0205D194 mov r0, #0x0 @@ -697,7 +697,7 @@ _0205D390: pop {r3-r5, pc} _0205D396: ldr r0, [r4, #0x0] - bl FUN_020348B4 + bl MapHeader_IsBikeAllowed cmp r0, #0x0 bne _0205D3A6 mov r0, #0x0 @@ -1178,7 +1178,7 @@ _0205D730: .word 0x000022F6 FUN_0205D734: ; 0x0205D734 push {r3, lr} ldr r0, [r0, #0x0] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0x0 beq _0205D744 mov r0, #0x0 @@ -1595,7 +1595,7 @@ _0205DA8E: cmp r0, #0x1 bne _0205DAA6 ldr r0, [r4, #0x0] - bl FUN_0203487C + bl MapHeader_GetField17_6 cmp r0, #0x1 bne _0205DAA6 mov r0, #0x0 diff --git a/arm9/asm/unk_0205F7A0.s b/arm9/asm/unk_0205F7A0.s index 43358f72..b781112b 100644 --- a/arm9/asm/unk_0205F7A0.s +++ b/arm9/asm/unk_0205F7A0.s @@ -55,7 +55,7 @@ FUN_0205F7A0: ; 0x0205F7A0 asr r1, r1, #0x5 asr r2, r2, #0x5 bl FUN_0203451C - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0x0 beq _0205F806 str r4, [r5, #0x0] diff --git a/arm9/asm/unk_02060CCC.s b/arm9/asm/unk_02060CCC.s index 44e19c06..b6692f24 100644 --- a/arm9/asm/unk_02060CCC.s +++ b/arm9/asm/unk_02060CCC.s @@ -1033,7 +1033,7 @@ FUN_02061374: ; 0x02061374 strh r1, [r0, #0x0] ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec add r1, sp, #0x0 strh r0, [r1, #0x2] add r0, r4, #0x0 @@ -1084,7 +1084,7 @@ FUN_020613CC: ; 0x020613CC bl FUN_02060E34 ldr r0, [r4, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec add r1, sp, #0x4 strh r0, [r1, #0x6] add r0, r4, #0x0 @@ -2838,7 +2838,7 @@ _0206218C: bl FUN_02034FE4 add r4, r0, #0x0 add r0, r5, #0x0 - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0x0 add r0, r7, #0x0 mov r1, #0x0 @@ -2949,7 +2949,7 @@ FUN_02062240: ; 0x02062240 bl MOD06_02245910 add r0, sp, #0x0 ldrh r0, [r0, #0x2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0x0 add r0, r4, #0x0 mov r1, #0x0 @@ -3176,7 +3176,7 @@ FUN_020623F4: ; 0x020623F4 lsl r1, r0, #0x1 ldr r0, _0206245C ; =UNK_020F79EE ldrh r0, [r0, r1] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0x0 add r0, r5, #0x0 mov r1, #0x0 diff --git a/arm9/asm/unk_0206367C.s b/arm9/asm/unk_0206367C.s index 431828e8..0696b4e4 100644 --- a/arm9/asm/unk_0206367C.s +++ b/arm9/asm/unk_0206367C.s @@ -107,7 +107,7 @@ _02063758: bne _0206377C ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] - bl FUN_020348B4 + bl MapHeader_IsBikeAllowed cmp r0, #0x0 bne _0206377C mov r0, #0x0 @@ -122,7 +122,7 @@ _0206377C: _02063786: ldr r0, [r5, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0x0 beq _020637A6 ldr r0, [r5, #0xc] diff --git a/arm9/asm/unk_02063948.s b/arm9/asm/unk_02063948.s index 28b6db5b..854eaedd 100644 --- a/arm9/asm/unk_02063948.s +++ b/arm9/asm/unk_02063948.s @@ -303,7 +303,7 @@ _02063B52: pop {r4, pc} _02063B66: ldr r0, [r4, #0x0] - bl FUN_02034898 + bl MapHeader_IsFlyAllowed cmp r0, #0x0 bne _02063B74 mov r0, #0x1 @@ -1129,7 +1129,7 @@ _020641BE: cmp r0, #0x1 bne _020641D2 ldr r0, [r4, #0x0] - bl FUN_0203487C + bl MapHeader_GetField17_6 cmp r0, #0x1 beq _020641D6 _020641D2: diff --git a/arm9/asm/unk_0207550C.s b/arm9/asm/unk_0207550C.s index d4608a0d..14488621 100644 --- a/arm9/asm/unk_0207550C.s +++ b/arm9/asm/unk_0207550C.s @@ -3503,7 +3503,7 @@ FUN_020772CC: ; 0x020772CC ldr r0, [r0, #0x1c] ldr r0, [r0, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec lsl r0, r0, #0x10 lsr r0, r0, #0x10 pop {r3, pc} diff --git a/arm9/asm/unk_02086084.s b/arm9/asm/unk_02086084.s index 9d8276fd..3a4017d7 100644 --- a/arm9/asm/unk_02086084.s +++ b/arm9/asm/unk_02086084.s @@ -279,7 +279,7 @@ _020862D6: add r7, r0, #0x0 ldr r0, [r6, #0x1c] ldr r0, [r0, #0x0] - bl FUN_02034824 + bl MapHeader_GetMapSec str r0, [sp, #0x4] mov r0, #0x0 str r0, [sp, #0x8] diff --git a/arm9/global.inc b/arm9/global.inc index 30385d33..621d07ec 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -2491,26 +2491,26 @@ .extern FUN_02034660 .extern FUN_02034678 .extern FUN_020346CC -.extern FUN_02034724 -.extern FUN_02034738 -.extern FUN_0203474C +.extern MapHeader_GetAreaDataBank +.extern MapHeader_GetField1 +.extern MapHeader_GetMatrixId .extern MapHeader_GetMsgBank -.extern MapHeader_GetScrSeqReleaseNo -.extern FUN_0203479C -.extern FUN_020347B0 -.extern FUN_020347C4 -.extern FUN_020347D8 -.extern FUN_020347FC -.extern FUN_02034810 -.extern FUN_02034824 -.extern FUN_02034838 -.extern FUN_0203484C -.extern FUN_02034860 -.extern FUN_0203487C -.extern FUN_02034898 -.extern FUN_020348B4 +.extern MapHeader_GetScriptsBank +.extern MapHeader_GetLevelScriptsBank +.extern MapHeader_GetDayMusicId +.extern MapHeader_GetNightMusicId +.extern MapHeader_HasWildEncounters +.extern MapHeader_GetWildEncounterBank +.extern MapHeader_GetEventsBank +.extern MapHeader_GetMapSec +.extern MapHeader_GetWeatherType +.extern MapHeader_GetCameraType +.extern MapHeader_GetField17_0 +.extern MapHeader_GetField17_6 +.extern MapHeader_IsFlyAllowed +.extern MapHeader_IsBikeAllowed .extern FUN_020348E4 -.extern FUN_02034908 +.extern MapHeader_MapIsOnOverworldMatrix .extern FUN_02034930 .extern FUN_02034944 .extern FUN_02034964 diff --git a/arm9/modules/05/asm/mod05_021D74E0.s b/arm9/modules/05/asm/mod05_021D74E0.s index 8488759b..e66ad6aa 100644 --- a/arm9/modules/05/asm/mod05_021D74E0.s +++ b/arm9/modules/05/asm/mod05_021D74E0.s @@ -477,10 +477,10 @@ _021D78CE: ldr r0, [r0, #0xc] bl MOD05_021DC174 add r0, r6, #0 - bl FUN_02034824 + bl MapHeader_GetMapSec add r6, r0, #0 add r0, r4, #0 - bl FUN_02034824 + bl MapHeader_GetMapSec add r1, r0, #0 cmp r6, r1 beq _021D7956 @@ -542,7 +542,7 @@ MOD05_021D79B4: ; 0x021D79B4 add r5, r0, #0 ldr r0, [r5, #0x1c] ldr r0, [r0] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0 beq _021D79FE ldr r0, [r5, #0xc] @@ -954,13 +954,13 @@ MOD05_021D7CF0: ; 0x021D7CF0 str r0, [r5, #0x50] ldr r0, [r5, #0x1c] ldr r0, [r0] - bl FUN_02034724 + bl MapHeader_GetAreaDataBank ldr r1, [r5, #0x4c] bl MOD05_021F4978 str r0, [r5, #0x2c] ldr r0, [r5, #0x1c] ldr r0, [r0] - bl FUN_02034738 + bl MapHeader_GetField1 add r4, r0, #0 ldr r0, [r5, #0x30] cmp r0, #0 diff --git a/arm9/modules/05/asm/mod05_021D80E8.s b/arm9/modules/05/asm/mod05_021D80E8.s index 946b25da..c00cb45f 100644 --- a/arm9/modules/05/asm/mod05_021D80E8.s +++ b/arm9/modules/05/asm/mod05_021D80E8.s @@ -1075,7 +1075,7 @@ _021D8992: _021D8998: ldr r0, [r4, #0x1c] ldr r0, [r0] - bl FUN_020347D8 + bl MapHeader_HasWildEncounters cmp r0, #0 beq _021D89B4 add r0, r4, #0 @@ -1846,7 +1846,7 @@ MOD05_021D8FD0: ; 0x021D8FD0 add r6, r0, #0 ldr r0, [r4, #0x1c] ldr r0, [r0] - bl FUN_02034824 + bl MapHeader_GetMapSec lsl r0, r0, #0x10 lsr r5, r0, #0x10 add r0, r6, #0 @@ -1894,7 +1894,7 @@ MOD05_021D9010: ; 0x021D9010 _021D903E: ldr r0, [r5, #0x1c] ldr r0, [r0] - bl FUN_02034824 + bl MapHeader_GetMapSec add r1, r0, #0 lsl r1, r1, #0x10 add r0, r4, #0 @@ -2216,11 +2216,11 @@ MOD05_021D9290: ; 0x021D9290 beq _021D92DA ldr r0, [r4, #0x1c] ldr r0, [r0] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #1 bne _021D931C ldr r0, [sp, #8] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0 bne _021D931C ldr r0, [r4, #0x38] @@ -2246,11 +2246,11 @@ _021D92DA: beq _021D931C ldr r0, [r4, #0x1c] ldr r0, [r0] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #1 bne _021D931C ldr r0, [sp, #8] - bl FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0 bne _021D931C ldr r0, [r4, #0x38] diff --git a/arm9/modules/05/asm/mod05_021E2E88.s b/arm9/modules/05/asm/mod05_021E2E88.s index 6d69341c..0666b52d 100644 --- a/arm9/modules/05/asm/mod05_021E2E88.s +++ b/arm9/modules/05/asm/mod05_021E2E88.s @@ -606,7 +606,7 @@ MOD05_021E331C: ; 0x021E331C bne _021E333E ldr r0, [r4, #0x1c] ldr r0, [r0] - bl FUN_02034824 + bl MapHeader_GetMapSec add r1, r0, #0 ldr r0, [r4, #4] ldr r0, [r0, #8] diff --git a/arm9/modules/05/asm/mod05_021E8310.s b/arm9/modules/05/asm/mod05_021E8310.s index e3a28a97..7a66cdcb 100644 --- a/arm9/modules/05/asm/mod05_021E8310.s +++ b/arm9/modules/05/asm/mod05_021E8310.s @@ -16,7 +16,7 @@ MOD05_021E8310: ; 0x021E8310 bl Sav2_Pokedex_get add r7, r0, #0 ldr r0, [r6] - bl FUN_02034824 + bl MapHeader_GetMapSec str r0, [r5, #4] add r0, r7, #0 bl Pokedex_GetSinnohDexFlag diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 104c1b87..fe346300 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -26953,7 +26953,7 @@ _021F5888: strh r0, [r4, #0xa] ldr r0, [r5, #0x1c] ldr r0, [r0] - bl FUN_020347D8 + bl MapHeader_HasWildEncounters cmp r0, #0 beq _021F58D4 mov r0, #0xa diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 18de2954..d46e003b 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8668,7 +8668,7 @@ _0223D804: bne _0223D8F4 ldr r0, [r5, #0x1c] ldr r0, [r0] - bl FUN_02034824 + bl MapHeader_GetMapSec cmp r0, #0x65 beq _0223D8F4 ldr r0, [r5, #0x1c] @@ -31270,7 +31270,7 @@ CreateInGameTradeMon: ; 0x022489D4 add r2, r4, #0 bl SetMonData ldr r0, [sp, #0x2c] - bl FUN_02034824 + bl MapHeader_GetMapSec add r3, r0, #0 ldr r0, [sp, #0x28] mov r1, #0 diff --git a/arm9/modules/42/asm/module_42.s b/arm9/modules/42/asm/module_42.s index 8e41c6cc..5bbfa2ba 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 FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix 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 FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix 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 8efadd9b..89b23259 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 FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix 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 FUN_02034908 + bl MapHeader_MapIsOnOverworldMatrix cmp r0, #0 beq _02254B36 ldr r1, [r4, #0x1c] diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 60757798..4982fa30 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -1248,7 +1248,7 @@ _021D7E32: add r4, r0, #0 ldr r0, [sp, #0x14] lsr r0, r0, #0x13 - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -1685,7 +1685,7 @@ MOD67_021D8208: ; 0x021D8208 b _021D832E _021D822A: ldrh r0, [r0, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r1, _021D8338 ; =0x0000017E mov r0, #0x1a @@ -1774,7 +1774,7 @@ _021D82EA: _021D82F2: add r0, sp, #0x10 ldrh r0, [r0, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r4, #0x54] mov r1, #0 @@ -2423,7 +2423,7 @@ MOD67_021D87E4: ; 0x021D87E4 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2674,7 +2674,7 @@ MOD67_021D89E0: ; 0x021D89E0 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2717,7 +2717,7 @@ MOD67_021D8A3C: ; 0x021D8A3C bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2760,7 +2760,7 @@ MOD67_021D8A98: ; 0x021D8A98 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2803,7 +2803,7 @@ MOD67_021D8AF4: ; 0x021D8AF4 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2846,7 +2846,7 @@ MOD67_021D8B50: ; 0x021D8B50 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2889,7 +2889,7 @@ MOD67_021D8BAC: ; 0x021D8BAC bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2932,7 +2932,7 @@ MOD67_021D8C08: ; 0x021D8C08 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -2975,7 +2975,7 @@ MOD67_021D8C64: ; 0x021D8C64 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -3018,7 +3018,7 @@ MOD67_021D8CC0: ; 0x021D8CC0 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -3061,7 +3061,7 @@ MOD67_021D8D1C: ; 0x021D8D1C bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 @@ -3104,7 +3104,7 @@ MOD67_021D8D78: ; 0x021D8D78 bl NewString_ReadMsgData add r7, r0, #0 ldrh r0, [r4, #2] - bl FUN_02034824 + bl MapHeader_GetMapSec add r2, r0, #0 ldr r0, [r5, #0x54] mov r1, #0 diff --git a/arm9/src/map_header.c b/arm9/src/map_header.c index 0a5b8987..644a590b 100644 --- a/arm9/src/map_header.c +++ b/arm9/src/map_header.c @@ -605,23 +605,23 @@ u32 MapNumberBoundsCheck(u32 mapno) return mapno; } -u8 FUN_02034724(u32 mapno) +u8 MapHeader_GetAreaDataBank(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk0; + return sMapHeaders[mapno].area_data_bank; } -u8 FUN_02034738(u32 mapno) +u8 MapHeader_GetField1(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); return sMapHeaders[mapno].unk1; } -u16 FUN_0203474C(u32 mapno) +u16 MapHeader_GetMatrixId(u32 mapno) { u16 ret; mapno = MapNumberBoundsCheck(mapno); - ret = sMapHeaders[mapno].unk2; + ret = sMapHeaders[mapno].matrix_id; // Spear Pillar if (ret == 22 && gGameVersion == VERSION_PEARL) ret = 23; @@ -631,94 +631,94 @@ u16 FUN_0203474C(u32 mapno) u16 MapHeader_GetMsgBank(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk8; + return sMapHeaders[mapno].msg_bank; } -u16 MapHeader_GetScrSeqReleaseNo(u32 mapno) +u16 MapHeader_GetScriptsBank(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk4; + return sMapHeaders[mapno].scripts_bank; } -u16 FUN_0203479C(u32 mapno) +u16 MapHeader_GetLevelScriptsBank(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk6; + return sMapHeaders[mapno].level_scripts_bank; } -u16 FUN_020347B0(u32 mapno) +u16 MapHeader_GetDayMusicId(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unkA; + return sMapHeaders[mapno].day_music_id; } -u16 FUN_020347C4(u32 mapno) +u16 MapHeader_GetNightMusicId(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unkC; + return sMapHeaders[mapno].night_music_id; } -BOOL FUN_020347D8(u32 mapno) +BOOL MapHeader_HasWildEncounters(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unkE != 0xFFFF; + return sMapHeaders[mapno].wild_encounter_bank != 0xFFFF; } -u16 FUN_020347FC(u32 mapno) +u16 MapHeader_GetWildEncounterBank(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unkE; + return sMapHeaders[mapno].wild_encounter_bank; } -u16 FUN_02034810(u32 mapno) +u16 MapHeader_GetEventsBank(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk10; + return sMapHeaders[mapno].events_bank; } -u16 FUN_02034824(u32 mapno) +u16 MapHeader_GetMapSec(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); return sMapHeaders[mapno].mapsec; } -u8 FUN_02034838(u32 mapno) +u8 MapHeader_GetWeatherType(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk14; + return sMapHeaders[mapno].weather_type; } -u8 FUN_0203484C(u32 mapno) +u8 MapHeader_GetCameraType(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk15; + return sMapHeaders[mapno].camera_type; } -u8 FUN_02034860(u32 mapno) +u8 MapHeader_GetField17_0(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); return sMapHeaders[mapno].unk17_0; } -u8 FUN_0203487C(u32 mapno) +u8 MapHeader_GetField17_6(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); return sMapHeaders[mapno].unk17_6; } -u8 FUN_02034898(u32 mapno) +u8 MapHeader_IsFlyAllowed(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk17_7; + return sMapHeaders[mapno].is_fly_allowed; } -u8 FUN_020348B4(u32 mapno) +u8 MapHeader_IsBikeAllowed(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); - return sMapHeaders[mapno].unk17_4; + return sMapHeaders[mapno].is_bike_allowed; } -u8 FUN_020348D0(u32 mapno) +u8 MapHeader_GetField16(u32 mapno) { mapno = MapNumberBoundsCheck(mapno); return sMapHeaders[mapno].unk16; @@ -726,36 +726,36 @@ u8 FUN_020348D0(u32 mapno) BOOL FUN_020348E4(u32 mapno) { - if (!FUN_02034898(mapno)) + if (!MapHeader_IsFlyAllowed(mapno)) return FALSE; - if (FUN_020348D0(mapno) != 1) + if (MapHeader_GetField16(mapno) != 1) return TRUE; return FALSE; } -BOOL FUN_02034908(u32 mapno) +BOOL MapHeader_MapIsOnOverworldMatrix(u32 mapno) { - return !FUN_0203474C(mapno); + return MapHeader_GetMatrixId(mapno) == 0; } BOOL FUN_0203491C(u32 mapno) { - return FUN_020348D0(mapno) == 5; + return MapHeader_GetField16(mapno) == 5; } BOOL FUN_02034930(u32 mapno) { - return FUN_020348D0(mapno) == 3; + return MapHeader_GetField16(mapno) == 3; } BOOL FUN_02034944(u32 mapno) { - return FUN_020348D0(mapno) == 4 || FUN_020348D0(mapno) == 5; + return MapHeader_GetField16(mapno) == 4 || MapHeader_GetField16(mapno) == 5; } BOOL FUN_02034964(u32 mapno) { - return FUN_020348D0(mapno) == 1 || FUN_020348D0(mapno) == 2; + return MapHeader_GetField16(mapno) == 1 || MapHeader_GetField16(mapno) == 2; } BOOL FUN_02034984(u32 mapno) diff --git a/arm9/src/scrcmd_18_c.c b/arm9/src/scrcmd_18_c.c index 633ad71c..c683bc8c 100644 --- a/arm9/src/scrcmd_18_c.c +++ b/arm9/src/scrcmd_18_c.c @@ -12,7 +12,7 @@ extern BOOL GiveMon(u32 heap_id, struct SaveBlock2 * sav2, u16 species, u8 level THUMB_FUNC BOOL ScrCmd_GiveMon(struct ScriptContext* ctx)
{
- u32 mapSec = FUN_02034824(*(ctx->unk80->mapId));
+ u32 mapSec = MapHeader_GetMapSec(*(ctx->unk80->mapId));
struct UnkSavStruct80 *savePtr = ctx->unk80;
u16 species = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
u16 level = VarGet(ctx->unk80, ScriptReadHalfword(ctx));
diff --git a/arm9/src/unk_02064E4C.c b/arm9/src/unk_02064E4C.c index 1e9f8515..90ff8340 100644 --- a/arm9/src/unk_02064E4C.c +++ b/arm9/src/unk_02064E4C.c @@ -16,7 +16,7 @@ void FUN_02064E4C(struct MsgData * msgData, u16 map_sec, struct String * dest) void FUN_02064E60(u32 map_no, u32 heap_id, struct String * dest) { struct MsgData * msgData = NewMsgDataFromNarc(1, NARC_MSGDATA_MSG, 382, heap_id); - u16 map_sec = FUN_02034824(map_no); + u16 map_sec = MapHeader_GetMapSec(map_no); FUN_02064E4C(msgData, map_sec, dest); diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h deleted file mode 100644 index 4557a2e7..00000000 --- a/include/global.fieldmap.h +++ /dev/null @@ -1,27 +0,0 @@ -#ifndef POKEDIAMOND_GLOBAL_FIELDMAP_H -#define POKEDIAMOND_GLOBAL_FIELDMAP_H - -struct MapHeader -{ - u8 unk0; - u8 unk1; - u16 unk2; - u16 unk4; - u16 unk6; - u16 unk8; - u16 unkA; - u16 unkC; - u16 unkE; - u16 unk10; - u16 mapsec; - u8 unk14; - u8 unk15; - u8 unk16; - u8 unk17_0:4; - u8 unk17_4:1; - u8 unk17_5:1; - u8 unk17_6:1; - u8 unk17_7:1; -}; - -#endif //POKEDIAMOND_GLOBAL_FIELDMAP_H diff --git a/include/global.h b/include/global.h index e0e8cb22..1c92a1ec 100644 --- a/include/global.h +++ b/include/global.h @@ -6,7 +6,6 @@ #include "MWC_string.h" #include "function_target.h" #include "nitro.h" -#include "global.fieldmap.h" #include "constants/global.h" #include "error_handling.h" diff --git a/include/map.h b/include/map.h deleted file mode 100644 index 18b8c1d1..00000000 --- a/include/map.h +++ /dev/null @@ -1,22 +0,0 @@ -#ifndef POKEDIAMOND_MAP_H -#define POKEDIAMOND_MAP_H - -typedef struct { - u8 MapAreaData; - u8 field_0x1; - u16 Matrix; - u16 MapScripts; - u16 MapLevelScripts; - u16 MapTexts; - u16 DayMusic; - u16 NightMusic; - u16 WildPokemonData; - u16 MapEvents; - u16 MapName; - u8 WeatherType; - u8 field_0x15; - u8 field_0x16; - u8 field_0x17; -} MapHeader; - -#endif //POKEDIAMOND_MAP_H diff --git a/include/map_header.h b/include/map_header.h index e4e96a59..20677025 100644 --- a/include/map_header.h +++ b/include/map_header.h @@ -1,27 +1,50 @@ #ifndef POKEDIAMOND_MAP_HEADER_H #define POKEDIAMOND_MAP_HEADER_H -u8 FUN_02034724(u32 mapno); -u8 FUN_02034738(u32 mapno); -u16 FUN_0203474C(u32 mapno); +struct MapHeader +{ + u8 area_data_bank; + u8 unk1; + u16 matrix_id; + u16 scripts_bank; + u16 level_scripts_bank; + u16 msg_bank; + u16 day_music_id; + u16 night_music_id; + u16 wild_encounter_bank; + u16 events_bank; + u16 mapsec; + u8 weather_type; + u8 camera_type; + u8 unk16; + u8 unk17_0:4; + u8 is_bike_allowed:1; + u8 unk17_5:1; + u8 unk17_6:1; + u8 is_fly_allowed:1; +}; + +u8 MapHeader_GetAreaDataBank(u32 mapno); +u8 MapHeader_GetField1(u32 mapno); +u16 MapHeader_GetMatrixId(u32 mapno); u16 MapHeader_GetMsgBank(u32 mapno); -u16 MapHeader_GetScrSeqReleaseNo(u32 mapno); -u16 FUN_0203479C(u32 mapno); -u16 FUN_020347B0(u32 mapno); -u16 FUN_020347C4(u32 mapno); -BOOL FUN_020347D8(u32 mapno); -u16 FUN_020347FC(u32 mapno); -u16 FUN_02034810(u32 mapno); -u16 FUN_02034824(u32 mapno); -u8 FUN_02034838(u32 mapno); -u8 FUN_0203484C(u32 mapno); -u8 FUN_02034860(u32 mapno); -u8 FUN_0203487C(u32 mapno); -u8 FUN_02034898(u32 mapno); -u8 FUN_020348B4(u32 mapno); -u8 FUN_020348D0(u32 mapno); +u16 MapHeader_GetScriptsBank(u32 mapno); +u16 MapHeader_GetLevelScriptsBank(u32 mapno); +u16 MapHeader_GetDayMusicId(u32 mapno); +u16 MapHeader_GetNightMusicId(u32 mapno); +BOOL MapHeader_HasWildEncounters(u32 mapno); +u16 MapHeader_GetWildEncounterBank(u32 mapno); +u16 MapHeader_GetEventsBank(u32 mapno); +u16 MapHeader_GetMapSec(u32 mapno); +u8 MapHeader_GetWeatherType(u32 mapno); +u8 MapHeader_GetCameraType(u32 mapno); +u8 MapHeader_GetField17_0(u32 mapno); +u8 MapHeader_GetField17_6(u32 mapno); +u8 MapHeader_IsFlyAllowed(u32 mapno); +u8 MapHeader_IsBikeAllowed(u32 mapno); +u8 MapHeader_GetField16(u32 mapno); BOOL FUN_020348E4(u32 mapno); -BOOL FUN_02034908(u32 mapno); +BOOL MapHeader_MapIsOnOverworldMatrix(u32 mapno); BOOL FUN_0203491C(u32 mapno); BOOL FUN_02034930(u32 mapno); BOOL FUN_02034944(u32 mapno); |