diff options
Diffstat (limited to 'src')
31 files changed, 134 insertions, 124 deletions
diff --git a/src/battle/battle_3.c b/src/battle/battle_3.c index 342395c34..f627e50f0 100644 --- a/src/battle/battle_3.c +++ b/src/battle/battle_3.c @@ -3137,15 +3137,15 @@ u8 IsPokeDisobedient(void) if (gBattleTypeFlags & BATTLE_TYPE_LINK || GetBankSide(gBankAttacker) == 1 || !IsOtherTrainer(gBattleMons[gBankAttacker].otId, gBattleMons[gBankAttacker].otName) - || FlagGet(BADGE08_GET)) + || FlagGet(FLAG_BADGE08_GET)) return 0; obedienceLevel = 10; - if (FlagGet(BADGE02_GET)) + if (FlagGet(FLAG_BADGE02_GET)) obedienceLevel = 30; - if (FlagGet(BADGE04_GET)) + if (FlagGet(FLAG_BADGE04_GET)) obedienceLevel = 50; - if (FlagGet(BADGE06_GET)) + if (FlagGet(FLAG_BADGE06_GET)) obedienceLevel = 70; if (gBattleMons[gBankAttacker].level <= obedienceLevel) diff --git a/src/battle/battle_message.c b/src/battle/battle_message.c index fb045c8a7..6faa3ace3 100644 --- a/src/battle/battle_message.c +++ b/src/battle/battle_message.c @@ -762,7 +762,7 @@ u32 StrCpyDecodeBattle(const u8* src, u8* dst) HANDLE_NICKNAME_STRING_CASE(BATTLE_STRUCT->scriptingActive, BATTLE_STRUCT->unk1605E) break; case 35: // lanette pc - if (FlagGet(SYS_PC_LANETTE)) + if (FlagGet(FLAG_SYS_PC_LANETTE)) toCpy = BattleText_Lanette; else toCpy = BattleText_Someone; diff --git a/src/battle/battle_setup.c b/src/battle/battle_setup.c index 9f51c2878..6baf47dee 100644 --- a/src/battle/battle_setup.c +++ b/src/battle/battle_setup.c @@ -441,7 +441,17 @@ const struct TrainerEyeTrainer gTrainerEyeTrainers[] = }, }; -static const u16 sBadgeFlags[] = {BADGE01_GET, BADGE02_GET, BADGE03_GET, BADGE04_GET, BADGE05_GET, BADGE06_GET, BADGE07_GET, BADGE08_GET}; +static const u16 sBadgeFlags[] = +{ + FLAG_BADGE01_GET, + FLAG_BADGE02_GET, + FLAG_BADGE03_GET, + FLAG_BADGE04_GET, + FLAG_BADGE05_GET, + FLAG_BADGE06_GET, + FLAG_BADGE07_GET, + FLAG_BADGE08_GET, +}; static void DoStandardWildBattle(void); static void DoSafariBattle(void); diff --git a/src/battle/calculate_base_damage.c b/src/battle/calculate_base_damage.c index f9ac03075..5c91b3657 100644 --- a/src/battle/calculate_base_damage.c +++ b/src/battle/calculate_base_damage.c @@ -90,7 +90,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE01_GET) + && FlagGet(FLAG_BADGE01_GET) && !GetBankSide(bankAtk)) attack = (110 * attack) / 100; } @@ -98,7 +98,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE05_GET) + && FlagGet(FLAG_BADGE05_GET) && !GetBankSide(bankDef)) defense = (110 * defense) / 100; } @@ -106,7 +106,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE07_GET) + && FlagGet(FLAG_BADGE07_GET) && !GetBankSide(bankAtk)) spAttack = (110 * spAttack) / 100; } @@ -114,7 +114,7 @@ s32 CalculateBaseDamage(struct BattlePokemon *attacker, struct BattlePokemon *de { if ((gBattleTypeFlags & BATTLE_TYPE_TRAINER) && gTrainerBattleOpponent != 1024 - && FlagGet(BADGE07_GET) + && FlagGet(FLAG_BADGE07_GET) && !GetBankSide(bankDef)) spDefense = (110 * spDefense) / 100; } diff --git a/src/battle/post_battle_event_funcs.c b/src/battle/post_battle_event_funcs.c index 27d7022fe..0617763f6 100644 --- a/src/battle/post_battle_event_funcs.c +++ b/src/battle/post_battle_event_funcs.c @@ -16,14 +16,14 @@ int GameClear(void) ScrSpecial_HealPlayerParty(); - if (FlagGet(SYS_GAME_CLEAR) == TRUE) + if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE) { gUnknown_02039324 = 1; } else { gUnknown_02039324 = 0; - FlagSet(SYS_GAME_CLEAR); + FlagSet(FLAG_SYS_GAME_CLEAR); } if (!GetGameStat(1)) @@ -55,7 +55,7 @@ int GameClear(void) if (ribbonGet == TRUE) { IncrementGameStat(42); - FlagSet(SYS_RIBBON_GET); + FlagSet(FLAG_SYS_RIBBON_GET); } SetMainCallback2(sub_8141F90); diff --git a/src/engine/clock.c b/src/engine/clock.c index 8f123c29c..416aaa6bb 100644 --- a/src/engine/clock.c +++ b/src/engine/clock.c @@ -20,7 +20,7 @@ static void ReturnFromStartWallClock(void); static void InitTimeBasedEvents(void) { - FlagSet(SYS_CLOCK_SET); + FlagSet(FLAG_SYS_CLOCK_SET); RtcCalcLocalTime(); gSaveBlock2.lastBerryTreeUpdate = gLocalTime; VarSet(VAR_DAYS, gLocalTime.days); @@ -28,7 +28,7 @@ static void InitTimeBasedEvents(void) void DoTimeBasedEvents(void) { - if (FlagGet(SYS_CLOCK_SET)) + if (FlagGet(FLAG_SYS_CLOCK_SET)) { RtcCalcLocalTime(); UpdatePerDay(&gLocalTime); diff --git a/src/engine/record_mixing.c b/src/engine/record_mixing.c index 2624837c7..6cb1e54b2 100644 --- a/src/engine/record_mixing.c +++ b/src/engine/record_mixing.c @@ -131,7 +131,7 @@ void Task_RecordMixing_Main(u8 taskId) if (!gTasks[data[10]].isActive) { tState = 2; - FlagSet(SYS_MIX_RECORD); + FlagSet(FLAG_SYS_MIX_RECORD); DestroyRecordMixingSprite(); DestroyTask(tSndEffTaskId); } @@ -1019,7 +1019,7 @@ void sub_80B9F3C(u16 *a, u8 b) VarSet(VAR_0x4001, *a); StringCopy(gStringVar1, gLinkPlayers[0].name); if (*a == ITEM_EON_TICKET) - FlagSet(SYS_HAS_EON_TICKET); + FlagSet(FLAG_SYS_HAS_EON_TICKET); } else { diff --git a/src/engine/save_menu_util.c b/src/engine/save_menu_util.c index a2d17bd36..771cb72c7 100644 --- a/src/engine/save_menu_util.c +++ b/src/engine/save_menu_util.c @@ -15,7 +15,7 @@ void HandleDrawSaveWindowInfo(s16 left, s16 top) if (IsResizeSaveWindowEnabled()) width = 13; - if (FlagGet(SYS_POKEDEX_GET)) + if (FlagGet(FLAG_SYS_POKEDEX_GET)) { // print info + dex information. MenuDrawTextWindow(left, top, left + width, top + 11); @@ -44,7 +44,7 @@ void HandleCloseSaveWindow(u16 left, u16 top) if (IsResizeSaveWindowEnabled()) width = 13; - if (FlagGet(SYS_POKEDEX_GET)) + if (FlagGet(FLAG_SYS_POKEDEX_GET)) MenuZeroFillWindowRect(left, top, left + width, top + 11); else MenuZeroFillWindowRect(left, top, left + width, top + 9); @@ -106,7 +106,7 @@ u8 GetBadgeCount(void) u8 badgeCount = 0; int badgeFlag; - for (badgeFlag = BADGE01_GET; badgeFlag <= BADGE08_GET; badgeFlag++) + for (badgeFlag = FLAG_BADGE01_GET; badgeFlag <= FLAG_BADGE08_GET; badgeFlag++) if (FlagGet(badgeFlag)) badgeCount++; diff --git a/src/engine/time_events.c b/src/engine/time_events.c index 831048add..3e3054aa3 100644 --- a/src/engine/time_events.c +++ b/src/engine/time_events.c @@ -85,9 +85,9 @@ void UpdateShoalTideFlag(void) { RtcCalcLocalTime(); if (tide[gLocalTime.hours]) - FlagSet(SYS_SHOAL_TIDE); + FlagSet(FLAG_SYS_SHOAL_TIDE); else - FlagClear(SYS_SHOAL_TIDE); + FlagClear(FLAG_SYS_SHOAL_TIDE); } } diff --git a/src/engine/trade.c b/src/engine/trade.c index 06a6b96c7..0567b4d2f 100644 --- a/src/engine/trade.c +++ b/src/engine/trade.c @@ -5696,7 +5696,7 @@ static void sub_804E1DC(void) numRibbons += GetMonData(&gEnemyParty[gUnknown_020297D8[1] % 6], MON_DATA_CHAMPION_RIBBON + i); } if (numRibbons != 0) - FlagSet(SYS_RIBBON_GET); + FlagSet(FLAG_SYS_RIBBON_GET); } void sub_804E22C(void) diff --git a/src/engine/trainer_card.c b/src/engine/trainer_card.c index 468890ca5..207fa5f77 100644 --- a/src/engine/trainer_card.c +++ b/src/engine/trainer_card.c @@ -323,7 +323,7 @@ void sub_8093390(struct TrainerCard *trainerCard) trainerCard->firstHallOfFameB = (playTime >> 8) & 0xFF; trainerCard->firstHallOfFameC = playTime & 0xFF; - trainerCard->hasPokedex = FlagGet(SYS_POKEDEX_GET); + trainerCard->hasPokedex = FlagGet(FLAG_SYS_POKEDEX_GET); trainerCard->var_3 = sub_8090FC0(); trainerCard->pokedexSeen = GetPokedexSeenCount(); @@ -543,14 +543,14 @@ void sub_80936D4(void) u32 badgeFlag; int i = 0; - badgeFlag = BADGE01_GET; + badgeFlag = FLAG_BADGE01_GET; while (1) { if (FlagGet(badgeFlag)) ewram0_2.var_e[i]++; badgeFlag++; i++; - if (badgeFlag > BADGE08_GET) + if (badgeFlag > FLAG_BADGE08_GET) { break; } diff --git a/src/field/braille_puzzles.c b/src/field/braille_puzzles.c index e6ab316d2..0d304714d 100644 --- a/src/field/braille_puzzles.c +++ b/src/field/braille_puzzles.c @@ -24,7 +24,7 @@ extern u8 S_OpenRegiceChamber[]; // regiice event script bool8 ShouldDoBrailleDigEffect(void) { - if (!FlagGet(SYS_BRAILLE_DIG) + if (!FlagGet(FLAG_SYS_BRAILLE_DIG) && (gSaveBlock1.location.mapGroup == MAP_GROUP(SEALED_CHAMBER_OUTER_ROOM) && gSaveBlock1.location.mapNum == MAP_NUM(SEALED_CHAMBER_OUTER_ROOM))) { @@ -49,7 +49,7 @@ void DoBrailleDigEffect(void) MapGridSetMetatileIdAt(18, 9, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(SYS_BRAILLE_DIG); + FlagSet(FLAG_SYS_BRAILLE_DIG); ScriptContext2_Disable(); } @@ -68,7 +68,7 @@ bool8 CheckRelicanthWailord(void) bool8 ShouldDoBrailleStrengthEffect(void) { - if (!FlagGet(SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1.location.mapNum == MAP_NUM(DESERT_RUINS))) + if (!FlagGet(FLAG_SYS_BRAILLE_STRENGTH) && (gSaveBlock1.location.mapGroup == MAP_GROUP(DESERT_RUINS) && gSaveBlock1.location.mapNum == MAP_NUM(DESERT_RUINS))) { if (gSaveBlock1.pos.x == 10 && gSaveBlock1.pos.y == 23) return TRUE; @@ -92,13 +92,13 @@ void DoBrailleStrengthEffect(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(SYS_BRAILLE_STRENGTH); + FlagSet(FLAG_SYS_BRAILLE_STRENGTH); ScriptContext2_Disable(); } bool8 ShouldDoBrailleFlyEffect(void) { - if (!FlagGet(SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP(ANCIENT_TOMB) && gSaveBlock1.location.mapNum == MAP_NUM(ANCIENT_TOMB))) + if (!FlagGet(FLAG_SYS_BRAILLE_FLY) && (gSaveBlock1.location.mapGroup == MAP_GROUP(ANCIENT_TOMB) && gSaveBlock1.location.mapNum == MAP_NUM(ANCIENT_TOMB))) { if (gSaveBlock1.pos.x == 8 && gSaveBlock1.pos.y == 25) return TRUE; @@ -138,13 +138,13 @@ void UseFlyAncientTomb_Finish(void) MapGridSetMetatileIdAt(16, 27, 3636); DrawWholeMapView(); PlaySE(SE_BAN); - FlagSet(SYS_BRAILLE_FLY); + FlagSet(FLAG_SYS_BRAILLE_FLY); ScriptContext2_Disable(); } void DoBrailleWait(void) { - if (!FlagGet(SYS_BRAILLE_WAIT)) + if (!FlagGet(FLAG_SYS_BRAILLE_WAIT)) CreateTask(Task_BrailleWait, 0x50); } diff --git a/src/field/dewford_trend.c b/src/field/dewford_trend.c index 90ea74f77..b36459655 100644 --- a/src/field/dewford_trend.c +++ b/src/field/dewford_trend.c @@ -101,10 +101,10 @@ bool8 sub_80FA364(u16 *a) if (!SB1ContainsWords(a)) { - if (!FlagGet(SYS_POPWORD_INPUT)) + if (!FlagGet(FLAG_SYS_POPWORD_INPUT)) { - FlagSet(SYS_POPWORD_INPUT); - if (!FlagGet(SYS_MIX_RECORD)) + FlagSet(FLAG_SYS_POPWORD_INPUT); + if (!FlagGet(FLAG_SYS_MIX_RECORD)) { gSaveBlock1.easyChatPairs[0].words[0] = a[0]; gSaveBlock1.easyChatPairs[0].words[1] = a[1]; diff --git a/src/field/event_data.c b/src/field/event_data.c index 5c8b7d7e5..3b3ac7bca 100644 --- a/src/field/event_data.c +++ b/src/field/event_data.c @@ -36,10 +36,10 @@ void ClearTempFieldEventData(void) { memset(gSaveBlock1.flags, 0, TEMP_FLAGS_SIZE); memset(gSaveBlock1.vars, 0, TEMP_VARS_SIZE); - FlagClear(SYS_ENC_UP_ITEM); - FlagClear(SYS_ENC_DOWN_ITEM); - FlagClear(SYS_USE_STRENGTH); - FlagClear(SYS_CTRL_OBJ_DELETE); + FlagClear(FLAG_SYS_ENC_UP_ITEM); + FlagClear(FLAG_SYS_ENC_DOWN_ITEM); + FlagClear(FLAG_SYS_USE_STRENGTH); + FlagClear(FLAG_SYS_CTRL_OBJ_DELETE); } // probably had different flag splits at one point. @@ -53,7 +53,7 @@ void DisableNationalPokedex(void) u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX); gSaveBlock2.pokedex.nationalMagic = 0; *nationalDexVar = 0; - FlagClear(SYS_NATIONAL_DEX); + FlagClear(FLAG_SYS_NATIONAL_DEX); } void EnableNationalPokedex(void) @@ -61,7 +61,7 @@ void EnableNationalPokedex(void) u16 *nationalDexVar = GetVarPointer(VAR_NATIONAL_DEX); gSaveBlock2.pokedex.nationalMagic = 0xDA; *nationalDexVar = 0x302; - FlagSet(SYS_NATIONAL_DEX); + FlagSet(FLAG_SYS_NATIONAL_DEX); gSaveBlock2.pokedex.unknown1 = 1; gSaveBlock2.pokedex.order = 0; sub_808C0A0(); @@ -69,7 +69,7 @@ void EnableNationalPokedex(void) bool32 IsNationalPokedexEnabled(void) { - if (gSaveBlock2.pokedex.nationalMagic == 0xDA && VarGet(VAR_NATIONAL_DEX) == 0x302 && FlagGet(SYS_NATIONAL_DEX)) + if (gSaveBlock2.pokedex.nationalMagic == 0xDA && VarGet(VAR_NATIONAL_DEX) == 0x302 && FlagGet(FLAG_SYS_NATIONAL_DEX)) return TRUE; else return FALSE; @@ -77,34 +77,34 @@ bool32 IsNationalPokedexEnabled(void) void DisableMysteryGift(void) { - FlagClear(SYS_EXDATA_ENABLE); + FlagClear(FLAG_SYS_EXDATA_ENABLE); } void EnableMysteryGift(void) { - FlagSet(SYS_EXDATA_ENABLE); + FlagSet(FLAG_SYS_EXDATA_ENABLE); } bool32 IsMysteryGiftEnabled(void) { - return FlagGet(SYS_EXDATA_ENABLE); + return FlagGet(FLAG_SYS_EXDATA_ENABLE); } void DisableResetRTC(void) { VarSet(VAR_RESET_RTC_ENABLE, 0); - FlagClear(SYS_RESET_RTC_ENABLE); + FlagClear(FLAG_SYS_RESET_RTC_ENABLE); } void EnableResetRTC(void) { VarSet(VAR_RESET_RTC_ENABLE, 0x920); - FlagSet(SYS_RESET_RTC_ENABLE); + FlagSet(FLAG_SYS_RESET_RTC_ENABLE); } bool32 CanResetRTC(void) { - if (FlagGet(SYS_RESET_RTC_ENABLE) && VarGet(VAR_RESET_RTC_ENABLE) == 0x920) + if (FlagGet(FLAG_SYS_RESET_RTC_ENABLE) && VarGet(VAR_RESET_RTC_ENABLE) == 0x920) return TRUE; else return FALSE; diff --git a/src/field/field_control_avatar.c b/src/field/field_control_avatar.c index c4e53b13f..dd29e9df5 100644 --- a/src/field/field_control_avatar.c +++ b/src/field/field_control_avatar.c @@ -423,11 +423,11 @@ static u8 *sub_8068500(struct MapPosition *position, u8 b, u8 c) static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2) { - if (FlagGet(BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE) + if (FlagGet(FLAG_BADGE05_GET) == TRUE && PartyHasMonWithSurf() == TRUE && IsPlayerFacingSurfableFishableWater() == TRUE) return UseSurfScript; if (MetatileBehavior_IsWaterfall(b) == TRUE) { - if (FlagGet(BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE) + if (FlagGet(FLAG_BADGE08_GET) == TRUE && IsPlayerSurfingNorth() == TRUE) return S_UseWaterfall; else return S_CannotUseWaterfall; @@ -437,7 +437,7 @@ static u8 *TryGetFieldMoveScript(struct MapPosition *unused1, u8 b, u8 unused2) static bool32 sub_8068770(void) { - if (FlagGet(BADGE07_GET) && sub_8068F18() == 2) + if (FlagGet(FLAG_BADGE07_GET) && sub_8068F18() == 2) { ScriptContext1_SetupScript(UseDiveScript); return TRUE; @@ -447,7 +447,7 @@ static bool32 sub_8068770(void) static bool32 sub_80687A4(void) { - if (FlagGet(BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1) + if (FlagGet(FLAG_BADGE07_GET) && gMapHeader.mapType == MAP_TYPE_UNDERWATER && sub_8068F18() == 1) { ScriptContext1_SetupScript(S_UseDiveUnderwater); return TRUE; diff --git a/src/field/field_player_avatar.c b/src/field/field_player_avatar.c index 437d16208..d80076be4 100644 --- a/src/field/field_player_avatar.c +++ b/src/field/field_player_avatar.c @@ -490,7 +490,7 @@ void sub_8058D0C(u8 direction, u16 heldKeys) PlayerGoSpeed2(direction); return; } - if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_4) && (heldKeys & B_BUTTON) && FlagGet(SYS_B_DASH) + if (!(gPlayerAvatar.flags & PLAYER_AVATAR_FLAG_4) && (heldKeys & B_BUTTON) && FlagGet(FLAG_SYS_B_DASH) && IsRunningDisallowed(gMapObjects[gPlayerAvatar.mapObjectId].mapobj_unk_1E) == 0) { sub_805940C(direction); @@ -563,7 +563,7 @@ static bool8 ShouldJumpLedge(s16 a, s16 b, u8 c) static u8 sub_8058F6C(s16 a, s16 b, u8 c) { - if (FlagGet(SYS_USE_STRENGTH)) + if (FlagGet(FLAG_SYS_USE_STRENGTH)) { u8 mapObjectId = GetFieldObjectIdByXY(a, b); diff --git a/src/field/field_special_scene.c b/src/field/field_special_scene.c index 6ef98f5e9..0b7fe336e 100644 --- a/src/field/field_special_scene.c +++ b/src/field/field_special_scene.c @@ -373,7 +373,7 @@ void sub_80C791C(void) void sub_80C7958(void) { - FlagSet(SYS_CRUISE_MODE); + FlagSet(FLAG_SYS_CRUISE_MODE); FlagSet(0x4001); FlagSet(0x4000); saved_warp2_set(0, gSaveBlock1.location.mapGroup, gSaveBlock1.location.mapNum, -1); diff --git a/src/field/field_specials.c b/src/field/field_specials.c index 9a286dd6e..78c60c94e 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -221,18 +221,18 @@ void UpdateCyclingRoadState(void) { void SetSSTidalFlag(void) { - FlagSet(SYS_CRUISE_MODE); + FlagSet(FLAG_SYS_CRUISE_MODE); *GetVarPointer(VAR_CRUISE_STEP_COUNT) = 0; } void ResetSSTidalFlag(void) { - FlagClear(SYS_CRUISE_MODE); + FlagClear(FLAG_SYS_CRUISE_MODE); } bool32 CountSSTidalStep(u16 delta) { - if (!FlagGet(SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) <= 0xcc) + if (!FlagGet(FLAG_SYS_CRUISE_MODE) || (*GetVarPointer(VAR_CRUISE_STEP_COUNT) += delta) <= 0xcc) { return FALSE; } @@ -1865,7 +1865,7 @@ void GivLeadMonEffortRibbon(void) { bool8 ribbonSet; IncrementGameStat(GAME_STAT_RECEIVED_RIBBONS); - FlagSet(SYS_RIBBON_GET); + FlagSet(FLAG_SYS_RIBBON_GET); ribbonSet = TRUE; SetMonData(&gPlayerParty[GetLeadMonIndex()], MON_DATA_EFFORT_RIBBON, &ribbonSet); } diff --git a/src/field/fldeff_flash.c b/src/field/fldeff_flash.c index 920791ce2..22f170184 100644 --- a/src/field/fldeff_flash.c +++ b/src/field/fldeff_flash.c @@ -73,7 +73,7 @@ static const u8 gCaveTransitionTiles[] = INCBIN_U8("graphics/misc/cave_transitio bool8 SetUpFieldMove_Flash(void) { - if (gMapHeader.cave == TRUE && !FlagGet(SYS_USE_FLASH)) + if (gMapHeader.cave == TRUE && !FlagGet(FLAG_SYS_USE_FLASH)) { gFieldCallback = FieldCallback_Teleport; gUnknown_03005CE4 = sub_810CBFC; @@ -94,7 +94,7 @@ void sub_810CBFC(void) void sub_810CC34(void) { PlaySE(SE_W115); - FlagSet(SYS_USE_FLASH); + FlagSet(FLAG_SYS_USE_FLASH); ScriptContext1_SetupScript(gUnknown_081B694A); } diff --git a/src/field/item_use.c b/src/field/item_use.c index 48b159c1c..c2e71070c 100644 --- a/src/field/item_use.c +++ b/src/field/item_use.c @@ -177,7 +177,7 @@ void ItemUseOutOfBattle_Bike(u8 taskId) PlayerGetDestCoords(&x, &y); tileBehavior = MapGridGetMetatileBehaviorAt(x, y); - if (FlagGet(SYS_CYCLING_ROAD) == TRUE // on cycling road? + if (FlagGet(FLAG_SYS_CYCLING_ROAD) == TRUE // on cycling road? || MetatileBehavior_IsVerticalRail(tileBehavior) == TRUE || MetatileBehavior_IsHorizontalRail(tileBehavior) == TRUE || MetatileBehavior_IsIsolatedVerticalRail(tileBehavior) == TRUE @@ -952,8 +952,8 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId) { if (gScriptItemId == ITEM_WHITE_FLUTE) { - FlagSet(SYS_ENC_UP_ITEM); - FlagClear(SYS_ENC_DOWN_ITEM); + FlagSet(FLAG_SYS_ENC_UP_ITEM); + FlagClear(FLAG_SYS_ENC_DOWN_ITEM); sub_80CA07C(); StringExpandPlaceholders(gStringVar4, gOtherText_UsedFlute); gTasks[taskId].func = sub_80CA098; @@ -961,8 +961,8 @@ void ItemUseOutOfBattle_BlackWhiteFlute(u8 taskId) } else if (gScriptItemId == ITEM_BLACK_FLUTE) { - FlagSet(SYS_ENC_DOWN_ITEM); - FlagClear(SYS_ENC_UP_ITEM); + FlagSet(FLAG_SYS_ENC_DOWN_ITEM); + FlagClear(FLAG_SYS_ENC_UP_ITEM); sub_80CA07C(); StringExpandPlaceholders(gStringVar4, gOtherText_UsedRepel); gTasks[taskId].func = sub_80CA098; diff --git a/src/field/overworld.c b/src/field/overworld.c index 21f3f98ef..834a2afa4 100644 --- a/src/field/overworld.c +++ b/src/field/overworld.c @@ -203,47 +203,47 @@ static void DoWhiteOut(void) void Overworld_ResetStateAfterFly(void) { player_avatar_init_params_reset(); - FlagClear(SYS_CYCLING_ROAD); - FlagClear(SYS_CRUISE_MODE); - FlagClear(SYS_SAFARI_MODE); - FlagClear(SYS_USE_STRENGTH); - FlagClear(SYS_USE_FLASH); + FlagClear(FLAG_SYS_CYCLING_ROAD); + FlagClear(FLAG_SYS_CRUISE_MODE); + FlagClear(FLAG_SYS_SAFARI_MODE); + FlagClear(FLAG_SYS_USE_STRENGTH); + FlagClear(FLAG_SYS_USE_FLASH); } void Overworld_ResetStateAfterTeleport(void) { player_avatar_init_params_reset(); - FlagClear(SYS_CYCLING_ROAD); - FlagClear(SYS_CRUISE_MODE); - FlagClear(SYS_SAFARI_MODE); - FlagClear(SYS_USE_STRENGTH); - FlagClear(SYS_USE_FLASH); + FlagClear(FLAG_SYS_CYCLING_ROAD); + FlagClear(FLAG_SYS_CRUISE_MODE); + FlagClear(FLAG_SYS_SAFARI_MODE); + FlagClear(FLAG_SYS_USE_STRENGTH); + FlagClear(FLAG_SYS_USE_FLASH); ScriptContext2_RunNewScript(gUnknown_0819FC9F); } void Overworld_ResetStateAfterDigEscRope(void) { player_avatar_init_params_reset(); - FlagClear(SYS_CYCLING_ROAD); - FlagClear(SYS_CRUISE_MODE); - FlagClear(SYS_SAFARI_MODE); - FlagClear(SYS_USE_STRENGTH); - FlagClear(SYS_USE_FLASH); + FlagClear(FLAG_SYS_CYCLING_ROAD); + FlagClear(FLAG_SYS_CRUISE_MODE); + FlagClear(FLAG_SYS_SAFARI_MODE); + FlagClear(FLAG_SYS_USE_STRENGTH); + FlagClear(FLAG_SYS_USE_FLASH); } void Overworld_ResetStateAfterWhiteOut(void) { player_avatar_init_params_reset(); - FlagClear(SYS_CYCLING_ROAD); - FlagClear(SYS_CRUISE_MODE); - FlagClear(SYS_SAFARI_MODE); - FlagClear(SYS_USE_STRENGTH); - FlagClear(SYS_USE_FLASH); + FlagClear(FLAG_SYS_CYCLING_ROAD); + FlagClear(FLAG_SYS_CRUISE_MODE); + FlagClear(FLAG_SYS_SAFARI_MODE); + FlagClear(FLAG_SYS_USE_STRENGTH); + FlagClear(FLAG_SYS_USE_FLASH); } void sub_805308C(void) { - FlagClear(SYS_SAFARI_MODE); + FlagClear(FLAG_SYS_SAFARI_MODE); ChooseAmbientCrySpecies(); ResetCyclingRoadChallengeData(); UpdateLocationHistoryForRoamer(); @@ -641,7 +641,7 @@ void sub_8053994(u32 a1) SetSav1WeatherFromCurrMapHeader(); ChooseAmbientCrySpecies(); if (v2) - FlagClear(SYS_USE_FLASH); + FlagClear(FLAG_SYS_USE_FLASH); SetDefaultFlashLevel(); Overworld_ClearSavedMusic(); mapheader_run_script_with_tag_x3(); @@ -691,7 +691,7 @@ struct UnkPlayerStruct *sub_8053AA8(void) u8 sub_8053B00(struct UnkPlayerStruct *playerStruct, u16 a2, u8 a3) { - if (a3 != 8 && FlagGet(SYS_CRUISE_MODE)) + if (a3 != 8 && FlagGet(FLAG_SYS_CRUISE_MODE)) return 1; if (a3 == 5) return 16; @@ -708,7 +708,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(SYS_CRUISE_MODE) && a4 == 6) + if (FlagGet(FLAG_SYS_CRUISE_MODE) && a4 == 6) return 4; if (MetatileBehavior_IsDeepSouthWarp(a3) == TRUE) return 2; @@ -766,7 +766,7 @@ void SetDefaultFlashLevel(void) { if (!gMapHeader.cave) gSaveBlock1.flashLevel = 0; - else if (FlagGet(SYS_USE_FLASH)) + else if (FlagGet(FLAG_SYS_USE_FLASH)) gSaveBlock1.flashLevel = 1; else gSaveBlock1.flashLevel = gMaxFlashLevel; @@ -792,7 +792,7 @@ void sub_8053D14(u16 mapDataId) static bool16 ShouldLegendaryMusicPlayAtLocation(struct WarpData *warp) { - if (!FlagGet(SYS_WEATHER_CTRL)) + if (!FlagGet(FLAG_SYS_WEATHER_CTRL)) return FALSE; if (warp->mapGroup == 0) { @@ -912,7 +912,7 @@ void Overworld_ClearSavedMusic(void) void sub_8053F0C(void) { - if (FlagGet(SPECIAL_FLAG_1) != TRUE) + if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE) { u16 newMusic = GetWarpDestinationMusic(); u16 currentMusic = GetCurrentMapMusic(); @@ -959,7 +959,7 @@ u8 GetMapMusicFadeoutSpeed(void) void sub_8053FF8(void) { u16 music = GetWarpDestinationMusic(); - if (FlagGet(SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic()) + if (FlagGet(FLAG_SPECIAL_FLAG_1) != TRUE && music != GetCurrentMapMusic()) { u8 speed = GetMapMusicFadeoutSpeed(); FadeOutMapMusic(speed); diff --git a/src/field/party_menu.c b/src/field/party_menu.c index dc817f8c9..7d21c365a 100644 --- a/src/field/party_menu.c +++ b/src/field/party_menu.c @@ -5643,7 +5643,7 @@ _08070F8A:\n\ void unref_sub_8070F90(void) { - FlagSet(SYS_POKEDEX_GET); - FlagSet(SYS_POKEMON_GET); - FlagSet(SYS_POKENAV_GET); + FlagSet(FLAG_SYS_POKEDEX_GET); + FlagSet(FLAG_SYS_POKEMON_GET); + FlagSet(FLAG_SYS_POKENAV_GET); } diff --git a/src/field/region_map.c b/src/field/region_map.c index 12bf1a5f2..07e77e389 100644 --- a/src/field/region_map.c +++ b/src/field/region_map.c @@ -1422,7 +1422,7 @@ static const u8 *const sEverGrandeCityAreaNames[] = {OtherText_PokeLeague, Other static const struct UnknownStruct4 sUnknown_083E79C0[1] = { - {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, SYS_POKEMON_LEAGUE_FLY}, + {sEverGrandeCityAreaNames, MAPSEC_EVER_GRANDE_CITY, FLAG_SYS_POKEMON_LEAGUE_FLY}, }; // XXX: what is this? @@ -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(SYS_POKEMON_LEAGUE_FLY) && ewram0_3.regionMap.everGrandeCityArea == 0) ? 20 : 11); + sub_8053538((FlagGet(FLAG_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/safari_zone.c b/src/field/safari_zone.c index 14fd1ddc4..73fb01f3e 100644 --- a/src/field/safari_zone.c +++ b/src/field/safari_zone.c @@ -41,17 +41,17 @@ extern u16 gScriptResult; bool32 GetSafariZoneFlag(void) { - return FlagGet(SYS_SAFARI_MODE); + return FlagGet(FLAG_SYS_SAFARI_MODE); } void SetSafariZoneFlag(void) { - FlagSet(SYS_SAFARI_MODE); + FlagSet(FLAG_SYS_SAFARI_MODE); } void ResetSafariZoneFlag(void) { - FlagClear(SYS_SAFARI_MODE); + FlagClear(FLAG_SYS_SAFARI_MODE); } void EnterSafariMode(void) diff --git a/src/field/script_menu.c b/src/field/script_menu.c index caa1d7562..1f8c2c45e 100644 --- a/src/field/script_menu.c +++ b/src/field/script_menu.c @@ -906,7 +906,7 @@ void ScriptMenu_CreatePCMenu(void) else width = 8; - if (FlagGet(SYS_GAME_CLEAR)) // player has cleared game? + if (FlagGet(FLAG_SYS_GAME_CLEAR)) // player has cleared game? { numChoices = 4; MenuDrawTextWindow(0, 0, width + 2, 9); @@ -920,7 +920,7 @@ void ScriptMenu_CreatePCMenu(void) MenuPrint(gPCText_LogOff, 1, 5); } - if (FlagGet(SYS_PC_LANETTE)) // player met lanette? + if (FlagGet(FLAG_SYS_PC_LANETTE)) // player met lanette? MenuPrint(gPCText_LanettesPC, 1, 1); else MenuPrint(gPCText_SomeonesPC, 1, 1); diff --git a/src/field/start_menu.c b/src/field/start_menu.c index 7913e5527..9f4eacd09 100644 --- a/src/field/start_menu.c +++ b/src/field/start_menu.c @@ -154,12 +154,12 @@ static void AddStartMenuAction(u8 action) static void BuildStartMenuActions_Normal(void) { - if (FlagGet(SYS_POKEDEX_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKEDEX_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEDEX); - if (FlagGet(SYS_POKEMON_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKEMON_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if (FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER); AddStartMenuAction(MENU_ACTION_SAVE); @@ -182,7 +182,7 @@ static void BuildStartMenuActions_Link(void) { AddStartMenuAction(MENU_ACTION_POKEMON); AddStartMenuAction(MENU_ACTION_BAG); - if (FlagGet(SYS_POKENAV_GET) == TRUE) + if (FlagGet(FLAG_SYS_POKENAV_GET) == TRUE) AddStartMenuAction(MENU_ACTION_POKENAV); AddStartMenuAction(MENU_ACTION_PLAYER_LINK); AddStartMenuAction(MENU_ACTION_OPTION); diff --git a/src/field/tv.c b/src/field/tv.c index c3141e0b5..db96775e3 100644 --- a/src/field/tv.c +++ b/src/field/tv.c @@ -542,7 +542,7 @@ bool8 IsTVShowInSearchOfTrainersAiring(void); void UpdateTVScreensOnMap(int width, int height) { - FlagSet(SYS_TV_WATCH); + FlagSet(FLAG_SYS_TV_WATCH); switch (CheckForBigMovieOrEmergencyNewsOnTV()) { case 1: @@ -556,9 +556,9 @@ void UpdateTVScreensOnMap(int width, int height) { SetTVMetatilesOnMap(width, height, 0x3); } - else if (FlagGet(SYS_TV_START) && (sub_80BD8B8() != 0xff || sub_80BECA0() != 0xff || IsTVShowInSearchOfTrainersAiring())) + else if (FlagGet(FLAG_SYS_TV_START) && (sub_80BD8B8() != 0xff || sub_80BECA0() != 0xff || IsTVShowInSearchOfTrainersAiring())) { - FlagClear(SYS_TV_WATCH); + FlagClear(FLAG_SYS_TV_WATCH); SetTVMetatilesOnMap(width, height, 0x3); } break; @@ -1138,7 +1138,7 @@ void nullsub_21(void) void sub_80BE778(void) { - if (FlagGet(SYS_GAME_CLEAR)) + if (FlagGet(FLAG_SYS_GAME_CLEAR)) { u8 i; @@ -1331,7 +1331,7 @@ void sub_80BEB20(void) { u16 rval; - if (FlagGet(SYS_GAME_CLEAR) != 0) + if (FlagGet(FLAG_SYS_GAME_CLEAR) != 0) { gUnknown_03005D38.var0 = sub_80BEBC8(gSaveBlock1.unknown_2ABC); if (gUnknown_03005D38.var0 != -1 && sub_80BF77C(0x28f) != 1) @@ -1507,7 +1507,7 @@ void sub_80BEE84(u16 var0) } else { - if (!gSaveBlock1.unknown_2ABC[i].val1 && FlagGet(SYS_GAME_CLEAR) == 1) + if (!gSaveBlock1.unknown_2ABC[i].val1 && FlagGet(FLAG_SYS_GAME_CLEAR) == 1) gSaveBlock1.unknown_2ABC[i].val1 = 1; gSaveBlock1.unknown_2ABC[i].val2 -= var0; } @@ -2133,9 +2133,9 @@ u8 CheckForBigMovieOrEmergencyNewsOnTV(void) if (gSaveBlock1.location.mapNum != MAP_NUM(LITTLEROOT_TOWN_MAYS_HOUSE_1F)) return 0; } - if (FlagGet(SYS_TV_LATI) == 1) + if (FlagGet(FLAG_SYS_TV_LATI) == 1) return 1; - if (FlagGet(SYS_TV_HOME) == 1) + if (FlagGet(FLAG_SYS_TV_HOME) == 1) return 2; return 1; } @@ -2650,7 +2650,7 @@ void sub_80C0408(void) { u16 i; - if (FlagGet(SYS_GAME_CLEAR) == TRUE) + if (FlagGet(FLAG_SYS_GAME_CLEAR) == TRUE) return; for (i = 0; i < 24; i++) { @@ -2801,7 +2801,7 @@ void sub_80C0788(void) { u8 i; - if (FlagGet(SYS_GAME_CLEAR) != 1) + if (FlagGet(FLAG_SYS_GAME_CLEAR) != 1) { for (i = 0; i < 16; i++) gSaveBlock1.unknown_2ABC[i].val1 = 0; diff --git a/src/field/wild_encounter.c b/src/field/wild_encounter.c index 64c88694c..cc4468728 100644 --- a/src/field/wild_encounter.c +++ b/src/field/wild_encounter.c @@ -4353,9 +4353,9 @@ static bool8 IsWildLevelAllowedByRepel(u8 wildLevel) static void ApplyFluteEncounterRateMod(u32 *encRate) { - if (FlagGet(SYS_ENC_UP_ITEM) == TRUE) + if (FlagGet(FLAG_SYS_ENC_UP_ITEM) == TRUE) *encRate += *encRate / 2; - else if (FlagGet(SYS_ENC_DOWN_ITEM) == TRUE) + else if (FlagGet(FLAG_SYS_ENC_DOWN_ITEM) == TRUE) *encRate = *encRate / 2; } diff --git a/src/pokemon/pokemon_menu.c b/src/pokemon/pokemon_menu.c index ea33cd3e6..f6f5e24e7 100644 --- a/src/pokemon/pokemon_menu.c +++ b/src/pokemon/pokemon_menu.c @@ -722,7 +722,7 @@ static void PokemonMenu_FieldMove(u8 taskID) PrintPartyMenuPromptText(sFieldMoveFuncs[tFieldMoveId].field_1, 0); gTasks[taskID].func = sub_808ABF4; } - else if (tFieldMoveId <= 7 && FlagGet(BADGE01_GET + tFieldMoveId) != TRUE) + else if (tFieldMoveId <= 7 && FlagGet(FLAG_BADGE01_GET + tFieldMoveId) != TRUE) { // can't use a field HM move without a proper badge MenuZeroFillWindowRect(19, 0, 29, 19); diff --git a/src/pokemon/pokemon_size_record.c b/src/pokemon/pokemon_size_record.c index 260396de0..2ab289416 100644 --- a/src/pokemon/pokemon_size_record.c +++ b/src/pokemon/pokemon_size_record.c @@ -212,6 +212,6 @@ void GiveGiftRibbonToParty(u8 index, u8 ribbonId) } } if (gotRibbon) - FlagSet(SYS_RIBBON_GET); + FlagSet(FLAG_SYS_RIBBON_GET); } } diff --git a/src/pokenav_before.c b/src/pokenav_before.c index bab6648de..6e83c6f97 100644 --- a/src/pokenav_before.c +++ b/src/pokenav_before.c @@ -401,7 +401,7 @@ void sub_80EBCA8() { ewram0_10.var6db2[1] = 2; ewram0_10.var6db2[2] = 3; - if (FlagGet(SYS_RIBBON_GET)) { + if (FlagGet(FLAG_SYS_RIBBON_GET)) { ewram0_10.var6db2[3] = 4; } else { |