diff options
author | tgsm <doodrabbit@hotmail.com> | 2021-03-24 07:28:25 -0400 |
---|---|---|
committer | tgsm <doodrabbit@hotmail.com> | 2021-03-24 07:28:25 -0400 |
commit | 08f7471387b63deca732cbf7e972f92187b4b647 (patch) | |
tree | 87c63291651163778359857df81f916446e294aa /arm9/modules/05 | |
parent | 1fbc3a19c26344a33dae19625a5113fe1eada50f (diff) |
Document some MapHeader functions/members
Diffstat (limited to 'arm9/modules/05')
-rw-r--r-- | arm9/modules/05/asm/mod05_021D74E0.s | 10 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021D80E8.s | 14 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E2E88.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/mod05_021E8310.s | 2 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 2 |
5 files changed, 15 insertions, 15 deletions
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 |