summaryrefslogtreecommitdiff
path: root/asm
diff options
context:
space:
mode:
Diffstat (limited to 'asm')
-rw-r--r--asm/battle_tower.s8
-rw-r--r--asm/field_effect_helpers.s112
-rw-r--r--asm/fldeff_80C5CD4.s68
-rw-r--r--asm/pokedex_area_screen.s6
-rw-r--r--asm/pokenav.s6
5 files changed, 100 insertions, 100 deletions
diff --git a/asm/battle_tower.s b/asm/battle_tower.s
index 3f019e1ea..65fbd0c05 100644
--- a/asm/battle_tower.s
+++ b/asm/battle_tower.s
@@ -2163,10 +2163,10 @@ _081355D6:
bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
- bl GetBattleTowerBattleTransition
+ bl BattleSetup_GetBattleTowerBattleTransition
lsls r0, 24
lsrs r0, 24
- bl sub_811AABC
+ bl BattleTransition_StartOnField
b _08135648
.align 2, 0
_081355F4: .4byte gPlayerParty
@@ -2200,10 +2200,10 @@ _08135606:
bl CreateTask
movs r0, 0
bl current_map_music_set__default_for_battle
- bl GetBattleTowerBattleTransition
+ bl BattleSetup_GetBattleTowerBattleTransition
lsls r0, 24
lsrs r0, 24
- bl sub_811AABC
+ bl BattleTransition_StartOnField
_08135648:
add sp, 0x4
pop {r4,r5}
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index 9df9dfd8d..5e54550e3 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -581,7 +581,7 @@ _08126C68: .4byte gSprites
thumb_func_start FldEff_Shadow
FldEff_Shadow: @ 8126C6C
push {r4,r5,lr}
- ldr r5, _08126CF8 @ =gUnknown_0202FF84
+ ldr r5, _08126CF8 @ =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -649,7 +649,7 @@ _08126CF0:
pop {r1}
bx r1
.align 2, 0
-_08126CF8: .4byte gUnknown_0202FF84
+_08126CF8: .4byte gFieldEffectArguments
_08126CFC: .4byte gMapObjects
_08126D00: .4byte gFieldEffectObjectTemplatePointers
_08126D04: .4byte gUnknown_08401E32
@@ -758,7 +758,7 @@ _08126DD4: .4byte 0x00400001
FldEff_TallGrass: @ 8126DD8
push {r4,r5,lr}
sub sp, 0x4
- ldr r5, _08126E70 @ =gUnknown_0202FF84
+ ldr r5, _08126E70 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -830,7 +830,7 @@ _08126E64:
pop {r1}
bx r1
.align 2, 0
-_08126E70: .4byte gUnknown_0202FF84
+_08126E70: .4byte gFieldEffectArguments
_08126E74: .4byte gFieldEffectObjectTemplatePointers
_08126E78: .4byte gSprites
thumb_func_end FldEff_TallGrass
@@ -972,7 +972,7 @@ _08126F7C: .4byte gMapObjects
thumb_func_start FldEff_JumpTallGrass
FldEff_JumpTallGrass: @ 8126F80
push {r4,lr}
- ldr r4, _08126FE4 @ =gUnknown_0202FF84
+ ldr r4, _08126FE4 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1021,7 +1021,7 @@ _08126FDC:
pop {r1}
bx r1
.align 2, 0
-_08126FE4: .4byte gUnknown_0202FF84
+_08126FE4: .4byte gFieldEffectArguments
_08126FE8: .4byte gFieldEffectObjectTemplatePointers
_08126FEC: .4byte gSprites
thumb_func_end FldEff_JumpTallGrass
@@ -1106,7 +1106,7 @@ _08127074:
FldEff_LongGrass: @ 8127080
push {r4,r5,lr}
sub sp, 0x4
- ldr r5, _0812711C @ =gUnknown_0202FF84
+ ldr r5, _0812711C @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -1179,7 +1179,7 @@ _08127110:
pop {r1}
bx r1
.align 2, 0
-_0812711C: .4byte gUnknown_0202FF84
+_0812711C: .4byte gFieldEffectArguments
_08127120: .4byte gFieldEffectObjectTemplatePointers
_08127124: .4byte gSprites
thumb_func_end FldEff_LongGrass
@@ -1313,7 +1313,7 @@ _0812721C: .4byte gMapObjects
thumb_func_start FldEff_JumpLongGrass
FldEff_JumpLongGrass: @ 8127220
push {r4,lr}
- ldr r4, _08127284 @ =gUnknown_0202FF84
+ ldr r4, _08127284 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1362,7 +1362,7 @@ _0812727C:
pop {r1}
bx r1
.align 2, 0
-_08127284: .4byte gUnknown_0202FF84
+_08127284: .4byte gFieldEffectArguments
_08127288: .4byte gFieldEffectObjectTemplatePointers
_0812728C: .4byte gSprites
thumb_func_end FldEff_JumpLongGrass
@@ -1370,7 +1370,7 @@ _0812728C: .4byte gSprites
thumb_func_start FldEff_ShortGrass
FldEff_ShortGrass: @ 8127290
push {r4-r6,lr}
- ldr r6, _08127324 @ =gUnknown_0202FF84
+ ldr r6, _08127324 @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1443,7 +1443,7 @@ _0812731C:
pop {r1}
bx r1
.align 2, 0
-_08127324: .4byte gUnknown_0202FF84
+_08127324: .4byte gFieldEffectArguments
_08127328: .4byte gMapObjects
_0812732C: .4byte gFieldEffectObjectTemplatePointers
_08127330: .4byte gSprites
@@ -1577,7 +1577,7 @@ _08127424: .4byte gSprites
thumb_func_start FldEff_SandFootprints
FldEff_SandFootprints: @ 8127428
push {r4,lr}
- ldr r4, _08127490 @ =gUnknown_0202FF84
+ ldr r4, _08127490 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1626,7 +1626,7 @@ _08127486:
pop {r1}
bx r1
.align 2, 0
-_08127490: .4byte gUnknown_0202FF84
+_08127490: .4byte gFieldEffectArguments
_08127494: .4byte gFieldEffectObjectTemplatePointers
_08127498: .4byte gSprites
thumb_func_end FldEff_SandFootprints
@@ -1634,7 +1634,7 @@ _08127498: .4byte gSprites
thumb_func_start FldEff_DeepSandFootprints
FldEff_DeepSandFootprints: @ 812749C
push {r4,r5,lr}
- ldr r4, _08127504 @ =gUnknown_0202FF84
+ ldr r4, _08127504 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1684,7 +1684,7 @@ _081274FC:
pop {r1}
bx r1
.align 2, 0
-_08127504: .4byte gUnknown_0202FF84
+_08127504: .4byte gFieldEffectArguments
_08127508: .4byte gFieldEffectObjectTemplatePointers
_0812750C: .4byte gSprites
thumb_func_end FldEff_DeepSandFootprints
@@ -1692,7 +1692,7 @@ _0812750C: .4byte gSprites
thumb_func_start FldEff_BikeTireTracks
FldEff_BikeTireTracks: @ 8127510
push {r4,r5,lr}
- ldr r4, _08127578 @ =gUnknown_0202FF84
+ ldr r4, _08127578 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1742,7 +1742,7 @@ _08127570:
pop {r1}
bx r1
.align 2, 0
-_08127578: .4byte gUnknown_0202FF84
+_08127578: .4byte gFieldEffectArguments
_0812757C: .4byte gFieldEffectObjectTemplatePointers
_08127580: .4byte gSprites
thumb_func_end FldEff_BikeTireTracks
@@ -1827,7 +1827,7 @@ _08127608:
thumb_func_start FldEff_Splash
FldEff_Splash: @ 8127610
push {r4-r6,lr}
- ldr r6, _081276A4 @ =gUnknown_0202FF84
+ ldr r6, _081276A4 @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1897,7 +1897,7 @@ _0812769A:
pop {r1}
bx r1
.align 2, 0
-_081276A4: .4byte gUnknown_0202FF84
+_081276A4: .4byte gFieldEffectArguments
_081276A8: .4byte gMapObjects
_081276AC: .4byte gFieldEffectObjectTemplatePointers
_081276B0: .4byte gSprites
@@ -1978,7 +1978,7 @@ _0812773C: .4byte gMapObjects
thumb_func_start FldEff_JumpSmallSplash
FldEff_JumpSmallSplash: @ 8127740
push {r4,lr}
- ldr r4, _081277A4 @ =gUnknown_0202FF84
+ ldr r4, _081277A4 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2027,7 +2027,7 @@ _0812779C:
pop {r1}
bx r1
.align 2, 0
-_081277A4: .4byte gUnknown_0202FF84
+_081277A4: .4byte gFieldEffectArguments
_081277A8: .4byte gFieldEffectObjectTemplatePointers
_081277AC: .4byte gSprites
thumb_func_end FldEff_JumpSmallSplash
@@ -2035,7 +2035,7 @@ _081277AC: .4byte gSprites
thumb_func_start FldEff_JumpBigSplash
FldEff_JumpBigSplash: @ 81277B0
push {r4,lr}
- ldr r4, _08127814 @ =gUnknown_0202FF84
+ ldr r4, _08127814 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2084,7 +2084,7 @@ _0812780C:
pop {r1}
bx r1
.align 2, 0
-_08127814: .4byte gUnknown_0202FF84
+_08127814: .4byte gFieldEffectArguments
_08127818: .4byte gFieldEffectObjectTemplatePointers
_0812781C: .4byte gSprites
thumb_func_end FldEff_JumpBigSplash
@@ -2092,7 +2092,7 @@ _0812781C: .4byte gSprites
thumb_func_start FldEff_FeetInFlowingWater
FldEff_FeetInFlowingWater: @ 8127820
push {r4-r7,lr}
- ldr r7, _081278C0 @ =gUnknown_0202FF84
+ ldr r7, _081278C0 @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -2168,7 +2168,7 @@ _081278B6:
pop {r1}
bx r1
.align 2, 0
-_081278C0: .4byte gUnknown_0202FF84
+_081278C0: .4byte gFieldEffectArguments
_081278C4: .4byte gMapObjects
_081278C8: .4byte gFieldEffectObjectTemplatePointers
_081278CC: .4byte gSprites
@@ -2263,7 +2263,7 @@ FldEff_Ripple: @ 8127978
push {r4,lr}
ldr r0, _081279CC @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14]
- ldr r4, _081279D0 @ =gUnknown_0202FF84
+ ldr r4, _081279D0 @ =gFieldEffectArguments
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0x4
@@ -2304,14 +2304,14 @@ _081279C4:
bx r1
.align 2, 0
_081279CC: .4byte gFieldEffectObjectTemplatePointers
-_081279D0: .4byte gUnknown_0202FF84
+_081279D0: .4byte gFieldEffectArguments
_081279D4: .4byte gSprites
thumb_func_end FldEff_Ripple
thumb_func_start FldEff_HotSpringsWater
FldEff_HotSpringsWater: @ 81279D8
push {r4-r6,lr}
- ldr r6, _08127A6C @ =gUnknown_0202FF84
+ ldr r6, _08127A6C @ =gFieldEffectArguments
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -2384,7 +2384,7 @@ _08127A64:
pop {r1}
bx r1
.align 2, 0
-_08127A6C: .4byte gUnknown_0202FF84
+_08127A6C: .4byte gFieldEffectArguments
_08127A70: .4byte gMapObjects
_08127A74: .4byte gFieldEffectObjectTemplatePointers
_08127A78: .4byte gSprites
@@ -2472,7 +2472,7 @@ _08127B10: .4byte gSprites
thumb_func_start FldEff_Unknown19
FldEff_Unknown19: @ 8127B14
push {r4,lr}
- ldr r4, _08127B74 @ =gUnknown_0202FF84
+ ldr r4, _08127B74 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2519,7 +2519,7 @@ _08127B6C:
pop {r1}
bx r1
.align 2, 0
-_08127B74: .4byte gUnknown_0202FF84
+_08127B74: .4byte gFieldEffectArguments
_08127B78: .4byte gFieldEffectObjectTemplatePointers
_08127B7C: .4byte gSprites
thumb_func_end FldEff_Unknown19
@@ -2527,7 +2527,7 @@ _08127B7C: .4byte gSprites
thumb_func_start FldEff_Unknown20
FldEff_Unknown20: @ 8127B80
push {r4,lr}
- ldr r4, _08127BE0 @ =gUnknown_0202FF84
+ ldr r4, _08127BE0 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2574,7 +2574,7 @@ _08127BD8:
pop {r1}
bx r1
.align 2, 0
-_08127BE0: .4byte gUnknown_0202FF84
+_08127BE0: .4byte gFieldEffectArguments
_08127BE4: .4byte gFieldEffectObjectTemplatePointers
_08127BE8: .4byte gSprites
thumb_func_end FldEff_Unknown20
@@ -2582,7 +2582,7 @@ _08127BE8: .4byte gSprites
thumb_func_start FldEff_Unknown21
FldEff_Unknown21: @ 8127BEC
push {r4,lr}
- ldr r4, _08127C4C @ =gUnknown_0202FF84
+ ldr r4, _08127C4C @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2629,7 +2629,7 @@ _08127C44:
pop {r1}
bx r1
.align 2, 0
-_08127C4C: .4byte gUnknown_0202FF84
+_08127C4C: .4byte gFieldEffectArguments
_08127C50: .4byte gFieldEffectObjectTemplatePointers
_08127C54: .4byte gSprites
thumb_func_end FldEff_Unknown21
@@ -2637,7 +2637,7 @@ _08127C54: .4byte gSprites
thumb_func_start FldEff_Unknown22
FldEff_Unknown22: @ 8127C58
push {r4,lr}
- ldr r4, _08127CB8 @ =gUnknown_0202FF84
+ ldr r4, _08127CB8 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2684,7 +2684,7 @@ _08127CB0:
pop {r1}
bx r1
.align 2, 0
-_08127CB8: .4byte gUnknown_0202FF84
+_08127CB8: .4byte gFieldEffectArguments
_08127CBC: .4byte gFieldEffectObjectTemplatePointers
_08127CC0: .4byte gSprites
thumb_func_end FldEff_Unknown22
@@ -2694,7 +2694,7 @@ ash: @ 8127CC4
push {r4,lr}
lsls r2, 16
lsrs r2, 16
- ldr r4, _08127CF4 @ =gUnknown_0202FF84
+ ldr r4, _08127CF4 @ =gFieldEffectArguments
lsls r0, 16
asrs r0, 16
str r0, [r4]
@@ -2715,14 +2715,14 @@ ash: @ 8127CC4
pop {r0}
bx r0
.align 2, 0
-_08127CF4: .4byte gUnknown_0202FF84
+_08127CF4: .4byte gFieldEffectArguments
thumb_func_end ash
thumb_func_start FldEff_Ash
FldEff_Ash: @ 8127CF8
push {r4,r5,lr}
sub sp, 0x4
- ldr r5, _08127D78 @ =gUnknown_0202FF84
+ ldr r5, _08127D78 @ =gFieldEffectArguments
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -2784,7 +2784,7 @@ _08127D6E:
pop {r1}
bx r1
.align 2, 0
-_08127D78: .4byte gUnknown_0202FF84
+_08127D78: .4byte gFieldEffectArguments
_08127D7C: .4byte gFieldEffectObjectTemplatePointers
_08127D80: .4byte gSprites
thumb_func_end FldEff_Ash
@@ -2907,7 +2907,7 @@ _08127E50:
thumb_func_start FldEff_SurfBlob
FldEff_SurfBlob: @ 8127E58
push {r4,r5,lr}
- ldr r4, _08127EC0 @ =gUnknown_0202FF84
+ ldr r4, _08127EC0 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2957,7 +2957,7 @@ _08127EB2:
pop {r1}
bx r1
.align 2, 0
-_08127EC0: .4byte gUnknown_0202FF84
+_08127EC0: .4byte gFieldEffectArguments
_08127EC4: .4byte gFieldEffectObjectTemplatePointers
_08127EC8: .4byte gSprites
_08127ECC: .4byte 0x0000ffff
@@ -3375,7 +3375,7 @@ _081281B0: .4byte gSprites
thumb_func_start FldEff_Dust
FldEff_Dust: @ 81281B4
push {r4,lr}
- ldr r4, _08128218 @ =gUnknown_0202FF84
+ ldr r4, _08128218 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3424,7 +3424,7 @@ _08128210:
pop {r1}
bx r1
.align 2, 0
-_08128218: .4byte gUnknown_0202FF84
+_08128218: .4byte gFieldEffectArguments
_0812821C: .4byte gFieldEffectObjectTemplatePointers
_08128220: .4byte gSprites
thumb_func_end FldEff_Dust
@@ -3432,7 +3432,7 @@ _08128220: .4byte gSprites
thumb_func_start FldEff_SandPile
FldEff_SandPile: @ 8128224
push {r4-r7,lr}
- ldr r7, _081282D0 @ =gUnknown_0202FF84
+ ldr r7, _081282D0 @ =gFieldEffectArguments
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -3515,7 +3515,7 @@ _081282C8:
pop {r1}
bx r1
.align 2, 0
-_081282D0: .4byte gUnknown_0202FF84
+_081282D0: .4byte gFieldEffectArguments
_081282D4: .4byte gMapObjects
_081282D8: .4byte gFieldEffectObjectTemplatePointers
_081282DC: .4byte gSprites
@@ -3629,7 +3629,7 @@ _081283A8: .4byte gMapObjects
thumb_func_start FldEff_Bubbles
FldEff_Bubbles: @ 81283AC
push {r4,lr}
- ldr r4, _08128404 @ =gUnknown_0202FF84
+ ldr r4, _08128404 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3672,7 +3672,7 @@ _081283FC:
pop {r1}
bx r1
.align 2, 0
-_08128404: .4byte gUnknown_0202FF84
+_08128404: .4byte gFieldEffectArguments
_08128408: .4byte gFieldEffectObjectTemplatePointers
_0812840C: .4byte gSprites
thumb_func_end FldEff_Bubbles
@@ -3714,7 +3714,7 @@ _0812844C: .4byte 0x00001004
thumb_func_start FldEff_BerryTreeGrowthSparkle
FldEff_BerryTreeGrowthSparkle: @ 8128450
push {r4,lr}
- ldr r4, _081284B8 @ =gUnknown_0202FF84
+ ldr r4, _081284B8 @ =gFieldEffectArguments
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -3765,7 +3765,7 @@ _081284B0:
pop {r1}
bx r1
.align 2, 0
-_081284B8: .4byte gUnknown_0202FF84
+_081284B8: .4byte gFieldEffectArguments
_081284BC: .4byte gFieldEffectObjectTemplatePointers
_081284C0: .4byte gSprites
thumb_func_end FldEff_BerryTreeGrowthSparkle
@@ -3816,7 +3816,7 @@ ShowDisguiseFieldEffect: @ 81284F4
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
- ldr r5, _08128528 @ =gUnknown_0202FF84
+ ldr r5, _08128528 @ =gFieldEffectArguments
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -3830,7 +3830,7 @@ ShowDisguiseFieldEffect: @ 81284F4
movs r0, 0x40
b _08128598
.align 2, 0
-_08128528: .4byte gUnknown_0202FF84
+_08128528: .4byte gFieldEffectArguments
_0812852C:
ldr r1, _081285A4 @ =gFieldEffectObjectTemplatePointers
lsls r0, r6, 2
@@ -4084,7 +4084,7 @@ _081286FC:
thumb_func_start FldEff_Sparkle
FldEff_Sparkle: @ 8128700
push {r4,lr}
- ldr r4, _08128768 @ =gUnknown_0202FF84
+ ldr r4, _08128768 @ =gFieldEffectArguments
ldr r0, [r4]
adds r0, 0x7
str r0, [r4]
@@ -4135,7 +4135,7 @@ _08128760:
pop {r1}
bx r1
.align 2, 0
-_08128768: .4byte gUnknown_0202FF84
+_08128768: .4byte gFieldEffectArguments
_0812876C: .4byte gFieldEffectObjectTemplatePointers
_08128770: .4byte gSprites
thumb_func_end FldEff_Sparkle
diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s
index 33182fc6a..011ce6427 100644
--- a/asm/fldeff_80C5CD4.s
+++ b/asm/fldeff_80C5CD4.s
@@ -741,7 +741,7 @@ _080C627C: .4byte gMapHeader
thumb_func_start sub_80C6280
sub_80C6280: @ 80C6280
push {lr}
- ldr r1, _080C6294 @ =gUnknown_0202FF84
+ ldr r1, _080C6294 @ =gFieldEffectArguments
ldr r0, [r1, 0x4]
cmp r0, 0x2
beq _080C62AA
@@ -751,7 +751,7 @@ sub_80C6280: @ 80C6280
beq _080C62A2
b _080C62BE
.align 2, 0
-_080C6294: .4byte gUnknown_0202FF84
+_080C6294: .4byte gFieldEffectArguments
_080C6298:
cmp r0, 0x3
beq _080C62AE
@@ -815,7 +815,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
bne _080C6330
bl sub_80C6264
ldr r1, _080C6320 @ =gFieldCallback
- ldr r0, _080C6324 @ =sub_808AB90
+ ldr r0, _080C6324 @ =FieldCallback_Teleport
str r0, [r1]
ldr r1, _080C6328 @ =gUnknown_03005CE4
ldr r0, _080C632C @ =sub_80C639C
@@ -824,7 +824,7 @@ SetUpFieldMove_SecretPower: @ 80C62C4
_080C6318: .4byte gScriptResult
_080C631C: .4byte gUnknown_0203923C
_080C6320: .4byte gFieldCallback
-_080C6324: .4byte sub_808AB90
+_080C6324: .4byte FieldCallback_Teleport
_080C6328: .4byte gUnknown_03005CE4
_080C632C: .4byte sub_80C639C
_080C6330:
@@ -836,14 +836,14 @@ _080C6330:
bne _080C6360
bl sub_80C6264
ldr r1, _080C6350 @ =gFieldCallback
- ldr r0, _080C6354 @ =sub_808AB90
+ ldr r0, _080C6354 @ =FieldCallback_Teleport
str r0, [r1]
ldr r1, _080C6358 @ =gUnknown_03005CE4
ldr r0, _080C635C @ =sub_80C64A8
b _080C6380
.align 2, 0
_080C6350: .4byte gFieldCallback
-_080C6354: .4byte sub_808AB90
+_080C6354: .4byte FieldCallback_Teleport
_080C6358: .4byte gUnknown_03005CE4
_080C635C: .4byte sub_80C64A8
_080C6360:
@@ -859,7 +859,7 @@ _080C636E:
_080C6372:
bl sub_80C6264
ldr r1, _080C638C @ =gFieldCallback
- ldr r0, _080C6390 @ =sub_808AB90
+ ldr r0, _080C6390 @ =FieldCallback_Teleport
str r0, [r1]
ldr r1, _080C6394 @ =gUnknown_03005CE4
ldr r0, _080C6398 @ =sub_80C660C
@@ -872,7 +872,7 @@ _080C6384:
bx r1
.align 2, 0
_080C638C: .4byte gFieldCallback
-_080C6390: .4byte sub_808AB90
+_080C6390: .4byte FieldCallback_Teleport
_080C6394: .4byte gUnknown_03005CE4
_080C6398: .4byte sub_80C660C
thumb_func_end SetUpFieldMove_SecretPower
@@ -880,7 +880,7 @@ _080C6398: .4byte sub_80C660C
thumb_func_start sub_80C639C
sub_80C639C: @ 80C639C
push {lr}
- ldr r1, _080C63B0 @ =gUnknown_0202FF84
+ ldr r1, _080C63B0 @ =gFieldEffectArguments
ldr r0, _080C63B4 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
@@ -889,7 +889,7 @@ sub_80C639C: @ 80C639C
pop {r0}
bx r0
.align 2, 0
-_080C63B0: .4byte gUnknown_0202FF84
+_080C63B0: .4byte gFieldEffectArguments
_080C63B4: .4byte gLastFieldPokeMenuOpened
_080C63B8: .4byte gUnknown_081A2CE6
thumb_func_end sub_80C639C
@@ -943,7 +943,7 @@ FldEff_SecretPowerCave: @ 80C63FC
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
- ldr r4, _080C6448 @ =gUnknown_0202FF84
+ ldr r4, _080C6448 @ =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -963,7 +963,7 @@ FldEff_SecretPowerCave: @ 80C63FC
_080C643C: .4byte gSpriteTemplate_83D2614
_080C6440: .4byte gSprites
_080C6444: .4byte gPlayerAvatar
-_080C6448: .4byte gUnknown_0202FF84
+_080C6448: .4byte gFieldEffectArguments
thumb_func_end FldEff_SecretPowerCave
thumb_func_start sub_80C644C
@@ -1025,7 +1025,7 @@ sub_80C6498: @ 80C6498
thumb_func_start sub_80C64A8
sub_80C64A8: @ 80C64A8
push {lr}
- ldr r1, _080C64BC @ =gUnknown_0202FF84
+ ldr r1, _080C64BC @ =gFieldEffectArguments
ldr r0, _080C64C0 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
@@ -1034,7 +1034,7 @@ sub_80C64A8: @ 80C64A8
pop {r0}
bx r0
.align 2, 0
-_080C64BC: .4byte gUnknown_0202FF84
+_080C64BC: .4byte gFieldEffectArguments
_080C64C0: .4byte gLastFieldPokeMenuOpened
_080C64C4: .4byte gUnknown_081A2D3E
thumb_func_end sub_80C64A8
@@ -1088,13 +1088,13 @@ FldEff_SecretPowerTree: @ 80C6508
ands r2, r0
cmp r2, 0x96
bne _080C652A
- ldr r1, _080C6588 @ =gUnknown_0202FF84
+ ldr r1, _080C6588 @ =gFieldEffectArguments
movs r0, 0
str r0, [r1, 0x1C]
_080C652A:
cmp r2, 0x9C
bne _080C6534
- ldr r1, _080C6588 @ =gUnknown_0202FF84
+ ldr r1, _080C6588 @ =gFieldEffectArguments
movs r0, 0x2
str r0, [r1, 0x1C]
_080C6534:
@@ -1110,7 +1110,7 @@ _080C6534:
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
- ldr r4, _080C6588 @ =gUnknown_0202FF84
+ ldr r4, _080C6588 @ =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -1137,7 +1137,7 @@ _080C6576:
.align 2, 0
_080C6580: .4byte gUnknown_0203923C
_080C6584: .4byte 0x00000fff
-_080C6588: .4byte gUnknown_0202FF84
+_080C6588: .4byte gFieldEffectArguments
_080C658C: .4byte gSpriteTemplate_83D262C
_080C6590: .4byte gSprites
_080C6594: .4byte gPlayerAvatar
@@ -1149,7 +1149,7 @@ sub_80C6598: @ 80C6598
adds r4, r0, 0
movs r0, 0x9B
bl PlaySE
- ldr r0, _080C65BC @ =gUnknown_0202FF84
+ ldr r0, _080C65BC @ =gFieldEffectArguments
ldr r1, [r0, 0x1C]
adds r2, r4, 0
adds r2, 0x2A
@@ -1162,7 +1162,7 @@ sub_80C6598: @ 80C6598
pop {r0}
bx r0
.align 2, 0
-_080C65BC: .4byte gUnknown_0202FF84
+_080C65BC: .4byte gFieldEffectArguments
_080C65C0: .4byte sub_80C65C4
thumb_func_end sub_80C6598
@@ -1177,7 +1177,7 @@ sub_80C65C4: @ 80C65C4
asrs r0, 16
cmp r0, 0x27
ble _080C65EE
- ldr r0, _080C65F4 @ =gUnknown_0202FF84
+ ldr r0, _080C65F4 @ =gFieldEffectArguments
ldr r0, [r0, 0x1C]
cmp r0, 0
beq _080C65E2
@@ -1195,7 +1195,7 @@ _080C65EE:
pop {r0}
bx r0
.align 2, 0
-_080C65F4: .4byte gUnknown_0202FF84
+_080C65F4: .4byte gFieldEffectArguments
_080C65F8: .4byte sub_80C65FC
thumb_func_end sub_80C65C4
@@ -1212,7 +1212,7 @@ sub_80C65FC: @ 80C65FC
thumb_func_start sub_80C660C
sub_80C660C: @ 80C660C
push {lr}
- ldr r1, _080C6620 @ =gUnknown_0202FF84
+ ldr r1, _080C6620 @ =gFieldEffectArguments
ldr r0, _080C6624 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
@@ -1221,7 +1221,7 @@ sub_80C660C: @ 80C660C
pop {r0}
bx r0
.align 2, 0
-_080C6620: .4byte gUnknown_0202FF84
+_080C6620: .4byte gFieldEffectArguments
_080C6624: .4byte gLastFieldPokeMenuOpened
_080C6628: .4byte gUnknown_081A2D96
thumb_func_end sub_80C660C
@@ -1275,7 +1275,7 @@ FldEff_SecretPowerShrub: @ 80C666C
ldrh r1, [r2, 0x2]
lsls r1, 23
lsrs r1, 23
- ldr r4, _080C66B8 @ =gUnknown_0202FF84
+ ldr r4, _080C66B8 @ =gFieldEffectArguments
ldr r3, [r4, 0x14]
adds r1, r3
lsls r1, 16
@@ -1295,7 +1295,7 @@ FldEff_SecretPowerShrub: @ 80C666C
_080C66AC: .4byte gSpriteTemplate_83D2644
_080C66B0: .4byte gSprites
_080C66B4: .4byte gPlayerAvatar
-_080C66B8: .4byte gUnknown_0202FF84
+_080C66B8: .4byte gFieldEffectArguments
thumb_func_end FldEff_SecretPowerShrub
thumb_func_start sub_80C66BC
@@ -2103,7 +2103,7 @@ FldEff_SandPillar: @ 80C6D3C
mov r0, sp
adds r1, r4, 0
bl GetXYCoordsOneStepInFrontOfPlayer
- ldr r1, _080C6D78 @ =gUnknown_0202FF84
+ ldr r1, _080C6D78 @ =gFieldEffectArguments
mov r0, sp
movs r2, 0
ldrsh r0, [r0, r2]
@@ -2122,7 +2122,7 @@ FldEff_SandPillar: @ 80C6D3C
beq _080C6D86
b _080C6E4C
.align 2, 0
-_080C6D78: .4byte gUnknown_0202FF84
+_080C6D78: .4byte gFieldEffectArguments
_080C6D7C:
cmp r0, 0x3
beq _080C6DEC
@@ -2240,7 +2240,7 @@ SpriteCB_SandPillar_0: @ 80C6E64
adds r5, r0, 0
movs r0, 0x83
bl PlaySE
- ldr r4, _080C6E90 @ =gUnknown_0202FF84
+ ldr r4, _080C6E90 @ =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
subs r1, 0x1
@@ -2255,7 +2255,7 @@ SpriteCB_SandPillar_0: @ 80C6E64
bl MapGridSetMetatileIdAt
b _080C6EAA
.align 2, 0
-_080C6E90: .4byte gUnknown_0202FF84
+_080C6E90: .4byte gFieldEffectArguments
_080C6E94: .4byte 0x00000286
_080C6E98: .4byte 0x00000e02
_080C6E9C:
@@ -2266,7 +2266,7 @@ _080C6E9C:
lsls r2, 2
bl MapGridSetMetatileIdAt
_080C6EAA:
- ldr r4, _080C6ED8 @ =gUnknown_0202FF84
+ ldr r4, _080C6ED8 @ =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, _080C6EDC @ =0x0000020a
@@ -2286,7 +2286,7 @@ _080C6EAA:
pop {r0}
bx r0
.align 2, 0
-_080C6ED8: .4byte gUnknown_0202FF84
+_080C6ED8: .4byte gFieldEffectArguments
_080C6EDC: .4byte 0x0000020a
_080C6EE0: .4byte SpriteCB_SandPillar_1
thumb_func_end SpriteCB_SandPillar_0
@@ -2304,7 +2304,7 @@ SpriteCB_SandPillar_1: @ 80C6EE4
strh r0, [r5, 0x2E]
b _080C6F14
_080C6EF8:
- ldr r4, _080C6F1C @ =gUnknown_0202FF84
+ ldr r4, _080C6F1C @ =gFieldEffectArguments
ldr r0, [r4, 0x14]
ldr r1, [r4, 0x18]
ldr r2, _080C6F20 @ =0x00000e8c
@@ -2321,7 +2321,7 @@ _080C6F14:
pop {r0}
bx r0
.align 2, 0
-_080C6F1C: .4byte gUnknown_0202FF84
+_080C6F1C: .4byte gFieldEffectArguments
_080C6F20: .4byte 0x00000e8c
_080C6F24: .4byte SpriteCB_SandPillar_2
thumb_func_end SpriteCB_SandPillar_1
diff --git a/asm/pokedex_area_screen.s b/asm/pokedex_area_screen.s
index 542eed201..9e380f597 100644
--- a/asm/pokedex_area_screen.s
+++ b/asm/pokedex_area_screen.s
@@ -518,7 +518,7 @@ _08110A44:
bl GetRoamerLocation
ldrb r0, [r4, 0x10]
ldrb r1, [r4, 0x11]
- bl get_mapheader_by_bank_and_number
+ bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
strh r0, [r4, 0x12]
movs r3, 0x88
@@ -566,7 +566,7 @@ SetAreaHasMon: @ 8110A98
adds r0, r5
strb r1, [r0, 0x11]
adds r0, r2, 0
- bl get_mapheader_by_bank_and_number
+ bl Overworld_GetMapHeaderByGroupAndId
ldrb r0, [r0, 0x14]
bl sub_80FBA04
ldrh r1, [r4]
@@ -599,7 +599,7 @@ SetSpecialMapHasMon: @ 8110AE4
cmp r0, 0x1F
bhi _08110B96
adds r0, r2, 0
- bl get_mapheader_by_bank_and_number
+ bl Overworld_GetMapHeaderByGroupAndId
adds r6, r0, 0
ldrb r0, [r6, 0x14]
cmp r0, 0x57
diff --git a/asm/pokenav.s b/asm/pokenav.s
index cb6a40450..1062abc48 100644
--- a/asm/pokenav.s
+++ b/asm/pokenav.s
@@ -22370,7 +22370,7 @@ _080F6C3A:
adds r6, r0, r1
ldrh r7, [r6]
adds r0, r7, 0
- bl trainer_flag_check
+ bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080F6CA0
@@ -22402,7 +22402,7 @@ _080F6C3A:
strb r1, [r0]
ldrh r0, [r6, 0xA]
ldrh r1, [r6, 0xC]
- bl get_mapheader_by_bank_and_number
+ bl Overworld_GetMapHeaderByGroupAndId
ldrh r1, [r5]
lsls r1, 3
adds r4, r1
@@ -22431,7 +22431,7 @@ _080F6CB4:
adds r5, r0, r1
ldrh r4, [r5]
adds r0, r4, 0
- bl trainer_flag_check
+ bl HasTrainerAlreadyBeenFought
lsls r0, 24
cmp r0, 0
beq _080F6D0E
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-04 16:43:56 +0000