summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-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
9 files changed, 42 insertions, 53 deletions
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)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 21:17:52 +0000