summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/engine/clock.c2
-rw-r--r--src/field/decoration.c6
-rw-r--r--src/field/event_data.c6
-rw-r--r--src/field/field_specials.c8
-rw-r--r--src/field/landmark.c46
-rw-r--r--src/field/region_map.c6
-rw-r--r--src/field/secret_base.c8
-rw-r--r--src/field/tv.c2
8 files changed, 42 insertions, 42 deletions
diff --git a/src/engine/clock.c b/src/engine/clock.c
index cb8af64a8..8f123c29c 100644
--- a/src/engine/clock.c
+++ b/src/engine/clock.c
@@ -45,7 +45,7 @@ static void UpdatePerDay(struct Time *time)
if (days != time->days && days <= time->days)
{
newDays = time->days - days;
- ClearUpperFlags();
+ ClearDailyFlags();
UpdateDewfordTrendPerDay(newDays);
UpdateTVShowsPerDay(newDays);
UpdateWeatherPerDay(newDays);
diff --git a/src/field/decoration.c b/src/field/decoration.c
index c7647f98d..c36c10a08 100644
--- a/src/field/decoration.c
+++ b/src/field/decoration.c
@@ -2322,12 +2322,12 @@ void sub_80FF474(void)
u8 j;
for (i=0; i<14; i++)
{
- if (FlagGet(i + 0xae) == 1)
+ if (FlagGet(i + FLAG_DECORATION_2) == 1)
{
- FlagClear(i + 0xae);
+ FlagClear(i + FLAG_DECORATION_2);
for (j=0; j<gMapHeader.events->mapObjectCount; j++)
{
- if (gMapHeader.events->mapObjects[j].flagId == i + 0xae)
+ if (gMapHeader.events->mapObjects[j].flagId == i + FLAG_DECORATION_2)
{
break;
}
diff --git a/src/field/event_data.c b/src/field/event_data.c
index 43d49c417..5c8b7d7e5 100644
--- a/src/field/event_data.c
+++ b/src/field/event_data.c
@@ -3,7 +3,7 @@
#include "pokedex.h"
#define TEMP_FLAGS_SIZE 0x4
-#define TEMP_UPPER_FLAGS_SIZE 0x8
+#define DAILY_FLAGS_SIZE 0x8
#define TEMP_VARS_SIZE 0x20
EWRAM_DATA u16 gSpecialVar_0x8000 = 0;
@@ -43,9 +43,9 @@ void ClearTempFieldEventData(void)
}
// probably had different flag splits at one point.
-void ClearUpperFlags(void)
+void ClearDailyFlags(void)
{
- memset(gSaveBlock1.flags + 0x118, 0, TEMP_UPPER_FLAGS_SIZE);
+ memset(gSaveBlock1.flags + (DAILY_FLAGS_START / 8), 0, DAILY_FLAGS_SIZE);
}
void DisableNationalPokedex(void)
diff --git a/src/field/field_specials.c b/src/field/field_specials.c
index d654d10f5..9a286dd6e 100644
--- a/src/field/field_specials.c
+++ b/src/field/field_specials.c
@@ -1881,14 +1881,14 @@ bool8 ScrSpecial_AreLeadMonEVsMaxedOut(void)
u8 sub_810F5BC(void)
{
- if (!FlagGet(0xc7) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
+ if (!FlagGet(FLAG_RUSTURF_TUNNEL_OPENED) && gSaveBlock1.location.mapGroup == MAP_GROUP(RUSTURF_TUNNEL) && gSaveBlock1.location.mapNum == MAP_NUM(RUSTURF_TUNNEL))
{
- if (FlagGet(0x3a3))
+ if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_1))
{
VarSet(VAR_0x409a, 4);
return TRUE;
}
- else if (FlagGet(0x3a4))
+ else if (FlagGet(FLAG_HIDE_RUSTURF_TUNNEL_ROCK_2))
{
VarSet(VAR_0x409a, 5);
return TRUE;
@@ -2002,7 +2002,7 @@ static void sub_810F814(u8 taskId)
bool8 sub_810F828(void)
{
- return FlagGet(0x2b8);
+ return FlagGet(FLAG_UNKNOWN_2B8);
}
void SetRoute119Weather(void)
diff --git a/src/field/landmark.c b/src/field/landmark.c
index 1b7805e96..476821ec6 100644
--- a/src/field/landmark.c
+++ b/src/field/landmark.c
@@ -54,43 +54,43 @@ extern const u8 gLandmarkName_FossilManiacsHouse[];
extern const u8 gLandmarkName_HuntersHouse[];
extern const u8 gLandmarkName_SkyPillar[];
-static const struct Landmark Landmark_FlowerShop = {gLandmarkName_FlowerShop, 2108};
+static const struct Landmark Landmark_FlowerShop = {gLandmarkName_FlowerShop, FLAG_LANDMARK_FLOWER_SHOP};
static const struct Landmark Landmark_PetalburgWoods = {gLandmarkName_PetalburgWoods, -1};
-static const struct Landmark Landmark_MrBrineysCottage = {gLandmarkName_MrBrineysCottage, 2109};
-static const struct Landmark Landmark_AbandonedShip = {gLandmarkName_AbandonedShip, 2110};
-static const struct Landmark Landmark_SeashoreHouse = {gLandmarkName_SeashoreHouse, 2111};
+static const struct Landmark Landmark_MrBrineysCottage = {gLandmarkName_MrBrineysCottage, FLAG_LANDMARK_MR_BRINEY_HOUSE};
+static const struct Landmark Landmark_AbandonedShip = {gLandmarkName_AbandonedShip, FLAG_LANDMARK_ABANDONED_SHIP};
+static const struct Landmark Landmark_SeashoreHouse = {gLandmarkName_SeashoreHouse, FLAG_LANDMARK_SEASHORE_HOUSE};
static const struct Landmark Landmark_SlateportBeach = {gLandmarkName_SlateportBeach, -1};
static const struct Landmark Landmark_CyclingRoad = {gLandmarkName_CyclingRoad, -1};
-static const struct Landmark Landmark_NewMauville = {gLandmarkName_NewMauville, 2112};
-static const struct Landmark Landmark_TrickHouse = {gLandmarkName_TrickHouse, 2114};
-static const struct Landmark Landmark_OldLadysRestShop = {gLandmarkName_OldLadysRestShop, 2113};
+static const struct Landmark Landmark_NewMauville = {gLandmarkName_NewMauville, FLAG_LANDMARK_NEW_MAUVILLE};
+static const struct Landmark Landmark_TrickHouse = {gLandmarkName_TrickHouse, FLAG_LANDMARK_TRICK_HOUSE};
+static const struct Landmark Landmark_OldLadysRestShop = {gLandmarkName_OldLadysRestShop, FLAG_LANDMARK_OLD_LADY_REST_SHOP};
static const struct Landmark Landmark_Desert = {gLandmarkName_Desert, -1};
-static const struct Landmark Landmark_WinstrateFamily = {gLandmarkName_WinstrateFamily, 2115};
+static const struct Landmark Landmark_WinstrateFamily = {gLandmarkName_WinstrateFamily, FLAG_LANDMARK_WINSTRATE_FAMILY};
static const struct Landmark Landmark_CableCar = {gLandmarkName_CableCar, -1};
-static const struct Landmark Landmark_GlassWorkshop = {gLandmarkName_GlassWorkshop, 2116};
+static const struct Landmark Landmark_GlassWorkshop = {gLandmarkName_GlassWorkshop, FLAG_LANDMARK_GLASS_WORKSHOP};
static const struct Landmark Landmark_WeatherInstitute = {gLandmarkName_WeatherInstitute, -1};
static const struct Landmark Landmark_MeteorFalls = {gLandmarkName_MeteorFalls, -1};
-static const struct Landmark Landmark_TunnelersRestHouse = {gLandmarkName_TunnelersRestHouse, 2138};
+static const struct Landmark Landmark_TunnelersRestHouse = {gLandmarkName_TunnelersRestHouse, FLAG_LANDMARK_TUNNELERS_REST_HOUSE};
static const struct Landmark Landmark_RusturfTunnel = {gLandmarkName_RusturfTunnel, -1};
-static const struct Landmark Landmark_PokemonDayCare = {gLandmarkName_PokemonDayCare, 2118};
+static const struct Landmark Landmark_PokemonDayCare = {gLandmarkName_PokemonDayCare, FLAG_LANDMARK_POKEMON_DAYCARE};
static const struct Landmark Landmark_SafariZoneEntrance = {gLandmarkName_SafariZoneEntrance, -1};
static const struct Landmark Landmark_MtPyre = {gLandmarkName_MtPyre, -1};
static const struct Landmark Landmark_ShoalCave = {gLandmarkName_ShoalCave, -1};
-static const struct Landmark Landmark_SeafloorCavern = {gLandmarkName_SeafloorCavern, 2119};
+static const struct Landmark Landmark_SeafloorCavern = {gLandmarkName_SeafloorCavern, FLAG_LANDMARK_SEAFLOOR_CAVERN};
static const struct Landmark Landmark_GraniteCave = {gLandmarkName_GraniteCave, -1};
static const struct Landmark Landmark_OceanCurrent = {gLandmarkName_OceanCurrent, -1};
-static const struct Landmark Landmark_LanettesHouse = {gLandmarkName_LanettesHouse, 2117};
-static const struct Landmark Landmark_FieryPath = {gLandmarkName_FieryPath, 2122};
+static const struct Landmark Landmark_LanettesHouse = {gLandmarkName_LanettesHouse, FLAG_LANDMARK_LANETTES_HOUSE};
+static const struct Landmark Landmark_FieryPath = {gLandmarkName_FieryPath, FLAG_LANDMARK_FIERY_PATH};
static const struct Landmark Landmark_JaggedPass = {gLandmarkName_JaggedPass, -1};
-static const struct Landmark Landmark_BerryMastersHouse = {gLandmarkName_BerryMastersHouse, 2147};
-static const struct Landmark Landmark_IslandCave = {gLandmarkName_IslandCave, 2133};
-static const struct Landmark Landmark_DesertRuins = {gLandmarkName_DesertRuins, 2134};
-static const struct Landmark Landmark_ScorchedSlab = {gLandmarkName_ScorchedSlab, 2136};
-static const struct Landmark Landmark_AncientTomb = {gLandmarkName_AncientTomb, 2137};
-static const struct Landmark Landmark_SealedChamber = {gLandmarkName_SealedChamber, 2140};
-static const struct Landmark Landmark_FossilManiacsHouse = {gLandmarkName_FossilManiacsHouse, 2135};
-static const struct Landmark Landmark_HuntersHouse = {gLandmarkName_HuntersHouse, 2139};
-static const struct Landmark Landmark_SkyPillar = {gLandmarkName_SkyPillar, 2142};
+static const struct Landmark Landmark_BerryMastersHouse = {gLandmarkName_BerryMastersHouse, FLAG_LANDMARK_BERRY_MASTERS_HOUSE};
+static const struct Landmark Landmark_IslandCave = {gLandmarkName_IslandCave, FLAG_LANDMARK_ISLAND_CAVE};
+static const struct Landmark Landmark_DesertRuins = {gLandmarkName_DesertRuins, FLAG_LANDMARK_DESERT_RUINS};
+static const struct Landmark Landmark_ScorchedSlab = {gLandmarkName_ScorchedSlab, FLAG_LANDMARK_SCORCHED_SLAB};
+static const struct Landmark Landmark_AncientTomb = {gLandmarkName_AncientTomb, FLAG_LANDMARK_ANCIENT_TOMB};
+static const struct Landmark Landmark_SealedChamber = {gLandmarkName_SealedChamber, FLAG_LANDMARK_SEALED_CHAMBER};
+static const struct Landmark Landmark_FossilManiacsHouse = {gLandmarkName_FossilManiacsHouse, FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE};
+static const struct Landmark Landmark_HuntersHouse = {gLandmarkName_HuntersHouse, FLAG_LANDMARK_HUNTERS_HOUSE};
+static const struct Landmark Landmark_SkyPillar = {gLandmarkName_SkyPillar, FLAG_LANDMARK_SKY_PILLAR};
static const struct Landmark *const Landmarks_Route104_0[] =
{
diff --git a/src/field/region_map.c b/src/field/region_map.c
index f2e4b3251..12bf1a5f2 100644
--- a/src/field/region_map.c
+++ b/src/field/region_map.c
@@ -916,9 +916,9 @@ static u16 sub_80FB758(u16 mapSectionId)
return FlagGet(FLAG_VISITED_EVER_GRANDE_CITY) ? 2 : 3;
case MAPSEC_BATTLE_TOWER:
- return FlagGet(FLAG_UNLOCK_BATTLE_TOWER) ? 4 : 0;
+ return FlagGet(FLAG_LANDMARK_BATTLE_TOWER) ? 4 : 0;
case MAPSEC_SOUTHERN_ISLAND:
- return FlagGet(FLAG_UNLOCK_SOUTHERN_ISLAND) ? 1 : 0;
+ return FlagGet(FLAG_LANDMARK_SOUTHERN_ISLAND) ? 1 : 0;
default:
return 1;
}
@@ -1822,7 +1822,7 @@ static void sub_80FC69C(void)
sub_8053538((gSaveBlock2.playerGender == MALE) ? 12 : 13);
break;
case MAPSEC_EVER_GRANDE_CITY:
- sub_8053538((FlagGet(0x854) && ewram0_3.regionMap.everGrandeCityArea == 0) ? 20 : 11);
+ sub_8053538((FlagGet(SYS_POKEMON_LEAGUE_FLY) && ewram0_3.regionMap.everGrandeCityArea == 0) ? 20 : 11);
break;
default:
if (sUnknown_083E7920[ewram0_3.regionMap.mapSectionId][2] != 0)
diff --git a/src/field/secret_base.c b/src/field/secret_base.c
index fee79a18c..bb7716190 100644
--- a/src/field/secret_base.c
+++ b/src/field/secret_base.c
@@ -877,7 +877,7 @@ void sub_80BC56C(void)
void sub_80BC5BC(void)
{
gSaveBlock1.secretBases[sub_80BC14C(gUnknown_020387DC)].sbr_field_1_6 ^= 1;
- FlagSet(0x10C);
+ FlagSet(FLAG_DECORATION_16);
}
void SecretBasePC_Decoration(void)
@@ -1244,7 +1244,7 @@ void sub_80BCE90()
{
u16 curBaseIndex = VarGet(VAR_0x4054);
- if (!FlagGet(0x8C2))
+ if (!FlagGet(FLAG_DAILY_UNKNOWN_8C2))
{
u8 i;
@@ -1253,7 +1253,7 @@ void sub_80BCE90()
gSaveBlock1.secretBases[i].sbr_field_1_5 = 0;
}
- FlagSet(0x8C2);
+ FlagSet(FLAG_DAILY_UNKNOWN_8C2);
}
gSpecialVar_0x8004 = sub_80BCCA4(curBaseIndex);
@@ -1650,7 +1650,7 @@ void sub_80BD610(struct SecretBaseRecord *basesA, struct SecretBaseRecord *bases
void sub_80BD674(void *playerRecords, u32 size, u8 c)
{
- if (FlagGet(0x60))
+ if (FlagGet(FLAG_RECEIVED_SECRET_POWER))
{
u16 i;
u8 numLinkedPlayers = GetLinkPlayerCount();
diff --git a/src/field/tv.c b/src/field/tv.c
index 71d6455bd..c3141e0b5 100644
--- a/src/field/tv.c
+++ b/src/field/tv.c
@@ -674,7 +674,7 @@ void GabbyAndTyBeforeInterview(void)
TakeTVShowInSearchOfTrainersOffTheAir();
if (gSaveBlock1.gabbyAndTyData.lastMove == 0)
- FlagSet(1);
+ FlagSet(FLAG_TEMP_1);
}
void sub_80BDC14(void)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-07 03:36:31 +0000