summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--asm/choose_party.s40
-rw-r--r--asm/daycare.s16
-rw-r--r--asm/field_effect.s4
-rw-r--r--asm/field_tasks.s2
-rw-r--r--asm/fldeff_80C5CD4.s12
-rw-r--r--asm/item_menu.s4
-rw-r--r--asm/party_menu.s4
-rw-r--r--asm/pokemon_menu.s114
-rw-r--r--asm/rom_810CBB4.s4
-rw-r--r--asm/rom_81258BC.s8
-rw-r--r--include/global.fieldmap.h25
-rw-r--r--include/metatile_behavior.h4
-rw-r--r--include/metatile_behaviors.h2
-rw-r--r--shared_syms.txt2
-rw-r--r--src/braille_puzzles.c4
-rw-r--r--src/field_player_avatar.c22
-rw-r--r--src/fieldmap.c1
-rw-r--r--src/fldeff_cut.c22
-rw-r--r--src/fldeff_strength.c14
-rw-r--r--src/fldeff_teleport.c6
-rw-r--r--src/metatile_behavior.c8
-rw-r--r--src/rom4.c12
-rw-r--r--src/rom6.c6
-rw-r--r--sym_common.txt2
24 files changed, 170 insertions, 168 deletions
diff --git a/asm/choose_party.s b/asm/choose_party.s
index 9995ceb30..25122e4ef 100644
--- a/asm/choose_party.s
+++ b/asm/choose_party.s
@@ -525,7 +525,7 @@ sub_81221F8: @ 81221F8
movs r0, 0x5
movs r1, 0x1
bl sub_806D538
- ldr r5, _08122248 @ =gUnknown_03005CE0
+ ldr r5, _08122248 @ =gLastFieldPokeMenuOpened
ldrb r1, [r5]
movs r0, 0x64
muls r0, r1
@@ -556,7 +556,7 @@ sub_81221F8: @ 81221F8
movs r0, 0x1
b _08122270
.align 2, 0
-_08122248: .4byte gUnknown_03005CE0
+_08122248: .4byte gLastFieldPokeMenuOpened
_0812224C: .4byte gPlayerParty
_08122250: .4byte gTasks
_08122254: .4byte gUnknown_084017D8
@@ -633,7 +633,7 @@ _081222E0:
bl PlaySE
adds r0, r4, 0
bl sub_806CA38
- ldr r1, _08122320 @ =gUnknown_03005CE0
+ ldr r1, _08122320 @ =gLastFieldPokeMenuOpened
strb r0, [r1]
lsls r0, 24
lsrs r0, 24
@@ -657,7 +657,7 @@ _081222E0:
str r1, [r0]
b _08122342
.align 2, 0
-_08122320: .4byte gUnknown_03005CE0
+_08122320: .4byte gLastFieldPokeMenuOpened
_08122324: .4byte gPlayerParty
_08122328: .4byte gStringVar1
_0812232C: .4byte gTasks
@@ -939,7 +939,7 @@ _08122536:
adds r0, r1
ldr r1, _08122584 @ =gStringVar1
bl GetMonNickname
- ldr r1, _08122588 @ =gUnknown_03005CE0
+ ldr r1, _08122588 @ =gLastFieldPokeMenuOpened
ldrb r0, [r4]
strb r0, [r1]
ldrb r0, [r5]
@@ -952,7 +952,7 @@ _08122578: .4byte 0x0201b260
_0812257C: .4byte gUnknown_020384F0
_08122580: .4byte gPlayerParty
_08122584: .4byte gStringVar1
-_08122588: .4byte gUnknown_03005CE0
+_08122588: .4byte gLastFieldPokeMenuOpened
_0812258C: .4byte sub_806AEDC
_08122590:
bl sub_80F9344
@@ -1089,7 +1089,7 @@ sub_8122694: @ 8122694
lsrs r5, r0, 24
movs r4, 0
ldr r3, _081226D4 @ =gSelectedOrderFromParty
- ldr r2, _081226D8 @ =gUnknown_03005CE0
+ ldr r2, _081226D8 @ =gLastFieldPokeMenuOpened
_081226A0:
adds r1, r4, r3
ldrb r0, [r1]
@@ -1117,7 +1117,7 @@ _081226CC:
b _08122716
.align 2, 0
_081226D4: .4byte gSelectedOrderFromParty
-_081226D8: .4byte gUnknown_03005CE0
+_081226D8: .4byte gLastFieldPokeMenuOpened
_081226DC:
adds r0, r4, 0x1
lsls r0, 24
@@ -1196,7 +1196,7 @@ sub_8122770: @ 8122770
lsls r0, 24
lsrs r6, r0, 24
movs r4, 0
- ldr r5, _08122798 @ =gUnknown_03005CE0
+ ldr r5, _08122798 @ =gLastFieldPokeMenuOpened
ldr r3, _0812279C @ =gSelectedOrderFromParty
_0812277C:
adds r2, r4, r3
@@ -1213,7 +1213,7 @@ _0812277C:
beq _081227AC
b _081227BE
.align 2, 0
-_08122798: .4byte gUnknown_03005CE0
+_08122798: .4byte gLastFieldPokeMenuOpened
_0812279C: .4byte gSelectedOrderFromParty
_081227A0:
ldrb r0, [r3, 0x1]
@@ -1982,7 +1982,7 @@ sub_8122D94: @ 8122D94
push {r4,lr}
lsls r0, 24
lsrs r4, r0, 24
- ldr r0, _08122DCC @ =gUnknown_03005CE0
+ ldr r0, _08122DCC @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -2006,7 +2006,7 @@ sub_8122D94: @ 8122D94
bl sub_806E750
b _08122DFA
.align 2, 0
-_08122DCC: .4byte gUnknown_03005CE0
+_08122DCC: .4byte gLastFieldPokeMenuOpened
_08122DD0: .4byte gPlayerParty
_08122DD4: .4byte gTasks
_08122DD8: .4byte gUnknown_08401810
@@ -2061,7 +2061,7 @@ _08122E38:
bl PlaySE
adds r0, r4, 0
bl sub_806CA38
- ldr r1, _08122E70 @ =gUnknown_03005CE0
+ ldr r1, _08122E70 @ =gLastFieldPokeMenuOpened
strb r0, [r1]
ldrb r1, [r1]
movs r0, 0x64
@@ -2081,7 +2081,7 @@ _08122E38:
str r1, [r0]
b _08122E9C
.align 2, 0
-_08122E70: .4byte gUnknown_03005CE0
+_08122E70: .4byte gLastFieldPokeMenuOpened
_08122E74: .4byte gPlayerParty
_08122E78: .4byte gStringVar1
_08122E7C: .4byte gTasks
@@ -2089,7 +2089,7 @@ _08122E80: .4byte sub_8122EAC
_08122E84:
movs r0, 0x5
bl PlaySE
- ldr r1, _08122EA4 @ =gUnknown_03005CE0
+ ldr r1, _08122EA4 @ =gLastFieldPokeMenuOpened
movs r0, 0xFF
strb r0, [r1]
ldr r1, _08122EA8 @ =gSpecialVar_0x8004
@@ -2102,7 +2102,7 @@ _08122E9C:
pop {r0}
bx r0
.align 2, 0
-_08122EA4: .4byte gUnknown_03005CE0
+_08122EA4: .4byte gLastFieldPokeMenuOpened
_08122EA8: .4byte gSpecialVar_0x8004
thumb_func_end sub_8122E0C
@@ -2204,7 +2204,7 @@ sub_8122F70: @ 8122F70
lsls r0, 24
lsrs r0, 24
ldr r2, _08122F88 @ =gSpecialVar_0x8004
- ldr r1, _08122F8C @ =gUnknown_03005CE0
+ ldr r1, _08122F8C @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
strh r1, [r2]
bl sub_8123138
@@ -2212,7 +2212,7 @@ sub_8122F70: @ 8122F70
bx r0
.align 2, 0
_08122F88: .4byte gSpecialVar_0x8004
-_08122F8C: .4byte gUnknown_03005CE0
+_08122F8C: .4byte gLastFieldPokeMenuOpened
thumb_func_end sub_8122F70
thumb_func_start sub_8122F90
@@ -2239,7 +2239,7 @@ _08122F96:
adds r0, r1
ldr r1, _08122FE4 @ =gStringVar1
bl GetMonNickname
- ldr r1, _08122FE8 @ =gUnknown_03005CE0
+ ldr r1, _08122FE8 @ =gLastFieldPokeMenuOpened
ldrb r0, [r4]
strb r0, [r1]
ldrb r0, [r5]
@@ -2252,7 +2252,7 @@ _08122FD8: .4byte 0x0201b260
_08122FDC: .4byte gUnknown_020384F0
_08122FE0: .4byte gPlayerParty
_08122FE4: .4byte gStringVar1
-_08122FE8: .4byte gUnknown_03005CE0
+_08122FE8: .4byte gLastFieldPokeMenuOpened
_08122FEC: .4byte sub_806AEDC
_08122FF0:
bl sub_80F9344
diff --git a/asm/daycare.s b/asm/daycare.s
index d78757d8f..886643fce 100644
--- a/asm/daycare.s
+++ b/asm/daycare.s
@@ -196,7 +196,7 @@ _08041498: .4byte 0x00002b4c
thumb_func_start daycare_send
daycare_send: @ 804149C
push {lr}
- ldr r0, _080414B4 @ =gUnknown_03005CE0
+ ldr r0, _080414B4 @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -207,7 +207,7 @@ daycare_send: @ 804149C
pop {r0}
bx r0
.align 2, 0
-_080414B4: .4byte gUnknown_03005CE0
+_080414B4: .4byte gLastFieldPokeMenuOpened
_080414B8: .4byte gPlayerParty
_080414BC: .4byte gSaveBlock1 + 0x2F9C
thumb_func_end daycare_send
@@ -2104,7 +2104,7 @@ _08042324: .4byte gStringVar2
thumb_func_start sub_8042328
sub_8042328: @ 8042328
push {r4-r6,lr}
- ldr r6, _08042354 @ =gUnknown_03005CE0
+ ldr r6, _08042354 @ =gLastFieldPokeMenuOpened
ldrb r0, [r6]
movs r5, 0x64
muls r0, r5
@@ -2123,7 +2123,7 @@ sub_8042328: @ 8042328
pop {r1}
bx r1
.align 2, 0
-_08042354: .4byte gUnknown_03005CE0
+_08042354: .4byte gLastFieldPokeMenuOpened
_08042358: .4byte gPlayerParty
_0804235C: .4byte gStringVar1
thumb_func_end sub_8042328
@@ -2722,7 +2722,7 @@ _0804279C:
bl sub_8072DEC
movs r0, 0x5
bl PlaySE
- ldr r3, _080427DC @ =gUnknown_03005CE0
+ ldr r3, _080427DC @ =gLastFieldPokeMenuOpened
ldr r2, _080427E0 @ =gScriptResult
ldr r1, _080427E4 @ =gTasks
lsls r0, r4, 2
@@ -2742,7 +2742,7 @@ _0804279C:
bl EnableBothScriptContexts
b _08042816
.align 2, 0
-_080427DC: .4byte gUnknown_03005CE0
+_080427DC: .4byte gLastFieldPokeMenuOpened
_080427E0: .4byte gScriptResult
_080427E4: .4byte gTasks
_080427E8:
@@ -2752,7 +2752,7 @@ _080427E8:
cmp r0, 0
beq _08042816
bl sub_8072DEC
- ldr r0, _0804281C @ =gUnknown_03005CE0
+ ldr r0, _0804281C @ =gLastFieldPokeMenuOpened
ldr r1, _08042820 @ =gScriptResult
strh r4, [r1]
movs r1, 0x2
@@ -2770,7 +2770,7 @@ _08042816:
pop {r0}
bx r0
.align 2, 0
-_0804281C: .4byte gUnknown_03005CE0
+_0804281C: .4byte gLastFieldPokeMenuOpened
_08042820: .4byte gScriptResult
thumb_func_end DaycareLevelMenuProcessKeyInput
diff --git a/asm/field_effect.s b/asm/field_effect.s
index 4bcba42ce..66d89ef09 100644
--- a/asm/field_effect.s
+++ b/asm/field_effect.s
@@ -1620,7 +1620,7 @@ task00_8084310: @ 8086604
cmp r0, 0
beq _08086666
ldr r1, _08086670 @ =gUnknown_0202FF84
- ldr r0, _08086674 @ =gUnknown_03005CE0
+ ldr r0, _08086674 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
cmp r0, 0x5
@@ -1654,7 +1654,7 @@ _08086666:
.align 2, 0
_0808666C: .4byte gTasks
_08086670: .4byte gUnknown_0202FF84
-_08086674: .4byte gUnknown_03005CE0
+_08086674: .4byte gLastFieldPokeMenuOpened
_08086678: .4byte CB2_LoadMap
_0808667C: .4byte gUnknown_0300485C
_08086680: .4byte mapldr_08084390
diff --git a/asm/field_tasks.s b/asm/field_tasks.s
index 23a49109d..5f3e3a03f 100644
--- a/asm/field_tasks.s
+++ b/asm/field_tasks.s
@@ -1523,7 +1523,7 @@ _08069F9E:
bl MapGridGetMetatileBehaviorAt
lsls r0, 24
lsrs r0, 24
- bl MetatileBehavior_IsAsh
+ bl MetatileBehavior_IsAshGrass
lsls r0, 24
cmp r0, 0
beq _0806A02A
diff --git a/asm/fldeff_80C5CD4.s b/asm/fldeff_80C5CD4.s
index 4214f8f9e..25ede5738 100644
--- a/asm/fldeff_80C5CD4.s
+++ b/asm/fldeff_80C5CD4.s
@@ -881,7 +881,7 @@ _080C6398: .4byte sub_80C660C
sub_80C639C: @ 80C639C
push {lr}
ldr r1, _080C63B0 @ =gUnknown_0202FF84
- ldr r0, _080C63B4 @ =gUnknown_03005CE0
+ ldr r0, _080C63B4 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
ldr r0, _080C63B8 @ =gUnknown_081A2CE6
@@ -890,7 +890,7 @@ sub_80C639C: @ 80C639C
bx r0
.align 2, 0
_080C63B0: .4byte gUnknown_0202FF84
-_080C63B4: .4byte gUnknown_03005CE0
+_080C63B4: .4byte gLastFieldPokeMenuOpened
_080C63B8: .4byte gUnknown_081A2CE6
thumb_func_end sub_80C639C
@@ -1026,7 +1026,7 @@ sub_80C6498: @ 80C6498
sub_80C64A8: @ 80C64A8
push {lr}
ldr r1, _080C64BC @ =gUnknown_0202FF84
- ldr r0, _080C64C0 @ =gUnknown_03005CE0
+ ldr r0, _080C64C0 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
ldr r0, _080C64C4 @ =gUnknown_081A2D3E
@@ -1035,7 +1035,7 @@ sub_80C64A8: @ 80C64A8
bx r0
.align 2, 0
_080C64BC: .4byte gUnknown_0202FF84
-_080C64C0: .4byte gUnknown_03005CE0
+_080C64C0: .4byte gLastFieldPokeMenuOpened
_080C64C4: .4byte gUnknown_081A2D3E
thumb_func_end sub_80C64A8
@@ -1213,7 +1213,7 @@ sub_80C65FC: @ 80C65FC
sub_80C660C: @ 80C660C
push {lr}
ldr r1, _080C6620 @ =gUnknown_0202FF84
- ldr r0, _080C6624 @ =gUnknown_03005CE0
+ ldr r0, _080C6624 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
str r0, [r1]
ldr r0, _080C6628 @ =gUnknown_081A2D96
@@ -1222,7 +1222,7 @@ sub_80C660C: @ 80C660C
bx r0
.align 2, 0
_080C6620: .4byte gUnknown_0202FF84
-_080C6624: .4byte gUnknown_03005CE0
+_080C6624: .4byte gLastFieldPokeMenuOpened
_080C6628: .4byte gUnknown_081A2D96
thumb_func_end sub_80C660C
diff --git a/asm/item_menu.s b/asm/item_menu.s
index b5ed56b69..29109f3d9 100644
--- a/asm/item_menu.s
+++ b/asm/item_menu.s
@@ -5128,7 +5128,7 @@ sub_80A599C: @ 80A599C
movs r4, 0
strh r2, [r1, 0x18]
strh r3, [r1, 0x1A]
- ldr r1, _080A59CC @ =gUnknown_03005CE0
+ ldr r1, _080A59CC @ =gLastFieldPokeMenuOpened
strb r4, [r1]
bl sub_80A5AE4
pop {r4}
@@ -5137,7 +5137,7 @@ sub_80A599C: @ 80A599C
.align 2, 0
_080A59C4: .4byte gTasks
_080A59C8: .4byte sub_805469C
-_080A59CC: .4byte gUnknown_03005CE0
+_080A59CC: .4byte gLastFieldPokeMenuOpened
thumb_func_end sub_80A599C
thumb_func_start sub_80A59D0
diff --git a/asm/party_menu.s b/asm/party_menu.s
index 02959f0c3..f405d174a 100644
--- a/asm/party_menu.s
+++ b/asm/party_menu.s
@@ -10413,13 +10413,13 @@ _080702B0:
ldr r1, [r4, 0x10]
str r1, [r0]
_080702C6:
- ldr r1, _080702D4 @ =gUnknown_03005CE0
+ ldr r1, _080702D4 @ =gLastFieldPokeMenuOpened
movs r0, 0
strb r0, [r1]
b _080702DE
.align 2, 0
_080702D0: .4byte gTasks
-_080702D4: .4byte gUnknown_03005CE0
+_080702D4: .4byte gLastFieldPokeMenuOpened
_080702D8:
adds r0, r5, 0
bl sub_8070088
diff --git a/asm/pokemon_menu.s b/asm/pokemon_menu.s
index 1ceaaff4f..2f1c16f8c 100644
--- a/asm/pokemon_menu.s
+++ b/asm/pokemon_menu.s
@@ -31,7 +31,7 @@ sub_8089A8C: @ 8089A8C
ldr r5, _08089AD0 @ =gUnknown_0202FFA9
movs r0, 0
strb r0, [r5]
- ldr r0, _08089AD4 @ =gUnknown_03005CE0
+ ldr r0, _08089AD4 @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -57,7 +57,7 @@ sub_8089A8C: @ 8089A8C
b _08089BC8
.align 2, 0
_08089AD0: .4byte gUnknown_0202FFA9
-_08089AD4: .4byte gUnknown_03005CE0
+_08089AD4: .4byte gLastFieldPokeMenuOpened
_08089AD8: .4byte gPlayerParty
_08089ADC: .4byte gUnknown_0202FFAA
_08089AE0:
@@ -73,7 +73,7 @@ _08089AE8:
beq _08089B48
ldr r5, _08089B24 @ =gUnknown_0839F554
_08089AF4:
- ldr r0, _08089B28 @ =gUnknown_03005CE0
+ ldr r0, _08089B28 @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -97,7 +97,7 @@ _08089AF4:
b _08089B48
.align 2, 0
_08089B24: .4byte gUnknown_0839F554
-_08089B28: .4byte gUnknown_03005CE0
+_08089B28: .4byte gLastFieldPokeMenuOpened
_08089B2C: .4byte gPlayerParty
_08089B30: .4byte gUnknown_0202FFAA
_08089B34: .4byte gUnknown_0202FFA9
@@ -132,7 +132,7 @@ _08089B48:
movs r2, 0x1
bl AppendToList
_08089B76:
- ldr r0, _08089BB0 @ =gUnknown_03005CE0
+ ldr r0, _08089BB0 @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -156,7 +156,7 @@ _08089B76:
_08089BA4: .4byte gUnknown_0202FFAA
_08089BA8: .4byte gUnknown_0202FFA9
_08089BAC: .4byte gPlayerParty + 1 * 0x64
-_08089BB0: .4byte gUnknown_03005CE0
+_08089BB0: .4byte gLastFieldPokeMenuOpened
_08089BB4:
adds r0, r4, 0
adds r1, r5, 0
@@ -336,7 +336,7 @@ _08089D04:
bl PlaySE
adds r0, r4, 0
bl sub_806CA38
- ldr r1, _08089D48 @ =gUnknown_03005CE0
+ ldr r1, _08089D48 @ =gLastFieldPokeMenuOpened
strb r0, [r1]
ldrb r1, [r1]
movs r0, 0x64
@@ -361,7 +361,7 @@ _08089D04:
bl sub_808B5B4
b _08089D84
.align 2, 0
-_08089D48: .4byte gUnknown_03005CE0
+_08089D48: .4byte gLastFieldPokeMenuOpened
_08089D4C: .4byte gPlayerParty
_08089D50: .4byte gStringVar1
_08089D54: .4byte gUnknown_0202FFA8
@@ -492,7 +492,7 @@ sub_8089E4C: @ 8089E4C
lsrs r1, r0, 24
cmp r1, 0
bne _08089E72
- ldr r0, _08089E7C @ =gUnknown_03005CE0
+ ldr r0, _08089E7C @ =gLastFieldPokeMenuOpened
strb r1, [r0]
ldr r0, _08089E80 @ =sub_805469C
bl SetMainCallback2
@@ -504,14 +504,14 @@ _08089E72:
bx r0
.align 2, 0
_08089E78: .4byte gPaletteFade
-_08089E7C: .4byte gUnknown_03005CE0
+_08089E7C: .4byte gLastFieldPokeMenuOpened
_08089E80: .4byte sub_805469C
thumb_func_end sub_8089E4C
thumb_func_start sub_8089E84
sub_8089E84: @ 8089E84
push {lr}
- ldr r0, _08089EAC @ =gUnknown_03005CE0
+ ldr r0, _08089EAC @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -528,7 +528,7 @@ sub_8089E84: @ 8089E84
pop {r0}
bx r0
.align 2, 0
-_08089EAC: .4byte gUnknown_03005CE0
+_08089EAC: .4byte gLastFieldPokeMenuOpened
_08089EB0: .4byte gPlayerParty
_08089EB4: .4byte gStringVar1
_08089EB8: .4byte gUnknown_0202FFA8
@@ -561,7 +561,7 @@ _08089ED8:
ldrb r0, [r4]
movs r1, 0
bl sub_806BF74
- ldr r1, _08089F0C @ =gUnknown_03005CE0
+ ldr r1, _08089F0C @ =gLastFieldPokeMenuOpened
ldrb r0, [r5]
strb r0, [r1]
bl sub_8089E84
@@ -572,7 +572,7 @@ _08089F04:
pop {r0}
bx r0
.align 2, 0
-_08089F0C: .4byte gUnknown_03005CE0
+_08089F0C: .4byte gLastFieldPokeMenuOpened
_08089F10: .4byte sub_806AEDC
thumb_func_end sub_8089EBC
@@ -1126,7 +1126,7 @@ _0808A370:
cmp r0, 0x1
bne _0808A364
ldrb r0, [r4]
- ldr r1, _0808A39C @ =gUnknown_03005CE0
+ ldr r1, _0808A39C @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
bl sub_806C994
ldrb r0, [r4]
@@ -1139,7 +1139,7 @@ _0808A394:
pop {r0}
bx r0
.align 2, 0
-_0808A39C: .4byte gUnknown_03005CE0
+_0808A39C: .4byte gLastFieldPokeMenuOpened
_0808A3A0: .4byte sub_806AEDC
thumb_func_end sub_808A358
@@ -1155,7 +1155,7 @@ _0808A3AA:
cmp r0, 0x1
bne _0808A3E4
ldrb r0, [r4]
- ldr r1, _0808A3DC @ =gUnknown_03005CE0
+ ldr r1, _0808A3DC @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
bl sub_806C994
ldrb r0, [r4]
@@ -1169,7 +1169,7 @@ _0808A3AA:
b _0808A3F0
.align 2, 0
_0808A3D8: .4byte 0x0201b260
-_0808A3DC: .4byte gUnknown_03005CE0
+_0808A3DC: .4byte gLastFieldPokeMenuOpened
_0808A3E0: .4byte sub_806AEDC
_0808A3E4:
bl sub_80F9344
@@ -1205,7 +1205,7 @@ sub_808A3F8: @ 808A3F8
adds r0, r4, 0
movs r1, 0
bl sub_806BD58
- ldr r0, _0808A46C @ =gUnknown_03005CE0
+ ldr r0, _0808A46C @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
adds r0, r4, 0
bl sub_806C994
@@ -1232,7 +1232,7 @@ sub_808A3F8: @ 808A3F8
_0808A460: .4byte gScriptItemId
_0808A464: .4byte sub_808A330
_0808A468: .4byte gPaletteFade
-_0808A46C: .4byte gUnknown_03005CE0
+_0808A46C: .4byte gLastFieldPokeMenuOpened
_0808A470: .4byte gPlayerParty
_0808A474: .4byte sub_808A34C
_0808A478:
@@ -1298,7 +1298,7 @@ _0808A4EC:
cmp r0, 0x1
bne _0808A4E0
ldrb r0, [r4]
- ldr r1, _0808A518 @ =gUnknown_03005CE0
+ ldr r1, _0808A518 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
bl sub_806C994
ldrb r0, [r4]
@@ -1311,7 +1311,7 @@ _0808A510:
pop {r0}
bx r0
.align 2, 0
-_0808A518: .4byte gUnknown_03005CE0
+_0808A518: .4byte gLastFieldPokeMenuOpened
_0808A51C: .4byte sub_806AEDC
thumb_func_end sub_808A4D4
@@ -1334,7 +1334,7 @@ sub_808A520: @ 808A520
movs r1, 0x1
bl RemoveBagItem
_0808A542:
- ldr r6, _0808A590 @ =gUnknown_03005CE0
+ ldr r6, _0808A590 @ =gLastFieldPokeMenuOpened
ldrb r0, [r6]
movs r5, 0x64
muls r0, r5
@@ -1366,7 +1366,7 @@ _0808A542:
_0808A584: .4byte gPaletteFade
_0808A588: .4byte gScriptResult
_0808A58C: .4byte gUnknown_0202E8F8
-_0808A590: .4byte gUnknown_03005CE0
+_0808A590: .4byte gLastFieldPokeMenuOpened
_0808A594: .4byte gPlayerParty
_0808A598: .4byte sub_8089CD4
_0808A59C:
@@ -1397,7 +1397,7 @@ sub_808A5BC: @ 808A5BC
ands r0, r1
cmp r0, 0
bne _0808A5EA
- ldr r0, _0808A5F4 @ =gUnknown_03005CE0
+ ldr r0, _0808A5F4 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
ldr r1, _0808A5F8 @ =gScriptItemId
ldrh r1, [r1]
@@ -1416,7 +1416,7 @@ _0808A5EA:
bx r0
.align 2, 0
_0808A5F0: .4byte gPaletteFade
-_0808A5F4: .4byte gUnknown_03005CE0
+_0808A5F4: .4byte gLastFieldPokeMenuOpened
_0808A5F8: .4byte gScriptItemId
_0808A5FC: .4byte gTasks
_0808A600: .4byte sub_808A1E0
@@ -1755,7 +1755,7 @@ _0808A8A4: .4byte sub_808A8A8
sub_808A8A8: @ 808A8A8
push {lr}
ldr r1, _0808A8C4 @ =gUnknown_020384F0
- ldr r0, _0808A8C8 @ =gUnknown_03005CE0
+ ldr r0, _0808A8C8 @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
strb r0, [r1]
ldr r0, _0808A8CC @ =0x0201b000
@@ -1768,7 +1768,7 @@ sub_808A8A8: @ 808A8A8
bx r0
.align 2, 0
_0808A8C4: .4byte gUnknown_020384F0
-_0808A8C8: .4byte gUnknown_03005CE0
+_0808A8C8: .4byte gLastFieldPokeMenuOpened
_0808A8CC: .4byte 0x0201b000
_0808A8D0: .4byte 0x00000262
thumb_func_end sub_808A8A8
@@ -2129,7 +2129,7 @@ sub_808ABA8: @ 808ABA8
lsrs r0, 24
cmp r0, 0x1
bne _0808ABDE
- ldr r0, _0808ABE4 @ =gUnknown_03005CE0
+ ldr r0, _0808ABE4 @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -2149,7 +2149,7 @@ _0808ABDE:
pop {r0}
bx r0
.align 2, 0
-_0808ABE4: .4byte gUnknown_03005CE0
+_0808ABE4: .4byte gLastFieldPokeMenuOpened
_0808ABE8: .4byte gPlayerParty
_0808ABEC: .4byte gUnknown_0202FF84
_0808ABF0: .4byte gUnknown_03005CE4
@@ -2190,7 +2190,7 @@ _0808AC28: .4byte gMain
sub_808AC2C: @ 808AC2C
push {lr}
ldr r0, _0808AC40 @ =gUnknown_0202FF84
- ldr r1, _0808AC44 @ =gUnknown_03005CE0
+ ldr r1, _0808AC44 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
str r1, [r0]
movs r0, 0x9
@@ -2199,7 +2199,7 @@ sub_808AC2C: @ 808AC2C
bx r0
.align 2, 0
_0808AC40: .4byte gUnknown_0202FF84
-_0808AC44: .4byte gUnknown_03005CE0
+_0808AC44: .4byte gLastFieldPokeMenuOpened
thumb_func_end sub_808AC2C
thumb_func_start SetUpFieldMove_Surf
@@ -2239,7 +2239,7 @@ _0808AC86:
sub_808AC8C: @ 808AC8C
push {lr}
ldr r0, _0808ACA0 @ =gUnknown_0202FF84
- ldr r1, _0808ACA4 @ =gUnknown_03005CE0
+ ldr r1, _0808ACA4 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
str r1, [r0]
movs r0, 0x1F
@@ -2248,7 +2248,7 @@ sub_808AC8C: @ 808AC8C
bx r0
.align 2, 0
_0808ACA0: .4byte gUnknown_0202FF84
-_0808ACA4: .4byte gUnknown_03005CE0
+_0808ACA4: .4byte gLastFieldPokeMenuOpened
thumb_func_end sub_808AC8C
thumb_func_start SetUpFieldMove_Fly
@@ -2320,7 +2320,7 @@ _0808AD24:
cmp r0, 0x1
bne _0808AD18
ldrb r0, [r4]
- ldr r1, _0808AD50 @ =gUnknown_03005CE0
+ ldr r1, _0808AD50 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
bl sub_806C994
ldrb r0, [r4]
@@ -2333,7 +2333,7 @@ _0808AD48:
pop {r0}
bx r0
.align 2, 0
-_0808AD50: .4byte gUnknown_03005CE0
+_0808AD50: .4byte gLastFieldPokeMenuOpened
_0808AD54: .4byte sub_806AEDC
thumb_func_end sub_808AD0C
@@ -2363,7 +2363,7 @@ _0808AD84: .4byte sub_808AD0C
thumb_func_start unref_sub_808AD88
unref_sub_808AD88: @ 808AD88
push {lr}
- ldr r0, _0808ADA4 @ =gUnknown_03005CE0
+ ldr r0, _0808ADA4 @ =gLastFieldPokeMenuOpened
ldrb r1, [r0]
movs r0, 0x64
muls r0, r1
@@ -2376,7 +2376,7 @@ unref_sub_808AD88: @ 808AD88
pop {r1}
bx r1
.align 2, 0
-_0808ADA4: .4byte gUnknown_03005CE0
+_0808ADA4: .4byte gLastFieldPokeMenuOpened
_0808ADA8: .4byte gPlayerParty
thumb_func_end unref_sub_808AD88
@@ -2384,7 +2384,7 @@ _0808ADA8: .4byte gPlayerParty
sub_808ADAC: @ 808ADAC
push {lr}
ldr r0, _0808ADC0 @ =gUnknown_0202FF84
- ldr r1, _0808ADC4 @ =gUnknown_03005CE0
+ ldr r1, _0808ADC4 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
str r1, [r0]
movs r0, 0x2C
@@ -2393,7 +2393,7 @@ sub_808ADAC: @ 808ADAC
bx r0
.align 2, 0
_0808ADC0: .4byte gUnknown_0202FF84
-_0808ADC4: .4byte gUnknown_03005CE0
+_0808ADC4: .4byte gLastFieldPokeMenuOpened
thumb_func_end sub_808ADAC
thumb_func_start SetUpFieldMove_Dive
@@ -2432,7 +2432,7 @@ _0808AE04: .4byte sub_808ADAC
sub_808AE08: @ 808AE08
push {lr}
ldr r0, _0808AE1C @ =gUnknown_0202FF84
- ldr r1, _0808AE20 @ =gUnknown_03005CE0
+ ldr r1, _0808AE20 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
str r1, [r0]
movs r0, 0x2B
@@ -2441,7 +2441,7 @@ sub_808AE08: @ 808AE08
bx r0
.align 2, 0
_0808AE1C: .4byte gUnknown_0202FF84
-_0808AE20: .4byte gUnknown_03005CE0
+_0808AE20: .4byte gLastFieldPokeMenuOpened
thumb_func_end sub_808AE08
thumb_func_start SetUpFieldMove_Waterfall
@@ -2648,7 +2648,7 @@ _0808AFBC:
_0808AFC2:
bl sub_808AF20
_0808AFC6:
- ldr r4, _0808B000 @ =gUnknown_03005CE0
+ ldr r4, _0808B000 @ =gLastFieldPokeMenuOpened
ldrb r0, [r4]
cmp r0, 0x5
bhi _0808AFE2
@@ -2666,7 +2666,7 @@ _0808AFE2:
strb r0, [r4]
_0808AFE6:
ldrb r0, [r5]
- ldr r1, _0808B000 @ =gUnknown_03005CE0
+ ldr r1, _0808B000 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
bl sub_806C994
ldrb r0, [r5]
@@ -2676,7 +2676,7 @@ _0808AFE6:
bl SetMainCallback2
b _0808B018
.align 2, 0
-_0808B000: .4byte gUnknown_03005CE0
+_0808B000: .4byte gLastFieldPokeMenuOpened
_0808B004: .4byte gPlayerParty
_0808B008: .4byte sub_806AEDC
_0808B00C:
@@ -2796,7 +2796,7 @@ _0808B0EC: .4byte gPaletteFade
_0808B0F0:
adds r0, r4, 0
bl sub_806CA38
- ldr r1, _0808B118 @ =gUnknown_03005CE0
+ ldr r1, _0808B118 @ =gLastFieldPokeMenuOpened
strb r0, [r1]
ldrb r1, [r1]
movs r0, 0x64
@@ -2811,7 +2811,7 @@ _0808B0F0:
bl PlaySE
b _0808B1CE
.align 2, 0
-_0808B118: .4byte gUnknown_03005CE0
+_0808B118: .4byte gLastFieldPokeMenuOpened
_0808B11C: .4byte gPlayerParty
_0808B120:
bl sub_806D5A4
@@ -2857,7 +2857,7 @@ _0808B180: .4byte sub_808B2B4
_0808B184:
adds r0, r4, 0
bl sub_806CA38
- ldr r1, _0808B1D8 @ =gUnknown_03005CE0
+ ldr r1, _0808B1D8 @ =gLastFieldPokeMenuOpened
strb r0, [r1]
movs r0, 0x5
bl PlaySE
@@ -2896,7 +2896,7 @@ _0808B1CE:
pop {r0}
bx r0
.align 2, 0
-_0808B1D8: .4byte gUnknown_03005CE0
+_0808B1D8: .4byte gLastFieldPokeMenuOpened
_0808B1DC: .4byte gUnknown_02038561
_0808B1E0: .4byte gTasks
_0808B1E4: .4byte sub_808B25C
@@ -3092,7 +3092,7 @@ sub_808B338: @ 808B338
bne _0808B384
adds r0, r5, 0
bl sub_806CA38
- ldr r1, _0808B390 @ =gUnknown_03005CE0
+ ldr r1, _0808B390 @ =gLastFieldPokeMenuOpened
strb r0, [r1]
ldrb r1, [r1]
movs r0, 0x64
@@ -3121,7 +3121,7 @@ _0808B384:
bx r0
.align 2, 0
_0808B38C: .4byte gPaletteFade
-_0808B390: .4byte gUnknown_03005CE0
+_0808B390: .4byte gLastFieldPokeMenuOpened
_0808B394: .4byte gPlayerParty
_0808B398: .4byte gSaveBlock1 + 0x2B4C
_0808B39C: .4byte sub_808B3EC
@@ -3147,7 +3147,7 @@ _0808B3B8:
cmp r0, 0x1
bne _0808B3AC
ldrb r0, [r4]
- ldr r1, _0808B3E4 @ =gUnknown_03005CE0
+ ldr r1, _0808B3E4 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
bl sub_806C994
ldrb r0, [r4]
@@ -3160,7 +3160,7 @@ _0808B3DC:
pop {r0}
bx r0
.align 2, 0
-_0808B3E4: .4byte gUnknown_03005CE0
+_0808B3E4: .4byte gLastFieldPokeMenuOpened
_0808B3E8: .4byte sub_806AEDC
thumb_func_end sub_808B3A0
@@ -3187,7 +3187,7 @@ sub_808B3EC: @ 808B3EC
movs r1, 0x1
bl RemoveBagItem
_0808B416:
- ldr r6, _0808B470 @ =gUnknown_03005CE0
+ ldr r6, _0808B470 @ =gLastFieldPokeMenuOpened
ldrb r0, [r6]
movs r5, 0x64
muls r0, r5
@@ -3224,7 +3224,7 @@ _0808B416:
_0808B464: .4byte gPaletteFade
_0808B468: .4byte gScriptResult
_0808B46C: .4byte gUnknown_0202E8F8
-_0808B470: .4byte gUnknown_03005CE0
+_0808B470: .4byte gLastFieldPokeMenuOpened
_0808B474: .4byte gPlayerParty
_0808B478: .4byte sub_808B25C
_0808B47C: .4byte sub_806AEDC
@@ -3258,7 +3258,7 @@ sub_808B4A4: @ 808B4A4
ands r0, r1
cmp r0, 0
bne _0808B4D2
- ldr r0, _0808B4DC @ =gUnknown_03005CE0
+ ldr r0, _0808B4DC @ =gLastFieldPokeMenuOpened
ldrb r0, [r0]
ldr r1, _0808B4E0 @ =gScriptItemId
ldrh r1, [r1]
@@ -3277,7 +3277,7 @@ _0808B4D2:
bx r0
.align 2, 0
_0808B4D8: .4byte gPaletteFade
-_0808B4DC: .4byte gUnknown_03005CE0
+_0808B4DC: .4byte gLastFieldPokeMenuOpened
_0808B4E0: .4byte gScriptItemId
_0808B4E4: .4byte gTasks
_0808B4E8: .4byte sub_808B4EC
diff --git a/asm/rom_810CBB4.s b/asm/rom_810CBB4.s
index 8eacec455..b4223f094 100644
--- a/asm/rom_810CBB4.s
+++ b/asm/rom_810CBB4.s
@@ -47,7 +47,7 @@ sub_810CBFC: @ 810CBFC
lsls r0, 24
lsrs r0, 24
ldr r2, _0810CC24 @ =gUnknown_0202FF84
- ldr r1, _0810CC28 @ =gUnknown_03005CE0
+ ldr r1, _0810CC28 @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
str r1, [r2]
ldr r2, _0810CC2C @ =gTasks
@@ -63,7 +63,7 @@ sub_810CBFC: @ 810CBFC
bx r0
.align 2, 0
_0810CC24: .4byte gUnknown_0202FF84
-_0810CC28: .4byte gUnknown_03005CE0
+_0810CC28: .4byte gLastFieldPokeMenuOpened
_0810CC2C: .4byte gTasks
_0810CC30: .4byte sub_810CC34
thumb_func_end sub_810CBFC
diff --git a/asm/rom_81258BC.s b/asm/rom_81258BC.s
index 483209fd5..aadab16fd 100644
--- a/asm/rom_81258BC.s
+++ b/asm/rom_81258BC.s
@@ -2244,14 +2244,14 @@ sub_812BFD4: @ 812BFD4
movs r0, 0x33
bl FieldEffectStart
ldr r0, _0812BFE8 @ =gUnknown_0202FF84
- ldr r1, _0812BFEC @ =gUnknown_03005CE0
+ ldr r1, _0812BFEC @ =gLastFieldPokeMenuOpened
ldrb r1, [r1]
str r1, [r0]
pop {r0}
bx r0
.align 2, 0
_0812BFE8: .4byte gUnknown_0202FF84
-_0812BFEC: .4byte gUnknown_03005CE0
+_0812BFEC: .4byte gLastFieldPokeMenuOpened
thumb_func_end sub_812BFD4
thumb_func_start FldEff_SweetScent
@@ -18242,7 +18242,7 @@ SetUpFieldMove_SoftBoiled: @ 8133CCC
push {r4-r6,lr}
mov r6, r8
push {r6}
- ldr r0, _08133D14 @ =gUnknown_03005CE0
+ ldr r0, _08133D14 @ =gLastFieldPokeMenuOpened
mov r8, r0
ldrb r0, [r0]
movs r6, 0x64
@@ -18273,7 +18273,7 @@ SetUpFieldMove_SoftBoiled: @ 8133CCC
movs r0, 0
b _08133D1E
.align 2, 0
-_08133D14: .4byte gUnknown_03005CE0
+_08133D14: .4byte gLastFieldPokeMenuOpened
_08133D18: .4byte gPlayerParty
_08133D1C:
movs r0, 0x1
diff --git a/include/global.fieldmap.h b/include/global.fieldmap.h
index 3c6f4cf4e..508d7e4ed 100644
--- a/include/global.fieldmap.h
+++ b/include/global.fieldmap.h
@@ -107,8 +107,21 @@ struct BgEvent
s16 x, y;
u8 unk4;
u8 kind;
- s16 filler_6;
- u8 *script;
+ // 0x2 padding for the union beginning.
+ union { // carried over from diego's FR/LG work, seems to be the same struct
+ // in gen 3, "kind" (0x3 in BgEvent struct) determines the method to read the union.
+ u8 *script;
+
+ // hidden item type probably
+ struct {
+ u8 filler6[0x2];
+ u16 hiddenItemId; // flag offset to determine flag lookup
+ } hiddenItem;
+
+ // secret base type
+ u16 secretBaseId;
+
+ } bgUnion;
};
struct MapEvents
@@ -126,10 +139,10 @@ struct MapEvents
struct MapConnection
{
- u8 direction;
- u32 offset;
- u8 mapGroup;
- u8 mapNum;
+ /*0x00*/ u8 direction;
+ /*0x01*/ u32 offset;
+ /*0x05*/ u8 mapGroup;
+ /*0x06*/ u8 mapNum;
};
struct MapConnections
diff --git a/include/metatile_behavior.h b/include/metatile_behavior.h
index 2960a1b6f..f4250f07b 100644
--- a/include/metatile_behavior.h
+++ b/include/metatile_behavior.h
@@ -72,7 +72,7 @@ bool8 MetatileBehavior_IsPuddle(u8);
bool8 MetatileBehavior_IsTallGrass(u8);
bool8 MetatileBehavior_IsLongGrass(u8);
bool8 MetatileBehavior_IsBerryTreeSoil(u8);
-bool8 MetatileBehavior_IsAsh(u8);
+bool8 MetatileBehavior_IsAshGrass(u8);
bool8 MetatileBehavior_IsUnusedFootprintMetatile(u8);
bool8 MetatileBehavior_IsBridge(u8);
u8 sub_8057450(u8);
@@ -123,7 +123,7 @@ bool8 MetatileBehavior_IsVerticalRail(u8);
bool8 MetatileBehavior_IsHorizontalRail(u8);
bool8 MetatileBehavior_IsSeaweed(u8);
bool8 MetatileBehavior_IsRunningDisallowed(u8);
-bool8 sub_80578F8(u8);
+bool8 MetatileBehavior_IsCuttableGrass(u8);
bool8 sub_805791C(u8);
bool8 MetatileBehavior_IsPictureBookShelf(u8);
bool8 MetatileBehavior_IsBookShelf(u8);
diff --git a/include/metatile_behaviors.h b/include/metatile_behaviors.h
index ea705054e..1241fbb81 100644
--- a/include/metatile_behaviors.h
+++ b/include/metatile_behaviors.h
@@ -32,7 +32,7 @@
#define MB_ICE 0x20
#define MB_SAND 0x21
#define MB_SEAWEED 0x22
-#define MB_ASH 0x24
+#define MB_ASHGRASS 0x24
#define MB_25 0x25
#define MB_THIN_ICE 0x26
#define MB_CRACKED_ICE 0x27
diff --git a/shared_syms.txt b/shared_syms.txt
index 3433a0769..ca008972f 100644
--- a/shared_syms.txt
+++ b/shared_syms.txt
@@ -33,4 +33,4 @@ unk_201C000 = 0x201C000;
gHallOfFame = 0x201E000;
unk_201f800 = 0x201F800;
-unk_201FFF0 = 0x201FFF0;
+gCutGrassSpriteArray = 0x201FFF0;
diff --git a/src/braille_puzzles.c b/src/braille_puzzles.c
index 37eda65d3..94643691c 100644
--- a/src/braille_puzzles.c
+++ b/src/braille_puzzles.c
@@ -16,7 +16,7 @@
#include "rom6.h"
extern u8 gPlayerPartyCount;
-extern u8 gUnknown_03005CE0;
+extern u8 gLastFieldPokeMenuOpened;
extern u32 gUnknown_0202FF84[];
@@ -106,7 +106,7 @@ bool8 ShouldDoBrailleFlyEffect(void)
void DoBrailleFlyEffect(void)
{
- gUnknown_0202FF84[0] = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(0x3C);
}
diff --git a/src/field_player_avatar.c b/src/field_player_avatar.c
index 9a7b25459..53bbf013b 100644
--- a/src/field_player_avatar.c
+++ b/src/field_player_avatar.c
@@ -24,13 +24,7 @@ extern u8 gOtherText_PokeOnHook[];
extern u8 gOtherText_NotEvenANibble[];
extern u8 gOtherText_ItGotAway[];
-extern struct
-{
- s32 x;
- s32 y;
- u32 unk8;
- u32 unkC;
-} gUnknown_0202FF84;
+extern u32 gUnknown_0202FF84[];
//Functions
static u32 sub_80587D8(void);
@@ -733,9 +727,9 @@ void PlayerAvatarTransition_Surfing(struct MapObject *a)
sub_805B980(a, GetPlayerAvatarGraphicsIdByStateId(3));
FieldObjectTurn(a, a->placeholder18);
SetPlayerAvatarStateMask(8);
- gUnknown_0202FF84.x = a->coords2.x;
- gUnknown_0202FF84.y = a->coords2.y;
- gUnknown_0202FF84.unk8 = gPlayerAvatar.mapObjectId;
+ gUnknown_0202FF84[0] = a->coords2.x;
+ gUnknown_0202FF84[1] = a->coords2.y;
+ gUnknown_0202FF84[2] = gPlayerAvatar.mapObjectId;
unk = FieldEffectStart(8);
a->mapobj_unk_1A = unk;
sub_8127ED0(unk, 1);
@@ -1293,10 +1287,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.x = c->coords2.x;
- gUnknown_0202FF84.y = c->coords2.y;
- gUnknown_0202FF84.unk8 = c->elevation;
- gUnknown_0202FF84.unkC = gSprites[c->spriteId].oam.priority;
+ 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;
FieldEffectStart(10);
PlaySE(SE_W070);
task->data[0]++;
diff --git a/src/fieldmap.c b/src/fieldmap.c
index 7a24897c4..b34a51bdc 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -1,5 +1,6 @@
#include "global.h"
#include "palette.h"
+#include "fieldmap.h"
struct BackupMapData
{
diff --git a/src/fldeff_cut.c b/src/fldeff_cut.c
index a54875fe1..f432027ab 100644
--- a/src/fldeff_cut.c
+++ b/src/fldeff_cut.c
@@ -14,7 +14,7 @@
#include "trig.h"
#include "map_obj_lock.h"
-extern u8 unk_201FFF0[8]; // seems to be an array of 8 sprite IDs
+extern u8 gCutGrassSpriteArray[8]; // seems to be an array of 8 sprite IDs
extern void (*gUnknown_0300485C)(void);
extern void (*gUnknown_03005CE4)(void);
@@ -23,8 +23,8 @@ extern struct SpriteTemplate gSpriteTemplate_CutGrass;
extern struct MapPosition gUnknown_0203923C;
-extern u8 gUnknown_03005CE0;
-extern u32 gUnknown_0202FF84;
+extern u8 gLastFieldPokeMenuOpened;
+extern u32 gUnknown_0202FF84[];
extern u8 UseCutScript;
@@ -65,7 +65,7 @@ bool8 SetUpFieldMove_Cut(void)
{
tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
if(MetatileBehavior_IsPokeGrass(tileBehavior) == TRUE
- || MetatileBehavior_IsAsh(tileBehavior) == TRUE)
+ || MetatileBehavior_IsAshGrass(tileBehavior) == TRUE)
{
gUnknown_0300485C = sub_808AB90;
gUnknown_03005CE4 = sub_80A25E8;
@@ -81,7 +81,7 @@ bool8 SetUpFieldMove_Cut(void)
void sub_80A25E8(void)
{
FieldEffectStart(1);
- gUnknown_0202FF84 = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
}
bool8 FldEff_UseCutOnGrass(void)
@@ -96,7 +96,7 @@ bool8 FldEff_UseCutOnGrass(void)
void sub_80A2634(void)
{
- gUnknown_0202FF84 = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(&UseCutScript);
}
@@ -131,7 +131,7 @@ bool8 FldEff_CutGrass(void)
if(MapGridGetZCoordAt(x, y) == (s8)gUnknown_0203923C.height)
{
tileBehavior = MapGridGetMetatileBehaviorAt(x, y);
- if(sub_80578F8(tileBehavior) == TRUE)
+ if(MetatileBehavior_IsCuttableGrass(tileBehavior) == TRUE)
{
sub_80A27A8(x, y);
sub_805BCC0(x, y);
@@ -145,9 +145,9 @@ bool8 FldEff_CutGrass(void)
// populate sprite ID array
for(i = 0; i < 8; i++)
{
- unk_201FFF0[i] = CreateSprite((struct SpriteTemplate *)&gSpriteTemplate_CutGrass,
+ gCutGrassSpriteArray[i] = CreateSprite((struct SpriteTemplate *)&gSpriteTemplate_CutGrass,
gSprites[gPlayerAvatar.spriteId].oam.x + 8, gSprites[gPlayerAvatar.spriteId].oam.y + 20, 0);
- gSprites[unk_201FFF0[i]].data2 = 32 * i;
+ gSprites[gCutGrassSpriteArray[i]].data2 = 32 * i;
}
return 0;
}
@@ -284,10 +284,10 @@ void sub_80A2AB8(void)
for(i = 1; i < 8; i++)
{
- DestroySprite(&gSprites[unk_201FFF0[i]]);
+ DestroySprite(&gSprites[gCutGrassSpriteArray[i]]);
}
- FieldEffectStop(&gSprites[unk_201FFF0[0]], 0x3A);
+ FieldEffectStop(&gSprites[gCutGrassSpriteArray[0]], 0x3A);
sub_8064E2C();
ScriptContext2_Disable();
}
diff --git a/src/fldeff_strength.c b/src/fldeff_strength.c
index 9166cb3dd..e7e7473d0 100644
--- a/src/fldeff_strength.c
+++ b/src/fldeff_strength.c
@@ -12,9 +12,9 @@ static void sub_811AA18(void);
static void sub_811AA38(void);
static void sub_811AA9C(void);
-extern u32 gUnknown_0202FF84;
+extern u32 gUnknown_0202FF84[];
-extern u8 gUnknown_03005CE0;
+extern u8 gLastFieldPokeMenuOpened;
extern u16 gScriptResult;
extern void (*gUnknown_0300485C)(void);
extern void (*gUnknown_03005CE4)(void);
@@ -25,7 +25,7 @@ bool8 SetUpFieldMove_Strength(void)
{
if (ShouldDoBrailleStrengthEffect())
{
- gScriptResult = gUnknown_03005CE0;
+ gScriptResult = gLastFieldPokeMenuOpened;
gUnknown_0300485C = sub_808AB90;
gUnknown_03005CE4 = sub_811AA38;
}
@@ -33,7 +33,7 @@ bool8 SetUpFieldMove_Strength(void)
{
if (npc_before_player_of_type(87) != TRUE)
return 0;
- gScriptResult = gUnknown_03005CE0;
+ gScriptResult = gLastFieldPokeMenuOpened;
gUnknown_0300485C = sub_808AB90;
gUnknown_03005CE4 = sub_811AA18;
}
@@ -43,13 +43,13 @@ bool8 SetUpFieldMove_Strength(void)
static void sub_811AA18(void)
{
- gUnknown_0202FF84 = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(UseStrengthScript);
}
static void sub_811AA38(void)
{
- gUnknown_0202FF84 = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
FieldEffectStart(40);
}
@@ -59,7 +59,7 @@ bool8 FldEff_UseStrength(void)
gTasks[taskId].data[8] = (u32)sub_811AA9C >> 16;
gTasks[taskId].data[9] = (u32)sub_811AA9C;
- GetMonNickname(&gPlayerParty[gUnknown_0202FF84], gStringVar1);
+ GetMonNickname(&gPlayerParty[gUnknown_0202FF84[0]], gStringVar1);
return FALSE;
}
diff --git a/src/fldeff_teleport.c b/src/fldeff_teleport.c
index 47a7d223a..0e6933649 100644
--- a/src/fldeff_teleport.c
+++ b/src/fldeff_teleport.c
@@ -7,10 +7,10 @@
extern void sub_8087BA8(void);
-extern u32 gUnknown_0202FF84;
+extern u32 gUnknown_0202FF84[];
extern void (*gUnknown_0300485C)(void);
-extern u8 gUnknown_03005CE0;
+extern u8 gLastFieldPokeMenuOpened;
extern void (*gUnknown_03005CE4)(void);
void hm_teleport_run_dp02scr(void);
@@ -32,7 +32,7 @@ void hm_teleport_run_dp02scr(void)
{
new_game();
FieldEffectStart(63);
- gUnknown_0202FF84 = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
}
bool8 FldEff_UseTeleport(void)
diff --git a/src/metatile_behavior.c b/src/metatile_behavior.c
index 611a368fe..a7fb5abef 100644
--- a/src/metatile_behavior.c
+++ b/src/metatile_behavior.c
@@ -826,9 +826,9 @@ bool8 MetatileBehavior_IsBerryTreeSoil(u8 var)
return FALSE;
}
-bool8 MetatileBehavior_IsAsh(u8 var)
+bool8 MetatileBehavior_IsAshGrass(u8 var)
{
- if (var == MB_ASH)
+ if (var == MB_ASHGRASS)
return TRUE;
else
return FALSE;
@@ -1236,9 +1236,9 @@ bool8 MetatileBehavior_IsRunningDisallowed(u8 var)
return FALSE;
}
-bool8 sub_80578F8(u8 var)
+bool8 MetatileBehavior_IsCuttableGrass(u8 var)
{
- if (var == MB_TALL_GRASS || var == MB_LONG_GRASS || var == MB_ASH || var == MB_LONG_GRASS_SOUTH_EDGE)
+ if (var == MB_TALL_GRASS || var == MB_LONG_GRASS || var == MB_ASHGRASS || var == MB_LONG_GRASS_SOUTH_EDGE)
return TRUE;
else
return FALSE;
diff --git a/src/rom4.c b/src/rom4.c
index 715f5d3f5..9d7fec115 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -469,16 +469,10 @@ struct MapConnection *sub_8053818(u8 dir)
if (connection == NULL)
return NULL;
-
- i = 0;
-
- while (i < count)
- {
- if (connection->direction == dir)
+
+ for(i = 0; i < count; i++, connection++)
+ if (connection->direction == dir)
return connection;
- i++;
- connection++;
- }
return NULL;
}
diff --git a/src/rom6.c b/src/rom6.c
index 9ac412ad5..037516489 100644
--- a/src/rom6.c
+++ b/src/rom6.c
@@ -15,7 +15,7 @@ extern u16 gScriptLastTalked;
extern u32 gUnknown_0202FF84[];
extern struct MapPosition gUnknown_0203923C;
extern void (*gUnknown_0300485C)(void);
-extern u8 gUnknown_03005CE0;
+extern u8 gLastFieldPokeMenuOpened;
extern void (*gUnknown_03005CE4)(void);
extern u8 UseRockSmashScript[];
@@ -134,7 +134,7 @@ bool8 SetUpFieldMove_RockSmash(void)
static void sub_810B53C(void)
{
- gUnknown_0202FF84[0] = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
ScriptContext1_SetupScript(UseRockSmashScript);
}
@@ -173,7 +173,7 @@ static void sub_810B5D8(void)
{
sub_8053014();
FieldEffectStart(0x26);
- gUnknown_0202FF84[0] = gUnknown_03005CE0;
+ gUnknown_0202FF84[0] = gLastFieldPokeMenuOpened;
}
int FldEff_UseDig(void)
diff --git a/sym_common.txt b/sym_common.txt
index 56f4cdf2f..fcd138cb4 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -216,7 +216,7 @@ gUnknown_03005560: @ 3005560
gUnknown_030056A0: @ 30056A0
.space 0x640
-gUnknown_03005CE0: @ 3005CE0
+gLastFieldPokeMenuOpened: @ 3005CE0
.space 0x4
gUnknown_03005CE4: @ 3005CE4
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 15:08:03 +0000