diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-03 13:20:55 -0800 |
---|---|---|
committer | Marcus Huderle <huderlem@gmail.com> | 2017-12-03 13:20:55 -0800 |
commit | 503bd8e491eefea7e26d6882674487f9a9765297 (patch) | |
tree | 34a4458dcd326d8b627b102c169fee8ec80f061c | |
parent | c9f38d22060841ac59e56c3f498427f53bc28569 (diff) |
Label script flags up to flag 288.
37 files changed, 109 insertions, 79 deletions
diff --git a/data-de/event_scripts.s b/data-de/event_scripts.s index c38187d0e..e5e712f7e 100644 --- a/data-de/event_scripts.s +++ b/data-de/event_scripts.s @@ -409,7 +409,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag 268 + checkflag FLAG_SECRET_BASE_UNKNOWN_16 goto_if_eq EventScript_15F3A0 goto EventScript_15F3E2 end @@ -1466,7 +1466,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FD7C:: @ 819FD7C applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty - checkflag 273 + checkflag FLAG_POKERUS_EXPLAINED goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1496,7 +1496,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA message gText_NurseJoy_Pokerus waitmessage - setflag 273 + setflag FLAG_POKERUS_EXPLAINED return OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 diff --git a/data/event_scripts.s b/data/event_scripts.s index 066c29477..b2414502f 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -409,7 +409,7 @@ gUnknown_0815F36C:: @ 815F36C EventScript_15F384: message UnknownString_81A3A87 waitmessage - checkflag 268 + checkflag FLAG_SECRET_BASE_UNKNOWN_16 goto_if_eq EventScript_15F3A0 goto EventScript_15F3E2 end @@ -1460,7 +1460,7 @@ do_heal_party:: @ 819FD7C applymovement 0x800b, OldaleTown_PokemonCenter_1F_Movement_1A0845 waitmovement 0 special ScrSpecial_HealPlayerParty - checkflag 273 + checkflag FLAG_POKERUS_EXPLAINED goto_if 0, OldaleTown_PokemonCenter_1F_EventScript_19FDCE goto OldaleTown_PokemonCenter_1F_EventScript_19FDB0 end @@ -1490,7 +1490,7 @@ OldaleTown_PokemonCenter_1F_EventScript_19FDCE:: @ 819FDCE OldaleTown_PokemonCenter_1F_EventScript_19FDEA:: @ 819FDEA message gText_NurseJoy_Pokerus waitmessage - setflag 273 + setflag FLAG_POKERUS_EXPLAINED return OldaleTown_PokemonCenter_1F_Movement_19FDF4:: @ 819FDF4 diff --git a/data/scripts/contest_hall.inc b/data/scripts/contest_hall.inc index 6c2678072..6d6ceb30e 100644 --- a/data/scripts/contest_hall.inc +++ b/data/scripts/contest_hall.inc @@ -1042,7 +1042,7 @@ LinkContestRoom1_EventScript_1A5C41:: @ 81A5C41 return LinkContestRoom1_EventScript_1A5C42:: @ 81A5C42 - setflag 270 + setflag FLAG_CONTEST_SKETCH_CREATED return LinkContestRoom1_EventScript_1A5C46:: @ 81A5C46 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index e08a108c6..b8da349f3 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -74,7 +74,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer - checkflag 257 + checkflag FLAG_RECEIVED_OLD_ROD goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 compare RESULT, 1 @@ -86,7 +86,7 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 DewfordTown_EventScript_14E0F0:: @ 814E0F0 msgbox DewfordTown_Text_16B6A8, 4 giveitem ITEM_OLD_ROD - setflag 257 + setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_16B6F9, 4 release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 7e26476fa..934e5a06c 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -5,7 +5,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 setflag SYS_POKEMON_LEAGUE_FLY - checkflag 263 + checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -47,7 +47,7 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall - checkflag 263 + checkflag FLAG_ENTERED_ELITE_FOUR goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 compare 0x4000, 11 @@ -71,7 +71,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 closemessage moveobjectoffscreen 3 moveobjectoffscreen 4 - setflag 263 + setflag FLAG_ENTERED_ELITE_FOUR releaseall end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 1a4bbc114..f6c62fbcb 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -6,7 +6,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 setflag 800 - clearflag 270 + clearflag FLAG_CONTEST_SKETCH_CREATED end FallarborTown_EventScript_14E7F5:: @ 814E7F5 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index da19b96a7..b483b0259 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -92,7 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E end FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 - checkflag 270 + checkflag FLAG_CONTEST_SKETCH_CREATED goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index f2526b3c1..4948c17b3 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -272,7 +272,7 @@ LavaridgeTown_EventScript_14E751:: @ 814E751 LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer - checkflag 266 + checkflag FLAG_RECEIVED_LAVARIDGE_EGG goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 @@ -281,7 +281,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 - setflag 266 + setflag FLAG_RECEIVED_LAVARIDGE_EGG playfanfare 370 message LavaridgeTown_Text_16C2EA waitfanfare diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 4c22a4883..0b5886131 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -256,9 +256,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 LilycoveCity_EventScript_14CD60:: @ 814CD60 playbgm 415, 1 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CDB0 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CDB9 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 @@ -278,7 +278,7 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9 return LilycoveCity_EventScript_14CDC2:: @ 814CDC2 - setflag 286 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_167AEB, 4 savebgm 0 fadedefaultbgm @@ -287,9 +287,9 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playbgm 421, 1 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CE23 - checkflag 286 + checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CE2C compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 @@ -309,7 +309,7 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C return LilycoveCity_EventScript_14CE35:: @ 814CE35 - setflag 286 + setflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE msgbox LilycoveCity_Text_16802C, 4 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 7d604d7f5..f0847e740 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -872,7 +872,7 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 message LittlerootTown_Text_16AA32 waitfanfare waitmessage - setflag 274 + setflag FLAG_RECEIVED_RUNNING_SHOES msgbox LittlerootTown_Text_16AA5C, 4 msgbox LittlerootTown_Text_16AB10, 4 closemessage diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index a478270b0..731e6fb5f 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -7,7 +7,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 - checkflag 274 + checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 56727a3c1..a58d16dd5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -7,7 +7,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E - checkflag 274 + checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 3889f55a6..0bc64765a 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -67,7 +67,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer - checkflag 284 + checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closemessage @@ -86,7 +86,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall - checkflag 284 + checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE goto_if_eq MauvilleCity_EventScript_14C292 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 @@ -177,7 +177,7 @@ MauvilleCity_EventScript_14C23C:: @ 814C23C return MauvilleCity_EventScript_14C285:: @ 814C285 - setflag 284 + setflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE msgbox MauvilleCity_Text_165DE8, 4 release end diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index a500a246e..7104ebee7 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -4,7 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer - checkflag 258 + checkflag FLAG_RECEIVED_COIN_CASE goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 @@ -30,7 +30,7 @@ MauvilleCity_House2_EventScript_15731B:: @ 815731B msgbox MauvilleCity_House2_Text_182515, 4 removeitem ITEM_HARBOR_MAIL, 1 giveitem ITEM_COIN_CASE - setflag 258 + setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_15733D end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 998b850aa..71b572ba2 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -68,7 +68,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011 MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer - checkflag 276 + checkflag FLAG_RECEIVED_KINGS_ROCK goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 compare RESULT, 0 @@ -77,7 +77,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027 giveitem ITEM_KINGS_ROCK compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B - setflag 276 + setflag FLAG_RECEIVED_KINGS_ROCK release end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 026d54bfe..5d6e42874 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -4,13 +4,13 @@ MtPyre_1F_MapScripts:: @ 815D322 MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer - checkflag 282 + checkflag FLAG_RECEIVED_CLEANSE_TAG goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B - setflag 282 + setflag FLAG_RECEIVED_CLEANSE_TAG release end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index d71c5478f..e9456ae13 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -169,7 +169,7 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer - checkflag 259 + checkflag FLAG_RETURNED_RED_OR_BLUE_ORB goto_if_eq MtPyre_Summit_EventScript_15D6C4 checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A @@ -210,7 +210,7 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 .else msgbox MtPyre_Summit_Text_1B639C, 4 .endif - setflag 259 + setflag FLAG_RETURNED_RED_OR_BLUE_ORB release end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b9c0deb63..20044f020 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -50,13 +50,13 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag 279 + checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 279 + setflag FLAG_RECEIVED_WHITE_HERB release end @@ -104,13 +104,13 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag 262 + checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 262 + setflag FLAG_RECEIVED_TM09 release end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 0c5419af6..f4838a211 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -328,7 +328,7 @@ Route109_EventScript_14F725:: @ 814F725 lock faceplayer special GetPlayerBigGuyGirlString - checkflag 280 + checkflag FLAG_RECEIVED_SOFT_SAND goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND @@ -337,7 +337,7 @@ Route109_EventScript_14F725:: @ 814F725 closemessage applymovement LAST_TALKED, Route109_Movement_1A083D waitmovement 0 - setflag 280 + setflag FLAG_RECEIVED_SOFT_SAND release end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index acd145dc3..9896af5ae 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -13,13 +13,13 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer setvar 0x8008, 3 - checkflag 277 + checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B - setflag 277 + setflag FLAG_RECEIVED_MACHO_BRACE goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index b217f24c4..3cdd40d51 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -9,13 +9,13 @@ Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer - checkflag 261 + checkflag FLAG_RECEIVED_TM28 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B - setflag 261 + setflag FLAG_RECEIVED_TM28 release end diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 13843f758..2ce9c1bfa 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -4,7 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer - checkflag 267 + checkflag FLAG_RECEIVED_FOSSIL_MON goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 003bcc397..c9e33288b 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -35,14 +35,14 @@ Route116_EventScript_150A71:: @ 8150A71 Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end Route116_EventScript_150A94:: @ 8150A94 - setflag 287 + setflag FLAG_MET_DEVON_EMPLOYEE giveitem ITEM_REPEAT_BALL compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 2bb43fc90..c6937170e 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -52,9 +52,9 @@ Route120_EventScript_151682:: @ 8151682 Route120_MapScript1_151686:: @ 8151686 checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route120_EventScript_1516A2 - checkflag 285 + checkflag FLAG_RECEIVED_DEVON_SCOPE call_if 1, Route120_EventScript_1516B5 - checkflag 285 + checkflag FLAG_RECEIVED_DEVON_SCOPE call_if 0, Route120_EventScript_1516DA end @@ -239,7 +239,7 @@ Route120_EventScript_151908:: @ 8151908 waitmovement 0 msgbox Route120_Text_171A40, 4 giveitem ITEM_DEVON_SCOPE - setflag 285 + setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, 4 closemessage applymovement 31, Route120_Movement_1A0845 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 76134aa43..8708bde71 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -549,7 +549,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag 288 + checkflag FLAG_MET_RIVAL_RUSTBORO goto_if_eq RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 @@ -559,13 +559,13 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA end RustboroCity_EventScript_14C8FD:: @ 814C8FD - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_1670A7, 4 release end RustboroCity_EventScript_14C90A:: @ 814C90A - setflag 288 + setflag FLAG_MET_RIVAL_RUSTBORO msgbox RustboroCity_Text_167213, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index c17a1ef68..097fee3fb 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -25,7 +25,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 faceplayer compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release @@ -139,7 +139,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 - setflag 267 + setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare @@ -159,7 +159,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 - setflag 267 + setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 3756b5c72..0cd4a36a8 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -146,7 +146,7 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer - checkflag 272 + checkflag FLAG_RECEIVED_EXP_SHARE goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 @@ -162,7 +162,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 giveitem ITEM_EXP_SHARE compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B - setflag 272 + setflag FLAG_RECEIVED_EXP_SHARE msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index cb722a6af..69f977e79 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -6,9 +6,9 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 faceplayer message RustboroCity_Mart_Text_1A0BE4 waitmessage - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if 0, RustboroCity_Mart_EventScript_157BEF - checkflag 287 + checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_Mart_EventScript_157C18 end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 73b364f5e..9fd77bd6b 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -77,7 +77,7 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer - checkflag 275 + checkflag FLAG_RECEIVED_QUICK_CLAW goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E @@ -90,7 +90,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE closemessage applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 - setflag 275 + setflag FLAG_RECEIVED_QUICK_CLAW release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 8c28628ea..18018316a 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -124,7 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 sethealplace 8 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag 260 + checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate @@ -134,7 +134,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 SSTidalCorridor_EventScript_15FE17:: @ 815FE17 sethealplace 4 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag 260 + checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index c7cd4447d..0a48ae453 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -4,13 +4,13 @@ SSTidalRooms_MapScripts:: @ 815FF05 SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer - checkflag 260 + checkflag FLAG_RECEIVED_TM49 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B - setflag 260 + setflag FLAG_RECEIVED_TM49 msgbox SSTidalRooms_Text_199C1A, 4 release end diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index db5779efe..9f4908cf6 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -36,13 +36,13 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer - checkflag 283 + checkflag FLAG_RECEIVED_FOCUS_BAND goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B - setflag 283 + setflag FLAG_RECEIVED_FOCUS_BAND release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index f8070f1a1..220ca3374 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -12,13 +12,13 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer - checkflag 265 + checkflag FLAG_RECEIVED_TM41 goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B - setflag 265 + setflag FLAG_RECEIVED_TM41 msgbox SlateportCity_ContestHall_Text_17CE28, 4 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ab71c9728..2486099ef 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -270,7 +270,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 faceplayer checkflag BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F - checkflag 271 + checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 @@ -289,7 +289,7 @@ SlateportCity_Harbor_EventScript_15624E:: @ 815624E end SlateportCity_Harbor_EventScript_156258:: @ 8156258 - setflag 271 + setflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE msgbox SlateportCity_Harbor_Text_17FF35, 4 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 2776dd084..be5f5a8ff 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -167,7 +167,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A giveitem ITEM_TM46 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 - setflag 269 + setflag FLAG_RECEIVED_TM46 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closemessage compare FACING, 2 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index ea2acf374..7f3c331bd 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -196,7 +196,7 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer - checkflag 278 + checkflag FLAG_RECEIVED_SOOTHE_BELL goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore @@ -215,7 +215,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A giveitem ITEM_SOOTHE_BELL compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B - setflag 278 + setflag FLAG_RECEIVED_SOOTHE_BELL release end diff --git a/include/constants/flags.h b/include/constants/flags.h index 013d20f84..0d2a3efbd 100644 --- a/include/constants/flags.h +++ b/include/constants/flags.h @@ -208,8 +208,38 @@ #define FLAG_RECEIVED_CHARCOAL 0xFE #define FLAG_LATIOS_OR_LATIAS_ROAMING 0xFF #define FLAG_RECEIVED_REPEAT_BALL 0x100 - -#define FLAG_RECEIVED_TM10 0x108 +#define FLAG_RECEIVED_OLD_ROD 0x101 +#define FLAG_RECEIVED_COIN_CASE 0x102 +#define FLAG_RETURNED_RED_OR_BLUE_ORB 0x103 +#define FLAG_RECEIVED_TM49 0x104 +#define FLAG_RECEIVED_TM28 0x105 +#define FLAG_RECEIVED_TM09 0x106 +#define FLAG_ENTERED_ELITE_FOUR 0x107 +#define FLAG_RECEIVED_TM10 0x108 +#define FLAG_RECEIVED_TM41 0x109 +#define FLAG_RECEIVED_LAVARIDGE_EGG 0x10A +#define FLAG_RECEIVED_FOSSIL_MON 0x10B +#define FLAG_SECRET_BASE_UNKNOWN_16 0x10C +#define FLAG_RECEIVED_TM46 0x10D +#define FLAG_CONTEST_SKETCH_CREATED 0x10E +#define FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE 0x10F +#define FLAG_RECEIVED_EXP_SHARE 0x110 +#define FLAG_POKERUS_EXPLAINED 0x111 +#define FLAG_RECEIVED_RUNNING_SHOES 0x112 +#define FLAG_RECEIVED_QUICK_CLAW 0x113 +#define FLAG_RECEIVED_KINGS_ROCK 0x114 +#define FLAG_RECEIVED_MACHO_BRACE 0x115 +#define FLAG_RECEIVED_SOOTHE_BELL 0x116 +#define FLAG_RECEIVED_WHITE_HERB 0x117 +#define FLAG_RECEIVED_SOFT_SAND 0x118 + +#define FLAG_RECEIVED_CLEANSE_TAG 0x11A +#define FLAG_RECEIVED_FOCUS_BAND 0x11B +#define FLAG_DECLINED_WALLY_BATTLE_MAUVILLE 0x11C +#define FLAG_RECEIVED_DEVON_SCOPE 0x11D +#define FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE 0x11E +#define FLAG_MET_DEVON_EMPLOYEE 0x11F +#define FLAG_MET_RIVAL_RUSTBORO 0x120 #define TRAINER_FLAG_START 0x500 |