summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/field_effect_helpers.s157
-rw-r--r--asm/fldeff_80C5CD4.s56
-rw-r--r--include/field_effect.h2
-rw-r--r--src/battle_transition.c16
-rw-r--r--src/braille_puzzles.c2
-rw-r--r--src/field_effect.c84
-rw-r--r--src/field_effect_helpers.c46
-rw-r--r--src/field_ground_effect.c128
-rw-r--r--src/field_map_obj.c26
-rw-r--r--src/field_map_obj_helpers.c10
-rw-r--r--src/field_player_avatar.c14
-rw-r--r--src/fldeff_cut.c4
-rw-r--r--src/fldeff_flash.c2
-rw-r--r--src/fldeff_strength.c6
-rw-r--r--src/fldeff_sweetscent.c2
-rw-r--r--src/fldeff_teleport.c2
-rw-r--r--src/pokemon_menu.c14
-rw-r--r--src/rom6.c24
-rw-r--r--src/scrcmd.c2
-rw-r--r--src/trainer_see.c16
20 files changed, 287 insertions, 326 deletions
diff --git a/asm/field_effect_helpers.s b/asm/field_effect_helpers.s
index f8df4a36d..e5875f1f7 100644
--- a/asm/field_effect_helpers.s
+++ b/asm/field_effect_helpers.s
@@ -6,63 +6,6 @@
.text
- thumb_func_start FldEff_JumpTallGrass
-FldEff_JumpTallGrass: @ 8126F80
- push {r4,lr}
- ldr r4, _08126FE4 @ =gUnknown_0202FF84
- adds r1, r4, 0x4
- adds r0, r4, 0
- movs r2, 0x8
- movs r3, 0xC
- bl sub_8060470
- ldr r0, _08126FE8 @ =gFieldEffectObjectTemplatePointers
- ldr r0, [r0, 0x28]
- movs r2, 0
- ldrsh r1, [r4, r2]
- movs r3, 0x4
- ldrsh r2, [r4, r3]
- movs r3, 0
- bl CreateSpriteAtEnd
- lsls r0, 24
- lsrs r0, 24
- cmp r0, 0x40
- beq _08126FDC
- lsls r2, r0, 4
- adds r2, r0
- lsls r2, 2
- ldr r0, _08126FEC @ =gSprites
- adds r2, r0
- adds r3, r2, 0
- adds r3, 0x3E
- ldrb r0, [r3]
- movs r1, 0x2
- orrs r0, r1
- strb r0, [r3]
- movs r0, 0x3
- ldrb r1, [r4, 0xC]
- ands r1, r0
- lsls r1, 2
- ldrb r3, [r2, 0x5]
- movs r0, 0xD
- negs r0, r0
- ands r0, r3
- orrs r0, r1
- strb r0, [r2, 0x5]
- ldr r0, [r4, 0x8]
- strh r0, [r2, 0x2E]
- movs r0, 0xC
- strh r0, [r2, 0x30]
-_08126FDC:
- movs r0, 0
- pop {r4}
- pop {r1}
- bx r1
- .align 2, 0
-_08126FE4: .4byte gUnknown_0202FF84
-_08126FE8: .4byte gFieldEffectObjectTemplatePointers
-_08126FEC: .4byte gSprites
- thumb_func_end FldEff_JumpTallGrass
-
thumb_func_start sub_8126FF0
sub_8126FF0: @ 8126FF0
push {r4-r7,lr}
@@ -143,7 +86,7 @@ _08127074:
FldEff_LongGrass: @ 8127080
push {r4,r5,lr}
sub sp, 0x4
- ldr r5, _0812711C @ =gUnknown_0202FF84
+ ldr r5, _0812711C @ =gFieldEffectSpawnParams
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -216,7 +159,7 @@ _08127110:
pop {r1}
bx r1
.align 2, 0
-_0812711C: .4byte gUnknown_0202FF84
+_0812711C: .4byte gFieldEffectSpawnParams
_08127120: .4byte gFieldEffectObjectTemplatePointers
_08127124: .4byte gSprites
thumb_func_end FldEff_LongGrass
@@ -350,7 +293,7 @@ _0812721C: .4byte gMapObjects
thumb_func_start FldEff_JumpLongGrass
FldEff_JumpLongGrass: @ 8127220
push {r4,lr}
- ldr r4, _08127284 @ =gUnknown_0202FF84
+ ldr r4, _08127284 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -399,7 +342,7 @@ _0812727C:
pop {r1}
bx r1
.align 2, 0
-_08127284: .4byte gUnknown_0202FF84
+_08127284: .4byte gFieldEffectSpawnParams
_08127288: .4byte gFieldEffectObjectTemplatePointers
_0812728C: .4byte gSprites
thumb_func_end FldEff_JumpLongGrass
@@ -407,7 +350,7 @@ _0812728C: .4byte gSprites
thumb_func_start FldEff_ShortGrass
FldEff_ShortGrass: @ 8127290
push {r4-r6,lr}
- ldr r6, _08127324 @ =gUnknown_0202FF84
+ ldr r6, _08127324 @ =gFieldEffectSpawnParams
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -480,7 +423,7 @@ _0812731C:
pop {r1}
bx r1
.align 2, 0
-_08127324: .4byte gUnknown_0202FF84
+_08127324: .4byte gFieldEffectSpawnParams
_08127328: .4byte gMapObjects
_0812732C: .4byte gFieldEffectObjectTemplatePointers
_08127330: .4byte gSprites
@@ -614,7 +557,7 @@ _08127424: .4byte gSprites
thumb_func_start FldEff_SandFootprints
FldEff_SandFootprints: @ 8127428
push {r4,lr}
- ldr r4, _08127490 @ =gUnknown_0202FF84
+ ldr r4, _08127490 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -663,7 +606,7 @@ _08127486:
pop {r1}
bx r1
.align 2, 0
-_08127490: .4byte gUnknown_0202FF84
+_08127490: .4byte gFieldEffectSpawnParams
_08127494: .4byte gFieldEffectObjectTemplatePointers
_08127498: .4byte gSprites
thumb_func_end FldEff_SandFootprints
@@ -671,7 +614,7 @@ _08127498: .4byte gSprites
thumb_func_start FldEff_DeepSandFootprints
FldEff_DeepSandFootprints: @ 812749C
push {r4,r5,lr}
- ldr r4, _08127504 @ =gUnknown_0202FF84
+ ldr r4, _08127504 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -721,7 +664,7 @@ _081274FC:
pop {r1}
bx r1
.align 2, 0
-_08127504: .4byte gUnknown_0202FF84
+_08127504: .4byte gFieldEffectSpawnParams
_08127508: .4byte gFieldEffectObjectTemplatePointers
_0812750C: .4byte gSprites
thumb_func_end FldEff_DeepSandFootprints
@@ -729,7 +672,7 @@ _0812750C: .4byte gSprites
thumb_func_start FldEff_BikeTireTracks
FldEff_BikeTireTracks: @ 8127510
push {r4,r5,lr}
- ldr r4, _08127578 @ =gUnknown_0202FF84
+ ldr r4, _08127578 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -779,7 +722,7 @@ _08127570:
pop {r1}
bx r1
.align 2, 0
-_08127578: .4byte gUnknown_0202FF84
+_08127578: .4byte gFieldEffectSpawnParams
_0812757C: .4byte gFieldEffectObjectTemplatePointers
_08127580: .4byte gSprites
thumb_func_end FldEff_BikeTireTracks
@@ -864,7 +807,7 @@ _08127608:
thumb_func_start FldEff_Splash
FldEff_Splash: @ 8127610
push {r4-r6,lr}
- ldr r6, _081276A4 @ =gUnknown_0202FF84
+ ldr r6, _081276A4 @ =gFieldEffectSpawnParams
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -934,7 +877,7 @@ _0812769A:
pop {r1}
bx r1
.align 2, 0
-_081276A4: .4byte gUnknown_0202FF84
+_081276A4: .4byte gFieldEffectSpawnParams
_081276A8: .4byte gMapObjects
_081276AC: .4byte gFieldEffectObjectTemplatePointers
_081276B0: .4byte gSprites
@@ -1015,7 +958,7 @@ _0812773C: .4byte gMapObjects
thumb_func_start FldEff_JumpSmallSplash
FldEff_JumpSmallSplash: @ 8127740
push {r4,lr}
- ldr r4, _081277A4 @ =gUnknown_0202FF84
+ ldr r4, _081277A4 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1064,7 +1007,7 @@ _0812779C:
pop {r1}
bx r1
.align 2, 0
-_081277A4: .4byte gUnknown_0202FF84
+_081277A4: .4byte gFieldEffectSpawnParams
_081277A8: .4byte gFieldEffectObjectTemplatePointers
_081277AC: .4byte gSprites
thumb_func_end FldEff_JumpSmallSplash
@@ -1072,7 +1015,7 @@ _081277AC: .4byte gSprites
thumb_func_start FldEff_JumpBigSplash
FldEff_JumpBigSplash: @ 81277B0
push {r4,lr}
- ldr r4, _08127814 @ =gUnknown_0202FF84
+ ldr r4, _08127814 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1121,7 +1064,7 @@ _0812780C:
pop {r1}
bx r1
.align 2, 0
-_08127814: .4byte gUnknown_0202FF84
+_08127814: .4byte gFieldEffectSpawnParams
_08127818: .4byte gFieldEffectObjectTemplatePointers
_0812781C: .4byte gSprites
thumb_func_end FldEff_JumpBigSplash
@@ -1129,7 +1072,7 @@ _0812781C: .4byte gSprites
thumb_func_start FldEff_FeetInFlowingWater
FldEff_FeetInFlowingWater: @ 8127820
push {r4-r7,lr}
- ldr r7, _081278C0 @ =gUnknown_0202FF84
+ ldr r7, _081278C0 @ =gFieldEffectSpawnParams
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -1205,7 +1148,7 @@ _081278B6:
pop {r1}
bx r1
.align 2, 0
-_081278C0: .4byte gUnknown_0202FF84
+_081278C0: .4byte gFieldEffectSpawnParams
_081278C4: .4byte gMapObjects
_081278C8: .4byte gFieldEffectObjectTemplatePointers
_081278CC: .4byte gSprites
@@ -1300,7 +1243,7 @@ FldEff_Ripple: @ 8127978
push {r4,lr}
ldr r0, _081279CC @ =gFieldEffectObjectTemplatePointers
ldr r0, [r0, 0x14]
- ldr r4, _081279D0 @ =gUnknown_0202FF84
+ ldr r4, _081279D0 @ =gFieldEffectSpawnParams
movs r2, 0
ldrsh r1, [r4, r2]
movs r3, 0x4
@@ -1341,14 +1284,14 @@ _081279C4:
bx r1
.align 2, 0
_081279CC: .4byte gFieldEffectObjectTemplatePointers
-_081279D0: .4byte gUnknown_0202FF84
+_081279D0: .4byte gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
ldrb r0, [r6]
ldrb r1, [r6, 0x4]
ldrb r2, [r6, 0x8]
@@ -1421,7 +1364,7 @@ _08127A64:
pop {r1}
bx r1
.align 2, 0
-_08127A6C: .4byte gUnknown_0202FF84
+_08127A6C: .4byte gFieldEffectSpawnParams
_08127A70: .4byte gMapObjects
_08127A74: .4byte gFieldEffectObjectTemplatePointers
_08127A78: .4byte gSprites
@@ -1509,7 +1452,7 @@ _08127B10: .4byte gSprites
thumb_func_start FldEff_Unknown19
FldEff_Unknown19: @ 8127B14
push {r4,lr}
- ldr r4, _08127B74 @ =gUnknown_0202FF84
+ ldr r4, _08127B74 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1556,7 +1499,7 @@ _08127B6C:
pop {r1}
bx r1
.align 2, 0
-_08127B74: .4byte gUnknown_0202FF84
+_08127B74: .4byte gFieldEffectSpawnParams
_08127B78: .4byte gFieldEffectObjectTemplatePointers
_08127B7C: .4byte gSprites
thumb_func_end FldEff_Unknown19
@@ -1564,7 +1507,7 @@ _08127B7C: .4byte gSprites
thumb_func_start FldEff_Unknown20
FldEff_Unknown20: @ 8127B80
push {r4,lr}
- ldr r4, _08127BE0 @ =gUnknown_0202FF84
+ ldr r4, _08127BE0 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1611,7 +1554,7 @@ _08127BD8:
pop {r1}
bx r1
.align 2, 0
-_08127BE0: .4byte gUnknown_0202FF84
+_08127BE0: .4byte gFieldEffectSpawnParams
_08127BE4: .4byte gFieldEffectObjectTemplatePointers
_08127BE8: .4byte gSprites
thumb_func_end FldEff_Unknown20
@@ -1619,7 +1562,7 @@ _08127BE8: .4byte gSprites
thumb_func_start FldEff_Unknown21
FldEff_Unknown21: @ 8127BEC
push {r4,lr}
- ldr r4, _08127C4C @ =gUnknown_0202FF84
+ ldr r4, _08127C4C @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1666,7 +1609,7 @@ _08127C44:
pop {r1}
bx r1
.align 2, 0
-_08127C4C: .4byte gUnknown_0202FF84
+_08127C4C: .4byte gFieldEffectSpawnParams
_08127C50: .4byte gFieldEffectObjectTemplatePointers
_08127C54: .4byte gSprites
thumb_func_end FldEff_Unknown21
@@ -1674,7 +1617,7 @@ _08127C54: .4byte gSprites
thumb_func_start FldEff_Unknown22
FldEff_Unknown22: @ 8127C58
push {r4,lr}
- ldr r4, _08127CB8 @ =gUnknown_0202FF84
+ ldr r4, _08127CB8 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1721,7 +1664,7 @@ _08127CB0:
pop {r1}
bx r1
.align 2, 0
-_08127CB8: .4byte gUnknown_0202FF84
+_08127CB8: .4byte gFieldEffectSpawnParams
_08127CBC: .4byte gFieldEffectObjectTemplatePointers
_08127CC0: .4byte gSprites
thumb_func_end FldEff_Unknown22
@@ -1731,7 +1674,7 @@ ash: @ 8127CC4
push {r4,lr}
lsls r2, 16
lsrs r2, 16
- ldr r4, _08127CF4 @ =gUnknown_0202FF84
+ ldr r4, _08127CF4 @ =gFieldEffectSpawnParams
lsls r0, 16
asrs r0, 16
str r0, [r4]
@@ -1752,14 +1695,14 @@ ash: @ 8127CC4
pop {r0}
bx r0
.align 2, 0
-_08127CF4: .4byte gUnknown_0202FF84
+_08127CF4: .4byte gFieldEffectSpawnParams
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 @ =gFieldEffectSpawnParams
ldrh r1, [r5]
mov r0, sp
strh r1, [r0]
@@ -1821,7 +1764,7 @@ _08127D6E:
pop {r1}
bx r1
.align 2, 0
-_08127D78: .4byte gUnknown_0202FF84
+_08127D78: .4byte gFieldEffectSpawnParams
_08127D7C: .4byte gFieldEffectObjectTemplatePointers
_08127D80: .4byte gSprites
thumb_func_end FldEff_Ash
@@ -1944,7 +1887,7 @@ _08127E50:
thumb_func_start FldEff_SurfBlob
FldEff_SurfBlob: @ 8127E58
push {r4,r5,lr}
- ldr r4, _08127EC0 @ =gUnknown_0202FF84
+ ldr r4, _08127EC0 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -1994,7 +1937,7 @@ _08127EB2:
pop {r1}
bx r1
.align 2, 0
-_08127EC0: .4byte gUnknown_0202FF84
+_08127EC0: .4byte gFieldEffectSpawnParams
_08127EC4: .4byte gFieldEffectObjectTemplatePointers
_08127EC8: .4byte gSprites
_08127ECC: .4byte 0x0000ffff
@@ -2412,7 +2355,7 @@ _081281B0: .4byte gSprites
thumb_func_start FldEff_Dust
FldEff_Dust: @ 81281B4
push {r4,lr}
- ldr r4, _08128218 @ =gUnknown_0202FF84
+ ldr r4, _08128218 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2461,7 +2404,7 @@ _08128210:
pop {r1}
bx r1
.align 2, 0
-_08128218: .4byte gUnknown_0202FF84
+_08128218: .4byte gFieldEffectSpawnParams
_0812821C: .4byte gFieldEffectObjectTemplatePointers
_08128220: .4byte gSprites
thumb_func_end FldEff_Dust
@@ -2469,7 +2412,7 @@ _08128220: .4byte gSprites
thumb_func_start FldEff_SandPile
FldEff_SandPile: @ 8128224
push {r4-r7,lr}
- ldr r7, _081282D0 @ =gUnknown_0202FF84
+ ldr r7, _081282D0 @ =gFieldEffectSpawnParams
ldrb r0, [r7]
ldrb r1, [r7, 0x4]
ldrb r2, [r7, 0x8]
@@ -2552,7 +2495,7 @@ _081282C8:
pop {r1}
bx r1
.align 2, 0
-_081282D0: .4byte gUnknown_0202FF84
+_081282D0: .4byte gFieldEffectSpawnParams
_081282D4: .4byte gMapObjects
_081282D8: .4byte gFieldEffectObjectTemplatePointers
_081282DC: .4byte gSprites
@@ -2666,7 +2609,7 @@ _081283A8: .4byte gMapObjects
thumb_func_start FldEff_Bubbles
FldEff_Bubbles: @ 81283AC
push {r4,lr}
- ldr r4, _08128404 @ =gUnknown_0202FF84
+ ldr r4, _08128404 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2709,7 +2652,7 @@ _081283FC:
pop {r1}
bx r1
.align 2, 0
-_08128404: .4byte gUnknown_0202FF84
+_08128404: .4byte gFieldEffectSpawnParams
_08128408: .4byte gFieldEffectObjectTemplatePointers
_0812840C: .4byte gSprites
thumb_func_end FldEff_Bubbles
@@ -2751,7 +2694,7 @@ _0812844C: .4byte 0x00001004
thumb_func_start FldEff_BerryTreeGrowthSparkle
FldEff_BerryTreeGrowthSparkle: @ 8128450
push {r4,lr}
- ldr r4, _081284B8 @ =gUnknown_0202FF84
+ ldr r4, _081284B8 @ =gFieldEffectSpawnParams
adds r1, r4, 0x4
adds r0, r4, 0
movs r2, 0x8
@@ -2802,7 +2745,7 @@ _081284B0:
pop {r1}
bx r1
.align 2, 0
-_081284B8: .4byte gUnknown_0202FF84
+_081284B8: .4byte gFieldEffectSpawnParams
_081284BC: .4byte gFieldEffectObjectTemplatePointers
_081284C0: .4byte gSprites
thumb_func_end FldEff_BerryTreeGrowthSparkle
@@ -2853,7 +2796,7 @@ ShowDisguiseFieldEffect: @ 81284F4
lsrs r6, r1, 24
lsls r2, 24
lsrs r7, r2, 24
- ldr r5, _08128528 @ =gUnknown_0202FF84
+ ldr r5, _08128528 @ =gFieldEffectSpawnParams
ldrb r0, [r5]
ldrb r1, [r5, 0x4]
ldrb r2, [r5, 0x8]
@@ -2867,7 +2810,7 @@ ShowDisguiseFieldEffect: @ 81284F4
movs r0, 0x40
b _08128598
.align 2, 0
-_08128528: .4byte gUnknown_0202FF84
+_08128528: .4byte gFieldEffectSpawnParams
_0812852C:
ldr r1, _081285A4 @ =gFieldEffectObjectTemplatePointers
lsls r0, r6, 2
@@ -3121,7 +3064,7 @@ _081286FC:
thumb_func_start FldEff_Sparkle
FldEff_Sparkle: @ 8128700
push {r4,lr}
- ldr r4, _08128768 @ =gUnknown_0202FF84
+ ldr r4, _08128768 @ =gFieldEffectSpawnParams
ldr r0, [r4]
adds r0, 0x7
str r0, [r4]
@@ -3172,7 +3115,7 @@ _08128760:
pop {r1}
bx r1
.align 2, 0
-_08128768: .4byte gUnknown_0202FF84
+_08128768: .4byte gFieldEffectSpawnParams
_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..4fe6c1f89 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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_080C6298:
cmp r0, 0x3
beq _080C62AE
@@ -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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
movs r0, 0
str r0, [r1, 0x1C]
_080C652A:
cmp r2, 0x9C
bne _080C6534
- ldr r1, _080C6588 @ =gUnknown_0202FF84
+ ldr r1, _080C6588 @ =gFieldEffectSpawnParams
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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_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 @ =gFieldEffectSpawnParams
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 gFieldEffectSpawnParams
_080C6F20: .4byte 0x00000e8c
_080C6F24: .4byte SpriteCB_SandPillar_2
thumb_func_end SpriteCB_SandPillar_1
diff --git a/include/field_effect.h b/include/field_effect.h
index f43b15afb..62e17b53c 100644
--- a/include/field_effect.h
+++ b/include/field_effect.h
@@ -253,6 +253,6 @@ void MultiplyInvertedPaletteRGBComponents(u16, u8, u8, u8);
void sub_80878A8(void);
void sub_8087BA8(void);
-extern u32 gUnknown_0202FF84[8];
+extern u32 gFieldEffectSpawnParams[8];
#endif // GUARD_FIELD_EFFECT_H
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 1cacb8857..fd6eab491 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -994,10 +994,10 @@ static bool8 Phase2_Transition_PokeballsTrail_Func2(struct Task* task)
rand = Random() & 1;
for (i = 0; i <= 4; i++, rand ^= 1)
{
- gUnknown_0202FF84[0] = arr0[rand]; // x
- gUnknown_0202FF84[1] = (i * 32) + 16; // y
- gUnknown_0202FF84[2] = rand;
- gUnknown_0202FF84[3] = arr1[i];
+ gFieldEffectSpawnParams[0] = arr0[rand]; // x
+ gFieldEffectSpawnParams[1] = (i * 32) + 16; // y
+ gFieldEffectSpawnParams[2] = rand;
+ gFieldEffectSpawnParams[3] = arr1[i];
FieldEffectStart(FLDEFF_POKEBALL);
}
@@ -1017,14 +1017,14 @@ static bool8 Phase2_Transition_PokeballsTrail_Func3(struct Task* task)
bool8 FldEff_Pokeball(void)
{
- u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gUnknown_0202FF84[0], gUnknown_0202FF84[1], 0);
+ u8 spriteID = CreateSpriteAtEnd(&sSpriteTemplate_83FD98C, gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], 0);
gSprites[spriteID].oam.priority = 0;
gSprites[spriteID].oam.affineMode = 1;
- gSprites[spriteID].data0 = gUnknown_0202FF84[2];
- gSprites[spriteID].data1 = gUnknown_0202FF84[3];
+ gSprites[spriteID].data0 = gFieldEffectSpawnParams[2];
+ gSprites[spriteID].data1 = gFieldEffectSpawnParams[3];
gSprites[spriteID].data2 = -1;
InitSpriteAffineAnim(&gSprites[spriteID]);
- StartSpriteAffineAnim(&gSprites[spriteID], gUnknown_0202FF84[2]);
+ StartSpriteAffineAnim(&gSprites[spriteID], gFieldEffectSpawnParams[2]);
return FALSE;
}
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index b8d7cd386..f6bd9e056 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -105,7 +105,7 @@ bool8 ShouldDoBrailleFlyEffect(void)
void DoBrailleFlyEffect(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(0x3C);
}
diff --git a/src/field_effect.c b/src/field_effect.c
index cffed2614..164c74657 100644
--- a/src/field_effect.c
+++ b/src/field_effect.c
@@ -28,7 +28,7 @@
#define subsprite_table(ptr) {.subsprites = ptr, .subspriteCount = (sizeof ptr) / (sizeof(struct Subsprite))}
-EWRAM_DATA u32 gUnknown_0202FF84[8] = {0};
+EWRAM_DATA u32 gFieldEffectSpawnParams[8] = {0};
const u32 gSpriteImage_839DC14[] = INCBIN_U32("graphics/birch_speech/birch.4bpp");
const u16 gBirchPalette[16] = INCBIN_U16("graphics/birch_speech/birch.gbapal");
@@ -1203,10 +1203,10 @@ void task00_8084310(u8 taskId)
{
return;
}
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
- if ((int)gUnknown_0202FF84[0] > 5)
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
+ if ((int)gFieldEffectSpawnParams[0] > 5)
{
- gUnknown_0202FF84[0] = 0;
+ gFieldEffectSpawnParams[0] = 0;
}
FieldEffectStart(FLDEFF_USE_FLY);
task->data[0]++;
@@ -1665,7 +1665,7 @@ bool8 FldEff_UseWaterfall(void)
{
u8 taskId;
taskId = CreateTask(sub_8086F64, 0xff);
- gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+ gTasks[taskId].data[1] = gFieldEffectSpawnParams[0];
sub_8086F64(taskId);
return FALSE;
}
@@ -1689,7 +1689,7 @@ bool8 waterfall_1_do_anim_probably(struct Task *task, struct MapObject *mapObjec
if (!FieldObjectIsSpecialAnimOrDirectionSequenceAnimActive(mapObject))
{
FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
- gUnknown_0202FF84[0] = task->data[1];
+ gFieldEffectSpawnParams[0] = task->data[1];
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
task->data[0]++;
}
@@ -1738,8 +1738,8 @@ bool8 FldEff_UseDive(void)
{
u8 taskId;
taskId = CreateTask(Task_Dive, 0xff);
- gTasks[taskId].data[15] = gUnknown_0202FF84[0];
- gTasks[taskId].data[14] = gUnknown_0202FF84[1];
+ gTasks[taskId].data[15] = gFieldEffectSpawnParams[0];
+ gTasks[taskId].data[14] = gFieldEffectSpawnParams[1];
Task_Dive(taskId);
return FALSE;
}
@@ -1759,7 +1759,7 @@ bool8 sub_8087124(struct Task *task)
bool8 dive_2_unknown(struct Task *task)
{
ScriptContext2_Enable();
- gUnknown_0202FF84[0] = task->data[15];
+ gFieldEffectSpawnParams[0] = task->data[15];
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
task->data[0]++;
return FALSE;
@@ -1820,10 +1820,10 @@ bool8 sub_8087298(struct Task *task, struct MapObject *mapObject, struct Sprite
{
sprite->pos2.y = 0;
task->data[3] = 1;
- gUnknown_0202FF84[0] = mapObject->coords2.x;
- gUnknown_0202FF84[1] = mapObject->coords2.y;
- gUnknown_0202FF84[2] = sprite->subpriority - 1;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObject->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObject->coords2.y;
+ gFieldEffectSpawnParams[2] = sprite->subpriority - 1;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_LAVARIDGE_GYM_WARP);
PlaySE(SE_W153);
task->data[0]++;
@@ -1924,10 +1924,10 @@ bool8 sub_80874FC(struct Task *task, struct MapObject *mapObject, struct Sprite
{
if (sub_807D770())
{
- gUnknown_0202FF84[0] = mapObject->coords2.x;
- gUnknown_0202FF84[1] = mapObject->coords2.y;
- gUnknown_0202FF84[2] = sprite->subpriority - 1;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObject->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObject->coords2.y;
+ gFieldEffectSpawnParams[2] = sprite->subpriority - 1;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
task->data[0]++;
}
@@ -1966,9 +1966,9 @@ extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[36]
u8 FldEff_LavaridgeGymWarp(void)
{
u8 spriteId;
- sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
- spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
- gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+ sub_8060470((s16 *)&gFieldEffectSpawnParams[0], (s16 *)&gFieldEffectSpawnParams[1], 8, 8);
+ spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[33], gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], gFieldEffectSpawnParams[2]);
+ gSprites[spriteId].oam.priority = gFieldEffectSpawnParams[3];
gSprites[spriteId].coordOffsetEnabled = 1;
return spriteId;
}
@@ -2009,10 +2009,10 @@ bool8 sub_80876F8(struct Task *task, struct MapObject *mapObject, struct Sprite
{
if (task->data[1] > 3)
{
- gUnknown_0202FF84[0] = mapObject->coords2.x;
- gUnknown_0202FF84[1] = mapObject->coords2.y;
- gUnknown_0202FF84[2] = sprite->subpriority - 1;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObject->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObject->coords2.y;
+ gFieldEffectSpawnParams[2] = sprite->subpriority - 1;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
task->data[1] = FieldEffectStart(FLDEFF_POP_OUT_OF_ASH);
task->data[0]++;
} else
@@ -2064,9 +2064,9 @@ bool8 sub_80877D4(struct Task *task, struct MapObject *mapObject, struct Sprite
u8 FldEff_PopOutOfAsh(void)
{
u8 spriteId;
- sub_8060470((s16 *)&gUnknown_0202FF84[0], (s16 *)&gUnknown_0202FF84[1], 8, 8);
- spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
- gSprites[spriteId].oam.priority = gUnknown_0202FF84[3];
+ sub_8060470((s16 *)&gFieldEffectSpawnParams[0], (s16 *)&gFieldEffectSpawnParams[1], 8, 8);
+ spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[32], gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], gFieldEffectSpawnParams[2]);
+ gSprites[spriteId].oam.priority = gFieldEffectSpawnParams[3];
gSprites[spriteId].coordOffsetEnabled = 1;
return spriteId;
}
@@ -2392,19 +2392,19 @@ bool8 FldEff_FieldMoveShowMon(void)
{
taskId = CreateTask(sub_808847C, 0xff);
}
- gTasks[taskId].data[15] = sub_8088830(gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
+ gTasks[taskId].data[15] = sub_8088830(gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], gFieldEffectSpawnParams[2]);
return FALSE;
}
bool8 FldEff_FieldMoveShowMonInit(void)
{
struct Pokemon *pokemon;
- u32 flag = gUnknown_0202FF84[0] & 0x80000000;
- pokemon = &gPlayerParty[(u8)gUnknown_0202FF84[0]];
- gUnknown_0202FF84[0] = GetMonData(pokemon, MON_DATA_SPECIES);
- gUnknown_0202FF84[1] = GetMonData(pokemon, MON_DATA_OT_ID);
- gUnknown_0202FF84[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
- gUnknown_0202FF84[0] |= flag;
+ u32 flag = gFieldEffectSpawnParams[0] & 0x80000000;
+ pokemon = &gPlayerParty[(u8)gFieldEffectSpawnParams[0]];
+ gFieldEffectSpawnParams[0] = GetMonData(pokemon, MON_DATA_SPECIES);
+ gFieldEffectSpawnParams[1] = GetMonData(pokemon, MON_DATA_OT_ID);
+ gFieldEffectSpawnParams[2] = GetMonData(pokemon, MON_DATA_PERSONALITY);
+ gFieldEffectSpawnParams[0] |= flag;
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON);
FieldEffectActiveListRemove(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
return FALSE;
@@ -2879,7 +2879,7 @@ u8 FldEff_UseSurf(void)
{
u8 taskId;
taskId = CreateTask(sub_8088954, 0xff);
- gTasks[taskId].data[15] = gUnknown_0202FF84[0];
+ gTasks[taskId].data[15] = gFieldEffectSpawnParams[0];
sav1_reset_battle_music_maybe();
sub_8053FB0(0x016d);
return FALSE;
@@ -2919,7 +2919,7 @@ void sub_8088A30(struct Task *task)
mapObject = &gMapObjects[gPlayerAvatar.mapObjectId];
if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(mapObject))
{
- gUnknown_0202FF84[0] = task->data[15] | 0x80000000;
+ gFieldEffectSpawnParams[0] = task->data[15] | 0x80000000;
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
task->data[0]++;
}
@@ -2934,9 +2934,9 @@ void sub_8088A78(struct Task *task)
sub_805B980(mapObject, GetPlayerAvatarGraphicsIdByStateId(3));
FieldObjectClearAnimIfSpecialAnimFinished(mapObject);
FieldObjectSetSpecialAnim(mapObject, sub_80608D0(mapObject->placeholder18));
- gUnknown_0202FF84[0] = task->data[1];
- gUnknown_0202FF84[1] = task->data[2];
- gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
+ gFieldEffectSpawnParams[0] = task->data[1];
+ gFieldEffectSpawnParams[1] = task->data[2];
+ gFieldEffectSpawnParams[2] = gPlayerAvatar.mapObjectId;
mapObject->mapobj_unk_1A = FieldEffectStart(FLDEFF_SURF_BLOB);
task->data[0]++;
}
@@ -2970,7 +2970,7 @@ u8 FldEff_NPCFlyOut(void)
sprite->oam.paletteNum = 0;
sprite->oam.priority = 1;
sprite->callback = sub_8088BC4;
- sprite->data1 = gUnknown_0202FF84[0];
+ sprite->data1 = gFieldEffectSpawnParams[0];
PlaySE(SE_W019);
return spriteId;
}
@@ -3009,7 +3009,7 @@ u8 FldEff_UseFly(void)
{
u8 taskId;
taskId = CreateTask(sub_8088C70, 0xfe);
- gTasks[taskId].data[1] = gUnknown_0202FF84[0];
+ gTasks[taskId].data[1] = gFieldEffectSpawnParams[0];
return 0;
}
@@ -3040,7 +3040,7 @@ void sub_8088CF8(struct Task *task)
if (FieldObjectClearAnimIfSpecialAnimFinished(mapObject))
{
task->data[0]++;
- gUnknown_0202FF84[0] = task->data[1];
+ gFieldEffectSpawnParams[0] = task->data[1];
FieldEffectStart(FLDEFF_FIELD_MOVE_SHOW_MON_INIT);
}
}
diff --git a/src/field_effect_helpers.c b/src/field_effect_helpers.c
index 5a71559ba..d0b659131 100644
--- a/src/field_effect_helpers.c
+++ b/src/field_effect_helpers.c
@@ -249,15 +249,15 @@ bool8 FldEff_Shadow(void)
const struct MapObjectGraphicsInfo *graphicsInfo;
u8 spriteId;
- mapObjectId = GetFieldObjectIdByLocalIdAndMap(gUnknown_0202FF84[0], gUnknown_0202FF84[1], gUnknown_0202FF84[2]);
+ mapObjectId = GetFieldObjectIdByLocalIdAndMap(gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], gFieldEffectSpawnParams[2]);
graphicsInfo = GetFieldObjectGraphicsInfo(gMapObjects[mapObjectId].graphicsId);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[gUnknown_08401E32[graphicsInfo->shadowSize]], 0, 0, 0x94);
if (spriteId != MAX_SPRITES)
{
gSprites[spriteId].coordOffsetEnabled = TRUE;
- gSprites[spriteId].data0 = gUnknown_0202FF84[0];
- gSprites[spriteId].data1 = gUnknown_0202FF84[1];
- gSprites[spriteId].data2 = gUnknown_0202FF84[2];
+ gSprites[spriteId].data0 = gFieldEffectSpawnParams[0];
+ gSprites[spriteId].data1 = gFieldEffectSpawnParams[1];
+ gSprites[spriteId].data2 = gFieldEffectSpawnParams[2];
gSprites[spriteId].data3 = (graphicsInfo->height >> 1) - gUnknown_08401E36[graphicsInfo->shadowSize];
}
return FALSE;
@@ -294,22 +294,22 @@ bool8 FldEff_TallGrass(void)
u8 spriteId;
struct Sprite *sprite;
- x = gUnknown_0202FF84[0];
- y = gUnknown_0202FF84[1];
+ x = gFieldEffectSpawnParams[0];
+ y = gFieldEffectSpawnParams[1];
sub_8060470(&x, &y, 8, 8);
spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[4], x, y, 0);
if (spriteId != MAX_SPRITES)
{
sprite = &gSprites[spriteId];
sprite->coordOffsetEnabled = TRUE;
- sprite->oam.priority = gUnknown_0202FF84[3];
- sprite->data0 = gUnknown_0202FF84[2];
- sprite->data1 = gUnknown_0202FF84[0];
- sprite->data2 = gUnknown_0202FF84[1];
- sprite->data3 = gUnknown_0202FF84[4];
- sprite->data4 = gUnknown_0202FF84[5];
- sprite->data5 = gUnknown_0202FF84[6];
- if (gUnknown_0202FF84[7])
+ sprite->oam.priority = gFieldEffectSpawnParams[3];
+ sprite->data0 = gFieldEffectSpawnParams[2];
+ sprite->data1 = gFieldEffectSpawnParams[0];
+ sprite->data2 = gFieldEffectSpawnParams[1];
+ sprite->data3 = gFieldEffectSpawnParams[4];
+ sprite->data4 = gFieldEffectSpawnParams[5];
+ sprite->data5 = gFieldEffectSpawnParams[6];
+ if (gFieldEffectSpawnParams[7])
{
SeekSpriteAnim(sprite, 4);
}
@@ -358,3 +358,21 @@ void unc_grass_normal(struct Sprite *sprite)
sub_812882C(sprite, sprite->data0, metatileBehavior);
}
}
+
+bool8 FldEff_JumpTallGrass(void)
+{
+ u8 spriteId;
+ struct Sprite *sprite;
+
+ sub_8060470((s16 *)&gFieldEffectSpawnParams[0], (s16 *)&gFieldEffectSpawnParams[1], 8, 12);
+ spriteId = CreateSpriteAtEnd(gFieldEffectObjectTemplatePointers[10], gFieldEffectSpawnParams[0], gFieldEffectSpawnParams[1], 0);
+ if (spriteId != MAX_SPRITES)
+ {
+ sprite = &gSprites[spriteId];
+ sprite->coordOffsetEnabled = TRUE;
+ sprite->oam.priority = gFieldEffectSpawnParams[3];
+ sprite->data0 = gFieldEffectSpawnParams[2];
+ sprite->data1 = 12;
+ }
+ return FALSE;
+}
diff --git a/src/field_ground_effect.c b/src/field_ground_effect.c
index b9935463b..e50811a78 100644
--- a/src/field_ground_effect.c
+++ b/src/field_ground_effect.c
@@ -460,18 +460,18 @@ void GroundEffect_SpawnOnTallGrass(struct MapObject *mapObj, struct Sprite *spri
{
u8 *ptr;
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = 2;
- gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
- gUnknown_0202FF84[5] = mapObj->mapGroup;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = 2;
+ gFieldEffectSpawnParams[4] = (mapObj->localId << 8) | mapObj->mapNum;
+ gFieldEffectSpawnParams[5] = mapObj->mapGroup;
ptr = (u8 *)&gSaveBlock1;
- gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+ gFieldEffectSpawnParams[6] = ((u8)gSaveBlock1.location.mapNum << 8)
| (u8)gSaveBlock1.location.mapGroup;
- gUnknown_0202FF84[7] = 1;
+ gFieldEffectSpawnParams[7] = 1;
FieldEffectStart(4);
}
@@ -479,18 +479,18 @@ void sub_8063E94(struct MapObject *mapObj, struct Sprite *sprite)
{
u8 *ptr;
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = 2;
- gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
- gUnknown_0202FF84[5] = mapObj->mapGroup;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = 2;
+ gFieldEffectSpawnParams[4] = (mapObj->localId << 8) | mapObj->mapNum;
+ gFieldEffectSpawnParams[5] = mapObj->mapGroup;
ptr = (u8 *)&gSaveBlock1;
- gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+ gFieldEffectSpawnParams[6] = ((u8)gSaveBlock1.location.mapNum << 8)
| (u8)gSaveBlock1.location.mapGroup;
- gUnknown_0202FF84[7] = 0;
+ gFieldEffectSpawnParams[7] = 0;
FieldEffectStart(4);
}
@@ -498,18 +498,18 @@ void sub_8063EE0(struct MapObject *mapObj, struct Sprite *sprite)
{
u8 *ptr;
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = 2;
- gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
- gUnknown_0202FF84[5] = mapObj->mapGroup;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = 2;
+ gFieldEffectSpawnParams[4] = (mapObj->localId << 8) | mapObj->mapNum;
+ gFieldEffectSpawnParams[5] = mapObj->mapGroup;
ptr = (u8 *)&gSaveBlock1;
- gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+ gFieldEffectSpawnParams[6] = ((u8)gSaveBlock1.location.mapNum << 8)
| (u8)gSaveBlock1.location.mapGroup;
- gUnknown_0202FF84[7] = 1;
+ gFieldEffectSpawnParams[7] = 1;
FieldEffectStart(17);
}
@@ -517,18 +517,18 @@ void sub_8063F2C(struct MapObject *mapObj, struct Sprite *sprite)
{
u8 *ptr;
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = 2;
- gUnknown_0202FF84[4] = (mapObj->localId << 8) | mapObj->mapNum;
- gUnknown_0202FF84[5] = mapObj->mapGroup;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = 2;
+ gFieldEffectSpawnParams[4] = (mapObj->localId << 8) | mapObj->mapNum;
+ gFieldEffectSpawnParams[5] = mapObj->mapGroup;
ptr = (u8 *)&gSaveBlock1;
- gUnknown_0202FF84[6] = ((u8)gSaveBlock1.location.mapNum << 8)
+ gFieldEffectSpawnParams[6] = ((u8)gSaveBlock1.location.mapNum << 8)
| (u8)gSaveBlock1.location.mapGroup;
- gUnknown_0202FF84[7] = 0;
+ gFieldEffectSpawnParams[7] = 0;
FieldEffectStart(17);
}
@@ -572,11 +572,11 @@ static void DoTracksGroundEffect_Footprints(struct MapObject *mapObj, struct Spr
// First half-word is a Field Effect script id. (gFieldEffectScriptPointers)
u16 sandFootprints_FieldEffectData[2] = { 0xD, 0x18 };
- gUnknown_0202FF84[0] = mapObj->coords3.x;
- gUnknown_0202FF84[1] = mapObj->coords3.y;
- gUnknown_0202FF84[2] = 149;
- gUnknown_0202FF84[3] = 2;
- gUnknown_0202FF84[4] = mapObj->mapobj_unk_18;
+ gFieldEffectSpawnParams[0] = mapObj->coords3.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords3.y;
+ gFieldEffectSpawnParams[2] = 149;
+ gFieldEffectSpawnParams[3] = 2;
+ gFieldEffectSpawnParams[4] = mapObj->mapobj_unk_18;
FieldEffectStart(sandFootprints_FieldEffectData[a]);
}
@@ -598,11 +598,11 @@ static void DoTracksGroundEffect_BikeTireTracks(
if (mapObj->coords2.x != mapObj->coords3.x || mapObj->coords2.y != mapObj->coords3.y)
{
- gUnknown_0202FF84[0] = mapObj->coords3.x;
- gUnknown_0202FF84[1] = mapObj->coords3.y;
- gUnknown_0202FF84[2] = 149;
- gUnknown_0202FF84[3] = 2;
- gUnknown_0202FF84[4] =
+ gFieldEffectSpawnParams[0] = mapObj->coords3.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords3.y;
+ gFieldEffectSpawnParams[2] = 149;
+ gFieldEffectSpawnParams[3] = 2;
+ gFieldEffectSpawnParams[4] =
bikeTireTracks_Transitions[mapObj->mapobj_unk_20][mapObj->mapobj_unk_18 - 5];
FieldEffectStart(FLDEFF_BIKE_TIRE_TRACKS);
}
@@ -627,10 +627,10 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprit
{
u8 spriteId;
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = 2;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = 2;
FieldEffectStart(FLDEFF_JUMP_TALL_GRASS);
spriteId = sub_8126FF0(
@@ -642,37 +642,37 @@ void GroundEffect_JumpOnTallGrass(struct MapObject *mapObj, struct Sprite *sprit
void GroundEffect_JumpOnLongGrass(struct MapObject *mapObj, struct Sprite *sprite)
{
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = 2;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = 2;
FieldEffectStart(FLDEFF_JUMP_LONG_GRASS);
}
void GroundEffect_JumpOnShallowWater(struct MapObject *mapObj, struct Sprite *sprite)
{
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_JUMP_SMALL_SPLASH);
}
void GroundEffect_JumpOnWater(struct MapObject *mapObj, struct Sprite *sprite)
{
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_JUMP_BIG_SPLASH);
}
void GroundEffect_JumpLandingDust(struct MapObject *mapObj, struct Sprite *sprite)
{
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
- gUnknown_0202FF84[2] = mapObj->elevation;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[2] = mapObj->elevation;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
FieldEffectStart(FLDEFF_DUST);
}
@@ -688,8 +688,8 @@ void GroundEffect_HotSprings(struct MapObject *mapObj, struct Sprite *sprite)
void GroundEffect_Seaweed(struct MapObject *mapObj, struct Sprite *sprite)
{
- gUnknown_0202FF84[0] = mapObj->coords2.x;
- gUnknown_0202FF84[1] = mapObj->coords2.y;
+ gFieldEffectSpawnParams[0] = mapObj->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObj->coords2.y;
FieldEffectStart(FLDEFF_BUBBLES);
}
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 1568432f5..dc72981bb 100644
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -3895,10 +3895,10 @@ u8 do_berry_tree_growth_sparkle_1(struct MapObject *mapObject, struct Sprite *sp
{
if (!(sprite->data7 & 4) && sprite->animNum == 4)
{
- gUnknown_0202FF84[0] = mapObject->coords2.x;
- gUnknown_0202FF84[1] = mapObject->coords2.y;
- gUnknown_0202FF84[2] = sprite->subpriority - 1;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObject->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObject->coords2.y;
+ gFieldEffectSpawnParams[2] = sprite->subpriority - 1;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
FieldEffectStart(0x17);
sprite->animNum = 0;
}
@@ -3934,10 +3934,10 @@ u8 do_berry_tree_growth_sparkle_2(struct MapObject *mapObject, struct Sprite *sp
sprite->data1 = 3;
sprite->data2 = 0;
sprite->data7 |= 2;
- gUnknown_0202FF84[0] = mapObject->coords2.x;
- gUnknown_0202FF84[1] = mapObject->coords2.y;
- gUnknown_0202FF84[2] = sprite->subpriority - 1;
- gUnknown_0202FF84[3] = sprite->oam.priority;
+ gFieldEffectSpawnParams[0] = mapObject->coords2.x;
+ gFieldEffectSpawnParams[1] = mapObject->coords2.y;
+ gFieldEffectSpawnParams[2] = sprite->subpriority - 1;
+ gFieldEffectSpawnParams[3] = sprite->oam.priority;
FieldEffectStart(0x17);
return 1;
}
@@ -5086,7 +5086,7 @@ void FieldObjectCB_TreeDisguise(struct Sprite *sprite)
mapObject = &gMapObjects[sprite->data0];
if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
{
- FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+ FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectSpawnParams[0], (u8 *)&gFieldEffectSpawnParams[1], (u8 *)&gFieldEffectSpawnParams[2]);
mapObject->mapobj_unk_1A = FieldEffectStart(0x1c);
mapObject->mapobj_unk_21 = 1;
sprite->data7 ++;
@@ -5106,7 +5106,7 @@ void FieldObjectCB_MountainDisguise(struct Sprite *sprite)
mapObject = &gMapObjects[sprite->data0];
if (mapObject->mapobj_unk_21 == 0 || (mapObject->mapobj_unk_21 == 1 && sprite->data7 == 0))
{
- FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+ FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectSpawnParams[0], (u8 *)&gFieldEffectSpawnParams[1], (u8 *)&gFieldEffectSpawnParams[2]);
mapObject->mapobj_unk_1A = FieldEffectStart(0x1d);
mapObject->mapobj_unk_21 = 1;
sprite->data7 ++;
@@ -7490,7 +7490,7 @@ bool8 sub_8062644(struct MapObject *mapObject, struct Sprite *sprite)
bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *sprite)
{
- FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+ FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectSpawnParams[0], (u8 *)&gFieldEffectSpawnParams[1], (u8 *)&gFieldEffectSpawnParams[2]);
FieldEffectStart(0x0);
sprite->data2 = 1;
return TRUE;
@@ -7498,7 +7498,7 @@ bool8 do_exclamation_mark_bubble_1(struct MapObject *mapObject, struct Sprite *s
bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *sprite)
{
- FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+ FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectSpawnParams[0], (u8 *)&gFieldEffectSpawnParams[1], (u8 *)&gFieldEffectSpawnParams[2]);
FieldEffectStart(0x21);
sprite->data2 = 1;
return TRUE;
@@ -7506,7 +7506,7 @@ bool8 do_exclamation_mark_bubble_2(struct MapObject *mapObject, struct Sprite *s
bool8 do_heart_bubble(struct MapObject *mapObject, struct Sprite *sprite)
{
- FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+ FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectSpawnParams[0], (u8 *)&gFieldEffectSpawnParams[1], (u8 *)&gFieldEffectSpawnParams[2]);
FieldEffectStart(0x2e);
sprite->data2 = 1;
return TRUE;
diff --git a/src/field_map_obj_helpers.c b/src/field_map_obj_helpers.c
index 87be8e011..d8cb33251 100644
--- a/src/field_map_obj_helpers.c
+++ b/src/field_map_obj_helpers.c
@@ -294,7 +294,7 @@ void sub_8064990(u8 a1, u8 dir)
u32 oe_exec_and_other_stuff(u8 fieldEffectId, struct MapObject *mapObject)
{
- FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+ FieldObjectGetLocalIdAndMap(mapObject, (u8 *)&gFieldEffectSpawnParams[0], (u8 *)&gFieldEffectSpawnParams[1], (u8 *)&gFieldEffectSpawnParams[2]);
return FieldEffectStart(fieldEffectId);
}
@@ -310,9 +310,9 @@ void DoShadowFieldEffect(struct MapObject *mapObject)
void DoRippleFieldEffect(struct MapObject *mapObject, struct Sprite *sprite)
{
const struct MapObjectGraphicsInfo *gfxInfo = GetFieldObjectGraphicsInfo(mapObject->graphicsId);
- gUnknown_0202FF84[0] = sprite->pos1.x;
- gUnknown_0202FF84[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
- gUnknown_0202FF84[2] = 151;
- gUnknown_0202FF84[3] = 3;
+ gFieldEffectSpawnParams[0] = sprite->pos1.x;
+ gFieldEffectSpawnParams[1] = sprite->pos1.y + (gfxInfo->height >> 1) - 2;
+ gFieldEffectSpawnParams[2] = 151;
+ gFieldEffectSpawnParams[3] = 3;
FieldEffectStart(5);
}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 2a7b2f3e0..b055036ea 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -666,9 +666,9 @@ void PlayerAvatarTransition_Surfing(struct MapObject *a)
sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(3));
FieldObjectTurn(a, a->placeholder18);
SetPlayerAvatarStateMask(8);
- gUnknown_0202FF84[0] = a->coords2.x;
- gUnknown_0202FF84[1] = a->coords2.y;
- gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
+ gFieldEffectSpawnParams[0] = a->coords2.x;
+ gFieldEffectSpawnParams[1] = a->coords2.y;
+ gFieldEffectSpawnParams[2] = gPlayerAvatar.mapObjectId;
unk = FieldEffectStart(8);
a->mapobj_unk_1A = unk;
sub_8127ED0(unk, 1);
@@ -1226,10 +1226,10 @@ u8 sub_8059EA4(struct Task *task, struct MapObject *b, struct MapObject *c)
FieldObjectClearAnimIfSpecialAnimFinished(c);
FieldObjectSetSpecialAnim(b, GetStepInPlaceDelay16AnimId(task->data[2]));
FieldObjectSetSpecialAnim(c, GetSimpleGoAnimId(task->data[2]));
- gUnknown_0202FF84[0] = c->coords2.x;
- gUnknown_0202FF84[1] = c->coords2.y;
- gUnknown_0202FF84[2] = c->elevation;
- gUnknown_0202FF84[3] = gSprites[c->spriteId].oam.priority;
+ gFieldEffectSpawnParams[0] = c->coords2.x;
+ gFieldEffectSpawnParams[1] = c->coords2.y;
+ gFieldEffectSpawnParams[2] = c->elevation;
+ gFieldEffectSpawnParams[3] = gSprites[c->spriteId].oam.priority;
FieldEffectStart(10);
PlaySE(SE_W070);
task->data[0]++;
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index b394d1e4c..d0fdd5139 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -71,7 +71,7 @@ bool8 SetUpFieldMove_Cut(void)
void sub_80A25E8(void)
{
FieldEffectStart(1);
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
}
bool8 FldEff_UseCutOnGrass(void)
@@ -86,7 +86,7 @@ bool8 FldEff_UseCutOnGrass(void)
void sub_80A2634(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(&UseCutScript);
}
diff --git a/src/fldeff_flash.c b/src/fldeff_flash.c
index 6c2633567..df05de52b 100644
--- a/src/fldeff_flash.c
+++ b/src/fldeff_flash.c
@@ -62,7 +62,7 @@ bool8 SetUpFieldMove_Flash(void)
void sub_810CBFC(void)
{
u8 taskId = oei_task_add();
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
gTasks[taskId].data[8] = (uintptr_t)sub_810CC34 >> 16;
gTasks[taskId].data[9] = (uintptr_t)sub_810CC34;
}
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 81f4f63c6..a5033e7b7 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -42,13 +42,13 @@ bool8 SetUpFieldMove_Strength(void)
static void sub_811AA18(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(UseStrengthScript);
}
static void sub_811AA38(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(40);
}
@@ -58,7 +58,7 @@ bool8 FldEff_UseStrength(void)
gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16;
gTasks[taskId].data[9] = (u32)sub_811AA9C;
- GetMonNickname(&gPlayerParty[gUnknown_0202FF84[0]], gStringVar1);
+ GetMonNickname(&gPlayerParty[gFieldEffectSpawnParams[0]], gStringVar1);
return FALSE;
}
diff --git a/src/fldeff_sweetscent.c b/src/fldeff_sweetscent.c
index 4c3e6bf4a..66fa3dae2 100644
--- a/src/fldeff_sweetscent.c
+++ b/src/fldeff_sweetscent.c
@@ -31,7 +31,7 @@ bool8 SetUpFieldMove_SweetScent(void)
static void sub_812BFD4(void)
{
FieldEffectStart(51);
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
}
bool8 FldEff_SweetScent()
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 74e68df06..8f75099dc 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -27,7 +27,7 @@ void hm_teleport_run_dp02scr(void)
{
new_game();
FieldEffectStart(63);
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
}
bool8 FldEff_UseTeleport(void)
diff --git a/src/pokemon_menu.c b/src/pokemon_menu.c
index 821101569..94801f1a2 100644
--- a/src/pokemon_menu.c
+++ b/src/pokemon_menu.c
@@ -786,7 +786,7 @@ static void sub_808ABA8(u8 taskID)
{
if (sub_807D770() == TRUE)
{
- gUnknown_0202FF84[0] = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES);
+ gFieldEffectSpawnParams[0] = GetMonData(&gPlayerParty[gLastFieldPokeMenuOpened], MON_DATA_SPECIES);
gUnknown_03005CE4();
DestroyTask(taskID);
}
@@ -803,7 +803,7 @@ static void sub_808ABF4(u8 taskID)
static void sub_808AC2C(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(FLDEFF_USE_SURF);
}
@@ -821,7 +821,7 @@ static bool8 SetUpFieldMove_Surf(void)
static void sub_808AC8C(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(FLDEFF_USE_FLY);
}
@@ -872,14 +872,14 @@ u16 unref_sub_808AD88(void)
static void sub_808ADAC(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(FLDEFF_USE_DIVE);
}
static bool8 SetUpFieldMove_Dive(void)
{
- gUnknown_0202FF84[1] = sub_8068F18();
- if (gUnknown_0202FF84[1])
+ gFieldEffectSpawnParams[1] = sub_8068F18();
+ if (gFieldEffectSpawnParams[1])
{
gFieldCallback = sub_808AB90;
gUnknown_03005CE4 = sub_808ADAC;
@@ -891,7 +891,7 @@ static bool8 SetUpFieldMove_Dive(void)
static void sub_808AE08(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(FLDEFF_USE_WATERFALL);
}
diff --git a/src/rom6.c b/src/rom6.c
index ff032b6c2..1f72eba93 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -91,17 +91,17 @@ static void sub_810B428(u8 taskId)
{
if (!FieldEffectActiveListContains(6))
{
- gUnknown_0202FF84[1] = player_get_direction_lower_nybble();
- if (gUnknown_0202FF84[1] == 1)
- gUnknown_0202FF84[2] = 0;
- if (gUnknown_0202FF84[1] == 2)
- gUnknown_0202FF84[2] = 1;
- if (gUnknown_0202FF84[1] == 3)
- gUnknown_0202FF84[2] = 2;
- if (gUnknown_0202FF84[1] == 4)
- gUnknown_0202FF84[2] = 3;
+ gFieldEffectSpawnParams[1] = player_get_direction_lower_nybble();
+ if (gFieldEffectSpawnParams[1] == 1)
+ gFieldEffectSpawnParams[2] = 0;
+ if (gFieldEffectSpawnParams[1] == 2)
+ gFieldEffectSpawnParams[2] = 1;
+ if (gFieldEffectSpawnParams[1] == 3)
+ gFieldEffectSpawnParams[2] = 2;
+ if (gFieldEffectSpawnParams[1] == 4)
+ gFieldEffectSpawnParams[2] = 3;
sub_805B980(&gMapObjects[gPlayerAvatar.mapObjectId], GetPlayerAvatarGraphicsIdByCurrentState());
- StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gUnknown_0202FF84[2]);
+ StartSpriteAnim(&gSprites[gPlayerAvatar.spriteId], gFieldEffectSpawnParams[2]);
FieldEffectActiveListRemove(6);
gTasks[taskId].func = sub_810B4CC;
}
@@ -132,7 +132,7 @@ bool8 SetUpFieldMove_RockSmash(void)
static void sub_810B53C(void)
{
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(UseRockSmashScript);
}
@@ -171,7 +171,7 @@ static void sub_810B5D8(void)
{
sub_8053014();
FieldEffectStart(0x26);
- gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
+ gFieldEffectSpawnParams[0] = gLastFieldPokeMenuOpened;
}
int FldEff_UseDig(void)
diff --git a/src/scrcmd.c b/src/scrcmd.c
index 66578f350..752aafe35 100644
--- a/src/scrcmd.c
+++ b/src/scrcmd.c
@@ -1724,7 +1724,7 @@ bool8 ScrCmd_doanimation(struct ScriptContext *ctx)
bool8 ScrCmd_setanimation(struct ScriptContext *ctx)
{
u8 v2 = ScriptReadByte(ctx);
- gUnknown_0202FF84[v2] = (s16)VarGet(ScriptReadHalfword(ctx));
+ gFieldEffectSpawnParams[v2] = (s16)VarGet(ScriptReadHalfword(ctx));
return FALSE;
}
diff --git a/src/trainer_see.c b/src/trainer_see.c
index feb35c67c..73dba2d60 100644
--- a/src/trainer_see.c
+++ b/src/trainer_see.c
@@ -201,7 +201,7 @@ s8 sub_8084398(u8 taskId, struct Task *task, struct MapObject *trainerObj)
{
u8 direction;
- FieldObjectGetLocalIdAndMap(trainerObj, (u8 *)&gUnknown_0202FF84[0], (u8 *)&gUnknown_0202FF84[1], (u8 *)&gUnknown_0202FF84[2]);
+ FieldObjectGetLocalIdAndMap(trainerObj, (u8 *)&gFieldEffectSpawnParams[0], (u8 *)&gFieldEffectSpawnParams[1], (u8 *)&gFieldEffectSpawnParams[2]);
FieldEffectStart(0);
direction = GetFaceDirectionAnimId(trainerObj->mapobj_unk_18);
@@ -311,10 +311,10 @@ s8 sub_80845FC(u8 taskId, struct Task *task, struct MapObject *trainerObj)
{
if (FieldObjectCheckIfSpecialAnimFinishedOrInactive(trainerObj))
{
- gUnknown_0202FF84[0] = trainerObj->coords2.x;
- gUnknown_0202FF84[1] = trainerObj->coords2.y;
- gUnknown_0202FF84[2] = gSprites[trainerObj->spriteId].subpriority - 1;
- gUnknown_0202FF84[3] = 2;
+ gFieldEffectSpawnParams[0] = trainerObj->coords2.x;
+ gFieldEffectSpawnParams[1] = trainerObj->coords2.y;
+ gFieldEffectSpawnParams[2] = gSprites[trainerObj->spriteId].subpriority - 1;
+ gFieldEffectSpawnParams[3] = 2;
task->data[4] = FieldEffectStart(49);
task->data[0]++;
}
@@ -421,9 +421,9 @@ void sub_8084894(struct Sprite *sprite, u16 a2, u8 a3)
sprite->oam.priority = 1;
sprite->coordOffsetEnabled = 1;
- sprite->data0 = gUnknown_0202FF84[0];
- sprite->data1 = gUnknown_0202FF84[1];
- sprite->data2 = gUnknown_0202FF84[2];
+ sprite->data0 = gFieldEffectSpawnParams[0];
+ sprite->data1 = gFieldEffectSpawnParams[1];
+ sprite->data2 = gFieldEffectSpawnParams[2];
sprite->data3 = -5;
sprite->data7 = a2;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-13 17:32:30 +0000