dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Name more unknown vars

Browse Source
This commit is contained in:
Phlosioneer
2019-02-27 15:18:56 -05:00
parent 4137dd7b0b
commit 648fc3d4f3
26 changed files with 141 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_specials.c
+1 -1
View File
@@ -3580,7 +3580,7 @@ bool32 sub_813B4E0(void)
bool32 sub_813B514(void)
{
if (!VarGet(VAR_0x403F))
if (!VarGet(VAR_ALWAYS_ZERO_0x403F))
{
return FALSE;
}
src/lottery_corner.c
+1 -1
View File
@@ -27,7 +27,7 @@ void ResetLotteryCorner(void)
u16 rand = Random();
SetLotteryNumber((Random() << 16) | rand);
VarSet(VAR_POKELOT_PRIZE, 0);
VarSet(VAR_POKELOT_PRIZE_ITEM, 0);
}
void SetRandomLotteryNumber(u16 i)
src/overworld.c
+3 -3
View File
@@ -1018,7 +1018,7 @@ static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp)
case MAP_NUM(ROUTE128):
return TRUE;
default:
if (VarGet(VAR_0x405E) < 4)
if (VarGet(VAR_RAYQUAZA_STATE) < 4)
return FALSE;
switch (warp->mapNum)
{
@@ -1059,9 +1059,9 @@ static bool16 IsInfiltratedWeatherInstitute(struct WarpData *warp)
static bool16 IsInflitratedSpaceCenter(struct WarpData *warp)
{
if (VarGet(VAR_0x405D) == 0)
if (VarGet(VAR_MOSSDEEP_STATE) == 0)
return FALSE;
else if (VarGet(VAR_0x405D) > 2)
else if (VarGet(VAR_MOSSDEEP_STATE) > 2)
return FALSE;
else if (warp->mapGroup != MAP_GROUP(MOSSDEEP_CITY_SPACE_CENTER_1F))
return FALSE;
src/secret_base.c
+2 -2
View File
@@ -407,7 +407,7 @@ void sub_80E9068(void)
bool8 sub_80E909C(void)
{
if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_0x4097) == 0)
if (gMapHeader.mapType == MAP_TYPE_SECRET_BASE && VarGet(VAR_SECRET_BASE_SHOULD_BE_INIT) == 0)
{
return FALSE;
}
@@ -494,7 +494,7 @@ void sub_80E9238(u8 flagIn)
sub_80E8CB0(&x, &y, 0x220);
MapGridSetMetatileIdAt(x + 7, y + 7, 0x221 | 0xc00);
}
else if (flagIn == 1 && VarGet(VAR_0x4089) == 1)
else if (flagIn == 1 && VarGet(VAR_SECRET_BASE_INITIALIZED) == 1)
{
sub_80E8CB0(&x, &y, 0x220);
MapGridSetMetatileIdAt(x + 7, y + 7, 0x20a | 0xc00);