diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-17 20:07:53 -0800 |
| commit | 88716f4c0e053a984eeb4bef92fefa42027dd22a (patch) | |
| tree | 326805fbcc882cd74cc43431e34b680b4971184c | |
| parent | b14cdde8bd4afda2b0b73bb72b3cffc6961a5790 (diff) | |
Use FLAG_ prefix for all flags
98 files changed, 388 insertions, 375 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 5c84fd673..c7e05f008 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1332,7 +1332,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 return EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 - setflag SYS_TV_LATI + setflag FLAG_SYS_TV_LATI return S_WhiteOut:: @ 819FC74 @@ -1723,9 +1723,9 @@ EventScript_1A0070: EventScript_1A0085: playse 2 - checkflag SYS_PC_LANETTE + checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_1A00AC - checkflag SYS_PC_LANETTE + checkflag FLAG_SYS_PC_LANETTE call_if 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem @@ -1749,7 +1749,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE playse 2 special AccessHallOfFamePC @@ -2366,9 +2366,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2382,9 +2382,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2479,9 +2479,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 call_if 1, Route119_EventScript_1A065A compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -3964,7 +3964,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 @@ -3999,7 +3999,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 @@ -4034,7 +4034,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D @@ -4069,7 +4069,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 @@ -4104,7 +4104,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 @@ -4139,7 +4139,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 @@ -4174,7 +4174,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D @@ -4209,7 +4209,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 @@ -4244,7 +4244,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 @@ -4279,7 +4279,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 diff --git a/data-de/field_move_scripts.inc b/data-de/field_move_scripts.inc index b33765564..559eaf0ab 100644 --- a/data-de/field_move_scripts.inc +++ b/data-de/field_move_scripts.inc @@ -1,6 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut checkpokemove MOVE_CUT compare RESULT, 6 @@ -61,7 +61,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 @@ -128,9 +128,9 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if 0, CannotUseStrength - checkflag SYS_USE_STRENGTH + checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength checkpokemove 70 compare RESULT, 6 @@ -153,7 +153,7 @@ S_UseStrength:: @ 81B100E end UsedStrength: @ 81B1019 - setflag SYS_USE_STRENGTH + setflag FLAG_SYS_USE_STRENGTH msgbox UsedStrengthText, 3 releaseall end diff --git a/data/event_scripts.s b/data/event_scripts.s index 0a250d570..bbeac074c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1326,7 +1326,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC62:: @ 819FC62 return EverGrandeCity_HallOfFame_EventScript_19FC70:: @ 819FC70 - setflag SYS_TV_LATI + setflag FLAG_SYS_TV_LATI return S_WhiteOut:: @ 819FC74 @@ -1717,9 +1717,9 @@ EventScript_1A0070: EventScript_1A0085: playse 2 - checkflag SYS_PC_LANETTE + checkflag FLAG_SYS_PC_LANETTE call_if 0, EventScript_1A00AC - checkflag SYS_PC_LANETTE + checkflag FLAG_SYS_PC_LANETTE call_if 1, EventScript_1A00B5 msgbox UnknownString_81A0A35, 4 special ShowPokemonStorageSystem @@ -1743,7 +1743,7 @@ EventScript_1A00BE: end EventScript_1A00CB: - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, EventScript_1A00BE playse 2 special AccessHallOfFamePC @@ -2360,9 +2360,9 @@ MagmaHideout_B1F_EventScript_1A04FD:: @ 81A04FD delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_1_HIDEOUT - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2376,9 +2376,9 @@ MagmaHideout_B1F_EventScript_1A051B:: @ 81A051B delay 40 waitpokecry setflag FLAG_HIDE_ELECTRODE_2_HIDEOUT - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -2473,9 +2473,9 @@ Route119_EventScript_1A05C3:: @ 81A05C3 call_if 1, Route119_EventScript_1A065A compare 0x8004, 7 call_if 1, Route119_EventScript_1A065E - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -3943,7 +3943,7 @@ SecretBase_YellowCave4_EventScript_1A2FC0:: @ 81A2FC0 end SecretBase_RedCave1_EventScript_1A3032:: @ 81A3032 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3086 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A30A5 @@ -3978,7 +3978,7 @@ SecretBase_RedCave1_EventScript_1A30A5:: @ 81A30A5 end SecretBase_RedCave1_EventScript_1A30AE:: @ 81A30AE - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3102 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3121 @@ -4013,7 +4013,7 @@ SecretBase_RedCave1_EventScript_1A3121:: @ 81A3121 end SecretBase_RedCave1_EventScript_1A312A:: @ 81A312A - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A317E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A319D @@ -4048,7 +4048,7 @@ SecretBase_RedCave1_EventScript_1A319D:: @ 81A319D end SecretBase_RedCave1_EventScript_1A31A6:: @ 81A31A6 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A31FA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3219 @@ -4083,7 +4083,7 @@ SecretBase_RedCave1_EventScript_1A3219:: @ 81A3219 end SecretBase_RedCave1_EventScript_1A3222:: @ 81A3222 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3276 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3295 @@ -4118,7 +4118,7 @@ SecretBase_RedCave1_EventScript_1A3295:: @ 81A3295 end SecretBase_RedCave1_EventScript_1A329E:: @ 81A329E - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A32F2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3311 @@ -4153,7 +4153,7 @@ SecretBase_RedCave1_EventScript_1A3311:: @ 81A3311 end SecretBase_RedCave1_EventScript_1A331A:: @ 81A331A - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A336E compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A338D @@ -4188,7 +4188,7 @@ SecretBase_RedCave1_EventScript_1A338D:: @ 81A338D end SecretBase_RedCave1_EventScript_1A3396:: @ 81A3396 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A33EA compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3409 @@ -4223,7 +4223,7 @@ SecretBase_RedCave1_EventScript_1A3409:: @ 81A3409 end SecretBase_RedCave1_EventScript_1A3412:: @ 81A3412 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A3466 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3485 @@ -4258,7 +4258,7 @@ SecretBase_RedCave1_EventScript_1A3485:: @ 81A3485 end SecretBase_RedCave1_EventScript_1A348E:: @ 81A348E - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, SecretBase_RedCave1_EventScript_1A34E2 compare RESULT, 1 goto_if_eq SecretBase_RedCave1_EventScript_1A3501 diff --git a/data/field_move_scripts.inc b/data/field_move_scripts.inc index 8fcf91616..86b81dd01 100644 --- a/data/field_move_scripts.inc +++ b/data/field_move_scripts.inc @@ -1,6 +1,6 @@ S_CuttableTree:: @ 81B0DCC lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if 0, CannotUseCut checkpokemove MOVE_CUT compare RESULT, 6 @@ -58,7 +58,7 @@ CannotUseCutText: @ 81B0E8E S_BreakableRock:: @ 81B0EB7 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, CannotUseRockSmash checkpokemove MOVE_ROCK_SMASH compare RESULT, 6 @@ -125,9 +125,9 @@ CannotUseRockSmashText: @ 81B0F90 S_PushableBoulder:: @ 81B0FCB lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if 0, CannotUseStrength - checkflag SYS_USE_STRENGTH + checkflag FLAG_SYS_USE_STRENGTH goto_if_eq AlreadyUsedStrength checkpokemove 70 compare RESULT, 6 @@ -150,7 +150,7 @@ S_UseStrength:: @ 81B100E end UsedStrength: @ 81B1019 - setflag SYS_USE_STRENGTH + setflag FLAG_SYS_USE_STRENGTH msgbox UsedStrengthText, 3 releaseall end diff --git a/data/scripts/cable_club.inc b/data/scripts/cable_club.inc index e3efba4e7..60ce36e43 100644 --- a/data/scripts/cable_club.inc +++ b/data/scripts/cable_club.inc @@ -174,7 +174,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SlateportCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 SootopolisCity_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 VerdanturfTown_PokemonCenter_2F_EventScript_1A3EA6:: @ 81A3EA6 - checkflag SYS_POKEDEX_GET + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4342 copyvar 0x8007, LAST_TALKED lock @@ -346,7 +346,7 @@ RustboroCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SlateportCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC SootopolisCity_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC VerdanturfTown_PokemonCenter_2F_EventScript_1A40CC:: @ 81A40CC - checkflag SYS_POKEDEX_GET + checkflag FLAG_SYS_POKEDEX_GET goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_1A4339 copyvar 0x8007, LAST_TALKED lock diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 6d6ceb30e..bc87b9a4e 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1143,7 +1143,7 @@ LinkContestRoom1_EventScript_1A5D3B:: @ 81A5D3B LinkContestRoom1_EventScript_1A5D5B:: @ 81A5D5B special sub_80C44C0 incrementgamestat GAME_STAT_RECEIVED_RIBBONS - setflag SYS_RIBBON_GET + setflag FLAG_SYS_RIBBON_GET lockall msgbox LinkContestRoom1_Text_1A6D6A, 4 playfanfare 370 diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index d28ce7fcc..268563660 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AncientTomb_EventScript_15EFD8 end @@ -18,7 +18,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag SYS_BRAILLE_FLY + checkflag FLAG_SYS_BRAILLE_FLY call_if 0, AncientTomb_EventScript_15EFEA end @@ -33,7 +33,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag SYS_BRAILLE_FLY + checkflag FLAG_SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbutton @@ -63,9 +63,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_HIDE_REGISTEEL - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 9498864c3..82d0c10c5 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AquaHideout_B1F_EventScript_15D846 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index b7711b1ad..a2067fe60 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end @@ -61,10 +61,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 waitpokecry - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 @@ -75,7 +75,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS - clearflag SYS_WEATHER_CTRL + clearflag FLAG_SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 228ca21ac..c767dd7e7 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, DesertRuins_EventScript_15CB0D end @@ -14,7 +14,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag SYS_BRAILLE_STRENGTH + checkflag FLAG_SYS_BRAILLE_STRENGTH call_if 0, DesertRuins_EventScript_15CB1B end @@ -33,7 +33,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag SYS_BRAILLE_STRENGTH + checkflag FLAG_SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbutton @@ -63,9 +63,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_HIDE_REGIROCK - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 5a4e56857..cbcb4d5eb 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -113,7 +113,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag FLAG_DEFEATED_DEWFORD_GYM - setflag BADGE02_GET + setflag FLAG_BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB @@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag BADGE02_GET + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag BADGE02_GET + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index c4f9ad315..b4fa64cae 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, EverGrandeCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 934e5a06c..a78338808 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 - setflag SYS_POKEMON_LEAGUE_FLY + setflag FLAG_SYS_POKEMON_LEAGUE_FLY checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 883274f29..d3f7be155 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -29,7 +29,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM - setflag BADGE06_GET + setflag FLAG_BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E @@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index fe8934fbd..e8489eb8a 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, IslandCave_EventScript_15EED0 end @@ -14,7 +14,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT call_if 0, IslandCave_EventScript_15EEDE end @@ -40,12 +40,12 @@ S_OpenRegiceChamber:: @ 815EF19 setmaptile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag SYS_BRAILLE_WAIT + setflag FLAG_SYS_BRAILLE_WAIT end IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait @@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate @@ -83,9 +83,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_HIDE_REGICE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 01b1dd08e..a44368925 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag FLAG_DEFEATED_LAVARIDGE_GYM - setflag BADGE04_GET + setflag FLAG_BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB @@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 4ae27e827..30f0ff36e 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -7,7 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E @@ -30,7 +30,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET call_if 1, LilycoveCity_EventScript_14CB2B end @@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release @@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release @@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall @@ -349,7 +349,7 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE @@ -361,7 +361,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq LilycoveCity_EventScript_14CEE8 return @@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,7 +386,7 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 @@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7546fe41b..6a1bc09e8 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -589,7 +589,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 - setflag SYS_RIBBON_GET + setflag FLAG_SYS_RIBBON_GET end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 62d35662d..3e4caf100 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 69e2e6766..7385f8c72 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release @@ -106,11 +106,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag SYS_HAS_EON_TICKET + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage @@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 4b9de4d15..d1be7b704 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 07f6581c2..52c52b798 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 - setflag SYS_B_DASH + setflag FLAG_SYS_B_DASH setvar 0x4050, 4 release end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 871025f55..f78d30ec2 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage - setflag SYS_POKEDEX_GET + setflag FLAG_SYS_POKEDEX_GET return LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 3042d75dc..6dbdc0461 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 1109acc81..ae00ca369 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -5,7 +5,7 @@ MauvilleCity_MapScripts:: @ 814C032 MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - setflag SYS_TV_START + setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 checkflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 142477ed5..d94436973 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -83,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag FLAG_DEFEATED_MAUVILLE_GYM - setflag BADGE03_GET + setflag FLAG_BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB @@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 71b572ba2..31ed83b2a 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, MossdeepCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 66ff840ed..0c27c28f7 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -62,7 +62,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag FLAG_DEFEATED_MOSSDEEP_GYM - setflag BADGE07_GET + setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 setvar 0x8008, 7 @@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 77953a959..fd400ad16 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 345e75fa1..55ee9ebac 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 1b55cde28..aa6cf6310 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F end @@ -170,9 +170,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -185,9 +185,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -200,8 +200,8 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index d46831902..69503908a 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag SYS_POKEDEX_GET + checkflag FLAG_SYS_POKEDEX_GET goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 07c6f8026..e2967169f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B end @@ -356,7 +356,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag FLAG_RECEIVED_TM42 goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release @@ -399,7 +399,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag FLAG_DEFEATED_PETALBURG_GYM setvar 0x4085, 7 - setflag BADGE05_GET + setflag FLAG_BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE @@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index c9a364c80..1810a6495 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag SYS_POKEMON_GET + setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 9595d00ab..92f5d5593 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index bce884555..07abd21bc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -6,7 +6,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag FLAG_LANDMARK_FLOWER_SHOP checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8fd9d3ea5..8e33517ca 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 - setflag SYS_CYCLING_ROAD + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall setvar 0x40a9, 0 - clearflag SYS_CYCLING_ROAD + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 1ca98817c..51cab5ddd 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B specialvar RESULT, GetPlayerAvatarBike compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 - setflag SYS_CYCLING_ROAD + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall - clearflag SYS_CYCLING_ROAD + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 6424aff45..bf0c36ff3 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index b24cc9da2..87b0f2cd6 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -11,7 +11,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 faceplayer checkflag FLAG_RECEIVED_DOLL_LANETTE goto_if_eq Route114_LanettesHouse_EventScript_15C28F - setflag SYS_PC_LANETTE + setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE givedecoration DECOR_LOTAD_DOLL diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 5454fa946..fb3d75660 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route119_EventScript_15117C end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 045fcbb43..209291a3a 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route120_EventScript_151628 end @@ -227,9 +227,9 @@ Route120_EventScript_15189D:: @ 815189D waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE goto Route120_EventScript_151908 end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 71f58bb57..3e062bfdc 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route124_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 7c4754f4f..ea24434e2 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index d480512f8..a89087994 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route126_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index e7c6f602f..5fb122821 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route127_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 5b8ec42e0..b0e295db6 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 09f555997..efa26ecd2 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route131_EventScript_15244E end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ffe133906..7e3a0e191 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 68039aac6..0e9786760 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -54,7 +54,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage - setflag SYS_POKENAV_GET + setflag FLAG_SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index e384014eb..427be433d 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -15,7 +15,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 setflag FLAG_DEFEATED_RUSTBORO_GYM - setflag BADGE01_GET + setflag FLAG_BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 setvar 0x8008, 1 @@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index b66d4245d..6a4d9af02 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -199,7 +199,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar 0x405e, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 - setflag SYS_WEATHER_CTRL + setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index f9f081a8b..7add1e6f3 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,7 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag SYS_BRAILLE_DIG + checkflag FLAG_SYS_BRAILLE_DIG call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end @@ -109,7 +109,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag SYS_BRAILLE_DIG + checkflag FLAG_SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 4bf77de75..fcff20944 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 @@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag SYS_SHOAL_ITEM + checkflag FLAG_SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 @@ -98,5 +98,5 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - clearflag SYS_SHOAL_ITEM + clearflag FLAG_SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 0be4b106c..43dfa8afa 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF @@ -23,7 +23,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA @@ -32,7 +32,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index b278fcfc2..37da10220 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SkyPillar_Top_EventScript_15F312 end @@ -20,9 +20,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 delay 40 waitpokecry setflag FLAG_HIDE_RAYQUAZA - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 567dd779b..c163685b2 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BC63 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall @@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 7f642c611..ae19d0326 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 end @@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release @@ -268,7 +268,7 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE goto_if_eq SlateportCity_Harbor_EventScript_156265 @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 73d63fe06..46dc8419c 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,9 +3,9 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C checkflag FLAG_DELIVERED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index ea64e9d29..748dbe898 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -37,7 +37,7 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag FLAG_VISITED_SOOTOPOLIS_CITY checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, SootopolisCity_EventScript_14D123 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index f3daa8c7f..6f99ba8a5 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -89,7 +89,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag FLAG_RECEIVED_TM03 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release @@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM - setflag BADGE08_GET + setflag FLAG_BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 @@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 8a978cc7d..0a9ca6b89 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SouthernIsland_Interior_EventScript_160B68 end @@ -46,7 +46,7 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag SYS_HAS_EON_TICKET + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy @@ -66,10 +66,10 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE releaseall end diff --git a/data/scripts/mauville_man.inc b/data/scripts/mauville_man.inc index b174e67f3..933de6769 100644 --- a/data/scripts/mauville_man.inc +++ b/data/scripts/mauville_man.inc @@ -84,7 +84,7 @@ dont_write_lyrics: SpeakToHipster: lock faceplayer - setflag SYS_HIPSTER_MEET + setflag FLAG_SYS_HIPSTER_MEET msgbox gTextHipster_TheyCallMeTheHipster, 4 special ScrSpecial_GetHipsterSpokenFlag compare RESULT, FALSE diff --git a/data/scripts/mystery_event_club.inc b/data/scripts/mystery_event_club.inc index f94d3cf9d..d8f628709 100644 --- a/data/scripts/mystery_event_club.inc +++ b/data/scripts/mystery_event_club.inc @@ -1,7 +1,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1B14:: @ 81B1B14 lock faceplayer - checkflag SYS_CHAT_USED + checkflag FLAG_SYS_CHAT_USED goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1BDB msgbox PetalburgCity_PokemonCenter_1F_Text_1B1C97, 4 goto PetalburgCity_PokemonCenter_1F_EventScript_1B1B2D @@ -97,11 +97,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_1B1C6D:: @ 81B1C6D end PetalburgCity_PokemonCenter_1F_EventScript_1B1C77:: @ 81B1C77 - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if 0, PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - checkflag SYS_EXDATA_ENABLE + checkflag FLAG_SYS_EXDATA_ENABLE goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_1B1C96 - setflag SYS_EXDATA_ENABLE + setflag FLAG_SYS_EXDATA_ENABLE msgbox PetalburgCity_PokemonCenter_1F_Text_1B21CC, 3 release end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index 5ff45e25a..a553ae379 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -222,7 +222,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BBE:: @ 81B6BBE msgbox LittlerootTown_BrendansHouse_1F_Text_172841, 4 fadedefaultbgm special TurnOffTVScreen - setflag SYS_TV_HOME + setflag FLAG_SYS_TV_HOME delay 35 return @@ -256,7 +256,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1B6BE9:: @ 81B6BE9 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 compare 0x408c, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C33 - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index dc026c062..a74eba551 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -7,9 +7,9 @@ Event_TV:: @ 81A6E72 goto_if_eq EventScript_1A6F01 compare RESULT, 1 goto_if_eq EventScript_1A6F0B - checkflag SYS_TV_START + checkflag FLAG_SYS_TV_START goto_if 0, EventScript_1A6EF1 - checkflag SYS_TV_WATCH + checkflag FLAG_SYS_TV_WATCH goto_if_eq EventScript_1A6EF1 specialvar RESULT, IsTVShowInSearchOfTrainersAiring compare RESULT, 1 @@ -49,7 +49,7 @@ EventScript_1A6F0B: msgbox UnknownString_8172C50, 4 .endif special InitRoamer - clearflag SYS_TV_LATI + clearflag FLAG_SYS_TV_LATI setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen releaseall @@ -66,7 +66,7 @@ EventScript_1A6F21: EventScript_1A6F37: special TurnOffTVScreen - setflag SYS_TV_WATCH + setflag FLAG_SYS_TV_WATCH releaseall end diff --git a/include/constants/flags.h b/include/constants/flags.h index 3869defce..55eeab526 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -671,24 +671,27 @@ #define TRAINER_FLAG_START 0x500 +#define TRAINERS_FLAG_NO 0x356 +#define SYSTEM_FLAGS (FLAG_TRAINER_FLAG_START + TRAINERS_FLAG_NO + 0xA) // 0x800 + // SYSTEM FLAGS -#define SYS_POKEMON_GET 0x800 -#define SYS_POKEDEX_GET 0x801 -#define SYS_POKENAV_GET 0x802 -#define SYS_GAME_CLEAR 0x804 -#define SYS_CHAT_USED 0x805 -#define SYS_HIPSTER_MEET 0x806 +#define FLAG_SYS_POKEMON_GET 0x800 +#define FLAG_SYS_POKEDEX_GET 0x801 +#define FLAG_SYS_POKENAV_GET 0x802 +#define FLAG_SYS_GAME_CLEAR 0x804 +#define FLAG_SYS_CHAT_USED 0x805 +#define FLAG_SYS_HIPSTER_MEET 0x806 // badges -#define BADGE01_GET 0x807 -#define BADGE02_GET 0x808 -#define BADGE03_GET 0x809 -#define BADGE04_GET 0x80A -#define BADGE05_GET 0x80B -#define BADGE06_GET 0x80C -#define BADGE07_GET 0x80D -#define BADGE08_GET 0x80E +#define FLAG_BADGE01_GET 0x807 +#define FLAG_BADGE02_GET 0x808 +#define FLAG_BADGE03_GET 0x809 +#define FLAG_BADGE04_GET 0x80A +#define FLAG_BADGE05_GET 0x80B +#define FLAG_BADGE06_GET 0x80C +#define FLAG_BADGE07_GET 0x80D +#define FLAG_BADGE08_GET 0x80E // cities and towns #define FLAG_VISITED_LITTLEROOT_TOWN 0x80F @@ -708,25 +711,25 @@ #define FLAG_VISITED_SOOTOPOLIS_CITY 0x81D #define FLAG_VISITED_EVER_GRANDE_CITY 0x81E -#define SYS_USE_FLASH 0x828 -#define SYS_USE_STRENGTH 0x829 -#define SYS_WEATHER_CTRL 0x82A -#define SYS_CYCLING_ROAD 0x82B -#define SYS_SAFARI_MODE 0x82C -#define SYS_CRUISE_MODE 0x82D - -#define SYS_TV_HOME 0x830 -#define SYS_TV_WATCH 0x831 -#define SYS_TV_START 0x832 -#define SYS_POPWORD_INPUT 0x833 -#define SYS_MIX_RECORD 0x834 -#define SYS_CLOCK_SET 0x835 -#define SYS_NATIONAL_DEX 0x836 -#define SYS_CAVE_SHIP 0x837 -#define SYS_CAVE_WONDER 0x838 -#define SYS_CAVE_BATTLE 0x839 -#define SYS_SHOAL_TIDE 0x83A -#define SYS_RIBBON_GET 0x83B +#define FLAG_SYS_USE_FLASH 0x828 +#define FLAG_SYS_USE_STRENGTH 0x829 +#define FLAG_SYS_WEATHER_CTRL 0x82A +#define FLAG_SYS_CYCLING_ROAD 0x82B +#define FLAG_SYS_SAFARI_MODE 0x82C +#define FLAG_SYS_CRUISE_MODE 0x82D + +#define FLAG_SYS_TV_HOME 0x830 +#define FLAG_SYS_TV_WATCH 0x831 +#define FLAG_SYS_TV_START 0x832 +#define FLAG_SYS_POPWORD_INPUT 0x833 +#define FLAG_SYS_MIX_RECORD 0x834 +#define FLAG_SYS_CLOCK_SET 0x835 +#define FLAG_SYS_NATIONAL_DEX 0x836 +#define FLAG_SYS_CAVE_SHIP 0x837 +#define FLAG_SYS_CAVE_WONDER 0x838 +#define FLAG_SYS_CAVE_BATTLE 0x839 +#define FLAG_SYS_SHOAL_TIDE 0x83A +#define FLAG_SYS_RIBBON_GET 0x83B #define FLAG_LANDMARK_FLOWER_SHOP 0x83C #define FLAG_LANDMARK_MR_BRINEY_HOUSE 0x83D @@ -744,16 +747,16 @@ #define FLAG_LANDMARK_SOUTHERN_ISLAND 0x849 #define FLAG_LANDMARK_FIERY_PATH 0x84A -#define SYS_PC_LANETTE 0x84B -#define SYS_EXDATA_ENABLE 0x84C -#define SYS_ENC_UP_ITEM 0x84D -#define SYS_ENC_DOWN_ITEM 0x84E -#define SYS_BRAILLE_DIG 0x84F -#define SYS_BRAILLE_STRENGTH 0x850 -#define SYS_BRAILLE_WAIT 0x851 -#define SYS_BRAILLE_FLY 0x852 -#define SYS_HAS_EON_TICKET 0x853 -#define SYS_POKEMON_LEAGUE_FLY 0x854 +#define FLAG_SYS_PC_LANETTE 0x84B +#define FLAG_SYS_EXDATA_ENABLE 0x84C +#define FLAG_SYS_ENC_UP_ITEM 0x84D +#define FLAG_SYS_ENC_DOWN_ITEM 0x84E +#define FLAG_SYS_BRAILLE_DIG 0x84F +#define FLAG_SYS_BRAILLE_STRENGTH 0x850 +#define FLAG_SYS_BRAILLE_WAIT 0x851 +#define FLAG_SYS_BRAILLE_FLY 0x852 +#define FLAG_SYS_HAS_EON_TICKET 0x853 +#define FLAG_SYS_POKEMON_LEAGUE_FLY 0x854 #define FLAG_LANDMARK_ISLAND_CAVE 0x855 #define FLAG_LANDMARK_DESERT_RUINS 0x856 @@ -764,14 +767,14 @@ #define FLAG_LANDMARK_HUNTERS_HOUSE 0x85B #define FLAG_LANDMARK_SEALED_CHAMBER 0x85C -#define SYS_TV_LATI 0x85D +#define FLAG_SYS_TV_LATI 0x85D #define FLAG_LANDMARK_SKY_PILLAR 0x85E -#define SYS_SHOAL_ITEM 0x85F -#define SYS_B_DASH 0x860 // got Running Shoes -#define SYS_CTRL_OBJ_DELETE 0x861 -#define SYS_RESET_RTC_ENABLE 0x862 +#define FLAG_SYS_SHOAL_ITEM 0x85F +#define FLAG_SYS_B_DASH 0x860 // got Running Shoes +#define FLAG_SYS_CTRL_OBJ_DELETE 0x861 +#define FLAG_SYS_RESET_RTC_ENABLE 0x862 #define FLAG_LANDMARK_BERRY_MASTERS_HOUSE 0x863 @@ -795,6 +798,6 @@ // SPECIAL FLAGS (unknown purpose) -#define SPECIAL_FLAG_1 0x4001 +#define FLAG_SPECIAL_FLAG_1 0x4001 #endif // GUARD_CONSTANTS_FLAGS_H 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 { |