diff options
67 files changed, 308 insertions, 235 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index 21f999721..a4bb7f4b1 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -1313,7 +1313,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 checkflag 298 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A - checkflag 123 + checkflag FLAG_RECEIVED_HM08 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E return @@ -1408,7 +1408,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 1217 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC @@ -2275,7 +2275,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 clearflag 808 clearflag 984 setvar 0x409a, 6 - setflag 199 + setflag FLAG_RUSTURF_TUNNEL_OPENED return EventScript_1A0457: @ unreferenced? @@ -3744,7 +3744,7 @@ EventScript_1A2DB8: closemessage playse 9 setvar 0x4097, 0 - setflag 173 + setflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 @@ -3785,14 +3785,14 @@ gUnknown_081A2E14:: @ 81A2E14 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 - clearflag 173 + clearflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E38: - setflag 173 + setflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate @@ -3862,20 +3862,20 @@ EventScript_1A2F3A:: LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D - setflag 174 - setflag 175 - setflag 176 - setflag 177 - setflag 178 - setflag 179 - setflag 180 - setflag 181 - setflag 182 - setflag 183 - setflag 184 - setflag 185 - setflag 186 - setflag 187 + setflag FLAG_SECRET_BASE_UNKNOWN_2 + setflag FLAG_SECRET_BASE_UNKNOWN_3 + setflag FLAG_SECRET_BASE_UNKNOWN_4 + setflag FLAG_SECRET_BASE_UNKNOWN_5 + setflag FLAG_SECRET_BASE_UNKNOWN_6 + setflag FLAG_SECRET_BASE_UNKNOWN_7 + setflag FLAG_SECRET_BASE_UNKNOWN_8 + setflag FLAG_SECRET_BASE_UNKNOWN_9 + setflag FLAG_SECRET_BASE_UNKNOWN_10 + setflag FLAG_SECRET_BASE_UNKNOWN_11 + setflag FLAG_SECRET_BASE_UNKNOWN_12 + setflag FLAG_SECRET_BASE_UNKNOWN_13 + setflag FLAG_SECRET_BASE_UNKNOWN_14 + setflag FLAG_SECRET_BASE_UNKNOWN_15 return LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 diff --git a/data/event_scripts.s b/data/event_scripts.s index 97a7d3533..d355bff97 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1307,7 +1307,7 @@ EverGrandeCity_HallOfFame_EventScript_19FC13:: @ 819FC13 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC70 checkflag 298 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5A - checkflag 123 + checkflag FLAG_RECEIVED_HM08 call_if 0, EverGrandeCity_HallOfFame_EventScript_19FC5E return @@ -1402,7 +1402,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B RustboroCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B SlateportCity_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B:: @ 819FD1B - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_1A14DC checkflag 1217 goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_1A14DC @@ -2269,7 +2269,7 @@ RusturfTunnel_EventScript_1A0442:: @ 81A0442 clearflag 808 clearflag 984 setvar 0x409a, 6 - setflag 199 + setflag FLAG_RUSTURF_TUNNEL_OPENED return EventScript_1A0457: @ unreferenced? @@ -3723,7 +3723,7 @@ EventScript_1A2DB8: closemessage playse 9 setvar 0x4097, 0 - setflag 173 + setflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BB8CC special sub_80BBAF0 setvar 0x8004, 0 @@ -3764,14 +3764,14 @@ gUnknown_081A2E14:: @ 81A2E14 special sub_80BC114 compare RESULT, 0 goto_if_eq EventScript_1A2E38 - clearflag 173 + clearflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate end EventScript_1A2E38: - setflag 173 + setflag FLAG_SECRET_BASE_UNKNOWN_1 special sub_80BBAF0 setvar 0x4089, 0 waitstate @@ -3841,20 +3841,20 @@ EventScript_1A2F3A:: LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D:: @ 81A2F3D LittlerootTown_MaysHouse_2F_EventScript_1A2F3D:: @ 81A2F3D SecretBase_RedCave1_EventScript_1A2F3D:: @ 81A2F3D - setflag 174 - setflag 175 - setflag 176 - setflag 177 - setflag 178 - setflag 179 - setflag 180 - setflag 181 - setflag 182 - setflag 183 - setflag 184 - setflag 185 - setflag 186 - setflag 187 + setflag FLAG_SECRET_BASE_UNKNOWN_2 + setflag FLAG_SECRET_BASE_UNKNOWN_3 + setflag FLAG_SECRET_BASE_UNKNOWN_4 + setflag FLAG_SECRET_BASE_UNKNOWN_5 + setflag FLAG_SECRET_BASE_UNKNOWN_6 + setflag FLAG_SECRET_BASE_UNKNOWN_7 + setflag FLAG_SECRET_BASE_UNKNOWN_8 + setflag FLAG_SECRET_BASE_UNKNOWN_9 + setflag FLAG_SECRET_BASE_UNKNOWN_10 + setflag FLAG_SECRET_BASE_UNKNOWN_11 + setflag FLAG_SECRET_BASE_UNKNOWN_12 + setflag FLAG_SECRET_BASE_UNKNOWN_13 + setflag FLAG_SECRET_BASE_UNKNOWN_14 + setflag FLAG_SECRET_BASE_UNKNOWN_15 return LittlerootTown_BrendansHouse_2F_EventScript_1A2F68:: @ 81A2F68 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 68fd92ac0..6c2678072 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -40,11 +40,11 @@ FallarborTown_ContestLobby_EventScript_1A4EF6:: @ 81A4EF6 end FallarborTown_ContestLobby_EventScript_1A4F13:: @ 81A4F13 - checkflag 150 + checkflag FLAG_RECEIVED_CONTEST_PASS goto_if_eq FallarborTown_ContestLobby_EventScript_1A4F44 msgbox FallarborTown_ContestLobby_Text_1A6583, 4 giveitem ITEM_CONTEST_PASS - setflag 150 + setflag FLAG_RECEIVED_CONTEST_PASS setflag FLAG_TEMP_1 msgbox FallarborTown_ContestLobby_Text_1A5E98, 4 goto FallarborTown_ContestLobby_EventScript_1A4F8F diff --git a/data/scripts/day_care.inc b/data/scripts/day_care.inc index 22d99f2a4..a09e47810 100644 --- a/data/scripts/day_care.inc +++ b/data/scripts/day_care.inc @@ -21,7 +21,7 @@ Route117_EventScript_1B2262:: @ 81B2262 compare RESULT, 1 goto_if_eq Route117_EventScript_1B2298 msgbox Route117_Text_1B2745, 4 - clearflag 134 + clearflag FLAG_PENDING_DAYCARE_EGG special RejectEggFromDayCare release end @@ -42,7 +42,7 @@ Route117_EventScript_1B22B2:: @ 81B22B2 waitbutton msgbox Route117_Text_1B27CD, 4 special GiveEggFromDaycare - clearflag 134 + clearflag FLAG_PENDING_DAYCARE_EGG release end diff --git a/data/scripts/magma_chimney.inc b/data/scripts/magma_chimney.inc index f13b319f4..586bbf3c5 100644 --- a/data/scripts/magma_chimney.inc +++ b/data/scripts/magma_chimney.inc @@ -85,7 +85,7 @@ MtChimney_EventScript_1B2CCB:: @ 81B2CCB call_if 1, MtChimney_EventScript_1B2D9E removeobject 1 setflag 927 - setflag 139 + setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY clearflag 928 setflag 942 releaseall diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bea4fc475..e08a108c6 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -9,7 +9,7 @@ DewfordTown_MapScript1_14DFFE:: @ 814DFFE DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waitmessage @@ -176,9 +176,9 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 clearflag 744 setflag 743 hideobject 4, 0, 11 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 17b000711..83dd7e78e 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -100,7 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 - checkflag 166 + checkflag FLAG_RECEIVED_TM08 goto_if 0, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 - setflag 166 + setflag FLAG_RECEIVED_TM08 release end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 286f01a93..1a4bbc114 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -12,7 +12,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 8e4b8bda3..dcfe7705a 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -60,7 +60,7 @@ FallarborTown_House1_EventScript_153C5E:: @ 8153C5E faceplayer checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C86 - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 1e2d3c4f3..abcb20c25 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 - checkflag 170 + checkflag FLAG_RECEIVED_TM40 goto_if 0, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -40,7 +40,7 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 - setflag 170 + setflag FLAG_RECEIVED_TM40 release end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 7b7ef0b2e..9ce96effe 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12 FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer - checkflag 155 + checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 @@ -30,7 +30,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 waitstate getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 - setflag 155 + setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 070276e58..dc61a77bf 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,9 +5,9 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar 0x8004, 274 + setvar 0x8004, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F - setflag 189 + setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 compare RESULT, 0 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 6af7731e1..dde0b0ebd 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -5,7 +5,7 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 06cf57265..40c1b6ea9 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -70,7 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 - checkflag 168 + checkflag FLAG_RECEIVED_TM50 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 - setflag 168 + setflag FLAG_RECEIVED_TM50 release end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index f2769ce3e..f0e515f13 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -126,23 +126,23 @@ LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA return LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27 - setflag 160 + setflag FLAG_COOL_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B - setflag 161 + setflag FLAG_BEAUTY_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F - setflag 162 + setflag FLAG_CUTE_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33 - setflag 163 + setflag FLAG_SMART_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37 - setflag 164 + setflag FLAG_TOUGH_PAINTING_MADE return LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B @@ -707,7 +707,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E end LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 - checkflag 150 + checkflag FLAG_RECEIVED_CONTEST_PASS goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index a4599f14a..585b1e79b 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -4,31 +4,31 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end @@ -146,35 +146,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8ff7f8b81..8f3b07312 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 100787ccf..56727a3c1 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -135,7 +135,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 68bdf0fcb..c0a403117 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index f778b1eff..407a1141d 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -158,7 +158,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B removeobject 7 clearflag 806 clearflag 809 - setflag 190 + setflag FLAG_DEFEATED_WALLY_MAUVILLE releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 43c60dc31..9b47bf493 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -69,7 +69,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB - checkflag 167 + checkflag FLAG_RECEIVED_TM34 goto_if 0, MauvilleCity_Gym_EventScript_15661D compare 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -100,7 +100,7 @@ MauvilleCity_Gym_EventScript_15661D:: @ 815661D compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 - setflag 167 + setflag FLAG_RECEIVED_TM34 release end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index ea79a03c3..9c32e989c 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -50,7 +50,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 - checkflag 171 + checkflag FLAG_RECEIVED_TM04 goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -76,7 +76,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 - setflag 171 + setflag FLAG_RECEIVED_TM04 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 8f9bf4dc5..63054a60c 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -4,14 +4,14 @@ MossdeepCity_House3_MapScripts:: @ 815A971 MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer - checkflag 152 + checkflag FLAG_RECEIVED_SUPER_ROD goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD - setflag 152 + setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 260cb4b6e..165742145 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -32,13 +32,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer - checkflag 192 + checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B - setflag 192 + setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index e0d6aa69f..ce24f2afd 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -40,7 +40,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 giveitem ITEM_HM08 - setflag 123 + setflag FLAG_RECEIVED_HM08 setflag 302 msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closemessage @@ -126,5 +126,5 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 giveitem ITEM_HM08, 1, 1 - setflag 123 + setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d54976844..0a3570d6d 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -406,7 +406,7 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if 0, MtChimney_EventScript_15D1D0 checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 1b128aef6..e0870e18a 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -173,7 +173,7 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 goto_if_eq MtPyre_Summit_EventScript_15D6C4 checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index b9b712937..92120e362 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -7,7 +7,7 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 setflag FLAG_VISITED_OLDALE_TOWN checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE call_if 0, OldaleTown_EventScript_14DD9E checkflag FLAG_ADVENTURE_STARTED call_if 1, OldaleTown_EventScript_14DD8C @@ -38,7 +38,7 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3 OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE goto_if_eq OldaleTown_EventScript_14DE79 checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 @@ -79,7 +79,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 - setflag 132 + setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 28b9dbd80..a2e033a24 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -4,7 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer - checkflag 154 + checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 @@ -30,7 +30,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E waitstate getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 - setflag 154 + setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f5a6fcc3f..19addd4b4 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -354,7 +354,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - checkflag 169 + checkflag FLAG_RECEIVED_TM42 goto_if 0, PetalburgCity_Gym_EventScript_154A2C checkflag SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 @@ -415,7 +415,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B - setflag 169 + setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index d8e95d8c6..282e064de 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -4,21 +4,21 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 checkflag 1217 goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 - checkflag 135 + checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 - setflag 135 + setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -26,7 +26,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 giveitem ITEM_HM03 - setflag 122 + setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release end @@ -49,7 +49,7 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D checkflag 1217 goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ff0ccce30..9af5c1bdc 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -120,7 +120,7 @@ Route103_EventScript_14ED46:: @ 814ED46 setvar 0x4062, 1 setvar 0x4084, 4 clearflag 889 - setflag 130 + setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 clearflag 979 savebgm 0 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 6e151447e..02cad5688 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,7 +17,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 @@ -158,9 +158,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 setvar 0x408e, 0 - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq Route104_EventScript_14F095 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index a4c360bc0..aabc03439 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -6,7 +6,7 @@ Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 end @@ -24,17 +24,17 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer - checkflag 147 + checkflag FLAG_MR_BRINEY_SAILING_INTRO call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E - setflag 147 + setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 8ef2ee8bc..66173b0cc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -4,7 +4,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag 2108 - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 @@ -21,9 +21,9 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B checkflag FLAG_TEMP_1 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A - setflag 127 + setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 9f0ef8c8d..0c5419af6 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -271,7 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D Route109_EventScript_14F680:: @ 814F680 lock faceplayer - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 50278c024..d365fa925 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -9,9 +9,9 @@ Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer - checkflag 140 + checkflag FLAG_RECEIVED_6_SODA_POP goto_if_eq Route109_SeashoreHouse_EventScript_160E36 - checkflag 141 + checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS goto_if_eq Route109_SeashoreHouse_EventScript_160E08 checkflag FLAG_TEMP_2 goto_if_eq Route109_SeashoreHouse_EventScript_160DFE @@ -30,7 +30,7 @@ Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 giveitem ITEM_SODA_POP, 6 compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C - setflag 140 + setflag FLAG_RECEIVED_6_SODA_POP release end @@ -100,7 +100,7 @@ Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON goto_if 0, Route109_SeashoreHouse_EventScript_160F29 - setflag 141 + setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 1841b025f..6756cd055 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -10,15 +10,15 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 end Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 return @@ -75,11 +75,11 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 compare 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E - clearflag 194 - clearflag 195 - clearflag 196 - clearflag 197 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 end Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E @@ -121,125 +121,125 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall delay 32 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playse 36 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall delay 32 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playse 36 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall delay 32 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playse 36 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall delay 32 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playse 36 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall delay 32 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playse 36 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 - setflag 194 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9 - clearflag 194 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE - setflag 195 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3 - clearflag 195 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8 - setflag 196 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD - clearflag 196 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2 - setflag 197 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7 - clearflag 197 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC - setflag 198 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 9be44af5a..3f5bbd909 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -9,18 +9,18 @@ Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer - checkflag 131 + checkflag FLAG_RECEIVED_DOLL_LANETTE goto_if_eq Route114_LanettesHouse_EventScript_15C28F setflag SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration 99 + givedecoration DECOR_LOTAD_DOLL .else - givedecoration 100 + givedecoration DECOR_SEEDOT_DOLL .endif compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE - setflag 131 + setflag FLAG_RECEIVED_DOLL_LANETTE release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index beb01e083..4853efdb3 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -3,7 +3,7 @@ Route116_MapScripts:: @ 8150A31 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS call_if 1, Route116_EventScript_150A41 end @@ -14,9 +14,9 @@ Route116_EventScript_150A41:: @ 8150A41 Route116_EventScript_150A49:: @ 8150A49 lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq Route116_EventScript_150A67 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 10991c38c..16f35b1f2 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 40affd3fd..44c4c156c 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,7 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag 134 + checkflag FLAG_PENDING_DAYCARE_EGG goto_if 0, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index ac64904a2..09bab727a 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -63,7 +63,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A waitfanfare waitmessage givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 - setflag 151 + setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release end @@ -87,7 +87,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer - checkflag 151 + checkflag FLAG_RECEIVED_CASTFORM goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 6e649de68..76134aa43 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,7 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release @@ -50,7 +50,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release @@ -179,7 +179,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 removeobject 9 setobjectxyperm 9, 30, 10 clearflag 732 - setflag 142 + setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 @@ -326,7 +326,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release @@ -371,7 +371,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 - setflag 159 + setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 @@ -473,7 +473,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage - setflag 144 + setflag FLAG_RETURNED_DEVON_GOODS setflag 732 setvar 0x405a, 5 delay 30 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 3e98746f3..77f2ee0a4 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -4,11 +4,11 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer - checkflag 137 + checkflag FLAG_RECEIVED_HM01 goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem ITEM_HM01 - setflag 137 + setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index 48d8aaf9f..f9e902763 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 end @@ -15,9 +15,9 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release @@ -36,11 +36,11 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release @@ -59,11 +59,11 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index f40c1b87b..c17a1ef68 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -41,7 +41,7 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 faceplayer compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 563e8b7a6..23277711e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitfanfare waitmessage setflag SYS_POKENAV_GET - setflag 188 + setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag 894 clearflag 807 @@ -148,7 +148,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B faceplayer checkflag 272 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 3a92491f7..816098829 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,7 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE - checkflag 165 + checkflag FLAG_RECEIVED_TM39 goto_if 0, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -29,7 +29,7 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B - setflag 165 + setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_184170, 4 release end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index b983617e0..53a845648 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -4,7 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer - checkflag 153 + checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 @@ -29,7 +29,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D special sub_804E174 waitstate msgbox RustboroCity_House1_Text_184F6B, 4 - setflag 153 + setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index ff21ff1ff..002071f2d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -341,8 +341,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA waitmovement 0 removeobject 5 removeobject 7 - clearflag 142 - setflag 143 + clearflag FLAG_DEVON_GOODS_STOLEN + setflag FLAG_RECOVERED_DEVON_GOODS setvar 0x405a, 4 setvar 0x4090, 1 setflag 891 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 1c580202d..d38459c1c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -201,7 +201,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA clearflag 945 setflag SYS_WEATHER_CTRL setflag 854 - setflag 129 + setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag 967 setvar 0x40c6, 1 setvar 0x40a2, 1 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 63f7eca53..b94a0ffd3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -182,7 +182,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 1ee8ff39b..2776dd084 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -57,7 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D end SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index e379c633d..a8411e067 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -87,7 +87,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 playse 9 removeobject 1 setflag 900 - setflag 149 + setflag FLAG_DELIVERED_DEVON_GOODS clearflag 947 setflag 949 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 2e43128de..7b2ae0d67 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -7,9 +7,9 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 checkflag BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 @@ -18,7 +18,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 - setflag 148 + setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag 882 releaseall end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index de86ce969..c0229dc9c 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -5,9 +5,9 @@ SootopolisCity_MapScripts:: @ 814D07D .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 0, SootopolisCity_EventScript_14D0A0 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, SootopolisCity_EventScript_14D0B1 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 44a8684ab..24c333bee 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -87,7 +87,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD 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 172 + checkflag FLAG_RECEIVED_TM03 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 checkflag BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A @@ -112,7 +112,7 @@ SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 - setflag 172 + setflag FLAG_RECEIVED_TM03 release end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 4877d6d6e..9a7b63c82 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -4,11 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 815B29A SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer - checkflag 121 + checkflag FLAG_RECEIVED_TM31 goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem ITEM_TM31 - setflag 121 + setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release end diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 52ccf6b2b..115ed0453 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -31,7 +31,7 @@ SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B268 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release @@ -47,7 +47,7 @@ SootopolisCity_Mart_EventScript_15B272:: @ 815B272 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B290 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index e36d0ed7b..8bbb06575 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -19,7 +19,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release @@ -35,7 +35,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index ce2de5124..9970d0490 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -6,7 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag 2119 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end @@ -15,7 +15,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index d2f0251f7..babbd8cce 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -11,7 +11,7 @@ VerdanturfTown_MapScript1_14E85A:: @ 814E85A VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 applymovement 2, VerdanturfTown_Movement_1A083D @@ -37,7 +37,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index fad64292b..0dd9aed7c 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -4,10 +4,10 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer - checkflag 193 + checkflag FLAG_WALLY_SPEECH goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 - setflag 193 + setflag FLAG_WALLY_SPEECH release end @@ -19,7 +19,7 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B @@ -46,7 +46,7 @@ VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 faceplayer checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 - checkflag 190 + checkflag FLAG_DEFEATED_WALLY_MAUVILLE goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release @@ -65,11 +65,11 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index fe775d793..e92cdcc82 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,7 +3,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD call_if 1, VictoryRoad_1F_EventScript_15DE93 end @@ -43,7 +43,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 msgbox VictoryRoad_1F_Text_197967, 4 clearflag 858 moveobjectoffscreen 4 - setflag 126 + setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD setvar 0x40c3, 1 releaseall end diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index c8cc4cd21..eab06c8ee 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -274,14 +274,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_1B6C33:: @ 81B6C33 end LittlerootTown_BrendansHouse_1F_EventScript_1B6C3D:: @ 81B6C3D - checkflag 133 + checkflag FLAG_RECEIVED_AMULET_COIN goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1B6C72 msgbox LittlerootTown_BrendansHouse_1F_Text_172782, 4 giveitem ITEM_AMULET_COIN compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1A029B msgbox LittlerootTown_BrendansHouse_1F_Text_1727CD, 4 - setflag 133 + setflag FLAG_RECEIVED_AMULET_COIN release end diff --git a/include/constants/flags.h b/include/constants/flags.h index 5826aeb2f..8038bcdd4 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -70,15 +70,88 @@ #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_LEGENDARY_BATTLE_COMPLETED 0x71 // defeated or caught Groudon/Kyogre in Cave of Origin #define FLAG_RECEIVED_METEORITE 0x73 #define FLAG_ADVENTURE_STARTED 0x74 // received pokedex and set loose #define FLAG_MET_HIDDEN_POWER_GIVER 0x76 - -#define FLAG_PENDING_DAYCARE_EGG 0x86 +#define FLAG_RECEIVED_TM31 0x79 +#define FLAG_RECEIVED_HM03 0x7A +#define FLAG_RECEIVED_HM08 0x7B + +#define FLAG_DEFEATED_WALLY_VICTORY_ROAD 0x7E +#define FLAG_MET_PRETTY_PETAL_SHOP_OWNER 0x7F + +#define FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN 0x81 +#define FLAG_DEFEATED_RIVAL_ROUTE103 0x82 +#define FLAG_RECEIVED_DOLL_LANETTE 0x83 +#define FLAG_RECEIVED_POTION_OLDALE 0x84 +#define FLAG_RECEIVED_AMULET_COIN 0x85 +#define FLAG_PENDING_DAYCARE_EGG 0x86 +#define FLAG_THANKED_FOR_PLAYING_WITH_WALLY 0x87 + +#define FLAG_RECEIVED_HM01 0x89 + +#define FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY 0x8B +#define FLAG_RECEIVED_6_SODA_POP 0x8C +#define FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS 0x8D +#define FLAG_DEVON_GOODS_STOLEN 0x8E +#define FLAG_RECOVERED_DEVON_GOODS 0x8F +#define FLAG_RETURNED_DEVON_GOODS 0x90 + +#define FLAG_MR_BRINEY_SAILING_INTRO 0x93 +#define FLAG_DOCK_REJECTED_DEVON_GOODS 0x94 +#define FLAG_DELIVERED_DEVON_GOODS 0x95 +#define FLAG_RECEIVED_CONTEST_PASS 0x96 +#define FLAG_RECEIVED_CASTFORM 0x97 +#define FLAG_RECEIVED_SUPER_ROD 0x98 +#define FLAG_RUSTBORO_NPC_TRADE_COMPLETED 0x99 +#define FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED 0x9A +#define FLAG_FORTREE_NPC_TRADE_COMPLETED 0x9B + +#define FLAG_UNKNOWN_9F 0x9F +#define FLAG_COOL_PAINTING_MADE 0xA0 +#define FLAG_BEAUTY_PAINTING_MADE 0xA1 +#define FLAG_CUTE_PAINTING_MADE 0xA2 +#define FLAG_SMART_PAINTING_MADE 0xA3 +#define FLAG_TOUGH_PAINTING_MADE 0xA4 +#define FLAG_RECEIVED_TM39 0xA5 +#define FLAG_RECEIVED_TM08 0xA6 +#define FLAG_RECEIVED_TM34 0xA7 +#define FLAG_RECEIVED_TM50 0xA8 +#define FLAG_RECEIVED_TM42 0xA9 +#define FLAG_RECEIVED_TM40 0xAA +#define FLAG_RECEIVED_TM04 0xAB +#define FLAG_RECEIVED_TM03 0xAC +#define FLAG_SECRET_BASE_UNKNOWN_1 0xAD +#define FLAG_SECRET_BASE_UNKNOWN_2 0xAE +#define FLAG_SECRET_BASE_UNKNOWN_3 0xAF +#define FLAG_SECRET_BASE_UNKNOWN_4 0xB0 +#define FLAG_SECRET_BASE_UNKNOWN_5 0xB1 +#define FLAG_SECRET_BASE_UNKNOWN_6 0xB2 +#define FLAG_SECRET_BASE_UNKNOWN_7 0xB3 +#define FLAG_SECRET_BASE_UNKNOWN_8 0xB4 +#define FLAG_SECRET_BASE_UNKNOWN_9 0xB5 +#define FLAG_SECRET_BASE_UNKNOWN_10 0xB6 +#define FLAG_SECRET_BASE_UNKNOWN_11 0xB7 +#define FLAG_SECRET_BASE_UNKNOWN_12 0xB8 +#define FLAG_SECRET_BASE_UNKNOWN_13 0xB9 +#define FLAG_SECRET_BASE_UNKNOWN_14 0xBA +#define FLAG_SECRET_BASE_UNKNOWN_15 0xBB +#define FLAG_RECEIVED_POKENAV 0xBC +#define FLAG_DELIVERED_STEVEN_LETTER 0xBD +#define FLAG_DEFEATED_WALLY_MAUVILLE 0xBE + +#define FLAG_RECEIVED_SUN_STONE_MOSSDEEP 0xC0 +#define FLAG_WALLY_SPEECH 0xC1 +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 0xC2 +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 0xC3 +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 0xC4 +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 0xC5 +#define FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 0xC6 +#define FLAG_RUSTURF_TUNNEL_OPENED 0xC7 #define FLAG_RECEIVED_TM10 0x108 |