diff options
| author | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:12:43 +0000 |
|---|---|---|
| committer | Tetrable <atifhuss386@gmail.com> | 2019-01-02 21:12:43 +0000 |
| commit | 1e3da62d24ad91e4d69ac6974476fd5ea47cae9b (patch) | |
| tree | 806828b7a2be77e7afc2017b34cef7f5c35324d0 /data | |
| parent | 2dd706ca5410d98ad214ceff7026d6db276f4d5a (diff) | |
Finish off labelling flags
Diffstat (limited to 'data')
184 files changed, 898 insertions, 930 deletions
diff --git a/data/event_scripts.s b/data/event_scripts.s index 92b0d504d..068b79c63 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -451,7 +451,7 @@ EventScript_SecretBasePC:: @ 823B4BB EventScript_23B4D3:: @ 823B4D3 message Text_27681A waitmessage - goto_if_set FLAG_0x10C, EventScript_23B4EF + goto_if_set FLAG_DECORATION_16, EventScript_23B4EF goto EventScript_23B531 end @@ -1049,7 +1049,7 @@ EventScript_2715DE:: @ 82715DE setflag FLAG_HIDE_LILYCOVE_HARBOR_EON_TICKET_TAKER setflag FLAG_HIDE_SOUTHERN_ISLAND_EON_STONE setflag FLAG_HIDE_SOUTHERN_ISLAND_UNCHOSEN_EON_DUO_MON - setflag FLAG_0x393 + setflag FLAG_UNKNOWN_0x393 setflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE setflag FLAG_HIDE_MAUVILLE_CITY_WATTSON setflag FLAG_HIDE_MAUVILLE_CITY_SCOTT @@ -1106,7 +1106,7 @@ EventScript_2715DE:: @ 82715DE EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 special sub_81AFDD0 - setflag FLAG_0x87F + setflag FLAG_IS_CHAMPION call EverGrandeCity_HallOfFame_EventScript_271829 compare VAR_0x40CC, 0 call_if_eq EverGrandeCity_HallOfFame_EventScript_271839 @@ -1124,8 +1124,8 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 clearflag FLAG_HIDE_SAFARI_ZONE_SOUTH_EAST_EXPANSION setflag FLAG_HIDE_LILYCOVE_CITY_RIVAL special sub_813BA60 - call_if_unset FLAG_0x123, EverGrandeCity_HallOfFame_EventScript_271843 - call_if_unset FLAG_0x12A, EverGrandeCity_HallOfFame_EventScript_27183F + call_if_unset FLAG_RECEIVED_SS_TICKET, EverGrandeCity_HallOfFame_EventScript_271843 + call_if_unset FLAG_RECEIVED_BELDUM, EverGrandeCity_HallOfFame_EventScript_27183F setflag FLAG_HIDE_LITTLEROOT_TOWN_BRENDANS_HOUSE_RIVAL_BEDROOM setflag FLAG_HIDE_LITTLEROOT_TOWN_MAYS_HOUSE_RIVAL_BEDROOM compare VAR_0x40D3, 0 @@ -1133,11 +1133,11 @@ EverGrandeCity_HallOfFame_EventScript_2717C1:: @ 82717C1 return EverGrandeCity_HallOfFame_EventScript_271829:: @ 8271829 - clearflag FLAG_0x1C7 - clearflag FLAG_0x1C8 - clearflag FLAG_0x1AC - clearflag FLAG_0x1DD - clearflag FLAG_0x1DC + clearflag FLAG_DEFEATED_MEW + clearflag FLAG_DEFEATED_LATIAS_OR_LATIOS + clearflag FLAG_DEFEATED_DEOXYS + clearflag FLAG_DEFEATED_LUGIA + clearflag FLAG_DEFEATED_HO_OH return EverGrandeCity_HallOfFame_EventScript_271839:: @ 8271839 @@ -1205,10 +1205,10 @@ EverGrandeCity_HallOfFame_EventScript_2718B3:: @ 82718B3 end EverGrandeCity_HallOfFame_EventScript_2718CC:: @ 82718CC - clearflag FLAG_0x4FB - clearflag FLAG_0x4FC - clearflag FLAG_0x4FD - clearflag FLAG_0x4FE + clearflag FLAG_DEFEATED_ELITE_4_SYDNEY + clearflag FLAG_DEFEATED_ELITE_4_PHOEBE + clearflag FLAG_DEFEATED_ELITE_4_GLACIA + clearflag FLAG_DEFEATED_ELITE_4_DRAKE setvar VAR_0x409C, 0 return @@ -1221,8 +1221,8 @@ PetalburgCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE RustboroCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE SlateportCity_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE VerdanturfTown_PokemonCenter_1F_EventScript_2718DE:: @ 82718DE - goto_if_unset FLAG_0x0BC, OldaleTown_PokemonCenter_1F_EventScript_27374E - goto_if_set FLAG_0x4F4, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_unset FLAG_RECEIVED_POKENAV, OldaleTown_PokemonCenter_1F_EventScript_27374E + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, OldaleTown_PokemonCenter_1F_EventScript_27374E goto_if_unset FLAG_HIDE_ROUTE_104_MR_BRINEY_BOAT, OldaleTown_PokemonCenter_1F_EventScript_27190C goto_if_unset FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN, OldaleTown_PokemonCenter_1F_EventScript_271912 goto_if_unset FLAG_HIDE_ROUTE_108_MR_BRINEY, OldaleTown_PokemonCenter_1F_EventScript_271918 @@ -1283,7 +1283,7 @@ OldaleTown_PokemonCenter_1F_EventScript_27195A:: @ 827195A call_if_eq OldaleTown_PokemonCenter_1F_EventScript_27198D waitmessage call OldaleTown_PokemonCenter_1F_EventScript_271993 - goto_if_unset FLAG_0x111, OldaleTown_PokemonCenter_1F_EventScript_271A43 + goto_if_unset FLAG_POKERUS_EXPLAINED, OldaleTown_PokemonCenter_1F_EventScript_271A43 goto OldaleTown_PokemonCenter_1F_EventScript_2719B1 end @@ -1336,9 +1336,9 @@ OldaleTown_PokemonCenter_1F_EventScript_271A03:: @ 8271A03 return OldaleTown_PokemonCenter_1F_EventScript_271A19:: @ 8271A19 - goto_if_set FLAG_0x880, OldaleTown_PokemonCenter_1F_EventScript_2719E2 + goto_if_set FLAG_NURSE_UNION_ROOM_REMINDER, OldaleTown_PokemonCenter_1F_EventScript_2719E2 msgbox gUnknown_08272798, MSGBOX_DEFAULT - setflag FLAG_0x880 + setflag FLAG_NURSE_UNION_ROOM_REMINDER message OldaleTown_PokemonCenter_1F_Text_278A48 waitmessage applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_271AD0 @@ -1356,12 +1356,12 @@ OldaleTown_PokemonCenter_1F_EventScript_271A43:: @ 8271A43 OldaleTown_PokemonCenter_1F_EventScript_271A5F:: @ 8271A5F message gUnknown_08272F07 - setflag FLAG_0x111 + setflag FLAG_POKERUS_EXPLAINED return OldaleTown_PokemonCenter_1F_EventScript_271A68:: @ 8271A68 - goto_if_set FLAG_0x159, OldaleTown_PokemonCenter_1F_EventScript_271AAC - setflag FLAG_0x159 + goto_if_set FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD, OldaleTown_PokemonCenter_1F_EventScript_271AAC + setflag FLAG_OLDALE_NURSE_MENTIONS_GOLD_CARD msgbox gUnknown_082727F5, MSGBOX_DEFAULT playse SE_PIN applymovement VAR_0x800B, OldaleTown_PokemonCenter_1F_Movement_272598 @@ -1744,7 +1744,7 @@ LavaridgeTown_Gym_1F_EventScript_271E84:: @ 8271E84 MauvilleCity_Gym_EventScript_271E84:: @ 8271E84 RustboroCity_Gym_EventScript_271E84:: @ 8271E84 clearflag FLAG_HIDE_PETALBURG_GYM_GREETER - setflag FLAG_0x128 + setflag FLAG_PETALBURG_MART_EXPANDED_ITEMS return DewfordTown_EventScript_271E8B:: @ 8271E8B @@ -2134,7 +2134,7 @@ Route103_EventScript_272141:: @ 8272141 lock faceplayer goto_if_unset FLAG_HAS_MATCH_CALL, Route101_EventScript_272155 - goto_if_unset FLAG_0x119, Route101_EventScript_1FA2D2 + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, Route101_EventScript_1FA2D2 Route101_EventScript_272155:: @ 8272155 msgbox gUnknown_082A5C9C, MSGBOX_YESNO @@ -3196,7 +3196,7 @@ EventScript_2736D9:: @ 82736D9 special sub_80B05B4 waitstate fadescreen 1 - call_if_set FLAG_0x06C, EventScript_2736F4 + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, EventScript_2736F4 special sp0C8_whiteout_maybe waitstate end @@ -4287,8 +4287,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_28C883:: @ 828C883 compare VAR_RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C939 copyvar VAR_0x8009, VAR_0x8006 - goto_if_set FLAG_0x069, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 - setflag FLAG_0x069 + goto_if_set FLAG_OCEANIC_MUSEUM_MET_REPORTER, SlateportCity_OceanicMuseum_1F_EventScript_28C8C8 + setflag FLAG_OCEANIC_MUSEUM_MET_REPORTER msgbox SlateportCity_OceanicMuseum_1F_Text_2811A0, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_28C8E7 @@ -10058,7 +10058,7 @@ PacifidlogTown_PokemonCenter_1F_Text_2C7E7A: @ 82C7E7A SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 lock faceplayer - goto_if_set FLAG_0x1B1, SlateportCity_PokemonFanClub_EventScript_2C7F74 + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SWAGGER, SlateportCity_PokemonFanClub_EventScript_2C7F74 msgbox SlateportCity_PokemonFanClub_Text_2C6E37, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A @@ -10070,7 +10070,7 @@ SlateportCity_PokemonFanClub_EventScript_2C7F16:: @ 82C7F16 call SlateportCity_PokemonFanClub_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_2C7F6A - setflag FLAG_0x1B1 + setflag FLAG_MOVE_TUTOR_TAUGHT_SWAGGER goto SlateportCity_PokemonFanClub_EventScript_2C7F74 end @@ -10087,7 +10087,7 @@ SlateportCity_PokemonFanClub_EventScript_2C7F74:: @ 82C7F74 MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E lock faceplayer - goto_if_set FLAG_0x1B2, MauvilleCity_EventScript_2C7FDC + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT, MauvilleCity_EventScript_2C7FDC msgbox MauvilleCity_Text_2C6FDB, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_2C7FD2 @@ -10099,7 +10099,7 @@ MauvilleCity_EventScript_2C7F7E:: @ 82C7F7E call MauvilleCity_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_EventScript_2C7FD2 - setflag FLAG_0x1B2 + setflag FLAG_MOVE_TUTOR_TAUGHT_ROLLOUT goto MauvilleCity_EventScript_2C7FDC end @@ -10116,7 +10116,7 @@ MauvilleCity_EventScript_2C7FDC:: @ 82C7FDC VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 lock faceplayer - goto_if_set FLAG_0x1B3, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER, VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 msgbox VerdanturfTown_PokemonCenter_1F_Text_2C7174, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A @@ -10128,7 +10128,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C7FE6:: @ 82C7FE6 call VerdanturfTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_PokemonCenter_1F_EventScript_2C803A - setflag FLAG_0x1B3 + setflag FLAG_MOVE_TUTOR_TAUGHT_FURY_CUTTER goto VerdanturfTown_PokemonCenter_1F_EventScript_2C8044 end @@ -10145,7 +10145,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_2C8044:: @ 82C8044 LavaridgeTown_House_EventScript_2C804E:: @ 82C804E lock faceplayer - goto_if_set FLAG_0x1B4, LavaridgeTown_House_EventScript_2C80AC + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_MIMIC, LavaridgeTown_House_EventScript_2C80AC msgbox LavaridgeTown_House_Text_2C72B6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_House_EventScript_2C80A2 @@ -10157,7 +10157,7 @@ LavaridgeTown_House_EventScript_2C804E:: @ 82C804E call LavaridgeTown_House_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_House_EventScript_2C80A2 - setflag FLAG_0x1B4 + setflag FLAG_MOVE_TUTOR_TAUGHT_MIMIC goto LavaridgeTown_House_EventScript_2C80AC end @@ -10174,7 +10174,7 @@ LavaridgeTown_House_EventScript_2C80AC:: @ 82C80AC FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 lock faceplayer - goto_if_set FLAG_0x1B5, FallarborTown_Mart_EventScript_2C8114 + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_METRONOME, FallarborTown_Mart_EventScript_2C8114 msgbox FallarborTown_Mart_Text_2C7449, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq FallarborTown_Mart_EventScript_2C810A @@ -10186,7 +10186,7 @@ FallarborTown_Mart_EventScript_2C80B6:: @ 82C80B6 call FallarborTown_Mart_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq FallarborTown_Mart_EventScript_2C810A - setflag FLAG_0x1B5 + setflag FLAG_MOVE_TUTOR_TAUGHT_METRONOME goto FallarborTown_Mart_EventScript_2C8114 end @@ -10203,7 +10203,7 @@ FallarborTown_Mart_EventScript_2C8114:: @ 82C8114 FortreeCity_House2_EventScript_2C811E:: @ 82C811E lock faceplayer - goto_if_set FLAG_0x1B6, FortreeCity_House2_EventScript_2C817C + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK, FortreeCity_House2_EventScript_2C817C msgbox FortreeCity_House2_Text_2C7637, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_2C8172 @@ -10215,7 +10215,7 @@ FortreeCity_House2_EventScript_2C811E:: @ 82C811E call FortreeCity_House2_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_2C8172 - setflag FLAG_0x1B6 + setflag FLAG_MOVE_TUTOR_TAUGHT_SLEEP_TALK goto FortreeCity_House2_EventScript_2C817C end @@ -10232,7 +10232,7 @@ FortreeCity_House2_EventScript_2C817C:: @ 82C817C LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 lock faceplayer - goto_if_set FLAG_0x1B7, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE, LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 msgbox LilycoveCity_DepartmentStoreRooftop_Text_2C77C6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA @@ -10244,7 +10244,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C8186:: @ 82C8186 call LilycoveCity_DepartmentStoreRooftop_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_2C81DA - setflag FLAG_0x1B7 + setflag FLAG_MOVE_TUTOR_TAUGHT_SUBSTITUTE goto LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4 end @@ -10261,7 +10261,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_2C81E4:: @ 82C81E4 MossdeepCity_EventScript_2C81EE:: @ 82C81EE lock faceplayer - goto_if_set FLAG_0x1B8, MossdeepCity_EventScript_2C824C + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH, MossdeepCity_EventScript_2C824C msgbox MossdeepCity_Text_2C79A6, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_2C8242 @@ -10273,7 +10273,7 @@ MossdeepCity_EventScript_2C81EE:: @ 82C81EE call MossdeepCity_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_2C8242 - setflag FLAG_0x1B8 + setflag FLAG_MOVE_TUTOR_TAUGHT_DYNAMICPUNCH goto MossdeepCity_EventScript_2C824C end @@ -10290,7 +10290,7 @@ MossdeepCity_EventScript_2C824C:: @ 82C824C SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 lock faceplayer - goto_if_set FLAG_0x1B9, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE, SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 msgbox SootopolisCity_PokemonCenter_1F_Text_2C7B8E, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA @@ -10302,7 +10302,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C8256:: @ 82C8256 call SootopolisCity_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_2C82AA - setflag FLAG_0x1B9 + setflag FLAG_MOVE_TUTOR_TAUGHT_DOUBLE_EDGE goto SootopolisCity_PokemonCenter_1F_EventScript_2C82B4 end @@ -10319,7 +10319,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_2C82B4:: @ 82C82B4 PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE lock faceplayer - goto_if_set FLAG_0x1BA, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C + goto_if_set FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION, PacifidlogTown_PokemonCenter_1F_EventScript_2C831C msgbox PacifidlogTown_PokemonCenter_1F_Text_2C7CFA, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 @@ -10331,7 +10331,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_2C82BE:: @ 82C82BE call PacifidlogTown_PokemonCenter_1F_EventScript_2C8326 compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_PokemonCenter_1F_EventScript_2C8312 - setflag FLAG_0x1BA + setflag FLAG_MOVE_TUTOR_TAUGHT_EXPLOSION goto PacifidlogTown_PokemonCenter_1F_EventScript_2C831C end diff --git a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc index 796b91c02..011ea4a07 100644 --- a/data/maps/AbandonedShip_CaptainsOffice/scripts.inc +++ b/data/maps/AbandonedShip_CaptainsOffice/scripts.inc @@ -4,7 +4,7 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 82387E1 AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2 lock faceplayer - goto_if_set FLAG_TRADED_SCANNER_TO_STERN, AbandonedShip_CaptainsOffice_EventScript_23881A + goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_23881A checkitem ITEM_SCANNER, 1 compare VAR_RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_238810 diff --git a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc index cfdf40163..e89d72c23 100644 --- a/data/maps/AbandonedShip_Corridors_B1F/scripts.inc +++ b/data/maps/AbandonedShip_Corridors_B1F/scripts.inc @@ -8,8 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_237D8F: @ 8237D8F end AbandonedShip_Corridors_B1F_MapScript1_237D98: @ 8237D98 - call_if_unset FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DAB - call_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237DB5 + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DAB + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237DB5 end AbandonedShip_Corridors_B1F_EventScript_237DAB:: @ 8237DAB @@ -26,14 +26,14 @@ AbandonedShip_Corridors_B1F_EventScript_237DBF:: @ 8237DBF AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8 lockall - goto_if_set FLAG_0x0EF, AbandonedShip_Corridors_B1F_EventScript_237E09 + goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_237E09 checkitem ITEM_STORAGE_KEY, 1 compare VAR_RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_237DFF msgbox AbandonedShip_Corridors_B1F_Text_237F4B, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 - setflag FLAG_0x0EF + setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_237DB5 special DrawWholeMapView releaseall diff --git a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc index cb60d7962..f8b5bcc65 100644 --- a/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc +++ b/data/maps/AbandonedShip_HiddenFloorCorridors/scripts.inc @@ -8,14 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_238977: @ 8238977 end AbandonedShip_HiddenFloorCorridors_MapScript1_238980: @ 8238980 - call_if_unset FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 - call_if_unset FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB - call_if_unset FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 - call_if_unset FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F - call_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 - call_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 - call_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD - call_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389F1 + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389FB + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A05 + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238A0F + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389DD + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 end AbandonedShip_HiddenFloorCorridors_EventScript_2389C9:: @ 82389C9 @@ -52,14 +52,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A0F:: @ 8238A0F AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 lockall - goto_if_set FLAG_0x0F0, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_1_KEY, 1 compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 - setflag FLAG_0x0F0 + setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_2389C9 special DrawWholeMapView releaseall @@ -67,14 +67,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19 AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 lockall - goto_if_set FLAG_0x0F1, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_2_KEY, 1 compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 - setflag FLAG_0x0F1 + setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_2389D3 special DrawWholeMapView releaseall @@ -82,14 +82,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50 AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 lockall - goto_if_set FLAG_0x0F2, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_4_KEY, 1 compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 - setflag FLAG_0x0F2 + setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_2389DD special DrawWholeMapView releaseall @@ -97,14 +97,14 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87 AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE lockall - goto_if_set FLAG_0x0F3, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D + goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_238B1D checkitem ITEM_ROOM_6_KEY, 1 compare VAR_RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13 msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, MSGBOX_DEFAULT playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 - setflag FLAG_0x0F3 + setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_2389E7 special DrawWholeMapView releaseall diff --git a/data/maps/AncientTomb/scripts.inc b/data/maps/AncientTomb/scripts.inc index 133db13a5..45bb9e007 100644 --- a/data/maps/AncientTomb/scripts.inc +++ b/data/maps/AncientTomb/scripts.inc @@ -17,7 +17,7 @@ AncientTomb_EventScript_238FCD:: @ 8238FCD AncientTomb_MapScript1_238FE1: @ 8238FE1 setflag FLAG_LANDMARK_ANCIENT_TOMB - call_if_unset FLAG_0x1BD, AncientTomb_EventScript_238FEE + call_if_unset FLAG_DEFEATED_REGISTEEL, AncientTomb_EventScript_238FEE end AncientTomb_EventScript_238FEE:: @ 8238FEE @@ -78,12 +78,12 @@ AncientTomb_EventScript_23905A:: @ 823905A goto_if_eq AncientTomb_EventScript_2390AA compare VAR_RESULT, 5 goto_if_eq AncientTomb_EventScript_2390AA - setflag FLAG_0x1BD + setflag FLAG_DEFEATED_REGISTEEL release end AncientTomb_EventScript_2390A1:: @ 82390A1 - setflag FLAG_0x1BD + setflag FLAG_DEFEATED_REGISTEEL goto AncientTomb_EventScript_27376D end diff --git a/data/maps/AquaHideout_1F/scripts.inc b/data/maps/AquaHideout_1F/scripts.inc index 0b44908e0..653e0f7c7 100644 --- a/data/maps/AquaHideout_1F/scripts.inc +++ b/data/maps/AquaHideout_1F/scripts.inc @@ -4,8 +4,8 @@ AquaHideout_1F_MapScripts:: @ 8233493 AquaHideout_1F_EventScript_233494:: @ 8233494 lock faceplayer - goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334BC - goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334B2 + goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334BC + goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334B2 msgbox AquaHideout_1F_Text_23351D, MSGBOX_DEFAULT release end @@ -23,8 +23,8 @@ AquaHideout_1F_EventScript_2334BC:: @ 82334BC AquaHideout_1F_EventScript_2334C6:: @ 82334C6 lock faceplayer - goto_if_set FLAG_0x06F, AquaHideout_1F_EventScript_2334EE - goto_if_set FLAG_0x0D4, AquaHideout_1F_EventScript_2334E4 + goto_if_set FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT, AquaHideout_1F_EventScript_2334EE + goto_if_set FLAG_RECEIVED_RED_OR_BLUE_ORB, AquaHideout_1F_EventScript_2334E4 msgbox AquaHideout_1F_Text_233739, MSGBOX_DEFAULT release end diff --git a/data/maps/AquaHideout_B1F/scripts.inc b/data/maps/AquaHideout_B1F/scripts.inc index 6a388e625..1763bcd5d 100644 --- a/data/maps/AquaHideout_B1F/scripts.inc +++ b/data/maps/AquaHideout_B1F/scripts.inc @@ -15,8 +15,8 @@ AquaHideout_B1F_EventScript_2339BC:: @ 82339BC return AquaHideout_B1F_MapScript1_2339D0: @ 82339D0 - call_if_unset FLAG_0x1C4, AquaHideout_B1F_EventScript_2339E3 - call_if_unset FLAG_0x1C5, AquaHideout_B1F_EventScript_2339E7 + call_if_unset FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E3 + call_if_unset FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT, AquaHideout_B1F_EventScript_2339E7 end AquaHideout_B1F_EventScript_2339E3:: @ 82339E3 @@ -45,12 +45,12 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB goto_if_eq AquaHideout_B1F_EventScript_233A2F compare VAR_RESULT, 5 goto_if_eq AquaHideout_B1F_EventScript_233A2F - setflag FLAG_0x1C4 + setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT release end AquaHideout_B1F_EventScript_233A2F:: @ 8233A2F - setflag FLAG_0x1C4 + setflag FLAG_DEFEATED_ELECTRODE_1_AQUA_HIDEOUT goto AquaHideout_B1F_EventScript_27376D end @@ -72,12 +72,12 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38 goto_if_eq AquaHideout_B1F_EventScript_233A7C compare VAR_RESULT, 5 goto_if_eq AquaHideout_B1F_EventScript_233A7C - setflag FLAG_0x1C5 + setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT release end AquaHideout_B1F_EventScript_233A7C:: @ 8233A7C - setflag FLAG_0x1C5 + setflag FLAG_DEFEATED_ELECTRODE_2_AQUA_HIDEOUT goto AquaHideout_B1F_EventScript_27376D end @@ -165,4 +165,3 @@ AquaHideout_B1F_Text_233D6E: @ 8233D6E AquaHideout_B1F_Text_233D84: @ 8233D84 .string "If you have a cool uniform, you look\n" .string "good even in a loss, don't you think?$" - diff --git a/data/maps/AquaHideout_B2F/scripts.inc b/data/maps/AquaHideout_B2F/scripts.inc index ab120193d..ba20cb681 100644 --- a/data/maps/AquaHideout_B2F/scripts.inc +++ b/data/maps/AquaHideout_B2F/scripts.inc @@ -3,7 +3,7 @@ AquaHideout_B2F_MapScripts:: @ 8233DCF .byte 0 AquaHideout_B2F_MapScript1_233DD5: @ 8233DD5 - call_if_set FLAG_0x070, AquaHideout_B2F_EventScript_233DDF + call_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, AquaHideout_B2F_EventScript_233DDF end AquaHideout_B2F_EventScript_233DDF:: @ 8233DDF @@ -46,7 +46,7 @@ AquaHideout_B2F_EventScript_233E25:: @ 8233E25 applymovement VAR_0x8008, AquaHideout_B2F_Movement_27259E waitmovement 0 msgbox AquaHideout_B2F_Text_233FF2, MSGBOX_DEFAULT - setflag FLAG_0x070 + setflag FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE setflag FLAG_HIDE_LILYCOVE_CITY_AQUA_GRUNTS release end @@ -156,4 +156,3 @@ AquaHideout_B2F_Text_2342CC: @ 82342CC AquaHideout_B2F_Text_2342FF: @ 82342FF .string "I'll have to learn about how I can\n" .string "battle more effectively…$" - diff --git a/data/maps/ArtisanCave_B1F/scripts.inc b/data/maps/ArtisanCave_B1F/scripts.inc index 059343a56..e46737583 100644 --- a/data/maps/ArtisanCave_B1F/scripts.inc +++ b/data/maps/ArtisanCave_B1F/scripts.inc @@ -3,6 +3,6 @@ ArtisanCave_B1F_MapScripts:: @ 823AFAD .byte 0 ArtisanCave_B1F_MapScript1_23AFB3: @ 823AFB3 - setflag FLAG_0x8DF + setflag FLAG_LANDMARK_ARTISAN_CAVE end diff --git a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc index 1e953db23..b89d2e061 100644 --- a/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerBattleRoom/scripts.inc @@ -513,7 +513,7 @@ BattleFrontier_BattleTowerBattleRoom_EventScript_2421FC:: @ 82421FC end BattleFrontier_BattleTowerBattleRoom_EventScript_24220E:: @ 824220E - setflag FLAG_0x077 + setflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE goto BattleFrontier_BattleTowerBattleRoom_EventScript_241C03 end diff --git a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc index 0479641a7..3dbd5eca3 100644 --- a/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerElevator/scripts.inc @@ -40,7 +40,7 @@ BattleFrontier_BattleTowerElevator_EventScript_241A55:: @ 8241A55 return BattleFrontier_BattleTowerElevator_EventScript_241A5F:: @ 8241A5F - goto_if_unset FLAG_0x152, BattleFrontier_BattleTowerElevator_EventScript_241A7C + goto_if_unset FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerElevator_EventScript_241A7C warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_CORRIDOR2, 255, 7, 2 waitstate return diff --git a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc index 29315eff5..e1bec2c21 100644 --- a/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerLobby/scripts.inc @@ -15,7 +15,7 @@ BattleFrontier_BattleTowerLobby_MapScript1_23E694: @ 823E694 special CallApprenticeFunction compare VAR_0x8004, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_23E6B5 - goto_if_set FLAG_0x934, BattleFrontier_BattleTowerLobby_EventScript_23E6C1 + goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, BattleFrontier_BattleTowerLobby_EventScript_23E6C1 BattleFrontier_BattleTowerLobby_EventScript_23E6B5:: @ 823E6B5 clearflag FLAG_HIDE_APPRENTICE @@ -120,7 +120,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23E7E2:: @ 823E7E2 BattleFrontier_BattleTowerLobby_EventScript_23E7F2:: @ 823E7F2 compare VAR_FRONTIER_BATTLE_MODE, 2 goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23E81E - goto_if_set FLAG_0x152, BattleFrontier_BattleTowerLobby_EventScript_23E81E + goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerLobby_EventScript_23E81E setvar VAR_0x8004, 1 setvar VAR_0x8005, 1 special sub_8161F74 @@ -398,7 +398,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23EC08:: @ 823EC08 lock faceplayer setvar VAR_FRONTIER_FACILITY, 0 - clearflag FLAG_0x152 + clearflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER special SavePlayerParty msgbox BattleFrontier_BattleTowerLobby_Text_240A8B, MSGBOX_DEFAULT @@ -744,7 +744,7 @@ BattleFrontier_BattleTowerLobby_EventScript_23F108:: @ 823F108 compare VAR_RESULT, 6 goto_if_ne BattleFrontier_BattleTowerLobby_EventScript_23F108 call BattleFrontier_BattleTowerLobby_EventScript_23F135 - clearflag FLAG_0x077 + clearflag FLAG_CANCEL_BATTLE_ROOM_CHALLENGE warp MAP_BATTLE_FRONTIER_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar VAR_TEMP_0, 0 waitstate diff --git a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc index ee63e72a1..7dbfbbc13 100644 --- a/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc +++ b/data/maps/BattleFrontier_BattleTowerMultiBattleRoom/scripts.inc @@ -11,7 +11,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DA7: @ 8243DA7 end BattleFrontier_BattleTowerMultiBattleRoom_MapScript1_243DB0: @ 8243DB0 - goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA + goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243DDA clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_1 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_2 clearflag FLAG_HIDE_BATTLE_TOWER_MULTI_BATTLE_PARTNER_3 @@ -165,7 +165,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F29:: @ 8243F29 end BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 - goto_if_set FLAG_0x152, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 + goto_if_set FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER, BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FC3 setvar VAR_0x8004, 11 setvar VAR_0x8005, 0 special sub_8161F74 @@ -195,7 +195,7 @@ BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243F36:: @ 8243F36 compare VAR_FACING, 1 call_if_eq BattleFrontier_BattleTowerMultiBattleRoom_EventScript_243FDF removeobject VAR_LAST_TALKED - setflag FLAG_0x152 + setflag FLAG_CHOSEN_MULTI_BATTLE_NPC_PARTNER warpsilent MAP_BATTLE_FRONTIER_BATTLE_TOWER_MULTI_BATTLE_ROOM, 255, 10, 3 waitstate release diff --git a/data/maps/BattleFrontier_Lounge1/scripts.inc b/data/maps/BattleFrontier_Lounge1/scripts.inc index a12c54334..28aab432b 100644 --- a/data/maps/BattleFrontier_Lounge1/scripts.inc +++ b/data/maps/BattleFrontier_Lounge1/scripts.inc @@ -4,9 +4,9 @@ BattleFrontier_Lounge1_MapScripts:: @ 825E774 BattleFrontier_Lounge1_EventScript_25E775:: @ 825E775 lock faceplayer - call_if_unset FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7AD - call_if_set FLAG_0x153, BattleFrontier_Lounge1_EventScript_25E7B6 - setflag FLAG_0x153 + call_if_unset FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7AD + call_if_set FLAG_MET_BATTLE_FRONTIER_BREEDER, BattleFrontier_Lounge1_EventScript_25E7B6 + setflag FLAG_MET_BATTLE_FRONTIER_BREEDER goto BattleFrontier_Lounge1_EventScript_25E792 end diff --git a/data/maps/BattleFrontier_Lounge2/scripts.inc b/data/maps/BattleFrontier_Lounge2/scripts.inc index e8c5db1f7..435eb4127 100644 --- a/data/maps/BattleFrontier_Lounge2/scripts.inc +++ b/data/maps/BattleFrontier_Lounge2/scripts.inc @@ -4,8 +4,8 @@ BattleFrontier_Lounge2_MapScripts:: @ 8260642 BattleFrontier_Lounge2_EventScript_260643:: @ 8260643 lock faceplayer - goto_if_set FLAG_0x154, BattleFrontier_Lounge2_EventScript_26065F - setflag FLAG_0x154 + goto_if_set FLAG_MET_BATTLE_FRONTIER_MANIAC, BattleFrontier_Lounge2_EventScript_26065F + setflag FLAG_MET_BATTLE_FRONTIER_MANIAC msgbox BattleFrontier_Lounge2_Text_260766, MSGBOX_DEFAULT goto BattleFrontier_Lounge2_EventScript_26066D end diff --git a/data/maps/BattleFrontier_Lounge3/scripts.inc b/data/maps/BattleFrontier_Lounge3/scripts.inc index 4b0b23bc8..6a817d50a 100644 --- a/data/maps/BattleFrontier_Lounge3/scripts.inc +++ b/data/maps/BattleFrontier_Lounge3/scripts.inc @@ -4,11 +4,11 @@ BattleFrontier_Lounge3_MapScripts:: @ 8261D82 BattleFrontier_Lounge3_EventScript_261D83:: @ 8261D83 lock faceplayer - goto_if_set FLAG_0x157, BattleFrontier_Lounge3_EventScript_261EF9 + goto_if_set FLAG_MET_BATTLE_FRONTIER_BETTOR, BattleFrontier_Lounge3_EventScript_261EF9 call BattleFrontier_Lounge3_EventScript_261EA0 compare VAR_0x8004, 2 goto_if_le BattleFrontier_Lounge3_EventScript_261EEB - setflag FLAG_0x157 + setflag FLAG_MET_BATTLE_FRONTIER_BETTOR msgbox BattleFrontier_Lounge3_Text_262061, MSGBOX_DEFAULT goto BattleFrontier_Lounge3_EventScript_261DAF end @@ -472,4 +472,3 @@ BattleFrontier_Lounge3_Text_263545:: @ 8263545 .string "Those TRAINERS…\n" .string "What are they doing?\l" .string "They should be taking challenges.$" - diff --git a/data/maps/BattleFrontier_Lounge6/scripts.inc b/data/maps/BattleFrontier_Lounge6/scripts.inc index 3c1852283..045103171 100644 --- a/data/maps/BattleFrontier_Lounge6/scripts.inc +++ b/data/maps/BattleFrontier_Lounge6/scripts.inc @@ -4,7 +4,7 @@ BattleFrontier_Lounge6_MapScripts:: @ 8264FEC BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED lock faceplayer - goto_if_set FLAG_0x09C, BattleFrontier_Lounge6_EventScript_265083 + goto_if_set FLAG_BATTLE_FRONTIER_TRADE_DONE, BattleFrontier_Lounge6_EventScript_265083 setvar VAR_0x8008, 3 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C @@ -28,7 +28,7 @@ BattleFrontier_Lounge6_EventScript_264FED:: @ 8264FED special sub_807F0E4 waitstate msgbox BattleFrontier_Lounge6_Text_265128, MSGBOX_DEFAULT - setflag FLAG_0x09C + setflag FLAG_BATTLE_FRONTIER_TRADE_DONE release end @@ -78,4 +78,3 @@ BattleFrontier_Lounge6_Text_26520E: @ 826520E .string "Giggle!\n" .string "A SKITTY is so much cuter than I had\l" .string "imagined. I'm delighted!$" - diff --git a/data/maps/BattleFrontier_Lounge7/scripts.inc b/data/maps/BattleFrontier_Lounge7/scripts.inc index 0f9376125..1339b54c9 100644 --- a/data/maps/BattleFrontier_Lounge7/scripts.inc +++ b/data/maps/BattleFrontier_Lounge7/scripts.inc @@ -5,9 +5,9 @@ BattleFrontier_Lounge7_EventScript_265255:: @ 8265255 lock faceplayer setvar VAR_TEMP_C, 9 - goto_if_set FLAG_0x15A, BattleFrontier_Lounge7_EventScript_265276 + goto_if_set FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265276 msgbox BattleFrontier_Lounge7_Text_2656ED, MSGBOX_DEFAULT - setflag FLAG_0x15A + setflag FLAG_MET_FRONTIER_BEAUTY_MOVE_TUTOR goto BattleFrontier_Lounge7_EventScript_265284 end @@ -119,9 +119,9 @@ BattleFrontier_Lounge7_EventScript_265445:: @ 8265445 lock faceplayer setvar VAR_TEMP_C, 10 - goto_if_set FLAG_0x15B, BattleFrontier_Lounge7_EventScript_265466 + goto_if_set FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR, BattleFrontier_Lounge7_EventScript_265466 msgbox BattleFrontier_Lounge7_Text_265A6C, MSGBOX_DEFAULT - setflag FLAG_0x15B + setflag FLAG_MET_FRONTIER_SWIMMER_MOVE_TUTOR goto BattleFrontier_Lounge7_EventScript_265474 end @@ -477,4 +477,3 @@ BattleFrontier_Lounge7_Text_2661B5:: @ 82661B5 .string "A fiery punch\n" .string "that may burn\n" .string "the foe.$" - diff --git a/data/maps/BattleFrontier_OutsideEast/scripts.inc b/data/maps/BattleFrontier_OutsideEast/scripts.inc index 401f5565d..9a90f23f9 100644 --- a/data/maps/BattleFrontier_OutsideEast/scripts.inc +++ b/data/maps/BattleFrontier_OutsideEast/scripts.inc @@ -17,7 +17,7 @@ BattleFrontier_OutsideEast_EventScript_242C19:: @ 8242C19 BattleFrontier_OutsideEast_MapScript1_242C2D: @ 8242C2D setvar VAR_0x40BC, 0 setflag FLAG_HIDE_BATTLE_TOWER_REPORTER - call_if_unset FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242C3F + call_if_unset FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242C3F end BattleFrontier_OutsideEast_EventScript_242C3F:: @ 8242C3F @@ -139,12 +139,12 @@ BattleFrontier_OutsideEast_EventScript_242CFC:: @ 8242CFC goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 compare VAR_RESULT, 5 goto_if_eq BattleFrontier_OutsideEast_EventScript_242D60 - setflag FLAG_0x1C6 + setflag FLAG_DEFEATED_SUDOWOODO release end BattleFrontier_OutsideEast_EventScript_242D60:: @ 8242D60 - setflag FLAG_0x1C6 + setflag FLAG_DEFEATED_SUDOWOODO goto IslandCave_EventScript_27376D end @@ -221,7 +221,7 @@ BattleFrontier_OutsideEast_EventScript_242DE0:: @ 8242DE0 BattleFrontier_OutsideEast_EventScript_242DE9:: @ 8242DE9 lock faceplayer - goto_if_set FLAG_0x1C6, BattleFrontier_OutsideEast_EventScript_242DFE + goto_if_set FLAG_DEFEATED_SUDOWOODO, BattleFrontier_OutsideEast_EventScript_242DFE msgbox BattleFrontier_OutsideEast_Text_243C2C, MSGBOX_DEFAULT release end diff --git a/data/maps/BattleFrontier_ScottsHouse/scripts.inc b/data/maps/BattleFrontier_ScottsHouse/scripts.inc index 9f42bc89e..c0566a1a1 100644 --- a/data/maps/BattleFrontier_ScottsHouse/scripts.inc +++ b/data/maps/BattleFrontier_ScottsHouse/scripts.inc @@ -11,15 +11,15 @@ BattleFrontier_ScottsHouse_EventScript_2636A8:: @ 82636A8 end BattleFrontier_ScottsHouse_EventScript_2636CB:: @ 82636CB - goto_if_unset FLAG_0x1D1, BattleFrontier_ScottsHouse_EventScript_263943 - goto_if_unset FLAG_0x05C, BattleFrontier_ScottsHouse_EventScript_263704 - goto_if_unset FLAG_0x1D2, BattleFrontier_ScottsHouse_EventScript_26376A + goto_if_unset FLAG_SCOTT_GIVES_BATTLE_POINTS, BattleFrontier_ScottsHouse_EventScript_263943 + goto_if_unset FLAG_COLLECTED_ALL_SILVER_SYMBOLS, BattleFrontier_ScottsHouse_EventScript_263704 + goto_if_unset FLAG_RECIEVED_STARF_BERRY_FROM_SCOTT, BattleFrontier_ScottsHouse_EventScript_26376A goto BattleFrontier_ScottsHouse_EventScript_2636EC end BattleFrontier_ScottsHouse_EventScript_2636EC:: @ 82636EC - goto_if_unset FLAG_0x0ED, BattleFrontier_ScottsHouse_EventScript_26381B - goto_if_unset FLAG_0x0EE, BattleFrontier_ScottsHouse_EventScript_2638B4 + goto_if_unset FLAG_RECEIVED_SILVER_SHIELD, BattleFrontier_ScottsHouse_EventScript_26381B + goto_if_unset FLAG_RECEIVED_GOLD_SHIELD, BattleFrontier_ScottsHouse_EventScript_2638B4 goto BattleFrontier_ScottsHouse_EventScript_2637E4 end @@ -35,7 +35,7 @@ BattleFrontier_ScottsHouse_EventScript_263704:: @ 8263704 giveitem_std ITEM_LANSAT_BERRY compare VAR_RESULT, 0 goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0 - setflag FLAG_0x05C + setflag FLAG_COLLECTED_ALL_SILVER_SYMBOLS setflag FLAG_TEMP_4 release end @@ -52,7 +52,7 @@ BattleFrontier_ScottsHouse_EventScript_26376A:: @ 826376A giveitem_std ITEM_STARF_BERRY compare VAR_RESULT, 0 goto_if_eq BattleFrontier_ScottsHouse_EventScript_2637D0 - setflag FLAG_0x1D2 + setflag FLAG_RECIEVED_STARF_BERRY_FROM_SCOTT setflag FLAG_TEMP_4 release end @@ -115,7 +115,7 @@ BattleFrontier_ScottsHouse_EventScript_26387A:: @ 826387A givedecoration_std 42 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0 - setflag FLAG_0x0ED + setflag FLAG_RECEIVED_SILVER_SHIELD setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA end @@ -158,7 +158,7 @@ BattleFrontier_ScottsHouse_EventScript_263913:: @ 8263913 givedecoration_std 43 compare VAR_RESULT, 0 goto_if_eq BattleFrontier_ScottsHouse_EventScript_2638A0 - setflag FLAG_0x0EE + setflag FLAG_RECEIVED_GOLD_SHIELD setflag FLAG_TEMP_3 goto BattleFrontier_ScottsHouse_EventScript_2638AA end @@ -221,7 +221,7 @@ BattleFrontier_ScottsHouse_EventScript_2639F8:: @ 82639F8 special sub_813A9D0 msgbox BattleFrontier_ScottsHouse_Text_263CB0, 9 msgbox BattleFrontier_ScottsHouse_Text_263CD0, MSGBOX_DEFAULT - setflag FLAG_0x1D1 + setflag FLAG_SCOTT_GIVES_BATTLE_POINTS setflag FLAG_TEMP_2 release end diff --git a/data/maps/BirthIsland_Exterior/scripts.inc b/data/maps/BirthIsland_Exterior/scripts.inc index cb84a51bd..0aa8056bc 100644 --- a/data/maps/BirthIsland_Exterior/scripts.inc +++ b/data/maps/BirthIsland_Exterior/scripts.inc @@ -9,12 +9,12 @@ BirthIsland_Exterior_MapScript1_267F25: @ 8267F25 end BirthIsland_Exterior_MapScript1_267F29: @ 8267F29 - setflag FLAG_0x8D3 + setflag FLAG_MAP_SCRIPT_CHECKED_DEOXYS setvar VAR_OBJ_GFX_ID_0, EVENT_OBJ_GFX_RIVAL_BRENDAN_NORMAL setvar VAR_0x4034, 0 setvar VAR_0x4035, 0 - call_if_set FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F4E - call_if_unset FLAG_0x1AD, BirthIsland_Exterior_EventScript_267F55 + call_if_set FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F4E + call_if_unset FLAG_BATTLED_DEOXYS, BirthIsland_Exterior_EventScript_267F55 end BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E @@ -23,7 +23,7 @@ BirthIsland_Exterior_EventScript_267F4E:: @ 8267F4E return BirthIsland_Exterior_EventScript_267F55:: @ 8267F55 - goto_if_set FLAG_0x1AC, BirthIsland_Exterior_EventScript_27374E + goto_if_set FLAG_DEFEATED_DEOXYS, BirthIsland_Exterior_EventScript_27374E clearflag FLAG_HIDE_BIRTH_ISLAND_DEOXYS_TRIANGLE clearflag FLAG_0x8D4 return @@ -94,12 +94,12 @@ BirthIsland_Exterior_EventScript_267FC1:: @ 8267FC1 goto_if_eq BirthIsland_Exterior_EventScript_268049 compare VAR_RESULT, 5 goto_if_eq BirthIsland_Exterior_EventScript_268049 - setflag FLAG_0x1AD + setflag FLAG_BATTLED_DEOXYS release end BirthIsland_Exterior_EventScript_26803B:: @ 826803B - setflag FLAG_0x1AC + setflag FLAG_DEFEATED_DEOXYS setvar VAR_0x8004, 410 goto BirthIsland_Exterior_EventScript_273776 end @@ -118,4 +118,3 @@ BirthIsland_Exterior_Movement_268054: @ 8268054 walk_slow_down walk_slow_down step_end - diff --git a/data/maps/CaveOfOrigin_1F/scripts.inc b/data/maps/CaveOfOrigin_1F/scripts.inc index f42cb92f6..1804e58ea 100644 --- a/data/maps/CaveOfOrigin_1F/scripts.inc +++ b/data/maps/CaveOfOrigin_1F/scripts.inc @@ -3,6 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 8235768 .byte 0 CaveOfOrigin_1F_MapScript1_23576E: @ 823576E - call_if_set FLAG_0x071, CaveOfOrigin_1F_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_1F_EventScript_2722C1 end - diff --git a/data/maps/CaveOfOrigin_B1F/scripts.inc b/data/maps/CaveOfOrigin_B1F/scripts.inc index cf7582e0d..371ea1ba5 100644 --- a/data/maps/CaveOfOrigin_B1F/scripts.inc +++ b/data/maps/CaveOfOrigin_B1F/scripts.inc @@ -51,7 +51,7 @@ CaveOfOrigin_B1F_EventScript_23584D:: @ 823584D closemessage playse SE_KAIDAN fadescreenspeed 1, 4 - setflag FLAG_0x137 + setflag FLAG_WALLACE_GOES_TO_SKY_PILLAR setvar VAR_0x405E, 3 removeobject 1 clearflag FLAG_HIDE_SKY_PILLAR_WALLACE diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc index 9ac7e4741..79c00f28c 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap1/scripts.inc @@ -3,6 +3,5 @@ CaveOfOrigin_UnusedRubySapphireMap1_MapScripts:: @ 8235778 .byte 0 CaveOfOrigin_UnusedRubySapphireMap1_MapScript1_23577E: @ 823577E - call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap1_EventScript_2722C1 end - diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc index 5743c7c8c..6f9812c38 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap2/scripts.inc @@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap2_MapScripts:: @ 8235788 .byte 0 CaveOfOrigin_UnusedRubySapphireMap2_MapScript1_23578E: @ 823578E - call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap2_EventScript_2722C1 end diff --git a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc index c831218a4..baa40934a 100644 --- a/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc +++ b/data/maps/CaveOfOrigin_UnusedRubySapphireMap3/scripts.inc @@ -3,6 +3,6 @@ CaveOfOrigin_UnusedRubySapphireMap3_MapScripts:: @ 8235798 .byte 0 CaveOfOrigin_UnusedRubySapphireMap3_MapScript1_23579E: @ 823579E - call_if_set FLAG_0x071, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 + call_if_set FLAG_UNUSED_RS_LEGENDARY_BATTLE_DONE, CaveOfOrigin_UnusedRubySapphireMap3_EventScript_2722C1 end diff --git a/data/maps/DesertRuins/scripts.inc b/data/maps/DesertRuins/scripts.inc index 685d8f5cf..62828e971 100644 --- a/data/maps/DesertRuins/scripts.inc +++ b/data/maps/DesertRuins/scripts.inc @@ -30,7 +30,7 @@ DesertRuins_EventScript_22D993:: @ 822D993 DesertRuins_MapScript1_22D9CA: @ 822D9CA setflag FLAG_LANDMARK_DESERT_RUINS - call_if_unset FLAG_0x1BB, DesertRuins_EventScript_22D9D7 + call_if_unset FLAG_DEFEATED_REGIROCK, DesertRuins_EventScript_22D9D7 end DesertRuins_EventScript_22D9D7:: @ 822D9D7 @@ -78,12 +78,12 @@ DesertRuins_EventScript_22DA02:: @ 822DA02 goto_if_eq DesertRuins_EventScript_22DA52 compare VAR_RESULT, 5 goto_if_eq DesertRuins_EventScript_22DA52 - setflag FLAG_0x1BB + setflag FLAG_DEFEATED_REGIROCK release end DesertRuins_EventScript_22DA49:: @ 822DA49 - setflag FLAG_0x1BB + setflag FLAG_DEFEATED_REGIROCK goto DesertRuins_EventScript_27376D end diff --git a/data/maps/DesertUnderpass/scripts.inc b/data/maps/DesertUnderpass/scripts.inc index d9913cb76..c64597d6c 100644 --- a/data/maps/DesertUnderpass/scripts.inc +++ b/data/maps/DesertUnderpass/scripts.inc @@ -9,8 +9,8 @@ DesertUnderpass_MapScript1_23AF3D: @ 823AF3D DesertUnderpass_EventScript_23AF41:: @ 823AF41 lock faceplayer - goto_if_set FLAG_0x14F, DesertUnderpass_EventScript_23AF57 - goto_if_set FLAG_0x150, DesertUnderpass_EventScript_23AF68 + goto_if_set FLAG_CHOSE_CLAW_FOSSIL, DesertUnderpass_EventScript_23AF57 + goto_if_set FLAG_CHOSE_ROOT_FOSSIL, DesertUnderpass_EventScript_23AF68 release end diff --git a/data/maps/DewfordTown/scripts.inc b/data/maps/DewfordTown/scripts.inc index b08a0e8a3..6c66f4860 100644 --- a/data/maps/DewfordTown/scripts.inc +++ b/data/maps/DewfordTown/scripts.inc @@ -9,7 +9,7 @@ DewfordTown_MapScript1_1E950D: @ 81E950D DewfordTown_EventScript_1E9511:: @ 81E9511 lock faceplayer - goto_if_unset FLAG_0x0BD, DewfordTown_EventScript_1E9585 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_1E9585 message DewfordTown_Text_1E9C8A waitmessage multichoicedefault 21, 6, 0, 2, 0 @@ -73,7 +73,7 @@ DewfordTown_EventScript_1E95CC:: @ 81E95CC DewfordTown_EventScript_1E95D5:: @ 81E95D5 lock faceplayer - goto_if_set FLAG_0x101, DewfordTown_EventScript_1E962A + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_1E962A msgbox DewfordTown_Text_1E9DD1, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq DewfordTown_EventScript_1E95FF @@ -84,7 +84,7 @@ DewfordTown_EventScript_1E95D5:: @ 81E95D5 DewfordTown_EventScript_1E95FF:: @ 81E95FF msgbox DewfordTown_Text_1E9E14, MSGBOX_DEFAULT giveitem_std ITEM_OLD_ROD - setflag FLAG_0x101 + setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_1E9E65, MSGBOX_DEFAULT release end @@ -174,8 +174,8 @@ DewfordTown_EventScript_1E96E7:: @ 81E96E7 clearflag FLAG_HIDE_ROUTE_109_MR_BRINEY_BOAT setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD_TOWN hideobjectat 4, MAP_DEWFORD_TOWN - call_if_unset FLAG_0x095, DewfordTown_EventScript_1E9790 - call_if_set FLAG_0x095, DewfordTown_EventScript_1E9799 + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9790 + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_1E9799 closemessage copyvar VAR_0x4096, VAR_0x8008 resetobjectpriority EVENT_OBJ_ID_PLAYER, MAP_DEWFORD_TOWN diff --git a/data/maps/DewfordTown_Gym/scripts.inc b/data/maps/DewfordTown_Gym/scripts.inc index 1251c714e..90fd3d4ae 100644 --- a/data/maps/DewfordTown_Gym/scripts.inc +++ b/data/maps/DewfordTown_Gym/scripts.inc @@ -160,7 +160,7 @@ DewfordTown_Gym_EventScript_1FC7C2:: @ 81FC7C2 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq DewfordTown_Gym_EventScript_1FC89C - goto_if_unset FLAG_0x0A6, DewfordTown_Gym_EventScript_1FC878 + goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1FC878 msgbox DewfordTown_Gym_Text_1FD20D, MSGBOX_DEFAULT release end @@ -171,7 +171,7 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 waitmessage call DewfordTown_Gym_EventScript_27207E msgbox DewfordTown_Gym_Text_1FD0A8, MSGBOX_DEFAULT - setflag FLAG_0x4F1 + setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 @@ -186,9 +186,9 @@ DewfordTown_Gym_EventScript_1FC7F7:: @ 81FC7F7 waitfanfare closemessage delay 30 - setflag FLAG_0x1D4 + setflag FLAG_ENABLE_BRAWLY_MATCH_CALL setvar VAR_0x40F4, 0 - setflag FLAG_0x080 + setflag FLAG_ENABLE_ROXANNE_FIRST_CALL release end @@ -197,7 +197,7 @@ DewfordTown_Gym_EventScript_1FC855:: @ 81FC855 compare VAR_RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_27205E msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT - setflag FLAG_0x0A6 + setflag FLAG_RECEIVED_TM08 return DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 @@ -205,7 +205,7 @@ DewfordTown_Gym_EventScript_1FC878:: @ 81FC878 compare VAR_RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_272054 msgbox DewfordTown_Gym_Text_1FD181, MSGBOX_DEFAULT - setflag FLAG_0x0A6 + setflag FLAG_RECEIVED_TM08 release end @@ -277,7 +277,7 @@ DewfordTown_Gym_EventScript_1FC97C:: @ 81FC97C DewfordTown_Gym_EventScript_1FC983:: @ 81FC983 lock faceplayer - goto_if_set FLAG_0x4F1, DewfordTown_Gym_EventScript_1FC998 + goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_1FC998 msgbox DewfordTown_Gym_Text_1FC9D6, MSGBOX_DEFAULT release end @@ -484,4 +484,3 @@ DewfordTown_Gym_Text_1FD3DE: @ 81FD3DE .string "that can battle.\p" .string "I'm sorry, but I'd like you to come back\n" .string "with at least two POKéMON.$" - diff --git a/data/maps/DewfordTown_Hall/scripts.inc b/data/maps/DewfordTown_Hall/scripts.inc index 450ccb4ec..0d9cf514c 100644 --- a/data/maps/DewfordTown_Hall/scripts.inc +++ b/data/maps/DewfordTown_Hall/scripts.inc @@ -252,12 +252,12 @@ DewfordTown_Hall_EventScript_1FD7DA:: @ 81FD7DA lock faceplayer call DewfordTown_Hall_EventScript_271E8B - goto_if_set FLAG_RECEIVED_TM_36, DewfordTown_Hall_EventScript_1FD80E + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1FD80E msgbox DewfordTown_Hall_Text_1FE142, MSGBOX_DEFAULT giveitem_std ITEM_TM36 compare VAR_RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_272054 - setflag FLAG_RECEIVED_TM_36 + setflag FLAG_RECEIVED_TM36 release end diff --git a/data/maps/DewfordTown_House2/scripts.inc b/data/maps/DewfordTown_House2/scripts.inc index cff58306e..eb6beb951 100644 --- a/data/maps/DewfordTown_House2/scripts.inc +++ b/data/maps/DewfordTown_House2/scripts.inc @@ -4,12 +4,12 @@ DewfordTown_House2_MapScripts:: @ 81FE22D DewfordTown_House2_EventScript_1FE22E:: @ 81FE22E lock faceplayer - goto_if_set FLAG_0x121, DewfordTown_House2_EventScript_1FE267 + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_1FE267 msgbox DewfordTown_House2_Text_1FE27A, MSGBOX_DEFAULT giveitem_std ITEM_SILK_SCARF compare VAR_RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_1FE25D - setflag FLAG_0x121 + setflag FLAG_RECEIVED_SILK_SCARF release end diff --git a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc index 06dd58d26..2c0949842 100644 --- a/data/maps/EverGrandeCity_DrakesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_DrakesRoom/scripts.inc @@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286C5:: @ 82286C5 end EverGrandeCity_DrakesRoom_MapScript1_2286D2: @ 82286D2 - call_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_2286E7 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_2286E7 compare VAR_0x409C, 4 call_if_eq EverGrandeCity_DrakesRoom_EventScript_2286ED end @@ -40,7 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_2286ED:: @ 82286ED EverGrandeCity_DrakesRoom_EventScript_2286F3:: @ 82286F3 lock faceplayer - goto_if_set FLAG_0x4FE, EverGrandeCity_DrakesRoom_EventScript_22871A + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_22871A playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_DrakesRoom_Text_22873E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_DRAKE, EverGrandeCity_DrakesRoom_Text_228895 @@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_22871A:: @ 822871A EverGrandeCity_DrakesRoom_EventScript_228724:: @ 8228724 setvar VAR_0x8004, 0 special sub_813BF7C - setflag FLAG_0x4FE + setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_2723F8 msgbox EverGrandeCity_DrakesRoom_Text_2288B0, MSGBOX_DEFAULT release diff --git a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc index 641c994a5..7510f468f 100644 --- a/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc +++ b/data/maps/EverGrandeCity_GlaciasRoom/scripts.inc @@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_22843B:: @ 822843B end EverGrandeCity_GlaciasRoom_MapScript1_228448: @ 8228448 - call_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_22845D + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_22845D compare VAR_0x409C, 3 call_if_eq EverGrandeCity_GlaciasRoom_EventScript_228463 end @@ -40,7 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228463:: @ 8228463 EverGrandeCity_GlaciasRoom_EventScript_228469:: @ 8228469 lock faceplayer - goto_if_set FLAG_0x4FD, EverGrandeCity_GlaciasRoom_EventScript_228490 + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_228490 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_GlaciasRoom_Text_2284AC, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GLACIA, EverGrandeCity_GlaciasRoom_Text_2285B4 @@ -53,7 +53,7 @@ EverGrandeCity_GlaciasRoom_EventScript_228490:: @ 8228490 end EverGrandeCity_GlaciasRoom_EventScript_22849A:: @ 822849A - setflag FLAG_0x4FD + setflag FLAG_DEFEATED_ELITE_4_GLACIA call EverGrandeCity_GlaciasRoom_EventScript_2723F8 msgbox EverGrandeCity_GlaciasRoom_Text_228640, MSGBOX_DEFAULT release diff --git a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc index 84ead3766..77f951d76 100644 --- a/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc +++ b/data/maps/EverGrandeCity_PhoebesRoom/scripts.inc @@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_22819D:: @ 822819D end EverGrandeCity_PhoebesRoom_MapScript1_2281AA: @ 82281AA - call_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281BF + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281BF compare VAR_0x409C, 2 call_if_eq EverGrandeCity_PhoebesRoom_EventScript_2281C5 end @@ -40,7 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281C5:: @ 82281C5 EverGrandeCity_PhoebesRoom_EventScript_2281CB:: @ 82281CB lock faceplayer - goto_if_set FLAG_0x4FC, EverGrandeCity_PhoebesRoom_EventScript_2281F2 + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_2281F2 playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_PhoebesRoom_Text_22820E, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_PHOEBE, EverGrandeCity_PhoebesRoom_Text_228325 @@ -53,7 +53,7 @@ EverGrandeCity_PhoebesRoom_EventScript_2281F2:: @ 82281F2 end EverGrandeCity_PhoebesRoom_EventScript_2281FC:: @ 82281FC - setflag FLAG_0x4FC + setflag FLAG_DEFEATED_ELITE_4_PHOEBE call EverGrandeCity_PhoebesRoom_EventScript_2723F8 msgbox EverGrandeCity_PhoebesRoom_Text_228343, MSGBOX_DEFAULT release diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc index c029571d0..0ec0acbb2 100644 --- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 8229A34 EverGrandeCity_PokemonCenter_1F_MapScript1_229A3F: @ 8229A3F setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1 - call_if_unset FLAG_0x1CF, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C + call_if_unset FLAG_MET_SCOTT_IN_EVERGRANDE, EverGrandeCity_PokemonCenter_1F_EventScript_229A4C end EverGrandeCity_PokemonCenter_1F_EventScript_229A4C:: @ 8229A4C @@ -41,7 +41,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_229A79:: @ 8229A79 compare VAR_FACING, 3 call_if_eq EverGrandeCity_PokemonCenter_1F_EventScript_229AC1 addvar VAR_0x40D1, 1 - setflag FLAG_0x1CF + setflag FLAG_MET_SCOTT_IN_EVERGRANDE playse SE_KAIDAN waitse removeobject 4 diff --git a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc index 9b9c561eb..ce4be66f8 100644 --- a/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc +++ b/data/maps/EverGrandeCity_PokemonLeague_1F/scripts.inc @@ -6,7 +6,7 @@ EverGrandeCity_PokemonLeague_1F_MapScripts:: @ 82295D2 EverGrandeCity_PokemonLeague_1F_MapScript1_2295DD: @ 82295DD setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2 setflag FLAG_LANDMARK_POKEMON_LEAGUE - call_if_unset FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED + call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2295ED end EverGrandeCity_PokemonLeague_1F_EventScript_2295ED:: @ 82295ED @@ -47,7 +47,7 @@ EverGrandeCity_PokemonLeague_1F_Pokemart_229624: @ 8229624 EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 lockall - goto_if_set FLAG_0x107, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB + goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_1F_EventScript_2296BB getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 call_if_ge EverGrandeCity_PokemonLeague_1F_EventScript_229698 @@ -69,7 +69,7 @@ EverGrandeCity_PokemonLeague_1F_EventScript_229636:: @ 8229636 closemessage moveobjectoffscreen 3 moveobjectoffscreen 4 - setflag FLAG_0x107 + setflag FLAG_ENTERED_ELITE_FOUR releaseall end diff --git a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc index 8324e19cf..9152254b3 100644 --- a/data/maps/EverGrandeCity_SidneysRoom/scripts.inc +++ b/data/maps/EverGrandeCity_SidneysRoom/scripts.inc @@ -6,12 +6,12 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 8227F01 .byte 0 EverGrandeCity_SidneysRoom_MapScript1_227F16: @ 8227F16 - setflag FLAG_0x1CF + setflag FLAG_MET_SCOTT_IN_EVERGRANDE setflag FLAG_HIDE_EVER_GRANDE_POKEMON_CENTER_1F_SCOTT end EverGrandeCity_SidneysRoom_MapScript1_227F1D: @ 8227F1D - call_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F32 + call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F32 compare VAR_0x409C, 1 call_if_eq EverGrandeCity_SidneysRoom_EventScript_227F38 end @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F57:: @ 8227F57 EverGrandeCity_SidneysRoom_EventScript_227F64:: @ 8227F64 lock faceplayer - goto_if_set FLAG_0x4FB, EverGrandeCity_SidneysRoom_EventScript_227F8B + goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_227F8B playbgm MUS_SITENNOU, 0 msgbox EverGrandeCity_SidneysRoom_Text_227FA7, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_SIDNEY, EverGrandeCity_SidneysRoom_Text_2280A2 @@ -60,7 +60,7 @@ EverGrandeCity_SidneysRoom_EventScript_227F8B:: @ 8227F8B end EverGrandeCity_SidneysRoom_EventScript_227F95:: @ 8227F95 - setflag FLAG_0x4FB + setflag FLAG_DEFEATED_ELITE_4_SYDNEY call EverGrandeCity_SidneysRoom_EventScript_2723F8 msgbox EverGrandeCity_SidneysRoom_Text_2280EC, MSGBOX_DEFAULT release diff --git a/data/maps/FallarborTown/scripts.inc b/data/maps/FallarborTown/scripts.inc index 7b157c5f3..5e06ed4cb 100644 --- a/data/maps/FallarborTown/scripts.inc +++ b/data/maps/FallarborTown/scripts.inc @@ -5,13 +5,13 @@ FallarborTown_MapScripts:: @ 81EB1FA FallarborTown_MapScript1_1EB200: @ 81EB200 setflag FLAG_VISITED_FALLARBOR_TOWN setvar VAR_0x4086, 0 - clearflag FLAG_0x10E + clearflag FLAG_CONTEST_SKETCH_CREATED end FallarborTown_EventScript_1EB20C:: @ 81EB20C lock faceplayer - goto_if_set FLAG_0x08B, FallarborTown_EventScript_1EB221 + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_1EB221 msgbox FallarborTown_Text_1EB26B, MSGBOX_DEFAULT release end diff --git a/data/maps/FallarborTown_BattleTentLobby/scripts.inc b/data/maps/FallarborTown_BattleTentLobby/scripts.inc index cfc468994..5d05570cc 100644 --- a/data/maps/FallarborTown_BattleTentLobby/scripts.inc +++ b/data/maps/FallarborTown_BattleTentLobby/scripts.inc @@ -294,10 +294,10 @@ FallarborTown_BattleTentLobby_EventScript_20021F:: @ 820021F FallarborTown_BattleTentLobby_EventScript_200228:: @ 8200228 lock faceplayer - goto_if_set FLAG_0x1CD, FallarborTown_BattleTentLobby_EventScript_200245 + goto_if_set FLAG_MET_SCOTT_IN_FALLARBOR, FallarborTown_BattleTentLobby_EventScript_200245 msgbox FallarborTown_BattleTentLobby_Text_200501, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 - setflag FLAG_0x1CD + setflag FLAG_MET_SCOTT_IN_FALLARBOR release end diff --git a/data/maps/FallarborTown_House1/scripts.inc b/data/maps/FallarborTown_House1/scripts.inc index 699f5e4ed..caf915e85 100644 --- a/data/maps/FallarborTown_House1/scripts.inc +++ b/data/maps/FallarborTown_House1/scripts.inc @@ -4,7 +4,7 @@ FallarborTown_House1_MapScripts:: @ 8200F12 FallarborTown_House1_EventScript_200F13:: @ 8200F13 lock faceplayer - goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FB2 + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FB2 checkitem ITEM_METEORITE, 1 compare VAR_RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_200F38 @@ -23,7 +23,7 @@ FallarborTown_House1_EventScript_200F38:: @ 8200F38 goto_if_eq FallarborTown_House1_EventScript_272054 setvar VAR_0x8004, 280 call FallarborTown_House1_EventScript_2723E4 - setflag FLAG_0x0E5 + setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_2011A5, MSGBOX_DEFAULT release end @@ -51,8 +51,8 @@ FallarborTown_House1_EventScript_200FB2:: @ 8200FB2 FallarborTown_House1_EventScript_200FBC:: @ 8200FBC lock faceplayer - goto_if_set FLAG_0x0E5, FallarborTown_House1_EventScript_200FE4 - goto_if_set FLAG_0x08B, FallarborTown_House1_EventScript_200FDA + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_200FE4 + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_200FDA msgbox FallarborTown_House1_Text_2012BC, MSGBOX_DEFAULT release end diff --git a/data/maps/FarawayIsland_Entrance/scripts.inc b/data/maps/FarawayIsland_Entrance/scripts.inc index 8661c4c52..37c16885f 100644 --- a/data/maps/FarawayIsland_Entrance/scripts.inc +++ b/data/maps/FarawayIsland_Entrance/scripts.inc @@ -3,7 +3,7 @@ FarawayIsland_Entrance_MapScripts:: @ 8267C8E .byte 0 FarawayIsland_Entrance_MapScript1_267C94: @ 8267C94 - setflag FLAG_0x8D8 + setflag FLAG_ARRIVED_ON_FARAWAY_ISLAND end FarawayIsland_Entrance_EventScript_267C98:: @ 8267C98 diff --git a/data/maps/FarawayIsland_Interior/scripts.inc b/data/maps/FarawayIsland_Interior/scripts.inc index 55fd591e2..a1038edac 100644 --- a/data/maps/FarawayIsland_Interior/scripts.inc +++ b/data/maps/FarawayIsland_Interior/scripts.inc @@ -40,11 +40,11 @@ FarawayIsland_Interior_EventScript_267D5E:: @ 8267D5E FarawayIsland_Interior_MapScript1_267D72: @ 8267D72 setvar VAR_0x403A, 0 setvar VAR_TEMP_1, 1 - call_if_unset FLAG_0x1CA, FarawayIsland_Interior_EventScript_267D86 + call_if_unset FLAG_CAUGHT_MEW, FarawayIsland_Interior_EventScript_267D86 end FarawayIsland_Interior_EventScript_267D86:: @ 8267D86 - goto_if_set FLAG_0x1C7, FarawayIsland_Interior_EventScript_27374E + goto_if_set FLAG_DEFEATED_MEW, FarawayIsland_Interior_EventScript_27374E clearflag FLAG_HIDE_MEW setvar VAR_TEMP_1, 0 return @@ -153,12 +153,12 @@ FarawayIsland_Interior_EventScript_267DF2:: @ 8267DF2 goto_if_eq FarawayIsland_Interior_EventScript_267EA4 compare VAR_RESULT, 10 goto_if_eq FarawayIsland_Interior_EventScript_267EA4 - setflag FLAG_0x1CA + setflag FLAG_CAUGHT_MEW release end FarawayIsland_Interior_EventScript_267E96:: @ 8267E96 - setflag FLAG_0x1C7 + setflag FLAG_DEFEATED_MEW setvar VAR_0x8004, 151 goto FarawayIsland_Interior_EventScript_273776 end diff --git a/data/maps/FortreeCity/scripts.inc b/data/maps/FortreeCity/scripts.inc index d1c80c9f9..d5c1ab29e 100644 --- a/data/maps/FortreeCity/scripts.inc +++ b/data/maps/FortreeCity/scripts.inc @@ -18,7 +18,7 @@ FortreeCity_EventScript_1E25B6:: @ 81E25B6 FortreeCity_EventScript_1E25BF:: @ 81E25BF lock faceplayer - goto_if_set FLAG_0x127, FortreeCity_EventScript_1E25D4 + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_1E25D4 msgbox FortreeCity_Text_1E2738, MSGBOX_DEFAULT release end @@ -81,7 +81,7 @@ FortreeCity_EventScript_1E2645:: @ 81E2645 applymovement VAR_LAST_TALKED, FortreeCity_Movement_1E2674 waitmovement 0 removeobject VAR_LAST_TALKED - setflag FLAG_0x127 + setflag FLAG_KECLEON_FLED_FORTREE release end diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc index f45d87c58..17633c0d5 100644 --- a/data/maps/FortreeCity_Gym/scripts.inc +++ b/data/maps/FortreeCity_Gym/scripts.inc @@ -20,7 +20,7 @@ FortreeCity_Gym_EventScript_2165C8:: @ 82165C8 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq FortreeCity_Gym_EventScript_21668D - goto_if_unset FLAG_0x0AA, FortreeCity_Gym_EventScript_216646 + goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_216646 msgbox FortreeCity_Gym_Text_217071, MSGBOX_DEFAULT release end @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD waitmessage call FortreeCity_Gym_EventScript_27207E msgbox FortreeCity_Gym_Text_216F17, MSGBOX_DEFAULT - setflag FLAG_0x4F5 + setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET setvar VAR_0x8008, 6 call FortreeCity_Gym_EventScript_271F43 @@ -42,9 +42,9 @@ FortreeCity_Gym_EventScript_2165FD:: @ 82165FD waitfanfare closemessage delay 30 - setflag FLAG_0x1D7 + setflag FLAG_ENABLE_WINONA_MATCH_CALL setvar VAR_0x40F3, 0 - setflag FLAG_0x08A + setflag FLAG_REGISTER_WINONA_POKENAV release end @@ -53,7 +53,7 @@ FortreeCity_Gym_EventScript_216646:: @ 8216646 compare VAR_RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_272054 msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT - setflag FLAG_0x0AA + setflag FLAG_RECEIVED_TM40 release end @@ -62,7 +62,7 @@ FortreeCity_Gym_EventScript_21666A:: @ 821666A compare VAR_RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_27205E msgbox FortreeCity_Gym_Text_216FEC, MSGBOX_DEFAULT - setflag FLAG_0x0AA + setflag FLAG_RECEIVED_TM40 return FortreeCity_Gym_EventScript_21668D:: @ 821668D @@ -103,7 +103,7 @@ FortreeCity_Gym_EventScript_21671B:: @ 821671B FortreeCity_Gym_EventScript_216732:: @ 8216732 lock faceplayer - goto_if_set FLAG_0x4F5, FortreeCity_Gym_EventScript_216747 + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_216747 msgbox FortreeCity_Gym_Text_216785, MSGBOX_DEFAULT release end @@ -318,4 +318,3 @@ FortreeCity_Gym_Text_217292: @ 8217292 .string "POKéMON with you?\p" .string "Please return with two POKéMON\n" .string "at the very least.$" - diff --git a/data/maps/FortreeCity_House1/scripts.inc b/data/maps/FortreeCity_House1/scripts.inc index 44651ae0d..43cfc73fe 100644 --- a/data/maps/FortreeCity_House1/scripts.inc +++ b/data/maps/FortreeCity_House1/scripts.inc @@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 82162BA FortreeCity_House1_EventScript_2162BB:: @ 82162BB lock faceplayer - goto_if_set FLAG_0x09B, FortreeCity_House1_EventScript_216355 + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_216355 setvar VAR_0x8008, 1 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C @@ -29,7 +29,7 @@ FortreeCity_House1_EventScript_2162BB:: @ 82162BB waitstate bufferspeciesname 0, VAR_0x8009 msgbox FortreeCity_House1_Text_216440, MSGBOX_DEFAULT - setflag FLAG_0x09B + setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end diff --git a/data/maps/FortreeCity_House2/scripts.inc b/data/maps/FortreeCity_House2/scripts.inc index db8b14029..cebd18884 100644 --- a/data/maps/FortreeCity_House2/scripts.inc +++ b/data/maps/FortreeCity_House2/scripts.inc @@ -4,8 +4,8 @@ FortreeCity_House2_MapScripts:: @ 82177CA FortreeCity_House2_EventScript_2177CB:: @ 82177CB lock faceplayer - goto_if_set FLAG_0x108, FortreeCity_House2_EventScript_21786E - call_if_unset FLAG_0x076, FortreeCity_House2_EventScript_217862 + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_21786E + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_217862 msgbox FortreeCity_House2_Text_2178D6, MSGBOX_DEFAULT multichoice 21, 8, 54, 1 switch VAR_RESULT @@ -22,14 +22,14 @@ FortreeCity_House2_EventScript_2177CB:: @ 82177CB giveitem_std ITEM_TM10 compare VAR_RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_272054 - setflag FLAG_0x108 + setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_217A91, MSGBOX_DEFAULT release end FortreeCity_House2_EventScript_217862:: @ 8217862 msgbox FortreeCity_House2_Text_217882, MSGBOX_DEFAULT - setflag FLAG_0x076 + setflag FLAG_MET_HIDDEN_POWER_GIVER return FortreeCity_House2_EventScript_21786E:: @ 821786E diff --git a/data/maps/FortreeCity_House4/scripts.inc b/data/maps/FortreeCity_House4/scripts.inc index 742fce6e9..fe4aefe5f 100644 --- a/data/maps/FortreeCity_House4/scripts.inc +++ b/data/maps/FortreeCity_House4/scripts.inc @@ -7,12 +7,12 @@ FortreeCity_House4_EventScript_217C81:: @ 8217C81 FortreeCity_House4_EventScript_217C8A:: @ 8217C8A lockall - goto_if_set FLAG_0x0DF, FortreeCity_House4_EventScript_217D06 - goto_if_set FLAG_0x0E0, FortreeCity_House4_EventScript_217CD8 - goto_if_set FLAG_0x0DE, FortreeCity_House4_EventScript_217CC4 + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_217D06 + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_217CD8 + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_217CC4 msgbox FortreeCity_House4_Text_217DB9, MSGBOX_DEFAULT closemessage - setflag FLAG_0x0DE + setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag FLAG_HIDE_MOSSDEEP_CITY_HOUSE_2_WINGULL applymovement 3, FortreeCity_House4_Movement_217D1A waitmovement 0 @@ -34,7 +34,7 @@ FortreeCity_House4_EventScript_217CD8:: @ 8217CD8 giveitem_std ITEM_MENTAL_HERB compare VAR_RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_272054 - setflag FLAG_0x0DF + setflag FLAG_RECEIVED_MENTAL_HERB releaseall end diff --git a/data/maps/GraniteCave_1F/scripts.inc b/data/maps/GraniteCave_1F/scripts.inc index 1ace4071b..b9e68d43c 100644 --- a/data/maps/GraniteCave_1F/scripts.inc +++ b/data/maps/GraniteCave_1F/scripts.inc @@ -4,10 +4,10 @@ GraniteCave_1F_MapScripts:: @ 822DA5D GraniteCave_1F_EventScript_22DA5E:: @ 822DA5E lock faceplayer - goto_if_set FLAG_0x06D, GraniteCave_1F_EventScript_22DA8A + goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_22DA8A msgbox GraniteCave_1F_Text_22DA94, MSGBOX_DEFAULT giveitem_std ITEM_HM05 - setflag FLAG_0x06D + setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_22DBB7, MSGBOX_DEFAULT release end diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc index e08dfffd7..d29ee13f2 100644 --- a/data/maps/GraniteCave_StevensRoom/scripts.inc +++ b/data/maps/GraniteCave_StevensRoom/scripts.inc @@ -7,7 +7,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B msgbox GraniteCave_StevensRoom_Text_22DD5A, MSGBOX_DEFAULT setvar VAR_0x8004, 274 call GraniteCave_StevensRoom_EventScript_2723E4 - setflag FLAG_0x0BD + setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_22DDBD, MSGBOX_DEFAULT giveitem_std ITEM_TM47 compare VAR_RESULT, 0 @@ -20,7 +20,7 @@ GraniteCave_StevensRoom_EventScript_22DC7B:: @ 822DC7B waitfanfare closemessage delay 30 - setflag FLAG_0x131 + setflag FLAG_REGISTERED_STEVEN_POKENAV msgbox GraniteCave_StevensRoom_Text_22DF8C, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 diff --git a/data/maps/IslandCave/scripts.inc b/data/maps/IslandCave/scripts.inc index 218a92205..7b551b4a7 100644 --- a/data/maps/IslandCave/scripts.inc +++ b/data/maps/IslandCave/scripts.inc @@ -31,7 +31,7 @@ IslandCave_EventScript_238E62:: @ 8238E62 IslandCave_MapScript1_238E99: @ 8238E99 setflag FLAG_LANDMARK_ISLAND_CAVE call IslandCave_EventScript_238F45 - call_if_unset FLAG_0x1BC, IslandCave_EventScript_238EAB + call_if_unset FLAG_DEFEATED_REGICE, IslandCave_EventScript_238EAB end IslandCave_EventScript_238EAB:: @ 8238EAB @@ -107,12 +107,12 @@ IslandCave_EventScript_238F58:: @ 8238F58 goto_if_eq IslandCave_EventScript_238FA8 compare VAR_RESULT, 5 goto_if_eq IslandCave_EventScript_238FA8 - setflag FLAG_0x1BC + setflag FLAG_DEFEATED_REGICE release end IslandCave_EventScript_238F9F:: @ 8238F9F - setflag FLAG_0x1BC + setflag FLAG_DEFEATED_REGICE goto IslandCave_EventScript_27376D end diff --git a/data/maps/JaggedPass/scripts.inc b/data/maps/JaggedPass/scripts.inc index a140093ca..93788a703 100644 --- a/data/maps/JaggedPass/scripts.inc +++ b/data/maps/JaggedPass/scripts.inc @@ -68,7 +68,7 @@ JaggedPass_EventScript_2306BB:: @ 82306BB JaggedPass_EventScript_230718:: @ 8230718 lockall - goto_if_set FLAG_0x139, JaggedPass_EventScript_230766 + goto_if_set FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS, JaggedPass_EventScript_230766 waitse playse SE_PIN applymovement 5, JaggedPass_Movement_272598 @@ -80,7 +80,7 @@ JaggedPass_EventScript_230718:: @ 8230718 msgbox JaggedPass_Text_230CCB, MSGBOX_DEFAULT closemessage trainerbattle_no_intro TRAINER_GRUNT_30, JaggedPass_Text_230D2D - setflag FLAG_0x139 + setflag FLAG_BEAT_MAGMA_GRUNT_JAGGED_PASS applymovement 5, JaggedPass_Movement_2725A2 waitmovement 0 releaseall diff --git a/data/maps/LavaridgeTown/scripts.inc b/data/maps/LavaridgeTown/scripts.inc index f210a9d11..3ffbdb07a 100644 --- a/data/maps/LavaridgeTown/scripts.inc +++ b/data/maps/LavaridgeTown/scripts.inc @@ -5,8 +5,8 @@ LavaridgeTown_MapScripts:: @ 81EA4D3 LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE setflag FLAG_VISITED_LAVARIDGE_TOWN - call_if_set FLAG_0x06C, LavaridgeTown_EventScript_1EA514 - call_if_set FLAG_0x08B, LavaridgeTown_EventScript_1EA53F + call_if_set FLAG_FLANNERY_GIVES_BADGE_INFO, LavaridgeTown_EventScript_1EA514 + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_1EA53F call LavaridgeTown_EventScript_271ED7 call LavaridgeTown_EventScript_271EFB compare VAR_0x4053, 1 @@ -16,7 +16,7 @@ LavaridgeTown_MapScript1_1EA4DE: @ 81EA4DE end LavaridgeTown_EventScript_1EA514:: @ 81EA514 - clearflag FLAG_0x06C + clearflag FLAG_FLANNERY_GIVES_BADGE_INFO return LavaridgeTown_EventScript_1EA518:: @ 81EA518 @@ -71,7 +71,7 @@ LavaridgeTown_EventScript_1EA551:: @ 81EA551 LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 msgbox LavaridgeTown_Text_1EA7C0, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES - setflag FLAG_0x0DD + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_1EA897, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end @@ -79,7 +79,7 @@ LavaridgeTown_EventScript_1EA5B5:: @ 81EA5B5 LavaridgeTown_EventScript_1EA5DA:: @ 81EA5DA msgbox LavaridgeTown_Text_1EA9A2, MSGBOX_DEFAULT giveitem_std ITEM_GO_GOGGLES - setflag FLAG_0x0DD + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_1EAA2E, MSGBOX_DEFAULT goto LavaridgeTown_EventScript_1EA5FF end @@ -246,7 +246,7 @@ LavaridgeTown_EventScript_1EA73B:: @ 81EA73B LavaridgeTown_EventScript_1EA744:: @ 81EA744 lock faceplayer - goto_if_set FLAG_0x10A, LavaridgeTown_EventScript_1EA787 + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_1EA787 msgbox LavaridgeTown_Text_1EAB80, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_EventScript_1EA79B @@ -254,7 +254,7 @@ LavaridgeTown_EventScript_1EA744:: @ 81EA744 compare VAR_RESULT, 6 goto_if_eq LavaridgeTown_EventScript_1EA791 msgbox LavaridgeTown_Text_1EACC0, MSGBOX_DEFAULT - setflag FLAG_0x10A + setflag FLAG_RECEIVED_LAVARIDGE_EGG playfanfare MUS_FANFA4 message LavaridgeTown_Text_1EACF4 waitfanfare diff --git a/data/maps/LavaridgeTown_Gym_1F/scripts.inc b/data/maps/LavaridgeTown_Gym_1F/scripts.inc index c0c8f1093..06ea54a98 100644 --- a/data/maps/LavaridgeTown_Gym_1F/scripts.inc +++ b/data/maps/LavaridgeTown_Gym_1F/scripts.inc @@ -63,7 +63,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE78C:: @ 81FE78C specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1FE864 - goto_if_unset FLAG_0x0A8, LavaridgeTown_Gym_1F_EventScript_1FE81D + goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1FE81D msgbox LavaridgeTown_Gym_1F_Text_1FF546, MSGBOX_DEFAULT release end @@ -73,8 +73,8 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 waitmessage call LavaridgeTown_Gym_1F_EventScript_27207E msgbox LavaridgeTown_Gym_1F_Text_1FF359, MSGBOX_DEFAULT - setflag FLAG_0x06C - setflag FLAG_0x4F3 + setflag FLAG_FLANNERY_GIVES_BADGE_INFO + setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 @@ -91,7 +91,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE7C1:: @ 81FE7C1 waitfanfare closemessage delay 30 - setflag FLAG_0x1D6 + setflag FLAG_ENABLE_FLANNERY_MATCH_CALL release end @@ -100,7 +100,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE81D:: @ 81FE81D compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_272054 msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT - setflag FLAG_0x0A8 + setflag FLAG_RECEIVED_TM50 release end @@ -109,7 +109,7 @@ LavaridgeTown_Gym_1F_EventScript_1FE841:: @ 81FE841 compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_27205E msgbox LavaridgeTown_Gym_1F_Text_1FF45C, MSGBOX_DEFAULT - setflag FLAG_0x0A8 + setflag FLAG_RECEIVED_TM50 return LavaridgeTown_Gym_1F_EventScript_1FE864:: @ 81FE864 @@ -169,7 +169,7 @@ LavaridgeTown_Gym_B1F_EventScript_1FE951:: @ 81FE951 LavaridgeTown_Gym_1F_EventScript_1FE96C:: @ 81FE96C lock faceplayer - goto_if_set FLAG_0x4F3, LavaridgeTown_Gym_1F_EventScript_1FE981 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_1FE981 msgbox LavaridgeTown_Gym_1F_Text_1FE9BF, MSGBOX_DEFAULT release end diff --git a/data/maps/LavaridgeTown_HerbShop/scripts.inc b/data/maps/LavaridgeTown_HerbShop/scripts.inc index d627d4fa7..e57996318 100644 --- a/data/maps/LavaridgeTown_HerbShop/scripts.inc +++ b/data/maps/LavaridgeTown_HerbShop/scripts.inc @@ -28,12 +28,12 @@ LavaridgeTown_HerbShop_EventScript_1FE4FC:: @ 81FE4FC LavaridgeTown_HerbShop_EventScript_1FE505:: @ 81FE505 lock faceplayer - goto_if_set FLAG_0x0FE, LavaridgeTown_HerbShop_EventScript_1FE534 + goto_if_set FLFLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_1FE534 msgbox LavaridgeTown_HerbShop_Text_1FE584, MSGBOX_DEFAULT giveitem_std ITEM_CHARCOAL compare VAR_RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_272054 - setflag FLAG_0x0FE + setflag FLFLAG_RECEIVED_CHARCOAL release end diff --git a/data/maps/LilycoveCity/scripts.inc b/data/maps/LilycoveCity/scripts.inc index 515754f8c..7817b9d58 100644 --- a/data/maps/LilycoveCity/scripts.inc +++ b/data/maps/LilycoveCity/scripts.inc @@ -12,7 +12,7 @@ LilycoveCity_MapScript1_1E2B47: @ 81E2B47 end LilycoveCity_MapScript1_1E2B61: @ 81E2B61 - call_if_unset FLAG_0x070, LilycoveCity_EventScript_1E2B6B + call_if_unset FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2B6B end LilycoveCity_EventScript_1E2B6B:: @ 81E2B6B @@ -34,14 +34,14 @@ LilycoveCity_EventScript_1E2BD8:: @ 81E2BD8 lock faceplayer dodailyevents - goto_if_set FLAG_0x92F, LilycoveCity_EventScript_1E2C18 + goto_if_set FLAG_DAILY_LILYCOVE_RECIEVED_BERRY, LilycoveCity_EventScript_1E2C18 msgbox LilycoveCity_Text_2A7244, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_272054 - setflag FLAG_0x92F + setflag FLAG_DAILY_LILYCOVE_RECIEVED_BERRY msgbox LilycoveCity_Text_2A72E3, MSGBOX_DEFAULT release end @@ -75,7 +75,7 @@ LilycoveCity_EventScript_1E2C4A:: @ 81E2C4A LilycoveCity_EventScript_1E2C53:: @ 81E2C53 lock faceplayer - goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C68 + goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C68 msgbox LilycoveCity_Text_1E3FAB, MSGBOX_DEFAULT release end @@ -88,7 +88,7 @@ LilycoveCity_EventScript_1E2C68:: @ 81E2C68 LilycoveCity_EventScript_1E2C72:: @ 81E2C72 lock faceplayer - goto_if_set FLAG_0x070, LilycoveCity_EventScript_1E2C87 + goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_1E2C87 msgbox LilycoveCity_Text_1E40AD, MSGBOX_DEFAULT release end @@ -195,14 +195,14 @@ LilycoveCity_EventScript_1E2D74:: @ 81E2D74 LilycoveCity_EventScript_1E2D7D:: @ 81E2D7D lockall - goto_if_set FLAG_0x0DA, LilycoveCity_EventScript_1E2DB0 + goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_1E2DB0 msgbox LilycoveCity_Text_1E3D1F, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_27259E waitmovement 0 msgbox LilycoveCity_Text_1E3D4A, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, LilycoveCity_Movement_2725A2 waitmovement 0 - setflag FLAG_0x0DA + setflag FLAG_MET_WAILMER_TRAINER releaseall end @@ -239,8 +239,8 @@ LilycoveCity_EventScript_1E2DDE:: @ 81E2DDE LilycoveCity_EventScript_1E2DF8:: @ 81E2DF8 playbgm MUS_GIRL_SUP, 1 - call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2E48 - call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2E51 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E48 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2E51 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_1E2E5A msgbox LilycoveCity_Text_1E3234, MSGBOX_DEFAULT @@ -259,7 +259,7 @@ LilycoveCity_EventScript_1E2E51:: @ 81E2E51 return LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A - setflag FLAG_0x11E + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_1E318D, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm @@ -268,8 +268,8 @@ LilycoveCity_EventScript_1E2E5A:: @ 81E2E5A LilycoveCity_EventScript_1E2E6B:: @ 81E2E6B playbgm MUS_BOY_SUP, 1 - call_if_set FLAG_0x11E, LilycoveCity_EventScript_1E2EBB - call_if_unset FLAG_0x11E, LilycoveCity_EventScript_1E2EC4 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EBB + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_1E2EC4 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_EventScript_1E2ECD msgbox LilycoveCity_Text_1E373C, MSGBOX_DEFAULT @@ -288,7 +288,7 @@ LilycoveCity_EventScript_1E2EC4:: @ 81E2EC4 return LilycoveCity_EventScript_1E2ECD:: @ 81E2ECD - setflag FLAG_0x11E + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_1E36BF, MSGBOX_DEFAULT savebgm MUS_DUMMY fadedefaultbgm @@ -397,7 +397,7 @@ LilycoveCity_EventScript_1E3006:: @ 81E3006 waitfieldeffect 30 savebgm MUS_DUMMY fadedefaultbgm - setflag FLAG_0x124 + setflag FLAG_MET_RIVAL_LILYCOVE release end diff --git a/data/maps/LilycoveCity_ContestLobby/scripts.inc b/data/maps/LilycoveCity_ContestLobby/scripts.inc index c60e8fdfc..74bee15d3 100644 --- a/data/maps/LilycoveCity_ContestLobby/scripts.inc +++ b/data/maps/LilycoveCity_ContestLobby/scripts.inc @@ -139,23 +139,23 @@ LilycoveCity_ContestLobby_EventScript_21A3B6:: @ 821A3B6 return LilycoveCity_ContestLobby_EventScript_21A3F3:: @ 821A3F3 - setflag FLAG_0x0A0 + setflag FLAG_COOL_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_21A3F7:: @ 821A3F7 - setflag FLAG_0x0A1 + setflag FLAG_BEAUTY_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_21A3FB:: @ 821A3FB - setflag FLAG_0x0A2 + setflag FLAG_CUTE_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_21A3FF:: @ 821A3FF - setflag FLAG_0x0A3 + setflag FLAG_SMART_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_21A403:: @ 821A403 - setflag FLAG_0x0A4 + setflag FLAG_TOUGH_PAINTING_MADE return LilycoveCity_ContestLobby_Movement_21A407: @ 821A407 @@ -364,7 +364,7 @@ LilycoveCity_ContestLobby_EventScript_21A5CF:: @ 821A5CF end LilycoveCity_ContestLobby_EventScript_21A5EF:: @ 821A5EF - setflag FLAG_0x155 + setflag FLAG_ENTERED_LINK_CONTEST switch VAR_CONTEST_CATEGORY case 0, LilycoveCity_ContestLobby_EventScript_21A62F case 1, LilycoveCity_ContestLobby_EventScript_21A63C @@ -1004,7 +1004,7 @@ LilycoveCity_ContestLobby_Movement_21ACEF: @ 821ACEF LilycoveCity_ContestLobby_EventScript_21ACF1:: @ 821ACF1 lock faceplayer - goto_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_21AD06 + goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_21AD06 msgbox LilycoveCity_ContestLobby_Text_21AD10, MSGBOX_DEFAULT release end diff --git a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc index 2290b7df5..f7fd5f453 100644 --- a/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc +++ b/data/maps/LilycoveCity_CoveLilyMotel_2F/scripts.inc @@ -55,10 +55,10 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_218744:: @ 8218744 LilycoveCity_CoveLilyMotel_2F_EventScript_21874D:: @ 821874D lock faceplayer - goto_if_set FLAG_0x1CE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A + goto_if_set FLAG_MET_SCOTT_IN_LILYCOVE, LilycoveCity_CoveLilyMotel_2F_EventScript_21876A msgbox LilycoveCity_CoveLilyMotel_2F_Text_218ACF, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 - setflag FLAG_0x1CE + setflag FLAG_MET_SCOTT_IN_LILYCOVE release end diff --git a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc index d2d5f60d6..2f8fcda3a 100644 --- a/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc +++ b/data/maps/LilycoveCity_DepartmentStore_1F/scripts.inc @@ -11,11 +11,11 @@ LilycoveCity_DepartmentStore_1F_EventScript_21F69C:: @ 821F69C dodailyevents compare VAR_POKELOT_PRIZE, 0 goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_21F7F7 - goto_if_set FLAG_0x92A, LilycoveCity_DepartmentStore_1F_EventScript_21F78D + goto_if_set FLAG_DAILY_PICKED_LOTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_21F78D msgbox LilycoveCity_DepartmentStore_1F_Text_2A6390, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_21F797 - setflag FLAG_0x92A + setflag FLAG_DAILY_PICKED_LOTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_2A64C8 waitmessage special RetrieveLotteryNumber diff --git a/data/maps/LilycoveCity_Harbor/scripts.inc b/data/maps/LilycoveCity_Harbor/scripts.inc index 62bcc15dd..5e9157826 100644 --- a/data/maps/LilycoveCity_Harbor/scripts.inc +++ b/data/maps/LilycoveCity_Harbor/scripts.inc @@ -112,40 +112,40 @@ LilycoveCity_Harbor_EventScript_21E194:: @ 821E194 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 1 - goto_if_set FLAG_0x1AE, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_E, 2 return LilycoveCity_Harbor_EventScript_21E1C6:: @ 821E1C6 setvar VAR_TEMP_D, 0 - goto_if_unset FLAG_0x8D5, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_BIRTH_ISLAND, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_AURORA_TICKET, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 1 - goto_if_set FLAG_0x1AF, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_AURORA_TICKET, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_D, 2 return LilycoveCity_Harbor_EventScript_21E1F8:: @ 821E1F8 setvar VAR_TEMP_C, 0 - goto_if_unset FLAG_0x8D6, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_FARAWAY_ISLAND, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_OLD_SEA_MAP, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 1 - goto_if_set FLAG_0x1B0, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_OLD_SEA_MAP, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_C, 2 return LilycoveCity_Harbor_EventScript_21E22A:: @ 821E22A setvar VAR_TEMP_9, 0 - goto_if_unset FLAG_0x8E0, LilycoveCity_Harbor_EventScript_27374E + goto_if_unset FLAG_ENABLE_SHIP_NAVEL_ROCK, LilycoveCity_Harbor_EventScript_27374E checkitem ITEM_MYSTIC_TICKET, 1 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 1 - goto_if_set FLAG_0x1DB, LilycoveCity_Harbor_EventScript_27374E + goto_if_set FLAG_HAS_MYSTIC_TICKET, LilycoveCity_Harbor_EventScript_27374E setvar VAR_TEMP_9, 2 return @@ -206,7 +206,7 @@ LilycoveCity_Harbor_EventScript_21E2EA:: @ 821E2EA return LilycoveCity_Harbor_EventScript_21E2F0:: @ 821E2F0 - setflag FLAG_0x1AE + setflag FLAG_HAS_EON_TICKET msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE @@ -223,7 +223,7 @@ LilycoveCity_Harbor_EventScript_21E30F:: @ 821E30F end LilycoveCity_Harbor_EventScript_21E320:: @ 821E320 - setflag FLAG_0x1AF + setflag FLAG_HAS_AURORA_TICKET msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE @@ -240,7 +240,7 @@ LilycoveCity_Harbor_EventScript_21E33F:: @ 821E33F end LilycoveCity_Harbor_EventScript_21E350:: @ 821E350 - setflag FLAG_0x1B0 + setflag FLAG_HAS_OLD_SEA_MAP msgbox LilycoveCity_Harbor_Text_2A6848, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE @@ -289,7 +289,7 @@ LilycoveCity_Harbor_EventScript_21E40C:: @ 821E40C end LilycoveCity_Harbor_EventScript_21E41D:: @ 821E41D - setflag FLAG_0x1DB + setflag FLAG_HAS_MYSTIC_TICKET msgbox LilycoveCity_Harbor_Text_2A68D2, MSGBOX_DEFAULT closemessage call LilycoveCity_Harbor_EventScript_21E4EE @@ -617,4 +617,3 @@ LilycoveCity_Harbor_Text_21E976: @ 821E976 .string "The folks at the SHIPYARD in SLATEPORT\n" .string "must've worked extra hard.\p" .string "Well, it's my turn to get busy now!$" - diff --git a/data/maps/LilycoveCity_House2/scripts.inc b/data/maps/LilycoveCity_House2/scripts.inc index dc526f00b..92adafe5a 100644 --- a/data/maps/LilycoveCity_House2/scripts.inc +++ b/data/maps/LilycoveCity_House2/scripts.inc @@ -4,12 +4,12 @@ LilycoveCity_House2_MapScripts:: @ 821ED74 LilycoveCity_House2_EventScript_21ED75:: @ 821ED75 lock faceplayer - goto_if_set FLAG_0x0EA, LilycoveCity_House2_EventScript_21EDAC + goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_21EDAC msgbox LilycoveCity_House2_Text_21EDB6, MSGBOX_DEFAULT giveitem_std ITEM_TM44 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_272054 - setflag FLAG_0x0EA + setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_21EDF9, MSGBOX_DEFAULT release end @@ -28,4 +28,3 @@ LilycoveCity_House2_Text_21EDF9: @ 821EDF9 .string "Yawn…\p" .string "Sleep is essential for good health…\n" .string "Sleep and regain health…$" - diff --git a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc index 325ad0340..da39ee655 100644 --- a/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc +++ b/data/maps/LilycoveCity_LilycoveMuseum_2F/scripts.inc @@ -4,27 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 821973A .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_219745: @ 8219745 - goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_21978B goto LilycoveCity_LilycoveMuseum_2F_EventScript_219754 end LilycoveCity_LilycoveMuseum_2F_EventScript_219754:: @ 8219754 - goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197A3 goto LilycoveCity_LilycoveMuseum_2F_EventScript_219763 end LilycoveCity_LilycoveMuseum_2F_EventScript_219763:: @ 8219763 - goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197BB goto LilycoveCity_LilycoveMuseum_2F_EventScript_219772 end LilycoveCity_LilycoveMuseum_2F_EventScript_219772:: @ 8219772 - goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197D3 goto LilycoveCity_LilycoveMuseum_2F_EventScript_219781 end LilycoveCity_LilycoveMuseum_2F_EventScript_219781:: @ 8219781 - goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2197EB end LilycoveCity_LilycoveMuseum_2F_EventScript_21978B:: @ 821978B @@ -91,7 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_219863: @ 8219863 LilycoveCity_LilycoveMuseum_2F_EventScript_219866:: @ 8219866 lockall - goto_if_set FLAG_0x0EC, LilycoveCity_LilycoveMuseum_2F_EventScript_219921 + goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_219921 specialvar VAR_0x8004, sub_80F8940 switch VAR_0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_2198BA @@ -121,7 +121,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_2198EA:: @ 82198EA givedecoration_std 44 compare VAR_RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_219911 - setflag FLAG_0x0EC + setflag FLAG_RECEIVED_GLASS_ORNAMENT closemessage releaseall end @@ -140,31 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_219921:: @ 8219921 LilycoveCity_LilycoveMuseum_2F_EventScript_21992B:: @ 821992B lockall - goto_if_set FLAG_0x0A2, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199C1 msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FA0, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_21993E:: @ 821993E lockall - goto_if_set FLAG_0x0A4, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199DD msgbox LilycoveCity_LilycoveMuseum_2F_Text_219FD3, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219951:: @ 8219951 lockall - goto_if_set FLAG_0x0A0, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199A5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A03B, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219964:: @ 8219964 lockall - goto_if_set FLAG_0x0A1, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199B3 msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A008, MSGBOX_SIGN end LilycoveCity_LilycoveMuseum_2F_EventScript_219977:: @ 8219977 lockall - goto_if_set FLAG_0x0A3, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_2199CF msgbox LilycoveCity_LilycoveMuseum_2F_Text_21A06D, MSGBOX_SIGN end diff --git a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc index cf4be3065..77bc40635 100644 --- a/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc +++ b/data/maps/LilycoveCity_PokemonTrainerFanClub/scripts.inc @@ -110,7 +110,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21C8DA:: @ 821C8DA compare VAR_RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1 clearflag FLAG_HIDE_LILYCOVE_FAN_CLUB_INTERVIEWER - clearflag FLAG_0x0D2 + clearflag FLAG_FAN_CLUB_STRENGTH_SHARED return LilycoveCity_PokemonTrainerFanClub_EventScript_21C8F1:: @ 821C8F1 @@ -499,8 +499,8 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CD71:: @ 821CD71 LilycoveCity_PokemonTrainerFanClub_EventScript_21CD7B:: @ 821CD7B lock faceplayer - goto_if_set FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED - goto_if_unset FLAG_0x0D2, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 + goto_if_set FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CEED + goto_if_unset FLAG_FAN_CLUB_STRENGTH_SHARED, LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90 end LilycoveCity_PokemonTrainerFanClub_EventScript_21CD90:: @ 821CD90 @@ -594,7 +594,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_21CED8:: @ 821CED8 setvar VAR_0x8004, 8 special BufferStreakTrainerText msgbox LilycoveCity_PokemonTrainerFanClub_Text_281D40, MSGBOX_DEFAULT - setflag FLAG_0x0D2 + setflag FLAG_FAN_CLUB_STRENGTH_SHARED release end @@ -859,4 +859,3 @@ LilycoveCity_PokemonTrainerFanClub_Text_21DF51: @ 821DF51 .string "True strength is…!\n" .string "… …\p" .string "Actually, I have no idea, either.$" - diff --git a/data/maps/LittlerootTown/scripts.inc b/data/maps/LittlerootTown/scripts.inc index 9f589d2e4..538fe9939 100644 --- a/data/maps/LittlerootTown/scripts.inc +++ b/data/maps/LittlerootTown/scripts.inc @@ -9,7 +9,7 @@ LittlerootTown_MapScript1_1E7DDB: @ 81E7DDB call LittlerootTown_EventScript_271ED7 compare VAR_0x4092, 2 call_if_eq LittlerootTown_EventScript_1E7E67 - call_if_unset FLAG_0x052, LittlerootTown_EventScript_1E7E6F + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E7E6F compare VAR_0x4050, 3 call_if_eq LittlerootTown_EventScript_1E7E92 compare VAR_0x4082, 4 @@ -35,7 +35,7 @@ LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B return LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F - setflag FLAG_0x12D + setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 return LittlerootTown_EventScript_1E7E53:: @ 81E7E53 @@ -234,8 +234,8 @@ LittlerootTown_EventScript_1E802B:: @ 81E802B LittlerootTown_EventScript_1E8034:: @ 81E8034 lock faceplayer - goto_if_set FLAG_0x074, LittlerootTown_EventScript_1E8087 - goto_if_set FLAG_0x052, LittlerootTown_EventScript_1E807A + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_1E8087 + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_1E807A compare VAR_0x4050, 0 goto_if_ne LittlerootTown_EventScript_1E805D msgbox LittlerootTown_Text_1E8BB8, MSGBOX_DEFAULT @@ -918,7 +918,7 @@ LittlerootTown_EventScript_1E8693:: @ 81E8693 playfanfare MUS_FANFA4 message LittlerootTown_Text_1E8925 waitfanfare - setflag FLAG_0x112 + setflag FLAG_RECEIVED_RUNNING_SHOES msgbox LittlerootTown_Text_1E894F, MSGBOX_DEFAULT msgbox LittlerootTown_Text_1E8A03, MSGBOX_DEFAULT closemessage diff --git a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc index 9eab32885..8fa7adbca 100644 --- a/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_1F/scripts.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 81F7755 LittlerootTown_BrendansHouse_1F_MapScript1_1F7765: @ 81F7765 compare VAR_0x4092, 6 call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_1F777A - call_if_set FLAG_0x112, LittlerootTown_BrendansHouse_1F_EventScript_1F778D + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_1F778D end LittlerootTown_BrendansHouse_1F_EventScript_1F777A:: @ 81F777A @@ -99,7 +99,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F785E:: @ 81F785E waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT - setflag FLAG_0x057 + setflag FLAG_MET_RIVAL_MOM setvar VAR_0x4082, 2 releaseall end diff --git a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc index 096f35c1e..524164c44 100644 --- a/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_BrendansHouse_2F/scripts.inc @@ -15,7 +15,7 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1F83EE: @ 81F83EE end LittlerootTown_BrendansHouse_2F_EventScript_1F841A:: @ 81F841A - goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F8433 compare VAR_0x4084, 2 goto_if_ge LittlerootTown_BrendansHouse_2F_EventScript_1F8456 goto LittlerootTown_BrendansHouse_2F_EventScript_1F8433 diff --git a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc index 0f71be46a..25ebc1bbd 100644 --- a/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_1F/scripts.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 81F88A5 LittlerootTown_MaysHouse_1F_MapScript1_1F88B5: @ 81F88B5 compare VAR_0x4092, 6 call_if_lt LittlerootTown_MaysHouse_1F_EventScript_1F88CA - call_if_set FLAG_0x112, LittlerootTown_MaysHouse_1F_EventScript_1F88DD + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1F88DD end LittlerootTown_MaysHouse_1F_EventScript_1F88CA:: @ 81F88CA @@ -99,7 +99,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1F89AE:: @ 81F89AE waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1F8BC5, MSGBOX_DEFAULT - setflag FLAG_0x057 + setflag FLAG_MET_RIVAL_MOM setvar VAR_0x408C, 2 releaseall end @@ -117,7 +117,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1F89F3:: @ 81F89F3 LittlerootTown_MaysHouse_1F_EventScript_1F89F3:: @ 81F89F3 lock faceplayer - goto_if_set FLAG_0x082, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_1F8A33 goto_if_set FLAG_SYS_POKEMON_GET, LittlerootTown_BrendansHouse_1F_EventScript_1F8A29 compare VAR_0x408D, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1F8A1F diff --git a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc index e0cb7dfe7..5d9db05c2 100644 --- a/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc +++ b/data/maps/LittlerootTown_MaysHouse_2F/scripts.inc @@ -15,7 +15,7 @@ LittlerootTown_MaysHouse_2F_MapScript1_1F92A1: @ 81F92A1 end LittlerootTown_MaysHouse_2F_EventScript_1F92CD:: @ 81F92CD - goto_if_set FLAG_0x124, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_MaysHouse_2F_EventScript_1F92E6 compare VAR_0x4084, 2 goto_if_ge LittlerootTown_MaysHouse_2F_EventScript_1F9309 goto LittlerootTown_MaysHouse_2F_EventScript_1F92E6 @@ -249,7 +249,7 @@ LittlerootTown_MaysHouse_2F_Movement_1F94BB: @ 81F94BB LittlerootTown_BrendansHouse_2F_EventScript_1F94C1:: @ 81F94C1 LittlerootTown_MaysHouse_2F_EventScript_1F94C1:: @ 81F94C1 lockall - goto_if_set FLAG_0x124, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F94F7 checkplayergender compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F94E3 @@ -275,17 +275,17 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F94F7:: @ 81F94F7 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F951D compare VAR_RESULT, 1 call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1F952F - setflag FLAG_0x125 + setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end LittlerootTown_BrendansHouse_2F_EventScript_1F951D:: @ 81F951D - goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F9541 + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F9541 msgbox LittlerootTown_BrendansHouse_2F_Text_1F99C9, MSGBOX_DEFAULT return LittlerootTown_BrendansHouse_2F_EventScript_1F952F:: @ 81F952F - goto_if_set FLAG_0x125, LittlerootTown_BrendansHouse_2F_EventScript_1F954A + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_1F954A msgbox LittlerootTown_BrendansHouse_2F_Text_1F9B0D, MSGBOX_DEFAULT return diff --git a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc index 3534047ae..c88ddd6c7 100644 --- a/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc +++ b/data/maps/LittlerootTown_ProfessorBirchsLab/scripts.inc @@ -196,7 +196,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9E80:: @ 81F9E80 setflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL setvar VAR_0x40D3, 2 setvar VAR_0x40F5, 0 - setflag FLAG_0x072 + setflag FLAG_SCOTT_CALL_NATIONAL_DEX releaseall end @@ -266,9 +266,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1F9F84:: @ 81F9F84 faceplayer compare VAR_0x4084, 3 goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_1F9FB1 - goto_if_set FLAG_0x058, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_1F9FA7 msgbox LittlerootTown_ProfessorBirchsLab_Text_1FA4E2, MSGBOX_DEFAULT - setflag FLAG_0x058 + setflag FLAG_BIRCH_AIDE_MET release end @@ -482,7 +482,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA25A:: @ 81FA25A compare VAR_0x40D3, 2 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA294 goto_if_unset FLAG_HAS_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E - goto_if_unset FLAG_0x119, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 + goto_if_unset FLAG_ENABLE_PROF_BIRCH_MATCH_CALL, LittlerootTown_ProfessorBirchsLab_EventScript_1FA2D2 goto LittlerootTown_ProfessorBirchsLab_EventScript_1FA29E end @@ -518,7 +518,7 @@ Route101_EventScript_1FA2D2:: @ 81FA2D2 waitfanfare closemessage delay 30 - setflag FLAG_0x119 + setflag FLAG_ENABLE_PROF_BIRCH_MATCH_CALL setvar VAR_0x40DA, 2 release end @@ -538,7 +538,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA2F8:: @ 81FA2F8 compare VAR_RESULT, 1 call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_1FA37F setvar VAR_0x4084, 5 - setflag FLAG_0x074 + setflag FLAG_ADVENTURE_STARTED setvar VAR_0x4051, 1 setvar VAR_0x408D, 4 setvar VAR_0x4050, 3 @@ -569,7 +569,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA3AC:: @ 81FA3AC waitfanfare setflag FLAG_SYS_POKEDEX_GET special sub_81AFDA0 - setflag FLAG_0x8E4 + setflag FLAG_RECIEVED_POKEDEX_FROM_BIRCH setvar VAR_0x40CD, 1 return @@ -687,7 +687,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_1FA4D6:: @ 81FA4D6 lockall pokenavcall LittlerootTown_ProfessorBirchsLab_Text_1FBD1A waitmessage - clearflag FLAG_0x072 + clearflag FLAG_SCOTT_CALL_NATIONAL_DEX releaseall end diff --git a/data/maps/MagmaHideout_4F/scripts.inc b/data/maps/MagmaHideout_4F/scripts.inc index 818b11da7..ba585c98a 100644 --- a/data/maps/MagmaHideout_4F/scripts.inc +++ b/data/maps/MagmaHideout_4F/scripts.inc @@ -63,7 +63,7 @@ MagmaHideout_4F_EventScript_23A560:: @ 823A560 clearflag FLAG_HIDE_SLATEPORT_CITY_CAPTAIN_STERN clearflag FLAG_HIDE_SLATEPORT_CITY_GABBY_AND_TY setvar VAR_0x4058, 1 - setflag FLAG_0x06F + setflag FLAG_GROUDON_AWAKENED_MAGMA_HIDEOUT setvar VAR_0x40A0, 1 fadescreen 1 removeobject 6 @@ -225,4 +225,3 @@ MagmaHideout_4F_Text_23ABE2: @ 823ABE2 .string "any need for this blasted volcano.\p" .string "I am going after GROUDON, so this\n" .string "is where we part!$" - diff --git a/data/maps/MarineCave_End/scripts.inc b/data/maps/MarineCave_End/scripts.inc index d42e0e1d6..aae89cb8a 100644 --- a/data/maps/MarineCave_End/scripts.inc +++ b/data/maps/MarineCave_End/scripts.inc @@ -15,7 +15,7 @@ MarineCave_End_EventScript_23AFF4:: @ 823AFF4 return MarineCave_End_MapScript1_23B008: @ 823B008 - call_if_unset FLAG_0x1BE, MarineCave_End_EventScript_23B012 + call_if_unset FLAG_DEFEATED_KYOGRE, MarineCave_End_EventScript_23B012 end MarineCave_End_EventScript_23B012:: @ 823B012 @@ -48,13 +48,13 @@ MarineCave_End_EventScript_23B01B:: @ 823B01B compare VAR_RESULT, 5 goto_if_eq MarineCave_End_EventScript_23B092 setvar VAR_0x4039, 1 - setflag FLAG_0x1BE + setflag FLAG_DEFEATED_KYOGRE releaseall end MarineCave_End_EventScript_23B084:: @ 823B084 setvar VAR_0x4039, 1 - setflag FLAG_0x1BE + setflag FLAG_DEFEATED_KYOGRE goto MarineCave_End_EventScript_27376D end diff --git a/data/maps/MauvilleCity/scripts.inc b/data/maps/MauvilleCity/scripts.inc index 79e6f1a5e..21f654888 100644 --- a/data/maps/MauvilleCity/scripts.inc +++ b/data/maps/MauvilleCity/scripts.inc @@ -7,7 +7,7 @@ MauvilleCity_MapScript1_1DF38B: @ 81DF38B clearflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE clearflag FLAG_HIDE_SLATEPORT_MUSEUM_POPULATION setflag FLAG_SYS_TV_START - clearflag FLAG_0x063 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar VAR_0x4093, 0 call_if_set FLAG_GOT_TM24_FROM_WATTSON, MauvilleCity_EventScript_1DF3A9 end @@ -53,9 +53,9 @@ MauvilleCity_EventScript_1DF3F2:: @ 81DF3F2 MauvilleCity_EventScript_1DF3FB:: @ 81DF3FB lock faceplayer - goto_if_set FLAG_0x062, MauvilleCity_EventScript_1DF413 + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_1DF413 msgbox MauvilleCity_Text_1E056A, MSGBOX_DEFAULT - setflag FLAG_0x062 + setflag FLAG_TV_EXPLAINED release end @@ -67,7 +67,7 @@ MauvilleCity_EventScript_1DF413:: @ 81DF413 MauvilleCity_EventScript_1DF41D:: @ 81DF41D lock faceplayer - goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF43D + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF43D msgbox MauvilleCity_Text_1DF7DC, MSGBOX_DEFAULT closemessage applymovement 7, MauvilleCity_Movement_2725A2 @@ -85,7 +85,7 @@ MauvilleCity_EventScript_1DF43D:: @ 81DF43D MauvilleCity_EventScript_1DF452:: @ 81DF452 lockall - goto_if_set FLAG_0x11C, MauvilleCity_EventScript_1DF690 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_1DF690 applymovement 6, MauvilleCity_Movement_2725A8 waitmovement 0 msgbox MauvilleCity_Text_1DF845, MSGBOX_DEFAULT @@ -157,9 +157,9 @@ MauvilleCity_EventScript_1DF593:: @ 81DF593 removeobject 7 clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLY clearflag FLAG_HIDE_VERDANTURF_TOWN_WANDAS_HOUSE_WALLYS_UNCLE - setflag FLAG_0x0BE + setflag FLAG_DEFEATED_WALLY_MAUVILLE setvar VAR_0x40F2, 0 - setflag FLAG_0x088 + setflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL compare VAR_FACING, 2 call_if_eq MauvilleCity_EventScript_1DF5F3 compare VAR_FACING, 4 @@ -217,7 +217,7 @@ MauvilleCity_EventScript_1DF63A:: @ 81DF63A return MauvilleCity_EventScript_1DF683:: @ 81DF683 - setflag FLAG_0x11C + setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE msgbox MauvilleCity_Text_1DFA4A, MSGBOX_DEFAULT release end @@ -461,8 +461,8 @@ MauvilleCity_EventScript_1DF7BA:: @ 81DF7BA waitfanfare closemessage delay 30 - setflag FLAG_0x0D6 - clearflag FLAG_0x088 + setflag FLAG_ENABLE_WALLY_MATCH_CALL + clearflag FLAG_ENABLE_FIRST_WALLY_POKENAV_CALL releaseall end diff --git a/data/maps/MauvilleCity_BikeShop/scripts.inc b/data/maps/MauvilleCity_BikeShop/scripts.inc index fd390a92c..fe6832423 100644 --- a/data/maps/MauvilleCity_BikeShop/scripts.inc +++ b/data/maps/MauvilleCity_BikeShop/scripts.inc @@ -4,8 +4,8 @@ MauvilleCity_BikeShop_MapScripts:: @ 820EBBB MauvilleCity_BikeShop_EventScript_20EBBC:: @ 820EBBC lock faceplayer - goto_if_set FLAG_0x05A, MauvilleCity_BikeShop_EventScript_20EC94 - goto_if_set FLAG_0x059, MauvilleCity_BikeShop_EventScript_20EBF7 + goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_20EC94 + goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_20EBF7 msgbox MauvilleCity_BikeShop_Text_20EE22, MSGBOX_DEFAULT msgbox MauvilleCity_BikeShop_Text_20EE99, MSGBOX_YESNO compare VAR_RESULT, 1 @@ -32,13 +32,13 @@ MauvilleCity_BikeShop_EventScript_20EC16:: @ 820EC16 end MauvilleCity_BikeShop_EventScript_20EC3D:: @ 820EC3D - setflag FLAG_0x059 + setflag FLAG_DECLINED_BIKE msgbox MauvilleCity_BikeShop_Text_20EEE8, MSGBOX_DEFAULT release end MauvilleCity_BikeShop_EventScript_20EC4A:: @ 820EC4A - setflag FLAG_0x05A + setflag FLAG_RECEIVED_BIKE goto MauvilleCity_BikeShop_EventScript_20EC16 end diff --git a/data/maps/MauvilleCity_GameCorner/scripts.inc b/data/maps/MauvilleCity_GameCorner/scripts.inc index 45f00c9ee..34125b421 100644 --- a/data/maps/MauvilleCity_GameCorner/scripts.inc +++ b/data/maps/MauvilleCity_GameCorner/scripts.inc @@ -404,7 +404,7 @@ MauvilleCity_GameCorner_EventScript_21012E:: @ 821012E MauvilleCity_GameCorner_EventScript_210137:: @ 8210137 lock faceplayer - goto_if_set FLAG_0x0E2, MauvilleCity_GameCorner_EventScript_210213 + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_210213 msgbox MauvilleCity_GameCorner_Text_210750, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_210209 @@ -421,7 +421,7 @@ MauvilleCity_GameCorner_EventScript_21017C:: @ 821017C goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 88 - setflag FLAG_0x0E2 + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_210213 end @@ -432,7 +432,7 @@ MauvilleCity_GameCorner_EventScript_2101A6:: @ 82101A6 goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 89 - setflag FLAG_0x0E2 + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_210213 end @@ -443,7 +443,7 @@ MauvilleCity_GameCorner_EventScript_2101D0:: @ 82101D0 goto_if_eq MauvilleCity_GameCorner_EventScript_2101FA msgbox MauvilleCity_GameCorner_Text_21079C, MSGBOX_DEFAULT givedecoration_std 90 - setflag FLAG_0x0E2 + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_210213 end @@ -474,11 +474,11 @@ MauvilleCity_GameCorner_EventScript_21021D:: @ 821021D end MauvilleCity_GameCorner_EventScript_21023D:: @ 821023D - goto_if_set FLAG_0x0E1, MauvilleCity_GameCorner_EventScript_21026B + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_21026B checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 1 goto_if_ge MauvilleCity_GameCorner_EventScript_21026B - setflag FLAG_0x0E1 + setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_2108A0, MSGBOX_DEFAULT playse SE_REGI diff --git a/data/maps/MauvilleCity_Gym/scripts.inc b/data/maps/MauvilleCity_Gym/scripts.inc index 335a27f56..76bceae56 100644 --- a/data/maps/MauvilleCity_Gym/scripts.inc +++ b/data/maps/MauvilleCity_Gym/scripts.inc @@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 820DD6E .byte 0 MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 - goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20DEE7 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20DEE7 switch VAR_0x4093 case 0, MauvilleCity_Gym_EventScript_20DDBA case 1, MauvilleCity_Gym_EventScript_20DEAF @@ -13,7 +13,7 @@ MauvilleCity_Gym_MapScript1_20DD74: @ 820DD74 end MauvilleCity_Gym_EventScript_20DDBA:: @ 820DDBA - goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20DDC4 + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20DDC4 end MauvilleCity_Gym_EventScript_20DDC4:: @ 820DDC4 @@ -78,7 +78,7 @@ MauvilleCity_Gym_EventScript_20DEEB:: @ 820DEEB specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MauvilleCity_Gym_EventScript_20DFDE - goto_if_unset FLAG_0x0A7, MauvilleCity_Gym_EventScript_20DF8D + goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_20DF8D compare VAR_0x40BA, 2 goto_if_eq MauvilleCity_Gym_EventScript_20DFD4 msgbox MauvilleCity_Gym_Text_20E8E3, MSGBOX_DEFAULT @@ -92,7 +92,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B msgbox MauvilleCity_Gym_Text_20E7AA, MSGBOX_DEFAULT setvar VAR_0x40D2, 3 clearflag FLAG_HIDE_VERDANTURF_TOWN_SCOTT - setflag FLAG_0x4F2 + setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET addvar VAR_0x4085, 1 compare VAR_0x4085, 6 @@ -110,7 +110,7 @@ MauvilleCity_Gym_EventScript_20DF2B:: @ 820DF2B waitfanfare closemessage delay 30 - setflag FLAG_0x1D5 + setflag FLAG_ENABLE_WATTSON_MATCH_CALL release end @@ -119,7 +119,7 @@ MauvilleCity_Gym_EventScript_20DF8D:: @ 820DF8D compare VAR_RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_272054 msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT - setflag FLAG_0x0A7 + setflag FLAG_RECEIVED_TM34 release end @@ -128,7 +128,7 @@ MauvilleCity_Gym_EventScript_20DFB1:: @ 820DFB1 compare VAR_RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_27205E msgbox MauvilleCity_Gym_Text_20E844, MSGBOX_DEFAULT - setflag FLAG_0x0A7 + setflag FLAG_RECEIVED_TM34 return MauvilleCity_Gym_EventScript_20DFD4:: @ 820DFD4 @@ -143,7 +143,7 @@ MauvilleCity_Gym_EventScript_20DFDE:: @ 820DFDE MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 lockall - goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 1 @@ -153,7 +153,7 @@ MauvilleCity_Gym_EventScript_20DFF9:: @ 820DFF9 MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E lockall - goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 2 @@ -163,7 +163,7 @@ MauvilleCity_Gym_EventScript_20E01E:: @ 820E01E MauvilleCity_Gym_EventScript_20E043:: @ 820E043 lockall - goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 3 @@ -173,7 +173,7 @@ MauvilleCity_Gym_EventScript_20E043:: @ 820E043 MauvilleCity_Gym_EventScript_20E068:: @ 820E068 lockall - goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E0AD + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E0AD compare VAR_0x4093, 4 goto_if_eq MauvilleCity_Gym_EventScript_20E0AD setvar VAR_0x4093, 4 @@ -186,8 +186,8 @@ MauvilleCity_Gym_EventScript_20E08D:: @ 820E08D special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN - goto_if_set FLAG_0x063, MauvilleCity_Gym_EventScript_20E0B4 - goto_if_unset FLAG_0x063, MauvilleCity_Gym_EventScript_20E0AF + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0B4 + goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_20E0AF releaseall end @@ -196,12 +196,12 @@ MauvilleCity_Gym_EventScript_20E0AD:: @ 820E0AD end MauvilleCity_Gym_EventScript_20E0AF:: @ 820E0AF - setflag FLAG_0x063 + setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end MauvilleCity_Gym_EventScript_20E0B4:: @ 820E0B4 - clearflag FLAG_0x063 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end @@ -233,7 +233,7 @@ MauvilleCity_Gym_EventScript_20E115:: @ 820E115 MauvilleCity_Gym_EventScript_20E12C:: @ 820E12C lock faceplayer - goto_if_set FLAG_0x4F2, MauvilleCity_Gym_EventScript_20E141 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_20E141 msgbox MauvilleCity_Gym_Text_20E17F, MSGBOX_DEFAULT release end diff --git a/data/maps/MauvilleCity_House1/scripts.inc b/data/maps/MauvilleCity_House1/scripts.inc index 0168f2e9b..50f84d87c 100644 --- a/data/maps/MauvilleCity_House1/scripts.inc +++ b/data/maps/MauvilleCity_House1/scripts.inc @@ -4,10 +4,10 @@ MauvilleCity_House1_MapScripts:: @ 820F975 MauvilleCity_House1_EventScript_20F976:: @ 820F976 lock faceplayer - goto_if_set FLAG_0x06B, MauvilleCity_House1_EventScript_20F9A5 + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_20F9A5 msgbox MauvilleCity_House1_Text_20F9AF, MSGBOX_DEFAULT giveitem_std ITEM_HM06 - setflag FLAG_0x06B + setflag FLAG_RECEIVED_HM06 setflag FLAG_HIDE_ROUTE_111_ROCK_SMASH_TIP_GUY msgbox MauvilleCity_House1_Text_20FAA9, MSGBOX_DEFAULT release diff --git a/data/maps/MauvilleCity_House2/scripts.inc b/data/maps/MauvilleCity_House2/scripts.inc index 288e50725..c49052914 100644 --- a/data/maps/MauvilleCity_House2/scripts.inc +++ b/data/maps/MauvilleCity_House2/scripts.inc @@ -4,7 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 8210C5C MauvilleCity_House2_EventScript_210C5D:: @ 8210C5D lock faceplayer - goto_if_set FLAG_0x102, MauvilleCity_House2_EventScript_210CDA + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_210CDA msgbox MauvilleCity_House2_Text_210CEE, MSGBOX_DEFAULT checkitem ITEM_HARBOR_MAIL, 1 compare VAR_RESULT, 1 @@ -29,7 +29,7 @@ MauvilleCity_House2_EventScript_210CB8:: @ 8210CB8 msgbox MauvilleCity_House2_Text_210DB3, MSGBOX_DEFAULT takeitem ITEM_HARBOR_MAIL, 1 giveitem_std ITEM_COIN_CASE - setflag FLAG_0x102 + setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_210CDA end diff --git a/data/maps/MeteorFalls_1F_1R/scripts.inc b/data/maps/MeteorFalls_1F_1R/scripts.inc index 7732e8e7d..ea161ba23 100644 --- a/data/maps/MeteorFalls_1F_1R/scripts.inc +++ b/data/maps/MeteorFalls_1F_1R/scripts.inc @@ -84,7 +84,7 @@ MeteorFalls_1F_1R_EventScript_22BD5F:: @ 822BD5F removeobject 8 removeobject 9 setflag FLAG_HIDE_ROUTE_112_TEAM_MAGMA - setflag FLAG_0x0CF + setflag FLAG_MET_ARCHIE_METEOR_FALLS setflag FLAG_HIDE_FALLORBOR_TOWN_BATTLE_TENT_SCOTT setvar VAR_0x40BF, 1 releaseall @@ -220,8 +220,8 @@ MeteorFalls_1F_1R_Movement_22BF1D: @ 822BF1D MeteorFalls_1F_1R_EventScript_22BF25:: @ 822BF25 lock faceplayer - goto_if_set FLAG_0x0F4, MeteorFalls_1F_1R_EventScript_22BF3D - setflag FLAG_0x0F4 + goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_22BF3D + setflag FLAG_MET_PROF_COSMO msgbox MeteorFalls_1F_1R_Text_22C342, MSGBOX_DEFAULT release end @@ -307,4 +307,3 @@ MeteorFalls_1F_1R_Text_22C47D: @ 822C47D .string "PROF. COZMO: But that TEAM MAGMA…\p" .string "What are they going to do with that\n" .string "METEORITE at MT. CHIMNEY?$" - diff --git a/data/maps/MeteorFalls_StevensCave/scripts.inc b/data/maps/MeteorFalls_StevensCave/scripts.inc index 854105932..ba8d807c5 100644 --- a/data/maps/MeteorFalls_StevensCave/scripts.inc +++ b/data/maps/MeteorFalls_StevensCave/scripts.inc @@ -3,7 +3,7 @@ MeteorFalls_StevensCave_MapScripts:: @ 823B181 MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 lock - goto_if_set FLAG_0x4F8, MeteorFalls_StevensCave_EventScript_23B1CD + goto_if_set FLAG_DEFEATED_METEOR_FALLS_STEVEN, MeteorFalls_StevensCave_EventScript_23B1CD waitse playse SE_PIN applymovement 1, MeteorFalls_StevensCave_Movement_272598 @@ -15,7 +15,7 @@ MeteorFalls_StevensCave_EventScript_23B182:: @ 823B182 msgbox MeteorFalls_StevensCave_Text_23B1E1, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_STEVEN, MeteorFalls_StevensCave_Text_23B32D msgbox MeteorFalls_StevensCave_Text_23B358, MSGBOX_DEFAULT - setflag FLAG_0x4F8 + setflag FLAG_DEFEATED_METEOR_FALLS_STEVEN release end diff --git a/data/maps/MirageTower_1F/scripts.inc b/data/maps/MirageTower_1F/scripts.inc index d8432293f..94aed55d0 100644 --- a/data/maps/MirageTower_1F/scripts.inc +++ b/data/maps/MirageTower_1F/scripts.inc @@ -3,7 +3,7 @@ MirageTower_1F_MapScripts:: @ 823AD01 .byte 0 MirageTower_1F_MapScript1_23AD07: @ 823AD07 - setflag FLAG_0x8DC + setflag FLAG_ENTERED_MIRAGE_TOWER setflag FLAG_FORCE_MIRAGE_TOWER_VISIBLE setflag FLAG_LANDMARK_MIRAGE_TOWER end diff --git a/data/maps/MirageTower_4F/scripts.inc b/data/maps/MirageTower_4F/scripts.inc index 5476d5e78..312852586 100644 --- a/data/maps/MirageTower_4F/scripts.inc +++ b/data/maps/MirageTower_4F/scripts.inc @@ -13,7 +13,7 @@ MirageTower_4F_EventScript_23AD48:: @ 823AD48 setflag FLAG_HIDE_MIRAGE_TOWER_CLAW_FOSSIL removeobject 1 delay 30 - setflag FLAG_0x14F + setflag FLAG_CHOSE_CLAW_FOSSIL goto MirageTower_4F_EventScript_23ADCA end @@ -34,7 +34,7 @@ MirageTower_4F_EventScript_23AD89:: @ 823AD89 setflag FLAG_HIDE_MIRAGE_TOWER_ROOT_FOSSIL removeobject 2 delay 30 - setflag FLAG_0x150 + setflag FLAG_CHOSE_ROOT_FOSSIL goto MirageTower_4F_EventScript_23ADCA end diff --git a/data/maps/MossdeepCity/scripts.inc b/data/maps/MossdeepCity/scripts.inc index 54210e809..b504d7004 100644 --- a/data/maps/MossdeepCity/scripts.inc +++ b/data/maps/MossdeepCity/scripts.inc @@ -3,17 +3,17 @@ MossdeepCity_MapScripts:: @ 81E4A96 .byte 0 MossdeepCity_MapScript1_1E4A9C: @ 81E4A9C - clearflag FLAG_0x064 - clearflag FLAG_0x065 - clearflag FLAG_0x066 - clearflag FLAG_0x067 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_27207A end MossdeepCity_EventScript_1E4AB2:: @ 81E4AB2 lock faceplayer - goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AC7 + goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AC7 msgbox MossdeepCity_Text_1E4E90, MSGBOX_DEFAULT release end @@ -26,7 +26,7 @@ MossdeepCity_EventScript_1E4AC7:: @ 81E4AC7 MossdeepCity_EventScript_1E4AD1:: @ 81E4AD1 lock faceplayer - goto_if_set FLAG_0x07B, MossdeepCity_EventScript_1E4AE6 + goto_if_set FLAG_RECEIVED_HM08, MossdeepCity_EventScript_1E4AE6 msgbox MossdeepCity_Text_1E4F50, MSGBOX_DEFAULT release end @@ -224,7 +224,7 @@ MossdeepCity_EventScript_1E4C10:: @ 81E4C10 MossdeepCity_EventScript_1E4C26:: @ 81E4C26 lock faceplayer - goto_if_set FLAG_0x114, MossdeepCity_EventScript_1E4C68 + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_1E4C68 msgbox MossdeepCity_Text_1E4CED, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_1E4C72 @@ -232,7 +232,7 @@ MossdeepCity_EventScript_1E4C26:: @ 81E4C26 giveitem_std ITEM_KINGS_ROCK compare VAR_RESULT, 0 goto_if_eq MossdeepCity_EventScript_272054 - setflag FLAG_0x114 + setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/maps/MossdeepCity_Gym/scripts.inc b/data/maps/MossdeepCity_Gym/scripts.inc index 84157a362..fc1a73b4d 100644 --- a/data/maps/MossdeepCity_Gym/scripts.inc +++ b/data/maps/MossdeepCity_Gym/scripts.inc @@ -3,22 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 8220800 .byte 0 MossdeepCity_Gym_MapScript1_220806: @ 8220806 - goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_22083D + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_22083D goto MossdeepCity_Gym_EventScript_220815 end MossdeepCity_Gym_EventScript_220815:: @ 8220815 - goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220855 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220855 goto MossdeepCity_Gym_EventScript_220824 end MossdeepCity_Gym_EventScript_220824:: @ 8220824 - goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_22086D + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_22086D goto MossdeepCity_Gym_EventScript_220833 end MossdeepCity_Gym_EventScript_220833:: @ 8220833 - goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220885 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220885 end MossdeepCity_Gym_EventScript_22083D:: @ 822083D @@ -49,7 +49,7 @@ MossdeepCity_Gym_EventScript_220898:: @ 8220898 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq MossdeepCity_Gym_EventScript_22097E - goto_if_unset FLAG_0x0AB, MossdeepCity_Gym_EventScript_220937 + goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_220937 msgbox MossdeepCity_Gym_Text_221B1D, MSGBOX_DEFAULT release end @@ -59,11 +59,11 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 waitmessage call MossdeepCity_Gym_EventScript_27207E msgbox MossdeepCity_Gym_Text_221999, MSGBOX_DEFAULT - setflag FLAG_0x4F6 + setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag FLAG_BADGE07_GET setflag FLAG_HIDE_AQUA_HIDEOUT_GRUNTS clearflag FLAG_HIDE_SLATEPORT_CITY_STERNS_SHIPYARD_MR_BRINEY - clearflag FLAG_0x393 + clearflag FLAG_UNKNOWN_0x393 setvar VAR_0x8008, 7 call MossdeepCity_Gym_EventScript_271F43 clearflag FLAG_HIDE_SLATEPORT_CITY_HARBOR_PATRONS @@ -82,7 +82,7 @@ MossdeepCity_Gym_EventScript_2208D1:: @ 82208D1 waitfanfare closemessage delay 30 - setflag FLAG_0x1D8 + setflag FLAG_ENABLE_TATE_AND_LIZA_MATCH_CALL release end @@ -91,7 +91,7 @@ MossdeepCity_Gym_EventScript_220937:: @ 8220937 compare VAR_RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_272054 msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT - setflag FLAG_0x0AB + setflag FLAG_RECEIVED_TM04 release end @@ -100,7 +100,7 @@ MossdeepCity_Gym_EventScript_22095B:: @ 822095B compare VAR_RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_27205E msgbox MossdeepCity_Gym_Text_221A40, MSGBOX_DEFAULT - setflag FLAG_0x0AB + setflag FLAG_RECEIVED_TM04 return MossdeepCity_Gym_EventScript_22097E:: @ 822097E @@ -110,8 +110,8 @@ MossdeepCity_Gym_EventScript_22097E:: @ 822097E MossdeepCity_Gym_EventScript_220999:: @ 8220999 lockall - goto_if_set FLAG_0x064, MossdeepCity_Gym_EventScript_2209D0 - setflag FLAG_0x064 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_2209D0 + setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 5, 5, 516, 0 @@ -126,7 +126,7 @@ MossdeepCity_Gym_EventScript_2209C8:: @ 82209C8 end MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 - clearflag FLAG_0x064 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 5, 5, 524, 0 @@ -136,8 +136,8 @@ MossdeepCity_Gym_EventScript_2209D0:: @ 82209D0 MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 lockall - goto_if_set FLAG_0x065, MossdeepCity_Gym_EventScript_220A24 - setflag FLAG_0x065 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_220A24 + setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 8, 14, 516, 0 @@ -146,7 +146,7 @@ MossdeepCity_Gym_EventScript_2209F5:: @ 82209F5 end MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 - clearflag FLAG_0x065 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 8, 14, 517, 0 @@ -156,8 +156,8 @@ MossdeepCity_Gym_EventScript_220A24:: @ 8220A24 MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 lockall - goto_if_set FLAG_0x066, MossdeepCity_Gym_EventScript_220A78 - setflag FLAG_0x066 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_220A78 + setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 15, 17, 524, 0 @@ -166,7 +166,7 @@ MossdeepCity_Gym_EventScript_220A49:: @ 8220A49 end MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 - clearflag FLAG_0x066 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 15, 17, 516, 0 @@ -176,8 +176,8 @@ MossdeepCity_Gym_EventScript_220A78:: @ 8220A78 MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D lockall - goto_if_set FLAG_0x067, MossdeepCity_Gym_EventScript_220ACC - setflag FLAG_0x067 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_220ACC + setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 1, 23, 525, 0 @@ -186,7 +186,7 @@ MossdeepCity_Gym_EventScript_220A9D:: @ 8220A9D end MossdeepCity_Gym_EventScript_220ACC:: @ 8220ACC - clearflag FLAG_0x067 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement EVENT_OBJ_ID_PLAYER, MossdeepCity_Gym_Movement_220C30 waitmovement 0 setmetatile 1, 23, 516, 0 @@ -264,7 +264,7 @@ MossdeepCity_Gym_EventScript_220BFA:: @ 8220BFA MossdeepCity_Gym_EventScript_220C11:: @ 8220C11 lock faceplayer - goto_if_set FLAG_0x4F6, MossdeepCity_Gym_EventScript_220C26 + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_220C26 msgbox MossdeepCity_Gym_Text_220CD5, MSGBOX_DEFAULT release end @@ -643,4 +643,3 @@ MossdeepCity_Gym_Text_221EB8: @ 8221EB8 .string "LIZA: You brought just one POKéMON!\p" .string "TATE: We need you to bring at least…\n" .string "LIZA: Two POKéMON when you come back.$" - diff --git a/data/maps/MossdeepCity_House2/scripts.inc b/data/maps/MossdeepCity_House2/scripts.inc index c2c5ff620..2151b2626 100644 --- a/data/maps/MossdeepCity_House2/scripts.inc +++ b/data/maps/MossdeepCity_House2/scripts.inc @@ -17,7 +17,7 @@ MossdeepCity_House2_EventScript_2220F1:: @ 82220F1 msgbox MossdeepCity_House2_Text_22222E, MSGBOX_DEFAULT waitmoncry closemessage - setflag FLAG_0x0E0 + setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_FORTREE_CITY_HOUSE_4_WINGULL compare VAR_FACING, 2 call_if_eq MossdeepCity_House2_EventScript_222124 diff --git a/data/maps/MossdeepCity_House3/scripts.inc b/data/maps/MossdeepCity_House3/scripts.inc index c61a0751c..257b7cc82 100644 --- a/data/maps/MossdeepCity_House3/scripts.inc +++ b/data/maps/MossdeepCity_House3/scripts.inc @@ -4,13 +4,13 @@ MossdeepCity_House3_MapScripts:: @ 82225C2 MossdeepCity_House3_EventScript_2225C3:: @ 82225C3 lock faceplayer - goto_if_set FLAG_0x098, MossdeepCity_House3_EventScript_222602 + goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_222602 msgbox MossdeepCity_House3_Text_222616, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_22260C msgbox MossdeepCity_House3_Text_2226B6, MSGBOX_DEFAULT giveitem_std ITEM_SUPER_ROD - setflag FLAG_0x098 + setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_2226F0, MSGBOX_DEFAULT release end diff --git a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc index 6d8b7bd47..91eda813c 100644 --- a/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_1F/scripts.inc @@ -116,12 +116,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_22308E:: @ 822308E faceplayer compare VAR_0x405D, 2 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_2230DA - goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_2230D0 msgbox MossdeepCity_SpaceCenter_1F_Text_223540, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 - setflag FLAG_0x0C0 + setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_2235A6, MSGBOX_DEFAULT release end @@ -132,12 +132,12 @@ MossdeepCity_SpaceCenter_1F_EventScript_2230D0:: @ 82230D0 end MossdeepCity_SpaceCenter_1F_EventScript_2230DA:: @ 82230DA - goto_if_set FLAG_0x0C0, MossdeepCity_SpaceCenter_1F_EventScript_223119 + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_223119 msgbox MossdeepCity_SpaceCenter_1F_Text_2235F0, MSGBOX_DEFAULT giveitem_std ITEM_SUN_STONE compare VAR_RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_272054 - setflag FLAG_0x0C0 + setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_223664, MSGBOX_DEFAULT applymovement VAR_LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_2725A8 waitmovement 0 @@ -232,10 +232,10 @@ MossdeepCity_SpaceCenter_1F_EventScript_223208:: @ 8223208 MossdeepCity_SpaceCenter_1F_EventScript_22321F:: @ 822321F lock faceplayer - goto_if_set FLAG_0x0BF, MossdeepCity_SpaceCenter_1F_EventScript_22326E + goto_if_set FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F, MossdeepCity_SpaceCenter_1F_EventScript_22326E msgbox MossdeepCity_SpaceCenter_1F_Text_223B90, MSGBOX_DEFAULT trainerbattle_no_intro TRAINER_GRUNT_23, MossdeepCity_SpaceCenter_1F_Text_223BC2 - setflag FLAG_0x0BF + setflag FLAG_DEFEATED_GRUNT_SPACE_CENTER_1F moveobjectoffscreen 9 switch VAR_FACING case 3, MossdeepCity_SpaceCenter_1F_EventScript_223278 @@ -431,4 +431,3 @@ MossdeepCity_SpaceCenter_1F_Text_223C2C: @ 8223C2C .string "We will take the fuel no matter what.\p" .string "“Let there be more land!\n" .string " TEAM MAGMA”$" - diff --git a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc index c4b106589..005c416ee 100644 --- a/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc +++ b/data/maps/MossdeepCity_SpaceCenter_2F/scripts.inc @@ -11,7 +11,7 @@ MossdeepCity_SpaceCenter_2F_MapScript1_223D63: @ 8223D63 end MossdeepCity_SpaceCenter_2F_EventScript_223D7A:: @ 8223D7A - clearflag FLAG_0x0CD + clearflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER setobjectxyperm 3, 5, 3 setobjectmovementtype 3, 10 setobjectxyperm 1, 3, 2 @@ -186,8 +186,8 @@ MossdeepCity_SpaceCenter_2F_EventScript_223F6F:: @ 8223F6F MossdeepCity_SpaceCenter_2F_EventScript_223F7A:: @ 8223F7A lockall - goto_if_set FLAG_0x0CD, MossdeepCity_SpaceCenter_2F_EventScript_223FDA - setflag FLAG_0x0CD + goto_if_set FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER, MossdeepCity_SpaceCenter_2F_EventScript_223FDA + setflag FLAG_INTERACTED_WITH_STEVEN_SPACE_CENTER msgbox MossdeepCity_SpaceCenter_2F_Text_2246B2, MSGBOX_DEFAULT msgbox MossdeepCity_SpaceCenter_2F_Text_2246F0, MSGBOX_DEFAULT closemessage @@ -310,7 +310,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224071:: @ 8224071 msgbox MossdeepCity_SpaceCenter_2F_Text_224A4A, MSGBOX_DEFAULT closemessage fadescreen 1 - setflag FLAG_0x075 + setflag FLAG_DEFEATED_MAGMA_SPACE_CENTER setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN removeobject 4 setflag FLAG_HIDE_MOSSDEEP_CITY_SPACE_CENTER_INVISIBLE_NINJA_BOY @@ -354,7 +354,7 @@ MossdeepCity_SpaceCenter_2F_EventScript_224175:: @ 8224175 compare VAR_RESULT, 1 call_if_eq MossdeepCity_SpaceCenter_2F_EventScript_22419A closemessage - clearflag FLAG_0x075 + clearflag FLAG_DEFEATED_MAGMA_SPACE_CENTER releaseall end @@ -517,4 +517,3 @@ MossdeepCity_SpaceCenter_2F_Text_224A4A: @ 8224A4A .string "after this.\p" .string "Oh, yes, I don't live in RUSTBORO CITY.\n" .string "I live right here on this island.$" - diff --git a/data/maps/MossdeepCity_StevensHouse/scripts.inc b/data/maps/MossdeepCity_StevensHouse/scripts.inc index 8db53c1c6..d2bd91694 100644 --- a/data/maps/MossdeepCity_StevensHouse/scripts.inc +++ b/data/maps/MossdeepCity_StevensHouse/scripts.inc @@ -39,8 +39,8 @@ MossdeepCity_StevensHouse_EventScript_2227CA:: @ 82227CA waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_222936, MSGBOX_DEFAULT giveitem_std ITEM_HM08 - setflag FLAG_0x07B - setflag FLAG_0x12E + setflag FLAG_RECEIVED_HM08 + setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_222A0E, MSGBOX_DEFAULT closemessage delay 20 @@ -129,7 +129,7 @@ MossdeepCity_StevensHouse_EventScript_2228EB:: @ 82228EB MossdeepCity_StevensHouse_EventScript_222901:: @ 8222901 setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_BELDUM_POKEBALL - setflag FLAG_0x12A + setflag FLAG_RECEIVED_BELDUM releaseall end @@ -149,7 +149,7 @@ MossdeepCity_StevensHouse_EventScript_22291B:: @ 822291B MossdeepCity_StevensHouse_EventScript_222926:: @ 8222926 giveitem_std ITEM_HM08, 1, 1 - setflag FLAG_0x07B + setflag FLAG_RECEIVED_HM08 end MossdeepCity_StevensHouse_Text_222936: @ 8222936 diff --git a/data/maps/MtChimney/scripts.inc b/data/maps/MtChimney/scripts.inc index 6e7331660..3bfc33f6a 100644 --- a/data/maps/MtChimney/scripts.inc +++ b/data/maps/MtChimney/scripts.inc @@ -14,12 +14,12 @@ MtChimney_MapScript1_22EDD2: @ 822EDD2 MtChimney_EventScript_22EDD5:: @ 822EDD5 lock faceplayer - call_if_unset FLAG_0x0DB, MtChimney_EventScript_22EDF9 - call_if_set FLAG_0x0DB, MtChimney_EventScript_22EE02 + call_if_unset FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EDF9 + call_if_set FLAG_EVIL_LEADER_PLEASE_STOP, MtChimney_EventScript_22EE02 closemessage applymovement 1, MtChimney_Movement_2725A2 waitmovement 0 - setflag FLAG_0x0DB + setflag FLAG_EVIL_LEADER_PLEASE_STOP release end @@ -70,7 +70,7 @@ MtChimney_EventScript_22EE0B:: @ 822EE0B call_if_eq MtChimney_EventScript_22EEE8 removeobject 1 setflag FLAG_HIDE_MT_CHIMNEY_TEAM_AQUA - setflag FLAG_0x08B + setflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY clearflag FLAG_HIDE_FALLARBOR_HOUSE_1_PROF_COZMO setflag FLAG_HIDE_METEOR_FALLS_1F_1R_COZMO clearflag FLAG_HIDE_MT_CHIMNEY_LAVA_COOKIE_LADY @@ -452,14 +452,14 @@ MtChimney_EventScript_22F0DB:: @ 822F0DB MtChimney_EventScript_22F0E4:: @ 822F0E4 lockall - goto_if_unset FLAG_0x08B, MtChimney_EventScript_22F137 - goto_if_set FLAG_0x073, MtChimney_EventScript_22F12D + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_22F137 + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_22F12D msgbox MtChimney_Text_22FF12, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq MtChimney_EventScript_22F123 msgbox MtChimney_Text_22FF66, MSGBOX_DEFAULT giveitem_std ITEM_METEORITE - setflag FLAG_0x073 + setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/maps/MtPyre_1F/scripts.inc b/data/maps/MtPyre_1F/scripts.inc index b3f38c296..676df4aee 100644 --- a/data/maps/MtPyre_1F/scripts.inc +++ b/data/maps/MtPyre_1F/scripts.inc @@ -4,12 +4,12 @@ MtPyre_1F_MapScripts:: @ 8230F3E MtPyre_1F_EventScript_230F3F:: @ 8230F3F lock faceplayer - goto_if_set FLAG_0x11A, MtPyre_1F_EventScript_230F6E + goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_230F6E msgbox MtPyre_1F_Text_230F8A, MSGBOX_DEFAULT giveitem_std ITEM_CLEANSE_TAG compare VAR_RESULT, 0 goto_if_eq MtPyre_1F_EventScript_272054 - setflag FLAG_0x11A + setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/maps/MtPyre_Summit/scripts.inc b/data/maps/MtPyre_Summit/scripts.inc index 31ae3348a..6eaf6265f 100644 --- a/data/maps/MtPyre_Summit/scripts.inc +++ b/data/maps/MtPyre_Summit/scripts.inc @@ -65,7 +65,7 @@ MtPyre_Summit_EventScript_23203C:: @ 823203C call_if_eq MtPyre_Summit_EventScript_232117 msgbox MtPyre_Summit_Text_23290E, MSGBOX_DEFAULT giveitem_std ITEM_MAGMA_EMBLEM - setflag FLAG_0x0D4 + setflag FLAG_RECEIVED_RED_OR_BLUE_ORB setflag FLAG_HIDE_JAGGED_PASS_MAGMA_GUARD releaseall end @@ -131,7 +131,7 @@ MtPyre_Summit_Movement_232139: @ 8232139 MtPyre_Summit_EventScript_23213C:: @ 823213C lock faceplayer - goto_if_set FLAG_0x09E, MtPyre_Summit_EventScript_232167 + goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, MtPyre_Summit_EventScript_232167 msgbox MtPyre_Summit_Text_232E0C, MSGBOX_YESNO compare VAR_RESULT, 1 call_if_eq MtPyre_Summit_EventScript_232187 @@ -164,17 +164,17 @@ MtPyre_Summit_EventScript_232199:: @ 8232199 MtPyre_Summit_EventScript_2321A2:: @ 82321A2 lock faceplayer - goto_if_set FLAG_0x103, MtPyre_Summit_EventScript_2321E2 + goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_2321E2 compare VAR_0x40B9, 3 call_if_ge MtPyre_Summit_EventScript_2321CB - goto_if_set FLAG_0x081, MtPyre_Summit_EventScript_2321D8 + goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_2321D8 msgbox MtPyre_Summit_Text_232AD8, MSGBOX_DEFAULT release end MtPyre_Summit_EventScript_2321CB:: @ 82321CB msgbox MtPyre_Summit_Text_232CA6, MSGBOX_DEFAULT - setflag FLAG_0x103 + setflag FLAG_RETURNED_RED_OR_BLUE_ORB release end diff --git a/data/maps/NavelRock_Bottom/scripts.inc b/data/maps/NavelRock_Bottom/scripts.inc index bbe02aadf..cd26de91d 100644 --- a/data/maps/NavelRock_Bottom/scripts.inc +++ b/data/maps/NavelRock_Bottom/scripts.inc @@ -4,8 +4,8 @@ NavelRock_Bottom_MapScripts:: @ 8269255 .byte 0 NavelRock_Bottom_MapScript1_269260: @ 8269260 - call_if_set FLAG_0x091, NavelRock_Bottom_EventScript_269273 - call_if_unset FLAG_0x091, NavelRock_Bottom_EventScript_269277 + call_if_set FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269273 + call_if_unset FLAG_CAUGHT_LUGIA, NavelRock_Bottom_EventScript_269277 end NavelRock_Bottom_EventScript_269273:: @ 8269273 @@ -13,7 +13,7 @@ NavelRock_Bottom_EventScript_269273:: @ 8269273 return NavelRock_Bottom_EventScript_269277:: @ 8269277 - goto_if_set FLAG_0x1DD, NavelRock_Bottom_EventScript_27374E + goto_if_set FLAG_DEFEATED_LUGIA, NavelRock_Bottom_EventScript_27374E clearflag FLAG_HIDE_LUGIA return @@ -67,12 +67,12 @@ NavelRock_Bottom_EventScript_2692A2:: @ 82692A2 goto_if_eq NavelRock_Bottom_EventScript_269344 compare VAR_RESULT, 5 goto_if_eq NavelRock_Bottom_EventScript_269344 - setflag FLAG_0x091 + setflag FLAG_CAUGHT_LUGIA release end NavelRock_Bottom_EventScript_269336:: @ 8269336 - setflag FLAG_0x1DD + setflag FLAG_DEFEATED_LUGIA setvar VAR_0x8004, 249 goto NavelRock_Bottom_EventScript_273776 end @@ -81,4 +81,3 @@ NavelRock_Bottom_EventScript_269344:: @ 8269344 setvar VAR_0x8004, 249 goto NavelRock_Bottom_EventScript_273776 end - diff --git a/data/maps/NavelRock_Exterior/scripts.inc b/data/maps/NavelRock_Exterior/scripts.inc index daa3fc964..21034a4e0 100644 --- a/data/maps/NavelRock_Exterior/scripts.inc +++ b/data/maps/NavelRock_Exterior/scripts.inc @@ -3,6 +3,6 @@ NavelRock_Exterior_MapScripts:: @ 82690B2 .byte 0 NavelRock_Exterior_MapScript1_2690B8: @ 82690B8 - setflag FLAG_0x8E1 + setflag FLAG_ARRIVED_AT_NAVEL_ROCK end diff --git a/data/maps/NavelRock_Top/events.inc b/data/maps/NavelRock_Top/events.inc index abd337cb2..0952b0f67 100644 --- a/data/maps/NavelRock_Top/events.inc +++ b/data/maps/NavelRock_Top/events.inc @@ -1,5 +1,5 @@ NavelRock_Top_EventObjects: @ 853DB74 - object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HOOH + object_event 1, EVENT_OBJ_GFX_HOOH, 0, 12, 4, 0, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, 0x0, FLAG_HIDE_HO_OH NavelRock_Top_MapWarps: @ 853DB8C warp_def 13, 20, 3, 1, MAP_NAVEL_ROCK_UP4 diff --git a/data/maps/NavelRock_Top/scripts.inc b/data/maps/NavelRock_Top/scripts.inc index 28d55d68f..423d998a7 100644 --- a/data/maps/NavelRock_Top/scripts.inc +++ b/data/maps/NavelRock_Top/scripts.inc @@ -4,20 +4,20 @@ NavelRock_Top_MapScripts:: @ 8269113 .byte 0 NavelRock_Top_MapScript1_26911E: @ 826911E - call_if_set FLAG_0x092, NavelRock_Top_EventScript_269131 - call_if_unset FLAG_0x092, NavelRock_Top_EventScript_26913A + call_if_set FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_269131 + call_if_unset FLAG_CAUGHT_HO_OH, NavelRock_Top_EventScript_26913A end NavelRock_Top_EventScript_269131:: @ 8269131 setvar VAR_TEMP_1, 1 - setflag FLAG_HIDE_HOOH + setflag FLAG_HIDE_HO_OH return NavelRock_Top_EventScript_26913A:: @ 826913A setvar VAR_TEMP_1, 1 - goto_if_set FLAG_0x1DC, NavelRock_Top_EventScript_27374E + goto_if_set FLAG_DEFEATED_HO_OH, NavelRock_Top_EventScript_27374E setvar VAR_TEMP_1, 0 - clearflag FLAG_HIDE_HOOH + clearflag FLAG_HIDE_HO_OH return NavelRock_Top_MapScript1_269151: @ 8269151 @@ -72,12 +72,12 @@ NavelRock_Top_EventScript_26916F:: @ 826916F goto_if_eq NavelRock_Top_EventScript_269225 compare VAR_RESULT, 5 goto_if_eq NavelRock_Top_EventScript_269225 - setflag FLAG_0x092 + setflag FLAG_CAUGHT_HO_OH releaseall end NavelRock_Top_EventScript_269217:: @ 8269217 - setflag FLAG_0x1DC + setflag FLAG_DEFEATED_HO_OH setvar VAR_0x8004, 250 goto NavelRock_Top_EventScript_273776 end @@ -120,4 +120,3 @@ NavelRock_Top_Movement_269243: @ 8269243 walk_in_place_down walk_in_place_down step_end - diff --git a/data/maps/NewMauville_Inside/scripts.inc b/data/maps/NewMauville_Inside/scripts.inc index aff38c577..b3d9d868f 100644 --- a/data/maps/NewMauville_Inside/scripts.inc +++ b/data/maps/NewMauville_Inside/scripts.inc @@ -22,9 +22,9 @@ NewMauville_Inside_EventScript_237407:: @ 8237407 NewMauville_Inside_MapScript1_23741B: @ 823741B setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 0 - call_if_unset FLAG_0x1C1, NewMauville_Inside_EventScript_237441 - call_if_unset FLAG_0x1C2, NewMauville_Inside_EventScript_237445 - call_if_unset FLAG_0x1C3, NewMauville_Inside_EventScript_237449 + call_if_unset FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE, NewMauville_Inside_EventScript_237441 + call_if_unset FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE, NewMauville_Inside_EventScript_237445 + call_if_unset FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE, NewMauville_Inside_EventScript_237449 end NewMauville_Inside_EventScript_237441:: @ 8237441 @@ -196,12 +196,12 @@ NewMauville_Inside_EventScript_2377AF:: @ 82377AF goto_if_eq NewMauville_Inside_EventScript_2377F3 compare VAR_RESULT, 5 goto_if_eq NewMauville_Inside_EventScript_2377F3 - setflag FLAG_0x1C1 + setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE release end NewMauville_Inside_EventScript_2377F3:: @ 82377F3 - setflag FLAG_0x1C1 + setflag FLAG_DEFEATED_VOLTORB_1_NEW_MAUVILLE goto NewMauville_Inside_EventScript_27376D end @@ -223,12 +223,12 @@ NewMauville_Inside_EventScript_2377FC:: @ 82377FC goto_if_eq NewMauville_Inside_EventScript_237840 compare VAR_RESULT, 5 goto_if_eq NewMauville_Inside_EventScript_237840 - setflag FLAG_0x1C2 + setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE release end NewMauville_Inside_EventScript_237840:: @ 8237840 - setflag FLAG_0x1C2 + setflag FLAG_DEFEATED_VOLTORB_2_NEW_MAUVILLE goto NewMauville_Inside_EventScript_27376D end @@ -250,12 +250,12 @@ NewMauville_Inside_EventScript_237849:: @ 8237849 goto_if_eq NewMauville_Inside_EventScript_23788D compare VAR_RESULT, 5 goto_if_eq NewMauville_Inside_EventScript_23788D - setflag FLAG_0x1C3 + setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE release end NewMauville_Inside_EventScript_23788D:: @ 823788D - setflag FLAG_0x1C3 + setflag FLAG_DEFEATED_VOLTORB_3_NEW_MAUVILLE goto NewMauville_Inside_EventScript_27376D end @@ -275,4 +275,3 @@ NewMauville_Inside_Text_237932: @ 8237932 .string "… … … … … … … …\p" .string "The generator appears to have\n" .string "stopped…$" - diff --git a/data/maps/OldaleTown/scripts.inc b/data/maps/OldaleTown/scripts.inc index 96863ceed..921323bbf 100644 --- a/data/maps/OldaleTown/scripts.inc +++ b/data/maps/OldaleTown/scripts.inc @@ -5,9 +5,9 @@ OldaleTown_MapScripts:: @ 81E8EA2 OldaleTown_MapScript1_1E8EA8: @ 81E8EA8 call OldaleTown_EventScript_271ED7 setflag FLAG_VISITED_OLDALE_TOWN - call_if_unset FLAG_0x074, OldaleTown_EventScript_1E8ED2 - call_if_unset FLAG_0x084, OldaleTown_EventScript_1E8EDE - call_if_set FLAG_0x074, OldaleTown_EventScript_1E8ECC + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ED2 + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8EDE + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E8ECC end OldaleTown_EventScript_1E8ECC:: @ 81E8ECC @@ -35,7 +35,7 @@ OldaleTown_EventScript_1E8EF3:: @ 81E8EF3 OldaleTown_EventScript_1E8EFC:: @ 81E8EFC lock faceplayer - goto_if_set FLAG_0x084, OldaleTown_EventScript_1E8FB9 + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_1E8FB9 goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_1E8FB9 setflag FLAG_TEMP_1 playbgm MUS_TSURETEK, 0 @@ -74,7 +74,7 @@ OldaleTown_EventScript_1E8F8C:: @ 81E8F8C compare VAR_RESULT, 0 goto_if_eq OldaleTown_EventScript_1E8FC3 msgbox OldaleTown_Text_1E92AF, MSGBOX_DEFAULT - setflag FLAG_0x084 + setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end @@ -190,7 +190,7 @@ OldaleTown_Movement_1E9013: @ 81E9013 OldaleTown_EventScript_1E901F:: @ 81E901F lock faceplayer - goto_if_set FLAG_0x074, OldaleTown_EventScript_1E9066 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_1E9066 msgbox OldaleTown_Text_1E939A, MSGBOX_DEFAULT closemessage applymovement 3, OldaleTown_Movement_2725A2 diff --git a/data/maps/OldaleTown_Mart/scripts.inc b/data/maps/OldaleTown_Mart/scripts.inc index 2eaa483f5..980b0e4d6 100644 --- a/data/maps/OldaleTown_Mart/scripts.inc +++ b/data/maps/OldaleTown_Mart/scripts.inc @@ -6,7 +6,7 @@ OldaleTown_Mart_EventScript_1FC240:: @ 81FC240 faceplayer message gUnknown_08272A21 waitmessage - goto_if_set FLAG_0x074, OldaleTown_Mart_EventScript_1FC26C + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC26C pokemart OldaleTown_Mart_Pokemart_1FC260 msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release @@ -41,7 +41,7 @@ OldaleTown_Mart_Pokemart_1FC27C: @ 81FC27C OldaleTown_Mart_EventScript_1FC28A:: @ 81FC28A lock faceplayer - goto_if_set FLAG_0x074, OldaleTown_Mart_EventScript_1FC29F + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_1FC29F msgbox OldaleTown_Mart_Text_1FC2B2, MSGBOX_DEFAULT release end diff --git a/data/maps/PacifidlogTown_House2/scripts.inc b/data/maps/PacifidlogTown_House2/scripts.inc index d0eb88cf2..b3078fa2d 100644 --- a/data/maps/PacifidlogTown_House2/scripts.inc +++ b/data/maps/PacifidlogTown_House2/scripts.inc @@ -6,10 +6,10 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_2037DE - goto_if_set FLAG_0x12B, PacifidlogTown_House2_EventScript_20387E - call_if_set FLAG_0x12C, PacifidlogTown_House2_EventScript_2037F8 - call_if_unset FLAG_0x12C, PacifidlogTown_House2_EventScript_203801 - setflag FLAG_0x12C + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_20387E + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_2037F8 + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_203801 + setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 goto_if_ge PacifidlogTown_House2_EventScript_203816 @@ -20,7 +20,7 @@ PacifidlogTown_House2_EventScript_203792:: @ 8203792 end PacifidlogTown_House2_EventScript_2037DE:: @ 82037DE - goto_if_unset FLAG_0x12B, PacifidlogTown_House2_EventScript_27374E + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_27374E specialvar VAR_RESULT, GetDaysUntilPacifidlogTMAvailable compare VAR_RESULT, 0 call_if_eq PacifidlogTown_House2_EventScript_203812 @@ -36,7 +36,7 @@ PacifidlogTown_House2_EventScript_203801:: @ 8203801 return PacifidlogTown_House2_EventScript_203812:: @ 8203812 - clearflag FLAG_0x12B + clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return PacifidlogTown_House2_EventScript_203816:: @ 8203816 @@ -44,7 +44,7 @@ PacifidlogTown_House2_EventScript_203816:: @ 8203816 giveitem_std ITEM_TM27 compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_272054 - setflag FLAG_0x12B + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release @@ -60,7 +60,7 @@ PacifidlogTown_House2_EventScript_20384F:: @ 820384F giveitem_std ITEM_TM21 compare VAR_RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_272054 - setflag FLAG_0x12B + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_203A85, MSGBOX_DEFAULT release diff --git a/data/maps/PacifidlogTown_House3/scripts.inc b/data/maps/PacifidlogTown_House3/scripts.inc index fb5bf8cb1..73ecfe1f3 100644 --- a/data/maps/PacifidlogTown_House3/scripts.inc +++ b/data/maps/PacifidlogTown_House3/scripts.inc @@ -4,7 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 8203C10 PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 lock faceplayer - goto_if_set FLAG_0x09A, PacifidlogTown_House3_EventScript_203CAB + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_203CAB setvar VAR_0x8008, 2 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C @@ -29,7 +29,7 @@ PacifidlogTown_House3_EventScript_203C11:: @ 8203C11 waitstate bufferspeciesname 0, VAR_0x8009 msgbox PacifidlogTown_House3_Text_203D87, MSGBOX_DEFAULT - setflag FLAG_0x09A + setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end diff --git a/data/maps/PetalburgCity_Gym/scripts.inc b/data/maps/PetalburgCity_Gym/scripts.inc index f97825624..66dfab92a 100644 --- a/data/maps/PetalburgCity_Gym/scripts.inc +++ b/data/maps/PetalburgCity_Gym/scripts.inc @@ -364,7 +364,7 @@ PetalburgCity_Gym_EventScript_204D80:: @ 8204D80 call PetalburgCity_Gym_EventScript_204DCE compare VAR_RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_204E1D - goto_if_unset FLAG_0x0A9, PetalburgCity_Gym_EventScript_204DAC + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_204DAC goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_20512D msgbox PetalburgCity_Gym_Text_206417, MSGBOX_DEFAULT release @@ -415,7 +415,7 @@ PetalburgCity_Gym_EventScript_204E3B:: @ 8204E3B waitmessage call PetalburgCity_Gym_EventScript_27207E msgbox PetalburgCity_Gym_Text_20618A, MSGBOX_DEFAULT - setflag FLAG_0x4F4 + setflag FLAG_DEFEATED_PETALBURG_GYM setvar VAR_0x4085, 7 setflag FLAG_BADGE05_GET special sub_813B9A0 @@ -445,7 +445,7 @@ PetalburgCity_Gym_EventScript_204ED2:: @ 8204ED2 giveitem_std ITEM_TM42 compare VAR_RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_27205E - setflag FLAG_0x0A9 + setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_206254, MSGBOX_DEFAULT return @@ -956,7 +956,7 @@ PetalburgCity_Gym_EventScript_205387:: @ 8205387 PetalburgCity_Gym_EventScript_2053BA:: @ 82053BA trainerbattle_single TRAINER_RANDALL, PetalburgCity_Gym_Text_20674F, PetalburgCity_Gym_Text_2067B9, PetalburgCity_Gym_EventScript_2053DE - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2053ED + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2053ED msgbox PetalburgCity_Gym_Text_2067D8, MSGBOX_AUTOCLOSE end @@ -973,7 +973,7 @@ PetalburgCity_Gym_EventScript_2053ED:: @ 82053ED PetalburgCity_Gym_EventScript_2053F6:: @ 82053F6 trainerbattle_single TRAINER_PARKER, PetalburgCity_Gym_Text_2068FD, PetalburgCity_Gym_Text_20694F, PetalburgCity_Gym_EventScript_20541A - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205429 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205429 msgbox PetalburgCity_Gym_Text_206996, MSGBOX_AUTOCLOSE end @@ -990,7 +990,7 @@ PetalburgCity_Gym_EventScript_205429:: @ 8205429 PetalburgCity_Gym_EventScript_205432:: @ 8205432 trainerbattle_single TRAINER_GEORGE, PetalburgCity_Gym_Text_206A1B, PetalburgCity_Gym_Text_206AB8, PetalburgCity_Gym_EventScript_205456 - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205465 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205465 msgbox PetalburgCity_Gym_Text_206AE9, MSGBOX_AUTOCLOSE end @@ -1007,7 +1007,7 @@ PetalburgCity_Gym_EventScript_205465:: @ 8205465 PetalburgCity_Gym_EventScript_20546E:: @ 820546E trainerbattle_single TRAINER_BERKE, PetalburgCity_Gym_Text_206BF4, PetalburgCity_Gym_Text_206C7D, PetalburgCity_Gym_EventScript_205492 - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054A1 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2054A1 msgbox PetalburgCity_Gym_Text_206C9F, MSGBOX_AUTOCLOSE end @@ -1024,7 +1024,7 @@ PetalburgCity_Gym_EventScript_2054A1:: @ 82054A1 PetalburgCity_Gym_EventScript_2054AA:: @ 82054AA trainerbattle_single TRAINER_MARY, PetalburgCity_Gym_Text_206DB2, PetalburgCity_Gym_Text_206E0D, PetalburgCity_Gym_EventScript_2054CE - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_2054DD + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_2054DD msgbox PetalburgCity_Gym_Text_206E26, MSGBOX_AUTOCLOSE end @@ -1041,7 +1041,7 @@ PetalburgCity_Gym_EventScript_2054DD:: @ 82054DD PetalburgCity_Gym_EventScript_2054E6:: @ 82054E6 trainerbattle_single TRAINER_ALEXIA, PetalburgCity_Gym_Text_206F44, PetalburgCity_Gym_Text_206F82, PetalburgCity_Gym_EventScript_20550A - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205519 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205519 msgbox PetalburgCity_Gym_Text_206F9F, MSGBOX_AUTOCLOSE end @@ -1058,7 +1058,7 @@ PetalburgCity_Gym_EventScript_205519:: @ 8205519 PetalburgCity_Gym_EventScript_205522:: @ 8205522 trainerbattle_single TRAINER_JODY, PetalburgCity_Gym_Text_207088, PetalburgCity_Gym_Text_2070E6, PetalburgCity_Gym_EventScript_205546 - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205555 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205555 msgbox PetalburgCity_Gym_Text_2070FB, MSGBOX_AUTOCLOSE end @@ -1205,7 +1205,7 @@ PetalburgCity_Gym_EventScript_20574B:: @ 820574B PetalburgCity_Gym_EventScript_20574F:: @ 820574F lock faceplayer - goto_if_set FLAG_0x4F4, PetalburgCity_Gym_EventScript_205764 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_205764 msgbox PetalburgCity_Gym_Text_206542, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgCity_Mart/scripts.inc b/data/maps/PetalburgCity_Mart/scripts.inc index 4303f1504..2bd72b69e 100644 --- a/data/maps/PetalburgCity_Mart/scripts.inc +++ b/data/maps/PetalburgCity_Mart/scripts.inc @@ -6,7 +6,7 @@ PetalburgCity_Mart_EventScript_207D69:: @ 8207D69 faceplayer message gUnknown_08272A21 waitmessage - goto_if_set FLAG_0x128, PetalburgCity_Mart_EventScript_207DA6 + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_207DA6 pokemart PetalburgCity_Mart_Pokemart_207D8C msgbox gUnknown_08272A3F, MSGBOX_DEFAULT release diff --git a/data/maps/PetalburgCity_WallysHouse/scripts.inc b/data/maps/PetalburgCity_WallysHouse/scripts.inc index 7645828ef..ac41aaa28 100644 --- a/data/maps/PetalburgCity_WallysHouse/scripts.inc +++ b/data/maps/PetalburgCity_WallysHouse/scripts.inc @@ -20,7 +20,7 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 lockall msgbox PetalburgCity_WallysHouse_Text_20446E, MSGBOX_DEFAULT giveitem_std ITEM_HM03 - setflag FLAG_0x07A + setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_20461A, MSGBOX_DEFAULT setvar VAR_0x4057, 5 releaseall @@ -29,11 +29,11 @@ PetalburgCity_WallysHouse_EventScript_204251:: @ 8204251 PetalburgCity_WallysHouse_EventScript_204278:: @ 8204278 lock faceplayer - goto_if_set FLAG_0x07E, PetalburgCity_WallysHouse_EventScript_2042AC - goto_if_set FLAG_0x07A, PetalburgCity_WallysHouse_EventScript_2042A2 - goto_if_set FLAG_0x087, PetalburgCity_WallysHouse_EventScript_2042B6 + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_2042AC + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_2042A2 + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_2042B6 msgbox PetalburgCity_WallysHouse_Text_2042DF, MSGBOX_DEFAULT - setflag FLAG_0x087 + setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end @@ -55,7 +55,7 @@ PetalburgCity_WallysHouse_EventScript_2042B6:: @ 82042B6 PetalburgCity_WallysHouse_EventScript_2042C0:: @ 82042C0 lock faceplayer - goto_if_set FLAG_0x07A, PetalburgCity_WallysHouse_EventScript_2042D5 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_2042D5 msgbox PetalburgCity_WallysHouse_Text_204732, MSGBOX_DEFAULT release end diff --git a/data/maps/PetalburgWoods/scripts.inc b/data/maps/PetalburgWoods/scripts.inc index 57797588f..eec9100f1 100644 --- a/data/maps/PetalburgWoods/scripts.inc +++ b/data/maps/PetalburgWoods/scripts.inc @@ -249,12 +249,12 @@ PetalburgWoods_EventScript_22E219:: @ 822E219 PetalburgWoods_EventScript_22E222:: @ 822E222 lock faceplayer - goto_if_set FLAG_0x129, PetalburgWoods_EventScript_22E251 + goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_22E251 msgbox PetalburgWoods_Text_22EAFE, MSGBOX_DEFAULT giveitem_std ITEM_MIRACLE_SEED compare VAR_RESULT, 0 goto_if_eq PetalburgWoods_EventScript_272054 - setflag FLAG_0x129 + setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/maps/Route101/scripts.inc b/data/maps/Route101/scripts.inc index deea27e74..c8ddeaaf9 100644 --- a/data/maps/Route101/scripts.inc +++ b/data/maps/Route101/scripts.inc @@ -219,7 +219,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16 lock faceplayer setflag FLAG_SYS_POKEMON_GET - setflag FLAG_0x052 + setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 setobjectxy EVENT_OBJ_ID_PLAYER, 6, 13 diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc index 6b793286e..d12045955 100644 --- a/data/maps/Route103/scripts.inc +++ b/data/maps/Route103/scripts.inc @@ -142,7 +142,7 @@ Route103_EventScript_1EC5A2:: @ 81EC5A2 removeobject 2 setvar VAR_0x4084, 4 clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCHS_LAB_RIVAL - setflag FLAG_0x082 + setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar VAR_0x40C7, 1 clearflag FLAG_HIDE_OLDALE_TOWN_RIVAL savebgm MUS_DUMMY diff --git a/data/maps/Route104/scripts.inc b/data/maps/Route104/scripts.inc index 2dfb42d74..6cddd613f 100644 --- a/data/maps/Route104/scripts.inc +++ b/data/maps/Route104/scripts.inc @@ -19,7 +19,7 @@ Route104_MapScript1_1ECC4E: @ 81ECC4E end Route104_EventScript_1ECC5E:: @ 81ECC5E - goto_if_unset FLAG_0x07F, Route104_EventScript_1ECC74 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_1ECC74 goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_1ECC74 clearflag FLAG_HIDE_ROUTE_104_WHITE_HERB_FLORIST return @@ -31,8 +31,8 @@ Route104_EventScript_1ECC74:: @ 81ECC74 Route104_EventScript_1ECC78:: @ 81ECC78 compare VAR_0x408E, 1 goto_if_ge Route104_EventScript_1ECC9D - goto_if_set FLAG_0x120, Route104_EventScript_1ECC9D - goto_if_unset FLAG_0x07C, Route104_EventScript_1ECC9D + goto_if_set FLAG_MET_RIVAL_RUSTBORO, Route104_EventScript_1ECC9D + goto_if_unset FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECC9D setobjectxyperm 34, 17, 52 return @@ -95,9 +95,9 @@ Route104_EventScript_1ECD33:: @ 81ECD33 end Route104_EventScript_1ECD4B:: @ 81ECD4B - goto_if_set FLAG_0x07D, Route104_EventScript_1ECE1C - goto_if_set FLAG_0x07C, Route104_EventScript_1ECDD0 - setflag FLAG_0x07C + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECE1C + goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECDD0 + setflag FLAG_REGISTER_RIVAL_POKENAV msgbox Route104_Text_1EDBFF, MSGBOX_DEFAULT closemessage delay 30 @@ -106,7 +106,7 @@ Route104_EventScript_1ECD4B:: @ 81ECD4B waitfanfare closemessage delay 30 - setflag FLAG_0x0FD + setflag FLAG_ENABLE_RIVAL_MATCH_CALL applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 msgbox Route104_Text_1EDCB1, MSGBOX_DEFAULT @@ -167,26 +167,26 @@ Route104_EventScript_1ECE31:: @ 81ECE31 Route104_EventScript_1ECE36:: @ 81ECE36 trainerbattle_no_intro TRAINER_MAY_14, Route104_Text_1EDE18 - setflag FLAG_0x07D + setflag FLAG_DEFEATED_RIVAL_ROUTE_104 goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE49:: @ 81ECE49 trainerbattle_no_intro TRAINER_MAY_15, Route104_Text_1EDE18 - setflag FLAG_0x07D + setflag FLAG_DEFEATED_RIVAL_ROUTE_104 goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE5C:: @ 81ECE5C trainerbattle_no_intro TRAINER_MAY_10, Route104_Text_1EDE18 - setflag FLAG_0x07D + setflag FLAG_DEFEATED_RIVAL_ROUTE_104 goto Route104_EventScript_1ECE1C end Route104_EventScript_1ECE6F:: @ 81ECE6F - goto_if_set FLAG_0x07D, Route104_EventScript_1ECF38 - goto_if_set FLAG_0x07C, Route104_EventScript_1ECEEC - setflag FLAG_0x07C + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE_104, Route104_EventScript_1ECF38 + goto_if_set FLAG_REGISTER_RIVAL_POKENAV, Route104_EventScript_1ECEEC + setflag FLAG_REGISTER_RIVAL_POKENAV msgbox Route104_Text_1EDF04, MSGBOX_DEFAULT closemessage delay 30 @@ -195,7 +195,7 @@ Route104_EventScript_1ECE6F:: @ 81ECE6F waitfanfare closemessage delay 30 - setflag FLAG_0x0FD + setflag FLAG_ENABLE_RIVAL_MATCH_CALL applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ECDCD applymovement 34, Route104_Movement_1ECDC8 msgbox Route104_Text_1EDFC6, MSGBOX_DEFAULT @@ -237,19 +237,19 @@ Route104_EventScript_1ECF38:: @ 81ECF38 Route104_EventScript_1ECF4D:: @ 81ECF4D trainerbattle_no_intro TRAINER_BRENDAN_10, Route104_Text_1EE107 - setflag FLAG_0x07D + setflag FLAG_DEFEATED_RIVAL_ROUTE_104 goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF60:: @ 81ECF60 trainerbattle_no_intro TRAINER_BRENDAN_12, Route104_Text_1EE107 - setflag FLAG_0x07D + setflag FLAG_DEFEATED_RIVAL_ROUTE_104 goto Route104_EventScript_1ECF38 end Route104_EventScript_1ECF73:: @ 81ECF73 trainerbattle_no_intro TRAINER_BRENDAN_11, Route104_Text_1EE107 - setflag FLAG_0x07D + setflag FLAG_DEFEATED_RIVAL_ROUTE_104 goto Route104_EventScript_1ECF38 end @@ -266,12 +266,12 @@ Route104_Movement_1ECF8A: @ 81ECF8A Route104_EventScript_1ECF8C:: @ 81ECF8C lock faceplayer - goto_if_set FLAG_0x0F6, Route104_EventScript_1ECFC3 + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104, Route104_EventScript_1ECFC3 msgbox Route104_Text_2A6D86, MSGBOX_DEFAULT giveitem_std ITEM_CHESTO_BERRY compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_272054 - setflag FLAG_0x0F6 + setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE_104 msgbox Route104_Text_2A6E32, MSGBOX_DEFAULT release end @@ -284,12 +284,12 @@ Route104_EventScript_1ECFC3:: @ 81ECFC3 Route104_EventScript_1ECFCD:: @ 81ECFCD lock faceplayer - goto_if_set FLAG_0x117, Route104_EventScript_1ECFFC + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_1ECFFC msgbox Route104_Text_1ED96A, MSGBOX_DEFAULT giveitem_std ITEM_WHITE_HERB compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_272054 - setflag FLAG_0x117 + setflag FLAG_RECEIVED_WHITE_HERB release end @@ -337,12 +337,12 @@ Route104_EventScript_1ED04E:: @ 81ED04E Route104_EventScript_1ED057:: @ 81ED057 lock faceplayer - goto_if_set FLAG_0x106, Route104_EventScript_1ED086 + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_1ED086 msgbox Route104_Text_1ED838, MSGBOX_DEFAULT giveitem_std ITEM_TM09 compare VAR_RESULT, 0 goto_if_eq Route104_EventScript_272054 - setflag FLAG_0x106 + setflag FLAG_RECEIVED_TM09 release end @@ -365,8 +365,8 @@ Route104_EventScript_1ED099:: @ 81ED099 waitmovement 0 hideobjectat EVENT_OBJ_ID_PLAYER, MAP_ROUTE104 call Route104_EventScript_2720A0 - goto_if_set FLAG_0x132, Route104_EventScript_1ED0D9 - goto_if_unset FLAG_0x132, Route104_EventScript_1ED0EF + goto_if_set FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0D9 + goto_if_unset FLAG_ENABLE_NORMAN_MATCH_CALL, Route104_EventScript_1ED0EF end Route104_EventScript_1ED0D9:: @ 81ED0D9 @@ -387,7 +387,7 @@ Route104_EventScript_1ED0EF:: @ 81ED0EF waitfanfare closemessage delay 30 - setflag FLAG_0x132 + setflag FLAG_ENABLE_NORMAN_MATCH_CALL applymovement EVENT_OBJ_ID_PLAYER, Route104_Movement_1ED22A applymovement 7, Route104_Movement_1ED22A, MAP_ROUTE104 waitmovement 7, MAP_ROUTE104 @@ -418,8 +418,8 @@ Route104_EventScript_1ED139:: @ 81ED139 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_0x408E, 0 - goto_if_unset FLAG_0x0BD, Route104_EventScript_1ED1B4 - goto_if_set FLAG_0x0BD, Route104_EventScript_1ED1BE + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1B4 + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_1ED1BE end Route104_EventScript_1ED1B4:: @ 81ED1B4 @@ -1185,4 +1185,3 @@ Route104_Text_1EE120: @ 81EE120 .string "making POKéMON battle.\p" .string "Like MR. BRINEY, it's important to\n" .string "become friends with your POKéMON.$" - diff --git a/data/maps/Route104_MrBrineysHouse/scripts.inc b/data/maps/Route104_MrBrineysHouse/scripts.inc index 90298a924..ba1afc428 100644 --- a/data/maps/Route104_MrBrineysHouse/scripts.inc +++ b/data/maps/Route104_MrBrineysHouse/scripts.inc @@ -6,7 +6,7 @@ Route104_MrBrineysHouse_MapScript1_229D34: @ 8229D34 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_0x4090, 1 call_if_eq Route104_MrBrineysHouse_EventScript_229D50 - call_if_set FLAG_0x0BC, Route104_MrBrineysHouse_EventScript_229D4C + call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_229D4C end Route104_MrBrineysHouse_EventScript_229D4C:: @ 8229D4C @@ -23,14 +23,14 @@ Route104_MrBrineysHouse_EventScript_229D50:: @ 8229D50 Route104_MrBrineysHouse_EventScript_229D67:: @ 8229D67 lock faceplayer - call_if_unset FLAG_0x093, Route104_MrBrineysHouse_EventScript_229D8A - goto_if_unset FLAG_0x0BD, Route104_MrBrineysHouse_EventScript_229DE1 - goto_if_unset FLAG_0x095, Route104_MrBrineysHouse_EventScript_229DFA + call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_229D8A + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_229DE1 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_229DFA goto Route104_MrBrineysHouse_EventScript_229DAE end Route104_MrBrineysHouse_EventScript_229D8A:: @ 8229D8A - setflag FLAG_0x093 + setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_229E70, MSGBOX_DEFAULT msgbox Route104_MrBrineysHouse_Text_229E9B, MSGBOX_YESNO compare VAR_RESULT, 0 diff --git a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc index fc0acf329..d023d5519 100644 --- a/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc +++ b/data/maps/Route104_PrettyPetalFlowerShop/scripts.inc @@ -4,7 +4,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 822A34C Route104_PrettyPetalFlowerShop_MapScript1_22A352: @ 822A352 setflag FLAG_LANDMARK_FLOWER_SHOP - goto_if_unset FLAG_0x07F, Route104_PrettyPetalFlowerShop_EventScript_22A36B + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A36B goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_22A36B setflag FLAG_TEMP_1 end @@ -18,8 +18,8 @@ Route104_PrettyPetalFlowerShop_EventScript_22A373:: @ 822A373 faceplayer goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_22A3E4 msgbox Route104_PrettyPetalFlowerShop_Text_2A7686, MSGBOX_DEFAULT - goto_if_set FLAG_0x07F, Route104_PrettyPetalFlowerShop_EventScript_22A3B2 - setflag FLAG_0x07F + goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_22A3B2 + setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_2A7706, MSGBOX_YESNO compare VAR_RESULT, 1 call_if_eq Route104_PrettyPetalFlowerShop_EventScript_22A3D2 @@ -68,7 +68,7 @@ Route104_PrettyPetalFlowerShop_Pokemart_22A3FC: @ 822A3FC Route104_PrettyPetalFlowerShop_EventScript_22A40C:: @ 822A40C lock faceplayer - goto_if_unset FLAG_0x05E, Route104_PrettyPetalFlowerShop_EventScript_22A421 + goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_22A421 msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT release end @@ -77,7 +77,7 @@ Route104_PrettyPetalFlowerShop_EventScript_22A421:: @ 822A421 msgbox Route104_PrettyPetalFlowerShop_Text_2A7916, MSGBOX_DEFAULT giveitem_std ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_2A79A6, MSGBOX_DEFAULT - setflag FLAG_0x05E + setflag FLAG_RECEIVED_WAILMER_PAIL release end @@ -85,14 +85,14 @@ Route104_PrettyPetalFlowerShop_EventScript_22A442:: @ 822A442 lock faceplayer dodailyevents - goto_if_set FLAG_0x930, Route104_PrettyPetalFlowerShop_EventScript_22A482 + goto_if_set FLAG_DAILY_FLOWER_SHOP_RECIEVED_BERRY, Route104_PrettyPetalFlowerShop_EventScript_22A482 msgbox Route104_PrettyPetalFlowerShop_Text_2A7A98, MSGBOX_DEFAULT random 8 addvar VAR_RESULT, 133 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_272054 - setflag FLAG_0x930 + setflag FLAG_DAILY_FLOWER_SHOP_RECIEVED_BERRY msgbox Route104_PrettyPetalFlowerShop_Text_2A7AF3, MSGBOX_DEFAULT release end diff --git a/data/maps/Route105/scripts.inc b/data/maps/Route105/scripts.inc index adb8c4f8e..b4213af5b 100644 --- a/data/maps/Route105/scripts.inc +++ b/data/maps/Route105/scripts.inc @@ -5,7 +5,7 @@ Route105_MapScripts:: @ 81EE1DB .byte 0 Route105_MapScript1_1EE1EB: @ 81EE1EB - call_if_unset FLAG_0x0E4, Route105_EventScript_1EE20B + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_1EE20B compare VAR_0x4037, 9 call_if_eq Route105_EventScript_2739AB compare VAR_0x4037, 10 diff --git a/data/maps/Route109/events.inc b/data/maps/Route109/events.inc index 322055874..89ee11bb3 100644 --- a/data/maps/Route109/events.inc +++ b/data/maps/Route109/events.inc @@ -21,7 +21,7 @@ Route109_EventObjects: @ 8528A34 object_event 20, EVENT_OBJ_GFX_ZIGZAGOON_2, 0, 32, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_1EEA18, 0 object_event 21, EVENT_OBJ_GFX_TUBER_F, 0, 17, 13, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 6, Route109_EventScript_1EEBEF, 0 object_event 22, EVENT_OBJ_GFX_TUBER_M, 0, 27, 7, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_LEFT, 1, 1, 1, 4, Route109_EventScript_1EEBD8, 0 - object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_0x474 + object_event 23, EVENT_OBJ_GFX_ITEM_BALL, 0, 25, 6, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route109_EventScript_290D67, FLAG_ITEM_ROUTE_109_POTION object_event 24, EVENT_OBJ_GFX_MAN_5, 0, 17, 56, 3, MOVEMENT_TYPE_WALK_SLOWLY_IN_PLACE_RIGHT, 1, 1, 1, 3, Route109_EventScript_1EEC06, 0 Route109_MapWarps: @ 8528C74 @@ -39,4 +39,3 @@ Route109_MapBGEvents: @ 8528C7C Route109_MapEvents:: @ 8528CDC map_events Route109_EventObjects, Route109_MapWarps, 0x0, Route109_MapBGEvents - diff --git a/data/maps/Route109/scripts.inc b/data/maps/Route109/scripts.inc index 2e588f813..ebf9398d1 100644 --- a/data/maps/Route109/scripts.inc +++ b/data/maps/Route109/scripts.inc @@ -272,7 +272,7 @@ Route109_Movement_1EE90D: @ 81EE90D Route109_EventScript_1EE910:: @ 81EE910 lock faceplayer - goto_if_unset FLAG_0x095, Route109_EventScript_1EE921 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_1EE921 goto Route109_EventScript_1EE93F end @@ -328,7 +328,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 lock faceplayer special GetPlayerBigGuyGirlString - goto_if_set FLAG_0x118, Route109_EventScript_1EE9F2 + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_1EE9F2 msgbox Route109_Text_1EEFDE, MSGBOX_DEFAULT giveitem_std ITEM_SOFT_SAND compare VAR_RESULT, 0 @@ -336,7 +336,7 @@ Route109_EventScript_1EE9B5:: @ 81EE9B5 closemessage applymovement VAR_LAST_TALKED, Route109_Movement_2725A2 waitmovement 0 - setflag FLAG_0x118 + setflag FLAG_RECEIVED_SOFT_SAND release end diff --git a/data/maps/Route109_SeashoreHouse/scripts.inc b/data/maps/Route109_SeashoreHouse/scripts.inc index 3056159cd..951356409 100644 --- a/data/maps/Route109_SeashoreHouse/scripts.inc +++ b/data/maps/Route109_SeashoreHouse/scripts.inc @@ -9,8 +9,8 @@ Route109_SeashoreHouse_MapScript1_2693FA: @ 82693FA Route109_SeashoreHouse_EventScript_2693FE:: @ 82693FE lock faceplayer - goto_if_set FLAG_0x08C, Route109_SeashoreHouse_EventScript_269460 - goto_if_set FLAG_0x08D, Route109_SeashoreHouse_EventScript_269432 + goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_269460 + goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE, Route109_SeashoreHouse_EventScript_269432 goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_269428 msgbox Route109_SeashoreHouse_Text_269555, MSGBOX_DEFAULT setflag FLAG_TEMP_2 @@ -27,7 +27,7 @@ Route109_SeashoreHouse_EventScript_269432:: @ 8269432 giveitem_std ITEM_SODA_POP, 6 compare VAR_RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_269456 - setflag FLAG_0x08C + setflag FLAG_RECEIVED_6_SODA_POP release end @@ -104,7 +104,7 @@ Route109_SeashoreHouse_EventScript_269533:: @ 8269533 goto_if_lt Route109_SeashoreHouse_EventScript_269553 checktrainerflag TRAINER_SIMON goto_if_lt Route109_SeashoreHouse_EventScript_269553 - setflag FLAG_0x08D + setflag FLAG_DEFEATED_SEASHORE_HOUSE release end diff --git a/data/maps/Route110/scripts.inc b/data/maps/Route110/scripts.inc index ba7bced21..c898240b8 100644 --- a/data/maps/Route110/scripts.inc +++ b/data/maps/Route110/scripts.inc @@ -648,7 +648,7 @@ Route110_EventScript_1EF9F7:: @ 81EF9F7 waitfanfare closemessage delay 30 - setflag FLAG_0x119 + setflag FLAG_ENABLE_PROF_BIRCH_MATCH_CALL msgbox Route110_Text_1F0C33, MSGBOX_DEFAULT closemessage compare VAR_0x8008, 1 diff --git a/data/maps/Route110_TrickHousePuzzle7/scripts.inc b/data/maps/Route110_TrickHousePuzzle7/scripts.inc index 76e8ac769..3babdbd45 100644 --- a/data/maps/Route110_TrickHousePuzzle7/scripts.inc +++ b/data/maps/Route110_TrickHousePuzzle7/scripts.inc @@ -10,11 +10,11 @@ Route110_TrickHousePuzzle7_MapScript1_26E0A6: @ 826E0A6 end Route110_TrickHousePuzzle7_EventScript_26E0AC:: @ 826E0AC - call_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E0DA - call_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E0ED - call_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E100 - call_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E113 - call_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E126 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126 return Route110_TrickHousePuzzle7_EventScript_26E0DA:: @ 826E0DA @@ -70,11 +70,11 @@ Route110_TrickHousePuzzle7_EventScript_26E185:: @ 826E185 Route110_TrickHousePuzzle7_MapScript1_26E198: @ 826E198 compare VAR_0x40B6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_26E1B3 - clearflag FLAG_0x0C2 - clearflag FLAG_0x0C3 - clearflag FLAG_0x0C4 - clearflag FLAG_0x0C5 - clearflag FLAG_0x0C6 + 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_26E1B3:: @ 826E1B3 @@ -116,105 +116,105 @@ Route110_TrickHousePuzzle7_EventScript_26E1ED:: @ 826E1ED Route110_TrickHousePuzzle7_EventScript_26E1FE:: @ 826E1FE lockall delay 32 - call_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E0DA - call_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E139 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E0DA + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E139 special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2E9 - goto_if_set FLAG_0x0C2, Route110_TrickHousePuzzle7_EventScript_26E2EE + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2E9 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_26E2EE end Route110_TrickHousePuzzle7_EventScript_26E22D:: @ 826E22D lockall delay 32 - call_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E0ED - call_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E14C + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E0ED + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E14C special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F3 - goto_if_set FLAG_0x0C3, Route110_TrickHousePuzzle7_EventScript_26E2F8 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F3 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_26E2F8 end Route110_TrickHousePuzzle7_EventScript_26E25C:: @ 826E25C lockall delay 32 - call_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E100 - call_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E15F + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E100 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E15F special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E2FD - goto_if_set FLAG_0x0C4, Route110_TrickHousePuzzle7_EventScript_26E302 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E2FD + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_26E302 end Route110_TrickHousePuzzle7_EventScript_26E28B:: @ 826E28B lockall delay 32 - call_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E113 - call_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E172 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E113 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E172 special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E307 - goto_if_set FLAG_0x0C5, Route110_TrickHousePuzzle7_EventScript_26E30C + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E307 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_26E30C end Route110_TrickHousePuzzle7_EventScript_26E2BA:: @ 826E2BA lockall delay 32 - call_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E126 - call_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E185 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E126 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E185 special DrawWholeMapView playse SE_TK_KASYA - goto_if_unset FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E311 - goto_if_set FLAG_0x0C6, Route110_TrickHousePuzzle7_EventScript_26E316 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E311 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_26E316 end Route110_TrickHousePuzzle7_EventScript_26E2E9:: @ 826E2E9 - setflag FLAG_0x0C2 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_26E2EE:: @ 826E2EE - clearflag FLAG_0x0C2 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_26E2F3:: @ 826E2F3 - setflag FLAG_0x0C3 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_26E2F8:: @ 826E2F8 - clearflag FLAG_0x0C3 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_26E2FD:: @ 826E2FD - setflag FLAG_0x0C4 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_26E302:: @ 826E302 - clearflag FLAG_0x0C4 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_26E307:: @ 826E307 - setflag FLAG_0x0C5 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_26E30C:: @ 826E30C - clearflag FLAG_0x0C5 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_26E311:: @ 826E311 - setflag FLAG_0x0C6 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end Route110_TrickHousePuzzle7_EventScript_26E316:: @ 826E316 - clearflag FLAG_0x0C6 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end diff --git a/data/maps/Route111/scripts.inc b/data/maps/Route111/scripts.inc index 6b8763fd7..7ea8b2bf2 100644 --- a/data/maps/Route111/scripts.inc +++ b/data/maps/Route111/scripts.inc @@ -6,7 +6,7 @@ Route111_MapScripts:: @ 81F0CA7 .byte 0 Route111_MapScript1_1F0CBC: @ 81F0CBC - call_if_unset FLAG_0x0E4, Route111_EventScript_1F0CD1 + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_1F0CD1 compare VAR_0x40CB, 1 call_if_eq Route111_EventScript_1F0CE4 end @@ -136,7 +136,7 @@ Route111_EventScript_1F0E60:: @ 81F0E60 waitstate setvar VAR_0x40CB, 2 clearflag FLAG_HIDE_DESERT_UNDERPASS_FOSSIL - goto_if_set FLAG_0x150, Route111_EventScript_1F0EA7 + goto_if_set FLAG_CHOSE_ROOT_FOSSIL, Route111_EventScript_1F0EA7 msgbox Route111_Text_1F1C74, MSGBOX_DEFAULT releaseall end @@ -160,12 +160,12 @@ Route111_EventScript_1F0EB9:: @ 81F0EB9 lock faceplayer dodailyevents - goto_if_set FLAG_0x92C, Route111_EventScript_1F0EF4 + goto_if_set FLAG_DAILY_ROUTE_111_RECIEVED_BERRY, Route111_EventScript_1F0EF4 msgbox Route111_Text_2A6EBD, MSGBOX_DEFAULT giveitem_std ITEM_RAZZ_BERRY compare VAR_RESULT, 0 goto_if_eq Route111_EventScript_272054 - setflag FLAG_0x92C + setflag FLAG_DAILY_ROUTE_111_RECIEVED_BERRY special GetPlayerBigGuyGirlString msgbox Route111_Text_2A6F3D, MSGBOX_DEFAULT release diff --git a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc index cd862b7e3..b54fe564e 100644 --- a/data/maps/Route111_WinstrateFamilysHouse/scripts.inc +++ b/data/maps/Route111_WinstrateFamilysHouse/scripts.inc @@ -13,12 +13,12 @@ Route111_WinstrateFamilysHouse_EventScript_22A4A2:: @ 822A4A2 lock faceplayer setvar VAR_0x8008, 3 - goto_if_set FLAG_0x115, Route111_WinstrateFamilysHouse_EventScript_22A4DA + goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_22A4DA msgbox Route111_WinstrateFamilysHouse_Text_22A5F4, MSGBOX_DEFAULT giveitem_std ITEM_MACHO_BRACE compare VAR_RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_272054 - setflag FLAG_0x115 + setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_22A52C end diff --git a/data/maps/Route114/scripts.inc b/data/maps/Route114/scripts.inc index b66b54910..b02e532d0 100644 --- a/data/maps/Route114/scripts.inc +++ b/data/maps/Route114/scripts.inc @@ -28,7 +28,7 @@ Route114_EventScript_1F2582:: @ 81F2582 lock faceplayer dodailyevents - goto_if_set FLAG_0x92B, Route114_EventScript_1F25C7 + goto_if_set FLAG_DAILY_ROUTE_114_RECIEVED_BERRY, Route114_EventScript_1F25C7 msgbox Route114_Text_2A6FCB, MSGBOX_DEFAULT random 5 addvar VAR_RESULT, 15 @@ -36,7 +36,7 @@ Route114_EventScript_1F2582:: @ 81F2582 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_272054 - setflag FLAG_0x92B + setflag FLAG_DAILY_ROUTE_114_RECIEVED_BERRY msgbox Route114_Text_2A7034, MSGBOX_DEFAULT release end @@ -49,12 +49,12 @@ Route114_EventScript_1F25C7:: @ 81F25C7 Route114_EventScript_1F25D1:: @ 81F25D1 lock faceplayer - goto_if_set FLAG_0x0E7, Route114_EventScript_1F2608 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1F2608 msgbox Route114_Text_1F2809, MSGBOX_DEFAULT giveitem_std ITEM_TM05 compare VAR_RESULT, 0 goto_if_eq Route114_EventScript_272054 - setflag FLAG_0x0E7 + setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1F2872, MSGBOX_DEFAULT release end diff --git a/data/maps/Route114_FossilManiacsHouse/scripts.inc b/data/maps/Route114_FossilManiacsHouse/scripts.inc index 4985089c2..e229c756d 100644 --- a/data/maps/Route114_FossilManiacsHouse/scripts.inc +++ b/data/maps/Route114_FossilManiacsHouse/scripts.inc @@ -9,12 +9,12 @@ Route114_FossilManiacsHouse_MapScript1_22AD36: @ 822AD36 Route114_FossilManiacsHouse_EventScript_22AD3A:: @ 822AD3A lock faceplayer - goto_if_set FLAG_0x105, Route114_FossilManiacsHouse_EventScript_22AD69 + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_22AD69 msgbox Route114_FossilManiacsHouse_Text_22AD85, MSGBOX_DEFAULT giveitem_std ITEM_TM28 compare VAR_RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_272054 - setflag FLAG_0x105 + setflag FLAG_RECEIVED_TM28 release end diff --git a/data/maps/Route114_FossilManiacsTunnel/scripts.inc b/data/maps/Route114_FossilManiacsTunnel/scripts.inc index 850e970e3..b98fd3321 100644 --- a/data/maps/Route114_FossilManiacsTunnel/scripts.inc +++ b/data/maps/Route114_FossilManiacsTunnel/scripts.inc @@ -34,7 +34,7 @@ Route114_FossilManiacsTunnel_EventScript_22AF66:: @ 822AF66 Route114_FossilManiacsTunnel_EventScript_22AF87:: @ 822AF87 lock faceplayer - goto_if_set FLAG_0x10B, Route114_FossilManiacsTunnel_EventScript_22AFC6 + goto_if_set FLAG_RECEIVED_REVIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_22AFC6 checkitem ITEM_ROOT_FOSSIL, 1 compare VAR_RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_22AFBC diff --git a/data/maps/Route114_LanettesHouse/scripts.inc b/data/maps/Route114_LanettesHouse/scripts.inc index 984bca574..b54365523 100644 --- a/data/maps/Route114_LanettesHouse/scripts.inc +++ b/data/maps/Route114_LanettesHouse/scripts.inc @@ -9,13 +9,13 @@ Route114_LanettesHouse_MapScript1_22B2CE: @ 822B2CE Route114_LanettesHouse_EventScript_22B2D2:: @ 822B2D2 lock faceplayer - goto_if_set FLAG_0x083, Route114_LanettesHouse_EventScript_22B2FF + goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_22B2FF setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_22B34E, MSGBOX_DEFAULT givedecoration_std 99 compare VAR_RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_272067 - setflag FLAG_0x083 + setflag FLAG_RECEIVED_DOLL_LANETTE release end diff --git a/data/maps/Route116/scripts.inc b/data/maps/Route116/scripts.inc index 519bc0447..623c74e3c 100644 --- a/data/maps/Route116/scripts.inc +++ b/data/maps/Route116/scripts.inc @@ -5,7 +5,7 @@ Route116_MapScripts:: @ 81F2C0C .byte 0 Route116_MapScript1_1F2C1C: @ 81F2C1C - call_if_set FLAG_0x08F, Route116_EventScript_1F2C47 + call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C47 compare VAR_0x4039, 1 call_if_eq Route116_EventScript_273D13 compare VAR_0x4037, 5 @@ -32,8 +32,8 @@ Route116_MapScript2_1F2C66: @ 81F2C66 Route116_EventScript_1F2C70:: @ 81F2C70 lock faceplayer - goto_if_set FLAG_0x08F, Route116_EventScript_1F2C8E - goto_if_set FLAG_0x08E, Route116_EventScript_1F2C98 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_1F2C8E + goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_1F2C98 msgbox Route116_Text_1F3140, MSGBOX_DEFAULT release end @@ -51,13 +51,13 @@ Route116_EventScript_1F2C98:: @ 81F2C98 Route116_EventScript_1F2CA2:: @ 81F2CA2 lock faceplayer - goto_if_set FLAG_0x11F, Route116_EventScript_1F2D2B + goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_1F2D2B msgbox Route116_Text_1F3317, MSGBOX_DEFAULT goto Route116_EventScript_1F2CBB end Route116_EventScript_1F2CBB:: @ 81F2CBB - setflag FLAG_0x11F + setflag FLAG_MET_DEVON_EMPLOYEE giveitem_std ITEM_REPEAT_BALL compare VAR_RESULT, 0 goto_if_eq Route116_EventScript_1F2D39 @@ -73,7 +73,7 @@ Route116_EventScript_1F2CBB:: @ 81F2CBB call_if_eq Route116_EventScript_1F2D20 removeobject VAR_LAST_TALKED clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE - setflag FLAG_0x100 + setflag FLAG_RECEIVED_REPEAT_BALL release end diff --git a/data/maps/Route118/scripts.inc b/data/maps/Route118/scripts.inc index 91067e786..45b8665b0 100644 --- a/data/maps/Route118/scripts.inc +++ b/data/maps/Route118/scripts.inc @@ -28,7 +28,7 @@ Route118_MapScript2_1F3E0A: @ 81F3E0A Route118_EventScript_1F3E14:: @ 81F3E14 lock faceplayer - goto_if_set FLAG_0x0E3, Route118_EventScript_1F3E69 + goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_1F3E69 msgbox Route118_Text_1F427B, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq Route118_EventScript_1F3E3E @@ -39,7 +39,7 @@ Route118_EventScript_1F3E14:: @ 81F3E14 Route118_EventScript_1F3E3E:: @ 81F3E3E msgbox Route118_Text_1F42AF, MSGBOX_DEFAULT giveitem_std ITEM_GOOD_ROD - setflag FLAG_0x0E3 + setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_1F42E7, MSGBOX_DEFAULT release end diff --git a/data/maps/Route119/scripts.inc b/data/maps/Route119/scripts.inc index 229db6da5..1aeb33ec5 100644 --- a/data/maps/Route119/scripts.inc +++ b/data/maps/Route119/scripts.inc @@ -139,7 +139,7 @@ Route119_EventScript_1F45E4:: @ 81F45E4 Route119_EventScript_1F45FF:: @ 81F45FF giveitem_std ITEM_HM02 - setflag FLAG_0x06E + setflag FLAG_RECEIVED_HM02 return Route119_EventScript_1F460F:: @ 81F460F @@ -490,7 +490,7 @@ Route119_EventScript_1F49EC:: @ 81F49EC lockall pokenavcall Route119_Text_1F4FBA waitmessage - clearflag FLAG_0x08A + clearflag FLAG_REGISTER_WINONA_POKENAV addvar VAR_0x40D1, 1 releaseall end diff --git a/data/maps/Route119_WeatherInstitute_1F/scripts.inc b/data/maps/Route119_WeatherInstitute_1F/scripts.inc index b0426ea2e..8dada27e8 100644 --- a/data/maps/Route119_WeatherInstitute_1F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_1F/scripts.inc @@ -32,8 +32,8 @@ Route119_WeatherInstitute_1F_EventScript_26FAC8:: @ 826FAC8 faceplayer goto_if_unset FLAG_SYS_GAME_CLEAR, Route119_WeatherInstitute_1F_EventScript_26FB05 setvar VAR_0x8004, 0 - call_if_set FLAG_0x1BE, Route119_WeatherInstitute_1F_EventScript_26FAFF - call_if_set FLAG_0x1BF, Route119_WeatherInstitute_1F_EventScript_26FAFF + call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_1F_EventScript_26FAFF + call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_1F_EventScript_26FAFF compare VAR_0x8004, 2 goto_if_eq Route119_WeatherInstitute_1F_EventScript_26FB05 msgbox Route119_WeatherInstitute_1F_Text_26FDE8, MSGBOX_DEFAULT diff --git a/data/maps/Route119_WeatherInstitute_2F/scripts.inc b/data/maps/Route119_WeatherInstitute_2F/scripts.inc index 6d54e62ad..e7d2cb03d 100644 --- a/data/maps/Route119_WeatherInstitute_2F/scripts.inc +++ b/data/maps/Route119_WeatherInstitute_2F/scripts.inc @@ -126,7 +126,7 @@ Route119_WeatherInstitute_2F_EventScript_2700DB:: @ 82700DB Route119_WeatherInstitute_2F_EventScript_2700EA:: @ 82700EA msgbox Route119_WeatherInstitute_2F_Text_2706FE, MSGBOX_DEFAULT - setflag FLAG_0x097 + setflag FLAG_RECEIVED_CASTFORM release end @@ -138,8 +138,8 @@ Route119_WeatherInstitute_2F_EventScript_2700F7:: @ 82700F7 Route119_WeatherInstitute_2F_EventScript_27010A:: @ 827010A setvar VAR_0x8004, 0 - call_if_set FLAG_0x1BE, Route119_WeatherInstitute_2F_EventScript_270160 - call_if_set FLAG_0x1BF, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_DEFEATED_KYOGRE, Route119_WeatherInstitute_2F_EventScript_270160 + call_if_set FLAG_DEFEATED_GROUDON, Route119_WeatherInstitute_2F_EventScript_270160 compare VAR_0x8004, 2 goto_if_eq Route119_WeatherInstitute_2F_EventScript_270166 call_if_unset FLAG_TEMP_2, Route119_WeatherInstitute_2F_EventScript_270159 @@ -207,7 +207,7 @@ Route119_WeatherInstitute_2F_Movement_270187: @ 8270187 Route119_WeatherInstitute_2F_EventScript_27018B:: @ 827018B lock faceplayer - goto_if_set FLAG_0x097, Route119_WeatherInstitute_2F_EventScript_2700F7 + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_2700F7 goto Route119_WeatherInstitute_2F_EventScript_27004D end diff --git a/data/maps/Route120/events.inc b/data/maps/Route120/events.inc index 4400081f7..24b289060 100644 --- a/data/maps/Route120/events.inc +++ b/data/maps/Route120/events.inc @@ -29,7 +29,7 @@ Route120_EventObjects: @ 852B3F8 object_event 28, EVENT_OBJ_GFX_ITEM_BALL, 0, 22, 13, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F6F, FLAG_ITEM_ROUTE_120_NEST_BALL object_event 29, EVENT_OBJ_GFX_ITEM_BALL, 0, 23, 82, 5, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_290F62, FLAG_ITEM_ROUTE_120_HYPER_POTION object_event 30, EVENT_OBJ_GFX_KECLEON_1, 0, 12, 16, 4, MOVEMENT_TYPE_INVISIBLE, 1, 1, 0, 0, Route120_EventScript_1F57BC, FLAG_HIDE_ROUTE_120_KECLEON_1 - object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_0x3CC + object_event 31, EVENT_OBJ_GFX_STEVEN, 0, 13, 15, 4, MOVEMENT_TYPE_FACE_DOWN, 1, 1, 0, 0, Route120_EventScript_1F5641, FLAG_HIDE_ROUTE_120_STEVEN object_event 32, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 20, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_14 object_event 33, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 15, 1, 3, MOVEMENT_TYPE_LOOK_AROUND, 1, 1, 0, 0, Route120_EventScript_2906BB, FLAG_TEMP_12 object_event 34, EVENT_OBJ_GFX_NINJA_BOY, 0, 10, 72, 3, MOVEMENT_TYPE_MOUNTAIN_DISGUISE, 1, 1, 1, 3, Route120_EventScript_1F593C, 0 diff --git a/data/maps/Route120/scripts.inc b/data/maps/Route120/scripts.inc index cde0fbbd3..7a184327e 100644 --- a/data/maps/Route120/scripts.inc +++ b/data/maps/Route120/scripts.inc @@ -39,9 +39,9 @@ Route120_EventScript_1F5460:: @ 81F5460 return Route120_MapScript1_1F5474: @ 81F5474 - call_if_unset FLAG_0x0E4, Route120_EventScript_1F5490 - call_if_set FLAG_0x11D, Route120_EventScript_1F54A3 - call_if_unset FLAG_0x11D, Route120_EventScript_1F54C8 + call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1F5490 + call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54A3 + call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1F54C8 end Route120_EventScript_1F5490:: @ 81F5490 @@ -99,7 +99,7 @@ Route120_EventScript_1F5527:: @ 81F5527 lock faceplayer dodailyevents - goto_if_set FLAG_0x92E, Route120_EventScript_1F5625 + goto_if_set FLAG_DAILY_ROUTE_120_RECIEVED_BERRY, Route120_EventScript_1F5625 msgbox Route120_Text_2A70C7, MSGBOX_YESNO compare VAR_RESULT, 1 call_if_eq Route120_EventScript_1F562F @@ -148,7 +148,7 @@ Route120_EventScript_1F5601:: @ 81F5601 giveitem_std VAR_0x8004 compare VAR_RESULT, 0 goto_if_eq Route120_EventScript_272054 - setflag FLAG_0x92E + setflag FLAG_DAILY_ROUTE_120_RECIEVED_BERRY msgbox Route120_Text_2A71D5, MSGBOX_DEFAULT release end @@ -169,7 +169,7 @@ Route120_EventScript_1F5638:: @ 81F5638 Route120_EventScript_1F5641:: @ 81F5641 lock faceplayer - goto_if_set FLAG_0x122, Route120_EventScript_1F5672 + goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE_120, Route120_EventScript_1F5672 msgbox Route120_Text_1F5998, MSGBOX_YESNO compare VAR_RESULT, 0 goto_if_eq Route120_EventScript_1F5665 @@ -178,7 +178,7 @@ Route120_EventScript_1F5641:: @ 81F5641 Route120_EventScript_1F5665:: @ 81F5665 msgbox Route120_Text_1F5AAC, MSGBOX_DEFAULT - setflag FLAG_0x122 + setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE_120 release end @@ -238,7 +238,7 @@ Route120_EventScript_1F572C:: @ 81F572C waitmovement 0 msgbox Route120_Text_1F5BAF, MSGBOX_DEFAULT giveitem_std ITEM_DEVON_SCOPE - setflag FLAG_0x11D + setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_1F5C7B, MSGBOX_DEFAULT closemessage applymovement 31, Route120_Movement_2725AA diff --git a/data/maps/Route121/events.inc b/data/maps/Route121/events.inc index 4f27079a6..432071ed1 100644 --- a/data/maps/Route121/events.inc +++ b/data/maps/Route121/events.inc @@ -10,9 +10,9 @@ Route121_EventObjects: @ 852BA14 object_event 9, EVENT_OBJ_GFX_BERRY_TREE, 0, 67, 14, 3, MOVEMENT_TYPE_BERRY_TREE_GROWTH, 0, 0, 0, 54, BerryTreeScript, 0 object_event 10, EVENT_OBJ_GFX_LASS, 0, 39, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F04, 0 object_event 11, EVENT_OBJ_GFX_LASS, 0, 40, 9, 3, MOVEMENT_TYPE_FACE_DOWN, 0, 0, 1, 1, Route121_EventScript_1F5F1F, 0 - object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_0x392 - object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_0x392 - object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_0x392 + object_event 12, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 8, 3, MOVEMENT_TYPE_FACE_UP, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS + object_event 13, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 30, 7, 3, MOVEMENT_TYPE_FACE_RIGHT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS + object_event 14, EVENT_OBJ_GFX_AQUA_MEMBER_M, 0, 31, 7, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 0, 0, 0x0, FLAG_HIDE_ROUTE_121_TEAM_AQUA_GRUNTS object_event 15, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 32, 5, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_11 object_event 16, EVENT_OBJ_GFX_CUTTABLE_TREE, 0, 65, 4, 3, MOVEMENT_TYPE_LOOK_AROUND, 0, 0, 0, 0, Route121_EventScript_2906BB, FLAG_TEMP_12 object_event 17, EVENT_OBJ_GFX_POKEFAN_F, 0, 63, 5, 3, MOVEMENT_TYPE_FACE_LEFT, 0, 0, 1, 4, Route121_EventScript_1F5E74, 0 diff --git a/data/maps/Route121_SafariZoneEntrance/scripts.inc b/data/maps/Route121_SafariZoneEntrance/scripts.inc index 4a26d8075..d4ef73f9b 100644 --- a/data/maps/Route121_SafariZoneEntrance/scripts.inc +++ b/data/maps/Route121_SafariZoneEntrance/scripts.inc @@ -82,7 +82,7 @@ Route121_SafariZoneEntrance_EventScript_22BC48:: @ 822BC48 waitmovement 0 special EnterSafariMode setvar VAR_0x40A4, 2 - clearflag FLAG_0x05D + clearflag FLAG_GOOD_LUCK_SAFARI_ZONE warp MAP_SAFARI_ZONE_SOUTH, 255, 32, 33 waitstate end diff --git a/data/maps/Route123/scripts.inc b/data/maps/Route123/scripts.inc index d56a543da..86a6e767e 100644 --- a/data/maps/Route123/scripts.inc +++ b/data/maps/Route123/scripts.inc @@ -9,7 +9,7 @@ Route123_MapScript1_1F614D: @ 81F614D Route123_EventScript_1F6151:: @ 81F6151 lock faceplayer - goto_if_set FLAG_0x0E8, Route123_EventScript_1F61A0 + goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_1F61A0 msgbox Route123_Text_1F641E, MSGBOX_DEFAULT special IsGrassTypeInParty compare VAR_RESULT, 0 @@ -18,7 +18,7 @@ Route123_EventScript_1F6151:: @ 81F6151 giveitem_std ITEM_TM19 compare VAR_RESULT, 0 goto_if_eq Route123_EventScript_272054 - setflag FLAG_0x0E8 + setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_1F64CF, MSGBOX_DEFAULT release end diff --git a/data/maps/Route123_BerryMastersHouse/scripts.inc b/data/maps/Route123_BerryMastersHouse/scripts.inc index a10bf7664..00606e18a 100644 --- a/data/maps/Route123_BerryMastersHouse/scripts.inc +++ b/data/maps/Route123_BerryMastersHouse/scripts.inc @@ -10,7 +10,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 lock faceplayer dodailyevents - goto_if_set FLAG_0x92D, Route123_BerryMastersHouse_EventScript_26F8B6 + goto_if_set FLAG_DAILY_BERRY_MASTER_RECIEVED_BERRY, Route123_BerryMastersHouse_EventScript_26F8B6 msgbox Route123_BerryMastersHouse_Text_2A7386, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 @@ -18,7 +18,7 @@ Route123_BerryMastersHouse_EventScript_26F845:: @ 826F845 giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x92D + setflag FLAG_DAILY_BERRY_MASTER_RECIEVED_BERRY msgbox Route123_BerryMastersHouse_Text_2A7428, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 @@ -39,7 +39,7 @@ Route123_BerryMastersHouse_EventScript_26F8C0:: @ 826F8C0 lock faceplayer dodailyevents - goto_if_set FLAG_0x931, Route123_BerryMastersHouse_EventScript_26FA6F + goto_if_set FLAG_DAILY_BERRY_MASTERS_WIFE, Route123_BerryMastersHouse_EventScript_26FA6F msgbox Route123_BerryMastersHouse_Text_2A74E6, MSGBOX_DEFAULT setvar VAR_0x8004, 13 call Route123_BerryMastersHouse_EventScript_271E7C @@ -84,52 +84,52 @@ Route123_BerryMastersHouse_EventScript_26F94C:: @ 826F94C end Route123_BerryMastersHouse_EventScript_26F97A:: @ 826F97A - goto_if_set FLAG_0x0F8, Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_SPELON_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0F8 + setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26F9AB:: @ 826F9AB - goto_if_set FLAG_0x0F9, Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_PAMTRE_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0F9 + setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26F9DC:: @ 826F9DC - goto_if_set FLAG_0x0FA, Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_WATMEL_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0FA + setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26FA0D:: @ 826FA0D - goto_if_set FLAG_0x0FB, Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_DURIN_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0FB + setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end Route123_BerryMastersHouse_EventScript_26FA3E:: @ 826FA3E - goto_if_set FLAG_0x0FC, Route123_BerryMastersHouse_EventScript_26F94C + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_26F94C msgbox Route123_BerryMastersHouse_Text_2A7583, MSGBOX_DEFAULT giveitem_std ITEM_BELUE_BERRY compare VAR_RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_272054 - setflag FLAG_0x0FC + setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_26FA79 end @@ -139,7 +139,7 @@ Route123_BerryMastersHouse_EventScript_26FA6F:: @ 826FA6F end Route123_BerryMastersHouse_EventScript_26FA79:: @ 826FA79 - setflag FLAG_0x931 + setflag FLAG_DAILY_BERRY_MASTERS_WIFE msgbox Route123_BerryMastersHouse_Text_2A761B, MSGBOX_DEFAULT release end diff --git a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc index 4fa64e6b9..934c6757d 100644 --- a/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc +++ b/data/maps/Route124_DivingTreasureHuntersHouse/scripts.inc @@ -9,9 +9,9 @@ Route124_DivingTreasureHuntersHouse_MapScript1_270A2E: @ 8270A2E Route124_DivingTreasureHuntersHouse_EventScript_270A32:: @ 8270A32 lock faceplayer - goto_if_set FLAG_0x0D9, Route124_DivingTreasureHuntersHouse_EventScript_270A4E + goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_270A4E msgbox Route124_DivingTreasureHuntersHouse_Text_270F6C, MSGBOX_DEFAULT - setflag FLAG_0x0D9 + setflag FLAG_MET_DIVING_TREASURE_HUNTER goto Route124_DivingTreasureHuntersHouse_EventScript_270A5C end diff --git a/data/maps/RustboroCity/scripts.inc b/data/maps/RustboroCity/scripts.inc index 941f73161..d78777c75 100644 --- a/data/maps/RustboroCity/scripts.inc +++ b/data/maps/RustboroCity/scripts.inc @@ -77,7 +77,7 @@ RustboroCity_EventScript_1E07AC:: @ 81E07AC goto RustboroCity_EventScript_1E07BD RustboroCity_EventScript_1E07BD:: @ 81E07BD - setflag FLAG_0x130 + setflag FLAG_ADDED_MATCH_CALL_TO_POKENAV special sp106_CreateStartMenu waitstate switch VAR_RESULT @@ -134,7 +134,7 @@ RustboroCity_Movement_1E085D: @ 81E085D RustboroCity_EventScript_1E085F:: @ 81E085F lock faceplayer - goto_if_set FLAG_0x08E, RustboroCity_EventScript_1E0874 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_1E0874 msgbox RustboroCity_Text_1E123F, MSGBOX_DEFAULT release end @@ -171,7 +171,7 @@ RustboroCity_EventScript_1E08A8:: @ 81E08A8 RustboroCity_EventScript_1E08B2:: @ 81E08B2 lock faceplayer - goto_if_set FLAG_0x0BC, RustboroCity_EventScript_1E08C7 + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_1E08C7 msgbox RustboroCity_Text_1E1520, MSGBOX_DEFAULT release end @@ -301,7 +301,7 @@ RustboroCity_EventScript_1E09CD:: @ 81E09CD removeobject 9 setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 - setflag FLAG_0x08E + setflag FLAG_DEVON_GOODS_STOLEN setvar VAR_0x405A, 2 setvar VAR_RUSTURF_TUNNEL_STATE, 2 setvar VAR_0x406F, 1 @@ -448,7 +448,7 @@ RustboroCity_Movement_1E0AD5: @ 81E0AD5 RustboroCity_EventScript_1E0ADD:: @ 81E0ADD lock faceplayer - goto_if_set FLAG_0x08F, RustboroCity_EventScript_1E0AF2 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_1E0AF2 msgbox RustboroCity_Text_1E1904, MSGBOX_DEFAULT release end @@ -492,7 +492,7 @@ RustboroCity_EventScript_1E0B2E:: @ 81E0B2E call_if_eq RustboroCity_EventScript_1E0BC7 compare VAR_TEMP_1, 3 call_if_eq RustboroCity_EventScript_1E0BF3 - setflag FLAG_0x09F + setflag FLAG_INTERACTED_WITH_DEVON_EMPLOYEE_GOODS_STOLEN setvar VAR_0x405A, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_1E183E, MSGBOX_DEFAULT @@ -594,7 +594,7 @@ RustboroCity_EventScript_1E0C5B:: @ 81E0C5B call_if_eq RustboroCity_EventScript_1E0CD3 msgbox RustboroCity_Text_1E1A21, MSGBOX_DEFAULT closemessage - setflag FLAG_0x090 + setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_EMPLOYEE_1 setvar VAR_0x405A, 5 delay 30 @@ -669,7 +669,7 @@ RustboroCity_EventScript_1E0D96:: @ 81E0D96 RustboroCity_EventScript_1E0DB8:: @ 81E0DB8 lockall - call_if_unset FLAG_0x120, RustboroCity_EventScript_1E0DD1 + call_if_unset FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E0DD1 applymovement 14, RustboroCity_Movement_27259E waitmovement 0 goto RustboroCity_EventScript_1E0FF3 @@ -828,9 +828,9 @@ RustboroCity_EventScript_1E0FF3:: @ 81E0FF3 end RustboroCity_EventScript_1E100B:: @ 81E100B - goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E10C1 - goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1070 - setflag FLAG_0x120 + goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E10C1 + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1070 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_1E1A49, MSGBOX_DEFAULT closemessage delay 30 @@ -839,7 +839,7 @@ RustboroCity_EventScript_1E100B:: @ 81E100B waitfanfare closemessage delay 30 - setflag FLAG_0x0FD + setflag FLAG_ENABLE_RIVAL_MATCH_CALL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 setvar VAR_0x8008, 0 @@ -882,26 +882,26 @@ RustboroCity_EventScript_1E10D6:: @ 81E10D6 RustboroCity_EventScript_1E10DB:: @ 81E10DB trainerbattle_no_intro TRAINER_MAY_14, RustboroCity_Text_1E1CC1 - setflag FLAG_0x0D3 + setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E10EE:: @ 81E10EE trainerbattle_no_intro TRAINER_MAY_15, RustboroCity_Text_1E1CC1 - setflag FLAG_0x0D3 + setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E1101:: @ 81E1101 trainerbattle_no_intro TRAINER_MAY_10, RustboroCity_Text_1E1CC1 - setflag FLAG_0x0D3 + setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_1E10C1 end RustboroCity_EventScript_1E1114:: @ 81E1114 - goto_if_set FLAG_0x0D3, RustboroCity_EventScript_1E11C0 - goto_if_set FLAG_0x120, RustboroCity_EventScript_1E1174 - setflag FLAG_0x120 + goto_if_set FLAG_DEFEATED_RIVAL_RUSTBORO, RustboroCity_EventScript_1E11C0 + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_1E1174 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_1E1D7D, MSGBOX_DEFAULT closemessage delay 30 @@ -910,7 +910,7 @@ RustboroCity_EventScript_1E1114:: @ 81E1114 waitfanfare closemessage delay 30 - setflag FLAG_0x0FD + setflag FLAG_ENABLE_RIVAL_MATCH_CALL setvar VAR_0x405A, 8 setvar VAR_0x4063, 2 msgbox RustboroCity_Text_1E1E34, MSGBOX_YESNO @@ -946,19 +946,19 @@ RustboroCity_EventScript_1E11C0:: @ 81E11C0 RustboroCity_EventScript_1E11D5:: @ 81E11D5 trainerbattle_no_intro TRAINER_BRENDAN_10, RustboroCity_Text_1E1FE9 - setflag FLAG_0x0D3 + setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11E8:: @ 81E11E8 trainerbattle_no_intro TRAINER_BRENDAN_12, RustboroCity_Text_1E1FE9 - setflag FLAG_0x0D3 + setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_1E11C0 end RustboroCity_EventScript_1E11FB:: @ 81E11FB trainerbattle_no_intro TRAINER_BRENDAN_11, RustboroCity_Text_1E1FE9 - setflag FLAG_0x0D3 + setflag FLAG_DEFEATED_RIVAL_RUSTBORO goto RustboroCity_EventScript_1E11C0 end @@ -1298,4 +1298,3 @@ RustboroCity_Text_1E249D: @ 81E249D .string "they'll both challenge you.\p" .string "Don't you think it'd be cool if you\n" .string "could beat two TRAINERS by yourself?$" - diff --git a/data/maps/RustboroCity_CuttersHouse/scripts.inc b/data/maps/RustboroCity_CuttersHouse/scripts.inc index b73744094..ab74d5340 100644 --- a/data/maps/RustboroCity_CuttersHouse/scripts.inc +++ b/data/maps/RustboroCity_CuttersHouse/scripts.inc @@ -4,10 +4,10 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8215BD3 RustboroCity_CuttersHouse_EventScript_215BD4:: @ 8215BD4 lock faceplayer - goto_if_set FLAG_0x089, RustboroCity_CuttersHouse_EventScript_215C00 + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_215C00 msgbox RustboroCity_CuttersHouse_Text_215C13, MSGBOX_DEFAULT giveitem_std ITEM_HM01 - setflag FLAG_0x089 + setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_215D33, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc index bbfd1bd53..157947c2d 100644 --- a/data/maps/RustboroCity_DevonCorp_1F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_1F/scripts.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8211245 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_21124B: @ 821124B - call_if_unset FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_211255 + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211255 end RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 @@ -14,8 +14,8 @@ RustboroCity_DevonCorp_1F_EventScript_211255:: @ 8211255 RustboroCity_DevonCorp_1F_EventScript_211261:: @ 8211261 lock faceplayer - goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_211289 - goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_21127F + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_211289 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_21127F msgbox RustboroCity_DevonCorp_1F_Text_2113D1, MSGBOX_DEFAULT release end @@ -33,9 +33,9 @@ RustboroCity_DevonCorp_1F_EventScript_211289:: @ 8211289 RustboroCity_DevonCorp_1F_EventScript_211293:: @ 8211293 lock faceplayer - goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_2112BA - goto_if_set FLAG_0x08F, RustboroCity_DevonCorp_1F_EventScript_2112C4 - goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_2112C4 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112BA + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112C4 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112C4 msgbox RustboroCity_DevonCorp_1F_Text_21151B, MSGBOX_DEFAULT release end @@ -53,9 +53,9 @@ RustboroCity_DevonCorp_1F_EventScript_2112C4:: @ 82112C4 RustboroCity_DevonCorp_1F_EventScript_2112CE:: @ 82112CE lock faceplayer - goto_if_set FLAG_0x090, RustboroCity_DevonCorp_1F_EventScript_2112F5 - goto_if_set FLAG_0x08F, RustboroCity_DevonCorp_1F_EventScript_2112FF - goto_if_set FLAG_0x08E, RustboroCity_DevonCorp_1F_EventScript_2112FF + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112F5 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_2112FF + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_2112FF msgbox RustboroCity_DevonCorp_1F_Text_21131B, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc index 8ce86352d..cce9ae394 100644 --- a/data/maps/RustboroCity_DevonCorp_2F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_2F/scripts.inc @@ -25,7 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_211886:: @ 8211886 faceplayer compare VAR_0x40C4, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - goto_if_set FLAG_0x11F, RustboroCity_DevonCorp_2F_EventScript_2118A6 + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_2118A6 msgbox RustboroCity_DevonCorp_2F_Text_211C50, MSGBOX_DEFAULT release end @@ -40,7 +40,7 @@ RustboroCity_DevonCorp_2F_EventScript_2118B0:: @ 82118B0 faceplayer compare VAR_0x40C4, 1 call_if_eq RustboroCity_DevonCorp_2F_EventScript_211869 - goto_if_set FLAG_0x0BC, RustboroCity_DevonCorp_2F_EventScript_2118D0 + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_2118D0 msgbox RustboroCity_DevonCorp_2F_Text_211D9F, MSGBOX_DEFAULT release end @@ -200,7 +200,7 @@ RustboroCity_DevonCorp_2F_EventScript_211AC4:: @ 8211AC4 RustboroCity_DevonCorp_2F_EventScript_211AD7:: @ 8211AD7 setvar VAR_0x40C4, 0 - setflag FLAG_0x10B + setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end @@ -249,7 +249,7 @@ RustboroCity_DevonCorp_2F_EventScript_211B67:: @ 8211B67 RustboroCity_DevonCorp_2F_EventScript_211B7A:: @ 8211B7A setvar VAR_0x40C4, 0 - setflag FLAG_0x10B + setflag FLAG_RECEIVED_REVIVED_FOSSIL_MON release end diff --git a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc index 0e21b4c38..da78ccb4b 100644 --- a/data/maps/RustboroCity_DevonCorp_3F/scripts.inc +++ b/data/maps/RustboroCity_DevonCorp_3F/scripts.inc @@ -54,7 +54,7 @@ RustboroCity_DevonCorp_3F_EventScript_21246E:: @ 821246E message RustboroCity_DevonCorp_3F_Text_212820 waitfanfare setflag FLAG_SYS_POKENAV_GET - setflag FLAG_0x0BC + setflag FLAG_RECEIVED_POKENAV setflag FLAG_HIDE_RUSTBORO_CITY_POKEMON_SCHOOL_SCOTT msgbox RustboroCity_DevonCorp_3F_Text_212837, MSGBOX_DEFAULT closemessage @@ -150,8 +150,8 @@ RustboroCity_DevonCorp_3F_Movement_212566: @ 8212566 RustboroCity_DevonCorp_3F_EventScript_21256C:: @ 821256C lock faceplayer - goto_if_set FLAG_0x110, RustboroCity_DevonCorp_3F_EventScript_2125CC - goto_if_set FLAG_0x0BD, RustboroCity_DevonCorp_3F_EventScript_212595 + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_2125CC + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_212595 msgbox RustboroCity_DevonCorp_3F_Text_212A09, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_3F_EventScript_212595:: @ 8212595 giveitem_std ITEM_EXP_SHARE compare VAR_RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_272054 - setflag FLAG_0x110 + setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_212A9E, MSGBOX_DEFAULT closemessage applymovement VAR_LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_2725A2 @@ -183,7 +183,7 @@ RustboroCity_DevonCorp_3F_EventScript_2125CC:: @ 82125CC RustboroCity_DevonCorp_3F_EventScript_2125E1:: @ 82125E1 lock faceplayer - goto_if_set FLAG_0x100, RustboroCity_DevonCorp_3F_EventScript_2125F6 + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_2125F6 msgbox RustboroCity_DevonCorp_3F_Text_212E41, MSGBOX_DEFAULT release end diff --git a/data/maps/RustboroCity_Flat2_2F/scripts.inc b/data/maps/RustboroCity_Flat2_2F/scripts.inc index e08d599ac..639e93884 100644 --- a/data/maps/RustboroCity_Flat2_2F/scripts.inc +++ b/data/maps/RustboroCity_Flat2_2F/scripts.inc @@ -8,12 +8,12 @@ RustboroCity_Flat2_2F_EventScript_215FD8:: @ 8215FD8 RustboroCity_Flat2_2F_EventScript_215FE1:: @ 8215FE1 lock faceplayer - goto_if_set FLAG_0x0D5, RustboroCity_Flat2_2F_EventScript_216010 + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_216010 msgbox RustboroCity_Flat2_2F_Text_21605A, MSGBOX_DEFAULT giveitem_std ITEM_PREMIER_BALL compare VAR_RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_272054 - setflag FLAG_0x0D5 + setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/maps/RustboroCity_Gym/scripts.inc b/data/maps/RustboroCity_Gym/scripts.inc index 170ae4324..4581707ce 100644 --- a/data/maps/RustboroCity_Gym/scripts.inc +++ b/data/maps/RustboroCity_Gym/scripts.inc @@ -6,7 +6,7 @@ RustboroCity_Gym_EventScript_212F31:: @ 8212F31 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq RustboroCity_Gym_EventScript_212FC8 - goto_if_unset FLAG_0x0A5, RustboroCity_Gym_EventScript_212FA4 + goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_212FA4 msgbox RustboroCity_Gym_Text_2139A7, MSGBOX_DEFAULT release end @@ -16,7 +16,7 @@ RustboroCity_Gym_EventScript_212F66:: @ 8212F66 waitmessage call RustboroCity_Gym_EventScript_27207E msgbox RustboroCity_Gym_Text_213816, MSGBOX_DEFAULT - setflag FLAG_0x4F0 + setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET setvar VAR_0x405A, 1 addvar VAR_0x4085, 1 @@ -31,7 +31,7 @@ RustboroCity_Gym_EventScript_212FA4:: @ 8212FA4 giveitem_std ITEM_TM39 compare VAR_RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_272054 - setflag FLAG_0x0A5 + setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_2138B1, MSGBOX_DEFAULT release end @@ -59,7 +59,7 @@ RustboroCity_Gym_EventScript_213011:: @ 8213011 RustboroCity_Gym_EventScript_213028:: @ 8213028 lock faceplayer - goto_if_set FLAG_0x4F0, RustboroCity_Gym_EventScript_21303D + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_21303D msgbox RustboroCity_Gym_Text_21309D, MSGBOX_DEFAULT release end @@ -101,8 +101,8 @@ RustboroCity_Gym_EventScript_21307B:: @ 821307B waitfanfare closemessage delay 30 - setflag FLAG_0x1D3 - clearflag FLAG_0x080 + setflag FLAG_ENABLE_ROXANNE_MATCH_CALL + clearflag FLAG_ENABLE_ROXANNE_FIRST_CALL releaseall end diff --git a/data/maps/RustboroCity_House1/scripts.inc b/data/maps/RustboroCity_House1/scripts.inc index 26a406675..e006ee00a 100644 --- a/data/maps/RustboroCity_House1/scripts.inc +++ b/data/maps/RustboroCity_House1/scripts.inc @@ -4,7 +4,7 @@ RustboroCity_House1_MapScripts:: @ 821593E RustboroCity_House1_EventScript_21593F:: @ 821593F lock faceplayer - goto_if_set FLAG_0x099, RustboroCity_House1_EventScript_2159D5 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_2159D5 setvar VAR_0x8008, 0 copyvar VAR_0x8004, VAR_0x8008 specialvar VAR_RESULT, sub_807E73C @@ -28,7 +28,7 @@ RustboroCity_House1_EventScript_21593F:: @ 821593F special sub_807F0E4 waitstate msgbox RustboroCity_House1_Text_215A77, MSGBOX_DEFAULT - setflag FLAG_0x099 + setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end diff --git a/data/maps/RustboroCity_Mart/scripts.inc b/data/maps/RustboroCity_Mart/scripts.inc index 78492e962..a5693847c 100644 --- a/data/maps/RustboroCity_Mart/scripts.inc +++ b/data/maps/RustboroCity_Mart/scripts.inc @@ -6,8 +6,8 @@ RustboroCity_Mart_EventScript_214F06:: @ 8214F06 faceplayer message gUnknown_08272A21 waitmessage - goto_if_unset FLAG_0x11F, RustboroCity_Mart_EventScript_214F21 - goto_if_set FLAG_0x11F, RustboroCity_Mart_EventScript_214F48 + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F21 + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_214F48 end RustboroCity_Mart_EventScript_214F21:: @ 8214F21 diff --git a/data/maps/RustboroCity_PokemonSchool/scripts.inc b/data/maps/RustboroCity_PokemonSchool/scripts.inc index 2bba066b2..c01e4a436 100644 --- a/data/maps/RustboroCity_PokemonSchool/scripts.inc +++ b/data/maps/RustboroCity_PokemonSchool/scripts.inc @@ -77,7 +77,7 @@ RustboroCity_PokemonSchool_EventScript_213F8C:: @ 8213F8C RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 lock faceplayer - goto_if_set FLAG_0x113, RustboroCity_PokemonSchool_EventScript_213FFB + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_213FFB compare VAR_FACING, 4 call_if_eq RustboroCity_PokemonSchool_EventScript_213FE5 compare VAR_FACING, 3 @@ -89,7 +89,7 @@ RustboroCity_PokemonSchool_EventScript_213F95:: @ 8213F95 closemessage applymovement VAR_LAST_TALKED, RustboroCity_PokemonSchool_Movement_2725AA waitmovement 0 - setflag FLAG_0x113 + setflag FLAG_RECEIVED_QUICK_CLAW release end @@ -166,12 +166,12 @@ RustboroCity_PokemonSchool_Movement_214027: @ 8214027 RustboroCity_PokemonSchool_EventScript_214040:: @ 8214040 lock faceplayer - goto_if_set FLAG_0x1CB, RustboroCity_PokemonSchool_EventScript_2140A8 - goto_if_set FLAG_0x136, RustboroCity_PokemonSchool_EventScript_21406F + goto_if_set FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE, RustboroCity_PokemonSchool_EventScript_2140A8 + goto_if_set FLAG_MET_SCOTT_RUSTBORO, RustboroCity_PokemonSchool_EventScript_21406F goto_if_set FLAG_BADGE01_GET, RustboroCity_PokemonSchool_EventScript_214082 msgbox RustboroCity_PokemonSchool_Text_2148C0, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 - setflag FLAG_0x136 + setflag FLAG_MET_SCOTT_RUSTBORO release end @@ -193,7 +193,7 @@ RustboroCity_PokemonSchool_EventScript_214090:: @ 8214090 RustboroCity_PokemonSchool_EventScript_21409E:: @ 821409E addvar VAR_0x40D1, 1 - setflag FLAG_0x1CB + setflag FLAG_MET_SCOTT_AFTER_OBTAINING_STONE_BADGE release end diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc index 8985f5b43..59d0789ba 100644 --- a/data/maps/RusturfTunnel/scripts.inc +++ b/data/maps/RusturfTunnel/scripts.inc @@ -63,7 +63,7 @@ RusturfTunnel_EventScript_22CEAE:: @ 822CEAE compare VAR_TEMP_1, 3 call_if_eq RusturfTunnel_EventScript_22CFC8 giveitem_std ITEM_HM04 - setflag FLAG_0x06A + setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_22D6D2, MSGBOX_DEFAULT closemessage compare VAR_TEMP_1, 1 @@ -343,8 +343,8 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2 waitmovement 0 removeobject 5 removeobject 7 - clearflag FLAG_0x08E - setflag FLAG_0x08F + clearflag FLAG_DEVON_GOODS_STOLEN + setflag FLAG_RECOVERED_DEVON_GOODS setvar VAR_0x405A, 4 setvar VAR_0x4090, 1 setflag FLAG_HIDE_ROUTE_116_MR_BRINEY diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc index 86d85fccc..204d70e14 100644 --- a/data/maps/SSTidalCorridor/scripts.inc +++ b/data/maps/SSTidalCorridor/scripts.inc @@ -125,7 +125,7 @@ SSTidalCorridor_EventScript_23C119:: @ 823C119 SSTidalCorridor_EventScript_23C13B:: @ 823C13B setrespawn HEAL_LOCATION_LILYCOVE_CITY msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - call_if_set FLAG_0x104, SSTidalCorridor_EventScript_23C179 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_23C13B:: @ 823C13B SSTidalCorridor_EventScript_23C15A:: @ 823C15A setrespawn HEAL_LOCATION_SLATEPORT_CITY msgbox SSTidalCorridor_Text_23C64F, MSGBOX_DEFAULT - call_if_set FLAG_0x104, SSTidalCorridor_EventScript_23C179 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_23C179 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release @@ -162,7 +162,7 @@ SSTidalCorridor_EventScript_23C19E:: @ 823C19E SSTidalCorridor_EventScript_23C1A3:: @ 823C1A3 lock faceplayer - goto_if_set FLAG_0x0F7, SSTidalCorridor_EventScript_23C1BD + goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_23C1BD call SSTidalCorridor_EventScript_23C1C7 msgbox SSTidalCorridor_Text_23C65E, MSGBOX_DEFAULT release @@ -190,7 +190,7 @@ SSTidalCorridor_EventScript_23C1C7:: @ 823C1C7 goto_if_lt SSTidalCorridor_EventScript_23C218 checktrainerflag TRAINER_NAOMI goto_if_lt SSTidalCorridor_EventScript_23C218 - setflag FLAG_0x0F7 + setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_23C1BD return @@ -215,7 +215,7 @@ SSTidalCorridor_EventScript_23C219:: @ 823C219 applymovement 1, SSTidalCorridor_Movement_23C28B waitmovement 0 delay 30 - setflag FLAG_0x1D0 + setflag FLAG_MET_SCOTT_ON_SS_TIDAL setvar VAR_0x40D4, 1 releaseall end diff --git a/data/maps/SSTidalRooms/scripts.inc b/data/maps/SSTidalRooms/scripts.inc index d4c088536..a021f5272 100644 --- a/data/maps/SSTidalRooms/scripts.inc +++ b/data/maps/SSTidalRooms/scripts.inc @@ -4,12 +4,12 @@ SSTidalRooms_MapScripts:: @ 823C9F1 SSTidalRooms_EventScript_23C9F2:: @ 823C9F2 lock faceplayer - goto_if_set FLAG_0x104, SSTidalRooms_EventScript_23CA29 + goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_23CA29 msgbox SSTidalRooms_Text_23D098, MSGBOX_DEFAULT giveitem_std ITEM_TM49 compare VAR_RESULT, 0 goto_if_eq SSTidalRooms_EventScript_272054 - setflag FLAG_0x104 + setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_23D145, MSGBOX_DEFAULT release end diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc index 06b050f67..ab6f70f86 100644 --- a/data/maps/SafariZone_South/scripts.inc +++ b/data/maps/SafariZone_South/scripts.inc @@ -51,7 +51,7 @@ SafariZone_South_EventScript_23D2DC:: @ 823D2DC SafariZone_South_EventScript_23D2E5:: @ 823D2E5 lock faceplayer - goto_if_unset FLAG_0x05D, SafariZone_South_EventScript_23D30D + goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_23D30D msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO compare VAR_RESULT, 1 goto_if_eq SafariZone_South_EventScript_23D31A @@ -60,7 +60,7 @@ SafariZone_South_EventScript_23D2E5:: @ 823D2E5 end SafariZone_South_EventScript_23D30D:: @ 823D30D - setflag FLAG_0x05D + setflag FLAG_GOOD_LUCK_SAFARI_ZONE msgbox SafariZone_South_Text_2A52AB, MSGBOX_DEFAULT release end @@ -150,4 +150,3 @@ SafariZone_Northeast_EventScript_23D3CF:: @ 823D3CF SafariZone_Northeast_EventScript_23D3D8:: @ 823D3D8 msgbox SafariZone_Northeast_Text_2A5A44, MSGBOX_NPC end - diff --git a/data/maps/SeafloorCavern_Room9/scripts.inc b/data/maps/SeafloorCavern_Room9/scripts.inc index 212496eef..6ab802ee4 100644 --- a/data/maps/SeafloorCavern_Room9/scripts.inc +++ b/data/maps/SeafloorCavern_Room9/scripts.inc @@ -131,7 +131,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9 clearflag FLAG_HIDE_ROUTE_128_ARCHIE clearflag FLAG_HIDE_ROUTE_128_MAXIE setflag FLAG_SYS_WEATHER_CTRL - setflag FLAG_0x081 + setflag FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_MOSSDEEP_CITY_STEVENS_HOUSE_STEVEN setvar VAR_0x40C6, 2 setvar VAR_0x40A2, 1 @@ -320,4 +320,3 @@ SeafloorCavern_Room9_Text_235692: @ 8235692 SeafloorCavern_Room9_Text_235723: @ 8235723 .string "MAXIE: {PLAYER}, come on, you have\n" .string "to get out of here, too!$" - diff --git a/data/maps/SealedChamber_InnerRoom/scripts.inc b/data/maps/SealedChamber_InnerRoom/scripts.inc index 36836fb49..5c4cb2199 100644 --- a/data/maps/SealedChamber_InnerRoom/scripts.inc +++ b/data/maps/SealedChamber_InnerRoom/scripts.inc @@ -6,7 +6,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 braillemessage SealedChamber_InnerRoom_Braille_2A6B99 waitbuttonpress hidebox2 - goto_if_set FLAG_0x0E4, SealedChamber_InnerRoom_EventScript_239253 + goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_239253 specialvar VAR_RESULT, CheckRelicanthWailord compare VAR_RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_239253 @@ -30,7 +30,7 @@ SealedChamber_InnerRoom_EventScript_2391F8:: @ 82391F8 msgbox gUnknown_0827301B, MSGBOX_DEFAULT closemessage fadeinbgm 0 - setflag FLAG_0x0E4 + setflag FLAG_REGI_DOORS_OPENED releaseall end diff --git a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc index 5f95bf8ed..c1e96f34a 100644 --- a/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideEntranceRoom/scripts.inc @@ -88,14 +88,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_236ECF:: @ 8236ECF end ShoalCave_LowTideEntranceRoom_EventScript_236ED9:: @ 8236ED9 - clearflag FLAG_0x3B8 - clearflag FLAG_0x3B9 - clearflag FLAG_0x3BA - clearflag FLAG_0x3BB - clearflag FLAG_0x3BC - clearflag FLAG_0x3BD - clearflag FLAG_0x3BE - clearflag FLAG_0x3BF + clearflag FLAG_RECIEVED_SHOAL_SALT_1 + clearflag FLAG_RECIEVED_SHOAL_SALT_2 + clearflag FLAG_RECIEVED_SHOAL_SALT_3 + clearflag FLAG_RECIEVED_SHOAL_SALT_4 + clearflag FLAG_RECIEVED_SHOAL_SHELL_1 + clearflag FLAG_RECIEVED_SHOAL_SHELL_2 + clearflag FLAG_RECIEVED_SHOAL_SHELL_3 + clearflag FLAG_RECIEVED_SHOAL_SHELL_4 clearflag FLAG_SYS_SHOAL_ITEM return - diff --git a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc index 226f89708..7e4ab53de 100644 --- a/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideInnerRoom/scripts.inc @@ -20,39 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_236F16: @ 8236F16 end ShoalCave_LowTideInnerRoom_EventScript_236F1C:: @ 8236F1C - goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_236F3D + goto_if_set FLAG_RECIEVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_236F3D goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F3D setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F3D end ShoalCave_LowTideInnerRoom_EventScript_236F3D:: @ 8236F3D - goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_236F5E + goto_if_set FLAG_RECIEVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_236F5E goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_236F5E setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F5E end ShoalCave_LowTideInnerRoom_EventScript_236F5E:: @ 8236F5E - goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236F76 + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236F76 setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F76 end ShoalCave_LowTideInnerRoom_EventScript_236F76:: @ 8236F76 - goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236F8E + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236F8E setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236F8E end ShoalCave_LowTideInnerRoom_EventScript_236F8E:: @ 8236F8E - goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FA6 + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FA6 setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_236FA6 end ShoalCave_LowTideInnerRoom_EventScript_236FA6:: @ 8236FA6 - goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FB9 + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FB9 setmetatile 16, 13, 857, 1 return @@ -61,13 +61,13 @@ ShoalCave_LowTideInnerRoom_EventScript_236FB9:: @ 8236FB9 ShoalCave_LowTideInnerRoom_EventScript_236FBA:: @ 8236FBA lockall - goto_if_set FLAG_0x3BC, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 20, 859, 0 special DrawWholeMapView - setflag FLAG_0x3BC + setflag FLAG_RECIEVED_SHOAL_SHELL_1 releaseall end @@ -78,49 +78,49 @@ ShoalCave_LowTideInnerRoom_EventScript_236FEC:: @ 8236FEC ShoalCave_LowTideInnerRoom_EventScript_236FF6:: @ 8236FF6 lockall - goto_if_set FLAG_0x3BD, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 41, 10, 859, 0 special DrawWholeMapView - setflag FLAG_0x3BD + setflag FLAG_RECIEVED_SHOAL_SHELL_2 releaseall end ShoalCave_LowTideInnerRoom_EventScript_237028:: @ 8237028 lockall - goto_if_set FLAG_0x3BE, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 6, 9, 859, 0 special DrawWholeMapView - setflag FLAG_0x3BE + setflag FLAG_RECIEVED_SHOAL_SHELL_3 releaseall end ShoalCave_LowTideInnerRoom_EventScript_23705A:: @ 823705A lockall - goto_if_set FLAG_0x3BF, ShoalCave_LowTideInnerRoom_EventScript_236FEC + goto_if_set FLAG_RECIEVED_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_236FEC giveitem_std ITEM_SHOAL_SHELL compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 16, 13, 859, 0 special DrawWholeMapView - setflag FLAG_0x3BF + setflag FLAG_RECIEVED_SHOAL_SHELL_4 releaseall end ShoalCave_LowTideInnerRoom_EventScript_23708C:: @ 823708C lockall - goto_if_set FLAG_0x3B8, ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_RECIEVED_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 31, 8, 858, 0 special DrawWholeMapView - setflag FLAG_0x3B8 + setflag FLAG_RECIEVED_SHOAL_SALT_1 releaseall end @@ -131,13 +131,12 @@ ShoalCave_LowTideInnerRoom_EventScript_2370BE:: @ 82370BE ShoalCave_LowTideInnerRoom_EventScript_2370C8:: @ 82370C8 lockall - goto_if_set FLAG_0x3B9, ShoalCave_LowTideInnerRoom_EventScript_2370BE + goto_if_set FLAG_RECIEVED_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_2370BE giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_272054 setmetatile 14, 26, 858, 0 special DrawWholeMapView - setflag FLAG_0x3B9 + setflag FLAG_RECIEVED_SHOAL_SALT_2 releaseall end - diff --git a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc index 1e2e756d7..56b50ca7d 100644 --- a/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideLowerRoom/scripts.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_23715C: @ 823715C end ShoalCave_LowTideLowerRoom_EventScript_237162:: @ 8237162 - goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_237175 + goto_if_set FLAG_RECIEVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_237175 setmetatile 18, 2, 856, 1 return @@ -16,13 +16,13 @@ ShoalCave_LowTideLowerRoom_EventScript_237175:: @ 8237175 ShoalCave_LowTideLowerRoom_EventScript_237176:: @ 8237176 lockall - goto_if_set FLAG_0x3BB, ShoalCave_LowTideLowerRoom_EventScript_2371A8 + goto_if_set FLAG_RECIEVED_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_2371A8 giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 setmetatile 18, 2, 858, 0 special DrawWholeMapView - setflag FLAG_0x3BB + setflag FLAG_RECIEVED_SHOAL_SALT_4 releaseall end @@ -34,12 +34,12 @@ ShoalCave_LowTideLowerRoom_EventScript_2371A8:: @ 82371A8 ShoalCave_LowTideLowerRoom_EventScript_2371B2:: @ 82371B2 lock faceplayer - goto_if_set FLAG_0x11B, ShoalCave_LowTideLowerRoom_EventScript_2371E1 + goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_2371E1 msgbox ShoalCave_LowTideLowerRoom_Text_2371EB, MSGBOX_DEFAULT giveitem_std ITEM_FOCUS_BAND compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_272054 - setflag FLAG_0x11B + setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc index 4486c7c61..a02899b74 100644 --- a/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc +++ b/data/maps/ShoalCave_LowTideStairsRoom/scripts.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_237100: @ 8237100 end ShoalCave_LowTideStairsRoom_EventScript_237106:: @ 8237106 - goto_if_set FLAG_0x3BA, ShoalCave_LowTideStairsRoom_EventScript_237119 + goto_if_set FLAG_RECIEVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_237119 setmetatile 11, 11, 856, 1 return @@ -16,13 +16,13 @@ ShoalCave_LowTideStairsRoom_EventScript_237119:: @ 8237119 ShoalCave_LowTideStairsRoom_EventScript_23711A:: @ 823711A lockall - goto_if_set FLAG_0x3BA, ShoalCave_LowTideStairsRoom_EventScript_23714C + goto_if_set FLAG_RECIEVED_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_23714C giveitem_std ITEM_SHOAL_SALT compare VAR_RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_272054 setmetatile 11, 11, 858, 0 special DrawWholeMapView - setflag FLAG_0x3BA + setflag FLAG_RECIEVED_SHOAL_SALT_3 releaseall end diff --git a/data/maps/SkyPillar_Outside/scripts.inc b/data/maps/SkyPillar_Outside/scripts.inc index 4e7701de6..eb57d1227 100644 --- a/data/maps/SkyPillar_Outside/scripts.inc +++ b/data/maps/SkyPillar_Outside/scripts.inc @@ -20,7 +20,7 @@ SkyPillar_Outside_EventScript_2392D3:: @ 82392D3 return SkyPillar_Outside_MapScript1_2392DD: @ 82392DD - call_if_set FLAG_0x137, SkyPillar_Outside_EventScript_2392E7 + call_if_set FLAG_WALLACE_GOES_TO_SKY_PILLAR, SkyPillar_Outside_EventScript_2392E7 end SkyPillar_Outside_EventScript_2392E7:: @ 82392E7 diff --git a/data/maps/SkyPillar_Top/scripts.inc b/data/maps/SkyPillar_Top/scripts.inc index 1ac3cf486..c0bc2e4c1 100644 --- a/data/maps/SkyPillar_Top/scripts.inc +++ b/data/maps/SkyPillar_Top/scripts.inc @@ -28,7 +28,7 @@ SkyPillar_Top_EventScript_2396FD:: @ 82396FD return SkyPillar_Top_EventScript_239705:: @ 8239705 - call_if_unset FLAG_0x1C0, SkyPillar_Top_EventScript_23970F + call_if_unset FLAG_DEFEATED_RAYQUAZA, SkyPillar_Top_EventScript_23970F return SkyPillar_Top_EventScript_23970F:: @ 823970F @@ -61,12 +61,12 @@ SkyPillar_Top_EventScript_239722:: @ 8239722 goto_if_eq SkyPillar_Top_EventScript_239771 compare VAR_RESULT, 5 goto_if_eq SkyPillar_Top_EventScript_239771 - setflag FLAG_0x1C0 + setflag FLAG_DEFEATED_RAYQUAZA releaseall end SkyPillar_Top_EventScript_239768:: @ 8239768 - setflag FLAG_0x1C0 + setflag FLAG_DEFEATED_RAYQUAZA goto SkyPillar_Top_EventScript_23977C end diff --git a/data/maps/SlateportCity/scripts.inc b/data/maps/SlateportCity/scripts.inc index a28d74fa2..e97438be9 100644 --- a/data/maps/SlateportCity/scripts.inc +++ b/data/maps/SlateportCity/scripts.inc @@ -75,7 +75,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C waitfanfare closemessage delay 30 - setflag FLAG_0x0D7 + setflag FLAG_ENABLE_SCOTT_MATCH_CALL msgbox SlateportCity_Text_1DF1D3, MSGBOX_DEFAULT closemessage applymovement 35, SlateportCity_Movement_1DCDB4 @@ -200,7 +200,7 @@ SlateportCity_EventScript_1DCE84:: @ 81DCE84 faceplayer compare VAR_0x4058, 1 call_if_eq SlateportCity_EventScript_1DCEA4 - goto_if_set FLAG_0x060, SlateportCity_EventScript_1DCEAE + goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DCEAE msgbox SlateportCity_Text_1DD93D, MSGBOX_DEFAULT release end @@ -256,7 +256,7 @@ SlateportCity_EventScript_1DCF0D:: @ 81DCF0D SlateportCity_EventScript_1DCF17:: @ 81DCF17 lock faceplayer - goto_if_set FLAG_0x094, SlateportCity_EventScript_1DCF2C + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_1DCF2C msgbox SlateportCity_Text_1DDBAC, MSGBOX_DEFAULT release end @@ -513,7 +513,7 @@ SlateportCity_EventScript_1DD18E:: @ 81DD18E SlateportCity_EventScript_1DD198:: @ 81DD198 lock faceplayer - goto_if_unset FLAG_0x060, SlateportCity_EventScript_1DD18E + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_1DD18E message gUnknown_08272A21 waitmessage pokemartdecoration SlateportCity_PokemartDecor_1DD1B8 @@ -722,10 +722,10 @@ SlateportCity_EventScript_1DD365:: @ 81DD365 SlateportCity_EventScript_1DD36E:: @ 81DD36E lock faceplayer - goto_if_set FLAG_0x151, SlateportCity_EventScript_1DD39A + goto_if_set FLAG_RECIEVED_POWDER_JAR, SlateportCity_EventScript_1DD39A msgbox SlateportCity_Text_1DEBCE, MSGBOX_DEFAULT giveitem_std ITEM_POWDER_JAR - setflag FLAG_0x151 + setflag FLAG_RECIEVED_POWDER_JAR msgbox SlateportCity_Text_1DED27, MSGBOX_DEFAULT release end @@ -1373,4 +1373,3 @@ SlateportCity_Text_1DF28C: @ 81DF28C .string "After all, a tough TRAINER is\n" .string "the perfect fit for the BATTLE TENT!\p" .string "Give it your best effort!$" - diff --git a/data/maps/SlateportCity_BattleTentLobby/scripts.inc b/data/maps/SlateportCity_BattleTentLobby/scripts.inc index 2d00095ba..8851c5fa8 100644 --- a/data/maps/SlateportCity_BattleTentLobby/scripts.inc +++ b/data/maps/SlateportCity_BattleTentLobby/scripts.inc @@ -245,12 +245,12 @@ SlateportCity_BattleTentLobby_Movement_208A38:: @ 8208A38 SlateportCity_BattleTentLobby_EventScript_208A3D:: @ 8208A3D lock faceplayer - goto_if_set FLAG_0x109, SlateportCity_BattleTentLobby_EventScript_208A74 + goto_if_set FLAG_RECEIVED_TM41, SlateportCity_BattleTentLobby_EventScript_208A74 msgbox SlateportCity_BattleTentLobby_Text_208B4E, MSGBOX_DEFAULT giveitem_std ITEM_TM41 compare VAR_RESULT, 0 goto_if_eq SlateportCity_BattleTentLobby_EventScript_272054 - setflag FLAG_0x109 + setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_BattleTentLobby_Text_208C5C, MSGBOX_DEFAULT release end diff --git a/data/maps/SlateportCity_Harbor/scripts.inc b/data/maps/SlateportCity_Harbor/scripts.inc index df573aa7a..2f71a2dc9 100644 --- a/data/maps/SlateportCity_Harbor/scripts.inc +++ b/data/maps/SlateportCity_Harbor/scripts.inc @@ -63,7 +63,7 @@ SlateportCity_Harbor_EventScript_20C9F5:: @ 820C9F5 removeobject 7 removeobject 8 setvar VAR_0x40A0, 2 - setflag FLAG_0x061 + setflag FLAG_MET_TEAM_AQUA_HARBOR setflag FLAG_HIDE_LILCOVE_MOTEL_SCOTT compare VAR_0x8008, 0 call_if_eq SlateportCity_Harbor_EventScript_20CA89 @@ -174,7 +174,7 @@ SlateportCity_Harbor_EventScript_20CB06:: @ 820CB06 end SlateportCity_Harbor_EventScript_20CB1A:: @ 820CB1A - goto_if_set FLAG_0x1D0, SlateportCity_Harbor_EventScript_20CB50 + goto_if_set FLAG_MET_SCOTT_ON_SS_TIDAL, SlateportCity_Harbor_EventScript_20CB50 multichoicedefault 18, 8, 56, 2, 0 switch VAR_RESULT case 0, SlateportCity_Harbor_EventScript_20CB92 @@ -269,8 +269,8 @@ SlateportCity_Harbor_EventScript_20CC52:: @ 820CC52 faceplayer goto_if_unset FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_20CC89 setvar VAR_0x8004, 0 - call_if_set FLAG_0x1BE, SlateportCity_Harbor_EventScript_20CC93 - call_if_set FLAG_0x1BF, SlateportCity_Harbor_EventScript_20CC93 + call_if_set FLAG_DEFEATED_KYOGRE, SlateportCity_Harbor_EventScript_20CC93 + call_if_set FLAG_DEFEATED_GROUDON, SlateportCity_Harbor_EventScript_20CC93 compare VAR_0x8004, 2 goto_if_eq SlateportCity_Harbor_EventScript_20CC89 msgbox SlateportCity_Harbor_Text_20D08E, MSGBOX_DEFAULT @@ -294,8 +294,8 @@ SlateportCity_Harbor_EventScript_20CCA2:: @ 820CCA2 lock faceplayer goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_20CD00 - goto_if_set FLAG_0x10F, SlateportCity_Harbor_EventScript_20CCF6 - goto_if_set FLAG_0x070, SlateportCity_Harbor_EventScript_20CCE9 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_20CCF6 + goto_if_set FLAG_TEAM_AQUA_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_20CCE9 compare VAR_0x40A0, 2 goto_if_eq SlateportCity_Harbor_EventScript_20CCDF msgbox SlateportCity_Harbor_Text_20D232, MSGBOX_DEFAULT @@ -311,7 +311,7 @@ SlateportCity_Harbor_EventScript_20CCDF:: @ 820CCDF end SlateportCity_Harbor_EventScript_20CCE9:: @ 820CCE9 - setflag FLAG_0x10F + setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE msgbox SlateportCity_Harbor_Text_20D42B, MSGBOX_DEFAULT release end @@ -361,7 +361,7 @@ SlateportCity_Harbor_EventScript_20CD7B:: @ 820CD7B goto_if_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT - setflag FLAG_TRADED_SCANNER_TO_STERN + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_20CE11 end @@ -374,7 +374,7 @@ SlateportCity_Harbor_EventScript_20CDBB:: @ 820CDBB goto_if_eq SlateportCity_Harbor_EventScript_272054 takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_20D94A, MSGBOX_DEFAULT - setflag FLAG_TRADED_SCANNER_TO_STERN + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_20CE11 end @@ -554,4 +554,3 @@ SlateportCity_Harbor_Text_20D94A: @ 820D94A SlateportCity_Harbor_Text_20D970: @ 820D970 .string "CAPT. STERN: Thanks, {PLAYER}{KUN}!\n" .string "This will help our research a lot!$" - diff --git a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc index 76bc18873..b574ce448 100644 --- a/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_1F/scripts.inc @@ -50,7 +50,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20ADE8:: @ 820ADE8 end SlateportCity_OceanicMuseum_1F_EventScript_20AE18:: @ 820AE18 - goto_if_unset FLAG_0x095, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_20AE39 msgbox SlateportCity_OceanicMuseum_1F_Text_20B03D, MSGBOX_DEFAULT closemessage hidemoneybox @@ -163,7 +163,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_20AEF8:: @ 820AEF8 giveitem_std ITEM_TM46 compare VAR_RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_20AFB5 - setflag FLAG_0x10D + setflag FLAG_RECEIVED_TM46 msgbox SlateportCity_OceanicMuseum_1F_Text_20B449, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 diff --git a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc index 387ffdabf..204ffb4eb 100644 --- a/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc +++ b/data/maps/SlateportCity_OceanicMuseum_2F/scripts.inc @@ -83,7 +83,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_20BB00:: @ 820BB00 setflag FLAG_HIDE_ROUTE_110_TEAM_AQUA compare VAR_0x40DA, 0 call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_20BC8C - setflag FLAG_0x095 + setflag FLAG_DELIVERED_DEVON_GOODS clearflag FLAG_HIDE_ROUTE_116_DEVON_EMPLOYEE setflag FLAG_HIDE_RUSTBORO_CITY_DEVON_CORP_3F_EMPLOYEE setvar VAR_0x40D2, 1 diff --git a/data/maps/SlateportCity_PokemonFanClub/scripts.inc b/data/maps/SlateportCity_PokemonFanClub/scripts.inc index 35fcde577..3faf350fc 100644 --- a/data/maps/SlateportCity_PokemonFanClub/scripts.inc +++ b/data/maps/SlateportCity_PokemonFanClub/scripts.inc @@ -4,8 +4,8 @@ SlateportCity_PokemonFanClub_MapScripts:: @ 8209E95 SlateportCity_PokemonFanClub_EventScript_209E96:: @ 8209E96 lock faceplayer - goto_if_unset FLAG_0x155, SlateportCity_PokemonFanClub_EventScript_20A152 - call_if_unset FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A172 + goto_if_unset FLAG_ENTERED_LINK_CONTEST, SlateportCity_PokemonFanClub_EventScript_20A152 + call_if_unset FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A172 switch VAR_0x40B7 case 0, SlateportCity_PokemonFanClub_EventScript_209ED2 case 1, SlateportCity_PokemonFanClub_EventScript_209EE5 @@ -21,11 +21,11 @@ SlateportCity_PokemonFanClub_EventScript_209ED2:: @ 8209ED2 SlateportCity_PokemonFanClub_EventScript_209EE5:: @ 8209EE5 setvar VAR_TEMP_2, 0 - call_if_set FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_209FD0 - call_if_set FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 + call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_209FD0 compare VAR_TEMP_2, 5 call_if_eq SlateportCity_PokemonFanClub_EventScript_209FCA compare VAR_0x40B7, 2 @@ -42,11 +42,11 @@ SlateportCity_PokemonFanClub_EventScript_209F3B:: @ 8209F3B SlateportCity_PokemonFanClub_EventScript_209F45:: @ 8209F45 msgbox SlateportCity_PokemonFanClub_Text_20A65F, MSGBOX_DEFAULT setvar VAR_TEMP_1, 0 - call_if_unset FLAG_0x0CC, SlateportCity_PokemonFanClub_EventScript_20A13B - call_if_unset FLAG_0x0CB, SlateportCity_PokemonFanClub_EventScript_20A124 - call_if_unset FLAG_0x0CA, SlateportCity_PokemonFanClub_EventScript_20A10D - call_if_unset FLAG_0x0C9, SlateportCity_PokemonFanClub_EventScript_20A0F6 - call_if_unset FLAG_0x0C8, SlateportCity_PokemonFanClub_EventScript_20A0DF + call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_20A13B + call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_20A124 + call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_20A10D + call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0F6 + call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_20A0DF bufferleadmonspeciesname 0 switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_209FD6 @@ -76,7 +76,7 @@ SlateportCity_PokemonFanClub_EventScript_209FE0:: @ 8209FE0 compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT - setflag FLAG_0x0C8 + setflag FLAG_RECEIVED_RED_SCARF giveitem_std ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_20A827, MSGBOX_DEFAULT release @@ -87,7 +87,7 @@ SlateportCity_PokemonFanClub_EventScript_20A011:: @ 820A011 compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT - setflag FLAG_0x0C9 + setflag FLAG_RECEIVED_BLUE_SCARF giveitem_std ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_20A880, MSGBOX_DEFAULT release @@ -98,7 +98,7 @@ SlateportCity_PokemonFanClub_EventScript_20A042:: @ 820A042 compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT - setflag FLAG_0x0CA + setflag FLAG_RECEIVED_PINK_SCARF giveitem_std ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_20A8D7, MSGBOX_DEFAULT release @@ -109,7 +109,7 @@ SlateportCity_PokemonFanClub_EventScript_20A073:: @ 820A073 compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT - setflag FLAG_0x0CB + setflag FLAG_RECEIVED_GREEN_SCARF giveitem_std ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_20A933, MSGBOX_DEFAULT release @@ -120,7 +120,7 @@ SlateportCity_PokemonFanClub_EventScript_20A0A4:: @ 820A0A4 compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_20A0D5 msgbox SlateportCity_PokemonFanClub_Text_20A795, MSGBOX_DEFAULT - setflag FLAG_0x0CC + setflag FLAG_RECEIVED_YELLOW_SCARF giveitem_std ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_20A984, MSGBOX_DEFAULT release @@ -182,9 +182,9 @@ SlateportCity_PokemonFanClub_EventScript_20A14C:: @ 820A14C return SlateportCity_PokemonFanClub_EventScript_20A152:: @ 820A152 - goto_if_set FLAG_0x156, SlateportCity_PokemonFanClub_EventScript_20A168 + goto_if_set FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN, SlateportCity_PokemonFanClub_EventScript_20A168 msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT - setflag FLAG_0x156 + setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN release end @@ -195,13 +195,13 @@ SlateportCity_PokemonFanClub_EventScript_20A168:: @ 820A168 SlateportCity_PokemonFanClub_EventScript_20A172:: @ 820A172 msgbox SlateportCity_PokemonFanClub_Text_20A233, MSGBOX_DEFAULT - setflag FLAG_0x156 + setflag FLAG_MET_SLATEPORT_FANCLUB_CHAIRMAN return SlateportCity_PokemonFanClub_EventScript_20A17E:: @ 820A17E lock faceplayer - goto_if_set FLAG_0x116, SlateportCity_PokemonFanClub_EventScript_20A1DE + goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_20A1DE msgbox SlateportCity_PokemonFanClub_Text_20AA77, MSGBOX_DEFAULT specialvar VAR_RESULT, GetLeadMonFriendshipScore compare VAR_RESULT, 4 @@ -219,7 +219,7 @@ SlateportCity_PokemonFanClub_EventScript_20A1A3:: @ 820A1A3 giveitem_std ITEM_SOOTHE_BELL compare VAR_RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_272054 - setflag FLAG_0x116 + setflag FLAG_RECEIVED_SOOTHE_BELL release end diff --git a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc index da264c2ee..adf1bd3a2 100644 --- a/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc +++ b/data/maps/SlateportCity_SternsShipyard_1F/scripts.inc @@ -5,8 +5,8 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 lockall goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_207F92 goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_207FA6 - goto_if_set FLAG_0x095, SlateportCity_SternsShipyard_1F_EventScript_207FD9 - goto_if_set FLAG_0x094, SlateportCity_SternsShipyard_1F_EventScript_207FBA + goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FD9 + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_207FBA msgbox SlateportCity_SternsShipyard_1F_Text_208008, MSGBOX_DEFAULT applymovement 1, SlateportCity_SternsShipyard_1F_Movement_27259E waitmovement 0 @@ -14,7 +14,7 @@ SlateportCity_SternsShipyard_1F_EventScript_207F40:: @ 8207F40 closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_2725A2 waitmovement 0 - setflag FLAG_0x094 + setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag FLAG_HIDE_SLATEPORT_CITY_TEAM_AQUA releaseall end diff --git a/data/maps/SootopolisCity/scripts.inc b/data/maps/SootopolisCity/scripts.inc index ceff8f4e4..0585640dd 100644 --- a/data/maps/SootopolisCity/scripts.inc +++ b/data/maps/SootopolisCity/scripts.inc @@ -7,9 +7,9 @@ SootopolisCity_MapScripts:: @ 81E565C .byte 0 SootopolisCity_MapScript1_1E5676: @ 81E5676 - call_if_unset FLAG_0x09E, SootopolisCity_EventScript_1E56E5 - goto_if_unset FLAG_0x081, SootopolisCity_EventScript_1E5692 - call_if_unset FLAG_0x09E, SootopolisCity_EventScript_1E5693 + call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E56E5 + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_1E5692 + call_if_unset FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E5693 end SootopolisCity_EventScript_1E5692:: @ 81E5692 @@ -121,7 +121,7 @@ SootopolisCity_EventScript_1E583E:: @ 81E583E return SootopolisCity_EventScript_1E5842:: @ 81E5842 - goto_if_set FLAG_0x133, SootopolisCity_EventScript_1E584C + goto_if_set FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E584C return SootopolisCity_EventScript_1E584C:: @ 81E584C @@ -744,7 +744,7 @@ SootopolisCity_EventScript_1E5F10:: @ 81E5F10 SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B dodailyevents special GetPlayerBigGuyGirlString - goto_if_set FLAG_0x932, SootopolisCity_EventScript_1E5FBB + goto_if_set FLAG_DAILY_SOOTOPOLIS_RECIEVED_BERRY, SootopolisCity_EventScript_1E5FBB msgbox SootopolisCity_Text_2A7BB0, MSGBOX_DEFAULT random 10 addvar VAR_RESULT, 20 @@ -752,7 +752,7 @@ SootopolisCity_EventScript_1E5F1B:: @ 81E5F1B giveitem_std VAR_RESULT compare VAR_RESULT, 0 goto_if_eq SootopolisCity_EventScript_272054 - setflag FLAG_0x932 + setflag FLAG_DAILY_SOOTOPOLIS_RECIEVED_BERRY msgbox SootopolisCity_Text_2A7C7C, MSGBOX_DEFAULT random 2 compare VAR_RESULT, 0 @@ -929,14 +929,14 @@ SootopolisCity_EventScript_1E6166:: @ 81E6166 lockall applymovement 7, SootopolisCity_Movement_27259E waitmovement 0 - call_if_unset FLAG_0x133, SootopolisCity_EventScript_1E61CC + call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_1E61CC compare VAR_0x405E, 2 goto_if_eq SootopolisCity_EventScript_1E61AE compare VAR_0x405E, 3 goto_if_eq SootopolisCity_EventScript_1E61C2 compare VAR_0x405E, 4 goto_if_eq SootopolisCity_EventScript_1E61C2 - goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E61B8 + goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E61B8 msgbox SootopolisCity_Text_1E78E5, MSGBOX_DEFAULT releaseall end @@ -976,7 +976,7 @@ SootopolisCity_EventScript_1E61CC:: @ 81E61CC waitmovement 0 msgbox SootopolisCity_Text_1E77F0, MSGBOX_DEFAULT closemessage - setflag FLAG_0x133 + setflag FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN applymovement EVENT_OBJ_ID_PLAYER, SootopolisCity_Movement_1E635A waitmovement 0 warp MAP_CAVE_OF_ORIGIN_ENTRANCE, 255, 9, 20 @@ -1342,8 +1342,8 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446 faceplayer compare VAR_0x405E, 4 goto_if_eq SootopolisCity_EventScript_1E64D8 - goto_if_set FLAG_0x138, SootopolisCity_EventScript_1E64E2 - goto_if_set FLAG_0x09E, SootopolisCity_EventScript_1E646F + goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_1E64E2 + goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_1E646F msgbox SootopolisCity_Text_1E7A3E, MSGBOX_DEFAULT release end @@ -1351,7 +1351,7 @@ SootopolisCity_EventScript_1E6446:: @ 81E6446 SootopolisCity_EventScript_1E646F:: @ 81E646F msgbox SootopolisCity_Text_1E7ACF, MSGBOX_DEFAULT giveitem_std ITEM_HM07 - setflag FLAG_0x138 + setflag FLAG_RECEIVED_HM07 msgbox SootopolisCity_Text_1E7B86, MSGBOX_DEFAULT closemessage compare VAR_FACING, 2 @@ -1408,8 +1408,8 @@ SootopolisCity_EventScript_1E64F2:: @ 81E64F2 SootopolisCity_EventScript_1E6509:: @ 81E6509 msgbox SootopolisCity_Text_1E737E, MSGBOX_DEFAULT - setflag FLAG_0x135 - goto_if_set FLAG_0x134, SootopolisCity_EventScript_1E654C + setflag FLAG_MET_MAXIE_SOOTOPOLIS + goto_if_set FLAG_MET_ARCHIE_SOOTOPOLIS, SootopolisCity_EventScript_1E654C releaseall end @@ -1424,15 +1424,15 @@ SootopolisCity_EventScript_1E651F:: @ 81E651F SootopolisCity_EventScript_1E6536:: @ 81E6536 msgbox SootopolisCity_Text_1E74F6, MSGBOX_DEFAULT - setflag FLAG_0x134 - goto_if_set FLAG_0x135, SootopolisCity_EventScript_1E654C + setflag FLAG_MET_ARCHIE_SOOTOPOLIS + goto_if_set FLAG_MET_MAXIE_SOOTOPOLIS, SootopolisCity_EventScript_1E654C releaseall end SootopolisCity_EventScript_1E654C:: @ 81E654C setflag FLAG_HIDE_SOOTOPOLIS_CITY_MAXIE setflag FLAG_HIDE_SOOTOPOLIS_CITY_ARCHIE - setflag FLAG_0x09E + setflag FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_MAXIE clearflag FLAG_HIDE_MT_PYRE_SUMMIT_ARCHIE setvar VAR_0x40B9, 2 diff --git a/data/maps/SootopolisCity_Gym_1F/scripts.inc b/data/maps/SootopolisCity_Gym_1F/scripts.inc index e4f062fe3..22cd864cf 100644 --- a/data/maps/SootopolisCity_Gym_1F/scripts.inc +++ b/data/maps/SootopolisCity_Gym_1F/scripts.inc @@ -90,7 +90,7 @@ SootopolisCity_Gym_1F_EventScript_224F44:: @ 8224F44 specialvar VAR_RESULT, ShouldTryRematchBattle compare VAR_RESULT, 1 goto_if_eq SootopolisCity_Gym_1F_EventScript_225025 - goto_if_unset FLAG_0x0AC, SootopolisCity_Gym_1F_EventScript_224FF7 + goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_224FF7 goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_22501B msgbox SootopolisCity_Gym_1F_Text_225778, MSGBOX_DEFAULT release @@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 waitmessage call SootopolisCity_Gym_1F_EventScript_27207E msgbox SootopolisCity_Gym_1F_Text_2255BE, MSGBOX_DEFAULT - setflag FLAG_0x4F7 + setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET setflag FLAG_HIDE_SOOTOPOLIS_CITY_RESIDENTS setflag FLAG_HIDE_SOOTOPOLIS_CITY_STEVEN @@ -118,7 +118,7 @@ SootopolisCity_Gym_1F_EventScript_224F82:: @ 8224F82 waitfanfare closemessage delay 30 - setflag FLAG_0x1D9 + setflag FLAG_ENABLE_JUAN_MATCH_CALL release end @@ -127,7 +127,7 @@ SootopolisCity_Gym_1F_EventScript_224FD4:: @ 8224FD4 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_27205E msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT - setflag FLAG_0x0AC + setflag FLAG_RECEIVED_TM03 return SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 @@ -135,7 +135,7 @@ SootopolisCity_Gym_1F_EventScript_224FF7:: @ 8224FF7 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_272054 msgbox SootopolisCity_Gym_1F_Text_2256C1, MSGBOX_DEFAULT - setflag FLAG_0x0AC + setflag FLAG_RECEIVED_TM03 release end @@ -152,7 +152,7 @@ SootopolisCity_Gym_1F_EventScript_225025:: @ 8225025 SootopolisCity_Gym_1F_EventScript_225040:: @ 8225040 lock faceplayer - goto_if_set FLAG_0x4F7, SootopolisCity_Gym_1F_EventScript_225055 + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_225055 msgbox SootopolisCity_Gym_1F_Text_225093, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_House1/scripts.inc b/data/maps/SootopolisCity_House1/scripts.inc index 5b59c3033..9dcc1031d 100644 --- a/data/maps/SootopolisCity_House1/scripts.inc +++ b/data/maps/SootopolisCity_House1/scripts.inc @@ -4,12 +4,12 @@ SootopolisCity_House1_MapScripts:: @ 822694C SootopolisCity_House1_EventScript_22694D:: @ 822694D lock faceplayer - goto_if_set FLAG_0x079, SootopolisCity_House1_EventScript_226984 + goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_226984 msgbox SootopolisCity_House1_Text_2269A1, MSGBOX_DEFAULT giveitem_std ITEM_TM31 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House1_EventScript_272054 - setflag FLAG_0x079 + setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_226A13, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_House6/scripts.inc b/data/maps/SootopolisCity_House6/scripts.inc index 499c01893..efa197c8d 100644 --- a/data/maps/SootopolisCity_House6/scripts.inc +++ b/data/maps/SootopolisCity_House6/scripts.inc @@ -4,7 +4,7 @@ SootopolisCity_House6_MapScripts:: @ 8226F5B SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C lock faceplayer - goto_if_set FLAG_0x0F5, SootopolisCity_House6_EventScript_226FA3 + goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_226FA3 msgbox SootopolisCity_House6_Text_226FC3, MSGBOX_YESNO compare VAR_RESULT, 0 call_if_eq SootopolisCity_House6_EventScript_226F99 @@ -12,7 +12,7 @@ SootopolisCity_House6_EventScript_226F5C:: @ 8226F5C givedecoration_std 117 compare VAR_RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_226FAD - setflag FLAG_0x0F5 + setflag FLAG_RECEIVED_WAILMER_DOLL release end diff --git a/data/maps/SootopolisCity_Mart/scripts.inc b/data/maps/SootopolisCity_Mart/scripts.inc index 94f0a8e9f..4a152bcf0 100644 --- a/data/maps/SootopolisCity_Mart/scripts.inc +++ b/data/maps/SootopolisCity_Mart/scripts.inc @@ -30,7 +30,7 @@ SootopolisCity_Mart_EventScript_2267C2:: @ 82267C2 faceplayer compare VAR_0x40CA, 2 goto_if_ge SootopolisCity_Mart_EventScript_2267E2 - goto_if_unset FLAG_0x081, SootopolisCity_Mart_EventScript_2267E2 + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_2267E2 msgbox SootopolisCity_Mart_Text_22685D, MSGBOX_DEFAULT release end @@ -45,7 +45,7 @@ SootopolisCity_Mart_EventScript_2267EC:: @ 82267EC faceplayer compare VAR_0x40CA, 2 goto_if_ge SootopolisCity_Mart_EventScript_22680C - goto_if_unset FLAG_0x081, SootopolisCity_Mart_EventScript_22680C + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_22680C msgbox SootopolisCity_Mart_Text_226928, MSGBOX_DEFAULT release end diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc index 448d66981..2e7e804ce 100644 --- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc +++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc @@ -20,7 +20,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_22650E:: @ 822650E faceplayer compare VAR_0x40CA, 2 goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_22652E - goto_if_unset FLAG_0x081, SootopolisCity_PokemonCenter_1F_EventScript_22652E + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_22652E msgbox SootopolisCity_PokemonCenter_1F_Text_22664B, MSGBOX_DEFAULT release end @@ -35,7 +35,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_226538:: @ 8226538 faceplayer compare VAR_0x40CA, 2 goto_if_ge SootopolisCity_PokemonCenter_1F_EventScript_226558 - goto_if_unset FLAG_0x081, SootopolisCity_PokemonCenter_1F_EventScript_226558 + goto_if_unset FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_226558 msgbox SootopolisCity_PokemonCenter_1F_Text_22672F, MSGBOX_DEFAULT release end diff --git a/data/maps/SouthernIsland_Interior/scripts.inc b/data/maps/SouthernIsland_Interior/scripts.inc index 13b38c835..33d6581a8 100644 --- a/data/maps/SouthernIsland_Interior/scripts.inc +++ b/data/maps/SouthernIsland_Interior/scripts.inc @@ -56,10 +56,10 @@ SouthernIsland_Interior_EventScript_242AC4:: @ 8242AC4 SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 goto_if_set FLAG_TEMP_2, SouthernIsland_Interior_EventScript_242B9A - goto_if_set FLAG_0x1C8, SouthernIsland_Interior_EventScript_242B9A - goto_if_set FLAG_0x1C9, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_DEFEATED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_242B9A + goto_if_set FLAG_CAUGHT_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_242B9A goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_242B9A - setflag FLAG_0x0CE + setflag FLAG_ENCOUNTERED_LATIAS_OR_LATIOS setflag FLAG_TEMP_2 special SpawnCameraObject applymovement EVENT_OBJ_ID_CAMERA, SouthernIsland_Interior_Movement_242BCA @@ -92,12 +92,12 @@ SouthernIsland_Interior_EventScript_242AD0:: @ 8242AD0 goto_if_eq SouthernIsland_Interior_EventScript_242B8F compare VAR_RESULT, 5 goto_if_eq SouthernIsland_Interior_EventScript_242B8F - setflag FLAG_0x1C9 + setflag FLAG_CAUGHT_LATIAS_OR_LATIOS releaseall end SouthernIsland_Interior_EventScript_242B81:: @ 8242B81 - setflag FLAG_0x1C8 + setflag FLAG_DEFEATED_LATIAS_OR_LATIOS copyvar VAR_0x8004, VAR_TEMP_4 goto SouthernIsland_Interior_EventScript_273776 end @@ -159,4 +159,3 @@ SouthernIsland_Interior_Movement_242BDA: @ 8242BDA walk_down walk_down step_end - diff --git a/data/maps/TerraCave_End/scripts.inc b/data/maps/TerraCave_End/scripts.inc index bd057eac6..a3164136d 100644 --- a/data/maps/TerraCave_End/scripts.inc +++ b/data/maps/TerraCave_End/scripts.inc @@ -15,7 +15,7 @@ TerraCave_End_EventScript_23B0C5:: @ 823B0C5 return TerraCave_End_MapScript1_23B0D9: @ 823B0D9 - call_if_unset FLAG_0x1BF, TerraCave_End_EventScript_23B0E3 + call_if_unset FLAG_DEFEATED_GROUDON, TerraCave_End_EventScript_23B0E3 end TerraCave_End_EventScript_23B0E3:: @ 823B0E3 @@ -48,13 +48,13 @@ TerraCave_End_EventScript_23B0EC:: @ 823B0EC compare VAR_RESULT, 5 goto_if_eq TerraCave_End_EventScript_23B163 setvar VAR_0x4039, 1 - setflag FLAG_0x1BF + setflag FLAG_DEFEATED_GROUDON releaseall end TerraCave_End_EventScript_23B155:: @ 823B155 setvar VAR_0x4039, 1 - setflag FLAG_0x1BF + setflag FLAG_DEFEATED_GROUDON goto TerraCave_End_EventScript_27376D end diff --git a/data/maps/TerraCave_Entrance/scripts.inc b/data/maps/TerraCave_Entrance/scripts.inc index 1762265ea..b9a17701b 100644 --- a/data/maps/TerraCave_Entrance/scripts.inc +++ b/data/maps/TerraCave_Entrance/scripts.inc @@ -3,6 +3,6 @@ TerraCave_Entrance_MapScripts:: @ 823B0A6 .byte 0 TerraCave_Entrance_MapScript1_23B0AC: @ 823B0AC - setflag FLAG_0x8DA + setflag FLAG_ARRIVED_AT_TERRA_CAVE_ENTRANCE end diff --git a/data/maps/Underwater_MarineCave/scripts.inc b/data/maps/Underwater_MarineCave/scripts.inc index ac96e3a9b..d6a3aa0db 100644 --- a/data/maps/Underwater_MarineCave/scripts.inc +++ b/data/maps/Underwater_MarineCave/scripts.inc @@ -4,7 +4,7 @@ Underwater_MarineCave_MapScripts:: @ 823AFB8 .byte 0 Underwater_MarineCave_MapScript1_23AFC3: @ 823AFC3 - setflag FLAG_0x8D9 + setflag FLAG_ARRIVED_AT_MARINE_CAVE_EMERGE_SPOT end Underwater_MarineCave_MapScript1_23AFC7: @ 823AFC7 diff --git a/data/maps/Underwater_SeafloorCavern/scripts.inc b/data/maps/Underwater_SeafloorCavern/scripts.inc index 4d5865511..efd2e9438 100644 --- a/data/maps/Underwater_SeafloorCavern/scripts.inc +++ b/data/maps/Underwater_SeafloorCavern/scripts.inc @@ -6,7 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 823433B Underwater_SeafloorCavern_MapScript1_23434B: @ 823434B setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - goto_if_set FLAG_0x081, Underwater_SeafloorCavern_EventScript_234358 + goto_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234358 end Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 @@ -14,7 +14,7 @@ Underwater_SeafloorCavern_EventScript_234358:: @ 8234358 end Underwater_SeafloorCavern_MapScript1_23435C: @ 823435C - call_if_set FLAG_0x081, Underwater_SeafloorCavern_EventScript_234366 + call_if_set FLAG_KYOGRE_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_234366 end Underwater_SeafloorCavern_EventScript_234366:: @ 8234366 diff --git a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc index d526c769a..df56f41ed 100644 --- a/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc +++ b/data/maps/VerdanturfTown_BattleTentLobby/scripts.inc @@ -277,12 +277,12 @@ VerdanturfTown_BattleTentLobby_Movement_201A77: @ 8201A77 VerdanturfTown_BattleTentLobby_EventScript_201A7B:: @ 8201A7B lock faceplayer - goto_if_set FLAG_0x0EB, VerdanturfTown_BattleTentLobby_EventScript_201AB2 + goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_BattleTentLobby_EventScript_201AB2 msgbox VerdanturfTown_BattleTentLobby_Text_201D9E, MSGBOX_DEFAULT giveitem_std ITEM_TM45 compare VAR_RESULT, 0 goto_if_eq VerdanturfTown_BattleTentLobby_EventScript_272054 - setflag FLAG_0x0EB + setflag FLAG_RECEIVED_TM45 msgbox VerdanturfTown_BattleTentLobby_Text_201E43, MSGBOX_DEFAULT release end @@ -305,10 +305,10 @@ VerdanturfTown_BattleTentLobby_EventScript_201AC5:: @ 8201AC5 VerdanturfTown_BattleTentLobby_EventScript_201AD0:: @ 8201AD0 lock faceplayer - goto_if_set FLAG_0x1CC, VerdanturfTown_BattleTentLobby_EventScript_201AED + goto_if_set FLAG_MET_SCOTT_IN_VERDANTURF, VerdanturfTown_BattleTentLobby_EventScript_201AED msgbox VerdanturfTown_BattleTentLobby_Text_201F3F, MSGBOX_DEFAULT addvar VAR_0x40D1, 1 - setflag FLAG_0x1CC + setflag FLAG_MET_SCOTT_IN_VERDANTURF release end @@ -434,4 +434,3 @@ VerdanturfTown_BattleTentLobby_Text_202025: @ 8202025 .string "SCOTT: I visit here regularly in hopes\n" .string "of seeing tough TRAINERS in action\l" .string "in whatever the situation.$" - diff --git a/data/maps/VerdanturfTown_WandasHouse/scripts.inc b/data/maps/VerdanturfTown_WandasHouse/scripts.inc index e185cff51..c63aa3fa1 100644 --- a/data/maps/VerdanturfTown_WandasHouse/scripts.inc +++ b/data/maps/VerdanturfTown_WandasHouse/scripts.inc @@ -4,9 +4,9 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 82028BE VerdanturfTown_WandasHouse_EventScript_2028BF:: @ 82028BF lock faceplayer - goto_if_set FLAG_0x0C1, VerdanturfTown_WandasHouse_EventScript_2028D7 + goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_2028D7 msgbox VerdanturfTown_WandasHouse_Text_202993, MSGBOX_DEFAULT - setflag FLAG_0x0C1 + setflag FLAG_WALLY_SPEECH release end @@ -18,8 +18,8 @@ VerdanturfTown_WandasHouse_EventScript_2028D7:: @ 82028D7 VerdanturfTown_WandasHouse_EventScript_2028E1:: @ 82028E1 lock faceplayer - goto_if_set FLAG_0x07E, VerdanturfTown_WandasHouse_EventScript_202909 - goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_2028FF + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202909 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_2028FF msgbox VerdanturfTown_WandasHouse_Text_202B37, MSGBOX_DEFAULT release end @@ -41,8 +41,8 @@ VerdanturfTown_WandasHouse_EventScript_202913:: @ 8202913 VerdanturfTown_WandasHouse_EventScript_20291C:: @ 820291C lock faceplayer - goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_202944 - goto_if_set FLAG_0x0BE, VerdanturfTown_WandasHouse_EventScript_20293A + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_202944 + goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_20293A msgbox VerdanturfTown_WandasHouse_Text_202D91, MSGBOX_DEFAULT release end @@ -60,8 +60,8 @@ VerdanturfTown_WandasHouse_EventScript_202944:: @ 8202944 VerdanturfTown_WandasHouse_EventScript_20294E:: @ 820294E lock faceplayer - goto_if_set FLAG_0x07E, VerdanturfTown_WandasHouse_EventScript_202989 - goto_if_set FLAG_0x4F3, VerdanturfTown_WandasHouse_EventScript_20297F + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_202989 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_20297F goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_202975 msgbox VerdanturfTown_WandasHouse_Text_202E47, MSGBOX_DEFAULT release diff --git a/data/maps/VictoryRoad_1F/scripts.inc b/data/maps/VictoryRoad_1F/scripts.inc index edf45de9c..20f36868e 100644 --- a/data/maps/VictoryRoad_1F/scripts.inc +++ b/data/maps/VictoryRoad_1F/scripts.inc @@ -45,7 +45,7 @@ VictoryRoad_1F_EventScript_235DE1:: @ 8235DE1 msgbox VictoryRoad_1F_Text_236020, MSGBOX_DEFAULT clearflag FLAG_HIDE_VICTORY_ROAD_ENTRANCE_WALLY moveobjectoffscreen 4 - setflag FLAG_0x07E + setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD copyvar VAR_0x40C3, VAR_0x8008 releaseall end diff --git a/data/mystery_event_msg.s b/data/mystery_event_msg.s index 0105d8815..406f9b434 100644 --- a/data/mystery_event_msg.s +++ b/data/mystery_event_msg.s @@ -9,7 +9,7 @@ .include "constants/constants.inc" .section .rodata - + .align 2 MysteryEventScript_StampCard:: @ 8674CB0 @@ -100,7 +100,7 @@ SurfPichu_Slot5: @ 8674DD8 sText_MysteryGiftEgg: .string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$" - + sText_FullParty: .string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$" @@ -161,7 +161,7 @@ MysteryEventScript_BattleCardInfo: @ 8675179 sText_MysteryGiftBattleCountCard: .string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$" - + sText_MysteryGiftBattleCountCard_2: .string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$" @@ -169,9 +169,9 @@ MysteryEventScript_AuroraTicket:: @ 867533C setvaddress MysteryEventScript_AuroraTicket lock faceplayer - checkflag FLAG_0x13A + checkflag FLAG_RECIEVED_AURORA_TICKET vgoto_if 1, AuroraTicket_Obtained - checkflag FLAG_0x1AD + checkflag FLAG_BATTLED_DEOXYS vgoto_if 1, AuroraTicket_Obtained checkitem ITEM_AURORA_TICKET, 1 compare_var_to_value VAR_RESULT, 1 @@ -183,8 +183,8 @@ MysteryEventScript_AuroraTicket:: @ 867533C compare_var_to_value VAR_RESULT, 0 vgoto_if 1, AuroraTicket_NoBagSpace giveitem_std ITEM_AURORA_TICKET - setflag FLAG_0x8D5 - setflag FLAG_0x13A + setflag FLAG_ENABLE_SHIP_BIRTH_ISLAND + setflag FLAG_RECIEVED_AURORA_TICKET vmessage sText_AuroraTicket2 waitmessage waitbuttonpress @@ -207,13 +207,13 @@ AuroraTicket_Obtained: @ 86753A0 sText_AuroraTicket1: .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" - + sText_AuroraTicket2: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" - + sText_AuroraTicketGot: .string "Thank you for using the MYSTERY\nGIFT System.$" - + sText_AuroraTicketNoPlace: .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" @@ -221,11 +221,11 @@ MysteryEventScript_MysticTicket:: @ 867550B setvaddress MysteryEventScript_MysticTicket lock faceplayer - checkflag FLAG_0x13B + checkflag FLAG_RECIEVED_MYSTIC_TICKET vgoto_if 1, MysticTicket_Obtained - checkflag FLAG_0x091 + checkflag FLAG_CAUGHT_LUGIA vgoto_if 1, MysticTicket_Obtained - checkflag FLAG_0x092 + checkflag FLAG_CAUGHT_HO_OH vgoto_if 1, MysticTicket_Obtained checkitem ITEM_MYSTIC_TICKET, 1 compare_var_to_value VAR_RESULT, 1 @@ -237,8 +237,8 @@ MysteryEventScript_MysticTicket:: @ 867550B compare_var_to_value VAR_RESULT, 0 vgoto_if 1, MysticTicket_NoBagSpace giveitem_std ITEM_MYSTIC_TICKET - setflag FLAG_0x8E0 - setflag FLAG_0x13B + setflag FLAG_ENABLE_SHIP_NAVEL_ROCK + setflag FLAG_RECIEVED_MYSTIC_TICKET vmessage sText_MysticTicket1 waitmessage waitbuttonpress @@ -261,13 +261,13 @@ MysticTicket_Obtained: @ 8675578 sText_MysticTicket2: .string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$" - + sText_MysticTicket1: .string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$" - + sText_MysticTicketGot: .string "Thank you for using the MYSTERY\nGIFT System.$" - + sText_MysticTicketNoPlace: .string "Oh, I'm sorry, {PLAYER}.\nYour BAG's KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$" @@ -293,9 +293,9 @@ MysteryEventScript_OldSeaMap:: @ 86757F4 setvaddress MysteryEventScript_OldSeaMap lock faceplayer - checkflag FLAG_0x13C + checkflag FLAG_RECIEVED_OLD_SEA_MAP vgoto_if 1, OldSeaMap_Obtained - checkflag FLAG_0x1CA + checkflag FLAG_CAUGHT_MEW vgoto_if 1, OldSeaMap_Obtained checkitem ITEM_OLD_SEA_MAP, 1 compare_var_to_value VAR_RESULT, 1 @@ -307,8 +307,8 @@ MysteryEventScript_OldSeaMap:: @ 86757F4 compare_var_to_value VAR_RESULT, 0 vgoto_if 1, OldSeaMap_NoBagSpace giveitem_std ITEM_OLD_SEA_MAP - setflag FLAG_0x8D6 - setflag FLAG_0x13C + setflag FLAG_ENABLE_SHIP_FARAWAY_ISLAND + setflag FLAG_RECIEVED_OLD_SEA_MAP vmessage sText_MysteryGiftOldSeaMap_1 waitmessage waitbuttonpress diff --git a/data/scripts/apprentice.inc b/data/scripts/apprentice.inc index 034732db2..ac4bd1979 100644 --- a/data/scripts/apprentice.inc +++ b/data/scripts/apprentice.inc @@ -33,7 +33,7 @@ EventScript_Apprentice:: @ 82B688D special CallApprenticeFunction compare VAR_0x8004, 0 goto_if_eq BattleFrontier_BattleTowerLobby_EventScript_2B68BE - goto_if_set FLAG_0x934, Script_Apprentice_ReleaseAndEnd + goto_if_set FLAG_DAILY_APPRENTICE_LEAVES, Script_Apprentice_ReleaseAndEnd BattleFrontier_BattleTowerLobby_EventScript_2B68BE: setvar VAR_0x8004, 11 @@ -289,7 +289,7 @@ BattleFrontier_BattleTowerLobby_EventScript_2B6DD4: Script_Apprentice_SetLeavingFlags: setflag FLAG_HIDE_APPRENTICE - setflag FLAG_0x934 + setflag FLAG_DAILY_APPRENTICE_LEAVES return Script_Apprentice_LeaveGoRight: diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 927d61439..f85ebd3d2 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -3,8 +3,8 @@ LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5 faceplayer compare VAR_0x408A, 0 goto_if_ne LilycoveCity_ContestLobby_EventScript_279D13 - call_if_set FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CEA - call_if_unset FLAG_0x05F, LilycoveCity_ContestLobby_EventScript_279CF3 + call_if_set FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CEA + call_if_unset FLAG_RECEIVED_POKEBLOCK_CASE, LilycoveCity_ContestLobby_EventScript_279CF3 goto LilycoveCity_ContestLobby_EventScript_279D5A end @@ -15,7 +15,7 @@ LilycoveCity_ContestLobby_EventScript_279CEA:: @ 8279CEA LilycoveCity_ContestLobby_EventScript_279CF3:: @ 8279CF3 msgbox LilycoveCity_ContestLobby_Text_27ADA7, MSGBOX_DEFAULT giveitem_std ITEM_POKEBLOCK_CASE - setflag FLAG_0x05F + setflag FLAG_RECEIVED_POKEBLOCK_CASE msgbox LilycoveCity_ContestLobby_Text_27AE47, MSGBOX_DEFAULT return @@ -1131,7 +1131,7 @@ LinkContestRoom1_EventScript_27ABCD:: @ 827ABCD return LinkContestRoom1_EventScript_27ABCE:: @ 827ABCE - setflag FLAG_0x10E + setflag FLAG_CONTEST_SKETCH_CREATED return LinkContestRoom1_EventScript_27ABD2:: @ 827ABD2 diff --git a/data/scripts/players_house.inc b/data/scripts/players_house.inc index f9c6cf24e..a198b0774 100644 --- a/data/scripts/players_house.inc +++ b/data/scripts/players_house.inc @@ -59,12 +59,12 @@ LittlerootTown_MaysHouse_2F_EventScript_29278D:: @ 829278D LittlerootTown_BrendansHouse_2F_EventScript_292799:: @ 8292799 LittlerootTown_MaysHouse_2F_EventScript_292799:: @ 8292799 - goto_if_set FLAG_0x051, LittlerootTown_BrendansHouse_2F_EventScript_29283F + goto_if_set FLAG_SET_WALL_CLOCK, LittlerootTown_BrendansHouse_2F_EventScript_29283F msgbox LittlerootTown_BrendansHouse_2F_Text_1F8668, MSGBOX_DEFAULT call LittlerootTown_BrendansHouse_2F_EventScript_292849 delay 30 setvar VAR_0x4092, 6 - setflag FLAG_0x051 + setflag FLAG_SET_WALL_CLOCK setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_1 setflag FLAG_HIDE_LITTLEROOT_TOWN_PLAYERS_HOUSE_VIGOROTH_2 checkplayergender @@ -318,7 +318,7 @@ LittlerootTown_MaysHouse_1F_EventScript_2929C5:: @ 82929C5 compare VAR_0x408C, 4 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A0F goto_if_set FLAG_HAS_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A19 - goto_if_set FLAG_0x052, LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_BrendansHouse_1F_EventScript_292A86 compare VAR_TEMP_1, 1 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292A94 compare VAR_0x4092, 7 @@ -333,7 +333,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A0F:: @ 8292A0F end LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 - goto_if_set FLAG_0x0D8, LittlerootTown_BrendansHouse_1F_EventScript_292A43 + goto_if_set FLAG_ENABLE_MOM_MATCH_CALL, LittlerootTown_BrendansHouse_1F_EventScript_292A43 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7E0E, MSGBOX_DEFAULT closemessage delay 30 @@ -342,7 +342,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A19:: @ 8292A19 waitfanfare closemessage delay 30 - setflag FLAG_0x0D8 + setflag FLAG_ENABLE_MOM_MATCH_CALL release end @@ -351,13 +351,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_292A43:: @ 8292A43 goto LittlerootTown_BrendansHouse_1F_EventScript_292A86 LittlerootTown_BrendansHouse_1F_EventScript_292A51:: @ 8292A51 - goto_if_set FLAG_0x085, LittlerootTown_BrendansHouse_1F_EventScript_292A86 + goto_if_set FLAG_MOM_SAYS_GOODBYE, LittlerootTown_BrendansHouse_1F_EventScript_292A86 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7D73, MSGBOX_DEFAULT giveitem_std ITEM_AMULET_COIN compare VAR_RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_272054 msgbox LittlerootTown_BrendansHouse_1F_Text_1F7DBE, MSGBOX_DEFAULT - setflag FLAG_0x085 + setflag FLAG_MOM_SAYS_GOODBYE release end @@ -475,7 +475,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292CEF playse SE_DOOR removeobject VAR_0x8009 - setflag FLAG_0x123 + setflag FLAG_RECEIVED_SS_TICKET delay 30 compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D48 @@ -484,7 +484,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 delay 20 msgbox LittlerootTown_BrendansHouse_1F_Text_1F81B9, MSGBOX_DEFAULT closemessage - setflag FLAG_SYS_TV_LATI + setflag FLAG_SYS_TV_LATIAS_LATIOS special TurnOnTVScreen delay 60 compare VAR_0x8008, 0 @@ -499,8 +499,8 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D33 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT closemessage - clearflag FLAG_SYS_TV_LATI - setflag FLAG_0x0FF + clearflag FLAG_SYS_TV_LATIAS_LATIOS + setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen compare VAR_0x8008, 0 call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_292D88 @@ -519,7 +519,7 @@ LittlerootTown_MaysHouse_1F_EventScript_292AF2:: @ 8292AF2 end LittlerootTown_BrendansHouse_1F_EventScript_292C72:: @ 8292C72 - setflag FLAG_SYS_TV_LATI + setflag FLAG_SYS_TV_LATIAS_LATIOS return LittlerootTown_BrendansHouse_1F_EventScript_292C76:: @ 8292C76 diff --git a/data/scripts/pokeblocks.inc b/data/scripts/pokeblocks.inc index 834fc38a2..63e828703 100644 --- a/data/scripts/pokeblocks.inc +++ b/data/scripts/pokeblocks.inc @@ -265,7 +265,7 @@ EventScript_Pblock1_No: @ 8293C70 EventScript_Pblock1_NoBerries: @ 8293C7A msgbox Text_Pblock1_NoBerries, MSGBOX_DEFAULT dodailyevents - goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_293C92 + goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY, LilycoveCity_ContestLobby_EventScript_293C92 goto LilycoveCity_ContestLobby_EventScript_293C9C end @@ -277,7 +277,7 @@ LilycoveCity_ContestLobby_EventScript_293C92: @ 8293C92 LilycoveCity_ContestLobby_EventScript_293C9C: @ 8293C9C msgbox LilycoveCity_ContestLobby_Text_292FD1, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY - setflag FLAG_0x921 + setflag FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY goto EventScript_Pblock1_KnowHow end @@ -552,7 +552,7 @@ LilycoveCity_ContestLobby_EventScript_293FF8: @ 8293FF8 compare VAR_RESULT, 65535 goto_if_eq LilycoveCity_ContestLobby_EventScript_294028 dodailyevents - goto_if_set FLAG_0x921, LilycoveCity_ContestLobby_EventScript_294028 + goto_if_set FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY, LilycoveCity_ContestLobby_EventScript_294028 goto LilycoveCity_ContestLobby_EventScript_294032 end @@ -564,7 +564,7 @@ LilycoveCity_ContestLobby_EventScript_294028: @ 8294028 LilycoveCity_ContestLobby_EventScript_294032: @ 8294032 msgbox LilycoveCity_ContestLobby_Text_293AF0, MSGBOX_DEFAULT giveitem_std ITEM_PECHA_BERRY - setflag FLAG_0x921 + setflag FLAG_DAILY_CONTEST_LOBBY_RECIEVED_BERRY msgbox LilycoveCity_ContestLobby_Text_293B76, MSGBOX_DEFAULT release end diff --git a/data/scripts/secret_base.inc b/data/scripts/secret_base.inc index ff5e53a06..db8aece85 100644 --- a/data/scripts/secret_base.inc +++ b/data/scripts/secret_base.inc @@ -455,7 +455,7 @@ SecretBase_RedCave1_EventScript_275B81:: @ 8275B81 SecretBase_RedCave1_EventScript_275BAB:: @ 8275BAB closemessage - setflag FLAG_0x060 + setflag FLAG_RECEIVED_SECRET_POWER special sub_80E91F8 waitstate end diff --git a/data/scripts/secret_power_tm.inc b/data/scripts/secret_power_tm.inc index 072d154f0..ed7216357 100644 --- a/data/scripts/secret_power_tm.inc +++ b/data/scripts/secret_power_tm.inc @@ -49,7 +49,7 @@ Route111_EventScript_27661E:: @ 827661E goto_if_eq Route111_EventScript_276680 msgbox Route111_Text_27636E, MSGBOX_DEFAULT closemessage - setflag FLAG_0x060 + setflag FLAG_RECEIVED_SECRET_POWER clearflag FLAG_HIDE_SLATEPORT_CITY_TM_SALESMAN compare VAR_FACING, 3 call_if_eq Route111_EventScript_27666A diff --git a/data/scripts/tv.inc b/data/scripts/tv.inc index 0b1224503..acc75f76a 100644 --- a/data/scripts/tv.inc +++ b/data/scripts/tv.inc @@ -43,8 +43,8 @@ EventScript_27EE9A:: @ 827EE9A EventScript_27EEA4:: @ 827EEA4 msgbox LittlerootTown_BrendansHouse_1F_Text_1F826F, MSGBOX_DEFAULT special InitRoamer - clearflag FLAG_SYS_TV_LATI - setflag FLAG_0x0FF + clearflag FLAG_SYS_TV_LATIAS_LATIOS + setflag FLAG_LATIOS_OR_LATIAS_ROAMING special TurnOffTVScreen releaseall end |