summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_setup.c14
-rw-r--r--src/dewford_trend.c6
-rw-r--r--src/pokemon_size_record.c2
-rw-r--r--src/record_mixing.c2
-rw-r--r--src/rom4.c56
-rw-r--r--src/save_menu_util.c18
-rw-r--r--src/start_menu.c8
-rw-r--r--src/wild_encounter.c4
8 files changed, 53 insertions, 57 deletions
diff --git a/src/battle_setup.c b/src/battle_setup.c
index 35fa79a5d..f6fe85b46 100644
--- a/src/battle_setup.c
+++ b/src/battle_setup.c
@@ -620,7 +620,7 @@ u8 TrainerBattleLoadArg8(u8 *ptr)
u16 trainerflag_opponent(void)
{
- return gTrainerBattleOpponent + 1280;
+ return TRAINER_FLAG_START + gTrainerBattleOpponent;
}
bool32 battle_exit_is_player_defeat(u32 a1)
@@ -753,10 +753,8 @@ void TrainerWantsBattle(u8 ptr, u8 *a2)
u8 GetTrainerFlagFromScriptPointer(u8 *data)
{
- u32 localFlag;
-
- localFlag = TrainerBattleLoadArg16(data + 2);
- return FlagGet(localFlag + 0x500);
+ u32 flag = TrainerBattleLoadArg16(data + 2);
+ return FlagGet(TRAINER_FLAG_START + flag);
}
void sub_8082524(void)
@@ -788,17 +786,17 @@ void unref_sub_8082590(void)
u8 trainer_flag_check(u16 flag)
{
- return FlagGet(flag + 0x500);
+ return FlagGet(TRAINER_FLAG_START + flag);
}
void trainer_flag_set(u16 flag)
{
- FlagSet(flag + 0x500);
+ FlagSet(TRAINER_FLAG_START + flag);
}
void trainer_flag_clear(u16 flag)
{
- FlagReset(flag + 0x500);
+ FlagReset(TRAINER_FLAG_START + flag);
}
void sub_80825E4(void)
diff --git a/src/dewford_trend.c b/src/dewford_trend.c
index 5fecf66f4..6ae7a6ae7 100644
--- a/src/dewford_trend.c
+++ b/src/dewford_trend.c
@@ -282,10 +282,10 @@ bool8 sub_80FA364(u16 *a)
if(!SB1ContainsWords(a))
{
- if(!FlagGet(0x833))
+ if(!FlagGet(SYS_POPWORD_INPUT))
{
- FlagSet(0x833);
- if(!FlagGet(0x834))
+ FlagSet(SYS_POPWORD_INPUT);
+ if(!FlagGet(SYS_MIX_RECORD))
{
gSaveBlock1.easyChatPairs[0].words[0] = a[0];
gSaveBlock1.easyChatPairs[0].words[1] = a[1];
diff --git a/src/pokemon_size_record.c b/src/pokemon_size_record.c
index 96ab85fbe..6381881b7 100644
--- a/src/pokemon_size_record.c
+++ b/src/pokemon_size_record.c
@@ -190,6 +190,6 @@ void GiveGiftRibbonToParty(u8 index, u8 ribbonId)
}
}
if(gotRibbon)
- FlagSet(0x83B);
+ FlagSet(SYS_RIBBON_GET);
}
}
diff --git a/src/record_mixing.c b/src/record_mixing.c
index bfa9681c0..a7955f76a 100644
--- a/src/record_mixing.c
+++ b/src/record_mixing.c
@@ -260,7 +260,7 @@ void sub_80B9484(u8 taskId)
if(!gTasks[taskData[10]].isActive)
{
taskData[TD_STATE] = 2;
- FlagSet(0x834);
+ FlagSet(SYS_MIX_RECORD);
DestroyRecordMixingSprite();
DestroyTask(taskData[15]);
}
diff --git a/src/rom4.c b/src/rom4.c
index c15aadbc6..d7bd9b7a3 100644
--- a/src/rom4.c
+++ b/src/rom4.c
@@ -260,47 +260,47 @@ void sub_8052F5C(void)
void flag_var_implications_of_teleport_(void)
{
player_avatar_init_params_reset();
- FlagReset(2091);
- FlagReset(2093);
- FlagReset(2092);
- FlagReset(2089);
- FlagReset(2088);
+ FlagReset(SYS_CYCLING_ROAD);
+ FlagReset(SYS_CRUISE_MODE);
+ FlagReset(SYS_SAFARI_MODE);
+ FlagReset(SYS_USE_STRENGTH);
+ FlagReset(SYS_USE_FLASH);
}
void new_game(void)
{
player_avatar_init_params_reset();
- FlagReset(2091);
- FlagReset(2093);
- FlagReset(2092);
- FlagReset(2089);
- FlagReset(2088);
+ FlagReset(SYS_CYCLING_ROAD);
+ FlagReset(SYS_CRUISE_MODE);
+ FlagReset(SYS_SAFARI_MODE);
+ FlagReset(SYS_USE_STRENGTH);
+ FlagReset(SYS_USE_FLASH);
ScriptContext2_RunNewScript(gUnknown_0819FC9F);
}
void sub_8053014(void)
{
player_avatar_init_params_reset();
- FlagReset(2091);
- FlagReset(2093);
- FlagReset(2092);
- FlagReset(2089);
- FlagReset(2088);
+ FlagReset(SYS_CYCLING_ROAD);
+ FlagReset(SYS_CRUISE_MODE);
+ FlagReset(SYS_SAFARI_MODE);
+ FlagReset(SYS_USE_STRENGTH);
+ FlagReset(SYS_USE_FLASH);
}
void sub_8053050(void)
{
player_avatar_init_params_reset();
- FlagReset(2091);
- FlagReset(2093);
- FlagReset(2092);
- FlagReset(2089);
- FlagReset(2088);
+ FlagReset(SYS_CYCLING_ROAD);
+ FlagReset(SYS_CRUISE_MODE);
+ FlagReset(SYS_SAFARI_MODE);
+ FlagReset(SYS_USE_STRENGTH);
+ FlagReset(SYS_USE_FLASH);
}
void sub_805308C(void)
{
- FlagReset(2092);
+ FlagReset(SYS_SAFARI_MODE);
sub_8054164();
ResetCyclingRoadChallengeData();
mapnumbers_history_shift_sav1_0_2_4_out();
@@ -698,7 +698,7 @@ void sub_8053994(u32 a1)
sub_80806E4();
sub_8054164();
if (v2)
- FlagReset(2088);
+ FlagReset(SYS_USE_FLASH);
sub_8053C98();
sav1_reset_battle_music_maybe();
mapheader_run_script_with_tag_x3();
@@ -748,7 +748,7 @@ struct UnkPlayerStruct *sub_8053AA8(void)
u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
{
- if (a3 != 8 && FlagGet(2093))
+ if (a3 != 8 && FlagGet(SYS_CRUISE_MODE))
return 1;
if (a3 == 5)
return 16;
@@ -765,7 +765,7 @@ u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3)
u8 sub_8053B60(struct UnkPlayerStruct *playerStruct, u8 a2, u16 a3, u8 a4)
{
- if (FlagGet(2093) && a4 == 6)
+ if (FlagGet(SYS_CRUISE_MODE) && a4 == 6)
return 4;
if (sub_8056F24(a3) == TRUE)
return 2;
@@ -813,7 +813,7 @@ void sub_8053C98(void)
{
if (!gMapHeader.cave)
gSaveBlock1.flashUsed = 0;
- else if (FlagGet(2088))
+ else if (FlagGet(SYS_USE_FLASH))
gSaveBlock1.flashUsed = 1;
else
gSaveBlock1.flashUsed = gUnknown_0839ACE8;
@@ -839,7 +839,7 @@ void sub_8053D14(u16 mapDataId)
bool16 sub_8053D30(struct WarpData *warp)
{
- if (!FlagGet(2090))
+ if (!FlagGet(SYS_WEATHER_CTRL))
return FALSE;
if (warp->mapGroup != 0)
return FALSE;
@@ -955,7 +955,7 @@ void sav1_reset_battle_music_maybe(void)
void sub_8053F0C(void)
{
- if (FlagGet(16385) != TRUE)
+ if (FlagGet(SPECIAL_FLAG_1) != TRUE)
{
u16 newMusic = warp1_target_get_music();
u16 currentMusic = GetCurrentMapMusic();
@@ -1002,7 +1002,7 @@ u8 is_warp1_light_level_8_or_9(void)
void sub_8053FF8(void)
{
u16 music = warp1_target_get_music();
- if (FlagGet(16385) != TRUE && music != GetCurrentMapMusic())
+ if (FlagGet(SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic())
{
u8 speed = is_warp1_light_level_8_or_9();
FadeOutMapMusic(speed);
diff --git a/src/save_menu_util.c b/src/save_menu_util.c
index 6d3d23e25..1cc80910f 100644
--- a/src/save_menu_util.c
+++ b/src/save_menu_util.c
@@ -25,7 +25,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top)
if (sub_809473C())
width = 13;
- if (FlagGet(2049)) // player has Pokédex?
+ if (FlagGet(SYS_POKEDEX_GET))
{
// print info + dex information.
MenuDrawTextWindow(left, top, left + width, top + 11);
@@ -53,7 +53,7 @@ void sub_80946C8(u16 left, u16 top)
if (sub_809473C())
width = 13;
- if (FlagGet(2049)) // player has Pokédex?
+ if (FlagGet(SYS_POKEDEX_GET))
MenuZeroFillWindowRect(left, top, left + width, top + 11);
else
MenuZeroFillWindowRect(left, top, left + width, top + 9);
@@ -112,14 +112,12 @@ void PrintSavePlayTime(s16 x, s16 y)
u8 GetBadgeCount(void)
{
u8 badgeCount = 0;
- int badgeFlag = 0x807; // first badge flag is located here.
-
- for(;badgeFlag <= 0x80E; badgeFlag++)
- {
- if ( FlagGet(badgeFlag) )
+ int badgeFlag;
+
+ for (badgeFlag = BADGE01_GET; badgeFlag <= BADGE08_GET; badgeFlag++)
+ if (FlagGet(badgeFlag))
badgeCount++;
- }
-
+
return badgeCount;
}
@@ -127,7 +125,7 @@ u16 GetPokedexSeenCount()
{
u16 pokedexSeenCount;
- if ( IsNationalPokedex() ) // national dex check?
+ if (IsNationalPokedex())
pokedexSeenCount = GetNationalPokedexCount(1);
else
pokedexSeenCount = GetHoennPokedexCount(1);
diff --git a/src/start_menu.c b/src/start_menu.c
index fee6a7b8f..429589a22 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -170,12 +170,12 @@ static void AddStartMenuAction(u8 action)
static void BuildStartMenuActions_Normal(void)
{
- if(FlagGet(0x801) == TRUE)
+ if(FlagGet(SYS_POKEDEX_GET) == TRUE)
AddStartMenuAction(MENU_ACTION_POKEDEX);
- if(FlagGet(0x800) == TRUE)
+ if(FlagGet(SYS_POKEMON_GET) == TRUE)
AddStartMenuAction(MENU_ACTION_POKEMON);
AddStartMenuAction(MENU_ACTION_BAG);
- if(FlagGet(0x802) == TRUE)
+ if(FlagGet(SYS_POKENAV_GET) == TRUE)
AddStartMenuAction(MENU_ACTION_POKENAV);
AddStartMenuAction(MENU_ACTION_PLAYER);
AddStartMenuAction(MENU_ACTION_SAVE);
@@ -198,7 +198,7 @@ static void BuildStartMenuActions_Link(void)
{
AddStartMenuAction(MENU_ACTION_POKEMON);
AddStartMenuAction(MENU_ACTION_BAG);
- if(FlagGet(0x802) == TRUE)
+ if(FlagGet(SYS_POKENAV_GET) == TRUE)
AddStartMenuAction(MENU_ACTION_POKENAV);
AddStartMenuAction(MENU_ACTION_PLAYER_LINK);
AddStartMenuAction(MENU_ACTION_OPTION);
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index fc1776d07..8c7cfe80c 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -766,9 +766,9 @@ bool8 RepelCheck(bool8 level)
void ApplyFluteEncounterRateMod(u32 *a1)
{
- if(FlagGet(0x84D) == 1)
+ if(FlagGet(SYS_ENC_UP_ITEM) == 1)
*a1 = *a1 + *a1 / 2;
- else if(FlagGet(0x84E) == 1)
+ else if(FlagGet(SYS_ENC_DOWN_ITEM) == 1)
*a1 = *a1 / 2;
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 07:13:57 +0000