diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-02 14:01:50 -0800 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-02 14:01:50 -0800 |
commit | 765526b99f50bf6b8c41c69bd6b1dc82471cda2d (patch) | |
tree | e74d93fa7a8eee6737f0e786890d427d7c8c1fc1 | |
parent | d1b967444e7f0e21b8b5d1a09c8e164bd828da08 (diff) |
Label flags up to flag 119.
28 files changed, 104 insertions, 82 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 5fe619194..dc9260511 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -4471,9 +4471,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 - checkflag 105 + checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 - setflag 105 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 diff --git a/data/event_scripts.s b/data/event_scripts.s index dfc251980..2a4fdebd8 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -4439,9 +4439,9 @@ SlateportCity_OceanicMuseum_1F_EventScript_1ADEE0:: @ 81ADEE0 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF96 copyvar 0x8009, 0x8006 - checkflag 105 + checkflag FLAG_OCEANIC_MUSEUM_MET_REPORTER goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF25 - setflag 105 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_1A927F, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_1ADF44 diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index 2eb2ae7e9..028a0ee7b 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -10,7 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release @@ -25,7 +25,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 230d0e2db..c0437d804 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -64,7 +64,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 - setflag 112 + setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE setflag 852 release end diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 3ad36cc18..6411aad49 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index c3bbdd45f..b8d4149b6 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index fb65de171..9b014d0e9 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index c21b04e91..d6f7bdaf1 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c6c3cd45e..c9f7b5964 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -19,7 +19,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 end @@ -73,7 +73,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setflag 856 clearflag 815 setvar 0x409b, 1 - setflag 113 + setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag 854 clearflag 2090 setvar 0x40b9, 2 diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index f210dd3ac..4d935e841 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -4,9 +4,9 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - checkflag 264 + checkflag FLAG_RECEIVED_TM10 goto_if_eq FortreeCity_House2_EventScript_158157 - checkflag 118 + checkflag FLAG_MET_HIDDEN_POWER_GIVER call_if 0, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 @@ -24,14 +24,14 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 giveitem ITEM_TM10 compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B - setflag 264 + setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_18652F, 4 release end FortreeCity_House2_EventScript_15814B:: @ 815814B msgbox FortreeCity_House2_Text_186306, 4 - setflag 118 + setflag FLAG_MET_HIDDEN_POWER_GIVER return FortreeCity_House2_EventScript_158157:: @ 8158157 diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index f389a774e..1932940c4 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -4,11 +4,11 @@ GraniteCave_1F_MapScripts:: @ 815CBA6 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer - checkflag 109 + checkflag FLAG_RECEIVED_HM05 goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem ITEM_HM05 - setflag 109 + setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index cf8e2e07d..9195cc9ec 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -28,7 +28,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmaptile 71, 6, 368, 0 setmaptile 72, 6, 445, 0 .endif - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE checkflag 2061 call_if 1, LilycoveCity_EventScript_14CB2B @@ -107,7 +107,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6 LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release @@ -121,7 +121,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04 LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 7ce49b0cb..fbec4f7a2 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -187,7 +187,7 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6 LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq LittlerootTown_EventScript_14D72F checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index dc7d48ea1..8e7a0854d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -129,7 +129,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 - setflag 116 + setflag FLAG_ADVENTURE_STARTED setvar 0x4051, 1 setvar 0x408d, 4 setvar 0x4050, 3 @@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage - setflag 2049 + setflag SYS_POKEDEX_GET return LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index e76564847..acb9f39fa 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -4,11 +4,11 @@ MauvilleCity_House1_MapScripts:: @ 81569FC MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer - checkflag 107 + checkflag FLAG_RECEIVED_HM06 goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem ITEM_HM06 - setflag 107 + setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 44deb9d63..aad1c6e16 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -3,10 +3,10 @@ MossdeepCity_MapScripts:: @ 814CF92 .byte 0 MossdeepCity_MapScript1_14CF98:: @ 814CF98 - clearflag 100 - clearflag 101 - clearflag 102 - clearflag 103 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 checkflag 2090 call_if 1, MossdeepCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 19b3c5045..dbd48c7d2 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -3,25 +3,25 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A558 end @@ -82,9 +82,9 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A621 - setflag 100 + setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 5, 5, 516, 0 @@ -99,7 +99,7 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619 end MossdeepCity_Gym_EventScript_15A621:: @ 815A621 - clearflag 100 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 5, 5, 524, 0 @@ -109,9 +109,9 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A675 - setflag 101 + setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 8, 14, 516, 0 @@ -120,7 +120,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 end MossdeepCity_Gym_EventScript_15A675:: @ 815A675 - clearflag 101 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 8, 14, 517, 0 @@ -130,9 +130,9 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 - setflag 102 + setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 15, 17, 524, 0 @@ -141,7 +141,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A end MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 - clearflag 102 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 15, 17, 516, 0 @@ -151,9 +151,9 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A71D - setflag 103 + setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 1, 23, 525, 0 @@ -162,7 +162,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE end MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D - clearflag 103 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 1, 23, 516, 0 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a8eec9a32..d54976844 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -408,14 +408,14 @@ MtChimney_EventScript_15D17D:: @ 815D17D lockall checkflag 139 goto_if 0, MtChimney_EventScript_15D1D0 - checkflag 115 + checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE - setflag 115 + setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 533fb6e90..1b128aef6 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -69,7 +69,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 end MtPyre_Summit_EventScript_15D57A:: @ 815D57A - setflag 111 + setflag FLAG_MT_PYRE_ORB_STOLEN setvar 0x4058, 1 clearflag 840 clearflag 835 @@ -171,7 +171,7 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 faceplayer checkflag 259 goto_if_eq MtPyre_Summit_EventScript_15D6C4 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A checkflag 129 goto_if_eq MtPyre_Summit_EventScript_15D6BA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 1ac72a727..ae4a2fb6e 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -5,11 +5,11 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag 2064 - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 checkflag 132 call_if 0, OldaleTown_EventScript_14DD9E - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED call_if 1, OldaleTown_EventScript_14DD8C end @@ -195,7 +195,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closemessage diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index b9698b58f..f90c787c2 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -6,7 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 faceplayer message OldaleTown_Mart_Text_1A0BE4 waitmessage - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 @@ -43,7 +43,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 2179a7e18..08853ed32 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -149,7 +149,7 @@ Route119_EventScript_151337:: @ 8151337 Route119_EventScript_151352:: @ 8151352 giveitem ITEM_HM02 - setflag 110 + setflag FLAG_RECEIVED_HM02 return Route119_EventScript_151362:: @ 8151362 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 98061b926..ff21ff1ff 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -65,7 +65,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 - setflag 106 + setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage compare 0x4001, 1 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 34d927753..7270aa5d4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -272,7 +272,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag 271 goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 994e33197..b907e7da3 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -17,7 +17,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 0, SootopolisCity_EventScript_14D0BB return @@ -35,7 +35,7 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag 2077 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 checkflag 2090 call_if 1, SootopolisCity_EventScript_14D123 @@ -68,7 +68,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165 SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release @@ -156,7 +156,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release @@ -170,7 +170,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release @@ -184,7 +184,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release @@ -445,7 +445,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index b88347002..52ccf6b2b 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -29,7 +29,7 @@ SootopolisCity_Mart_Items:: @ 815B234 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B268 checkflag 129 goto_if 0, SootopolisCity_Mart_EventScript_15B268 @@ -45,7 +45,7 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268 SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B290 checkflag 129 goto_if 0, SootopolisCity_Mart_EventScript_15B290 diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index cb09d8856..e36d0ed7b 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -17,7 +17,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 checkflag 129 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 @@ -33,7 +33,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE checkflag 129 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE diff --git a/include/constants/flags.h b/include/constants/flags.h index 05f1541d2..5826aeb2f 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -42,24 +42,46 @@ #define FLAG_VICTORY_ROAD_ROCK FLAG_TEMP_20 // scripts -#define FLAG_SET_WALL_CLOCK 0x51 -#define FLAG_RESCUED_BIRCH 0x52 +#define FLAG_SET_WALL_CLOCK 0x51 +#define FLAG_RESCUED_BIRCH 0x52 -#define FLAG_LINK_CONTEST_ROOM_POKEBALL 0x56 -#define FLAG_MET_RIVAL_MOM 0x57 -#define FLAG_BIRCH_AIDE_MET 0x58 -#define FLAG_DECLINED_BIKE 0x59 -#define FLAG_RECEIVED_BIKE 0x5A +#define FLAG_LINK_CONTEST_ROOM_POKEBALL 0x56 +#define FLAG_MET_RIVAL_MOM 0x57 +#define FLAG_BIRCH_AIDE_MET 0x58 +#define FLAG_DECLINED_BIKE 0x59 +#define FLAG_RECEIVED_BIKE 0x5A -#define FLAG_RECEIVED_WAILMER_PAIL 0x5E -#define FLAG_RECEIVED_POKEBLOCK_CASE 0x5F -#define FLAG_RECEIVED_SECRET_POWER 0x60 +#define FLAG_RECEIVED_WAILMER_PAIL 0x5E +#define FLAG_RECEIVED_POKEBLOCK_CASE 0x5F +#define FLAG_RECEIVED_SECRET_POWER 0x60 + +#define FLAG_TV_EXPLAINED 0x62 +#define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63 +#define FLAG_MOSSDEEP_GYM_SWITCH_1 0x64 +#define FLAG_MOSSDEEP_GYM_SWITCH_2 0x65 +#define FLAG_MOSSDEEP_GYM_SWITCH_3 0x66 +#define FLAG_MOSSDEEP_GYM_SWITCH_4 0x67 + +#define FLAG_OCEANIC_MUSEUM_MET_REPORTER 0x69 +#define FLAG_RECEIVED_HM04 0x6A +#define FLAG_RECEIVED_HM06 0x6B + +#define FLAG_RECEIVED_HM05 0x6D +#define FLAG_RECEIVED_HM02 0x6E +#define FLAG_MT_PYRE_ORB_STOLEN 0x6F +#define FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE 0x70 +#define FLAG_LEGENDARY_BATTLE_COMPLETED 0x71 // defeated or caught Groudon/Kyogre + +#define FLAG_RECEIVED_METEORITE 0x73 +#define FLAG_ADVENTURE_STARTED 0x74 // received pokedex and set loose + +#define FLAG_MET_HIDDEN_POWER_GIVER 0x76 -#define FLAG_TV_EXPLAINED 0x62 -#define FLAG_MAUVILLE_GYM_BARRIERS_STATE 0x63 #define FLAG_PENDING_DAYCARE_EGG 0x86 +#define FLAG_RECEIVED_TM10 0x108 + #define TRAINER_FLAG_START 0x500 // SYSTEM FLAGS |