From 5e9e52e3a95f4d7301565ad86084907f2d8a94e6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 9 Sep 2017 22:04:01 -0500 Subject: more renaming/refactoring --- data/scripts/maps/Route101.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 8462603a6..1acd4b598 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -224,7 +224,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F movesprite 255, 6, 13 move 255, Route101_Movement_1A083F waitmove 0 - special ChooseStarter + special ScrSpecial_ChooseStarter waitstate move 2, Route101_Movement_14EAD7 waitmove 0 -- cgit v1.2.3 From 6f9ad223a51eab0a2d39296c963486689392d0b5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 10 Sep 2017 16:21:30 -0500 Subject: stuff --- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 2 +- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 7ba7540c4..bfc5b6a79 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -64,7 +64,7 @@ AncientTomb_EventScript_15F050:: @ 815F050 setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag 937 setflag 2145 - special StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 023892d36..5517a9c7e 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -62,7 +62,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 pause 40 waitpokecry setflag 2145 - special StartBattle_GroudonKyogre + special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag 2145 specialval RESULT, sub_810E300 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index df40fc126..97a22bae3 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -64,7 +64,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag 935 setflag 2145 - special StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index b16f386d8..8f2ce6dc1 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -84,7 +84,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 setflag 2145 - special StartBattle_Regi + special ScrSpecial_StartRegiBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index dc5efe243..123b099fe 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -32,7 +32,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 move 255, PetalburgCity_Movement_14B7CC waitmove 0 msgbox PetalburgCity_Text_16D361, 4 - special StartBattle_WallyTutorial + special ScrSpecial_StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_16D3DE, 4 movecoords 2, PetalburgCity_Movement_1A083F, 0, 0 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 23db6a8ea..d659a23c1 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -21,7 +21,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 waitpokecry setflag 773 setflag 2145 - special StartBattle_Rayquaza + special ScrSpecial_StartRayquazaBattle waitstate clearflag 2145 release diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 3adf3545f..e5eaadab5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -67,7 +67,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 setflag 2145 - special StartBattle_SouthernIsland + special ScrSpecial_StartSouthernIslandBattle waitstate clearflag 2145 releaseall -- cgit v1.2.3 From 2c87516ca3efa260b96b92ededb24d75edfe49e8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 12 Sep 2017 20:23:23 -0500 Subject: more labels and fix build --- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 8cd3639a5..a1570ac13 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -242,7 +242,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 special LoadPlayerParty closebutton pause 2 - call BattleTower_Lobby_EventScript_19F806 + call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 3c8cc5bdf..6bdcf55e2 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -330,7 +330,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 compare RESULT, 0 jumpeq LilycoveCity_ContestLobby_EventScript_158C35 - call LilycoveCity_ContestLobby_EventScript_19F806 + call S_DoSaveDialog hidebox 0, 0, 15, 9 compare RESULT, 0 jumpeq LilycoveCity_ContestLobby_EventScript_158C35 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 14836f3e0..59669596a 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -103,7 +103,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 compare RESULT, 0 callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty - call MossdeepCity_GameCorner_1F_EventScript_19F806 + call S_DoSaveDialog compare RESULT, 0 jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 -- cgit v1.2.3 From 270bd98d41a19c516a4be95f522deb26cc4300a9 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 13 Sep 2017 00:03:22 -0500 Subject: more labeling --- data/scripts/maps/BattleTower_BattleRoom.inc | 4 ++-- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc | 6 +++--- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route110.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 176d8e8e8..2f0fb97b9 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -20,7 +20,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA msgbox 0x20234cc, 4 waittext closebutton - special HealPlayerParty + special ScrSpecial_HealPlayerParty setvar 0x8004, 0 setvar 0x8005, 0 special sub_813556C @@ -56,7 +56,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special sub_8135A14 fanfare 368 waitfanfare - special HealPlayerParty + special ScrSpecial_HealPlayerParty BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 msgbox BattleTower_BattleRoom_Text_19AD09, 5 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 8f2ce6dc1..2f8ba2121 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -31,7 +31,7 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 setflag 2133 end -gIslandCave_EventScript_OpenRegiiceChamber:: @ 815EF19 +S_OpenRegiceChamber:: @ 815EF19 setmaptile 7, 19, 554, 1 setmaptile 8, 19, 555, 1 setmaptile 9, 19, 556, 1 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index dcf74b77c..09d19c1c5 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -29,7 +29,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD message LilycoveCity_CoveLilyMotel_2F_Text_18708F waittext call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 - special sub_810D6A4 + special ScrSpecial_ShowDiploma waitstate release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index f8ff8f9f3..aca6b16d4 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -135,7 +135,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE callif 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 - special HealPlayerParty + special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E warp SouthernIsland_Exterior, 255, 13, 22 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 6adea2eb2..2786c930c 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -21,7 +21,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE special sub_80FA148 compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71 - special sub_80F9F3C + special ScrSpecial_CountPokemonMoves compare RESULT, 1 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 @@ -30,7 +30,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 0 compare 0x8005, 4 jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE - special sub_80F9F84 + special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 switch RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53 @@ -47,7 +47,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 end LilycoveCity_MoveDeletersHouse_EventScript_159B64:: @ 8159B64 - special sub_80F9F84 + special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6D0, 4 releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index a5a013d5f..c7d1201fd 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -29,7 +29,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E compare RESULT, 2 callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton - special HealPlayerParty + special ScrSpecial_HealPlayerParty move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmove 0 special LoadPlayerParty diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1acd4b598..d945aadfc 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -229,7 +229,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F move 2, Route101_Movement_14EAD7 waitmove 0 msgbox Route101_Text_16D191, 4 - special HealPlayerParty + special ScrSpecial_HealPlayerParty setflag 720 clearflag 721 setflag 700 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index d8c19d92c..a77feaa0f 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -25,7 +25,7 @@ Route110_MapScript2_14F933:: @ 814F933 .2byte 0 Route110_EventScript_14F93D:: @ 814F93D - special BeginCyclingRoadChallenge + special ScrSpecial_BeginCyclingRoadChallenge setvar 0x40a9, 2 return diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 48eb5c1df..e156f8948 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -69,7 +69,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 specialval RESULT, LeadMonHasEffortRibbon compare RESULT, 1 callif 1, SlateportCity_EventScript_14BB35 - specialval RESULT, GetLeadMonEVCount + specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 callif 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 -- cgit v1.2.3 From ae5ec7f5b05218ba21c53ef632590a5243a7f647 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:17:14 -0500 Subject: Replace script commands: snop -> nop, snop1 -> nop1, jump -> goto --- data/scripts/maps/BattleTower_BattleRoom.inc | 2 +- data/scripts/maps/BattleTower_Corridor.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 8 +- data/scripts/maps/BattleTower_Outside.inc | 4 +- data/scripts/maps/DewfordTown.inc | 6 +- data/scripts/maps/DewfordTown_Gym.inc | 10 +-- data/scripts/maps/DewfordTown_Hall.inc | 4 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 12 +-- .../maps/FallarborTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 6 +- data/scripts/maps/IslandCave.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 4 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 +- data/scripts/maps/LilycoveCity.inc | 16 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 20 ++--- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +-- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 22 +++--- .../maps/LilycoveCity_DepartmentStore_1F.inc | 6 +- data/scripts/maps/LilycoveCity_Harbor.inc | 6 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 18 ++--- data/scripts/maps/LittlerootTown.inc | 16 ++-- .../maps/LittlerootTown_BrendansHouse_1F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 6 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 26 +++---- data/scripts/maps/MauvilleCity_GameCorner.inc | 86 +++++++++++----------- data/scripts/maps/MauvilleCity_Gym.inc | 18 ++--- data/scripts/maps/MauvilleCity_House2.inc | 2 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 34 ++++----- data/scripts/maps/MtChimney.inc | 4 +- data/scripts/maps/MtPyre_Summit.inc | 12 +-- data/scripts/maps/OldaleTown.inc | 18 ++--- data/scripts/maps/PacifidlogTown_House2.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 8 +- data/scripts/maps/PetalburgCity_Gym.inc | 14 ++-- data/scripts/maps/PetalburgCity_WallysHouse.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 8 +- data/scripts/maps/Route103.inc | 20 ++--- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 +- data/scripts/maps/Route109.inc | 12 +-- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +- data/scripts/maps/Route110.inc | 32 ++++---- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 20 ++--- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 74 +++++++++---------- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 4 +- data/scripts/maps/Route111.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 12 +-- data/scripts/maps/Route113_GlassWorkshop.inc | 34 ++++----- data/scripts/maps/Route116.inc | 8 +- data/scripts/maps/Route118.inc | 6 +- data/scripts/maps/Route119.inc | 20 ++--- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 18 ++--- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +-- data/scripts/maps/Route123_BerryMastersHouse.inc | 12 +-- .../maps/Route124_DivingTreasureHuntersHouse.inc | 50 ++++++------- data/scripts/maps/RustboroCity.inc | 28 +++---- data/scripts/maps/RustboroCity_Gym.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 12 +-- data/scripts/maps/SSTidalCorridor.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 2 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 12 +-- data/scripts/maps/SlateportCity_Harbor.inc | 20 ++--- .../maps/SlateportCity_OceanicMuseum_1F.inc | 8 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 6 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 6 +- 84 files changed, 479 insertions(+), 479 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 2f0fb97b9..750c64b74 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -85,7 +85,7 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C waitmove 0 move 2, BattleTower_BattleRoom_Movement_160AD0 waitmove 0 - jump BattleTower_BattleRoom_EventScript_1608FA + goto BattleTower_BattleRoom_EventScript_1608FA BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 4ccf2028c..f4f50d90b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -26,7 +26,7 @@ BattleTower_Corridor_EventScript_16088B:: @ 816088B move 1, BattleTower_Corridor_Movement_1608D5 move 255, BattleTower_Corridor_Movement_1608D4 waitmove 0 - jump BattleTower_Corridor_EventScript_1608C2 + goto BattleTower_Corridor_EventScript_1608C2 BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 move 1, BattleTower_Corridor_Movement_1608D2 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index a1570ac13..50c9c9152 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -260,7 +260,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 BattleTower_Lobby_EventScript_160600:: @ 8160600 msgbox BattleTower_Lobby_Text_19A0D1, 4 - jump BattleTower_Lobby_EventScript_1604BE + goto BattleTower_Lobby_EventScript_1604BE BattleTower_Lobby_EventScript_16060D:: @ 816060D switch RESULT @@ -269,16 +269,16 @@ BattleTower_Lobby_EventScript_16060D:: @ 816060D BattleTower_Lobby_EventScript_160628:: @ 8160628 msgbox BattleTower_Lobby_Text_19A249, 4 - jump BattleTower_Lobby_EventScript_160662 + goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160635:: @ 8160635 msgbox BattleTower_Lobby_Text_19A32D, 4 - jump BattleTower_Lobby_EventScript_160662 + goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 setvar 0x8004, 12 special sub_8135668 - jump BattleTower_Lobby_EventScript_160652 + goto BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F special LoadPlayerParty diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 02c4e0c6f..01e10ebd3 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -17,7 +17,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 jumpeq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext - jump BattleTower_Outside_EventScript_16018E + goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_16018E:: @ 816018E @@ -59,7 +59,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB BattleTower_Outside_EventScript_160226:: @ 8160226 message BattleTower_Outside_Text_199E7A waittext - jump BattleTower_Outside_EventScript_16018E + goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_160232:: @ 8160232 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 8ca2eb3df..9a914fcd8 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -24,14 +24,14 @@ DewfordTown_EventScript_14E002:: @ 814E002 DewfordTown_EventScript_14E04B:: @ 814E04B msgbox DewfordTown_Text_16B57D, 4 closebutton - jump DewfordTown_EventScript_14E151 + goto DewfordTown_EventScript_14E151 release end DewfordTown_EventScript_14E05B:: @ 814E05B msgbox DewfordTown_Text_16B5D2, 4 closebutton - jump DewfordTown_EventScript_14E1D8 + goto DewfordTown_EventScript_14E1D8 release end @@ -52,7 +52,7 @@ DewfordTown_EventScript_14E076:: @ 814E076 DewfordTown_EventScript_14E093:: @ 814E093 msgbox DewfordTown_Text_16B417, 4 closebutton - jump DewfordTown_EventScript_14E151 + goto DewfordTown_EventScript_14E151 end DewfordTown_EventScript_14E0A2:: @ 814E0A2 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 51d4f44ba..457f510f0 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -17,7 +17,7 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 jumpeq DewfordTown_Gym_EventScript_1530B6 compare 0x8000, 2 jumpeq DewfordTown_Gym_EventScript_1530B2 - jump DewfordTown_Gym_EventScript_1530AE + goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA darken 0 @@ -41,7 +41,7 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 - snop1 + nop1 comparevars 0x8000, 0x8001 jumpeq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 @@ -119,7 +119,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 callif 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 - jump DewfordTown_Gym_EventScript_1531B5 + goto DewfordTown_Gym_EventScript_1531B5 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 @@ -179,14 +179,14 @@ DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall checkflag 2056 jumpeq DewfordTown_Gym_EventScript_15327E - jump DewfordTown_Gym_EventScript_153288 + goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall checkflag 2056 jumpeq DewfordTown_Gym_EventScript_15327E - jump DewfordTown_Gym_EventScript_153288 + goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15327E:: @ 815327E diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 28d396a3e..70689f7ac 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -122,13 +122,13 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall setvar 0x8008, 0 - jump DewfordTown_Hall_EventScript_15340A + goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall setvar 0x8008, 1 - jump DewfordTown_Hall_EventScript_15340A + goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_15340A:: @ 815340A diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index bddcfa74b..4d2179cc1 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -28,7 +28,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE move 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmove 0 setvar 0x4001, 1 - jump EverGrandeCity_ChampionsRoom_EventScript_15B805 + goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall end @@ -41,7 +41,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 playmusic 454, 0 msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 - jump EverGrandeCity_ChampionsRoom_EventScript_15B821 + goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 @@ -84,7 +84,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 waitmove 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4 - jump EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 end EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB @@ -97,7 +97,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB waitmove 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4 - jump EverGrandeCity_ChampionsRoom_EventScript_15B8F0 + goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 end EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index d10957a8e..55e38da15 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -46,7 +46,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 playmusic 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 - jump EverGrandeCity_DrakesRoom_EventScript_15B795 + goto EverGrandeCity_DrakesRoom_EventScript_15B795 end EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 039b2a772..9271f3da9 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -46,7 +46,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA playmusic 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 - jump EverGrandeCity_GlaciasRoom_EventScript_15B6FB + goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB end EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 7e8ee131a..9b693c227 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -46,7 +46,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 playmusic 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C - jump EverGrandeCity_PhoebesRoom_EventScript_15B661 + goto EverGrandeCity_PhoebesRoom_EventScript_15B661 end EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 84a6c3fdc..bbb95e0ad 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -47,7 +47,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 playmusic 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 - jump EverGrandeCity_SidneysRoom_EventScript_15B5C7 + goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 end EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 1351b96d3..c36036ce3 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -9,7 +9,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 jumpeq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 setflag 1 - jump FallarborTown_House2_EventScript_153CB6 + goto FallarborTown_House2_EventScript_153CB6 end FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 @@ -19,7 +19,7 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT case 0, FallarborTown_House2_EventScript_153D60 - jump FallarborTown_House2_EventScript_153CE4 + goto FallarborTown_House2_EventScript_153CE4 end FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 @@ -33,7 +33,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 jumpeq FallarborTown_House2_EventScript_153D52 compare 0x8005, 0 jumpeq FallarborTown_House2_EventScript_153D44 - jump FallarborTown_House2_EventScript_153D1A + goto FallarborTown_House2_EventScript_153D1A end FallarborTown_House2_EventScript_153D1A:: @ 8153D1A @@ -44,17 +44,17 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A jumpeq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 - jump FallarborTown_House2_EventScript_153D60 + goto FallarborTown_House2_EventScript_153D60 end FallarborTown_House2_EventScript_153D44:: @ 8153D44 msgbox FallarborTown_House2_Text_177C78, 4 - jump FallarborTown_House2_EventScript_153CE4 + goto FallarborTown_House2_EventScript_153CE4 end FallarborTown_House2_EventScript_153D52:: @ 8153D52 msgbox FallarborTown_House2_Text_177D33, 4 - jump FallarborTown_House2_EventScript_153CE4 + goto FallarborTown_House2_EventScript_153CE4 end FallarborTown_House2_EventScript_153D60:: @ 8153D60 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 636cac8f1..bb924026c 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -36,13 +36,13 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 move 4, FallarborTown_PokemonCenter_1F_Movement_153B74 waitmove 0 - jump FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 move 4, FallarborTown_PokemonCenter_1F_Movement_153B81 waitmove 0 - jump FallarborTown_PokemonCenter_1F_EventScript_153B69 + goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 44f5890a2..971b05f1b 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -32,7 +32,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 setflag 2060 setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 - jump FortreeCity_Gym_EventScript_157F3E + goto FortreeCity_Gym_EventScript_157F3E end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E @@ -82,14 +82,14 @@ FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall checkflag 2060 jumpeq FortreeCity_Gym_EventScript_157FFD - jump FortreeCity_Gym_EventScript_158007 + goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall checkflag 2060 jumpeq FortreeCity_Gym_EventScript_157FFD - jump FortreeCity_Gym_EventScript_158007 + goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FFD:: @ 8157FFD diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 2f8ba2121..e706914d7 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -50,7 +50,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59 braillemsg IslandCave_Braille_1C54FC special DoBrailleWait waitstate - jump IslandCave_EventScript_15EF95 + goto IslandCave_EventScript_15EF95 end IslandCave_EventScript_15EF72:: @ 815EF72 @@ -65,7 +65,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C jumpeq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate - jump IslandCave_EventScript_15EF95 + goto IslandCave_EventScript_15EF95 end IslandCave_EventScript_15EF95:: @ 815EF95 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 685e44d58..125b2d42b 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -86,7 +86,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB giveitem ITEM_GO_GOGGLES setflag 221 msgbox LavaridgeTown_Text_16BE7D, 4 - jump LavaridgeTown_EventScript_14E5F5 + goto LavaridgeTown_EventScript_14E5F5 end LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 @@ -94,7 +94,7 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 giveitem ITEM_GO_GOGGLES setflag 221 msgbox LavaridgeTown_Text_16C020, 4 - jump LavaridgeTown_EventScript_14E5F5 + goto LavaridgeTown_EventScript_14E5F5 end LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 57506bdb6..1f5810e7f 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -90,7 +90,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag 806 setvar 0x4053, 1 - jump LavaridgeTown_Gym_1F_EventScript_1537A7 + goto LavaridgeTown_Gym_1F_EventScript_1537A7 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 @@ -150,14 +150,14 @@ LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall checkflag 2058 jumpeq LavaridgeTown_Gym_1F_EventScript_153898 - jump LavaridgeTown_Gym_1F_EventScript_1538A2 + goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall checkflag 2058 jumpeq LavaridgeTown_Gym_1F_EventScript_153898 - jump LavaridgeTown_Gym_1F_EventScript_1538A2 + goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153898:: @ 8153898 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b688107ce..082e88bd5 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -318,32 +318,32 @@ LilycoveCity_EventScript_14CE35:: @ 814CE35 LilycoveCity_EventScript_14CE46:: @ 814CE46 trainerbattle 3, OPPONENT_MAY_11, 0, LilycoveCity_Text_167BD5 - jump LilycoveCity_EventScript_14CEA6 + goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE56:: @ 814CE56 trainerbattle 3, OPPONENT_MAY_12, 0, LilycoveCity_Text_167BD5 - jump LilycoveCity_EventScript_14CEA6 + goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE66:: @ 814CE66 trainerbattle 3, OPPONENT_MAY_10, 0, LilycoveCity_Text_167BD5 - jump LilycoveCity_EventScript_14CEA6 + goto LilycoveCity_EventScript_14CEA6 end LilycoveCity_EventScript_14CE76:: @ 814CE76 trainerbattle 3, OPPONENT_BRENDAN_11, 0, LilycoveCity_Text_1680E4 - jump LilycoveCity_EventScript_14CF12 + goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE86:: @ 814CE86 trainerbattle 3, OPPONENT_BRENDAN_12, 0, LilycoveCity_Text_1680E4 - jump LilycoveCity_EventScript_14CF12 + goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CE96:: @ 814CE96 trainerbattle 3, OPPONENT_BRENDAN_10, 0, LilycoveCity_Text_1680E4 - jump LilycoveCity_EventScript_14CF12 + goto LilycoveCity_EventScript_14CF12 end LilycoveCity_EventScript_14CEA6:: @ 814CEA6 @@ -357,7 +357,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 callif 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 - jump LilycoveCity_EventScript_14CF6B + goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CEDE:: @ 814CEDE @@ -393,7 +393,7 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 compare RESULT, 1 callif 1, LilycoveCity_EventScript_14CF50 clearflag 760 - jump LilycoveCity_EventScript_14CF6B + goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CF47:: @ 814CF47 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 6bdcf55e2..ebd59cd91 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -312,13 +312,13 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 message LilycoveCity_ContestLobby_Text_18848C waittext setflag 2 - jump LilycoveCity_ContestLobby_EventScript_158BF0 + goto LilycoveCity_ContestLobby_EventScript_158BF0 end LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE message LilycoveCity_ContestLobby_Text_188584 waittext - jump LilycoveCity_ContestLobby_EventScript_158BF0 + goto LilycoveCity_ContestLobby_EventScript_158BF0 end LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA @@ -348,7 +348,7 @@ LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0 LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27 msgbox LilycoveCity_ContestLobby_Text_1885A7, 4 - jump LilycoveCity_ContestLobby_EventScript_158B85 + goto LilycoveCity_ContestLobby_EventScript_158B85 end LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 @@ -378,17 +378,17 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96 msgbox LilycoveCity_ContestLobby_Text_1A664A, 4 - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158CA4:: @ 8158CA4 msgbox LilycoveCity_ContestLobby_Text_1A669F, 4 - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 msgbox LilycoveCity_ContestLobby_Text_1A66DC, 4 - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 @@ -411,7 +411,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA case 5, LilycoveCity_ContestLobby_EventScript_158C35 case 127, LilycoveCity_ContestLobby_EventScript_158C35 copyvar CONTEST_CATEGORY, RESULT - jump LilycoveCity_ContestLobby_EventScript_158C42 + goto LilycoveCity_ContestLobby_EventScript_158C42 end LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 @@ -437,7 +437,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82 msgbox LilycoveCity_ContestLobby_Text_188750, 4 - jump LilycoveCity_ContestLobby_EventScript_158CEA + goto LilycoveCity_ContestLobby_EventScript_158CEA end LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 @@ -466,7 +466,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 msgbox LilycoveCity_ContestLobby_Text_18873A, 4 - jump LilycoveCity_ContestLobby_EventScript_158CEA + goto LilycoveCity_ContestLobby_EventScript_158CEA end LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 @@ -476,7 +476,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 message2 LilycoveCity_ContestLobby_Text_188845 waittext addvar 0x8004, 65535 - jump LilycoveCity_ContestLobby_EventScript_158DEE + goto LilycoveCity_ContestLobby_EventScript_158DEE end LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 09d19c1c5..48758ac5c 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -22,7 +22,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag 2 fanfare 370 waitfanfare - jump LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 74b746633..b28fe3a47 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -26,7 +26,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 @@ -35,7 +35,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 @@ -44,7 +44,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E @@ -62,7 +62,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 - jump LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index f84c84201..c1be4bbe7 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -72,8 +72,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD message LilycoveCity_DepartmentStoreRooftop_Text_18C72B waittext showmoney 0, 0 - snop - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + nop + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE @@ -84,22 +84,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7C3, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C setvar 0x4000, 26 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 setvar 0x4000, 27 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 setvar 0x4000, 28 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D:: @ 815A23D @@ -145,7 +145,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 compare 0x4001, 2 callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 - snop + nop bufferitem 0, 0x4000 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 @@ -177,23 +177,23 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferitem 1, 0x4000 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E message LilycoveCity_DepartmentStoreRooftop_Text_18C72B waittext - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A:: @ 815A37A msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C7AF, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C79, 4 - jump LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 + goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A396 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index feff49c42..ac1198aee 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E giveitem 0x8005 compare RESULT, 0 jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E9C - jump LilycoveCity_DepartmentStore_1F_EventScript_159E6E + goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end LilycoveCity_DepartmentStore_1F_EventScript_159E3A:: @ 8159E3A @@ -75,7 +75,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E56:: @ 8159E56 LilycoveCity_DepartmentStore_1F_EventScript_159E60:: @ 8159E60 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4E27, 4 - jump LilycoveCity_DepartmentStore_1F_EventScript_159E6E + goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end LilycoveCity_DepartmentStore_1F_EventScript_159E6E:: @ 8159E6E @@ -101,7 +101,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C copyvar 0x4045, 0x8005 - jump LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index aca6b16d4..471d1f8b5 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -12,7 +12,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 checkitem ITEM_EON_TICKET, 1 compare RESULT, 1 jumpeq LilycoveCity_Harbor_EventScript_1599EE - jump LilycoveCity_Harbor_EventScript_1598BA + goto LilycoveCity_Harbor_EventScript_1598BA end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA @@ -29,7 +29,7 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD jumpeq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext - jump LilycoveCity_Harbor_EventScript_1598F1 + goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 @@ -70,7 +70,7 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B LilycoveCity_Harbor_EventScript_15997E:: @ 815997E message LilycoveCity_Harbor_Text_18B4E2 waittext - jump LilycoveCity_Harbor_EventScript_1598F1 + goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_15998A:: @ 815998A diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index b3564ebf5..06a3ae4ca 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -6,25 +6,25 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 checkflag 160 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 checkflag 161 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 checkflag 162 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 checkflag 163 jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 @@ -35,25 +35,25 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD setmaptile 10, 6, 606, 1 setmaptile 11, 6, 607, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 setmaptile 18, 6, 604, 1 setmaptile 19, 6, 605, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D setmaptile 14, 10, 608, 1 setmaptile 15, 10, 609, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 setmaptile 6, 10, 602, 1 setmaptile 7, 10, 603, 1 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 + goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D @@ -118,7 +118,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4 move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4 - jump LilycoveCity_LilycoveMuseum_2F_EventScript_15875C + goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C end LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 2a4f77529..2da725de7 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -371,38 +371,38 @@ LittlerootTown_EventScript_14D860:: @ 814D860 lockall setvar 0x8008, 0 movesprite 4, 10, 9 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall setvar 0x8008, 1 movesprite 4, 11, 9 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall setvar 0x8008, 2 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall setvar 0x8008, 3 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall setvar 0x8008, 4 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall setvar 0x8008, 5 - jump LittlerootTown_EventScript_14D8B6 + goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8B6:: @ 814D8B6 @@ -429,7 +429,7 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 callif 1, LittlerootTown_EventScript_14DAAA compare RESULT, 1 callif 1, LittlerootTown_EventScript_14DAED - jump LittlerootTown_EventScript_14DD2B + goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14D926:: @ 814D926 @@ -856,7 +856,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange - jump LittlerootTown_EventScript_14DD2B + goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14DD2B:: @ 814DD2B diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 69206566a..849115390 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -78,14 +78,14 @@ LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall setvar 0x8004, 1 setvar 0x8005, 0 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B6956 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall setvar 0x8004, 0 setvar 0x8005, 1 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF + goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 @@ -120,5 +120,5 @@ LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 setvar 0x8005, 0 move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmove 0 - jump LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 + goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 5f7f20d63..b70dc0687 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -78,14 +78,14 @@ LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall setvar 0x8004, 1 setvar 0x8005, 1 - jump LittlerootTown_MaysHouse_1F_EventScript_1B6956 + goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall setvar 0x8004, 1 setvar 0x8005, 1 - jump LittlerootTown_MaysHouse_1F_EventScript_1B6B2E + goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 @@ -167,5 +167,5 @@ LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 setvar 0x8005, 1 move 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmove 0 - jump LittlerootTown_MaysHouse_1F_EventScript_1B69B7 + goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 94aeadfa6..80148ce08 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -39,7 +39,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA setvar 0x8004, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 - jump LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA @@ -69,7 +69,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A lockall move 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B waitmove 0 - jump LittlerootTown_ProfessorBirchsLab_EventScript_152DBA + goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA end LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 1b2827f2a..78d1961e5 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -101,7 +101,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 move 6, MauvilleCity_Movement_1A0835 waitmove 0 msgbox MauvilleCity_Text_165D50, 5 - jump MauvilleCity_EventScript_14C154 + goto MauvilleCity_EventScript_14C154 end MauvilleCity_EventScript_14C154:: @ 814C154 @@ -131,7 +131,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187 move 6, MauvilleCity_Movement_14C2B6 move 7, MauvilleCity_Movement_14C2DF waitmove 0 - jump MauvilleCity_EventScript_14C22B + goto MauvilleCity_EventScript_14C22B end MauvilleCity_EventScript_14C1D9:: @ 814C1D9 @@ -150,7 +150,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 move 6, MauvilleCity_Movement_14C2C1 move 7, MauvilleCity_Movement_14C2E8 waitmove 0 - jump MauvilleCity_EventScript_14C22B + goto MauvilleCity_EventScript_14C22B end MauvilleCity_EventScript_14C22B:: @ 814C22B @@ -186,7 +186,7 @@ MauvilleCity_EventScript_14C292:: @ 814C292 move 6, MauvilleCity_Movement_1A0839 waitmove 0 msgbox MauvilleCity_Text_165EE2, 5 - jump MauvilleCity_EventScript_14C154 + goto MauvilleCity_EventScript_14C154 end MauvilleCity_Movement_14C2AA:: @ 814C2AA diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 5436bf38a..e0faf85a0 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -41,19 +41,19 @@ MauvilleCity_BikeShop_EventScript_156817:: @ 8156817 MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 setflag 90 - jump MauvilleCity_BikeShop_EventScript_1567F0 + goto MauvilleCity_BikeShop_EventScript_1567F0 end MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D msgbox MauvilleCity_BikeShop_Text_181332, 4 giveitem ITEM_MACH_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 msgbox MauvilleCity_BikeShop_Text_18134A, 4 giveitem ITEM_ACRO_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 @@ -92,7 +92,7 @@ MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 msgbox MauvilleCity_BikeShop_Text_181439, 4 removeitem ITEM_ACRO_BIKE, 1 giveitem ITEM_MACH_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA @@ -100,7 +100,7 @@ MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA msgbox MauvilleCity_BikeShop_Text_181408, 4 removeitem ITEM_MACH_BIKE, 1 giveitem ITEM_ACRO_BIKE - jump MauvilleCity_BikeShop_EventScript_156861 + goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B @@ -110,7 +110,7 @@ MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B MauvilleCity_BikeShop_EventScript_156914:: @ 8156914 message MauvilleCity_BikeShop_Text_1815EA waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 @@ -126,19 +126,19 @@ MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 MauvilleCity_BikeShop_EventScript_156962:: @ 8156962 message MauvilleCity_BikeShop_Text_18162C waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15696E:: @ 815696E message MauvilleCity_BikeShop_Text_1816F5 waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15697A:: @ 815697A message MauvilleCity_BikeShop_Text_1817BF waittext - jump MauvilleCity_BikeShop_EventScript_156920 + goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 @@ -148,7 +148,7 @@ MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 MauvilleCity_BikeShop_EventScript_156988:: @ 8156988 message MauvilleCity_BikeShop_Text_181892 waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 @@ -164,19 +164,19 @@ MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 MauvilleCity_BikeShop_EventScript_1569D6:: @ 81569D6 message MauvilleCity_BikeShop_Text_1818D4 waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569E2:: @ 81569E2 message MauvilleCity_BikeShop_Text_18199A waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE message MauvilleCity_BikeShop_Text_181A3D waittext - jump MauvilleCity_BikeShop_EventScript_156994 + goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569FA:: @ 81569FA diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index f20a7dacd..fa5b58885 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -11,16 +11,16 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 message MauvilleCity_GameCorner_Text_181CB4 waittext showmoney 0, 0 - snop + nop showcoins 0, 5 - jump MauvilleCity_GameCorner_EventScript_156A60 + goto MauvilleCity_GameCorner_EventScript_156A60 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 multichoicedef 15, 0, 49, 0, 0 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 - jump MauvilleCity_GameCorner_EventScript_156B4C + goto MauvilleCity_GameCorner_EventScript_156B4C end @ 8156A87 @@ -28,7 +28,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 - jump MauvilleCity_GameCorner_EventScript_156B4C + goto MauvilleCity_GameCorner_EventScript_156B4C end MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE @@ -41,7 +41,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE givecoins 50 paymoney 0x3e8, 0 updatemoney 0, 0 - snop + nop updatecoins 0, 5 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 @@ -60,7 +60,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 givecoins 500 paymoney 0x2710, 0 updatemoney 0, 0 - snop + nop updatecoins 0, 5 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 @@ -110,12 +110,12 @@ MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 waittext showcoins 0, 0 setvar 0x4001, 0 - jump MauvilleCity_GameCorner_EventScript_156BA6 + goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B message MauvilleCity_GameCorner_Text_181E17 waittext - jump MauvilleCity_GameCorner_EventScript_156BA6 + goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 multichoice 12, 0, 48, 0 @@ -124,23 +124,23 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 case 1, MauvilleCity_GameCorner_EventScript_156BF0 case 2, MauvilleCity_GameCorner_EventScript_156BFE case 3, MauvilleCity_GameCorner_EventScript_156D0D - jump MauvilleCity_GameCorner_EventScript_156D0D + goto MauvilleCity_GameCorner_EventScript_156D0D end MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 bufferdecor 0, 88 - jump MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 bufferdecor 0, 89 - jump MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 bufferdecor 0, 90 - jump MauvilleCity_GameCorner_EventScript_156C0C + goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 @@ -165,7 +165,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 @@ -181,7 +181,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA @@ -197,17 +197,17 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156CF4:: @ 8156CF4 msgbox MauvilleCity_GameCorner_Text_181E76, 4 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02 call MauvilleCity_GameCorner_EventScript_1A02B8 - jump MauvilleCity_GameCorner_EventScript_156B9B + goto MauvilleCity_GameCorner_EventScript_156B9B end MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D @@ -231,12 +231,12 @@ MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 waittext showcoins 0, 0 setvar 0x4001, 0 - jump MauvilleCity_GameCorner_EventScript_156D54 + goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 message MauvilleCity_GameCorner_Text_181E17 waittext - jump MauvilleCity_GameCorner_EventScript_156D54 + goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 multichoice 12, 0, 55, 0 @@ -247,33 +247,33 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 case 3, MauvilleCity_GameCorner_EventScript_156DD0 case 4, MauvilleCity_GameCorner_EventScript_156DDE case 5, MauvilleCity_GameCorner_EventScript_156F77 - jump MauvilleCity_GameCorner_EventScript_156F77 + goto MauvilleCity_GameCorner_EventScript_156F77 end MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 bufferitem 0, ITEM_TM32 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 bufferitem 0, ITEM_TM29 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 bufferitem 0, ITEM_TM35 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 bufferitem 0, ITEM_TM24 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 bufferitem 0, ITEM_TM13 - jump MauvilleCity_GameCorner_EventScript_156DEC + goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 @@ -299,7 +299,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 @@ -314,7 +314,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 @@ -329,7 +329,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA @@ -344,7 +344,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 @@ -359,17 +359,17 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 updatecoins 0, 0 playsfx 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F5E:: @ 8156F5E msgbox MauvilleCity_GameCorner_Text_181E76, 4 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C call MauvilleCity_GameCorner_EventScript_1A02A5 - jump MauvilleCity_GameCorner_EventScript_156D49 + goto MauvilleCity_GameCorner_EventScript_156D49 end MauvilleCity_GameCorner_EventScript_156F77:: @ 8156F77 @@ -408,7 +408,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 setflag 226 - jump MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 @@ -419,7 +419,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 setflag 226 - jump MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F @@ -430,7 +430,7 @@ MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 setflag 226 - jump MauvilleCity_GameCorner_EventScript_157072 + goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157059:: @ 8157059 @@ -456,7 +456,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C compare RESULT, 1 jumpeq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C @@ -469,33 +469,33 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 playsfx 95 - jump MauvilleCity_GameCorner_EventScript_1570CA + goto MauvilleCity_GameCorner_EventScript_1570CA end MauvilleCity_GameCorner_EventScript_1570CA:: @ 81570CA msgbox MauvilleCity_GameCorner_Text_1820DD, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_1570D8:: @ 81570D8 lock faceplayer msgbox MauvilleCity_GameCorner_Text_182120, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_1570E8:: @ 81570E8 lock faceplayer msgbox MauvilleCity_GameCorner_Text_18217C, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 lock faceplayer msgbox MauvilleCity_GameCorner_Text_182241, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 @@ -509,14 +509,14 @@ MauvilleCity_GameCorner_EventScript_157115:: @ 8157115 lock faceplayer msgbox MauvilleCity_GameCorner_Text_182272, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 lock faceplayer msgbox MauvilleCity_GameCorner_Text_1822F4, 4 - jump MauvilleCity_GameCorner_EventScript_157108 + goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index bd5c119f3..75136dcef 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -48,19 +48,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B MauvilleCity_Gym_EventScript_15657D:: @ 815657D setvar 0x8004, 0 special MauvilleGymSpecial1 - jump MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B setvar 0x8004, 1 special MauvilleGymSpecial1 - jump MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 setvar 0x8004, 2 special MauvilleGymSpecial1 - jump MauvilleCity_Gym_EventScript_156491 + goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 @@ -92,7 +92,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB special MauvilleGymSpecial3 special DrawWholeMapView playsfx 44 - jump MauvilleCity_Gym_EventScript_15661D + goto MauvilleCity_Gym_EventScript_15661D end MauvilleCity_Gym_EventScript_15661D:: @ 815661D @@ -117,7 +117,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B jumpeq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 - jump MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_1566BA end MauvilleCity_Gym_EventScript_156670:: @ 8156670 @@ -128,7 +128,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 jumpeq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 - jump MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_1566BA end MauvilleCity_Gym_EventScript_156695:: @ 8156695 @@ -139,7 +139,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 jumpeq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 - jump MauvilleCity_Gym_EventScript_1566BA + goto MauvilleCity_Gym_EventScript_1566BA end MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA @@ -206,14 +206,14 @@ MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall checkflag 2057 jumpeq MauvilleCity_Gym_EventScript_156781 - jump MauvilleCity_Gym_EventScript_15678B + goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall checkflag 2057 jumpeq MauvilleCity_Gym_EventScript_156781 - jump MauvilleCity_Gym_EventScript_15678B + goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156781:: @ 8156781 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 8a73af034..edb74f9f9 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -31,7 +31,7 @@ MauvilleCity_House2_EventScript_15731B:: @ 815731B removeitem ITEM_HARBOR_MAIL, 1 giveitem ITEM_COIN_CASE setflag 258 - jump MauvilleCity_House2_EventScript_15733D + goto MauvilleCity_House2_EventScript_15733D end MauvilleCity_House2_EventScript_15733D:: @ 815733D diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index b2b5dabd4..0e9ba15ef 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -5,7 +5,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 sethealplace 5 call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B - jump MauvilleCity_PokemonCenter_1F_EventScript_157365 + goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 20f43a150..733f6816e 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -5,19 +5,19 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 checkflag 100 jumpeq MossdeepCity_Gym_EventScript_15A510 - jump MossdeepCity_Gym_EventScript_15A4E8 + goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 checkflag 101 jumpeq MossdeepCity_Gym_EventScript_15A528 - jump MossdeepCity_Gym_EventScript_15A4F7 + goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 checkflag 102 jumpeq MossdeepCity_Gym_EventScript_15A540 - jump MossdeepCity_Gym_EventScript_15A506 + goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 @@ -28,19 +28,19 @@ MossdeepCity_Gym_EventScript_15A506:: @ 815A506 MossdeepCity_Gym_EventScript_15A510:: @ 815A510 setmaptile 5, 5, 516, 0 setmaptile 2, 7, 569, 1 - jump MossdeepCity_Gym_EventScript_15A4E8 + goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 setmaptile 8, 14, 516, 0 setmaptile 8, 10, 569, 1 - jump MossdeepCity_Gym_EventScript_15A4F7 + goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 setmaptile 15, 17, 524, 0 setmaptile 17, 15, 569, 1 - jump MossdeepCity_Gym_EventScript_15A506 + goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 @@ -68,7 +68,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag 905 - jump MossdeepCity_Gym_EventScript_15A5C6 + goto MossdeepCity_Gym_EventScript_15A5C6 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 @@ -89,7 +89,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA waitmove 0 setmaptile 5, 5, 516, 0 setmaptile 2, 7, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A619:: @ 815A619 @@ -104,7 +104,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 waitmove 0 setmaptile 5, 5, 524, 0 setmaptile 2, 7, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A646:: @ 815A646 @@ -116,7 +116,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 waitmove 0 setmaptile 8, 14, 516, 0 setmaptile 8, 10, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A675:: @ 815A675 @@ -125,7 +125,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 waitmove 0 setmaptile 8, 14, 517, 0 setmaptile 8, 10, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A @@ -137,7 +137,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A waitmove 0 setmaptile 15, 17, 524, 0 setmaptile 17, 15, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 @@ -146,7 +146,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 waitmove 0 setmaptile 15, 17, 516, 0 setmaptile 17, 15, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE @@ -158,7 +158,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE waitmove 0 setmaptile 1, 23, 525, 0 setmaptile 5, 24, 569, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D @@ -167,7 +167,7 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D waitmove 0 setmaptile 1, 23, 516, 0 setmaptile 5, 24, 568, 1 - jump MossdeepCity_Gym_EventScript_15A619 + goto MossdeepCity_Gym_EventScript_15A619 end MossdeepCity_Gym_EventScript_15A742:: @ 815A742 @@ -230,14 +230,14 @@ MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall checkflag 2061 jumpeq MossdeepCity_Gym_EventScript_15A81A - jump MossdeepCity_Gym_EventScript_15A824 + goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall checkflag 2061 jumpeq MossdeepCity_Gym_EventScript_15A81A - jump MossdeepCity_Gym_EventScript_15A824 + goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A81A:: @ 815A81A diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index fdebcf102..0134adbdf 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -16,7 +16,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 lock faceplayer showmoney 0, 0 - snop + nop msgbox MtChimney_Text_195760, 5 compare RESULT, 0 jumpeq MtChimney_EventScript_15D00B @@ -43,7 +43,7 @@ MtChimney_EventScript_15CFF3:: @ 815CFF3 MtChimney_EventScript_15D000:: @ 815D000 paymoney 0xc8, 0 updatemoney 0, 0 - snop + nop return MtChimney_EventScript_15D00B:: @ 815D00B diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e352ac30e..f30b6fb9e 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -9,19 +9,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall setvar 0x8008, 0 - jump MtPyre_Summit_EventScript_15D4E1 + goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall setvar 0x8008, 1 - jump MtPyre_Summit_EventScript_15D4E1 + goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall setvar 0x8008, 2 - jump MtPyre_Summit_EventScript_15D4E1 + goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 @@ -247,19 +247,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall setvar 0x8008, 0 - jump MtPyre_Summit_EventScript_15D6F2 + goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall setvar 0x8008, 1 - jump MtPyre_Summit_EventScript_15D6F2 + goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall setvar 0x8008, 2 - jump MtPyre_Summit_EventScript_15D6F2 + goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 68ed80949..f1d554d87 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -56,21 +56,21 @@ OldaleTown_EventScript_14DE07:: @ 814DE07 move 2, OldaleTown_Movement_14DE97 move 255, OldaleTown_Movement_14DEC1 waitmove 0 - jump OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE1E:: @ 814DE1E move 2, OldaleTown_Movement_14DEA2 move 255, OldaleTown_Movement_14DECB waitmove 0 - jump OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE35:: @ 814DE35 move 255, OldaleTown_Movement_14DEB9 move 2, OldaleTown_Movement_14DE8E waitmove 0 - jump OldaleTown_EventScript_14DE4C + goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE4C:: @ 814DE4C @@ -225,7 +225,7 @@ OldaleTown_EventScript_14DF30:: @ 814DF30 lockall move 4, OldaleTown_Movement_1A0839 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF41:: @ 814DF41 @@ -234,7 +234,7 @@ OldaleTown_EventScript_14DF41:: @ 814DF41 waitmove 0 move 255, OldaleTown_Movement_1A0843 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF5C:: @ 814DF5C @@ -243,7 +243,7 @@ OldaleTown_EventScript_14DF5C:: @ 814DF5C waitmove 0 move 255, OldaleTown_Movement_1A0843 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF77:: @ 814DF77 @@ -252,7 +252,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 waitmove 0 move 255, OldaleTown_Movement_1A0843 waitmove 0 - jump OldaleTown_EventScript_14DF92 + goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF92:: @ 814DF92 @@ -265,12 +265,12 @@ OldaleTown_EventScript_14DF92:: @ 814DF92 OldaleTown_EventScript_14DFAA:: @ 814DFAA msgbox OldaleTown_Text_16B196, 4 - jump OldaleTown_EventScript_14DFC6 + goto OldaleTown_EventScript_14DFC6 end OldaleTown_EventScript_14DFB8:: @ 814DFB8 msgbox OldaleTown_Text_16B1BE, 4 - jump OldaleTown_EventScript_14DFC6 + goto OldaleTown_EventScript_14DFC6 end OldaleTown_EventScript_14DFC6:: @ 814DFC6 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e45f09de4..f2174441f 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -19,7 +19,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 2 jumpif 4, PacifidlogTown_House2_EventScript_15421B - jump PacifidlogTown_House2_EventScript_154225 + goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 123b099fe..ed575844c 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -157,25 +157,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall setvar 0x8008, 0 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall setvar 0x8008, 1 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall setvar 0x8008, 2 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall setvar 0x8008, 3 - jump PetalburgCity_EventScript_14B866 + goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B866:: @ 814B866 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index c534cb538..f8dfb0a39 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -123,22 +123,22 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 PetalburgCity_Gym_EventScript_15463D:: @ 815463D setvar 0x8008, 0 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 setvar 0x8008, 1 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 setvar 0x8008, 2 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E setvar 0x8008, 3 - jump PetalburgCity_Gym_EventScript_154669 + goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 @@ -408,7 +408,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 clearflag 940 call PetalburgCity_Gym_EventScript_1544ED special DrawWholeMapView - jump PetalburgCity_Gym_EventScript_154A2C + goto PetalburgCity_Gym_EventScript_154A2C end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C @@ -1036,14 +1036,14 @@ PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall checkflag 2059 jumpeq PetalburgCity_Gym_EventScript_1551CA - jump PetalburgCity_Gym_EventScript_1551D4 + goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall checkflag 2059 jumpeq PetalburgCity_Gym_EventScript_1551CA - jump PetalburgCity_Gym_EventScript_1551D4 + goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551CA:: @ 81551CA diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index e8ac407dc..fb521aa46 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -20,7 +20,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 checkflag 122 jumpeq PetalburgCity_WallysHouse_EventScript_154431 - jump PetalburgCity_WallysHouse_EventScript_154406 + goto PetalburgCity_WallysHouse_EventScript_154406 end PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index c24f7c195..463fbec3c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -36,7 +36,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 call PetalburgWoods_EventScript_15CDFA move 4, PetalburgWoods_Movement_15CE80 waitmove 0 - jump PetalburgWoods_EventScript_15CE69 + goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CD42:: @ 815CD42 @@ -71,7 +71,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 call PetalburgWoods_EventScript_15CDFA move 4, PetalburgWoods_Movement_15CE95 waitmove 0 - jump PetalburgWoods_EventScript_15CE69 + goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 @@ -93,12 +93,12 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA giveitem ITEM_GREAT_BALL compare RESULT, 0 jumpeq PetalburgWoods_EventScript_15CE3F - jump PetalburgWoods_EventScript_15CE4D + goto PetalburgWoods_EventScript_15CE4D end PetalburgWoods_EventScript_15CE3F:: @ 815CE3F msgbox PetalburgWoods_Text_195182, 4 - jump PetalburgWoods_EventScript_15CE4D + goto PetalburgWoods_EventScript_15CE4D end PetalburgWoods_EventScript_15CE4D:: @ 815CE4D diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 4c7da3d0d..2d0c1c921 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -50,42 +50,42 @@ Route103_EventScript_14EC04:: @ 814EC04 Route103_EventScript_14EC5D:: @ 814EC5D trainerbattle 3, OPPONENT_MAY_4, 0, Route103_Text_16D65B - jump Route103_EventScript_14ECBD + goto Route103_EventScript_14ECBD end Route103_EventScript_14EC6D:: @ 814EC6D trainerbattle 3, OPPONENT_MAY_7, 0, Route103_Text_16D65B - jump Route103_EventScript_14ECBD + goto Route103_EventScript_14ECBD end Route103_EventScript_14EC7D:: @ 814EC7D trainerbattle 3, OPPONENT_MAY_1, 0, Route103_Text_16D65B - jump Route103_EventScript_14ECBD + goto Route103_EventScript_14ECBD end Route103_EventScript_14EC8D:: @ 814EC8D trainerbattle 3, OPPONENT_BRENDAN_4, 0, Route103_Text_16D836 - jump Route103_EventScript_14ECCB + goto Route103_EventScript_14ECCB end Route103_EventScript_14EC9D:: @ 814EC9D trainerbattle 3, OPPONENT_BRENDAN_7, 0, Route103_Text_16D836 - jump Route103_EventScript_14ECCB + goto Route103_EventScript_14ECCB end Route103_EventScript_14ECAD:: @ 814ECAD trainerbattle 3, OPPONENT_BRENDAN_1, 0, Route103_Text_16D836 - jump Route103_EventScript_14ECCB + goto Route103_EventScript_14ECCB end Route103_EventScript_14ECBD:: @ 814ECBD msgbox Route103_Text_16D688, 4 - jump Route103_EventScript_14ECD9 + goto Route103_EventScript_14ECD9 end Route103_EventScript_14ECCB:: @ 814ECCB msgbox Route103_Text_16D856, 4 - jump Route103_EventScript_14ECD9 + goto Route103_EventScript_14ECD9 end Route103_EventScript_14ECD9:: @ 814ECD9 @@ -103,7 +103,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C playsfx 10 move 2, Route103_Movement_14ED6B waitmove 0 - jump Route103_EventScript_14ED46 + goto Route103_EventScript_14ED46 end Route103_EventScript_14ED29:: @ 814ED29 @@ -112,7 +112,7 @@ Route103_EventScript_14ED29:: @ 814ED29 playsfx 10 move 2, Route103_Movement_14ED74 waitmove 0 - jump Route103_EventScript_14ED46 + goto Route103_EventScript_14ED46 end Route103_EventScript_14ED46:: @ 814ED46 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b617767bf..d829c6a93 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -9,7 +9,7 @@ Route104_MapScript2_14EE97:: @ 814EE97 Route104_EventScript_14EEA1:: @ 814EEA1 lockall - jump Route104_EventScript_14EFD5 + goto Route104_EventScript_14EFD5 end Route104_MapScript1_14EEA8:: @ 814EEA8 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 5c6704e67..693939cf4 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -30,7 +30,7 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB jumpif 0, Route104_MrBrineysHouse_EventScript_15BD65 checkflag 149 jumpif 0, Route104_MrBrineysHouse_EventScript_15BD7E - jump Route104_MrBrineysHouse_EventScript_15BD32 + goto Route104_MrBrineysHouse_EventScript_15BD32 end Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E @@ -39,7 +39,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 jumpeq Route104_MrBrineysHouse_EventScript_15BD97 - jump Route104_MrBrineysHouse_EventScript_15BDAB + goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 @@ -56,14 +56,14 @@ Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 compare RESULT, 0 jumpeq Route104_MrBrineysHouse_EventScript_15BD97 - jump Route104_MrBrineysHouse_EventScript_15BDAB + goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 compare RESULT, 0 jumpeq Route104_MrBrineysHouse_EventScript_15BD97 - jump Route104_MrBrineysHouse_EventScript_15BDAB + goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD97:: @ 815BD97 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 58c38173e..6e9d4adff 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -17,19 +17,19 @@ Route109_EventScript_14F4D3:: @ 814F4D3 Route109_EventScript_14F518:: @ 814F518 move 255, Route109_Movement_14F66D waitmove 0 - jump Route109_EventScript_14F548 + goto Route109_EventScript_14F548 end Route109_EventScript_14F528:: @ 814F528 move 255, Route109_Movement_14F675 waitmove 0 - jump Route109_EventScript_14F548 + goto Route109_EventScript_14F548 end Route109_EventScript_14F538:: @ 814F538 move 255, Route109_Movement_14F678 waitmove 0 - jump Route109_EventScript_14F548 + goto Route109_EventScript_14F548 end Route109_EventScript_14F548:: @ 814F548 @@ -273,7 +273,7 @@ Route109_EventScript_14F680:: @ 814F680 faceplayer checkflag 149 jumpif 0, Route109_EventScript_14F691 - jump Route109_EventScript_14F6AF + goto Route109_EventScript_14F6AF end Route109_EventScript_14F691:: @ 814F691 @@ -281,7 +281,7 @@ Route109_EventScript_14F691:: @ 814F691 msgbox Route109_Text_16E0F9, 5 compare RESULT, 0 jumpeq Route109_EventScript_14F6F1 - jump Route109_EventScript_14F6E2 + goto Route109_EventScript_14F6E2 end Route109_EventScript_14F6AF:: @ 814F6AF @@ -297,7 +297,7 @@ Route109_EventScript_14F6AF:: @ 814F6AF Route109_EventScript_14F6E2:: @ 814F6E2 msgbox Route109_Text_16E159, 4 closebutton - jump Route109_EventScript_14F4D3 + goto Route109_EventScript_14F4D3 end Route109_EventScript_14F6F1:: @ 814F6F1 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e1d9c380b..e8afb54fb 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -41,7 +41,7 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoney 0, 0 - snop + nop msgbox Route109_SeashoreHouse_Text_19B702, 5 compare RESULT, 1 jumpeq Route109_SeashoreHouse_EventScript_160E5A @@ -60,7 +60,7 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 updatemoney 0, 0 - snop + nop giveitem ITEM_SODA_POP hidemoney 0, 0 release diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index a77feaa0f..745faaddf 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -279,27 +279,27 @@ Route110_EventScript_14FC39:: @ 814FC39 Route110_EventScript_14FCC3:: @ 814FCC3 msgbox Route110_Text_16EF9F, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCD1:: @ 814FCD1 msgbox Route110_Text_16F012, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCDF:: @ 814FCDF msgbox Route110_Text_16F069, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCED:: @ 814FCED msgbox Route110_Text_16F0D0, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FCFB:: @ 814FCFB msgbox Route110_Text_16F139, 4 - jump Route110_EventScript_14FD09 + goto Route110_EventScript_14FD09 end Route110_EventScript_14FD09:: @ 814FD09 @@ -310,17 +310,17 @@ Route110_EventScript_14FD09:: @ 814FD09 Route110_EventScript_14FD13:: @ 814FD13 setvar 0x8008, 1 - jump Route110_EventScript_14FD34 + goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E setvar 0x8008, 2 - jump Route110_EventScript_14FD34 + goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 setvar 0x8008, 3 - jump Route110_EventScript_14FD34 + goto Route110_EventScript_14FD34 end Route110_EventScript_14FD34:: @ 814FD34 @@ -369,24 +369,24 @@ Route110_EventScript_14FDB1:: @ 814FDB1 Route110_EventScript_14FDE0:: @ 814FDE0 trainerbattle 3, OPPONENT_MAY_5, 0, Route110_Text_16E826 - jump Route110_EventScript_14FE10 + goto Route110_EventScript_14FE10 end Route110_EventScript_14FDF0:: @ 814FDF0 trainerbattle 3, OPPONENT_MAY_8, 0, Route110_Text_16E826 - jump Route110_EventScript_14FE10 + goto Route110_EventScript_14FE10 end Route110_EventScript_14FE00:: @ 814FE00 trainerbattle 3, OPPONENT_MAY_2, 0, Route110_Text_16E826 - jump Route110_EventScript_14FE10 + goto Route110_EventScript_14FE10 end Route110_EventScript_14FE10:: @ 814FE10 msgbox Route110_Text_16E84C, 4 call Route110_EventScript_14FEA5 msgbox Route110_Text_16E8B3, 4 - jump Route110_EventScript_14FEB2 + goto Route110_EventScript_14FEB2 end Route110_EventScript_14FE2B:: @ 814FE2B @@ -399,24 +399,24 @@ Route110_EventScript_14FE2B:: @ 814FE2B Route110_EventScript_14FE5A:: @ 814FE5A trainerbattle 3, OPPONENT_BRENDAN_5, 0, Route110_Text_16EA0F - jump Route110_EventScript_14FE8A + goto Route110_EventScript_14FE8A end Route110_EventScript_14FE6A:: @ 814FE6A trainerbattle 3, OPPONENT_BRENDAN_8, 0, Route110_Text_16EA0F - jump Route110_EventScript_14FE8A + goto Route110_EventScript_14FE8A end Route110_EventScript_14FE7A:: @ 814FE7A trainerbattle 3, OPPONENT_BRENDAN_2, 0, Route110_Text_16EA0F - jump Route110_EventScript_14FE8A + goto Route110_EventScript_14FE8A end Route110_EventScript_14FE8A:: @ 814FE8A msgbox Route110_Text_16EA2A, 4 call Route110_EventScript_14FEA5 msgbox Route110_Text_16EA7B, 4 - jump Route110_EventScript_14FEB2 + goto Route110_EventScript_14FEB2 end Route110_EventScript_14FEA5:: @ 814FEA5 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 6b6d45af2..b4f800876 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -15,12 +15,12 @@ Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall compare 0x40ab, 0 jumpeq Route110_TrickHousePuzzle1_EventScript_161D26 - jump Route110_TrickHousePuzzle1_EventScript_161892 + goto Route110_TrickHousePuzzle1_EventScript_161892 end Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 setvar 0x40ab, 1 - jump Route110_TrickHousePuzzle1_EventScript_16189C + goto Route110_TrickHousePuzzle1_EventScript_16189C end Route110_TrickHousePuzzle1_EventScript_161D31:: @ 8161D31 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 27ffad50d..96e9d8143 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -25,12 +25,12 @@ Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall compare 0x40ac, 0 jumpeq Route110_TrickHousePuzzle2_EventScript_161DD5 - jump Route110_TrickHousePuzzle2_EventScript_161892 + goto Route110_TrickHousePuzzle2_EventScript_161892 end Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 setvar 0x40ac, 1 - jump Route110_TrickHousePuzzle2_EventScript_16189C + goto Route110_TrickHousePuzzle2_EventScript_16189C end Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index efd96ec44..c81c5dd1c 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -248,50 +248,50 @@ Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB lockall setvar 0x4008, 1 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 lockall setvar 0x4008, 2 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 lockall setvar 0x4008, 3 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF lockall setvar 0x4008, 4 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB lockall setvar 0x4008, 5 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 lockall setvar 0x4008, 6 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 lockall setvar 0x4008, 7 - jump Route110_TrickHousePuzzle3_EventScript_1625FF + goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF call Route110_TrickHousePuzzle3_EventScript_162612 playsfx 21 call Route110_TrickHousePuzzle3_EventScript_161F12 - jump Route110_TrickHousePuzzle3_EventScript_1626AD + goto Route110_TrickHousePuzzle3_EventScript_1626AD end Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 @@ -372,12 +372,12 @@ Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall compare 0x40ad, 0 jumpeq Route110_TrickHousePuzzle3_EventScript_1626FD - jump Route110_TrickHousePuzzle3_EventScript_161892 + goto Route110_TrickHousePuzzle3_EventScript_161892 end Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD setvar 0x40ad, 1 - jump Route110_TrickHousePuzzle3_EventScript_16189C + goto Route110_TrickHousePuzzle3_EventScript_16189C end Route110_TrickHousePuzzle3_EventScript_162708:: @ 8162708 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 89d5e45c3..11c0074d9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -5,12 +5,12 @@ Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall compare 0x40ae, 0 jumpeq Route110_TrickHousePuzzle4_EventScript_162760 - jump Route110_TrickHousePuzzle4_EventScript_161892 + goto Route110_TrickHousePuzzle4_EventScript_161892 end Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 setvar 0x40ae, 1 - jump Route110_TrickHousePuzzle4_EventScript_16189C + goto Route110_TrickHousePuzzle4_EventScript_16189C end Route110_TrickHousePuzzle4_EventScript_16276B:: @ 816276B diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index cd5d2fbb9..be416e326 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -15,12 +15,12 @@ Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall compare 0x40af, 0 jumpeq Route110_TrickHousePuzzle5_EventScript_1627E7 - jump Route110_TrickHousePuzzle5_EventScript_161892 + goto Route110_TrickHousePuzzle5_EventScript_161892 end Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 setvar 0x40af, 1 - jump Route110_TrickHousePuzzle5_EventScript_16189C + goto Route110_TrickHousePuzzle5_EventScript_16189C end Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 @@ -30,7 +30,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 compare 0x4001, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 @@ -40,7 +40,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 compare 0x4002, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 @@ -50,7 +50,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 compare 0x4003, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 @@ -60,7 +60,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 compare 0x4004, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 @@ -70,91 +70,91 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 compare 0x4005, 1 jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF lockall setvar 0x4009, 2 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB lockall setvar 0x4009, 3 - jump Route110_TrickHousePuzzle5_EventScript_16293F + goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_1629B3 + goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 lockall setvar 0x4009, 2 - jump Route110_TrickHousePuzzle5_EventScript_162A27 + goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_162A9B + goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B lockall setvar 0x4009, 0 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 lockall setvar 0x4009, 1 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 lockall setvar 0x4009, 2 - jump Route110_TrickHousePuzzle5_EventScript_162B0F + goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F @@ -272,7 +272,7 @@ Route110_TrickHousePuzzle5_EventScript_162B83:: @ 8162B83 multichoice 0, 0, 25, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 @@ -280,7 +280,7 @@ Route110_TrickHousePuzzle5_EventScript_162BA6:: @ 8162BA6 multichoice 0, 0, 26, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 @@ -288,7 +288,7 @@ Route110_TrickHousePuzzle5_EventScript_162BC9:: @ 8162BC9 multichoice 0, 0, 27, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC @@ -296,7 +296,7 @@ Route110_TrickHousePuzzle5_EventScript_162BEC:: @ 8162BEC multichoice 0, 0, 28, 1 switch RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F @@ -304,7 +304,7 @@ Route110_TrickHousePuzzle5_EventScript_162C0F:: @ 8162C0F multichoice 0, 0, 29, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 @@ -312,7 +312,7 @@ Route110_TrickHousePuzzle5_EventScript_162C32:: @ 8162C32 multichoice 0, 0, 30, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 @@ -320,7 +320,7 @@ Route110_TrickHousePuzzle5_EventScript_162C55:: @ 8162C55 multichoice 0, 0, 31, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 @@ -328,7 +328,7 @@ Route110_TrickHousePuzzle5_EventScript_162C78:: @ 8162C78 multichoice 0, 0, 32, 1 switch RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B @@ -336,7 +336,7 @@ Route110_TrickHousePuzzle5_EventScript_162C9B:: @ 8162C9B multichoice 0, 0, 33, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE @@ -344,7 +344,7 @@ Route110_TrickHousePuzzle5_EventScript_162CBE:: @ 8162CBE multichoice 0, 0, 34, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 @@ -352,7 +352,7 @@ Route110_TrickHousePuzzle5_EventScript_162CE1:: @ 8162CE1 multichoice 0, 0, 35, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 @@ -360,7 +360,7 @@ Route110_TrickHousePuzzle5_EventScript_162D04:: @ 8162D04 multichoice 0, 0, 36, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 @@ -368,7 +368,7 @@ Route110_TrickHousePuzzle5_EventScript_162D27:: @ 8162D27 multichoice 0, 0, 37, 1 switch RESULT case 1, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A @@ -376,7 +376,7 @@ Route110_TrickHousePuzzle5_EventScript_162D4A:: @ 8162D4A multichoice 0, 0, 38, 1 switch RESULT case 0, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D @@ -384,7 +384,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D multichoice 0, 0, 39, 1 switch RESULT case 2, Route110_TrickHousePuzzle5_EventScript_162DDF - jump Route110_TrickHousePuzzle5_EventScript_162D90 + goto Route110_TrickHousePuzzle5_EventScript_162D90 end Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 @@ -409,7 +409,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF checksound playsfx 31 - jump Route110_TrickHousePuzzle5_EventScript_162DE9 + goto Route110_TrickHousePuzzle5_EventScript_162DE9 end Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 1e47bbd83..bd0a7c8d8 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -19,12 +19,12 @@ Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall compare 0x40b0, 0 jumpeq Route110_TrickHousePuzzle6_EventScript_1630FC - jump Route110_TrickHousePuzzle6_EventScript_161892 + goto Route110_TrickHousePuzzle6_EventScript_161892 end Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC setvar 0x40b0, 1 - jump Route110_TrickHousePuzzle6_EventScript_16189C + goto Route110_TrickHousePuzzle6_EventScript_16189C end Route110_TrickHousePuzzle6_EventScript_163107:: @ 8163107 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 7f965b467..a4093c546 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -102,12 +102,12 @@ Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall compare 0x40b1, 0 jumpeq Route110_TrickHousePuzzle7_EventScript_16329D - jump Route110_TrickHousePuzzle7_EventScript_161892 + goto Route110_TrickHousePuzzle7_EventScript_161892 end Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D setvar 0x40b1, 1 - jump Route110_TrickHousePuzzle7_EventScript_16189C + goto Route110_TrickHousePuzzle7_EventScript_16189C end Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index a31c868be..d4afab4ea 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -5,12 +5,12 @@ Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall compare 0x40b2, 0 jumpeq Route110_TrickHousePuzzle8_EventScript_16342E - jump Route110_TrickHousePuzzle8_EventScript_161892 + goto Route110_TrickHousePuzzle8_EventScript_161892 end Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E setvar 0x40b2, 1 - jump Route110_TrickHousePuzzle8_EventScript_16189C + goto Route110_TrickHousePuzzle8_EventScript_16189C end Route110_TrickHousePuzzle8_EventScript_163439:: @ 8163439 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 1358a44be..68be7e7d2 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -141,25 +141,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall setvar 0x8004, 0 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall setvar 0x8004, 1 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall setvar 0x8004, 2 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end @ 815012E lockall setvar 0x8004, 3 - jump Route111_EventScript_15013A + goto Route111_EventScript_15013A end Route111_EventScript_15013A:: @ 815013A diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 3eb514ad2..3fbaf7958 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -6,7 +6,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 faceplayer setvar 0x8008, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A @@ -20,12 +20,12 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A compare RESULT, 0 jumpeq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 msgbox Route111_WinstrateFamilysHouse_Text_19214D, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 @@ -33,7 +33,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 faceplayer setvar 0x8008, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 @@ -44,12 +44,12 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 jumpeq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192334, 4 - jump Route111_WinstrateFamilysHouse_EventScript_15BFC4 + goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 83983f9bb..24f4803b2 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -42,7 +42,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 jumpif 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext - jump Route113_GlassWorkshop_EventScript_1635EE + goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 @@ -77,7 +77,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C @@ -91,7 +91,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 @@ -105,7 +105,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 @@ -119,7 +119,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 @@ -133,7 +133,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C @@ -148,7 +148,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD @@ -163,7 +163,7 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD jumpeq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 - jump Route113_GlassWorkshop_EventScript_163851 + goto Route113_GlassWorkshop_EventScript_163851 end Route113_GlassWorkshop_EventScript_16380E:: @ 816380E @@ -184,13 +184,13 @@ Route113_GlassWorkshop_EventScript_163830:: @ 8163830 buffernum 1, 32778 message Route113_GlassWorkshop_Text_19E890 waittext - jump Route113_GlassWorkshop_EventScript_1635EE + goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163845:: @ 8163845 message Route113_GlassWorkshop_Text_19E802 waittext - jump Route113_GlassWorkshop_EventScript_1635EE + goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163851:: @ 8163851 @@ -248,49 +248,49 @@ Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 bufferitem 0, 0x8008 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 bufferdecor 0, 13 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 bufferdecor 0, 6 - jump Route113_GlassWorkshop_EventScript_1639B1 + goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index f5ef82f8b..7b9a5162f 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -38,7 +38,7 @@ Route116_EventScript_150A7B:: @ 8150A7B checkflag 287 jumpeq Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 - jump Route116_EventScript_150A94 + goto Route116_EventScript_150A94 end Route116_EventScript_150A94:: @ 8150A94 @@ -74,7 +74,7 @@ Route116_EventScript_150AF9:: @ 8150AF9 Route116_EventScript_150B04:: @ 8150B04 msgbox Route116_Text_170865, 4 - jump Route116_EventScript_150A94 + goto Route116_EventScript_150A94 end Route116_EventScript_150B12:: @ 8150B12 @@ -160,7 +160,7 @@ Route116_EventScript_150B8F:: @ 8150B8F Route116_EventScript_150BBB:: @ 8150BBB msgbox Route116_Text_1709B7, 4 closebutton - jump Route116_EventScript_150C03 + goto Route116_EventScript_150C03 end Route116_EventScript_150BCA:: @ 8150BCA @@ -176,7 +176,7 @@ Route116_EventScript_150BCA:: @ 8150BCA Route116_EventScript_150BF4:: @ 8150BF4 msgbox Route116_Text_17094D, 4 closebutton - jump Route116_EventScript_150C03 + goto Route116_EventScript_150C03 end Route116_EventScript_150C03:: @ 8150C03 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 0b5b4748e..a28352c94 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -55,7 +55,7 @@ Route118_EventScript_150FAE:: @ 8150FAE waitmove 0 move 19, Route118_Movement_151069 waitmove 0 - jump Route118_EventScript_151004 + goto Route118_EventScript_151004 end Route118_EventScript_150FCE:: @ 8150FCE @@ -63,7 +63,7 @@ Route118_EventScript_150FCE:: @ 8150FCE setvar 0x8008, 1 move 255, Route118_Movement_1A0841 waitmove 0 - jump Route118_EventScript_151004 + goto Route118_EventScript_151004 end Route118_EventScript_150FE4:: @ 8150FE4 @@ -73,7 +73,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 waitmove 0 move 19, Route118_Movement_15106B waitmove 0 - jump Route118_EventScript_151004 + goto Route118_EventScript_151004 end Route118_EventScript_151004:: @ 8151004 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 55a3fb1dc..bd73bbf31 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -40,12 +40,12 @@ Route119_EventScript_1511B9:: @ 81511B9 Route119_EventScript_1511C5:: @ 81511C5 setvar 0x4001, 1 - jump Route119_EventScript_1511DB + goto Route119_EventScript_1511DB end Route119_EventScript_1511D0:: @ 81511D0 setvar 0x4001, 2 - jump Route119_EventScript_1511DB + goto Route119_EventScript_1511DB end Route119_EventScript_1511DB:: @ 81511DB @@ -97,24 +97,24 @@ Route119_EventScript_15125E:: @ 815125E Route119_EventScript_15128D:: @ 815128D trainerbattle 3, OPPONENT_MAY_6, 0, Route119_Text_171156 - jump Route119_EventScript_1512BD + goto Route119_EventScript_1512BD end Route119_EventScript_15129D:: @ 815129D trainerbattle 3, OPPONENT_MAY_9, 0, Route119_Text_171156 - jump Route119_EventScript_1512BD + goto Route119_EventScript_1512BD end Route119_EventScript_1512AD:: @ 81512AD trainerbattle 3, OPPONENT_MAY_3, 0, Route119_Text_171156 - jump Route119_EventScript_1512BD + goto Route119_EventScript_1512BD end Route119_EventScript_1512BD:: @ 81512BD msgbox Route119_Text_1711B1, 4 call Route119_EventScript_151352 msgbox Route119_Text_171214, 4 - jump Route119_EventScript_151362 + goto Route119_EventScript_151362 end Route119_EventScript_1512D8:: @ 81512D8 @@ -127,24 +127,24 @@ Route119_EventScript_1512D8:: @ 81512D8 Route119_EventScript_151307:: @ 8151307 trainerbattle 3, OPPONENT_BRENDAN_6, 0, Route119_Text_1713E2 - jump Route119_EventScript_151337 + goto Route119_EventScript_151337 end Route119_EventScript_151317:: @ 8151317 trainerbattle 3, OPPONENT_BRENDAN_9, 0, Route119_Text_1713E2 - jump Route119_EventScript_151337 + goto Route119_EventScript_151337 end Route119_EventScript_151327:: @ 8151327 trainerbattle 3, OPPONENT_BRENDAN_3, 0, Route119_Text_1713E2 - jump Route119_EventScript_151337 + goto Route119_EventScript_151337 end Route119_EventScript_151337:: @ 8151337 msgbox Route119_Text_17140B, 4 call Route119_EventScript_151352 msgbox Route119_Text_171475, 4 - jump Route119_EventScript_151362 + goto Route119_EventScript_151362 end Route119_EventScript_151352:: @ 8151352 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 37f8e9ec6..f88b97cfe 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -50,7 +50,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 move 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmove 0 moveoffscreen 5 - jump Route119_WeatherInstitute_2F_EventScript_163D7A + goto Route119_WeatherInstitute_2F_EventScript_163D7A end Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A @@ -89,5 +89,5 @@ Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC faceplayer checkflag 151 jumpeq Route119_WeatherInstitute_2F_EventScript_163DBE - jump Route119_WeatherInstitute_2F_EventScript_163D7A + goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 75385fe8f..74250fd0f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -102,7 +102,7 @@ Route120_EventScript_151719:: @ 8151719 jumpif 3, Route120_EventScript_151735 compare 0x4000, 19 jumpif 3, Route120_EventScript_151715 - jump Route120_EventScript_151735 + goto Route120_EventScript_151735 end Route120_EventScript_151735:: @ 8151735 @@ -136,27 +136,27 @@ Route120_EventScript_151739:: @ 8151739 Route120_EventScript_1517DC:: @ 81517DC setvar 0x8004, 143 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 setvar 0x8004, 144 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 setvar 0x8004, 145 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD setvar 0x8004, 146 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 setvar 0x8004, 147 - jump Route120_EventScript_151813 + goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 @@ -189,7 +189,7 @@ Route120_EventScript_151853:: @ 8151853 msgbox Route120_Text_171827, 5 compare RESULT, 0 jumpeq Route120_EventScript_151877 - jump Route120_EventScript_15189D + goto Route120_EventScript_15189D end Route120_EventScript_151877:: @ 8151877 @@ -202,7 +202,7 @@ Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 compare RESULT, 0 jumpeq Route120_EventScript_151877 - jump Route120_EventScript_15189D + goto Route120_EventScript_15189D end Route120_EventScript_15189D:: @ 815189D @@ -230,7 +230,7 @@ Route120_EventScript_15189D:: @ 815189D setflag 2145 dowildbattle clearflag 2145 - jump Route120_EventScript_151908 + goto Route120_EventScript_151908 end Route120_EventScript_151908:: @ 8151908 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 251b09c73..6850cdeb2 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -50,12 +50,12 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 move 255, Route121_SafariZoneEntrance_Movement_1A0841 waitmove 0 showmoney 0, 0 - snop + nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 compare RESULT, 1 jumpeq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 @@ -69,7 +69,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 updatemoney 0, 0 - snop + nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 fanfare 370 message Route121_SafariZoneEntrance_Text_1C3910 @@ -94,7 +94,7 @@ Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 compare RESULT, 1 jumpeq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F @@ -102,12 +102,12 @@ Route121_SafariZoneEntrance_EventScript_15C44F:: @ 815C44F Route121_SafariZoneEntrance_EventScript_15C450:: @ 815C450 msgbox Route121_SafariZoneEntrance_Text_1C39C3, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E msgbox Route121_SafariZoneEntrance_Text_1C38B5, 4 - jump Route121_SafariZoneEntrance_EventScript_15C46C + goto Route121_SafariZoneEntrance_EventScript_15C46C end Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 9290f845d..18e94034d 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -81,7 +81,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 giveitem RESULT compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D release end @@ -93,7 +93,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F @@ -104,7 +104,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 @@ -115,7 +115,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 @@ -126,7 +126,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 @@ -137,7 +137,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 compare RESULT, 0 jumpeq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 - jump Route123_BerryMastersHouse_EventScript_163C1D + goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13 diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index e1049c8be..2d0d624c0 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -13,19 +13,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 setflag 217 - jump Route124_DivingTreasureHuntersHouse_EventScript_163E2E + goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E end Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F48F, 4 - jump Route124_DivingTreasureHuntersHouse_EventScript_163E2E + goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E end Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_164329 - jump Route124_DivingTreasureHuntersHouse_EventScript_163EA2 + goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 @@ -62,7 +62,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 msgbox Route124_DivingTreasureHuntersHouse_Text_19F544, 4 - jump Route124_DivingTreasureHuntersHouse_EventScript_163EB0 + goto Route124_DivingTreasureHuntersHouse_EventScript_163EB0 end Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 @@ -91,7 +91,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163F61:: @ 8163F61 switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_163F87:: @ 8163F87 @@ -99,7 +99,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163F87:: @ 8163F87 switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_163FAD:: @ 8163FAD @@ -108,7 +108,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163FAD:: @ 8163FAD case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_163FDE:: @ 8163FDE @@ -116,7 +116,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163FDE:: @ 8163FDE switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164004:: @ 8164004 @@ -125,7 +125,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164004:: @ 8164004 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164035:: @ 8164035 @@ -134,7 +134,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164035:: @ 8164035 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164066:: @ 8164066 @@ -144,7 +144,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164066:: @ 8164066 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1640A2:: @ 81640A2 @@ -152,7 +152,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640A2:: @ 81640A2 switch RESULT case 0, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 1, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1640C8:: @ 81640C8 @@ -161,7 +161,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640C8:: @ 81640C8 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164256 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1640F9:: @ 81640F9 @@ -170,7 +170,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1640F9:: @ 81640F9 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_16412A:: @ 816412A @@ -180,7 +180,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_16412A:: @ 816412A case 1, Route124_DivingTreasureHuntersHouse_EventScript_164265 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164166:: @ 8164166 @@ -189,7 +189,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164166:: @ 8164166 case 0, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 2, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164197:: @ 8164197 @@ -199,7 +199,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164197:: @ 8164197 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_1641D3:: @ 81641D3 @@ -209,7 +209,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1641D3:: @ 81641D3 case 1, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 2, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 3, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F @@ -220,28 +220,28 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F case 2, Route124_DivingTreasureHuntersHouse_EventScript_164274 case 3, Route124_DivingTreasureHuntersHouse_EventScript_164283 case 4, Route124_DivingTreasureHuntersHouse_EventScript_16431F - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 setvar 0x8008, 48 setvar 0x8009, 95 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 setvar 0x8008, 50 setvar 0x8009, 96 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 setvar 0x8008, 49 setvar 0x8009, 97 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 setvar 0x8008, 51 setvar 0x8009, 98 - jump Route124_DivingTreasureHuntersHouse_EventScript_164292 + goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 0, 0x8008 @@ -255,7 +255,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 checkitem 0x8008, 2 compare RESULT, 0 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - jump Route124_DivingTreasureHuntersHouse_EventScript_164315 + goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 @@ -268,7 +268,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 - jump Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end Route124_DivingTreasureHuntersHouse_EventScript_164315:: @ 8164315 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c338e8b67..77f0a5f6f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -127,7 +127,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 0 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C498:: @ 814C498 @@ -135,7 +135,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 1 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4AF:: @ 814C4AF @@ -143,7 +143,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 2 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4C6:: @ 814C4C6 @@ -151,7 +151,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 3 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4DD:: @ 814C4DD @@ -159,7 +159,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD movespriteperm 9, 14, 21 spritebehave 9, 10 setvar 0x8004, 4 - jump RustboroCity_EventScript_14C4F4 + goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4F4:: @ 814C4F4 @@ -335,31 +335,31 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 checksound setvar 0x4001, 4 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall setvar 0x4001, 0 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall setvar 0x4001, 1 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall setvar 0x4001, 2 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall setvar 0x4001, 3 - jump RustboroCity_EventScript_14C650 + goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 @@ -435,25 +435,25 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall setvar 0x4001, 0 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall setvar 0x4001, 1 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall setvar 0x4001, 2 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall setvar 0x4001, 3 - jump RustboroCity_EventScript_14C77D + goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index e4f91f82e..776cb5c0a 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -22,7 +22,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call RustboroCity_Gym_EventScript_1A01C0 compare 0x4085, 6 callif 1, RustboroCity_Gym_EventScript_1A00FB - jump RustboroCity_Gym_EventScript_15793C + goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C @@ -62,14 +62,14 @@ RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall checkflag 2055 jumpeq RustboroCity_Gym_EventScript_1579CD - jump RustboroCity_Gym_EventScript_1579D7 + goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall checkflag 2055 jumpeq RustboroCity_Gym_EventScript_1579CD - jump RustboroCity_Gym_EventScript_1579D7 + goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579CD:: @ 81579CD diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 8b037a3e7..168c0aaa2 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -4,7 +4,7 @@ RustboroCity_PokemonSchool_MapScripts:: @ 81579E1 RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 lockall msgbox RustboroCity_PokemonSchool_Text_184321, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 @@ -23,27 +23,27 @@ RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 RustboroCity_PokemonSchool_EventScript_157A50:: @ 8157A50 msgbox RustboroCity_PokemonSchool_Text_184389, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A5E:: @ 8157A5E msgbox RustboroCity_PokemonSchool_Text_184447, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A6C:: @ 8157A6C msgbox RustboroCity_PokemonSchool_Text_1844EC, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A7A:: @ 8157A7A msgbox RustboroCity_PokemonSchool_Text_1845A5, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A88:: @ 8157A88 msgbox RustboroCity_PokemonSchool_Text_184627, 4 - jump RustboroCity_PokemonSchool_EventScript_1579F1 + goto RustboroCity_PokemonSchool_EventScript_1579F1 end RustboroCity_PokemonSchool_EventScript_157A96:: @ 8157A96 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 58cfbec47..a301bb6fe 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -193,7 +193,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84 checktrainerflag OPPONENT_ANETTE jumpif 0, SSTidalCorridor_EventScript_15FED5 setflag 247 - jump SSTidalCorridor_EventScript_15FE7A + goto SSTidalCorridor_EventScript_15FE7A return SSTidalCorridor_EventScript_15FED5:: @ 815FED5 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 22fd5ec56..f0529fbec 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -80,7 +80,7 @@ SafariZone_Southeast_EventScript_160105:: @ 8160105 waitmove 0 move 255, SafariZone_Southeast_Movement_16014B waitmove 0 - jump SafariZone_Southeast_EventScript_160139 + goto SafariZone_Southeast_EventScript_160139 end SafariZone_Southeast_EventScript_16011F:: @ 816011F @@ -88,7 +88,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F waitmove 0 move 255, SafariZone_Southeast_Movement_16014D waitmove 0 - jump SafariZone_Southeast_EventScript_160139 + goto SafariZone_Southeast_EventScript_160139 end SafariZone_Southeast_EventScript_160139:: @ 8160139 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 38a1c9a74..6238e7f4a 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag checkflag 2106 jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E06E - jump ShoalCave_LowTideEntranceRoom_EventScript_15E072 + goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E setmapfooter 169 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 3078b4625..bed2d7b21 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -6,7 +6,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D checkflag 2106 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1AB - jump ShoalCave_LowTideInnerRoom_EventScript_15E1AF + goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB setmapfooter 170 @@ -26,7 +26,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag 2106 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA @@ -35,28 +35,28 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag 2106 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB checkflag 956 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E213 setmaptile 41, 20, 857, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E213 + goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 checkflag 957 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E22B setmaptile 41, 10, 857, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E22B + goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B checkflag 958 jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E243 setmaptile 6, 9, 857, 1 - jump ShoalCave_LowTideInnerRoom_EventScript_15E243 + goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index d65d28877..d7769eb81 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -25,19 +25,19 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall setvar 0x8008, 0 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall setvar 0x8008, 1 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall setvar 0x8008, 2 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF @@ -45,7 +45,7 @@ SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF setvar 0x8008, 3 move 255, SlateportCity_Harbor_Movement_1560C2 waitmove 0 - jump SlateportCity_Harbor_EventScript_155FD5 + goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 @@ -172,7 +172,7 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 jumpeq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext - jump SlateportCity_Harbor_EventScript_1560FD + goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD @@ -213,7 +213,7 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 SlateportCity_Harbor_EventScript_15618A:: @ 815618A message SlateportCity_Harbor_Text_17FBE5 waittext - jump SlateportCity_Harbor_EventScript_1560FD + goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_156196:: @ 8156196 @@ -319,7 +319,7 @@ SlateportCity_Harbor_EventScript_15629D:: @ 815629D SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7 message SlateportCity_Harbor_Text_18028B waittext - jump SlateportCity_Harbor_EventScript_1562B3 + goto SlateportCity_Harbor_EventScript_1562B3 end SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 @@ -341,7 +341,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 - jump SlateportCity_Harbor_EventScript_156380 + goto SlateportCity_Harbor_EventScript_156380 end SlateportCity_Harbor_EventScript_15632A:: @ 815632A @@ -354,7 +354,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 - jump SlateportCity_Harbor_EventScript_156380 + goto SlateportCity_Harbor_EventScript_156380 end SlateportCity_Harbor_EventScript_15636A:: @ 815636A @@ -365,7 +365,7 @@ SlateportCity_Harbor_EventScript_15636A:: @ 815636A SlateportCity_Harbor_EventScript_156374:: @ 8156374 message SlateportCity_Harbor_Text_180447 waittext - jump SlateportCity_Harbor_EventScript_1562B3 + goto SlateportCity_Harbor_EventScript_1562B3 end SlateportCity_Harbor_EventScript_156380:: @ 8156380 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index e84f8ccc6..83cac24ef 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -20,19 +20,19 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 lockall move 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F waitmove 0 - jump SlateportCity_OceanicMuseum_1F_EventScript_155B06 + goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 lockall move 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 waitmove 0 - jump SlateportCity_OceanicMuseum_1F_EventScript_155B06 + goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoney 0, 0 - snop + nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B2D @@ -49,7 +49,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 - snop + nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 setvar 0x40aa, 1 hidemoney 0, 0 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 0a7466a3b..fa2aae4ab 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -18,7 +18,7 @@ SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 setvar 0x40b7, 1 msgbox SlateportCity_PokemonFanClub_Text_17D773, 4 - jump SlateportCity_PokemonFanClub_EventScript_155808 + goto SlateportCity_PokemonFanClub_EventScript_155808 end SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 @@ -38,7 +38,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 compare 0x40b7, 2 jumpeq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 - jump SlateportCity_PokemonFanClub_EventScript_155808 + goto SlateportCity_PokemonFanClub_EventScript_155808 end SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 32bf4d619..9fe6da43d 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -104,7 +104,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D setflag 2062 setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 - jump SootopolisCity_Gym_1F_EventScript_15B056 + goto SootopolisCity_Gym_1F_EventScript_15B056 end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 @@ -139,14 +139,14 @@ SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall checkflag 2062 jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 - jump SootopolisCity_Gym_1F_EventScript_15B0CD + goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall checkflag 2062 jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 - jump SootopolisCity_Gym_1F_EventScript_15B0CD + goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0C3:: @ 815B0C3 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index e5eaadab5..f341f5aeb 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -40,7 +40,7 @@ SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall setvar 0x8008, 12 - jump SouthernIsland_Interior_EventScript_160BA7 + goto SouthernIsland_Interior_EventScript_160BA7 end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index d7e7aabcb..bbd0db9d9 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -8,7 +8,7 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 compare 0x8005, 44 jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 - jump Underwater_SealedChamber_EventScript_15F0AF + goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 warp4 Route134, 255, 60, 31 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index f64ca20ab..3eae03f37 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -16,7 +16,7 @@ VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 reappear 4 move 4, VictoryRoad_1F_Movement_15DF07 waitmove 0 - jump VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB @@ -24,7 +24,7 @@ VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB reappear 4 move 4, VictoryRoad_1F_Movement_15DF13 waitmove 0 - jump VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF @@ -32,7 +32,7 @@ VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF reappear 4 move 4, VictoryRoad_1F_Movement_15DF1E waitmove 0 - jump VictoryRoad_1F_EventScript_15DED3 + goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 -- cgit v1.2.3 From 86e7bf1fd61b151011038cdb281db3de0a1d9e6a Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 14:28:51 -0500 Subject: Replace more script commands and fix German build --- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 6 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 8 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 32 +-- .../maps/AbandonedShip_HiddenFloorRooms.inc | 16 +- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/AncientTomb.inc | 6 +- data/scripts/maps/AquaHideout_1F.inc | 4 +- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 38 ++-- data/scripts/maps/BattleTower_Outside.inc | 6 +- data/scripts/maps/CaveOfOrigin_1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B3F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 6 +- data/scripts/maps/DesertRuins.inc | 6 +- data/scripts/maps/DewfordTown.inc | 28 +-- data/scripts/maps/DewfordTown_Gym.inc | 34 +-- data/scripts/maps/DewfordTown_Hall.inc | 26 +-- data/scripts/maps/DewfordTown_House2.inc | 4 +- data/scripts/maps/EverGrandeCity.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 12 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 10 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 6 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 16 +- data/scripts/maps/FallarborTown_House2.inc | 12 +- data/scripts/maps/FortreeCity.inc | 6 +- data/scripts/maps/FortreeCity_Gym.inc | 10 +- data/scripts/maps/FortreeCity_House1.inc | 8 +- data/scripts/maps/FortreeCity_House2.inc | 6 +- data/scripts/maps/FortreeCity_House4.inc | 8 +- data/scripts/maps/GraniteCave_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/IslandCave.inc | 8 +- data/scripts/maps/JaggedPass.inc | 6 +- data/scripts/maps/LavaridgeTown.inc | 56 ++--- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 32 +-- data/scripts/maps/LavaridgeTown_HerbShop.inc | 4 +- data/scripts/maps/LilycoveCity.inc | 56 ++--- data/scripts/maps/LilycoveCity_ContestLobby.inc | 52 ++--- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 4 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 6 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 12 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 30 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 24 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 26 +-- data/scripts/maps/LilycoveCity_House2.inc | 4 +- data/scripts/maps/LilycoveCity_House3.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 8 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 24 +-- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 76 +++---- data/scripts/maps/LittlerootTown.inc | 102 ++++----- .../maps/LittlerootTown_BrendansHouse_1F.inc | 12 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 14 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 22 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 36 ++-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 32 +-- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 20 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 20 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 90 ++++---- data/scripts/maps/MauvilleCity_Gym.inc | 34 +-- data/scripts/maps/MauvilleCity_House1.inc | 2 +- data/scripts/maps/MauvilleCity_House2.inc | 8 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 8 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 28 +-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 26 +-- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 4 +- data/scripts/maps/MossdeepCity_House4.inc | 4 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 8 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 12 +- data/scripts/maps/MtChimney.inc | 16 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 4 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 42 ++-- data/scripts/maps/NewMauville_Entrance.inc | 6 +- data/scripts/maps/NewMauville_Inside.inc | 10 +- data/scripts/maps/OldaleTown.inc | 18 +- data/scripts/maps/OldaleTown_Mart.inc | 4 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 18 +- data/scripts/maps/PacifidlogTown_House3.inc | 8 +- data/scripts/maps/PacifidlogTown_House4.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 20 +- data/scripts/maps/PetalburgCity_Gym.inc | 230 ++++++++++----------- data/scripts/maps/PetalburgCity_Mart.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 14 +- data/scripts/maps/PetalburgWoods.inc | 8 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 26 +-- data/scripts/maps/Route104_MrBrineysHouse.inc | 16 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 22 +- data/scripts/maps/Route104_Prototype.inc | 28 +-- data/scripts/maps/Route105.inc | 2 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 12 +- data/scripts/maps/Route109_SeashoreHouse.inc | 20 +- data/scripts/maps/Route110.inc | 42 ++-- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 8 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 134 ++++++------ data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 10 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 42 ++-- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 102 ++++----- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 56 ++--- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 2 +- data/scripts/maps/Route111.inc | 40 ++-- data/scripts/maps/Route111_OldLadysRestStop.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 6 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 52 ++--- data/scripts/maps/Route114.inc | 12 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 4 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 6 +- data/scripts/maps/Route114_LanettesHouse.inc | 8 +- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 36 ++-- data/scripts/maps/Route116_TunnelersRestHouse.inc | 2 +- data/scripts/maps/Route117.inc | 14 +- data/scripts/maps/Route118.inc | 16 +- data/scripts/maps/Route119.inc | 36 ++-- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 8 +- data/scripts/maps/Route120.inc | 52 ++--- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +- data/scripts/maps/Route123.inc | 10 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 46 ++--- data/scripts/maps/Route124.inc | 8 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 22 +- data/scripts/maps/Route125.inc | 4 +- data/scripts/maps/Route126.inc | 2 +- data/scripts/maps/Route127.inc | 2 +- data/scripts/maps/Route128.inc | 6 +- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/RustboroCity.inc | 38 ++-- data/scripts/maps/RustboroCity_CuttersHouse.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 18 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 38 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 10 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 12 +- data/scripts/maps/RustboroCity_House1.inc | 8 +- data/scripts/maps/RustboroCity_Mart.inc | 4 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 8 +- data/scripts/maps/RusturfTunnel.inc | 26 +-- data/scripts/maps/SSTidalCorridor.inc | 34 +-- data/scripts/maps/SSTidalRooms.inc | 4 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 4 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 24 +-- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 42 ++-- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 10 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity.inc | 38 ++-- data/scripts/maps/SlateportCity_ContestHall.inc | 4 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 46 ++--- data/scripts/maps/SlateportCity_House1.inc | 20 +- data/scripts/maps/SlateportCity_House2.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 12 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 50 ++--- .../maps/SlateportCity_SternsShipyard_1F.inc | 8 +- data/scripts/maps/SootopolisCity.inc | 38 ++-- data/scripts/maps/SootopolisCity_Gym_1F.inc | 18 +- data/scripts/maps/SootopolisCity_House1.inc | 2 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House3.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 6 +- data/scripts/maps/SootopolisCity_House8.inc | 20 +- data/scripts/maps/SootopolisCity_Mart.inc | 8 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 10 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 4 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 18 +- data/scripts/maps/VerdanturfTown.inc | 4 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 4 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 16 +- data/scripts/maps/VictoryRoad_1F.inc | 4 +- 212 files changed, 1717 insertions(+), 1717 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index cf525003e..eb912028a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -5,12 +5,12 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer checkflag 294 - jumpeq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 - jumpeq AbandonedShip_CaptainsOffice_EventScript_15EB23 + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 checkflag 1078 - jumpeq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index b0ae966ad..212d80416 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -9,9 +9,9 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 checkflag 239 - callif 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 + call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 checkflag 239 - callif 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 + call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 @@ -29,10 +29,10 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall checkflag 239 - jumpeq AbandonedShip_Corridors_B1F_EventScript_15EA14 + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_Corridors_B1F_EventScript_15EA0A + goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playsfx 21 removeitem ITEM_STORAGE_KEY, 1 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 8cb2aed22..9f0b5ca85 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -9,21 +9,21 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A checkflag 240 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB checkflag 241 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 checkflag 242 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF checkflag 243 - callif 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 + call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 checkflag 240 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 checkflag 241 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD checkflag 242 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 checkflag 243 - callif 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 @@ -61,10 +61,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall checkflag 240 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_1_KEY, 1 @@ -77,10 +77,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall checkflag 241 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_2_KEY, 1 @@ -93,10 +93,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall checkflag 242 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_4_KEY, 1 @@ -109,10 +109,10 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall checkflag 243 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 - jumpeq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED + goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 removeitem ITEM_ROOM_6_KEY, 1 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 5c4c050a0..d8ed3fe07 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 getplayerxy 0x4002, 0x4003 setvar 0x4004, 1 compare 0x4002, 21 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 compare 0x4002, 36 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F compare 0x4003, 2 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch 0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 @@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B doanimation 54 specialval RESULT, sub_810F4D4 compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 pause 10 end @@ -56,10 +56,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 specialval RESULT, sub_810F488 compare RESULT, 1 - jumpeq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA + goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA pause 20 compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 pause 10 end @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB doanimation 54 specialval RESULT, sub_810F4FC compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 pause 10 end @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 doanimation 54 specialval RESULT, sub_810F4B0 compare RESULT, 0 - callif 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B + call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 pause 10 end diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index a6ccdc43c..b7fe34b81 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -5,7 +5,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq AbandonedShip_Rooms2_1F_EventScript_15EA93 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -18,7 +18,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq AbandonedShip_Rooms2_1F_EventScript_15EAD9 + goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index bfc5b6a79..deed30c5b 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -6,7 +6,7 @@ AncientTomb_MapScripts:: @ 815EFBE AncientTomb_MapScript1_15EFCE:: @ 815EFCE checkflag 2145 - callif 1, AncientTomb_EventScript_15EFD8 + call_if 1, AncientTomb_EventScript_15EFD8 end AncientTomb_EventScript_15EFD8:: @ 815EFD8 @@ -19,7 +19,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC AncientTomb_MapScript1_15EFE0:: @ 815EFE0 checkflag 2130 - callif 0, AncientTomb_EventScript_15EFEA + call_if 0, AncientTomb_EventScript_15EFEA end AncientTomb_EventScript_15EFEA:: @ 815EFEA @@ -34,7 +34,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall checkflag 2130 - jumpeq AncientTomb_EventScript_15F038 + goto_if_eq AncientTomb_EventScript_15F038 braillemsg AncientTomb_Braille_1C552E waitbutton hidebox 0, 0, 29, 19 diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index cc1ad33b1..2eb2ae7e9 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -11,7 +11,7 @@ MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer checkflag 111 - jumpeq AquaHideout_1F_EventScript_15D7E3 + goto_if_eq AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release end @@ -26,7 +26,7 @@ MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer checkflag 111 - jumpeq AquaHideout_1F_EventScript_15D802 + goto_if_eq AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 969d590e3..cad8e7481 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -5,7 +5,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C checkflag 2145 - callif 1, AquaHideout_B1F_EventScript_15D846 + call_if 1, AquaHideout_B1F_EventScript_15D846 end AquaHideout_B1F_EventScript_15D846:: @ 815D846 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index f4f50d90b..cfb4ba855 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -5,7 +5,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 BattleTower_Corridor_MapScript1_160850:: @ 8160850 compare 0x8006, 1 - jumpeq BattleTower_Corridor_EventScript_16086E + goto_if_eq BattleTower_Corridor_EventScript_16086E setmaptile 12, 0, 519, 0 setmaptile 12, 1, 527, 0 end @@ -22,7 +22,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 compare 0x8006, 1 - jumpeq BattleTower_Corridor_EventScript_1608B1 + goto_if_eq BattleTower_Corridor_EventScript_1608B1 move 1, BattleTower_Corridor_Movement_1608D5 move 255, BattleTower_Corridor_Movement_1608D4 waitmove 0 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 50c9c9152..fc5cee29a 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -14,12 +14,12 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar 0x8004, 10 special sub_8135668 checkflag 238 - jumpeq BattleTower_Lobby_EventScript_1602E4 + goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag 237 - jumpeq BattleTower_Lobby_EventScript_1602CD + goto_if_eq BattleTower_Lobby_EventScript_1602CD specialval 0x8007, sub_810F404 compare 0x8007, 50 - jumpif 0, BattleTower_Lobby_EventScript_1602E4 + goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC return @@ -27,7 +27,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialval 0x8007, sub_810F404 compare 0x8007, 100 - jumpif 0, BattleTower_Lobby_EventScript_1602E4 + goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC return @@ -78,10 +78,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 setvar 0x8004, 0 special sub_81358A4 compare RESULT, 6 - jumpeq BattleTower_Lobby_EventScript_16037D + goto_if_eq BattleTower_Lobby_EventScript_16037D special sub_8135E50 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_16037D + goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext fanfare 370 @@ -92,7 +92,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 special sub_81358A4 compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_1603AD + goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext setvar 0x8004, 13 @@ -119,7 +119,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar 0x8004, 9 special sub_81358A4 compare RESULT, 49 - jumpif 5, BattleTower_Lobby_EventScript_1603F8 + goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 @@ -187,7 +187,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E setvar 0x8004, 0 special sub_81358A4 compare RESULT, 6 - jumpeq BattleTower_Lobby_EventScript_160342 + goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -210,7 +210,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist compare 0x8004, 1 - jumpeq BattleTower_Lobby_EventScript_16060D + goto_if_eq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT copyvar 0x8006, RESULT @@ -220,7 +220,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA special ChooseBattleTowerPlayerParty waitstate compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_16064F + goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, 5 switch RESULT case 0, BattleTower_Lobby_EventScript_16064F @@ -246,7 +246,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x4000, 5 hidebox 0, 0, 15, 10 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_160642 + goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty special sub_8135A14 @@ -348,9 +348,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC lock faceplayer compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_160701 + goto_if_eq BattleTower_Lobby_EventScript_160701 compare RESULT, 1 - jumpeq BattleTower_Lobby_EventScript_16070B + goto_if_eq BattleTower_Lobby_EventScript_16070B end BattleTower_Lobby_EventScript_1606F7:: @ 81606F7 @@ -388,14 +388,14 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer checkflag 238 - jumpeq BattleTower_Lobby_EventScript_1607C5 + goto_if_eq BattleTower_Lobby_EventScript_1607C5 checkflag 237 - jumpeq BattleTower_Lobby_EventScript_160773 + goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, 42 givedecoration 42 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_1607AF + goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 237 msgbox BattleTower_Lobby_Text_19ABAA, 4 release @@ -404,12 +404,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialval RESULT, sub_810F404 compare RESULT, 100 - jumpif 0, BattleTower_Lobby_EventScript_1607C5 + goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, 43 givedecoration 43 compare RESULT, 0 - jumpeq BattleTower_Lobby_EventScript_1607AF + goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 238 msgbox BattleTower_Lobby_Text_19ABAA, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 01e10ebd3..77f8b39b6 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -14,7 +14,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 compare RESULT, 0 - jumpeq BattleTower_Outside_EventScript_1601C6 + goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext goto BattleTower_Outside_EventScript_16018E @@ -37,7 +37,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, 5 compare RESULT, 0 - jumpeq BattleTower_Outside_EventScript_160226 + goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 warp SlateportCity_Harbor, 255, 8, 11 @@ -48,7 +48,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, 5 compare RESULT, 0 - jumpeq BattleTower_Outside_EventScript_160226 + goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 warp LilycoveCity_Harbor, 255, 8, 11 diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 7fd365b36..3ad36cc18 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 checkflag 113 - callif 1, CaveOfOrigin_1F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index 9603ae83b..c3bbdd45f 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 checkflag 113 - callif 1, CaveOfOrigin_B1F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index 6b3a55648..fb65de171 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 checkflag 113 - callif 1, CaveOfOrigin_B2F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index 8e61048d2..c21b04e91 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -4,5 +4,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 checkflag 113 - callif 1, CaveOfOrigin_B3F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 5517a9c7e..f5ce8138f 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -5,7 +5,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 checkflag 2145 - callif 1, CaveOfOrigin_B4F_EventScript_15DDC1 + call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 @@ -20,7 +20,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 checkflag 113 - callif 1, CaveOfOrigin_B4F_EventScript_1A04E3 + call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 end CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 @@ -67,7 +67,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 clearflag 2145 specialval RESULT, sub_810E300 compare RESULT, 1 - callif 1, CaveOfOrigin_B4F_EventScript_15DE73 + call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 setflag 855 setflag 856 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 97a22bae3..ab094c824 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -6,7 +6,7 @@ DesertRuins_MapScripts:: @ 815CAF3 DesertRuins_MapScript1_15CB03:: @ 815CB03 checkflag 2145 - callif 1, DesertRuins_EventScript_15CB0D + call_if 1, DesertRuins_EventScript_15CB0D end DesertRuins_EventScript_15CB0D:: @ 815CB0D @@ -15,7 +15,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D DesertRuins_MapScript1_15CB11:: @ 815CB11 checkflag 2128 - callif 0, DesertRuins_EventScript_15CB1B + call_if 0, DesertRuins_EventScript_15CB1B end DesertRuins_EventScript_15CB1B:: @ 815CB1B @@ -34,7 +34,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall checkflag 2128 - jumpeq DesertRuins_EventScript_15CB6D + goto_if_eq DesertRuins_EventScript_15CB6D braillemsg DesertRuins_Braille_1C54C8 waitbutton hidebox 0, 0, 29, 19 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 9a914fcd8..f30c202c8 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -10,7 +10,7 @@ DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer checkflag 189 - jumpif 0, DewfordTown_EventScript_14E076 + goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waittext multichoicedef 21, 6, 0, 2, 0 @@ -44,7 +44,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, 5 compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E093 + goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release end @@ -75,12 +75,12 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer checkflag 257 - jumpeq DewfordTown_EventScript_14E11B + goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E0F0 + goto_if_eq DewfordTown_EventScript_14E0F0 compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E111 + goto_if_eq DewfordTown_EventScript_14E111 end DewfordTown_EventScript_14E0F0:: @ 814E0F0 @@ -101,9 +101,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B waittext multichoice 20, 8, 50, 1 compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E13D + goto_if_eq DewfordTown_EventScript_14E13D compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E147 + goto_if_eq DewfordTown_EventScript_14E147 end DewfordTown_EventScript_14E13D:: @ 814E13D @@ -177,9 +177,9 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 setflag 743 spriteinvisible 4, 0, 11 checkflag 149 - callif 0, DewfordTown_EventScript_14E281 + call_if 0, DewfordTown_EventScript_14E281 checkflag 149 - callif 1, DewfordTown_EventScript_14E28A + call_if 1, DewfordTown_EventScript_14E28A closebutton copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 11 @@ -600,9 +600,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, 5 compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E439 + goto_if_eq DewfordTown_EventScript_14E439 compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E443 + goto_if_eq DewfordTown_EventScript_14E443 end DewfordTown_EventScript_14E439:: @ 814E439 @@ -617,15 +617,15 @@ DewfordTown_EventScript_14E443:: @ 814E443 lock faceplayer compare RESULT, 1 - jumpeq DewfordTown_EventScript_14E46E + goto_if_eq DewfordTown_EventScript_14E46E compare RESULT, 0 - jumpeq DewfordTown_EventScript_14E485 + goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E inccounter GAME_STAT_STARTED_TRENDS compare 0x8004, 0 - jumpeq DewfordTown_EventScript_14E48F + goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 457f510f0..cf484a546 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -8,15 +8,15 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B DewfordTown_Gym_EventScript_153071:: @ 8153071 checktrainerflag OPPONENT_BRAWLY - jumpeq DewfordTown_Gym_EventScript_1530AA + goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 compare 0x8000, 0 - jumpeq DewfordTown_Gym_EventScript_1530BA + goto_if_eq DewfordTown_Gym_EventScript_1530BA compare 0x8000, 1 - jumpeq DewfordTown_Gym_EventScript_1530B6 + goto_if_eq DewfordTown_Gym_EventScript_1530B6 compare 0x8000, 2 - jumpeq DewfordTown_Gym_EventScript_1530B2 + goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA @@ -43,14 +43,14 @@ DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 comparevars 0x8000, 0x8001 - jumpeq DewfordTown_Gym_EventScript_1530F5 + goto_if_eq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 compare 0x8000, 1 - jumpeq DewfordTown_Gym_EventScript_1530F6 + goto_if_eq DewfordTown_Gym_EventScript_1530F6 compare 0x8000, 2 - jumpeq DewfordTown_Gym_EventScript_153101 + goto_if_eq DewfordTown_Gym_EventScript_153101 compare 0x8000, 3 - jumpeq DewfordTown_Gym_EventScript_15310C + goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return @@ -82,17 +82,17 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar 0x8000, 0 checktrainerflag OPPONENT_HIDEKI - jumpif 0, DewfordTown_Gym_EventScript_153135 + goto_if 0, DewfordTown_Gym_EventScript_153135 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA - jumpif 0, DewfordTown_Gym_EventScript_153143 + goto_if 0, DewfordTown_Gym_EventScript_153143 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA - jumpif 0, DewfordTown_Gym_EventScript_153151 + goto_if 0, DewfordTown_Gym_EventScript_153151 addvar 0x8000, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 @@ -101,7 +101,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 checkflag 166 - jumpif 0, DewfordTown_Gym_EventScript_1531B5 + goto_if 0, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release end @@ -116,7 +116,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag 2056 addvar 0x4085, 1 compare 0x4085, 6 - callif 1, DewfordTown_Gym_EventScript_1A00FB + call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 @@ -125,7 +125,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08 compare RESULT, 0 - jumpeq DewfordTown_Gym_EventScript_1A029B + goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag 166 release @@ -165,7 +165,7 @@ DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer checkflag 1204 - jumpeq DewfordTown_Gym_EventScript_153254 + goto_if_eq DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release end @@ -178,14 +178,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall checkflag 2056 - jumpeq DewfordTown_Gym_EventScript_15327E + goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall checkflag 2056 - jumpeq DewfordTown_Gym_EventScript_15327E + goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 70689f7ac..cc096080e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -7,7 +7,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 call DewfordTown_Hall_EventScript_1A0102 special sub_80FA5E4 compare RESULT, 1 - jumpeq DewfordTown_Hall_EventScript_1532B2 + goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release end @@ -32,9 +32,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 - jumpeq DewfordTown_Hall_EventScript_1532F6 + goto_if_eq DewfordTown_Hall_EventScript_1532F6 compare RESULT, 0 - jumpeq DewfordTown_Hall_EventScript_153300 + goto_if_eq DewfordTown_Hall_EventScript_153300 end DewfordTown_Hall_EventScript_1532F6:: @ 81532F6 @@ -192,14 +192,14 @@ DewfordTown_Hall_EventScript_1534FD:: @ 81534FD move 8, DewfordTown_Hall_Movement_153599 waitmove 0 compare 0x8008, 0 - jumpeq DewfordTown_Hall_EventScript_15351E + goto_if_eq DewfordTown_Hall_EventScript_15351E compare 0x8008, 1 - jumpeq DewfordTown_Hall_EventScript_153534 + goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E compare FACING, 4 - jumpeq DewfordTown_Hall_EventScript_1534FC + goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A0843 waitmove 0 return @@ -211,16 +211,16 @@ DewfordTown_Hall_EventScript_153535:: @ 8153535 move 7, DewfordTown_Hall_Movement_15359B waitmove 0 compare 0x8008, 0 - jumpeq DewfordTown_Hall_EventScript_153556 + goto_if_eq DewfordTown_Hall_EventScript_153556 compare 0x8008, 1 - jumpeq DewfordTown_Hall_EventScript_153583 + goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 compare FACING, 2 - callif 1, DewfordTown_Hall_EventScript_15356D + call_if 1, DewfordTown_Hall_EventScript_15356D compare FACING, 1 - callif 1, DewfordTown_Hall_EventScript_153578 + call_if 1, DewfordTown_Hall_EventScript_153578 return DewfordTown_Hall_EventScript_15356D:: @ 815356D @@ -235,7 +235,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 DewfordTown_Hall_EventScript_153583:: @ 8153583 compare FACING, 3 - jumpeq DewfordTown_Hall_EventScript_1534FC + goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A083F waitmove 0 return @@ -253,11 +253,11 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D faceplayer call DewfordTown_Hall_EventScript_1A0102 checkflag 230 - jumpeq DewfordTown_Hall_EventScript_1535D1 + goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 compare RESULT, 0 - jumpeq DewfordTown_Hall_EventScript_1A029B + goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag 230 release end diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index 529f8bb24..befe47404 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -5,11 +5,11 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer checkflag 289 - jumpeq DewfordTown_House2_EventScript_153615 + goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF compare RESULT, 0 - jumpeq DewfordTown_House2_EventScript_15360B + goto_if_eq DewfordTown_House2_EventScript_15360B setflag 289 release end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index 9b6d2a8b7..c9768d006 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -4,7 +4,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB checkflag 2090 - callif 1, EverGrandeCity_EventScript_1A02C1 + call_if 1, EverGrandeCity_EventScript_1A02C1 end EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 4d2179cc1..2b0f9545f 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -54,16 +54,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playsfx 8 checkgender compare RESULT, 0 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 reappear 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender compare RESULT, 0 - jumpeq EverGrandeCity_ChampionsRoom_EventScript_15B886 + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 compare RESULT, 1 - jumpeq EverGrandeCity_ChampionsRoom_EventScript_15B8BB + goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C @@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender compare RESULT, 0 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 - callif 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 + call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF move 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 55e38da15..3ddcb6ef3 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -25,9 +25,9 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag 1248 - callif 1, EverGrandeCity_DrakesRoom_EventScript_15B758 + call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 compare 0x409c, 4 - callif 1, EverGrandeCity_DrakesRoom_EventScript_15B75E + call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758 @@ -42,7 +42,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer checkflag 1248 - jumpeq EverGrandeCity_DrakesRoom_EventScript_15B78B + goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B playmusic 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 9271f3da9..2526b2ea6 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -25,9 +25,9 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag 1247 - callif 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE + call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare 0x409c, 3 - callif 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 + call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE @@ -42,7 +42,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer checkflag 1247 - jumpeq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 + goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playmusic 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 175990328..0999f9a4d 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -45,9 +45,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender compare RESULT, 0 - jumpeq EverGrandeCity_HallOfFame_EventScript_15BC41 + goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 compare RESULT, 1 - jumpeq EverGrandeCity_HallOfFame_EventScript_15BC4D + goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 9b693c227..9e2c4c0b7 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -25,9 +25,9 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag 1246 - callif 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 + call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare 0x409c, 2 - callif 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A + call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624 @@ -42,7 +42,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer checkflag 1246 - jumpeq EverGrandeCity_PhoebesRoom_EventScript_15B657 + goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 playmusic 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index bfb3cdc1b..7065bdefe 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -6,7 +6,7 @@ EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 setflag 2132 checkflag 263 - callif 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B + call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B @@ -48,17 +48,17 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall checkflag 263 - jumpeq EverGrandeCity_PokemonLeague_EventScript_15BB57 + goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 compare 0x4000, 11 - callif 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 + call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 compare 0x4000, 8 - callif 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F + call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext pause 75 checkflag 2060 - jumpif 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A + goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closebutton move 3, EverGrandeCity_PokemonLeague_Movement_15BB7E move 4, EverGrandeCity_PokemonLeague_Movement_15BB81 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index bbb95e0ad..d9e7a8213 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -6,9 +6,9 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag 1245 - callif 1, EverGrandeCity_SidneysRoom_EventScript_15B564 + call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 compare 0x409c, 1 - callif 1, EverGrandeCity_SidneysRoom_EventScript_15B56A + call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 @@ -43,7 +43,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer checkflag 1245 - jumpeq EverGrandeCity_SidneysRoom_EventScript_15B5BD + goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD playmusic 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index a48be5b24..043588ed5 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -13,7 +13,7 @@ FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer checkflag 139 - jumpeq FallarborTown_EventScript_14E80A + goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index ed67d922d..1dddf43de 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -93,7 +93,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 checkflag 270 - jumpeq FallarborTown_ContestLobby_EventScript_153AA9 + goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 8a44cdcfb..0228fe25d 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -9,25 +9,25 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer checkflag 229 - jumpeq FallarborTown_House1_EventScript_153C54 + goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 - jumpeq FallarborTown_House1_EventScript_153BDA + goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA checkflag 2 - callif 0, FallarborTown_House1_EventScript_153C2D + call_if 0, FallarborTown_House1_EventScript_153C2D checkflag 2 - callif 1, FallarborTown_House1_EventScript_153C3E + call_if 1, FallarborTown_House1_EventScript_153C3E compare RESULT, 0 - jumpeq FallarborTown_House1_EventScript_153C47 + goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem ITEM_TM27 compare RESULT, 0 - jumpeq FallarborTown_House1_EventScript_1A029B + goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F setflag 229 @@ -59,9 +59,9 @@ FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer checkflag 229 - jumpeq FallarborTown_House1_EventScript_153C86 + goto_if_eq FallarborTown_House1_EventScript_153C86 checkflag 139 - jumpeq FallarborTown_House1_EventScript_153C7C + goto_if_eq FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release end diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index c36036ce3..5ecc475ea 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -6,7 +6,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 move 1, FallarborTown_House2_Movement_1A0839 waitmove 0 checkflag 1 - jumpeq FallarborTown_House2_EventScript_153CB6 + goto_if_eq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 setflag 1 goto FallarborTown_House2_EventScript_153CB6 @@ -15,7 +15,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 compare RESULT, 0 - jumpeq FallarborTown_House2_EventScript_153D60 + goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT case 0, FallarborTown_House2_EventScript_153D60 @@ -27,12 +27,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 special sub_80F9A4C waitstate compare 0x8004, 255 - jumpeq FallarborTown_House2_EventScript_153D60 + goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 - jumpeq FallarborTown_House2_EventScript_153D52 + goto_if_eq FallarborTown_House2_EventScript_153D52 compare 0x8005, 0 - jumpeq FallarborTown_House2_EventScript_153D44 + goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -41,7 +41,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A special sub_8132670 waitstate compare 0x8004, 0 - jumpeq FallarborTown_House2_EventScript_153CE4 + goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_153D60 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 7f9d5ae12..b5426de8e 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -19,7 +19,7 @@ FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer checkflag 295 - jumpeq FortreeCity_EventScript_14C973 + goto_if_eq FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release end @@ -58,7 +58,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 faceplayer checkitem ITEM_DEVON_SCOPE, 1 compare RESULT, 1 - jumpeq FortreeCity_EventScript_14C9CF + goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release end @@ -66,7 +66,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, 5 compare RESULT, 1 - jumpeq FortreeCity_EventScript_14C9E4 + goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 971b05f1b..8744141cb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -18,7 +18,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 checkflag 170 - jumpif 0, FortreeCity_Gym_EventScript_157F3E + goto_if 0, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release end @@ -38,7 +38,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40 compare RESULT, 0 - jumpeq FortreeCity_Gym_EventScript_1A029B + goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag 170 release @@ -68,7 +68,7 @@ FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer checkflag 1225 - jumpeq FortreeCity_Gym_EventScript_157FD3 + goto_if_eq FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release end @@ -81,14 +81,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall checkflag 2060 - jumpeq FortreeCity_Gym_EventScript_157FFD + goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall checkflag 2060 - jumpeq FortreeCity_Gym_EventScript_157FFD + goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index f5bda05ab..446831c33 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -5,24 +5,24 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer checkflag 155 - jumpeq FortreeCity_House1_EventScript_157EAD + goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 - jumpeq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 - jumpeq FortreeCity_House1_EventScript_157E95 + goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 - jumpif 5, FortreeCity_House1_EventScript_157E9F + goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a special sub_804DB68 diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ea4aad3d8..f210dd3ac 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -5,9 +5,9 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer checkflag 264 - jumpeq FortreeCity_House2_EventScript_158157 + goto_if_eq FortreeCity_House2_EventScript_158157 checkflag 118 - callif 0, FortreeCity_House2_EventScript_15814B + call_if 0, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 switch RESULT @@ -23,7 +23,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem ITEM_TM10 compare RESULT, 0 - jumpeq FortreeCity_House2_EventScript_1A029B + goto_if_eq FortreeCity_House2_EventScript_1A029B setflag 264 msgbox FortreeCity_House2_Text_18652F, 4 release diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 33d0ed1ae..5de611399 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -8,11 +8,11 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall checkflag 223 - jumpeq FortreeCity_House4_EventScript_158204 + goto_if_eq FortreeCity_House4_EventScript_158204 checkflag 224 - jumpeq FortreeCity_House4_EventScript_1581D6 + goto_if_eq FortreeCity_House4_EventScript_1581D6 checkflag 222 - jumpeq FortreeCity_House4_EventScript_1581C2 + goto_if_eq FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closebutton setflag 222 @@ -36,7 +36,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB compare RESULT, 0 - jumpeq FortreeCity_House4_EventScript_1A029B + goto_if_eq FortreeCity_House4_EventScript_1A029B setflag 223 releaseall end diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 59aaa2fc3..f389a774e 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -5,7 +5,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer checkflag 109 - jumpeq GraniteCave_1F_EventScript_15CBD3 + goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem ITEM_HM05 setflag 109 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 895241406..004c3d679 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -11,17 +11,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 compare RESULT, 0 - callif 1, GraniteCave_StevensRoom_EventScript_15CC83 + call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closebutton compare FACING, 2 - callif 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 1 - callif 1, GraniteCave_StevensRoom_EventScript_15CC78 + call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 compare FACING, 3 - callif 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 - callif 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playsfx 9 disappear 1 release diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 0c26f0f88..a265b97e1 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -18,9 +18,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 setflag 0x4000 checkgender compare RESULT, 0 - jumpeq InsideOfTruck_EventScript_15FC45 + goto_if_eq InsideOfTruck_EventScript_15FC45 compare RESULT, 1 - jumpeq InsideOfTruck_EventScript_15FC68 + goto_if_eq InsideOfTruck_EventScript_15FC68 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index e706914d7..73523c460 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -6,7 +6,7 @@ IslandCave_MapScripts:: @ 815EEB6 IslandCave_MapScript1_15EEC6:: @ 815EEC6 checkflag 2145 - callif 1, IslandCave_EventScript_15EED0 + call_if 1, IslandCave_EventScript_15EED0 end IslandCave_EventScript_15EED0:: @ 815EED0 @@ -15,7 +15,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 IslandCave_MapScript1_15EED4:: @ 815EED4 checkflag 2129 - callif 0, IslandCave_EventScript_15EEDE + call_if 0, IslandCave_EventScript_15EEDE end IslandCave_EventScript_15EEDE:: @ 815EEDE @@ -46,7 +46,7 @@ S_OpenRegiceChamber:: @ 815EF19 IslandCave_EventScript_15EF59:: @ 815EF59 lockall checkflag 2129 - jumpeq IslandCave_EventScript_15EF72 + goto_if_eq IslandCave_EventScript_15EF72 braillemsg IslandCave_Braille_1C54FC special DoBrailleWait waitstate @@ -62,7 +62,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemsg IslandCave_Braille_1C54FC checkflag 2129 - jumpeq IslandCave_EventScript_15EF95 + goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 151f1ec79..e80894dc2 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -9,7 +9,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 JaggedPass_MapScript1_15D274:: @ 815D274 compare 0x40bd, 1 - callif 1, JaggedPass_EventScript_15D280 + call_if 1, JaggedPass_EventScript_15D280 end JaggedPass_EventScript_15D280:: @ 815D280 @@ -26,7 +26,7 @@ JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq JaggedPass_EventScript_15D2C3 + goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -39,7 +39,7 @@ JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq JaggedPass_EventScript_15D301 + goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 125b2d42b..ca476eb97 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -6,11 +6,11 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag 2066 checkflag 139 - callif 1, LavaridgeTown_EventScript_14E4DF + call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 compare 0x4053, 2 - callif 1, LavaridgeTown_EventScript_14E4D0 + call_if 1, LavaridgeTown_EventScript_14E4D0 end LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 @@ -45,16 +45,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmove 0 checkgender compare RESULT, 0 - callif 1, LavaridgeTown_EventScript_14E56B + call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 - callif 1, LavaridgeTown_EventScript_14E570 + call_if 1, LavaridgeTown_EventScript_14E570 compare 0x8008, 1 - callif 1, LavaridgeTown_EventScript_14E68F + call_if 1, LavaridgeTown_EventScript_14E68F checkgender compare RESULT, 0 - jumpeq LavaridgeTown_EventScript_14E5AB + goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 - jumpeq LavaridgeTown_EventScript_14E5D0 + goto_if_eq LavaridgeTown_EventScript_14E5D0 end LavaridgeTown_EventScript_14E56B:: @ 814E56B @@ -71,14 +71,14 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 setvar 0x8008, 0 checkgender compare RESULT, 0 - callif 1, LavaridgeTown_EventScript_14E56B + call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 - callif 1, LavaridgeTown_EventScript_14E570 + call_if 1, LavaridgeTown_EventScript_14E570 checkgender compare RESULT, 0 - jumpeq LavaridgeTown_EventScript_14E5AB + goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 - jumpeq LavaridgeTown_EventScript_14E5D0 + goto_if_eq LavaridgeTown_EventScript_14E5D0 end LavaridgeTown_EventScript_14E5AB:: @ 814E5AB @@ -100,22 +100,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closebutton compare 0x8008, 1 - callif 1, LavaridgeTown_EventScript_14E646 + call_if 1, LavaridgeTown_EventScript_14E646 compare 0x8008, 0 - callif 1, LavaridgeTown_EventScript_14E64E + call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 pause 30 compare 0x8008, 1 - callif 1, LavaridgeTown_EventScript_14E69A + call_if 1, LavaridgeTown_EventScript_14E69A compare 0x8008, 0 - callif 1, LavaridgeTown_EventScript_14E6A5 + call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 playmusicbattle 0 fadedefault compare 0x8008, 0 - jumpeq LavaridgeTown_EventScript_14E644 + goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -129,13 +129,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 LavaridgeTown_EventScript_14E64E:: @ 814E64E compare FACING, 2 - callif 1, LavaridgeTown_EventScript_14E67B + call_if 1, LavaridgeTown_EventScript_14E67B compare FACING, 1 - callif 1, LavaridgeTown_EventScript_14E680 + call_if 1, LavaridgeTown_EventScript_14E680 compare FACING, 3 - callif 1, LavaridgeTown_EventScript_14E685 + call_if 1, LavaridgeTown_EventScript_14E685 compare FACING, 4 - callif 1, LavaridgeTown_EventScript_14E68A + call_if 1, LavaridgeTown_EventScript_14E68A return LavaridgeTown_EventScript_14E67B:: @ 814E67B @@ -166,13 +166,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 compare FACING, 2 - callif 1, LavaridgeTown_EventScript_14E6D2 + call_if 1, LavaridgeTown_EventScript_14E6D2 compare FACING, 1 - callif 1, LavaridgeTown_EventScript_14E6D2 + call_if 1, LavaridgeTown_EventScript_14E6D2 compare FACING, 3 - callif 1, LavaridgeTown_EventScript_14E6DD + call_if 1, LavaridgeTown_EventScript_14E6DD compare FACING, 4 - callif 1, LavaridgeTown_EventScript_14E6D2 + call_if 1, LavaridgeTown_EventScript_14E6D2 return LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 @@ -238,7 +238,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E LavaridgeTown_EventScript_14E710:: @ 814E710 specialval RESULT, player_get_direction_lower_nybble compare RESULT, 1 - jumpeq LavaridgeTown_EventScript_14E721 + goto_if_eq LavaridgeTown_EventScript_14E721 end LavaridgeTown_EventScript_14E721:: @ 814E721 @@ -273,13 +273,13 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer checkflag 266 - jumpeq LavaridgeTown_EventScript_14E79E + goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 - jumpeq LavaridgeTown_EventScript_14E7B2 + goto_if_eq LavaridgeTown_EventScript_14E7B2 countpokemon compare RESULT, 6 - jumpeq LavaridgeTown_EventScript_14E7A8 + goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 fanfare 370 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 1f5810e7f..e22d4471f 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -14,27 +14,27 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar 0x400e, 0 setvar 0x400f, 0 checktrainerflag OPPONENT_COLE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 setvar 0x400b, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 checktrainerflag OPPONENT_ZANE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 setvar 0x400c, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 checktrainerflag OPPONENT_AXLE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 setvar 0x400d, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 checktrainerflag OPPONENT_SADIE - jumpeq LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 setvar 0x400e, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 checktrainerflag OPPONENT_ANDY - jumpeq LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE setvar 0x400f, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE @@ -42,27 +42,27 @@ LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF checktrainerflag OPPONENT_COLE - jumpeq LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C spritebehave 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C checktrainerflag OPPONENT_ZANE - jumpeq LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719 spritebehave 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 checktrainerflag OPPONENT_AXLE - jumpeq LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726 spritebehave 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 checktrainerflag OPPONENT_SADIE - jumpeq LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733 spritebehave 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 checktrainerflag OPPONENT_ANDY - jumpeq LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740 spritebehave 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 @@ -71,7 +71,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 checkflag 168 - jumpif 0, LavaridgeTown_Gym_1F_EventScript_1537A7 + goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release end @@ -85,7 +85,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag 2058 addvar 0x4085, 1 compare 0x4085, 6 - callif 1, LavaridgeTown_Gym_1F_EventScript_1A00FB + call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag 806 @@ -96,7 +96,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50 compare RESULT, 0 - jumpeq LavaridgeTown_Gym_1F_EventScript_1A029B + goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag 168 release @@ -136,7 +136,7 @@ LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer checkflag 1213 - jumpeq LavaridgeTown_Gym_1F_EventScript_15386E + goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release end @@ -149,14 +149,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall checkflag 2058 - jumpeq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall checkflag 2058 - jumpeq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 6ff103ce3..c924684bc 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -29,11 +29,11 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer checkflag 254 - jumpeq LavaridgeTown_HerbShop_EventScript_153684 + goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL compare RESULT, 0 - jumpeq LavaridgeTown_HerbShop_EventScript_1A029B + goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag 254 release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 082e88bd5..f700988f9 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -8,7 +8,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setvar 0x4086, 0 setflag 802 checkflag 2090 - callif 1, LilycoveCity_EventScript_1A02C1 + call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E end @@ -29,9 +29,9 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmaptile 72, 6, 445, 0 .endif checkflag 112 - callif 0, LilycoveCity_EventScript_14CABE + call_if 0, LilycoveCity_EventScript_14CABE checkflag 2061 - callif 1, LilycoveCity_EventScript_14CB2B + call_if 1, LilycoveCity_EventScript_14CB2B end LilycoveCity_EventScript_14CABE:: @ 814CABE @@ -65,13 +65,13 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 faceplayer checkdailyflags checkflag 2255 - jumpeq LilycoveCity_EventScript_14CBB4 + goto_if_eq LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq LilycoveCity_EventScript_1A029B + goto_if_eq LilycoveCity_EventScript_1A029B setflag 2255 msgbox LilycoveCity_Text_1C5B1D, 4 release @@ -90,7 +90,7 @@ LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer checkflag 2061 - jumpeq LilycoveCity_EventScript_14CBDC + goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release end @@ -108,7 +108,7 @@ LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer checkflag 112 - jumpeq LilycoveCity_EventScript_14CC04 + goto_if_eq LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release end @@ -122,7 +122,7 @@ LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer checkflag 112 - jumpeq LilycoveCity_EventScript_14CC23 + goto_if_eq LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release end @@ -148,7 +148,7 @@ LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer checkflag 2061 - jumpeq LilycoveCity_EventScript_14CC5D + goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release end @@ -187,7 +187,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall checkflag 2052 - jumpeq LilycoveCity_EventScript_14CCC0 + goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall end @@ -212,7 +212,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall checkflag 218 - jumpeq LilycoveCity_EventScript_14CD18 + goto_if_eq LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 move LAST_TALKED, LilycoveCity_Movement_1A0839 waitmove 0 @@ -249,19 +249,19 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 faceplayer checkgender compare RESULT, 0 - jumpeq LilycoveCity_EventScript_14CD60 + goto_if_eq LilycoveCity_EventScript_14CD60 compare RESULT, 1 - jumpeq LilycoveCity_EventScript_14CDD3 + goto_if_eq LilycoveCity_EventScript_14CDD3 end LilycoveCity_EventScript_14CD60:: @ 814CD60 playmusic 415, 1 checkflag 286 - callif 1, LilycoveCity_EventScript_14CDB0 + call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 - callif 0, LilycoveCity_EventScript_14CDB9 + call_if 0, LilycoveCity_EventScript_14CDB9 compare RESULT, 0 - jumpeq LilycoveCity_EventScript_14CDC2 + goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch 0x4023 case 0, LilycoveCity_EventScript_14CE46 @@ -288,11 +288,11 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playmusic 421, 1 checkflag 286 - callif 1, LilycoveCity_EventScript_14CE23 + call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 - callif 0, LilycoveCity_EventScript_14CE2C + call_if 0, LilycoveCity_EventScript_14CE2C compare RESULT, 0 - jumpeq LilycoveCity_EventScript_14CE35 + goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch 0x4023 case 0, LilycoveCity_EventScript_14CE76 @@ -350,11 +350,11 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 checkflag 2060 - callif 1, LilycoveCity_EventScript_14CEDE + call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - callif 1, LilycoveCity_EventScript_14CEEE + call_if 1, LilycoveCity_EventScript_14CEEE compare RESULT, 1 - callif 1, LilycoveCity_EventScript_14CEF7 + call_if 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 goto LilycoveCity_EventScript_14CF6B @@ -362,7 +362,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 LilycoveCity_EventScript_14CEDE:: @ 814CEDE checkflag 2062 - jumpeq LilycoveCity_EventScript_14CEE8 + goto_if_eq LilycoveCity_EventScript_14CEE8 return LilycoveCity_EventScript_14CEE8:: @ 814CEE8 @@ -375,7 +375,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE LilycoveCity_EventScript_14CEF7:: @ 814CEF7 checkflag 2052 - jumpeq LilycoveCity_EventScript_14CF09 + goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -387,11 +387,11 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 checkflag 2060 - callif 1, LilycoveCity_EventScript_14CEDE + call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - callif 1, LilycoveCity_EventScript_14CF47 + call_if 1, LilycoveCity_EventScript_14CF47 compare RESULT, 1 - callif 1, LilycoveCity_EventScript_14CF50 + call_if 1, LilycoveCity_EventScript_14CF50 clearflag 760 goto LilycoveCity_EventScript_14CF6B end @@ -402,7 +402,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 LilycoveCity_EventScript_14CF50:: @ 814CF50 checkflag 2052 - jumpeq LilycoveCity_EventScript_14CF62 + goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index ebd59cd91..1abc71238 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -14,7 +14,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 checkflag 775 - jumpeq LilycoveCity_ContestLobby_EventScript_158898 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 setvar 0x4099, 0 end @@ -32,9 +32,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_1588DE + goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158918 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -45,7 +45,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon compare RESULT, 1 - callif 1, LilycoveCity_ContestLobby_EventScript_158948 + call_if 1, LilycoveCity_ContestLobby_EventScript_158948 move 4, LilycoveCity_ContestLobby_Movement_158A43 waitmove 0 disappear 4 @@ -57,7 +57,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_1588DE + goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton move 4, LilycoveCity_ContestLobby_Movement_158A43 @@ -189,7 +189,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B checkflag 775 - jumpeq LilycoveCity_ContestLobby_EventScript_158A6A + goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A setvar 0x4099, 0 end @@ -206,9 +206,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158AAE + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158AE8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE @@ -218,7 +218,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon compare RESULT, 1 - callif 1, LilycoveCity_ContestLobby_EventScript_158B18 + call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 move 11, LilycoveCity_ContestLobby_Movement_158B6D waitmove 0 disappear 11 @@ -230,7 +230,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158AAE + goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton move 11, LilycoveCity_ContestLobby_Movement_158B6D @@ -306,9 +306,9 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158BBA + goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA checkflag 2 - jumpeq LilycoveCity_ContestLobby_EventScript_158BAE + goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waittext setflag 2 @@ -329,11 +329,11 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158C35 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog hidebox 0, 0, 15, 9 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158C35 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 return @@ -362,18 +362,18 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 setvar CONTEST_RANK, 0 choosecontestpkmn compare 0x8004, 255 - jumpeq LilycoveCity_ContestLobby_EventScript_158CEA + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 compare RESULT, 0 - jumpeq LilycoveCity_ContestLobby_EventScript_158C96 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158CC0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 compare RESULT, 2 - jumpeq LilycoveCity_ContestLobby_EventScript_158CC0 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 compare RESULT, 3 - jumpeq LilycoveCity_ContestLobby_EventScript_158CA4 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 compare RESULT, 4 - jumpeq LilycoveCity_ContestLobby_EventScript_158CB2 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end LilycoveCity_ContestLobby_EventScript_158C96:: @ 8158C96 @@ -403,7 +403,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA checkflag 3 - callif 0, LilycoveCity_ContestLobby_EventScript_158BC4 + call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waittext multichoice 0, 0, 4, 0 @@ -421,11 +421,11 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 special sub_808363C waitstate compare RESULT, 3 - jumpeq LilycoveCity_ContestLobby_EventScript_158D90 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 compare RESULT, 5 - jumpeq LilycoveCity_ContestLobby_EventScript_158DA1 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 compare RESULT, 6 - jumpeq LilycoveCity_ContestLobby_EventScript_158DB2 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A waittext contestlinktransfer @@ -570,7 +570,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialval RESULT, sub_80C5044 compare RESULT, 1 - jumpeq LilycoveCity_ContestLobby_EventScript_158EE8 + goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 @@ -708,7 +708,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 checkflag 150 - jumpif 0, LilycoveCity_ContestLobby_EventScript_159039 + goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 95945a595..638bf8cf1 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall checkflag 2052 - jumpeq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 + goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 checkflag 2061 - jumpeq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF + goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmove 0 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 48758ac5c..f5c511179 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -5,12 +5,12 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer checkflag 2 - callif 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 + call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag 2 - callif 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialval RESULT, sub_8090FC0 compare RESULT, 1 - jumpeq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 + goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index b28fe3a47..9a9843053 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer checkflag 2 - callif 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF + call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar 0x8005, 0x4043 special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 @@ -23,7 +23,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 warpplace LilycoveCity_DepartmentStore_1F, 255, 2, 1 compare 0x4043, 0 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -32,7 +32,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 warpplace LilycoveCity_DepartmentStore_2F, 255, 2, 1 compare 0x4043, 1 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -41,7 +41,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 warpplace LilycoveCity_DepartmentStore_3F, 255, 2, 1 compare 0x4043, 2 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -50,7 +50,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B warpplace LilycoveCity_DepartmentStore_4F, 255, 2, 1 compare 0x4043, 3 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E warpplace LilycoveCity_DepartmentStore_5F, 255, 2, 1 compare 0x4043, 4 - jumpeq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 + goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index c1be4bbe7..f3989bc2a 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 event_96 3 compare RESULT, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F compare RESULT, 0 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 faceplayer event_96 3 compare RESULT, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release end @@ -128,22 +128,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 compare 0x4001, 0 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D compare 0x4001, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 compare 0x4001, 2 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace 0x4000, 1 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 compare 0x4001, 0 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 compare 0x4001, 1 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 compare 0x4001, 2 - callif 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 + call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop bufferitem 0, 0x4000 @@ -155,10 +155,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - jumpif 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 @@ -167,10 +167,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - jumpif 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 + goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index ac1198aee..5704a090b 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -10,12 +10,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E faceplayer checkdailyflags compare 0x4045, 0 - jumpif 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 + goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E4C + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E56 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waittext @@ -34,24 +34,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmove 0 compare 0x8004, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E60 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY compare 0x8006, 0 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitem 0, 0x8005 compare 0x8004, 1 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 compare 0x8004, 3 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare 0x8004, 4 - callif 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 + call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem 0x8005 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159E9C + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -113,7 +113,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem 0x4045 compare RESULT, 0 - jumpeq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 + goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 471d1f8b5..884b43bb1 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -11,13 +11,13 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 faceplayer checkitem ITEM_EON_TICKET, 1 compare RESULT, 1 - jumpeq LilycoveCity_Harbor_EventScript_1599EE + goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA checkflag 2052 - jumpeq LilycoveCity_Harbor_EventScript_1598CD + goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release end @@ -26,7 +26,7 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 compare RESULT, 0 - jumpeq LilycoveCity_Harbor_EventScript_159929 + goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext goto LilycoveCity_Harbor_EventScript_1598F1 @@ -49,7 +49,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 compare RESULT, 0 - jumpeq LilycoveCity_Harbor_EventScript_15997E + goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A warp SSTidalCorridor, 255, 1, 10 @@ -60,7 +60,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, 5 compare RESULT, 0 - jumpeq LilycoveCity_Harbor_EventScript_15997E + goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp BattleTower_Outside, 255, 19, 23 waitstate @@ -81,9 +81,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A pause 30 spriteinvisible LAST_TALKED, 13, 10 compare FACING, 2 - callif 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - callif 1, LilycoveCity_Harbor_EventScript_1599CE + call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 setvar 0x8004, 2 @@ -107,11 +107,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE checkflag 2052 - jumpif 0, LilycoveCity_Harbor_EventScript_1598BA + goto_if 0, LilycoveCity_Harbor_EventScript_1598BA checkflag 206 - jumpeq LilycoveCity_Harbor_EventScript_1598BA + goto_if_eq LilycoveCity_Harbor_EventScript_1598BA checkflag 2131 - jumpif 0, LilycoveCity_Harbor_EventScript_1598BA + goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closebutton move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 @@ -130,9 +130,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE pause 30 disappear 4 compare FACING, 2 - callif 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - callif 1, LilycoveCity_Harbor_EventScript_1599CE + call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 special ScrSpecial_HealPlayerParty @@ -160,7 +160,7 @@ LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer checkflag 2052 - jumpeq LilycoveCity_Harbor_EventScript_159AA2 + goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index 75780667d..d3399f5ac 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -5,11 +5,11 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer checkflag 234 - jumpeq LilycoveCity_House2_EventScript_159BDA + goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 compare RESULT, 0 - jumpeq LilycoveCity_House2_EventScript_1A029B + goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag 234 msgbox LilycoveCity_House2_Text_18B883, 4 release diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 51e4988b3..6926f4f45 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -12,7 +12,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 faceplayer msgbox LilycoveCity_House3_Text_18B8CC, 5 compare RESULT, 0 - jumpeq LilycoveCity_House3_EventScript_159C1D + goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton move LAST_TALKED, LilycoveCity_House3_Movement_1A083D diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index a481f9c32..c0fa73360 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -12,9 +12,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 waittext multichoice 20, 8, 16, 1 compare RESULT, 0 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 compare RESULT, 1 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F @@ -24,9 +24,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 compare RESULT, 0 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 compare RESULT, 1 - jumpeq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 + goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 06a3ae4ca..ec316b576 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -5,31 +5,31 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 checkflag 160 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 checkflag 161 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 checkflag 162 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 checkflag 163 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 checkflag 164 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD @@ -97,7 +97,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag 236 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialval 0x8004, sub_80C4D50 switch 0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C @@ -126,7 +126,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 compare RESULT, 0 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 closebutton releaseall @@ -147,35 +147,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall checkflag 162 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall checkflag 164 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall checkflag 160 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall checkflag 161 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall checkflag 163 - jumpeq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A + goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 2786c930c..286ad055e 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -17,19 +17,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE special sub_80F9A0C waitstate compare 0x8004, 255 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B7B + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 compare RESULT, 1 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B71 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves compare RESULT, 1 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159B64 + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special sub_80F9EEC fadescreen 0 compare 0x8005, 4 - jumpeq LilycoveCity_MoveDeletersHouse_EventScript_159ADE + goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 switch RESULT diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 5809e28c8..b398076fa 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -22,7 +22,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer checkflag 2061 - jumpeq LilycoveCity_PokemonCenter_1F_EventScript_15935D + goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index e503ef4ec..14806cba4 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -62,9 +62,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 compare 0x4095, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 compare 0x4095, 2 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 @@ -72,35 +72,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 setvar 0x8004, 8 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 specialval RESULT, sub_810FD60 compare RESULT, 0 - callif 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 @@ -149,13 +149,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F setvar 0x8004, 13 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release end @@ -163,7 +163,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release end @@ -189,13 +189,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 setvar 0x8004, 8 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release end @@ -203,7 +203,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release end @@ -229,13 +229,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D setvar 0x8004, 9 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release end @@ -243,7 +243,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release end @@ -269,13 +269,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 setvar 0x8004, 10 special sub_810FDAC compare 0x4095, 0 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release end @@ -283,7 +283,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release end @@ -310,10 +310,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release end @@ -321,7 +321,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release end @@ -343,10 +343,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release end @@ -354,7 +354,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release end @@ -376,10 +376,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release end @@ -387,7 +387,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release end @@ -409,10 +409,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 special sub_810FDAC specialval RESULT, sub_810FD60 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 specialval RESULT, sub_810FCB0 compare RESULT, 7 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release end @@ -420,7 +420,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 specialval RESULT, sub_810FCB0 compare RESULT, 1 - jumpeq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F + goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 2da725de7..1c019e046 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -6,19 +6,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 compare 0x4092, 2 - callif 1, LittlerootTown_EventScript_14D57B + call_if 1, LittlerootTown_EventScript_14D57B checkflag 82 - callif 0, LittlerootTown_EventScript_14D583 + call_if 0, LittlerootTown_EventScript_14D583 compare 0x4050, 3 - callif 1, LittlerootTown_EventScript_14D5A6 + call_if 1, LittlerootTown_EventScript_14D5A6 compare 0x4082, 4 - callif 1, LittlerootTown_EventScript_14D570 + call_if 1, LittlerootTown_EventScript_14D570 compare 0x408c, 4 - callif 1, LittlerootTown_EventScript_14D570 + call_if 1, LittlerootTown_EventScript_14D570 compare 0x40c7, 1 - callif 1, LittlerootTown_EventScript_14D567 + call_if 1, LittlerootTown_EventScript_14D567 compare 0x408d, 3 - callif 1, LittlerootTown_EventScript_14D563 + call_if 1, LittlerootTown_EventScript_14D563 end LittlerootTown_EventScript_14D563:: @ 814D563 @@ -41,7 +41,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B LittlerootTown_EventScript_14D583:: @ 814D583 compare 0x4050, 0 - jumpeq LittlerootTown_EventScript_14D59A + goto_if_eq LittlerootTown_EventScript_14D59A movespriteperm 1, 10, 1 spritebehave 1, 7 return @@ -56,9 +56,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 spritebehave 4, 8 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D5C5 + call_if 1, LittlerootTown_EventScript_14D5C5 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D5CD + call_if 1, LittlerootTown_EventScript_14D5CD return LittlerootTown_EventScript_14D5C5:: @ 814D5C5 @@ -188,11 +188,11 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer checkflag 116 - jumpeq LittlerootTown_EventScript_14D72F + goto_if_eq LittlerootTown_EventScript_14D72F checkflag 82 - jumpeq LittlerootTown_EventScript_14D722 + goto_if_eq LittlerootTown_EventScript_14D722 compare 0x4050, 0 - jumpif 5, LittlerootTown_EventScript_14D708 + goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release end @@ -335,9 +335,9 @@ LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D822 + call_if 1, LittlerootTown_EventScript_14D822 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D82B + call_if 1, LittlerootTown_EventScript_14D82B releaseall end @@ -353,9 +353,9 @@ LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D84E + call_if 1, LittlerootTown_EventScript_14D84E compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D857 + call_if 1, LittlerootTown_EventScript_14D857 releaseall end @@ -408,27 +408,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D93C + call_if 1, LittlerootTown_EventScript_14D93C compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D947 + call_if 1, LittlerootTown_EventScript_14D947 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D926 + call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D931 + call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closebutton checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D952 + call_if 1, LittlerootTown_EventScript_14D952 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D995 + call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14DAAA + call_if 1, LittlerootTown_EventScript_14DAAA compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14DAED + call_if 1, LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -454,32 +454,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 LittlerootTown_EventScript_14D952:: @ 814D952 compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14D9D8 + call_if 1, LittlerootTown_EventScript_14D9D8 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14D9ED + call_if 1, LittlerootTown_EventScript_14D9ED compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DA02 + call_if 1, LittlerootTown_EventScript_14DA02 compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DA17 + call_if 1, LittlerootTown_EventScript_14DA17 compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DA2C + call_if 1, LittlerootTown_EventScript_14DA2C compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DA41 + call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14D9D8 + call_if 1, LittlerootTown_EventScript_14D9D8 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14D9ED + call_if 1, LittlerootTown_EventScript_14D9ED compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DA56 + call_if 1, LittlerootTown_EventScript_14DA56 compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DA6B + call_if 1, LittlerootTown_EventScript_14DA6B compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DA80 + call_if 1, LittlerootTown_EventScript_14DA80 compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DA95 + call_if 1, LittlerootTown_EventScript_14DA95 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 @@ -554,32 +554,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 LittlerootTown_EventScript_14DAAA:: @ 814DAAA compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14DB30 + call_if 1, LittlerootTown_EventScript_14DB30 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14DB3B + call_if 1, LittlerootTown_EventScript_14DB3B compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DB46 + call_if 1, LittlerootTown_EventScript_14DB46 compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DB6C + call_if 1, LittlerootTown_EventScript_14DB6C compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DB92 + call_if 1, LittlerootTown_EventScript_14DB92 compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DBB8 + call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED compare 0x8008, 0 - callif 1, LittlerootTown_EventScript_14DB30 + call_if 1, LittlerootTown_EventScript_14DB30 compare 0x8008, 1 - callif 1, LittlerootTown_EventScript_14DB3B + call_if 1, LittlerootTown_EventScript_14DB3B compare 0x8008, 2 - callif 1, LittlerootTown_EventScript_14DBDE + call_if 1, LittlerootTown_EventScript_14DBDE compare 0x8008, 3 - callif 1, LittlerootTown_EventScript_14DC04 + call_if 1, LittlerootTown_EventScript_14DC04 compare 0x8008, 4 - callif 1, LittlerootTown_EventScript_14DC2A + call_if 1, LittlerootTown_EventScript_14DC2A compare 0x8008, 5 - callif 1, LittlerootTown_EventScript_14DC50 + call_if 1, LittlerootTown_EventScript_14DC50 return LittlerootTown_EventScript_14DB30:: @ 814DB30 @@ -843,9 +843,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 faceplayer checkgender compare RESULT, 0 - callif 1, LittlerootTown_EventScript_14D926 + call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 - callif 1, LittlerootTown_EventScript_14D931 + call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 move 4, LittlerootTown_Movement_1A0841 waitmove 0 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 849115390..ca872ba0f 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare 0x4092, 6 - callif 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 + call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag 274 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 @@ -19,7 +19,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152680 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 @@ -28,11 +28,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A compare 0x4092, 3 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 compare 0x4092, 5 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC compare 0x4092, 6 - callif 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 + call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 0803cd512..0176db332 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -5,9 +5,9 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag 130 - callif 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE + call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare 0x4092, 4 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 end @@ -24,16 +24,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_15280A + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A compare RESULT, 1 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152814 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end LittlerootTown_BrendansHouse_2F_EventScript_15280A:: @ 815280A @@ -52,9 +52,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkgender compare RESULT, 0 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152837 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 compare RESULT, 1 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_15285D + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index b70dc0687..1d76bb6dc 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -6,9 +6,9 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare 0x4092, 6 - callif 0, LittlerootTown_MaysHouse_1F_EventScript_15289E + call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag 274 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E @@ -19,7 +19,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkgender compare RESULT, 1 - jumpeq LittlerootTown_MaysHouse_1F_EventScript_1528BE + goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE @@ -28,11 +28,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 compare 0x4092, 3 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_152902 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 compare 0x4092, 5 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA compare 0x4092, 6 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA @@ -118,9 +118,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 lockall checkgender compare RESULT, 0 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 compare RESULT, 1 - callif 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 + call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -136,11 +136,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer checkflag 130 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A21 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A17 + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare 0x408d, 3 - jumpeq LittlerootTown_BrendansHouse_1F_EventScript_152A2B + goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 release diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 85a41caff..a0dda8b70 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -5,9 +5,9 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag 130 - callif 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A + call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare 0x4092, 4 - callif 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 + call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 end @@ -24,19 +24,19 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkgender compare RESULT, 1 - jumpeq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall checkflag 292 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkgender compare RESULT, 0 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playsfx 9 disappear LAST_TALKED setvar 0x408d, 3 @@ -58,11 +58,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton compare FACING, 4 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 compare FACING, 2 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 compare FACING, 3 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 @@ -92,11 +92,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton compare FACING, 4 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 2 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 3 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F @@ -114,22 +114,22 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 waitmove 0 checkgender compare RESULT, 0 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 - callif 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED + call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag 293 releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB checkflag 293 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152BFF + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED checkflag 293 - jumpeq LittlerootTown_BrendansHouse_2F_EventScript_152C08 + goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return @@ -195,9 +195,9 @@ LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkgender compare RESULT, 0 - jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C52 + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 compare RESULT, 1 - jumpeq LittlerootTown_MaysHouse_2F_EventScript_152C5C + goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 80148ce08..bd846b4fe 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -31,9 +31,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 compare RESULT, 1 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA compare RESULT, 0 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA @@ -45,9 +45,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 compare RESULT, 1 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 compare RESULT, 0 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 @@ -60,9 +60,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 compare RESULT, 1 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 compare RESULT, 0 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A @@ -86,9 +86,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer compare 0x4084, 3 - jumpif 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 + goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag 88 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 setflag 88 release @@ -108,9 +108,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer checkflag 896 - jumpif 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F + goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare 0x4084, 5 - jumpeq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B + goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release end @@ -125,9 +125,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA waitmove 0 checkgender compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 setflag 116 setvar 0x4051, 1 @@ -140,7 +140,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem ITEM_POKE_BALL, 5 compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 return @@ -149,7 +149,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem ITEM_POKE_BALL, 5 compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 return @@ -189,9 +189,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 faceplayer checkgender compare RESULT, 0 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE compare RESULT, 1 - callif 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 + call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 0304181fb..63364c6e5 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -4,7 +4,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE checkflag 2145 - callif 1, MagmaHideout_B1F_EventScript_15F2B8 + call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 78d1961e5..cae65f41e 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -9,7 +9,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 clearflag 99 setvar 0x4093, 0 checkflag 209 - callif 1, MauvilleCity_EventScript_14C053 + call_if 1, MauvilleCity_EventScript_14C053 end MauvilleCity_EventScript_14C053:: @ 814C053 @@ -53,7 +53,7 @@ MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer checkflag 98 - jumpeq MauvilleCity_EventScript_14C0BA + goto_if_eq MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 setflag 98 release @@ -68,7 +68,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer checkflag 284 - jumpeq MauvilleCity_EventScript_14C0E4 + goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closebutton move 7, MauvilleCity_Movement_1A083D @@ -87,7 +87,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall checkflag 284 - jumpeq MauvilleCity_EventScript_14C292 + goto_if_eq MauvilleCity_EventScript_14C292 move 6, MauvilleCity_Movement_1A0843 waitmove 0 msgbox MauvilleCity_Text_165BE3, 4 @@ -106,9 +106,9 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 MauvilleCity_EventScript_14C154:: @ 814C154 compare RESULT, 1 - callif 1, MauvilleCity_EventScript_14C23C + call_if 1, MauvilleCity_EventScript_14C23C compare RESULT, 0 - jumpeq MauvilleCity_EventScript_14C285 + goto_if_eq MauvilleCity_EventScript_14C285 closebutton switch FACING case 2, MauvilleCity_EventScript_14C187 @@ -285,11 +285,11 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer checkflag 209 - jumpeq MauvilleCity_EventScript_14C368 + goto_if_eq MauvilleCity_EventScript_14C368 compare 0x40ba, 2 - jumpeq MauvilleCity_EventScript_14C33C + goto_if_eq MauvilleCity_EventScript_14C33C checkflag 208 - jumpeq MauvilleCity_EventScript_14C332 + goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 giveitem ITEM_BASEMENT_KEY setflag 208 @@ -306,7 +306,7 @@ MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem ITEM_TM24 compare RESULT, 0 - jumpeq MauvilleCity_EventScript_1A029B + goto_if_eq MauvilleCity_EventScript_1A029B setflag 209 msgbox MauvilleCity_Text_166488, 4 release diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index e0faf85a0..0b577885e 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -5,23 +5,23 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer checkflag 90 - jumpeq MauvilleCity_BikeShop_EventScript_15686E + goto_if_eq MauvilleCity_BikeShop_EventScript_15686E checkflag 89 - jumpeq MauvilleCity_BikeShop_EventScript_1567D1 + goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_156824 + goto_if_eq MauvilleCity_BikeShop_EventScript_156824 compare RESULT, 0 - jumpeq MauvilleCity_BikeShop_EventScript_156817 + goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, 5 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_156824 + goto_if_eq MauvilleCity_BikeShop_EventScript_156824 compare RESULT, 0 - jumpeq MauvilleCity_BikeShop_EventScript_156817 + goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 @@ -65,19 +65,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, 5 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_15688D + goto_if_eq MauvilleCity_BikeShop_EventScript_15688D compare RESULT, 0 - jumpeq MauvilleCity_BikeShop_EventScript_1568BF + goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_1568C9 + goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 compare RESULT, 1 - jumpeq MauvilleCity_BikeShop_EventScript_1568EA + goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index fa5b58885..db6223400 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -7,7 +7,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156B32 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waittext showmoney 0, 0 @@ -34,10 +34,10 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins 16385 compare 0x4001, 9950 - jumpif 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156B3C + goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 paymoney 0x3e8, 0 updatemoney 0, 0 @@ -53,10 +53,10 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins 16385 compare 0x4001, 9500 - jumpif 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156B3C + goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 paymoney 0x2710, 0 updatemoney 0, 0 @@ -101,7 +101,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 compare RESULT, 1 - jumpeq MauvilleCity_GameCorner_EventScript_156B88 + goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -145,7 +145,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D0D + goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156C46 case 2, MauvilleCity_GameCorner_EventScript_156C80 @@ -155,11 +155,11 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 88 checkdecor 88 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 88 updatecoins 0, 0 @@ -171,11 +171,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 89 checkdecor 89 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 89 updatecoins 0, 0 @@ -187,11 +187,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 90 checkdecor 90 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156D02 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 90 updatecoins 0, 0 @@ -222,7 +222,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 compare RESULT, 1 - jumpeq MauvilleCity_GameCorner_EventScript_156D36 + goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -278,7 +278,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F77 + goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156E3C case 2, MauvilleCity_GameCorner_EventScript_156E76 @@ -290,10 +290,10 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins 16386 compare 0x4002, 1500 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 1500 additem ITEM_TM32, 1 updatecoins 0, 0 @@ -305,10 +305,10 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins 16386 compare 0x4002, 3500 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 3500 additem ITEM_TM29, 1 updatecoins 0, 0 @@ -320,10 +320,10 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins 16386 compare 0x4002, 4000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM35, 1 updatecoins 0, 0 @@ -335,10 +335,10 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins 16386 compare 0x4002, 4000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM24, 1 updatecoins 0, 0 @@ -350,10 +350,10 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins 16386 compare 0x4002, 4000 - jumpif 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_156F6C + goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM13, 1 updatecoins 0, 0 @@ -390,10 +390,10 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer checkflag 226 - jumpeq MauvilleCity_GameCorner_EventScript_157072 + goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157068 + goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch 0x4023 case 0, MauvilleCity_GameCorner_EventScript_156FDB case 1, MauvilleCity_GameCorner_EventScript_157005 @@ -404,7 +404,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecor 1, 88 checkdecor 88 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157059 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 setflag 226 @@ -415,7 +415,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecor 1, 89 checkdecor 89 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157059 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 setflag 226 @@ -426,7 +426,7 @@ MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecor 1, 90 checkdecor 90 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_157059 + goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 setflag 226 @@ -454,17 +454,17 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C faceplayer checkitem ITEM_COIN_CASE, 1 compare RESULT, 1 - jumpeq MauvilleCity_GameCorner_EventScript_15709C + goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag 225 - jumpeq MauvilleCity_GameCorner_EventScript_1570CA + goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 compare 0x4001, 1 - jumpif 4, MauvilleCity_GameCorner_EventScript_1570CA + goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag 225 givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 @@ -523,7 +523,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialval RESULT, sub_810F424 pokecasino RESULT @@ -534,7 +534,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialval RESULT, sub_810F424 pokecasino RESULT @@ -545,7 +545,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialval RESULT, sub_810F424 pokecasino RESULT @@ -556,7 +556,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialval RESULT, sub_810F424 pokecasino RESULT @@ -567,7 +567,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialval RESULT, sub_810F424 pokecasino RESULT @@ -578,7 +578,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialval RESULT, sub_810F424 pokecasino RESULT @@ -589,7 +589,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialval RESULT, sub_810F424 pokecasino RESULT @@ -600,7 +600,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialval RESULT, sub_810F424 pokecasino RESULT @@ -611,7 +611,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialval RESULT, sub_810F424 pokecasino RESULT @@ -622,7 +622,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialval RESULT, sub_810F424 pokecasino RESULT @@ -633,7 +633,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialval RESULT, sub_810F424 pokecasino RESULT @@ -644,7 +644,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 - jumpeq MauvilleCity_GameCorner_EventScript_1572B5 + goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialval RESULT, sub_810F424 pokecasino RESULT diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 75136dcef..80a33ffb0 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -4,7 +4,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1565A7 + goto_if_eq MauvilleCity_Gym_EventScript_1565A7 switch 0x4093 case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D @@ -14,7 +14,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 MauvilleCity_Gym_EventScript_156491:: @ 8156491 checkflag 99 - jumpeq MauvilleCity_Gym_EventScript_15649B + goto_if_eq MauvilleCity_Gym_EventScript_15649B end MauvilleCity_Gym_EventScript_15649B:: @ 815649B @@ -70,9 +70,9 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 - jumpif 0, MauvilleCity_Gym_EventScript_15661D + goto_if 0, MauvilleCity_Gym_EventScript_15661D compare 0x40ba, 2 - jumpeq MauvilleCity_Gym_EventScript_156641 + goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release end @@ -86,7 +86,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag 2057 addvar 0x4085, 1 compare 0x4085, 6 - callif 1, MauvilleCity_Gym_EventScript_1A00FB + call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 @@ -98,7 +98,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34 compare RESULT, 0 - jumpeq MauvilleCity_Gym_EventScript_1A029B + goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag 167 release @@ -112,9 +112,9 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 1 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 goto MauvilleCity_Gym_EventScript_1566BA @@ -123,9 +123,9 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 2 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 goto MauvilleCity_Gym_EventScript_1566BA @@ -134,9 +134,9 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 3 - jumpeq MauvilleCity_Gym_EventScript_1566DA + goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 goto MauvilleCity_Gym_EventScript_1566BA @@ -148,9 +148,9 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special DrawWholeMapView playsfx 44 checkflag 99 - jumpeq MauvilleCity_Gym_EventScript_1566E1 + goto_if_eq MauvilleCity_Gym_EventScript_1566E1 checkflag 99 - jumpif 0, MauvilleCity_Gym_EventScript_1566DC + goto_if 0, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -192,7 +192,7 @@ MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer checkflag 1208 - jumpeq MauvilleCity_Gym_EventScript_156757 + goto_if_eq MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release end @@ -205,14 +205,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall checkflag 2057 - jumpeq MauvilleCity_Gym_EventScript_156781 + goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall checkflag 2057 - jumpeq MauvilleCity_Gym_EventScript_156781 + goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index 48ee31be5..e76564847 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -5,7 +5,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer checkflag 107 - jumpeq MauvilleCity_House1_EventScript_156A29 + goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem ITEM_HM06 setflag 107 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index edb74f9f9..24236ede6 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -5,11 +5,11 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer checkflag 258 - jumpeq MauvilleCity_House2_EventScript_15733D + goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 compare RESULT, 1 - jumpeq MauvilleCity_House2_EventScript_1572E5 + goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end @@ -21,9 +21,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 waitmove 0 msgbox MauvilleCity_House2_Text_1824D8, 5 compare RESULT, 1 - jumpeq MauvilleCity_House2_EventScript_15731B + goto_if_eq MauvilleCity_House2_EventScript_15731B compare RESULT, 0 - jumpeq MauvilleCity_House2_EventScript_157347 + goto_if_eq MauvilleCity_House2_EventScript_157347 end MauvilleCity_House2_EventScript_15731B:: @ 815731B diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 3e7155955..d5e1574cc 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -216,7 +216,7 @@ MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer checkflag 244 - jumpeq MeteorFalls_1F_1R_EventScript_15C66E + goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E setflag 244 msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 8e45c34ae..23d814855 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -5,7 +5,7 @@ MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MeteorFalls_1F_2R_EventScript_15C6A0 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -18,7 +18,7 @@ MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MeteorFalls_1F_2R_EventScript_15C6E2 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -31,7 +31,7 @@ MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MeteorFalls_1F_2R_EventScript_15C728 + goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index ddb317364..d1b8e88b3 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -8,7 +8,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag 102 clearflag 103 checkflag 2090 - callif 1, MossdeepCity_EventScript_1A02C1 + call_if 1, MossdeepCity_EventScript_1A02C1 end MossdeepCity_EventScript_14CFAE:: @ 814CFAE @@ -69,14 +69,14 @@ MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer checkflag 276 - jumpeq MossdeepCity_EventScript_14D069 + goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 compare RESULT, 0 - jumpeq MossdeepCity_EventScript_14D073 + goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem ITEM_KINGS_ROCK compare RESULT, 0 - jumpeq MossdeepCity_EventScript_1A029B + goto_if_eq MossdeepCity_EventScript_1A029B setflag 276 release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 59669596a..f644e93cc 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special sub_813601C compare RESULT, 1 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 @@ -18,9 +18,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special sub_813601C compare RESULT, 0 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E compare 0x40c0, 0 - callif 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF + call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E @@ -50,11 +50,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 move 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmove 0 compare 0x40c0, 1 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 compare 0x40c0, 2 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B compare 0x40c0, 3 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar 0x40c0, 0 releaseall @@ -85,7 +85,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer compare 0x4001, 1 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15AD59 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release end @@ -95,28 +95,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 compare RESULT, 0 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 compare RESULT, 0 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog compare RESULT, 0 - jumpeq MossdeepCity_GameCorner_1F_EventScript_15ADE8 + goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton compare FACING, 2 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 compare FACING, 4 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 - callif 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 + call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MossdeepCity_GameCorner_B1F, 255, 3, 1 waitstate release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index c7d1201fd..77cc96f4d 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -23,11 +23,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special sub_813556C waitstate compare RESULT, 3 - callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 + call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 compare RESULT, 1 - callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 + call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 compare RESULT, 2 - callif 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE + call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 733f6816e..4c46ca334 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -4,25 +4,25 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 checkflag 100 - jumpeq MossdeepCity_Gym_EventScript_15A510 + goto_if_eq MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 checkflag 101 - jumpeq MossdeepCity_Gym_EventScript_15A528 + goto_if_eq MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 checkflag 102 - jumpeq MossdeepCity_Gym_EventScript_15A540 + goto_if_eq MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 checkflag 103 - jumpeq MossdeepCity_Gym_EventScript_15A558 + goto_if_eq MossdeepCity_Gym_EventScript_15A558 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 @@ -51,7 +51,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 checkflag 171 - jumpif 0, MossdeepCity_Gym_EventScript_15A5C6 + goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release end @@ -74,7 +74,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04 compare RESULT, 0 - jumpeq MossdeepCity_Gym_EventScript_1A029B + goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag 171 release @@ -83,7 +83,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall checkflag 100 - jumpeq MossdeepCity_Gym_EventScript_15A621 + goto_if_eq MossdeepCity_Gym_EventScript_15A621 setflag 100 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -110,7 +110,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall checkflag 101 - jumpeq MossdeepCity_Gym_EventScript_15A675 + goto_if_eq MossdeepCity_Gym_EventScript_15A675 setflag 101 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -131,7 +131,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall checkflag 102 - jumpeq MossdeepCity_Gym_EventScript_15A6C9 + goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 setflag 102 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -152,7 +152,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall checkflag 103 - jumpeq MossdeepCity_Gym_EventScript_15A71D + goto_if_eq MossdeepCity_Gym_EventScript_15A71D setflag 103 move 255, MossdeepCity_Gym_Movement_15A7F7 waitmove 0 @@ -211,7 +211,7 @@ MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer checkflag 1229 - jumpeq MossdeepCity_Gym_EventScript_15A7ED + goto_if_eq MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release end @@ -229,14 +229,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall checkflag 2061 - jumpeq MossdeepCity_Gym_EventScript_15A81A + goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall checkflag 2061 - jumpeq MossdeepCity_Gym_EventScript_15A81A + goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 319dfba8e..c8af8f886 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -8,7 +8,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F msgbox MossdeepCity_House1_Text_18D465, 4 specialval RESULT, GetPokeblockNameByMonNature compare RESULT, 0 - jumpeq MossdeepCity_House1_EventScript_15A855 + goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f3d07b64e..3cf5a8ff4 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B setflag 224 clearflag 933 compare FACING, 2 - callif 1, MossdeepCity_House2_EventScript_15A8AE + call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 - callif 1, MossdeepCity_House2_EventScript_15A8B9 + call_if 1, MossdeepCity_House2_EventScript_15A8B9 disappear 3 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index fd97ee598..8f9bf4dc5 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -5,10 +5,10 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer checkflag 152 - jumpeq MossdeepCity_House3_EventScript_15A9B1 + goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 compare RESULT, 0 - jumpeq MossdeepCity_House3_EventScript_15A9BB + goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD setflag 152 diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 12dc941e7..215cf5e35 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -5,7 +5,7 @@ MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer checkflag 2052 - jumpeq MossdeepCity_House4_EventScript_15AB46 + goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release end @@ -20,7 +20,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 faceplayer special sub_80BB63C compare RESULT, 0 - jumpeq MossdeepCity_House4_EventScript_15AB6D + goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 release diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index db31e4c62..369523b42 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -8,9 +8,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B specialval RESULT, GetWeekCount buffernum 0, RESULT compare RESULT, 0 - callif 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA + call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 - callif 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 + call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmove 0 @@ -33,11 +33,11 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer checkflag 192 - jumpeq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE compare RESULT, 0 - jumpeq MossdeepCity_SpaceCenter_1F_EventScript_1A029B + goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag 192 msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d4477bd39..f6ba77cb9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -6,7 +6,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 checkflag 2052 - callif 0, MossdeepCity_StevensHouse_EventScript_15A9DF + call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF @@ -15,7 +15,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 compare 0x40c6, 1 - callif 1, MossdeepCity_StevensHouse_EventScript_15A9F5 + call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 @@ -73,10 +73,10 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 compare RESULT, 0 - jumpeq MossdeepCity_StevensHouse_EventScript_15AAE6 + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 countpokemon compare RESULT, 6 - jumpeq MossdeepCity_StevensHouse_EventScript_15AADC + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 fanfare 370 @@ -87,7 +87,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 - callif 1, MossdeepCity_StevensHouse_EventScript_1A0678 + call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 setflag 298 releaseall @@ -114,7 +114,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall checkflag 302 - jumpeq MossdeepCity_StevensHouse_EventScript_15AB16 + goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 0134adbdf..458e4a15b 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -19,17 +19,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 nop msgbox MtChimney_Text_195760, 5 compare RESULT, 0 - jumpeq MtChimney_EventScript_15D00B + goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 compare RESULT, 0 - jumpeq MtChimney_EventScript_15D018 + goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 - callif 1, MtChimney_EventScript_15D000 + call_if 1, MtChimney_EventScript_15D000 giveitem ITEM_LAVA_COOKIE compare RESULT, 0 - jumpeq MtChimney_EventScript_15CFF3 + goto_if_eq MtChimney_EventScript_15CFF3 hidemoney 0, 0 release end @@ -407,12 +407,12 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall checkflag 139 - jumpif 0, MtChimney_EventScript_15D1D0 + goto_if 0, MtChimney_EventScript_15D1D0 checkflag 115 - jumpeq MtChimney_EventScript_15D1C6 + goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 compare RESULT, 0 - jumpeq MtChimney_EventScript_15D1BC + goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE setflag 115 @@ -442,7 +442,7 @@ MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MtChimney_EventScript_15D20A + goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 24101b0cb..6f4ea44a5 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 compare 0x40a3, 1 - callif 1, MtChimney_CableCarStation_EventScript_15C111 + call_if 1, MtChimney_CableCarStation_EventScript_15C111 end MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 @@ -33,9 +33,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B faceplayer msgbox MtChimney_CableCarStation_Text_19256A, 5 compare RESULT, 1 - jumpeq MtChimney_CableCarStation_EventScript_15C16C + goto_if_eq MtChimney_CableCarStation_EventScript_15C16C compare RESULT, 0 - jumpeq MtChimney_CableCarStation_EventScript_15C19B + goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 805c4a8d3..026d54bfe 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -5,11 +5,11 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer checkflag 282 - jumpeq MtPyre_1F_EventScript_15D352 + goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG compare RESULT, 0 - jumpeq MtPyre_1F_EventScript_1A029B + goto_if_eq MtPyre_1F_EventScript_1A029B setflag 282 release end diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 657b4ef15..4f8d99c5e 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -5,7 +5,7 @@ MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq MtPyre_6F_EventScript_15D46F + goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index efffc7c3b..550f74d9a 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -9,7 +9,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy 0x4000, 0x4001 compare 0x4001, 12 - jumpif 0, MtPyre_Exterior_EventScript_15D4A3 + goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index f30b6fb9e..31a83857b 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -31,11 +31,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 waitmove 0 pause 50 compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D593 + call_if 1, MtPyre_Summit_EventScript_15D593 compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D59E + call_if 1, MtPyre_Summit_EventScript_15D59E compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D59F + call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 .else @@ -53,11 +53,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 pause 20 call MtPyre_Summit_EventScript_15D57A compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D5AA + call_if 1, MtPyre_Summit_EventScript_15D5AA compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D5BF + call_if 1, MtPyre_Summit_EventScript_15D5BF compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D5CA + call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 .else @@ -144,9 +144,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF msgbox MtPyre_Summit_Text_1B64B3, 5 .endif compare RESULT, 1 - callif 1, MtPyre_Summit_EventScript_15D611 + call_if 1, MtPyre_Summit_EventScript_15D611 compare RESULT, 0 - callif 1, MtPyre_Summit_EventScript_15D61A + call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -170,11 +170,11 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer checkflag 259 - jumpeq MtPyre_Summit_EventScript_15D6C4 + goto_if_eq MtPyre_Summit_EventScript_15D6C4 checkflag 113 - jumpeq MtPyre_Summit_EventScript_15D64A + goto_if_eq MtPyre_Summit_EventScript_15D64A checkflag 129 - jumpeq MtPyre_Summit_EventScript_15D6BA + goto_if_eq MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 .else @@ -190,9 +190,9 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A msgbox MtPyre_Summit_Text_1B6283, 5 .endif compare RESULT, 1 - jumpeq MtPyre_Summit_EventScript_15D669 + goto_if_eq MtPyre_Summit_EventScript_15D669 compare RESULT, 0 - jumpeq MtPyre_Summit_EventScript_15D69B + goto_if_eq MtPyre_Summit_EventScript_15D69B end MtPyre_Summit_EventScript_15D669:: @ 815D669 @@ -221,9 +221,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B msgbox MtPyre_Summit_Text_1B62E7, 5 .endif compare RESULT, 1 - jumpeq MtPyre_Summit_EventScript_15D669 + goto_if_eq MtPyre_Summit_EventScript_15D669 compare RESULT, 0 - jumpeq MtPyre_Summit_EventScript_15D69B + goto_if_eq MtPyre_Summit_EventScript_15D69B end MtPyre_Summit_EventScript_15D6BA:: @ 815D6BA @@ -269,11 +269,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 waitmove 0 pause 50 compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D75E + call_if 1, MtPyre_Summit_EventScript_15D75E compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D769 + call_if 1, MtPyre_Summit_EventScript_15D769 compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D774 + call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 .else @@ -281,11 +281,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 .endif closebutton compare 0x8008, 0 - callif 1, MtPyre_Summit_EventScript_15D77F + call_if 1, MtPyre_Summit_EventScript_15D77F compare 0x8008, 1 - callif 1, MtPyre_Summit_EventScript_15D78A + call_if 1, MtPyre_Summit_EventScript_15D78A compare 0x8008, 2 - callif 1, MtPyre_Summit_EventScript_15D795 + call_if 1, MtPyre_Summit_EventScript_15D795 disappear 2 setvar 0x40b9, 3 releaseall diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 547fc72e7..698f2f6cd 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A NewMauville_Entrance_MapScript1_15E495:: @ 815E495 compare 0x40ba, 0 - callif 1, NewMauville_Entrance_EventScript_15E4A1 + call_if 1, NewMauville_Entrance_EventScript_15E4A1 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 @@ -28,10 +28,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 compare RESULT, 0 - jumpeq NewMauville_Entrance_EventScript_15E55D + goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, 5 compare RESULT, 0 - jumpeq NewMauville_Entrance_EventScript_15E55D + goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmaptile 3, 0, 707, 0 setmaptile 4, 0, 708, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index b088b8e7d..352bb8a6d 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -6,11 +6,11 @@ NewMauville_Inside_MapScripts:: @ 815E55F NewMauville_Inside_MapScript1_15E56F:: @ 815E56F compare 0x4001, 1 - callif 1, NewMauville_Inside_EventScript_15E5DA + call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 - callif 1, NewMauville_Inside_EventScript_15E728 + call_if 1, NewMauville_Inside_EventScript_15E728 checkflag 2145 - callif 1, NewMauville_Inside_EventScript_15E58F + call_if 1, NewMauville_Inside_EventScript_15E58F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F @@ -24,7 +24,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 NewMauville_Inside_MapScript1_15E59E:: @ 815E59E compare 0x40ba, 2 - callif 1, NewMauville_Inside_EventScript_15E88B + call_if 1, NewMauville_Inside_EventScript_15E88B end NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA @@ -151,7 +151,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall compare 0x40ba, 2 - jumpeq NewMauville_Inside_EventScript_15E8F6 + goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index f1d554d87..d620df71e 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -6,11 +6,11 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag 2064 checkflag 116 - callif 0, OldaleTown_EventScript_14DD92 + call_if 0, OldaleTown_EventScript_14DD92 checkflag 132 - callif 0, OldaleTown_EventScript_14DD9E + call_if 0, OldaleTown_EventScript_14DD9E checkflag 116 - callif 1, OldaleTown_EventScript_14DD8C + call_if 1, OldaleTown_EventScript_14DD8C end OldaleTown_EventScript_14DD8C:: @ 814DD8C @@ -39,9 +39,9 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer checkflag 132 - jumpeq OldaleTown_EventScript_14DE79 + goto_if_eq OldaleTown_EventScript_14DE79 checkflag 1 - jumpeq OldaleTown_EventScript_14DE79 + goto_if_eq OldaleTown_EventScript_14DE79 setflag 1 playmusic 420, 0 msgbox OldaleTown_Text_16AEF2, 4 @@ -77,7 +77,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem ITEM_POTION compare RESULT, 0 - jumpeq OldaleTown_EventScript_14DE83 + goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 fadedefault @@ -196,7 +196,7 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer checkflag 116 - jumpeq OldaleTown_EventScript_14DF26 + goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closebutton move 3, OldaleTown_Movement_1A083D @@ -258,9 +258,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkgender compare RESULT, 0 - jumpeq OldaleTown_EventScript_14DFAA + goto_if_eq OldaleTown_EventScript_14DFAA compare RESULT, 1 - jumpeq OldaleTown_EventScript_14DFB8 + goto_if_eq OldaleTown_EventScript_14DFB8 end OldaleTown_EventScript_14DFAA:: @ 814DFAA diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index 3f4994890..77d7eee4d 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -7,7 +7,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 message OldaleTown_Mart_Text_1A0BE4 waittext checkflag 116 - jumpeq OldaleTown_Mart_EventScript_152FA8 + goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 release @@ -44,7 +44,7 @@ OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer checkflag 116 - jumpeq OldaleTown_Mart_EventScript_152FDB + goto_if_eq OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 4ba96ddc8..6d2fe54f0 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -27,7 +27,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer checkflag 2049 - jumpeq OldaleTown_PokemonCenter_1F_EventScript_152F4C + goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f2174441f..aaeeb2453 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -7,27 +7,27 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 checkdailyflags call PacifidlogTown_House2_EventScript_1541B4 checkflag 299 - jumpeq PacifidlogTown_House2_EventScript_154254 + goto_if_eq PacifidlogTown_House2_EventScript_154254 checkflag 300 - callif 1, PacifidlogTown_House2_EventScript_1541CE + call_if 1, PacifidlogTown_House2_EventScript_1541CE checkflag 300 - callif 0, PacifidlogTown_House2_EventScript_1541D7 + call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - jumpif 4, PacifidlogTown_House2_EventScript_1541EC + goto_if 4, PacifidlogTown_House2_EventScript_1541EC specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 2 - jumpif 4, PacifidlogTown_House2_EventScript_15421B + goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 - jumpif 0, PacifidlogTown_House2_EventScript_1A14DC + goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialval RESULT, sub_810F908 compare RESULT, 0 - callif 1, PacifidlogTown_House2_EventScript_1541E8 + call_if 1, PacifidlogTown_House2_EventScript_1541E8 return PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE @@ -47,7 +47,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem ITEM_TM27 compare RESULT, 0 - jumpeq PacifidlogTown_House2_EventScript_1A029B + goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 @@ -63,7 +63,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem ITEM_TM21 compare RESULT, 0 - jumpeq PacifidlogTown_House2_EventScript_1A029B + goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 6ab9a09b0..73f749400 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -5,24 +5,24 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer checkflag 154 - jumpeq PacifidlogTown_House3_EventScript_154338 + goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 - jumpeq PacifidlogTown_House3_EventScript_154320 + goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 - jumpeq PacifidlogTown_House3_EventScript_154320 + goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 - jumpif 5, PacifidlogTown_House3_EventScript_15432A + goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a special sub_804DB68 diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index e48644beb..b7a6c9f86 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -14,9 +14,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E faceplayer msgbox PacifidlogTown_House4_Text_17963D, 5 compare RESULT, 1 - jumpeq PacifidlogTown_House4_EventScript_15437F + goto_if_eq PacifidlogTown_House4_EventScript_15437F compare RESULT, 0 - jumpeq PacifidlogTown_House4_EventScript_154389 + goto_if_eq PacifidlogTown_House4_EventScript_154389 end PacifidlogTown_House4_EventScript_15437F:: @ 815437F diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index dca1a51b0..fdc496d1f 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -6,7 +6,7 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394 faceplayer specialval RESULT, IsMirageIslandPresent compare RESULT, 1 - jumpeq PacifidlogTown_House5_EventScript_1543B0 + goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index ed575844c..1ffc14144 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -6,9 +6,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag 2070 compare 0x4057, 0 - callif 1, PetalburgCity_EventScript_14B731 + call_if 1, PetalburgCity_EventScript_14B731 compare 0x4057, 2 - callif 1, PetalburgCity_EventScript_14B739 + call_if 1, PetalburgCity_EventScript_14B739 end PetalburgCity_EventScript_14B731:: @ 814B731 @@ -188,23 +188,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 move 9, PetalburgCity_Movement_1A0835 waitmove 0 compare 0x8008, 0 - callif 1, PetalburgCity_EventScript_14B91B + call_if 1, PetalburgCity_EventScript_14B91B compare 0x8008, 1 - callif 1, PetalburgCity_EventScript_14B930 + call_if 1, PetalburgCity_EventScript_14B930 compare 0x8008, 2 - callif 1, PetalburgCity_EventScript_14B93B + call_if 1, PetalburgCity_EventScript_14B93B compare 0x8008, 3 - callif 1, PetalburgCity_EventScript_14B950 + call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closebutton compare 0x8008, 0 - callif 1, PetalburgCity_EventScript_14B965 + call_if 1, PetalburgCity_EventScript_14B965 compare 0x8008, 1 - callif 1, PetalburgCity_EventScript_14B977 + call_if 1, PetalburgCity_EventScript_14B977 compare 0x8008, 2 - callif 1, PetalburgCity_EventScript_14B989 + call_if 1, PetalburgCity_EventScript_14B989 compare 0x8008, 3 - callif 1, PetalburgCity_EventScript_14B99B + call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 move 9, PetalburgCity_Movement_1A0843 move 255, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f8dfb0a39..4b0757f63 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -7,28 +7,28 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C compare 0x4085, 6 - jumpeq PetalburgCity_Gym_EventScript_1544A3 + goto_if_eq PetalburgCity_Gym_EventScript_1544A3 compare 0x4085, 7 - callif 4, PetalburgCity_Gym_EventScript_1544ED + call_if 4, PetalburgCity_Gym_EventScript_1544ED end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar 0x8005, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL - callif 1, PetalburgCity_Gym_EventScript_154FBB + call_if 1, PetalburgCity_Gym_EventScript_154FBB checktrainerflag OPPONENT_MARY - callif 1, PetalburgCity_Gym_EventScript_154FDC + call_if 1, PetalburgCity_Gym_EventScript_154FDC checktrainerflag OPPONENT_PARKER - callif 1, PetalburgCity_Gym_EventScript_154FFD + call_if 1, PetalburgCity_Gym_EventScript_154FFD checktrainerflag OPPONENT_LORI - callif 1, PetalburgCity_Gym_EventScript_15501E + call_if 1, PetalburgCity_Gym_EventScript_15501E checktrainerflag OPPONENT_GEORGE - callif 1, PetalburgCity_Gym_EventScript_15503F + call_if 1, PetalburgCity_Gym_EventScript_15503F checktrainerflag OPPONENT_JODY - callif 1, PetalburgCity_Gym_EventScript_155060 + call_if 1, PetalburgCity_Gym_EventScript_155060 checktrainerflag OPPONENT_BERKE - callif 1, PetalburgCity_Gym_EventScript_155081 + call_if 1, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -45,11 +45,11 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED PetalburgCity_Gym_MapScript1_15451B:: @ 815451B compare 0x4085, 1 - callif 1, PetalburgCity_Gym_EventScript_15453B + call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 - callif 0, PetalburgCity_Gym_EventScript_154543 + call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag 2052 - callif 1, PetalburgCity_Gym_EventScript_15454B + call_if 1, PetalburgCity_Gym_EventScript_15454B end PetalburgCity_Gym_EventScript_15453B:: @ 815453B @@ -145,65 +145,65 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 playsfx 8 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_1547EE + call_if 1, PetalburgCity_Gym_EventScript_1547EE compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_154800 + call_if 1, PetalburgCity_Gym_EventScript_154800 compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_15481C + call_if 1, PetalburgCity_Gym_EventScript_15481C compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_15481C + call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_154884 + call_if 1, PetalburgCity_Gym_EventScript_154884 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_15488F + call_if 1, PetalburgCity_Gym_EventScript_15488F compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_1548A1 + call_if 1, PetalburgCity_Gym_EventScript_1548A1 compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_1548B3 + call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_1548C5 + call_if 1, PetalburgCity_Gym_EventScript_1548C5 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_1548D0 + call_if 1, PetalburgCity_Gym_EventScript_1548D0 compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_1548DB + call_if 1, PetalburgCity_Gym_EventScript_1548DB compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_1548E6 + call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_15492F + call_if 1, PetalburgCity_Gym_EventScript_15492F compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_154930 + call_if 1, PetalburgCity_Gym_EventScript_154930 compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_15493B + call_if 1, PetalburgCity_Gym_EventScript_15493B compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_15493C + call_if 1, PetalburgCity_Gym_EventScript_15493C compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_1548F1 + call_if 1, PetalburgCity_Gym_EventScript_1548F1 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_1548FC + call_if 1, PetalburgCity_Gym_EventScript_1548FC compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_1548F1 + call_if 1, PetalburgCity_Gym_EventScript_1548F1 compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_1548F1 + call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 playmusic 420, 0 compare 0x8008, 0 - callif 1, PetalburgCity_Gym_EventScript_154835 + call_if 1, PetalburgCity_Gym_EventScript_154835 compare 0x8008, 1 - callif 1, PetalburgCity_Gym_EventScript_15484E + call_if 1, PetalburgCity_Gym_EventScript_15484E compare 0x8008, 2 - callif 1, PetalburgCity_Gym_EventScript_154860 + call_if 1, PetalburgCity_Gym_EventScript_154860 compare 0x8008, 3 - callif 1, PetalburgCity_Gym_EventScript_154872 + call_if 1, PetalburgCity_Gym_EventScript_154872 disappear 10 setflag 728 setvar 0x4085, 1 @@ -353,11 +353,11 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_1549B8 + goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 - jumpif 0, PetalburgCity_Gym_EventScript_154A2C + goto_if 0, PetalburgCity_Gym_EventScript_154A2C checkflag 2052 - jumpeq PetalburgCity_Gym_EventScript_154B69 + goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release end @@ -365,15 +365,15 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D PetalburgCity_Gym_EventScript_154969:: @ 8154969 specialval RESULT, IsEnigmaBerryValid compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 compare 0x402d, 0 - jumpeq PetalburgCity_Gym_EventScript_1549B2 + goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 return @@ -385,7 +385,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_1A029B + goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 release end @@ -414,28 +414,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_1A029B + goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closebutton compare FACING, 2 - callif 1, PetalburgCity_Gym_EventScript_154ABC + call_if 1, PetalburgCity_Gym_EventScript_154ABC compare FACING, 1 - callif 1, PetalburgCity_Gym_EventScript_154AC7 + call_if 1, PetalburgCity_Gym_EventScript_154AC7 compare FACING, 3 - callif 1, PetalburgCity_Gym_EventScript_154AD2 + call_if 1, PetalburgCity_Gym_EventScript_154AD2 compare FACING, 4 - callif 1, PetalburgCity_Gym_EventScript_154ADD + call_if 1, PetalburgCity_Gym_EventScript_154ADD pause 70 compare FACING, 2 - callif 1, PetalburgCity_Gym_EventScript_154AE8 + call_if 1, PetalburgCity_Gym_EventScript_154AE8 compare FACING, 1 - callif 1, PetalburgCity_Gym_EventScript_154AF3 + call_if 1, PetalburgCity_Gym_EventScript_154AF3 compare FACING, 3 - callif 1, PetalburgCity_Gym_EventScript_154AFE + call_if 1, PetalburgCity_Gym_EventScript_154AFE compare FACING, 4 - callif 1, PetalburgCity_Gym_EventScript_154B09 + call_if 1, PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release end @@ -593,14 +593,14 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare 0x4085, 6 - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 @@ -623,150 +623,150 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare 0x4085, 6 - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE - jumpif 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 - jumpeq PetalburgCity_Gym_EventScript_154BA8 + goto_if_eq PetalburgCity_Gym_EventScript_154BA8 compare RESULT, 0 - jumpeq PetalburgCity_Gym_EventScript_154BB7 + goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154E29 + goto_if_eq PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -784,7 +784,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154E65 + goto_if_eq PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -802,7 +802,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154EA1 + goto_if_eq PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -820,7 +820,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154EDD + goto_if_eq PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -838,7 +838,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154F19 + goto_if_eq PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -856,7 +856,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154F55 + goto_if_eq PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -874,7 +874,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_154F91 + goto_if_eq PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -892,72 +892,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar 0x8004, 1 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar 0x8004, 2 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar 0x8004, 3 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar 0x8004, 4 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar 0x8004, 5 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar 0x8004, 6 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar 0x8004, 7 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar 0x8004, 8 compare 0x8005, 0 - callif 1, PetalburgCity_Gym_EventScript_155182 + call_if 1, PetalburgCity_Gym_EventScript_155182 compare 0x8005, 1 - callif 1, PetalburgCity_Gym_EventScript_155187 + call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return @@ -1022,7 +1022,7 @@ PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer checkflag 1217 - jumpeq PetalburgCity_Gym_EventScript_1551A0 + goto_if_eq PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release end @@ -1035,14 +1035,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall checkflag 2059 - jumpeq PetalburgCity_Gym_EventScript_1551CA + goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall checkflag 2059 - jumpeq PetalburgCity_Gym_EventScript_1551CA + goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index 2eac03cac..ab7bb822a 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -7,7 +7,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 message PetalburgCity_Mart_Text_1A0BE4 waittext checkflag 296 - jumpeq PetalburgCity_Mart_EventScript_1552EA + goto_if_eq PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 5ef99eee1..63dcaa6ca 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -29,17 +29,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 specialval RESULT, IsStarterInParty compare RESULT, 1 - jumpeq PetalburgCity_PokemonCenter_1F_EventScript_15524F + goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F compare 0x4023, 0 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 compare 0x4023, 1 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B compare 0x4023, 2 - callif 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 + call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index fb521aa46..d8e95d8c6 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -5,13 +5,13 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer checkflag 126 - jumpeq PetalburgCity_WallysHouse_EventScript_1543F7 + goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 checkflag 122 - jumpeq PetalburgCity_WallysHouse_EventScript_154427 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 checkflag 1217 - jumpeq PetalburgCity_WallysHouse_EventScript_154406 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 checkflag 135 - jumpeq PetalburgCity_WallysHouse_EventScript_15443B + goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 setflag 135 release @@ -19,7 +19,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 checkflag 122 - jumpeq PetalburgCity_WallysHouse_EventScript_154431 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -50,9 +50,9 @@ PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer checkflag 122 - jumpeq PetalburgCity_WallysHouse_EventScript_15446D + goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D checkflag 1217 - jumpeq PetalburgCity_WallysHouse_EventScript_154463 + goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 463fbec3c..d1d3a1b8a 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -92,7 +92,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL compare RESULT, 0 - jumpeq PetalburgWoods_EventScript_15CE3F + goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -242,11 +242,11 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer checkflag 297 - jumpeq PetalburgWoods_EventScript_15CF0B + goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED compare RESULT, 0 - jumpeq PetalburgWoods_EventScript_1A029B + goto_if_eq PetalburgWoods_EventScript_1A029B setflag 297 release end @@ -273,7 +273,7 @@ PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq PetalburgWoods_EventScript_15CF65 + goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index b0a714763..5f9f76be2 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -21,7 +21,7 @@ Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route102_EventScript_14EB25 + goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 2d0c1c921..d12f8918f 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -11,9 +11,9 @@ Route103_EventScript_14EB92:: @ 814EB92 lockall checkgender compare RESULT, 0 - jumpeq Route103_EventScript_14EBAB + goto_if_eq Route103_EventScript_14EBAB compare RESULT, 1 - jumpeq Route103_EventScript_14EC04 + goto_if_eq Route103_EventScript_14EC04 end Route103_EventScript_14EBAB:: @ 814EBAB @@ -175,7 +175,7 @@ Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route103_EventScript_14EDD6 + goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -188,7 +188,7 @@ Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route103_EventScript_14EE1C + goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -206,7 +206,7 @@ Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route103_EventScript_14EE75 + goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index d829c6a93..584ab47dd 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -18,9 +18,9 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag 127 - jumpif 0, Route104_EventScript_14EEC4 + goto_if 0, Route104_EventScript_14EEC4 checkflag 2057 - jumpif 0, Route104_EventScript_14EEC4 + goto_if 0, Route104_EventScript_14EEC4 clearflag 906 return @@ -32,11 +32,11 @@ Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer checkflag 246 - jumpeq Route104_EventScript_14EEFF + goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 release @@ -51,11 +51,11 @@ Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer checkflag 279 - jumpeq Route104_EventScript_14EF38 + goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 279 release end @@ -105,11 +105,11 @@ Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer checkflag 262 - jumpeq Route104_EventScript_14EFC2 + goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 compare RESULT, 0 - jumpeq Route104_EventScript_1A029B + goto_if_eq Route104_EventScript_1A029B setflag 262 release end @@ -159,9 +159,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5 moveoffscreen 2 setvar 0x408e, 0 checkflag 189 - jumpif 0, Route104_EventScript_14F08B + goto_if 0, Route104_EventScript_14F08B checkflag 189 - jumpeq Route104_EventScript_14F095 + goto_if_eq Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B @@ -411,7 +411,7 @@ Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F1C7 + goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -424,7 +424,7 @@ Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F205 + goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -437,7 +437,7 @@ Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route104_EventScript_14F243 + goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 693939cf4..ce32a544a 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -5,9 +5,9 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 compare 0x4090, 1 - callif 1, Route104_MrBrineysHouse_EventScript_15BCD4 + call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag 188 - callif 1, Route104_MrBrineysHouse_EventScript_15BCD0 + call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 @@ -25,11 +25,11 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer checkflag 147 - callif 0, Route104_MrBrineysHouse_EventScript_15BD0E + call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E checkflag 189 - jumpif 0, Route104_MrBrineysHouse_EventScript_15BD65 + goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 checkflag 149 - jumpif 0, Route104_MrBrineysHouse_EventScript_15BD7E + goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end @@ -38,7 +38,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 - jumpeq Route104_MrBrineysHouse_EventScript_15BD97 + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -55,14 +55,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 compare RESULT, 0 - jumpeq Route104_MrBrineysHouse_EventScript_15BD97 + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 compare RESULT, 0 - jumpeq Route104_MrBrineysHouse_EventScript_15BD97 + goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 02842c62d..d4d7b59cb 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -5,9 +5,9 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag 2108 checkflag 127 - jumpif 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag 2057 - jumpif 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag 1 end @@ -19,25 +19,25 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer checkflag 1 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_15BE7C + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 checkflag 127 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_15BE4A + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag 127 msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 compare RESULT, 1 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, 0 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 compare RESULT, 1 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, 0 - callif 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -73,7 +73,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer checkflag 94 - jumpif 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 + goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release end @@ -91,13 +91,13 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA faceplayer checkdailyflags checkflag 2256 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_15BF1A + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route104_PrettyPetalFlowerShop_EventScript_1A029B + goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag 2256 msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 release diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index ff1c9d258..e090c4bf2 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -5,21 +5,21 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_CINDY_2 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_AMY_AND_LIV_3 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_GINA_AND_MIA_2 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_LUCAS_2 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 - jumpif 0, Route104_Prototype_EventScript_160C99 + goto_if 0, Route104_Prototype_EventScript_160C99 setflag 215 msgbox Route104_Prototype_Text_19B267, 4 checkflag 216 - jumpeq Route104_Prototype_EventScript_160CFB + goto_if_eq Route104_Prototype_EventScript_160CFB release end @@ -32,21 +32,21 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_CINDY_2 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_AMY_AND_LIV_3 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_GINA_AND_MIA_2 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_LUCAS_2 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 - jumpif 0, Route104_Prototype_EventScript_160CF1 + goto_if 0, Route104_Prototype_EventScript_160CF1 setflag 216 msgbox Route104_Prototype_Text_19B2E9, 4 checkflag 215 - jumpeq Route104_Prototype_EventScript_160CFB + goto_if_eq Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index c71e2ce05..1182dae7e 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -4,7 +4,7 @@ Route105_MapScripts:: @ 814F298 Route105_MapScript1_14F29E:: @ 814F29E checkflag 228 - callif 0, Route105_EventScript_14F2A8 + call_if 0, Route105_EventScript_14F2A8 end Route105_EventScript_14F2A8:: @ 814F2A8 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 0c25594c6..0acf70e64 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -19,7 +19,7 @@ Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route106_EventScript_14F38D + goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index a14bb7298..9daa57b7e 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -10,7 +10,7 @@ Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route107_EventScript_14F3FA + goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 6e9d4adff..09be54c49 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -272,7 +272,7 @@ Route109_EventScript_14F680:: @ 814F680 lock faceplayer checkflag 149 - jumpif 0, Route109_EventScript_14F691 + goto_if 0, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end @@ -280,7 +280,7 @@ Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, 5 compare RESULT, 0 - jumpeq Route109_EventScript_14F6F1 + goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -329,11 +329,11 @@ Route109_EventScript_14F725:: @ 814F725 faceplayer special GetPlayerBigGuyGirlString checkflag 280 - jumpeq Route109_EventScript_14F762 + goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND compare RESULT, 0 - jumpeq Route109_EventScript_1A029B + goto_if_eq Route109_EventScript_1A029B closebutton move LAST_TALKED, Route109_Movement_1A083D waitmove 0 @@ -398,7 +398,7 @@ Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route109_EventScript_14F830 + goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -411,7 +411,7 @@ Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route109_EventScript_14F86E + goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e8afb54fb..789ee3e56 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -10,11 +10,11 @@ Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer checkflag 140 - jumpeq Route109_SeashoreHouse_EventScript_160E36 + goto_if_eq Route109_SeashoreHouse_EventScript_160E36 checkflag 141 - jumpeq Route109_SeashoreHouse_EventScript_160E08 + goto_if_eq Route109_SeashoreHouse_EventScript_160E08 checkflag 2 - jumpeq Route109_SeashoreHouse_EventScript_160DFE + goto_if_eq Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 setflag 2 release @@ -29,7 +29,7 @@ Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem ITEM_SODA_POP, 6 compare RESULT, 0 - jumpeq Route109_SeashoreHouse_EventScript_160E2C + goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag 140 release end @@ -44,7 +44,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 compare RESULT, 1 - jumpeq Route109_SeashoreHouse_EventScript_160E5A + goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoney 0, 0 release @@ -53,10 +53,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 compare RESULT, 0 - jumpeq Route109_SeashoreHouse_EventScript_160E9E + goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 compare RESULT, 0 - jumpeq Route109_SeashoreHouse_EventScript_160EAB + goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 updatemoney 0, 0 @@ -95,11 +95,11 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 checktrainerflag OPPONENT_DWAYNE - jumpif 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_JOHANNA - jumpif 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON - jumpif 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if 0, Route109_SeashoreHouse_EventScript_160F29 setflag 141 release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 745faaddf..723c41e0c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -13,7 +13,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 compare 0x40a9, 1 - callif 1, Route110_EventScript_14F92F + call_if 1, Route110_EventScript_14F92F end Route110_EventScript_14F92F:: @ 814F92F @@ -133,7 +133,7 @@ Route110_EventScript_14FA2E:: @ 814FA2E lockall specialval RESULT, GetRecordedCyclingRoadResults compare RESULT, 0 - jumpeq Route110_EventScript_14FA49 + goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall end @@ -148,9 +148,9 @@ Route110_EventScript_14FA53:: @ 814FA53 faceplayer specialval RESULT, GetPlayerAvatarBike compare RESULT, 1 - jumpeq Route110_EventScript_14FA84 + goto_if_eq Route110_EventScript_14FA84 compare 0x40a9, 0 - jumpeq Route110_EventScript_14FA7A + goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release end @@ -179,7 +179,7 @@ Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FAE3 + goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -207,7 +207,7 @@ Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FB66 + goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -225,7 +225,7 @@ Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FBBB + goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -238,7 +238,7 @@ Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route110_EventScript_14FBF9 + goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -327,9 +327,9 @@ Route110_EventScript_14FD34:: @ 814FD34 lockall checkgender compare RESULT, 0 - callif 1, Route110_EventScript_14FDA7 + call_if 1, Route110_EventScript_14FDA7 compare RESULT, 1 - callif 1, Route110_EventScript_14FDAC + call_if 1, Route110_EventScript_14FDAC move 28, Route110_Movement_1A0845 waitmove 0 move 28, Route110_Movement_1A0833 @@ -338,16 +338,16 @@ Route110_EventScript_14FD34:: @ 814FD34 waitmove 0 pause 30 compare 0x8008, 1 - callif 1, Route110_EventScript_14FF14 + call_if 1, Route110_EventScript_14FF14 compare 0x8008, 2 - callif 1, Route110_EventScript_14FF1F + call_if 1, Route110_EventScript_14FF1F compare 0x8008, 3 - callif 1, Route110_EventScript_14FF2A + call_if 1, Route110_EventScript_14FF2A checkgender compare RESULT, 0 - jumpeq Route110_EventScript_14FDB1 + goto_if_eq Route110_EventScript_14FDB1 compare RESULT, 1 - jumpeq Route110_EventScript_14FE2B + goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -426,22 +426,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closebutton compare 0x8008, 1 - callif 1, Route110_EventScript_14FF56 + call_if 1, Route110_EventScript_14FF56 compare 0x8008, 2 - callif 1, Route110_EventScript_14FF5E + call_if 1, Route110_EventScript_14FF5E compare 0x8008, 3 - callif 1, Route110_EventScript_14FF66 + call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 disappear 28 reappear 29 pause 45 compare 0x8008, 1 - callif 1, Route110_EventScript_14FF35 + call_if 1, Route110_EventScript_14FF35 compare 0x8008, 2 - callif 1, Route110_EventScript_14FF40 + call_if 1, Route110_EventScript_14FF40 compare 0x8008, 3 - callif 1, Route110_EventScript_14FF4B + call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 playmusicbattle 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 96e492b39..32b3ae4fb 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE compare 0x40a9, 3 - callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 compare 0x40a9, 2 - callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 @@ -25,9 +25,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 lockall specialval RESULT, GetPlayerAvatarBike @ player state? compare RESULT, 2 - callif 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D + call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 - jumpeq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 + goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag 2091 setvar 0x4001, 1 releaseall diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 08d6fb5f1..95ea7454e 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -12,7 +12,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall specialval RESULT, GetPlayerAvatarBike compare RESULT, 0 - jumpeq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 + goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 setvar 0x4001, 1 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 10e1a6865..d18f30a43 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B compare 0x4001, 1 - callif 1, Route110_TrickHouseEnd_EventScript_161994 + call_if 1, Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 @@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B setvar 0x40c1, 0 giveitem ITEM_RARE_CANDY compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 setvar 0x40c1, 0 giveitem ITEM_TIMER_BALL compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 setvar 0x40c1, 0 giveitem ITEM_HARD_STONE compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF setvar 0x40c1, 0 giveitem ITEM_SMOKE_BALL compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB setvar 0x40c1, 0 giveitem ITEM_TM12 compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 setvar 0x40c1, 0 giveitem ITEM_MAGNET compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 setvar 0x40c1, 0 giveitem ITEM_PP_MAX compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton call Route110_TrickHouseEnd_EventScript_161C2E @@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closebutton compare FACING, 1 - callif 1, Route110_TrickHouseEnd_EventScript_161C74 + call_if 1, Route110_TrickHouseEnd_EventScript_161C74 compare FACING, 2 - callif 1, Route110_TrickHouseEnd_EventScript_161C7F + call_if 1, Route110_TrickHouseEnd_EventScript_161C7F compare FACING, 3 - callif 1, Route110_TrickHouseEnd_EventScript_161C8A + call_if 1, Route110_TrickHouseEnd_EventScript_161C8A compare FACING, 4 - callif 1, Route110_TrickHouseEnd_EventScript_161C95 + call_if 1, Route110_TrickHouseEnd_EventScript_161C95 pause 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closebutton @@ -172,7 +172,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF givedecoration 31 .endc compare RESULT, 0 - callif 1, Route110_TrickHouseEnd_EventScript_161C61 + call_if 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E special ResetTrickHouseEndRoomFlag diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 2601942be..81d6a44e0 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -7,17 +7,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag 2114 compare 0x40b5, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_160FCE + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE compare 0x40c1, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_160FB2 + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 compare 0x40a6, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_16108E + goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E compare 0x40a7, 5 - callif 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE compare 0x40a7, 3 - callif 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE compare 0x40a7, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE switch 0x40a7 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 @@ -28,7 +28,7 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 setvar 0x40a5, 1 compare 0x4044, 8 - jumpeq Route110_TrickHouseEntrance_EventScript_160FC8 + goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 setvar 0x40a7, 2 end @@ -45,56 +45,56 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar 0x40a7, 0 compare 0x4044, 1 - callif 1, Route110_TrickHouseEntrance_EventScript_16103C + call_if 1, Route110_TrickHouseEntrance_EventScript_16103C compare 0x4044, 2 - callif 1, Route110_TrickHouseEntrance_EventScript_161046 + call_if 1, Route110_TrickHouseEntrance_EventScript_161046 compare 0x4044, 3 - callif 1, Route110_TrickHouseEntrance_EventScript_161050 + call_if 1, Route110_TrickHouseEntrance_EventScript_161050 compare 0x4044, 4 - callif 1, Route110_TrickHouseEntrance_EventScript_16105A + call_if 1, Route110_TrickHouseEntrance_EventScript_16105A compare 0x4044, 5 - callif 1, Route110_TrickHouseEntrance_EventScript_161064 + call_if 1, Route110_TrickHouseEntrance_EventScript_161064 compare 0x4044, 6 - callif 1, Route110_TrickHouseEntrance_EventScript_16106E + call_if 1, Route110_TrickHouseEntrance_EventScript_16106E compare 0x4044, 7 - callif 1, Route110_TrickHouseEntrance_EventScript_161078 + call_if 1, Route110_TrickHouseEntrance_EventScript_161078 compare 0x4044, 8 - callif 1, Route110_TrickHouseEntrance_EventScript_161082 + call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C checkflag 2057 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 checkflag 2058 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 checkflag 2059 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A checkflag 2060 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 checkflag 2061 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E checkflag 2062 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 checkflag 2052 - callif 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 @@ -214,7 +214,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall pause 20 compare 0x4044, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_161327 + call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton pause 20 @@ -249,21 +249,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D move 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmove 0 compare 0x4044, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1612CD + call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD compare 0x4044, 1 - callif 1, Route110_TrickHouseEntrance_EventScript_1612D6 + call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 compare 0x4044, 2 - callif 1, Route110_TrickHouseEntrance_EventScript_1612DF + call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF compare 0x4044, 3 - callif 1, Route110_TrickHouseEntrance_EventScript_1612E8 + call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 compare 0x4044, 4 - callif 1, Route110_TrickHouseEntrance_EventScript_1612F1 + call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 compare 0x4044, 5 - callif 1, Route110_TrickHouseEntrance_EventScript_1612FA + call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA compare 0x4044, 6 - callif 1, Route110_TrickHouseEntrance_EventScript_161303 + call_if 1, Route110_TrickHouseEntrance_EventScript_161303 compare 0x4044, 7 - callif 1, Route110_TrickHouseEntrance_EventScript_16130C + call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closebutton setvar 0x40a6, 1 warp Route110_TrickHouseEntrance, 255, 6, 2 @@ -352,27 +352,27 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E waitmove 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 compare 0x4044, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_1613CE + goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE compare 0x4044, 2 - jumpeq Route110_TrickHouseEntrance_EventScript_1613FA + goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA compare 0x4044, 3 - jumpeq Route110_TrickHouseEntrance_EventScript_161426 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 compare 0x4044, 4 - jumpeq Route110_TrickHouseEntrance_EventScript_161452 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 compare 0x4044, 5 - jumpeq Route110_TrickHouseEntrance_EventScript_16147E + goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E compare 0x4044, 6 - jumpeq Route110_TrickHouseEntrance_EventScript_1614AA + goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA compare 0x4044, 7 - jumpeq Route110_TrickHouseEntrance_EventScript_1614D6 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem ITEM_RARE_CANDY compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -380,9 +380,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem ITEM_TIMER_BALL compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -390,9 +390,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem ITEM_HARD_STONE compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -400,9 +400,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem ITEM_SMOKE_BALL compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -410,9 +410,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem ITEM_TM12 compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -420,9 +420,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem ITEM_MAGNET compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -430,9 +430,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem ITEM_PP_MAX compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161502 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -455,9 +455,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 givedecoration 31 .endif compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_161551 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 compare RESULT, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1A02B8 + call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall end @@ -496,7 +496,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 closebutton compare RESULT, 1 - jumpeq Route110_TrickHouseEntrance_EventScript_1615DD + goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -578,7 +578,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 compare 0x4044, 8 - jumpeq Route110_TrickHouseEntrance_EventScript_1616D7 + goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall end @@ -603,7 +603,7 @@ gUnknown_081616E1:: @ 81616E1 Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 compare 0x40AB, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playsfx SE_PIN setvar 0x40AB, 2 @@ -614,7 +614,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 compare 0x40AC, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playsfx SE_PIN setvar 0x40AC, 2 @@ -625,7 +625,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 compare 0x40AD, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playsfx SE_PIN setvar 0x40AD, 2 @@ -636,7 +636,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB compare 0x40AE, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playsfx SE_PIN setvar 0x40AE, 2 @@ -647,7 +647,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 compare 0x40AF, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playsfx SE_PIN setvar 0x40AF, 2 @@ -658,7 +658,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D compare 0x40B0, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playsfx SE_PIN setvar 0x40B0, 2 @@ -669,7 +669,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 compare 0x40B1, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playsfx SE_PIN setvar 0x40B1, 2 @@ -680,7 +680,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F compare 0x40B2, 0 - jumpeq Route110_TrickHouseEntrance_EventScript_161888 + goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playsfx SE_PIN setvar 0x40B2, 2 @@ -727,11 +727,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall compare 0x4044, 0 - callif 1, Route110_TrickHouseEntrance_EventScript_1618E1 + call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 compare 0x4044, 1 - callif 1, Route110_TrickHouseEntrance_EventScript_1618F6 + call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 compare 0x4044, 2 - callif 1, Route110_TrickHouseEntrance_EventScript_16190B + call_if 1, Route110_TrickHouseEntrance_EventScript_16190B setvar 0x40a5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index b4f800876..3a89c2db1 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE compare 0x40ab, 2 - jumpeq Route110_TrickHousePuzzle1_EventScript_161D0A + goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall compare 0x40ab, 0 - jumpeq Route110_TrickHousePuzzle1_EventScript_161D26 + goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 96e9d8143..a4731d329 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 compare 0x4001, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E2C + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C compare 0x4002, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E3F + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F compare 0x4003, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E52 + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 compare 0x4004, 1 - callif 1, Route110_TrickHousePuzzle2_EventScript_161E65 + call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE @@ -24,7 +24,7 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall compare 0x40ac, 0 - jumpeq Route110_TrickHousePuzzle2_EventScript_161DD5 + goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index c81c5dd1c..86d68a6ef 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 compare 0x4009, 0 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 @@ -32,19 +32,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmaptile 1, 3, 600, 0 setmaptile 10, 2, 600, 0 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_161F9F + call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FA9 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FB3 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FBD + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FC7 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 compare 0x4008, 6 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FD1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 compare 0x4008, 7 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FDB + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F @@ -303,19 +303,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar 0x4006, 0 setvar 0x4007, 0 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_162683 + call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle3_EventScript_162689 + call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle3_EventScript_16268F + call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle3_EventScript_162695 + call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle3_EventScript_16269B + call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B compare 0x4008, 6 - callif 1, Route110_TrickHousePuzzle3_EventScript_1626A1 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 compare 0x4008, 7 - callif 1, Route110_TrickHousePuzzle3_EventScript_1626A7 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 @@ -348,14 +348,14 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 compare 0x4009, 0 - callif 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView compare 0x4009, 1 - jumpeq Route110_TrickHousePuzzle3_EventScript_1626DD + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD compare 0x4009, 0 - jumpeq Route110_TrickHousePuzzle3_EventScript_1626E4 + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD @@ -371,7 +371,7 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall compare 0x40ad, 0 - jumpeq Route110_TrickHousePuzzle3_EventScript_1626FD + goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 11c0074d9..0c9fc426f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall compare 0x40ae, 0 - jumpeq Route110_TrickHousePuzzle4_EventScript_162760 + goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index be416e326..72268710b 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -14,7 +14,7 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall compare 0x40af, 0 - jumpeq Route110_TrickHousePuzzle5_EventScript_1627E7 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end @@ -28,7 +28,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 move 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4001, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end @@ -38,7 +38,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 move 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4002, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end @@ -48,7 +48,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 move 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4003, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end @@ -58,7 +58,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 move 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4004, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end @@ -68,7 +68,7 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 move 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 compare 0x4005, 1 - jumpeq Route110_TrickHousePuzzle5_EventScript_162DE9 + goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end @@ -166,11 +166,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F move 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 switch RESULT @@ -188,11 +188,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 move 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 switch RESULT @@ -210,11 +210,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 move 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 switch RESULT @@ -232,11 +232,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B move 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 switch RESULT @@ -254,11 +254,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F move 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 compare 0x4009, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare 0x4009, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 compare 0x4009, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 switch RESULT @@ -419,80 +419,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F43 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F4E + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F59 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F64 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F6F + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F7A + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F85 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F90 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_162F9B + call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FA6 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FB1 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FBC + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FC7 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 compare 0x4009, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FD2 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 compare 0x4009, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FDD + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FE8 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FF3 + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_162FFE + call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_163009 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_163014 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_16301F + call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_16302A + call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_163035 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_163040 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_16304B + call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B compare 0x4008, 1 - callif 1, Route110_TrickHousePuzzle5_EventScript_163056 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 compare 0x4008, 2 - callif 1, Route110_TrickHousePuzzle5_EventScript_163061 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 compare 0x4008, 3 - callif 1, Route110_TrickHousePuzzle5_EventScript_16306C + call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C compare 0x4008, 4 - callif 1, Route110_TrickHousePuzzle5_EventScript_163077 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 compare 0x4008, 5 - callif 1, Route110_TrickHousePuzzle5_EventScript_163082 + call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index bd0a7c8d8..ddf845142 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -18,7 +18,7 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall compare 0x40b0, 0 - jumpeq Route110_TrickHousePuzzle6_EventScript_1630FC + goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index a4093c546..c9dcce5e3 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -11,15 +11,15 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 checkflag 194 - callif 1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 checkflag 195 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 checkflag 196 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB checkflag 197 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE checkflag 198 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 @@ -74,7 +74,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 compare 0x40b6, 1 - jumpeq Route110_TrickHousePuzzle7_EventScript_16326E + goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag 194 clearflag 195 clearflag 196 @@ -87,7 +87,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F compare 0x40b6, 1 - callif 1, Route110_TrickHousePuzzle7_EventScript_163167 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B @@ -101,7 +101,7 @@ Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall compare 0x40b1, 0 - jumpeq Route110_TrickHousePuzzle7_EventScript_16329D + goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end @@ -122,75 +122,75 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall pause 32 checkflag 194 - callif 0, Route110_TrickHousePuzzle7_EventScript_163195 + call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 checkflag 194 - callif 1, Route110_TrickHousePuzzle7_EventScript_1631F4 + call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playsfx 36 checkflag 194 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633A4 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 checkflag 194 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633A9 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall pause 32 checkflag 195 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 checkflag 195 - callif 1, Route110_TrickHousePuzzle7_EventScript_163207 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playsfx 36 checkflag 195 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633AE + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE checkflag 195 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633B3 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall pause 32 checkflag 196 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB checkflag 196 - callif 1, Route110_TrickHousePuzzle7_EventScript_16321A + call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playsfx 36 checkflag 196 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633B8 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 checkflag 196 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633BD + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall pause 32 checkflag 197 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE checkflag 197 - callif 1, Route110_TrickHousePuzzle7_EventScript_16322D + call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playsfx 36 checkflag 197 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633C2 + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 checkflag 197 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633C7 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall pause 32 checkflag 198 - callif 0, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 checkflag 198 - callif 1, Route110_TrickHousePuzzle7_EventScript_163240 + call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playsfx 36 checkflag 198 - jumpif 0, Route110_TrickHousePuzzle7_EventScript_1633CC + goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC checkflag 198 - jumpeq Route110_TrickHousePuzzle7_EventScript_1633D1 + goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index d4afab4ea..5f0b00684 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -4,7 +4,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall compare 0x40b2, 0 - jumpeq Route110_TrickHousePuzzle8_EventScript_16342E + goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 68be7e7d2..2a69df98a 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -5,7 +5,7 @@ Route111_MapScripts:: @ 814FF91 Route111_MapScript1_14FF9C:: @ 814FF9C checkflag 228 - callif 0, Route111_EventScript_14FFA6 + call_if 0, Route111_EventScript_14FFA6 end Route111_EventScript_14FFA6:: @ 814FFA6 @@ -17,21 +17,21 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 checktrainerflag OPPONENT_VICKY - jumpif 0, Route111_EventScript_15000D + goto_if 0, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy 0x4000, 0x4001 compare 0x4001, 34 - jumpif 0, Route111_EventScript_15000C + goto_if 0, Route111_EventScript_15000C compare 0x4001, 107 - jumpif 2, Route111_EventScript_15000C + goto_if 2, Route111_EventScript_15000C compare 0x4001, 72 - jumpif 2, Route111_EventScript_150009 + goto_if 2, Route111_EventScript_150009 compare 0x4000, 2000 - jumpif 2, Route111_EventScript_15000C + goto_if 2, Route111_EventScript_15000C compare 0x4000, 8 - jumpif 0, Route111_EventScript_15000C + goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 setweather 8 @@ -53,7 +53,7 @@ Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, 5 compare RESULT, 0 - jumpeq Route111_EventScript_15005F + goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closebutton setflag 963 @@ -75,7 +75,7 @@ Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, 5 compare RESULT, 0 - jumpeq Route111_EventScript_1500A5 + goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closebutton setflag 964 @@ -122,11 +122,11 @@ Route111_EventScript_1500C5:: @ 81500C5 faceplayer checkdailyflags checkflag 2252 - jumpeq Route111_EventScript_150100 + goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY compare RESULT, 0 - jumpeq Route111_EventScript_1A029B + goto_if_eq Route111_EventScript_1A029B setflag 2252 special GetPlayerBigGuyGirlString msgbox Route111_Text_1C5781, 4 @@ -165,7 +165,7 @@ Route111_EventScript_150122:: @ 8150122 Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 compare RESULT, 0 - jumpeq Route111_EventScript_150151 + goto_if_eq Route111_EventScript_150151 setvar 0x4003, 1 releaseall end @@ -174,13 +174,13 @@ Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closebutton compare 0x8004, 0 - callif 1, Route111_EventScript_150188 + call_if 1, Route111_EventScript_150188 compare 0x8004, 1 - callif 1, Route111_EventScript_150193 + call_if 1, Route111_EventScript_150193 compare 0x8004, 2 - callif 1, Route111_EventScript_15019E + call_if 1, Route111_EventScript_15019E compare 0x8004, 3 - callif 1, Route111_EventScript_1501A9 + call_if 1, Route111_EventScript_1501A9 releaseall end @@ -239,7 +239,7 @@ Route111_EventScript_1501D1:: @ 81501D1 setflag 2115 msgbox Route111_Text_16F705, 5 compare RESULT, 1 - jumpeq Route111_EventScript_1501F3 + goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release end @@ -394,7 +394,7 @@ Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route111_EventScript_15042A + goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -422,7 +422,7 @@ Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route111_EventScript_1504AD + goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -435,7 +435,7 @@ Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route111_EventScript_1504EB + goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index 107026a4b..a33b436dc 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -11,9 +11,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, 5 compare RESULT, 1 - jumpeq Route111_OldLadysRestStop_EventScript_15BFFC + goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC compare RESULT, 0 - jumpeq Route111_OldLadysRestStop_EventScript_15C029 + goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC @@ -22,9 +22,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 compare RESULT, 1 - jumpeq Route111_OldLadysRestStop_EventScript_15BFFC + goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC compare RESULT, 0 - jumpeq Route111_OldLadysRestStop_EventScript_15C029 + goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end Route111_OldLadysRestStop_EventScript_15C029:: @ 815C029 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 3fbaf7958..39fc62eaf 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -14,11 +14,11 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A faceplayer setvar 0x8008, 3 checkflag 277 - jumpeq Route111_WinstrateFamilysHouse_EventScript_15BF72 + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE compare RESULT, 0 - jumpeq Route111_WinstrateFamilysHouse_EventScript_1A029B + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -41,7 +41,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 faceplayer setvar 0x8008, 4 checkflag 4 - jumpeq Route111_WinstrateFamilysHouse_EventScript_15BFB6 + goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 1c1e36838..22c055320 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -40,7 +40,7 @@ Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route112_EventScript_150587 + goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 016b868a8..c4ab89f23 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E warp6 Route112, 255, 28, 28 compare 0x40a3, 2 - callif 1, Route112_CableCarStation_EventScript_15C052 + call_if 1, Route112_CableCarStation_EventScript_15C052 end Route112_CableCarStation_EventScript_15C052:: @ 815C052 @@ -34,9 +34,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C faceplayer msgbox Route112_CableCarStation_Text_1924F5, 5 compare RESULT, 1 - jumpeq Route112_CableCarStation_EventScript_15C0AD + goto_if_eq Route112_CableCarStation_EventScript_15C0AD compare RESULT, 0 - jumpeq Route112_CableCarStation_EventScript_15C0DC + goto_if_eq Route112_CableCarStation_EventScript_15C0DC end Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 1fc5a9345..67d28e6df 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -15,9 +15,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy 0x4000, 0x4001 compare 0x4000, 19 - jumpif 0, Route113_EventScript_150604 + goto_if 0, Route113_EventScript_150604 compare 0x4000, 84 - jumpif 2, Route113_EventScript_150604 + goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -62,7 +62,7 @@ Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route113_EventScript_150690 + goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -75,7 +75,7 @@ Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route113_EventScript_1506CE + goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 24f4803b2..2fec004e4 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag 2116 compare 0x40be, 1 - callif 1, Route113_GlassWorkshop_EventScript_16355F + call_if 1, Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F @@ -16,11 +16,11 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer compare 0x40be, 10 - jumpif 4, Route113_GlassWorkshop_EventScript_1638D2 + goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 compare 0x40be, 2 - jumpeq Route113_GlassWorkshop_EventScript_1635B5 + goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 compare 0x40be, 1 - jumpeq Route113_GlassWorkshop_EventScript_1635AB + goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem ITEM_SOOT_SACK setvar 0x40be, 1 @@ -36,10 +36,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_1635E4 + goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 compare 0x4048, 250 - jumpif 0, Route113_GlassWorkshop_EventScript_163818 + goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext goto Route113_GlassWorkshop_EventScript_1635EE @@ -71,10 +71,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 bufferitem 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 goto Route113_GlassWorkshop_EventScript_163851 @@ -85,10 +85,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C bufferitem 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 goto Route113_GlassWorkshop_EventScript_163851 @@ -99,10 +99,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 bufferitem 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 goto Route113_GlassWorkshop_EventScript_163851 @@ -113,10 +113,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 bufferitem 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 goto Route113_GlassWorkshop_EventScript_163851 @@ -127,10 +127,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 bufferitem 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 goto Route113_GlassWorkshop_EventScript_163851 @@ -142,10 +142,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C bufferdecor 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 goto Route113_GlassWorkshop_EventScript_163851 @@ -157,10 +157,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD bufferdecor 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 - jumpif 0, Route113_GlassWorkshop_EventScript_163830 + goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_163845 + goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 goto Route113_GlassWorkshop_EventScript_163851 @@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare 0x8009, 0 - callif 1, Route113_GlassWorkshop_EventScript_163889 + call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 - callif 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release end @@ -212,13 +212,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 Route113_GlassWorkshop_EventScript_163889:: @ 8163889 giveitem 0x8008 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_1638B4 + goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 givedecoration 0x8008 compare RESULT, 0 - jumpeq Route113_GlassWorkshop_EventScript_1638C3 + goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return Route113_GlassWorkshop_EventScript_1638B4:: @ 81638B4 @@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare 0x8009, 0 - callif 1, Route113_GlassWorkshop_EventScript_163889 + call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 - callif 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index cfe1dfe7d..6d28b87a4 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -6,14 +6,14 @@ Route114_EventScript_150733:: @ 8150733 faceplayer checkdailyflags checkflag 2251 - jumpeq Route114_EventScript_150778 + goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route114_EventScript_1A029B + goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 release @@ -28,11 +28,11 @@ Route114_EventScript_150782:: @ 8150782 lock faceplayer checkflag 231 - jumpeq Route114_EventScript_1507B9 + goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 compare RESULT, 0 - jumpeq Route114_EventScript_1A029B + goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 release @@ -89,7 +89,7 @@ Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route114_EventScript_150874 + goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -102,7 +102,7 @@ Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route114_EventScript_1508B2 + goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 50305dc04..b217f24c4 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -10,11 +10,11 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer checkflag 261 - jumpeq Route114_FossilManiacsHouse_EventScript_15C1F2 + goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 compare RESULT, 0 - jumpeq Route114_FossilManiacsHouse_EventScript_1A029B + goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag 261 release end diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 7986a0436..13843f758 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -5,13 +5,13 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer checkflag 267 - jumpeq Route114_FossilManiacsTunnel_EventScript_15C24E + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 - jumpeq Route114_FossilManiacsTunnel_EventScript_15C244 + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 compare RESULT, 1 - jumpeq Route114_FossilManiacsTunnel_EventScript_15C244 + goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release end diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index ff8a1c565..e4334647c 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -10,7 +10,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer checkflag 131 - jumpeq Route114_LanettesHouse_EventScript_15C28F + goto_if_eq Route114_LanettesHouse_EventScript_15C28F setflag 2123 msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE @@ -19,7 +19,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 givedecoration 100 .endif compare RESULT, 0 - jumpeq Route114_LanettesHouse_EventScript_1A02AE + goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag 131 release end @@ -33,7 +33,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, 5 compare RESULT, 1 - jumpeq Route114_LanettesHouse_EventScript_15C2B7 + goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall end @@ -41,7 +41,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, 5 compare RESULT, 1 - callif 1, Route114_LanettesHouse_EventScript_15C2CC + call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 2b0d744ca..3bacb06d1 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -17,7 +17,7 @@ Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route115_EventScript_150970 + goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -35,7 +35,7 @@ Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route115_EventScript_1509C5 + goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -48,7 +48,7 @@ Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route115_EventScript_150A03 + goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 7b9a5162f..94b7d25d6 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -4,7 +4,7 @@ Route116_MapScripts:: @ 8150A31 Route116_MapScript1_150A37:: @ 8150A37 checkflag 143 - callif 1, Route116_EventScript_150A41 + call_if 1, Route116_EventScript_150A41 end Route116_EventScript_150A41:: @ 8150A41 @@ -15,9 +15,9 @@ Route116_EventScript_150A49:: @ 8150A49 lock faceplayer checkflag 143 - jumpeq Route116_EventScript_150A67 + goto_if_eq Route116_EventScript_150A67 checkflag 142 - jumpeq Route116_EventScript_150A71 + goto_if_eq Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release end @@ -36,7 +36,7 @@ Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer checkflag 287 - jumpeq Route116_EventScript_150B04 + goto_if_eq Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end @@ -45,17 +45,17 @@ Route116_EventScript_150A94:: @ 8150A94 setflag 287 giveitem ITEM_REPEAT_BALL compare RESULT, 0 - jumpeq Route116_EventScript_150B12 + goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closebutton compare FACING, 2 - callif 1, Route116_EventScript_150AEE + call_if 1, Route116_EventScript_150AEE compare FACING, 1 - callif 1, Route116_EventScript_150AEE + call_if 1, Route116_EventScript_150AEE compare FACING, 3 - callif 1, Route116_EventScript_150AEE + call_if 1, Route116_EventScript_150AEE compare FACING, 4 - callif 1, Route116_EventScript_150AF9 + call_if 1, Route116_EventScript_150AF9 disappear LAST_TALKED clearflag 949 setflag 256 @@ -149,10 +149,10 @@ Route116_EventScript_150B8F:: @ 8150B8F faceplayer checkitem ITEM_BLACK_GLASSES, 1 compare RESULT, 1 - jumpeq Route116_EventScript_150BCA + goto_if_eq Route116_EventScript_150BCA specialval RESULT, sub_810F828 compare RESULT, 1 - jumpeq Route116_EventScript_150BBB + goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release end @@ -168,7 +168,7 @@ Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_170921, 4 specialval RESULT, sub_810F828 compare RESULT, 1 - jumpeq Route116_EventScript_150BF4 + goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release end @@ -182,13 +182,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 pause 20 compare FACING, 2 - callif 1, Route116_EventScript_150C37 + call_if 1, Route116_EventScript_150C37 compare FACING, 1 - callif 1, Route116_EventScript_150C37 + call_if 1, Route116_EventScript_150C37 compare FACING, 3 - callif 1, Route116_EventScript_150C37 + call_if 1, Route116_EventScript_150C37 compare FACING, 4 - callif 1, Route116_EventScript_150C42 + call_if 1, Route116_EventScript_150C42 disappear LAST_TALKED release end @@ -242,7 +242,7 @@ Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route116_EventScript_150CB7 + goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -265,7 +265,7 @@ Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route116_EventScript_150D23 + goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index d141fae37..10991c38c 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -18,7 +18,7 @@ Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer checkflag 199 - jumpeq Route116_TunnelersRestHouse_EventScript_15C30F + goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 61dbf6a30..a84d1eaf8 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -8,7 +8,7 @@ Route117_MapScript1_150D40:: @ 8150D40 Route117_EventScript_150D46:: @ 8150D46 checkflag 134 - jumpif 0, Route117_EventScript_150D56 + goto_if 0, Route117_EventScript_150D56 movespriteperm 3, 47, 6 Route117_EventScript_150D56:: @ 8150D56 @@ -42,7 +42,7 @@ Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150DB4 + goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -55,7 +55,7 @@ Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150DF2 + goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -68,7 +68,7 @@ Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150E30 + goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -81,7 +81,7 @@ Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150E6E + goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -99,7 +99,7 @@ Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150EC7 + goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -112,7 +112,7 @@ Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route117_EventScript_150F0D + goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index a28352c94..7d4109f59 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -10,12 +10,12 @@ Route118_EventScript_150F34:: @ 8150F34 lock faceplayer checkflag 227 - jumpeq Route118_EventScript_150F89 + goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 compare RESULT, 1 - jumpeq Route118_EventScript_150F5E + goto_if_eq Route118_EventScript_150F5E compare RESULT, 0 - jumpeq Route118_EventScript_150F7F + goto_if_eq Route118_EventScript_150F7F end Route118_EventScript_150F5E:: @ 8150F5E @@ -84,11 +84,11 @@ Route118_EventScript_151004:: @ 8151004 msgbox Route118_Text_170D66, 4 closebutton compare 0x8008, 0 - callif 1, Route118_EventScript_151048 + call_if 1, Route118_EventScript_151048 compare 0x8008, 1 - callif 1, Route118_EventScript_151053 + call_if 1, Route118_EventScript_151053 compare 0x8008, 2 - callif 1, Route118_EventScript_15105E + call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 releaseall @@ -163,7 +163,7 @@ Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route118_EventScript_1510B6 + goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -186,7 +186,7 @@ Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route118_EventScript_151122 + goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index bd73bbf31..0d71ac056 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -5,14 +5,14 @@ Route119_MapScripts:: @ 8151167 Route119_MapScript1_151172:: @ 8151172 checkflag 2145 - callif 1, Route119_EventScript_15117C + call_if 1, Route119_EventScript_15117C end Route119_EventScript_15117C:: @ 815117C compare 0x8004, 6 - callif 1, Route119_EventScript_151193 + call_if 1, Route119_EventScript_151193 compare 0x8004, 7 - callif 1, Route119_EventScript_151197 + call_if 1, Route119_EventScript_151197 return Route119_EventScript_151193:: @ 8151193 @@ -28,7 +28,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 compare 0x40b3, 1 - callif 1, Route119_EventScript_1511B9 + call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -53,29 +53,29 @@ Route119_EventScript_1511DB:: @ 81511DB reappear 25 checkgender compare RESULT, 0 - callif 1, Route119_EventScript_151254 + call_if 1, Route119_EventScript_151254 compare RESULT, 1 - callif 1, Route119_EventScript_151259 + call_if 1, Route119_EventScript_151259 pause 65 compare 0x4001, 1 - callif 1, Route119_EventScript_1513A6 + call_if 1, Route119_EventScript_1513A6 compare 0x4001, 2 - callif 1, Route119_EventScript_1513B1 + call_if 1, Route119_EventScript_1513B1 move 255, Route119_Movement_1A0845 waitmove 0 pause 30 compare 0x4001, 1 - callif 1, Route119_EventScript_1513D2 + call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 - callif 1, Route119_EventScript_1513E1 + call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 pause 30 checkgender compare RESULT, 0 - jumpeq Route119_EventScript_15125E + goto_if_eq Route119_EventScript_15125E compare RESULT, 1 - jumpeq Route119_EventScript_1512D8 + goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -155,16 +155,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton compare 0x4001, 1 - callif 1, Route119_EventScript_1513D2 + call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 - callif 1, Route119_EventScript_1513E1 + call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 pause 30 compare 0x4001, 1 - callif 1, Route119_EventScript_1513BC + call_if 1, Route119_EventScript_1513BC compare 0x4001, 2 - callif 1, Route119_EventScript_1513C7 + call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 playmusicbattle 0 @@ -298,7 +298,7 @@ Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route119_EventScript_1514E6 + goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -311,7 +311,7 @@ Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route119_EventScript_151524 + goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 95ec39d61..762a6c299 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 compare 0x40b3, 0 - callif 1, Route119_WeatherInstitute_1F_EventScript_163C41 + call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 @@ -18,7 +18,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D faceplayer special GetPlayerBigGuyGirlString compare 0x40b3, 0 - jumpeq Route119_WeatherInstitute_1F_EventScript_163C67 + goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index f88b97cfe..35e547f79 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -5,9 +5,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 compare 0x40b3, 0 - callif 1, Route119_WeatherInstitute_2F_EventScript_163CE4 + call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 compare 0x40b3, 1 - callif 1, Route119_WeatherInstitute_2F_EventScript_163CF0 + call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 @@ -57,7 +57,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 countpokemon compare RESULT, 6 - jumpeq Route119_WeatherInstitute_2F_EventScript_163DB4 + goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 fanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare @@ -88,6 +88,6 @@ Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer checkflag 151 - jumpeq Route119_WeatherInstitute_2F_EventScript_163DBE + goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 74250fd0f..f0179d317 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -6,22 +6,22 @@ Route120_MapScripts:: @ 815160E Route120_MapScript1_15161E:: @ 815161E checkflag 2145 - callif 1, Route120_EventScript_151628 + call_if 1, Route120_EventScript_151628 end Route120_EventScript_151628:: @ 8151628 compare 0x8004, 0 - callif 1, Route120_EventScript_15166B + call_if 1, Route120_EventScript_15166B compare 0x8004, 1 - callif 1, Route120_EventScript_151672 + call_if 1, Route120_EventScript_151672 compare 0x8004, 2 - callif 1, Route120_EventScript_151676 + call_if 1, Route120_EventScript_151676 compare 0x8004, 3 - callif 1, Route120_EventScript_15167A + call_if 1, Route120_EventScript_15167A compare 0x8004, 4 - callif 1, Route120_EventScript_15167E + call_if 1, Route120_EventScript_15167E compare 0x8004, 5 - callif 1, Route120_EventScript_151682 + call_if 1, Route120_EventScript_151682 return Route120_EventScript_15166B:: @ 815166B @@ -51,11 +51,11 @@ Route120_EventScript_151682:: @ 8151682 Route120_MapScript1_151686:: @ 8151686 checkflag 228 - callif 0, Route120_EventScript_1516A2 + call_if 0, Route120_EventScript_1516A2 checkflag 285 - callif 1, Route120_EventScript_1516B5 + call_if 1, Route120_EventScript_1516B5 checkflag 285 - callif 0, Route120_EventScript_1516DA + call_if 0, Route120_EventScript_1516DA end Route120_EventScript_1516A2:: @ 81516A2 @@ -82,11 +82,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy 0x4000, 0x4001 compare 0x4001, 14 - jumpif 3, Route120_EventScript_151715 + goto_if 3, Route120_EventScript_151715 compare 0x4001, 60 - jumpif 3, Route120_EventScript_151719 + goto_if 3, Route120_EventScript_151719 compare 0x4001, 61 - jumpif 4, Route120_EventScript_151711 + goto_if 4, Route120_EventScript_151711 return Route120_EventScript_151711:: @ 8151711 @@ -99,9 +99,9 @@ Route120_EventScript_151715:: @ 8151715 Route120_EventScript_151719:: @ 8151719 compare 0x4000, 7 - jumpif 3, Route120_EventScript_151735 + goto_if 3, Route120_EventScript_151735 compare 0x4000, 19 - jumpif 3, Route120_EventScript_151715 + goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -114,12 +114,12 @@ Route120_EventScript_151739:: @ 8151739 faceplayer checkdailyflags checkflag 2254 - jumpeq Route120_EventScript_151837 + goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 compare RESULT, 1 - callif 1, Route120_EventScript_151841 + call_if 1, Route120_EventScript_151841 compare RESULT, 0 - callif 1, Route120_EventScript_15184A + call_if 1, Route120_EventScript_15184A specialval RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC @@ -162,7 +162,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 compare RESULT, 0 - jumpeq Route120_EventScript_1A029B + goto_if_eq Route120_EventScript_1A029B setflag 2254 msgbox Route120_Text_1C5A0B, 4 release @@ -185,10 +185,10 @@ Route120_EventScript_151853:: @ 8151853 lock faceplayer checkflag 290 - jumpeq Route120_EventScript_151884 + goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 compare RESULT, 0 - jumpeq Route120_EventScript_151877 + goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -201,7 +201,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 compare RESULT, 0 - jumpeq Route120_EventScript_151877 + goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -209,9 +209,9 @@ Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closebutton compare FACING, 2 - callif 1, Route120_EventScript_15197F + call_if 1, Route120_EventScript_15197F compare FACING, 3 - callif 1, Route120_EventScript_15198A + call_if 1, Route120_EventScript_15198A move 31, Route120_Movement_1A083F waitmove 0 pause 20 @@ -294,7 +294,7 @@ Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route120_EventScript_1519F1 + goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -317,7 +317,7 @@ Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route120_EventScript_151A5D + goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index e1aaec716..c87774cb8 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -75,7 +75,7 @@ Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route121_EventScript_151BB0 + goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -103,7 +103,7 @@ Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route121_EventScript_151C3B + goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 6850cdeb2..3724e9aeb 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -35,7 +35,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 compare RESULT, 1 - jumpeq Route121_SafariZoneEntrance_EventScript_15C379 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release end @@ -53,7 +53,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 compare RESULT, 1 - jumpeq Route121_SafariZoneEntrance_EventScript_15C3B3 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C end @@ -61,11 +61,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 compare RESULT, 0 - jumpeq Route121_SafariZoneEntrance_EventScript_15C450 + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 compare RESULT, 0 - jumpeq Route121_SafariZoneEntrance_EventScript_15C45E + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 updatemoney 0, 0 @@ -89,10 +89,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon compare RESULT, 6 - jumpif 5, Route121_SafariZoneEntrance_EventScript_15C44F + goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialval RESULT, CheckFreePokemonStorageSpace compare RESULT, 1 - jumpeq Route121_SafariZoneEntrance_EventScript_15C44F + goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C end diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 891a395f0..395eaa7c3 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -10,15 +10,15 @@ Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer checkflag 232 - jumpeq Route123_EventScript_151CAC + goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 - jumpeq Route123_EventScript_151CAA + goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 compare RESULT, 0 - jumpeq Route123_EventScript_1A029B + goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 release @@ -64,7 +64,7 @@ Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route123_EventScript_151D3D + goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -77,7 +77,7 @@ Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route123_EventScript_151D7B + goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 18e94034d..4f7bad5f9 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -11,14 +11,14 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 faceplayer checkdailyflags checkflag 2253 - jumpeq Route123_BerryMastersHouse_EventScript_163A5A + goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 2253 msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 random 10 @@ -26,7 +26,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release end @@ -41,16 +41,16 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 faceplayer checkdailyflags checkflag 2257 - jumpeq Route123_BerryMastersHouse_EventScript_163C13 + goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar 0x8004, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer compare RESULT, 1 - jumpeq Route123_BerryMastersHouse_EventScript_163AAD + goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_163A9B + goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B @@ -61,17 +61,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD compare 0x8004, 0 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 compare 0x8004, 1 - jumpeq Route123_BerryMastersHouse_EventScript_163B1E + goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E compare 0x8004, 2 - jumpeq Route123_BerryMastersHouse_EventScript_163B4F + goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F compare 0x8004, 3 - jumpeq Route123_BerryMastersHouse_EventScript_163B80 + goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 compare 0x8004, 4 - jumpeq Route123_BerryMastersHouse_EventScript_163BB1 + goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 compare 0x8004, 5 - jumpeq Route123_BerryMastersHouse_EventScript_163BE2 + goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 @@ -80,62 +80,62 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E checkflag 248 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F checkflag 249 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 checkflag 250 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 checkflag 251 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 checkflag 252 - jumpeq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY compare RESULT, 0 - jumpeq Route123_BerryMastersHouse_EventScript_1A029B + goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 goto Route123_BerryMastersHouse_EventScript_163C1D end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 68f17b12a..a60b29b99 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -4,7 +4,7 @@ Route124_MapScripts:: @ 8151DDF Route124_MapScript1_151DE5:: @ 8151DE5 checkflag 2090 - callif 1, Route124_EventScript_1A02C1 + call_if 1, Route124_EventScript_1A02C1 end Route124_EventScript_151DEF:: @ 8151DEF @@ -25,7 +25,7 @@ Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route124_EventScript_151E4D + goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -48,7 +48,7 @@ Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route124_EventScript_151EBD + goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -61,7 +61,7 @@ Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route124_EventScript_151F03 + goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 2d0d624c0..b3e91e43c 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -10,7 +10,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer checkflag 217 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163E20 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 setflag 217 goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E @@ -24,7 +24,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_164329 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end @@ -32,16 +32,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar 0x4001, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 compare RESULT, 1 - callif 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C + call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A @@ -248,13 +248,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_16431F + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace 0x8009, 1 compare RESULT, 1 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 checkitem 0x8008, 2 compare RESULT, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end @@ -264,10 +264,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_164333 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 - jumpeq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 + goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index a5d2457d5..045a55a11 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -4,7 +4,7 @@ Route125_MapScripts:: @ 8151F1E Route125_MapScript1_151F24:: @ 8151F24 checkflag 2090 - callif 1, Route125_EventScript_1A02C1 + call_if 1, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E @@ -31,7 +31,7 @@ Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route125_EventScript_151FB1 + goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index f3d1a77f9..729922681 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -4,7 +4,7 @@ Route126_MapScripts:: @ 8151FFE Route126_MapScript1_152004:: @ 8152004 checkflag 2090 - callif 1, Route126_EventScript_1A02C1 + call_if 1, Route126_EventScript_1A02C1 end Route126_EventScript_15200E:: @ 815200E diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index b4461b253..284d1fbd4 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -4,7 +4,7 @@ Route127_MapScripts:: @ 815206A Route127_MapScript1_152070:: @ 8152070 checkflag 2090 - callif 1, Route127_EventScript_1A02C1 + call_if 1, Route127_EventScript_1A02C1 end Route127_EventScript_15207A:: @ 815207A diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 011591400..7db99f7b3 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -5,7 +5,7 @@ Route128_MapScripts:: @ 815211B Route128_MapScript1_152126:: @ 8152126 checkflag 2090 - callif 1, Route128_EventScript_1A02C1 + call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end @@ -184,7 +184,7 @@ Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route128_EventScript_1522CB + goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -197,7 +197,7 @@ Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq Route128_EventScript_152309 + goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index bac6728a7..2c93c1bd6 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -5,7 +5,7 @@ Route130_MapScripts:: @ 81523C2 Route130_MapScript1_1523C8:: @ 81523C8 specialval RESULT, IsMirageIslandPresent compare RESULT, 1 - jumpeq Route130_EventScript_15240C + goto_if_eq Route130_EventScript_15240C setflag 17 setflag 18 setflag 19 diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 81cb7dc02..124788a17 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -4,7 +4,7 @@ Route131_MapScripts:: @ 815243E Route131_MapScript1_152444:: @ 8152444 checkflag 2052 - callif 1, Route131_EventScript_15244E + call_if 1, Route131_EventScript_15244E end Route131_EventScript_15244E:: @ 815244E diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 77f0a5f6f..13a4ce265 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -12,7 +12,7 @@ RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer checkflag 142 - jumpeq RustboroCity_EventScript_14C39B + goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release end @@ -37,7 +37,7 @@ RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer checkflag 2055 - jumpeq RustboroCity_EventScript_14C3CF + goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release end @@ -51,7 +51,7 @@ RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer checkflag 188 - jumpeq RustboroCity_EventScript_14C3EE + goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release end @@ -327,7 +327,7 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer checkflag 143 - jumpeq RustboroCity_EventScript_14C614 + goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release end @@ -364,13 +364,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 RustboroCity_EventScript_14C650:: @ 814C650 compare 0x4001, 0 - callif 1, RustboroCity_EventScript_14C691 + call_if 1, RustboroCity_EventScript_14C691 compare 0x4001, 1 - callif 1, RustboroCity_EventScript_14C6BD + call_if 1, RustboroCity_EventScript_14C6BD compare 0x4001, 2 - callif 1, RustboroCity_EventScript_14C6E9 + call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 - callif 1, RustboroCity_EventScript_14C715 + call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 moveoffscreen 9 @@ -458,19 +458,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 0 - callif 1, RustboroCity_EventScript_14C7FE + call_if 1, RustboroCity_EventScript_14C7FE compare 0x4001, 1 - callif 1, RustboroCity_EventScript_14C82A + call_if 1, RustboroCity_EventScript_14C82A compare 0x4001, 2 - callif 1, RustboroCity_EventScript_14C856 + call_if 1, RustboroCity_EventScript_14C856 compare 0x4001, 3 - callif 1, RustboroCity_EventScript_14C882 + call_if 1, RustboroCity_EventScript_14C882 compare 0x4001, 4 - callif 1, RustboroCity_EventScript_14C8B8 + call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL compare RESULT, 0 - callif 1, RustboroCity_EventScript_14C7F5 + call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton setflag 144 @@ -550,12 +550,12 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer checkflag 288 - jumpeq RustboroCity_EventScript_14C917 + goto_if_eq RustboroCity_EventScript_14C917 checkgender compare RESULT, 0 - jumpeq RustboroCity_EventScript_14C8FD + goto_if_eq RustboroCity_EventScript_14C8FD compare RESULT, 1 - jumpeq RustboroCity_EventScript_14C90A + goto_if_eq RustboroCity_EventScript_14C90A end RustboroCity_EventScript_14C8FD:: @ 814C8FD @@ -573,9 +573,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender compare RESULT, 0 - jumpeq RustboroCity_EventScript_14C92F + goto_if_eq RustboroCity_EventScript_14C92F compare RESULT, 1 - jumpeq RustboroCity_EventScript_14C939 + goto_if_eq RustboroCity_EventScript_14C939 end RustboroCity_EventScript_14C92F:: @ 814C92F diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index d400de1ef..3e98746f3 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -5,7 +5,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer checkflag 137 - jumpeq RustboroCity_CuttersHouse_EventScript_157D53 + goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem ITEM_HM01 setflag 137 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index 97a59257f..f5fb02c93 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C checkflag 144 - callif 0, RustboroCity_DevonCorp_1F_EventScript_157416 + call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 end RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 @@ -16,9 +16,9 @@ RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer checkflag 144 - jumpeq RustboroCity_DevonCorp_1F_EventScript_15744A + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A checkflag 142 - jumpeq RustboroCity_DevonCorp_1F_EventScript_157440 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release end @@ -37,11 +37,11 @@ RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer checkflag 144 - jumpeq RustboroCity_DevonCorp_1F_EventScript_15747B + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B checkflag 143 - jumpeq RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 checkflag 142 - jumpeq RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release end @@ -60,11 +60,11 @@ RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer checkflag 144 - jumpeq RustboroCity_DevonCorp_1F_EventScript_1574B6 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 checkflag 143 - jumpeq RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 checkflag 142 - jumpeq RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index e35015b3e..0c604c513 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release end @@ -24,9 +24,9 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 287 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157519 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release end @@ -40,9 +40,9 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 188 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157543 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release end @@ -56,7 +56,7 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer compare 0x40c4, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release end @@ -65,16 +65,16 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer compare 0x40c4, 2 - jumpeq RustboroCity_DevonCorp_2F_EventScript_15764A + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A compare 0x40c4, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157640 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_1575A6 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 compare RESULT, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_1575EE + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -87,7 +87,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_ROOT_FOSSIL, 1 @@ -105,7 +105,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157636 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_CLAW_FOSSIL, 1 @@ -126,9 +126,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A compare 0x40c5, 1 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157661 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 compare 0x40c5, 2 - jumpeq RustboroCity_DevonCorp_2F_EventScript_1576B4 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 @@ -136,7 +136,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 @@ -147,7 +147,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -156,7 +156,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 - jumpeq RustboroCity_DevonCorp_2F_EventScript_157707 + goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 @@ -167,7 +167,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 - callif 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 2b749c873..fe39af9c4 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 compare 0x408f, 0 - callif 1, RustboroCity_DevonCorp_3F_EventScript_15772D + call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D @@ -147,9 +147,9 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer checkflag 272 - jumpeq RustboroCity_DevonCorp_3F_EventScript_15789B + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B checkflag 189 - jumpeq RustboroCity_DevonCorp_3F_EventScript_157864 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closebutton move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D @@ -161,7 +161,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem ITEM_EXP_SHARE compare RESULT, 0 - jumpeq RustboroCity_DevonCorp_3F_EventScript_1A029B + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closebutton @@ -182,7 +182,7 @@ RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer checkflag 256 - jumpeq RustboroCity_DevonCorp_3F_EventScript_1578C5 + goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index d6e0c92b3..0dfec5cfa 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -9,11 +9,11 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer checkflag 213 - jumpeq RustboroCity_Flat2_2F_EventScript_157DCF + goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL compare RESULT, 0 - jumpeq RustboroCity_Flat2_2F_EventScript_1A029B + goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag 213 release end diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 776cb5c0a..6bb33b4dc 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -4,7 +4,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE checkflag 165 - jumpif 0, RustboroCity_Gym_EventScript_15793C + goto_if 0, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release end @@ -21,14 +21,14 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 compare 0x4085, 6 - callif 1, RustboroCity_Gym_EventScript_1A00FB + call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 compare RESULT, 0 - jumpeq RustboroCity_Gym_EventScript_1A029B + goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag 165 msgbox RustboroCity_Gym_Text_184170, 4 release @@ -48,7 +48,7 @@ RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer checkflag 1201 - jumpeq RustboroCity_Gym_EventScript_1579A3 + goto_if_eq RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release end @@ -61,14 +61,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall checkflag 2055 - jumpeq RustboroCity_Gym_EventScript_1579CD + goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall checkflag 2055 - jumpeq RustboroCity_Gym_EventScript_1579CD + goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 402fff1d3..e45bf2080 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -5,24 +5,24 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer checkflag 153 - jumpeq RustboroCity_House1_EventScript_157D13 + goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 - jumpeq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 compare 0x8004, 255 - jumpeq RustboroCity_House1_EventScript_157CFB + goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT comparevars RESULT, 0x8009 - jumpif 5, RustboroCity_House1_EventScript_157D05 + goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a special sub_804DB68 diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index 6b4ff3a77..7ee528ade 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -7,9 +7,9 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 message RustboroCity_Mart_Text_1A0BE4 waittext checkflag 287 - jumpif 0, RustboroCity_Mart_EventScript_157BEF + goto_if 0, RustboroCity_Mart_EventScript_157BEF checkflag 287 - jumpeq RustboroCity_Mart_EventScript_157C18 + goto_if_eq RustboroCity_Mart_EventScript_157C18 end RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 168c0aaa2..e5a9622fb 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -78,15 +78,15 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer checkflag 275 - jumpeq RustboroCity_PokemonSchool_EventScript_157B34 + goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 - callif 1, RustboroCity_PokemonSchool_EventScript_157B1E + call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E compare FACING, 3 - callif 1, RustboroCity_PokemonSchool_EventScript_157B29 + call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem ITEM_QUICK_CLAW compare RESULT, 0 - jumpeq RustboroCity_PokemonSchool_EventScript_1A029B + goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmove 0 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 129bef7c9..bcc612511 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -11,7 +11,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 compare 0x409a, 2 - callif 1, RusturfTunnel_EventScript_15C773 + call_if 1, RusturfTunnel_EventScript_15C773 end RusturfTunnel_EventScript_15C773:: @ 815C773 @@ -33,7 +33,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer checkflag 1 - jumpeq RusturfTunnel_EventScript_15C7BC + goto_if_eq RusturfTunnel_EventScript_15C7BC setflag 1 msgbox RusturfTunnel_Text_1944C5, 4 closebutton @@ -53,35 +53,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall compare 0x4001, 1 - callif 1, RusturfTunnel_EventScript_15C8CA + call_if 1, RusturfTunnel_EventScript_15C8CA compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C8DF + call_if 1, RusturfTunnel_EventScript_15C8DF compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C8EA + call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C8EB + call_if 1, RusturfTunnel_EventScript_15C8EB compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C8EB + call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 closebutton compare 0x4001, 1 - callif 1, RusturfTunnel_EventScript_15C880 + call_if 1, RusturfTunnel_EventScript_15C880 compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C892 + call_if 1, RusturfTunnel_EventScript_15C892 compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C8AE + call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closebutton compare 0x4001, 1 - callif 1, RusturfTunnel_EventScript_15C8F7 + call_if 1, RusturfTunnel_EventScript_15C8F7 compare 0x4001, 2 - callif 1, RusturfTunnel_EventScript_15C909 + call_if 1, RusturfTunnel_EventScript_15C909 compare 0x4001, 3 - callif 1, RusturfTunnel_EventScript_15C91B + call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index a301bb6fe..d076510dc 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -42,9 +42,9 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 gUnknown_0815FD0D:: @ 815FD0D compare 0x40B4, 2 - jumpeq SSTidalCorridor_EventScript_15FD24 + goto_if_eq SSTidalCorridor_EventScript_15FD24 compare 0x40B4, 7 - jumpeq SSTidalCorridor_EventScript_15FD3A + goto_if_eq SSTidalCorridor_EventScript_15FD3A end SSTidalCorridor_EventScript_15FD24:: @ 815FD24 @@ -114,9 +114,9 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer compare 0x40b4, 4 - jumpeq SSTidalCorridor_EventScript_15FDF8 + goto_if_eq SSTidalCorridor_EventScript_15FDF8 compare 0x40b4, 8 - jumpeq SSTidalCorridor_EventScript_15FE17 + goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release end @@ -125,7 +125,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 sethealplace 8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 - callif 1, SSTidalCorridor_EventScript_15FE36 + call_if 1, SSTidalCorridor_EventScript_15FE36 warp LilycoveCity_Harbor, 255, 8, 11 waitstate release @@ -135,7 +135,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17 sethealplace 4 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 - callif 1, SSTidalCorridor_EventScript_15FE36 + call_if 1, SSTidalCorridor_EventScript_15FE36 warp SlateportCity_Harbor, 255, 8, 11 waitstate release @@ -148,9 +148,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall compare 0x40b4, 2 - jumpeq SSTidalCorridor_EventScript_15FE5B + goto_if_eq SSTidalCorridor_EventScript_15FE5B compare 0x40b4, 7 - jumpeq SSTidalCorridor_EventScript_15FE5B + goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall end @@ -164,7 +164,7 @@ SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer checkflag 247 - jumpeq SSTidalCorridor_EventScript_15FE7A + goto_if_eq SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 release @@ -177,21 +177,21 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A SSTidalCorridor_EventScript_15FE84:: @ 815FE84 checktrainerflag OPPONENT_PHILLIP - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEONARD - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_COLTON - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_TUCKER - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_THOMAS - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEA_AND_JED - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_GARRET - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE - jumpif 0, SSTidalCorridor_EventScript_15FED5 + goto_if 0, SSTidalCorridor_EventScript_15FED5 setflag 247 goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 4d588cd46..aa84b6b48 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -5,11 +5,11 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer checkflag 260 - jumpeq SSTidalRooms_EventScript_15FF3D + goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 compare RESULT, 0 - jumpeq SSTidalRooms_EventScript_1A029B + goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 release diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index f0529fbec..9005bef3b 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -21,7 +21,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B SafariZone_Southeast_MapScript1_160073:: @ 8160073 compare 0x40a4, 2 - callif 1, SafariZone_Southeast_EventScript_16007F + call_if 1, SafariZone_Southeast_EventScript_16007F end SafariZone_Southeast_EventScript_16007F:: @ 816007F @@ -53,10 +53,10 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer compare 0x4001, 0 - jumpeq SafariZone_Southeast_EventScript_1600D1 + goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 compare RESULT, 1 - jumpeq SafariZone_Southeast_EventScript_1600E0 + goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release end diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 76a930dc0..091db022c 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -7,10 +7,10 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 waitbutton hidebox 0, 0, 29, 19 checkflag 228 - jumpeq SealedChamber_InnerRoom_EventScript_15F247 + goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialval RESULT, CheckRelicanthWailord compare RESULT, 0 - jumpeq SealedChamber_InnerRoom_EventScript_15F247 + goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeout 0 playsfx 49 special DoSealedChamberShakingEffect1 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 83ca4e4df..dfa4777fa 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -15,7 +15,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB checkflag 2127 - callif 0, SealedChamber_OuterRoom_EventScript_15F0F5 + call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 @@ -110,7 +110,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall checkflag 2127 - jumpeq SealedChamber_OuterRoom_EventScript_15F1CF + goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemsg SealedChamber_OuterRoom_Braille_1C53B1 waitbutton hidebox 0, 0, 29, 19 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 6238e7f4a..dc2b107e3 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag checkflag 2106 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E06E + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E @@ -21,27 +21,27 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 faceplayer checkdailyflags checkflag 2143 - callif 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 + call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E138 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E138 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E16C + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 - callif 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 + call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 compare RESULT, 2 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E12E + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 removeitem ITEM_SHOAL_SALT, 4 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL compare RESULT, 0 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag 2 release @@ -50,13 +50,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E117 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E128 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return ShoalCave_LowTideEntranceRoom_EventScript_15E128:: @ 815E128 @@ -71,10 +71,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E162 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 compare RESULT, 1 - jumpeq ShoalCave_LowTideEntranceRoom_EventScript_15E162 + goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release end diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index bed2d7b21..05fc6a315 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -5,7 +5,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D checkflag 2106 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1AB + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB @@ -22,46 +22,46 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag 952 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA checkflag 2106 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag 953 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB checkflag 2106 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB checkflag 956 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E213 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 setmaptile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 checkflag 957 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E22B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B setmaptile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B checkflag 958 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E243 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 setmaptile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 checkflag 959 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E256 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 setmaptile 16, 13, 857, 1 return @@ -71,10 +71,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall checkflag 956 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView setflag 956 @@ -89,10 +89,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall checkflag 957 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView setflag 957 @@ -102,10 +102,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall checkflag 958 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView setflag 958 @@ -115,10 +115,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall checkflag 959 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView setflag 959 @@ -128,10 +128,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall checkflag 952 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView setflag 952 @@ -146,10 +146,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall checkflag 953 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideInnerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView setflag 953 diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index 67de2676f..db5779efe 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF checkflag 955 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_15E412 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 setmaptile 18, 2, 856, 1 return @@ -18,10 +18,10 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall checkflag 955 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_15E445 + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView setflag 955 @@ -37,11 +37,11 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer checkflag 283 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_15E47E + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND compare RESULT, 0 - jumpeq ShoalCave_LowTideLowerRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag 283 release end diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index c46a2cb2d..bffb7bd49 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -8,7 +8,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 checkflag 954 - jumpeq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 setmaptile 11, 11, 856, 1 return @@ -18,10 +18,10 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall checkflag 954 - jumpeq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT compare RESULT, 0 - jumpeq ShoalCave_LowTideStairsRoom_EventScript_1A029B + goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView setflag 954 diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index d659a23c1..e41d579c0 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -4,7 +4,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 SkyPillar_Top_MapScript1_15F308:: @ 815F308 checkflag 2145 - callif 1, SkyPillar_Top_EventScript_15F312 + call_if 1, SkyPillar_Top_EventScript_15F312 end SkyPillar_Top_EventScript_15F312:: @ 815F312 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index e156f8948..4b11b2f8d 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -13,7 +13,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BA68 + call_if 1, SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C @@ -68,10 +68,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 msgbox SlateportCity_Text_164682, 4 specialval RESULT, LeadMonHasEffortRibbon compare RESULT, 1 - callif 1, SlateportCity_EventScript_14BB35 + call_if 1, SlateportCity_EventScript_14BB35 specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 - callif 1, SlateportCity_EventScript_14BB2B + call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 fanfare 370 message SlateportCity_Text_1646DD @@ -96,7 +96,7 @@ SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BB56 + call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release end @@ -110,7 +110,7 @@ SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BB77 + call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release end @@ -124,9 +124,9 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BBA1 + call_if 1, SlateportCity_EventScript_14BBA1 checkflag 96 - jumpeq SlateportCity_EventScript_14BBAB + goto_if_eq SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release end @@ -145,7 +145,7 @@ SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BBCC + call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release end @@ -157,7 +157,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC SlateportCity_EventScript_14BBD6:: @ 814BBD6 compare 0x4058, 1 - jumpeq SlateportCity_EventScript_14BBEA + goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -169,7 +169,7 @@ SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BC0A + call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release end @@ -183,7 +183,7 @@ SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer checkflag 148 - jumpeq SlateportCity_EventScript_14BC29 + goto_if_eq SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release end @@ -200,9 +200,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall checkflag 2052 - jumpeq SlateportCity_EventScript_14BC63 + goto_if_eq SlateportCity_EventScript_14BC63 checkflag 2061 - jumpeq SlateportCity_EventScript_14BC59 + goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall end @@ -236,7 +236,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall checkflag 2052 - jumpeq SlateportCity_EventScript_14BCA5 + goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall end @@ -254,7 +254,7 @@ SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer compare 0x4058, 1 - callif 1, SlateportCity_EventScript_14BCCF + call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release end @@ -289,9 +289,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 faceplayer msgbox SlateportCity_Text_1650F1, 5 compare RESULT, 1 - callif 1, SlateportCity_EventScript_14BD28 + call_if 1, SlateportCity_EventScript_14BD28 compare RESULT, 0 - callif 1, SlateportCity_EventScript_14BD31 + call_if 1, SlateportCity_EventScript_14BD31 release end @@ -411,7 +411,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer checkflag 96 - jumpif 0, SlateportCity_EventScript_14BE16 + goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waittext pokemartdecor SlateportCity_Decorations2 @@ -443,7 +443,7 @@ SlateportCity_Decorations2:: @ 814BE40 lock faceplayer checkflag 96 - jumpif 0, SlateportCity_EventScript_14BE16 + goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waittext pokemartdecor SlateportCity_Decorations3 diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 559719583..b2963098c 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -13,11 +13,11 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer checkflag 265 - jumpeq SlateportCity_ContestHall_EventScript_155595 + goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 compare RESULT, 0 - jumpeq SlateportCity_ContestHall_EventScript_1A029B + goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag 265 msgbox SlateportCity_ContestHall_Text_17CE28, 4 release diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index b1ce50815..b541fb0e8 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -102,7 +102,7 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall checkflag 95 - jumpeq SlateportCity_ContestLobby_EventScript_155526 + goto_if_eq SlateportCity_ContestLobby_EventScript_155526 move 7, SlateportCity_ContestLobby_Movement_1A0839 waitmove 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index d7769eb81..33a99b2a4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -6,9 +6,9 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 warp6 SlateportCity, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 - callif 1, SlateportCity_Harbor_EventScript_155F89 + call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag 2052 - callif 1, SlateportCity_Harbor_EventScript_155F85 + call_if 1, SlateportCity_Harbor_EventScript_155F85 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 @@ -64,13 +64,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 disappear 8 setvar 0x40a0, 2 compare 0x8008, 0 - callif 1, SlateportCity_Harbor_EventScript_15605C + call_if 1, SlateportCity_Harbor_EventScript_15605C compare 0x8008, 1 - callif 1, SlateportCity_Harbor_EventScript_156071 + call_if 1, SlateportCity_Harbor_EventScript_156071 compare 0x8008, 2 - callif 1, SlateportCity_Harbor_EventScript_156086 + call_if 1, SlateportCity_Harbor_EventScript_156086 compare 0x8008, 3 - callif 1, SlateportCity_Harbor_EventScript_156086 + call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closebutton setflag 821 @@ -160,7 +160,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer checkflag 2052 - jumpeq SlateportCity_Harbor_EventScript_1560D9 + goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release end @@ -169,7 +169,7 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_156135 + goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext goto SlateportCity_Harbor_EventScript_1560FD @@ -192,7 +192,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_15618A + goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 warp SSTidalCorridor, 255, 1, 10 @@ -203,7 +203,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_15618A + goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp BattleTower_Outside, 255, 19, 23 waitstate @@ -224,9 +224,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 pause 30 spriteinvisible LAST_TALKED, 9, 8 compare FACING, 2 - callif 1, SlateportCity_Harbor_EventScript_1561EF + call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 - callif 1, SlateportCity_Harbor_EventScript_1561E4 + call_if 1, SlateportCity_Harbor_EventScript_1561E4 pause 30 spriteinvisible 255, 0, 0 setvar 0x8004, 5 @@ -269,13 +269,13 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer checkflag 2061 - jumpeq SlateportCity_Harbor_EventScript_15626F + goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag 271 - jumpeq SlateportCity_Harbor_EventScript_156265 + goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag 112 - jumpeq SlateportCity_Harbor_EventScript_156258 + goto_if_eq SlateportCity_Harbor_EventScript_156258 compare 0x40a0, 2 - jumpeq SlateportCity_Harbor_EventScript_15624E + goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton move LAST_TALKED, SlateportCity_Harbor_Movement_1A083D @@ -301,12 +301,12 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 SlateportCity_Harbor_EventScript_15626F:: @ 815626F compare 0x4001, 1 - jumpeq SlateportCity_Harbor_EventScript_156380 + goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 compare RESULT, 1 - jumpeq SlateportCity_Harbor_EventScript_1562A7 + goto_if_eq SlateportCity_Harbor_EventScript_1562A7 checkflag 2052 - jumpeq SlateportCity_Harbor_EventScript_15629D + goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release end @@ -334,10 +334,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_156374 + goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_1A029B + goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 @@ -347,10 +347,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_156374 + goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE compare RESULT, 0 - jumpeq SlateportCity_Harbor_EventScript_1A029B + goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag 294 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 4161889e1..f9ffba65f 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -6,9 +6,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B faceplayer msgbox SlateportCity_House1_Text_17D46A, 5 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_15569C + goto_if_eq SlateportCity_House1_EventScript_15569C compare RESULT, 0 - jumpeq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_House1_EventScript_1556BF end SlateportCity_House1_EventScript_15569C:: @ 815569C @@ -16,9 +16,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C special sub_80F9A0C waitstate compare 0x8004, 255 - jumpif 5, SlateportCity_House1_EventScript_1556C9 + goto_if 5, SlateportCity_House1_EventScript_1556C9 compare 0x8004, 255 - jumpeq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_House1_EventScript_1556BF end SlateportCity_House1_EventScript_1556BF:: @ 81556BF @@ -29,20 +29,20 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialval RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG - jumpeq SlateportCity_House1_EventScript_15571C + goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_155726 + goto_if_eq SlateportCity_House1_EventScript_155726 specialval RESULT, sub_810F96C special sub_80BFAE0 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_155726 + goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_155730 + goto_if_eq SlateportCity_House1_EventScript_155730 compare RESULT, 0 - jumpeq SlateportCity_House1_EventScript_1556BF + goto_if_eq SlateportCity_House1_EventScript_1556BF end SlateportCity_House1_EventScript_15571C:: @ 815571C @@ -61,7 +61,7 @@ SlateportCity_House1_EventScript_155730:: @ 8155730 specialval RESULT, sub_80BF9B4 special sub_80BFAE0 compare RESULT, 1 - jumpeq SlateportCity_House1_EventScript_15575A + goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release end diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc index 2d50f0851..934fae153 100644 --- a/data/scripts/maps/SlateportCity_House2.inc +++ b/data/scripts/maps/SlateportCity_House2.inc @@ -10,7 +10,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 faceplayer checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 1 - jumpeq SlateportCity_House2_EventScript_1563B5 + goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 83cac24ef..45b69dff2 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -35,7 +35,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B2D + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 move 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D @@ -46,7 +46,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 compare RESULT, 0 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155B5A + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 nop @@ -58,7 +58,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A checkflag 149 - jumpif 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B + goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closebutton hidemoney 0, 0 @@ -166,14 +166,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 compare RESULT, 0 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closebutton compare FACING, 2 - jumpeq SlateportCity_OceanicMuseum_1F_EventScript_155C98 + goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 compare FACING, 2 - jumpif 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD + goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD end SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 57bfbbd03..136054947 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -22,21 +22,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmove 0 compare FACING, 1 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 compare FACING, 4 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 compare FACING, 4 - callif 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D + call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton move 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmove 0 compare FACING, 1 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 - callif 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 + call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closebutton diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index fa2aae4ab..6656e58a4 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -24,19 +24,19 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar 0x4002, 0 checkflag 204 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 203 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 202 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 201 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 200 - callif 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 compare 0x4002, 5 - callif 1, SlateportCity_PokemonFanClub_EventScript_15588D + call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D compare 0x40b7, 2 - jumpeq SlateportCity_PokemonFanClub_EventScript_1557FE + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 end @@ -50,15 +50,15 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar 0x4001, 0 checkflag 204 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559FE + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE checkflag 203 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559E7 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 checkflag 202 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559D0 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 checkflag 201 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559B9 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag 200 - callif 0, SlateportCity_PokemonFanClub_EventScript_1559A2 + call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferfirstpoke 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 @@ -86,7 +86,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 200 giveitem ITEM_RED_SCARF @@ -97,7 +97,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 201 giveitem ITEM_BLUE_SCARF @@ -108,7 +108,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 202 giveitem ITEM_PINK_SCARF @@ -119,7 +119,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 203 giveitem ITEM_GREEN_SCARF @@ -130,7 +130,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_155998 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 204 giveitem ITEM_YELLOW_SCARF @@ -146,7 +146,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialval RESULT, CheckLeadMonCool compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559B3 + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 @@ -156,7 +156,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialval RESULT, CheckLeadMonBeauty compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559CA + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA @@ -166,7 +166,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialval RESULT, CheckLeadMonCute compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559E1 + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 @@ -176,7 +176,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialval RESULT, CheckLeadMonSmart compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_1559F8 + call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 @@ -186,7 +186,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialval RESULT, CheckLeadMonTough compare RESULT, 1 - callif 1, SlateportCity_PokemonFanClub_EventScript_155A0F + call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F @@ -197,11 +197,11 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer checkflag 278 - jumpeq SlateportCity_PokemonFanClub_EventScript_155A75 + goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialval RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - jumpif 4, SlateportCity_PokemonFanClub_EventScript_155A3A + goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end @@ -214,7 +214,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL compare RESULT, 0 - jumpeq SlateportCity_PokemonFanClub_EventScript_1A029B + goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag 278 release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 4c0596d29..d585fb94c 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -4,13 +4,13 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall checkflag 2052 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_155388 + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 checkflag 2061 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_15539C + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C checkflag 149 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_1553CF + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF checkflag 148 - jumpeq SlateportCity_SternsShipyard_1F_EventScript_1553B0 + goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmove 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 0c22fbc37..d718fed6e 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -6,9 +6,9 @@ SootopolisCity_MapScripts:: @ 814D07D SootopolisCity_MapScript1_14D08D:: @ 814D08D checkflag 129 - callif 0, SootopolisCity_EventScript_14D0A0 + call_if 0, SootopolisCity_EventScript_14D0A0 checkflag 129 - callif 1, SootopolisCity_EventScript_14D0B1 + call_if 1, SootopolisCity_EventScript_14D0B1 end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 @@ -18,7 +18,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 SootopolisCity_EventScript_14D0B1:: @ 814D0B1 checkflag 113 - callif 0, SootopolisCity_EventScript_14D0BB + call_if 0, SootopolisCity_EventScript_14D0BB return SootopolisCity_EventScript_14D0BB:: @ 814D0BB @@ -36,9 +36,9 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag 2077 checkflag 113 - callif 1, SootopolisCity_EventScript_14D159 + call_if 1, SootopolisCity_EventScript_14D159 checkflag 2090 - callif 1, SootopolisCity_EventScript_14D123 + call_if 1, SootopolisCity_EventScript_14D123 end SootopolisCity_EventScript_14D123:: @ 814D123 @@ -46,7 +46,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 movespriteperm 1, 29, 19 movespriteperm 2, 33, 19 compare 0x405e, 1 - callif 1, SootopolisCity_EventScript_14D142 + call_if 1, SootopolisCity_EventScript_14D142 return SootopolisCity_EventScript_14D142:: @ 814D142 @@ -69,7 +69,7 @@ SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D183 + goto_if_eq SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release end @@ -93,27 +93,27 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F checkdailyflags special GetPlayerBigGuyGirlString checkflag 2258 - jumpeq SootopolisCity_EventScript_14D241 + goto_if_eq SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT compare RESULT, 0 - jumpeq SootopolisCity_EventScript_1A029B + goto_if_eq SootopolisCity_EventScript_1A029B setflag 2258 msgbox SootopolisCity_Text_1C64D0, 4 random 2 compare RESULT, 0 - jumpeq SootopolisCity_EventScript_14D1FF + goto_if_eq SootopolisCity_EventScript_14D1FF compare RESULT, 1 - jumpeq SootopolisCity_EventScript_14D220 + goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY compare RESULT, 0 - jumpeq SootopolisCity_EventScript_1A029B + goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release end @@ -121,7 +121,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY compare RESULT, 0 - jumpeq SootopolisCity_EventScript_1A029B + goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release end @@ -129,7 +129,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, 5 compare RESULT, 1 - jumpeq SootopolisCity_EventScript_14D25E + goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release end @@ -143,7 +143,7 @@ SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer checkflag 1236 - jumpeq SootopolisCity_EventScript_14D27D + goto_if_eq SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release end @@ -157,7 +157,7 @@ SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D29C + goto_if_eq SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release end @@ -171,7 +171,7 @@ SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D2BB + goto_if_eq SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release end @@ -185,7 +185,7 @@ SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D2DA + goto_if_eq SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release end @@ -446,7 +446,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer checkflag 113 - jumpeq SootopolisCity_EventScript_14D4AD + goto_if_eq SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 .else diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 9fe6da43d..d776e8ecf 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E compare 0x4022, 8 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15AF85 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 compare 0x4022, 28 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15AF73 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 compare 0x4022, 69 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15AF61 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmaptile 8, 4, 519, 0 setmaptile 8, 5, 519, 0 @@ -88,9 +88,9 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag 172 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15B056 + goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 checkflag 2060 - jumpif 0, SootopolisCity_Gym_1F_EventScript_15B07A + goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release end @@ -110,7 +110,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03 compare RESULT, 0 - jumpeq SootopolisCity_Gym_1F_EventScript_1A029B + goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag 172 release @@ -125,7 +125,7 @@ SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer checkflag 1236 - jumpeq SootopolisCity_Gym_1F_EventScript_15B099 + goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release end @@ -138,14 +138,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall checkflag 2062 - jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall checkflag 2062 - jumpeq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 604f04c4f..e01a00d97 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -5,7 +5,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer checkflag 121 - jumpeq SootopolisCity_House1_EventScript_15B2C7 + goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem ITEM_TM31 setflag 121 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 409a871a8..011806291 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 faceplayer msgbox SootopolisCity_House2_Text_18FA66, 5 compare RESULT, 1 - callif 1, SootopolisCity_House2_EventScript_15B307 + call_if 1, SootopolisCity_House2_EventScript_15B307 compare RESULT, 0 - callif 1, SootopolisCity_House2_EventScript_15B310 + call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index 88e35730e..f1bf0bf19 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -6,7 +6,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A faceplayer msgbox SootopolisCity_House3_Text_18FB36, 5 compare RESULT, 1 - jumpeq SootopolisCity_House3_EventScript_15B339 + goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index cccfa78ee..1e1b53956 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -5,14 +5,14 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer checkflag 245 - jumpeq SootopolisCity_House6_EventScript_15B3CD + goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 compare RESULT, 0 - callif 1, SootopolisCity_House6_EventScript_15B3C3 + call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration 117 compare RESULT, 0 - jumpeq SootopolisCity_House6_EventScript_15B3D7 + goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag 245 release end diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 9d7618316..662117741 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -10,14 +10,14 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 waitstate copyvar RESULT, 0x8004 compare RESULT, 255 - jumpeq SootopolisCity_House8_EventScript_15B448 + goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize compare RESULT, 1 - jumpeq SootopolisCity_House8_EventScript_15B452 + goto_if_eq SootopolisCity_House8_EventScript_15B452 compare RESULT, 2 - jumpeq SootopolisCity_House8_EventScript_15B45C + goto_if_eq SootopolisCity_House8_EventScript_15B45C compare RESULT, 3 - jumpeq SootopolisCity_House8_EventScript_15B466 + goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -40,7 +40,7 @@ SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem ITEM_ELIXIR compare RESULT, 0 - jumpeq SootopolisCity_House8_EventScript_15B488 + goto_if_eq SootopolisCity_House8_EventScript_15B488 closebutton release end @@ -59,14 +59,14 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 waitstate copyvar RESULT, 0x8004 compare RESULT, 255 - jumpeq SootopolisCity_House8_EventScript_15B4D9 + goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize compare RESULT, 1 - jumpeq SootopolisCity_House8_EventScript_15B4E3 + goto_if_eq SootopolisCity_House8_EventScript_15B4E3 compare RESULT, 2 - jumpeq SootopolisCity_House8_EventScript_15B4ED + goto_if_eq SootopolisCity_House8_EventScript_15B4ED compare RESULT, 3 - jumpeq SootopolisCity_House8_EventScript_15B4F7 + goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -89,7 +89,7 @@ SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem ITEM_ELIXIR compare RESULT, 0 - jumpeq SootopolisCity_House8_EventScript_15B519 + goto_if_eq SootopolisCity_House8_EventScript_15B519 closebutton release end diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 9f37f9d0b..6cfb2ff79 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -30,9 +30,9 @@ SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer checkflag 113 - jumpeq SootopolisCity_Mart_EventScript_15B268 + goto_if_eq SootopolisCity_Mart_EventScript_15B268 checkflag 129 - jumpif 0, SootopolisCity_Mart_EventScript_15B268 + goto_if 0, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release end @@ -46,9 +46,9 @@ SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer checkflag 113 - jumpeq SootopolisCity_Mart_EventScript_15B290 + goto_if_eq SootopolisCity_Mart_EventScript_15B290 checkflag 129 - jumpif 0, SootopolisCity_Mart_EventScript_15B290 + goto_if 0, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release end diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 29cc06584..00c9d3310 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -18,9 +18,9 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer checkflag 113 - jumpeq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 checkflag 129 - jumpif 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release end @@ -34,9 +34,9 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer checkflag 113 - jumpeq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE checkflag 129 - jumpif 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 9723647cd..fc7d811c4 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -11,7 +11,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, 5 compare RESULT, 0 - jumpeq SouthernIsland_Exterior_EventScript_160B25 + goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton move LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index f341f5aeb..84e6b93c5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -5,7 +5,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E checkflag 2145 - callif 1, SouthernIsland_Interior_EventScript_160B68 + call_if 1, SouthernIsland_Interior_EventScript_160B68 end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 @@ -24,9 +24,9 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkgender compare RESULT, 0 - jumpeq SouthernIsland_Interior_EventScript_160B8F + goto_if_eq SouthernIsland_Interior_EventScript_160B8F compare RESULT, 1 - jumpeq SouthernIsland_Interior_EventScript_160B95 + goto_if_eq SouthernIsland_Interior_EventScript_160B95 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F @@ -45,9 +45,9 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag 206 - jumpeq SouthernIsland_Interior_EventScript_160C08 + goto_if_eq SouthernIsland_Interior_EventScript_160C08 checkflag 2131 - jumpif 0, SouthernIsland_Interior_EventScript_160C08 + goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag 206 special SpawnCameraDummy move 127, SouthernIsland_Interior_Movement_160C12 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index c879ec609..8ef61d0f0 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -7,7 +7,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag 2119 checkflag 129 - jumpeq Underwater_SeafloorCavern_EventScript_15D9BB + goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB @@ -16,7 +16,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF checkflag 129 - callif 1, Underwater_SeafloorCavern_EventScript_15D9C9 + call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index bbd0db9d9..4e2895166 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy 0x8004, 0x8005 compare 0x8004, 12 - jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 compare 0x8005, 44 - jumpif 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index cbd782f35..52aca6d12 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -14,15 +14,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId compare RESULT, 0 - callif 1, LinkContestRoom1_EventScript_15F5E0 + call_if 1, LinkContestRoom1_EventScript_15F5E0 compare RESULT, 1 - callif 1, LinkContestRoom1_EventScript_15F5E4 + call_if 1, LinkContestRoom1_EventScript_15F5E4 compare RESULT, 2 - callif 1, LinkContestRoom1_EventScript_15F5E8 + call_if 1, LinkContestRoom1_EventScript_15F5E8 compare RESULT, 3 - callif 1, LinkContestRoom1_EventScript_15F5EC + call_if 1, LinkContestRoom1_EventScript_15F5EC compare RESULT, 4 - callif 1, LinkContestRoom1_EventScript_15F5F0 + call_if 1, LinkContestRoom1_EventScript_15F5F0 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 @@ -47,7 +47,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 compare 0x4009, 1 - callif 1, LinkContestRoom1_EventScript_15F600 + call_if 1, LinkContestRoom1_EventScript_15F600 end LinkContestRoom1_EventScript_15F600:: @ 815F600 @@ -76,7 +76,7 @@ LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 compare 0x4000, 8 - jumpif 0, LinkContestRoom1_EventScript_15F630 + goto_if 0, LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 @@ -415,9 +415,9 @@ SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkgender compare RESULT, 0 - jumpeq FallarborTown_ContestLobby_EventScript_15FBF3 + goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 compare RESULT, 1 - jumpeq FallarborTown_ContestLobby_EventScript_15FBF9 + goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index 610643823..66aa080ba 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -12,7 +12,7 @@ VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer checkflag 199 - jumpeq VerdanturfTown_EventScript_14E885 + goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 move 2, VerdanturfTown_Movement_1A083D waitmove 0 @@ -38,7 +38,7 @@ VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer checkflag 199 - jumpeq VerdanturfTown_EventScript_14E8C0 + goto_if_eq VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 8fd4016d1..00454133d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -102,11 +102,11 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer checkflag 235 - jumpeq VerdanturfTown_ContestLobby_EventScript_153E76 + goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 compare RESULT, 0 - jumpeq VerdanturfTown_ContestLobby_EventScript_1A029B + goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag 235 release end diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index 80bd6151d..fad64292b 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer checkflag 193 - jumpeq VerdanturfTown_WandasHouse_EventScript_153F73 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 setflag 193 release @@ -20,9 +20,9 @@ VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer checkflag 126 - jumpeq VerdanturfTown_WandasHouse_EventScript_153FA5 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 checkflag 1213 - jumpeq VerdanturfTown_WandasHouse_EventScript_153F9B + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release end @@ -45,9 +45,9 @@ VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer checkflag 1213 - jumpeq VerdanturfTown_WandasHouse_EventScript_153FE0 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 checkflag 190 - jumpeq VerdanturfTown_WandasHouse_EventScript_153FD6 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release end @@ -66,11 +66,11 @@ VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer checkflag 126 - jumpeq VerdanturfTown_WandasHouse_EventScript_154025 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 checkflag 1213 - jumpeq VerdanturfTown_WandasHouse_EventScript_15401B + goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B checkflag 199 - jumpeq VerdanturfTown_WandasHouse_EventScript_154011 + goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 3eae03f37..7ea560d0d 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -4,7 +4,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 checkflag 126 - callif 1, VictoryRoad_1F_EventScript_15DE93 + call_if 1, VictoryRoad_1F_EventScript_15DE93 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 @@ -95,7 +95,7 @@ VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialval RESULT, sub_8082C68 compare RESULT, 1 - jumpeq VictoryRoad_1F_EventScript_15DF58 + goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end -- cgit v1.2.3 From 1e2601a0287fdacfb8f0d680fbe82a274414ea65 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:10:51 -0500 Subject: more script command renaming --- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 8 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 16 +- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 30 ++-- data/scripts/maps/BattleTower_Outside.inc | 6 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DewfordTown.inc | 20 +-- data/scripts/maps/DewfordTown_Gym.inc | 18 +-- data/scripts/maps/DewfordTown_Hall.inc | 24 +-- data/scripts/maps/DewfordTown_House2.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 12 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 6 +- data/scripts/maps/FallarborTown_House2.inc | 10 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 6 +- data/scripts/maps/FortreeCity_House2.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/JaggedPass.inc | 6 +- data/scripts/maps/LavaridgeTown.inc | 52 +++---- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 18 +-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 42 ++--- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 30 ++-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 16 +- data/scripts/maps/LilycoveCity_House2.inc | 2 +- data/scripts/maps/LilycoveCity_House3.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 8 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 76 ++++----- data/scripts/maps/LittlerootTown.inc | 96 ++++++------ .../maps/LittlerootTown_BrendansHouse_1F.inc | 10 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 12 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 16 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 28 ++-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 28 ++-- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 16 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 86 +++++------ data/scripts/maps/MauvilleCity_Gym.inc | 12 +- data/scripts/maps/MauvilleCity_House2.inc | 6 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 28 ++-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 6 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 8 +- data/scripts/maps/MtChimney.inc | 12 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 36 ++--- data/scripts/maps/NewMauville_Entrance.inc | 6 +- data/scripts/maps/NewMauville_Inside.inc | 8 +- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House2.inc | 10 +- data/scripts/maps/PacifidlogTown_House3.inc | 6 +- data/scripts/maps/PacifidlogTown_House4.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 20 +-- data/scripts/maps/PetalburgCity_Gym.inc | 170 ++++++++++----------- .../maps/PetalburgCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/PetalburgWoods.inc | 6 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 12 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 10 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 8 +- data/scripts/maps/Route109_SeashoreHouse.inc | 8 +- data/scripts/maps/Route110.inc | 42 ++--- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 8 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 ++-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 120 +++++++-------- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 10 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 42 ++--- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 102 ++++++------- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 6 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 2 +- data/scripts/maps/Route111.inc | 34 ++--- data/scripts/maps/Route111_OldLadysRestStop.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 52 +++---- data/scripts/maps/Route114.inc | 8 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 4 +- data/scripts/maps/Route114_LanettesHouse.inc | 6 +- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 28 ++-- data/scripts/maps/Route117.inc | 12 +- data/scripts/maps/Route118.inc | 14 +- data/scripts/maps/Route119.inc | 34 ++--- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +- data/scripts/maps/Route120.inc | 40 ++--- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +- data/scripts/maps/Route123.inc | 8 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 32 ++-- data/scripts/maps/Route124.inc | 6 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 20 +-- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/RustboroCity.inc | 28 ++-- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 34 ++--- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 4 +- data/scripts/maps/RustboroCity_House1.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 6 +- data/scripts/maps/RusturfTunnel.inc | 24 +-- data/scripts/maps/SSTidalCorridor.inc | 12 +- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 20 +-- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 12 +- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 4 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 2 +- data/scripts/maps/SlateportCity.inc | 24 +-- data/scripts/maps/SlateportCity_ContestHall.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 34 ++--- data/scripts/maps/SlateportCity_House1.inc | 20 +-- data/scripts/maps/SlateportCity_House2.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 10 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 28 ++-- data/scripts/maps/SootopolisCity.inc | 14 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House3.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SootopolisCity_House8.inc | 20 +-- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 18 +-- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- 171 files changed, 1193 insertions(+), 1193 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index eb912028a..97871a9f5 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 checkflag 294 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 checkflag 1078 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 212d80416..c2f813e88 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 checkflag 239 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playsfx 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 9f0b5ca85..c3a48f55d 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 checkflag 240 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A checkflag 241 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 @@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 checkflag 242 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 @@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 checkflag 243 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playsfx 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index d8ed3fe07..bda0e9603 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 setvar 0x4001, 1 getplayerxy 0x4002, 0x4003 setvar 0x4004, 1 - compare 0x4002, 21 + compare_var_to_imm 0x4002, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare 0x4002, 36 + compare_var_to_imm 0x4002, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare 0x4003, 2 + compare_var_to_imm 0x4003, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch 0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B @@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setanimation 2, 0 doanimation 54 specialval RESULT, sub_810F4D4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 pause 10 @@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 specialval RESULT, sub_810F488 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA pause 20 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 pause 10 @@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 2, 0 doanimation 54 specialval RESULT, sub_810F4FC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 pause 10 @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 2, 0 doanimation 54 specialval RESULT, sub_810F4B0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 pause 10 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index b7fe34b81..0c223cbaa 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -17,7 +17,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index cfb4ba855..4b3dae8f8 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare 0x8006, 1 + compare_var_to_imm 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmaptile 12, 0, 519, 0 setmaptile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 - compare 0x8006, 1 + compare_var_to_imm 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 move 1, BattleTower_Corridor_Movement_1608D5 move 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index fc5cee29a..4caffb405 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -18,7 +18,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C checkflag 237 goto_if_eq BattleTower_Lobby_EventScript_1602CD specialval 0x8007, sub_810F404 - compare 0x8007, 50 + compare_var_to_imm 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -26,7 +26,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialval 0x8007, sub_810F404 - compare 0x8007, 100 + compare_var_to_imm 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -77,10 +77,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 waittext setvar 0x8004, 0 special sub_81358A4 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special sub_8135E50 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext @@ -91,7 +91,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 special sub_81358A4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext @@ -118,7 +118,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitfanfare setvar 0x8004, 9 special sub_81358A4 - compare RESULT, 49 + compare_var_to_imm RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -186,7 +186,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E faceplayer setvar 0x8004, 0 special sub_81358A4 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -209,7 +209,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT @@ -219,7 +219,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA fadescreen 1 special ChooseBattleTowerPlayerParty waitstate - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, 5 switch RESULT @@ -245,7 +245,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty @@ -347,9 +347,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160701 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_16070B end @@ -394,7 +394,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, 42 givedecoration 42 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 237 msgbox BattleTower_Lobby_Text_19ABAA, 4 @@ -403,12 +403,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialval RESULT, sub_810F404 - compare RESULT, 100 + compare_var_to_imm RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, 43 givedecoration 43 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 238 msgbox BattleTower_Lobby_Text_19ABAA, 4 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 77f8b39b6..beb9ed690 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -13,7 +13,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 faceplayer msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext @@ -36,7 +36,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -47,7 +47,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index f5ce8138f..e79dfb3ff 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -66,7 +66,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 waitstate clearflag 2145 specialval RESULT, sub_810E300 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 setflag 855 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f30c202c8..8e442e46f 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -43,7 +43,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -77,9 +77,9 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 checkflag 257 goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E0F0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E111 end @@ -100,9 +100,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E waittext multichoice 20, 8, 50, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E147 end @@ -599,9 +599,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 faceplayer call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E439 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E443 end @@ -616,15 +616,15 @@ DewfordTown_EventScript_14E443:: @ 814E443 call DewfordTown_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_EventScript_14E46E - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E inccounter GAME_STAT_STARTED_TRENDS - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index cf484a546..4168acd0c 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -11,11 +11,11 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 - compare 0x8000, 0 + compare_var_to_imm 0x8000, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare 0x8000, 1 + compare_var_to_imm 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare 0x8000, 2 + compare_var_to_imm 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - comparevars 0x8000, 0x8001 + compare_var_to_var 0x8000, 0x8001 goto_if_eq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 - compare 0x8000, 1 + compare_var_to_imm 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare 0x8000, 2 + compare_var_to_imm 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare 0x8000, 3 + compare_var_to_imm 0x8000, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -115,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag 1204 setflag 2056 addvar 0x4085, 1 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 @@ -124,7 +124,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag 166 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index cc096080e..39bcb0236 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 faceplayer call DewfordTown_Hall_EventScript_1A0102 special sub_80FA5E4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD call DewfordTown_Hall_EventScript_1A0102 special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_153300 end @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD move 8, DewfordTown_Hall_Movement_153599 waitmove 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E - compare FACING, 4 + compare_var_to_imm FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A0843 waitmove 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 move 7, DewfordTown_Hall_Movement_15359B waitmove 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, DewfordTown_Hall_EventScript_15356D - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, DewfordTown_Hall_EventScript_153578 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 return DewfordTown_Hall_EventScript_153583:: @ 8153583 - compare FACING, 3 + compare_var_to_imm FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC move 255, DewfordTown_Hall_Movement_1A083F waitmove 0 @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag 230 release diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index befe47404..b3b3eef34 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -8,7 +8,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag 289 release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 2b0f9545f..be3557c22 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 closebutton playsfx 8 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 reappear 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 waitmove 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 3ddcb6ef3..1e32394d9 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag 1248 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare 0x409c, 4 + compare_var_to_imm 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 2526b2ea6..71e80287b 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag 1247 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare 0x409c, 3 + compare_var_to_imm 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 0999f9a4d..123a7cbe2 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 9e2c4c0b7..6fb0d7ba4 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag 1246 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare 0x409c, 2 + compare_var_to_imm 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 7065bdefe..0f0efbd26 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -50,9 +50,9 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 checkflag 263 goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 - compare 0x4000, 11 + compare_var_to_imm 0x4000, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare 0x4000, 8 + compare_var_to_imm 0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index d9e7a8213..bc8ad9f5a 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag 1245 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare 0x409c, 1 + compare_var_to_imm 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 0228fe25d..1971593cb 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -11,7 +11,7 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release @@ -22,11 +22,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag 2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem ITEM_TM27 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 5ecc475ea..74674d3df 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -14,7 +14,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index b5426de8e..565effc66 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -57,7 +57,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release @@ -65,7 +65,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 8744141cb..d601aabab 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag 170 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 446831c33..e0942354d 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -11,17 +11,17 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT - comparevars RESULT, 0x8009 + compare_var_to_var RESULT, 0x8009 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index f210dd3ac..ce1dd2344 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -22,7 +22,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem ITEM_TM10 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag 264 msgbox FortreeCity_House2_Text_18652F, 4 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 5de611399..c4284b722 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -35,7 +35,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 waitmove 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag 223 releaseall diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 004c3d679..9473cbe8e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -10,17 +10,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA setflag 189 msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playsfx 9 disappear 1 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index a265b97e1..9eedd4e05 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag 0x4000 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq InsideOfTruck_EventScript_15FC68 end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index e80894dc2..333ccbaad 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare 0x40bd, 1 + compare_var_to_imm 0x40bd, 1 call_if 1, JaggedPass_EventScript_15D280 end @@ -25,7 +25,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -38,7 +38,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index ca476eb97..e091ed372 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare 0x4053, 2 + compare_var_to_imm 0x4053, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -44,16 +44,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED move 8, LavaridgeTown_Movement_1A0835 waitmove 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -70,14 +70,14 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 faceplayer setvar 0x8008, 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closebutton - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 pause 30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 playmusicbattle 0 fadedefault - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -128,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 return LavaridgeTown_EventScript_14E64E:: @ 814E64E - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LavaridgeTown_EventScript_14E67B - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, LavaridgeTown_EventScript_14E680 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LavaridgeTown_EventScript_14E685 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LavaridgeTown_EventScript_14E68A return @@ -165,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LavaridgeTown_EventScript_14E6DD - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LavaridgeTown_EventScript_14E6D2 return @@ -237,7 +237,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E LavaridgeTown_EventScript_14E710:: @ 814E710 specialval RESULT, player_get_direction_lower_nybble - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -275,10 +275,10 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A checkflag 266 goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index e22d4471f..68f93443a 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -84,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag 1213 setflag 2058 addvar 0x4085, 1 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 @@ -95,7 +95,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag 168 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index c924684bc..bf148186a 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag 254 release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index f700988f9..801e25396 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -70,7 +70,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 random 10 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag 2255 msgbox LilycoveCity_Text_1C5B1D, 4 @@ -248,9 +248,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_EventScript_14CDD3 end @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 call_if 0, LilycoveCity_EventScript_14CDB9 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch 0x4023 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 call_if 0, LilycoveCity_EventScript_14CE2C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch 0x4023 @@ -351,9 +351,9 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 @@ -388,9 +388,9 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 clearflag 760 goto LilycoveCity_EventScript_14CF6B diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1abc71238..4785ffbbb 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -31,9 +31,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -44,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE special sub_80C4CEC setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 move 4, LilycoveCity_ContestLobby_Movement_158A43 waitmove 0 @@ -56,7 +56,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -205,9 +205,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A fadescreen 1 showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -217,7 +217,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE special sub_80C4CEC setvar 0x4099, 0 specialval RESULT, GiveMonArtistRibbon - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 move 11, LilycoveCity_ContestLobby_Movement_158B6D waitmove 0 @@ -229,7 +229,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -305,7 +305,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA checkflag 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE @@ -328,11 +328,11 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog hidebox 0, 0, 15, 9 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 return @@ -361,18 +361,18 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestpkmn - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end @@ -420,11 +420,11 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 copyvar 0x8004, RESULT special sub_808363C waitstate - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 - compare RESULT, 5 + compare_var_to_imm RESULT, 5 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A waittext @@ -569,7 +569,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialval RESULT, sub_80C5044 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index f5c511179..5bdaa610a 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -9,7 +9,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 checkflag 2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialval RESULT, sub_8090FC0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 9a9843053..2ee04505e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 warpplace LilycoveCity_DepartmentStore_1F, 255, 2, 1 - compare 0x4043, 0 + compare_var_to_imm 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 @@ -31,7 +31,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 warpplace LilycoveCity_DepartmentStore_2F, 255, 2, 1 - compare 0x4043, 1 + compare_var_to_imm 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 warpplace LilycoveCity_DepartmentStore_3F, 255, 2, 1 - compare 0x4043, 2 + compare_var_to_imm 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B warpplace LilycoveCity_DepartmentStore_4F, 255, 2, 1 - compare 0x4043, 3 + compare_var_to_imm 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 @@ -58,7 +58,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E warpplace LilycoveCity_DepartmentStore_5F, 255, 2, 1 - compare 0x4043, 4 + compare_var_to_imm 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index f3989bc2a..27d217b40 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 event_96 3 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer event_96 3 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release @@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace 0x4000, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playsfx 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 5704a090b..6c1ecbc1d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,12 +9,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer checkdailyflags - compare 0x4045, 0 + compare_var_to_imm 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 @@ -33,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E pause 10 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmove 0 - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY - compare 0x8006, 0 + compare_var_to_imm 0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare 0x8006, 1 + compare_var_to_imm 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitem 0, 0x8005 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem 0x8005 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -112,7 +112,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem 0x4045 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 release diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 884b43bb1..12c880d31 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -10,7 +10,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 lock faceplayer checkitem ITEM_EON_TICKET, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end @@ -25,7 +25,7 @@ LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext @@ -48,7 +48,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -59,7 +59,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp BattleTower_Outside, 255, 19, 23 @@ -80,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A waitmove 0 pause 30 spriteinvisible LAST_TALKED, 13, 10 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 @@ -129,9 +129,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE waitmove 0 pause 30 disappear 4 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE pause 30 spriteinvisible 255, 0, 0 diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d3399f5ac..cbf015eb3 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag 234 msgbox LilycoveCity_House2_Text_18B883, 4 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 6926f4f45..62455f547 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index c0fa73360..236d48f65 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waittext multichoice 20, 8, 16, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index ec316b576..e41d61fe8 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -125,7 +125,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 closebutton diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 286ad055e..0127761a7 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,19 +16,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special sub_80F9EEC fadescreen 0 - compare 0x8005, 4 + compare_var_to_imm 0x8005, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 14806cba4..e097504cf 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -61,9 +61,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare 0x4095, 1 + compare_var_to_imm 0x4095, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare 0x4095, 2 + compare_var_to_imm 0x4095, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end @@ -71,35 +71,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 setvar 0x8004, 8 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 specialval RESULT, sub_810FD60 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -148,13 +148,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release @@ -162,7 +162,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release @@ -188,13 +188,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release @@ -202,7 +202,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release @@ -228,13 +228,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release @@ -242,7 +242,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release @@ -268,13 +268,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare 0x4095, 0 + compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release @@ -282,7 +282,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release @@ -309,10 +309,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B setvar 0x8004, 11 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release @@ -320,7 +320,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release @@ -342,10 +342,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D setvar 0x8004, 12 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release @@ -353,7 +353,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release @@ -375,10 +375,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF setvar 0x8004, 14 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release @@ -386,7 +386,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release @@ -408,10 +408,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 setvar 0x8004, 15 special sub_810FDAC specialval RESULT, sub_810FD60 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 specialval RESULT, sub_810FCB0 - compare RESULT, 7 + compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release @@ -419,7 +419,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 specialval RESULT, sub_810FCB0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 1c019e046..936437fb9 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 - compare 0x4092, 2 + compare_var_to_imm 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag 82 call_if 0, LittlerootTown_EventScript_14D583 - compare 0x4050, 3 + compare_var_to_imm 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare 0x4082, 4 + compare_var_to_imm 0x4082, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x408c, 4 + compare_var_to_imm 0x408c, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x40c7, 1 + compare_var_to_imm 0x40c7, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare 0x408d, 3 + compare_var_to_imm 0x408d, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare 0x4050, 0 + compare_var_to_imm 0x4050, 0 goto_if_eq LittlerootTown_EventScript_14D59A movespriteperm 1, 10, 1 spritebehave 1, 7 @@ -55,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 spritebehave 4, 8 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D5CD return @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag 82 goto_if_eq LittlerootTown_EventScript_14D722 - compare 0x4050, 0 + compare_var_to_imm 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -334,9 +334,9 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D822 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D82B releaseall end @@ -352,9 +352,9 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D84E - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D857 releaseall end @@ -407,27 +407,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D93C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D947 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closebutton checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14DAAA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare 0x8008, 4 + compare_var_to_imm 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare 0x8008, 5 + compare_var_to_imm 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -842,9 +842,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 move 4, LittlerootTown_Movement_1A0841 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index ca872ba0f..63e717a51 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag 274 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare 0x4092, 3 + compare_var_to_imm 0x4092, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare 0x4092, 5 + compare_var_to_imm 0x4092, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 0176db332..8c0133625 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag 130 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare 0x4092, 4 + compare_var_to_imm 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,16 +23,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end @@ -51,9 +51,9 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 1d76bb6dc..73060a055 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag 274 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkgender - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare 0x4092, 3 + compare_var_to_imm 0x4092, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare 0x4092, 5 + compare_var_to_imm 0x4092, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare 0x4092, 6 + compare_var_to_imm 0x4092, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -117,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare 0x408d, 3 + compare_var_to_imm 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index a0dda8b70..ea6869b1b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag 130 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare 0x4092, 4 + compare_var_to_imm 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkgender - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -33,9 +33,9 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D checkflag 292 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playsfx 9 disappear LAST_TALKED @@ -57,11 +57,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 waitmove 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F return @@ -91,11 +91,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A waitmove 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA return @@ -113,9 +113,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmove 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag 293 releaseall @@ -194,9 +194,9 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index bd846b4fe..d34e52f7f 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -30,9 +30,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE fanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -44,9 +44,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -59,9 +59,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare 0x4084, 3 + compare_var_to_imm 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag 88 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag 896 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare 0x4084, 5 + compare_var_to_imm 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -124,9 +124,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA move 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmove 0 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 setflag 116 @@ -139,7 +139,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem ITEM_POKE_BALL, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 @@ -148,7 +148,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem ITEM_POKE_BALL, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 @@ -188,9 +188,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index cae65f41e..d6cade75d 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -105,9 +105,9 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MauvilleCity_EventScript_14C23C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_EventScript_14C285 closebutton switch FACING @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag 209 goto_if_eq MauvilleCity_EventScript_14C368 - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag 208 goto_if_eq MauvilleCity_EventScript_14C332 @@ -305,7 +305,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem ITEM_TM24 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag 209 msgbox MauvilleCity_Text_166488, 4 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 0b577885e..b418e8a79 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -10,17 +10,17 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -64,19 +64,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index db6223400..02b0c4bbb 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 faceplayer msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waittext @@ -33,10 +33,10 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins 16385 - compare 0x4001, 9950 + compare_var_to_imm 0x4001, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 paymoney 0x3e8, 0 @@ -52,10 +52,10 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins 16385 - compare 0x4001, 9500 + compare_var_to_imm 0x4001, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 paymoney 0x2710, 0 @@ -100,7 +100,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -144,7 +144,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -154,11 +154,11 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 - compare 0x4002, 1000 + compare_var_to_imm 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 88 checkdecor 88 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 88 @@ -170,11 +170,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 - compare 0x4002, 1000 + compare_var_to_imm 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 89 checkdecor 89 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 89 @@ -186,11 +186,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 - compare 0x4002, 1000 + compare_var_to_imm 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 90 checkdecor 90 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 90 @@ -221,7 +221,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -277,7 +277,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -289,10 +289,10 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins 16386 - compare 0x4002, 1500 + compare_var_to_imm 0x4002, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 1500 additem ITEM_TM32, 1 @@ -304,10 +304,10 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins 16386 - compare 0x4002, 3500 + compare_var_to_imm 0x4002, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 3500 additem ITEM_TM29, 1 @@ -319,10 +319,10 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins 16386 - compare 0x4002, 4000 + compare_var_to_imm 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM35, 1 @@ -334,10 +334,10 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins 16386 - compare 0x4002, 4000 + compare_var_to_imm 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM24, 1 @@ -349,10 +349,10 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins 16386 - compare 0x4002, 4000 + compare_var_to_imm 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM13, 1 @@ -392,7 +392,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 checkflag 226 goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch 0x4023 case 0, MauvilleCity_GameCorner_EventScript_156FDB @@ -403,7 +403,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecor 1, 88 checkdecor 88 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 @@ -414,7 +414,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecor 1, 89 checkdecor 89 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 @@ -425,7 +425,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecor 1, 90 checkdecor 90 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 @@ -453,7 +453,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 @@ -463,7 +463,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag 225 goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag 225 givecoins 20 @@ -522,7 +522,7 @@ MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialval RESULT, sub_810F424 @@ -533,7 +533,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialval RESULT, sub_810F424 @@ -544,7 +544,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialval RESULT, sub_810F424 @@ -555,7 +555,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialval RESULT, sub_810F424 @@ -566,7 +566,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialval RESULT, sub_810F424 @@ -577,7 +577,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialval RESULT, sub_810F424 @@ -588,7 +588,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialval RESULT, sub_810F424 @@ -599,7 +599,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialval RESULT, sub_810F424 @@ -610,7 +610,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialval RESULT, sub_810F424 @@ -621,7 +621,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialval RESULT, sub_810F424 @@ -632,7 +632,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialval RESULT, sub_810F424 @@ -643,7 +643,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialval RESULT, sub_810F424 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 80a33ffb0..3255f8459 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag 1208 setflag 2057 addvar 0x4085, 1 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 @@ -97,7 +97,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag 167 @@ -113,7 +113,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 1 + compare_var_to_imm 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 @@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 2 + compare_var_to_imm 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 @@ -135,7 +135,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 3 + compare_var_to_imm 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 24236ede6..7182a59aa 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -8,7 +8,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end @@ -20,9 +20,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 move LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmove 0 msgbox MauvilleCity_House2_Text_1824D8, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_15731B - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index 23d814855..e6225bba0 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -4,7 +4,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -17,7 +17,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -30,7 +30,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index d1b8e88b3..d01c85ff3 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -71,11 +71,11 @@ MossdeepCity_EventScript_14D027:: @ 814D027 checkflag 276 goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem ITEM_KINGS_ROCK - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag 276 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index f644e93cc..453b611cc 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special sub_813601C - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -17,9 +17,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special sub_813601C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare 0x40c0, 0 + compare_var_to_imm 0x40c0, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end @@ -49,11 +49,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveoffscreen 1 move 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmove 0 - compare 0x40c0, 1 + compare_var_to_imm 0x40c0, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare 0x40c0, 2 + compare_var_to_imm 0x40c0, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare 0x40c0, 3 + compare_var_to_imm 0x40c0, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar 0x40c0, 0 @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release @@ -94,28 +94,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MossdeepCity_GameCorner_B1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 77cc96f4d..a7ae2f947 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -22,11 +22,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E setvar 0x8005, 0 special sub_813556C waitstate - compare RESULT, 3 + compare_var_to_imm RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 4c46ca334..4112a3b15 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -73,7 +73,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag 171 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index c8af8f886..8f3d2ebfc 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -7,7 +7,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F bufferfirstpoke 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialval RESULT, GetPokeblockNameByMonNature - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 3cf5a8ff4..9be55e8d0 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B closebutton setflag 224 clearflag 933 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 disappear 3 release diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 8f9bf4dc5..b94e0ec19 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -7,7 +7,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 checkflag 152 goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 215cf5e35..6db52bc42 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -19,7 +19,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 lock faceplayer special sub_80BB63C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 369523b42..f5927aa77 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -7,9 +7,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B checkdailyflags specialval RESULT, GetWeekCount buffernum 0, RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D @@ -36,7 +36,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag 192 msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index f6ba77cb9..c283d0532 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare 0x40c6, 1 + compare_var_to_imm 0x40c6, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -72,10 +72,10 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 @@ -86,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 setflag 298 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 458e4a15b..9fa2b77de 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -18,17 +18,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 showmoney 0, 0 nop msgbox MtChimney_Text_195760, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MtChimney_EventScript_15D000 giveitem ITEM_LAVA_COOKIE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoney 0, 0 release @@ -411,7 +411,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D checkflag 115 goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE @@ -441,7 +441,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 6f4ea44a5..b61097fdc 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare 0x40a3, 1 + compare_var_to_imm 0x40a3, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 026d54bfe..3f012780d 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag 282 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 4f8d99c5e..6b85a88c3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -4,7 +4,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 550f74d9a..787315320 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -8,7 +8,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy 0x4000, 0x4001 - compare 0x4001, 12 + compare_var_to_imm 0x4001, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 31a83857b..cc66242e3 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 pause 50 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 pause 20 call MtPyre_Summit_EventScript_15D57A - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -143,9 +143,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF .else msgbox MtPyre_Summit_Text_1B64B3, 5 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, MtPyre_Summit_EventScript_15D611 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -189,9 +189,9 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A .else msgbox MtPyre_Summit_Text_1B6283, 5 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -220,9 +220,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B .else msgbox MtPyre_Summit_Text_1B62E7, 5 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 pause 50 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 disappear 2 setvar 0x40b9, 3 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 698f2f6cd..94836d8c4 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare 0x40ba, 0 + compare_var_to_imm 0x40ba, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC waitmove 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmaptile 3, 0, 707, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 352bb8a6d..3407c8a01 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare 0x4002, 1 + compare_var_to_imm 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag 2145 call_if 1, NewMauville_Inside_EventScript_15E58F @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare 0x40ba, 2 + compare_var_to_imm 0x40ba, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index d620df71e..eef21daa7 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -76,7 +76,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem ITEM_POTION - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 @@ -257,9 +257,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq OldaleTown_EventScript_14DFB8 end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index aaeeb2453..07b6150d7 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -14,10 +14,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 specialval RESULT, GetLeadMonFriendshipScore - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC specialval RESULT, GetLeadMonFriendshipScore - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end @@ -26,7 +26,7 @@ PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialval RESULT, sub_810F908 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -46,7 +46,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem ITEM_TM27 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 @@ -62,7 +62,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem ITEM_TM21 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 73f749400..3a8dc3b1d 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -11,17 +11,17 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT - comparevars RESULT, 0x8009 + compare_var_to_var RESULT, 0x8009 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index b7a6c9f86..bba0ede14 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer msgbox PacifidlogTown_House4_Text_17963D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index fdc496d1f..008c2f800 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer specialval RESULT, IsMirageIslandPresent - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1ffc14144..f5b683b34 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag 2070 - compare 0x4057, 0 + compare_var_to_imm 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare 0x4057, 2 + compare_var_to_imm 0x4057, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmove 0 move 9, PetalburgCity_Movement_1A0835 waitmove 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 move 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 4b0757f63..e22f02b50 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare 0x4085, 7 + compare_var_to_imm 0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare 0x4085, 1 + compare_var_to_imm 0x4085, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag 2052 call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -144,65 +144,65 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 playsfx 8 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 playmusic 420, 0 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 disappear 10 setflag 728 @@ -352,7 +352,7 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 goto_if 0, PetalburgCity_Gym_EventScript_154A2C @@ -364,15 +364,15 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D PetalburgCity_Gym_EventScript_154969:: @ 8154969 specialval RESULT, IsEnigmaBerryValid - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare 0x402d, 0 + compare_var_to_imm 0x402d, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -384,7 +384,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 release @@ -413,28 +413,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154ABC - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AC7 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AD2 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154ADD pause 70 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154AE8 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AF3 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AFE - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release @@ -592,14 +592,14 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -622,14 +622,14 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -640,9 +640,9 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 setvar 0x8008, 7 setvar 0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -653,9 +653,9 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B setvar 0x8008, 1 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -666,9 +666,9 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E setvar 0x8008, 7 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -679,9 +679,9 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 setvar 0x8008, 1 setvar 0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -692,9 +692,9 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 setvar 0x8008, 1 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -705,9 +705,9 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 setvar 0x8008, 7 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -718,9 +718,9 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A setvar 0x8008, 1 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -731,9 +731,9 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D setvar 0x8008, 7 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -744,9 +744,9 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 setvar 0x8008, 1 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -757,9 +757,9 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 setvar 0x8008, 7 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -891,72 +891,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar 0x8004, 1 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar 0x8004, 2 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar 0x8004, 3 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar 0x8004, 4 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar 0x8004, 5 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar 0x8004, 6 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar 0x8004, 7 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar 0x8004, 8 - compare 0x8005, 0 + compare_var_to_imm 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare_var_to_imm 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 63dcaa6ca..0884db479 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,17 +28,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 specialval RESULT, IsStarterInParty - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare 0x4023, 0 + compare_var_to_imm 0x4023, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare 0x4023, 1 + compare_var_to_imm 0x4023, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare 0x4023, 2 + compare_var_to_imm 0x4023, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index d1d3a1b8a..dcf0a27cf 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -91,7 +91,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA waitmove 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -245,7 +245,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag 297 release @@ -272,7 +272,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 5f9f76be2..6d6b1c2da 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -20,7 +20,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index d12f8918f..328021785 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -10,9 +10,9 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route103_EventScript_14EBAB - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EC04 end @@ -174,7 +174,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -187,7 +187,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -205,7 +205,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 584ab47dd..8ab1999e6 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -35,7 +35,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 @@ -54,7 +54,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 279 release @@ -108,7 +108,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 262 release @@ -410,7 +410,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -423,7 +423,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -436,7 +436,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index ce32a544a..751c86825 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 - compare 0x4090, 1 + compare_var_to_imm 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag 188 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -37,7 +37,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag 147 msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -54,14 +54,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index d4d7b59cb..097e99357 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -25,18 +25,18 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag 127 msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -96,7 +96,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA random 8 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag 2256 msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 0acf70e64..a1a13a003 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -18,7 +18,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 9daa57b7e..c33bb7d19 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -9,7 +9,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 09be54c49..d3baeea34 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -279,7 +279,7 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -332,7 +332,7 @@ Route109_EventScript_14F725:: @ 814F725 goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_EventScript_1A029B closebutton move LAST_TALKED, Route109_Movement_1A083D @@ -397,7 +397,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -410,7 +410,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 789ee3e56..2a69242c2 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -28,7 +28,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem ITEM_SODA_POP, 6 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag 140 release @@ -43,7 +43,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoney 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoney 0, 0 @@ -52,10 +52,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 723c41e0c..68a2c6613 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare 0x40a9, 1 + compare_var_to_imm 0x40a9, 1 call_if 1, Route110_EventScript_14F92F end @@ -132,7 +132,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall specialval RESULT, GetRecordedCyclingRoadResults - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall @@ -147,9 +147,9 @@ Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer specialval RESULT, GetPlayerAvatarBike - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare 0x40a9, 0 + compare_var_to_imm 0x40a9, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -178,7 +178,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -206,7 +206,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -224,7 +224,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -237,7 +237,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -326,9 +326,9 @@ Route110_EventScript_14FD29:: @ 814FD29 Route110_EventScript_14FD34:: @ 814FD34 lockall checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_EventScript_14FDA7 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route110_EventScript_14FDAC move 28, Route110_Movement_1A0845 waitmove 0 @@ -337,16 +337,16 @@ Route110_EventScript_14FD34:: @ 814FD34 move 28, Route110_Movement_1A0835 waitmove 0 pause 30 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF14 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route110_EventScript_14FF1F - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, Route110_EventScript_14FF2A checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closebutton - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF56 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route110_EventScript_14FF5E - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 disappear 28 reappear 29 pause 45 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF35 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route110_EventScript_14FF40 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 32b3ae4fb..daa55dc7f 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,9 +3,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare 0x40a9, 3 + compare_var_to_imm 0x40a9, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare 0x40a9, 2 + compare_var_to_imm 0x40a9, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end @@ -24,9 +24,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall specialval RESULT, GetPlayerAvatarBike @ player state? - compare RESULT, 2 + compare_var_to_imm RESULT, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 95ea7454e..63e8df87c 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -11,7 +11,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall specialval RESULT, GetPlayerAvatarBike - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index d18f30a43..7f4ffdddd 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_RARE_CANDY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TIMER_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_HARD_STONE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_SMOKE_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TM12 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_MAGNET - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_PP_MAX - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closebutton - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161C74 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route110_TrickHouseEnd_EventScript_161C7F - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route110_TrickHouseEnd_EventScript_161C8A - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_161C95 pause 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF .else givedecoration 31 .endc - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 81d6a44e0..28b1eb0de 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,17 +6,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag 2114 - compare 0x40b5, 1 + compare_var_to_imm 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare 0x40c1, 1 + compare_var_to_imm 0x40c1, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare 0x40a6, 1 + compare_var_to_imm 0x40a6, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare 0x40a7, 5 + compare_var_to_imm 0x40a7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 3 + compare_var_to_imm 0x40a7, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 0 + compare_var_to_imm 0x40a7, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE switch 0x40a7 case 0, Route110_TrickHouseEntrance_EventScript_16109A @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 setvar 0x40a5, 1 - compare 0x4044, 8 + compare_var_to_imm 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 setvar 0x40a7, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar 0x40a7, 0 - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare 0x4044, 3 + compare_var_to_imm 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare 0x4044, 4 + compare_var_to_imm 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare 0x4044, 5 + compare_var_to_imm 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare 0x4044, 6 + compare_var_to_imm 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare 0x4044, 7 + compare_var_to_imm 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare 0x4044, 8 + compare_var_to_imm 0x4044, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall pause 20 - compare 0x4044, 0 + compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton @@ -248,21 +248,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmove 0 move 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmove 0 - compare 0x4044, 0 + compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare 0x4044, 3 + compare_var_to_imm 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare 0x4044, 4 + compare_var_to_imm 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare 0x4044, 5 + compare_var_to_imm 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare 0x4044, 6 + compare_var_to_imm 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare 0x4044, 7 + compare_var_to_imm 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closebutton setvar 0x40a6, 1 @@ -351,27 +351,27 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E move 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmove 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare 0x4044, 3 + compare_var_to_imm 0x4044, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare 0x4044, 4 + compare_var_to_imm 0x4044, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare 0x4044, 5 + compare_var_to_imm 0x4044, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare 0x4044, 6 + compare_var_to_imm 0x4044, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare 0x4044, 7 + compare_var_to_imm 0x4044, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem ITEM_RARE_CANDY - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -379,9 +379,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem ITEM_TIMER_BALL - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -389,9 +389,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem ITEM_HARD_STONE - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -399,9 +399,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem ITEM_SMOKE_BALL - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -409,9 +409,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem ITEM_TM12 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -419,9 +419,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem ITEM_MAGNET - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -429,9 +429,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem ITEM_PP_MAX - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -454,9 +454,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 .else givedecoration 31 .endif - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall @@ -495,7 +495,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 closebutton - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare 0x4044, 8 + compare_var_to_imm 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -602,7 +602,7 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare 0x40AB, 0 + compare_var_to_imm 0x40AB, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playsfx SE_PIN @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare 0x40AC, 0 + compare_var_to_imm 0x40AC, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playsfx SE_PIN @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare 0x40AD, 0 + compare_var_to_imm 0x40AD, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playsfx SE_PIN @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare 0x40AE, 0 + compare_var_to_imm 0x40AE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playsfx SE_PIN @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare 0x40AF, 0 + compare_var_to_imm 0x40AF, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playsfx SE_PIN @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare 0x40B0, 0 + compare_var_to_imm 0x40B0, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playsfx SE_PIN @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare 0x40B1, 0 + compare_var_to_imm 0x40B1, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playsfx SE_PIN @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare 0x40B2, 0 + compare_var_to_imm 0x40B2, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playsfx SE_PIN @@ -726,11 +726,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare 0x4044, 0 + compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare 0x4044, 1 + compare_var_to_imm 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare 0x4044, 2 + compare_var_to_imm 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B setvar 0x40a5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 3a89c2db1..d9536edde 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare 0x40ab, 2 + compare_var_to_imm 0x40ab, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare 0x40ab, 0 + compare_var_to_imm 0x40ab, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index a4731d329..4102bd9ec 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,13 +4,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare 0x4002, 1 + compare_var_to_imm 0x4002, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare 0x4003, 1 + compare_var_to_imm 0x4003, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare 0x4004, 1 + compare_var_to_imm 0x4004, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare 0x40ac, 0 + compare_var_to_imm 0x40ac, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 86d68a6ef..377791261 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare 0x4009, 0 + compare_var_to_imm 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmaptile 13, 7, 600, 0 setmaptile 1, 3, 600, 0 setmaptile 10, 2, 600, 0 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare 0x4008, 6 + compare_var_to_imm 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare 0x4008, 7 + compare_var_to_imm 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -302,19 +302,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar 0x4005, 0 setvar 0x4006, 0 setvar 0x4007, 0 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare 0x4008, 6 + compare_var_to_imm 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare 0x4008, 7 + compare_var_to_imm 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return @@ -347,14 +347,14 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 0 + compare_var_to_imm 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare 0x4009, 0 + compare_var_to_imm 0x4009, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end @@ -370,7 +370,7 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare 0x40ad, 0 + compare_var_to_imm 0x40ad, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0c9fc426f..0bff3f526 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare 0x40ae, 0 + compare_var_to_imm 0x40ae, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 72268710b..67f5bc469 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare 0x40af, 0 + compare_var_to_imm 0x40af, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall move 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F @@ -37,7 +37,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall move 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4002, 1 + compare_var_to_imm 0x4002, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall move 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4003, 1 + compare_var_to_imm 0x4003, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 @@ -57,7 +57,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall move 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4004, 1 + compare_var_to_imm 0x4004, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall move 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmove 0 - compare 0x4005, 1 + compare_var_to_imm 0x4005, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F @@ -165,11 +165,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F waitmove 0 move 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -187,11 +187,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 waitmove 0 move 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -209,11 +209,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 waitmove 0 move 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -231,11 +231,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B waitmove 0 move 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -253,11 +253,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F waitmove 0 move 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmove 0 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare_var_to_imm 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare_var_to_imm 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare 0x4009, 4 + compare_var_to_imm 0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare 0x4009, 5 + compare_var_to_imm 0x4009, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare 0x4008, 1 + compare_var_to_imm 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare 0x4008, 2 + compare_var_to_imm 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare 0x4008, 3 + compare_var_to_imm 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare 0x4008, 4 + compare_var_to_imm 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare 0x4008, 5 + compare_var_to_imm 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index ddf845142..e4ce617c9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare 0x40b0, 0 + compare_var_to_imm 0x40b0, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index c9dcce5e3..5d635e2c5 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare 0x40b6, 1 + compare_var_to_imm 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag 194 clearflag 195 @@ -86,7 +86,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare 0x40b6, 1 + compare_var_to_imm 0x40b6, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end @@ -100,7 +100,7 @@ Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare 0x40b1, 0 + compare_var_to_imm 0x40b1, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 5f0b00684..1c6a9847f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare 0x40b2, 0 + compare_var_to_imm 0x40b2, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 2a69df98a..7231b427a 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -22,15 +22,15 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy 0x4000, 0x4001 - compare 0x4001, 34 + compare_var_to_imm 0x4001, 34 goto_if 0, Route111_EventScript_15000C - compare 0x4001, 107 + compare_var_to_imm 0x4001, 107 goto_if 2, Route111_EventScript_15000C - compare 0x4001, 72 + compare_var_to_imm 0x4001, 72 goto_if 2, Route111_EventScript_150009 - compare 0x4000, 2000 + compare_var_to_imm 0x4000, 2000 goto_if 2, Route111_EventScript_15000C - compare 0x4000, 8 + compare_var_to_imm 0x4000, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -52,7 +52,7 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closebutton @@ -74,7 +74,7 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closebutton @@ -125,7 +125,7 @@ Route111_EventScript_1500C5:: @ 81500C5 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag 2252 special GetPlayerBigGuyGirlString @@ -164,7 +164,7 @@ Route111_EventScript_150122:: @ 8150122 Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_EventScript_150151 setvar 0x4003, 1 releaseall @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closebutton - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 call_if 1, Route111_EventScript_150188 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, Route111_EventScript_150193 - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 call_if 1, Route111_EventScript_15019E - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 call_if 1, Route111_EventScript_1501A9 releaseall end @@ -238,7 +238,7 @@ Route111_EventScript_1501D1:: @ 81501D1 faceplayer setflag 2115 msgbox Route111_Text_16F705, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release @@ -393,7 +393,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -421,7 +421,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -434,7 +434,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index a33b436dc..fdd0078ed 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC closebutton call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 39fc62eaf..b5b6056f4 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 22c055320..9a4c85158 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -39,7 +39,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index c4ab89f23..d2d01f253 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E warp6 Route112, 255, 28, 28 - compare 0x40a3, 2 + compare_var_to_imm 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer msgbox Route112_CableCarStation_Text_1924F5, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 67d28e6df..ae08ff5bb 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy 0x4000, 0x4001 - compare 0x4000, 19 + compare_var_to_imm 0x4000, 19 goto_if 0, Route113_EventScript_150604 - compare 0x4000, 84 + compare_var_to_imm 0x4000, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -61,7 +61,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -74,7 +74,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 2fec004e4..f83c5cf23 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag 2116 - compare 0x40be, 1 + compare_var_to_imm 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end @@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_16355F:: @ 816355F Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare 0x40be, 10 + compare_var_to_imm 0x40be, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare 0x40be, 2 + compare_var_to_imm 0x40be, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare 0x40be, 1 + compare_var_to_imm 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem ITEM_SOOT_SACK @@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare 0x4048, 250 + compare_var_to_imm 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext @@ -70,10 +70,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitem 0, 0x8008 setvar 0x800a, 250 - compare 0x4048, 250 + compare_var_to_imm 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 @@ -84,10 +84,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare_var_to_imm 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 @@ -98,10 +98,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare_var_to_imm 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 @@ -112,10 +112,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare_var_to_imm 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 @@ -126,10 +126,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare_var_to_imm 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 @@ -141,10 +141,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecor 0, 0x8008 setvar 0x800a, 6000 - compare 0x4048, 6000 + compare_var_to_imm 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 @@ -156,10 +156,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecor 0, 0x8008 setvar 0x800a, 8000 - compare 0x4048, 8000 + compare_var_to_imm 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 @@ -201,9 +201,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 pause 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare_var_to_imm 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare_var_to_imm 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release @@ -211,13 +211,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 Route113_GlassWorkshop_EventScript_163889:: @ 8163889 giveitem 0x8008 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 givedecoration 0x8008 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -295,9 +295,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare_var_to_imm 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare_var_to_imm 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 6d28b87a4..d910d3e16 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 @@ -31,7 +31,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 @@ -88,7 +88,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -101,7 +101,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index b217f24c4..3406a78f6 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag 261 release diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 13843f758..71c627728 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F checkflag 267 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index e4334647c..fbc4976ab 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -18,7 +18,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 .else givedecoration 100 .endif - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag 131 release @@ -32,7 +32,7 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall @@ -40,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 3bacb06d1..711a62e40 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -16,7 +16,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -34,7 +34,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -47,7 +47,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 94b7d25d6..838ebe814 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -44,17 +44,17 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag 287 giveitem ITEM_REPEAT_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route116_EventScript_150AEE - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route116_EventScript_150AEE - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route116_EventScript_150AEE - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route116_EventScript_150AF9 disappear LAST_TALKED clearflag 949 @@ -148,10 +148,10 @@ Route116_EventScript_150B8F:: @ 8150B8F lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BCA specialval RESULT, sub_810F828 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release @@ -167,7 +167,7 @@ Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 specialval RESULT, sub_810F828 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release @@ -181,13 +181,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 pause 20 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route116_EventScript_150C37 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, Route116_EventScript_150C37 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route116_EventScript_150C37 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, Route116_EventScript_150C42 disappear LAST_TALKED release @@ -241,7 +241,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -264,7 +264,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index a84d1eaf8..2a27c01d7 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -41,7 +41,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -54,7 +54,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -67,7 +67,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -80,7 +80,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -98,7 +98,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -111,7 +111,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 7d4109f59..e1b4fd345 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -12,9 +12,9 @@ Route118_EventScript_150F34:: @ 8150F34 checkflag 227 goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_150F5E - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route118_EventScript_150F7F end @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 pause 30 msgbox Route118_Text_170D66, 4 closebutton - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, Route118_EventScript_151048 - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, Route118_EventScript_151053 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 @@ -162,7 +162,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -185,7 +185,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 0d71ac056..cae90cd12 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare 0x8004, 6 + compare_var_to_imm 0x8004, 6 call_if 1, Route119_EventScript_151193 - compare 0x8004, 7 + compare_var_to_imm 0x8004, 7 call_if 1, Route119_EventScript_151197 return @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare 0x40b3, 1 + compare_var_to_imm 0x40b3, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -52,29 +52,29 @@ Route119_EventScript_1511DB:: @ 81511DB lockall reappear 25 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route119_EventScript_151254 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route119_EventScript_151259 pause 65 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513A6 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513B1 move 255, Route119_Movement_1A0845 waitmove 0 pause 30 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 pause 30 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route119_EventScript_15125E - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 pause 30 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513BC - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 @@ -297,7 +297,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -310,7 +310,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 762a6c299..aa918bc34 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare 0x40b3, 0 + compare_var_to_imm 0x40b3, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare 0x40b3, 0 + compare_var_to_imm 0x40b3, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 35e547f79..a8fd671bd 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare 0x40b3, 0 + compare_var_to_imm 0x40b3, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare 0x40b3, 1 + compare_var_to_imm 0x40b3, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -56,7 +56,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 fanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index f0179d317..e736722b5 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 call_if 1, Route120_EventScript_15166B - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 call_if 1, Route120_EventScript_151672 - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 call_if 1, Route120_EventScript_151676 - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 call_if 1, Route120_EventScript_15167A - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 call_if 1, Route120_EventScript_15167E - compare 0x8004, 5 + compare_var_to_imm 0x8004, 5 call_if 1, Route120_EventScript_151682 return @@ -81,11 +81,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy 0x4000, 0x4001 - compare 0x4001, 14 + compare_var_to_imm 0x4001, 14 goto_if 3, Route120_EventScript_151715 - compare 0x4001, 60 + compare_var_to_imm 0x4001, 60 goto_if 3, Route120_EventScript_151719 - compare 0x4001, 61 + compare_var_to_imm 0x4001, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare 0x4000, 7 + compare_var_to_imm 0x4000, 7 goto_if 3, Route120_EventScript_151735 - compare 0x4000, 19 + compare_var_to_imm 0x4000, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -116,9 +116,9 @@ Route120_EventScript_151739:: @ 8151739 checkflag 2254 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route120_EventScript_151841 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, Route120_EventScript_15184A specialval RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -161,7 +161,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag 2254 msgbox Route120_Text_1C5A0B, 4 @@ -187,7 +187,7 @@ Route120_EventScript_151853:: @ 8151853 checkflag 290 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -200,7 +200,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -208,9 +208,9 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, Route120_EventScript_15197F - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, Route120_EventScript_15198A move 31, Route120_Movement_1A083F waitmove 0 @@ -293,7 +293,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -316,7 +316,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index c87774cb8..3af8ff7cf 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -74,7 +74,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -102,7 +102,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 3724e9aeb..efc2ab4fb 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -52,7 +52,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 showmoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C @@ -60,11 +60,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 @@ -88,10 +88,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialval RESULT, CheckFreePokemonStorageSpace - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 395eaa7c3..f4ba11b0d 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_151C5D:: @ 8151C5D goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 @@ -63,7 +63,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -76,7 +76,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 4f7bad5f9..4c35b52ec 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 2253 msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release @@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare 0x8004, 0 + compare_var_to_imm 0x8004, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare 0x8004, 1 + compare_var_to_imm 0x8004, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare 0x8004, 2 + compare_var_to_imm 0x8004, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare 0x8004, 3 + compare_var_to_imm 0x8004, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare 0x8004, 4 + compare_var_to_imm 0x8004, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare 0x8004, 5 + compare_var_to_imm 0x8004, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end @@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 random 10 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release @@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 goto Route123_BerryMastersHouse_EventScript_163C1D diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index a60b29b99..ef9f0ebed 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -24,7 +24,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -47,7 +47,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -60,7 +60,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index b3e91e43c..1deeb9e34 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar 0x4001, 0 checkitem ITEM_RED_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C return @@ -247,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 0, 0x8008 bufferitem 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace 0x8009, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 checkitem 0x8008, 2 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end @@ -263,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 045a55a11..7d5fc0376 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -30,7 +30,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 7db99f7b3..10bb0a1cc 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -183,7 +183,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -196,7 +196,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 2c93c1bd6..83b972dbf 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81523C2 Route130_MapScript1_1523C8:: @ 81523C8 specialval RESULT, IsMirageIslandPresent - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag 17 setflag 18 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 13a4ce265..1a2afe16d 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -363,13 +363,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 @@ -457,19 +457,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare_var_to_imm 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton @@ -552,9 +552,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -572,9 +572,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 0c604c513..352850d9e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end @@ -14,7 +14,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 287 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 188 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,16 +64,16 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare 0x40c4, 2 + compare_var_to_imm 0x40c4, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare 0x40c4, 1 + compare_var_to_imm 0x40c4, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -86,7 +86,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -104,7 +104,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmove 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare 0x40c5, 1 + compare_var_to_imm 0x40c5, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare 0x40c5, 2 + compare_var_to_imm 0x40c5, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -135,7 +135,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 bufferpoke 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -146,7 +146,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waittext givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -155,7 +155,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 bufferpoke 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare RESULT, 6 + compare_var_to_imm RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -166,7 +166,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waittext givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index fe39af9c4..78feb0ce5 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare 0x408f, 0 + compare_var_to_imm 0x408f, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem ITEM_EXP_SHARE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 0dfec5cfa..fefc67d0f 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag 213 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 6bb33b4dc..353ac8fe3 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -20,14 +20,14 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE addvar 0x4085, 1 setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare 0x4085, 6 + compare_var_to_imm 0x4085, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag 165 msgbox RustboroCity_Gym_Text_184170, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index e45bf2080..0dd47d2d3 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -11,17 +11,17 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialval RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a specialval RESULT, sub_804DB2C copyvar 0x800b, RESULT - comparevars RESULT, 0x8009 + compare_var_to_var RESULT, 0x8009 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index e5a9622fb..5f4de010e 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -79,13 +79,13 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE faceplayer checkflag 275 goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem ITEM_QUICK_CLAW - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index bcc612511..b4546e27a 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -10,7 +10,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare 0x409a, 2 + compare_var_to_imm 0x409a, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 closebutton - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closebutton - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare 0x4001, 2 + compare_var_to_imm 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare 0x4001, 3 + compare_var_to_imm 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index d076510dc..da9d31cca 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -41,9 +41,9 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 return gUnknown_0815FD0D:: @ 815FD0D - compare 0x40B4, 2 + compare_var_to_imm 0x40B4, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare 0x40B4, 7 + compare_var_to_imm 0x40B4, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare 0x40b4, 4 + compare_var_to_imm 0x40b4, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare 0x40b4, 8 + compare_var_to_imm 0x40b4, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare 0x40b4, 2 + compare_var_to_imm 0x40b4, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare 0x40b4, 7 + compare_var_to_imm 0x40b4, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index aa84b6b48..f9e815d1f 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 9005bef3b..8cc342f88 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -20,7 +20,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare 0x40a4, 2 + compare_var_to_imm 0x40a4, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -52,10 +52,10 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare 0x4001, 0 + compare_var_to_imm 0x4001, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 091db022c..2650f4ab5 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -9,7 +9,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialval RESULT, CheckRelicanthWailord - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeout 0 playsfx 49 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index dc2b107e3..bad7397c0 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -23,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkflag 2143 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 removeitem ITEM_SHOAL_SALT, 4 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag 2 @@ -49,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return @@ -70,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 05fc6a315..8dec3b212 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -73,7 +73,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 checkflag 956 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 checkflag 957 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 checkflag 958 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 checkflag 959 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView @@ -130,7 +130,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 checkflag 952 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView @@ -148,7 +148,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 checkflag 953 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index db5779efe..01719a9cf 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 checkflag 955 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView @@ -40,7 +40,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag 283 release diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index bffb7bd49..1c5cde842 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 checkflag 954 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 4b11b2f8d..c43ddfaee 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -12,7 +12,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BA68 end @@ -67,10 +67,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 specialval RESULT, LeadMonHasEffortRibbon - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_EventScript_14BB35 specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 fanfare 370 @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag 96 goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare 0x4058, 1 + compare_var_to_imm 0x4058, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -288,9 +288,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer msgbox SlateportCity_Text_1650F1, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_EventScript_14BD28 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index b2963098c..d30089fbb 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -16,7 +16,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag 265 msgbox SlateportCity_ContestHall_Text_17CE28, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 33a99b2a4..be1504415 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 warp6 SlateportCity, 255, 28, 13 setvar 0x4001, 0 - compare 0x40a0, 1 + compare_var_to_imm 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag 2052 call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 disappear 7 disappear 8 setvar 0x40a0, 2 - compare 0x8008, 0 + compare_var_to_imm 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare 0x8008, 1 + compare_var_to_imm 0x8008, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare 0x8008, 2 + compare_var_to_imm 0x8008, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare 0x8008, 3 + compare_var_to_imm 0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closebutton @@ -168,7 +168,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext @@ -191,7 +191,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 @@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp BattleTower_Outside, 255, 19, 23 @@ -223,9 +223,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 waitmove 0 pause 30 spriteinvisible LAST_TALKED, 9, 8 - compare FACING, 2 + compare_var_to_imm FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 pause 30 spriteinvisible 255, 0, 0 @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag 112 goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare 0x40a0, 2 + compare_var_to_imm 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton @@ -300,10 +300,10 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare 0x4001, 1 + compare_var_to_imm 0x4001, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 checkflag 2052 goto_if_eq SlateportCity_Harbor_EventScript_15629D @@ -333,10 +333,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 @@ -346,10 +346,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index f9ffba65f..731b3385b 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer msgbox SlateportCity_House1_Text_17D46A, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15569C - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare 0x8004, 255 + compare_var_to_imm 0x8004, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -28,20 +28,20 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialval RESULT, ScriptGetPartyMonSpecies - compare RESULT, SPECIES_EGG + compare_var_to_imm RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialval RESULT, sub_810F96C special sub_80BFAE0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155730 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -60,7 +60,7 @@ SlateportCity_House1_EventScript_155730:: @ 8155730 call SlateportCity_House1_EventScript_1A0678 specialval RESULT, sub_80BF9B4 special sub_80BFAE0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc index 934fae153..6f267d31f 100644 --- a/data/scripts/maps/SlateportCity_House2.inc +++ b/data/scripts/maps/SlateportCity_House2.inc @@ -9,7 +9,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 45b69dff2..e8f6d45ac 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -34,7 +34,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoney 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 @@ -165,14 +165,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A waitmove 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closebutton - compare FACING, 2 + compare_var_to_imm FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 - compare FACING, 2 + compare_var_to_imm FACING, 2 goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 136054947..3a08fcc2a 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -21,21 +21,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmove 0 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 - compare FACING, 4 + compare_var_to_imm FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton move 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmove 0 - compare FACING, 1 + compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 - compare FACING, 3 + compare_var_to_imm FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 6656e58a4..4a7fc8474 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 200 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare 0x4002, 5 + compare_var_to_imm 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare 0x40b7, 2 + compare_var_to_imm 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -85,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 200 @@ -96,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 201 @@ -107,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 202 @@ -118,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 203 @@ -129,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 204 @@ -145,7 +145,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialval RESULT, CheckLeadMonCool - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -155,7 +155,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialval RESULT, CheckLeadMonBeauty - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -165,7 +165,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialval RESULT, CheckLeadMonCute - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -175,7 +175,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialval RESULT, CheckLeadMonSmart - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -185,7 +185,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialval RESULT, CheckLeadMonTough - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -200,7 +200,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialval RESULT, GetLeadMonFriendshipScore - compare RESULT, 4 + compare_var_to_imm RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end @@ -213,7 +213,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A waitmove 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag 278 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index d718fed6e..44ee245fd 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 movespriteperm 1, 29, 19 movespriteperm 2, 33, 19 - compare 0x405e, 1 + compare_var_to_imm 0x405e, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -99,20 +99,20 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag 2258 msgbox SootopolisCity_Text_1C64D0, 4 random 2 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_14D1FF - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -120,7 +120,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -128,7 +128,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index d776e8ecf..39bc2d4db 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare 0x4022, 8 + compare_var_to_imm 0x4022, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare 0x4022, 28 + compare_var_to_imm 0x4022, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare 0x4022, 69 + compare_var_to_imm 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmaptile 8, 4, 519, 0 setmaptile 8, 5, 519, 0 @@ -109,7 +109,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag 172 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 011806291..6315cee85 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer msgbox SootopolisCity_House2_Text_18FA66, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_15B307 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index f1bf0bf19..156ee232d 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer msgbox SootopolisCity_House3_Text_18FB36, 5 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1e1b53956..2d6add92d 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -7,11 +7,11 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 checkflag 245 goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration 117 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag 245 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 662117741..e7ddaa39d 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -9,14 +9,14 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare RESULT, 255 + compare_var_to_imm RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B452 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B45C - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -39,7 +39,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem ITEM_ELIXIR - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closebutton release @@ -58,14 +58,14 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare RESULT, 255 + compare_var_to_imm RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B4E3 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B4ED - compare RESULT, 3 + compare_var_to_imm RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -88,7 +88,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem ITEM_ELIXIR - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closebutton release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index fc7d811c4..72a11a88b 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -10,7 +10,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 84e6b93c5..368e26794 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -23,9 +23,9 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq SouthernIsland_Interior_EventScript_160B95 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 4e2895166..cbb45993a 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -4,9 +4,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy 0x8004, 0x8005 - compare 0x8004, 12 + compare_var_to_imm 0x8004, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare 0x8005, 44 + compare_var_to_imm 0x8005, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 52aca6d12..fee3b1498 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -13,15 +13,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId - compare RESULT, 0 + compare_var_to_imm RESULT, 0 call_if 1, LinkContestRoom1_EventScript_15F5E0 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 call_if 1, LinkContestRoom1_EventScript_15F5E4 - compare RESULT, 2 + compare_var_to_imm RESULT, 2 call_if 1, LinkContestRoom1_EventScript_15F5E8 - compare RESULT, 3 + compare_var_to_imm RESULT, 3 call_if 1, LinkContestRoom1_EventScript_15F5EC - compare RESULT, 4 + compare_var_to_imm RESULT, 4 call_if 1, LinkContestRoom1_EventScript_15F5F0 return @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare 0x4009, 1 + compare_var_to_imm 0x4009, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare 0x4000, 8 + compare_var_to_imm 0x4000, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return @@ -414,9 +414,9 @@ LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkgender - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 00454133d..2443b01b0 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -105,7 +105,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 - compare RESULT, 0 + compare_var_to_imm RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag 235 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7ea560d0d..95b82f46a 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -94,7 +94,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialval RESULT, sub_8082C68 - compare RESULT, 1 + compare_var_to_imm RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end -- cgit v1.2.3 From 207f8e6a76f6b13855780bb2608be9d8c1f14b15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:36:39 -0500 Subject: more script command renaming --- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 4 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 10 ++-- .../maps/AbandonedShip_HiddenFloorRooms.inc | 24 ++++---- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/AbandonedShip_Rooms_B1F.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater1.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater2.inc | 2 +- data/scripts/maps/AncientTomb.inc | 4 +- data/scripts/maps/AquaHideout_B2F.inc | 6 +- data/scripts/maps/BattleTower_BattleRoom.inc | 8 +-- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 24 ++++---- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 12 ++-- data/scripts/maps/DesertRuins.inc | 4 +- data/scripts/maps/DewfordTown_Gym.inc | 8 +-- data/scripts/maps/DewfordTown_House1.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 26 ++++----- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 6 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 8 +-- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 6 +- data/scripts/maps/FallarborTown_Mart.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 6 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/FortreeCity_House5.inc | 2 +- data/scripts/maps/GraniteCave_B1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/IslandCave.inc | 6 +- data/scripts/maps/JaggedPass.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 14 ++--- data/scripts/maps/LavaridgeTown_House.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 24 ++++---- data/scripts/maps/LilycoveCity_ContestHall.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 42 +++++++------- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 4 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 ++-- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 10 ++-- data/scripts/maps/LilycoveCity_Harbor.inc | 14 ++--- data/scripts/maps/LilycoveCity_House1.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 64 +++++++++++----------- data/scripts/maps/LittlerootTown.inc | 14 ++--- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 14 ++--- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 6 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 46 ++++++++-------- data/scripts/maps/MauvilleCity_Gym.inc | 4 +- data/scripts/maps/MauvilleCity_House2.inc | 2 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 4 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 6 +- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtPyre_2F.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 10 ++-- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 16 +++--- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House2.inc | 14 ++--- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 10 ++-- data/scripts/maps/PetalburgCity_Gym.inc | 16 +++--- .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 6 +- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 18 +++--- data/scripts/maps/Route104.inc | 6 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 2 +- data/scripts/maps/Route104_Prototype.inc | 4 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 6 +- data/scripts/maps/Route110.inc | 30 +++++----- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 2 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 14 ++--- data/scripts/maps/Route110_TrickHouseEntrance.inc | 34 ++++++------ data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 +-- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 18 +++--- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 20 +++---- data/scripts/maps/Route111.inc | 16 +++--- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route113.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 4 +- data/scripts/maps/Route114.inc | 8 +-- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 10 ++-- data/scripts/maps/Route117.inc | 12 ++-- data/scripts/maps/Route118.inc | 8 +-- data/scripts/maps/Route119.inc | 20 +++---- data/scripts/maps/Route119_House.inc | 2 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 18 +++--- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 4 +- data/scripts/maps/Route123.inc | 4 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 4 +- data/scripts/maps/Route124.inc | 6 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 14 ++--- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/Route134.inc | 2 +- data/scripts/maps/RustboroCity.inc | 22 ++++---- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 8 +-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 8 +-- data/scripts/maps/RustboroCity_Flat2_1F.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 4 +- data/scripts/maps/RustboroCity_House3.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 10 ++-- data/scripts/maps/SSTidalCorridor.inc | 16 +++--- data/scripts/maps/SafariZone_Southeast.inc | 2 +- data/scripts/maps/SeafloorCavern_Entrance.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 22 ++++---- data/scripts/maps/SealedChamber_InnerRoom.inc | 22 ++++---- data/scripts/maps/SealedChamber_OuterRoom.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 2 +- data/scripts/maps/SkyPillar_2F.inc | 2 +- data/scripts/maps/SkyPillar_4F.inc | 2 +- data/scripts/maps/SkyPillar_Top.inc | 4 +- data/scripts/maps/SlateportCity.inc | 14 ++--- data/scripts/maps/SlateportCity_ContestLobby.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 6 +- data/scripts/maps/SlateportCity_House1.inc | 6 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 8 +-- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 ++-- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 20 +++---- data/scripts/maps/SootopolisCity.inc | 18 +++--- data/scripts/maps/SootopolisCity_Gym_1F.inc | 18 +++--- data/scripts/maps/SootopolisCity_House1.inc | 2 +- data/scripts/maps/SootopolisCity_House4.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 10 ++-- data/scripts/maps/Underwater_Route134.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/Underwater_SootopolisCity.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 10 ++-- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 6 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 4 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- 163 files changed, 625 insertions(+), 625 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index c2f813e88..85531be99 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F .byte 0 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A - warp4 AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp AbandonedShip_Underwater1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 @@ -34,7 +34,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 - playsfx 21 + playse 21 removeitem ITEM_STORAGE_KEY, 1 setflag 239 call AbandonedShip_Corridors_B1F_EventScript_15E9C0 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index c3a48f55d..fe833b47c 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 - warp4 AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp AbandonedShip_Underwater1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A @@ -66,7 +66,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_1_KEY, 1 setflag 240 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 @@ -82,7 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_2_KEY, 1 setflag 241 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_4_KEY, 1 setflag 242 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 @@ -114,7 +114,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 compare_var_to_imm RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playsfx 21 + playse 21 removeitem ITEM_ROOM_6_KEY, 1 setflag 243 call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index bda0e9603..4f3e0f099 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -38,37 +38,37 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 return AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B - pause 20 + delay 20 setanimation 0, 10 setanimation 1, 10 setanimation 2, 0 doanimation 54 - specialval RESULT, sub_810F4D4 + specialvar RESULT, sub_810F4D4 compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialval RESULT, sub_810F488 + specialvar RESULT, sub_810F488 compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA - pause 20 + delay 20 compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA end AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB - pause 20 + delay 20 setanimation 0, 8 setanimation 1, 5 setanimation 2, 0 @@ -77,15 +77,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 1, 3 setanimation 2, 0 doanimation 54 - specialval RESULT, sub_810F4FC + specialvar RESULT, sub_810F4FC compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 - pause 20 + delay 20 setanimation 0, 16 setanimation 1, 3 setanimation 2, 0 @@ -98,11 +98,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 1, 6 setanimation 2, 0 doanimation 54 - specialval RESULT, sub_810F4B0 + specialvar RESULT, sub_810F4B0 compare_var_to_imm RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 - pause 10 + delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 0c223cbaa..4feecded6 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 @@ -16,7 +16,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 44b8c5f20..218f1a2ca 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B - warp4 AbandonedShip_Underwater2, 255, 17, 4 + setdivewarp AbandonedShip_Underwater2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index 71d903682..afac470ea 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 .byte 0 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D - warp4 AbandonedShip_HiddenFloorCorridors, 255, 0, 10 + setdivewarp AbandonedShip_HiddenFloorCorridors, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index f7b434c07..b8facc4ec 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 .byte 0 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D - warp4 AbandonedShip_Rooms_B1F, 255, 13, 7 + setdivewarp AbandonedShip_Rooms_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index deed30c5b..a0f00e877 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -57,9 +57,9 @@ AncientTomb_EventScript_15F042:: @ 815F042 AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer - checksound + waitse pokecry SPECIES_REGISTEEL, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag 937 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 845b755b7..9ed2d102c 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -10,7 +10,7 @@ AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar 0x8008, 1 - playsfx 21 + playse 21 move 0x8008, AquaHideout_B2F_Movement_1A0833 waitmove 0 .ifdef SAPPHIRE @@ -43,7 +43,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD move 0x8008, AquaHideout_B2F_Movement_1A0843 .endif waitmove 0 - pause 20 + delay 20 move 0x8008, AquaHideout_B2F_Movement_1A0839 waitmove 0 msgbox AquaHideout_B2F_Text_197162, 4 @@ -60,7 +60,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD .endif waitmove 0 disappear 0x8009 - pause 20 + delay 20 move 0x8008, AquaHideout_B2F_Movement_1A0839 waitmove 0 msgbox AquaHideout_B2F_Text_1971AE, 4 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 750c64b74..60685adad 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special sub_8135A14 - fanfare 368 + playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty @@ -108,10 +108,10 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 setvar 0x8004, 2 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 - pause 60 + delay 60 waittext - playsfx 55 - checksound + playse 55 + waitse msgbox BattleTower_BattleRoom_Text_1C6D05, 4 BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index 408e7485e..2c9f12a6e 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -14,7 +14,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 waitmove 0 special sub_810EBEC waitstate - pause 64 + delay 64 move 1, BattleTower_Elevator_Movement_16083D move 255, BattleTower_Elevator_Movement_160841 waitmove 0 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 4caffb405..c4ffe4c32 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -17,7 +17,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag 237 goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialval 0x8007, sub_810F404 + specialvar 0x8007, sub_810F404 compare_var_to_imm 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 @@ -25,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialval 0x8007, sub_810F404 + specialvar 0x8007, sub_810F404 compare_var_to_imm 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 @@ -84,7 +84,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext - fanfare 370 + playfanfare 370 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -100,8 +100,8 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D special sub_8135D84 setvar 0x8004, 3 special sub_8135BA0 - playsfx 55 - checksound + playse 55 + waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar 0x8004, 0 @@ -114,7 +114,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waittext - fanfare 370 + playfanfare 370 waitfanfare setvar 0x8004, 9 special sub_81358A4 @@ -148,8 +148,8 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 special sub_8135668 setvar 0x8004, 0 special sub_8135BA0 - playsfx 55 - checksound + playse 55 + waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closebutton setvar 0x4000, 5 @@ -166,8 +166,8 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waittext setvar 0x8004, 1 special sub_8135BA0 - playsfx 55 - checksound + playse 55 + waitse setvar 0x8004, 8 setvar 0x8005, 0 special sub_8135668 @@ -241,7 +241,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 special sub_8135668 special LoadPlayerParty closebutton - pause 2 + delay 2 call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 @@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialval RESULT, sub_810F404 + specialvar RESULT, sub_810F404 compare_var_to_imm RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index beb9ed690..8ef5dc0ad 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -66,7 +66,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 closebutton move LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmove 0 - pause 30 + delay 30 spriteinvisible 5, 26, 4 setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index e79dfb3ff..aad189887 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -37,7 +37,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playsfx 209 + playse 209 setanimation 0, 9 setanimation 1, 13 setanimation 2, 0 @@ -48,24 +48,24 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar RESULT, 2 .endif - playsfx 107 + playse 107 special sub_80818A4 waitstate special sub_80818FC waitstate move 1, CaveOfOrigin_B4F_Movement_15DE7D waitmove 0 - pause 60 + delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE - checksound + waitse pokecry SPECIES_GROUDON_OR_KYOGRE, 2 - pause 40 + delay 40 waitpokecry setflag 2145 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag 2145 - specialval RESULT, sub_810E300 + specialvar RESULT, sub_810E300 compare_var_to_imm RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index ab094c824..d63398d78 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -57,9 +57,9 @@ DesertRuins_EventScript_15CB77:: @ 815CB77 DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer - checksound + waitse pokecry SPECIES_REGIROCK, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag 935 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 4168acd0c..8f57e549a 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -56,25 +56,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playsfx 35 + playse 35 lighten 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playsfx 35 + playse 35 lighten 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playsfx 35 + playse 35 lighten 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playsfx 35 + playse 35 lighten 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index 40e06357c..321e376bd 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -12,7 +12,7 @@ DewfordTown_House1_EventScript_152FF8:: @ 8152FF8 DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 waitpokecry diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index be3557c22..6726686ca 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE lockall move 255, EverGrandeCity_ChampionsRoom_Movement_1A084E waitmove 0 - pause 40 + delay 40 move 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmove 0 setvar 0x4001, 1 @@ -38,20 +38,20 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playmusic 454, 0 + playbgm 454, 0 msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 - playsfx 8 + playse 8 setmaptile 6, 1, 838, 0 setmaptile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closebutton - playsfx 8 + playse 8 checkgender compare_var_to_imm RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C @@ -67,17 +67,17 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playmusic 415, 0 + playbgm 415, 0 return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playmusic 421, 0 + playbgm 421, 0 return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 - pause 40 - playsfx 21 + delay 40 + playse 21 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmove 0 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 @@ -89,8 +89,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 - pause 40 - playsfx 21 + delay 40 + playse 21 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmove 0 move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 @@ -112,18 +112,18 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4 move 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 waitmove 0 - pause 20 + delay 20 move 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmove 0 msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4 closebutton - pause 30 + delay 30 move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB move 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD move 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 move 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 waitmove 0 - pause 20 + delay 20 move 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmove 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 1e32394d9..a283c4c2a 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 faceplayer checkflag 1248 goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 71e80287b..f00f82f2e 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA faceplayer checkflag 1247 goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 123a7cbe2..458796e0c 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -28,7 +28,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 move 1, EverGrandeCity_HallOfFame_Movement_15BC60 move 255, EverGrandeCity_HallOfFame_Movement_15BC60 waitmove 0 - pause 20 + delay 20 move 1, EverGrandeCity_HallOfFame_Movement_1A0843 move 255, EverGrandeCity_HallOfFame_Movement_1A083F waitmove 0 @@ -37,10 +37,10 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 move 1, EverGrandeCity_HallOfFame_Movement_1A0841 move 255, EverGrandeCity_HallOfFame_Movement_1A0841 waitmove 0 - pause 20 + delay 20 doanimation 62 checkanimation 62 - pause 40 + delay 40 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 6fb0d7ba4..2b5266ade 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 faceplayer checkflag 1246 goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 0f0efbd26..04a8b701a 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -56,15 +56,15 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext - pause 75 + delay 75 checkflag 2060 goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closebutton move 3, EverGrandeCity_PokemonLeague_Movement_15BB7E move 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmove 0 - pause 10 - fanfare 369 + delay 10 + playfanfare 369 message EverGrandeCity_PokemonLeague_Text_191804 waittext waitfanfare @@ -86,7 +86,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playsfx 32 + playse 32 msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index bc8ad9f5a..564b2b806 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 faceplayer checkflag 1245 goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD - playmusic 450, 0 + playbgm 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 043588ed5..d6d4ffd3b 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -34,7 +34,7 @@ FallarborTown_EventScript_14E81D:: @ 814E81D FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer - checksound + waitse pokecry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 waitpokecry diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 1dddf43de..7a3a8a7c8 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -22,17 +22,17 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall move 1, FallarborTown_ContestLobby_Movement_153A7C waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, FallarborTown_ContestLobby_Movement_153A7F waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, FallarborTown_ContestLobby_Movement_153A8C waitmove 0 move 255, FallarborTown_ContestLobby_Movement_153A7A diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index 4b66546e8..05a3704fe 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -40,7 +40,7 @@ FallarborTown_Mart_EventScript_1539A5:: @ 81539A5 FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 waitpokecry diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index bb924026c..320ba0a3a 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playsfx 18 + playse 18 disappear 4 clearflag 870 release diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 565effc66..57405986b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -75,9 +75,9 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 closebutton move LAST_TALKED, FortreeCity_Movement_1A0662 waitmove 0 - checksound + waitse pokecry SPECIES_KECLEON, 2 - pause 40 + delay 40 waitpokecry move LAST_TALKED, FortreeCity_Movement_14CA13 waitmove 0 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index e0942354d..d21b82e51 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -8,7 +8,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 - specialval RESULT, sub_804D89C + specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare_var_to_imm RESULT, 0 @@ -19,7 +19,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 compare_var_to_imm 0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a - specialval RESULT, sub_804DB2C + specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT compare_var_to_var RESULT, 0x8009 goto_if 5, FortreeCity_House1_EventScript_157E9F @@ -57,7 +57,7 @@ FortreeCity_House1_EventScript_157EB7:: @ 8157EB7 FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 waitpokecry diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index c4284b722..bcf2bcd49 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -59,7 +59,7 @@ FortreeCity_House4_Movement_158218:: @ 8158218 FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 waitpokecry diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index 1144a8e81..59f80917e 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -12,7 +12,7 @@ FortreeCity_House5_EventScript_15823B:: @ 815823B FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 waitpokecry diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index 240de1d98..aa8d705c7 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,5 +6,5 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED tileeffect 7 - warp5 GraniteCave_B2F, 255, 0, 0 + setholewarp GraniteCave_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9473cbe8e..ee1c37dae 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare_var_to_imm FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - playsfx 9 + playse 9 disappear 1 release end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 9eedd4e05..e5782b63e 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -31,7 +31,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 setflag 784 setflag 760 setvar 0x408c, 1 - warpplace LittlerootTown, 255, 3, 10 + setdynamicwarp LittlerootTown, 255, 3, 10 releaseall end @@ -43,7 +43,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 785 setflag 722 setvar 0x4082, 1 - warpplace LittlerootTown, 255, 12, 10 + setdynamicwarp LittlerootTown, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 73523c460..06524f95e 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -39,7 +39,7 @@ S_OpenRegiceChamber:: @ 815EF19 setmaptile 8, 20, 563, 0 setmaptile 9, 20, 564, 1 special DrawWholeMapView - playsfx SE_BAN + playse SE_BAN setflag 2129 end @@ -77,9 +77,9 @@ IslandCave_EventScript_15EF95:: @ 815EF95 IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer - checksound + waitse pokecry SPECIES_REGICE, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 333ccbaad..98b367006 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -24,7 +24,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 @@ -37,7 +37,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e091ed372..e40a9252a 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -58,11 +58,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playmusic 415, 1 + playbgm 415, 1 return LavaridgeTown_EventScript_14E570:: @ 814E570 - playmusic 421, 1 + playbgm 421, 1 return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -105,15 +105,15 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 - pause 30 + delay 30 compare_var_to_imm 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A compare_var_to_imm 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm compare_var_to_imm 0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall @@ -236,7 +236,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E step_end LavaridgeTown_EventScript_14E710:: @ 814E710 - specialval RESULT, player_get_direction_lower_nybble + specialvar RESULT, player_get_direction_lower_nybble compare_var_to_imm RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -282,7 +282,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 - fanfare 370 + playfanfare 370 message LavaridgeTown_Text_16C2EA waitfanfare waittext diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index 944427bb6..dd5a9cc2b 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -8,7 +8,7 @@ LavaridgeTown_House_EventScript_1538AE:: @ 81538AE LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 waitpokecry diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 801e25396..5b53435d4 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -63,7 +63,7 @@ LilycoveCity_EventScript_14CB2B:: @ 814CB2B LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer - checkdailyflags + dodailyevents checkflag 2255 goto_if_eq LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 @@ -172,7 +172,7 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialval 0x8004, sub_80C4D50 + specialvar 0x8004, sub_80C4D50 switch 0x8004 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 @@ -255,7 +255,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playmusic 415, 1 + playbgm 415, 1 checkflag 286 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 @@ -280,13 +280,13 @@ LilycoveCity_EventScript_14CDB9:: @ 814CDB9 LilycoveCity_EventScript_14CDC2:: @ 814CDC2 setflag 286 msgbox LilycoveCity_Text_167AEB, 4 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm release end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playmusic 421, 1 + playbgm 421, 1 checkflag 286 call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 @@ -311,8 +311,8 @@ LilycoveCity_EventScript_14CE2C:: @ 814CE2C LilycoveCity_EventScript_14CE35:: @ 814CE35 setflag 286 msgbox LilycoveCity_Text_16802C, 4 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm release end @@ -414,14 +414,14 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B closebutton move LAST_TALKED, LilycoveCity_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear LAST_TALKED checkanimation 30 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm setflag 292 release end diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/scripts/maps/LilycoveCity_ContestHall.inc index 3601cb455..525d57a71 100644 --- a/data/scripts/maps/LilycoveCity_ContestHall.inc +++ b/data/scripts/maps/LilycoveCity_ContestHall.inc @@ -219,7 +219,7 @@ LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 lockall move 29, LilycoveCity_ContestHall_Movement_1A0839 waitmove 0 - pause 25 + delay 25 move 29, LilycoveCity_ContestHall_Movement_1A083D waitmove 0 msgbox LilycoveCity_ContestHall_Text_189DA2, 3 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 4785ffbbb..881a842f1 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -43,7 +43,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE closebutton special sub_80C4CEC setvar 0x4099, 0 - specialval RESULT, GiveMonArtistRibbon + specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 move 4, LilycoveCity_ContestLobby_Movement_158A43 @@ -72,13 +72,13 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 special sub_80C4858 move 4, LilycoveCity_ContestLobby_Movement_158A4E waitmove 0 - playsfx 21 + playse 21 move 4, LilycoveCity_ContestLobby_Movement_1A0833 waitmove 0 move 4, LilycoveCity_ContestLobby_Movement_158A52 waitmove 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - fanfare 370 + playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -87,7 +87,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialval 0x8004, sub_80C4D50 + specialvar 0x8004, sub_80C4D50 switch 0x8004 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA @@ -216,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE closebutton special sub_80C4CEC setvar 0x4099, 0 - specialval RESULT, GiveMonArtistRibbon + specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 move 11, LilycoveCity_ContestLobby_Movement_158B6D @@ -245,13 +245,13 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 special sub_80C4858 move 11, LilycoveCity_ContestLobby_Movement_158B78 waitmove 0 - playsfx 21 + playse 21 move 11, LilycoveCity_ContestLobby_Movement_1A0833 waitmove 0 move 11, LilycoveCity_ContestLobby_Movement_158B7C waitmove 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - fanfare 370 + playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -492,28 +492,28 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B lockall message2 LilycoveCity_ContestLobby_Text_1888C6 waittext - pause 20 + delay 20 closebutton move 2, LilycoveCity_ContestLobby_Movement_158E9C waitmove 0 - playsfx 71 + playse 71 setmaptile 9, 2, 545, 1 setmaptile 9, 3, 609, 1 special DrawWholeMapView move 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmove 0 - playsfx 71 + playse 71 setmaptile 9, 2, 721, 1 setmaptile 9, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 2, LilycoveCity_ContestLobby_Movement_158EAE waitmove 0 move 255, LilycoveCity_ContestLobby_Movement_158E99 waitmove 0 message2 LilycoveCity_ContestLobby_Text_1A6832 waittext - pause 20 + delay 20 closebutton move 2, LilycoveCity_ContestLobby_Movement_158EA4 move 255, LilycoveCity_ContestLobby_Movement_158E8E @@ -568,7 +568,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE step_end LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 - specialval RESULT, sub_80C5044 + specialvar RESULT, sub_80C5044 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 @@ -602,31 +602,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 return LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 - warp3 LinkContestRoom4, 255, 7, 5 + setwarp LinkContestRoom4, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 - warp3 LinkContestRoom2, 255, 7, 5 + setwarp LinkContestRoom2, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F - warp3 LinkContestRoom6, 255, 7, 5 + setwarp LinkContestRoom6, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C - warp3 LinkContestRoom5, 255, 7, 5 + setwarp LinkContestRoom5, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 - warp3 LinkContestRoom3, 255, 7, 5 + setwarp LinkContestRoom3, 255, 7, 5 special sub_8081334 waitstate return @@ -635,17 +635,17 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall move 1, LilycoveCity_ContestLobby_Movement_15900B waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, LilycoveCity_ContestLobby_Movement_15900F waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, LilycoveCity_ContestLobby_Movement_15901C waitmove 0 move 255, LilycoveCity_ContestLobby_Movement_159008 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 638bf8cf1..aef4bc74a 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -41,7 +41,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall - playsfx 21 + playse 21 move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 waitmove 0 move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 5bdaa610a..98aec1d7a 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag 2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialval RESULT, sub_8090FC0 + specialvar RESULT, sub_8090FC0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release @@ -20,7 +20,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag 2 - fanfare 370 + playfanfare 370 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 2ee04505e..1dd8d5869 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C end LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 - warpplace LilycoveCity_DepartmentStore_1F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 compare_var_to_imm 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 - warpplace LilycoveCity_DepartmentStore_2F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 compare_var_to_imm 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 - warpplace LilycoveCity_DepartmentStore_3F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 compare_var_to_imm 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B - warpplace LilycoveCity_DepartmentStore_4F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 compare_var_to_imm 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E - warpplace LilycoveCity_DepartmentStore_5F, 255, 2, 1 + setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 compare_var_to_imm 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 27d217b40..3295bf6ee 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoney 0, 0 nop bufferitem 0, 0x4000 - playsfx 106 + playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 additem 0x4000, 1 bufferitem 1, 0x4000 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace 0x4000, 1 compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playsfx 106 + playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 bufferitem 1, 0x4000 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace 0x4000, 1 compare_var_to_imm RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playsfx 106 + playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 bufferitem 1, 0x4000 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 6c1ecbc1d..9d22e6055 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -8,7 +8,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D55:: @ 8159D55 LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer - checkdailyflags + dodailyevents compare_var_to_imm 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 @@ -25,12 +25,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmove 0 - playsfx 4 + playse 4 special DoLotteryCornerComputerEffect special PickLotteryCornerTicket - pause 220 + delay 220 special EndLotteryCornerComputerEffect - pause 10 + delay 10 move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmove 0 compare_var_to_imm 0x8004, 0 @@ -133,7 +133,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EE9:: @ 8159EE9 LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer - checksound + waitse pokecry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 waitpokecry diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 12c880d31..0d9e70a15 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -78,13 +78,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A closebutton move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 spriteinvisible LAST_TALKED, 13, 10 compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE - pause 30 + delay 30 spriteinvisible 255, 0, 0 setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E @@ -116,24 +116,24 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE closebutton move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 spriteinvisible LAST_TALKED, 13, 10 - pause 60 + delay 60 reappear 4 - pause 30 + delay 30 move 4, LilycoveCity_Harbor_Movement_1A0839 waitmove 0 msgbox LilycoveCity_Harbor_Text_1C5120, 4 closebutton move 4, LilycoveCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 disappear 4 compare_var_to_imm FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare_var_to_imm FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE - pause 30 + delay 30 spriteinvisible 255, 0, 0 special ScrSpecial_HealPlayerParty setvar 0x8004, 2 diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 3dae362c1..6440f6d3d 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -8,7 +8,7 @@ LilycoveCity_House1_EventScript_159B86:: @ 8159B86 LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer - checksound + waitse pokecry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 waitpokecry diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index e41d61fe8..663b1f25b 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -98,7 +98,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag 236 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialval 0x8004, sub_80C4D50 + specialvar 0x8004, sub_80C4D50 switch 0x8004 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0127761a7..01781f3ca 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special sub_80FA0DC - fanfare 378 + playfanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 releaseall diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index e097504cf..dba3cf57a 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -70,35 +70,35 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 setvar 0x8004, 8 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -150,10 +150,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 @@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F end LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -190,10 +190,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 @@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 end LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -230,10 +230,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 @@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D end LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -270,10 +270,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 special sub_810FDAC compare_var_to_imm 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 @@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 end LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -308,10 +308,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B faceplayer setvar 0x8004, 11 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 @@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B end LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -341,10 +341,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D faceplayer setvar 0x8004, 12 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 @@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D end LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -374,10 +374,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF faceplayer setvar 0x8004, 14 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 @@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF end LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -407,10 +407,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 faceplayer setvar 0x8004, 15 special sub_810FDAC - specialval RESULT, sub_810FD60 + specialvar RESULT, sub_810FD60 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 @@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 end LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 - specialval RESULT, sub_810FCB0 + specialvar RESULT, sub_810FCB0 compare_var_to_imm RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 936437fb9..79b89e157 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -81,7 +81,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 761 - warpmuted LittlerootTown_BrendansHouse_1F, 255, 8, 8 + warpsilent LittlerootTown_BrendansHouse_1F, 255, 8, 8 waitstate releaseall end @@ -92,14 +92,14 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 762 - warpmuted LittlerootTown_MaysHouse_1F, 255, 2, 8 + warpsilent LittlerootTown_MaysHouse_1F, 255, 2, 8 waitstate releaseall end LittlerootTown_EventScript_14D62B:: @ 814D62B - pause 15 - playsfx 10 + delay 15 + playse 10 move 255, LittlerootTown_Movement_14D6C0 waitmove 0 setdooropened 0x8004, 0x8005 @@ -109,7 +109,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmove 0 setdoorclosed 0x8004, 0x8005 doorchange - pause 10 + delay 10 move 4, LittlerootTown_Movement_14D6AE waitmove 0 msgbox LittlerootTown_Text_16A7C9, 4 @@ -868,7 +868,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, 4 - fanfare 370 + playfanfare 370 message LittlerootTown_Text_16AA32 waitfanfare waittext @@ -876,5 +876,5 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16AA5C, 4 msgbox LittlerootTown_Text_16AB10, 4 closebutton - pause 30 + delay 30 return diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 63e717a51..f0440a49e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall - playsfx 21 + playse 21 move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmove 0 move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8c0133625..61b981995 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -60,7 +60,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 setvar 0x8004, 1 special DoPCTurnOnEffect - playsfx SE_PC_ON + playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 special BedroomPC waitstate @@ -69,7 +69,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 gBrendanHouse_TurnPCOff:: @ 8152850 setvar 0x8004, 1 - playsfx SE_PC_OFF + playse SE_PC_OFF special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 73060a055..882c5ede3 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall - playsfx 21 + playse 21 move 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 waitmove 0 move 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index ea6869b1b..b9dca087f 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -37,18 +37,18 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playsfx 9 + playse 9 disappear LAST_TALKED setvar 0x408d, 3 setvar 0x4050, 1 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 - playmusic 415, 1 + playbgm 415, 1 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmove 0 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 - playmusic 421, 1 + playbgm 421, 1 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmove 0 move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -208,7 +208,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C setvar 0x8004, 2 special DoPCTurnOnEffect - playsfx SE_PC_ON + playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 special BedroomPC waitstate @@ -217,7 +217,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C gMayHouse_TurnPCOff:: @ 8152C75 setvar 0x8004, 2 - playsfx SE_PC_OFF + playse SE_PC_OFF special DoPCTurnOffEffect releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index d34e52f7f..092d50545 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferfirstpoke 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waittext - fanfare 370 + playfanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 compare_var_to_imm RESULT, 1 @@ -155,7 +155,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - fanfare 370 + playfanfare 370 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waittext diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index d6cade75d..da0ff3a62 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -95,7 +95,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 msgbox MauvilleCity_Text_165D01, 4 move 6, MauvilleCity_Movement_1A0839 waitmove 0 - playsfx 21 + playse 21 move 6, MauvilleCity_Movement_1A0833 waitmove 0 move 6, MauvilleCity_Movement_1A0835 @@ -121,7 +121,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187 waitmove 0 move 6, MauvilleCity_Movement_1A0843 waitmove 0 - pause 30 + delay 30 move 7, MauvilleCity_Movement_14C2D8 waitmove 0 move 255, MauvilleCity_Movement_1A0845 @@ -140,7 +140,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 waitmove 0 move 6, MauvilleCity_Movement_1A0843 waitmove 0 - pause 30 + delay 30 move 7, MauvilleCity_Movement_14C2DC waitmove 0 move 255, MauvilleCity_Movement_1A0845 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 02b0c4bbb..63476bb1a 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoney 0, 0 nop updatecoins 0, 5 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoney 0, 0 hidecoins 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoney 0, 0 nop updatecoins 0, 5 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoney 0, 0 hidecoins 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 removecoins 1000 adddecor 88 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 removecoins 1000 adddecor 89 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA removecoins 1000 adddecor 90 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C removecoins 1500 additem ITEM_TM32, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 removecoins 3500 additem ITEM_TM29, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 removecoins 4000 additem ITEM_TM35, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA removecoins 4000 additem ITEM_TM24, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 removecoins 4000 additem ITEM_TM13, 1 updatecoins 0, 0 - playsfx 95 + playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -468,7 +468,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag 225 givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 - playsfx 95 + playse 95 goto MauvilleCity_GameCorner_EventScript_1570CA end @@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end @@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 compare_var_to_imm RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 - specialval RESULT, sub_810F424 + specialvar RESULT, sub_810F424 pokecasino RESULT releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 3255f8459..1030d8f68 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -91,7 +91,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView - playsfx 44 + playse 44 goto MauvilleCity_Gym_EventScript_15661D end @@ -146,7 +146,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playsfx 44 + playse 44 checkflag 99 goto_if_eq MauvilleCity_Gym_EventScript_1566E1 checkflag 99 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 7182a59aa..4308fd5ab 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -14,7 +14,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 end MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 - playsfx 21 + playse 21 move LAST_TALKED, MauvilleCity_House2_Movement_1A0833 waitmove 0 move LAST_TALKED, MauvilleCity_House2_Movement_1A0835 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index d5e1574cc..07e264fa8 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -10,7 +10,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C lockall move 255, MeteorFalls_1F_1R_Movement_1A0845 waitmove 0 - pause 30 + delay 30 move 5, MeteorFalls_1F_1R_Movement_1A0845 waitmove 0 msgbox MeteorFalls_1F_1R_Text_193237, 4 @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C move 5, MeteorFalls_1F_1R_Movement_1A0841 move 6, MeteorFalls_1F_1R_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 5, MeteorFalls_1F_1R_Movement_1A0833 waitmove 0 move 5, MeteorFalls_1F_1R_Movement_1A0835 diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index e6225bba0..a5c89055b 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 @@ -16,7 +16,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 @@ -29,7 +29,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 4112a3b15..de38e8fd0 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -94,7 +94,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playsfx 36 + playse 36 releaseall end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 8f3d2ebfc..b6fe4fd6e 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -6,7 +6,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F faceplayer bufferfirstpoke 0 msgbox MossdeepCity_House1_Text_18D465, 4 - specialval RESULT, GetPokeblockNameByMonNature + specialvar RESULT, GetPokeblockNameByMonNature compare_var_to_imm RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 9be55e8d0..e3485ae0d 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -12,7 +12,7 @@ MossdeepCity_House2_EventScript_15A872:: @ 815A872 MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 6db52bc42..9b1b17c69 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -34,7 +34,7 @@ MossdeepCity_House4_EventScript_15AB6D:: @ 815AB6D MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 waitpokecry diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index f5927aa77..40ed4f4ef 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -4,8 +4,8 @@ MossdeepCity_SpaceCenter_1F_MapScripts:: @ 815AB8A MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B lock faceplayer - checkdailyflags - specialval RESULT, GetWeekCount + dodailyevents + specialvar RESULT, GetWeekCount buffernum 0, RESULT compare_var_to_imm RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index c283d0532..d5004c644 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -31,7 +31,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall move 1, MossdeepCity_StevensHouse_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 1, MossdeepCity_StevensHouse_Movement_1A0833 waitmove 0 move 1, MossdeepCity_StevensHouse_Movement_1A0835 @@ -44,7 +44,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B setflag 302 msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closebutton - pause 20 + delay 20 move 1, MossdeepCity_StevensHouse_Movement_15AA76 waitmove 0 setvar 0x40c6, 1 @@ -79,7 +79,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 - fanfare 370 + playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waittext diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 9fa2b77de..578743995 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -440,7 +440,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index c44251af7..8d48dac84 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 815D36E MtPyre_2F_MapScript1_15D37E:: @ 815D37E tileeffect 7 - warp5 MtPyre_1F, 255, 0, 0 + setholewarp MtPyre_1F, 255, 0, 0 end MtPyre_2F_EventScript_15D389:: @ 815D389 diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 6b85a88c3..5d650a8a6 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index cc66242e3..a558475c5 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -29,7 +29,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 waitmove 0 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 - pause 50 + delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 compare_var_to_imm 0x8008, 1 @@ -50,7 +50,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 setflag 916 setflag 917 fadescreen 0 - pause 20 + delay 20 call MtPyre_Summit_EventScript_15D57A compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA @@ -201,10 +201,10 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 closebutton move LAST_TALKED, MtPyre_Summit_Movement_1A0841 waitmove 0 - pause 40 + delay 40 move LAST_TALKED, MtPyre_Summit_Movement_1A0839 waitmove 0 - pause 10 + delay 10 .ifdef SAPPHIRE msgbox UnknownString_81B5762, 4 .else @@ -267,7 +267,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 waitmove 0 move 2, MtPyre_Summit_Movement_1A0845 waitmove 0 - pause 50 + delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E compare_var_to_imm 0x8008, 1 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 94836d8c4..eb3f63225 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmaptile 4, 1, 716, 0 setmaptile 5, 1, 717, 1 special DrawWholeMapView - playsfx 20 + playse 20 setvar 0x40ba, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 3407c8a01..4fdf02d15 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -31,7 +31,7 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall setvar 0x4001, 1 setvar 0x4002, 0 - playsfx 21 + playse 21 call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView releaseall @@ -41,7 +41,7 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall setvar 0x4001, 0 setvar 0x4002, 1 - playsfx 21 + playse 21 call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView releaseall @@ -165,9 +165,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - checksound + waitse pokecry SPECIES_VOLTORB, 2 - pause 40 + delay 40 waitpokecry setflag 974 setflag 2145 @@ -180,9 +180,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - checksound + waitse pokecry SPECIES_VOLTORB, 2 - pause 40 + delay 40 waitpokecry setflag 975 setflag 2145 @@ -195,9 +195,9 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C lock faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE - checksound + waitse pokecry SPECIES_VOLTORB, 2 - pause 40 + delay 40 waitpokecry setflag 976 setflag 2145 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index eef21daa7..7cac8011a 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC checkflag 1 goto_if_eq OldaleTown_EventScript_14DE79 setflag 1 - playmusic 420, 0 + playbgm 420, 0 msgbox OldaleTown_Text_16AEF2, 4 closebutton switch FACING @@ -80,7 +80,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 - fadedefault + fadedefaultbgm release end @@ -91,7 +91,7 @@ OldaleTown_EventScript_14DE79:: @ 814DE79 OldaleTown_EventScript_14DE83:: @ 814DE83 msgbox OldaleTown_Text_1A0CC2, 4 - fadedefault + fadedefaultbgm release end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index 07b6150d7..e604a4f33 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -4,7 +4,7 @@ PacifidlogTown_House2_MapScripts:: @ 8154167 PacifidlogTown_House2_EventScript_154168:: @ 8154168 lock faceplayer - checkdailyflags + dodailyevents call PacifidlogTown_House2_EventScript_1541B4 checkflag 299 goto_if_eq PacifidlogTown_House2_EventScript_154254 @@ -13,10 +13,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 checkflag 300 call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 - specialval RESULT, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore compare_var_to_imm RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC - specialval RESULT, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore compare_var_to_imm RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 goto_if 0, PacifidlogTown_House2_EventScript_1A14DC - specialval RESULT, sub_810F908 + specialvar RESULT, sub_810F908 compare_var_to_imm RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -71,7 +71,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialval RESULT, sub_810F908 + specialvar RESULT, sub_810F908 buffernum 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release @@ -80,7 +80,7 @@ PacifidlogTown_House2_EventScript_154254:: @ 8154254 PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer - checksound + waitse pokecry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 waitpokecry @@ -91,7 +91,7 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer - checksound + waitse pokecry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 waitpokecry diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 3a8dc3b1d..e39db3921 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -8,7 +8,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 - specialval RESULT, sub_804D89C + specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare_var_to_imm RESULT, 0 @@ -19,7 +19,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E compare_var_to_imm 0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a - specialval RESULT, sub_804DB2C + specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT compare_var_to_var RESULT, 0x8009 goto_if 5, PacifidlogTown_House3_EventScript_15432A diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index 008c2f800..abbf81dd8 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -4,7 +4,7 @@ PacifidlogTown_House5_MapScripts:: @ 8154393 PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer - specialval RESULT, IsMirageIslandPresent + specialvar RESULT, IsMirageIslandPresent compare_var_to_imm RESULT, 1 goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index f5b683b34..e1e49096a 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - playmusicbattle 420 + savebgm 420 return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -41,7 +41,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 closebutton clearflag 0x4000 setvar 0x4057, 3 - fadedefault + fadedefaultbgm clearflag 0x4001 special LoadPlayerParty setvar 0x4085, 1 @@ -181,8 +181,8 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 move 9, PetalburgCity_Movement_1A0839 waitmove 0 - playmusic 420, 0 - playsfx 21 + playbgm 420, 0 + playse 21 move 9, PetalburgCity_Movement_1A0833 waitmove 0 move 9, PetalburgCity_Movement_1A0835 @@ -213,7 +213,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 closebutton move 9, PetalburgCity_Movement_14B9F4 waitmove 0 - fadedefault + fadedefaultbgm releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e22f02b50..489a3f8fd 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -84,10 +84,10 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C move 255, PetalburgCity_Gym_Movement_1A0845 move 10, PetalburgCity_Gym_Movement_1545B4 waitmove 0 - playsfx 9 + playse 9 disappear 10 setflag 726 - pause 30 + delay 30 move 255, PetalburgCity_Gym_Movement_1A0841 waitmove 0 msgbox PetalburgCity_Gym_Text_17A2A4, 4 @@ -143,7 +143,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 - playsfx 8 + playse 8 compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE compare_var_to_imm 0x8008, 1 @@ -195,7 +195,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 - playmusic 420, 0 + playbgm 420, 0 compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 compare_var_to_imm 0x8008, 1 @@ -363,7 +363,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D end PetalburgCity_Gym_EventScript_154969:: @ 8154969 - specialval RESULT, IsEnigmaBerryValid + specialvar RESULT, IsEnigmaBerryValid compare_var_to_imm RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 @@ -427,7 +427,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C call_if 1, PetalburgCity_Gym_EventScript_154AD2 compare_var_to_imm FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154ADD - pause 70 + delay 70 compare_var_to_imm FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154AE8 compare_var_to_imm FACING, 1 @@ -605,8 +605,8 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 closebutton - pause 30 - warpwalk PetalburgCity_Gym, 255, 32776, 32777 + delay 30 + warpdoor PetalburgCity_Gym, 255, 32776, 32777 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 0884db479..25783cf33 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -27,7 +27,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 lock faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 - specialval RESULT, IsStarterInParty + specialvar RESULT, IsStarterInParty compare_var_to_imm RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index dcf0a27cf..8c90aa09c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -13,7 +13,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 waitmove 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 move 3, PetalburgWoods_Movement_15CEC3 waitmove 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 waitmove 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 move 3, PetalburgWoods_Movement_15CEC3 waitmove 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -271,7 +271,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index d945aadfc..bfbc9f2bd 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playmusic 410, 1 + playbgm 410, 1 msgbox Route101_Text_16D10E, 4 closebutton movesprite 2, 0, 15 diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 6d6b1c2da..70b750aef 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,7 +19,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 328021785..586075465 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 - playmusic 415, 1 + playbgm 415, 1 move 2, Route103_Movement_1A0839 waitmove 0 move 2, Route103_Movement_1A0833 @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 - playmusic 421, 1 + playbgm 421, 1 move 2, Route103_Movement_1A0839 waitmove 0 move 2, Route103_Movement_1A0833 @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C move 2, Route103_Movement_14ED67 waitmove 0 - playsfx 10 + playse 10 move 2, Route103_Movement_14ED6B waitmove 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 move 2, Route103_Movement_14ED71 waitmove 0 - playsfx 10 + playse 10 move 2, Route103_Movement_14ED74 waitmove 0 goto Route103_EventScript_14ED46 @@ -123,8 +123,8 @@ Route103_EventScript_14ED46:: @ 814ED46 setflag 130 setvar 0x40c7, 1 clearflag 979 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end @@ -173,7 +173,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 @@ -186,7 +186,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 @@ -204,7 +204,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8ab1999e6..58a6704bf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 @@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 @@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 751c86825..6428e018b 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -91,7 +91,7 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 waitpokecry diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 097e99357..44fb9a082 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -89,7 +89,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer - checkdailyflags + dodailyevents checkflag 2256 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index e090c4bf2..6103d19ac 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -57,9 +57,9 @@ Route104_Prototype_EventScript_160CF1:: @ 8160CF1 Route104_Prototype_EventScript_160CFB:: @ 8160CFB closebutton - pause 60 + delay 60 fadescreen 1 - pause 60 + delay 60 special DoSoftReset waitstate release diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index a1a13a003..6a0eea00f 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,7 +17,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index c33bb7d19..907ac93a2 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,7 +8,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index d3baeea34..1846cb2ff 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -359,7 +359,7 @@ Route109_EventScript_14F77F:: @ 814F77F Route109_EventScript_14F788:: @ 814F788 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 waitpokecry @@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 @@ -409,7 +409,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 68a2c6613..9fba68693 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914 end Route110_EventScript_14F92F:: @ 814F92F - playmusicbattle 403 @ Bicycle music + savebgm 403 @ Bicycle music return Route110_MapScript2_14F933:: @ 814F933 @@ -131,7 +131,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall - specialval RESULT, GetRecordedCyclingRoadResults + specialvar RESULT, GetRecordedCyclingRoadResults compare_var_to_imm RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 @@ -146,7 +146,7 @@ Route110_EventScript_14FA49:: @ 814FA49 Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer - specialval RESULT, GetPlayerAvatarBike + specialvar RESULT, GetPlayerAvatarBike compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FA84 compare_var_to_imm 0x40a9, 0 @@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 @@ -205,7 +205,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 @@ -223,7 +223,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 @@ -236,7 +236,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 @@ -304,8 +304,8 @@ Route110_EventScript_14FCFB:: @ 814FCFB Route110_EventScript_14FD09:: @ 814FD09 setvar 0x40a9, 3 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm return Route110_EventScript_14FD13:: @ 814FD13 @@ -336,7 +336,7 @@ Route110_EventScript_14FD34:: @ 814FD34 waitmove 0 move 28, Route110_Movement_1A0835 waitmove 0 - pause 30 + delay 30 compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF14 compare_var_to_imm 0x8008, 2 @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playmusic 415, 1 + playbgm 415, 1 return Route110_EventScript_14FDAC:: @ 814FDAC - playmusic 421, 1 + playbgm 421, 1 return Route110_EventScript_14FDB1:: @ 814FDB1 @@ -435,7 +435,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 spritebehave 29, 10 disappear 28 reappear 29 - pause 45 + delay 45 compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF35 compare_var_to_imm 0x8008, 2 @@ -444,8 +444,8 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index daa55dc7f..d98662e78 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -23,7 +23,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall - specialval RESULT, GetPlayerAvatarBike @ player state? + specialvar RESULT, GetPlayerAvatarBike @ player state? compare_var_to_imm RESULT, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 63e8df87c..204ccc64d 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -10,7 +10,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall - specialval RESULT, GetPlayerAvatarBike + specialvar RESULT, GetPlayerAvatarBike compare_var_to_imm RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 7f4ffdddd..e70dcd749 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -158,12 +158,12 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF call_if 1, Route110_TrickHouseEnd_EventScript_161C8A compare_var_to_imm FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_161C95 - pause 30 + delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closebutton move 1, Route110_TrickHouseEnd_Movement_1A0839 waitmove 0 - pause 30 + delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 .ifdef SAPPHIRE @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E move 1, Route110_TrickHouseEnd_Movement_161315 waitmove 0 - playsfx 178 + playse 178 move 1, Route110_TrickHouseEnd_Movement_16131E waitmove 0 disappear 1 @@ -224,20 +224,20 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall spriteface 1, 3 - playsfx 21 + playse 21 move 1, Route110_TrickHouseEnd_Movement_1A0833 waitmove 0 - pause 20 + delay 20 move 1, Route110_TrickHouseEnd_Movement_161CEA waitmove 0 - playsfx 178 + playse 178 move 255, Route110_TrickHouseEnd_Movement_1A0845 waitmove 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 closebutton move 255, Route110_TrickHouseEnd_Movement_161CE8 waitmove 0 - pause 4 + delay 4 spriteface 1, 4 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 28b1eb0de..6a515e6f3 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -212,15 +212,15 @@ Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall - pause 20 + delay 20 compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton - pause 20 + delay 20 move 1, Route110_TrickHouseEntrance_Movement_161315 waitmove 0 - playsfx 178 + playse 178 move 1, Route110_TrickHouseEntrance_Movement_16131E waitmove 0 disappear 1 @@ -243,7 +243,7 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A end Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D - playsfx 21 + playse 21 move 255, Route110_TrickHouseEntrance_Movement_1A0833 waitmove 0 move 255, Route110_TrickHouseEntrance_Movement_1A0835 @@ -336,7 +336,7 @@ Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 closebutton move 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmove 0 - playsfx 21 + playse 21 move 1, Route110_TrickHouseEntrance_Movement_1A0833 waitmove 0 move 1, Route110_TrickHouseEntrance_Movement_1A0835 @@ -469,7 +469,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmove 0 move 1, Route110_TrickHouseEntrance_Movement_161315 waitmove 0 - playsfx 178 + playse 178 move 1, Route110_TrickHouseEntrance_Movement_16131E waitmove 0 disappear 1 @@ -503,7 +503,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD setmaptile 5, 1, 537, 0 special DrawWholeMapView - pause 20 + delay 20 move 255, Route110_TrickHouseEntrance_Movement_1A0856 waitmove 0 move 255, Route110_TrickHouseEntrance_Movement_16165E @@ -605,7 +605,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 compare_var_to_imm 0x40AB, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AB, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -616,7 +616,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 compare_var_to_imm 0x40AC, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AC, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -627,7 +627,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 compare_var_to_imm 0x40AD, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AD, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -638,7 +638,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB compare_var_to_imm 0x40AE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AE, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -649,7 +649,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 compare_var_to_imm 0x40AF, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40AF, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -660,7 +660,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D compare_var_to_imm 0x40B0, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40B0, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -671,7 +671,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 compare_var_to_imm 0x40B1, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40B1, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -682,7 +682,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F compare_var_to_imm 0x40B2, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 - playsfx SE_PIN + playse SE_PIN setvar 0x40B2, 2 setmaptile 13, 1, 523, 0 special DrawWholeMapView @@ -714,7 +714,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - fanfare 370 + playfanfare 370 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waittext @@ -762,5 +762,5 @@ Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 setanimation 2, 32774 doanimation 54 checkanimation 54 - pause 10 + delay 10 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 4102bd9ec..6252a96d6 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -36,7 +36,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall setvar 0x4001, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView releaseall @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall setvar 0x4002, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView releaseall @@ -54,7 +54,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall setvar 0x4003, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView releaseall @@ -63,7 +63,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall setvar 0x4004, 1 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 377791261..705f52455 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -289,7 +289,7 @@ Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF call Route110_TrickHousePuzzle3_EventScript_162612 - playsfx 21 + playse 21 call Route110_TrickHousePuzzle3_EventScript_161F12 goto Route110_TrickHousePuzzle3_EventScript_1626AD end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 67f5bc469..d0ced1ecb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -160,7 +160,7 @@ Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar 0x4001, 1 setvar 0x4008, 1 - playsfx 21 + playse 21 move 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 1, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -182,7 +182,7 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar 0x4002, 1 setvar 0x4008, 2 - playsfx 21 + playse 21 move 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 2, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -204,7 +204,7 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar 0x4003, 1 setvar 0x4008, 3 - playsfx 21 + playse 21 move 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 3, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -226,7 +226,7 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar 0x4004, 1 setvar 0x4008, 4 - playsfx 21 + playse 21 move 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 4, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -248,7 +248,7 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar 0x4005, 1 setvar 0x4008, 5 - playsfx 21 + playse 21 move 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmove 0 move 5, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -388,8 +388,8 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D end Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 - checksound - playsfx 32 + waitse + playse 32 msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 move 1, Route110_TrickHousePuzzle5_Movement_16309F move 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -407,8 +407,8 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 end Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF - checksound - playsfx 31 + waitse + playse 31 goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 5d635e2c5..ae55a4316 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -120,13 +120,13 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall - pause 32 + delay 32 checkflag 194 call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 checkflag 194 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playsfx 36 + playse 36 checkflag 194 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 checkflag 194 @@ -135,13 +135,13 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall - pause 32 + delay 32 checkflag 195 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 checkflag 195 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playsfx 36 + playse 36 checkflag 195 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE checkflag 195 @@ -150,13 +150,13 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall - pause 32 + delay 32 checkflag 196 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB checkflag 196 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playsfx 36 + playse 36 checkflag 196 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 checkflag 196 @@ -165,13 +165,13 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall - pause 32 + delay 32 checkflag 197 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE checkflag 197 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playsfx 36 + playse 36 checkflag 197 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 checkflag 197 @@ -180,13 +180,13 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall - pause 32 + delay 32 checkflag 198 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 checkflag 198 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playsfx 36 + playse 36 checkflag 198 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC checkflag 198 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 7231b427a..fc73716eb 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -59,7 +59,7 @@ Route111_EventScript_150023:: @ 8150023 setflag 963 setflag 964 disappear 34 - pause 30 + delay 30 move 35, Route111_Movement_1500AF waitmove 0 disappear 35 @@ -81,7 +81,7 @@ Route111_EventScript_150069:: @ 8150069 setflag 964 setflag 963 disappear 35 - pause 30 + delay 30 move 34, Route111_Movement_1500AF waitmove 0 disappear 34 @@ -120,7 +120,7 @@ Route111_Movement_1500AF:: @ 81500AF Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer - checkdailyflags + dodailyevents checkflag 2252 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 @@ -222,14 +222,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather 2 - fademusic 360 + fadenewbgm 360 doweather setvar 0x4003, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather 8 - fademusic 409 + fadenewbgm 409 doweather end @@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 @@ -420,7 +420,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 @@ -433,7 +433,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 9a4c85158..70a6a2869 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -38,7 +38,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index ae08ff5bb..06519867e 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -60,7 +60,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 @@ -73,7 +73,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index f83c5cf23..9774a3a5f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -197,8 +197,8 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, 4 closebutton fadescreen 1 - playsfx 5 - pause 30 + playse 5 + delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare_var_to_imm 0x8009, 0 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index d910d3e16..799a115b7 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -4,7 +4,7 @@ Route114_MapScripts:: @ 8150732 Route114_EventScript_150733:: @ 8150733 lock faceplayer - checkdailyflags + dodailyevents checkflag 2251 goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 @@ -46,7 +46,7 @@ Route114_EventScript_1507B9:: @ 81507B9 Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer - checksound + waitse pokecry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 waitpokecry @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 711a62e40..64b0a7497 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -15,7 +15,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 @@ -33,7 +33,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 @@ -46,7 +46,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 838ebe814..c58a3dfb9 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -150,7 +150,7 @@ Route116_EventScript_150B8F:: @ 8150B8F checkitem ITEM_BLACK_GLASSES, 1 compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BCA - specialval RESULT, sub_810F828 + specialvar RESULT, sub_810F828 compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 @@ -166,7 +166,7 @@ Route116_EventScript_150BBB:: @ 8150BBB Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 - specialval RESULT, sub_810F828 + specialvar RESULT, sub_810F828 compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 @@ -180,7 +180,7 @@ Route116_EventScript_150BF4:: @ 8150BF4 end Route116_EventScript_150C03:: @ 8150C03 - pause 20 + delay 20 compare_var_to_imm FACING, 2 call_if 1, Route116_EventScript_150C37 compare_var_to_imm FACING, 1 @@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 @@ -263,7 +263,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 2a27c01d7..6d538a872 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,7 +40,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 @@ -53,7 +53,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 @@ -66,7 +66,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 @@ -79,7 +79,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 @@ -97,7 +97,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 @@ -110,7 +110,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index e1b4fd345..7e6543d7f 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -77,10 +77,10 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playsfx 10 + playse 10 move 19, Route118_Movement_15106D waitmove 0 - pause 30 + delay 30 msgbox Route118_Text_170D66, 4 closebutton compare_var_to_imm 0x8008, 0 @@ -161,7 +161,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 @@ -184,7 +184,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index cae90cd12..9abb8adf9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -56,21 +56,21 @@ Route119_EventScript_1511DB:: @ 81511DB call_if 1, Route119_EventScript_151254 compare_var_to_imm RESULT, 1 call_if 1, Route119_EventScript_151259 - pause 65 + delay 65 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513A6 compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513B1 move 255, Route119_Movement_1A0845 waitmove 0 - pause 30 + delay 30 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 - pause 30 + delay 30 checkgender compare_var_to_imm RESULT, 0 goto_if_eq Route119_EventScript_15125E @@ -80,11 +80,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playmusic 415, 1 + playbgm 415, 1 return Route119_EventScript_151259:: @ 8151259 - playmusic 421, 1 + playbgm 421, 1 return Route119_EventScript_15125E:: @ 815125E @@ -160,15 +160,15 @@ Route119_EventScript_151362:: @ 8151362 call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 - pause 30 + delay 30 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513BC compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 - playmusicbattle 0 - fadedefault + savebgm 0 + fadedefaultbgm releaseall end @@ -296,7 +296,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 @@ -309,7 +309,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index 6395e40eb..ea963dee0 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -8,7 +8,7 @@ Route119_House_EventScript_163DDE:: @ 8163DDE Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 waitpokecry diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index a8fd671bd..54b54dd18 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -40,7 +40,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 closebutton setvar 0x40b3, 1 clearflag 893 - fadedefault + fadedefaultbgm fadescreen 1 setflag 890 disappear 1 @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A countpokemon compare_var_to_imm RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - fanfare 370 + playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waittext diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index e736722b5..2e6ae94e5 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -112,7 +112,7 @@ Route120_EventScript_151735:: @ 8151735 Route120_EventScript_151739:: @ 8151739 lock faceplayer - checkdailyflags + dodailyevents checkflag 2254 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 @@ -120,7 +120,7 @@ Route120_EventScript_151739:: @ 8151739 call_if 1, Route120_EventScript_151841 compare_var_to_imm RESULT, 0 call_if 1, Route120_EventScript_15184A - specialval RESULT, GetPlayerTrainerIdOnesDigit + specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC case 5, Route120_EventScript_1517DC @@ -214,16 +214,16 @@ Route120_EventScript_15189D:: @ 815189D call_if 1, Route120_EventScript_15198A move 31, Route120_Movement_1A083F waitmove 0 - pause 20 + delay 20 msgbox Route120_Text_1719D4, 4 closebutton move 30, Route120_Movement_1A0843 waitmove 0 move 30, Route120_Movement_1A0662 waitmove 0 - checksound + waitse pokecry SPECIES_KECLEON, 2 - pause 40 + delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 @@ -244,10 +244,10 @@ Route120_EventScript_151908:: @ 8151908 closebutton move 31, Route120_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear 31 checkanimation 30 setmaptile 13, 15, 663, 0 @@ -292,7 +292,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 @@ -315,7 +315,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 3af8ff7cf..68c04762f 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -73,7 +73,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 @@ -101,7 +101,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index efc2ab4fb..2fd6e54f6 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 - fanfare 370 + playfanfare 370 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waittext @@ -90,7 +90,7 @@ Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon compare_var_to_imm RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F - specialval RESULT, CheckFreePokemonStorageSpace + specialvar RESULT, CheckFreePokemonStorageSpace compare_var_to_imm RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index f4ba11b0d..6e6cbd506 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -62,7 +62,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 @@ -75,7 +75,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 4c35b52ec..ee7bc80cf 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -9,7 +9,7 @@ Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer - checkdailyflags + dodailyevents checkflag 2253 goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 @@ -39,7 +39,7 @@ Route123_BerryMastersHouse_EventScript_163A5A:: @ 8163A5A Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer - checkdailyflags + dodailyevents checkflag 2257 goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index ef9f0ebed..7d7d38ceb 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,7 +23,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 @@ -46,7 +46,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 @@ -59,7 +59,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 7d5fc0376..c62d49117 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 10bb0a1cc..21927ec0f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -15,7 +15,7 @@ Route128_MapScript2_152135:: @ 8152135 Route128_EventScript_15213F:: @ 815213F lockall - pause 20 + delay 20 .ifndef SAPPHIRE special sub_807E25C waitstate @@ -45,13 +45,13 @@ Route128_EventScript_15213F:: @ 815213F waitmove 0 msgbox Route128_Text_17210B, 4 closebutton - pause 40 + delay 40 move 5, Route128_Movement_152296 move 4, Route128_Movement_152283 waitmove 0 disappear 5 disappear 4 - pause 100 + delay 100 setanimation 0, 1 doanimation 30 checkanimation 30 @@ -76,10 +76,10 @@ Route128_EventScript_15213F:: @ 815213F closebutton move 3, Route128_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear 3 checkanimation 30 setvar 0x407b, 2 @@ -182,7 +182,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 @@ -195,7 +195,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 83b972dbf..3e234667a 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -3,7 +3,7 @@ Route130_MapScripts:: @ 81523C2 .byte 0 Route130_MapScript1_1523C8:: @ 81523C8 - specialval RESULT, IsMirageIslandPresent + specialvar RESULT, IsMirageIslandPresent compare_var_to_imm RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag 17 diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index b1f77fac1..6b4d330d1 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81525B5 .byte 0 Route134_MapScript1_1525BB:: @ 81525BB - warp4 Underwater_Route134, 255, 8, 6 + setdivewarp Underwater_Route134, 255, 8, 6 end Route134_EventScript_1525C4:: @ 81525C4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 1a2afe16d..677838f8a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -333,7 +333,7 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF end RustboroCity_EventScript_14C614:: @ 814C614 - checksound + waitse setvar 0x4001, 4 goto RustboroCity_EventScript_14C77D end @@ -381,7 +381,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 RustboroCity_EventScript_14C691:: @ 814C691 move 9, RustboroCity_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -393,7 +393,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 RustboroCity_EventScript_14C6BD:: @ 814C6BD move 9, RustboroCity_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -405,7 +405,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD RustboroCity_EventScript_14C6E9:: @ 814C6E9 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -417,7 +417,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 RustboroCity_EventScript_14C715:: @ 814C715 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -476,7 +476,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D setflag 144 setflag 732 setvar 0x405a, 5 - pause 30 + delay 30 warp RustboroCity_DevonCorp_3F, 255, 2, 2 waitstate releaseall @@ -489,7 +489,7 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 RustboroCity_EventScript_14C7FE:: @ 814C7FE move 9, RustboroCity_Movement_1A0841 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -501,7 +501,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE RustboroCity_EventScript_14C82A:: @ 814C82A move 9, RustboroCity_Movement_1A0843 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -513,7 +513,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A RustboroCity_EventScript_14C856:: @ 814C856 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -525,7 +525,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 RustboroCity_EventScript_14C882:: @ 814C882 move 9, RustboroCity_Movement_1A0845 waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 @@ -539,7 +539,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 RustboroCity_EventScript_14C8B8:: @ 814C8B8 move 9, RustboroCity_Movement_1A083F waitmove 0 - playsfx 21 + playse 21 move 9, RustboroCity_Movement_1A0833 waitmove 0 move 9, RustboroCity_Movement_1A0835 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 352850d9e..2f3fd5927 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -80,7 +80,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closebutton - playsfx 21 + playse 21 move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmove 0 move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -98,7 +98,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closebutton - playsfx 21 + playse 21 move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmove 0 move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -140,7 +140,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 - fanfare 370 + playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waittext @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar 0x8004, RESULT setvar 0x40c4, 0 setflag 267 - fanfare 370 + playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waittext diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 78feb0ce5..887299933 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -32,25 +32,25 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 closebutton move 2, RustboroCity_DevonCorp_3F_Movement_157815 waitmove 0 - pause 80 + delay 80 move 2, RustboroCity_DevonCorp_3F_Movement_15781E waitmove 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closebutton - playmusic 420, 0 + playbgm 420, 0 move 2, RustboroCity_DevonCorp_3F_Movement_157803 move 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmove 0 msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 closebutton - fadedefault + fadedefaultbgm move 2, RustboroCity_DevonCorp_3F_Movement_157812 move 255, RustboroCity_DevonCorp_3F_Movement_157835 waitmove 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 - fanfare 370 + playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waittext diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index 5aa91d5d1..f22f6cc90 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -8,7 +8,7 @@ RustboroCity_Flat2_1F_EventScript_157D7A:: @ 8157D7A RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 waitpokecry diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 0dd47d2d3..080fc7e18 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -8,7 +8,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 - specialval RESULT, sub_804D89C + specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare_var_to_imm RESULT, 0 @@ -19,7 +19,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D compare_var_to_imm 0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a - specialval RESULT, sub_804DB2C + specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT compare_var_to_var RESULT, 0x8009 goto_if 5, RustboroCity_House1_EventScript_157D05 diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index 0e81ed158..b219563be 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -12,7 +12,7 @@ RustboroCity_House3_EventScript_157DF6:: @ 8157DF6 RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer - checksound + waitse pokecry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 waitpokecry diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index b4546e27a..cfa319bf3 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B return RusturfTunnel_EventScript_15C92D:: @ 815C92D - playsfx 21 + playse 21 move 1, RusturfTunnel_Movement_1A0833 waitmove 0 move 1, RusturfTunnel_Movement_1A0835 @@ -299,7 +299,7 @@ RusturfTunnel_Movement_15C9D3:: @ 815C9D3 RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 waitpokecry @@ -309,7 +309,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 @@ -319,7 +319,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA move 6, RusturfTunnel_Movement_15CAA2 waitmove 0 disappear 6 - pause 50 + delay 50 reappear 5 move 5, RusturfTunnel_Movement_15CAAC waitmove 0 @@ -331,7 +331,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA waitmove 0 message RusturfTunnel_Text_19434F waittext - checksound + waitse pokecry SPECIES_WINGULL, 0 waitbutton waitpokecry diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index da9d31cca..9f86473be 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar 0x40b4, 2 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_199007, 4 releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar 0x40b4, 6 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar 0x40b4, 7 - playsfx 73 + playse 73 msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar 0x40b4, 4 - playsfx 73 + playse 73 msgbox SSTidalRooms_Text_1990F8, 4 return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar 0x40b4, 3 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar 0x40b4, 8 lockall - playsfx 73 + playse 73 msgbox SSTidalCorridor_Text_1990B4, 4 releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar 0x40b4, 8 - playsfx 73 + playse 73 msgbox SSTidalRooms_Text_1990B4, 4 return @@ -87,7 +87,7 @@ SSTidalCorridor_EventScript_15FD96:: @ 815FD96 SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer - checksound + waitse pokecry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 waitpokecry diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 8cc342f88..f1c37be5b 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -94,7 +94,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F SafariZone_Southeast_EventScript_160139:: @ 8160139 setvar 0x40a4, 1 special ExitSafariMode - warpwalk Route121_SafariZoneEntrance, 255, 2, 5 + warpdoor Route121_SafariZoneEntrance, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index 0bf99d2ad..787ac6605 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,6 +3,6 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A .byte 0 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 - warp4 Underwater_SeafloorCavern, 255, 6, 5 + setdivewarp Underwater_SeafloorCavern, 255, 6, 5 warp6 Underwater_SeafloorCavern, 255, 6, 5 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 71184346f..fe13664d9 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 0 .endif - playsfx 209 + playse 209 setanimation 0, 16 setanimation 1, 42 setanimation 2, 0 @@ -89,17 +89,17 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 1 .endif - fanfare 388 - playsfx 107 + playfanfare 388 + playse 107 special sub_80818A4 move 0x8004, SeafloorCavern_Room9_Movement_1A0841 move 255, SeafloorCavern_Room9_Movement_1A0841 waitmove 0 - pause 150 + delay 150 disappear 7 reappear 1 waitstate - pause 60 + delay 60 move 1, SeafloorCavern_Room9_Movement_15DD4C waitmove 0 special sub_80818FC @@ -111,12 +111,12 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA move 1, SeafloorCavern_Room9_Movement_15DD57 waitmove 0 disappear 1 - pause 4 + delay 4 setvar 0x8004, 2 setvar 0x8005, 2 special sub_810F758 waitstate - pause 30 + delay 30 setvar 0x8004, 2 setvar 0x8005, 3 setvar 0x8006, 4 @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, 4 .endif - playsfx 2 + playse 2 move 255, SeafloorCavern_Room9_Movement_1A083F waitmove 0 .ifdef SAPPHIRE @@ -143,8 +143,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4B11, 4 .endif closebutton - playsfx 3 - pause 20 + playse 3 + delay 20 move 0x8004, SeafloorCavern_Room9_Movement_1A0845 waitmove 0 .ifdef SAPPHIRE @@ -167,7 +167,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif - playsfx 21 + playse 21 move 0x8004, SeafloorCavern_Room9_Movement_1A0833 waitmove 0 move 0x8004, SeafloorCavern_Room9_Movement_1A0835 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 2650f4ab5..929b4d0ca 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -8,29 +8,29 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 hidebox 0, 0, 29, 19 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 - specialval RESULT, CheckRelicanthWailord + specialvar RESULT, CheckRelicanthWailord compare_var_to_imm RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 - fadeout 0 - playsfx 49 + fadeoutbgm 0 + playse 49 special DoSealedChamberShakingEffect1 waitstate - pause 40 + delay 40 special DoSealedChamberShakingEffect2 waitstate - playsfx 8 - pause 40 + playse 8 + delay 40 special DoSealedChamberShakingEffect2 waitstate - playsfx 8 - pause 40 + playse 8 + delay 40 special DoSealedChamberShakingEffect2 waitstate - playsfx 8 - pause 40 + playse 8 + delay 40 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closebutton - fadein 0 + fadeinbgm 0 setflag 228 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index dfa4777fa..091c0e8a4 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,7 +5,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 .byte 0 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 - warp4 Underwater_SealedChamber, 255, 12, 44 + setdivewarp Underwater_SealedChamber, 255, 12, 44 warp6 Underwater_SealedChamber, 255, 12, 44 end diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index bad7397c0..e51817e27 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -19,7 +19,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072 ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer - checkdailyflags + dodailyevents checkflag 2143 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 62cb389f2..3b3585bf8 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -6,5 +6,5 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 tileeffect 7 - warp5 SkyPillar_1F, 255, 0, 0 + setholewarp SkyPillar_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 5e1f7f4e6..3d535a25a 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -6,5 +6,5 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 tileeffect 7 - warp5 SkyPillar_3F, 255, 0, 0 + setholewarp SkyPillar_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index e41d579c0..9a8a57e3f 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -15,9 +15,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 lock faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE - checksound + waitse pokecry SPECIES_RAYQUAZA, 2 - pause 40 + delay 40 waitpokecry setflag 773 setflag 2145 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index c43ddfaee..69bd90d75 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -66,14 +66,14 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 faceplayer bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 - specialval RESULT, LeadMonHasEffortRibbon + specialvar RESULT, LeadMonHasEffortRibbon compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_EventScript_14BB35 - specialval RESULT, ScrSpecial_AreLeadMonEVsMaxedOut + specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare_var_to_imm RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 - fanfare 370 + playfanfare 370 message SlateportCity_Text_1646DD waitfanfare waittext @@ -493,10 +493,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC closebutton move 10, SlateportCity_Movement_1A0843 waitmove 0 - pause 10 + delay 10 move 9, SlateportCity_Movement_1A0845 waitmove 0 - pause 25 + delay 25 move 11, SlateportCity_Movement_14C000 move 255, SlateportCity_Movement_14C00E move 10, SlateportCity_Movement_14BFDD @@ -508,7 +508,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC move 11, SlateportCity_Movement_1A0841 waitmove 0 msgbox SlateportCity_Text_1655E7, 4 - playmusic BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, 0 msgbox SlateportCity_Text_1656BC, 4 move 6, SlateportCity_Movement_1A083F move 1, SlateportCity_Movement_1A083F @@ -519,7 +519,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC move 11, SlateportCity_Movement_1A0845 waitmove 0 msgbox SlateportCity_Text_16578F, 4 - playsfx 21 + playse 21 move 11, SlateportCity_Movement_1A0833 waitmove 0 move 11, SlateportCity_Movement_1A0835 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index b541fb0e8..0f2d03a5a 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -22,17 +22,17 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall move 1, SlateportCity_ContestLobby_Movement_1554CC waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, SlateportCity_ContestLobby_Movement_1554CF waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, SlateportCity_ContestLobby_Movement_1554DC waitmove 0 move 255, SlateportCity_ContestLobby_Movement_1554CA diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index be1504415..802906f25 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -16,7 +16,7 @@ SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 - playmusicbattle BGM_EVIL_TEAM + savebgm BGM_EVIL_TEAM movespriteperm 4, 12, 13 spritebehave 4, 9 setflag 905 @@ -221,13 +221,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 closebutton move LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmove 0 - pause 30 + delay 30 spriteinvisible LAST_TALKED, 9, 8 compare_var_to_imm FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare_var_to_imm FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 - pause 30 + delay 30 spriteinvisible 255, 0, 0 setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 731b3385b..e932a58ab 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -27,14 +27,14 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF end SlateportCity_House1_EventScript_1556C9:: @ 81556C9 - specialval RESULT, ScriptGetPartyMonSpecies + specialvar RESULT, ScriptGetPartyMonSpecies compare_var_to_imm RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialval RESULT, sub_810F96C + specialvar RESULT, sub_810F96C special sub_80BFAE0 compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 @@ -58,7 +58,7 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialval RESULT, sub_80BF9B4 + specialvar RESULT, sub_80BF9B4 special sub_80BFAE0 compare_var_to_imm RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index e8f6d45ac..0c75b2b9d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -157,8 +157,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C31:: @ 8155C31 SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A lock faceplayer - pause 8 - playsfx 21 + delay 8 + playse 21 move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 waitmove 0 move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 @@ -180,7 +180,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 move 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmove 0 setflag 965 - playsfx 9 + playse 9 disappear 13 release end @@ -189,7 +189,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD move 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmove 0 setflag 965 - playsfx 9 + playse 9 disappear 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 3a08fcc2a..709d3f1d6 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closebutton - playmusic BGM_EVIL_TEAM, 1 + playbgm BGM_EVIL_TEAM, 1 reappear 3 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmove 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmove 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 - playmusicbattle 0 + savebgm 0 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 move 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmove 0 @@ -54,7 +54,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmove 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 closebutton - pause 35 + delay 35 reappear 2 move 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 move 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE @@ -73,7 +73,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 disappear 3 disappear 4 fadescreen 0 - pause 30 + delay 30 setflag 883 move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmove 0 @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closebutton move 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmove 0 - playsfx 9 + playse 9 disappear 1 setflag 900 setflag 149 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 4a7fc8474..80ee23d43 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -144,7 +144,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 end SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 - specialval RESULT, CheckLeadMonCool + specialvar RESULT, CheckLeadMonCool compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -154,7 +154,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 - specialval RESULT, CheckLeadMonBeauty + specialvar RESULT, CheckLeadMonBeauty compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -164,7 +164,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 - specialval RESULT, CheckLeadMonCute + specialvar RESULT, CheckLeadMonCute compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -174,7 +174,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 - specialval RESULT, CheckLeadMonSmart + specialvar RESULT, CheckLeadMonSmart compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -184,7 +184,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE - specialval RESULT, CheckLeadMonTough + specialvar RESULT, CheckLeadMonTough compare_var_to_imm RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -199,14 +199,14 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 checkflag 278 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 - specialval RESULT, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore compare_var_to_imm RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A - playsfx 21 + playse 21 move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 waitmove 0 move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 @@ -235,7 +235,7 @@ SlateportCity_PokemonFanClub_EventScript_155A88:: @ 8155A88 SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer - checksound + waitse pokecry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 waitpokecry @@ -245,7 +245,7 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer - checksound + waitse pokecry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 waitpokecry @@ -255,7 +255,7 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer - checksound + waitse pokecry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 waitpokecry diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 44ee245fd..14bece069 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -62,7 +62,7 @@ SootopolisCity_EventScript_14D159:: @ 814D159 return SootopolisCity_MapScript1_14D165:: @ 814D165 - warp4 Underwater_SootopolisCity, 255, 9, 6 + setdivewarp Underwater_SootopolisCity, 255, 9, 6 end SootopolisCity_EventScript_14D16E:: @ 814D16E @@ -90,7 +90,7 @@ SootopolisCity_EventScript_14D196:: @ 814D196 SootopolisCity_EventScript_14D19F:: @ 814D19F lock faceplayer - checkdailyflags + dodailyevents special GetPlayerBigGuyGirlString checkflag 2258 goto_if_eq SootopolisCity_EventScript_14D241 @@ -216,7 +216,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 move 10, SootopolisCity_Movement_1A083F move 255, SootopolisCity_Movement_1A0843 waitmove 0 - playsfx 21 + playse 21 move 10, SootopolisCity_Movement_1A0833 waitmove 0 move 10, SootopolisCity_Movement_1A0835 @@ -237,7 +237,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169E82, 4 .endif - playsfx 21 + playse 21 move 5, SootopolisCity_Movement_1A0833 waitmove 0 move 5, SootopolisCity_Movement_1A0835 @@ -248,7 +248,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 msgbox SootopolisCity_Text_169F3C, 4 .endif closebutton - pause 30 + delay 30 move 5, SootopolisCity_Movement_14D46A move 10, SootopolisCity_Movement_14D41D move 255, SootopolisCity_Movement_14D445 @@ -256,7 +256,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 move 5, SootopolisCity_Movement_1A0843 move 255, SootopolisCity_Movement_1A0843 waitmove 0 - pause 30 + delay 30 move 10, SootopolisCity_Movement_1A0845 waitmove 0 .ifdef SAPPHIRE @@ -265,7 +265,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 msgbox SootopolisCity_Text_169F6B, 4 .endif closebutton - pause 30 + delay 30 move 5, SootopolisCity_Movement_14D47C move 255, SootopolisCity_Movement_14D457 move 10, SootopolisCity_Movement_14D42D @@ -460,10 +460,10 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD closebutton move LAST_TALKED, SootopolisCity_Movement_1A0845 waitmove 0 - pause 50 + delay 50 setanimation 0, 1 doanimation 30 - pause 15 + delay 15 disappear LAST_TALKED checkanimation 30 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 39bc2d4db..1df729aad 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -48,35 +48,35 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar 0x4022, 1 - pause 40 - playsfx 40 + delay 40 + playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar 0x4022, 1 - pause 40 - playsfx 40 + delay 40 + playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar 0x4022, 1 - pause 40 - playsfx 40 + delay 40 + playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 lockall - pause 20 + delay 20 move 255, SootopolisCity_Gym_1F_Movement_15AFFD waitmove 0 - playsfx 43 - pause 60 + playse 43 + delay 60 warphole SootopolisCity_Gym_B1F waitstate end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index e01a00d97..ccfec8036 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -21,7 +21,7 @@ SootopolisCity_House1_EventScript_15B2C7:: @ 815B2C7 SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer - checksound + waitse pokecry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 waitpokecry diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index ee3bfe61b..ac9a641d6 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -12,7 +12,7 @@ SootopolisCity_House4_EventScript_15B356:: @ 815B356 SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer - checksound + waitse pokecry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 waitpokecry diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 72a11a88b..2965b6748 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -16,7 +16,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 closebutton move LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmove 0 - pause 30 + delay 30 spriteinvisible 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 368e26794..e50b29d76 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -52,17 +52,17 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 special SpawnCameraDummy move 127, SouthernIsland_Interior_Movement_160C12 waitmove 0 - pause 50 - checksound + delay 50 + waitse pokecry SPECIES_LATIAS_OR_LATIOS, 0 - pause 30 + delay 30 waitpokecry reappear 2 - pause 30 + delay 30 move 127, SouthernIsland_Interior_Movement_160C16 move 2, SouthernIsland_Interior_Movement_160C22 waitmove 0 - pause 50 + delay 50 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index ee79f9799..bbe7e1ce2 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,5 +3,5 @@ Underwater_Route134_MapScripts:: @ 815F071 .byte 0 Underwater_Route134_MapScript1_15F077:: @ 815F077 - warp4 Route134, 255, 60, 31 + setdivewarp Route134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 8ef61d0f0..3d2fe81b2 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 - warp4 SeafloorCavern_Entrance, 255, 10, 17 + setdivewarp SeafloorCavern_Entrance, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index cbb45993a..6d263690d 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 - warp4 Route134, 255, 60, 31 + setdivewarp Route134, 255, 60, 31 end Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF - warp4 SealedChamber_OuterRoom, 255, 10, 19 + setdivewarp SealedChamber_OuterRoom, 255, 10, 19 end Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index 624c2c83e..c9405dfd7 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,5 +3,5 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 .byte 0 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA - warp4 SootopolisCity, 255, 29, 53 + setdivewarp SootopolisCity, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index fee3b1498..0bf09e41e 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - playmusicbattle 393 + savebgm 393 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - playmusicbattle 394 + savebgm 394 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - playmusicbattle 395 + savebgm 395 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - playmusicbattle 396 + savebgm 396 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - playmusicbattle 440 + savebgm 440 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 2443b01b0..e3aa13eb2 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -22,17 +22,17 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall move 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView move 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmove 0 - playsfx 71 + playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView - pause 20 + delay 20 move 1, VerdanturfTown_ContestLobby_Movement_153E35 waitmove 0 move 255, VerdanturfTown_ContestLobby_Movement_153E23 diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 5453fb42c..0dcad8f62 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -5,7 +5,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_154030:: @ 8154030 lock faceplayer msgbox VerdanturfTown_FriendshipRatersHouse_Text_178A9C, 4 - specialval RESULT, GetLeadMonFriendshipScore + specialvar RESULT, GetLeadMonFriendshipScore switch RESULT case 0, VerdanturfTown_FriendshipRatersHouse_EventScript_154093 case 1, VerdanturfTown_FriendshipRatersHouse_EventScript_15409D @@ -55,7 +55,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540CF:: @ 81540CF VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer - checksound + waitse pokecry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 waitpokecry diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 95b82f46a..78c246eb0 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -93,7 +93,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 - specialval RESULT, sub_8082C68 + specialvar RESULT, sub_8082C68 compare_var_to_imm RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 -- cgit v1.2.3 From 598756eaa47b523bd557a619e05cb23399ac02e5 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 24 Sep 2017 17:57:54 -0500 Subject: more script command renaming --- data/scripts/maps/AquaHideout_B2F.inc | 34 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 28 +-- data/scripts/maps/BattleTower_Corridor.inc | 12 +- data/scripts/maps/BattleTower_Elevator.inc | 12 +- data/scripts/maps/BattleTower_Lobby.inc | 12 +- data/scripts/maps/BattleTower_Outside.inc | 4 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 +- data/scripts/maps/DewfordTown.inc | 40 ++-- data/scripts/maps/DewfordTown_Hall.inc | 32 +-- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 72 +++---- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 30 +-- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 22 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 22 +- data/scripts/maps/FallarborTown_House2.inc | 4 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 8 +- data/scripts/maps/FortreeCity.inc | 8 +- data/scripts/maps/FortreeCity_House4.inc | 16 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 8 +- data/scripts/maps/LavaridgeTown.inc | 34 +-- data/scripts/maps/LilycoveCity.inc | 12 +- data/scripts/maps/LilycoveCity_ContestHall.inc | 112 +++++----- data/scripts/maps/LilycoveCity_ContestLobby.inc | 100 ++++----- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 46 ++--- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 8 +- data/scripts/maps/LilycoveCity_Harbor.inc | 24 +-- data/scripts/maps/LilycoveCity_House3.inc | 12 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 22 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 30 +-- .../maps/LilycoveCity_MoveDeletersHouse.inc | 4 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 26 +-- data/scripts/maps/LittlerootTown.inc | 230 ++++++++++----------- .../maps/LittlerootTown_BrendansHouse_1F.inc | 24 +-- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 24 +-- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 48 ++--- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 12 +- data/scripts/maps/MauvilleCity.inc | 88 ++++---- data/scripts/maps/MauvilleCity_GameCorner.inc | 4 +- data/scripts/maps/MauvilleCity_House2.inc | 8 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 82 ++++---- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 30 +-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 8 +- data/scripts/maps/MossdeepCity_Gym.inc | 32 +-- data/scripts/maps/MossdeepCity_House2.inc | 8 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 8 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 20 +- data/scripts/maps/MtChimney_CableCarStation.inc | 12 +- data/scripts/maps/MtPyre_Summit.inc | 76 +++---- data/scripts/maps/NewMauville_Entrance.inc | 4 +- data/scripts/maps/OldaleTown.inc | 64 +++--- data/scripts/maps/PetalburgCity.inc | 88 ++++---- data/scripts/maps/PetalburgCity_Gym.inc | 142 ++++++------- data/scripts/maps/PetalburgWoods.inc | 84 ++++---- data/scripts/maps/Route101.inc | 44 ++-- data/scripts/maps/Route103.inc | 40 ++-- data/scripts/maps/Route104.inc | 26 +-- data/scripts/maps/Route109.inc | 42 ++-- data/scripts/maps/Route110.inc | 56 ++--- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 44 ++-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 64 +++--- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 192 ++++++++--------- data/scripts/maps/Route111.inc | 80 +++---- .../maps/Route111_WinstrateFamilysHouse.inc | 4 +- data/scripts/maps/Route112_CableCarStation.inc | 12 +- data/scripts/maps/Route116.inc | 22 +- data/scripts/maps/Route118.inc | 36 ++-- data/scripts/maps/Route119.inc | 28 +-- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 30 +-- data/scripts/maps/Route121.inc | 8 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 16 +- data/scripts/maps/Route128.inc | 60 +++--- data/scripts/maps/RustboroCity.inc | 192 ++++++++--------- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 16 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 32 +-- data/scripts/maps/RustboroCity_PokemonSchool.inc | 16 +- data/scripts/maps/RusturfTunnel.inc | 112 +++++----- data/scripts/maps/SafariZone_Southeast.inc | 24 +-- data/scripts/maps/SeafloorCavern_Room9.inc | 76 +++---- data/scripts/maps/SlateportCity.inc | 88 ++++---- data/scripts/maps/SlateportCity_ContestHall.inc | 40 ++-- data/scripts/maps/SlateportCity_ContestLobby.inc | 26 +-- data/scripts/maps/SlateportCity_Harbor.inc | 60 +++--- .../maps/SlateportCity_OceanicMuseum_1F.inc | 32 +-- .../maps/SlateportCity_OceanicMuseum_2F.inc | 74 +++---- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 8 +- .../maps/SlateportCity_SternsShipyard_1F.inc | 28 +-- data/scripts/maps/SootopolisCity.inc | 70 +++---- data/scripts/maps/SootopolisCity_Gym_1F.inc | 4 +- data/scripts/maps/SouthernIsland_Exterior.inc | 12 +- data/scripts/maps/SouthernIsland_Interior.inc | 10 +- data/scripts/maps/VerdanturfTown.inc | 8 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 22 +- data/scripts/maps/VictoryRoad_1F.inc | 16 +- 97 files changed, 1844 insertions(+), 1844 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 9ed2d102c..b08a68d1b 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -11,14 +11,14 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar 0x8008, 1 playse 21 - move 0x8008, AquaHideout_B2F_Movement_1A0833 - waitmove 0 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0833 + waitmovement 0 .ifdef SAPPHIRE - move 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 .else - move 0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 .endif - waitmove 0 + waitmovement 0 setvar 0x4001, 1 releaseall end @@ -38,31 +38,31 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD setvar 0x8009, 3 .endif .ifdef SAPPHIRE - move 0x8008, Movement_1A083F + applymovement 0x8008, Movement_1A083F .else - move 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 .endif - waitmove 0 + waitmovement 0 delay 20 - move 0x8008, AquaHideout_B2F_Movement_1A0839 - waitmove 0 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closebutton .ifdef SAPPHIRE - move 0x8008, Movement_1A083F + applymovement 0x8008, Movement_1A083F .else - move 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - move 0x8009, AquaHideout_B2F_Movement_15D958 + applymovement 0x8009, AquaHideout_B2F_Movement_15D958 .else - move 0x8009, AquaHideout_B2F_Movement_15D95D + applymovement 0x8009, AquaHideout_B2F_Movement_15D95D .endif - waitmove 0 + waitmovement 0 disappear 0x8009 delay 20 - move 0x8008, AquaHideout_B2F_Movement_1A0839 - waitmove 0 + applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag 112 setflag 852 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 60685adad..bbc3360a8 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -8,14 +8,14 @@ BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB setvar 0x4000, 1 - move 255, BattleTower_BattleRoom_Movement_160AB7 - waitmove 0 + applymovement 255, BattleTower_BattleRoom_Movement_160AB7 + waitmovement 0 BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_81347F8 reappear 1 - move 1, BattleTower_BattleRoom_Movement_160AC0 - waitmove 0 + applymovement 1, BattleTower_BattleRoom_Movement_160AC0 + waitmovement 0 special sub_8135474 msgbox 0x20234cc, 4 waittext @@ -43,13 +43,13 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 - move 1, BattleTower_BattleRoom_Movement_160AC6 - waitmove 0 + applymovement 1, BattleTower_BattleRoom_Movement_160AC6 + waitmovement 0 disappear 1 - move 2, BattleTower_BattleRoom_Movement_160ACB - waitmove 0 - move 255, BattleTower_BattleRoom_Movement_160ABC - waitmove 0 + applymovement 2, BattleTower_BattleRoom_Movement_160ACB + waitmovement 0 + applymovement 255, BattleTower_BattleRoom_Movement_160ABC + waitmovement 0 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 special LoadPlayerParty special SavePlayerParty @@ -81,10 +81,10 @@ BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C closebutton - move 255, BattleTower_BattleRoom_Movement_160ABE - waitmove 0 - move 2, BattleTower_BattleRoom_Movement_160AD0 - waitmove 0 + applymovement 255, BattleTower_BattleRoom_Movement_160ABE + waitmovement 0 + applymovement 2, BattleTower_BattleRoom_Movement_160AD0 + waitmovement 0 goto BattleTower_BattleRoom_EventScript_1608FA BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 4b3dae8f8..26570cd66 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -23,15 +23,15 @@ BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 compare_var_to_imm 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 - move 1, BattleTower_Corridor_Movement_1608D5 - move 255, BattleTower_Corridor_Movement_1608D4 - waitmove 0 + applymovement 1, BattleTower_Corridor_Movement_1608D5 + applymovement 255, BattleTower_Corridor_Movement_1608D4 + waitmovement 0 goto BattleTower_Corridor_EventScript_1608C2 BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 - move 1, BattleTower_Corridor_Movement_1608D2 - move 255, BattleTower_Corridor_Movement_1608D1 - waitmove 0 + applymovement 1, BattleTower_Corridor_Movement_1608D2 + applymovement 255, BattleTower_Corridor_Movement_1608D1 + waitmovement 0 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 setvar 0x4000, 0 diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index 2c9f12a6e..fe55b50db 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -9,15 +9,15 @@ BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 setvar 0x4000, 1 - move 1, BattleTower_Elevator_Movement_160835 - move 255, BattleTower_Elevator_Movement_160839 - waitmove 0 + applymovement 1, BattleTower_Elevator_Movement_160835 + applymovement 255, BattleTower_Elevator_Movement_160839 + waitmovement 0 special sub_810EBEC waitstate delay 64 - move 1, BattleTower_Elevator_Movement_16083D - move 255, BattleTower_Elevator_Movement_160841 - waitmove 0 + applymovement 1, BattleTower_Elevator_Movement_16083D + applymovement 255, BattleTower_Elevator_Movement_160841 + waitmovement 0 setvar 0x4000, 0 warp BattleTower_Corridor, 255, 8, 1 waitstate diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index c4ffe4c32..bd4f4ecd1 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -293,14 +293,14 @@ BattleTower_Lobby_EventScript_160662:: @ 8160662 end BattleTower_Lobby_EventScript_160664:: @ 8160664 - move 1, BattleTower_Lobby_Movement_160693 - move 255, BattleTower_Lobby_Movement_160693 - waitmove 0 + applymovement 1, BattleTower_Lobby_Movement_160693 + applymovement 255, BattleTower_Lobby_Movement_160693 + waitmovement 0 setdooropened 6, 1 doorchange - move 1, BattleTower_Lobby_Movement_160697 - move 255, BattleTower_Lobby_Movement_16069A - waitmove 0 + applymovement 1, BattleTower_Lobby_Movement_160697 + applymovement 255, BattleTower_Lobby_Movement_16069A + waitmovement 0 setdoorclosed 6, 1 doorchange return diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 8ef5dc0ad..2f88db2db 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -64,8 +64,8 @@ BattleTower_Outside_EventScript_160226:: @ 8160226 BattleTower_Outside_EventScript_160232:: @ 8160232 closebutton - move LAST_TALKED, BattleTower_Outside_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 + waitmovement 0 delay 30 spriteinvisible 5, 26, 4 setvar 0x8004, 4 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index aad189887..4d27844a7 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -25,8 +25,8 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 lockall - move 255, CaveOfOrigin_B4F_Movement_1A0841 - waitmove 0 + applymovement 255, CaveOfOrigin_B4F_Movement_1A0841 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4F03, 4 .else @@ -53,8 +53,8 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 waitstate special sub_80818FC waitstate - move 1, CaveOfOrigin_B4F_Movement_15DE7D - waitmove 0 + applymovement 1, CaveOfOrigin_B4F_Movement_15DE7D + waitmovement 0 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 8e442e46f..f8265d1cf 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -120,20 +120,20 @@ DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C spritelevelup 2, 0, 11, 0 spritelevelup 255, 0, 11, 0 - move 2, DewfordTown_Movement_14E40E - waitmove 0 + applymovement 2, DewfordTown_Movement_14E40E + waitmovement 0 disappear 2 - move 255, DewfordTown_Movement_14E402 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E402 + waitmovement 0 spriteinvisible 255, 0, 11 call DewfordTown_EventScript_1A02E7 - move 4, DewfordTown_Movement_14E293 - move 255, DewfordTown_Movement_14E293 - waitmove 0 + applymovement 4, DewfordTown_Movement_14E293 + applymovement 255, DewfordTown_Movement_14E293 + waitmovement 0 spritevisible 255, 0, 19 call DewfordTown_EventScript_1A02EF - move 255, DewfordTown_Movement_14E405 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E405 + waitmovement 0 spritevisible 255, 0, 19 clearflag 739 clearflag 881 @@ -152,25 +152,25 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C spritelevelup 2, 0, 11, 0 spritelevelup 255, 0, 11, 1 - move 2, DewfordTown_Movement_14E40E - waitmove 0 + applymovement 2, DewfordTown_Movement_14E40E + waitmovement 0 disappear 2 - move 255, DewfordTown_Movement_14E402 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E402 + waitmovement 0 spriteinvisible 255, 0, 11 call DewfordTown_EventScript_1A02E7 - move 4, DewfordTown_Movement_14E356 - move 255, DewfordTown_Movement_14E356 - waitmove 0 + applymovement 4, DewfordTown_Movement_14E356 + applymovement 255, DewfordTown_Movement_14E356 + waitmovement 0 call DewfordTown_EventScript_1A02EF spritevisible 255, 0, 24 - move 255, DewfordTown_Movement_14E409 - waitmove 0 + applymovement 255, DewfordTown_Movement_14E409 + waitmovement 0 movespriteperm 2, 21, 26 reappear 2 spritelevelup 2, 0, 24, 0 - move 2, DewfordTown_Movement_14E410 - waitmove 0 + applymovement 2, DewfordTown_Movement_14E410 + waitmovement 0 clearflag 741 reappear 1 clearflag 744 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 39bcb0236..0b19ef92d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -53,8 +53,8 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17570D, 4 closebutton - move 4, DewfordTown_Hall_Movement_1A0841 - waitmove 0 + applymovement 4, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 release end @@ -64,8 +64,8 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326 call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17574C, 4 closebutton - move 5, DewfordTown_Hall_Movement_1A0841 - waitmove 0 + applymovement 5, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 release end @@ -189,8 +189,8 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC return DewfordTown_Hall_EventScript_1534FD:: @ 81534FD - move 8, DewfordTown_Hall_Movement_153599 - waitmove 0 + applymovement 8, DewfordTown_Hall_Movement_153599 + waitmovement 0 compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E compare_var_to_imm 0x8008, 1 @@ -200,16 +200,16 @@ DewfordTown_Hall_EventScript_1534FD:: @ 81534FD DewfordTown_Hall_EventScript_15351E:: @ 815351E compare_var_to_imm FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC - move 255, DewfordTown_Hall_Movement_1A0843 - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A0843 + waitmovement 0 return DewfordTown_Hall_EventScript_153534:: @ 8153534 return DewfordTown_Hall_EventScript_153535:: @ 8153535 - move 7, DewfordTown_Hall_Movement_15359B - waitmove 0 + applymovement 7, DewfordTown_Hall_Movement_15359B + waitmovement 0 compare_var_to_imm 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 compare_var_to_imm 0x8008, 1 @@ -224,20 +224,20 @@ DewfordTown_Hall_EventScript_153556:: @ 8153556 return DewfordTown_Hall_EventScript_15356D:: @ 815356D - move 255, DewfordTown_Hall_Movement_1A0841 - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A0841 + waitmovement 0 return DewfordTown_Hall_EventScript_153578:: @ 8153578 - move 255, DewfordTown_Hall_Movement_1A0845 - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A0845 + waitmovement 0 return DewfordTown_Hall_EventScript_153583:: @ 8153583 compare_var_to_imm FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC - move 255, DewfordTown_Hall_Movement_1A083F - waitmove 0 + applymovement 255, DewfordTown_Hall_Movement_1A083F + waitmovement 0 return DewfordTown_Hall_Movement_153599:: @ 8153599 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 6726686ca..45df01e78 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -22,11 +22,11 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE lockall - move 255, EverGrandeCity_ChampionsRoom_Movement_1A084E - waitmove 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A084E + waitmovement 0 delay 40 - move 255, EverGrandeCity_ChampionsRoom_Movement_15B802 - waitmove 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 + waitmovement 0 setvar 0x4001, 1 goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall @@ -78,10 +78,10 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 delay 40 playse 21 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 - waitmove 0 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191268, 4 goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 @@ -91,10 +91,10 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 delay 40 playse 21 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 - waitmove 0 - move 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 + waitmovement 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 + waitmovement 0 call EverGrandeCity_ChampionsRoom_EventScript_15B9D2 msgbox EverGrandeCity_ChampionsRoom_Text_191305, 4 goto EverGrandeCity_ChampionsRoom_EventScript_15B8F0 @@ -103,29 +103,29 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 closebutton reappear 3 - move 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 - waitmove 0 - move 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 - waitmove 0 + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 + waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_19134D, 4 call EverGrandeCity_ChampionsRoom_EventScript_1A03B0 msgbox EverGrandeCity_ChampionsRoom_Text_1914C6, 4 - move 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0841 + waitmovement 0 delay 20 - move 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 + waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4 closebutton delay 30 - move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB - move 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD - move 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 - move 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD + applymovement 3, EverGrandeCity_ChampionsRoom_Movement_1A0841 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9F8 + waitmovement 0 delay 20 - move 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 - waitmove 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 + waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender compare_var_to_imm RESULT, 0 @@ -133,9 +133,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 compare_var_to_imm RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton - move 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF - move 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 - waitmove 0 + applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 + waitmovement 0 setflag 781 warp EverGrandeCity_HallOfFame, 255, 7, 16 waitstate @@ -151,15 +151,15 @@ EverGrandeCity_ChampionsRoom_EventScript_15B9B4:: @ 815B9B4 return EverGrandeCity_ChampionsRoom_EventScript_15B9BD:: @ 815B9BD - move 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 - waitmove 0 - move 255, EverGrandeCity_ChampionsRoom_Movement_1A083F - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9E6 + waitmovement 0 + applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A083F + waitmovement 0 return EverGrandeCity_ChampionsRoom_EventScript_15B9D2:: @ 815B9D2 - move 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF - waitmove 0 + applymovement 2, EverGrandeCity_ChampionsRoom_Movement_15B9EF + waitmovement 0 return EverGrandeCity_ChampionsRoom_Movement_15B9DD:: @ 815B9DD diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 458796e0c..0bb327fd4 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -17,26 +17,26 @@ EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 lockall - move 1, EverGrandeCity_HallOfFame_Movement_15BC59 - move 255, EverGrandeCity_HallOfFame_Movement_15BC59 - waitmove 0 - move 1, EverGrandeCity_HallOfFame_Movement_1A0843 - move 255, EverGrandeCity_HallOfFame_Movement_1A083F - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC59 + applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC59 + waitmovement 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_191841, 4 closebutton - move 1, EverGrandeCity_HallOfFame_Movement_15BC60 - move 255, EverGrandeCity_HallOfFame_Movement_15BC60 - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60 + applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60 + waitmovement 0 delay 20 - move 1, EverGrandeCity_HallOfFame_Movement_1A0843 - move 255, EverGrandeCity_HallOfFame_Movement_1A083F - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0843 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F + waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4 closebutton - move 1, EverGrandeCity_HallOfFame_Movement_1A0841 - move 255, EverGrandeCity_HallOfFame_Movement_1A0841 - waitmove 0 + applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841 + applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 + waitmovement 0 delay 20 doanimation 62 checkanimation 62 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 04a8b701a..93f9c5fcb 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -60,9 +60,9 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 checkflag 2060 goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closebutton - move 3, EverGrandeCity_PokemonLeague_Movement_15BB7E - move 4, EverGrandeCity_PokemonLeague_Movement_15BB81 - waitmove 0 + applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E + applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 + waitmovement 0 delay 10 playfanfare 369 message EverGrandeCity_PokemonLeague_Text_191804 @@ -76,13 +76,13 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 end EverGrandeCity_PokemonLeague_EventScript_15BB34:: @ 815BB34 - move 255, EverGrandeCity_PokemonLeague_Movement_15BB76 - waitmove 0 + applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB76 + waitmovement 0 return EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F - move 255, EverGrandeCity_PokemonLeague_Movement_15BB7A - waitmove 0 + applymovement 255, EverGrandeCity_PokemonLeague_Movement_15BB7A + waitmovement 0 return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A @@ -92,12 +92,12 @@ EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A end EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 - move LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 + waitmovement 0 msgbox EverGrandeCity_PokemonLeague_Text_191804, 4 closebutton - move LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 7a3a8a7c8..a629acaf9 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -20,28 +20,28 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall - move 1, FallarborTown_ContestLobby_Movement_153A7C - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A7C + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, FallarborTown_ContestLobby_Movement_153A7F - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A7F + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, FallarborTown_ContestLobby_Movement_153A8C - waitmove 0 - move 255, FallarborTown_ContestLobby_Movement_153A7A - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A8C + waitmovement 0 + applymovement 255, FallarborTown_ContestLobby_Movement_153A7A + waitmovement 0 msgbox FallarborTown_ContestLobby_Text_1A6832, 4 closebutton - move 1, FallarborTown_ContestLobby_Movement_153A83 - move 255, FallarborTown_ContestLobby_Movement_153A70 - waitmove 0 + applymovement 1, FallarborTown_ContestLobby_Movement_153A83 + applymovement 255, FallarborTown_ContestLobby_Movement_153A70 + waitmovement 0 releaseall return diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 74674d3df..f25f02da5 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -3,8 +3,8 @@ FallarborTown_House2_MapScripts:: @ 8153C90 FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall - move 1, FallarborTown_House2_Movement_1A0839 - waitmove 0 + applymovement 1, FallarborTown_House2_Movement_1A0839 + waitmovement 0 checkflag 1 goto_if_eq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 320ba0a3a..abe0ac7c6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -34,14 +34,14 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 end FallarborTown_PokemonCenter_1F_EventScript_153B49:: @ 8153B49 - move 4, FallarborTown_PokemonCenter_1F_Movement_153B74 - waitmove 0 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B74 + waitmovement 0 goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 - move 4, FallarborTown_PokemonCenter_1F_Movement_153B81 - waitmove 0 + applymovement 4, FallarborTown_PokemonCenter_1F_Movement_153B81 + waitmovement 0 goto FallarborTown_PokemonCenter_1F_EventScript_153B69 end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 57405986b..c63273d5b 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -73,14 +73,14 @@ FortreeCity_EventScript_14C9CF:: @ 814C9CF FortreeCity_EventScript_14C9E4:: @ 814C9E4 msgbox FortreeCity_Text_1678CB, 4 closebutton - move LAST_TALKED, FortreeCity_Movement_1A0662 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_Movement_1A0662 + waitmovement 0 waitse pokecry SPECIES_KECLEON, 2 delay 40 waitpokecry - move LAST_TALKED, FortreeCity_Movement_14CA13 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_Movement_14CA13 + waitmovement 0 disappear LAST_TALKED setflag 295 release diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index bcf2bcd49..f13b29249 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -17,22 +17,22 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 closebutton setflag 222 clearflag 934 - move 3, FortreeCity_House4_Movement_158218 - waitmove 0 + applymovement 3, FortreeCity_House4_Movement_158218 + waitmovement 0 disappear 3 releaseall end FortreeCity_House4_EventScript_1581C2:: @ 81581C2 - move LAST_TALKED, FortreeCity_House4_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 msgbox FortreeCity_House4_Text_18684E, 4 releaseall end FortreeCity_House4_EventScript_1581D6:: @ 81581D6 - move LAST_TALKED, FortreeCity_House4_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB compare_var_to_imm RESULT, 0 @@ -42,8 +42,8 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 end FortreeCity_House4_EventScript_158204:: @ 8158204 - move LAST_TALKED, FortreeCity_House4_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 + waitmovement 0 msgbox FortreeCity_House4_Text_186924, 4 releaseall end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index ee1c37dae..ed6a1a784 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -28,13 +28,13 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA end GraniteCave_StevensRoom_EventScript_15CC6D:: @ 815CC6D - move 1, GraniteCave_StevensRoom_Movement_15CC8C - waitmove 0 + applymovement 1, GraniteCave_StevensRoom_Movement_15CC8C + waitmovement 0 return GraniteCave_StevensRoom_EventScript_15CC78:: @ 815CC78 - move 1, GraniteCave_StevensRoom_Movement_15CC93 - waitmove 0 + applymovement 1, GraniteCave_StevensRoom_Movement_15CC93 + waitmovement 0 return GraniteCave_StevensRoom_EventScript_15CC83:: @ 815CC83 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e40a9252a..d35fcaae5 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -32,17 +32,17 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED setdooropened 12, 15 doorchange reappear 8 - move 8, LavaridgeTown_Movement_14E70E - waitmove 0 + applymovement 8, LavaridgeTown_Movement_14E70E + waitmovement 0 setdoorclosed 12, 15 doorchange - move 8, LavaridgeTown_Movement_1A083F - waitmove 0 - move 255, LavaridgeTown_Movement_1A0843 - move 8, LavaridgeTown_Movement_1A0833 - waitmove 0 - move 8, LavaridgeTown_Movement_1A0835 - waitmove 0 + applymovement 8, LavaridgeTown_Movement_1A083F + waitmovement 0 + applymovement 255, LavaridgeTown_Movement_1A0843 + applymovement 8, LavaridgeTown_Movement_1A0833 + waitmovement 0 + applymovement 8, LavaridgeTown_Movement_1A0835 + waitmovement 0 checkgender compare_var_to_imm RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B @@ -155,13 +155,13 @@ LavaridgeTown_EventScript_14E68A:: @ 814E68A return LavaridgeTown_EventScript_14E68F:: @ 814E68F - move 8, LavaridgeTown_Movement_14E6E8 - waitmove 0 + applymovement 8, LavaridgeTown_Movement_14E6E8 + waitmovement 0 return LavaridgeTown_EventScript_14E69A:: @ 814E69A - move 7, LavaridgeTown_Movement_14E6EF - waitmove 0 + applymovement 7, LavaridgeTown_Movement_14E6EF + waitmovement 0 return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 @@ -176,13 +176,13 @@ LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 return LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 - move 7, LavaridgeTown_Movement_14E6FA - waitmove 0 + applymovement 7, LavaridgeTown_Movement_14E6FA + waitmovement 0 return LavaridgeTown_EventScript_14E6DD:: @ 814E6DD - move 7, LavaridgeTown_Movement_14E703 - waitmove 0 + applymovement 7, LavaridgeTown_Movement_14E703 + waitmovement 0 return LavaridgeTown_Movement_14E6E8:: @ 814E6E8 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 5b53435d4..b8410429b 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -214,11 +214,11 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5 checkflag 218 goto_if_eq LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 - move LAST_TALKED, LilycoveCity_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_Text_168675, 4 - move LAST_TALKED, LilycoveCity_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Movement_1A083D + waitmovement 0 setflag 218 releaseall end @@ -412,8 +412,8 @@ LilycoveCity_EventScript_14CF62:: @ 814CF62 LilycoveCity_EventScript_14CF6B:: @ 814CF6B closebutton - move LAST_TALKED, LilycoveCity_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 diff --git a/data/scripts/maps/LilycoveCity_ContestHall.inc b/data/scripts/maps/LilycoveCity_ContestHall.inc index 525d57a71..944857a21 100644 --- a/data/scripts/maps/LilycoveCity_ContestHall.inc +++ b/data/scripts/maps/LilycoveCity_ContestHall.inc @@ -22,48 +22,48 @@ LilycoveCity_ContestHall_EventScript_1590B6:: @ 81590B6 LilycoveCity_ContestHall_EventScript_1590BF:: @ 81590BF msgbox LilycoveCity_ContestHall_Text_189301, 2 lockall - move 4, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 4, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1590D4:: @ 81590D4 msgbox LilycoveCity_ContestHall_Text_189366, 2 lockall - move 5, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 5, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1590E9:: @ 81590E9 msgbox LilycoveCity_ContestHall_Text_1893CE, 2 lockall - move 6, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 6, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1590FE:: @ 81590FE msgbox LilycoveCity_ContestHall_Text_189463, 2 lockall - move 7, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 7, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159113:: @ 8159113 msgbox LilycoveCity_ContestHall_Text_189512, 2 lockall - move 8, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 8, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159128:: @ 8159128 msgbox LilycoveCity_ContestHall_Text_18956B, 2 lockall - move 9, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 9, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end @@ -74,154 +74,154 @@ LilycoveCity_ContestHall_EventScript_15913D:: @ 815913D LilycoveCity_ContestHall_EventScript_159146:: @ 8159146 msgbox LilycoveCity_ContestHall_Text_189617, 2 lockall - move 12, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 12, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15915B:: @ 815915B msgbox LilycoveCity_ContestHall_Text_1896BE, 2 lockall - move 22, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 22, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159170:: @ 8159170 msgbox LilycoveCity_ContestHall_Text_1896FE, 2 lockall - move 11, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 11, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159185:: @ 8159185 msgbox LilycoveCity_ContestHall_Text_189771, 2 lockall - move 13, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 13, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15919A:: @ 815919A msgbox LilycoveCity_ContestHall_Text_1897AA, 2 lockall - move 14, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 14, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591AF:: @ 81591AF msgbox LilycoveCity_ContestHall_Text_18980B, 2 lockall - move 15, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 15, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591C4:: @ 81591C4 msgbox LilycoveCity_ContestHall_Text_189874, 2 lockall - move 16, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 16, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591D9:: @ 81591D9 msgbox LilycoveCity_ContestHall_Text_18990A, 2 lockall - move 17, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 17, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1591EE:: @ 81591EE msgbox LilycoveCity_ContestHall_Text_189981, 2 lockall - move 18, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 18, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159203:: @ 8159203 msgbox LilycoveCity_ContestHall_Text_189A1D, 2 lockall - move 19, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 19, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159218:: @ 8159218 msgbox LilycoveCity_ContestHall_Text_189A82, 2 lockall - move 21, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 21, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15922D:: @ 815922D msgbox LilycoveCity_ContestHall_Text_189AE1, 2 lockall - move 20, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 20, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159242:: @ 8159242 msgbox LilycoveCity_ContestHall_Text_189B4E, 2 lockall - move 23, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 23, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159257:: @ 8159257 msgbox LilycoveCity_ContestHall_Text_189BBF, 2 lockall - move 24, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 24, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_15926C:: @ 815926C msgbox LilycoveCity_ContestHall_Text_189C29, 2 lockall - move 25, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 25, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159281:: @ 8159281 msgbox LilycoveCity_ContestHall_Text_189C67, 2 lockall - move 26, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 26, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_159296:: @ 8159296 msgbox LilycoveCity_ContestHall_Text_189CB3, 2 lockall - move 27, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 27, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1592AB:: @ 81592AB msgbox LilycoveCity_ContestHall_Text_189D11, 2 lockall - move 28, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 28, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 lockall - move 29, LilycoveCity_ContestHall_Movement_1A0839 - waitmove 0 + applymovement 29, LilycoveCity_ContestHall_Movement_1A0839 + waitmovement 0 delay 25 - move 29, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 29, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 msgbox LilycoveCity_ContestHall_Text_189DA2, 3 releaseall end @@ -229,16 +229,16 @@ LilycoveCity_ContestHall_EventScript_1592C0:: @ 81592C0 LilycoveCity_ContestHall_EventScript_1592E2:: @ 81592E2 msgbox LilycoveCity_ContestHall_Text_189E5F, 2 lockall - move 31, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 31, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_ContestHall_EventScript_1592F7:: @ 81592F7 msgbox LilycoveCity_ContestHall_Text_189DF3, 2 lockall - move 30, LilycoveCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 30, LilycoveCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 881a842f1..d775fd440 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -21,10 +21,10 @@ LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 lockall reappear 4 - move 4, LilycoveCity_ContestLobby_Movement_158A3B - waitmove 4 - move 255, LilycoveCity_ContestLobby_Movement_158A4C - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B + waitmovement 4 + applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 @@ -46,8 +46,8 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 - move 4, LilycoveCity_ContestLobby_Movement_158A43 - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 + waitmovement 0 disappear 4 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA @@ -60,8 +60,8 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton - move 4, LilycoveCity_ContestLobby_Movement_158A43 - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 + waitmovement 0 setvar 0x4099, 0 disappear 4 releaseall @@ -70,13 +70,13 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 inccounter GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 - move 4, LilycoveCity_ContestLobby_Movement_158A4E - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E + waitmovement 0 playse 21 - move 4, LilycoveCity_ContestLobby_Movement_1A0833 - waitmove 0 - move 4, LilycoveCity_ContestLobby_Movement_158A52 - waitmove 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833 + waitmovement 0 + applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 @@ -196,10 +196,10 @@ LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall reappear 11 - move 11, LilycoveCity_ContestLobby_Movement_158B64 - waitmove 11 - move 255, LilycoveCity_ContestLobby_Movement_158B76 - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B64 + waitmovement 11 + applymovement 255, LilycoveCity_ContestLobby_Movement_158B76 + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 @@ -219,8 +219,8 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE specialvar RESULT, GiveMonArtistRibbon compare_var_to_imm RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 - move 11, LilycoveCity_ContestLobby_Movement_158B6D - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D + waitmovement 0 disappear 11 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA @@ -233,8 +233,8 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton - move 11, LilycoveCity_ContestLobby_Movement_158B6D - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D + waitmovement 0 setvar 0x4099, 0 disappear 11 releaseall @@ -243,13 +243,13 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 inccounter GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 - move 11, LilycoveCity_ContestLobby_Movement_158B78 - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 + waitmovement 0 playse 21 - move 11, LilycoveCity_ContestLobby_Movement_1A0833 - waitmove 0 - move 11, LilycoveCity_ContestLobby_Movement_158B7C - waitmove 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833 + waitmovement 0 + applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 playfanfare 370 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 @@ -494,30 +494,30 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B waittext delay 20 closebutton - move 2, LilycoveCity_ContestLobby_Movement_158E9C - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C + waitmovement 0 playse 71 setmaptile 9, 2, 545, 1 setmaptile 9, 3, 609, 1 special DrawWholeMapView - move 2, LilycoveCity_ContestLobby_Movement_158EA0 - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 + waitmovement 0 playse 71 setmaptile 9, 2, 721, 1 setmaptile 9, 3, 729, 1 special DrawWholeMapView delay 20 - move 2, LilycoveCity_ContestLobby_Movement_158EAE - waitmove 0 - move 255, LilycoveCity_ContestLobby_Movement_158E99 - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 + waitmovement 0 message2 LilycoveCity_ContestLobby_Text_1A6832 waittext delay 20 closebutton - move 2, LilycoveCity_ContestLobby_Movement_158EA4 - move 255, LilycoveCity_ContestLobby_Movement_158E8E - waitmove 0 + applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4 + applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E + waitmovement 0 releaseall return @@ -633,28 +633,28 @@ LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall - move 1, LilycoveCity_ContestLobby_Movement_15900B - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_15900B + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, LilycoveCity_ContestLobby_Movement_15900F - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_15900F + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, LilycoveCity_ContestLobby_Movement_15901C - waitmove 0 - move 255, LilycoveCity_ContestLobby_Movement_159008 - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_15901C + waitmovement 0 + applymovement 255, LilycoveCity_ContestLobby_Movement_159008 + waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_1A6832, 4 closebutton - move 1, LilycoveCity_ContestLobby_Movement_159013 - move 255, LilycoveCity_ContestLobby_Movement_158FFE - waitmove 0 + applymovement 1, LilycoveCity_ContestLobby_Movement_159013 + applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE + waitmovement 0 releaseall return diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index aef4bc74a..f6fb499a3 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -8,53 +8,53 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 checkflag 2061 goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4 closebutton - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CCE, 4 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4 closebutton - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186E57, 4 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4 closebutton - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D + waitmovement 0 releaseall end LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall playse 21 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 - waitmove 0 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 - waitmove 0 - move 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 - waitmove 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 + waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4 closebutton - move 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A - waitmove 0 - move 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C - waitmove 0 + applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A + waitmovement 0 + applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839C + waitmovement 0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 1dd8d5869..fdf1c76e3 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -72,8 +72,8 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 hidebox 0, 0, 29, 19 - move LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 + waitmovement 0 special sub_810EBEC waitstate setflag 2 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 9d22e6055..4ee36a21d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -23,16 +23,16 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E copyvar 0x8008, RESULT special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 - move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 - waitmove 0 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 + waitmovement 0 playse 4 special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 special EndLotteryCornerComputerEffect delay 10 - move 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 - waitmove 0 + applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 0d9e70a15..8998d6268 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -76,8 +76,8 @@ LilycoveCity_Harbor_EventScript_15997E:: @ 815997E LilycoveCity_Harbor_EventScript_15998A:: @ 815998A msgbox LilycoveCity_Harbor_Text_18B4B3, 4 closebutton - move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 13, 10 compare_var_to_imm FACING, 2 @@ -91,13 +91,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A return LilycoveCity_Harbor_EventScript_1599CE:: @ 81599CE - move 255, LilycoveCity_Harbor_Movement_159A86 - waitmove 0 + applymovement 255, LilycoveCity_Harbor_Movement_159A86 + waitmovement 0 return LilycoveCity_Harbor_EventScript_1599D9:: @ 81599D9 - move 255, LilycoveCity_Harbor_Movement_159A89 - waitmove 0 + applymovement 255, LilycoveCity_Harbor_Movement_159A89 + waitmovement 0 return LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 @@ -114,19 +114,19 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closebutton - move LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 13, 10 delay 60 reappear 4 delay 30 - move 4, LilycoveCity_Harbor_Movement_1A0839 - waitmove 0 + applymovement 4, LilycoveCity_Harbor_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_Harbor_Text_1C5120, 4 closebutton - move 4, LilycoveCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement 4, LilycoveCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 disappear 4 compare_var_to_imm FACING, 2 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 62455f547..452c0567f 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -15,16 +15,16 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton - move LAST_TALKED, LilycoveCity_House3_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 release end LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D msgbox LilycoveCity_House3_Text_18B9DC, 4 closebutton - move LAST_TALKED, LilycoveCity_House3_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 release end @@ -33,8 +33,8 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 faceplayer msgbox LilycoveCity_House3_Text_18BD64, 4 closebutton - move LAST_TALKED, LilycoveCity_House3_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 236d48f65..7611b0ef5 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15841C:: @ 815841C LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 lockall - move 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waittext multichoice 20, 8, 16, 1 @@ -36,8 +36,8 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158477:: @ 8158477 LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3 - move 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC - waitmove 0 + applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC + waitmovement 0 disappear 2 switch FACING case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD @@ -47,24 +47,24 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD lockall - move 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 - waitmove 0 + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 + waitmovement 0 warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 waitstate end LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 lockall - move 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE - waitmove 0 + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE + waitmovement 0 warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 waitstate end LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 lockall - move 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 - waitmove 0 + applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 + waitmovement 0 warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 waitstate end @@ -152,8 +152,8 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158585:: @ 8158585 LilycoveCity_LilycoveMuseum_1F_EventScript_15858E:: @ 815858E msgbox LilycoveCity_LilycoveMuseum_1F_Text_187B04, 2 lockall - move 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D - waitmove 0 + applymovement 8, LilycoveCity_LilycoveMuseum_1F_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 663b1f25b..6fb0f07b1 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -67,19 +67,19 @@ LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A lockall - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 - move 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C42, 3 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 - waitmove 0 - move 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187C64, 3 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 - waitmove 0 - move 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + waitmovement 0 + applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3 copyvar 0x4094, 0x1 releaseall @@ -113,16 +113,16 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15872C:: @ 815872C end LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18802F, 4 - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1586D5 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188041, 4 goto LilycoveCity_LilycoveMuseum_2F_EventScript_15875C end LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C - move 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 + applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 01781f3ca..978eb6569 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -3,8 +3,8 @@ LilycoveCity_MoveDeletersHouse_MapScripts:: @ 8159AAD LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE lockall - move 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 - waitmove 0 + applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 + waitmovement 0 msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, 5 switch RESULT case 1, LilycoveCity_MoveDeletersHouse_EventScript_159ADE diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index dba3cf57a..eb1882043 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -9,21 +9,21 @@ LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F lockall - move 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845 - waitmove 0 + applymovement 1, LilycoveCity_PokemonTrainerFanClub_Movement_1A0845 + waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1D6, 4 - move 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 - move 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA - waitmove 0 - move 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843 - waitmove 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159402 + applymovement 2, LilycoveCity_PokemonTrainerFanClub_Movement_1593FA + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A0843 + waitmovement 0 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A1E8, 4 - move 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 - waitmove 0 - move 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F - waitmove 0 - move 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C - waitmove 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_159409 + waitmovement 0 + applymovement 255, LilycoveCity_PokemonTrainerFanClub_Movement_1A083F + waitmovement 0 + applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C + waitmovement 0 setvar 0x4095, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 79b89e157..e3f9b1dc7 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -100,28 +100,28 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 playse 10 - move 255, LittlerootTown_Movement_14D6C0 - waitmove 0 + applymovement 255, LittlerootTown_Movement_14D6C0 + waitmovement 0 setdooropened 0x8004, 0x8005 doorchange reappear 4 - move 4, LittlerootTown_Movement_14D6AC - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6AC + waitmovement 0 setdoorclosed 0x8004, 0x8005 doorchange delay 10 - move 4, LittlerootTown_Movement_14D6AE - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6AE + waitmovement 0 msgbox LittlerootTown_Text_16A7C9, 4 closebutton - move 4, LittlerootTown_Movement_14D6B1 - move 255, LittlerootTown_Movement_14D6B8 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6B1 + applymovement 255, LittlerootTown_Movement_14D6B8 + waitmovement 0 setdooropened 0x8004, 0x8005 doorchange - move 4, LittlerootTown_Movement_14D6B5 - move 255, LittlerootTown_Movement_14D6BD - waitmove 0 + applymovement 4, LittlerootTown_Movement_14D6B5 + applymovement 255, LittlerootTown_Movement_14D6BD + waitmovement 0 setflag 752 setvar 0x4092, 3 spriteinvisible 255, 0, 0 @@ -200,8 +200,8 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF LittlerootTown_EventScript_14D708:: @ 814D708 msgbox LittlerootTown_Text_16AD82, 4 closebutton - move 1, LittlerootTown_Movement_1A083D - waitmove 0 + applymovement 1, LittlerootTown_Movement_1A083D + waitmovement 0 setvar 0x4050, 2 release end @@ -219,20 +219,20 @@ LittlerootTown_EventScript_14D72F:: @ 814D72F LittlerootTown_EventScript_14D739:: @ 814D739 lockall - move 1, LittlerootTown_Movement_14D779 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D779 + waitmovement 0 call LittlerootTown_EventScript_14D755 - move 1, LittlerootTown_Movement_14D789 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D789 + waitmovement 0 releaseall end LittlerootTown_EventScript_14D755:: @ 814D755 msgbox LittlerootTown_Text_16ACEB, 4 closebutton - move 1, LittlerootTown_Movement_14D787 - move 255, LittlerootTown_Movement_14D793 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D787 + applymovement 255, LittlerootTown_Movement_14D793 + waitmovement 0 msgbox LittlerootTown_Text_16AD3C, 4 closebutton return @@ -277,11 +277,11 @@ LittlerootTown_Movement_14D793:: @ 814D793 LittlerootTown_EventScript_14D797:: @ 814D797 lockall - move 1, LittlerootTown_Movement_14D7B3 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D7B3 + waitmovement 0 call LittlerootTown_EventScript_14D755 - move 1, LittlerootTown_Movement_14D7C0 - waitmove 0 + applymovement 1, LittlerootTown_Movement_14D7C0 + waitmovement 0 releaseall end @@ -311,14 +311,14 @@ LittlerootTown_Movement_14D7C0:: @ 814D7C0 LittlerootTown_EventScript_14D7C7:: @ 814D7C7 lockall - move 1, LittlerootTown_Movement_1A0843 - waitmove 0 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 + applymovement 1, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 msgbox LittlerootTown_Text_16AD82, 4 closebutton - move 1, LittlerootTown_Movement_1A083D - waitmove 0 + applymovement 1, LittlerootTown_Movement_1A083D + waitmovement 0 setvar 0x4050, 2 releaseall end @@ -443,13 +443,13 @@ LittlerootTown_EventScript_14D931:: @ 814D931 return LittlerootTown_EventScript_14D93C:: @ 814D93C - move 4, LittlerootTown_Movement_1A0843 - waitmove 0 + applymovement 4, LittlerootTown_Movement_1A0843 + waitmovement 0 return LittlerootTown_EventScript_14D947:: @ 814D947 - move 4, LittlerootTown_Movement_1A083F - waitmove 0 + applymovement 4, LittlerootTown_Movement_1A083F + waitmovement 0 return LittlerootTown_EventScript_14D952:: @ 814D952 @@ -483,73 +483,73 @@ LittlerootTown_EventScript_14D995:: @ 814D995 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 - move 255, LittlerootTown_Movement_1A0845 - waitmove 0 - move 4, LittlerootTown_Movement_14DC76 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0845 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC76 + waitmovement 0 return LittlerootTown_EventScript_14D9ED:: @ 814D9ED - move 255, LittlerootTown_Movement_1A0845 - waitmove 0 - move 4, LittlerootTown_Movement_14DC7D - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0845 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC7D + waitmovement 0 return LittlerootTown_EventScript_14DA02:: @ 814DA02 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC84 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC84 + waitmovement 0 return LittlerootTown_EventScript_14DA17:: @ 814DA17 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC89 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC89 + waitmovement 0 return LittlerootTown_EventScript_14DA2C:: @ 814DA2C - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC8F - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC8F + waitmovement 0 return LittlerootTown_EventScript_14DA41:: @ 814DA41 - move 255, LittlerootTown_Movement_1A083F - waitmove 0 - move 4, LittlerootTown_Movement_14DC92 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A083F + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC92 + waitmovement 0 return LittlerootTown_EventScript_14DA56:: @ 814DA56 - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DC96 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC96 + waitmovement 0 return LittlerootTown_EventScript_14DA6B:: @ 814DA6B - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DC9A - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC9A + waitmovement 0 return LittlerootTown_EventScript_14DA80:: @ 814DA80 - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DC9D - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DC9D + waitmovement 0 return LittlerootTown_EventScript_14DA95:: @ 814DA95 - move 255, LittlerootTown_Movement_1A0843 - waitmove 0 - move 4, LittlerootTown_Movement_14DCA3 - waitmove 0 + applymovement 255, LittlerootTown_Movement_1A0843 + waitmovement 0 + applymovement 4, LittlerootTown_Movement_14DCA3 + waitmovement 0 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA @@ -583,106 +583,106 @@ LittlerootTown_EventScript_14DAED:: @ 814DAED return LittlerootTown_EventScript_14DB30:: @ 814DB30 - move 4, LittlerootTown_Movement_14DCA8 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCA8 + waitmovement 0 return LittlerootTown_EventScript_14DB3B:: @ 814DB3B - move 4, LittlerootTown_Movement_14DCAE - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCAE + waitmovement 0 return LittlerootTown_EventScript_14DB46:: @ 814DB46 - move 4, LittlerootTown_Movement_14DCB4 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCB4 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DB6C:: @ 814DB6C - move 4, LittlerootTown_Movement_14DCBA - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCBA + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DB92:: @ 814DB92 - move 4, LittlerootTown_Movement_14DCC1 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCC1 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 - move 4, LittlerootTown_Movement_14DCC5 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCC5 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DBDE:: @ 814DBDE - move 4, LittlerootTown_Movement_14DCCA - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCCA + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DC04:: @ 814DC04 - move 4, LittlerootTown_Movement_14DCCF - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCCF + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DC2A:: @ 814DC2A - move 4, LittlerootTown_Movement_14DCD3 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCD3 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return LittlerootTown_EventScript_14DC50:: @ 814DC50 - move 4, LittlerootTown_Movement_14DCDA - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCDA + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange @@ -847,12 +847,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 compare_var_to_imm RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 - move 4, LittlerootTown_Movement_1A0841 - waitmove 0 + applymovement 4, LittlerootTown_Movement_1A0841 + waitmovement 0 setdooropened 0x8009, 0x800a doorchange - move 4, LittlerootTown_Movement_14DCE0 - waitmove 0 + applymovement 4, LittlerootTown_Movement_14DCE0 + waitmovement 0 spriteinvisible 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index f0440a49e..7f3f3f5cf 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -62,9 +62,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA lockall msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4 closebutton - move 255, LittlerootTown_BrendansHouse_1F_Movement_152720 - move 1, LittlerootTown_BrendansHouse_1F_Movement_152720 - waitmove 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 + applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 + waitmovement 0 warp LittlerootTown_BrendansHouse_2F, 255, 7, 1 waitstate releaseall @@ -91,13 +91,13 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall playse 21 - move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 - waitmove 0 - move 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 - waitmove 0 - move 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F - move 4, LittlerootTown_BrendansHouse_1F_Movement_152782 - waitmove 0 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_1A083F + applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_152782 + waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 setflag 87 @@ -118,7 +118,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall setvar 0x8004, 1 setvar 0x8005, 0 - move 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F - waitmove 0 + applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 882c5ede3..022e98b2a 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -62,9 +62,9 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 lockall msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4 closebutton - move 255, LittlerootTown_MaysHouse_1F_Movement_15295E - move 1, LittlerootTown_MaysHouse_1F_Movement_15295E - waitmove 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E + applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E + waitmovement 0 warp LittlerootTown_MaysHouse_2F, 255, 1, 1 waitstate releaseall @@ -91,13 +91,13 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall playse 21 - move 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 - waitmove 0 - move 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 - waitmove 0 - move 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 - move 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 - waitmove 0 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 + waitmovement 0 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 + waitmovement 0 + applymovement 255, LittlerootTown_MaysHouse_1F_Movement_1A0843 + applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1529C0 + waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 setflag 87 @@ -165,7 +165,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall setvar 0x8004, 1 setvar 0x8005, 1 - move 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 - waitmove 0 + applymovement 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 + waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index b9dca087f..cf2033919 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -49,12 +49,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 playbgm 415, 1 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton compare_var_to_imm FACING, 4 @@ -66,29 +66,29 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C11 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B34:: @ 8152B34 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C1C + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 playbgm 421, 1 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 - waitmove 0 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 + waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton compare_var_to_imm FACING, 4 @@ -100,18 +100,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C30 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_152C25 + waitmovement 0 return LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 - move LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 + waitmovement 0 checkgender compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 092d50545..d6576be92 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -67,8 +67,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B LittlerootTown_ProfessorBirchsLab_EventScript_152D4A:: @ 8152D4A lockall - move 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B - waitmove 0 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_152D5B + waitmovement 0 goto LittlerootTown_ProfessorBirchsLab_EventScript_152DBA end @@ -119,10 +119,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA msgbox LittlerootTown_ProfessorBirchsLab_Text_17411F, 4 call LittlerootTown_ProfessorBirchsLab_EventScript_152E6D msgbox LittlerootTown_ProfessorBirchsLab_Text_174248, 4 - move 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 - waitmove 0 - move 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 - waitmove 0 + applymovement 3, LittlerootTown_ProfessorBirchsLab_Movement_152E97 + waitmovement 0 + applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 + waitmovement 0 checkgender compare_var_to_imm RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index da0ff3a62..6ebd36749 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -71,16 +71,16 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closebutton - move 7, MauvilleCity_Movement_1A083D - waitmove 0 + applymovement 7, MauvilleCity_Movement_1A083D + waitmovement 0 release end MauvilleCity_EventScript_14C0E4:: @ 814C0E4 msgbox MauvilleCity_Text_165E45, 4 closebutton - move 7, MauvilleCity_Movement_1A083D - waitmove 0 + applymovement 7, MauvilleCity_Movement_1A083D + waitmovement 0 release end @@ -88,18 +88,18 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall checkflag 284 goto_if_eq MauvilleCity_EventScript_14C292 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 msgbox MauvilleCity_Text_165BE3, 4 msgbox MauvilleCity_Text_165C57, 4 msgbox MauvilleCity_Text_165D01, 4 - move 6, MauvilleCity_Movement_1A0839 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 playse 21 - move 6, MauvilleCity_Movement_1A0833 - waitmove 0 - move 6, MauvilleCity_Movement_1A0835 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0833 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0835 + waitmovement 0 msgbox MauvilleCity_Text_165D50, 5 goto MauvilleCity_EventScript_14C154 end @@ -116,40 +116,40 @@ MauvilleCity_EventScript_14C154:: @ 814C154 end MauvilleCity_EventScript_14C187:: @ 814C187 - move 6, MauvilleCity_Movement_14C2AA - move 7, MauvilleCity_Movement_14C2CC - waitmove 0 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2AA + applymovement 7, MauvilleCity_Movement_14C2CC + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 delay 30 - move 7, MauvilleCity_Movement_14C2D8 - waitmove 0 - move 255, MauvilleCity_Movement_1A0845 - waitmove 0 + applymovement 7, MauvilleCity_Movement_14C2D8 + waitmovement 0 + applymovement 255, MauvilleCity_Movement_1A0845 + waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 closebutton - move 6, MauvilleCity_Movement_14C2B6 - move 7, MauvilleCity_Movement_14C2DF - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2B6 + applymovement 7, MauvilleCity_Movement_14C2DF + waitmovement 0 goto MauvilleCity_EventScript_14C22B end MauvilleCity_EventScript_14C1D9:: @ 814C1D9 - move 6, MauvilleCity_Movement_14C2B0 - move 7, MauvilleCity_Movement_14C2D2 - waitmove 0 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2B0 + applymovement 7, MauvilleCity_Movement_14C2D2 + waitmovement 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 delay 30 - move 7, MauvilleCity_Movement_14C2DC - waitmove 0 - move 255, MauvilleCity_Movement_1A0845 - waitmove 0 + applymovement 7, MauvilleCity_Movement_14C2DC + waitmovement 0 + applymovement 255, MauvilleCity_Movement_1A0845 + waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 closebutton - move 6, MauvilleCity_Movement_14C2C1 - move 7, MauvilleCity_Movement_14C2E8 - waitmove 0 + applymovement 6, MauvilleCity_Movement_14C2C1 + applymovement 7, MauvilleCity_Movement_14C2E8 + waitmovement 0 goto MauvilleCity_EventScript_14C22B end @@ -165,14 +165,14 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B MauvilleCity_EventScript_14C23C:: @ 814C23C msgbox MauvilleCity_Text_165F0D, 4 trainerbattle 3, OPPONENT_WALLY_2, 0, MauvilleCity_Text_165F38 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 msgbox MauvilleCity_Text_165F85, 4 - move 6, MauvilleCity_Movement_1A0839 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 msgbox MauvilleCity_Text_165FB3, 4 - move 6, MauvilleCity_Movement_1A0843 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0843 + waitmovement 0 msgbox MauvilleCity_Text_166050, 4 return @@ -183,8 +183,8 @@ MauvilleCity_EventScript_14C285:: @ 814C285 end MauvilleCity_EventScript_14C292:: @ 814C292 - move 6, MauvilleCity_Movement_1A0839 - waitmove 0 + applymovement 6, MauvilleCity_Movement_1A0839 + waitmovement 0 msgbox MauvilleCity_Text_165EE2, 5 goto MauvilleCity_EventScript_14C154 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 63476bb1a..bc49cd481 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -500,8 +500,8 @@ MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 closebutton - move LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 4308fd5ab..3f9ba59f3 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -15,10 +15,10 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 playse 21 - move LAST_TALKED, MauvilleCity_House2_Movement_1A0833 - waitmove 0 - move LAST_TALKED, MauvilleCity_House2_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 + waitmovement 0 msgbox MauvilleCity_House2_Text_1824D8, 5 compare_var_to_imm RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_15731B diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 07e264fa8..8d78d1496 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -8,72 +8,72 @@ MeteorFalls_1F_1R_MapScript1_15C496:: @ 815C496 MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C lockall - move 255, MeteorFalls_1F_1R_Movement_1A0845 - waitmove 0 + applymovement 255, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 delay 30 - move 5, MeteorFalls_1F_1R_Movement_1A0845 - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193237, 4 closebutton - move 5, MeteorFalls_1F_1R_Movement_1A0841 - move 6, MeteorFalls_1F_1R_Movement_1A0841 - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 + applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 + waitmovement 0 playse 21 - move 5, MeteorFalls_1F_1R_Movement_1A0833 - waitmove 0 - move 5, MeteorFalls_1F_1R_Movement_1A0835 - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193268, 4 closebutton - move 5, MeteorFalls_1F_1R_Movement_15C5EE - waitmove 0 + applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1932C5, 4 closebutton - move 255, MeteorFalls_1F_1R_Movement_1A083F - move 5, MeteorFalls_1F_1R_Movement_1A083F - move 6, MeteorFalls_1F_1R_Movement_1A083F - waitmove 0 + applymovement 255, MeteorFalls_1F_1R_Movement_1A083F + applymovement 5, MeteorFalls_1F_1R_Movement_1A083F + applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 reappear 7 reappear 8 reappear 9 - move 7, MeteorFalls_1F_1R_Movement_15C608 - move 8, MeteorFalls_1F_1R_Movement_15C60F - move 9, MeteorFalls_1F_1R_Movement_15C617 - waitmove 0 - move 5, MeteorFalls_1F_1R_Movement_1A083F - move 6, MeteorFalls_1F_1R_Movement_1A083F - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_15C608 + applymovement 8, MeteorFalls_1F_1R_Movement_15C60F + applymovement 9, MeteorFalls_1F_1R_Movement_15C617 + waitmovement 0 + applymovement 5, MeteorFalls_1F_1R_Movement_1A083F + applymovement 6, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193320, 4 closebutton - move 255, MeteorFalls_1F_1R_Movement_15C64F - move 5, MeteorFalls_1F_1R_Movement_15C5F1 - move 6, MeteorFalls_1F_1R_Movement_15C5FC - waitmove 0 + applymovement 255, MeteorFalls_1F_1R_Movement_15C64F + applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 + applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC + waitmovement 0 disappear 5 disappear 6 - move 7, MeteorFalls_1F_1R_Movement_15C628 - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_15C628 + waitmovement 0 .ifdef SAPPHIRE msgbox MeteorFalls_1F_1R_Text_1933EC, 4 .else msgbox MeteorFalls_1F_1R_Text_193584, 4 .endif closebutton - move 8, MeteorFalls_1F_1R_Movement_15C639 - move 9, MeteorFalls_1F_1R_Movement_15C64A - waitmove 0 + applymovement 8, MeteorFalls_1F_1R_Movement_15C639 + applymovement 9, MeteorFalls_1F_1R_Movement_15C64A + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193720, 4 - move 7, MeteorFalls_1F_1R_Movement_1A0845 - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_1A0845 + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193747, 4 - move 7, MeteorFalls_1F_1R_Movement_1A083F - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_1A083F + waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1937AA, 4 closebutton - move 7, MeteorFalls_1F_1R_Movement_15C61F - move 8, MeteorFalls_1F_1R_Movement_15C62E - move 9, MeteorFalls_1F_1R_Movement_15C63E - waitmove 0 + applymovement 7, MeteorFalls_1F_1R_Movement_15C61F + applymovement 8, MeteorFalls_1F_1R_Movement_15C62E + applymovement 9, MeteorFalls_1F_1R_Movement_15C63E + waitmovement 0 disappear 7 disappear 8 disappear 9 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index d01c85ff3..cd5d9840f 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -60,8 +60,8 @@ MossdeepCity_EventScript_14D011:: @ 814D011 lock faceplayer msgbox MossdeepCity_Text_16944E, 4 - move LAST_TALKED, MossdeepCity_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 453b611cc..8d889a7d6 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -42,13 +42,13 @@ MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 lockall - move 255, MossdeepCity_GameCorner_1F_Movement_15AD3D - waitmove 0 - move 1, MossdeepCity_GameCorner_1F_Movement_15AD3F - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AD3D + waitmovement 0 + applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F + waitmovement 0 moveoffscreen 1 - move 255, MossdeepCity_GameCorner_1F_Movement_1A0841 - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 + waitmovement 0 compare_var_to_imm 0x40c0, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 compare_var_to_imm 0x40c0, 2 @@ -136,21 +136,21 @@ MossdeepCity_GameCorner_1F_EventScript_15ADF5:: @ 815ADF5 return MossdeepCity_GameCorner_1F_EventScript_15AE04:: @ 815AE04 - move LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 - move 255, MossdeepCity_GameCorner_1F_Movement_15AE3A - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3A + waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE16:: @ 815AE16 - move LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 - move 255, MossdeepCity_GameCorner_1F_Movement_15AE3E - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE49 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE3E + waitmovement 0 return MossdeepCity_GameCorner_1F_EventScript_15AE28:: @ 815AE28 - move LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 - move 255, MossdeepCity_GameCorner_1F_Movement_15AE42 - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_GameCorner_1F_Movement_15AE46 + applymovement 255, MossdeepCity_GameCorner_1F_Movement_15AE42 + waitmovement 0 return MossdeepCity_GameCorner_1F_Movement_15AE3A:: @ 815AE3A diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index a7ae2f947..29400a80b 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -13,8 +13,8 @@ MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E lockall - move 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 + waitmovement 0 special sub_81360C0 msgbox 0x20234cc, 4 closebutton @@ -30,8 +30,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty - move 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF - waitmove 0 + applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF + waitmovement 0 special LoadPlayerParty setvar 0x4001, 1 warp MossdeepCity_GameCorner_1F, 255, 3, 1 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index de38e8fd0..838b7fd14 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -85,8 +85,8 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA checkflag 100 goto_if_eq MossdeepCity_Gym_EventScript_15A621 setflag 100 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 5, 5, 516, 0 setmaptile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -100,8 +100,8 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619 MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag 100 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 5, 5, 524, 0 setmaptile 2, 7, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -112,8 +112,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 checkflag 101 goto_if_eq MossdeepCity_Gym_EventScript_15A675 setflag 101 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 8, 14, 516, 0 setmaptile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -121,8 +121,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag 101 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 8, 14, 517, 0 setmaptile 8, 10, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -133,8 +133,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A checkflag 102 goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 setflag 102 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 15, 17, 524, 0 setmaptile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -142,8 +142,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag 102 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 15, 17, 516, 0 setmaptile 17, 15, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -154,8 +154,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE checkflag 103 goto_if_eq MossdeepCity_Gym_EventScript_15A71D setflag 103 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 1, 23, 525, 0 setmaptile 5, 24, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 @@ -163,8 +163,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag 103 - move 255, MossdeepCity_Gym_Movement_15A7F7 - waitmove 0 + applymovement 255, MossdeepCity_Gym_Movement_15A7F7 + waitmovement 0 setmaptile 1, 23, 516, 0 setmaptile 5, 24, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index e3485ae0d..660bc2c06 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -28,13 +28,13 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B end MossdeepCity_House2_EventScript_15A8AE:: @ 815A8AE - move 3, MossdeepCity_House2_Movement_15A8C4 - waitmove 0 + applymovement 3, MossdeepCity_House2_Movement_15A8C4 + waitmovement 0 return MossdeepCity_House2_EventScript_15A8B9:: @ 815A8B9 - move 3, MossdeepCity_House2_Movement_15A8CB - waitmove 0 + applymovement 3, MossdeepCity_House2_Movement_15A8CB + waitmovement 0 return MossdeepCity_House2_Movement_15A8C4:: @ 815A8C4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 40ed4f4ef..b328a6784 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -12,8 +12,8 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B compare_var_to_imm RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton - move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + waitmovement 0 release end @@ -57,7 +57,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4 closebutton - move LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index d5004c644..31a9efcea 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -29,15 +29,15 @@ MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall - move 1, MossdeepCity_StevensHouse_Movement_1A083F - waitmove 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F + waitmovement 0 playse 21 - move 1, MossdeepCity_StevensHouse_Movement_1A0833 - waitmove 0 - move 1, MossdeepCity_StevensHouse_Movement_1A0835 - waitmove 0 - move 1, MossdeepCity_StevensHouse_Movement_15AA6E - waitmove 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833 + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835 + waitmovement 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E + waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 giveitem ITEM_HM08 setflag 123 @@ -45,8 +45,8 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closebutton delay 20 - move 1, MossdeepCity_StevensHouse_Movement_15AA76 - waitmove 0 + applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 + waitmovement 0 setvar 0x40c6, 1 releaseall end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index b61097fdc..43dee22b4 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -19,9 +19,9 @@ MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 lockall - move 255, MtChimney_CableCarStation_Movement_15C1B4 - move 1, MtChimney_CableCarStation_Movement_15C1AA - waitmove 0 + applymovement 255, MtChimney_CableCarStation_Movement_15C1B4 + applymovement 1, MtChimney_CableCarStation_Movement_15C1AA + waitmovement 0 setvar 0x40a3, 0 movespriteperm 1, 6, 7 spritebehave 1, 8 @@ -41,9 +41,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C msgbox MtChimney_CableCarStation_Text_1925A9, 4 closebutton - move 1, MtChimney_CableCarStation_Movement_15C1A5 - move 255, MtChimney_CableCarStation_Movement_15C1AF - waitmove 0 + applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 + applymovement 255, MtChimney_CableCarStation_Movement_15C1AF + waitmovement 0 setvar 0x8004, 1 setvar 0x40a3, 2 inccounter GAME_STAT_RODE_CABLE_CAR diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index a558475c5..44d0760df 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -25,10 +25,10 @@ MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 end MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 - move 255, MtPyre_Summit_Movement_1A0841 - waitmove 0 - move 2, MtPyre_Summit_Movement_1A0845 - waitmove 0 + applymovement 255, MtPyre_Summit_Movement_1A0841 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_1A0845 + waitmovement 0 delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 @@ -78,35 +78,35 @@ MtPyre_Summit_EventScript_15D57A:: @ 815D57A return MtPyre_Summit_EventScript_15D593:: @ 815D593 - move 2, MtPyre_Summit_Movement_15D5E9 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D5E9 + waitmovement 0 return MtPyre_Summit_EventScript_15D59E:: @ 815D59E return MtPyre_Summit_EventScript_15D59F:: @ 815D59F - move 2, MtPyre_Summit_Movement_15D5EC - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D5EC + waitmovement 0 return MtPyre_Summit_EventScript_15D5AA:: @ 815D5AA - move 3, MtPyre_Summit_Movement_15D5DF - waitmove 0 - move 255, MtPyre_Summit_Movement_1A0843 - waitmove 0 + applymovement 3, MtPyre_Summit_Movement_15D5DF + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_1A0843 + waitmovement 0 return MtPyre_Summit_EventScript_15D5BF:: @ 815D5BF - move 3, MtPyre_Summit_Movement_15D5E3 - waitmove 0 + applymovement 3, MtPyre_Summit_Movement_15D5E3 + waitmovement 0 return MtPyre_Summit_EventScript_15D5CA:: @ 815D5CA - move 3, MtPyre_Summit_Movement_15D5E5 - waitmove 0 - move 255, MtPyre_Summit_Movement_1A083F - waitmove 0 + applymovement 3, MtPyre_Summit_Movement_15D5E5 + waitmovement 0 + applymovement 255, MtPyre_Summit_Movement_1A083F + waitmovement 0 return MtPyre_Summit_Movement_15D5DF:: @ 815D5DF @@ -199,11 +199,11 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 setvar 0x8004, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closebutton - move LAST_TALKED, MtPyre_Summit_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 + waitmovement 0 delay 40 - move LAST_TALKED, MtPyre_Summit_Movement_1A0839 - waitmove 0 + applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0839 + waitmovement 0 delay 10 .ifdef SAPPHIRE msgbox UnknownString_81B5762, 4 @@ -263,10 +263,10 @@ MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 end MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 - move 255, MtPyre_Summit_Movement_1A0841 - waitmove 0 - move 2, MtPyre_Summit_Movement_1A0845 - waitmove 0 + applymovement 255, MtPyre_Summit_Movement_1A0841 + waitmovement 0 + applymovement 2, MtPyre_Summit_Movement_1A0845 + waitmovement 0 delay 50 compare_var_to_imm 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E @@ -292,33 +292,33 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 end MtPyre_Summit_EventScript_15D75E:: @ 815D75E - move 2, MtPyre_Summit_Movement_15D7A0 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A0 + waitmovement 0 return MtPyre_Summit_EventScript_15D769:: @ 815D769 - move 2, MtPyre_Summit_Movement_15D7A3 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A3 + waitmovement 0 return MtPyre_Summit_EventScript_15D774:: @ 815D774 - move 2, MtPyre_Summit_Movement_15D7A4 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A4 + waitmovement 0 return MtPyre_Summit_EventScript_15D77F:: @ 815D77F - move 2, MtPyre_Summit_Movement_15D7A7 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7A7 + waitmovement 0 return MtPyre_Summit_EventScript_15D78A:: @ 815D78A - move 2, MtPyre_Summit_Movement_15D7B0 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7B0 + waitmovement 0 return MtPyre_Summit_EventScript_15D795:: @ 815D795 - move 2, MtPyre_Summit_Movement_15D7B9 - waitmove 0 + applymovement 2, MtPyre_Summit_Movement_15D7B9 + waitmovement 0 return MtPyre_Summit_Movement_15D7A0:: @ 815D7A0 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index eb3f63225..7eb3769cc 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -23,8 +23,8 @@ NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC lockall - move 255, NewMauville_Entrance_Movement_1A0841 - waitmove 0 + applymovement 255, NewMauville_Entrance_Movement_1A0841 + waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 7cac8011a..0afc63220 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -53,23 +53,23 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC end OldaleTown_EventScript_14DE07:: @ 814DE07 - move 2, OldaleTown_Movement_14DE97 - move 255, OldaleTown_Movement_14DEC1 - waitmove 0 + applymovement 2, OldaleTown_Movement_14DE97 + applymovement 255, OldaleTown_Movement_14DEC1 + waitmovement 0 goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE1E:: @ 814DE1E - move 2, OldaleTown_Movement_14DEA2 - move 255, OldaleTown_Movement_14DECB - waitmove 0 + applymovement 2, OldaleTown_Movement_14DEA2 + applymovement 255, OldaleTown_Movement_14DECB + waitmovement 0 goto OldaleTown_EventScript_14DE4C end OldaleTown_EventScript_14DE35:: @ 814DE35 - move 255, OldaleTown_Movement_14DEB9 - move 2, OldaleTown_Movement_14DE8E - waitmove 0 + applymovement 255, OldaleTown_Movement_14DEB9 + applymovement 2, OldaleTown_Movement_14DE8E + waitmovement 0 goto OldaleTown_EventScript_14DE4C end @@ -199,20 +199,20 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closebutton - move 3, OldaleTown_Movement_1A083D - waitmove 0 + applymovement 3, OldaleTown_Movement_1A083D + waitmovement 0 release end OldaleTown_EventScript_14DEFF:: @ 814DEFF lockall - move 255, OldaleTown_Movement_14DFEC - move 3, OldaleTown_Movement_14DFEF - waitmove 0 + applymovement 255, OldaleTown_Movement_14DFEC + applymovement 3, OldaleTown_Movement_14DFEF + waitmovement 0 msgbox OldaleTown_Text_16B045, 4 closebutton - move 3, OldaleTown_Movement_14DFF5 - waitmove 0 + applymovement 3, OldaleTown_Movement_14DFF5 + waitmovement 0 releaseall end @@ -223,35 +223,35 @@ OldaleTown_EventScript_14DF26:: @ 814DF26 OldaleTown_EventScript_14DF30:: @ 814DF30 lockall - move 4, OldaleTown_Movement_1A0839 - waitmove 0 + applymovement 4, OldaleTown_Movement_1A0839 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF41:: @ 814DF41 lockall - move 4, OldaleTown_Movement_14DFDE - waitmove 0 - move 255, OldaleTown_Movement_1A0843 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFDE + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF5C:: @ 814DF5C lockall - move 4, OldaleTown_Movement_14DFE1 - waitmove 0 - move 255, OldaleTown_Movement_1A0843 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFE1 + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end OldaleTown_EventScript_14DF77:: @ 814DF77 lockall - move 4, OldaleTown_Movement_14DFE3 - waitmove 0 - move 255, OldaleTown_Movement_1A0843 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFE3 + waitmovement 0 + applymovement 255, OldaleTown_Movement_1A0843 + waitmovement 0 goto OldaleTown_EventScript_14DF92 end @@ -275,8 +275,8 @@ OldaleTown_EventScript_14DFB8:: @ 814DFB8 OldaleTown_EventScript_14DFC6:: @ 814DFC6 closebutton - move 4, OldaleTown_Movement_14DFE5 - waitmove 0 + applymovement 4, OldaleTown_Movement_14DFE5 + waitmovement 0 disappear 4 setvar 0x40c7, 2 setflag 979 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index e1e49096a..4dca1fdb8 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -28,15 +28,15 @@ PetalburgCity_EventScript_14B747:: @ 814B747 setflag 0x4000 special SavePlayerParty special PutZigzagoonInPlayerParty - move 2, PetalburgCity_Movement_14B7ED - move 255, PetalburgCity_Movement_14B7CC - waitmove 0 + applymovement 2, PetalburgCity_Movement_14B7ED + applymovement 255, PetalburgCity_Movement_14B7CC + waitmovement 0 msgbox PetalburgCity_Text_16D361, 4 special ScrSpecial_StartWallyTutorialBattle waitstate msgbox PetalburgCity_Text_16D3DE, 4 - movecoords 2, PetalburgCity_Movement_1A083F, 0, 0 - waitmovexy 0, 0, 2 + applymovement 2, PetalburgCity_Movement_1A083F, 0, 0 + waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 closebutton clearflag 0x4000 @@ -55,8 +55,8 @@ PetalburgCity_EventScript_14B7AC:: @ 814B7AC faceplayer msgbox PetalburgCity_Text_164490, 4 closebutton - move 3, PetalburgCity_Movement_1A083D - waitmove 0 + applymovement 3, PetalburgCity_Movement_1A083D + waitmovement 0 release end @@ -179,14 +179,14 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A end PetalburgCity_EventScript_14B866:: @ 814B866 - move 9, PetalburgCity_Movement_1A0839 - waitmove 0 + applymovement 9, PetalburgCity_Movement_1A0839 + waitmovement 0 playbgm 420, 0 playse 21 - move 9, PetalburgCity_Movement_1A0833 - waitmove 0 - move 9, PetalburgCity_Movement_1A0835 - waitmove 0 + applymovement 9, PetalburgCity_Movement_1A0833 + waitmovement 0 + applymovement 9, PetalburgCity_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B91B compare_var_to_imm 0x8008, 1 @@ -206,65 +206,65 @@ PetalburgCity_EventScript_14B866:: @ 814B866 compare_var_to_imm 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 - move 9, PetalburgCity_Movement_1A0843 - move 255, PetalburgCity_Movement_1A0843 - waitmove 0 + applymovement 9, PetalburgCity_Movement_1A0843 + applymovement 255, PetalburgCity_Movement_1A0843 + waitmovement 0 msgbox PetalburgCity_Text_164449, 4 closebutton - move 9, PetalburgCity_Movement_14B9F4 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9F4 + waitmovement 0 fadedefaultbgm releaseall end PetalburgCity_EventScript_14B91B:: @ 814B91B - move 9, PetalburgCity_Movement_14B9B1 - waitmove 0 - move 255, PetalburgCity_Movement_1A0845 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9B1 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0845 + waitmovement 0 return PetalburgCity_EventScript_14B930:: @ 814B930 - move 9, PetalburgCity_Movement_14B9B6 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9B6 + waitmovement 0 return PetalburgCity_EventScript_14B93B:: @ 814B93B - move 9, PetalburgCity_Movement_14B9B9 - waitmove 0 - move 255, PetalburgCity_Movement_1A0841 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9B9 + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0841 + waitmovement 0 return PetalburgCity_EventScript_14B950:: @ 814B950 - move 9, PetalburgCity_Movement_14B9BE - waitmove 0 - move 255, PetalburgCity_Movement_1A0841 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9BE + waitmovement 0 + applymovement 255, PetalburgCity_Movement_1A0841 + waitmovement 0 return PetalburgCity_EventScript_14B965:: @ 814B965 - move 9, PetalburgCity_Movement_14B9C4 - move 255, PetalburgCity_Movement_14BA01 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9C4 + applymovement 255, PetalburgCity_Movement_14BA01 + waitmovement 0 return PetalburgCity_EventScript_14B977:: @ 814B977 - move 9, PetalburgCity_Movement_14B9CF - move 255, PetalburgCity_Movement_14BA0B - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9CF + applymovement 255, PetalburgCity_Movement_14BA0B + waitmovement 0 return PetalburgCity_EventScript_14B989:: @ 814B989 - move 9, PetalburgCity_Movement_14B9DD - move 255, PetalburgCity_Movement_14BA18 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9DD + applymovement 255, PetalburgCity_Movement_14BA18 + waitmovement 0 return PetalburgCity_EventScript_14B99B:: @ 814B99B - move 9, PetalburgCity_Movement_14B9E8 - move 255, PetalburgCity_Movement_14BA22 - waitmove 0 + applymovement 9, PetalburgCity_Movement_14B9E8 + applymovement 255, PetalburgCity_Movement_14BA22 + waitmovement 0 return @ 814B9AD diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 489a3f8fd..f4598403f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -81,15 +81,15 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C msgbox PetalburgCity_Gym_Text_17A196, 4 msgbox PetalburgCity_Gym_Text_17A1B0, 4 closebutton - move 255, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_1545B4 - waitmove 0 + applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_1545B4 + waitmovement 0 playse 9 disappear 10 setflag 726 delay 30 - move 255, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 255, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 msgbox PetalburgCity_Gym_Text_17A2A4, 4 setvar 0x4085, 2 releaseall @@ -218,102 +218,102 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 end PetalburgCity_Gym_EventScript_1547EE:: @ 81547EE - move 1, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_154B27 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B27 + waitmovement 0 return PetalburgCity_Gym_EventScript_154800:: @ 8154800 - move 10, PetalburgCity_Gym_Movement_154B1D - waitmove 0 - move 1, PetalburgCity_Gym_Movement_1A0843 - move 255, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B1D + waitmovement 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 255, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_15481C:: @ 815481C - move 1, PetalburgCity_Gym_Movement_1A0845 - move 255, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_154B27 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 255, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B27 + waitmovement 0 return PetalburgCity_Gym_EventScript_154835:: @ 8154835 - move 1, PetalburgCity_Gym_Movement_1A0845 - move 10, PetalburgCity_Gym_Movement_154B3E - move 255, PetalburgCity_Gym_Movement_154B4D - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 10, PetalburgCity_Gym_Movement_154B3E + applymovement 255, PetalburgCity_Gym_Movement_154B4D + waitmovement 0 return PetalburgCity_Gym_EventScript_15484E:: @ 815484E - move 10, PetalburgCity_Gym_Movement_154B2E - move 255, PetalburgCity_Gym_Movement_154B45 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B2E + applymovement 255, PetalburgCity_Gym_Movement_154B45 + waitmovement 0 return PetalburgCity_Gym_EventScript_154860:: @ 8154860 - move 10, PetalburgCity_Gym_Movement_154B3E - move 255, PetalburgCity_Gym_Movement_154B57 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B3E + applymovement 255, PetalburgCity_Gym_Movement_154B57 + waitmovement 0 return PetalburgCity_Gym_EventScript_154872:: @ 8154872 - move 10, PetalburgCity_Gym_Movement_154B36 - move 255, PetalburgCity_Gym_Movement_154B5F - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_154B36 + applymovement 255, PetalburgCity_Gym_Movement_154B5F + waitmovement 0 return PetalburgCity_Gym_EventScript_154884:: @ 8154884 - move 1, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_15488F:: @ 815488F - move 1, PetalburgCity_Gym_Movement_1A0845 - move 255, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + applymovement 255, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548A1:: @ 81548A1 - move 1, PetalburgCity_Gym_Movement_1A0843 - move 255, PetalburgCity_Gym_Movement_1A083F - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + applymovement 255, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 return PetalburgCity_Gym_EventScript_1548B3:: @ 81548B3 - move 1, PetalburgCity_Gym_Movement_1A083F - move 255, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + applymovement 255, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548C5:: @ 81548C5 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548D0:: @ 81548D0 - move 1, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548DB:: @ 81548DB - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548E6:: @ 81548E6 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548F1:: @ 81548F1 - move 10, PetalburgCity_Gym_Movement_1A0839 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_1A0839 + waitmovement 0 return PetalburgCity_Gym_EventScript_1548FC:: @ 81548FC - move 10, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 10, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_154907:: @ 8154907 @@ -340,8 +340,8 @@ PetalburgCity_Gym_EventScript_15492F:: @ 815492F return PetalburgCity_Gym_EventScript_154930:: @ 8154930 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_15493B:: @ 815493B @@ -441,43 +441,43 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C end PetalburgCity_Gym_EventScript_154ABC:: @ 8154ABC - move 1, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AC7:: @ 8154AC7 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AD2:: @ 8154AD2 - move 1, PetalburgCity_Gym_Movement_1A083F - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 return PetalburgCity_Gym_EventScript_154ADD:: @ 8154ADD - move 1, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AE8:: @ 8154AE8 - move 1, PetalburgCity_Gym_Movement_1A0845 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0845 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AF3:: @ 8154AF3 - move 1, PetalburgCity_Gym_Movement_1A0841 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0841 + waitmovement 0 return PetalburgCity_Gym_EventScript_154AFE:: @ 8154AFE - move 1, PetalburgCity_Gym_Movement_1A0843 - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A0843 + waitmovement 0 return PetalburgCity_Gym_EventScript_154B09:: @ 8154B09 - move 1, PetalburgCity_Gym_Movement_1A083F - waitmove 0 + applymovement 1, PetalburgCity_Gym_Movement_1A083F + waitmovement 0 return @ 8154B14 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 8c90aa09c..8f34eecc6 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -9,74 +9,74 @@ PetalburgWoods_MapScript1_15CCA2:: @ 815CCA2 PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 lockall call PetalburgWoods_EventScript_15CDE6 - move 4, PetalburgWoods_Movement_15CE89 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE89 + waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton playbgm BGM_EVIL_TEAM, 0 - move 3, PetalburgWoods_Movement_15CEC3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEC3 + waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 closebutton - move 3, PetalburgWoods_Movement_15CEB0 - waitmove 0 - move 4, PetalburgWoods_Movement_1A0841 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB0 + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_1A0841 + waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 closebutton - move 4, PetalburgWoods_Movement_15CE9E - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE9E + waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 - move 3, PetalburgWoods_Movement_15CEC8 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEC8 + waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 - move 3, PetalburgWoods_Movement_15CEB3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB3 + waitmovement 0 call PetalburgWoods_EventScript_15CDFA - move 4, PetalburgWoods_Movement_15CE80 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE80 + waitmovement 0 goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CD42:: @ 815CD42 lockall call PetalburgWoods_EventScript_15CDE6 - move 4, PetalburgWoods_Movement_15CE8E - waitmove 0 - move 255, PetalburgWoods_Movement_1A083F - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE8E + waitmovement 0 + applymovement 255, PetalburgWoods_Movement_1A083F + waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closebutton playbgm BGM_EVIL_TEAM, 0 - move 3, PetalburgWoods_Movement_15CEC3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEC3 + waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 closebutton - move 3, PetalburgWoods_Movement_15CEBF - waitmove 0 - move 4, PetalburgWoods_Movement_1A0841 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEBF + waitmovement 0 + applymovement 4, PetalburgWoods_Movement_1A0841 + waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 closebutton - move 4, PetalburgWoods_Movement_15CEA4 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CEA4 + waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 - move 255, PetalburgWoods_Movement_1A0841 - waitmove 0 + applymovement 255, PetalburgWoods_Movement_1A0841 + waitmovement 0 msgbox PetalburgWoods_Text_194EE8, 4 trainerbattle 3, OPPONENT_PETALBURG_WOODS_GRUNT, 0, PetalburgWoods_Text_194F83 - move 3, PetalburgWoods_Movement_15CEB3 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB3 + waitmovement 0 call PetalburgWoods_EventScript_15CDFA - move 4, PetalburgWoods_Movement_15CE95 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE95 + waitmovement 0 goto PetalburgWoods_EventScript_15CE69 end PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 - move 4, PetalburgWoods_Movement_15CE73 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CE73 + waitmovement 0 msgbox PetalburgWoods_Text_194D71, 4 closebutton return @@ -84,11 +84,11 @@ PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 PetalburgWoods_EventScript_15CDFA:: @ 815CDFA msgbox PetalburgWoods_Text_194FA4, 4 closebutton - move 3, PetalburgWoods_Movement_15CEB7 - waitmove 0 + applymovement 3, PetalburgWoods_Movement_15CEB7 + waitmovement 0 disappear 3 - move 255, PetalburgWoods_Movement_1A0845 - waitmove 0 + applymovement 255, PetalburgWoods_Movement_1A0845 + waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL compare_var_to_imm RESULT, 0 @@ -103,8 +103,8 @@ PetalburgWoods_EventScript_15CE3F:: @ 815CE3F PetalburgWoods_EventScript_15CE4D:: @ 815CE4D msgbox PetalburgWoods_Text_19510A, 4 - move 4, PetalburgWoods_Movement_15CEA8 - waitmove 0 + applymovement 4, PetalburgWoods_Movement_15CEA8 + waitmovement 0 msgbox PetalburgWoods_Text_195153, 4 closebutton return diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index bfbc9f2bd..35fbaf744 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -23,18 +23,18 @@ Route101_EventScript_14E948:: @ 814E948 closebutton movesprite 2, 0, 15 movesprite 4, 0, 16 - move 255, Route101_Movement_14EA2C - move 2, Route101_Movement_14EA50 - move 4, Route101_Movement_14EA1F - waitmove 0 - move 4, Route101_Movement_14EA00 - move 2, Route101_Movement_14EA31 - waitmove 0 - move 2, Route101_Movement_1A0843 - waitmove 0 - move 4, Route101_Movement_14EA27 - move 2, Route101_Movement_14EA58 - waitmove 0 + applymovement 255, Route101_Movement_14EA2C + applymovement 2, Route101_Movement_14EA50 + applymovement 4, Route101_Movement_14EA1F + waitmovement 0 + applymovement 4, Route101_Movement_14EA00 + applymovement 2, Route101_Movement_14EA31 + waitmovement 0 + applymovement 2, Route101_Movement_1A0843 + waitmovement 0 + applymovement 4, Route101_Movement_14EA27 + applymovement 2, Route101_Movement_14EA58 + waitmovement 0 msgbox Route101_Text_16D119, 4 closebutton setvar 0x4060, 2 @@ -45,8 +45,8 @@ Route101_EventScript_14E9B8:: @ 814E9B8 lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FA - waitmove 0 + applymovement 255, Route101_Movement_14E9FA + waitmovement 0 releaseall end @@ -54,8 +54,8 @@ Route101_EventScript_14E9CE:: @ 814E9CE lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FC - waitmove 0 + applymovement 255, Route101_Movement_14E9FC + waitmovement 0 releaseall end @@ -63,8 +63,8 @@ Route101_EventScript_14E9E4:: @ 814E9E4 lockall msgbox Route101_Text_16D15E, 4 closebutton - move 255, Route101_Movement_14E9FE - waitmove 0 + applymovement 255, Route101_Movement_14E9FE + waitmovement 0 releaseall end @@ -222,12 +222,12 @@ Route101_EventScript_14EA7F:: @ 814EA7F fadescreen 1 disappear 4 movesprite 255, 6, 13 - move 255, Route101_Movement_1A083F - waitmove 0 + applymovement 255, Route101_Movement_1A083F + waitmovement 0 special ScrSpecial_ChooseStarter waitstate - move 2, Route101_Movement_14EAD7 - waitmove 0 + applymovement 2, Route101_Movement_14EAD7 + waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty setflag 720 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 586075465..102d2aa0c 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -19,12 +19,12 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 playbgm 415, 1 - move 2, Route103_Movement_1A0839 - waitmove 0 - move 2, Route103_Movement_1A0833 - waitmove 0 - move 2, Route103_Movement_1A0835 - waitmove 0 + applymovement 2, Route103_Movement_1A0839 + waitmovement 0 + applymovement 2, Route103_Movement_1A0833 + waitmovement 0 + applymovement 2, Route103_Movement_1A0835 + waitmovement 0 msgbox Route103_Text_16D5B6, 4 switch 0x4023 case 0, Route103_EventScript_14EC5D @@ -35,12 +35,12 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 playbgm 421, 1 - move 2, Route103_Movement_1A0839 - waitmove 0 - move 2, Route103_Movement_1A0833 - waitmove 0 - move 2, Route103_Movement_1A0835 - waitmove 0 + applymovement 2, Route103_Movement_1A0839 + waitmovement 0 + applymovement 2, Route103_Movement_1A0833 + waitmovement 0 + applymovement 2, Route103_Movement_1A0835 + waitmovement 0 msgbox Route103_Text_16D7A9, 4 switch 0x4023 case 0, Route103_EventScript_14EC8D @@ -98,20 +98,20 @@ Route103_EventScript_14ECD9:: @ 814ECD9 end Route103_EventScript_14ED0C:: @ 814ED0C - move 2, Route103_Movement_14ED67 - waitmove 0 + applymovement 2, Route103_Movement_14ED67 + waitmovement 0 playse 10 - move 2, Route103_Movement_14ED6B - waitmove 0 + applymovement 2, Route103_Movement_14ED6B + waitmovement 0 goto Route103_EventScript_14ED46 end Route103_EventScript_14ED29:: @ 814ED29 - move 2, Route103_Movement_14ED71 - waitmove 0 + applymovement 2, Route103_Movement_14ED71 + waitmovement 0 playse 10 - move 2, Route103_Movement_14ED74 - waitmove 0 + applymovement 2, Route103_Movement_14ED74 + waitmovement 0 goto Route103_EventScript_14ED46 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 58a6704bf..d9f65a382 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -126,28 +126,28 @@ Route104_EventScript_14EFCC:: @ 814EFCC Route104_EventScript_14EFD5:: @ 814EFD5 spritelevelup 8, 0, 19, 0 spritelevelup 255, 0, 19, 0 - move 8, Route104_Movement_14F16C - waitmove 0 + applymovement 8, Route104_Movement_14F16C + waitmovement 0 disappear 8 - move 255, Route104_Movement_14F162 - waitmove 0 + applymovement 255, Route104_Movement_14F162 + waitmovement 0 spriteinvisible 255, 0, 19 call Route104_EventScript_1A02E7 - move 7, Route104_Movement_14F09F - move 255, Route104_Movement_14F09F - waitmove 0 - move 255, Route104_Movement_14F166 - waitmove 0 + applymovement 7, Route104_Movement_14F09F + applymovement 255, Route104_Movement_14F09F + waitmovement 0 + applymovement 255, Route104_Movement_14F166 + waitmovement 0 call Route104_EventScript_1A02EF spritevisible 255, 0, 11 - move 255, Route104_Movement_14F168 - waitmove 0 + applymovement 255, Route104_Movement_14F168 + waitmovement 0 movespriteperm 2, 12, 8 reappear 2 spritelevelup 2, 0, 11, 0 clearflag 740 - move 2, Route104_Movement_14F16F - waitmove 0 + applymovement 2, Route104_Movement_14F16F + waitmovement 0 reappear 4 clearflag 743 call Route104_EventScript_1A02EF diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 1846cb2ff..bd5116a43 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -5,8 +5,8 @@ Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C spritelevelup 2, 0, 24, 0 spritelevelup 255, 0, 24, 0 - move 2, Route109_Movement_14F67B - waitmove 0 + applymovement 2, Route109_Movement_14F67B + waitmovement 0 disappear 2 switch FACING case 1, Route109_EventScript_14F518 @@ -15,40 +15,40 @@ Route109_EventScript_14F4D3:: @ 814F4D3 end Route109_EventScript_14F518:: @ 814F518 - move 255, Route109_Movement_14F66D - waitmove 0 + applymovement 255, Route109_Movement_14F66D + waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F528:: @ 814F528 - move 255, Route109_Movement_14F675 - waitmove 0 + applymovement 255, Route109_Movement_14F675 + waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F538:: @ 814F538 - move 255, Route109_Movement_14F678 - waitmove 0 + applymovement 255, Route109_Movement_14F678 + waitmovement 0 goto Route109_EventScript_14F548 end Route109_EventScript_14F548:: @ 814F548 spriteinvisible 255, 0, 24 call Route109_EventScript_1A02E7 - move 1, Route109_Movement_14F5BF - move 255, Route109_Movement_14F5BF - waitmove 0 + applymovement 1, Route109_Movement_14F5BF + applymovement 255, Route109_Movement_14F5BF + waitmovement 0 call Route109_EventScript_1A02EF spritevisible 255, 0, 11 - move 255, Route109_Movement_14F670 - waitmove 0 + applymovement 255, Route109_Movement_14F670 + waitmovement 0 reappear 4 clearflag 743 movespriteperm 2, 12, 8 reappear 2 spritelevelup 2, 0, 11, 0 - move 2, Route109_Movement_14F67D - waitmove 0 + applymovement 2, Route109_Movement_14F67D + waitmovement 0 clearflag 740 setflag 744 spriteinvisible 1, 0, 24 @@ -319,8 +319,8 @@ Route109_EventScript_14F70E:: @ 814F70E faceplayer msgbox Route109_Text_16E405, 4 closebutton - move LAST_TALKED, Route109_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 release end @@ -335,16 +335,16 @@ Route109_EventScript_14F725:: @ 814F725 compare_var_to_imm RESULT, 0 goto_if_eq Route109_EventScript_1A029B closebutton - move LAST_TALKED, Route109_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 setflag 280 release end Route109_EventScript_14F762:: @ 814F762 msgbox Route109_Text_16E446, 4 - move LAST_TALKED, Route109_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route109_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9fba68693..e4582e08e 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -33,8 +33,8 @@ Route110_EventScript_14F946:: @ 814F946 lock faceplayer msgbox Route110_Text_16E6C0, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -42,8 +42,8 @@ Route110_EventScript_14F95C:: @ 814F95C lock faceplayer msgbox Route110_Text_16E6F2, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -51,8 +51,8 @@ Route110_EventScript_14F972:: @ 814F972 lock faceplayer msgbox Route110_Text_16E729, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -60,8 +60,8 @@ Route110_EventScript_14F988:: @ 814F988 lock faceplayer msgbox Route110_Text_16E76A, 4 - move LAST_TALKED, Route110_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route110_Movement_1A083D + waitmovement 0 release end @@ -254,8 +254,8 @@ Route110_EventScript_14FC10:: @ 814FC10 Route110_EventScript_14FC27:: @ 814FC27 lockall - move 21, Route110_Movement_1A0843 - waitmove 0 + applymovement 21, Route110_Movement_1A0843 + waitmovement 0 call Route110_EventScript_14FC39 releaseall end @@ -330,12 +330,12 @@ Route110_EventScript_14FD34:: @ 814FD34 call_if 1, Route110_EventScript_14FDA7 compare_var_to_imm RESULT, 1 call_if 1, Route110_EventScript_14FDAC - move 28, Route110_Movement_1A0845 - waitmove 0 - move 28, Route110_Movement_1A0833 - waitmove 0 - move 28, Route110_Movement_1A0835 - waitmove 0 + applymovement 28, Route110_Movement_1A0845 + waitmovement 0 + applymovement 28, Route110_Movement_1A0833 + waitmovement 0 + applymovement 28, Route110_Movement_1A0835 + waitmovement 0 delay 30 compare_var_to_imm 0x8008, 1 call_if 1, Route110_EventScript_14FF14 @@ -450,33 +450,33 @@ Route110_EventScript_14FEB2:: @ 814FEB2 end Route110_EventScript_14FF14:: @ 814FF14 - move 28, Route110_Movement_14FF6E - waitmove 0 + applymovement 28, Route110_Movement_14FF6E + waitmovement 0 return Route110_EventScript_14FF1F:: @ 814FF1F - move 28, Route110_Movement_14FF72 - waitmove 0 + applymovement 28, Route110_Movement_14FF72 + waitmovement 0 return Route110_EventScript_14FF2A:: @ 814FF2A - move 28, Route110_Movement_14FF74 - waitmove 0 + applymovement 28, Route110_Movement_14FF74 + waitmovement 0 return Route110_EventScript_14FF35:: @ 814FF35 - move 29, Route110_Movement_14FF78 - waitmove 0 + applymovement 29, Route110_Movement_14FF78 + waitmovement 0 return Route110_EventScript_14FF40:: @ 814FF40 - move 29, Route110_Movement_14FF80 - waitmove 0 + applymovement 29, Route110_Movement_14FF80 + waitmovement 0 return Route110_EventScript_14FF4B:: @ 814FF4B - move 29, Route110_Movement_14FF89 - waitmove 0 + applymovement 29, Route110_Movement_14FF89 + waitmovement 0 return Route110_EventScript_14FF56:: @ 814FF56 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index d98662e78..c2900de22 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -42,8 +42,8 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @ You don't have a bike! msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4 closebutton - move 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 - waitmove 0 + applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 + waitmovement 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 204ccc64d..c385a7bc9 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -21,8 +21,8 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4 closebutton - move 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB - waitmove 0 + applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB + waitmovement 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index e70dcd749..61c0e65a6 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -161,8 +161,8 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closebutton - move 1, Route110_TrickHouseEnd_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0839 + waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 @@ -180,11 +180,11 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF end Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E - move 1, Route110_TrickHouseEnd_Movement_161315 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_161315 + waitmovement 0 playse 178 - move 1, Route110_TrickHouseEnd_Movement_16131E - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_16131E + waitmovement 0 disappear 1 addvar 0x4044, 1 return @@ -202,41 +202,41 @@ Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 return Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 - move 1, Route110_TrickHouseEnd_Movement_1A0845 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0845 + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C7F:: @ 8161C7F - move 1, Route110_TrickHouseEnd_Movement_1A0841 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0841 + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C8A:: @ 8161C8A - move 1, Route110_TrickHouseEnd_Movement_1A083F - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A083F + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 - move 1, Route110_TrickHouseEnd_Movement_1A0843 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0843 + waitmovement 0 return Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall spriteface 1, 3 playse 21 - move 1, Route110_TrickHouseEnd_Movement_1A0833 - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 + waitmovement 0 delay 20 - move 1, Route110_TrickHouseEnd_Movement_161CEA - waitmove 0 + applymovement 1, Route110_TrickHouseEnd_Movement_161CEA + waitmovement 0 playse 178 - move 255, Route110_TrickHouseEnd_Movement_1A0845 - waitmove 0 + applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 + waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 closebutton - move 255, Route110_TrickHouseEnd_Movement_161CE8 - waitmove 0 + applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 + waitmovement 0 delay 4 spriteface 1, 4 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 6a515e6f3..4e60c9fc1 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -218,11 +218,11 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton delay 20 - move 1, Route110_TrickHouseEntrance_Movement_161315 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + waitmovement 0 playse 178 - move 1, Route110_TrickHouseEntrance_Movement_16131E - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + waitmovement 0 disappear 1 setvar 0x40a7, 1 setvar 0x40a6, 0 @@ -244,10 +244,10 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D playse 21 - move 255, Route110_TrickHouseEntrance_Movement_1A0833 - waitmove 0 - move 255, Route110_TrickHouseEntrance_Movement_1A0835 - waitmove 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD compare_var_to_imm 0x4044, 1 @@ -334,22 +334,22 @@ Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 msgbox Route110_TrickHouseEntrance_Text_19BF19, 4 closebutton - move 1, Route110_TrickHouseEntrance_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 playse 21 - move 1, Route110_TrickHouseEntrance_Movement_1A0833 - waitmove 0 - move 1, Route110_TrickHouseEntrance_Movement_1A0835 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833 + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835 + waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19BFAB, 4 - move 1, Route110_TrickHouseEntrance_Movement_1A0841 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E - move 1, Route110_TrickHouseEntrance_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 compare_var_to_imm 0x4044, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE @@ -440,14 +440,14 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 setvar 0x40c1, 0 setvar 0x40a7, 3 - move 1, Route110_TrickHouseEntrance_Movement_1A0841 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 + waitmovement 0 releaseall end Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 - move 1, Route110_TrickHouseEntrance_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 + waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE givedecoration 32 @@ -465,13 +465,13 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 msgbox Route110_TrickHouseEntrance_Text_19C17E, 4 closebutton - move 1, Route110_TrickHouseEntrance_Movement_16309F - waitmove 0 - move 1, Route110_TrickHouseEntrance_Movement_161315 - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_16309F + waitmovement 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_161315 + waitmovement 0 playse 178 - move 1, Route110_TrickHouseEntrance_Movement_16131E - waitmove 0 + applymovement 1, Route110_TrickHouseEntrance_Movement_16131E + waitmovement 0 disappear 1 setvar 0x40c1, 0 setvar 0x40a7, 5 @@ -504,10 +504,10 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD setmaptile 5, 1, 537, 0 special DrawWholeMapView delay 20 - move 255, Route110_TrickHouseEntrance_Movement_1A0856 - waitmove 0 - move 255, Route110_TrickHouseEntrance_Movement_16165E - waitmove 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 + waitmovement 0 + applymovement 255, Route110_TrickHouseEntrance_Movement_16165E + waitmovement 0 switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_161660 case 1, Route110_TrickHouseEntrance_EventScript_16166B diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index d0ced1ecb..c99158dbd 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -25,8 +25,8 @@ Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall - move 1, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4001, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -35,8 +35,8 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall - move 2, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4002, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -45,8 +45,8 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall - move 3, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4003, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -55,8 +55,8 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall - move 4, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4004, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -65,8 +65,8 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall - move 5, Route110_TrickHousePuzzle5_Movement_1A0839 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 + waitmovement 0 compare_var_to_imm 0x4005, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 @@ -161,10 +161,10 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar 0x4001, 1 setvar 0x4008, 1 playse 21 - move 1, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 1, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare_var_to_imm 0x4009, 2 @@ -183,10 +183,10 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar 0x4002, 1 setvar 0x4008, 2 playse 21 - move 2, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 2, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare_var_to_imm 0x4009, 2 @@ -205,10 +205,10 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar 0x4003, 1 setvar 0x4008, 3 playse 21 - move 3, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 3, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare_var_to_imm 0x4009, 2 @@ -227,10 +227,10 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar 0x4004, 1 setvar 0x4008, 4 playse 21 - move 4, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 4, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 compare_var_to_imm 0x4009, 2 @@ -249,10 +249,10 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar 0x4005, 1 setvar 0x4008, 5 playse 21 - move 5, Route110_TrickHousePuzzle5_Movement_1A0833 - waitmove 0 - move 5, Route110_TrickHousePuzzle5_Movement_1A0835 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 + waitmovement 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 + waitmovement 0 compare_var_to_imm 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B compare_var_to_imm 0x4009, 2 @@ -391,13 +391,13 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse playse 32 msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 - move 1, Route110_TrickHousePuzzle5_Movement_16309F - move 2, Route110_TrickHousePuzzle5_Movement_16309F - move 3, Route110_TrickHousePuzzle5_Movement_16309F - move 4, Route110_TrickHousePuzzle5_Movement_16309F - move 5, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 3, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 4, Route110_TrickHousePuzzle5_Movement_16309F + applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4 - waitmove 0 + waitmovement 0 closebutton msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 closebutton @@ -496,153 +496,153 @@ Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B return Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 - move 1, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F4E:: @ 8162F4E - move 2, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F59:: @ 8162F59 - move 3, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F64:: @ 8162F64 - move 4, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F6F:: @ 8162F6F - move 5, Route110_TrickHousePuzzle5_Movement_16308D - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16308D + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F7A:: @ 8162F7A - move 1, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F85:: @ 8162F85 - move 2, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F90:: @ 8162F90 - move 3, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162F9B:: @ 8162F9B - move 4, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FA6:: @ 8162FA6 - move 5, Route110_TrickHousePuzzle5_Movement_16308F - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16308F + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FB1:: @ 8162FB1 - move 1, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FBC:: @ 8162FBC - move 2, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FC7:: @ 8162FC7 - move 3, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FD2:: @ 8162FD2 - move 4, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FDD:: @ 8162FDD - move 5, Route110_TrickHousePuzzle5_Movement_163092 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_163092 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FE8:: @ 8162FE8 - move 1, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FF3:: @ 8162FF3 - move 2, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_162FFE:: @ 8162FFE - move 3, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163009:: @ 8163009 - move 4, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163014:: @ 8163014 - move 5, Route110_TrickHousePuzzle5_Movement_163096 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_163096 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16301F:: @ 816301F - move 1, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16302A:: @ 816302A - move 2, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163035:: @ 8163035 - move 3, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163040:: @ 8163040 - move 4, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16304B:: @ 816304B - move 5, Route110_TrickHousePuzzle5_Movement_163098 - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_163098 + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163056:: @ 8163056 - move 1, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 1, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163061:: @ 8163061 - move 2, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 2, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_16306C:: @ 816306C - move 3, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 3, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163077:: @ 8163077 - move 4, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 4, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_EventScript_163082:: @ 8163082 - move 5, Route110_TrickHousePuzzle5_Movement_16309B - waitmove 0 + applymovement 5, Route110_TrickHousePuzzle5_Movement_16309B + waitmovement 0 return Route110_TrickHousePuzzle5_Movement_16308D:: @ 816308D diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index fc73716eb..35c60cf8f 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -60,8 +60,8 @@ Route111_EventScript_150023:: @ 8150023 setflag 964 disappear 34 delay 30 - move 35, Route111_Movement_1500AF - waitmove 0 + applymovement 35, Route111_Movement_1500AF + waitmovement 0 disappear 35 releaseall end @@ -82,8 +82,8 @@ Route111_EventScript_150069:: @ 8150069 setflag 963 disappear 35 delay 30 - move 34, Route111_Movement_1500AF - waitmove 0 + applymovement 34, Route111_Movement_1500AF + waitmovement 0 disappear 34 releaseall end @@ -185,23 +185,23 @@ Route111_EventScript_150151:: @ 8150151 end Route111_EventScript_150188:: @ 8150188 - move 255, Route111_Movement_1501B4 - waitmove 0 + applymovement 255, Route111_Movement_1501B4 + waitmovement 0 return Route111_EventScript_150193:: @ 8150193 - move 255, Route111_Movement_1501B6 - waitmove 0 + applymovement 255, Route111_Movement_1501B6 + waitmovement 0 return Route111_EventScript_15019E:: @ 815019E - move 255, Route111_Movement_1501B8 - waitmove 0 + applymovement 255, Route111_Movement_1501B8 + waitmovement 0 return Route111_EventScript_1501A9:: @ 81501A9 - move 255, Route111_Movement_1501BA - waitmove 0 + applymovement 255, Route111_Movement_1501BA + waitmovement 0 return Route111_Movement_1501B4:: @ 81501B4 @@ -247,67 +247,67 @@ Route111_EventScript_1501D1:: @ 81501D1 Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F7B3, 4 trainerbattle 3, OPPONENT_VICTOR, 0, Route111_Text_16F7D2 - move 1, Route111_Movement_1A0841 - waitmove 0 + applymovement 1, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F7FF, 4 closebutton - move 1, Route111_Movement_150356 - waitmove 0 + applymovement 1, Route111_Movement_150356 + waitmovement 0 disappear 1 call Route111_EventScript_15034F - move 255, Route111_Movement_15035B - waitmove 0 + applymovement 255, Route111_Movement_15035B + waitmovement 0 call Route111_EventScript_150348 reappear 2 - move 2, Route111_Movement_150359 - waitmove 0 + applymovement 2, Route111_Movement_150359 + waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F82D, 4 trainerbattle 3, OPPONENT_VICTORIA, 0, Route111_Text_16F8A6 - move 2, Route111_Movement_1A0841 - waitmove 0 + applymovement 2, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F8D5, 4 closebutton - move 2, Route111_Movement_150356 - waitmove 0 + applymovement 2, Route111_Movement_150356 + waitmovement 0 disappear 2 call Route111_EventScript_15034F - move 255, Route111_Movement_15035B - waitmove 0 + applymovement 255, Route111_Movement_15035B + waitmovement 0 call Route111_EventScript_150348 reappear 3 - move 3, Route111_Movement_150359 - waitmove 0 + applymovement 3, Route111_Movement_150359 + waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F90E, 4 trainerbattle 3, OPPONENT_VIVI, 0, Route111_Text_16F956 - move 3, Route111_Movement_1A0841 - waitmove 0 + applymovement 3, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F96C, 4 closebutton - move 3, Route111_Movement_150356 - waitmove 0 + applymovement 3, Route111_Movement_150356 + waitmovement 0 disappear 3 call Route111_EventScript_15034F - move 255, Route111_Movement_15035B - waitmove 0 + applymovement 255, Route111_Movement_15035B + waitmovement 0 call Route111_EventScript_150348 reappear 4 - move 4, Route111_Movement_150359 - waitmove 0 + applymovement 4, Route111_Movement_150359 + waitmovement 0 call Route111_EventScript_15034F msgbox Route111_Text_16F991, 4 trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 closebutton - move 4, Route111_Movement_1A0841 - waitmove 0 + applymovement 4, Route111_Movement_1A0841 + waitmovement 0 call Route111_EventScript_150348 - move 4, Route111_Movement_150356 - waitmove 0 + applymovement 4, Route111_Movement_150356 + waitmovement 0 disappear 4 call Route111_EventScript_15034F release diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index b5b6056f4..7742d3507 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -54,7 +54,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closebutton - move 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D - waitmove 0 + applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index d2d01f253..dfa1fecd6 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -20,9 +20,9 @@ Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E Route112_CableCarStation_EventScript_15C068:: @ 815C068 lockall - move 255, Route112_CableCarStation_Movement_15C0F5 - move 1, Route112_CableCarStation_Movement_15C0EB - waitmove 0 + applymovement 255, Route112_CableCarStation_Movement_15C0F5 + applymovement 1, Route112_CableCarStation_Movement_15C0EB + waitmovement 0 setvar 0x40a3, 0 movespriteperm 1, 6, 7 spritebehave 1, 8 @@ -42,9 +42,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD msgbox Route112_CableCarStation_Text_1925A9, 4 closebutton - move 1, Route112_CableCarStation_Movement_15C0E6 - move 255, Route112_CableCarStation_Movement_15C0F0 - waitmove 0 + applymovement 1, Route112_CableCarStation_Movement_15C0E6 + applymovement 255, Route112_CableCarStation_Movement_15C0F0 + waitmovement 0 setvar 0x8004, 0 setvar 0x40a3, 1 inccounter GAME_STAT_RODE_CABLE_CAR diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index c58a3dfb9..61ccb6632 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -63,13 +63,13 @@ Route116_EventScript_150A94:: @ 8150A94 end Route116_EventScript_150AEE:: @ 8150AEE - move LAST_TALKED, Route116_Movement_150B1C - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150B1C + waitmovement 0 return Route116_EventScript_150AF9:: @ 8150AF9 - move LAST_TALKED, Route116_Movement_150B25 - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150B25 + waitmovement 0 return Route116_EventScript_150B04:: @ 8150B04 @@ -136,9 +136,9 @@ Route116_EventScript_150B5D:: @ 8150B5D Route116_EventScript_150B6E:: @ 8150B6E lockall - move 11, Route116_Movement_1A0843 - move 255, Route116_Movement_1A083F - waitmove 0 + applymovement 11, Route116_Movement_1A0843 + applymovement 255, Route116_Movement_1A083F + waitmovement 0 msgbox Route116_Text_17032A, 4 setvar 0x406f, 2 releaseall @@ -194,13 +194,13 @@ Route116_EventScript_150C03:: @ 8150C03 end Route116_EventScript_150C37:: @ 8150C37 - move LAST_TALKED, Route116_Movement_150C4D - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150C4D + waitmovement 0 return Route116_EventScript_150C42:: @ 8150C42 - move LAST_TALKED, Route116_Movement_150C57 - waitmove 0 + applymovement LAST_TALKED, Route116_Movement_150C57 + waitmovement 0 return Route116_Movement_150C4D:: @ 8150C4D diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 7e6543d7f..8c91e7da4 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -51,35 +51,35 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall setvar 0x8008, 0 - move 255, Route118_Movement_1A0841 - waitmove 0 - move 19, Route118_Movement_151069 - waitmove 0 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 + applymovement 19, Route118_Movement_151069 + waitmovement 0 goto Route118_EventScript_151004 end Route118_EventScript_150FCE:: @ 8150FCE lockall setvar 0x8008, 1 - move 255, Route118_Movement_1A0841 - waitmove 0 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 goto Route118_EventScript_151004 end Route118_EventScript_150FE4:: @ 8150FE4 lockall setvar 0x8008, 2 - move 255, Route118_Movement_1A0841 - waitmove 0 - move 19, Route118_Movement_15106B - waitmove 0 + applymovement 255, Route118_Movement_1A0841 + waitmovement 0 + applymovement 19, Route118_Movement_15106B + waitmovement 0 goto Route118_EventScript_151004 end Route118_EventScript_151004:: @ 8151004 playse 10 - move 19, Route118_Movement_15106D - waitmove 0 + applymovement 19, Route118_Movement_15106D + waitmovement 0 delay 30 msgbox Route118_Text_170D66, 4 closebutton @@ -95,18 +95,18 @@ Route118_EventScript_151004:: @ 8151004 end Route118_EventScript_151048:: @ 8151048 - move 19, Route118_Movement_151071 - waitmove 0 + applymovement 19, Route118_Movement_151071 + waitmovement 0 return Route118_EventScript_151053:: @ 8151053 - move 19, Route118_Movement_15107C - waitmove 0 + applymovement 19, Route118_Movement_15107C + waitmovement 0 return Route118_EventScript_15105E:: @ 815105E - move 19, Route118_Movement_151086 - waitmove 0 + applymovement 19, Route118_Movement_151086 + waitmovement 0 return Route118_Movement_151069:: @ 8151069 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 9abb8adf9..5b0f61387 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -61,8 +61,8 @@ Route119_EventScript_1511DB:: @ 81511DB call_if 1, Route119_EventScript_1513A6 compare_var_to_imm 0x4001, 2 call_if 1, Route119_EventScript_1513B1 - move 255, Route119_Movement_1A0845 - waitmove 0 + applymovement 255, Route119_Movement_1A0845 + waitmovement 0 delay 30 compare_var_to_imm 0x4001, 1 call_if 1, Route119_EventScript_1513D2 @@ -173,23 +173,23 @@ Route119_EventScript_151362:: @ 8151362 end Route119_EventScript_1513A6:: @ 81513A6 - move 25, Route119_Movement_1513F0 - waitmove 0 + applymovement 25, Route119_Movement_1513F0 + waitmovement 0 return Route119_EventScript_1513B1:: @ 81513B1 - move 25, Route119_Movement_1513FA - waitmove 0 + applymovement 25, Route119_Movement_1513FA + waitmovement 0 return Route119_EventScript_1513BC:: @ 81513BC - move 25, Route119_Movement_151405 - waitmove 0 + applymovement 25, Route119_Movement_151405 + waitmovement 0 return Route119_EventScript_1513C7:: @ 81513C7 - move 25, Route119_Movement_15140F - waitmove 0 + applymovement 25, Route119_Movement_15140F + waitmovement 0 return Route119_EventScript_1513D2:: @ 81513D2 @@ -355,8 +355,8 @@ Route119_EventScript_1515C5:: @ 81515C5 faceplayer msgbox Route119_Text_171520, 4 closebutton - move LAST_TALKED, Route119_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route119_Movement_1A083D + waitmovement 0 release end @@ -365,8 +365,8 @@ Route119_EventScript_1515DC:: @ 81515DC faceplayer msgbox Route119_Text_17157C, 4 closebutton - move LAST_TALKED, Route119_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, Route119_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 54b54dd18..b903d7063 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -47,8 +47,8 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 disappear 2 disappear 3 fadescreen 0 - move 5, Route119_WeatherInstitute_2F_Movement_163DC8 - waitmove 0 + applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 + waitmovement 0 moveoffscreen 5 goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 2e6ae94e5..7c1968aa5 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -212,15 +212,15 @@ Route120_EventScript_15189D:: @ 815189D call_if 1, Route120_EventScript_15197F compare_var_to_imm FACING, 3 call_if 1, Route120_EventScript_15198A - move 31, Route120_Movement_1A083F - waitmove 0 + applymovement 31, Route120_Movement_1A083F + waitmovement 0 delay 20 msgbox Route120_Text_1719D4, 4 closebutton - move 30, Route120_Movement_1A0843 - waitmove 0 - move 30, Route120_Movement_1A0662 - waitmove 0 + applymovement 30, Route120_Movement_1A0843 + waitmovement 0 + applymovement 30, Route120_Movement_1A0662 + waitmovement 0 waitse pokecry SPECIES_KECLEON, 2 delay 40 @@ -234,16 +234,16 @@ Route120_EventScript_15189D:: @ 815189D end Route120_EventScript_151908:: @ 8151908 - move 31, Route120_Movement_1A0845 - move 255, Route120_Movement_1A0841 - waitmove 0 + applymovement 31, Route120_Movement_1A0845 + applymovement 255, Route120_Movement_1A0841 + waitmovement 0 msgbox Route120_Text_171A40, 4 giveitem ITEM_DEVON_SCOPE setflag 285 msgbox Route120_Text_171B0E, 4 closebutton - move 31, Route120_Movement_1A0845 - waitmove 0 + applymovement 31, Route120_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 @@ -259,13 +259,13 @@ Route120_EventScript_151908:: @ 8151908 end Route120_EventScript_15197F:: @ 815197F - move 255, Route120_Movement_1A083F - waitmove 0 + applymovement 255, Route120_Movement_1A083F + waitmovement 0 return Route120_EventScript_15198A:: @ 815198A - move 255, Route120_Movement_151995 - waitmove 0 + applymovement 255, Route120_Movement_151995 + waitmovement 0 return Route120_Movement_151995:: @ 8151995 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 68c04762f..562f122e3 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -22,10 +22,10 @@ Route121_EventScript_151B25:: @ 8151B25 lockall msgbox Route121_Text_171C8F, 4 closebutton - move 12, Route121_Movement_151B57 - move 13, Route121_Movement_151B60 - move 14, Route121_Movement_151B69 - waitmove 0 + applymovement 12, Route121_Movement_151B57 + applymovement 13, Route121_Movement_151B60 + applymovement 14, Route121_Movement_151B69 + waitmovement 0 disappear 12 disappear 13 disappear 14 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 2fd6e54f6..52f0e5c44 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -8,8 +8,8 @@ Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 lockall - move 255, Route121_SafariZoneEntrance_Movement_15C348 - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C348 + waitmovement 0 special ExitSafariMode setvar 0x40a4, 0 releaseall @@ -47,8 +47,8 @@ Route121_SafariZoneEntrance_EventScript_15C379:: @ 815C379 Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 lockall - move 255, Route121_SafariZoneEntrance_Movement_1A0841 - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841 + waitmovement 0 showmoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 @@ -78,8 +78,8 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 msgbox Route121_SafariZoneEntrance_Text_1C392D, 4 closebutton hidemoney 0, 0 - move 255, Route121_SafariZoneEntrance_Movement_15C47E - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E + waitmovement 0 special EnterSafariMode setvar 0x40a4, 2 warp SafariZone_Southeast, 255, 32, 33 @@ -113,8 +113,8 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C closebutton hidemoney 0, 0 - move 255, Route121_SafariZoneEntrance_Movement_15C47C - waitmove 0 + applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C + waitmovement 0 releaseall end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 21927ec0f..0ce76670f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -20,35 +20,35 @@ Route128_EventScript_15213F:: @ 815213F special sub_807E25C waitstate .endif - move 4, Route128_Movement_152271 - waitmove 0 + applymovement 4, Route128_Movement_152271 + waitmovement 0 msgbox Route128_Text_171EE0, 4 - move 4, Route128_Movement_152279 - waitmove 0 + applymovement 4, Route128_Movement_152279 + waitmovement 0 msgbox Route128_Text_171F35, 4 closebutton - move 5, Route128_Movement_152293 - waitmove 0 - move 4, Route128_Movement_1A0841 - waitmove 0 + applymovement 5, Route128_Movement_152293 + waitmovement 0 + applymovement 4, Route128_Movement_1A0841 + waitmovement 0 msgbox Route128_Text_171F4B, 4 closebutton - move 5, Route128_Movement_1522A1 - waitmove 0 - move 255, Route128_Movement_1A0841 - waitmove 0 + applymovement 5, Route128_Movement_1522A1 + waitmovement 0 + applymovement 255, Route128_Movement_1A0841 + waitmovement 0 msgbox Route128_Text_172008, 4 closebutton - move 4, Route128_Movement_15227E - move 255, Route128_Movement_1A083F - move 5, Route128_Movement_152290 - waitmove 0 + applymovement 4, Route128_Movement_15227E + applymovement 255, Route128_Movement_1A083F + applymovement 5, Route128_Movement_152290 + waitmovement 0 msgbox Route128_Text_17210B, 4 closebutton delay 40 - move 5, Route128_Movement_152296 - move 4, Route128_Movement_152283 - waitmove 0 + applymovement 5, Route128_Movement_152296 + applymovement 4, Route128_Movement_152283 + waitmovement 0 disappear 5 disappear 4 delay 100 @@ -56,26 +56,26 @@ Route128_EventScript_15213F:: @ 815213F doanimation 30 checkanimation 30 reappear 3 - move 3, Route128_Movement_15226F - waitmove 0 - move 255, Route128_Movement_1A0843 - waitmove 0 + applymovement 3, Route128_Movement_15226F + waitmovement 0 + applymovement 255, Route128_Movement_1A0843 + waitmovement 0 msgbox Route128_Text_172181, 4 closebutton - move 3, Route128_Movement_15226D - move 255, Route128_Movement_1A0841 - waitmove 0 + applymovement 3, Route128_Movement_15226D + applymovement 255, Route128_Movement_1A0841 + waitmovement 0 .ifdef SAPPHIRE msgbox Route128_Text_1721A2, 4 .else msgbox Route128_Text_1722A1, 4 .endif - move 3, Route128_Movement_1A0845 - waitmove 0 + applymovement 3, Route128_Movement_1A0845 + waitmovement 0 msgbox Route128_Text_1723BE, 4 closebutton - move 3, Route128_Movement_1A0845 - waitmove 0 + applymovement 3, Route128_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 677838f8a..ddd58be1a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -101,8 +101,8 @@ RustboroCity_EventScript_14C449:: @ 814C449 lock faceplayer msgbox RustboroCity_Text_166D59, 4 - move 7, RustboroCity_Movement_1A083D - waitmove 0 + applymovement 7, RustboroCity_Movement_1A083D + waitmovement 0 release end @@ -110,8 +110,8 @@ RustboroCity_EventScript_14C45F:: @ 814C45F lock faceplayer msgbox RustboroCity_Text_166DB0, 4 - move 8, RustboroCity_Movement_1A083D - waitmove 0 + applymovement 8, RustboroCity_Movement_1A083D + waitmovement 0 release end @@ -167,15 +167,15 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 closebutton reappear 10 reappear 9 - move 10, RustboroCity_Movement_14C5C2 - waitmove 0 + applymovement 10, RustboroCity_Movement_14C5C2 + waitmovement 0 disappear 10 - move 9, RustboroCity_Movement_14C5D3 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5D3 + waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 closebutton - move 9, RustboroCity_Movement_14C5DB - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5DB + waitmovement 0 disappear 9 movespriteperm 9, 30, 10 clearflag 732 @@ -200,30 +200,30 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 return @ 814C56F - move 9, RustboroCity_Movement_14C5E3 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5E3 + waitmovement 0 return @ 814C57A - move 9, RustboroCity_Movement_14C5E7 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5E7 + waitmovement 0 return @ 814C585 - move 9, RustboroCity_Movement_14C5EC - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5EC + waitmovement 0 return @ 814C590 - move 9, RustboroCity_Movement_14C5F1 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5F1 + waitmovement 0 return @ 814C59B - move 9, RustboroCity_Movement_14C5F7 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_14C5F7 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return @ 814C5B0 @@ -379,53 +379,53 @@ RustboroCity_EventScript_14C650:: @ 814C650 end RustboroCity_EventScript_14C691:: @ 814C691 - move 9, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 return RustboroCity_EventScript_14C6BD:: @ 814C6BD - move 9, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0843 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0843 + waitmovement 0 return RustboroCity_EventScript_14C6E9:: @ 814C6E9 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C715:: @ 814C715 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 9, RustboroCity_Movement_14C74B - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_Movement_14C74B:: @ 814C74B @@ -487,63 +487,63 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 return RustboroCity_EventScript_14C7FE:: @ 814C7FE - move 9, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0841 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0845 + waitmovement 0 return RustboroCity_EventScript_14C82A:: @ 814C82A - move 9, RustboroCity_Movement_1A0843 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0843 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A083F + waitmovement 0 return RustboroCity_EventScript_14C856:: @ 814C856 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C882:: @ 814C882 - move 9, RustboroCity_Movement_1A0845 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0845 + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 - move 9, RustboroCity_Movement_14C74B - waitmove 0 - move 255, RustboroCity_Movement_1A0841 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 + applymovement 9, RustboroCity_Movement_14C74B + waitmovement 0 + applymovement 255, RustboroCity_Movement_1A0841 + waitmovement 0 return RustboroCity_EventScript_14C8B8:: @ 814C8B8 - move 9, RustboroCity_Movement_1A083F - waitmove 0 + applymovement 9, RustboroCity_Movement_1A083F + waitmovement 0 playse 21 - move 9, RustboroCity_Movement_1A0833 - waitmove 0 - move 9, RustboroCity_Movement_1A0835 - waitmove 0 + applymovement 9, RustboroCity_Movement_1A0833 + waitmovement 0 + applymovement 9, RustboroCity_Movement_1A0835 + waitmovement 0 return RustboroCity_EventScript_14C8DA:: @ 814C8DA diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 2f3fd5927..d5b3b03c7 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -81,10 +81,10 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closebutton playse 21 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 - waitmove 0 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 - waitmove 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 @@ -99,10 +99,10 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closebutton playse 21 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0833 - waitmove 0 - move 5, RustboroCity_DevonCorp_2F_Movement_1A0835 - waitmove 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 + waitmovement 0 + applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 + waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 887299933..12cf2f6c8 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -30,23 +30,23 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 lockall msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4 closebutton - move 2, RustboroCity_DevonCorp_3F_Movement_157815 - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 + waitmovement 0 delay 80 - move 2, RustboroCity_DevonCorp_3F_Movement_15781E - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E + waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closebutton playbgm 420, 0 - move 2, RustboroCity_DevonCorp_3F_Movement_157803 - move 255, RustboroCity_DevonCorp_3F_Movement_157827 - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 + waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 closebutton fadedefaultbgm - move 2, RustboroCity_DevonCorp_3F_Movement_157812 - move 255, RustboroCity_DevonCorp_3F_Movement_157835 - waitmove 0 + applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 + applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 + waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 @@ -152,8 +152,8 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closebutton - move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 release end @@ -165,16 +165,16 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 closebutton - move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 release end RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4 closebutton - move LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 5f4de010e..cd71e8bba 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -88,27 +88,27 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE compare_var_to_imm RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + waitmovement 0 setflag 275 release end RustboroCity_PokemonSchool_EventScript_157B1E:: @ 8157B1E - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B60 + waitmovement 0 return RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_157B49 + waitmovement 0 return RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 msgbox RustboroCity_PokemonSchool_Text_184737, 4 closebutton - move LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 + waitmovement 0 release end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index cfa319bf3..922ad27e1 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -24,8 +24,8 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 faceplayer msgbox RusturfTunnel_Text_194766, 4 closebutton - move LAST_TALKED, RusturfTunnel_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 release end @@ -37,16 +37,16 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 setflag 1 msgbox RusturfTunnel_Text_1944C5, 4 closebutton - move LAST_TALKED, RusturfTunnel_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 release end RusturfTunnel_EventScript_15C7BC:: @ 815C7BC msgbox RusturfTunnel_Text_1945B2, 4 closebutton - move LAST_TALKED, RusturfTunnel_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D + waitmovement 0 release end @@ -87,37 +87,37 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 end RusturfTunnel_EventScript_15C880:: @ 815C880 - move 255, RusturfTunnel_Movement_15C96A - move 1, RusturfTunnel_Movement_15C98F - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15C96A + applymovement 1, RusturfTunnel_Movement_15C98F + waitmovement 0 return RusturfTunnel_EventScript_15C892:: @ 815C892 - move 255, RusturfTunnel_Movement_15C96D - move 1, RusturfTunnel_Movement_15C994 - waitmove 0 - move 10, RusturfTunnel_Movement_1A0845 - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15C96D + applymovement 1, RusturfTunnel_Movement_15C994 + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_1A0845 + waitmovement 0 return RusturfTunnel_EventScript_15C8AE:: @ 815C8AE - move 255, RusturfTunnel_Movement_15C96D - move 1, RusturfTunnel_Movement_15C994 - waitmove 0 - move 10, RusturfTunnel_Movement_1A0845 - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15C96D + applymovement 1, RusturfTunnel_Movement_15C994 + waitmovement 0 + applymovement 10, RusturfTunnel_Movement_1A0845 + waitmovement 0 return RusturfTunnel_EventScript_15C8CA:: @ 815C8CA - move 1, RusturfTunnel_Movement_1A0841 - waitmove 0 - move 255, RusturfTunnel_Movement_1A0845 - waitmove 0 + applymovement 1, RusturfTunnel_Movement_1A0841 + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_1A0845 + waitmovement 0 return RusturfTunnel_EventScript_15C8DF:: @ 815C8DF - move 1, RusturfTunnel_Movement_15C970 - waitmove 0 + applymovement 1, RusturfTunnel_Movement_15C970 + waitmovement 0 return RusturfTunnel_EventScript_15C8EA:: @ 815C8EA @@ -125,34 +125,34 @@ RusturfTunnel_EventScript_15C8EA:: @ 815C8EA RusturfTunnel_EventScript_15C8EB:: @ 815C8EB closebutton - move 1, RusturfTunnel_Movement_15C98D - waitmove 0 + applymovement 1, RusturfTunnel_Movement_15C98D + waitmovement 0 return RusturfTunnel_EventScript_15C8F7:: @ 815C8F7 - move 10, RusturfTunnel_Movement_15C945 - move 1, RusturfTunnel_Movement_15C973 - waitmove 0 + applymovement 10, RusturfTunnel_Movement_15C945 + applymovement 1, RusturfTunnel_Movement_15C973 + waitmovement 0 return RusturfTunnel_EventScript_15C909:: @ 815C909 - move 10, RusturfTunnel_Movement_15C951 - move 1, RusturfTunnel_Movement_15C980 - waitmove 0 + applymovement 10, RusturfTunnel_Movement_15C951 + applymovement 1, RusturfTunnel_Movement_15C980 + waitmovement 0 return RusturfTunnel_EventScript_15C91B:: @ 815C91B - move 10, RusturfTunnel_Movement_15C951 - move 1, RusturfTunnel_Movement_15C980 - waitmove 0 + applymovement 10, RusturfTunnel_Movement_15C951 + applymovement 1, RusturfTunnel_Movement_15C980 + waitmovement 0 return RusturfTunnel_EventScript_15C92D:: @ 815C92D playse 21 - move 1, RusturfTunnel_Movement_1A0833 - waitmove 0 - move 1, RusturfTunnel_Movement_1A0835 - waitmove 0 + applymovement 1, RusturfTunnel_Movement_1A0833 + waitmovement 0 + applymovement 1, RusturfTunnel_Movement_1A0835 + waitmovement 0 return RusturfTunnel_Movement_15C945:: @ 815C945 @@ -281,9 +281,9 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB lockall msgbox RusturfTunnel_Text_194159, 4 closebutton - move 6, RusturfTunnel_Movement_15C9D3 - move 7, RusturfTunnel_Movement_15C9D3 - waitmove 0 + applymovement 6, RusturfTunnel_Movement_15C9D3 + applymovement 7, RusturfTunnel_Movement_15C9D3 + waitmovement 0 moveoffscreen 6 moveoffscreen 7 setvar 0x409a, 3 @@ -315,20 +315,20 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA msgbox RusturfTunnel_Text_194274, 4 giveitem ITEM_DEVON_GOODS closebutton - move 255, RusturfTunnel_Movement_15CA99 - move 6, RusturfTunnel_Movement_15CAA2 - waitmove 0 + applymovement 255, RusturfTunnel_Movement_15CA99 + applymovement 6, RusturfTunnel_Movement_15CAA2 + waitmovement 0 disappear 6 delay 50 reappear 5 - move 5, RusturfTunnel_Movement_15CAAC - waitmove 0 - move 255, RusturfTunnel_Movement_15CA9F - move 5, RusturfTunnel_Movement_15CAC0 - waitmove 0 + applymovement 5, RusturfTunnel_Movement_15CAAC + waitmovement 0 + applymovement 255, RusturfTunnel_Movement_15CA9F + applymovement 5, RusturfTunnel_Movement_15CAC0 + waitmovement 0 msgbox RusturfTunnel_Text_19432A, 4 - move 5, RusturfTunnel_Movement_1A0839 - waitmove 0 + applymovement 5, RusturfTunnel_Movement_1A0839 + waitmovement 0 message RusturfTunnel_Text_19434F waittext waitse @@ -336,9 +336,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA waitbutton waitpokecry closebutton - move 5, RusturfTunnel_Movement_15CAB4 - move 7, RusturfTunnel_Movement_15CAC3 - waitmove 0 + applymovement 5, RusturfTunnel_Movement_15CAB4 + applymovement 7, RusturfTunnel_Movement_15CAC3 + waitmovement 0 disappear 5 disappear 7 clearflag 142 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index f1c37be5b..b735a87b2 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -10,10 +10,10 @@ SafariZone_Southeast_MapScript2_160041:: @ 8160041 SafariZone_Southeast_EventScript_16004B:: @ 816004B lockall setvar 0x4001, 0 - move 255, SafariZone_Southeast_Movement_160087 - waitmove 0 - move 1, SafariZone_Southeast_Movement_160089 - waitmove 0 + applymovement 255, SafariZone_Southeast_Movement_160087 + waitmovement 0 + applymovement 1, SafariZone_Southeast_Movement_160089 + waitmovement 0 movespriteperm 1, 32, 34 setvar 0x40a4, 0 releaseall @@ -76,18 +76,18 @@ SafariZone_Southeast_EventScript_1600E0:: @ 81600E0 end SafariZone_Southeast_EventScript_160105:: @ 8160105 - move 1, SafariZone_Southeast_Movement_160150 - waitmove 0 - move 255, SafariZone_Southeast_Movement_16014B - waitmove 0 + applymovement 1, SafariZone_Southeast_Movement_160150 + waitmovement 0 + applymovement 255, SafariZone_Southeast_Movement_16014B + waitmovement 0 goto SafariZone_Southeast_EventScript_160139 end SafariZone_Southeast_EventScript_16011F:: @ 816011F - move 1, SafariZone_Southeast_Movement_160153 - waitmove 0 - move 255, SafariZone_Southeast_Movement_16014D - waitmove 0 + applymovement 1, SafariZone_Southeast_Movement_160153 + waitmovement 0 + applymovement 255, SafariZone_Southeast_Movement_16014D + waitmovement 0 goto SafariZone_Southeast_EventScript_160139 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index fe13664d9..087c1caf7 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -18,10 +18,10 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar 0x8005, 3 setvar 0x8006, 4 setvar 0x8007, 5 - move 255, SeafloorCavern_Room9_Movement_1A0841 - waitmove 0 - move 255, SeafloorCavern_Room9_Movement_15DD68 - waitmove 0 + applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 + applymovement 255, SeafloorCavern_Room9_Movement_15DD68 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41B8, 4 .else @@ -29,24 +29,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .endif closebutton reappear 0x8004 - move 255, SeafloorCavern_Room9_Movement_1A083F - waitmove 0 - move 0x8004, SeafloorCavern_Room9_Movement_15DD36 - waitmove 0 + applymovement 255, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - move 0x8004, SeafloorCavern_Room9_Movement_1A0841 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - move 0x8004, SeafloorCavern_Room9_Movement_1A0839 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0839 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 .else @@ -92,24 +92,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare 388 playse 107 special sub_80818A4 - move 0x8004, SeafloorCavern_Room9_Movement_1A0841 - move 255, SeafloorCavern_Room9_Movement_1A0841 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement 255, SeafloorCavern_Room9_Movement_1A0841 + waitmovement 0 delay 150 disappear 7 reappear 1 waitstate delay 60 - move 1, SeafloorCavern_Room9_Movement_15DD4C - waitmove 0 + applymovement 1, SeafloorCavern_Room9_Movement_15DD4C + waitmovement 0 special sub_80818FC waitstate setvar 0x8004, 1 setvar 0x8005, 1 special sub_810F758 waitstate - move 1, SeafloorCavern_Room9_Movement_15DD57 - waitmove 0 + applymovement 1, SeafloorCavern_Room9_Movement_15DD57 + waitmovement 0 disappear 1 delay 4 setvar 0x8004, 2 @@ -127,16 +127,16 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4A89, 4 .endif playse 2 - move 255, SeafloorCavern_Room9_Movement_1A083F - waitmove 0 + applymovement 255, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4443, 4 .else msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closebutton - move 0x8004, SeafloorCavern_Room9_Movement_15DD41 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 .else @@ -145,8 +145,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closebutton playse 3 delay 20 - move 0x8004, SeafloorCavern_Room9_Movement_1A0845 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 .else @@ -156,22 +156,22 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA reappear 0x8005 reappear 0x8006 reappear 0x8007 - move 0x8007, SeafloorCavern_Room9_Movement_15DD63 - move 0x8006, SeafloorCavern_Room9_Movement_15DD63 - move 0x8005, SeafloorCavern_Room9_Movement_15DD5A - waitmove 0 - move 0x8004, SeafloorCavern_Room9_Movement_1A083F - waitmove 0 + applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 + applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 + applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A + waitmovement 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 .else msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse 21 - move 0x8004, SeafloorCavern_Room9_Movement_1A0833 - waitmove 0 - move 0x8004, SeafloorCavern_Room9_Movement_1A0835 - waitmove 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0833 + waitmovement 0 + applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0835 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 .else @@ -183,9 +183,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closebutton - move 0x8005, SeafloorCavern_Room9_Movement_15DD60 - move 0x8004, SeafloorCavern_Room9_Movement_15DD46 - waitmove 0 + applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 + applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 + waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 .else diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 69bd90d75..02ab6c28c 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -308,8 +308,8 @@ SlateportCity_EventScript_14BD3A:: @ 814BD3A faceplayer msgbox SlateportCity_Text_164C64, 4 closebutton - move 5, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 5, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -318,8 +318,8 @@ SlateportCity_EventScript_14BD51:: @ 814BD51 faceplayer msgbox SlateportCity_Text_164C9F, 4 closebutton - move 19, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 19, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -328,8 +328,8 @@ SlateportCity_EventScript_14BD68:: @ 814BD68 faceplayer msgbox SlateportCity_Text_164CE8, 4 closebutton - move 20, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 20, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -338,8 +338,8 @@ SlateportCity_EventScript_14BD7F:: @ 814BD7F faceplayer msgbox SlateportCity_Text_164D2B, 4 closebutton - move 27, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 27, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -348,8 +348,8 @@ SlateportCity_EventScript_14BD96:: @ 814BD96 faceplayer msgbox SlateportCity_Text_164D92, 4 closebutton - move 28, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 28, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -358,8 +358,8 @@ SlateportCity_EventScript_14BDAD:: @ 814BDAD faceplayer msgbox SlateportCity_Text_164DD5, 4 closebutton - move 29, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 29, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -368,8 +368,8 @@ SlateportCity_EventScript_14BDC4:: @ 814BDC4 faceplayer msgbox SlateportCity_Text_164DF4, 4 closebutton - move 30, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 30, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -378,8 +378,8 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB faceplayer msgbox SlateportCity_Text_164E46, 4 closebutton - move 31, SlateportCity_Movement_1A083D - waitmove 0 + applymovement 31, SlateportCity_Movement_1A083D + waitmovement 0 release end @@ -491,47 +491,47 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC msgbox SlateportCity_Text_165498, 4 msgbox SlateportCity_Text_1654E0, 4 closebutton - move 10, SlateportCity_Movement_1A0843 - waitmove 0 + applymovement 10, SlateportCity_Movement_1A0843 + waitmovement 0 delay 10 - move 9, SlateportCity_Movement_1A0845 - waitmove 0 + applymovement 9, SlateportCity_Movement_1A0845 + waitmovement 0 delay 25 - move 11, SlateportCity_Movement_14C000 - move 255, SlateportCity_Movement_14C00E - move 10, SlateportCity_Movement_14BFDD - move 9, SlateportCity_Movement_14BFEA - waitmove 0 + applymovement 11, SlateportCity_Movement_14C000 + applymovement 255, SlateportCity_Movement_14C00E + applymovement 10, SlateportCity_Movement_14BFDD + applymovement 9, SlateportCity_Movement_14BFEA + waitmovement 0 disappear 10 disappear 9 msgbox SlateportCity_Text_16558D, 4 - move 11, SlateportCity_Movement_1A0841 - waitmove 0 + applymovement 11, SlateportCity_Movement_1A0841 + waitmovement 0 msgbox SlateportCity_Text_1655E7, 4 playbgm BGM_EVIL_TEAM, 0 msgbox SlateportCity_Text_1656BC, 4 - move 6, SlateportCity_Movement_1A083F - move 1, SlateportCity_Movement_1A083F - move 7, SlateportCity_Movement_14BFCD - move 3, SlateportCity_Movement_1A0831 - move 2, SlateportCity_Movement_14BFD5 - waitmove 0 - move 11, SlateportCity_Movement_1A0845 - waitmove 0 + applymovement 6, SlateportCity_Movement_1A083F + applymovement 1, SlateportCity_Movement_1A083F + applymovement 7, SlateportCity_Movement_14BFCD + applymovement 3, SlateportCity_Movement_1A0831 + applymovement 2, SlateportCity_Movement_14BFD5 + waitmovement 0 + applymovement 11, SlateportCity_Movement_1A0845 + waitmovement 0 msgbox SlateportCity_Text_16578F, 4 playse 21 - move 11, SlateportCity_Movement_1A0833 - waitmove 0 - move 11, SlateportCity_Movement_1A0835 - waitmove 0 + applymovement 11, SlateportCity_Movement_1A0833 + waitmovement 0 + applymovement 11, SlateportCity_Movement_1A0835 + waitmovement 0 msgbox SlateportCity_Text_1657FA, 4 - move 11, SlateportCity_Movement_1A0839 - waitmove 0 + applymovement 11, SlateportCity_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_Text_16583A, 4 closebutton - move 11, SlateportCity_Movement_14BFFB - move 255, SlateportCity_Movement_14C008 - waitmove 0 + applymovement 11, SlateportCity_Movement_14BFFB + applymovement 255, SlateportCity_Movement_14C008 + waitmovement 0 disappear 11 clearflag 841 clearflag 848 diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index d30089fbb..74eaf27fe 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -31,80 +31,80 @@ SlateportCity_ContestHall_EventScript_155595:: @ 8155595 SlateportCity_ContestHall_EventScript_15559F:: @ 815559F msgbox SlateportCity_ContestHall_Text_17CEF3, 2 lockall - move 3, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 3, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555B4:: @ 81555B4 msgbox SlateportCity_ContestHall_Text_17CFA7, 2 lockall - move 4, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 4, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555C9:: @ 81555C9 msgbox SlateportCity_ContestHall_Text_17D054, 2 lockall - move 5, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 5, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555DE:: @ 81555DE msgbox SlateportCity_ContestHall_Text_17D07F, 2 lockall - move 6, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 6, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_1555F3:: @ 81555F3 msgbox SlateportCity_ContestHall_Text_17D0F9, 2 lockall - move 7, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 7, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_155608:: @ 8155608 msgbox SlateportCity_ContestHall_Text_17D222, 2 lockall - move 8, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 8, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_15561D:: @ 815561D msgbox SlateportCity_ContestHall_Text_17D39A, 2 lockall - move 9, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 9, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_155632:: @ 8155632 msgbox SlateportCity_ContestHall_Text_17D3F0, 2 lockall - move 10, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 10, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_155647:: @ 8155647 msgbox SlateportCity_ContestHall_Text_17D300, 2 lockall - move 12, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 12, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_ContestHall_EventScript_15565C:: @ 815565C msgbox SlateportCity_ContestHall_Text_17D27F, 2 lockall - move 11, SlateportCity_ContestHall_Movement_1A083D - waitmove 0 + applymovement 11, SlateportCity_ContestHall_Movement_1A083D + waitmovement 0 releaseall end diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 0f2d03a5a..c43b64288 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -20,28 +20,28 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall - move 1, SlateportCity_ContestLobby_Movement_1554CC - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554CC + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, SlateportCity_ContestLobby_Movement_1554CF - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554CF + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, SlateportCity_ContestLobby_Movement_1554DC - waitmove 0 - move 255, SlateportCity_ContestLobby_Movement_1554CA - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554DC + waitmovement 0 + applymovement 255, SlateportCity_ContestLobby_Movement_1554CA + waitmovement 0 msgbox SlateportCity_ContestLobby_Text_1A6832, 4 closebutton - move 1, SlateportCity_ContestLobby_Movement_1554D3 - move 255, SlateportCity_ContestLobby_Movement_1554C0 - waitmove 0 + applymovement 1, SlateportCity_ContestLobby_Movement_1554D3 + applymovement 255, SlateportCity_ContestLobby_Movement_1554C0 + waitmovement 0 releaseall return @@ -103,8 +103,8 @@ SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall checkflag 95 goto_if_eq SlateportCity_ContestLobby_EventScript_155526 - move 7, SlateportCity_ContestLobby_Movement_1A0839 - waitmove 0 + applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 giveitem ITEM_POKEBLOCK_CASE setflag 95 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 802906f25..0e0b5da1f 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -43,22 +43,22 @@ SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall setvar 0x8008, 3 - move 255, SlateportCity_Harbor_Movement_1560C2 - waitmove 0 + applymovement 255, SlateportCity_Harbor_Movement_1560C2 + waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 - move 7, SlateportCity_Harbor_Movement_1A0845 - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement 7, SlateportCity_Harbor_Movement_1A0845 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0841 + waitmovement 0 msgbox SlateportCity_Harbor_Text_17FD7D, 4 closebutton - move 6, SlateportCity_Harbor_Movement_15609B - move 7, SlateportCity_Harbor_Movement_15609B - move 8, SlateportCity_Harbor_Movement_1560A5 - waitmove 0 + applymovement 6, SlateportCity_Harbor_Movement_15609B + applymovement 7, SlateportCity_Harbor_Movement_15609B + applymovement 8, SlateportCity_Harbor_Movement_1560A5 + waitmovement 0 disappear 6 disappear 7 disappear 8 @@ -81,24 +81,24 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 end SlateportCity_Harbor_EventScript_15605C:: @ 815605C - move 4, SlateportCity_Harbor_Movement_1560B3 - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0845 - waitmove 0 + applymovement 4, SlateportCity_Harbor_Movement_1560B3 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0845 + waitmovement 0 return SlateportCity_Harbor_EventScript_156071:: @ 8156071 - move 4, SlateportCity_Harbor_Movement_1560B9 - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0843 - waitmove 0 + applymovement 4, SlateportCity_Harbor_Movement_1560B9 + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0843 + waitmovement 0 return SlateportCity_Harbor_EventScript_156086:: @ 8156086 - move 4, SlateportCity_Harbor_Movement_1560BE - waitmove 0 - move 255, SlateportCity_Harbor_Movement_1A0843 - waitmove 0 + applymovement 4, SlateportCity_Harbor_Movement_1560BE + waitmovement 0 + applymovement 255, SlateportCity_Harbor_Movement_1A0843 + waitmovement 0 return SlateportCity_Harbor_Movement_15609B:: @ 815609B @@ -219,8 +219,8 @@ SlateportCity_Harbor_EventScript_15618A:: @ 815618A SlateportCity_Harbor_EventScript_156196:: @ 8156196 msgbox SlateportCity_Harbor_Text_17FBB6, 4 closebutton - move LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 - waitmove 0 + applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 + waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 9, 8 compare_var_to_imm FACING, 2 @@ -239,13 +239,13 @@ SlateportCity_Harbor_EventScript_1561DA:: @ 81561DA end SlateportCity_Harbor_EventScript_1561E4:: @ 81561E4 - move 255, SlateportCity_Harbor_Movement_1561FA - waitmove 0 + applymovement 255, SlateportCity_Harbor_Movement_1561FA + waitmovement 0 return SlateportCity_Harbor_EventScript_1561EF:: @ 81561EF - move 255, SlateportCity_Harbor_Movement_1561FD - waitmove 0 + applymovement 255, SlateportCity_Harbor_Movement_1561FD + waitmovement 0 return SlateportCity_Harbor_Movement_1561FA:: @ 81561FA @@ -278,8 +278,8 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton - move LAST_TALKED, SlateportCity_Harbor_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 0c75b2b9d..575538286 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -18,15 +18,15 @@ SlateportCity_OceanicMuseum_1F_EventScript_155ADB:: @ 8155ADB SlateportCity_OceanicMuseum_1F_EventScript_155AE4:: @ 8155AE4 lockall - move 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A083F + waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 lockall - move 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_1A0843 + waitmovement 0 goto SlateportCity_OceanicMuseum_1F_EventScript_155B06 end @@ -38,8 +38,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 - move 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + waitmovement 0 releaseall end @@ -62,8 +62,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closebutton hidemoney 0, 0 - move 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D + waitmovement 0 releaseall end @@ -159,10 +159,10 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A faceplayer delay 8 playse 21 - move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 - waitmove 0 - move 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 - waitmove 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 + waitmovement 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 compare_var_to_imm RESULT, 0 @@ -177,8 +177,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A end SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 - move 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 - waitmove 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 + waitmovement 0 setflag 965 playse 9 disappear 13 @@ -186,8 +186,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 end SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD - move 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC - waitmove 0 + applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC + waitmovement 0 setflag 965 playse 9 disappear 13 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 709d3f1d6..1f6aa3c2d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -13,14 +13,14 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closebutton playbgm BGM_EVIL_TEAM, 1 reappear 3 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 - waitmove 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 + waitmovement 0 reappear 4 - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 - waitmove 0 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 - waitmove 0 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 + waitmovement 0 compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 compare_var_to_imm FACING, 4 @@ -31,8 +31,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 - waitmove 0 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + waitmovement 0 compare_var_to_imm FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare_var_to_imm FACING, 3 @@ -40,28 +40,28 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closebutton - move 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF - waitmove 0 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 - waitmove 0 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEA5, 4 savebgm 0 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_2, 0, SlateportCity_OceanicMuseum_2F_Text_17EED6 - move 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF - waitmove 0 - move 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 - move 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 - waitmove 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EBF + waitmovement 0 + applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_1A0845 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 closebutton delay 35 reappear 2 - move 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 - move 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE - waitmove 0 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 + applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EF62, 4 - move 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6 - waitmove 0 + applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA6 + waitmovement 0 .ifdef SAPPHIRE msgbox SlateportCity_OceanicMuseum_2F_Text_17EFC9, 4 .else @@ -75,15 +75,15 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 fadescreen 0 delay 30 setflag 883 - move 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 + waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 setvar 0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closebutton - move 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 - waitmove 0 + applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 + waitmovement 0 playse 9 disappear 1 setflag 900 @@ -94,23 +94,23 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 end SlateportCity_OceanicMuseum_2F_EventScript_155E62:: @ 8155E62 - move 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A083F + waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E6D:: @ 8155E6D - move 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F - waitmove 0 + applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_1A083F + waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E78:: @ 8155E78 - move 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E8E + waitmovement 0 return SlateportCity_OceanicMuseum_2F_EventScript_155E83:: @ 8155E83 - move 255, SlateportCity_OceanicMuseum_2F_Movement_155E92 - waitmove 0 + applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_155E92 + waitmovement 0 return SlateportCity_OceanicMuseum_2F_Movement_155E8E:: @ 8155E8E @@ -266,7 +266,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4 closebutton - move LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D - waitmove 0 + applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 80ee23d43..882e865ee 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -207,10 +207,10 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A playse 21 - move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 - waitmove 0 - move LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 - waitmove 0 + applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 + waitmovement 0 + applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 + waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL compare_var_to_imm RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index d585fb94c..3c988d084 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -12,44 +12,44 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 checkflag 148 goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, 4 closebutton - move 1, SlateportCity_SternsShipyard_1F_Movement_1A083D - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + waitmovement 0 setflag 148 setflag 882 releaseall end SlateportCity_SternsShipyard_1F_EventScript_155388:: @ 8155388 - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C472, 4 releaseall end SlateportCity_SternsShipyard_1F_EventScript_15539C:: @ 815539C - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C3F7, 4 releaseall end SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0 - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, 4 closebutton - move 1, SlateportCity_SternsShipyard_1F_Movement_1A083D - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D + waitmovement 0 releaseall end SlateportCity_SternsShipyard_1F_EventScript_1553CF:: @ 81553CF - move 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 - waitmove 0 + applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 + waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C360, 4 releaseall end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 14bece069..6006ac2ef 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -213,35 +213,35 @@ ClosedSootopolisGymDoorScript:: @ 814D2FF SootopolisCity_EventScript_14D308:: @ 814D308 lockall - move 10, SootopolisCity_Movement_1A083F - move 255, SootopolisCity_Movement_1A0843 - waitmove 0 + applymovement 10, SootopolisCity_Movement_1A083F + applymovement 255, SootopolisCity_Movement_1A0843 + waitmovement 0 playse 21 - move 10, SootopolisCity_Movement_1A0833 - waitmove 0 - move 10, SootopolisCity_Movement_1A0835 - waitmove 0 - move 10, SootopolisCity_Movement_14D413 - waitmove 0 + applymovement 10, SootopolisCity_Movement_1A0833 + waitmovement 0 + applymovement 10, SootopolisCity_Movement_1A0835 + waitmovement 0 + applymovement 10, SootopolisCity_Movement_14D413 + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169988, 4 .else msgbox SootopolisCity_Text_169E0F, 4 .endif closebutton - move 10, SootopolisCity_Movement_14D417 - move 255, SootopolisCity_Movement_14D440 - waitmove 10 + applymovement 10, SootopolisCity_Movement_14D417 + applymovement 255, SootopolisCity_Movement_14D440 + waitmovement 10 .ifdef SAPPHIRE msgbox SootopolisCity_Text_1699FD, 4 .else msgbox SootopolisCity_Text_169E82, 4 .endif playse 21 - move 5, SootopolisCity_Movement_1A0833 - waitmove 0 - move 5, SootopolisCity_Movement_1A0835 - waitmove 0 + applymovement 5, SootopolisCity_Movement_1A0833 + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A0835 + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169AB7, 4 .else @@ -249,16 +249,16 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .endif closebutton delay 30 - move 5, SootopolisCity_Movement_14D46A - move 10, SootopolisCity_Movement_14D41D - move 255, SootopolisCity_Movement_14D445 - waitmove 0 - move 5, SootopolisCity_Movement_1A0843 - move 255, SootopolisCity_Movement_1A0843 - waitmove 0 + applymovement 5, SootopolisCity_Movement_14D46A + applymovement 10, SootopolisCity_Movement_14D41D + applymovement 255, SootopolisCity_Movement_14D445 + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A0843 + applymovement 255, SootopolisCity_Movement_1A0843 + waitmovement 0 delay 30 - move 10, SootopolisCity_Movement_1A0845 - waitmove 0 + applymovement 10, SootopolisCity_Movement_1A0845 + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169AE7, 4 .else @@ -266,19 +266,19 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .endif closebutton delay 30 - move 5, SootopolisCity_Movement_14D47C - move 255, SootopolisCity_Movement_14D457 - move 10, SootopolisCity_Movement_14D42D - waitmove 0 - move 5, SootopolisCity_Movement_1A083F - waitmove 0 + applymovement 5, SootopolisCity_Movement_14D47C + applymovement 255, SootopolisCity_Movement_14D457 + applymovement 10, SootopolisCity_Movement_14D42D + waitmovement 0 + applymovement 5, SootopolisCity_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169BC7, 4 .else msgbox SootopolisCity_Text_16A06C, 4 .endif - move 255, SootopolisCity_Movement_1A083F - waitmove 0 + applymovement 255, SootopolisCity_Movement_1A083F + waitmovement 0 .ifdef SAPPHIRE msgbox SootopolisCity_Text_169C99, 4 .else @@ -458,8 +458,8 @@ SootopolisCity_EventScript_14D498:: @ 814D498 SootopolisCity_EventScript_14D4AD:: @ 814D4AD msgbox SootopolisCity_Text_16A33E, 4 closebutton - move LAST_TALKED, SootopolisCity_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 + waitmovement 0 delay 50 setanimation 0, 1 doanimation 30 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 1df729aad..d6c7958b6 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -73,8 +73,8 @@ SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 lockall delay 20 - move 255, SootopolisCity_Gym_1F_Movement_15AFFD - waitmove 0 + applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD + waitmovement 0 playse 43 delay 60 warphole SootopolisCity_Gym_B1F diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 2965b6748..a45b0b556 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -14,8 +14,8 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton - move LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 - waitmove 0 + applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 + waitmovement 0 delay 30 spriteinvisible 1, 26, 9 setvar 0x8004, 2 @@ -31,13 +31,13 @@ SouthernIsland_Exterior_EventScript_160B25:: @ 8160B25 end BattleTower_Outside_EventScript_160B2F:: @ 8160B2F - move 255, BattleTower_Outside_Movement_160B45 - waitmove 0 + applymovement 255, BattleTower_Outside_Movement_160B45 + waitmovement 0 return BattleTower_Outside_EventScript_160B3A:: @ 8160B3A - move 255, BattleTower_Outside_Movement_160B47 - waitmove 0 + applymovement 255, BattleTower_Outside_Movement_160B47 + waitmovement 0 return BattleTower_Outside_Movement_160B45:: @ 8160B45 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index e50b29d76..d30f8cee4 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -50,8 +50,8 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag 206 special SpawnCameraDummy - move 127, SouthernIsland_Interior_Movement_160C12 - waitmove 0 + applymovement 127, SouthernIsland_Interior_Movement_160C12 + waitmovement 0 delay 50 waitse pokecry SPECIES_LATIAS_OR_LATIOS, 0 @@ -59,9 +59,9 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 waitpokecry reappear 2 delay 30 - move 127, SouthernIsland_Interior_Movement_160C16 - move 2, SouthernIsland_Interior_Movement_160C22 - waitmove 0 + applymovement 127, SouthernIsland_Interior_Movement_160C16 + applymovement 2, SouthernIsland_Interior_Movement_160C22 + waitmovement 0 delay 50 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index 66aa080ba..3e8f02302 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -14,15 +14,15 @@ VerdanturfTown_EventScript_14E866:: @ 814E866 checkflag 199 goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 - move 2, VerdanturfTown_Movement_1A083D - waitmove 0 + applymovement 2, VerdanturfTown_Movement_1A083D + waitmovement 0 release end VerdanturfTown_EventScript_14E885:: @ 814E885 msgbox VerdanturfTown_Text_16CBCE, 4 - move 2, VerdanturfTown_Movement_1A083D - waitmove 0 + applymovement 2, VerdanturfTown_Movement_1A083D + waitmovement 0 release end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index e3aa13eb2..52de0db78 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -20,28 +20,28 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall - move 1, VerdanturfTown_ContestLobby_Movement_153E25 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 + waitmovement 0 playse 71 setmaptile 4, 2, 545, 1 setmaptile 4, 3, 609, 1 special DrawWholeMapView - move 1, VerdanturfTown_ContestLobby_Movement_153E28 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 + waitmovement 0 playse 71 setmaptile 4, 2, 721, 1 setmaptile 4, 3, 729, 1 special DrawWholeMapView delay 20 - move 1, VerdanturfTown_ContestLobby_Movement_153E35 - waitmove 0 - move 255, VerdanturfTown_ContestLobby_Movement_153E23 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 + waitmovement 0 + applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23 + waitmovement 0 msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4 closebutton - move 1, VerdanturfTown_ContestLobby_Movement_153E2C - move 255, VerdanturfTown_ContestLobby_Movement_153E19 - waitmove 0 + applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C + applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19 + waitmovement 0 releaseall return diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 78c246eb0..7bbcf6a41 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -14,30 +14,30 @@ VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 lockall reappear 4 - move 4, VictoryRoad_1F_Movement_15DF07 - waitmove 0 + applymovement 4, VictoryRoad_1F_Movement_15DF07 + waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB lockall reappear 4 - move 4, VictoryRoad_1F_Movement_15DF13 - waitmove 0 + applymovement 4, VictoryRoad_1F_Movement_15DF13 + waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF lockall reappear 4 - move 4, VictoryRoad_1F_Movement_15DF1E - waitmove 0 + applymovement 4, VictoryRoad_1F_Movement_15DF1E + waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 end VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 - move 255, VictoryRoad_1F_Movement_1A083F - waitmove 0 + applymovement 255, VictoryRoad_1F_Movement_1A083F + waitmovement 0 msgbox VictoryRoad_1F_Text_19782B, 4 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 -- cgit v1.2.3 From 9458b3fad18eea3fbd9168a88dd33e8aa10abcda Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:09:41 -0500 Subject: single compare macro --- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 8 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 16 +- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 +- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 30 ++-- data/scripts/maps/BattleTower_Outside.inc | 6 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DewfordTown.inc | 20 +-- data/scripts/maps/DewfordTown_Gym.inc | 18 +-- data/scripts/maps/DewfordTown_Hall.inc | 24 +-- data/scripts/maps/DewfordTown_House2.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 12 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 6 +- data/scripts/maps/FallarborTown_House2.inc | 10 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 6 +- data/scripts/maps/FortreeCity_House2.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/InsideOfTruck.inc | 4 +- data/scripts/maps/JaggedPass.inc | 6 +- data/scripts/maps/LavaridgeTown.inc | 52 +++---- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 18 +-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 42 ++--- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 30 ++-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 16 +- data/scripts/maps/LilycoveCity_House2.inc | 2 +- data/scripts/maps/LilycoveCity_House3.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 8 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 76 ++++----- data/scripts/maps/LittlerootTown.inc | 96 ++++++------ .../maps/LittlerootTown_BrendansHouse_1F.inc | 10 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 12 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 16 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 28 ++-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 28 ++-- data/scripts/maps/MauvilleCity.inc | 8 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 16 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 86 +++++------ data/scripts/maps/MauvilleCity_Gym.inc | 12 +- data/scripts/maps/MauvilleCity_House2.inc | 6 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 28 ++-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 6 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 8 +- data/scripts/maps/MtChimney.inc | 12 +- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 36 ++--- data/scripts/maps/NewMauville_Entrance.inc | 6 +- data/scripts/maps/NewMauville_Inside.inc | 8 +- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House2.inc | 10 +- data/scripts/maps/PacifidlogTown_House3.inc | 6 +- data/scripts/maps/PacifidlogTown_House4.inc | 4 +- data/scripts/maps/PacifidlogTown_House5.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 20 +-- data/scripts/maps/PetalburgCity_Gym.inc | 170 ++++++++++----------- .../maps/PetalburgCity_PokemonCenter_1F.inc | 8 +- data/scripts/maps/PetalburgWoods.inc | 6 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 12 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 10 +- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 8 +- data/scripts/maps/Route109_SeashoreHouse.inc | 8 +- data/scripts/maps/Route110.inc | 42 ++--- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 8 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 ++-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 120 +++++++-------- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 10 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 42 ++--- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 102 ++++++------- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 6 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 2 +- data/scripts/maps/Route111.inc | 34 ++--- data/scripts/maps/Route111_OldLadysRestStop.inc | 8 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 52 +++---- data/scripts/maps/Route114.inc | 8 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 4 +- data/scripts/maps/Route114_LanettesHouse.inc | 6 +- data/scripts/maps/Route115.inc | 6 +- data/scripts/maps/Route116.inc | 28 ++-- data/scripts/maps/Route117.inc | 12 +- data/scripts/maps/Route118.inc | 14 +- data/scripts/maps/Route119.inc | 34 ++--- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +- data/scripts/maps/Route120.inc | 40 ++--- data/scripts/maps/Route121.inc | 4 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 12 +- data/scripts/maps/Route123.inc | 8 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 32 ++-- data/scripts/maps/Route124.inc | 6 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 20 +-- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/RustboroCity.inc | 28 ++-- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 34 ++--- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 4 +- data/scripts/maps/RustboroCity_House1.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 6 +- data/scripts/maps/RusturfTunnel.inc | 24 +-- data/scripts/maps/SSTidalCorridor.inc | 12 +- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 20 +-- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 12 +- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 4 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 2 +- data/scripts/maps/SlateportCity.inc | 24 +-- data/scripts/maps/SlateportCity_ContestHall.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 34 ++--- data/scripts/maps/SlateportCity_House1.inc | 20 +-- data/scripts/maps/SlateportCity_House2.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 10 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 28 ++-- data/scripts/maps/SootopolisCity.inc | 14 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House3.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SootopolisCity_House8.inc | 20 +-- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 18 +-- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- 171 files changed, 1193 insertions(+), 1193 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 97871a9f5..eb912028a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 checkflag 294 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 checkflag 1078 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 85531be99..f3c3c0aa0 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 checkflag 239 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index fe833b47c..29a89a620 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 checkflag 240 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A checkflag 241 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 checkflag 242 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 @@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 checkflag 243 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 4f3e0f099..cc9074e35 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 setvar 0x4001, 1 getplayerxy 0x4002, 0x4003 setvar 0x4004, 1 - compare_var_to_imm 0x4002, 21 + compare 0x4002, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare_var_to_imm 0x4002, 36 + compare 0x4002, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare_var_to_imm 0x4003, 2 + compare 0x4003, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch 0x4004 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B @@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4D4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B checkanimation 54 delay 10 @@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 specialvar RESULT, sub_810F488 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B checkanimation 54 delay 10 @@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4FC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B checkanimation 54 delay 10 @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setanimation 2, 0 doanimation 54 specialvar RESULT, sub_810F4B0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B checkanimation 54 delay 10 diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 4feecded6..5e8ab1062 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 end @@ -17,7 +17,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 end diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 26570cd66..9d4fbc844 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmaptile 12, 0, 519, 0 setmaptile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar 0x4000, 1 - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index bd4f4ecd1..61b2da5e7 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -18,7 +18,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C checkflag 237 goto_if_eq BattleTower_Lobby_EventScript_1602CD specialvar 0x8007, sub_810F404 - compare_var_to_imm 0x8007, 50 + compare 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -26,7 +26,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar 0x8007, sub_810F404 - compare_var_to_imm 0x8007, 100 + compare 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag 941 special sub_810F8FC @@ -77,10 +77,10 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 waittext setvar 0x8004, 0 special sub_81358A4 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special sub_8135E50 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waittext @@ -91,7 +91,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar 0x8004, 8 special sub_81358A4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waittext @@ -118,7 +118,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitfanfare setvar 0x8004, 9 special sub_81358A4 - compare_var_to_imm RESULT, 49 + compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -186,7 +186,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E faceplayer setvar 0x8004, 0 special sub_81358A4 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty msgbox BattleTower_Lobby_Text_199F2C, 4 @@ -209,7 +209,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D setvar 0x8004, 1 copyvar 0x8005, RESULT @@ -219,7 +219,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA fadescreen 1 special ChooseBattleTowerPlayerParty waitstate - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F msgbox BattleTower_Lobby_Text_199FDA, 5 switch RESULT @@ -245,7 +245,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 call S_DoSaveDialog setvar 0x4000, 5 hidebox 0, 0, 15, 10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty @@ -347,9 +347,9 @@ BattleTower_Lobby_EventScript_1606CC:: @ 81606CC call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160701 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_16070B end @@ -394,7 +394,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, 42 givedecoration 42 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 237 msgbox BattleTower_Lobby_Text_19ABAA, 4 @@ -403,12 +403,12 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialvar RESULT, sub_810F404 - compare_var_to_imm RESULT, 100 + compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, 43 givedecoration 43 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag 238 msgbox BattleTower_Lobby_Text_19ABAA, 4 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 2f88db2db..f577f39fa 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -13,7 +13,7 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 faceplayer msgbox BattleTower_Outside_Text_199D06, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D waittext @@ -36,7 +36,7 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 BattleTower_Outside_EventScript_1601D0:: @ 81601D0 msgbox BattleTower_Outside_Text_199DF2, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -47,7 +47,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 BattleTower_Outside_EventScript_1601FB:: @ 81601FB msgbox BattleTower_Outside_Text_199E0E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 4d27844a7..dcd97f069 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -66,7 +66,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 waitstate clearflag 2145 specialvar RESULT, sub_810E300 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag 816 setflag 855 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index f8265d1cf..09835c0b9 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -43,7 +43,7 @@ DewfordTown_EventScript_14E06B:: @ 814E06B DewfordTown_EventScript_14E076:: @ 814E076 msgbox DewfordTown_Text_16B3BC, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -77,9 +77,9 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 checkflag 257 goto_if_eq DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E0F0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E111 end @@ -100,9 +100,9 @@ DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E waittext multichoice 20, 8, 50, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E147 end @@ -599,9 +599,9 @@ DewfordTown_EventScript_14E413:: @ 814E413 faceplayer call DewfordTown_EventScript_1A0102 msgbox DewfordTown_Text_16B9CE, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E439 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E443 end @@ -616,15 +616,15 @@ DewfordTown_EventScript_14E443:: @ 814E443 call DewfordTown_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_EventScript_14E46E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E485 end DewfordTown_EventScript_14E46E:: @ 814E46E inccounter GAME_STAT_STARTED_TRENDS - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 8f57e549a..034bca1bc 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -11,11 +11,11 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar 0x8001, 0x8000 - compare_var_to_imm 0x8000, 0 + compare 0x8000, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare_var_to_imm 0x8000, 1 + compare 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare_var_to_imm 0x8000, 2 + compare 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare_var_to_var 0x8000, 0x8001 + compare 0x8000, 0x8001 goto_if_eq DewfordTown_Gym_EventScript_1530F5 copyvar 0x8001, 0x8000 - compare_var_to_imm 0x8000, 1 + compare 0x8000, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare_var_to_imm 0x8000, 2 + compare 0x8000, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare_var_to_imm 0x8000, 3 + compare 0x8000, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -115,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag 1204 setflag 2056 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 @@ -124,7 +124,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 giveitem ITEM_TM08 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 setflag 166 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 0b19ef92d..78b5f5044 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -6,7 +6,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 faceplayer call DewfordTown_Hall_EventScript_1A0102 special sub_80FA5E4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 release @@ -31,9 +31,9 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD call DewfordTown_Hall_EventScript_1A0102 special sub_80EB83C msgbox DewfordTown_Hall_Text_1755F9, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_153300 end @@ -191,14 +191,14 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end DewfordTown_Hall_EventScript_15351E:: @ 815351E - compare_var_to_imm FACING, 4 + compare FACING, 4 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A0843 waitmovement 0 @@ -210,16 +210,16 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end DewfordTown_Hall_EventScript_153556:: @ 8153556 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, DewfordTown_Hall_EventScript_15356D - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, DewfordTown_Hall_EventScript_153578 return @@ -234,7 +234,7 @@ DewfordTown_Hall_EventScript_153578:: @ 8153578 return DewfordTown_Hall_EventScript_153583:: @ 8153583 - compare_var_to_imm FACING, 3 + compare FACING, 3 goto_if_eq DewfordTown_Hall_EventScript_1534FC applymovement 255, DewfordTown_Hall_Movement_1A083F waitmovement 0 @@ -256,7 +256,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag 230 release diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index b3b3eef34..befe47404 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -8,7 +8,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag 289 release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 45df01e78..669da34f9 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -53,16 +53,16 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 closebutton playse 8 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 reappear 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B8BB end @@ -128,9 +128,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closebutton applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index a283c4c2a..ee171824f 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag 1248 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare_var_to_imm 0x409c, 4 + compare 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index f00f82f2e..8ebf7939f 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag 1247 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare_var_to_imm 0x409c, 3 + compare 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 0bb327fd4..d0fb7922f 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -44,9 +44,9 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC4D end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 2b5266ade..b8fe90a01 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -26,7 +26,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag 1246 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare_var_to_imm 0x409c, 2 + compare 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 93f9c5fcb..f15f05904 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -50,9 +50,9 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 checkflag 263 goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4000, 11 + compare 0x4000, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waittext diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 564b2b806..3f472ca3f 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag 1245 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare_var_to_imm 0x409c, 1 + compare 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 1971593cb..0228fe25d 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -11,7 +11,7 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA msgbox FallarborTown_House1_Text_177755, 4 release @@ -22,11 +22,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag 2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem ITEM_TM27 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index f25f02da5..3b215a697 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -14,7 +14,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 msgbox FallarborTown_House2_Text_177BDB, 5 switch RESULT @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 removeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index c63273d5b..e0bac8007 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -57,7 +57,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 lock faceplayer checkitem ITEM_DEVON_SCOPE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9CF msgbox FortreeCity_Text_167868, 4 release @@ -65,7 +65,7 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 FortreeCity_EventScript_14C9CF:: @ 814C9CF msgbox FortreeCity_Text_16788B, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index d601aabab..8744141cb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -37,7 +37,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E giveitem ITEM_TM40 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 setflag 170 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index d21b82e51..3809e1f01 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -11,17 +11,17 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox FortreeCity_House1_Text_18568C, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ce1dd2344..f210dd3ac 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -22,7 +22,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 giveitem ITEM_TM10 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag 264 msgbox FortreeCity_House2_Text_18652F, 4 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f13b29249..f7f8391d4 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -35,7 +35,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 giveitem ITEM_MENTAL_HERB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag 223 releaseall diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index ed6a1a784..06f234f28 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -10,17 +10,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA setflag 189 msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playse 9 disappear 1 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index e5782b63e..7a13cbe78 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -17,9 +17,9 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag 0x4000 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq InsideOfTruck_EventScript_15FC68 end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 98b367006..6f910d0ad 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare_var_to_imm 0x40bd, 1 + compare 0x40bd, 1 call_if 1, JaggedPass_EventScript_15D280 end @@ -25,7 +25,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 end @@ -38,7 +38,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index d35fcaae5..d24280efa 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare_var_to_imm 0x4053, 2 + compare 0x4053, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -44,16 +44,16 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED applymovement 8, LavaridgeTown_Movement_1A0835 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -70,14 +70,14 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 faceplayer setvar 0x8008, 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E5D0 end @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closebutton - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E disappear 8 reappear 7 delay 30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 disappear 7 setvar 0x4053, 2 savebgm 0 fadedefaultbgm - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end @@ -128,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 return LavaridgeTown_EventScript_14E64E:: @ 814E64E - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LavaridgeTown_EventScript_14E67B - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, LavaridgeTown_EventScript_14E680 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LavaridgeTown_EventScript_14E685 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LavaridgeTown_EventScript_14E68A return @@ -165,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A return LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, LavaridgeTown_EventScript_14E6D2 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LavaridgeTown_EventScript_14E6DD - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LavaridgeTown_EventScript_14E6D2 return @@ -237,7 +237,7 @@ LavaridgeTown_Movement_14E70E:: @ 814E70E LavaridgeTown_EventScript_14E710:: @ 814E710 specialvar RESULT, player_get_direction_lower_nybble - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LavaridgeTown_EventScript_14E721 end @@ -275,10 +275,10 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A checkflag 266 goto_if_eq LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag 266 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 68f93443a..e22d4471f 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -84,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag 1213 setflag 2058 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 @@ -95,7 +95,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 giveitem ITEM_TM50 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 setflag 168 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index bf148186a..c924684bc 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -32,7 +32,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag 254 release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b8410429b..7031eb530 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -70,7 +70,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 random 10 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag 2255 msgbox LilycoveCity_Text_1C5B1D, 4 @@ -248,9 +248,9 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_EventScript_14CDD3 end @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag 286 call_if 0, LilycoveCity_EventScript_14CDB9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch 0x4023 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag 286 call_if 0, LilycoveCity_EventScript_14CE2C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch 0x4023 @@ -351,9 +351,9 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag 722 clearflag 849 @@ -388,9 +388,9 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 setvar RESULT, 0 checkflag 2060 call_if 1, LilycoveCity_EventScript_14CEDE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 clearflag 760 goto LilycoveCity_EventScript_14CF6B diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index d775fd440..1020e9d2b 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -31,9 +31,9 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 showcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -44,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 @@ -56,7 +56,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -205,9 +205,9 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A fadescreen 1 showcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -217,7 +217,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 @@ -229,7 +229,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closebutton @@ -305,7 +305,7 @@ LilycoveCity_ContestLobby_Movement_158B7C:: @ 8158B7C LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 lockall checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA checkflag 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE @@ -328,11 +328,11 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog hidebox 0, 0, 15, 9 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 return @@ -361,18 +361,18 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestpkmn - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C96 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CC0 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CA4 - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CB2 end @@ -420,11 +420,11 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 copyvar 0x8004, RESULT special sub_808363C waitstate - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq LilycoveCity_ContestLobby_EventScript_158D90 - compare_var_to_imm RESULT, 5 + compare RESULT, 5 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A waittext @@ -569,7 +569,7 @@ LilycoveCity_ContestLobby_Movement_158EAE:: @ 8158EAE LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 98aec1d7a..0a51aff26 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -9,7 +9,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 checkflag 2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, sub_8090FC0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index fdf1c76e3..43f110577 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 - compare_var_to_imm 0x4043, 0 + compare 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 0 @@ -31,7 +31,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 - compare_var_to_imm 0x4043, 1 + compare 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 1 @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 - compare_var_to_imm 0x4043, 2 + compare 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 - compare_var_to_imm 0x4043, 3 + compare 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 3 @@ -58,7 +58,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 - compare_var_to_imm 0x4043, 4 + compare 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 setvar 0x4043, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 3295bf6ee..b01d74129 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -4,9 +4,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 event_96 3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end @@ -52,7 +52,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer event_96 3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release @@ -127,22 +127,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop @@ -154,10 +154,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 @@ -166,10 +166,10 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 bufferstd 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace 0x4000, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 4ee36a21d..311dac1ab 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,12 +9,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer dodailyevents - compare_var_to_imm 0x4045, 0 + compare 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag 2250 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 @@ -33,24 +33,24 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 inccounter GAME_STAT_WON_POKEMON_LOTTERY - compare_var_to_imm 0x8006, 0 + compare 0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare_var_to_imm 0x8006, 1 + compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitem 0, 0x8005 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem 0x8005 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E end @@ -112,7 +112,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 giveitem 0x4045 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 release diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 8998d6268..94b2d53a9 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -10,7 +10,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 lock faceplayer checkitem ITEM_EON_TICKET, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_Harbor_EventScript_1599EE goto LilycoveCity_Harbor_EventScript_1598BA end @@ -25,7 +25,7 @@ LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD msgbox LilycoveCity_Harbor_Text_18B36F, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 waittext @@ -48,7 +48,7 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -59,7 +59,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 LilycoveCity_Harbor_EventScript_15995B:: @ 815995B msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp BattleTower_Outside, 255, 19, 23 @@ -80,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 13, 10 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 spriteinvisible 255, 0, 0 @@ -129,9 +129,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE waitmovement 0 delay 30 disappear 4 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 spriteinvisible 255, 0, 0 diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index cbf015eb3..d3399f5ac 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -8,7 +8,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag 234 msgbox LilycoveCity_House2_Text_18B883, 4 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 452c0567f..fa5a30862 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -11,7 +11,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closebutton diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 7611b0ef5..db55695e6 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -11,9 +11,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 waittext multichoice 20, 8, 16, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_15844F end @@ -23,9 +23,9 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 6fb0f07b1..f63068d74 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -125,7 +125,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 givedecoration 44 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 closebutton diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 978eb6569..02558e9d3 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,19 +16,19 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 special sub_80F9EEC fadescreen 0 - compare_var_to_imm 0x8005, 4 + compare 0x8005, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index eb1882043..4d6401502 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -61,9 +61,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare_var_to_imm 0x4095, 1 + compare 0x4095, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare_var_to_imm 0x4095, 2 + compare 0x4095, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end @@ -71,35 +71,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 setvar 0x8004, 8 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar 0x8004, 9 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar 0x8004, 10 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar 0x8004, 11 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar 0x8004, 12 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar 0x8004, 13 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar 0x8004, 14 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar 0x8004, 15 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -148,13 +148,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 release @@ -162,7 +162,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 release @@ -188,13 +188,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 release @@ -202,7 +202,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 release @@ -228,13 +228,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 release @@ -242,7 +242,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 release @@ -268,13 +268,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare_var_to_imm 0x4095, 0 + compare 0x4095, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 release @@ -282,7 +282,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 release @@ -309,10 +309,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B setvar 0x8004, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 release @@ -320,7 +320,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 release @@ -342,10 +342,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D setvar 0x8004, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 release @@ -353,7 +353,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 release @@ -375,10 +375,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF setvar 0x8004, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 release @@ -386,7 +386,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 release @@ -408,10 +408,10 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 setvar 0x8004, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 7 + compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 release @@ -419,7 +419,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 specialvar RESULT, sub_810FCB0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index e3f9b1dc7..0f1dc96d9 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 - compare_var_to_imm 0x4092, 2 + compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag 82 call_if 0, LittlerootTown_EventScript_14D583 - compare_var_to_imm 0x4050, 3 + compare 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare_var_to_imm 0x4082, 4 + compare 0x4082, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare_var_to_imm 0x408c, 4 + compare 0x408c, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare_var_to_imm 0x40c7, 1 + compare 0x40c7, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare_var_to_imm 0x408d, 3 + compare 0x408d, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare_var_to_imm 0x4050, 0 + compare 0x4050, 0 goto_if_eq LittlerootTown_EventScript_14D59A movespriteperm 1, 10, 1 spritebehave 1, 7 @@ -55,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 spritebehave 4, 8 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D5CD return @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag 82 goto_if_eq LittlerootTown_EventScript_14D722 - compare_var_to_imm 0x4050, 0 + compare 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -334,9 +334,9 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D822 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D82B releaseall end @@ -352,9 +352,9 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D84E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D857 releaseall end @@ -407,27 +407,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D93C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D947 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closebutton checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14DAAA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare_var_to_imm 0x8008, 4 + compare 0x8008, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare_var_to_imm 0x8008, 5 + compare 0x8008, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -842,9 +842,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 7f3f3f5cf..e878d7e2e 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag 274 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare_var_to_imm 0x4092, 3 + compare 0x4092, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare_var_to_imm 0x4092, 5 + compare 0x4092, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 61b981995..3b39fe2ed 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag 130 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare_var_to_imm 0x4092, 4 + compare 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,16 +23,16 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152814 end @@ -51,9 +51,9 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15285D end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 022e98b2a..9b5a372fa 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag 274 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 checkgender - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare_var_to_imm 0x4092, 3 + compare 0x4092, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare_var_to_imm 0x4092, 5 + compare 0x4092, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare_var_to_imm 0x4092, 6 + compare 0x4092, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -117,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare_var_to_imm 0x408d, 3 + compare 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index cf2033919..712bebf03 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,7 +6,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag 130 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare_var_to_imm 0x4092, 4 + compare 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar 0x4089, 0 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 checkgender - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -33,9 +33,9 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D checkflag 292 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 disappear LAST_TALKED @@ -57,11 +57,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F return @@ -91,11 +91,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closebutton - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA return @@ -113,9 +113,9 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag 293 releaseall @@ -194,9 +194,9 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C5C end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index d6576be92..834ae8521 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -30,9 +30,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE playfanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -44,9 +44,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -59,9 +59,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare_var_to_imm 0x4084, 3 + compare 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag 88 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag 896 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare_var_to_imm 0x4084, 5 + compare 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -124,9 +124,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmovement 0 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 setflag 116 @@ -139,7 +139,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem ITEM_POKE_BALL, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 @@ -148,7 +148,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem ITEM_POKE_BALL, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 @@ -188,9 +188,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6ebd36749..5dd9983f4 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -105,9 +105,9 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MauvilleCity_EventScript_14C23C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_14C285 closebutton switch FACING @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag 209 goto_if_eq MauvilleCity_EventScript_14C368 - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag 208 goto_if_eq MauvilleCity_EventScript_14C332 @@ -305,7 +305,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 giveitem ITEM_TM24 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag 209 msgbox MauvilleCity_Text_166488, 4 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index b418e8a79..0b577885e 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -10,17 +10,17 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -64,19 +64,19 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end MauvilleCity_BikeShop_EventScript_15688D:: @ 815688D msgbox MauvilleCity_BikeShop_Text_1813D4, 4 checkitem ITEM_ACRO_BIKE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568C9 checkitem ITEM_MACH_BIKE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_BikeShop_EventScript_1568EA msgbox MauvilleCity_BikeShop_Text_181498, 4 release diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index bc49cd481..6e9b11947 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -6,7 +6,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 faceplayer msgbox MauvilleCity_GameCorner_Text_181C35, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waittext @@ -33,10 +33,10 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins 16385 - compare_var_to_imm 0x4001, 9950 + compare 0x4001, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 paymoney 0x3e8, 0 @@ -52,10 +52,10 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins 16385 - compare_var_to_imm 0x4001, 9500 + compare 0x4001, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 paymoney 0x2710, 0 @@ -100,7 +100,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156B88 release end @@ -144,7 +144,7 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -154,11 +154,11 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 88 checkdecor 88 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 88 @@ -170,11 +170,11 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 89 checkdecor 89 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 89 @@ -186,11 +186,11 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 - compare_var_to_imm 0x4002, 1000 + compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecor 1, 90 checkdecor 90 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 removecoins 1000 adddecor 90 @@ -221,7 +221,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A faceplayer msgbox MauvilleCity_GameCorner_Text_181DE1, 4 checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_156D36 release end @@ -277,7 +277,7 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch 0x4001 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -289,10 +289,10 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins 16386 - compare_var_to_imm 0x4002, 1500 + compare 0x4002, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 1500 additem ITEM_TM32, 1 @@ -304,10 +304,10 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins 16386 - compare_var_to_imm 0x4002, 3500 + compare 0x4002, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 3500 additem ITEM_TM29, 1 @@ -319,10 +319,10 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM35, 1 @@ -334,10 +334,10 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM24, 1 @@ -349,10 +349,10 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins 16386 - compare_var_to_imm 0x4002, 4000 + compare 0x4002, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C removecoins 4000 additem ITEM_TM13, 1 @@ -392,7 +392,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 checkflag 226 goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch 0x4023 case 0, MauvilleCity_GameCorner_EventScript_156FDB @@ -403,7 +403,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB bufferdecor 1, 88 checkdecor 88 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 88 @@ -414,7 +414,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 bufferdecor 1, 89 checkdecor 89 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 89 @@ -425,7 +425,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F bufferdecor 1, 90 checkdecor 90 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 givedecoration 90 @@ -453,7 +453,7 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C lock faceplayer checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_GameCorner_EventScript_15709C msgbox MauvilleCity_GameCorner_Text_18201E, 4 goto MauvilleCity_GameCorner_EventScript_157108 @@ -463,7 +463,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag 225 goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag 225 givecoins 20 @@ -522,7 +522,7 @@ MauvilleCity_GameCorner_EventScript_157125:: @ 8157125 MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialvar RESULT, sub_810F424 @@ -533,7 +533,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialvar RESULT, sub_810F424 @@ -544,7 +544,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialvar RESULT, sub_810F424 @@ -555,7 +555,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialvar RESULT, sub_810F424 @@ -566,7 +566,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialvar RESULT, sub_810F424 @@ -577,7 +577,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialvar RESULT, sub_810F424 @@ -588,7 +588,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialvar RESULT, sub_810F424 @@ -599,7 +599,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialvar RESULT, sub_810F424 @@ -610,7 +610,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialvar RESULT, sub_810F424 @@ -621,7 +621,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialvar RESULT, sub_810F424 @@ -632,7 +632,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialvar RESULT, sub_810F424 @@ -643,7 +643,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 lockall checkitem ITEM_COIN_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialvar RESULT, sub_810F424 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 1030d8f68..e5791d521 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag 167 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -85,7 +85,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag 1208 setflag 2057 addvar 0x4085, 1 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 @@ -97,7 +97,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB MauvilleCity_Gym_EventScript_15661D:: @ 815661D giveitem ITEM_TM34 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 setflag 167 @@ -113,7 +113,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 1 + compare 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 1 setvar 0x8004, 0 @@ -124,7 +124,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 2 + compare 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 2 setvar 0x8004, 1 @@ -135,7 +135,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag 1208 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare_var_to_imm 0x4093, 3 + compare 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar 0x4093, 3 setvar 0x8004, 2 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 3f9ba59f3..a500a246e 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -8,7 +8,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 goto_if_eq MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_1572E5 release end @@ -20,9 +20,9 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmovement 0 msgbox MauvilleCity_House2_Text_1824D8, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MauvilleCity_House2_EventScript_15731B - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index a5c89055b..b3a0c51fe 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -4,7 +4,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 end @@ -17,7 +17,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 end @@ -30,7 +30,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index cd5d9840f..44deb9d63 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -71,11 +71,11 @@ MossdeepCity_EventScript_14D027:: @ 814D027 checkflag 276 goto_if_eq MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem ITEM_KINGS_ROCK - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag 276 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 8d889a7d6..7861d0c4d 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special sub_813601C - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -17,9 +17,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special sub_813601C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare_var_to_imm 0x40c0, 0 + compare 0x40c0, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end @@ -49,11 +49,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 - compare_var_to_imm 0x40c0, 1 + compare 0x40c0, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare_var_to_imm 0x40c0, 2 + compare 0x40c0, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare_var_to_imm 0x40c0, 3 + compare 0x40c0, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar 0x40c0, 0 @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release @@ -94,28 +94,28 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special sub_810F414 msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 hidebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MossdeepCity_GameCorner_B1F, 255, 3, 1 waitstate diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 29400a80b..46b9dcfea 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -22,11 +22,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E setvar 0x8005, 0 special sub_813556C waitstate - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE closebutton special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 838b7fd14..4365ba74a 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -73,7 +73,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 giveitem ITEM_TM04 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 setflag 171 diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index b6fe4fd6e..6098cc617 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -7,7 +7,7 @@ MossdeepCity_House1_EventScript_15A82F:: @ 815A82F bufferfirstpoke 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House1_EventScript_15A855 msgbox MossdeepCity_House1_Text_18D475, 4 release diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 660bc2c06..b8388376a 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -19,9 +19,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B closebutton setflag 224 clearflag 933 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 disappear 3 release diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index b94e0ec19..8f9bf4dc5 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -7,7 +7,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 checkflag 152 goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 9b1b17c69..205f10313 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -19,7 +19,7 @@ MossdeepCity_House4_EventScript_15AB50:: @ 815AB50 lock faceplayer special sub_80BB63C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_House4_EventScript_15AB6D special GetSecretBaseNearbyMapName msgbox MossdeepCity_House4_Text_18E17E, 4 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index b328a6784..a407bd5b9 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -7,9 +7,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B dodailyevents specialvar RESULT, GetWeekCount buffernum 0, RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closebutton applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D @@ -36,7 +36,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag 192 msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 31a9efcea..aebb51c9c 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare_var_to_imm 0x40c6, 1 + compare 0x40c6, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -72,10 +72,10 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT disappear 2 @@ -86,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 setflag 298 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 578743995..d206f927e 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -18,17 +18,17 @@ MtChimney_EventScript_15CF95:: @ 815CF95 showmoney 0, 0 nop msgbox MtChimney_Text_195760, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D018 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MtChimney_EventScript_15D000 giveitem ITEM_LAVA_COOKIE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoney 0, 0 release @@ -411,7 +411,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D checkflag 115 goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE @@ -441,7 +441,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 43dee22b4..8a66f75ee 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare_var_to_imm 0x40a3, 1 + compare 0x40a3, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -32,9 +32,9 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 3f012780d..026d54bfe 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -8,7 +8,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem ITEM_CLEANSE_TAG - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag 282 release diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 5d650a8a6..433b533b3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -4,7 +4,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 787315320..550f74d9a 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -8,7 +8,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 12 + compare 0x4001, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 44d0760df..e60c40cae 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -143,9 +143,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF .else msgbox MtPyre_Summit_Text_1B64B3, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, MtPyre_Summit_EventScript_15D611 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -189,9 +189,9 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A .else msgbox MtPyre_Summit_Text_1B6283, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -220,9 +220,9 @@ MtPyre_Summit_EventScript_15D69B:: @ 815D69B .else msgbox MtPyre_Summit_Text_1B62E7, 5 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq MtPyre_Summit_EventScript_15D669 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 disappear 2 setvar 0x40b9, 3 diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 7eb3769cc..6429ff2f9 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare_var_to_imm 0x40ba, 0 + compare 0x40ba, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -27,10 +27,10 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC waitmovement 0 msgbox NewMauville_Entrance_Text_1982C0, 4 checkitem ITEM_BASEMENT_KEY, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982D4, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmaptile 3, 0, 707, 0 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 4fdf02d15..ef016f261 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag 2145 call_if 1, NewMauville_Inside_EventScript_15E58F @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare_var_to_imm 0x40ba, 2 + compare 0x40ba, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 0afc63220..0ece240c6 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -76,7 +76,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 giveitem ITEM_POTION - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 setflag 132 @@ -257,9 +257,9 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 OldaleTown_EventScript_14DF92:: @ 814DF92 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq OldaleTown_EventScript_14DFB8 end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e604a4f33..cef40ecd3 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -14,10 +14,10 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 call_if 0, PacifidlogTown_House2_EventScript_1541D7 setflag 300 specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if 4, PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end @@ -26,7 +26,7 @@ PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag 299 goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, sub_810F908 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -46,7 +46,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 giveitem ITEM_TM27 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 @@ -62,7 +62,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 giveitem ITEM_TM21 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag 299 special sub_810F950 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index e39db3921..1edd445fc 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -11,17 +11,17 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index bba0ede14..b7a6c9f86 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -13,9 +13,9 @@ PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer msgbox PacifidlogTown_House4_Text_17963D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PacifidlogTown_House5.inc b/data/scripts/maps/PacifidlogTown_House5.inc index abbf81dd8..46b1990df 100644 --- a/data/scripts/maps/PacifidlogTown_House5.inc +++ b/data/scripts/maps/PacifidlogTown_House5.inc @@ -5,7 +5,7 @@ PacifidlogTown_House5_EventScript_154394:: @ 8154394 lock faceplayer specialvar RESULT, IsMirageIslandPresent - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PacifidlogTown_House5_EventScript_1543B0 msgbox PacifidlogTown_House5_Text_179718, 4 release diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 4dca1fdb8..8b7d4f313 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag 2070 - compare_var_to_imm 0x4057, 0 + compare 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare_var_to_imm 0x4057, 2 + compare 0x4057, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f4598403f..1eff4d6c4 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare_var_to_imm 0x4085, 7 + compare 0x4085, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare_var_to_imm 0x4085, 1 + compare 0x4085, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag 2052 call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -144,65 +144,65 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 reappear 10 playse 8 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closebutton setflag 0x4001 playbgm 420, 0 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 disappear 10 setflag 728 @@ -352,7 +352,7 @@ PetalburgCity_Gym_EventScript_15493C:: @ 815493C PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 goto_if 0, PetalburgCity_Gym_EventScript_154A2C @@ -364,15 +364,15 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D PetalburgCity_Gym_EventScript_154969:: @ 8154969 specialvar RESULT, IsEnigmaBerryValid - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 checkpcitem ITEM_ENIGMA_BERRY, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare_var_to_imm 0x402d, 0 + compare 0x402d, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -384,7 +384,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem ITEM_ENIGMA_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 release @@ -413,28 +413,28 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154ABC - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AC7 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AD2 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154ADD delay 70 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154AE8 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, PetalburgCity_Gym_EventScript_154AF3 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, PetalburgCity_Gym_EventScript_154AFE - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release @@ -592,14 +592,14 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -622,14 +622,14 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -640,9 +640,9 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 setvar 0x8008, 7 setvar 0x8009, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -653,9 +653,9 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B setvar 0x8008, 1 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -666,9 +666,9 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E setvar 0x8008, 7 setvar 0x8009, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -679,9 +679,9 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 setvar 0x8008, 1 setvar 0x8009, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -692,9 +692,9 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 setvar 0x8008, 1 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -705,9 +705,9 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 setvar 0x8008, 7 setvar 0x8009, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -718,9 +718,9 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A setvar 0x8008, 1 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -731,9 +731,9 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D setvar 0x8008, 7 setvar 0x8009, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -744,9 +744,9 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 setvar 0x8008, 1 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -757,9 +757,9 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 setvar 0x8008, 7 setvar 0x8009, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -891,72 +891,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar 0x8004, 1 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar 0x8004, 2 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar 0x8004, 3 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar 0x8004, 4 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar 0x8004, 5 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar 0x8004, 6 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar 0x8004, 7 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar 0x8004, 8 - compare_var_to_imm 0x8005, 0 + compare 0x8005, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare_var_to_imm 0x8005, 1 + compare 0x8005, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 25783cf33..a70035fef 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -28,17 +28,17 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 faceplayer msgbox PetalburgCity_PokemonCenter_1F_Text_17BDC5, 4 specialvar RESULT, IsStarterInParty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15524F release end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare_var_to_imm 0x4023, 0 + compare 0x4023, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare_var_to_imm 0x4023, 1 + compare 0x4023, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare_var_to_imm 0x4023, 2 + compare 0x4023, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 8f34eecc6..48eb53a50 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -91,7 +91,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 giveitem ITEM_GREAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D end @@ -245,7 +245,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag 297 release @@ -272,7 +272,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 end diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 70b750aef..95a0a4a1f 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -20,7 +20,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 102d2aa0c..b46545050 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -10,9 +10,9 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route103_EventScript_14EBAB - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EC04 end @@ -174,7 +174,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 end @@ -187,7 +187,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 end @@ -205,7 +205,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index d9f65a382..c954ac972 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -35,7 +35,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 246 msgbox Route104_Text_1C5665, 4 @@ -54,7 +54,7 @@ Route104_EventScript_14EF09:: @ 814EF09 goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem ITEM_WHITE_HERB - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 279 release @@ -108,7 +108,7 @@ Route104_EventScript_14EF93:: @ 814EF93 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem ITEM_TM09 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag 262 release @@ -410,7 +410,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 end @@ -423,7 +423,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 end @@ -436,7 +436,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 6428e018b..cc3dad35a 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 - compare_var_to_imm 0x4090, 1 + compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag 188 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -37,7 +37,7 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag 147 msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -54,14 +54,14 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 44fb9a082..876af8650 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -25,18 +25,18 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag 127 msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -96,7 +96,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA random 8 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag 2256 msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 6a0eea00f..2ec903363 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -18,7 +18,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 end diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index 907ac93a2..b6973407b 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -9,7 +9,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index bd5116a43..45ff1d3ed 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -279,7 +279,7 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 msgbox Route109_Text_16E0F9, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end @@ -332,7 +332,7 @@ Route109_EventScript_14F725:: @ 814F725 goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem ITEM_SOFT_SAND - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B closebutton applymovement LAST_TALKED, Route109_Movement_1A083D @@ -397,7 +397,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 end @@ -410,7 +410,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 2a69242c2..789ee3e56 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -28,7 +28,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 giveitem ITEM_SODA_POP, 6 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag 140 release @@ -43,7 +43,7 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoney 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoney 0, 0 @@ -52,10 +52,10 @@ Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A checkmoney 0x12c, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E9E checkitemspace ITEM_SODA_POP, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 paymoney 0x12c, 0 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index e4582e08e..56d4ff196 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare_var_to_imm 0x40a9, 1 + compare 0x40a9, 1 call_if 1, Route110_EventScript_14F92F end @@ -132,7 +132,7 @@ Route110_EventScript_14FA25:: @ 814FA25 Route110_EventScript_14FA2E:: @ 814FA2E lockall specialvar RESULT, GetRecordedCyclingRoadResults - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_EventScript_14FA49 msgbox Route110_Text_16F53A, 4 releaseall @@ -147,9 +147,9 @@ Route110_EventScript_14FA53:: @ 814FA53 lock faceplayer specialvar RESULT, GetPlayerAvatarBike - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare_var_to_imm 0x40a9, 0 + compare 0x40a9, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -178,7 +178,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 end @@ -206,7 +206,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 end @@ -224,7 +224,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 end @@ -237,7 +237,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 end @@ -326,9 +326,9 @@ Route110_EventScript_14FD29:: @ 814FD29 Route110_EventScript_14FD34:: @ 814FD34 lockall checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_EventScript_14FDA7 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route110_EventScript_14FDAC applymovement 28, Route110_Movement_1A0845 waitmovement 0 @@ -337,16 +337,16 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF14 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF1F - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF2A checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_EventScript_14FE2B releaseall end @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closebutton - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF56 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF5E - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 disappear 28 reappear 29 delay 45 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route110_EventScript_14FF35 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route110_EventScript_14FF40 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B disappear 29 setvar 0x4069, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index c2900de22..a7db7e0ee 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,9 +3,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare_var_to_imm 0x40a9, 3 + compare 0x40a9, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare_var_to_imm 0x40a9, 2 + compare 0x40a9, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end @@ -24,9 +24,9 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 @ Coord event directly in front of the gatesman heading left to right lockall specialvar RESULT, GetPlayerAvatarBike @ player state? - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index c385a7bc9..1cb046a99 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -11,7 +11,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16347F:: @ 816347F Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B lockall specialvar RESULT, GetPlayerAvatarBike - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag 2091 setvar 0x4001, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 61c0e65a6..f99869648 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,7 +6,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end @@ -61,7 +61,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_RARE_CANDY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -74,7 +74,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TIMER_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -87,7 +87,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_HARD_STONE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -100,7 +100,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_SMOKE_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -113,7 +113,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_TM12 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -126,7 +126,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_MAGNET - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -139,7 +139,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 giveitem ITEM_PP_MAX - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closebutton @@ -150,13 +150,13 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closebutton - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161C74 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route110_TrickHouseEnd_EventScript_161C7F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route110_TrickHouseEnd_EventScript_161C8A - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 @@ -171,7 +171,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF .else givedecoration 31 .endc - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 4e60c9fc1..129cc7d6a 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,17 +6,17 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag 2114 - compare_var_to_imm 0x40b5, 1 + compare 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare_var_to_imm 0x40c1, 1 + compare 0x40c1, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare_var_to_imm 0x40a6, 1 + compare 0x40a6, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare_var_to_imm 0x40a7, 5 + compare 0x40a7, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare_var_to_imm 0x40a7, 3 + compare 0x40a7, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare_var_to_imm 0x40a7, 0 + compare 0x40a7, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE switch 0x40a7 case 0, Route110_TrickHouseEntrance_EventScript_16109A @@ -27,7 +27,7 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 setvar 0x40a5, 1 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 setvar 0x40a7, 2 end @@ -44,21 +44,21 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar 0x40a7, 0 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -213,7 +213,7 @@ Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closebutton @@ -248,21 +248,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closebutton setvar 0x40a6, 1 @@ -351,27 +351,27 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare_var_to_imm 0x4044, 3 + compare 0x4044, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare_var_to_imm 0x4044, 4 + compare 0x4044, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare_var_to_imm 0x4044, 5 + compare 0x4044, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare_var_to_imm 0x4044, 6 + compare 0x4044, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare_var_to_imm 0x4044, 7 + compare 0x4044, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE giveitem ITEM_RARE_CANDY - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -379,9 +379,9 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA giveitem ITEM_TIMER_BALL - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -389,9 +389,9 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 giveitem ITEM_HARD_STONE - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -399,9 +399,9 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 giveitem ITEM_SMOKE_BALL - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -409,9 +409,9 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E giveitem ITEM_TM12 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -419,9 +419,9 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA giveitem ITEM_MAGNET - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -429,9 +429,9 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 giveitem ITEM_PP_MAX - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall @@ -454,9 +454,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 .else givedecoration 31 .endif - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall @@ -495,7 +495,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 closebutton - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare_var_to_imm 0x4044, 8 + compare 0x4044, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -602,7 +602,7 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare_var_to_imm 0x40AB, 0 + compare 0x40AB, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playse SE_PIN @@ -613,7 +613,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare_var_to_imm 0x40AC, 0 + compare 0x40AC, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playse SE_PIN @@ -624,7 +624,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare_var_to_imm 0x40AD, 0 + compare 0x40AD, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playse SE_PIN @@ -635,7 +635,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare_var_to_imm 0x40AE, 0 + compare 0x40AE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playse SE_PIN @@ -646,7 +646,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare_var_to_imm 0x40AF, 0 + compare 0x40AF, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playse SE_PIN @@ -657,7 +657,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare_var_to_imm 0x40B0, 0 + compare 0x40B0, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playse SE_PIN @@ -668,7 +668,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare_var_to_imm 0x40B1, 0 + compare 0x40B1, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playse SE_PIN @@ -679,7 +679,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare_var_to_imm 0x40B2, 0 + compare 0x40B2, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playse SE_PIN @@ -726,11 +726,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare_var_to_imm 0x4044, 0 + compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare_var_to_imm 0x4044, 1 + compare 0x4044, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare_var_to_imm 0x4044, 2 + compare 0x4044, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B setvar 0x40a5, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index d9536edde..3a89c2db1 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare_var_to_imm 0x40ab, 2 + compare 0x40ab, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare_var_to_imm 0x40ab, 0 + compare 0x40ab, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 6252a96d6..f71a9611a 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,13 +4,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end @@ -23,7 +23,7 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare_var_to_imm 0x40ac, 0 + compare 0x40ac, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 705f52455..a50ecd3ce 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,9 +5,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmaptile 13, 7, 600, 0 setmaptile 1, 3, 600, 0 setmaptile 10, 2, 600, 0 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare_var_to_imm 0x4008, 6 + compare 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare_var_to_imm 0x4008, 7 + compare 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -302,19 +302,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar 0x4005, 0 setvar 0x4006, 0 setvar 0x4007, 0 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare_var_to_imm 0x4008, 6 + compare 0x4008, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare_var_to_imm 0x4008, 7 + compare 0x4008, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return @@ -347,14 +347,14 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare_var_to_imm 0x4009, 0 + compare 0x4009, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end @@ -370,7 +370,7 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare_var_to_imm 0x40ad, 0 + compare 0x40ad, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0bff3f526..0c9fc426f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare_var_to_imm 0x40ae, 0 + compare 0x40ae, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index c99158dbd..dc3f9f725 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,7 +13,7 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare_var_to_imm 0x40af, 0 + compare 0x40af, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end @@ -27,7 +27,7 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F @@ -37,7 +37,7 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4002, 1 + compare 0x4002, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 @@ -47,7 +47,7 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4003, 1 + compare 0x4003, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 @@ -57,7 +57,7 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4004, 1 + compare 0x4004, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B @@ -67,7 +67,7 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare_var_to_imm 0x4005, 1 + compare 0x4005, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 setvar 0x4009, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F @@ -165,11 +165,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -187,11 +187,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -209,11 +209,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -231,11 +231,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -253,11 +253,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare_var_to_imm 0x4009, 2 + compare 0x4009, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare_var_to_imm 0x4009, 3 + compare 0x4009, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare_var_to_imm 0x4009, 4 + compare 0x4009, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare_var_to_imm 0x4009, 5 + compare 0x4009, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare_var_to_imm 0x4008, 1 + compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare_var_to_imm 0x4008, 2 + compare 0x4008, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare_var_to_imm 0x4008, 3 + compare 0x4008, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare_var_to_imm 0x4008, 4 + compare 0x4008, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare_var_to_imm 0x4008, 5 + compare 0x4008, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index e4ce617c9..ddf845142 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,7 +17,7 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare_var_to_imm 0x40b0, 0 + compare 0x40b0, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index ae55a4316..3361e3e9d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare_var_to_imm 0x40b6, 1 + compare 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag 194 clearflag 195 @@ -86,7 +86,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare_var_to_imm 0x40b6, 1 + compare 0x40b6, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end @@ -100,7 +100,7 @@ Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare_var_to_imm 0x40b1, 0 + compare 0x40b1, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 1c6a9847f..5f0b00684 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare_var_to_imm 0x40b2, 0 + compare 0x40b2, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 35c60cf8f..617509938 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -22,15 +22,15 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 34 + compare 0x4001, 34 goto_if 0, Route111_EventScript_15000C - compare_var_to_imm 0x4001, 107 + compare 0x4001, 107 goto_if 2, Route111_EventScript_15000C - compare_var_to_imm 0x4001, 72 + compare 0x4001, 72 goto_if 2, Route111_EventScript_150009 - compare_var_to_imm 0x4000, 2000 + compare 0x4000, 2000 goto_if 2, Route111_EventScript_15000C - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -52,7 +52,7 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall msgbox Route111_Text_16FA54, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closebutton @@ -74,7 +74,7 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall msgbox Route111_Text_16FAED, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closebutton @@ -125,7 +125,7 @@ Route111_EventScript_1500C5:: @ 81500C5 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag 2252 special GetPlayerBigGuyGirlString @@ -164,7 +164,7 @@ Route111_EventScript_150122:: @ 8150122 Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_EventScript_150151 setvar 0x4003, 1 releaseall @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closebutton - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 call_if 1, Route111_EventScript_150188 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route111_EventScript_150193 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route111_EventScript_15019E - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route111_EventScript_1501A9 releaseall end @@ -238,7 +238,7 @@ Route111_EventScript_1501D1:: @ 81501D1 faceplayer setflag 2115 msgbox Route111_Text_16F705, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release @@ -393,7 +393,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 end @@ -421,7 +421,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 end @@ -434,7 +434,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 end diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index fdd0078ed..a33b436dc 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -10,9 +10,9 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -21,9 +21,9 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC closebutton call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 7742d3507..ea70af41f 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -17,7 +17,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem ITEM_MACHO_BRACE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag 277 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index 70a6a2869..d0d464207 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -39,7 +39,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index dfa1fecd6..5254b7beb 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E warp6 Route112, 255, 28, 28 - compare_var_to_imm 0x40a3, 2 + compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -33,9 +33,9 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer msgbox Route112_CableCarStation_Text_1924F5, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 06519867e..2eb34cdf3 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -14,9 +14,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4000, 19 + compare 0x4000, 19 goto_if 0, Route113_EventScript_150604 - compare_var_to_imm 0x4000, 84 + compare 0x4000, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return @@ -61,7 +61,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 end @@ -74,7 +74,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 9774a3a5f..48c2965fd 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,7 +4,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag 2116 - compare_var_to_imm 0x40be, 1 + compare 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end @@ -15,11 +15,11 @@ Route113_GlassWorkshop_EventScript_16355F:: @ 816355F Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare_var_to_imm 0x40be, 10 + compare 0x40be, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare_var_to_imm 0x40be, 2 + compare 0x40be, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare_var_to_imm 0x40be, 1 + compare 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem ITEM_SOOT_SACK @@ -35,10 +35,10 @@ Route113_GlassWorkshop_EventScript_1635AB:: @ 81635AB Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 checkitem ITEM_SOOT_SACK, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare_var_to_imm 0x4048, 250 + compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waittext @@ -70,10 +70,10 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitem 0, 0x8008 setvar 0x800a, 250 - compare_var_to_imm 0x4048, 250 + compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 10 subvar 0x4048, 250 @@ -84,10 +84,10 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare_var_to_imm 0x4048, 500 + compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 11 subvar 0x4048, 500 @@ -98,10 +98,10 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitem 0, 0x8008 setvar 0x800a, 500 - compare_var_to_imm 0x4048, 500 + compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 12 subvar 0x4048, 500 @@ -112,10 +112,10 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare_var_to_imm 0x4048, 1000 + compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 13 subvar 0x4048, 1000 @@ -126,10 +126,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitem 0, 0x8008 setvar 0x800a, 1000 - compare_var_to_imm 0x4048, 1000 + compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 14 subvar 0x4048, 1000 @@ -141,10 +141,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecor 0, 0x8008 setvar 0x800a, 6000 - compare_var_to_imm 0x4048, 6000 + compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 15 subvar 0x4048, 6000 @@ -156,10 +156,10 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecor 0, 0x8008 setvar 0x800a, 8000 - compare_var_to_imm 0x4048, 8000 + compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar 0x40be, 16 subvar 0x4048, 8000 @@ -201,9 +201,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare_var_to_imm 0x8009, 0 + compare 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare_var_to_imm 0x8009, 1 + compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release @@ -211,13 +211,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 Route113_GlassWorkshop_EventScript_163889:: @ 8163889 giveitem 0x8008 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 givedecoration 0x8008 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -295,9 +295,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare_var_to_imm 0x8009, 0 + compare 0x8009, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare_var_to_imm 0x8009, 1 + compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar 0x40be, 2 release diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 799a115b7..95d321e0b 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -12,7 +12,7 @@ Route114_EventScript_150733:: @ 8150733 addvar RESULT, 15 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 2251 msgbox Route114_Text_1C5861, 4 @@ -31,7 +31,7 @@ Route114_EventScript_150782:: @ 8150782 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag 231 msgbox Route114_Text_1701C5, 4 @@ -88,7 +88,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 end @@ -101,7 +101,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 3406a78f6..b217f24c4 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -13,7 +13,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem ITEM_TM28 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag 261 release diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 71c627728..13843f758 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -7,10 +7,10 @@ Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F checkflag 267 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 msgbox Route114_FossilManiacsTunnel_Text_192795, 4 release diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index fbc4976ab..e4334647c 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -18,7 +18,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 .else givedecoration 100 .endif - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE setflag 131 release @@ -32,7 +32,7 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall @@ -40,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 64b0a7497..8e0eb7855 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -16,7 +16,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 end @@ -34,7 +34,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 end @@ -47,7 +47,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 61ccb6632..5a328f198 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -44,17 +44,17 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag 287 giveitem ITEM_REPEAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route116_EventScript_150AEE - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route116_EventScript_150AF9 disappear LAST_TALKED clearflag 949 @@ -148,10 +148,10 @@ Route116_EventScript_150B8F:: @ 8150B8F lock faceplayer checkitem ITEM_BLACK_GLASSES, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BCA specialvar RESULT, sub_810F828 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 release @@ -167,7 +167,7 @@ Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 specialvar RESULT, sub_810F828 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 release @@ -181,13 +181,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 delay 20 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route116_EventScript_150C37 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, Route116_EventScript_150C42 disappear LAST_TALKED release @@ -241,7 +241,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 end @@ -264,7 +264,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 6d538a872..6ba9519eb 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -41,7 +41,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 end @@ -54,7 +54,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 end @@ -67,7 +67,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 end @@ -80,7 +80,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 end @@ -98,7 +98,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 end @@ -111,7 +111,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 8c91e7da4..86e5f9045 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -12,9 +12,9 @@ Route118_EventScript_150F34:: @ 8150F34 checkflag 227 goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_150F5E - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route118_EventScript_150F7F end @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closebutton - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, Route118_EventScript_151048 - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, Route118_EventScript_151053 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 disappear 19 @@ -162,7 +162,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 end @@ -185,7 +185,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 5b0f61387..fff294ca9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare_var_to_imm 0x8004, 6 + compare 0x8004, 6 call_if 1, Route119_EventScript_151193 - compare_var_to_imm 0x8004, 7 + compare 0x8004, 7 call_if 1, Route119_EventScript_151197 return @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare_var_to_imm 0x40b3, 1 + compare 0x40b3, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -52,29 +52,29 @@ Route119_EventScript_1511DB:: @ 81511DB lockall reappear 25 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route119_EventScript_151254 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route119_EventScript_151259 delay 65 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513A6 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 25 reappear 16 delay 30 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route119_EventScript_15125E - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1512D8 releaseall end @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 disappear 16 reappear 25 delay 30 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, Route119_EventScript_1513BC - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, Route119_EventScript_1513C7 disappear 25 setvar 0x4072, 1 @@ -297,7 +297,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 end @@ -310,7 +310,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 end diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index aa918bc34..762a6c299 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index b903d7063..5f9cf9888 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare_var_to_imm 0x40b3, 0 + compare 0x40b3, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare_var_to_imm 0x40b3, 1 + compare 0x40b3, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -56,7 +56,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 7c1968aa5..cb8ebb2cc 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 call_if 1, Route120_EventScript_15166B - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 call_if 1, Route120_EventScript_151672 - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 call_if 1, Route120_EventScript_151676 - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 call_if 1, Route120_EventScript_15167A - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 call_if 1, Route120_EventScript_15167E - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 call_if 1, Route120_EventScript_151682 return @@ -81,11 +81,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy 0x4000, 0x4001 - compare_var_to_imm 0x4001, 14 + compare 0x4001, 14 goto_if 3, Route120_EventScript_151715 - compare_var_to_imm 0x4001, 60 + compare 0x4001, 60 goto_if 3, Route120_EventScript_151719 - compare_var_to_imm 0x4001, 61 + compare 0x4001, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare_var_to_imm 0x4000, 7 + compare 0x4000, 7 goto_if 3, Route120_EventScript_151735 - compare_var_to_imm 0x4000, 19 + compare 0x4000, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -116,9 +116,9 @@ Route120_EventScript_151739:: @ 8151739 checkflag 2254 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route120_EventScript_151841 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -161,7 +161,7 @@ Route120_EventScript_151808:: @ 8151808 Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag 2254 msgbox Route120_Text_1C5A0B, 4 @@ -187,7 +187,7 @@ Route120_EventScript_151853:: @ 8151853 checkflag 290 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -200,7 +200,7 @@ Route120_EventScript_151877:: @ 8151877 Route120_EventScript_151884:: @ 8151884 msgbox Route120_Text_17196F, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -208,9 +208,9 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, Route120_EventScript_15197F - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 @@ -293,7 +293,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 end @@ -316,7 +316,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 end diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 562f122e3..efaf251b1 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -74,7 +74,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 end @@ -102,7 +102,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 52f0e5c44..5fdb749f3 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -34,7 +34,7 @@ Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -52,7 +52,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 showmoney 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C @@ -60,11 +60,11 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 checkitem ITEM_POKEBLOCK_CASE, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C450 call Route121_SafariZoneEntrance_EventScript_15C425 checkmoney 0x1f4, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 paymoney 0x1f4, 0 @@ -88,10 +88,10 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F msgbox Route121_SafariZoneEntrance_Text_1C39A3, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 6e6cbd506..14c5a2dba 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -13,11 +13,11 @@ Route123_EventScript_151C5D:: @ 8151C5D goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 giveitem ITEM_TM19 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag 232 msgbox Route123_Text_171E34, 4 @@ -63,7 +63,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 end @@ -76,7 +76,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index ee7bc80cf..64888759d 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -17,7 +17,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 2253 msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 @@ -25,7 +25,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 release @@ -47,9 +47,9 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AAD - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163A9B end @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare_var_to_imm 0x8004, 0 + compare 0x8004, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare_var_to_imm 0x8004, 1 + compare 0x8004, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare_var_to_imm 0x8004, 2 + compare 0x8004, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare_var_to_imm 0x8004, 3 + compare 0x8004, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare_var_to_imm 0x8004, 4 + compare 0x8004, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare_var_to_imm 0x8004, 5 + compare 0x8004, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end @@ -79,7 +79,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 random 10 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D release @@ -90,7 +90,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 248 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -101,7 +101,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 249 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -112,7 +112,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 250 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -123,7 +123,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 251 goto Route123_BerryMastersHouse_EventScript_163C1D @@ -134,7 +134,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag 252 goto Route123_BerryMastersHouse_EventScript_163C1D diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 7d7d38ceb..ffe4cef97 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -24,7 +24,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 end @@ -47,7 +47,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 end @@ -60,7 +60,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 1deeb9e34..b3e91e43c 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,7 +23,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end @@ -31,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar 0x4001, 0 checkitem ITEM_RED_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C return @@ -247,13 +247,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitem 0, 0x8008 bufferitem 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace 0x8009, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 checkitem 0x8008, 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end @@ -263,10 +263,10 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index c62d49117..489a7314b 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -30,7 +30,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 0ce76670f..158313a1b 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -183,7 +183,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 end @@ -196,7 +196,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 3e234667a..7c3c575dc 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -4,7 +4,7 @@ Route130_MapScripts:: @ 81523C2 Route130_MapScript1_1523C8:: @ 81523C8 specialvar RESULT, IsMirageIslandPresent - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq Route130_EventScript_15240C setflag 17 setflag 18 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ddd58be1a..dcbb75886 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -363,13 +363,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 end RustboroCity_EventScript_14C650:: @ 814C650 - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C691 - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 @@ -457,19 +457,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 end RustboroCity_EventScript_14C77D:: @ 814C77D - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RustboroCity_EventScript_14C82A - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RustboroCity_EventScript_14C856 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C882 - compare_var_to_imm 0x4001, 4 + compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem ITEM_GREAT_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closebutton @@ -552,9 +552,9 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C90A end @@ -572,9 +572,9 @@ RustboroCity_EventScript_14C90A:: @ 814C90A RustboroCity_EventScript_14C917:: @ 814C917 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_EventScript_14C939 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index d5b3b03c7..e7c966c08 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end @@ -14,7 +14,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 287 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag 188 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,16 +64,16 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare_var_to_imm 0x40c4, 2 + compare 0x40c4, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare_var_to_imm 0x40c4, 1 + compare 0x40c4, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575A6 checkitem ITEM_CLAW_FOSSIL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1575EE release end @@ -86,7 +86,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -104,7 +104,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitem 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare_var_to_imm 0x40c5, 1 + compare 0x40c5, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare_var_to_imm 0x40c5, 2 + compare 0x40c5, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -135,7 +135,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 bufferpoke 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -146,7 +146,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waittext givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -155,7 +155,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 bufferpoke 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon - compare_var_to_imm RESULT, 6 + compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT setvar 0x40c4, 0 @@ -166,7 +166,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waittext givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 12cf2f6c8..88f1c377a 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare_var_to_imm 0x408f, 0 + compare 0x408f, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 giveitem ITEM_EXP_SHARE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index fefc67d0f..0dfec5cfa 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -12,7 +12,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag 213 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 353ac8fe3..6bb33b4dc 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -20,14 +20,14 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE addvar 0x4085, 1 setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare_var_to_imm 0x4085, 6 + compare 0x4085, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag 165 msgbox RustboroCity_Gym_Text_184170, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 080fc7e18..a344738a8 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -11,17 +11,17 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialvar RESULT, sub_804D89C copyvar 0x8009, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate copyvar 0x800a, 0x8004 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar 0x8005, 0x800a specialvar RESULT, sub_804DB2C copyvar 0x800b, RESULT - compare_var_to_var RESULT, 0x8009 + compare RESULT, 0x8009 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar 0x8004, 0x8008 copyvar 0x8005, 0x800a diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index cd71e8bba..156b437a0 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -79,13 +79,13 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE faceplayer checkflag 275 goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem ITEM_QUICK_CLAW - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closebutton applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 922ad27e1..81bfcd27d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -10,7 +10,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare_var_to_imm 0x409a, 2 + compare 0x409a, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closebutton - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare_var_to_imm 0x4001, 2 + compare 0x4001, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare_var_to_imm 0x4001, 3 + compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 9f86473be..3edfdd7bb 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -41,9 +41,9 @@ SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 return gUnknown_0815FD0D:: @ 815FD0D - compare_var_to_imm 0x40B4, 2 + compare 0x40B4, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare_var_to_imm 0x40B4, 7 + compare 0x40B4, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare_var_to_imm 0x40b4, 4 + compare 0x40b4, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare_var_to_imm 0x40b4, 8 + compare 0x40b4, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare_var_to_imm 0x40b4, 2 + compare 0x40b4, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare_var_to_imm 0x40b4, 7 + compare 0x40b4, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index f9e815d1f..aa84b6b48 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -8,7 +8,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem ITEM_TM49 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag 260 msgbox SSTidalRooms_Text_199C1A, 4 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index b735a87b2..0632a2dda 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -20,7 +20,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare_var_to_imm 0x40a4, 2 + compare 0x40a4, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -52,10 +52,10 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare_var_to_imm 0x4001, 0 + compare 0x4001, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 929b4d0ca..70821d183 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -9,7 +9,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 playse 49 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index e51817e27..983ab69d9 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -23,24 +23,24 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkflag 2143 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 checkitem ITEM_SHOAL_SHELL, 4 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 removeitem ITEM_SHOAL_SALT, 4 removeitem ITEM_SHOAL_SHELL, 4 giveitem ITEM_SHELL_BELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 setflag 2 @@ -49,13 +49,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 ShoalCave_LowTideEntranceRoom_EventScript_15E106:: @ 815E106 checkitem ITEM_SHOAL_SALT, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E117 return ShoalCave_LowTideEntranceRoom_EventScript_15E117:: @ 815E117 checkitem ITEM_SHOAL_SHELL, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E128 return @@ -70,10 +70,10 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E12E:: @ 815E12E ShoalCave_LowTideEntranceRoom_EventScript_15E138:: @ 815E138 checkitem ITEM_SHOAL_SALT, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 checkitem ITEM_SHOAL_SHELL, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E162 msgbox ShoalCave_LowTideEntranceRoom_Text_1C6668, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 8dec3b212..05fc6a315 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -73,7 +73,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 checkflag 956 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView @@ -91,7 +91,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 checkflag 957 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView @@ -104,7 +104,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 checkflag 958 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView @@ -117,7 +117,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 checkflag 959 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView @@ -130,7 +130,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 checkflag 952 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView @@ -148,7 +148,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 checkflag 953 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index 01719a9cf..db5779efe 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 checkflag 955 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView @@ -40,7 +40,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem ITEM_FOCUS_BAND - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag 283 release diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index 1c5cde842..bffb7bd49 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -20,7 +20,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 checkflag 954 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 02ab6c28c..aba9ee235 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -12,7 +12,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BA68 end @@ -67,10 +67,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 bufferfirstpoke 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_EventScript_14BB35 specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 playfanfare 370 @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag 96 goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare_var_to_imm 0x4058, 1 + compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -288,9 +288,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer msgbox SlateportCity_Text_1650F1, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_EventScript_14BD28 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 74eaf27fe..f8070f1a1 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -16,7 +16,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem ITEM_TM41 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag 265 msgbox SlateportCity_ContestHall_Text_17CE28, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 0e0b5da1f..184586d94 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 warp6 SlateportCity, 255, 28, 13 setvar 0x4001, 0 - compare_var_to_imm 0x40a0, 1 + compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag 2052 call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 disappear 7 disappear 8 setvar 0x40a0, 2 - compare_var_to_imm 0x8008, 0 + compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare_var_to_imm 0x8008, 1 + compare 0x8008, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare_var_to_imm 0x8008, 2 + compare 0x8008, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare_var_to_imm 0x8008, 3 + compare 0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closebutton @@ -168,7 +168,7 @@ SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 msgbox SlateportCity_Harbor_Text_17FA73, 4 checkitem ITEM_SS_TICKET, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A waittext @@ -191,7 +191,7 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 @@ -202,7 +202,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F SlateportCity_Harbor_EventScript_156167:: @ 8156167 msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp BattleTower_Outside, 255, 19, 23 @@ -223,9 +223,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 waitmovement 0 delay 30 spriteinvisible LAST_TALKED, 9, 8 - compare_var_to_imm FACING, 2 + compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 spriteinvisible 255, 0, 0 @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag 112 goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare_var_to_imm 0x40a0, 2 + compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closebutton @@ -300,10 +300,10 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare_var_to_imm 0x4001, 1 + compare 0x4001, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 checkflag 2052 goto_if_eq SlateportCity_Harbor_EventScript_15629D @@ -333,10 +333,10 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_TOOTH - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 @@ -346,10 +346,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem ITEM_DEEP_SEA_SCALE - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index e932a58ab..c72aa229a 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -5,9 +5,9 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer msgbox SlateportCity_House1_Text_17D46A, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15569C - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare_var_to_imm 0x8004, 255 + compare 0x8004, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -28,20 +28,20 @@ SlateportCity_House1_EventScript_1556BF:: @ 81556BF SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies - compare_var_to_imm RESULT, SPECIES_EGG + compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C special sub_80BFAE0 special sub_80BFB10 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialvar RESULT, sub_810F96C special sub_80BFAE0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155730 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -60,7 +60,7 @@ SlateportCity_House1_EventScript_155730:: @ 8155730 call SlateportCity_House1_EventScript_1A0678 specialvar RESULT, sub_80BF9B4 special sub_80BFAE0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 release diff --git a/data/scripts/maps/SlateportCity_House2.inc b/data/scripts/maps/SlateportCity_House2.inc index 6f267d31f..934fae153 100644 --- a/data/scripts/maps/SlateportCity_House2.inc +++ b/data/scripts/maps/SlateportCity_House2.inc @@ -9,7 +9,7 @@ SlateportCity_House2_EventScript_156399:: @ 8156399 lock faceplayer checkitem ITEM_CONTEST_PASS, 1 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_House2_EventScript_1563B5 msgbox SlateportCity_House2_Text_180567, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 575538286..7fe5865a4 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -34,7 +34,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoney 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closebutton hidemoney 0, 0 @@ -45,7 +45,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A paymoney 0x32, 0 updatemoney 0, 0 @@ -165,14 +165,14 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 giveitem ITEM_TM46 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 closebutton - compare_var_to_imm FACING, 2 + compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 - compare_var_to_imm FACING, 2 + compare FACING, 2 goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 1f6aa3c2d..c1398e579 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -21,21 +21,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmovement 0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 - compare_var_to_imm FACING, 4 + compare FACING, 4 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closebutton applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 - compare_var_to_imm FACING, 1 + compare FACING, 1 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 - compare_var_to_imm FACING, 3 + compare FACING, 3 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 882e865ee..cd71d8d51 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -33,9 +33,9 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag 200 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare_var_to_imm 0x4002, 5 + compare 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare_var_to_imm 0x40b7, 2 + compare 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -85,7 +85,7 @@ SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 checkitemspace ITEM_RED_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 200 @@ -96,7 +96,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 checkitemspace ITEM_BLUE_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 201 @@ -107,7 +107,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 checkitemspace ITEM_PINK_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 202 @@ -118,7 +118,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 checkitemspace ITEM_GREEN_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 203 @@ -129,7 +129,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 checkitemspace ITEM_YELLOW_SCARF, 1 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag 204 @@ -145,7 +145,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialvar RESULT, CheckLeadMonCool - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 return @@ -155,7 +155,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialvar RESULT, CheckLeadMonBeauty - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA return @@ -165,7 +165,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialvar RESULT, CheckLeadMonCute - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 return @@ -175,7 +175,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialvar RESULT, CheckLeadMonSmart - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 return @@ -185,7 +185,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialvar RESULT, CheckLeadMonTough - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F return @@ -200,7 +200,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore - compare_var_to_imm RESULT, 4 + compare RESULT, 4 goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A release end @@ -213,7 +213,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 giveitem ITEM_SOOTHE_BELL - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag 278 release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 6006ac2ef..936b859e5 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 movespriteperm 1, 29, 19 movespriteperm 2, 33, 19 - compare_var_to_imm 0x405e, 1 + compare 0x405e, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -99,20 +99,20 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F addvar RESULT, 20 addvar RESULT, 133 giveitem RESULT - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag 2258 msgbox SootopolisCity_Text_1C64D0, 4 random 2 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_14D1FF - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D220 end SootopolisCity_EventScript_14D1FF:: @ 814D1FF giveitem ITEM_FIGY_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -120,7 +120,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF SootopolisCity_EventScript_14D220:: @ 814D220 giveitem ITEM_IAPAPA_BERRY - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 release @@ -128,7 +128,7 @@ SootopolisCity_EventScript_14D220:: @ 814D220 SootopolisCity_EventScript_14D241:: @ 814D241 msgbox SootopolisCity_Text_1C6540, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index d6c7958b6..bd0af12be 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare_var_to_imm 0x4022, 8 + compare 0x4022, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare_var_to_imm 0x4022, 28 + compare 0x4022, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare_var_to_imm 0x4022, 69 + compare 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmaptile 8, 4, 519, 0 setmaptile 8, 5, 519, 0 @@ -109,7 +109,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 giveitem ITEM_TM03 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 setflag 172 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 6315cee85..011806291 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -5,9 +5,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer msgbox SootopolisCity_House2_Text_18FA66, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, SootopolisCity_House2_EventScript_15B307 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index 156ee232d..f1bf0bf19 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -5,7 +5,7 @@ SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer msgbox SootopolisCity_House3_Text_18FB36, 5 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 2d6add92d..1e1b53956 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -7,11 +7,11 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 checkflag 245 goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration 117 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag 245 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index e7ddaa39d..662117741 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -9,14 +9,14 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B452 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B45C - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B466 release end @@ -39,7 +39,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 giveitem ITEM_ELIXIR - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closebutton release @@ -58,14 +58,14 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 special sub_80F9A0C waitstate copyvar RESULT, 0x8004 - compare_var_to_imm RESULT, 255 + compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SootopolisCity_House8_EventScript_15B4E3 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 goto_if_eq SootopolisCity_House8_EventScript_15B4ED - compare_var_to_imm RESULT, 3 + compare RESULT, 3 goto_if_eq SootopolisCity_House8_EventScript_15B4F7 release end @@ -88,7 +88,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 giveitem ITEM_ELIXIR - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closebutton release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index a45b0b556..358e2277c 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -10,7 +10,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closebutton diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index d30f8cee4..37af5e140 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -23,9 +23,9 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq SouthernIsland_Interior_EventScript_160B95 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 6d263690d..5bbe8e3b6 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -4,9 +4,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy 0x8004, 0x8005 - compare_var_to_imm 0x8004, 12 + compare 0x8004, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare_var_to_imm 0x8005, 44 + compare 0x8005, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 0bf09e41e..994f37b63 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -13,15 +13,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId - compare_var_to_imm RESULT, 0 + compare RESULT, 0 call_if 1, LinkContestRoom1_EventScript_15F5E0 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 call_if 1, LinkContestRoom1_EventScript_15F5E4 - compare_var_to_imm RESULT, 2 + compare RESULT, 2 call_if 1, LinkContestRoom1_EventScript_15F5E8 - compare_var_to_imm RESULT, 3 + compare RESULT, 3 call_if 1, LinkContestRoom1_EventScript_15F5EC - compare_var_to_imm RESULT, 4 + compare RESULT, 4 call_if 1, LinkContestRoom1_EventScript_15F5F0 return @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare_var_to_imm 0x4009, 1 + compare 0x4009, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,7 +75,7 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare_var_to_imm 0x4000, 8 + compare 0x4000, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return @@ -414,9 +414,9 @@ LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB checkgender - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF9 return diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 52de0db78..5d7c6de18 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -105,7 +105,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 - compare_var_to_imm RESULT, 0 + compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag 235 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7bbcf6a41..a0173e720 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -94,7 +94,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 specialvar RESULT, sub_8082C68 - compare_var_to_imm RESULT, 1 + compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 end -- cgit v1.2.3 From b4ba35a54c0f6204e34d2814351162c79ea4c0ba Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 26 Sep 2017 14:33:52 -0500 Subject: more command renaming --- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/DewfordTown.inc | 22 +++++------ data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 6 +-- data/scripts/maps/EverGrandeCity_Corridor1.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor2.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor3.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor4.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor5.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 2 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 8 ++-- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 12 +++--- data/scripts/maps/LilycoveCity_Harbor.inc | 12 +++--- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 28 ++++++------- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 4 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 16 ++++---- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 10 ++--- data/scripts/maps/NewMauville_Inside.inc | 2 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 8 ++-- data/scripts/maps/PetalburgWoods.inc | 4 +- data/scripts/maps/Route101.inc | 8 ++-- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 12 +++--- data/scripts/maps/Route109.inc | 12 +++--- data/scripts/maps/Route110.inc | 6 +-- data/scripts/maps/Route110_TrickHouseEnd.inc | 12 +++--- data/scripts/maps/Route110_TrickHouseEntrance.inc | 46 +++++++++++----------- data/scripts/maps/Route111.inc | 22 +++++------ data/scripts/maps/Route116.inc | 4 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 16 ++++---- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +-- data/scripts/maps/Route120.inc | 16 ++++---- data/scripts/maps/Route121.inc | 6 +-- data/scripts/maps/Route128.inc | 8 ++-- data/scripts/maps/RustboroCity.inc | 8 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 8 ++-- data/scripts/maps/SeafloorCavern_Room9.inc | 14 +++---- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity.inc | 6 +-- data/scripts/maps/SlateportCity_Harbor.inc | 10 ++--- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 14 +++---- data/scripts/maps/SootopolisCity.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 6 +-- 73 files changed, 230 insertions(+), 230 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index a0f00e877..5a0b4014a 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -10,7 +10,7 @@ AncientTomb_MapScript1_15EFCE:: @ 815EFCE end AncientTomb_EventScript_15EFD8:: @ 815EFD8 - disappear LAST_TALKED + removeobject LAST_TALKED return AncientTomb_MapScript1_15EFDC:: @ 815EFDC diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index cad8e7481..0001d7574 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -9,7 +9,7 @@ AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C end AquaHideout_B1F_EventScript_15D846:: @ 815D846 - disappear LAST_TALKED + removeobject LAST_TALKED return AquaHideout_B1F_MapScript1_15D84A:: @ 815D84A diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index b08a68d1b..9fd81f121 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -59,7 +59,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8009, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - disappear 0x8009 + removeobject 0x8009 delay 20 applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index bbc3360a8..3223deba4 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -13,7 +13,7 @@ BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_81347F8 - reappear 1 + addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 special sub_8135474 @@ -45,7 +45,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 waitmovement 0 - disappear 1 + removeobject 1 applymovement 2, BattleTower_BattleRoom_Movement_160ACB waitmovement 0 applymovement 255, BattleTower_BattleRoom_Movement_160ABC diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index fe55b50db..a147a3b5a 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -29,7 +29,7 @@ BattleTower_Elevator_MapScript2_160821:: @ 8160821 BattleTower_Elevator_EventScript_16082B:: @ 816082B setvar 0x4001, 1 - spriteface 255, 2 + turnobject 255, 2 end BattleTower_Elevator_Movement_160835:: @ 8160835 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 61b2da5e7..61ac04810 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -46,7 +46,7 @@ BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 setvar 0x4001, 1 - spriteface 255, 2 + turnobject 255, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index f577f39fa..53e693f71 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 - spriteinvisible 5, 26, 4 + hideobject 5, 26, 4 setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index dcd97f069..3b2e7802d 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -9,7 +9,7 @@ CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 - disappear 1 + removeobject 1 return CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index d63398d78..b549cf127 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -10,7 +10,7 @@ DesertRuins_MapScript1_15CB03:: @ 815CB03 end DesertRuins_EventScript_15CB0D:: @ 815CB0D - disappear LAST_TALKED + removeobject LAST_TALKED return DesertRuins_MapScript1_15CB11:: @ 815CB11 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 09835c0b9..c8f20f4ac 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -122,24 +122,24 @@ DewfordTown_EventScript_14E151:: @ 814E151 spritelevelup 255, 0, 11, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 - disappear 2 + removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - spriteinvisible 255, 0, 11 + hideobject 255, 0, 11 call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 applymovement 255, DewfordTown_Movement_14E293 waitmovement 0 - spritevisible 255, 0, 19 + showobject 255, 0, 19 call DewfordTown_EventScript_1A02EF applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 - spritevisible 255, 0, 19 + showobject 255, 0, 19 clearflag 739 clearflag 881 clearflag 742 setflag 743 - spriteinvisible 4, 0, 11 + hideobject 4, 0, 11 setvar 0x408e, 2 restorespritelevel 255, 0, 11 warp Route104_MrBrineysHouse, 255, 5, 4 @@ -154,28 +154,28 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 spritelevelup 255, 0, 11, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 - disappear 2 + removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - spriteinvisible 255, 0, 11 + hideobject 255, 0, 11 call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 applymovement 255, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - spritevisible 255, 0, 24 + showobject 255, 0, 24 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 movespriteperm 2, 21, 26 - reappear 2 + addobject 2 spritelevelup 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag 741 - reappear 1 + addobject 1 clearflag 744 setflag 743 - spriteinvisible 4, 0, 11 + hideobject 4, 0, 11 checkflag 149 call_if 0, DewfordTown_EventScript_14E281 checkflag 149 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 669da34f9..adfbca1bf 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -13,7 +13,7 @@ EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 @@ -57,7 +57,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 - reappear 2 + addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkgender compare RESULT, 0 @@ -102,7 +102,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 closebutton - reappear 3 + addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 waitmovement 0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0843 diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/scripts/maps/EverGrandeCity_Corridor1.inc index 499ad673f..104504960 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/scripts/maps/EverGrandeCity_Corridor2.inc index 692de1ed9..c7c049020 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/scripts/maps/EverGrandeCity_Corridor3.inc index f8ed19669..1714db5cc 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/scripts/maps/EverGrandeCity_Corridor4.inc index 616a25ec5..64cc234eb 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/scripts/maps/EverGrandeCity_Corridor5.inc index 783b03aec..73c0b5a84 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc @@ -7,5 +7,5 @@ EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 - spriteface 255, 2 + turnobject 255, 2 end diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ee171824f..3d3d56ff9 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 8ebf7939f..07f6e8877 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index d0fb7922f..523a337cc 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -8,7 +8,7 @@ EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index b8fe90a01..b7c1618ba 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 3f472ca3f..daca98176 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -25,7 +25,7 @@ EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A - spriteface 255, 2 + turnobject 255, 2 end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index abe0ac7c6..3b33c5a41 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -47,7 +47,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 - disappear 4 + removeobject 4 clearflag 870 release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index e0bac8007..a7c548b1f 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -81,7 +81,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 waitpokecry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 - disappear LAST_TALKED + removeobject LAST_TALKED setflag 295 release end diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f7f8391d4..f90c080f8 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -19,7 +19,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 clearflag 934 applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 - disappear 3 + removeobject 3 releaseall end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 06f234f28..9afe54091 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -23,7 +23,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D playse 9 - disappear 1 + removeobject 1 release end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 06524f95e..b59500625 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -10,7 +10,7 @@ IslandCave_MapScript1_15EEC6:: @ 815EEC6 end IslandCave_EventScript_15EED0:: @ 815EED0 - disappear LAST_TALKED + removeobject LAST_TALKED return IslandCave_MapScript1_15EED4:: @ 815EED4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index d24280efa..afad309a9 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -31,7 +31,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED setvar 0x8008, 1 setdooropened 12, 15 doorchange - reappear 8 + addobject 8 applymovement 8, LavaridgeTown_Movement_14E70E waitmovement 0 setdoorclosed 12, 15 @@ -103,14 +103,14 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 call_if 1, LavaridgeTown_EventScript_14E646 compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E64E - disappear 8 - reappear 7 + removeobject 8 + addobject 7 delay 30 compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E69A compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 - disappear 7 + removeobject 7 setvar 0x4053, 2 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 7031eb530..af353e824 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -418,7 +418,7 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B setanimation 0, 1 doanimation 30 delay 15 - disappear LAST_TALKED + removeobject LAST_TALKED checkanimation 30 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 1020e9d2b..7746eac01 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -20,7 +20,7 @@ LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 lockall - reappear 4 + addobject 4 applymovement 4, LilycoveCity_ContestLobby_Movement_158A3B waitmovement 4 applymovement 255, LilycoveCity_ContestLobby_Movement_158A4C @@ -48,7 +48,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE call_if 1, LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 - disappear 4 + removeobject 4 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA releaseall @@ -63,7 +63,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 setvar 0x4099, 0 - disappear 4 + removeobject 4 releaseall end @@ -195,7 +195,7 @@ LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall - reappear 11 + addobject 11 applymovement 11, LilycoveCity_ContestLobby_Movement_158B64 waitmovement 11 applymovement 255, LilycoveCity_ContestLobby_Movement_158B76 @@ -221,7 +221,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 - disappear 11 + removeobject 11 call LilycoveCity_ContestLobby_EventScript_158994 call LilycoveCity_ContestLobby_EventScript_1589EA releaseall @@ -236,7 +236,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 setvar 0x4099, 0 - disappear 11 + removeobject 11 releaseall end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 94b2d53a9..cbcac6f6e 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 13, 10 + hideobject LAST_TALKED, 13, 10 compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -117,9 +117,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 13, 10 + hideobject LAST_TALKED, 13, 10 delay 60 - reappear 4 + addobject 4 delay 30 applymovement 4, LilycoveCity_Harbor_Movement_1A0839 waitmovement 0 @@ -128,13 +128,13 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement 4, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - disappear 4 + removeobject 4 compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index db55695e6..548c80a96 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -38,7 +38,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158481:: @ 8158481 msgbox LilycoveCity_LilycoveMuseum_1F_Text_187534, 3 applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1584FC waitmovement 0 - disappear 2 + removeobject 2 switch FACING case 2, LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD case 3, LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 0f1dc96d9..06508fd02 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -104,7 +104,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setdooropened 0x8004, 0x8005 doorchange - reappear 4 + addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 setdoorclosed 0x8004, 0x8005 @@ -124,7 +124,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setflag 752 setvar 0x4092, 3 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setdoorclosed 0x8004, 0x8005 doorchange clearflag 868 @@ -370,14 +370,14 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall setvar 0x8008, 0 - movesprite 4, 10, 9 + setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall setvar 0x8008, 1 - movesprite 4, 11, 9 + setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end @@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange return @@ -853,14 +853,14 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 doorchange applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - spriteinvisible 4, 0, 9 + hideobject 4, 0, 9 setdoorclosed 0x8009, 0x800a doorchange goto LittlerootTown_EventScript_14DD2B end LittlerootTown_EventScript_14DD2B:: @ 814DD2B - disappear 4 + removeobject 4 setflag 2144 setvar 0x4050, 4 release diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 712bebf03..84fb4e69b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -38,7 +38,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 - disappear LAST_TALKED + removeobject LAST_TALKED setvar 0x408d, 3 setvar 0x4050, 1 savebgm 0 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 834ae8521..7e3386d7a 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -14,7 +14,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 - spriteface 255, 2 + turnobject 255, 2 end LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 63364c6e5..780eea4f5 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -8,5 +8,5 @@ MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 - disappear LAST_TALKED + removeobject LAST_TALKED return diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 5dd9983f4..da406e2f7 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -154,8 +154,8 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 end MauvilleCity_EventScript_14C22B:: @ 814C22B - disappear 6 - disappear 7 + removeobject 6 + removeobject 7 clearflag 806 clearflag 809 setflag 190 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 8d78d1496..c7aa8fb10 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -33,9 +33,9 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A083F applymovement 6, MeteorFalls_1F_1R_Movement_1A083F waitmovement 0 - reappear 7 - reappear 8 - reappear 9 + addobject 7 + addobject 8 + addobject 9 applymovement 7, MeteorFalls_1F_1R_Movement_15C608 applymovement 8, MeteorFalls_1F_1R_Movement_15C60F applymovement 9, MeteorFalls_1F_1R_Movement_15C617 @@ -49,8 +49,8 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC waitmovement 0 - disappear 5 - disappear 6 + removeobject 5 + removeobject 6 applymovement 7, MeteorFalls_1F_1R_Movement_15C628 waitmovement 0 .ifdef SAPPHIRE @@ -74,9 +74,9 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 8, MeteorFalls_1F_1R_Movement_15C62E applymovement 9, MeteorFalls_1F_1R_Movement_15C63E waitmovement 0 - disappear 7 - disappear 8 - disappear 9 + removeobject 7 + removeobject 8 + removeobject 9 setflag 819 setvar 0x40bf, 1 releaseall diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index b8388376a..c34eb9391 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -23,7 +23,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 call_if 1, MossdeepCity_House2_EventScript_15A8B9 - disappear 3 + removeobject 3 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index aebb51c9c..8648487c9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -78,7 +78,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT - disappear 2 + removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e60c40cae..8720375ae 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -43,10 +43,10 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .endif closebutton fadescreen 1 - disappear 2 - disappear 4 - disappear 5 - disappear 6 + removeobject 2 + removeobject 4 + removeobject 5 + removeobject 6 setflag 916 setflag 917 fadescreen 0 @@ -286,7 +286,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 call_if 1, MtPyre_Summit_EventScript_15D78A compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 - disappear 2 + removeobject 2 setvar 0x40b9, 3 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ef016f261..0627fc53b 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -14,7 +14,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F - disappear LAST_TALKED + removeobject LAST_TALKED return NewMauville_Inside_MapScript1_15E593:: @ 815E593 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 0ece240c6..412261ce1 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -277,7 +277,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 closebutton applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 - disappear 4 + removeobject 4 setvar 0x40c7, 2 setflag 979 releaseall diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1eff4d6c4..3ac7b85fc 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -69,7 +69,7 @@ PetalburgCity_Gym_MapScript2_154553:: @ 8154553 .2byte 0 PetalburgCity_Gym_EventScript_15455D:: @ 815455D - spriteface 255, 2 + turnobject 255, 2 end PetalburgCity_Gym_MapScript2_154562:: @ 8154562 @@ -85,7 +85,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 playse 9 - disappear 10 + removeobject 10 setflag 726 delay 30 applymovement 255, PetalburgCity_Gym_Movement_1A0841 @@ -142,7 +142,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E end PetalburgCity_Gym_EventScript_154669:: @ 8154669 - reappear 10 + addobject 10 playse 8 compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE @@ -204,7 +204,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_154860 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 - disappear 10 + removeobject 10 setflag 728 setvar 0x4085, 1 setvar 0x4057, 2 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 48eb53a50..4dececafa 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -86,7 +86,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA closebutton applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 - disappear 3 + removeobject 3 applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 @@ -110,7 +110,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D return PetalburgWoods_EventScript_15CE69:: @ 815CE69 - disappear 4 + removeobject 4 setvar 0x4098, 1 releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 35fbaf744..35c2d4117 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -21,8 +21,8 @@ Route101_EventScript_14E948:: @ 814E948 playbgm 410, 1 msgbox Route101_Text_16D10E, 4 closebutton - movesprite 2, 0, 15 - movesprite 4, 0, 16 + setobjectxy 2, 0, 15 + setobjectxy 4, 0, 16 applymovement 255, Route101_Movement_14EA2C applymovement 2, Route101_Movement_14EA50 applymovement 4, Route101_Movement_14EA1F @@ -220,8 +220,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag 2048 setflag 82 fadescreen 1 - disappear 4 - movesprite 255, 6, 13 + removeobject 4 + setobjectxy 255, 6, 13 applymovement 255, Route101_Movement_1A083F waitmovement 0 special ScrSpecial_ChooseStarter diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index b46545050..e5cf156a1 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -116,7 +116,7 @@ Route103_EventScript_14ED29:: @ 814ED29 end Route103_EventScript_14ED46:: @ 814ED46 - disappear 2 + removeobject 2 setvar 0x4062, 1 setvar 0x4084, 4 clearflag 889 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c954ac972..8abb7354a 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -128,10 +128,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 spritelevelup 255, 0, 19, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 - disappear 8 + removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - spriteinvisible 255, 0, 19 + hideobject 255, 0, 19 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,20 +139,20 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - spritevisible 255, 0, 11 + showobject 255, 0, 11 applymovement 255, Route104_Movement_14F168 waitmovement 0 movespriteperm 2, 12, 8 - reappear 2 + addobject 2 spritelevelup 2, 0, 11, 0 clearflag 740 applymovement 2, Route104_Movement_14F16F waitmovement 0 - reappear 4 + addobject 4 clearflag 743 call Route104_EventScript_1A02EF setflag 742 - spriteinvisible 7, 0, 19 + hideobject 7, 0, 19 copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 19 restorespritelevel 2, 0, 11 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 45ff1d3ed..7b13fef72 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -7,7 +7,7 @@ Route109_EventScript_14F4D3:: @ 814F4D3 spritelevelup 255, 0, 24, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 - disappear 2 + removeobject 2 switch FACING case 1, Route109_EventScript_14F518 case 3, Route109_EventScript_14F538 @@ -33,25 +33,25 @@ Route109_EventScript_14F538:: @ 814F538 end Route109_EventScript_14F548:: @ 814F548 - spriteinvisible 255, 0, 24 + hideobject 255, 0, 24 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF applymovement 255, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - spritevisible 255, 0, 11 + showobject 255, 0, 11 applymovement 255, Route109_Movement_14F670 waitmovement 0 - reappear 4 + addobject 4 clearflag 743 movespriteperm 2, 12, 8 - reappear 2 + addobject 2 spritelevelup 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag 740 setflag 744 - spriteinvisible 1, 0, 24 + hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 closebutton copyvar 0x4096, 0x8008 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 56d4ff196..194816c36 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -433,8 +433,8 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF66 spritebehave 28, 10 spritebehave 29, 10 - disappear 28 - reappear 29 + removeobject 28 + addobject 29 delay 45 compare 0x8008, 1 call_if 1, Route110_EventScript_14FF35 @@ -442,7 +442,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 call_if 1, Route110_EventScript_14FF40 compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B - disappear 29 + removeobject 29 setvar 0x4069, 1 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index f99869648..0445496d2 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -21,9 +21,9 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 .2byte 0 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F - reappear 1 - spritevisible 1, 29, 1 - spriteface 1, 4 + addobject 1 + showobject 1, 29, 1 + turnobject 1, 4 end Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C @@ -185,7 +185,7 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E playse 178 applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 addvar 0x4044, 1 return @@ -223,7 +223,7 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall - spriteface 1, 3 + turnobject 1, 3 playse 21 applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 waitmovement 0 @@ -238,7 +238,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 waitmovement 0 delay 4 - spriteface 1, 4 + turnobject 1, 4 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 129cc7d6a..677ce93fa 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -138,15 +138,15 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 .2byte 0 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 - reappear 1 - spritevisible 1, 29, 0 - spriteface 1, 4 - spriteface 255, 3 + addobject 1 + showobject 1, 29, 0 + turnobject 1, 4 + turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 - reappear 1 - spriteinvisible 1, 29, 0 + addobject 1 + hideobject 1, 29, 0 switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 @@ -159,51 +159,51 @@ Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 end Route110_TrickHouseEntrance_EventScript_16116B:: @ 816116B - movesprite 1, 6, 3 + setobjectxy 1, 6, 3 end Route110_TrickHouseEntrance_EventScript_161173:: @ 8161173 - movesprite 1, 11, 5 + setobjectxy 1, 11, 5 end Route110_TrickHouseEntrance_EventScript_16117B:: @ 816117B - movesprite 1, 11, 1 + setobjectxy 1, 11, 1 end Route110_TrickHouseEntrance_EventScript_161183:: @ 8161183 - movesprite 1, 3, 1 + setobjectxy 1, 3, 1 end Route110_TrickHouseEntrance_EventScript_16118B:: @ 816118B - movesprite 1, 0, 5 + setobjectxy 1, 0, 5 end Route110_TrickHouseEntrance_EventScript_161193:: @ 8161193 - movesprite 1, 9, 1 + setobjectxy 1, 9, 1 end Route110_TrickHouseEntrance_EventScript_16119B:: @ 816119B - movesprite 1, 8, 1 + setobjectxy 1, 8, 1 end Route110_TrickHouseEntrance_EventScript_1611A3:: @ 81611A3 - movesprite 1, 4, 4 + setobjectxy 1, 4, 4 end Route110_TrickHouseEntrance_EventScript_1611AB:: @ 81611AB - disappear 1 + removeobject 1 end Route110_TrickHouseEntrance_EventScript_1611AF:: @ 81611AF - reappear 1 - movesprite 1, 5, 2 - spriteface 1, 2 + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 2 end Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE - reappear 1 - movesprite 1, 5, 2 - spriteface 1, 1 + addobject 1 + setobjectxy 1, 5, 2 + turnobject 1, 1 end Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD @@ -223,7 +223,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 playse 178 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 setvar 0x40a7, 1 setvar 0x40a6, 0 releaseall @@ -472,7 +472,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 playse 178 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 - disappear 1 + removeobject 1 setvar 0x40c1, 0 setvar 0x40a7, 5 releaseall diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 617509938..879735ece 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -58,11 +58,11 @@ Route111_EventScript_150023:: @ 8150023 closebutton setflag 963 setflag 964 - disappear 34 + removeobject 34 delay 30 applymovement 35, Route111_Movement_1500AF waitmovement 0 - disappear 35 + removeobject 35 releaseall end @@ -80,11 +80,11 @@ Route111_EventScript_150069:: @ 8150069 closebutton setflag 964 setflag 963 - disappear 35 + removeobject 35 delay 30 applymovement 34, Route111_Movement_1500AF waitmovement 0 - disappear 34 + removeobject 34 releaseall end @@ -254,12 +254,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 1, Route111_Movement_150356 waitmovement 0 - disappear 1 + removeobject 1 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 2 + addobject 2 applymovement 2, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -272,12 +272,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 2, Route111_Movement_150356 waitmovement 0 - disappear 2 + removeobject 2 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 3 + addobject 3 applymovement 3, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -290,12 +290,12 @@ Route111_EventScript_1501F3:: @ 81501F3 closebutton applymovement 3, Route111_Movement_150356 waitmovement 0 - disappear 3 + removeobject 3 call Route111_EventScript_15034F applymovement 255, Route111_Movement_15035B waitmovement 0 call Route111_EventScript_150348 - reappear 4 + addobject 4 applymovement 4, Route111_Movement_150359 waitmovement 0 call Route111_EventScript_15034F @@ -308,7 +308,7 @@ Route111_EventScript_1501F3:: @ 81501F3 call Route111_EventScript_150348 applymovement 4, Route111_Movement_150356 waitmovement 0 - disappear 4 + removeobject 4 call Route111_EventScript_15034F release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 5a328f198..ca3895e1a 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -56,7 +56,7 @@ Route116_EventScript_150A94:: @ 8150A94 call_if 1, Route116_EventScript_150AEE compare FACING, 4 call_if 1, Route116_EventScript_150AF9 - disappear LAST_TALKED + removeobject LAST_TALKED clearflag 949 setflag 256 release @@ -189,7 +189,7 @@ Route116_EventScript_150C03:: @ 8150C03 call_if 1, Route116_EventScript_150C37 compare FACING, 4 call_if 1, Route116_EventScript_150C42 - disappear LAST_TALKED + removeobject LAST_TALKED release end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 86e5f9045..8427395a6 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -90,7 +90,7 @@ Route118_EventScript_151004:: @ 8151004 compare 0x8008, 2 call_if 1, Route118_EventScript_15105E setvar 0x4071, 1 - disappear 19 + removeobject 19 releaseall end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index fff294ca9..d825cb96e 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -16,11 +16,11 @@ Route119_EventScript_15117C:: @ 815117C return Route119_EventScript_151193:: @ 8151193 - disappear 35 + removeobject 35 return Route119_EventScript_151197:: @ 8151197 - disappear 36 + removeobject 36 return Route119_MapScript1_15119B:: @ 815119B @@ -50,7 +50,7 @@ Route119_EventScript_1511D0:: @ 81511D0 Route119_EventScript_1511DB:: @ 81511DB lockall - reappear 25 + addobject 25 checkgender compare RESULT, 0 call_if 1, Route119_EventScript_151254 @@ -68,8 +68,8 @@ Route119_EventScript_1511DB:: @ 81511DB call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 - disappear 25 - reappear 16 + removeobject 25 + addobject 16 delay 30 checkgender compare RESULT, 0 @@ -158,14 +158,14 @@ Route119_EventScript_151362:: @ 8151362 call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 call_if 1, Route119_EventScript_1513E1 - disappear 16 - reappear 25 + removeobject 16 + addobject 25 delay 30 compare 0x4001, 1 call_if 1, Route119_EventScript_1513BC compare 0x4001, 2 call_if 1, Route119_EventScript_1513C7 - disappear 25 + removeobject 25 setvar 0x4072, 1 savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 5f9cf9888..37b6d07a9 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -43,9 +43,9 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 fadedefaultbgm fadescreen 1 setflag 890 - disappear 1 - disappear 2 - disappear 3 + removeobject 1 + removeobject 2 + removeobject 3 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmovement 0 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cb8ebb2cc..b6bb60ddd 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -25,28 +25,28 @@ Route120_EventScript_151628:: @ 8151628 return Route120_EventScript_15166B:: @ 815166B - disappear 30 - disappear 36 + removeobject 30 + removeobject 36 return Route120_EventScript_151672:: @ 8151672 - disappear 37 + removeobject 37 return Route120_EventScript_151676:: @ 8151676 - disappear 38 + removeobject 38 return Route120_EventScript_15167A:: @ 815167A - disappear 39 + removeobject 39 return Route120_EventScript_15167E:: @ 815167E - disappear 41 + removeobject 41 return Route120_EventScript_151682:: @ 8151682 - disappear 40 + removeobject 40 return Route120_MapScript1_151686:: @ 8151686 @@ -248,7 +248,7 @@ Route120_EventScript_151908:: @ 8151908 setanimation 0, 1 doanimation 30 delay 15 - disappear 31 + removeobject 31 checkanimation 30 setmaptile 13, 15, 663, 0 setmaptile 12, 16, 671, 0 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index efaf251b1..43be91266 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -26,9 +26,9 @@ Route121_EventScript_151B25:: @ 8151B25 applymovement 13, Route121_Movement_151B60 applymovement 14, Route121_Movement_151B69 waitmovement 0 - disappear 12 - disappear 13 - disappear 14 + removeobject 12 + removeobject 13 + removeobject 14 setvar 0x4074, 1 releaseall end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 158313a1b..f19dc6662 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -49,13 +49,13 @@ Route128_EventScript_15213F:: @ 815213F applymovement 5, Route128_Movement_152296 applymovement 4, Route128_Movement_152283 waitmovement 0 - disappear 5 - disappear 4 + removeobject 5 + removeobject 4 delay 100 setanimation 0, 1 doanimation 30 checkanimation 30 - reappear 3 + addobject 3 applymovement 3, Route128_Movement_15226F waitmovement 0 applymovement 255, Route128_Movement_1A0843 @@ -80,7 +80,7 @@ Route128_EventScript_15213F:: @ 815213F setanimation 0, 1 doanimation 30 delay 15 - disappear 3 + removeobject 3 checkanimation 30 setvar 0x407b, 2 releaseall diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index dcbb75886..d2469dca7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -165,18 +165,18 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD RustboroCity_EventScript_14C4F4:: @ 814C4F4 msgbox RustboroCity_Text_166E65, 4 closebutton - reappear 10 - reappear 9 + addobject 10 + addobject 9 applymovement 10, RustboroCity_Movement_14C5C2 waitmovement 0 - disappear 10 + removeobject 10 applymovement 9, RustboroCity_Movement_14C5D3 waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 closebutton applymovement 9, RustboroCity_Movement_14C5DB waitmovement 0 - disappear 9 + removeobject 9 movespriteperm 9, 30, 10 clearflag 732 setflag 142 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 88f1c377a..6458ec5ca 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -19,7 +19,7 @@ RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 - spriteface 255, 4 + turnobject 255, 4 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 81bfcd27d..0cfb66351 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -318,9 +318,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 waitmovement 0 - disappear 6 + removeobject 6 delay 50 - reappear 5 + addobject 5 applymovement 5, RusturfTunnel_Movement_15CAAC waitmovement 0 applymovement 255, RusturfTunnel_Movement_15CA9F @@ -339,8 +339,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 waitmovement 0 - disappear 5 - disappear 7 + removeobject 5 + removeobject 7 clearflag 142 setflag 143 setvar 0x405a, 4 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 087c1caf7..e600611be 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -28,7 +28,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closebutton - reappear 0x8004 + addobject 0x8004 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 @@ -96,8 +96,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 - disappear 7 - reappear 1 + removeobject 7 + addobject 1 waitstate delay 60 applymovement 1, SeafloorCavern_Room9_Movement_15DD4C @@ -110,7 +110,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 - disappear 1 + removeobject 1 delay 4 setvar 0x8004, 2 setvar 0x8005, 2 @@ -153,9 +153,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closebutton - reappear 0x8005 - reappear 0x8006 - reappear 0x8007 + addobject 0x8005 + addobject 0x8006 + addobject 0x8007 applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 9a8a57e3f..f5ee60d6d 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -8,7 +8,7 @@ SkyPillar_Top_MapScript1_15F308:: @ 815F308 end SkyPillar_Top_EventScript_15F312:: @ 815F312 - disappear LAST_TALKED + removeobject LAST_TALKED return SkyPillar_Top_EventScript_15F316:: @ 815F316 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index aba9ee235..1c9fc342f 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -502,8 +502,8 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 10, SlateportCity_Movement_14BFDD applymovement 9, SlateportCity_Movement_14BFEA waitmovement 0 - disappear 10 - disappear 9 + removeobject 10 + removeobject 9 msgbox SlateportCity_Text_16558D, 4 applymovement 11, SlateportCity_Movement_1A0841 waitmovement 0 @@ -532,7 +532,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_14BFFB applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 - disappear 11 + removeobject 11 clearflag 841 clearflag 848 clearflag 845 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 184586d94..50f4926e4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -59,9 +59,9 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 applymovement 7, SlateportCity_Harbor_Movement_15609B applymovement 8, SlateportCity_Harbor_Movement_1560A5 waitmovement 0 - disappear 6 - disappear 7 - disappear 8 + removeobject 6 + removeobject 7 + removeobject 8 setvar 0x40a0, 2 compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C @@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - spriteinvisible LAST_TALKED, 9, 8 + hideobject LAST_TALKED, 9, 8 compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 - spriteinvisible 255, 0, 0 + hideobject 255, 0, 0 setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 7fe5865a4..32a5c2013 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -181,7 +181,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 waitmovement 0 setflag 965 playse 9 - disappear 13 + removeobject 13 release end @@ -190,7 +190,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD waitmovement 0 setflag 965 playse 9 - disappear 13 + removeobject 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index c1398e579..5f64b3941 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -12,10 +12,10 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closebutton playbgm BGM_EVIL_TEAM, 1 - reappear 3 + addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmovement 0 - reappear 4 + addobject 4 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC3 waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB8 @@ -55,7 +55,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 closebutton delay 35 - reappear 2 + addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155ECE waitmovement 0 @@ -69,9 +69,9 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 .endif closebutton fadescreen 1 - disappear 2 - disappear 3 - disappear 4 + removeobject 2 + removeobject 3 + removeobject 4 fadescreen 0 delay 30 setflag 883 @@ -85,7 +85,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 playse 9 - disappear 1 + removeobject 1 setflag 900 setflag 149 clearflag 947 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 936b859e5..90d2bcc5e 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -464,7 +464,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD setanimation 0, 1 doanimation 30 delay 15 - disappear LAST_TALKED + removeobject LAST_TALKED checkanimation 30 release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 358e2277c..77c163c47 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,7 +17,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 - spriteinvisible 1, 26, 9 + hideobject 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C warp LilycoveCity_Harbor, 255, 8, 11 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 37af5e140..f4ec0ab2f 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -9,7 +9,7 @@ SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 - disappear 2 + removeobject 2 return SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C @@ -57,7 +57,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 pokecry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 waitpokecry - reappear 2 + addobject 2 delay 30 applymovement 127, SouthernIsland_Interior_Movement_160C16 applymovement 2, SouthernIsland_Interior_Movement_160C22 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 994f37b63..0c621d237 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - spriteinvisible 255, 0, 9 + hideobject 255, 0, 9 call LinkContestRoom1_EventScript_15F919 end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index a0173e720..2ed660a5f 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -13,7 +13,7 @@ VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF07 waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 @@ -21,7 +21,7 @@ VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF13 waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 @@ -29,7 +29,7 @@ VictoryRoad_1F_EventScript_15DEAB:: @ 815DEAB VictoryRoad_1F_EventScript_15DEBF:: @ 815DEBF lockall - reappear 4 + addobject 4 applymovement 4, VictoryRoad_1F_Movement_15DF1E waitmovement 0 goto VictoryRoad_1F_EventScript_15DED3 -- cgit v1.2.3 From 676ffb73cad2a5ec4173a09d525fda68dd2bd0f7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 15:38:46 -0500 Subject: stuff... I don't remember --- data/scripts/maps/Route111.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 879735ece..de37c68fc 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -44,9 +44,9 @@ Route111_EventScript_15000D:: @ 815000D setflag 769 setflag 770 setflag 771 - settrainerflag OPPONENT_VICTOR - settrainerflag OPPONENT_VICTORIA - settrainerflag OPPONENT_VIVI + cleartrainerflag OPPONENT_VICTOR + cleartrainerflag OPPONENT_VICTORIA + cleartrainerflag OPPONENT_VIVI end Route111_EventScript_150023:: @ 8150023 -- cgit v1.2.3 From e926119b726839bc687c503db3680899906aad0d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sat, 30 Sep 2017 17:04:25 -0500 Subject: update --- data/scripts/maps/AncientTomb.inc | 4 +- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 8 +-- data/scripts/maps/BattleTower_Lobby.inc | 42 +++++++-------- data/scripts/maps/BattleTower_Outside.inc | 8 +-- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DesertRuins.inc | 4 +- data/scripts/maps/DewfordTown.inc | 20 ++++---- data/scripts/maps/DewfordTown_Gym.inc | 2 +- data/scripts/maps/DewfordTown_Hall.inc | 4 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 8 +-- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 4 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 22 ++++---- data/scripts/maps/FallarborTown_ContestLobby.inc | 6 +-- data/scripts/maps/FallarborTown_Mart.inc | 2 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_DecorationShop.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/FortreeCity_Mart.inc | 2 +- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 18 +++---- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 12 ++--- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LavaridgeTown_Mart.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 56 ++++++++++---------- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 8 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 6 +-- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LilycoveCity_DepartmentStore_2F.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_3F.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_4F.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_5F.inc | 8 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 12 ++--- data/scripts/maps/LilycoveCity_House3.inc | 6 +-- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 14 ++--- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 16 +++--- data/scripts/maps/LittlerootTown.inc | 32 ++++++------ .../maps/LittlerootTown_BrendansHouse_1F.inc | 14 ++--- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 14 ++--- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 8 +-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MauvilleCity.inc | 10 ++-- data/scripts/maps/MauvilleCity_BikeShop.inc | 18 +++---- data/scripts/maps/MauvilleCity_GameCorner.inc | 16 +++--- data/scripts/maps/MauvilleCity_Gym.inc | 2 +- data/scripts/maps/MauvilleCity_Mart.inc | 2 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 12 ++--- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 14 ++--- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 8 +-- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_Mart.inc | 2 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 10 ++-- data/scripts/maps/MtChimney_CableCarStation.inc | 10 ++-- data/scripts/maps/MtPyre_Summit.inc | 6 +-- data/scripts/maps/OldaleTown.inc | 16 +++--- data/scripts/maps/OldaleTown_Mart.inc | 2 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 10 ++-- data/scripts/maps/PetalburgCity_Gym.inc | 18 +++---- data/scripts/maps/PetalburgCity_Mart.inc | 2 +- .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 18 +++---- data/scripts/maps/Route101.inc | 10 ++-- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 4 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 12 ++--- .../maps/Route104_PrettyPetalFlowerShop.inc | 4 +- data/scripts/maps/Route104_Prototype.inc | 2 +- data/scripts/maps/Route109.inc | 16 +++--- data/scripts/maps/Route110.inc | 12 ++--- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 2 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 20 ++++---- data/scripts/maps/Route110_TrickHouseEntrance.inc | 16 +++--- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 4 +- data/scripts/maps/Route111.inc | 14 ++--- data/scripts/maps/Route111_OldLadysRestStop.inc | 2 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 10 ++-- data/scripts/maps/Route113_GlassWorkshop.inc | 8 +-- data/scripts/maps/Route116.inc | 8 +-- data/scripts/maps/Route117.inc | 2 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 14 ++--- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 6 +-- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 16 +++--- data/scripts/maps/Route120.inc | 8 +-- data/scripts/maps/Route121.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 6 +-- .../maps/Route124_DivingTreasureHuntersHouse.inc | 2 +- data/scripts/maps/Route128.inc | 12 ++--- data/scripts/maps/RustboroCity.inc | 30 +++++------ data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 4 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 12 ++--- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 18 +++---- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_Mart.inc | 2 +- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 8 +-- data/scripts/maps/RusturfTunnel.inc | 28 +++++----- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SafariZone_Southeast.inc | 6 +-- data/scripts/maps/SeafloorCavern_Room9.inc | 10 ++-- data/scripts/maps/SealedChamber_InnerRoom.inc | 16 +++--- data/scripts/maps/SealedChamber_OuterRoom.inc | 24 ++++----- data/scripts/maps/SlateportCity.inc | 60 +++++++++++----------- data/scripts/maps/SlateportCity_ContestLobby.inc | 6 +-- data/scripts/maps/SlateportCity_Harbor.inc | 26 +++++----- data/scripts/maps/SlateportCity_Mart.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 6 +-- .../maps/SlateportCity_OceanicMuseum_2F.inc | 14 ++--- .../maps/SlateportCity_PokemonCenter_1F.inc | 2 +- .../maps/SlateportCity_SternsShipyard_1F.inc | 4 +- data/scripts/maps/SootopolisCity.inc | 34 ++++++------ data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- data/scripts/maps/SootopolisCity_Mart.inc | 2 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 6 +-- data/scripts/maps/VerdanturfTown_Mart.inc | 2 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- 142 files changed, 595 insertions(+), 595 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 5a0b4014a..0e9a82f4c 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -37,7 +37,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 goto_if_eq AncientTomb_EventScript_15F038 braillemsg AncientTomb_Braille_1C552E waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ AncientTomb_EventScript_15F042:: @ 815F042 lockall braillemsg AncientTomb_Braille_1C552E waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 9fd81f121..230d0e2db 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -47,7 +47,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 - closebutton + closemessage .ifdef SAPPHIRE applymovement 0x8008, Movement_1A083F .else diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3223deba4..3f1aad4a0 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -18,8 +18,8 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmovement 0 special sub_8135474 msgbox 0x20234cc, 4 - waittext - closebutton + waitmessage + closemessage special ScrSpecial_HealPlayerParty setvar 0x8004, 0 setvar 0x8005, 0 @@ -80,7 +80,7 @@ BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E case 127, BattleTower_BattleRoom_EventScript_1609B2 BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C - closebutton + closemessage applymovement 255, BattleTower_BattleRoom_Movement_160ABE waitmovement 0 applymovement 2, BattleTower_BattleRoom_Movement_160AD0 @@ -109,7 +109,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 - waittext + waitmessage playse 55 waitse msgbox BattleTower_BattleRoom_Text_1C6D05, 4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 61ac04810..555e32d81 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -65,7 +65,7 @@ BattleTower_Lobby_EventScript_160330:: @ 8160330 lock faceplayer msgbox BattleTower_Lobby_Text_19A3FD, 4 - closebutton + closemessage setvar 0x4000, 5 release end @@ -74,7 +74,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 lock faceplayer message BattleTower_Lobby_Text_19A487 - waittext + waitmessage setvar 0x8004, 0 special sub_81358A4 compare RESULT, 6 @@ -83,7 +83,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE - waittext + waitmessage playfanfare 370 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -94,7 +94,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 - waittext + waitmessage setvar 0x8004, 13 special sub_8135668 special sub_8135D84 @@ -108,12 +108,12 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar 0x8005, 3 special sub_8135668 message BattleTower_Lobby_Text_19A4BB - waittext + waitmessage special sub_8135DEC switch RESULT case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 - waittext + waitmessage playfanfare 370 waitfanfare setvar 0x8004, 9 @@ -124,15 +124,15 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 msgbox BattleTower_Lobby_Text_199FA9, 4 - closebutton + closemessage setvar 0x4000, 5 release end BattleTower_Lobby_EventScript_160408:: @ 8160408 msgbox BattleTower_Lobby_Text_19A520, 4 - waittext - closebutton + waitmessage + closemessage setvar 0x4000, 5 release end @@ -141,9 +141,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 lock faceplayer message BattleTower_Lobby_Text_19A571 - waittext + waitmessage message BattleTower_Lobby_Text_19A589 - waittext + waitmessage setvar 0x8004, 13 special sub_8135668 setvar 0x8004, 0 @@ -151,7 +151,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 playse 55 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 - closebutton + closemessage setvar 0x4000, 5 release end @@ -161,9 +161,9 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B faceplayer setvar 0x40bc, 1 message BattleTower_Lobby_Text_19A5B1 - waittext + waitmessage message BattleTower_Lobby_Text_19A5CE - waittext + waitmessage setvar 0x8004, 1 special sub_8135BA0 playse 55 @@ -175,7 +175,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B special SavePlayerParty special sub_8135A14 msgbox BattleTower_Lobby_Text_19A0A8, 4 - closebutton + closemessage call BattleTower_Lobby_EventScript_160664 warp BattleTower_Elevator, 255, 1, 6 setvar 0x4000, 0 @@ -193,7 +193,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E BattleTower_Lobby_EventScript_1604BE:: @ 81604BE message BattleTower_Lobby_Text_199F79 - waittext + waitmessage multichoice 15, 6, 23, 0 switch RESULT case 0, BattleTower_Lobby_EventScript_1604FA @@ -203,7 +203,7 @@ BattleTower_Lobby_EventScript_1604BE:: @ 81604BE BattleTower_Lobby_EventScript_1604FA:: @ 81604FA message BattleTower_Lobby_Text_19A024 - waittext + waitmessage multichoice 18, 6, 24, 0 switch RESULT case 2, BattleTower_Lobby_EventScript_160652 @@ -240,11 +240,11 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x8005, 0 special sub_8135668 special LoadPlayerParty - closebutton + closemessage delay 2 call S_DoSaveDialog setvar 0x4000, 5 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 inccounter GAME_STAT_ENTERED_BATTLE_TOWER @@ -252,7 +252,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 special sub_8135A14 setvar 0x40bc, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 - closebutton + closemessage call BattleTower_Lobby_EventScript_160664 warp BattleTower_Elevator, 255, 1, 6 setvar 0x4000, 0 @@ -380,7 +380,7 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 lockall special ShowBattleTowerRecords waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 53e693f71..95c5a9d77 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -16,12 +16,12 @@ BattleTower_Outside_EventScript_160168:: @ 8160168 compare RESULT, 0 goto_if_eq BattleTower_Outside_EventScript_1601C6 message BattleTower_Outside_Text_199D9D - waittext + waitmessage goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_16018E:: @ 816018E - multichoicedef 21, 6, 53, 2, 0 + multichoicedefault 21, 6, 53, 2, 0 switch RESULT case 0, BattleTower_Outside_EventScript_1601D0 case 1, BattleTower_Outside_EventScript_1601FB @@ -58,12 +58,12 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB BattleTower_Outside_EventScript_160226:: @ 8160226 message BattleTower_Outside_Text_199E7A - waittext + waitmessage goto BattleTower_Outside_EventScript_16018E end BattleTower_Outside_EventScript_160232:: @ 8160232 - closebutton + closemessage applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 3b2e7802d..503b9f1a8 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -32,7 +32,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4 .endif - closebutton + closemessage setweather 0 doweather special WaitWeather @@ -87,7 +87,7 @@ CaveOfOrigin_B4F_EventScript_15DE73:: @ 815DE73 .else msgbox CaveOfOrigin_B4F_Text_1B5009, 4 .endif - closebutton + closemessage return CaveOfOrigin_B4F_Movement_15DE7D:: @ 815DE7D diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index b549cf127..6b8bb5cdb 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -37,7 +37,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 goto_if_eq DesertRuins_EventScript_15CB6D braillemsg DesertRuins_Braille_1C54C8 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ DesertRuins_EventScript_15CB77:: @ 815CB77 lockall braillemsg DesertRuins_Braille_1C54C8 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index c8f20f4ac..480a408e3 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -12,8 +12,8 @@ DewfordTown_EventScript_14E002:: @ 814E002 checkflag 189 goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 - waittext - multichoicedef 21, 6, 0, 2, 0 + waitmessage + multichoicedefault 21, 6, 0, 2, 0 switch RESULT case 0, DewfordTown_EventScript_14E04B case 1, DewfordTown_EventScript_14E05B @@ -23,21 +23,21 @@ DewfordTown_EventScript_14E002:: @ 814E002 DewfordTown_EventScript_14E04B:: @ 814E04B msgbox DewfordTown_Text_16B57D, 4 - closebutton + closemessage goto DewfordTown_EventScript_14E151 release end DewfordTown_EventScript_14E05B:: @ 814E05B msgbox DewfordTown_Text_16B5D2, 4 - closebutton + closemessage goto DewfordTown_EventScript_14E1D8 release end DewfordTown_EventScript_14E06B:: @ 814E06B msgbox DewfordTown_Text_16B627, 4 - closebutton + closemessage release end @@ -51,7 +51,7 @@ DewfordTown_EventScript_14E076:: @ 814E076 DewfordTown_EventScript_14E093:: @ 814E093 msgbox DewfordTown_Text_16B417, 4 - closebutton + closemessage goto DewfordTown_EventScript_14E151 end @@ -98,7 +98,7 @@ DewfordTown_EventScript_14E111:: @ 814E111 DewfordTown_EventScript_14E11B:: @ 814E11B message DewfordTown_Text_16B84E - waittext + waitmessage multichoice 20, 8, 50, 1 compare RESULT, 0 goto_if_eq DewfordTown_EventScript_14E13D @@ -166,7 +166,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 showobject 255, 0, 24 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 - movespriteperm 2, 21, 26 + setobjectxyperm 2, 21, 26 addobject 2 spritelevelup 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 @@ -180,11 +180,11 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call_if 0, DewfordTown_EventScript_14E281 checkflag 149 call_if 1, DewfordTown_EventScript_14E28A - closebutton + closemessage copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 11 restorespritelevel 2, 0, 24 - moveoffscreen 2 + moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 034bca1bc..296d2ed2d 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -109,7 +109,7 @@ DewfordTown_Gym_EventScript_153152:: @ 8153152 DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_153117 message DewfordTown_Gym_Text_1752BB - waittext + waitmessage call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag 1204 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 78b5f5044..ea4016147 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -52,7 +52,7 @@ DewfordTown_Hall_EventScript_15330A:: @ 815330A faceplayer call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17570D, 4 - closebutton + closemessage applymovement 4, DewfordTown_Hall_Movement_1A0841 waitmovement 0 release @@ -63,7 +63,7 @@ DewfordTown_Hall_EventScript_153326:: @ 8153326 faceplayer call DewfordTown_Hall_EventScript_1A0102 msgbox DewfordTown_Hall_Text_17574C, 4 - closebutton + closemessage applymovement 5, DewfordTown_Hall_Movement_1A0841 waitmovement 0 release diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 96c198ae5..70e75492e 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 setvar 0x800b, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index adfbca1bf..febd6a521 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -50,7 +50,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 setmaptile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 - closebutton + closemessage playse 8 checkgender compare RESULT, 0 @@ -101,7 +101,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB end EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 - closebutton + closemessage addobject 3 applymovement 3, EverGrandeCity_ChampionsRoom_Movement_15BA03 waitmovement 0 @@ -116,7 +116,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191512, 4 - closebutton + closemessage delay 30 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FB applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9DD @@ -132,7 +132,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 - closebutton + closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 523a337cc..b53319abe 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -24,7 +24,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_191841, 4 - closebutton + closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_15BC60 applymovement 255, EverGrandeCity_HallOfFame_Movement_15BC60 waitmovement 0 @@ -33,7 +33,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A083F waitmovement 0 msgbox EverGrandeCity_HallOfFame_Text_1918D7, 4 - closebutton + closemessage applymovement 1, EverGrandeCity_HallOfFame_Movement_1A0841 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 waitmovement 0 diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 7c0b8b0a4..57262b211 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 setvar 0x800b, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index f15f05904..acbdac899 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -10,14 +10,14 @@ EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B end EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B - movespriteperm 3, 9, 2 - movespriteperm 4, 10, 2 + setobjectxyperm 3, 9, 2 + setobjectxyperm 4, 10, 2 return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A setvar 0x800b, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B - waittext + waitmessage waitbutton release end @@ -26,7 +26,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAA8:: @ 815BAA8 lock faceplayer message EverGrandeCity_PokemonLeague_Text_1A0BE4 - waittext + waitmessage pokemart EverGrandeCity_PokemonLeague_Items msgbox EverGrandeCity_PokemonLeague_Text_1A0C02, 4 release @@ -55,22 +55,22 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 compare 0x4000, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD - waittext + waitmessage delay 75 checkflag 2060 goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A - closebutton + closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 playfanfare 369 message EverGrandeCity_PokemonLeague_Text_191804 - waittext + waitmessage waitfanfare - closebutton - moveoffscreen 3 - moveoffscreen 4 + closemessage + moveobjectoffscreen 3 + moveobjectoffscreen 4 setflag 263 releaseall end @@ -95,7 +95,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB57:: @ 815BB57 applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A0839 waitmovement 0 msgbox EverGrandeCity_PokemonLeague_Text_191804, 4 - closebutton + closemessage applymovement LAST_TALKED, EverGrandeCity_PokemonLeague_Movement_1A083D waitmovement 0 releaseall diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index a629acaf9..c4c590b53 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -38,7 +38,7 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 applymovement 255, FallarborTown_ContestLobby_Movement_153A7A waitmovement 0 msgbox FallarborTown_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, FallarborTown_ContestLobby_Movement_153A83 applymovement 255, FallarborTown_ContestLobby_Movement_153A70 waitmovement 0 @@ -108,7 +108,7 @@ FallarborTown_ContestLobby_EventScript_153AB2:: @ 8153AB2 FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB lockall fadescreen 1 - showcontestwinner 2 + drawcontestwinner 2 releaseall end @@ -116,6 +116,6 @@ FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index 05a3704fe..0cf842ddf 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -5,7 +5,7 @@ FallarborTown_Mart_EventScript_153967:: @ 8153967 lock faceplayer message FallarborTown_Mart_Text_1A0BE4 - waittext + waitmessage pokemart FallarborTown_Mart_Items msgbox FallarborTown_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 3b33c5a41..5b1f1c948 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end @@ -27,7 +27,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B22:: @ 8153B22 lock faceplayer msgbox FallarborTown_PokemonCenter_1F_Text_1774D4, 4 - closebutton + closemessage switch FACING case 2, FallarborTown_PokemonCenter_1F_EventScript_153B49 case 3, FallarborTown_PokemonCenter_1F_EventScript_153B59 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index a7c548b1f..3cddff4f9 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -72,7 +72,7 @@ FortreeCity_EventScript_14C9CF:: @ 814C9CF FortreeCity_EventScript_14C9E4:: @ 814C9E4 msgbox FortreeCity_Text_1678CB, 4 - closebutton + closemessage applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc index c9d9fdd4e..fca20b866 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.inc +++ b/data/scripts/maps/FortreeCity_DecorationShop.inc @@ -13,7 +13,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A lock faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 - waittext + waitmessage pokemartdecor FortreeCity_DecorationShop_Decorations1 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release @@ -37,7 +37,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 lock faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 - waittext + waitmessage pokemartdecor FortreeCity_DecorationShop_Decorations2 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 8744141cb..7309be0bb 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -25,7 +25,7 @@ FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 FortreeCity_Gym_EventScript_157F15:: @ 8157F15 message FortreeCity_Gym_Text_185E48 - waittext + waitmessage call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 setflag 1225 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index f90c080f8..fdd30022f 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -14,7 +14,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 checkflag 222 goto_if_eq FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 - closebutton + closemessage setflag 222 clearflag 934 applymovement 3, FortreeCity_House4_Movement_158218 diff --git a/data/scripts/maps/FortreeCity_Mart.inc b/data/scripts/maps/FortreeCity_Mart.inc index 9e5f34ff9..076f702af 100644 --- a/data/scripts/maps/FortreeCity_Mart.inc +++ b/data/scripts/maps/FortreeCity_Mart.inc @@ -5,7 +5,7 @@ FortreeCity_Mart_EventScript_158067:: @ 8158067 lock faceplayer message FortreeCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart FortreeCity_Mart_Items msgbox FortreeCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 148324abf..5268cbeed 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B setvar 0x800b, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 9afe54091..070276e58 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -13,7 +13,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 - closebutton + closemessage compare FACING, 2 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 1 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index b59500625..ed230477c 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -70,7 +70,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C IslandCave_EventScript_15EF95:: @ 815EF95 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index afad309a9..e0d54d0e7 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -14,8 +14,8 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE end LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 - movespriteperm 8, 11, 9 - movespriteperm 7, 11, 9 + setobjectxyperm 8, 11, 9 + setobjectxyperm 7, 11, 9 return LavaridgeTown_EventScript_14E4DF:: @ 814E4DF @@ -98,7 +98,7 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 end LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 - closebutton + closemessage compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E646 compare 0x8008, 0 @@ -124,7 +124,7 @@ LavaridgeTown_EventScript_14E644:: @ 814E644 end LavaridgeTown_EventScript_14E646:: @ 814E646 - movespriteperm 7, 6, 16 + setobjectxyperm 7, 6, 16 return LavaridgeTown_EventScript_14E64E:: @ 814E64E @@ -139,19 +139,19 @@ LavaridgeTown_EventScript_14E64E:: @ 814E64E return LavaridgeTown_EventScript_14E67B:: @ 814E67B - spritebehave 7, 8 + setobjectmovementtype 7, 8 return LavaridgeTown_EventScript_14E680:: @ 814E680 - spritebehave 7, 7 + setobjectmovementtype 7, 7 return LavaridgeTown_EventScript_14E685:: @ 814E685 - spritebehave 7, 10 + setobjectmovementtype 7, 10 return LavaridgeTown_EventScript_14E68A:: @ 814E68A - spritebehave 7, 9 + setobjectmovementtype 7, 9 return LavaridgeTown_EventScript_14E68F:: @ 814E68F @@ -285,7 +285,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A playfanfare 370 message LavaridgeTown_Text_16C2EA waitfanfare - waittext + waitmessage giveegg 360 release end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index e22d4471f..2edffe9f0 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -43,27 +43,27 @@ LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF checktrainerflag OPPONENT_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C - spritebehave 2, 63 + setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C checktrainerflag OPPONENT_ZANE goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719 - spritebehave 3, 63 + setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 checktrainerflag OPPONENT_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726 - spritebehave 4, 63 + setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 checktrainerflag OPPONENT_SADIE goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733 - spritebehave 5, 63 + setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 checktrainerflag OPPONENT_ANDY goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740 - spritebehave 7, 63 + setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 return @@ -78,7 +78,7 @@ LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 message LavaridgeTown_Gym_1F_Text_176A62 - waittext + waitmessage call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag 1213 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index c924684bc..5ec6731d4 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -5,7 +5,7 @@ LavaridgeTown_HerbShop_EventScript_153629:: @ 8153629 lock faceplayer message LavaridgeTown_HerbShop_Text_17615C - waittext + waitmessage pokemart LavaridgeTown_HerbShop_Items msgbox LavaridgeTown_HerbShop_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LavaridgeTown_Mart.inc b/data/scripts/maps/LavaridgeTown_Mart.inc index 4f28e16b0..99b567e06 100644 --- a/data/scripts/maps/LavaridgeTown_Mart.inc +++ b/data/scripts/maps/LavaridgeTown_Mart.inc @@ -5,7 +5,7 @@ LavaridgeTown_Mart_EventScript_1538CB:: @ 81538CB lock faceplayer message LavaridgeTown_Mart_Text_1A0BE4 - waittext + waitmessage pokemart LavaridgeTown_Mart_Items msgbox LavaridgeTown_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index c0762bcc3..9d0f31059 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B setvar 0x800b, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index af353e824..76976543c 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -411,7 +411,7 @@ LilycoveCity_EventScript_14CF62:: @ 814CF62 return LilycoveCity_EventScript_14CF6B:: @ 814CF6B - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7746eac01..09f2e88ea 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -28,7 +28,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 - showcontestwinner 0 + drawcontestwinner 0 lockall msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 @@ -40,7 +40,7 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 - closebutton + closemessage special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon @@ -59,7 +59,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 - closebutton + closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 setvar 0x4099, 0 @@ -83,7 +83,7 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 msgbox LilycoveCity_ContestLobby_Text_188C32, 4 - closebutton + closemessage return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 @@ -203,7 +203,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A msgbox LilycoveCity_ContestLobby_Text_18890F, 4 lockall fadescreen 1 - showcontestwinner 0 + drawcontestwinner 0 msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE @@ -213,7 +213,7 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 - closebutton + closemessage special sub_80C4CEC setvar 0x4099, 0 specialvar RESULT, GiveMonArtistRibbon @@ -232,7 +232,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 - closebutton + closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 setvar 0x4099, 0 @@ -256,7 +256,7 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 msgbox LilycoveCity_ContestLobby_Text_188C32, 4 - closebutton + closemessage return LilycoveCity_ContestLobby_Movement_158B64:: @ 8158B64 @@ -310,14 +310,14 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkflag 2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C - waittext + waitmessage setflag 2 goto LilycoveCity_ContestLobby_EventScript_158BF0 end LilycoveCity_ContestLobby_EventScript_158BAE:: @ 8158BAE message LilycoveCity_ContestLobby_Text_188584 - waittext + waitmessage goto LilycoveCity_ContestLobby_EventScript_158BF0 end @@ -331,7 +331,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog - hidebox 0, 0, 15, 9 + erasebox 0, 0, 15, 9 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 setflag 3 @@ -394,7 +394,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 copyvar 0x8008, 0x8004 message LilycoveCity_ContestLobby_Text_1A67A3 - waittext + waitmessage yesnobox 20, 8 switch RESULT case 0, LilycoveCity_ContestLobby_EventScript_158C42 @@ -405,7 +405,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA checkflag 3 call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC - waittext + waitmessage multichoice 0, 0, 4, 0 switch RESULT case 5, LilycoveCity_ContestLobby_EventScript_158C35 @@ -416,7 +416,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 - waittext + waitmessage copyvar 0x8004, RESULT special sub_808363C waitstate @@ -427,7 +427,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 compare RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 message2 LilycoveCity_ContestLobby_Text_18872A - waittext + waitmessage contestlinktransfer switch 0x8004 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 @@ -443,7 +443,7 @@ LilycoveCity_ContestLobby_EventScript_158D82:: @ 8158D82 LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 special CloseLink msgbox LilycoveCity_ContestLobby_Text_18878D, 4 - closebutton + closemessage releaseall clearflag 3 end @@ -451,7 +451,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 special CloseLink msgbox LilycoveCity_ContestLobby_Text_1887F4, 4 - closebutton + closemessage releaseall clearflag 3 end @@ -459,7 +459,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 special CloseLink msgbox LilycoveCity_ContestLobby_Text_18881F, 4 - closebutton + closemessage releaseall clearflag 3 end @@ -474,7 +474,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 addvar 0x8004, 1 buffernum 1, 32772 message2 LilycoveCity_ContestLobby_Text_188845 - waittext + waitmessage addvar 0x8004, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -491,9 +491,9 @@ LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B lockall message2 LilycoveCity_ContestLobby_Text_1888C6 - waittext + waitmessage delay 20 - closebutton + closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 playse 71 @@ -512,9 +512,9 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 waitmovement 0 message2 LilycoveCity_ContestLobby_Text_1A6832 - waittext + waitmessage delay 20 - closebutton + closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158EA4 applymovement 255, LilycoveCity_ContestLobby_Movement_158E8E waitmovement 0 @@ -651,7 +651,7 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 applymovement 255, LilycoveCity_ContestLobby_Movement_159008 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, LilycoveCity_ContestLobby_Movement_159013 applymovement 255, LilycoveCity_ContestLobby_Movement_158FFE waitmovement 0 @@ -735,21 +735,21 @@ LilycoveCity_ContestLobby_EventScript_15905D:: @ 815905D LilycoveCity_ContestLobby_EventScript_159066:: @ 8159066 lockall fadescreen 1 - showcontestwinner 6 + drawcontestwinner 6 releaseall end LilycoveCity_ContestLobby_EventScript_15906D:: @ 815906D lockall fadescreen 1 - showcontestwinner 7 + drawcontestwinner 7 releaseall end LilycoveCity_ContestLobby_EventScript_159074:: @ 8159074 lockall fadescreen 1 - showcontestwinner 8 + drawcontestwinner 8 releaseall end @@ -766,6 +766,6 @@ SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index f6fb499a3..7b602b2c7 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -11,7 +11,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186C2B, 4 - closebutton + closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D waitmovement 0 releaseall @@ -22,7 +22,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF:: @ 81582FF applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186D7F, 4 - closebutton + closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D waitmovement 0 releaseall @@ -33,7 +33,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186F09, 4 - closebutton + closemessage applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A083D waitmovement 0 releaseall @@ -49,7 +49,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_1A0845 waitmovement 0 msgbox LilycoveCity_CoveLilyMotel_1F_Text_186CA6, 4 - closebutton + closemessage applymovement 255, LilycoveCity_CoveLilyMotel_1F_Movement_158395 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_15839A waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 0a51aff26..fd9ea8a58 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -27,7 +27,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD:: @ 81583DD message LilycoveCity_CoveLilyMotel_2F_Text_18708F - waittext + waitmessage call LilycoveCity_CoveLilyMotel_2F_EventScript_1A02C5 special ScrSpecial_ShowDiploma waitstate diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 43f110577..9d04d2e33 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -9,7 +9,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C copyvar 0x8005, 0x4043 special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 - waittext + waitmessage multichoice 0, 0, 57, 0 switch RESULT case 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A402 @@ -66,12 +66,12 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E end LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1:: @ 815A4B1 - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 release end LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 special sub_810EBEC diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index b01d74129..02f5ca3ca 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -22,7 +22,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 lock faceplayer message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 - waittext + waitmessage pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 release @@ -70,7 +70,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1C4:: @ 815A1C4 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD lockall message LilycoveCity_DepartmentStoreRooftop_Text_18C72B - waittext + waitmessage showmoney 0, 0 nop goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE @@ -182,7 +182,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E:: @ 815A36E message LilycoveCity_DepartmentStoreRooftop_Text_18C72B - waittext + waitmessage goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 311dac1ab..2b39ea557 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -18,7 +18,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag 2250 message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 - waittext + waitmessage special RetrieveLotteryNumber copyvar 0x8008, RESULT special sub_810F9AC diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc index e54883714..25e981628 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_2F.inc @@ -17,7 +17,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F2A:: @ 8159F2A lock faceplayer message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_2F_Items1 msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4 release @@ -44,7 +44,7 @@ LilycoveCity_DepartmentStore_2F_EventScript_159F5E:: @ 8159F5E lock faceplayer message LilycoveCity_DepartmentStore_2F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_2F_Items2 msgbox LilycoveCity_DepartmentStore_2F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc index e669cef7f..1f55f5018 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_3F.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_159F91:: @ 8159F91 lock faceplayer message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_3F_Items1 msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4 release @@ -27,7 +27,7 @@ LilycoveCity_DepartmentStore_3F_EventScript_159FB8:: @ 8159FB8 lock faceplayer message LilycoveCity_DepartmentStore_3F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_3F_Items2 msgbox LilycoveCity_DepartmentStore_3F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc index 994b3b63f..d922d9181 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_4F.inc @@ -17,7 +17,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A019:: @ 815A019 lock faceplayer message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_4F_Items1 msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4 release @@ -37,7 +37,7 @@ LilycoveCity_DepartmentStore_4F_EventScript_15A03C:: @ 815A03C lock faceplayer message LilycoveCity_DepartmentStore_4F_Text_1A0BE4 - waittext + waitmessage pokemart LilycoveCity_DepartmentStore_4F_Items2 msgbox LilycoveCity_DepartmentStore_4F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 0bef8866a..835a0f48d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -5,7 +5,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items1 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release @@ -33,7 +33,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items2 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release @@ -58,7 +58,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items3 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release @@ -83,7 +83,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 lock faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 - waittext + waitmessage pokemartbp LilycoveCity_DepartmentStore_5F_Items4 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index cbcac6f6e..1fc172d8c 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -28,12 +28,12 @@ LilycoveCity_Harbor_EventScript_1598CD:: @ 81598CD compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_159929 message LilycoveCity_Harbor_Text_18B406 - waittext + waitmessage goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_1598F1:: @ 81598F1 - multichoicedef 18, 6, 56, 2, 0 + multichoicedefault 18, 6, 56, 2, 0 switch RESULT case 0, LilycoveCity_Harbor_EventScript_159933 case 1, LilycoveCity_Harbor_EventScript_15995B @@ -69,13 +69,13 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B LilycoveCity_Harbor_EventScript_15997E:: @ 815997E message LilycoveCity_Harbor_Text_18B4E2 - waittext + waitmessage goto LilycoveCity_Harbor_EventScript_1598F1 end LilycoveCity_Harbor_EventScript_15998A:: @ 815998A msgbox LilycoveCity_Harbor_Text_18B4B3, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 @@ -113,7 +113,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE checkflag 2131 goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 @@ -124,7 +124,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement 4, LilycoveCity_Harbor_Movement_1A0839 waitmovement 0 msgbox LilycoveCity_Harbor_Text_1C5120, 4 - closebutton + closemessage applymovement 4, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index fa5a30862..f700eed9d 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -14,7 +14,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 compare RESULT, 0 goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release @@ -22,7 +22,7 @@ LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 LilycoveCity_House3_EventScript_159C1D:: @ 8159C1D msgbox LilycoveCity_House3_Text_18B9DC, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release @@ -32,7 +32,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 lock faceplayer msgbox LilycoveCity_House3_Text_18BD64, 4 - closebutton + closemessage applymovement LAST_TALKED, LilycoveCity_House3_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 548c80a96..06e82d5f8 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -9,7 +9,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_158425:: @ 8158425 lockall applymovement 2, LilycoveCity_LilycoveMuseum_1F_Movement_1A0839 message LilycoveCity_LilycoveMuseum_1F_Text_1873B9 - waittext + waitmessage multichoice 20, 8, 16, 1 compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158458 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index f63068d74..a4599f14a 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -128,14 +128,14 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag 236 - closebutton + closemessage releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_158783:: @ 8158783 call LilycoveCity_LilycoveMuseum_2F_EventScript_1A02B8 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188166, 4 - closebutton + closemessage releaseall end @@ -198,34 +198,34 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158817:: @ 8158817 LilycoveCity_LilycoveMuseum_2F_EventScript_158820:: @ 8158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 9 + drawcontestwinner 9 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15882E:: @ 815882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 10 + drawcontestwinner 10 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15883C:: @ 815883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 11 + drawcontestwinner 11 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_15884A:: @ 815884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 12 + drawcontestwinner 12 releaseall end LilycoveCity_LilycoveMuseum_2F_EventScript_158858:: @ 8158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18831A, 3 fadescreen 1 - showcontestwinner 13 + drawcontestwinner 13 releaseall end diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index b398076fa..20b5c5f13 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 setvar 0x800b, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 4d6401502..13217b340 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -104,35 +104,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 end LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 - movespriteperm 1, 7, 5 + setobjectxyperm 1, 7, 5 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD:: @ 81594DD - movespriteperm 3, 3, 4 + setobjectxyperm 3, 3, 4 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5:: @ 81594E5 - movespriteperm 4, 7, 2 + setobjectxyperm 4, 7, 2 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED:: @ 81594ED - movespriteperm 5, 5, 5 + setobjectxyperm 5, 5, 5 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5:: @ 81594F5 - movespriteperm 6, 5, 2 + setobjectxyperm 6, 5, 2 return LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD:: @ 81594FD - movespriteperm 2, 8, 4 + setobjectxyperm 2, 8, 4 return LilycoveCity_PokemonTrainerFanClub_EventScript_159505:: @ 8159505 - movespriteperm 7, 3, 3 + setobjectxyperm 7, 3, 3 return LilycoveCity_PokemonTrainerFanClub_EventScript_15950D:: @ 815950D - movespriteperm 8, 8, 3 + setobjectxyperm 8, 8, 3 return LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 06508fd02..095862fd6 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -36,24 +36,24 @@ LittlerootTown_EventScript_14D570:: @ 814D570 return LittlerootTown_EventScript_14D57B:: @ 814D57B - movespriteperm 4, 14, 8 + setobjectxyperm 4, 14, 8 return LittlerootTown_EventScript_14D583:: @ 814D583 compare 0x4050, 0 goto_if_eq LittlerootTown_EventScript_14D59A - movespriteperm 1, 10, 1 - spritebehave 1, 7 + setobjectxyperm 1, 10, 1 + setobjectmovementtype 1, 7 return LittlerootTown_EventScript_14D59A:: @ 814D59A - movespriteperm 1, 7, 2 - spritebehave 1, 8 + setobjectxyperm 1, 7, 2 + setobjectmovementtype 1, 8 return LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 - spritebehave 4, 8 + setobjectmovementtype 4, 8 checkgender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 @@ -62,11 +62,11 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 return LittlerootTown_EventScript_14D5C5:: @ 814D5C5 - movespriteperm 4, 5, 9 + setobjectxyperm 4, 5, 9 return LittlerootTown_EventScript_14D5CD:: @ 814D5CD - movespriteperm 4, 14, 9 + setobjectxyperm 4, 14, 9 return LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 @@ -113,7 +113,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6AE waitmovement 0 msgbox LittlerootTown_Text_16A7C9, 4 - closebutton + closemessage applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 @@ -199,7 +199,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF LittlerootTown_EventScript_14D708:: @ 814D708 msgbox LittlerootTown_Text_16AD82, 4 - closebutton + closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 setvar 0x4050, 2 @@ -229,12 +229,12 @@ LittlerootTown_EventScript_14D739:: @ 814D739 LittlerootTown_EventScript_14D755:: @ 814D755 msgbox LittlerootTown_Text_16ACEB, 4 - closebutton + closemessage applymovement 1, LittlerootTown_Movement_14D787 applymovement 255, LittlerootTown_Movement_14D793 waitmovement 0 msgbox LittlerootTown_Text_16AD3C, 4 - closebutton + closemessage return LittlerootTown_Movement_14D779:: @ 814D779 @@ -316,7 +316,7 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7 applymovement 255, LittlerootTown_Movement_1A083F waitmovement 0 msgbox LittlerootTown_Text_16AD82, 4 - closebutton + closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 setvar 0x4050, 2 @@ -417,7 +417,7 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 - closebutton + closemessage checkgender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 @@ -871,10 +871,10 @@ LittlerootTown_EventScript_14DD38:: @ 814DD38 playfanfare 370 message LittlerootTown_Text_16AA32 waitfanfare - waittext + waitmessage setflag 274 msgbox LittlerootTown_Text_16AA5C, 4 msgbox LittlerootTown_Text_16AB10, 4 - closebutton + closemessage delay 30 return diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index e878d7e2e..30b2d6eef 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -36,18 +36,18 @@ LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A end LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC - movespriteperm 1, 8, 4 - spritebehave 1, 7 + setobjectxyperm 1, 8, 4 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_1F_EventScript_1526B8:: @ 81526B8 - movespriteperm 1, 4, 5 - spritebehave 1, 7 + setobjectxyperm 1, 4, 5 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4 - movespriteperm 1, 9, 8 - spritebehave 1, 7 + setobjectxyperm 1, 9, 8 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 @@ -61,7 +61,7 @@ LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA lockall msgbox LittlerootTown_BrendansHouse_1F_Text_172574, 4 - closebutton + closemessage applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 3b39fe2ed..1f4b301c0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -13,8 +13,8 @@ LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF end LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE - movespriteperm 1, 1, 2 - spritebehave 1, 7 + setobjectxyperm 1, 1, 2 + setobjectmovementtype 1, 7 return LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 9b5a372fa..45eb481e4 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -36,18 +36,18 @@ LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 end LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA - movespriteperm 1, 2, 4 - spritebehave 1, 7 + setobjectxyperm 1, 2, 4 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_1F_EventScript_1528F6:: @ 81528F6 - movespriteperm 1, 6, 5 - spritebehave 1, 7 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902 - movespriteperm 1, 1, 8 - spritebehave 1, 7 + setobjectxyperm 1, 1, 8 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E @@ -61,7 +61,7 @@ LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 lockall msgbox LittlerootTown_MaysHouse_1F_Text_172574, 4 - closebutton + closemessage applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 84fb4e69b..b35ee81a9 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -13,8 +13,8 @@ LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B end LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A - movespriteperm 1, 7, 2 - spritebehave 1, 7 + setobjectxyperm 1, 7, 2 + setobjectmovementtype 1, 7 return LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 @@ -56,7 +56,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 - closebutton + closemessage compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 compare FACING, 2 @@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0835 waitmovement 0 msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 - closebutton + closemessage compare FACING, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 2 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 7e3386d7a..7c6886209 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -26,7 +26,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall bufferfirstpoke 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 - waittext + waitmessage playfanfare 370 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 @@ -158,7 +158,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D playfanfare 370 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare - waittext + waitmessage setflag 2049 return diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index da406e2f7..5c93aa252 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -70,7 +70,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 checkflag 284 goto_if_eq MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 - closebutton + closemessage applymovement 7, MauvilleCity_Movement_1A083D waitmovement 0 release @@ -78,7 +78,7 @@ MauvilleCity_EventScript_14C0C4:: @ 814C0C4 MauvilleCity_EventScript_14C0E4:: @ 814C0E4 msgbox MauvilleCity_Text_165E45, 4 - closebutton + closemessage applymovement 7, MauvilleCity_Movement_1A083D waitmovement 0 release @@ -109,7 +109,7 @@ MauvilleCity_EventScript_14C154:: @ 814C154 call_if 1, MauvilleCity_EventScript_14C23C compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_14C285 - closebutton + closemessage switch FACING case 2, MauvilleCity_EventScript_14C187 case 4, MauvilleCity_EventScript_14C1D9 @@ -127,7 +127,7 @@ MauvilleCity_EventScript_14C187:: @ 814C187 applymovement 255, MauvilleCity_Movement_1A0845 waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 - closebutton + closemessage applymovement 6, MauvilleCity_Movement_14C2B6 applymovement 7, MauvilleCity_Movement_14C2DF waitmovement 0 @@ -146,7 +146,7 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 applymovement 255, MauvilleCity_Movement_1A0845 waitmovement 0 msgbox MauvilleCity_Text_1660FA, 4 - closebutton + closemessage applymovement 6, MauvilleCity_Movement_14C2C1 applymovement 7, MauvilleCity_Movement_14C2E8 waitmovement 0 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 0b577885e..8c0ce9590 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -26,7 +26,7 @@ MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 message MauvilleCity_BikeShop_Text_1810B1 - waittext + waitmessage multichoice 21, 8, 12, 1 switch RESULT case 0, MauvilleCity_BikeShop_EventScript_15682D @@ -109,7 +109,7 @@ MauvilleCity_BikeShop_EventScript_15690B:: @ 815690B MauvilleCity_BikeShop_EventScript_156914:: @ 8156914 message MauvilleCity_BikeShop_Text_1815EA - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end @@ -125,19 +125,19 @@ MauvilleCity_BikeShop_EventScript_156920:: @ 8156920 MauvilleCity_BikeShop_EventScript_156962:: @ 8156962 message MauvilleCity_BikeShop_Text_18162C - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15696E:: @ 815696E message MauvilleCity_BikeShop_Text_1816F5 - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end MauvilleCity_BikeShop_EventScript_15697A:: @ 815697A message MauvilleCity_BikeShop_Text_1817BF - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156920 end @@ -147,7 +147,7 @@ MauvilleCity_BikeShop_EventScript_156986:: @ 8156986 MauvilleCity_BikeShop_EventScript_156988:: @ 8156988 message MauvilleCity_BikeShop_Text_181892 - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end @@ -163,19 +163,19 @@ MauvilleCity_BikeShop_EventScript_156994:: @ 8156994 MauvilleCity_BikeShop_EventScript_1569D6:: @ 81569D6 message MauvilleCity_BikeShop_Text_1818D4 - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569E2:: @ 81569E2 message MauvilleCity_BikeShop_Text_18199A - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end MauvilleCity_BikeShop_EventScript_1569EE:: @ 81569EE message MauvilleCity_BikeShop_Text_181A3D - waittext + waitmessage goto MauvilleCity_BikeShop_EventScript_156994 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6e9b11947..6952ca4e1 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -9,14 +9,14 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 - waittext + waitmessage showmoney 0, 0 nop showcoins 0, 5 goto MauvilleCity_GameCorner_EventScript_156A60 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 - multichoicedef 15, 0, 49, 0, 0 + multichoicedefault 15, 0, 49, 0, 0 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 @@ -24,7 +24,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 end @ 8156A87 - multichoicedef 15, 0, 49, 1, 0 + multichoicedefault 15, 0, 49, 1, 0 switch RESULT case 0, MauvilleCity_GameCorner_EventScript_156AAE case 1, MauvilleCity_GameCorner_EventScript_156AF0 @@ -107,14 +107,14 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage showcoins 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 @@ -228,14 +228,14 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage showcoins 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 message MauvilleCity_GameCorner_Text_181E17 - waittext + waitmessage goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 @@ -499,7 +499,7 @@ MauvilleCity_GameCorner_EventScript_1570F8:: @ 81570F8 end MauvilleCity_GameCorner_EventScript_157108:: @ 8157108 - closebutton + closemessage applymovement LAST_TALKED, MauvilleCity_GameCorner_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index e5791d521..5221add7a 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -79,7 +79,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB message MauvilleCity_Gym_Text_180DAF - waittext + waitmessage call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag 1208 diff --git a/data/scripts/maps/MauvilleCity_Mart.inc b/data/scripts/maps/MauvilleCity_Mart.inc index fac5906ad..0dd66eddf 100644 --- a/data/scripts/maps/MauvilleCity_Mart.inc +++ b/data/scripts/maps/MauvilleCity_Mart.inc @@ -5,7 +5,7 @@ MauvilleCity_Mart_EventScript_1573BE:: @ 81573BE lock faceplayer message MauvilleCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart MauvilleCity_Mart_Items msgbox MauvilleCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 0e9ba15ef..7122b8c3c 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -15,7 +15,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 setvar 0x800b, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index c7aa8fb10..06abbc8f6 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -14,7 +14,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A0845 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193237, 4 - closebutton + closemessage applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 waitmovement 0 @@ -24,11 +24,11 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193268, 4 - closebutton + closemessage applymovement 5, MeteorFalls_1F_1R_Movement_15C5EE waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1932C5, 4 - closebutton + closemessage applymovement 255, MeteorFalls_1F_1R_Movement_1A083F applymovement 5, MeteorFalls_1F_1R_Movement_1A083F applymovement 6, MeteorFalls_1F_1R_Movement_1A083F @@ -44,7 +44,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 6, MeteorFalls_1F_1R_Movement_1A083F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_193320, 4 - closebutton + closemessage applymovement 255, MeteorFalls_1F_1R_Movement_15C64F applymovement 5, MeteorFalls_1F_1R_Movement_15C5F1 applymovement 6, MeteorFalls_1F_1R_Movement_15C5FC @@ -58,7 +58,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C .else msgbox MeteorFalls_1F_1R_Text_193584, 4 .endif - closebutton + closemessage applymovement 8, MeteorFalls_1F_1R_Movement_15C639 applymovement 9, MeteorFalls_1F_1R_Movement_15C64A waitmovement 0 @@ -69,7 +69,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 7, MeteorFalls_1F_1R_Movement_1A083F waitmovement 0 msgbox MeteorFalls_1F_1R_Text_1937AA, 4 - closebutton + closemessage applymovement 7, MeteorFalls_1F_1R_Movement_15C61F applymovement 8, MeteorFalls_1F_1R_Movement_15C62E applymovement 9, MeteorFalls_1F_1R_Movement_15C63E diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 7861d0c4d..66ad747f9 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -25,13 +25,13 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E setvar 0x4001, 1 - movespriteperm 1, 3, 2 - spritebehave 1, 8 + setobjectxyperm 1, 3, 2 + setobjectmovementtype 1, 8 return MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF - movespriteperm 1, 2, 2 - spritebehave 1, 10 + setobjectxyperm 1, 2, 2 + setobjectmovementtype 1, 10 return MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB @@ -46,7 +46,7 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 waitmovement 0 applymovement 1, MossdeepCity_GameCorner_1F_Movement_15AD3F waitmovement 0 - moveoffscreen 1 + moveobjectoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 compare 0x40c0, 1 @@ -106,11 +106,11 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 call S_DoSaveDialog compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 - hidebox 0, 0, 15, 10 + erasebox 0, 0, 15, 10 special SavePlayerParty special ReducePlayerPartyToThree msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 - closebutton + closemessage compare FACING, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 compare FACING, 4 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 46b9dcfea..886c64d29 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -17,7 +17,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E waitmovement 0 special sub_81360C0 msgbox 0x20234cc, 4 - closebutton + closemessage setvar 0x8004, 2 setvar 0x8005, 0 special sub_813556C @@ -28,7 +28,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 compare RESULT, 2 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE - closebutton + closemessage special ScrSpecial_HealPlayerParty applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmovement 0 @@ -47,14 +47,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 setvar 0x40c0, 1 special ShowFieldMessageStringVar4 - waittext + waitmessage waitbutton return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE setvar 0x40c0, 2 special ShowFieldMessageStringVar4 - waittext + waitmessage waitbutton return diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 4365ba74a..944860f2d 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -58,7 +58,7 @@ MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B MossdeepCity_Gym_EventScript_15A594:: @ 815A594 message MossdeepCity_Gym_Text_18D0F9 - waittext + waitmessage call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag 1229 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index c34eb9391..b1954a6cf 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -16,7 +16,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B pokecry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry - closebutton + closemessage setflag 224 clearflag 933 compare FACING, 2 diff --git a/data/scripts/maps/MossdeepCity_Mart.inc b/data/scripts/maps/MossdeepCity_Mart.inc index d1e861b99..ce5845c81 100644 --- a/data/scripts/maps/MossdeepCity_Mart.inc +++ b/data/scripts/maps/MossdeepCity_Mart.inc @@ -5,7 +5,7 @@ MossdeepCity_Mart_EventScript_15A926:: @ 815A926 lock faceplayer message MossdeepCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart MossdeepCity_Mart_Items msgbox MossdeepCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 988608ffd..4ed3ea57e 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA setvar 0x800b, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index a407bd5b9..acd499966 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -11,7 +11,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 - closebutton + closemessage applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 release @@ -56,7 +56,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AC1F:: @ 815AC1F lock faceplayer msgbox MossdeepCity_SpaceCenter_1F_Text_18E427, 4 - closebutton + closemessage applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 8648487c9..6905b31b3 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -19,8 +19,8 @@ MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 end MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 - movespriteperm 1, 6, 5 - spritebehave 1, 7 + setobjectxyperm 1, 6, 5 + setobjectmovementtype 1, 7 return MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 @@ -43,7 +43,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B setflag 123 setflag 302 msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 - closebutton + closemessage delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 waitmovement 0 @@ -82,8 +82,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare - waittext - givepokemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferpoke 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 8a66f75ee..2b4de8344 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -9,8 +9,8 @@ MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 end MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 - movespriteperm 1, 5, 4 - spritebehave 1, 10 + setobjectxyperm 1, 5, 4 + setobjectmovementtype 1, 10 return MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D @@ -23,8 +23,8 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 applymovement 1, MtChimney_CableCarStation_Movement_15C1AA waitmovement 0 setvar 0x40a3, 0 - movespriteperm 1, 6, 7 - spritebehave 1, 8 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 releaseall end @@ -40,7 +40,7 @@ MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C msgbox MtChimney_CableCarStation_Text_1925A9, 4 - closebutton + closemessage applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 8720375ae..533fb6e90 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -41,7 +41,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .else msgbox MtPyre_Summit_Text_1B5EEC, 4 .endif - closebutton + closemessage fadescreen 1 removeobject 2 removeobject 4 @@ -198,7 +198,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A MtPyre_Summit_EventScript_15D669:: @ 815D669 setvar 0x8004, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F - closebutton + closemessage applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 waitmovement 0 delay 40 @@ -279,7 +279,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 .else msgbox MtPyre_Summit_Text_1B6848, 4 .endif - closebutton + closemessage compare 0x8008, 0 call_if 1, MtPyre_Summit_EventScript_15D77F compare 0x8008, 1 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 412261ce1..2d84a6f92 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -18,13 +18,13 @@ OldaleTown_EventScript_14DD8C:: @ 814DD8C return OldaleTown_EventScript_14DD92:: @ 814DD92 - movespriteperm 3, 1, 11 - spritebehave 3, 9 + setobjectxyperm 3, 1, 11 + setobjectmovementtype 3, 9 return OldaleTown_EventScript_14DD9E:: @ 814DD9E - movespriteperm 2, 13, 14 - spritebehave 2, 8 + setobjectxyperm 2, 13, 14 + setobjectmovementtype 2, 8 return OldaleTown_EventScript_14DDAA:: @ 814DDAA @@ -45,7 +45,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC setflag 1 playbgm 420, 0 msgbox OldaleTown_Text_16AEF2, 4 - closebutton + closemessage switch FACING case 1, OldaleTown_EventScript_14DE07 case 2, OldaleTown_EventScript_14DE1E @@ -198,7 +198,7 @@ OldaleTown_EventScript_14DEDF:: @ 814DEDF checkflag 116 goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 - closebutton + closemessage applymovement 3, OldaleTown_Movement_1A083D waitmovement 0 release @@ -210,7 +210,7 @@ OldaleTown_EventScript_14DEFF:: @ 814DEFF applymovement 3, OldaleTown_Movement_14DFEF waitmovement 0 msgbox OldaleTown_Text_16B045, 4 - closebutton + closemessage applymovement 3, OldaleTown_Movement_14DFF5 waitmovement 0 releaseall @@ -274,7 +274,7 @@ OldaleTown_EventScript_14DFB8:: @ 814DFB8 end OldaleTown_EventScript_14DFC6:: @ 814DFC6 - closebutton + closemessage applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 removeobject 4 diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index 77d7eee4d..b9698b58f 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -5,7 +5,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 lock faceplayer message OldaleTown_Mart_Text_1A0BE4 - waittext + waitmessage checkflag 116 goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 6d2fe54f0..494f109fe 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 setvar 0x800b, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 973f80a55..64dd5008c 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 @ 8154109 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 8b7d4f313..1c2711b83 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -12,7 +12,7 @@ PetalburgCity_MapScript1_14B717:: @ 814B717 end PetalburgCity_EventScript_14B731:: @ 814B731 - movespriteperm 9, 5, 11 + setobjectxyperm 9, 5, 11 return PetalburgCity_EventScript_14B739:: @ 814B739 @@ -38,7 +38,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 applymovement 2, PetalburgCity_Movement_1A083F, 0, 0 waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 - closebutton + closemessage clearflag 0x4000 setvar 0x4057, 3 fadedefaultbgm @@ -54,7 +54,7 @@ PetalburgCity_EventScript_14B7AC:: @ 814B7AC lock faceplayer msgbox PetalburgCity_Text_164490, 4 - closebutton + closemessage applymovement 3, PetalburgCity_Movement_1A083D waitmovement 0 release @@ -196,7 +196,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 compare 0x8008, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 - closebutton + closemessage compare 0x8008, 0 call_if 1, PetalburgCity_EventScript_14B965 compare 0x8008, 1 @@ -210,7 +210,7 @@ PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 255, PetalburgCity_Movement_1A0843 waitmovement 0 msgbox PetalburgCity_Text_164449, 4 - closebutton + closemessage applymovement 9, PetalburgCity_Movement_14B9F4 waitmovement 0 fadedefaultbgm diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 3ac7b85fc..b2d104894 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -53,15 +53,15 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B end PetalburgCity_Gym_EventScript_15453B:: @ 815453B - movespriteperm 10, 5, 108 + setobjectxyperm 10, 5, 108 return PetalburgCity_Gym_EventScript_154543:: @ 8154543 - movespriteperm 1, 4, 107 + setobjectxyperm 1, 4, 107 return PetalburgCity_Gym_EventScript_15454B:: @ 815454B - movespriteperm 1, 4, 107 + setobjectxyperm 1, 4, 107 return PetalburgCity_Gym_MapScript2_154553:: @ 8154553 @@ -80,7 +80,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C lockall msgbox PetalburgCity_Gym_Text_17A196, 4 msgbox PetalburgCity_Gym_Text_17A1B0, 4 - closebutton + closemessage applymovement 255, PetalburgCity_Gym_Movement_1A0845 applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 @@ -113,7 +113,7 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 case 6, PetalburgCity_Gym_EventScript_1549D6 case 7, PetalburgCity_Gym_EventScript_15493D msgbox PetalburgCity_Gym_Text_179DF6, 4 - closebutton + closemessage switch FACING case 1, PetalburgCity_Gym_EventScript_15463D case 2, PetalburgCity_Gym_EventScript_154648 @@ -193,7 +193,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 - closebutton + closemessage setflag 0x4001 playbgm 420, 0 compare 0x8008, 0 @@ -394,7 +394,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A653, 4 trainerbattle 3, OPPONENT_NORMAN, 0, PetalburgCity_Gym_Text_17A77A message PetalburgCity_Gym_Text_17A7DD - waittext + waitmessage call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag 1217 @@ -418,7 +418,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C setflag 169 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 - closebutton + closemessage compare FACING, 2 call_if 1, PetalburgCity_Gym_EventScript_154ABC compare FACING, 1 @@ -604,7 +604,7 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 end PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 - closebutton + closemessage delay 30 warpdoor PetalburgCity_Gym, 255, 32776, 32777 waitstate diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index ab7bb822a..e4186eaae 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -5,7 +5,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 lock faceplayer message PetalburgCity_Mart_Text_1A0BE4 - waittext + waitmessage checkflag 296 goto_if_eq PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index a70035fef..e2013a1d6 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 setvar 0x800b, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 4dececafa..0b0c72f70 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -12,18 +12,18 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 applymovement 4, PetalburgWoods_Movement_15CE89 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 - closebutton + closemessage playbgm BGM_EVIL_TEAM, 0 applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 - closebutton + closemessage applymovement 3, PetalburgWoods_Movement_15CEB0 waitmovement 0 applymovement 4, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 - closebutton + closemessage applymovement 4, PetalburgWoods_Movement_15CE9E waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 @@ -47,18 +47,18 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 applymovement 255, PetalburgWoods_Movement_1A083F waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 - closebutton + closemessage playbgm BGM_EVIL_TEAM, 0 applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 - closebutton + closemessage applymovement 3, PetalburgWoods_Movement_15CEBF waitmovement 0 applymovement 4, PetalburgWoods_Movement_1A0841 waitmovement 0 msgbox PetalburgWoods_Text_194E6B, 4 - closebutton + closemessage applymovement 4, PetalburgWoods_Movement_15CEA4 waitmovement 0 msgbox PetalburgWoods_Text_194E9A, 4 @@ -78,12 +78,12 @@ PetalburgWoods_EventScript_15CDE6:: @ 815CDE6 applymovement 4, PetalburgWoods_Movement_15CE73 waitmovement 0 msgbox PetalburgWoods_Text_194D71, 4 - closebutton + closemessage return PetalburgWoods_EventScript_15CDFA:: @ 815CDFA msgbox PetalburgWoods_Text_194FA4, 4 - closebutton + closemessage applymovement 3, PetalburgWoods_Movement_15CEB7 waitmovement 0 removeobject 3 @@ -106,7 +106,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D applymovement 4, PetalburgWoods_Movement_15CEA8 waitmovement 0 msgbox PetalburgWoods_Text_195153, 4 - closebutton + closemessage return PetalburgWoods_EventScript_15CE69:: @ 815CE69 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 35c2d4117..2fe80e098 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -20,7 +20,7 @@ Route101_EventScript_14E948:: @ 814E948 lockall playbgm 410, 1 msgbox Route101_Text_16D10E, 4 - closebutton + closemessage setobjectxy 2, 0, 15 setobjectxy 4, 0, 16 applymovement 255, Route101_Movement_14EA2C @@ -36,7 +36,7 @@ Route101_EventScript_14E948:: @ 814E948 applymovement 2, Route101_Movement_14EA58 waitmovement 0 msgbox Route101_Text_16D119, 4 - closebutton + closemessage setvar 0x4060, 2 releaseall end @@ -44,7 +44,7 @@ Route101_EventScript_14E948:: @ 814E948 Route101_EventScript_14E9B8:: @ 814E9B8 lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FA waitmovement 0 releaseall @@ -53,7 +53,7 @@ Route101_EventScript_14E9B8:: @ 814E9B8 Route101_EventScript_14E9CE:: @ 814E9CE lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FC waitmovement 0 releaseall @@ -62,7 +62,7 @@ Route101_EventScript_14E9CE:: @ 814E9CE Route101_EventScript_14E9E4:: @ 814E9E4 lockall msgbox Route101_Text_16D15E, 4 - closebutton + closemessage applymovement 255, Route101_Movement_14E9FE waitmovement 0 releaseall diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index e5cf156a1..c9ebf9511 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -89,7 +89,7 @@ Route103_EventScript_14ECCB:: @ 814ECCB end Route103_EventScript_14ECD9:: @ 814ECD9 - closebutton + closemessage switch FACING case 1, Route103_EventScript_14ED29 case 2, Route103_EventScript_14ED0C diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 8abb7354a..b1e3d94ac 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -142,7 +142,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 showobject 255, 0, 11 applymovement 255, Route104_Movement_14F168 waitmovement 0 - movespriteperm 2, 12, 8 + setobjectxyperm 2, 12, 8 addobject 2 spritelevelup 2, 0, 11, 0 clearflag 740 @@ -156,7 +156,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 19 restorespritelevel 2, 0, 11 - moveoffscreen 2 + moveobjectoffscreen 2 setvar 0x408e, 0 checkflag 189 goto_if 0, Route104_EventScript_14F08B diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index cc3dad35a..d388d1c7a 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -15,10 +15,10 @@ Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 return Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 - movespriteperm 1, 9, 3 - spritebehave 1, 50 - movespriteperm 2, 9, 6 - spritebehave 2, 51 + setobjectxyperm 1, 9, 3 + setobjectmovementtype 1, 50 + setobjectxyperm 2, 9, 6 + setobjectmovementtype 2, 51 return Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB @@ -44,8 +44,8 @@ Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 message Route104_MrBrineysHouse_Text_191E80 - waittext - multichoicedef 21, 8, 14, 1, 0 + waitmessage + multichoicedefault 21, 8, 14, 1, 0 switch RESULT case 0, Route104_MrBrineysHouse_EventScript_15BDAB case 1, Route104_MrBrineysHouse_EventScript_15BDA1 diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 876af8650..4c5becf88 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -12,7 +12,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA end Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 - movespriteperm 1, 4, 6 + setobjectxyperm 1, 4, 6 end Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B @@ -51,7 +51,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C message Route104_PrettyPetalFlowerShop_Text_1A0C42 - waittext + waitmessage pokemartbp Route104_PrettyPetalFlowerShop_Items msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4 release diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 6103d19ac..3c218747a 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -56,7 +56,7 @@ Route104_Prototype_EventScript_160CF1:: @ 8160CF1 end Route104_Prototype_EventScript_160CFB:: @ 8160CFB - closebutton + closemessage delay 60 fadescreen 1 delay 60 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 7b13fef72..be296d403 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -44,7 +44,7 @@ Route109_EventScript_14F548:: @ 814F548 waitmovement 0 addobject 4 clearflag 743 - movespriteperm 2, 12, 8 + setobjectxyperm 2, 12, 8 addobject 2 spritelevelup 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D @@ -53,11 +53,11 @@ Route109_EventScript_14F548:: @ 814F548 setflag 744 hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 - closebutton + closemessage copyvar 0x4096, 0x8008 restorespritelevel 255, 0, 24 restorespritelevel 2, 0, 11 - moveoffscreen 2 + moveobjectoffscreen 2 release end @@ -286,8 +286,8 @@ Route109_EventScript_14F691:: @ 814F691 Route109_EventScript_14F6AF:: @ 814F6AF message Route109_Text_16E26A - waittext - multichoicedef 21, 8, 14, 1, 0 + waitmessage + multichoicedefault 21, 8, 14, 1, 0 switch RESULT case 0, Route109_EventScript_14F6E2 case 1, Route109_EventScript_14F6FB @@ -296,7 +296,7 @@ Route109_EventScript_14F6AF:: @ 814F6AF Route109_EventScript_14F6E2:: @ 814F6E2 msgbox Route109_Text_16E159, 4 - closebutton + closemessage goto Route109_EventScript_14F4D3 end @@ -318,7 +318,7 @@ Route109_EventScript_14F70E:: @ 814F70E lock faceplayer msgbox Route109_Text_16E405, 4 - closebutton + closemessage applymovement LAST_TALKED, Route109_Movement_1A083D waitmovement 0 release @@ -334,7 +334,7 @@ Route109_EventScript_14F725:: @ 814F725 giveitem ITEM_SOFT_SAND compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B - closebutton + closemessage applymovement LAST_TALKED, Route109_Movement_1A083D waitmovement 0 setflag 280 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 194816c36..afbfebcc2 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -424,15 +424,15 @@ Route110_EventScript_14FEA5:: @ 814FEA5 return Route110_EventScript_14FEB2:: @ 814FEB2 - closebutton + closemessage compare 0x8008, 1 call_if 1, Route110_EventScript_14FF56 compare 0x8008, 2 call_if 1, Route110_EventScript_14FF5E compare 0x8008, 3 call_if 1, Route110_EventScript_14FF66 - spritebehave 28, 10 - spritebehave 29, 10 + setobjectmovementtype 28, 10 + setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 @@ -480,15 +480,15 @@ Route110_EventScript_14FF4B:: @ 814FF4B return Route110_EventScript_14FF56:: @ 814FF56 - movespriteperm 29, 33, 55 + setobjectxyperm 29, 33, 55 return Route110_EventScript_14FF5E:: @ 814FF5E - movespriteperm 29, 34, 55 + setobjectxyperm 29, 34, 55 return Route110_EventScript_14FF66:: @ 814FF66 - movespriteperm 29, 35, 55 + setobjectxyperm 29, 35, 55 return Route110_Movement_14FF6E:: @ 814FF6E diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index a7db7e0ee..c60bc366e 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -41,7 +41,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @ You don't have a bike! msgbox Route110_SeasideCyclingRoadNorthEntrance_Text_19E3AD, 4 - closebutton + closemessage applymovement 255, Route110_SeasideCyclingRoadNorthEntrance_Movement_163538 waitmovement 0 releaseall diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 1cb046a99..cf18a8e36 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -20,7 +20,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6:: @ 81634A6 msgbox Route110_SeasideCyclingRoadSouthEntrance_Text_19E3AD, 4 - closebutton + closemessage applymovement 255, Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB waitmovement 0 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 0445496d2..12309207c 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -64,7 +64,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -77,7 +77,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -90,7 +90,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -103,7 +103,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -116,7 +116,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -129,7 +129,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end @@ -142,14 +142,14 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 - closebutton + closemessage call Route110_TrickHouseEnd_EventScript_161C2E release end Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 - closebutton + closemessage compare FACING, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161C74 compare FACING, 2 @@ -160,7 +160,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF call_if 1, Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 - closebutton + closemessage applymovement 1, Route110_TrickHouseEnd_Movement_1A0839 waitmovement 0 delay 30 @@ -234,7 +234,7 @@ Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 - closebutton + closemessage applymovement 255, Route110_TrickHouseEnd_Movement_161CE8 waitmovement 0 delay 4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 677ce93fa..cf192345c 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -106,8 +106,8 @@ Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088 return Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E - movespriteperm 1, 5, 2 - spritebehave 1, 4 + setobjectxyperm 1, 5, 2 + setobjectmovementtype 1, 4 end Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A @@ -216,7 +216,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 compare 0x4044, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 - closebutton + closemessage delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 @@ -264,7 +264,7 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D call_if 1, Route110_TrickHouseEntrance_EventScript_161303 compare 0x4044, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C - closebutton + closemessage setvar 0x40a6, 1 warp Route110_TrickHouseEntrance, 255, 6, 2 waitstate @@ -333,7 +333,7 @@ Route110_TrickHouseEntrance_EventScript_161327:: @ 8161327 Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 msgbox Route110_TrickHouseEntrance_Text_19BF19, 4 - closebutton + closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 playse 21 @@ -464,7 +464,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 msgbox Route110_TrickHouseEntrance_Text_19C17E, 4 - closebutton + closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_16309F waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 @@ -494,7 +494,7 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 - closebutton + closemessage compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall @@ -717,7 +717,7 @@ Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C playfanfare 370 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare - waittext + waitmessage msgbox Route110_TrickHousePuzzle1_Text_19C1CB, 4 releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index dc3f9f725..222a71138 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -398,9 +398,9 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 applymovement 5, Route110_TrickHousePuzzle5_Movement_16309F msgbox Route110_TrickHousePuzzle5_Text_19D5ED, 4 waitmovement 0 - closebutton + closemessage msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 - closebutton + closemessage warp Route110_TrickHousePuzzle5, 255, 0, 21 waitstate releaseall diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index de37c68fc..ec13ca3a3 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -55,7 +55,7 @@ Route111_EventScript_150023:: @ 8150023 compare RESULT, 0 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL - closebutton + closemessage setflag 963 setflag 964 removeobject 34 @@ -77,7 +77,7 @@ Route111_EventScript_150069:: @ 8150069 compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL - closebutton + closemessage setflag 964 setflag 963 removeobject 35 @@ -172,7 +172,7 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 - closebutton + closemessage compare 0x8004, 0 call_if 1, Route111_EventScript_150188 compare 0x8004, 1 @@ -251,7 +251,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F7FF, 4 - closebutton + closemessage applymovement 1, Route111_Movement_150356 waitmovement 0 removeobject 1 @@ -269,7 +269,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F8D5, 4 - closebutton + closemessage applymovement 2, Route111_Movement_150356 waitmovement 0 removeobject 2 @@ -287,7 +287,7 @@ Route111_EventScript_1501F3:: @ 81501F3 waitmovement 0 call Route111_EventScript_150348 msgbox Route111_Text_16F96C, 4 - closebutton + closemessage applymovement 3, Route111_Movement_150356 waitmovement 0 removeobject 3 @@ -302,7 +302,7 @@ Route111_EventScript_1501F3:: @ 81501F3 msgbox Route111_Text_16F991, 4 trainerbattle 3, OPPONENT_VICKY, 0, Route111_Text_16F9EC msgbox Route111_Text_16FA22, 4 - closebutton + closemessage applymovement 4, Route111_Movement_1A0841 waitmovement 0 call Route111_EventScript_150348 diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index a33b436dc..5576a44ff 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -18,7 +18,7 @@ Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC msgbox Route111_OldLadysRestStop_Text_192423, 4 - closebutton + closemessage call Route111_OldLadysRestStop_EventScript_1A02CA msgbox Route111_OldLadysRestStop_Text_19244D, 5 compare RESULT, 1 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index ea70af41f..d9a94ce75 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -53,7 +53,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 end Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 - closebutton + closemessage applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 5254b7beb..f8e91eb09 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -10,8 +10,8 @@ Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E end Route112_CableCarStation_EventScript_15C052:: @ 815C052 - movespriteperm 1, 7, 4 - spritebehave 1, 9 + setobjectxyperm 1, 7, 4 + setobjectmovementtype 1, 9 return Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E @@ -24,8 +24,8 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 applymovement 1, Route112_CableCarStation_Movement_15C0EB waitmovement 0 setvar 0x40a3, 0 - movespriteperm 1, 6, 7 - spritebehave 1, 8 + setobjectxyperm 1, 6, 7 + setobjectmovementtype 1, 8 releaseall end @@ -41,7 +41,7 @@ Route112_CableCarStation_EventScript_15C08C:: @ 815C08C Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD msgbox Route112_CableCarStation_Text_1925A9, 4 - closebutton + closemessage applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 48c2965fd..39b484c8a 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -41,7 +41,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 - waittext + waitmessage goto Route113_GlassWorkshop_EventScript_1635EE end @@ -183,19 +183,19 @@ Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 buffernum 1, 32778 message Route113_GlassWorkshop_Text_19E890 - waittext + waitmessage goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163845:: @ 8163845 message Route113_GlassWorkshop_Text_19E802 - waittext + waitmessage goto Route113_GlassWorkshop_EventScript_1635EE end Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, 4 - closebutton + closemessage fadescreen 1 playse 5 delay 30 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index ca3895e1a..beb01e083 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -8,7 +8,7 @@ Route116_MapScript1_150A37:: @ 8150A37 end Route116_EventScript_150A41:: @ 8150A41 - movespriteperm 21, 41, 10 + setobjectxyperm 21, 41, 10 return Route116_EventScript_150A49:: @ 8150A49 @@ -47,7 +47,7 @@ Route116_EventScript_150A94:: @ 8150A94 compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 - closebutton + closemessage compare FACING, 2 call_if 1, Route116_EventScript_150AEE compare FACING, 1 @@ -159,7 +159,7 @@ Route116_EventScript_150B8F:: @ 8150B8F Route116_EventScript_150BBB:: @ 8150BBB msgbox Route116_Text_1709B7, 4 - closebutton + closemessage goto Route116_EventScript_150C03 end @@ -175,7 +175,7 @@ Route116_EventScript_150BCA:: @ 8150BCA Route116_EventScript_150BF4:: @ 8150BF4 msgbox Route116_Text_17094D, 4 - closebutton + closemessage goto Route116_EventScript_150C03 end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 6ba9519eb..40affd3fd 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -9,7 +9,7 @@ Route117_MapScript1_150D40:: @ 8150D40 Route117_EventScript_150D46:: @ 8150D46 checkflag 134 goto_if 0, Route117_EventScript_150D56 - movespriteperm 3, 47, 6 + setobjectxyperm 3, 47, 6 Route117_EventScript_150D56:: @ 8150D56 return diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 8427395a6..b96346f15 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -82,7 +82,7 @@ Route118_EventScript_151004:: @ 8151004 waitmovement 0 delay 30 msgbox Route118_Text_170D66, 4 - closebutton + closemessage compare 0x8008, 0 call_if 1, Route118_EventScript_151048 compare 0x8008, 1 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index d825cb96e..7d5acea77 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -153,7 +153,7 @@ Route119_EventScript_151352:: @ 8151352 return Route119_EventScript_151362:: @ 8151362 - closebutton + closemessage compare 0x4001, 1 call_if 1, Route119_EventScript_1513D2 compare 0x4001, 2 @@ -193,13 +193,13 @@ Route119_EventScript_1513C7:: @ 81513C7 return Route119_EventScript_1513D2:: @ 81513D2 - movespriteperm 16, 25, 32 - movespriteperm 25, 25, 32 + setobjectxyperm 16, 25, 32 + setobjectxyperm 25, 25, 32 return Route119_EventScript_1513E1:: @ 81513E1 - movespriteperm 16, 26, 32 - movespriteperm 25, 26, 32 + setobjectxyperm 16, 26, 32 + setobjectxyperm 25, 26, 32 return Route119_Movement_1513F0:: @ 81513F0 @@ -354,7 +354,7 @@ Route119_EventScript_1515C5:: @ 81515C5 lock faceplayer msgbox Route119_Text_171520, 4 - closebutton + closemessage applymovement LAST_TALKED, Route119_Movement_1A083D waitmovement 0 release @@ -364,7 +364,7 @@ Route119_EventScript_1515DC:: @ 81515DC lock faceplayer msgbox Route119_Text_17157C, 4 - closebutton + closemessage applymovement LAST_TALKED, Route119_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 762a6c299..3dc9672e3 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -9,8 +9,8 @@ Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 end Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 - movespriteperm 5, 0, 5 - spritebehave 5, 10 + setobjectxyperm 5, 0, 5 + setobjectmovementtype 5, 10 return Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D @@ -39,7 +39,7 @@ Route119_WeatherInstitute_1F_EventScript_163C7A:: @ 8163C7A Route119_WeatherInstitute_1F_EventScript_163C83:: @ 8163C83 lockall msgbox Route119_WeatherInstitute_1F_Text_19EE8B, 4 - closebutton + closemessage call Route119_WeatherInstitute_1F_EventScript_1A02CA releaseall end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 37b6d07a9..ac64904a2 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -11,13 +11,13 @@ Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 end Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 - movespriteperm 5, 1, 6 - spritebehave 5, 10 + setobjectxyperm 5, 1, 6 + setobjectmovementtype 5, 10 return Route119_WeatherInstitute_2F_EventScript_163CF0:: @ 8163CF0 - movespriteperm 5, 4, 6 - spritebehave 5, 10 + setobjectxyperm 5, 4, 6 + setobjectmovementtype 5, 10 return Route119_WeatherInstitute_2F_EventScript_163CFC:: @ 8163CFC @@ -37,7 +37,7 @@ Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 - closebutton + closemessage setvar 0x40b3, 1 clearflag 893 fadedefaultbgm @@ -49,7 +49,7 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 fadescreen 0 applymovement 5, Route119_WeatherInstitute_2F_Movement_163DC8 waitmovement 0 - moveoffscreen 5 + moveobjectoffscreen 5 goto Route119_WeatherInstitute_2F_EventScript_163D7A end @@ -61,8 +61,8 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare - waittext - givepokemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 setflag 151 msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index b6bb60ddd..d5807ae94 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -71,7 +71,7 @@ Route120_EventScript_1516B5:: @ 81516B5 return Route120_EventScript_1516DA:: @ 81516DA - spritebehave 36, 10 + setobjectmovementtype 36, 10 return Route120_MapScript1_1516DF:: @ 81516DF @@ -207,7 +207,7 @@ Route120_EventScript_151884:: @ 8151884 Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 - closebutton + closemessage compare FACING, 2 call_if 1, Route120_EventScript_15197F compare FACING, 3 @@ -216,7 +216,7 @@ Route120_EventScript_15189D:: @ 815189D waitmovement 0 delay 20 msgbox Route120_Text_1719D4, 4 - closebutton + closemessage applymovement 30, Route120_Movement_1A0843 waitmovement 0 applymovement 30, Route120_Movement_1A0662 @@ -241,7 +241,7 @@ Route120_EventScript_151908:: @ 8151908 giveitem ITEM_DEVON_SCOPE setflag 285 msgbox Route120_Text_171B0E, 4 - closebutton + closemessage applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 43be91266..39443d2f9 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -21,7 +21,7 @@ Route121_EventScript_151B1C:: @ 8151B1C Route121_EventScript_151B25:: @ 8151B25 lockall msgbox Route121_Text_171C8F, 4 - closebutton + closemessage applymovement 12, Route121_Movement_151B57 applymovement 13, Route121_Movement_151B60 applymovement 14, Route121_Movement_151B69 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 5fdb749f3..c9439ee5f 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -74,9 +74,9 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 playfanfare 370 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare - waittext + waitmessage msgbox Route121_SafariZoneEntrance_Text_1C392D, 4 - closebutton + closemessage hidemoney 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 @@ -111,7 +111,7 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E end Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C - closebutton + closemessage hidemoney 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C waitmovement 0 diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index b3e91e43c..543736e80 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -67,7 +67,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 message Route124_DivingTreasureHuntersHouse_Text_19F5C5 - waittext + waitmessage switch 0x4001 case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61 case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index f19dc6662..3b2c99591 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -26,25 +26,25 @@ Route128_EventScript_15213F:: @ 815213F applymovement 4, Route128_Movement_152279 waitmovement 0 msgbox Route128_Text_171F35, 4 - closebutton + closemessage applymovement 5, Route128_Movement_152293 waitmovement 0 applymovement 4, Route128_Movement_1A0841 waitmovement 0 msgbox Route128_Text_171F4B, 4 - closebutton + closemessage applymovement 5, Route128_Movement_1522A1 waitmovement 0 applymovement 255, Route128_Movement_1A0841 waitmovement 0 msgbox Route128_Text_172008, 4 - closebutton + closemessage applymovement 4, Route128_Movement_15227E applymovement 255, Route128_Movement_1A083F applymovement 5, Route128_Movement_152290 waitmovement 0 msgbox Route128_Text_17210B, 4 - closebutton + closemessage delay 40 applymovement 5, Route128_Movement_152296 applymovement 4, Route128_Movement_152283 @@ -61,7 +61,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 255, Route128_Movement_1A0843 waitmovement 0 msgbox Route128_Text_172181, 4 - closebutton + closemessage applymovement 3, Route128_Movement_15226D applymovement 255, Route128_Movement_1A0841 waitmovement 0 @@ -73,7 +73,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 msgbox Route128_Text_1723BE, 4 - closebutton + closemessage applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index d2469dca7..955726d89 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -124,47 +124,47 @@ RustboroCity_EventScript_14C475:: @ 814C475 RustboroCity_EventScript_14C481:: @ 814C481 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 0 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C498:: @ 814C498 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 1 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 2 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 3 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall - movespriteperm 9, 14, 21 - spritebehave 9, 10 + setobjectxyperm 9, 14, 21 + setobjectmovementtype 9, 10 setvar 0x8004, 4 goto RustboroCity_EventScript_14C4F4 end RustboroCity_EventScript_14C4F4:: @ 814C4F4 msgbox RustboroCity_Text_166E65, 4 - closebutton + closemessage addobject 10 addobject 9 applymovement 10, RustboroCity_Movement_14C5C2 @@ -173,11 +173,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 applymovement 9, RustboroCity_Movement_14C5D3 waitmovement 0 msgbox RustboroCity_Text_166E7E, 4 - closebutton + closemessage applymovement 9, RustboroCity_Movement_14C5DB waitmovement 0 removeobject 9 - movespriteperm 9, 30, 10 + setobjectxyperm 9, 30, 10 clearflag 732 setflag 142 setvar 0x405a, 2 @@ -373,7 +373,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C715 setflag 159 setvar 0x405a, 3 - moveoffscreen 9 + moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 releaseall end @@ -472,7 +472,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 - closebutton + closemessage setflag 144 setflag 732 setvar 0x405a, 5 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index f5fb02c93..48d8aaf9f 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -8,8 +8,8 @@ RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C end RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 - movespriteperm 2, 14, 2 - spritebehave 2, 8 + setobjectxyperm 2, 14, 2 + setobjectmovementtype 2, 8 return RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index e7c966c08..784ef8087 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -79,7 +79,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 end RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 - closebutton + closemessage playse 21 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 @@ -97,7 +97,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 end RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE - closebutton + closemessage playse 21 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 @@ -143,8 +143,8 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare - waittext - givepokemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 @@ -163,8 +163,8 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare - waittext - givepokemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + waitmessage + givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 6458ec5ca..6f0152e60 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -10,8 +10,8 @@ RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 end RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D - movespriteperm 2, 3, 2 - spritebehave 2, 9 + setobjectxyperm 2, 3, 2 + setobjectmovementtype 2, 9 return RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 @@ -29,20 +29,20 @@ RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 lockall msgbox RustboroCity_DevonCorp_3F_Text_18374C, 4 - closebutton + closemessage applymovement 2, RustboroCity_DevonCorp_3F_Movement_157815 waitmovement 0 delay 80 applymovement 2, RustboroCity_DevonCorp_3F_Movement_15781E waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 - closebutton + closemessage playbgm 420, 0 applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18394A, 4 - closebutton + closemessage fadedefaultbgm applymovement 2, RustboroCity_DevonCorp_3F_Movement_157812 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 @@ -53,7 +53,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare - waittext + waitmessage setflag 2050 setflag 188 msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 @@ -151,7 +151,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B checkflag 189 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag 272 msgbox RustboroCity_DevonCorp_3F_Text_1835B3, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release @@ -172,7 +172,7 @@ RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B msgbox RustboroCity_DevonCorp_3F_Text_18368D, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 6bb33b4dc..b1bbfb8d8 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -11,7 +11,7 @@ RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 RustboroCity_Gym_EventScript_1578FE:: @ 81578FE message RustboroCity_Gym_Text_1840AB - waittext + waitmessage call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 setflag 1201 diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index 7ee528ade..cb722a6af 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -5,7 +5,7 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 lock faceplayer message RustboroCity_Mart_Text_1A0BE4 - waittext + waitmessage checkflag 287 goto_if 0, RustboroCity_Mart_EventScript_157BEF checkflag 287 diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 896e8e220..53b481832 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 156b437a0..73b364f5e 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -9,8 +9,8 @@ RustboroCity_PokemonSchool_EventScript_1579E2:: @ 81579E2 RustboroCity_PokemonSchool_EventScript_1579F1:: @ 81579F1 message RustboroCity_PokemonSchool_Text_184368 - waittext - multichoicerow 8, 1, 13, 3, 0 + waitmessage + multichoicegrid 8, 1, 13, 3, 0 switch RESULT case 0, RustboroCity_PokemonSchool_EventScript_157A50 case 1, RustboroCity_PokemonSchool_EventScript_157A5E @@ -87,7 +87,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE giveitem ITEM_QUICK_CLAW compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 setflag 275 @@ -106,7 +106,7 @@ RustboroCity_PokemonSchool_EventScript_157B29:: @ 8157B29 RustboroCity_PokemonSchool_EventScript_157B34:: @ 8157B34 msgbox RustboroCity_PokemonSchool_Text_184737, 4 - closebutton + closemessage applymovement LAST_TALKED, RustboroCity_PokemonSchool_Movement_1A0845 waitmovement 0 release diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 0cfb66351..b11304607 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -15,15 +15,15 @@ RusturfTunnel_MapScript1_15C762:: @ 815C762 end RusturfTunnel_EventScript_15C773:: @ 815C773 - movespriteperm 7, 13, 4 - movespriteperm 6, 13, 5 + setobjectxyperm 7, 13, 4 + setobjectxyperm 6, 13, 5 return RusturfTunnel_EventScript_15C782:: @ 815C782 lock faceplayer msgbox RusturfTunnel_Text_194766, 4 - closebutton + closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release @@ -36,7 +36,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 goto_if_eq RusturfTunnel_EventScript_15C7BC setflag 1 msgbox RusturfTunnel_Text_1944C5, 4 - closebutton + closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release @@ -44,7 +44,7 @@ RusturfTunnel_EventScript_15C799:: @ 815C799 RusturfTunnel_EventScript_15C7BC:: @ 815C7BC msgbox RusturfTunnel_Text_1945B2, 4 - closebutton + closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D waitmovement 0 release @@ -67,7 +67,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 giveitem ITEM_HM04 setflag 106 msgbox RusturfTunnel_Text_194693, 4 - closebutton + closemessage compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C880 compare 0x4001, 2 @@ -75,7 +75,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 - closebutton + closemessage compare 0x4001, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 compare 0x4001, 2 @@ -124,7 +124,7 @@ RusturfTunnel_EventScript_15C8EA:: @ 815C8EA return RusturfTunnel_EventScript_15C8EB:: @ 815C8EB - closebutton + closemessage applymovement 1, RusturfTunnel_Movement_15C98D waitmovement 0 return @@ -280,12 +280,12 @@ RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 RusturfTunnel_EventScript_15C9AB:: @ 815C9AB lockall msgbox RusturfTunnel_Text_194159, 4 - closebutton + closemessage applymovement 6, RusturfTunnel_Movement_15C9D3 applymovement 7, RusturfTunnel_Movement_15C9D3 waitmovement 0 - moveoffscreen 6 - moveoffscreen 7 + moveobjectoffscreen 6 + moveobjectoffscreen 7 setvar 0x409a, 3 releaseall end @@ -314,7 +314,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 giveitem ITEM_DEVON_GOODS - closebutton + closemessage applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 waitmovement 0 @@ -330,12 +330,12 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA applymovement 5, RusturfTunnel_Movement_1A0839 waitmovement 0 message RusturfTunnel_Text_19434F - waittext + waitmessage waitse pokecry SPECIES_WINGULL, 0 waitbutton waitpokecry - closebutton + closemessage applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 waitmovement 0 diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index aa84b6b48..c7cd4447d 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -23,7 +23,7 @@ SSTidalRooms_EventScript_15FF3D:: @ 815FF3D SSTidalRooms_EventScript_15FF47:: @ 815FF47 lockall msgbox SSTidalRooms_Text_19956B, 4 - closebutton + closemessage call SSTidalRooms_EventScript_1A02CA call SSTidalRooms_EventScript_15FD64 releaseall diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 0632a2dda..06a400810 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -14,7 +14,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B waitmovement 0 applymovement 1, SafariZone_Southeast_Movement_160089 waitmovement 0 - movespriteperm 1, 32, 34 + setobjectxyperm 1, 32, 34 setvar 0x40a4, 0 releaseall end @@ -25,7 +25,7 @@ SafariZone_Southeast_MapScript1_160073:: @ 8160073 end SafariZone_Southeast_EventScript_16007F:: @ 816007F - movespriteperm 1, 31, 34 + setobjectxyperm 1, 31, 34 return SafariZone_Southeast_Movement_160087:: @ 8160087 @@ -69,7 +69,7 @@ SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 SafariZone_Southeast_EventScript_1600E0:: @ 81600E0 msgbox SafariZone_Southeast_Text_1C3ACA, 4 - closebutton + closemessage switch FACING case 2, SafariZone_Southeast_EventScript_160105 case 4, SafariZone_Southeast_EventScript_16011F diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index e600611be..ee404404e 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -27,7 +27,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif - closebutton + closemessage addobject 0x8004 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 @@ -134,7 +134,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif - closebutton + closemessage applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE @@ -142,7 +142,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4B11, 4 .endif - closebutton + closemessage playse 3 delay 20 applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845 @@ -152,7 +152,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif - closebutton + closemessage addobject 0x8005 addobject 0x8006 addobject 0x8007 @@ -182,7 +182,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif - closebutton + closemessage applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 70821d183..027c1c363 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -5,7 +5,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall braillemsg SealedChamber_InnerRoom_Braille_1C53C1 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 checkflag 228 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord @@ -29,7 +29,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 playse 8 delay 40 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 - closebutton + closemessage fadeinbgm 0 setflag 228 releaseall @@ -43,7 +43,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall braillemsg SealedChamber_InnerRoom_Braille_1C53F2 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -51,7 +51,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall braillemsg SealedChamber_InnerRoom_Braille_1C5414 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -59,7 +59,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall braillemsg SealedChamber_InnerRoom_Braille_1C5435 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -67,7 +67,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall braillemsg SealedChamber_InnerRoom_Braille_1C545C waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -75,7 +75,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall braillemsg SealedChamber_InnerRoom_Braille_1C5470 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -83,6 +83,6 @@ SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall braillemsg SealedChamber_InnerRoom_Braille_1C549B waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 091c0e8a4..638fc2a85 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -31,7 +31,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall braillemsg SealedChamber_OuterRoom_Braille_1C534F waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -39,7 +39,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall braillemsg SealedChamber_OuterRoom_Braille_1C5359 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -47,7 +47,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall braillemsg SealedChamber_OuterRoom_Braille_1C5363 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -55,7 +55,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall braillemsg SealedChamber_OuterRoom_Braille_1C536D waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -63,7 +63,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall braillemsg SealedChamber_OuterRoom_Braille_1C5377 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -71,7 +71,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall braillemsg SealedChamber_OuterRoom_Braille_1C5381 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -79,7 +79,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall braillemsg SealedChamber_OuterRoom_Braille_1C538B waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -87,7 +87,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall braillemsg SealedChamber_OuterRoom_Braille_1C5396 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -95,7 +95,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall braillemsg SealedChamber_OuterRoom_Braille_1C539E waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -103,7 +103,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall braillemsg SealedChamber_OuterRoom_Braille_1C53A9 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -113,7 +113,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemsg SealedChamber_OuterRoom_Braille_1C53B1 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end @@ -126,6 +126,6 @@ SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall braillemsg SealedChamber_OuterRoom_Braille_1C53B1 waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 1c9fc342f..dcd550549 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -23,27 +23,27 @@ SlateportCity_EventScript_14BA5C:: @ 814BA5C return SlateportCity_EventScript_14BA68:: @ 814BA68 - movespriteperm 11, 28, 13 - movespriteperm 7, 25, 13 - movespriteperm 3, 25, 14 - movespriteperm 6, 27, 16 - movespriteperm 8, 28, 16 - movespriteperm 1, 29, 16 - movespriteperm 2, 31, 14 - spritebehave 11, 8 - spritebehave 7, 18 - spritebehave 3, 16 - spritebehave 6, 7 - spritebehave 8, 7 - spritebehave 1, 7 - spritebehave 2, 9 + setobjectxyperm 11, 28, 13 + setobjectxyperm 7, 25, 13 + setobjectxyperm 3, 25, 14 + setobjectxyperm 6, 27, 16 + setobjectxyperm 8, 28, 16 + setobjectxyperm 1, 29, 16 + setobjectxyperm 2, 31, 14 + setobjectmovementtype 11, 8 + setobjectmovementtype 7, 18 + setobjectmovementtype 3, 16 + setobjectmovementtype 6, 7 + setobjectmovementtype 8, 7 + setobjectmovementtype 1, 7 + setobjectmovementtype 2, 9 return SlateportCity_EventScript_14BAB6:: @ 814BAB6 lock faceplayer message SlateportCity_Text_164642 - waittext + waitmessage pokemart SlateportCity_Items1 msgbox SlateportCity_Text_1A0C02, 4 release @@ -76,7 +76,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 playfanfare 370 message SlateportCity_Text_1646DD waitfanfare - waittext + waitmessage msgbox SlateportCity_Text_1646FC, 4 special GivLeadMonEffortRibbon release @@ -307,7 +307,7 @@ SlateportCity_EventScript_14BD3A:: @ 814BD3A lock faceplayer msgbox SlateportCity_Text_164C64, 4 - closebutton + closemessage applymovement 5, SlateportCity_Movement_1A083D waitmovement 0 release @@ -317,7 +317,7 @@ SlateportCity_EventScript_14BD51:: @ 814BD51 lock faceplayer msgbox SlateportCity_Text_164C9F, 4 - closebutton + closemessage applymovement 19, SlateportCity_Movement_1A083D waitmovement 0 release @@ -327,7 +327,7 @@ SlateportCity_EventScript_14BD68:: @ 814BD68 lock faceplayer msgbox SlateportCity_Text_164CE8, 4 - closebutton + closemessage applymovement 20, SlateportCity_Movement_1A083D waitmovement 0 release @@ -337,7 +337,7 @@ SlateportCity_EventScript_14BD7F:: @ 814BD7F lock faceplayer msgbox SlateportCity_Text_164D2B, 4 - closebutton + closemessage applymovement 27, SlateportCity_Movement_1A083D waitmovement 0 release @@ -347,7 +347,7 @@ SlateportCity_EventScript_14BD96:: @ 814BD96 lock faceplayer msgbox SlateportCity_Text_164D92, 4 - closebutton + closemessage applymovement 28, SlateportCity_Movement_1A083D waitmovement 0 release @@ -357,7 +357,7 @@ SlateportCity_EventScript_14BDAD:: @ 814BDAD lock faceplayer msgbox SlateportCity_Text_164DD5, 4 - closebutton + closemessage applymovement 29, SlateportCity_Movement_1A083D waitmovement 0 release @@ -367,7 +367,7 @@ SlateportCity_EventScript_14BDC4:: @ 814BDC4 lock faceplayer msgbox SlateportCity_Text_164DF4, 4 - closebutton + closemessage applymovement 30, SlateportCity_Movement_1A083D waitmovement 0 release @@ -377,7 +377,7 @@ SlateportCity_EventScript_14BDDB:: @ 814BDDB lock faceplayer msgbox SlateportCity_Text_164E46, 4 - closebutton + closemessage applymovement 31, SlateportCity_Movement_1A083D waitmovement 0 release @@ -387,7 +387,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2 lock faceplayer message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemartdecor SlateportCity_Decorations1 msgbox SlateportCity_Text_1A0C02, 4 release @@ -413,7 +413,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 checkflag 96 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemartdecor SlateportCity_Decorations2 msgbox SlateportCity_Text_1A0C02, 4 release @@ -445,7 +445,7 @@ SlateportCity_Decorations2:: @ 814BE40 checkflag 96 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemartdecor SlateportCity_Decorations3 msgbox SlateportCity_Text_1A0C02, 4 release @@ -472,7 +472,7 @@ SlateportCity_EventScript_14BE9A:: @ 814BE9A lock faceplayer message SlateportCity_Text_1A0BE4 - waittext + waitmessage pokemart SlateportCity_Items2 msgbox SlateportCity_Text_1A0C02, 4 release @@ -490,7 +490,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC lockall msgbox SlateportCity_Text_165498, 4 msgbox SlateportCity_Text_1654E0, 4 - closebutton + closemessage applymovement 10, SlateportCity_Movement_1A0843 waitmovement 0 delay 10 @@ -528,7 +528,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0839 waitmovement 0 msgbox SlateportCity_Text_16583A, 4 - closebutton + closemessage applymovement 11, SlateportCity_Movement_14BFFB applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index c43b64288..cb4632d77 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -38,7 +38,7 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 applymovement 255, SlateportCity_ContestLobby_Movement_1554CA waitmovement 0 msgbox SlateportCity_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, SlateportCity_ContestLobby_Movement_1554D3 applymovement 255, SlateportCity_ContestLobby_Movement_1554C0 waitmovement 0 @@ -118,7 +118,7 @@ SlateportCity_ContestLobby_EventScript_155526:: @ 8155526 SlateportCity_ContestLobby_EventScript_15552F:: @ 815552F lockall fadescreen 1 - showcontestwinner 3 + drawcontestwinner 3 releaseall end @@ -130,6 +130,6 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 50f4926e4..6d2471d99 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -17,8 +17,8 @@ SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 savebgm BGM_EVIL_TEAM - movespriteperm 4, 12, 13 - spritebehave 4, 9 + setobjectxyperm 4, 12, 13 + setobjectmovementtype 4, 9 setflag 905 return @@ -54,7 +54,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 applymovement 255, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 msgbox SlateportCity_Harbor_Text_17FD7D, 4 - closebutton + closemessage applymovement 6, SlateportCity_Harbor_Movement_15609B applymovement 7, SlateportCity_Harbor_Movement_15609B applymovement 8, SlateportCity_Harbor_Movement_1560A5 @@ -72,11 +72,11 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 compare 0x8008, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 - closebutton + closemessage setflag 821 setflag 822 - moveoffscreen 4 - spritebehave 4, 10 + moveobjectoffscreen 4 + setobjectmovementtype 4, 10 releaseall end @@ -171,12 +171,12 @@ SlateportCity_Harbor_EventScript_1560D9:: @ 81560D9 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156135 message SlateportCity_Harbor_Text_17FB0A - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_1560FD:: @ 81560FD - multichoicedef 18, 6, 52, 2, 0 + multichoicedefault 18, 6, 52, 2, 0 switch RESULT case 0, SlateportCity_Harbor_EventScript_15613F case 1, SlateportCity_Harbor_EventScript_156167 @@ -212,13 +212,13 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 SlateportCity_Harbor_EventScript_15618A:: @ 815618A message SlateportCity_Harbor_Text_17FBE5 - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1560FD end SlateportCity_Harbor_EventScript_156196:: @ 8156196 msgbox SlateportCity_Harbor_Text_17FBB6, 4 - closebutton + closemessage applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 @@ -277,7 +277,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 - closebutton + closemessage applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A083D waitmovement 0 release @@ -318,7 +318,7 @@ SlateportCity_Harbor_EventScript_15629D:: @ 815629D SlateportCity_Harbor_EventScript_1562A7:: @ 81562A7 message SlateportCity_Harbor_Text_18028B - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1562B3 end @@ -364,7 +364,7 @@ SlateportCity_Harbor_EventScript_15636A:: @ 815636A SlateportCity_Harbor_EventScript_156374:: @ 8156374 message SlateportCity_Harbor_Text_180447 - waittext + waitmessage goto SlateportCity_Harbor_EventScript_1562B3 end diff --git a/data/scripts/maps/SlateportCity_Mart.inc b/data/scripts/maps/SlateportCity_Mart.inc index 730afe6d4..39a1d5ba2 100644 --- a/data/scripts/maps/SlateportCity_Mart.inc +++ b/data/scripts/maps/SlateportCity_Mart.inc @@ -5,7 +5,7 @@ SlateportCity_Mart_EventScript_156411:: @ 8156411 lock faceplayer message SlateportCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart SlateportCity_Mart_Items msgbox SlateportCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 32a5c2013..f1da0c5a3 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -36,7 +36,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D - closebutton + closemessage hidemoney 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 @@ -60,7 +60,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A checkflag 149 goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 - closebutton + closemessage hidemoney 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 @@ -169,7 +169,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag 269 msgbox SlateportCity_OceanicMuseum_1F_Text_17E606, 4 - closebutton + closemessage compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 compare FACING, 2 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 5f64b3941..e379c633d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -10,7 +10,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 lock faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 - closebutton + closemessage playbgm BGM_EVIL_TEAM, 1 addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 @@ -30,7 +30,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 - closebutton + closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 compare FACING, 1 @@ -39,7 +39,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 - closebutton + closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EBF waitmovement 0 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB2 @@ -53,7 +53,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_1A0841 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17EEEA, 4 - closebutton + closemessage delay 35 addobject 2 applymovement 2, SlateportCity_OceanicMuseum_2F_Movement_155EA8 @@ -67,7 +67,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 .else msgbox SlateportCity_OceanicMuseum_2F_Text_17F17E, 4 .endif - closebutton + closemessage fadescreen 1 removeobject 2 removeobject 3 @@ -81,7 +81,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 setvar 0x8004, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 - closebutton + closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 playse 9 @@ -265,7 +265,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155F46:: @ 8155F46 lock faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17F53B, 4 - closebutton + closemessage applymovement LAST_TALKED, SlateportCity_OceanicMuseum_2F_Movement_1A083D waitmovement 0 release diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index c550a6850..9aa326f70 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -10,7 +10,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE setvar 0x800b, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 3c988d084..9fe7f1f1a 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -15,7 +15,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C1EC, 4 - closebutton + closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 setflag 148 @@ -41,7 +41,7 @@ SlateportCity_SternsShipyard_1F_EventScript_1553B0:: @ 81553B0 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmovement 0 msgbox SlateportCity_SternsShipyard_1F_Text_17C2F2, 4 - closebutton + closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 releaseall diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 90d2bcc5e..a1ecffbd2 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -12,7 +12,7 @@ SootopolisCity_MapScript1_14D08D:: @ 814D08D end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 - movespriteperm 3, 31, 18 + setobjectxyperm 3, 31, 18 setmaptile 31, 32, 592, 1 return @@ -43,22 +43,22 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 - movespriteperm 1, 29, 19 - movespriteperm 2, 33, 19 + setobjectxyperm 1, 29, 19 + setobjectxyperm 2, 33, 19 compare 0x405e, 1 call_if 1, SootopolisCity_EventScript_14D142 return SootopolisCity_EventScript_14D142:: @ 814D142 - movespriteperm 10, 29, 6 - spritebehave 10, 10 - movespriteperm 5, 30, 6 - spritebehave 5, 9 + setobjectxyperm 10, 29, 6 + setobjectmovementtype 10, 10 + setobjectxyperm 5, 30, 6 + setobjectmovementtype 5, 9 return SootopolisCity_EventScript_14D159:: @ 814D159 - movespriteperm 10, 31, 33 - spritebehave 10, 8 + setobjectxyperm 10, 31, 33 + setobjectmovementtype 10, 8 return SootopolisCity_MapScript1_14D165:: @ 814D165 @@ -228,7 +228,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169E0F, 4 .endif - closebutton + closemessage applymovement 10, SootopolisCity_Movement_14D417 applymovement 255, SootopolisCity_Movement_14D440 waitmovement 10 @@ -247,7 +247,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169F3C, 4 .endif - closebutton + closemessage delay 30 applymovement 5, SootopolisCity_Movement_14D46A applymovement 10, SootopolisCity_Movement_14D41D @@ -264,7 +264,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169F6B, 4 .endif - closebutton + closemessage delay 30 applymovement 5, SootopolisCity_Movement_14D47C applymovement 255, SootopolisCity_Movement_14D457 @@ -284,10 +284,10 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_16A13E, 4 .endif - moveoffscreen 5 - spritebehave 5, 9 - moveoffscreen 10 - spritebehave 10, 10 + moveobjectoffscreen 5 + setobjectmovementtype 5, 9 + moveobjectoffscreen 10 + setobjectmovementtype 10, 10 setvar 0x405e, 2 releaseall end @@ -457,7 +457,7 @@ SootopolisCity_EventScript_14D498:: @ 814D498 SootopolisCity_EventScript_14D4AD:: @ 814D4AD msgbox SootopolisCity_Text_16A33E, 4 - closebutton + closemessage applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index bd0af12be..51b67ee4b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -97,7 +97,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D message SootopolisCity_Gym_1F_Text_18F342 - waittext + waitmessage call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag 1236 diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 662117741..df536004e 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -41,7 +41,7 @@ SootopolisCity_House8_EventScript_15B466:: @ 815B466 giveitem ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 - closebutton + closemessage release end @@ -90,7 +90,7 @@ SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 giveitem ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 - closebutton + closemessage release end diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 6cfb2ff79..b88347002 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -5,7 +5,7 @@ SootopolisCity_Mart_EventScript_15B21B:: @ 815B21B lock faceplayer message SootopolisCity_Mart_Text_1A0BE4 - waittext + waitmessage pokemart SootopolisCity_Mart_Items msgbox SootopolisCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 00c9d3310..cb09d8856 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 @ 815B19A setvar 0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 77c163c47..3c6426024 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -13,7 +13,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 compare RESULT, 0 goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 - closebutton + closemessage applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 5bbe8e3b6..edc8229a7 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -22,6 +22,6 @@ Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall braillemsg Underwater_SealedChamber_Braille_1C533D waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 5d7c6de18..8462892e6 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -38,7 +38,7 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 applymovement 255, VerdanturfTown_ContestLobby_Movement_153E23 waitmovement 0 msgbox VerdanturfTown_ContestLobby_Text_1A6832, 4 - closebutton + closemessage applymovement 1, VerdanturfTown_ContestLobby_Movement_153E2C applymovement 255, VerdanturfTown_ContestLobby_Movement_153E19 waitmovement 0 @@ -90,7 +90,7 @@ VerdanturfTown_ContestLobby_Movement_153E35:: @ 8153E35 VerdanturfTown_ContestLobby_EventScript_153E37:: @ 8153E37 lockall fadescreen 1 - showcontestwinner 1 + drawcontestwinner 1 releaseall end @@ -124,6 +124,6 @@ VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 lockall special ShowBerryBlenderRecordWindow waitbutton - hidebox 0, 0, 29, 19 + erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_Mart.inc b/data/scripts/maps/VerdanturfTown_Mart.inc index 4227dc8b1..db72de227 100644 --- a/data/scripts/maps/VerdanturfTown_Mart.inc +++ b/data/scripts/maps/VerdanturfTown_Mart.inc @@ -5,7 +5,7 @@ VerdanturfTown_Mart_EventScript_153EBC:: @ 8153EBC lock faceplayer message VerdanturfTown_Mart_Text_1A0BE4 - waittext + waitmessage pokemart VerdanturfTown_Mart_Items msgbox VerdanturfTown_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index e0fee3fb8..a0b1f87de 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -11,7 +11,7 @@ PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B - waittext + waitmessage waitbutton release end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 2ed660a5f..fe775d793 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -42,7 +42,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 clearflag 858 - moveoffscreen 4 + moveobjectoffscreen 4 setflag 126 setvar 0x40c3, 1 releaseall -- cgit v1.2.3 From 6ca1e8747d0278eb5a8e5d7f5ec74801a3e1aded Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 11:51:50 -0500 Subject: fix more command names --- data/scripts/maps/AncientTomb.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/DesertRuins.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 4 +- data/scripts/maps/IslandCave.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 14 +++--- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 52 +++++++++++----------- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 2 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 32 ++++++------- .../maps/Route124_DivingTreasureHuntersHouse.inc | 4 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 8 ++-- data/scripts/maps/RustboroCity_House1.inc | 2 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 14 +++--- data/scripts/maps/SealedChamber_OuterRoom.inc | 24 +++++----- data/scripts/maps/SlateportCity.inc | 2 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 2 +- data/scripts/maps/SootopolisCity_House6.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- 25 files changed, 97 insertions(+), 97 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 0e9a82f4c..6f6499b26 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -35,7 +35,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 lockall checkflag 2130 goto_if_eq AncientTomb_EventScript_15F038 - braillemsg AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_1C552E waitbutton erasebox 0, 0, 29, 19 releaseall @@ -48,7 +48,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall - braillemsg AncientTomb_Braille_1C552E + braillemessage AncientTomb_Braille_1C552E waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 555e32d81..5bb74d35b 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecor 1, 0x8008 + getdecorname 1, 0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 6b8bb5cdb..93cbb8fe8 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -35,7 +35,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 lockall checkflag 2128 goto_if_eq DesertRuins_EventScript_15CB6D - braillemsg DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_1C54C8 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -48,7 +48,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall - braillemsg DesertRuins_Braille_1C54C8 + braillemessage DesertRuins_Braille_1C54C8 waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 3809e1f01..3fb0f7745 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -28,7 +28,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 special sub_804DB68 special sub_804E174 waitstate - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 setflag 155 release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index ed230477c..55bd4103c 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -47,7 +47,7 @@ IslandCave_EventScript_15EF59:: @ 815EF59 lockall checkflag 2129 goto_if_eq IslandCave_EventScript_15EF72 - braillemsg IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_1C54FC special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 @@ -60,7 +60,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall - braillemsg IslandCave_Braille_1C54FC + braillemessage IslandCave_Braille_1C54FC checkflag 2129 goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 09f2e88ea..2bd95eace 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 - buffernum 1, 32772 + getnumberstring 1, 32772 message2 LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 02f5ca3ca..03d64bbd1 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoney 0, 0 nop - bufferitem 0, 0x4000 + getitemname 0, 0x4000 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -162,8 +162,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -174,8 +174,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 additem 0x4000, 1 - bufferitem 1, 0x4000 - bufferstd 2, 14 + getitemname 1, 0x4000 + getstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 2b39ea557..80fda6d59 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitem 0, 0x8005 + getitemname 0, 0x8005 compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 7c6886209..d7aab95a6 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall - bufferfirstpoke 0 + getfirstpartypokename 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage playfanfare 370 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6952ca4e1..0a853b2fc 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 - bufferdecor 0, 88 + getdecorname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 - bufferdecor 0, 89 + getdecorname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 - bufferdecor 0, 90 + getdecorname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C @@ -156,7 +156,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 88 + getdecorname 1, 88 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -172,7 +172,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 89 + getdecorname 1, 89 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -188,7 +188,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecor 1, 90 + getdecorname 1, 90 checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 - bufferitem 0, ITEM_TM32 + getitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 - bufferitem 0, ITEM_TM29 + getitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 - bufferitem 0, ITEM_TM35 + getitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 - bufferitem 0, ITEM_TM24 + getitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 - bufferitem 0, ITEM_TM13 + getitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -401,7 +401,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - bufferdecor 1, 88 + getdecorname 1, 88 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -412,7 +412,7 @@ MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - bufferdecor 1, 89 + getdecorname 1, 89 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -423,7 +423,7 @@ MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - bufferdecor 1, 90 + getdecorname 1, 90 checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 @@ -526,7 +526,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 0 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -537,7 +537,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 1 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -548,7 +548,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 2 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -559,7 +559,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 3 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -570,7 +570,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 4 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -581,7 +581,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 5 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -592,7 +592,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 6 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -603,7 +603,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 7 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -614,7 +614,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 8 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -625,7 +625,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 9 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -636,7 +636,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 10 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end @@ -647,7 +647,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar 0x8004, 11 specialvar RESULT, sub_810F424 - pokecasino RESULT + playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 6098cc617..62edffc8b 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E MossdeepCity_House1_EventScript_15A82F:: @ 815A82F lock faceplayer - bufferfirstpoke 0 + getfirstpartypokename 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index acd499966..260cb4b6e 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer dodailyevents specialvar RESULT, GetWeekCount - buffernum 0, RESULT + getnumberstring 0, RESULT compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 6905b31b3..8bf899780 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -84,7 +84,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C waitfanfare waitmessage givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - bufferpoke 1, SPECIES_BELDUM + getspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index cef40ecd3..f3a198a08 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialvar RESULT, sub_810F908 - buffernum 0, RESULT + getnumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 1edd445fc..28b9dbd80 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -28,7 +28,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E special sub_804DB68 special sub_804E174 waitstate - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag 154 release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 39b484c8a..d0b608339 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8009, 1 setvar 0x8008, 13 - bufferdecor 0, 0x8008 + getdecorname 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8009, 1 setvar 0x8008, 6 - bufferdecor 0, 0x8008 + getdecorname 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E Route113_GlassWorkshop_EventScript_163818:: @ 8163818 setvar 0x800a, 250 subvar 0x800a, 16456 - buffernum 0, 32778 + getnumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 - buffernum 1, 32778 + getnumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 - bufferitem 0, 0x8008 + getitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 - bufferdecor 0, 13 + getdecorname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 - bufferdecor 0, 6 + getdecorname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 543736e80..7421e94e0 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitem 0, 0x8008 - bufferitem 1, 0x8009 + getitemname 0, 0x8008 + getitemname 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 784ef8087..f40c1b87b 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -88,7 +88,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - bufferitem 0, ITEM_ROOT_FOSSIL + getitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_ROOT_FOSSIL, 1 setvar 0x40c4, 1 @@ -106,7 +106,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - bufferitem 0, ITEM_CLAW_FOSSIL + getitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 removeitem ITEM_CLAW_FOSSIL, 1 setvar 0x40c4, 1 @@ -132,7 +132,7 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 - bufferpoke 1, SPECIES_LILEEP + getspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 @@ -152,7 +152,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 end RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 - bufferpoke 1, SPECIES_ANORITH + getspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 countpokemon compare RESULT, 6 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index a344738a8..b983617e0 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferpoke 0, 0x8009 + getspeciesname 0, 0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 027c1c363..526ada367 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -3,7 +3,7 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C53C1 + braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbutton erasebox 0, 0, 29, 19 checkflag 228 @@ -41,7 +41,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C53F2 + braillemessage SealedChamber_InnerRoom_Braille_1C53F2 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -49,7 +49,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5414 + braillemessage SealedChamber_InnerRoom_Braille_1C5414 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -57,7 +57,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5435 + braillemessage SealedChamber_InnerRoom_Braille_1C5435 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -65,7 +65,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C545C + braillemessage SealedChamber_InnerRoom_Braille_1C545C waitbutton erasebox 0, 0, 29, 19 releaseall @@ -73,7 +73,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall - braillemsg SealedChamber_InnerRoom_Braille_1C5470 + braillemessage SealedChamber_InnerRoom_Braille_1C5470 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -81,7 +81,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall - braillemsg SealedChamber_InnerRoom_Braille_1C549B + braillemessage SealedChamber_InnerRoom_Braille_1C549B waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 638fc2a85..39542559b 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -29,7 +29,7 @@ SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall - braillemsg SealedChamber_OuterRoom_Braille_1C534F + braillemessage SealedChamber_OuterRoom_Braille_1C534F waitbutton erasebox 0, 0, 29, 19 releaseall @@ -37,7 +37,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5359 + braillemessage SealedChamber_OuterRoom_Braille_1C5359 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -45,7 +45,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5363 + braillemessage SealedChamber_OuterRoom_Braille_1C5363 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -53,7 +53,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C536D + braillemessage SealedChamber_OuterRoom_Braille_1C536D waitbutton erasebox 0, 0, 29, 19 releaseall @@ -61,7 +61,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5377 + braillemessage SealedChamber_OuterRoom_Braille_1C5377 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -69,7 +69,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5381 + braillemessage SealedChamber_OuterRoom_Braille_1C5381 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -77,7 +77,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C538B + braillemessage SealedChamber_OuterRoom_Braille_1C538B waitbutton erasebox 0, 0, 29, 19 releaseall @@ -85,7 +85,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall - braillemsg SealedChamber_OuterRoom_Braille_1C5396 + braillemessage SealedChamber_OuterRoom_Braille_1C5396 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -93,7 +93,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall - braillemsg SealedChamber_OuterRoom_Braille_1C539E + braillemessage SealedChamber_OuterRoom_Braille_1C539E waitbutton erasebox 0, 0, 29, 19 releaseall @@ -101,7 +101,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall - braillemsg SealedChamber_OuterRoom_Braille_1C53A9 + braillemessage SealedChamber_OuterRoom_Braille_1C53A9 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -111,7 +111,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall checkflag 2127 goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF - braillemsg SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton erasebox 0, 0, 29, 19 releaseall @@ -124,7 +124,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall - braillemsg SealedChamber_OuterRoom_Braille_1C53B1 + braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton erasebox 0, 0, 29, 19 releaseall diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index dcd550549..bea1455a7 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0 SlateportCity_EventScript_14BAE0:: @ 814BAE0 lock faceplayer - bufferfirstpoke 0 + getfirstpartypokename 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index cd71d8d51..fa66113b1 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag 200 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 - bufferfirstpoke 0 + getfirstpartypokename 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1e1b53956..a0fdc5ca4 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - bufferdecor 1, 117 + getdecorname 1, 117 msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index edc8229a7..836ad86e2 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -20,7 +20,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall - braillemsg Underwater_SealedChamber_Braille_1C533D + braillemessage Underwater_SealedChamber_Braille_1C533D waitbutton erasebox 0, 0, 29, 19 releaseall -- cgit v1.2.3 From 639493e0ee82d173e58d9a791b37ab08106e16fa Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:07:22 -0500 Subject: fix more command names --- data/scripts/maps/DewfordTown_Gym.inc | 10 +++++----- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 16 ++++++++-------- data/scripts/maps/MauvilleCity_GameCorner.inc | 20 ++++++++++---------- data/scripts/maps/MtChimney.inc | 14 +++++++------- data/scripts/maps/Route109_SeashoreHouse.inc | 14 +++++++------- data/scripts/maps/Route121_SafariZoneEntrance.inc | 10 +++++----- data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 14 +++++++------- 7 files changed, 49 insertions(+), 49 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 296d2ed2d..65556c739 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA - darken 0 + setdarklevel 0 return DewfordTown_Gym_EventScript_1530AE:: @ 81530AE - darken 1 + setdarklevel 1 return DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 - darken 2 + setdarklevel 2 return DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 - darken 3 + setdarklevel 3 return DewfordTown_Gym_EventScript_1530BA:: @ 81530BA - darken 4 + setdarklevel 4 return DewfordTown_Gym_EventScript_1530BE:: @ 81530BE diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 03d64bbd1..29914a9b5 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -3,7 +3,7 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F .byte 0 LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 - event_96 3 + getpricereduction 3 compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F compare RESULT, 0 @@ -51,7 +51,7 @@ LilycoveCity_DepartmentStoreRooftop_Decorations:: @ 815A180 LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 lock faceplayer - event_96 3 + getpricereduction 3 compare RESULT, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 @@ -71,7 +71,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD lockall message LilycoveCity_DepartmentStoreRooftop_Text_18C72B waitmessage - showmoney 0, 0 + showmoneybox 0, 0 nop goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE end @@ -115,15 +115,15 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B:: @ 815A24B return LilycoveCity_DepartmentStoreRooftop_EventScript_15A252:: @ 815A252 - paymoney 0xc8, 0 + takemoney 0xc8, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A259:: @ 815A259 - paymoney 0x12c, 0 + takemoney 0x12c, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 - paymoney 0x15e, 0 + takemoney 0x15e, 0 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 @@ -144,7 +144,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 compare 0x4001, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 - updatemoney 0, 0 + updatemoneybox 0, 0 nop getitemname 0, 0x4000 playse 106 @@ -197,6 +197,6 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A388:: @ 815A388 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A396:: @ 815A396 - hidemoney 0, 0 + hidemoneybox 0, 0 releaseall end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 0a853b2fc..8d98f03a8 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -10,7 +10,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 goto_if_eq MauvilleCity_GameCorner_EventScript_156B32 message MauvilleCity_GameCorner_Text_181CB4 waitmessage - showmoney 0, 0 + showmoneybox 0, 0 nop showcoins 0, 5 goto MauvilleCity_GameCorner_EventScript_156A60 @@ -39,13 +39,13 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 50 - paymoney 0x3e8, 0 - updatemoney 0, 0 + takemoney 0x3e8, 0 + updatemoneybox 0, 0 nop updatecoins 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end @@ -58,13 +58,13 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C givecoins 500 - paymoney 0x2710, 0 - updatemoney 0, 0 + takemoney 0x2710, 0 + updatemoneybox 0, 0 nop updatecoins 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end @@ -76,21 +76,21 @@ MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32 MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C msgbox MauvilleCity_GameCorner_Text_181D28, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C msgbox MauvilleCity_GameCorner_Text_181D73, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C msgbox MauvilleCity_GameCorner_Text_181D57, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 hidecoins 0, 5 release end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d206f927e..a8eec9a32 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -15,7 +15,7 @@ MtChimney_MapScript1_15CF92:: @ 815CF92 MtChimney_EventScript_15CF95:: @ 815CF95 lock faceplayer - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox MtChimney_Text_195760, 5 compare RESULT, 0 @@ -30,31 +30,31 @@ MtChimney_EventScript_15CF95:: @ 815CF95 giveitem ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15CFF3:: @ 815CFF3 msgbox MtChimney_Text_1A0CC2, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15D000:: @ 815D000 - paymoney 0xc8, 0 - updatemoney 0, 0 + takemoney 0xc8, 0 + updatemoneybox 0, 0 nop return MtChimney_EventScript_15D00B:: @ 815D00B msgbox MtChimney_Text_1957F7, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end MtChimney_EventScript_15D018:: @ 815D018 msgbox MtChimney_Text_1957BA, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 789ee3e56..4d8d363aa 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -40,13 +40,13 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C end Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox Route109_SeashoreHouse_Text_19B702, 5 compare RESULT, 1 goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end @@ -58,23 +58,23 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160EAB msgbox Route109_SeashoreHouse_Text_19B74C, 4 - paymoney 0x12c, 0 - updatemoney 0, 0 + takemoney 0x12c, 0 + updatemoneybox 0, 0 nop giveitem ITEM_SODA_POP - hidemoney 0, 0 + hidemoneybox 0, 0 release end Route109_SeashoreHouse_EventScript_160E9E:: @ 8160E9E msgbox Route109_SeashoreHouse_Text_19B759, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end Route109_SeashoreHouse_EventScript_160EAB:: @ 8160EAB msgbox Route109_SeashoreHouse_Text_1A0CC2, 4 - hidemoney 0, 0 + hidemoneybox 0, 0 release end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index c9439ee5f..9649271f4 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -49,7 +49,7 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 lockall applymovement 255, Route121_SafariZoneEntrance_Movement_1A0841 waitmovement 0 - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 compare RESULT, 1 @@ -67,8 +67,8 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 compare RESULT, 0 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C45E msgbox Route121_SafariZoneEntrance_Text_1C38D9, 4 - paymoney 0x1f4, 0 - updatemoney 0, 0 + takemoney 0x1f4, 0 + updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 playfanfare 370 @@ -77,7 +77,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 waitmessage msgbox Route121_SafariZoneEntrance_Text_1C392D, 4 closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 special EnterSafariMode @@ -112,7 +112,7 @@ Route121_SafariZoneEntrance_EventScript_15C45E:: @ 815C45E Route121_SafariZoneEntrance_EventScript_15C46C:: @ 815C46C closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47C waitmovement 0 releaseall diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index f1da0c5a3..1ee8ff39b 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -31,13 +31,13 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 end SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 - showmoney 0, 0 + showmoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 compare RESULT, 1 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 releaseall @@ -47,12 +47,12 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D checkmoney 0x32, 0 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B5A - paymoney 0x32, 0 - updatemoney 0, 0 + takemoney 0x32, 0 + updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 setvar 0x40aa, 1 - hidemoney 0, 0 + hidemoneybox 0, 0 releaseall end @@ -61,7 +61,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage - hidemoney 0, 0 + hidemoneybox 0, 0 applymovement 255, SlateportCity_OceanicMuseum_1F_Movement_155B8D waitmovement 0 releaseall @@ -70,7 +70,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4 setvar 0x40aa, 1 - hidemoney 0, 0 + hidemoneybox 0, 0 releaseall end -- cgit v1.2.3 From 89092b609a9af15a35b0151442e9881aeab28708 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:21:52 -0500 Subject: fix more command names --- .../maps/AbandonedShip_HiddenFloorRooms.inc | 88 +++++++++++----------- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 12 +-- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/DewfordTown_Gym.inc | 8 +- data/scripts/maps/DewfordTown_House1.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 6 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_Mart.inc | 2 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/FortreeCity_House5.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 8 +- data/scripts/maps/LavaridgeTown_House.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 8 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 8 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- data/scripts/maps/LilycoveCity_House1.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 16 ++-- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 8 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 6 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 4 +- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 4 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 10 +-- data/scripts/maps/Route114.inc | 2 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route119_House.inc | 2 +- data/scripts/maps/Route120.inc | 8 +- data/scripts/maps/Route128.inc | 12 +-- data/scripts/maps/RustboroCity.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_1F.inc | 2 +- data/scripts/maps/RustboroCity_House3.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 4 +- data/scripts/maps/SSTidalCorridor.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 10 +-- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 6 +- data/scripts/maps/SootopolisCity.inc | 6 +- data/scripts/maps/SootopolisCity_House1.inc | 2 +- data/scripts/maps/SootopolisCity_House4.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 2 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 2 +- 57 files changed, 163 insertions(+), 163 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index cc9074e35..eb5c1dccd 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -39,14 +39,14 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B delay 20 - setanimation 0, 10 - setanimation 1, 10 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 10 + setfieldeffect 1, 10 + setfieldeffect 2, 0 + dofieldeffect 54 specialvar RESULT, sub_810F4D4 compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B - checkanimation 54 + waitfieldeffect 54 delay 10 end @@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 delay 20 compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B - checkanimation 54 + waitfieldeffect 54 delay 10 end @@ -69,39 +69,39 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB delay 20 - setanimation 0, 8 - setanimation 1, 5 - setanimation 2, 0 - doanimation 54 - setanimation 0, 11 - setanimation 1, 3 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 8 + setfieldeffect 1, 5 + setfieldeffect 2, 0 + dofieldeffect 54 + setfieldeffect 0, 11 + setfieldeffect 1, 3 + setfieldeffect 2, 0 + dofieldeffect 54 specialvar RESULT, sub_810F4FC compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B - checkanimation 54 + waitfieldeffect 54 delay 10 end AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 delay 20 - setanimation 0, 16 - setanimation 1, 3 - setanimation 2, 0 - doanimation 54 - setanimation 0, 25 - setanimation 1, 2 - setanimation 2, 0 - doanimation 54 - setanimation 0, 24 - setanimation 1, 6 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 16 + setfieldeffect 1, 3 + setfieldeffect 2, 0 + dofieldeffect 54 + setfieldeffect 0, 25 + setfieldeffect 1, 2 + setfieldeffect 2, 0 + dofieldeffect 54 + setfieldeffect 0, 24 + setfieldeffect 1, 6 + setfieldeffect 2, 0 + dofieldeffect 54 specialvar RESULT, sub_810F4B0 compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B - checkanimation 54 + waitfieldeffect 54 delay 10 end @@ -109,31 +109,31 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A end AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B - setanimation 0, 42 - setanimation 1, 10 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 42 + setfieldeffect 1, 10 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B - setanimation 0, 20 - setanimation 1, 5 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 20 + setfieldeffect 1, 5 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B - setanimation 0, 1 - setanimation 1, 12 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 1 + setfieldeffect 1, 12 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B - setanimation 0, 1 - setanimation 1, 2 - setanimation 2, 0 - doanimation 54 + setfieldeffect 0, 1 + setfieldeffect 1, 2 + setfieldeffect 2, 0 + dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EEAB:: @ 815EEAB diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 6f6499b26..188691e73 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -58,7 +58,7 @@ AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer waitse - pokecry SPECIES_REGISTEEL, 2 + playpokecry SPECIES_REGISTEEL, 2 delay 40 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 503b9f1a8..e8270030b 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -38,11 +38,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special WaitWeather waitstate playse 209 - setanimation 0, 9 - setanimation 1, 13 - setanimation 2, 0 - doanimation 54 - checkanimation 54 + setfieldeffect 0, 9 + setfieldeffect 1, 13 + setfieldeffect 2, 0 + dofieldeffect 54 + waitfieldeffect 54 .ifdef SAPPHIRE setvar RESULT, 3 .else @@ -58,7 +58,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse - pokecry SPECIES_GROUDON_OR_KYOGRE, 2 + playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 waitpokecry setflag 2145 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 93cbb8fe8..9f6f7b388 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -58,7 +58,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer waitse - pokecry SPECIES_REGIROCK, 2 + playpokecry SPECIES_REGIROCK, 2 delay 40 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 65556c739..92776afb1 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -57,25 +57,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 playse 35 - lighten 3 + animdarklevel 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 playse 35 - lighten 2 + animdarklevel 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C playse 35 - lighten 1 + animdarklevel 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 playse 35 - lighten 0 + animdarklevel 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index 321e376bd..e8897b974 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -13,7 +13,7 @@ DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 waitpokecry release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index febd6a521..90df9ab4e 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -52,14 +52,14 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage playse 8 - checkgender + checkplayergender compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD - checkgender + checkplayergender compare RESULT, 0 goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B886 compare RESULT, 1 @@ -127,7 +127,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_1A0845 waitmovement 0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 - checkgender + checkplayergender compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index b53319abe..d9baaee89 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -38,12 +38,12 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 applymovement 255, EverGrandeCity_HallOfFame_Movement_1A0841 waitmovement 0 delay 20 - doanimation 62 - checkanimation 62 + dofieldeffect 62 + waitfieldeffect 62 delay 40 setvar 0x4001, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq EverGrandeCity_HallOfFame_EventScript_15BC41 compare RESULT, 1 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index d6d4ffd3b..13c8a9f2e 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -35,7 +35,7 @@ FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer waitse - pokecry SPECIES_AZURILL, 0 + playpokecry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 waitpokecry release diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index 0cf842ddf..e6f715697 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -41,7 +41,7 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 waitpokecry release diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 3cddff4f9..6ea89dcb7 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -76,7 +76,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse - pokecry SPECIES_KECLEON, 2 + playpokecry SPECIES_KECLEON, 2 delay 40 waitpokecry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 3fb0f7745..7b7ef0b2e 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -58,7 +58,7 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 waitpokecry release diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index fdd30022f..b261e14fb 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -60,7 +60,7 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 waitpokecry release diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index 59f80917e..fe10b53b0 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -13,7 +13,7 @@ FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 waitpokecry release diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 7a13cbe78..fc2930aa5 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -16,7 +16,7 @@ InsideOfTruck_MapScript1_15FC26:: @ 815FC26 InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall setflag 0x4000 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 compare RESULT, 1 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 55bd4103c..75399bde8 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -78,7 +78,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer waitse - pokecry SPECIES_REGICE, 2 + playpokecry SPECIES_REGICE, 2 delay 40 waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e0d54d0e7..5a4981f09 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -43,14 +43,14 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmovement 0 applymovement 8, LavaridgeTown_Movement_1A0835 waitmovement 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 compare 0x8008, 1 call_if 1, LavaridgeTown_EventScript_14E68F - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 @@ -69,12 +69,12 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer setvar 0x8008, 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB compare RESULT, 1 diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index dd5a9cc2b..c75cb9e4b 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -9,7 +9,7 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 waitpokecry release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 76976543c..cf8e2e07d 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -247,7 +247,7 @@ LilycoveCity_EventScript_14CD3D:: @ 814CD3D LilycoveCity_EventScript_14CD46:: @ 814CD46 lock faceplayer - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CD60 compare RESULT, 1 @@ -415,11 +415,11 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject LAST_TALKED - checkanimation 30 + waitfieldeffect 30 savebgm 0 fadedefaultbgm setflag 292 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 2bd95eace..0b8d520ee 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -426,7 +426,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DA1 compare RESULT, 6 goto_if_eq LilycoveCity_ContestLobby_EventScript_158DB2 - message2 LilycoveCity_ContestLobby_Text_18872A + messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer switch 0x8004 @@ -473,7 +473,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 getnumberstring 1, 32772 - message2 LilycoveCity_ContestLobby_Text_188845 + messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE @@ -490,7 +490,7 @@ LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B lockall - message2 LilycoveCity_ContestLobby_Text_1888C6 + messageautoscroll LilycoveCity_ContestLobby_Text_1888C6 waitmessage delay 20 closemessage @@ -511,7 +511,7 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B waitmovement 0 applymovement 255, LilycoveCity_ContestLobby_Movement_158E99 waitmovement 0 - message2 LilycoveCity_ContestLobby_Text_1A6832 + messageautoscroll LilycoveCity_ContestLobby_Text_1A6832 waitmessage delay 20 closemessage diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 80fda6d59..a4e6af419 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -134,7 +134,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer waitse - pokecry SPECIES_AZUMARILL, 0 + playpokecry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 waitpokecry release diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 6440f6d3d..4defe37b8 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -9,7 +9,7 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer waitse - pokecry SPECIES_KECLEON, 0 + playpokecry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 waitpokecry release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 095862fd6..af1d0cc1e 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -54,7 +54,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A LittlerootTown_EventScript_14D5A6:: @ 814D5A6 clearflag 752 setobjectmovementtype 4, 8 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D5C5 compare RESULT, 1 @@ -333,7 +333,7 @@ LittlerootTown_EventScript_14D7FF:: @ 814D7FF LittlerootTown_EventScript_14D808:: @ 814D808 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D822 compare RESULT, 1 @@ -351,7 +351,7 @@ LittlerootTown_EventScript_14D82B:: @ 814D82B LittlerootTown_EventScript_14D834:: @ 814D834 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D84E compare RESULT, 1 @@ -406,25 +406,25 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA end LittlerootTown_EventScript_14D8B6:: @ 814D8B6 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D93C compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D947 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closemessage - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D952 compare RESULT, 1 call_if 1, LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14DAAA compare RESULT, 1 @@ -841,7 +841,7 @@ LittlerootTown_Movement_14DCE0:: @ 814DCE0 LittlerootTown_EventScript_14DCE2:: @ 814DCE2 lock faceplayer - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_EventScript_14D926 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 30b2d6eef..04256cacb 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -17,7 +17,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 return LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152680 return diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 1f4b301c0..8ff7f8b81 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -22,14 +22,14 @@ LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1A2F68 end @ 81527F1 lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_15280A compare RESULT, 1 @@ -50,7 +50,7 @@ gUnknown_0815281E:: @ 815281E LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152837 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 45eb481e4..14c7f5d8a 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -17,7 +17,7 @@ LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E return LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 - checkgender + checkplayergender compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528BE return @@ -116,7 +116,7 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 @ 81529C7 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index b35ee81a9..68bdf0fcb 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -22,7 +22,7 @@ LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 - checkgender + checkplayergender compare RESULT, 1 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_1A2F68 end @@ -32,7 +32,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall checkflag 292 goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 @@ -112,7 +112,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BAA:: @ 8152BAA LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 @@ -193,7 +193,7 @@ gUnknown_08152C39:: @ 8152C39 LittlerootTown_MaysHouse_2F_EventScript_152C39:: @ 8152C39 lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq LittlerootTown_MaysHouse_2F_EventScript_152C52 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index d7aab95a6..e7ccd73f6 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -123,7 +123,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA waitmovement 0 applymovement 255, LittlerootTown_ProfessorBirchsLab_Movement_1A0843 waitmovement 0 - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 @@ -187,7 +187,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E9A:: @ 8152E9A LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 lock faceplayer - checkgender + checkplayergender compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE compare RESULT, 1 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index b1954a6cf..f7f66b843 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -13,7 +13,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry closemessage diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 205f10313..fd173899d 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -35,7 +35,7 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 waitpokecry release diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 0627fc53b..2d2a46ab4 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -166,7 +166,7 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - pokecry SPECIES_VOLTORB, 2 + playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry setflag 974 @@ -181,7 +181,7 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - pokecry SPECIES_VOLTORB, 2 + playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry setflag 975 @@ -196,7 +196,7 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - pokecry SPECIES_VOLTORB, 2 + playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry setflag 976 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 2d84a6f92..e80df2cd2 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -256,7 +256,7 @@ OldaleTown_EventScript_14DF77:: @ 814DF77 end OldaleTown_EventScript_14DF92:: @ 814DF92 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DFAA compare RESULT, 1 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f3a198a08..e04a8caae 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -81,7 +81,7 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer waitse - pokecry SPECIES_AZURILL, 0 + playpokecry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 waitpokecry msgbox PacifidlogTown_House2_Text_17939B, 4 @@ -92,7 +92,7 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer waitse - pokecry SPECIES_AZURILL, 2 + playpokecry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 waitpokecry msgbox PacifidlogTown_House2_Text_1793DD, 4 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index c9ebf9511..ff0ccce30 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -9,7 +9,7 @@ Route103_MapScript1_14EB87:: @ 814EB87 Route103_EventScript_14EB92:: @ 814EB92 lockall - checkgender + checkplayergender compare RESULT, 0 goto_if_eq Route103_EventScript_14EBAB compare RESULT, 1 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index d388d1c7a..f24e92cd4 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -92,7 +92,7 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 waitpokecry release diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index be296d403..501ca5e0e 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -360,7 +360,7 @@ Route109_EventScript_14F788:: @ 814F788 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 waitpokecry release diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index afbfebcc2..146be5959 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -325,7 +325,7 @@ Route110_EventScript_14FD29:: @ 814FD29 Route110_EventScript_14FD34:: @ 814FD34 lockall - checkgender + checkplayergender compare RESULT, 0 call_if 1, Route110_EventScript_14FDA7 compare RESULT, 1 @@ -343,7 +343,7 @@ Route110_EventScript_14FD34:: @ 814FD34 call_if 1, Route110_EventScript_14FF1F compare 0x8008, 3 call_if 1, Route110_EventScript_14FF2A - checkgender + checkplayergender compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 compare RESULT, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index cf192345c..568ba2af6 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -757,10 +757,10 @@ Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B return Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 - setanimation 0, 32772 - setanimation 1, 32773 - setanimation 2, 32774 - doanimation 54 - checkanimation 54 + setfieldeffect 0, 32772 + setfieldeffect 1, 32773 + setfieldeffect 2, 32774 + dofieldeffect 54 + waitfieldeffect 54 delay 10 return diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 95d321e0b..0730db23a 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -47,7 +47,7 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - pokecry SPECIES_POOCHYENA, 2 + playpokecry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 waitpokecry release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 7d5acea77..2179a7e18 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -51,7 +51,7 @@ Route119_EventScript_1511D0:: @ 81511D0 Route119_EventScript_1511DB:: @ 81511DB lockall addobject 25 - checkgender + checkplayergender compare RESULT, 0 call_if 1, Route119_EventScript_151254 compare RESULT, 1 @@ -71,7 +71,7 @@ Route119_EventScript_1511DB:: @ 81511DB removeobject 25 addobject 16 delay 30 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq Route119_EventScript_15125E compare RESULT, 1 diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index ea963dee0..42cc89068 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -9,7 +9,7 @@ Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 waitpokecry release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index d5807ae94..868d00324 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -222,7 +222,7 @@ Route120_EventScript_15189D:: @ 815189D applymovement 30, Route120_Movement_1A0662 waitmovement 0 waitse - pokecry SPECIES_KECLEON, 2 + playpokecry SPECIES_KECLEON, 2 delay 40 waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE @@ -245,11 +245,11 @@ Route120_EventScript_151908:: @ 8151908 applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject 31 - checkanimation 30 + waitfieldeffect 30 setmaptile 13, 15, 663, 0 setmaptile 12, 16, 671, 0 setmaptile 12, 17, 161, 0 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 3b2c99591..615662fc1 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -52,9 +52,9 @@ Route128_EventScript_15213F:: @ 815213F removeobject 5 removeobject 4 delay 100 - setanimation 0, 1 - doanimation 30 - checkanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 + waitfieldeffect 30 addobject 3 applymovement 3, Route128_Movement_15226F waitmovement 0 @@ -77,11 +77,11 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject 3 - checkanimation 30 + waitfieldeffect 30 setvar 0x407b, 2 releaseall end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 955726d89..916eb8108 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -551,7 +551,7 @@ RustboroCity_EventScript_14C8DA:: @ 814C8DA faceplayer checkflag 288 goto_if_eq RustboroCity_EventScript_14C917 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD compare RESULT, 1 @@ -571,7 +571,7 @@ RustboroCity_EventScript_14C90A:: @ 814C90A end RustboroCity_EventScript_14C917:: @ 814C917 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C92F compare RESULT, 1 diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index f22f6cc90..b6b8b41b1 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -9,7 +9,7 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 waitpokecry release diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index b219563be..a5088175e 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -13,7 +13,7 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer waitse - pokecry SPECIES_PIKACHU, 0 + playpokecry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 waitpokecry release diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index b11304607..28f6f0ad4 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -300,7 +300,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 waitpokecry release @@ -332,7 +332,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA message RusturfTunnel_Text_19434F waitmessage waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 waitbutton waitpokecry closemessage diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 3edfdd7bb..2c55a9443 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -88,7 +88,7 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer waitse - pokecry SPECIES_WINGULL, 0 + playpokecry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 waitpokecry release diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index ee404404e..19ac9a036 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -79,11 +79,11 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar RESULT, 0 .endif playse 209 - setanimation 0, 16 - setanimation 1, 42 - setanimation 2, 0 - doanimation 54 - checkanimation 54 + setfieldeffect 0, 16 + setfieldeffect 1, 42 + setfieldeffect 2, 0 + dofieldeffect 54 + waitfieldeffect 54 .ifdef SAPPHIRE setvar RESULT, 0 .else diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index f5ee60d6d..1dee6e9c4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -16,7 +16,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE waitse - pokecry SPECIES_RAYQUAZA, 2 + playpokecry SPECIES_RAYQUAZA, 2 delay 40 waitpokecry setflag 773 diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index fa66113b1..4195ad43a 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -236,7 +236,7 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer waitse - pokecry SPECIES_SKITTY, 0 + playpokecry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 waitpokecry release @@ -246,7 +246,7 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer waitse - pokecry SPECIES_ZIGZAGOON, 0 + playpokecry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 waitpokecry release @@ -256,7 +256,7 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer waitse - pokecry SPECIES_AZUMARILL, 0 + playpokecry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 waitpokecry release diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index a1ecffbd2..bddc5965d 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -461,10 +461,10 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 - setanimation 0, 1 - doanimation 30 + setfieldeffect 0, 1 + dofieldeffect 30 delay 15 removeobject LAST_TALKED - checkanimation 30 + waitfieldeffect 30 release end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index ccfec8036..4877d6d6e 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -22,7 +22,7 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer waitse - pokecry SPECIES_KECLEON, 0 + playpokecry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 waitpokecry release diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index ac9a641d6..c192a0340 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -13,7 +13,7 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer waitse - pokecry SPECIES_AZUMARILL, 0 + playpokecry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 waitpokecry release diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index f4ec0ab2f..bcb316f96 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -22,7 +22,7 @@ SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C end SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 - checkgender + checkplayergender compare RESULT, 0 goto_if_eq SouthernIsland_Interior_EventScript_160B8F compare RESULT, 1 @@ -54,7 +54,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 waitmovement 0 delay 50 waitse - pokecry SPECIES_LATIAS_OR_LATIOS, 0 + playpokecry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 waitpokecry addobject 2 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 0c621d237..6b7854dc9 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -413,7 +413,7 @@ FallarborTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB LilycoveCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB SlateportCity_ContestLobby_EventScript_15FBDB:: @ 815FBDB VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB - checkgender + checkplayergender compare RESULT, 0 goto_if_eq FallarborTown_ContestLobby_EventScript_15FBF3 compare RESULT, 1 diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 0dcad8f62..1cfa785d3 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -56,7 +56,7 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer waitse - pokecry SPECIES_PIKACHU, 0 + playpokecry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 waitpokecry release -- cgit v1.2.3 From 6c9249af37b380ee5f5b00ed24013bfc46bf1bae Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:32:19 -0500 Subject: fix more command names --- data/scripts/maps/BattleTower_Lobby.inc | 8 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DewfordTown.inc | 16 +-- data/scripts/maps/LavaridgeTown.inc | 8 +- data/scripts/maps/LittlerootTown.inc | 88 ++++++++-------- data/scripts/maps/Route104.inc | 10 +- data/scripts/maps/Route109.inc | 10 +- data/scripts/maps/Route111.inc | 8 +- data/scripts/maps/Route130.inc | 4 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 116 ++++++++++----------- 14 files changed, 143 insertions(+), 143 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5bb74d35b..b92ec258e 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -296,13 +296,13 @@ BattleTower_Lobby_EventScript_160664:: @ 8160664 applymovement 1, BattleTower_Lobby_Movement_160693 applymovement 255, BattleTower_Lobby_Movement_160693 waitmovement 0 - setdooropened 6, 1 - doorchange + opendoor 6, 1 + waitdooranim applymovement 1, BattleTower_Lobby_Movement_160697 applymovement 255, BattleTower_Lobby_Movement_16069A waitmovement 0 - setdoorclosed 6, 1 - doorchange + closedoor 6, 1 + waitdooranim return BattleTower_Lobby_Movement_160693:: @ 8160693 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index e8270030b..c6c3cd45e 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -14,9 +14,9 @@ CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 .ifdef SAPPHIRE - setmapfooter 163 + setmaplayoutindex 163 .else - setmapfooter 313 + setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 checkflag 113 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 480a408e3..bdb7ca51a 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -118,8 +118,8 @@ DewfordTown_EventScript_14E147:: @ 814E147 DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C - spritelevelup 2, 0, 11, 0 - spritelevelup 255, 0, 11, 0 + setobjectpriority 2, 0, 11, 0 + setobjectpriority 255, 0, 11, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 @@ -141,7 +141,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setflag 743 hideobject 4, 0, 11 setvar 0x408e, 2 - restorespritelevel 255, 0, 11 + resetobjectpriority 255, 0, 11 warp Route104_MrBrineysHouse, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate @@ -150,8 +150,8 @@ DewfordTown_EventScript_14E151:: @ 814E151 DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C - spritelevelup 2, 0, 11, 0 - spritelevelup 255, 0, 11, 1 + setobjectpriority 2, 0, 11, 0 + setobjectpriority 255, 0, 11, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 @@ -168,7 +168,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - spritelevelup 2, 0, 24, 0 + setobjectpriority 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag 741 @@ -182,8 +182,8 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 - restorespritelevel 255, 0, 11 - restorespritelevel 2, 0, 24 + resetobjectpriority 255, 0, 11 + resetobjectpriority 2, 0, 24 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 5a4981f09..85f323063 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -29,13 +29,13 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall setvar 0x8008, 1 - setdooropened 12, 15 - doorchange + opendoor 12, 15 + waitdooranim addobject 8 applymovement 8, LavaridgeTown_Movement_14E70E waitmovement 0 - setdoorclosed 12, 15 - doorchange + closedoor 12, 15 + waitdooranim applymovement 8, LavaridgeTown_Movement_1A083F waitmovement 0 applymovement 255, LavaridgeTown_Movement_1A0843 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index af1d0cc1e..220aeead7 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -102,13 +102,13 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse 10 applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - setdooropened 0x8004, 0x8005 - doorchange + opendoor 0x8004, 0x8005 + waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - setdoorclosed 0x8004, 0x8005 - doorchange + closedoor 0x8004, 0x8005 + waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE waitmovement 0 @@ -117,16 +117,16 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - setdooropened 0x8004, 0x8005 - doorchange + opendoor 0x8004, 0x8005 + waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 setflag 752 setvar 0x4092, 3 hideobject 255, 0, 0 - setdoorclosed 0x8004, 0x8005 - doorchange + closedoor 0x8004, 0x8005 + waitdooranim clearflag 868 clearflag 0x4000 return @@ -595,97 +595,97 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim return LittlerootTown_Movement_14DC76:: @ 814DC76 @@ -849,13 +849,13 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - setdooropened 0x8009, 0x800a - doorchange + opendoor 0x8009, 0x800a + waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobject 4, 0, 9 - setdoorclosed 0x8009, 0x800a - doorchange + closedoor 0x8009, 0x800a + waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b1e3d94ac..651f2afb4 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -124,8 +124,8 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - spritelevelup 8, 0, 19, 0 - spritelevelup 255, 0, 19, 0 + setobjectpriority 8, 0, 19, 0 + setobjectpriority 255, 0, 19, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 @@ -144,7 +144,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - spritelevelup 2, 0, 11, 0 + setobjectpriority 2, 0, 11, 0 clearflag 740 applymovement 2, Route104_Movement_14F16F waitmovement 0 @@ -154,8 +154,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setflag 742 hideobject 7, 0, 19 copyvar 0x4096, 0x8008 - restorespritelevel 255, 0, 19 - restorespritelevel 2, 0, 11 + resetobjectpriority 255, 0, 19 + resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 setvar 0x408e, 0 checkflag 189 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 501ca5e0e..9f0ef8c8d 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2 Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C - spritelevelup 2, 0, 24, 0 - spritelevelup 255, 0, 24, 0 + setobjectpriority 2, 0, 24, 0 + setobjectpriority 255, 0, 24, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 removeobject 2 @@ -46,7 +46,7 @@ Route109_EventScript_14F548:: @ 814F548 clearflag 743 setobjectxyperm 2, 12, 8 addobject 2 - spritelevelup 2, 0, 11, 0 + setobjectpriority 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag 740 @@ -55,8 +55,8 @@ Route109_EventScript_14F548:: @ 814F548 msgbox Route109_Text_16B4B5, 4 closemessage copyvar 0x4096, 0x8008 - restorespritelevel 255, 0, 24 - restorespritelevel 2, 0, 11 + resetobjectpriority 255, 0, 24 + resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index ec13ca3a3..545e62921 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -314,13 +314,13 @@ Route111_EventScript_1501F3:: @ 81501F3 end Route111_EventScript_150348:: @ 8150348 - setdooropened 13, 113 - doorchange + opendoor 13, 113 + waitdooranim return Route111_EventScript_15034F:: @ 815034F - setdoorclosed 13, 113 - doorchange + closedoor 13, 113 + waitdooranim return Route111_Movement_150356:: @ 8150356 diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 7c3c575dc..69da29471 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -22,11 +22,11 @@ Route130_MapScript1_1523C8:: @ 81523C8 setflag 30 setflag 31 setflag 32 - setmapfooter 264 + setmaplayoutindex 264 end Route130_EventScript_15240C:: @ 815240C - setmapfooter 46 + setmaplayoutindex 46 end Route130_EventScript_152410:: @ 8152410 diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 124788a17..50ad4222b 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -8,7 +8,7 @@ Route131_MapScript1_152444:: @ 8152444 end Route131_EventScript_15244E:: @ 815244E - setmapfooter 320 + setmaplayoutindex 320 return Route131_EventScript_152452:: @ 8152452 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 19ac9a036..eb3d108a6 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -6,9 +6,9 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC call SeafloorCavern_Room9_EventScript_1A0196 call SeafloorCavern_Room9_EventScript_1A01B5 .ifdef SAPPHIRE - setmapfooter 157 + setmaplayoutindex 157 .else - setmapfooter 327 + setmaplayoutindex 327 .endif end diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 983ab69d9..52d430db5 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -9,11 +9,11 @@ ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E - setmapfooter 169 + setmaplayoutindex 169 end ShoalCave_LowTideEntranceRoom_EventScript_15E072:: @ 815E072 - setmapfooter 165 + setmaplayoutindex 165 end ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 05fc6a315..ada997023 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -9,11 +9,11 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB - setmapfooter 170 + setmaplayoutindex 170 end ShoalCave_LowTideInnerRoom_EventScript_15E1AF:: @ 815E1AF - setmapfooter 166 + setmaplayoutindex 166 end ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 6b7854dc9..a3a1f711c 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -302,73 +302,73 @@ LinkContestRoom1_EventScript_15F919:: @ 815F919 return LinkContestRoom1_EventScript_15F956:: @ 815F956 - createvsprite 5, 20, 3, 2, 3, 1 - createvsprite 46, 24, 11, 2, 3, 1 + createvobject 5, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 return LinkContestRoom1_EventScript_15F969:: @ 815F969 - createvsprite 45, 0, 2, 3, 3, 4 - createvsprite 66, 1, 2, 4, 3, 4 - createvsprite 55, 2, 2, 7, 3, 4 - createvsprite 46, 3, 2, 8, 3, 4 - createvsprite 5, 10, 12, 3, 3, 3 - createvsprite 20, 11, 12, 4, 3, 3 - createvsprite 24, 12, 12, 7, 3, 3 - createvsprite 12, 13, 12, 8, 3, 3 - createvsprite 47, 20, 3, 2, 3, 1 - createvsprite 46, 24, 11, 2, 3, 1 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 46, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 12, 13, 12, 8, 3, 3 + createvobject 47, 20, 3, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 return LinkContestRoom1_EventScript_15F9C4:: @ 815F9C4 - createvsprite 45, 0, 2, 3, 3, 4 - createvsprite 66, 1, 2, 4, 3, 4 - createvsprite 55, 2, 2, 7, 3, 4 - createvsprite 48, 3, 2, 8, 3, 4 - createvsprite 5, 10, 12, 3, 3, 3 - createvsprite 20, 11, 12, 4, 3, 3 - createvsprite 24, 12, 12, 7, 3, 3 - createvsprite 45, 13, 12, 8, 3, 3 - createvsprite 22, 20, 3, 2, 3, 1 - createvsprite 23, 20, 6, 2, 3, 1 - createvsprite 34, 20, 7, 2, 3, 1 - createvsprite 46, 24, 8, 2, 3, 1 - createvsprite 48, 24, 11, 2, 3, 1 - createvsprite 11, 25, 3, 9, 3, 2 - createvsprite 35, 26, 4, 9, 3, 2 - createvsprite 17, 27, 5, 9, 3, 2 - createvsprite 41, 28, 9, 9, 3, 2 - createvsprite 38, 29, 10, 9, 3, 2 - createvsprite 83, 30, 11, 9, 3, 2 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 48, 3, 2, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 22, 20, 3, 2, 3, 1 + createvobject 23, 20, 6, 2, 3, 1 + createvobject 34, 20, 7, 2, 3, 1 + createvobject 46, 24, 8, 2, 3, 1 + createvobject 48, 24, 11, 2, 3, 1 + createvobject 11, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 17, 27, 5, 9, 3, 2 + createvobject 41, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 return LinkContestRoom1_EventScript_15FA70:: @ 815FA70 - createvsprite 45, 0, 2, 3, 3, 4 - createvsprite 66, 1, 2, 4, 3, 4 - createvsprite 55, 2, 2, 7, 3, 4 - createvsprite 12, 3, 2, 8, 3, 4 - createvsprite 39, 4, 1, 3, 3, 4 - createvsprite 34, 6, 1, 5, 3, 4 - createvsprite 26, 7, 1, 6, 3, 4 - createvsprite 48, 9, 1, 8, 3, 4 - createvsprite 5, 10, 12, 3, 3, 3 - createvsprite 20, 11, 12, 4, 3, 3 - createvsprite 24, 12, 12, 7, 3, 3 - createvsprite 45, 13, 12, 8, 3, 3 - createvsprite 50, 14, 13, 3, 3, 3 - createvsprite 52, 15, 13, 4, 3, 3 - createvsprite 65, 17, 13, 6, 3, 3 - createvsprite 83, 18, 13, 7, 3, 3 - createvsprite 116, 19, 13, 8, 3, 3 - createvsprite 25, 20, 3, 2, 3, 1 - createvsprite 31, 21, 6, 2, 3, 1 - createvsprite 33, 22, 7, 2, 3, 1 - createvsprite 46, 24, 11, 2, 3, 1 - createvsprite 49, 25, 3, 9, 3, 2 - createvsprite 35, 26, 4, 9, 3, 2 - createvsprite 48, 27, 5, 9, 3, 2 - createvsprite 41, 28, 9, 9, 3, 2 - createvsprite 38, 29, 10, 9, 3, 2 - createvsprite 83, 30, 11, 9, 3, 2 + createvobject 45, 0, 2, 3, 3, 4 + createvobject 66, 1, 2, 4, 3, 4 + createvobject 55, 2, 2, 7, 3, 4 + createvobject 12, 3, 2, 8, 3, 4 + createvobject 39, 4, 1, 3, 3, 4 + createvobject 34, 6, 1, 5, 3, 4 + createvobject 26, 7, 1, 6, 3, 4 + createvobject 48, 9, 1, 8, 3, 4 + createvobject 5, 10, 12, 3, 3, 3 + createvobject 20, 11, 12, 4, 3, 3 + createvobject 24, 12, 12, 7, 3, 3 + createvobject 45, 13, 12, 8, 3, 3 + createvobject 50, 14, 13, 3, 3, 3 + createvobject 52, 15, 13, 4, 3, 3 + createvobject 65, 17, 13, 6, 3, 3 + createvobject 83, 18, 13, 7, 3, 3 + createvobject 116, 19, 13, 8, 3, 3 + createvobject 25, 20, 3, 2, 3, 1 + createvobject 31, 21, 6, 2, 3, 1 + createvobject 33, 22, 7, 2, 3, 1 + createvobject 46, 24, 11, 2, 3, 1 + createvobject 49, 25, 3, 9, 3, 2 + createvobject 35, 26, 4, 9, 3, 2 + createvobject 48, 27, 5, 9, 3, 2 + createvobject 41, 28, 9, 9, 3, 2 + createvobject 38, 29, 10, 9, 3, 2 + createvobject 83, 30, 11, 9, 3, 2 return LinkContestRoom1_EventScript_15FB64:: @ 815FB64 -- cgit v1.2.3 From 3505da56b15432062be0b49fc9d212b12f0bea15 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Sun, 1 Oct 2017 12:40:07 -0500 Subject: fix more command names --- data/scripts/maps/BattleTower_Lobby.inc | 2 +- data/scripts/maps/DewfordTown.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 4 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 56 +++++++++++----------- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 4 +- data/scripts/maps/SeafloorCavern_Entrance.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 8 ++-- 14 files changed, 47 insertions(+), 47 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index b92ec258e..3227df991 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -247,7 +247,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 - inccounter GAME_STAT_ENTERED_BATTLE_TOWER + incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty special sub_8135A14 setvar 0x40bc, 1 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bdb7ca51a..aa3584741 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -623,7 +623,7 @@ DewfordTown_EventScript_14E443:: @ 814E443 end DewfordTown_EventScript_14E46E:: @ 814E46E - inccounter GAME_STAT_STARTED_TRENDS + incrementgamestat GAME_STAT_STARTED_TRENDS compare 0x8004, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 85f323063..5192176a7 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -242,7 +242,7 @@ LavaridgeTown_EventScript_14E710:: @ 814E710 end LavaridgeTown_EventScript_14E721:: @ 814E721 - inccounter GAME_STAT_ENTERED_HOT_SPRINGS + incrementgamestat GAME_STAT_ENTERED_HOT_SPRINGS end LavaridgeTown_EventScript_14E724:: @ 814E724 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 0b8d520ee..a8c32a4fe 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -68,7 +68,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 end LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 - inccounter GAME_STAT_RECEIVED_RIBBONS + incrementgamestat GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E waitmovement 0 @@ -241,7 +241,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 end LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 - inccounter GAME_STAT_RECEIVED_RIBBONS + incrementgamestat GAME_STAT_RECEIVED_RIBBONS special sub_80C4858 applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index a4e6af419..7acd29523 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -35,7 +35,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E waitmovement 0 compare 0x8004, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 - inccounter GAME_STAT_WON_POKEMON_LOTTERY + incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare 0x8006, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 1fc172d8c..7e14db994 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 - warp6 LilycoveCity, 255, 12, 33 + setescapewarp LilycoveCity, 255, 12, 33 end LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 8c0ce9590..a93ff5170 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -88,7 +88,7 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF end MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 - inccounter GAME_STAT_TRADED_BIKES + incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181439, 4 removeitem ITEM_ACRO_BIKE, 1 giveitem ITEM_MACH_BIKE @@ -96,7 +96,7 @@ MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA - inccounter GAME_STAT_TRADED_BIKES + incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181408, 4 removeitem ITEM_MACH_BIKE, 1 giveitem ITEM_ACRO_BIKE diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 8d98f03a8..2e0231287 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -12,7 +12,7 @@ MauvilleCity_GameCorner_EventScript_156A34:: @ 8156A34 waitmessage showmoneybox 0, 0 nop - showcoins 0, 5 + showcoinsbox 0, 5 goto MauvilleCity_GameCorner_EventScript_156A60 MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 @@ -42,11 +42,11 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE takemoney 0x3e8, 0 updatemoneybox 0, 0 nop - updatecoins 0, 5 + updatecoinsbox 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end @@ -61,11 +61,11 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 takemoney 0x2710, 0 updatemoneybox 0, 0 nop - updatecoins 0, 5 + updatecoinsbox 0, 5 playse 95 msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end @@ -77,21 +77,21 @@ MauvilleCity_GameCorner_EventScript_156B32:: @ 8156B32 MauvilleCity_GameCorner_EventScript_156B3C:: @ 8156B3C msgbox MauvilleCity_GameCorner_Text_181D28, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end MauvilleCity_GameCorner_EventScript_156B4C:: @ 8156B4C msgbox MauvilleCity_GameCorner_Text_181D73, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end MauvilleCity_GameCorner_EventScript_156B5C:: @ 8156B5C msgbox MauvilleCity_GameCorner_Text_181D57, 4 hidemoneybox 0, 0 - hidecoins 0, 5 + hidecoinsbox 0, 5 release end @@ -108,7 +108,7 @@ MauvilleCity_GameCorner_EventScript_156B6C:: @ 8156B6C MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 waitmessage - showcoins 0, 0 + showcoinsbox 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 @@ -160,9 +160,9 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkdecor 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - removecoins 1000 + takecoins 1000 adddecor 88 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B @@ -176,9 +176,9 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkdecor 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - removecoins 1000 + takecoins 1000 adddecor 89 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B @@ -192,9 +192,9 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkdecor 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 - removecoins 1000 + takecoins 1000 adddecor 90 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B @@ -212,7 +212,7 @@ MauvilleCity_GameCorner_EventScript_156D02:: @ 8156D02 MauvilleCity_GameCorner_EventScript_156D0D:: @ 8156D0D msgbox MauvilleCity_GameCorner_Text_181EC2, 4 - hidecoins 0, 0 + hidecoinsbox 0, 0 release end @@ -229,7 +229,7 @@ MauvilleCity_GameCorner_EventScript_156D1A:: @ 8156D1A MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 waitmessage - showcoins 0, 0 + showcoinsbox 0, 0 setvar 0x4001, 0 goto MauvilleCity_GameCorner_EventScript_156D54 @@ -294,9 +294,9 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkitemspace ITEM_TM32, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 1500 + takecoins 1500 additem ITEM_TM32, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -309,9 +309,9 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkitemspace ITEM_TM29, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 3500 + takecoins 3500 additem ITEM_TM29, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -324,9 +324,9 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkitemspace ITEM_TM35, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 4000 + takecoins 4000 additem ITEM_TM35, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -339,9 +339,9 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkitemspace ITEM_TM24, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 4000 + takecoins 4000 additem ITEM_TM24, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -354,9 +354,9 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkitemspace ITEM_TM13, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C - removecoins 4000 + takecoins 4000 additem ITEM_TM13, 1 - updatecoins 0, 0 + updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 @@ -374,7 +374,7 @@ MauvilleCity_GameCorner_EventScript_156F6C:: @ 8156F6C MauvilleCity_GameCorner_EventScript_156F77:: @ 8156F77 msgbox MauvilleCity_GameCorner_Text_181EC2, 4 - hidecoins 0, 0 + hidecoinsbox 0, 0 release end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 2b4de8344..9d99eb5fb 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -46,7 +46,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C waitmovement 0 setvar 0x8004, 1 setvar 0x40a3, 2 - inccounter GAME_STAT_RODE_CABLE_CAR + incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 waitstate diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index f8e91eb09..22534aa77 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 .byte 0 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E - warp6 Route112, 255, 28, 28 + setescapewarp Route112, 255, 28, 28 compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -47,7 +47,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD waitmovement 0 setvar 0x8004, 0 setvar 0x40a3, 1 - inccounter GAME_STAT_RODE_CABLE_CAR + incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 waitstate diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index 787ac6605..7ea46d9b0 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -4,5 +4,5 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 setdivewarp Underwater_SeafloorCavern, 255, 6, 5 - warp6 Underwater_SeafloorCavern, 255, 6, 5 + setescapewarp Underwater_SeafloorCavern, 255, 6, 5 end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 39542559b..f16a88802 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -6,7 +6,7 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 setdivewarp Underwater_SealedChamber, 255, 12, 44 - warp6 Underwater_SealedChamber, 255, 12, 44 + setescapewarp Underwater_SealedChamber, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 6d2471d99..f145c4a3d 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 - warp6 SlateportCity, 255, 28, 13 + setescapewarp SlateportCity, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index a3a1f711c..34d0bb70b 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -381,25 +381,25 @@ LinkContestRoom1_EventScript_15FB64:: @ 815FB64 return LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1 - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp VerdanturfTown_ContestLobby, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp FallarborTown_ContestLobby, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9 - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp SlateportCity_ContestLobby, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5 - inccounter GAME_STAT_ENTERED_CONTEST + incrementgamestat GAME_STAT_ENTERED_CONTEST warp LilycoveCity_ContestLobby, 255, 6, 4 waitstate end -- cgit v1.2.3 From c5cda9f16442780794852af54635f6526c4c031a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 1 Nov 2017 23:52:26 -0700 Subject: Use descriptive variable and function names for battle_tower code --- data/scripts/maps/BattleTower_BattleRoom.inc | 4 ++-- data/scripts/maps/BattleTower_Lobby.inc | 6 +++--- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 4 ++-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3f1aad4a0..dbab17a8b 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -16,7 +16,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA addobject 1 applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 - special sub_8135474 + special PrintBattleTowerTrainerGreeting msgbox 0x20234cc, 4 waitmessage closemessage @@ -116,7 +116,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 BattleTower_BattleRoom_EventScript_160AB1:: @ 8160AB1 fadescreen 1 - special sub_8135C38 + special BattleTower_SoftReset end BattleTower_BattleRoom_Movement_160AB7:: @ 8160AB7 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 3227df991..75d4f8731 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -79,7 +79,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D - special sub_8135E50 + special AwardBattleTowerRibbons compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE @@ -97,7 +97,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D waitmessage setvar 0x8004, 13 special sub_8135668 - special sub_8135D84 + special DetermineBattleTowerPrize setvar 0x8004, 3 special sub_8135BA0 playse 55 @@ -109,7 +109,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage - special sub_8135DEC + special GiveBattleTowerPrize switch RESULT case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 66ad747f9..cef02df2c 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -5,7 +5,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 .byte 0 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 - special sub_813601C + special ValidateEReaderTrainer compare RESULT, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 end @@ -16,7 +16,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 return MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 - special sub_813601C + special ValidateEReaderTrainer compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E compare 0x40c0, 0 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 886c64d29..11b3ce7a3 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -4,7 +4,7 @@ MossdeepCity_GameCorner_B1F_MapScripts:: @ 815AE55 .byte 0 MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 - special sub_8134AB4 + special SetEReaderTrainerGfxId end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 @@ -15,7 +15,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E lockall applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmovement 0 - special sub_81360C0 + special PrintEReaderTrainerGreeting msgbox 0x20234cc, 4 closemessage setvar 0x8004, 2 -- cgit v1.2.3 From 7485560810130fe8bb6a78e4352f3613fdc09653 Mon Sep 17 00:00:00 2001 From: ProjectRevoTPP Date: Fri, 10 Nov 2017 23:40:12 -0500 Subject: eliminate remaining RAM pointers in data/ --- data/scripts/maps/BattleTower_BattleRoom.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index dbab17a8b..c3ff67902 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -17,7 +17,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA applymovement 1, BattleTower_BattleRoom_Movement_160AC0 waitmovement 0 special PrintBattleTowerTrainerGreeting - msgbox 0x20234cc, 4 + msgbox gStringVar4, 4 waitmessage closemessage special ScrSpecial_HealPlayerParty diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 11b3ce7a3..5a526bd60 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -16,7 +16,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEF9 waitmovement 0 special PrintEReaderTrainerGreeting - msgbox 0x20234cc, 4 + msgbox gStringVar4, 4 closemessage setvar 0x8004, 2 setvar 0x8005, 0 -- cgit v1.2.3 From 2fea5bf7d82e85f4b33857e6eb5b4ddc6e7542d2 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 27 Nov 2017 22:12:09 -0600 Subject: convert data files to use constants/map.h --- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 2 +- data/scripts/maps/AbandonedShip_Rooms_B1F.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater1.inc | 2 +- data/scripts/maps/AbandonedShip_Underwater2.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 ++-- data/scripts/maps/BattleTower_Corridor.inc | 2 +- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 4 ++-- data/scripts/maps/BattleTower_Outside.inc | 4 ++-- data/scripts/maps/DewfordTown.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/GraniteCave_B1F.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 4 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 10 +++++----- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 10 +++++----- data/scripts/maps/LilycoveCity_Harbor.inc | 8 ++++---- data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc | 6 +++--- data/scripts/maps/LittlerootTown.inc | 4 ++-- data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MtPyre_2F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 4 ++-- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 18 +++++++++--------- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route134.inc | 2 +- data/scripts/maps/RustboroCity.inc | 2 +- data/scripts/maps/SSTidalCorridor.inc | 4 ++-- data/scripts/maps/SafariZone_Southeast.inc | 2 +- data/scripts/maps/SeafloorCavern_Entrance.inc | 4 ++-- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 ++-- data/scripts/maps/SkyPillar_2F.inc | 2 +- data/scripts/maps/SkyPillar_4F.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 6 +++--- data/scripts/maps/SootopolisCity.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/Underwater_Route134.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 ++-- data/scripts/maps/Underwater_SootopolisCity.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 10 +++++----- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- 56 files changed, 93 insertions(+), 93 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index f3c3c0aa0..de3ba5442 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -4,7 +4,7 @@ AbandonedShip_Corridors_B1F_MapScripts:: @ 815E98F .byte 0 AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 29a89a620..e6c143091 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -4,7 +4,7 @@ AbandonedShip_HiddenFloorCorridors_MapScripts:: @ 815EB46 .byte 0 AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 - setdivewarp AbandonedShip_Underwater1, 255, 5, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER1, 255, 5, 4 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A diff --git a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc index 218f1a2ca..4299c7da4 100644 --- a/data/scripts/maps/AbandonedShip_Rooms_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms_B1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms_B1F_MapScripts:: @ 815EA35 .byte 0 AbandonedShip_Rooms_B1F_MapScript1_15EA3B:: @ 815EA3B - setdivewarp AbandonedShip_Underwater2, 255, 17, 4 + setdivewarp MAP_ABANDONED_SHIP_UNDERWATER2, 255, 17, 4 end AbandonedShip_Rooms_B1F_EventScript_15EA44:: @ 815EA44 diff --git a/data/scripts/maps/AbandonedShip_Underwater1.inc b/data/scripts/maps/AbandonedShip_Underwater1.inc index afac470ea..52ba61136 100644 --- a/data/scripts/maps/AbandonedShip_Underwater1.inc +++ b/data/scripts/maps/AbandonedShip_Underwater1.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater1_MapScripts:: @ 815EA57 .byte 0 AbandonedShip_Underwater1_MapScript1_15EA5D:: @ 815EA5D - setdivewarp AbandonedShip_HiddenFloorCorridors, 255, 0, 10 + setdivewarp MAP_ABANDONED_SHIP_HIDDEN_FLOOR_CORRIDORS, 255, 0, 10 end diff --git a/data/scripts/maps/AbandonedShip_Underwater2.inc b/data/scripts/maps/AbandonedShip_Underwater2.inc index b8facc4ec..22113661a 100644 --- a/data/scripts/maps/AbandonedShip_Underwater2.inc +++ b/data/scripts/maps/AbandonedShip_Underwater2.inc @@ -3,5 +3,5 @@ AbandonedShip_Underwater2_MapScripts:: @ 815EB37 .byte 0 AbandonedShip_Underwater2_MapScript1_15EB3D:: @ 815EB3D - setdivewarp AbandonedShip_Rooms_B1F, 255, 13, 7 + setdivewarp MAP_ABANDONED_SHIP_ROOMS_B1F, 255, 13, 7 end diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index c3ff67902..3065c0cbb 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -35,7 +35,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 @@ -101,7 +101,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special sub_8135668 setvar 0x8004, 3 special sub_810FF60 - warp BattleTower_Lobby, 255, 6, 6 + warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 9d4fbc844..ac97aa14b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -35,7 +35,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 setvar 0x4000, 0 - warp BattleTower_BattleRoom, 255, 4, 8 + warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index a147a3b5a..c006cdffe 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -19,7 +19,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 setvar 0x4000, 0 - warp BattleTower_Corridor, 255, 8, 1 + warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 75d4f8731..5a0e6105c 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -177,7 +177,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate @@ -254,7 +254,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 - warp BattleTower_Elevator, 255, 1, 6 + warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 setvar 0x4000, 0 waitstate diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 95c5a9d77..a37310d16 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -40,7 +40,7 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -51,7 +51,7 @@ BattleTower_Outside_EventScript_1601FB:: @ 81601FB goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index aa3584741..7f8fe6fef 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -142,7 +142,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 hideobject 4, 0, 11 setvar 0x408e, 2 resetobjectpriority 255, 0, 11 - warp Route104_MrBrineysHouse, 255, 5, 4 + warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate release diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 90df9ab4e..b13c930cf 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -137,7 +137,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 setflag 781 - warp EverGrandeCity_HallOfFame, 255, 7, 16 + warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index c4c590b53..da19b96a7 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -14,7 +14,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD special sub_80C4BF0 call FallarborTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 2 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index aa8d705c7..07a95c3f1 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -6,5 +6,5 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED tileeffect 7 - setholewarp GraniteCave_B2F, 255, 0, 0 + setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index fc2930aa5..737bacf71 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -31,7 +31,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 setflag 784 setflag 760 setvar 0x408c, 1 - setdynamicwarp LittlerootTown, 255, 3, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end @@ -43,7 +43,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 785 setflag 722 setvar 0x4082, 1 - setdynamicwarp LittlerootTown, 255, 12, 10 + setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index a8c32a4fe..656516fd6 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -602,31 +602,31 @@ LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 return LilycoveCity_ContestLobby_EventScript_158F45:: @ 8158F45 - setwarp LinkContestRoom4, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM4, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F52:: @ 8158F52 - setwarp LinkContestRoom2, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM2, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F5F:: @ 8158F5F - setwarp LinkContestRoom6, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM6, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F6C:: @ 8158F6C - setwarp LinkContestRoom5, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM5, 255, 7, 5 special sub_8081334 waitstate return LilycoveCity_ContestLobby_EventScript_158F79:: @ 8158F79 - setwarp LinkContestRoom3, 255, 7, 5 + setwarp MAP_LINK_CONTEST_ROOM3, 255, 7, 5 special sub_8081334 waitstate return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 9d04d2e33..0e6bdc140 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C end LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 - setdynamicwarp LilycoveCity_DepartmentStore_1F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 compare 0x4043, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -30,7 +30,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 - setdynamicwarp LilycoveCity_DepartmentStore_2F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 compare 0x4043, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -39,7 +39,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 - setdynamicwarp LilycoveCity_DepartmentStore_3F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 compare 0x4043, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -48,7 +48,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B - setdynamicwarp LilycoveCity_DepartmentStore_4F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 compare 0x4043, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 @@ -57,7 +57,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E - setdynamicwarp LilycoveCity_DepartmentStore_5F, 255, 2, 1 + setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 compare 0x4043, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7e14db994..4dcc1ba71 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -3,7 +3,7 @@ LilycoveCity_Harbor_MapScripts:: @ 8159893 .byte 0 LilycoveCity_Harbor_MapScript1_159899:: @ 8159899 - setescapewarp LilycoveCity, 255, 12, 33 + setescapewarp MAP_LILYCOVE_CITY, 255, 12, 33 end LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 @@ -52,7 +52,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar 0x40b4, 5 call LilycoveCity_Harbor_EventScript_15998A - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -62,7 +62,7 @@ LilycoveCity_Harbor_EventScript_15995B:: @ 815995B compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end @@ -138,7 +138,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E - warp SouthernIsland_Exterior, 255, 13, 22 + warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 06e82d5f8..5d5b04114 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -49,7 +49,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584BD:: @ 81584BD lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158504 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -57,7 +57,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584D2:: @ 81584D2 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_1584FE waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end @@ -65,7 +65,7 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_1584E7:: @ 81584E7 lockall applymovement 255, LilycoveCity_LilycoveMuseum_1F_Movement_158501 waitmovement 0 - warp LilycoveCity_LilycoveMuseum_2F, 255, 11, 8 + warp MAP_LILYCOVE_CITY_LILYCOVE_MUSEUM_2F, 255, 11, 8 waitstate end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 220aeead7..3027e1f77 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -81,7 +81,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 761 - warpsilent LittlerootTown_BrendansHouse_1F, 255, 8, 8 + warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall end @@ -92,7 +92,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B setflag 762 - warpsilent LittlerootTown_MaysHouse_1F, 255, 2, 8 + warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 04256cacb..d3694bd22 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA applymovement 255, LittlerootTown_BrendansHouse_1F_Movement_152720 applymovement 1, LittlerootTown_BrendansHouse_1F_Movement_152720 waitmovement 0 - warp LittlerootTown_BrendansHouse_2F, 255, 7, 1 + warp MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F, 255, 7, 1 waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 14c7f5d8a..a4d6f2403 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -65,7 +65,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 applymovement 255, LittlerootTown_MaysHouse_1F_Movement_15295E applymovement 1, LittlerootTown_MaysHouse_1F_Movement_15295E waitmovement 0 - warp LittlerootTown_MaysHouse_2F, 255, 1, 1 + warp MAP_LITTLEROOT_TOWN_MAYS_HOUSE_2F, 255, 1, 1 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index cef02df2c..afc02e82c 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -117,7 +117,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 - warp MossdeepCity_GameCorner_B1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate release end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 5a526bd60..94f44e311 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -34,7 +34,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E waitmovement 0 special LoadPlayerParty setvar 0x4001, 1 - warp MossdeepCity_GameCorner_1F, 255, 3, 1 + warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 944860f2d..19b3c5045 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -172,7 +172,7 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D MossdeepCity_Gym_EventScript_15A742:: @ 815A742 lockall - warpteleport MossdeepCity_Gym, 255, 14, 29 + warpteleport MAP_MOSSDEEP_CITY_GYM, 255, 14, 29 waitstate releaseall end diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 8d48dac84..90ad1d9cc 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -6,7 +6,7 @@ MtPyre_2F_MapScripts:: @ 815D36E MtPyre_2F_MapScript1_15D37E:: @ 815D37E tileeffect 7 - setholewarp MtPyre_1F, 255, 0, 0 + setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end MtPyre_2F_EventScript_15D389:: @ 815D389 diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 1c2711b83..b4548ddce 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -45,7 +45,7 @@ PetalburgCity_EventScript_14B747:: @ 814B747 clearflag 0x4001 special LoadPlayerParty setvar 0x4085, 1 - warp PetalburgCity_Gym, 255, 4, 108 + warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index b2d104894..6c92316d6 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -212,7 +212,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 clearflag 866 setflag 889 special InitBirchState - warp PetalburgCity, 255, 15, 8 + warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate release end @@ -606,7 +606,7 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 PetalburgCity_Gym_EventScript_154BA8:: @ 8154BA8 closemessage delay 30 - warpdoor PetalburgCity_Gym, 255, 32776, 32777 + warpdoor MAP_PETALBURG_CITY_GYM, 255, 32776, 32777 waitstate releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 2fe80e098..747b56197 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -236,7 +236,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 - warp LittlerootTown_ProfessorBirchsLab, 255, 6, 5 + warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index f24e92cd4..a4c360bc0 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -83,7 +83,7 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB clearflag 738 setflag 739 setflag 881 - warp Route104, 255, 13, 51 + warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 568ba2af6..7d2c77645 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -266,7 +266,7 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closemessage setvar 0x40a6, 1 - warp Route110_TrickHouseEntrance, 255, 6, 2 + warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall end @@ -524,49 +524,49 @@ Route110_TrickHouseEntrance_Movement_16165E:: @ 816165E step_end Route110_TrickHouseEntrance_EventScript_161660:: @ 8161660 - warp Route110_TrickHousePuzzle1, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE1, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16166B:: @ 816166B - warp Route110_TrickHousePuzzle2, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE2, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161676:: @ 8161676 - warp Route110_TrickHousePuzzle3, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE3, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161681:: @ 8161681 - warp Route110_TrickHousePuzzle4, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE4, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_16168C:: @ 816168C - warp Route110_TrickHousePuzzle5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_161697:: @ 8161697 - warp Route110_TrickHousePuzzle6, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE6, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616A2:: @ 81616A2 - warp Route110_TrickHousePuzzle7, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 0, 21 waitstate releaseall end Route110_TrickHouseEntrance_EventScript_1616AD:: @ 81616AD - warp Route110_TrickHousePuzzle8, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE8, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 222a71138..4b9031715 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -401,7 +401,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 closemessage msgbox Route110_TrickHousePuzzle5_Text_19D615, 4 closemessage - warp Route110_TrickHousePuzzle5, 255, 0, 21 + warp MAP_ROUTE110_TRICK_HOUSE_PUZZLE5, 255, 0, 21 waitstate releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 3361e3e9d..1841b025f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -113,7 +113,7 @@ Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 lockall setvar 0x40b6, 1 - warpteleport Route110_TrickHousePuzzle7, 255, 3, 19 + warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 22534aa77..d414ca8ed 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -4,7 +4,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 .byte 0 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E - setescapewarp Route112, 255, 28, 28 + setescapewarp MAP_ROUTE112, 255, 28, 28 compare 0x40a3, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 9649271f4..9f8753b76 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -82,7 +82,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 waitmovement 0 special EnterSafariMode setvar 0x40a4, 2 - warp SafariZone_Southeast, 255, 32, 33 + warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route134.inc b/data/scripts/maps/Route134.inc index 6b4d330d1..06b53ce31 100644 --- a/data/scripts/maps/Route134.inc +++ b/data/scripts/maps/Route134.inc @@ -3,7 +3,7 @@ Route134_MapScripts:: @ 81525B5 .byte 0 Route134_MapScript1_1525BB:: @ 81525BB - setdivewarp Underwater_Route134, 255, 8, 6 + setdivewarp MAP_UNDERWATER_ROUTE134, 255, 8, 6 end Route134_EventScript_1525C4:: @ 81525C4 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 916eb8108..3be6be562 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -477,7 +477,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D setflag 732 setvar 0x405a, 5 delay 30 - warp RustboroCity_DevonCorp_3F, 255, 2, 2 + warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 2c55a9443..59ab89112 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -126,7 +126,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end @@ -136,7 +136,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag 260 call_if 1, SSTidalCorridor_EventScript_15FE36 - warp SlateportCity_Harbor, 255, 8, 11 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 06a400810..6d31cf981 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -94,7 +94,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F SafariZone_Southeast_EventScript_160139:: @ 8160139 setvar 0x40a4, 1 special ExitSafariMode - warpdoor Route121_SafariZoneEntrance, 255, 2, 5 + warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate end diff --git a/data/scripts/maps/SeafloorCavern_Entrance.inc b/data/scripts/maps/SeafloorCavern_Entrance.inc index 7ea46d9b0..9d59279ea 100644 --- a/data/scripts/maps/SeafloorCavern_Entrance.inc +++ b/data/scripts/maps/SeafloorCavern_Entrance.inc @@ -3,6 +3,6 @@ SeafloorCavern_Entrance_MapScripts:: @ 815DA4A .byte 0 SeafloorCavern_Entrance_MapScript1_15DA50:: @ 815DA50 - setdivewarp Underwater_SeafloorCavern, 255, 6, 5 - setescapewarp Underwater_SeafloorCavern, 255, 6, 5 + setdivewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 + setescapewarp MAP_UNDERWATER_SEAFLOOR_CAVERN, 255, 6, 5 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index eb3d108a6..26cb2321a 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -210,7 +210,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setflag 831 setflag 859 setflag 946 - warp Route128, 255, 38, 22 + warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index f16a88802..5ff94be19 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -5,8 +5,8 @@ SealedChamber_OuterRoom_MapScripts:: @ 815F0C6 .byte 0 SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 - setdivewarp Underwater_SealedChamber, 255, 12, 44 - setescapewarp Underwater_SealedChamber, 255, 12, 44 + setdivewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 + setescapewarp MAP_UNDERWATER_SEALED_CHAMBER, 255, 12, 44 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 3b3585bf8..3f388127b 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -6,5 +6,5 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 tileeffect 7 - setholewarp SkyPillar_1F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index 3d535a25a..f0b9a6f85 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -6,5 +6,5 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 tileeffect 7 - setholewarp SkyPillar_3F, 255, 0, 0 + setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index bea1455a7..600cfc959 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -538,7 +538,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC clearflag 845 clearflag 846 setvar 0x4058, 2 - warp SlateportCity_Harbor, 255, 11, 14 + warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall end diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index cb4632d77..85a8fe40e 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -14,7 +14,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D special sub_80C4BF0 call SlateportCity_ContestLobby_EventScript_15FBDB setvar 0x4088, 3 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index f145c4a3d..34d927753 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -3,7 +3,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D .byte 0 SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 - setescapewarp SlateportCity, 255, 28, 13 + setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 @@ -195,7 +195,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar 0x40b4, 1 call SlateportCity_Harbor_EventScript_156196 - warp SSTidalCorridor, 255, 1, 10 + warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate release end @@ -205,7 +205,7 @@ SlateportCity_Harbor_EventScript_156167:: @ 8156167 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 - warp BattleTower_Outside, 255, 19, 23 + warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 waitstate release end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index bddc5965d..994e33197 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -62,7 +62,7 @@ SootopolisCity_EventScript_14D159:: @ 814D159 return SootopolisCity_MapScript1_14D165:: @ 814D165 - setdivewarp Underwater_SootopolisCity, 255, 9, 6 + setdivewarp MAP_UNDERWATER_SOOTOPOLIS_CITY, 255, 9, 6 end SootopolisCity_EventScript_14D16E:: @ 814D16E diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 51b67ee4b..29b62402f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -77,7 +77,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 waitmovement 0 playse 43 delay 60 - warphole SootopolisCity_Gym_B1F + warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 3c6426024..4ee0d0ec3 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -20,7 +20,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 hideobject 1, 26, 9 setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C - warp LilycoveCity_Harbor, 255, 8, 11 + warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release end diff --git a/data/scripts/maps/Underwater_Route134.inc b/data/scripts/maps/Underwater_Route134.inc index bbe7e1ce2..464731b10 100644 --- a/data/scripts/maps/Underwater_Route134.inc +++ b/data/scripts/maps/Underwater_Route134.inc @@ -3,5 +3,5 @@ Underwater_Route134_MapScripts:: @ 815F071 .byte 0 Underwater_Route134_MapScript1_15F077:: @ 815F077 - setdivewarp Route134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 3d2fe81b2..ce2de5124 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -35,7 +35,7 @@ Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 - setdivewarp SeafloorCavern_Entrance, 255, 10, 17 + setdivewarp MAP_SEAFLOOR_CAVERN_ENTRANCE, 255, 10, 17 end Underwater_SeafloorCavern_EventScript_15DA3F:: @ 815DA3F diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 836ad86e2..733a060c3 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -11,11 +11,11 @@ Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 - setdivewarp Route134, 255, 60, 31 + setdivewarp MAP_ROUTE134, 255, 60, 31 end Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF - setdivewarp SealedChamber_OuterRoom, 255, 10, 19 + setdivewarp MAP_SEALED_CHAMBER_OUTER_ROOM, 255, 10, 19 end Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 diff --git a/data/scripts/maps/Underwater_SootopolisCity.inc b/data/scripts/maps/Underwater_SootopolisCity.inc index c9405dfd7..bba04eec8 100644 --- a/data/scripts/maps/Underwater_SootopolisCity.inc +++ b/data/scripts/maps/Underwater_SootopolisCity.inc @@ -3,5 +3,5 @@ Underwater_SootopolisCity_MapScripts:: @ 815CAE4 .byte 0 Underwater_SootopolisCity_MapScript1_15CAEA:: @ 815CAEA - setdivewarp SootopolisCity, 255, 29, 53 + setdivewarp MAP_SOOTOPOLIS_CITY, 255, 29, 53 end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 34d0bb70b..213a3609a 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -382,30 +382,30 @@ LinkContestRoom1_EventScript_15FB64:: @ 815FB64 LinkContestRoom1_EventScript_15FBA1:: @ 815FBA1 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp VerdanturfTown_ContestLobby, 255, 5, 4 + warp MAP_VERDANTURF_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBAD:: @ 815FBAD incrementgamestat GAME_STAT_ENTERED_CONTEST - warp FallarborTown_ContestLobby, 255, 5, 4 + warp MAP_FALLARBOR_TOWN_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBB9:: @ 815FBB9 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp SlateportCity_ContestLobby, 255, 5, 4 + warp MAP_SLATEPORT_CITY_CONTEST_LOBBY, 255, 5, 4 waitstate end LinkContestRoom1_EventScript_15FBC5:: @ 815FBC5 incrementgamestat GAME_STAT_ENTERED_CONTEST - warp LilycoveCity_ContestLobby, 255, 6, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 6, 4 waitstate end LinkContestRoom1_EventScript_15FBD1:: @ 815FBD1 - warp LilycoveCity_ContestLobby, 255, 7, 4 + warp MAP_LILYCOVE_CITY_CONTEST_LOBBY, 255, 7, 4 waitstate end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 8462892e6..67554d26b 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -14,7 +14,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 special sub_80C4BF0 call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar 0x4088, 1 - warp LinkContestRoom1, 255, 7, 5 + warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end -- cgit v1.2.3 From 4d93db09a365cfa68e30be93d94b8c0ad1f89f9b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 28 Nov 2017 20:36:12 -0800 Subject: Use constants for temporary map flags --- data/scripts/maps/FallarborTown_House1.inc | 6 ++--- data/scripts/maps/FallarborTown_House2.inc | 4 +-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 16 ++++++------ .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 6 ++--- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 4 +-- data/scripts/maps/OldaleTown.inc | 4 +-- .../maps/Route104_PrettyPetalFlowerShop.inc | 4 +-- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +-- .../maps/Route111_WinstrateFamilysHouse.inc | 4 +-- data/scripts/maps/Route130.inc | 30 +++++++++++----------- data/scripts/maps/RusturfTunnel.inc | 4 +-- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 2 +- 12 files changed, 44 insertions(+), 44 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 0228fe25d..8e4b8bda3 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -18,9 +18,9 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, FallarborTown_House1_EventScript_153C2D - checkflag 2 + checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_153C3E compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 @@ -45,7 +45,7 @@ FallarborTown_House1_EventScript_153C3E:: @ 8153C3E return FallarborTown_House1_EventScript_153C47:: @ 8153C47 - setflag 2 + setflag FLAG_TEMP_2 msgbox FallarborTown_House1_Text_17797D, 4 release end diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 3b215a697..c827eea7b 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -5,10 +5,10 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall applymovement 1, FallarborTown_House2_Movement_1A0839 waitmovement 0 - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 - setflag 1 + setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_153CB6 end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 656516fd6..470af3871 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -307,11 +307,11 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waitmessage - setflag 2 + setflag FLAG_TEMP_2 goto LilycoveCity_ContestLobby_EventScript_158BF0 end @@ -334,7 +334,7 @@ LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 erasebox 0, 0, 15, 9 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 - setflag 3 + setflag FLAG_TEMP_3 return LilycoveCity_ContestLobby_EventScript_158BF0:: @ 8158BF0 @@ -354,7 +354,7 @@ LilycoveCity_ContestLobby_EventScript_158C27:: @ 8158C27 LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 msgbox LilycoveCity_ContestLobby_Text_188559, 4 releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 @@ -402,7 +402,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 end LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA - checkflag 3 + checkflag FLAG_TEMP_3 call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waitmessage @@ -445,7 +445,7 @@ LilycoveCity_ContestLobby_EventScript_158D90:: @ 8158D90 msgbox LilycoveCity_ContestLobby_Text_18878D, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 @@ -453,7 +453,7 @@ LilycoveCity_ContestLobby_EventScript_158DA1:: @ 8158DA1 msgbox LilycoveCity_ContestLobby_Text_1887F4, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 @@ -461,7 +461,7 @@ LilycoveCity_ContestLobby_EventScript_158DB2:: @ 8158DB2 msgbox LilycoveCity_ContestLobby_Text_18881F, 4 closemessage releaseall - clearflag 3 + clearflag FLAG_TEMP_3 end LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index fd9ea8a58..00a10b655 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -4,9 +4,9 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 - checkflag 2 + checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, sub_8090FC0 compare RESULT, 1 @@ -19,7 +19,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 return LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 - setflag 2 + setflag FLAG_TEMP_2 playfanfare 370 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 0e6bdc140..ca60bbc89 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -4,7 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer - checkflag 2 + checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar 0x8005, 0x4043 special sub_810E944 @@ -76,7 +76,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 waitmovement 0 special sub_810EBEC waitstate - setflag 2 + setflag FLAG_TEMP_2 return LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF:: @ 815A4CF diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index e80df2cd2..1ac72a727 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -40,9 +40,9 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC faceplayer checkflag 132 goto_if_eq OldaleTown_EventScript_14DE79 - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 - setflag 1 + setflag FLAG_TEMP_1 playbgm 420, 0 msgbox OldaleTown_Text_16AEF2, 4 closemessage diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 4c5becf88..34cc8e85d 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -8,7 +8,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag 2057 goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - setflag 1 + setflag FLAG_TEMP_1 end Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 @@ -18,7 +18,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 checkflag 127 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 4d8d363aa..50278c024 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -13,10 +13,10 @@ Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 goto_if_eq Route109_SeashoreHouse_EventScript_160E36 checkflag 141 goto_if_eq Route109_SeashoreHouse_EventScript_160E08 - checkflag 2 + checkflag FLAG_TEMP_2 goto_if_eq Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 - setflag 2 + setflag FLAG_TEMP_2 release end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index d9a94ce75..acd145dc3 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -40,10 +40,10 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer setvar 0x8008, 4 - checkflag 4 + checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 - setflag 4 + setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 69da29471..897047edc 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -6,21 +6,21 @@ Route130_MapScript1_1523C8:: @ 81523C8 specialvar RESULT, IsMirageIslandPresent compare RESULT, 1 goto_if_eq Route130_EventScript_15240C - setflag 17 - setflag 18 - setflag 19 - setflag 20 - setflag 21 - setflag 22 - setflag 23 - setflag 24 - setflag 25 - setflag 26 - setflag 27 - setflag 28 - setflag 29 - setflag 30 - setflag 31 + setflag FLAG_TEMP_11 + setflag FLAG_TEMP_12 + setflag FLAG_TEMP_13 + setflag FLAG_TEMP_14 + setflag FLAG_TEMP_15 + setflag FLAG_TEMP_16 + setflag FLAG_TEMP_17 + setflag FLAG_TEMP_18 + setflag FLAG_TEMP_19 + setflag FLAG_TEMP_1A + setflag FLAG_TEMP_1B + setflag FLAG_TEMP_1C + setflag FLAG_TEMP_1D + setflag FLAG_TEMP_1E + setflag FLAG_TEMP_1F setflag 32 setmaplayoutindex 264 end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 28f6f0ad4..98061b926 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -32,9 +32,9 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer - checkflag 1 + checkflag FLAG_TEMP_1 goto_if_eq RusturfTunnel_EventScript_15C7BC - setflag 1 + setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, 4 closemessage applymovement LAST_TALKED, RusturfTunnel_Movement_1A083D diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 52d430db5..ab1e1ad7b 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -43,7 +43,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 - setflag 2 + setflag FLAG_TEMP_2 release end -- cgit v1.2.3 From d1b967444e7f0e21b8b5d1a09c8e164bd828da08 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 12:39:11 -0800 Subject: Label flags up to flag 99. --- data/scripts/maps/LittlerootTown.inc | 4 ++-- data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc | 4 ++-- data/scripts/maps/MauvilleCity.inc | 6 +++--- data/scripts/maps/MauvilleCity_BikeShop.inc | 8 ++++---- data/scripts/maps/MauvilleCity_Gym.inc | 10 +++++----- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104_PrettyPetalFlowerShop.inc | 4 ++-- data/scripts/maps/Route130.inc | 2 +- data/scripts/maps/SlateportCity.inc | 6 +++--- data/scripts/maps/SlateportCity_ContestLobby.inc | 4 ++-- 12 files changed, 27 insertions(+), 27 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 3027e1f77..7ce49b0cb 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -7,7 +7,7 @@ LittlerootTown_MapScript1_14D514:: @ 814D514 setflag 2063 compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B - checkflag 82 + checkflag FLAG_RESCUED_BIRCH call_if 0, LittlerootTown_EventScript_14D583 compare 0x4050, 3 call_if 1, LittlerootTown_EventScript_14D5A6 @@ -189,7 +189,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF faceplayer checkflag 116 goto_if_eq LittlerootTown_EventScript_14D72F - checkflag 82 + checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 compare 0x4050, 0 goto_if 5, LittlerootTown_EventScript_14D708 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index d3694bd22..a478270b0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -100,7 +100,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 - setflag 87 + setflag FLAG_MET_RIVAL_MOM setvar 0x4082, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index a4d6f2403..100787ccf 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -100,7 +100,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 waitmovement 0 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 - setflag 87 + setflag FLAG_MET_RIVAL_MOM setvar 0x408c, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index e7ccd73f6..dc7d48ea1 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -87,10 +87,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 faceplayer compare 0x4084, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 - checkflag 88 + checkflag FLAG_BIRCH_AIDE_MET goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 - setflag 88 + setflag FLAG_BIRCH_AIDE_MET release end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 5c93aa252..8123c5f41 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -6,7 +6,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 setflag 2072 clearflag 961 setflag 2098 - clearflag 99 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 checkflag 209 call_if 1, MauvilleCity_EventScript_14C053 @@ -52,10 +52,10 @@ MauvilleCity_EventScript_14C099:: @ 814C099 MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer - checkflag 98 + checkflag FLAG_TV_EXPLAINED goto_if_eq MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 - setflag 98 + setflag FLAG_TV_EXPLAINED release end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index a93ff5170..ef44a20bb 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -4,9 +4,9 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer - checkflag 90 + checkflag FLAG_RECEIVED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_15686E - checkflag 89 + checkflag FLAG_DECLINED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, 5 @@ -34,13 +34,13 @@ MauvilleCity_BikeShop_EventScript_1567F0:: @ 81567F0 end MauvilleCity_BikeShop_EventScript_156817:: @ 8156817 - setflag 89 + setflag FLAG_DECLINED_BIKE msgbox MauvilleCity_BikeShop_Text_181067, 4 release end MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 - setflag 90 + setflag FLAG_RECEIVED_BIKE goto MauvilleCity_BikeShop_EventScript_1567F0 end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 5221add7a..1088c0802 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -13,7 +13,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 end MauvilleCity_Gym_EventScript_156491:: @ 8156491 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_15649B end @@ -147,9 +147,9 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial1 special DrawWholeMapView playse 44 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_1566E1 - checkflag 99 + checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if 0, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -159,12 +159,12 @@ MauvilleCity_Gym_EventScript_1566DA:: @ 81566DA end MauvilleCity_Gym_EventScript_1566DC:: @ 81566DC - setflag 99 + setflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end MauvilleCity_Gym_EventScript_1566E1:: @ 81566E1 - clearflag 99 + clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 747b56197..86c22fa40 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -218,7 +218,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer setflag 2048 - setflag 82 + setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 setobjectxy 255, 6, 13 diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 34cc8e85d..904d39f05 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -72,7 +72,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer - checkflag 94 + checkflag FLAG_RECEIVED_WAILMER_PAIL goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release @@ -82,7 +82,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 giveitem ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 - setflag 94 + setflag FLAG_RECEIVED_WAILMER_PAIL release end diff --git a/data/scripts/maps/Route130.inc b/data/scripts/maps/Route130.inc index 897047edc..b0381969d 100644 --- a/data/scripts/maps/Route130.inc +++ b/data/scripts/maps/Route130.inc @@ -21,7 +21,7 @@ Route130_MapScript1_1523C8:: @ 81523C8 setflag FLAG_TEMP_1D setflag FLAG_TEMP_1E setflag FLAG_TEMP_1F - setflag 32 + setflag FLAG_TEMP_20 setmaplayoutindex 264 end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 600cfc959..129b6c447 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -125,7 +125,7 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 faceplayer compare 0x4058, 1 call_if 1, SlateportCity_EventScript_14BBA1 - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if_eq SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release @@ -410,7 +410,7 @@ SlateportCity_EventScript_14BE16:: @ 814BE16 SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage @@ -442,7 +442,7 @@ SlateportCity_Decorations2:: @ 814BE40 @ 814BE60 lock faceplayer - checkflag 96 + checkflag FLAG_RECEIVED_SECRET_POWER goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 85a8fe40e..5a00f4830 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -101,13 +101,13 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall - checkflag 95 + checkflag FLAG_RECEIVED_POKEBLOCK_CASE goto_if_eq SlateportCity_ContestLobby_EventScript_155526 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 giveitem ITEM_POKEBLOCK_CASE - setflag 95 + setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end -- cgit v1.2.3 From 765526b99f50bf6b8c41c69bd6b1dc82471cda2d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 14:01:50 -0800 Subject: Label flags up to flag 119. --- data/scripts/maps/AquaHideout_1F.inc | 4 +-- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B3F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +-- data/scripts/maps/FortreeCity_House2.inc | 8 +++--- data/scripts/maps/GraniteCave_1F.inc | 4 +-- data/scripts/maps/LilycoveCity.inc | 6 ++-- data/scripts/maps/LittlerootTown.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 +-- data/scripts/maps/MauvilleCity_House1.inc | 4 +-- data/scripts/maps/MossdeepCity.inc | 8 +++--- data/scripts/maps/MossdeepCity_Gym.inc | 32 +++++++++++----------- data/scripts/maps/MtChimney.inc | 4 +-- data/scripts/maps/MtPyre_Summit.inc | 4 +-- data/scripts/maps/OldaleTown.inc | 6 ++-- data/scripts/maps/OldaleTown_Mart.inc | 4 +-- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 14 +++++----- data/scripts/maps/SootopolisCity_Mart.inc | 4 +-- .../maps/SootopolisCity_PokemonCenter_1F.inc | 4 +-- 25 files changed, 66 insertions(+), 66 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index 2eb2ae7e9..028a0ee7b 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -10,7 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release @@ -25,7 +25,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer - checkflag 111 + checkflag FLAG_MT_PYRE_ORB_STOLEN goto_if_eq AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 230d0e2db..c0437d804 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -64,7 +64,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 - setflag 112 + setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE setflag 852 release end diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 3ad36cc18..6411aad49 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index c3bbdd45f..b8d4149b6 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index fb65de171..9b014d0e9 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index c21b04e91..d6f7bdaf1 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -3,6 +3,6 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c6c3cd45e..c9f7b5964 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -19,7 +19,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 end @@ -73,7 +73,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setflag 856 clearflag 815 setvar 0x409b, 1 - setflag 113 + setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag 854 clearflag 2090 setvar 0x40b9, 2 diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index f210dd3ac..4d935e841 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -4,9 +4,9 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - checkflag 264 + checkflag FLAG_RECEIVED_TM10 goto_if_eq FortreeCity_House2_EventScript_158157 - checkflag 118 + checkflag FLAG_MET_HIDDEN_POWER_GIVER call_if 0, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 @@ -24,14 +24,14 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 giveitem ITEM_TM10 compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B - setflag 264 + setflag FLAG_RECEIVED_TM10 msgbox FortreeCity_House2_Text_18652F, 4 release end FortreeCity_House2_EventScript_15814B:: @ 815814B msgbox FortreeCity_House2_Text_186306, 4 - setflag 118 + setflag FLAG_MET_HIDDEN_POWER_GIVER return FortreeCity_House2_EventScript_158157:: @ 8158157 diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index f389a774e..1932940c4 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -4,11 +4,11 @@ GraniteCave_1F_MapScripts:: @ 815CBA6 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer - checkflag 109 + checkflag FLAG_RECEIVED_HM05 goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem ITEM_HM05 - setflag 109 + setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index cf8e2e07d..9195cc9ec 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -28,7 +28,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmaptile 71, 6, 368, 0 setmaptile 72, 6, 445, 0 .endif - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE checkflag 2061 call_if 1, LilycoveCity_EventScript_14CB2B @@ -107,7 +107,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6 LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release @@ -121,7 +121,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04 LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 7ce49b0cb..fbec4f7a2 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -187,7 +187,7 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6 LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq LittlerootTown_EventScript_14D72F checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index dc7d48ea1..8e7a0854d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -129,7 +129,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar 0x4084, 5 - setflag 116 + setflag FLAG_ADVENTURE_STARTED setvar 0x4051, 1 setvar 0x408d, 4 setvar 0x4050, 3 @@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage - setflag 2049 + setflag SYS_POKEDEX_GET return LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index e76564847..acb9f39fa 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -4,11 +4,11 @@ MauvilleCity_House1_MapScripts:: @ 81569FC MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer - checkflag 107 + checkflag FLAG_RECEIVED_HM06 goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem ITEM_HM06 - setflag 107 + setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 44deb9d63..aad1c6e16 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -3,10 +3,10 @@ MossdeepCity_MapScripts:: @ 814CF92 .byte 0 MossdeepCity_MapScript1_14CF98:: @ 814CF98 - clearflag 100 - clearflag 101 - clearflag 102 - clearflag 103 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 checkflag 2090 call_if 1, MossdeepCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 19b3c5045..dbd48c7d2 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -3,25 +3,25 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A558 end @@ -82,9 +82,9 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall - checkflag 100 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 goto_if_eq MossdeepCity_Gym_EventScript_15A621 - setflag 100 + setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 5, 5, 516, 0 @@ -99,7 +99,7 @@ MossdeepCity_Gym_EventScript_15A619:: @ 815A619 end MossdeepCity_Gym_EventScript_15A621:: @ 815A621 - clearflag 100 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 5, 5, 524, 0 @@ -109,9 +109,9 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall - checkflag 101 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 goto_if_eq MossdeepCity_Gym_EventScript_15A675 - setflag 101 + setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 8, 14, 516, 0 @@ -120,7 +120,7 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 end MossdeepCity_Gym_EventScript_15A675:: @ 815A675 - clearflag 101 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 8, 14, 517, 0 @@ -130,9 +130,9 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall - checkflag 102 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 - setflag 102 + setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 15, 17, 524, 0 @@ -141,7 +141,7 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A end MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 - clearflag 102 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 15, 17, 516, 0 @@ -151,9 +151,9 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall - checkflag 103 + checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 goto_if_eq MossdeepCity_Gym_EventScript_15A71D - setflag 103 + setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 1, 23, 525, 0 @@ -162,7 +162,7 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE end MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D - clearflag 103 + clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 setmaptile 1, 23, 516, 0 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a8eec9a32..d54976844 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -408,14 +408,14 @@ MtChimney_EventScript_15D17D:: @ 815D17D lockall checkflag 139 goto_if 0, MtChimney_EventScript_15D1D0 - checkflag 115 + checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, 5 compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem ITEM_METEORITE - setflag 115 + setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 533fb6e90..1b128aef6 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -69,7 +69,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 end MtPyre_Summit_EventScript_15D57A:: @ 815D57A - setflag 111 + setflag FLAG_MT_PYRE_ORB_STOLEN setvar 0x4058, 1 clearflag 840 clearflag 835 @@ -171,7 +171,7 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 faceplayer checkflag 259 goto_if_eq MtPyre_Summit_EventScript_15D6C4 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A checkflag 129 goto_if_eq MtPyre_Summit_EventScript_15D6BA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 1ac72a727..ae4a2fb6e 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -5,11 +5,11 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag 2064 - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 checkflag 132 call_if 0, OldaleTown_EventScript_14DD9E - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED call_if 1, OldaleTown_EventScript_14DD8C end @@ -195,7 +195,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closemessage diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index b9698b58f..f90c787c2 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -6,7 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 faceplayer message OldaleTown_Mart_Text_1A0BE4 waitmessage - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 @@ -43,7 +43,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer - checkflag 116 + checkflag FLAG_ADVENTURE_STARTED goto_if_eq OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 2179a7e18..08853ed32 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -149,7 +149,7 @@ Route119_EventScript_151337:: @ 8151337 Route119_EventScript_151352:: @ 8151352 giveitem ITEM_HM02 - setflag 110 + setflag FLAG_RECEIVED_HM02 return Route119_EventScript_151362:: @ 8151362 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 98061b926..ff21ff1ff 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -65,7 +65,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem ITEM_HM04 - setflag 106 + setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage compare 0x4001, 1 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 34d927753..7270aa5d4 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -272,7 +272,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag 271 goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag 112 + checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 compare 0x40a0, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 994e33197..b907e7da3 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -17,7 +17,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 0, SootopolisCity_EventScript_14D0BB return @@ -35,7 +35,7 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag 2077 - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 checkflag 2090 call_if 1, SootopolisCity_EventScript_14D123 @@ -68,7 +68,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165 SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release @@ -156,7 +156,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release @@ -170,7 +170,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release @@ -184,7 +184,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release @@ -445,7 +445,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index b88347002..52ccf6b2b 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -29,7 +29,7 @@ SootopolisCity_Mart_Items:: @ 815B234 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B268 checkflag 129 goto_if 0, SootopolisCity_Mart_EventScript_15B268 @@ -45,7 +45,7 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268 SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B290 checkflag 129 goto_if 0, SootopolisCity_Mart_EventScript_15B290 diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index cb09d8856..e36d0ed7b 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -17,7 +17,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 checkflag 129 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 @@ -33,7 +33,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer - checkflag 113 + checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE checkflag 129 goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE -- cgit v1.2.3 From 79e3d29c29335d7e1fb8478b16d100b1844f2da4 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 14:38:49 -0800 Subject: Use constants for all SYS flags --- data/scripts/maps/AncientTomb.inc | 10 +++++----- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 ++++---- data/scripts/maps/DesertRuins.inc | 10 +++++----- data/scripts/maps/DewfordTown.inc | 2 +- data/scripts/maps/DewfordTown_Gym.inc | 6 +++--- data/scripts/maps/EverGrandeCity.inc | 4 ++-- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 ++-- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FortreeCity.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 6 +++--- data/scripts/maps/IslandCave.inc | 14 +++++++------- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 +++--- data/scripts/maps/LilycoveCity.inc | 22 +++++++++++----------- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 4 ++-- data/scripts/maps/LilycoveCity_Harbor.inc | 8 ++++---- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 4 ++-- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 4 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 6 +++--- data/scripts/maps/MossdeepCity.inc | 4 ++-- data/scripts/maps/MossdeepCity_Gym.inc | 6 +++--- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 14 +++++++------- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 10 +++++----- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 2 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 ++-- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 ++-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 14 +++++++------- data/scripts/maps/Route114_LanettesHouse.inc | 2 +- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/Route124.inc | 2 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route126.inc | 2 +- data/scripts/maps/Route127.inc | 2 +- data/scripts/maps/Route128.inc | 2 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/RustboroCity.inc | 4 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 ++-- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 6 +++--- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 6 +++--- data/scripts/maps/SkyPillar_Top.inc | 6 +++--- data/scripts/maps/SlateportCity.inc | 8 ++++---- data/scripts/maps/SlateportCity_Harbor.inc | 8 ++++---- .../maps/SlateportCity_SternsShipyard_1F.inc | 4 ++-- data/scripts/maps/SootopolisCity.inc | 4 ++-- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 ++++---- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 8 ++++---- data/scripts/maps/VerdanturfTown.inc | 2 +- 65 files changed, 155 insertions(+), 155 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 188691e73..36df2cb3f 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, AncientTomb_EventScript_15EFD8 end @@ -18,7 +18,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag 2130 + checkflag SYS_BRAILLE_FLY call_if 0, AncientTomb_EventScript_15EFEA end @@ -33,7 +33,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag 2130 + checkflag SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbutton @@ -63,9 +63,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag 937 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 0001d7574..9498864c3 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, AquaHideout_B1F_EventScript_15D846 end diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index a37310d16..1f3c0f105 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -3,7 +3,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 .byte 0 BattleTower_Outside_MapScript1_16015C:: @ 816015C - setflag 2120 + setflag FLAG_UNLOCK_BATTLE_TOWER setvar 0x40bc, 0 setflag 918 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c9f7b5964..c0a88a880 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end @@ -61,10 +61,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 waitpokecry - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 @@ -75,7 +75,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag 854 - clearflag 2090 + clearflag SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag 916 releaseall diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 9f6f7b388..3ca08a6de 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, DesertRuins_EventScript_15CB0D end @@ -14,7 +14,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag 2128 + checkflag SYS_BRAILLE_STRENGTH call_if 0, DesertRuins_EventScript_15CB1B end @@ -33,7 +33,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag 2128 + checkflag SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbutton @@ -63,9 +63,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag 935 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 7f8fe6fef..bea4fc475 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -3,7 +3,7 @@ DewfordTown_MapScripts:: @ 814DFF8 .byte 0 DewfordTown_MapScript1_14DFFE:: @ 814DFFE - setflag 2065 + setflag FLAG_VISITED_DEWFORD_TOWN end DewfordTown_EventScript_14E002:: @ 814E002 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 92776afb1..17b000711 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -113,7 +113,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag 1204 - setflag 2056 + setflag BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB @@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag 2056 + checkflag BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag 2056 + checkflag BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index c9768d006..c4f9ad315 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, EverGrandeCity_EventScript_1A02C1 end @@ -20,6 +20,6 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 end EverGrandeCity_EventScript_14D500:: @ 814D500 - setflag 2078 + setflag FLAG_VISITED_EVER_GRANDE_CITY setvar 0x4001, 1 end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index acbdac899..7e26476fa 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 - setflag 2132 + setflag SYS_POKEMON_LEAGUE_FLY checkflag 263 call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag 2060 + checkflag BADGE06_GET goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 13c8a9f2e..286f01a93 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -3,7 +3,7 @@ FallarborTown_MapScripts:: @ 814E7E0 .byte 0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 - setflag 2067 + setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 setflag 800 clearflag 270 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 6ea89dcb7..ae0f53f5e 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -4,7 +4,7 @@ FortreeCity_MapScripts:: @ 814C943 .byte 0 FortreeCity_MapScript1_14C94E:: @ 814C94E - setflag 2074 + setflag FLAG_VISITED_FORTREE_CITY end FortreeCity_MapScript1_14C952:: @ 814C952 diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 7309be0bb..1e2d3c4f3 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -29,7 +29,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 setflag 1225 - setflag 2060 + setflag BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E @@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag 2060 + checkflag BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag 2060 + checkflag BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 75399bde8..4b72b166c 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, IslandCave_EventScript_15EED0 end @@ -14,7 +14,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag 2129 + checkflag SYS_BRAILLE_WAIT call_if 0, IslandCave_EventScript_15EEDE end @@ -40,12 +40,12 @@ S_OpenRegiceChamber:: @ 815EF19 setmaptile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag 2129 + setflag SYS_BRAILLE_WAIT end IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag 2129 + checkflag SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait @@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag 2129 + checkflag SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate @@ -83,9 +83,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag 936 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 5192176a7..6af7731e1 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -4,7 +4,7 @@ LavaridgeTown_MapScripts:: @ 814E4A3 .byte 0 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE - setflag 2066 + setflag FLAG_VISITED_LAVARIDGE_TOWN checkflag 139 call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 2edffe9f0..06cf57265 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag 1213 - setflag 2058 + setflag BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB @@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag 2058 + checkflag BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag 2058 + checkflag BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 9195cc9ec..ed07b2171 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -4,10 +4,10 @@ LilycoveCity_MapScripts:: @ 814CA15 .byte 0 LilycoveCity_MapScript1_14CA20:: @ 814CA20 - setflag 2075 + setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 setflag 802 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E @@ -30,7 +30,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE - checkflag 2061 + checkflag BADGE07_GET call_if 1, LilycoveCity_EventScript_14CB2B end @@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release @@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release @@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall @@ -349,7 +349,7 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag 2060 + checkflag BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE @@ -361,7 +361,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag 2062 + checkflag BADGE08_GET goto_if_eq LilycoveCity_EventScript_14CEE8 return @@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,7 +386,7 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag 2060 + checkflag BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 @@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 470af3871..f2769ce3e 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -589,7 +589,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 - setflag 2107 + setflag SYS_RIBBON_GET end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 7b602b2c7..62d35662d 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 4dcc1ba71..ae62caea7 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release @@ -106,11 +106,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA checkflag 206 goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag 2131 + checkflag SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage @@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 20b5c5f13..4b9de4d15 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index fbec4f7a2..7d604d7f5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -4,7 +4,7 @@ LittlerootTown_MapScripts:: @ 814D509 .byte 0 LittlerootTown_MapScript1_14D514:: @ 814D514 - setflag 2063 + setflag FLAG_VISITED_LITTLEROOT_TOWN compare 0x4092, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag FLAG_RESCUED_BIRCH @@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 - setflag 2144 + setflag SYS_B_DASH setvar 0x4050, 4 release end diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 780eea4f5..3042d75dc 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 8123c5f41..f778b1eff 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -3,9 +3,9 @@ MauvilleCity_MapScripts:: @ 814C032 .byte 0 MauvilleCity_MapScript1_14C038:: @ 814C038 - setflag 2072 + setflag FLAG_VISITED_MAUVILLE_CITY clearflag 961 - setflag 2098 + setflag SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 checkflag 209 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 1088c0802..43c60dc31 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -83,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag 1208 - setflag 2057 + setflag BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB @@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag 2057 + checkflag BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag 2057 + checkflag BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index aad1c6e16..998b850aa 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, MossdeepCity_EventScript_1A02C1 end @@ -52,7 +52,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF end MossdeepCity_EventScript_14D008:: @ 814D008 - setflag 2076 + setflag FLAG_VISITED_MOSSDEEP_CITY setvar 0x4001, 1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index dbd48c7d2..ea79a03c3 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -62,7 +62,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag 1229 - setflag 2061 + setflag BADGE07_GET clearflag 869 clearflag 915 setvar 0x8008, 7 @@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag 2061 + checkflag BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag 2061 + checkflag BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index fd173899d..77953a959 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 8bf899780..e0d6aa69f 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 2d2a46ab4..62b8f4d59 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F end @@ -170,9 +170,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 delay 40 waitpokecry setflag 974 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end @@ -185,9 +185,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E delay 40 waitpokecry setflag 975 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end @@ -200,8 +200,8 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C delay 40 waitpokecry setflag 976 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index ae4a2fb6e..b9b712937 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -4,7 +4,7 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E - setflag 2064 + setflag FLAG_VISITED_OLDALE_TOWN checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 checkflag 132 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 494f109fe..d46831902 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag 2049 + checkflag SYS_POKEDEX_GET goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc index c7cfb08df..085d083d8 100644 --- a/data/scripts/maps/PacifidlogTown.inc +++ b/data/scripts/maps/PacifidlogTown.inc @@ -4,7 +4,7 @@ PacifidlogTown_MapScripts:: @ 814E8EE .byte 0 PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 - setflag 2069 + setflag FLAG_VISITED_PACIFIDLOG_TOWN end PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index b4548ddce..45cdce991 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -4,7 +4,7 @@ PetalburgCity_MapScripts:: @ 814B70C .byte 0 PetalburgCity_MapScript1_14B717:: @ 814B717 - setflag 2070 + setflag FLAG_VISITED_PETALBURG_CITY compare 0x4057, 0 call_if 1, PetalburgCity_EventScript_14B731 compare 0x4057, 2 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 6c92316d6..f5a6fcc3f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B end @@ -356,7 +356,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag 169 goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release @@ -399,7 +399,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag 1217 setvar 0x4085, 7 - setflag 2059 + setflag BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag 913 clearflag 912 @@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag 2059 + checkflag BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag 2059 + checkflag BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 86c22fa40..122e723a1 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag 2048 + setflag SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 651f2afb4..6e151447e 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag 127 goto_if 0, Route104_EventScript_14EEC4 - checkflag 2057 + checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 clearflag 906 return diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 904d39f05..8ef2ee8bc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -6,7 +6,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag 2108 checkflag 127 goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag 2057 + checkflag BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index c60bc366e..8fd9d3ea5 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 - setflag 2091 + setflag SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall setvar 0x40a9, 0 - clearflag 2091 + clearflag SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index cf18a8e36..1ca98817c 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B specialvar RESULT, GetPlayerAvatarBike compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 - setflag 2091 + setflag SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall - clearflag 2091 + clearflag SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 7d2c77645..bd4867c60 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag 2057 + checkflag BADGE03_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag 2058 + checkflag BADGE04_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag 2059 + checkflag BADGE05_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag 2060 + checkflag BADGE06_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag 2061 + checkflag BADGE07_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag 2062 + checkflag BADGE08_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index e4334647c..9be44af5a 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -11,7 +11,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 faceplayer checkflag 131 goto_if_eq Route114_LanettesHouse_EventScript_15C28F - setflag 2123 + setflag SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE givedecoration 99 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 08853ed32..ec47cbd79 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, Route119_EventScript_15117C end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 868d00324..b2765e977 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, Route120_EventScript_151628 end @@ -227,9 +227,9 @@ Route120_EventScript_15189D:: @ 815189D waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE dowildbattle - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE goto Route120_EventScript_151908 end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index ffe4cef97..71f58bb57 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route124_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 489a7314b..7c4754f4f 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index 729922681..d480512f8 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route126_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 284d1fbd4..e7c6f602f 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route127_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 615662fc1..5b8ec42e0 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 50ad4222b..09f555997 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 1, Route131_EventScript_15244E end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 3be6be562..6e649de68 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -3,7 +3,7 @@ RustboroCity_MapScripts:: @ 814C372 .byte 0 RustboroCity_MapScript1_14C378:: @ 814C378 - setflag 2073 + setflag FLAG_VISITED_RUSTBORO_CITY call RustboroCity_EventScript_1A0196 call RustboroCity_EventScript_1A014E end @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag 2055 + checkflag BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 6f0152e60..563e8b7a6 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -54,7 +54,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage - setflag 2050 + setflag SYS_POKENAV_GET setflag 188 msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag 894 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index b1bbfb8d8..3a92491f7 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -15,7 +15,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 setflag 1201 - setflag 2055 + setflag BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 setvar 0x8008, 1 @@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag 2055 + checkflag BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag 2055 + checkflag BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 26cb2321a..1c580202d 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -199,7 +199,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar 0x405e, 1 clearflag 944 clearflag 945 - setflag 2090 + setflag SYS_WEATHER_CTRL setflag 854 setflag 129 setflag 967 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 5ff94be19..27d44cad1 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,7 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag 2127 + checkflag SYS_BRAILLE_DIG call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end @@ -109,7 +109,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag 2127 + checkflag SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index ab1e1ad7b..1d852f41a 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 @@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag 2143 + checkflag SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 @@ -98,5 +98,5 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 clearflag 957 clearflag 958 clearflag 959 - clearflag 2143 + clearflag SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index ada997023..d10f958fd 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF @@ -23,7 +23,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag 952 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA @@ -32,7 +32,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag 953 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag 2106 + checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 1dee6e9c4..f22055bc4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, SkyPillar_Top_EventScript_15F312 end @@ -20,9 +20,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 delay 40 waitpokecry setflag 773 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 129b6c447..63f7eca53 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -17,7 +17,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C end SlateportCity_EventScript_14BA5C:: @ 814BA5C - setflag 2071 + setflag FLAG_VISITED_SLATEPORT_CITY setvar 0x4086, 0 setflag 803 return @@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BC63 - checkflag 2061 + checkflag BADGE07_GET goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall @@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 7270aa5d4..ab71c9728 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag 2052 + checkflag SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 end @@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release @@ -268,7 +268,7 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag 2061 + checkflag BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag 271 goto_if_eq SlateportCity_Harbor_EventScript_156265 @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 9fe7f1f1a..2e43128de 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,9 +3,9 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag 2052 + checkflag SYS_GAME_CLEAR goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag 2061 + checkflag BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C checkflag 149 goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index b907e7da3..de86ce969 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -34,10 +34,10 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB return SootopolisCity_MapScript1_14D10D:: @ 814D10D - setflag 2077 + setflag FLAG_VISITED_SOOTOPOLIS_CITY checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 - checkflag 2090 + checkflag SYS_WEATHER_CTRL call_if 1, SootopolisCity_EventScript_14D123 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 29b62402f..44a8684ab 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -89,7 +89,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag 172 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag 2060 + checkflag BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release @@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag 1236 - setflag 2062 + setflag BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 @@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag 2062 + checkflag BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag 2062 + checkflag BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 4ee0d0ec3..da0fcf2cd 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6 .byte 0 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC - setflag 2121 + setflag FLAG_UNLOCK_SOUTHERN_ISLAND end SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index bcb316f96..8d6ed8ddc 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag 2145 + checkflag SYS_CTRL_OBJ_DELETE call_if 1, SouthernIsland_Interior_EventScript_160B68 end @@ -46,7 +46,7 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag 206 goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag 2131 + checkflag SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag 206 special SpawnCameraDummy @@ -66,10 +66,10 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag 911 - setflag 2145 + setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate - clearflag 2145 + clearflag SYS_CTRL_OBJ_DELETE releaseall end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index 3e8f02302..d2f0251f7 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -3,7 +3,7 @@ VerdanturfTown_MapScripts:: @ 814E854 .byte 0 VerdanturfTown_MapScript1_14E85A:: @ 814E85A - setflag 2068 + setflag FLAG_VISITED_VERDANTURF_TOWN setvar 0x4086, 0 setflag 801 end -- cgit v1.2.3 From 24a90b9acb243bf5c24a797a2a300a23613813d5 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 2 Dec 2017 19:12:33 -0800 Subject: Label script flags up to flag 199. --- data/scripts/maps/DewfordTown.inc | 6 +- data/scripts/maps/DewfordTown_Gym.inc | 4 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 4 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 12 ++-- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 20 +++--- .../maps/LittlerootTown_BrendansHouse_2F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_Gym.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 4 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 4 +- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 2 +- data/scripts/maps/OldaleTown.inc | 6 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/PetalburgCity_Gym.inc | 4 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 14 ++-- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 6 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 10 +-- .../maps/Route104_PrettyPetalFlowerShop.inc | 6 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route109_SeashoreHouse.inc | 8 +-- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 80 +++++++++++----------- data/scripts/maps/Route114_LanettesHouse.inc | 8 +-- data/scripts/maps/Route116.inc | 6 +- data/scripts/maps/Route116_TunnelersRestHouse.inc | 2 +- data/scripts/maps/Route117.inc | 2 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/RustboroCity.inc | 12 ++-- data/scripts/maps/RustboroCity_CuttersHouse.inc | 4 +- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 18 ++--- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 4 +- data/scripts/maps/RustboroCity_House1.inc | 4 +- data/scripts/maps/RusturfTunnel.inc | 4 +- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SlateportCity.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/SlateportCity_SternsShipyard_1F.inc | 6 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 4 +- data/scripts/maps/SootopolisCity_House1.inc | 4 +- data/scripts/maps/SootopolisCity_Mart.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 4 +- data/scripts/maps/VerdanturfTown.inc | 4 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 12 ++-- data/scripts/maps/VictoryRoad_1F.inc | 4 +- 60 files changed, 185 insertions(+), 185 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bea4fc475..e08a108c6 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -9,7 +9,7 @@ DewfordTown_MapScript1_14DFFE:: @ 814DFFE DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waitmessage @@ -176,9 +176,9 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 clearflag 744 setflag 743 hideobject 4, 0, 11 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 17b000711..83dd7e78e 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -100,7 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 - checkflag 166 + checkflag FLAG_RECEIVED_TM08 goto_if 0, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release @@ -127,7 +127,7 @@ DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 - setflag 166 + setflag FLAG_RECEIVED_TM08 release end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 286f01a93..1a4bbc114 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -12,7 +12,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 8e4b8bda3..dcfe7705a 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -60,7 +60,7 @@ FallarborTown_House1_EventScript_153C5E:: @ 8153C5E faceplayer checkflag 229 goto_if_eq FallarborTown_House1_EventScript_153C86 - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 1e2d3c4f3..abcb20c25 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,7 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 - checkflag 170 + checkflag FLAG_RECEIVED_TM40 goto_if 0, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release @@ -40,7 +40,7 @@ FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 - setflag 170 + setflag FLAG_RECEIVED_TM40 release end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 7b7ef0b2e..9ce96effe 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -4,7 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12 FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer - checkflag 155 + checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD setvar 0x8008, 1 copyvar 0x8004, 0x8008 @@ -30,7 +30,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 waitstate getspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 - setflag 155 + setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 070276e58..dc61a77bf 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,9 +5,9 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar 0x8004, 274 + setvar 0x8004, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F - setflag 189 + setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem ITEM_TM47 compare RESULT, 0 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 6af7731e1..dde0b0ebd 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -5,7 +5,7 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 06cf57265..40c1b6ea9 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -70,7 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 - checkflag 168 + checkflag FLAG_RECEIVED_TM50 goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release @@ -98,7 +98,7 @@ LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 - setflag 168 + setflag FLAG_RECEIVED_TM50 release end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index f2769ce3e..f0e515f13 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -126,23 +126,23 @@ LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA return LilycoveCity_ContestLobby_EventScript_158A27:: @ 8158A27 - setflag 160 + setflag FLAG_COOL_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2B:: @ 8158A2B - setflag 161 + setflag FLAG_BEAUTY_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A2F:: @ 8158A2F - setflag 162 + setflag FLAG_CUTE_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A33:: @ 8158A33 - setflag 163 + setflag FLAG_SMART_PAINTING_MADE return LilycoveCity_ContestLobby_EventScript_158A37:: @ 8158A37 - setflag 164 + setflag FLAG_TOUGH_PAINTING_MADE return LilycoveCity_ContestLobby_Movement_158A3B:: @ 8158A3B @@ -707,7 +707,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E end LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 - checkflag 150 + checkflag FLAG_RECEIVED_CONTEST_PASS goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index a4599f14a..585b1e79b 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -4,31 +4,31 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end @@ -146,35 +146,35 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall - checkflag 162 + checkflag FLAG_CUTE_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall - checkflag 164 + checkflag FLAG_TOUGH_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall - checkflag 160 + checkflag FLAG_COOL_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall - checkflag 161 + checkflag FLAG_BEAUTY_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall - checkflag 163 + checkflag FLAG_SMART_PAINTING_MADE goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8ff7f8b81..8f3b07312 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare 0x4092, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 100787ccf..56727a3c1 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -135,7 +135,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag 301 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 68bdf0fcb..c0a403117 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,7 +4,7 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - checkflag 130 + checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare 0x4092, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index f778b1eff..407a1141d 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -158,7 +158,7 @@ MauvilleCity_EventScript_14C22B:: @ 814C22B removeobject 7 clearflag 806 clearflag 809 - setflag 190 + setflag FLAG_DEFEATED_WALLY_MAUVILLE releaseall end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 43c60dc31..9b47bf493 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -69,7 +69,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB - checkflag 167 + checkflag FLAG_RECEIVED_TM34 goto_if 0, MauvilleCity_Gym_EventScript_15661D compare 0x40ba, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 @@ -100,7 +100,7 @@ MauvilleCity_Gym_EventScript_15661D:: @ 815661D compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 - setflag 167 + setflag FLAG_RECEIVED_TM34 release end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index ea79a03c3..9c32e989c 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -50,7 +50,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 - checkflag 171 + checkflag FLAG_RECEIVED_TM04 goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release @@ -76,7 +76,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 - setflag 171 + setflag FLAG_RECEIVED_TM04 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 8f9bf4dc5..63054a60c 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -4,14 +4,14 @@ MossdeepCity_House3_MapScripts:: @ 815A971 MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer - checkflag 152 + checkflag FLAG_RECEIVED_SUPER_ROD goto_if_eq MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, 5 compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem ITEM_SUPER_ROD - setflag 152 + setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 260cb4b6e..165742145 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -32,13 +32,13 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer - checkflag 192 + checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem ITEM_SUN_STONE compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B - setflag 192 + setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP msgbox MossdeepCity_SpaceCenter_1F_Text_18E39B, 4 release end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index e0d6aa69f..ce24f2afd 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -40,7 +40,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 giveitem ITEM_HM08 - setflag 123 + setflag FLAG_RECEIVED_HM08 setflag 302 msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closemessage @@ -126,5 +126,5 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 giveitem ITEM_HM08, 1, 1 - setflag 123 + setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d54976844..0a3570d6d 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -406,7 +406,7 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag 139 + checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if 0, MtChimney_EventScript_15D1D0 checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 1b128aef6..e0870e18a 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -173,7 +173,7 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 goto_if_eq MtPyre_Summit_EventScript_15D6C4 checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq MtPyre_Summit_EventScript_15D64A - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index b9b712937..92120e362 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -7,7 +7,7 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 setflag FLAG_VISITED_OLDALE_TOWN checkflag FLAG_ADVENTURE_STARTED call_if 0, OldaleTown_EventScript_14DD92 - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE call_if 0, OldaleTown_EventScript_14DD9E checkflag FLAG_ADVENTURE_STARTED call_if 1, OldaleTown_EventScript_14DD8C @@ -38,7 +38,7 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3 OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer - checkflag 132 + checkflag FLAG_RECEIVED_POTION_OLDALE goto_if_eq OldaleTown_EventScript_14DE79 checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 @@ -79,7 +79,7 @@ OldaleTown_EventScript_14DE4C:: @ 814DE4C compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 - setflag 132 + setflag FLAG_RECEIVED_POTION_OLDALE fadedefaultbgm release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 28b9dbd80..a2e033a24 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -4,7 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer - checkflag 154 + checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar 0x8008, 2 copyvar 0x8004, 0x8008 @@ -30,7 +30,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E waitstate getspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 - setflag 154 + setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index f5a6fcc3f..19addd4b4 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -354,7 +354,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - checkflag 169 + checkflag FLAG_RECEIVED_TM42 goto_if 0, PetalburgCity_Gym_EventScript_154A2C checkflag SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 @@ -415,7 +415,7 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C giveitem ITEM_TM42 compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B - setflag 169 + setflag FLAG_RECEIVED_TM42 msgbox PetalburgCity_Gym_Text_17A8CF, 4 msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index d8e95d8c6..282e064de 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -4,21 +4,21 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 checkflag 1217 goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 - checkflag 135 + checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 - setflag 135 + setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -26,7 +26,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 giveitem ITEM_HM03 - setflag 122 + setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release end @@ -49,7 +49,7 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer - checkflag 122 + checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D checkflag 1217 goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ff0ccce30..9af5c1bdc 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -120,7 +120,7 @@ Route103_EventScript_14ED46:: @ 814ED46 setvar 0x4062, 1 setvar 0x4084, 4 clearflag 889 - setflag 130 + setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 clearflag 979 savebgm 0 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 6e151447e..02cad5688 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,7 +17,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 @@ -158,9 +158,9 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, 0, 11 moveobjectoffscreen 2 setvar 0x408e, 0 - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq Route104_EventScript_14F095 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index a4c360bc0..aabc03439 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -6,7 +6,7 @@ Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag 2109 compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 end @@ -24,17 +24,17 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer - checkflag 147 + checkflag FLAG_MR_BRINEY_SAILING_INTRO call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E - setflag 147 + setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 msgbox Route104_MrBrineysHouse_Text_191AAD, 5 compare RESULT, 0 diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 8ef2ee8bc..66173b0cc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -4,7 +4,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag 2108 - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 @@ -21,9 +21,9 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B checkflag FLAG_TEMP_1 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 - checkflag 127 + checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A - setflag 127 + setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 compare RESULT, 1 call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 9f0ef8c8d..0c5419af6 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -271,7 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D Route109_EventScript_14F680:: @ 814F680 lock faceplayer - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 50278c024..d365fa925 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -9,9 +9,9 @@ Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer - checkflag 140 + checkflag FLAG_RECEIVED_6_SODA_POP goto_if_eq Route109_SeashoreHouse_EventScript_160E36 - checkflag 141 + checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS goto_if_eq Route109_SeashoreHouse_EventScript_160E08 checkflag FLAG_TEMP_2 goto_if_eq Route109_SeashoreHouse_EventScript_160DFE @@ -30,7 +30,7 @@ Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 giveitem ITEM_SODA_POP, 6 compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C - setflag 140 + setflag FLAG_RECEIVED_6_SODA_POP release end @@ -100,7 +100,7 @@ Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 goto_if 0, Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON goto_if 0, Route109_SeashoreHouse_EventScript_160F29 - setflag 141 + setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 1841b025f..6756cd055 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -10,15 +10,15 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 end Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 return @@ -75,11 +75,11 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 compare 0x40b6, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E - clearflag 194 - clearflag 195 - clearflag 196 - clearflag 197 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 end Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E @@ -121,125 +121,125 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall delay 32 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playse 36 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 - checkflag 194 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall delay 32 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playse 36 - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE - checkflag 195 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall delay 32 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playse 36 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 - checkflag 196 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall delay 32 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playse 36 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 - checkflag 197 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall delay 32 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playse 36 - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC - checkflag 198 + checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 - setflag 194 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633A9:: @ 81633A9 - clearflag 194 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 releaseall end Route110_TrickHousePuzzle7_EventScript_1633AE:: @ 81633AE - setflag 195 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B3:: @ 81633B3 - clearflag 195 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 releaseall end Route110_TrickHousePuzzle7_EventScript_1633B8:: @ 81633B8 - setflag 196 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633BD:: @ 81633BD - clearflag 196 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C2:: @ 81633C2 - setflag 197 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633C7:: @ 81633C7 - clearflag 197 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 releaseall end Route110_TrickHousePuzzle7_EventScript_1633CC:: @ 81633CC - setflag 198 + setflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end Route110_TrickHousePuzzle7_EventScript_1633D1:: @ 81633D1 - clearflag 198 + clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 releaseall end diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 9be44af5a..3f5bbd909 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -9,18 +9,18 @@ Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer - checkflag 131 + checkflag FLAG_RECEIVED_DOLL_LANETTE goto_if_eq Route114_LanettesHouse_EventScript_15C28F setflag SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration 99 + givedecoration DECOR_LOTAD_DOLL .else - givedecoration 100 + givedecoration DECOR_SEEDOT_DOLL .endif compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE - setflag 131 + setflag FLAG_RECEIVED_DOLL_LANETTE release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index beb01e083..4853efdb3 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -3,7 +3,7 @@ Route116_MapScripts:: @ 8150A31 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS call_if 1, Route116_EventScript_150A41 end @@ -14,9 +14,9 @@ Route116_EventScript_150A41:: @ 8150A41 Route116_EventScript_150A49:: @ 8150A49 lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq Route116_EventScript_150A67 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 10991c38c..16f35b1f2 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -17,7 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 40affd3fd..44c4c156c 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,7 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag 134 + checkflag FLAG_PENDING_DAYCARE_EGG goto_if 0, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index ac64904a2..09bab727a 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -63,7 +63,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A waitfanfare waitmessage givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 - setflag 151 + setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release end @@ -87,7 +87,7 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer - checkflag 151 + checkflag FLAG_RECEIVED_CASTFORM goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 6e649de68..76134aa43 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,7 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release @@ -50,7 +50,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release @@ -179,7 +179,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 removeobject 9 setobjectxyperm 9, 30, 10 clearflag 732 - setflag 142 + setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 @@ -326,7 +326,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release @@ -371,7 +371,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 call_if 1, RustboroCity_EventScript_14C6E9 compare 0x4001, 3 call_if 1, RustboroCity_EventScript_14C715 - setflag 159 + setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 @@ -473,7 +473,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage - setflag 144 + setflag FLAG_RETURNED_DEVON_GOODS setflag 732 setvar 0x405a, 5 delay 30 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 3e98746f3..77f2ee0a4 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -4,11 +4,11 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer - checkflag 137 + checkflag FLAG_RECEIVED_HM01 goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem ITEM_HM01 - setflag 137 + setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index 48d8aaf9f..f9e902763 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -3,7 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 end @@ -15,9 +15,9 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release @@ -36,11 +36,11 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release @@ -59,11 +59,11 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer - checkflag 144 + checkflag FLAG_RETURNED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 - checkflag 143 + checkflag FLAG_RECOVERED_DEVON_GOODS goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 - checkflag 142 + checkflag FLAG_DEVON_GOODS_STOLEN goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index f40c1b87b..c17a1ef68 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -41,7 +41,7 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 faceplayer compare 0x40c4, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag 188 + checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 563e8b7a6..23277711e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitfanfare waitmessage setflag SYS_POKENAV_GET - setflag 188 + setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag 894 clearflag 807 @@ -148,7 +148,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B faceplayer checkflag 272 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_15789B - checkflag 189 + checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if_eq RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 3a92491f7..816098829 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,7 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE - checkflag 165 + checkflag FLAG_RECEIVED_TM39 goto_if 0, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release @@ -29,7 +29,7 @@ RustboroCity_Gym_EventScript_15793C:: @ 815793C giveitem ITEM_TM39 compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B - setflag 165 + setflag FLAG_RECEIVED_TM39 msgbox RustboroCity_Gym_Text_184170, 4 release end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index b983617e0..53a845648 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -4,7 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer - checkflag 153 + checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 setvar 0x8008, 0 copyvar 0x8004, 0x8008 @@ -29,7 +29,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D special sub_804E174 waitstate msgbox RustboroCity_House1_Text_184F6B, 4 - setflag 153 + setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED release end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index ff21ff1ff..002071f2d 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -341,8 +341,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA waitmovement 0 removeobject 5 removeobject 7 - clearflag 142 - setflag 143 + clearflag FLAG_DEVON_GOODS_STOLEN + setflag FLAG_RECOVERED_DEVON_GOODS setvar 0x405a, 4 setvar 0x4090, 1 setflag 891 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 1c580202d..d38459c1c 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -201,7 +201,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA clearflag 945 setflag SYS_WEATHER_CTRL setflag 854 - setflag 129 + setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag 967 setvar 0x40c6, 1 setvar 0x40a2, 1 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 63f7eca53..b94a0ffd3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -182,7 +182,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 1ee8ff39b..2776dd084 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -57,7 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D end SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index e379c633d..a8411e067 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -87,7 +87,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 playse 9 removeobject 1 setflag 900 - setflag 149 + setflag FLAG_DELIVERED_DEVON_GOODS clearflag 947 setflag 949 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 2e43128de..7b2ae0d67 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -7,9 +7,9 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 checkflag BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C - checkflag 149 + checkflag FLAG_DELIVERED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF - checkflag 148 + checkflag FLAG_DOCK_REJECTED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 @@ -18,7 +18,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 closemessage applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 - setflag 148 + setflag FLAG_DOCK_REJECTED_DEVON_GOODS setflag 882 releaseall end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index de86ce969..c0229dc9c 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -5,9 +5,9 @@ SootopolisCity_MapScripts:: @ 814D07D .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 0, SootopolisCity_EventScript_14D0A0 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, SootopolisCity_EventScript_14D0B1 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 44a8684ab..24c333bee 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -87,7 +87,7 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D - checkflag 172 + checkflag FLAG_RECEIVED_TM03 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 checkflag BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A @@ -112,7 +112,7 @@ SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 - setflag 172 + setflag FLAG_RECEIVED_TM03 release end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 4877d6d6e..9a7b63c82 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -4,11 +4,11 @@ SootopolisCity_House1_MapScripts:: @ 815B29A SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer - checkflag 121 + checkflag FLAG_RECEIVED_TM31 goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem ITEM_TM31 - setflag 121 + setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release end diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 52ccf6b2b..115ed0453 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -31,7 +31,7 @@ SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B268 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release @@ -47,7 +47,7 @@ SootopolisCity_Mart_EventScript_15B272:: @ 815B272 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_Mart_EventScript_15B290 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index e36d0ed7b..8bbb06575 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -19,7 +19,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release @@ -35,7 +35,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 faceplayer checkflag FLAG_LEGENDARY_BATTLE_COMPLETED goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index ce2de5124..9970d0490 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -6,7 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag 2119 - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end @@ -15,7 +15,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF - checkflag 129 + checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index d2f0251f7..babbd8cce 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -11,7 +11,7 @@ VerdanturfTown_MapScript1_14E85A:: @ 814E85A VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 applymovement 2, VerdanturfTown_Movement_1A083D @@ -37,7 +37,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index fad64292b..0dd9aed7c 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -4,10 +4,10 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer - checkflag 193 + checkflag FLAG_WALLY_SPEECH goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 - setflag 193 + setflag FLAG_WALLY_SPEECH release end @@ -19,7 +19,7 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B @@ -46,7 +46,7 @@ VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 faceplayer checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 - checkflag 190 + checkflag FLAG_DEFEATED_WALLY_MAUVILLE goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release @@ -65,11 +65,11 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 checkflag 1213 goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B - checkflag 199 + checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index fe775d793..e92cdcc82 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,7 +3,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - checkflag 126 + checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD call_if 1, VictoryRoad_1F_EventScript_15DE93 end @@ -43,7 +43,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 msgbox VictoryRoad_1F_Text_197967, 4 clearflag 858 moveobjectoffscreen 4 - setflag 126 + setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD setvar 0x40c3, 1 releaseall end -- cgit v1.2.3 From c9f38d22060841ac59e56c3f498427f53bc28569 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 12:32:57 -0800 Subject: Label scripts flags up to flag 256. --- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 8 +++--- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 32 +++++++++++----------- data/scripts/maps/BattleTower_Lobby.inc | 20 +++++++------- data/scripts/maps/DewfordTown_Hall.inc | 4 +-- data/scripts/maps/FallarborTown_House1.inc | 6 ++-- data/scripts/maps/FortreeCity_House4.inc | 10 +++---- data/scripts/maps/LavaridgeTown.inc | 4 +-- data/scripts/maps/LavaridgeTown_HerbShop.inc | 4 +-- data/scripts/maps/LilycoveCity.inc | 4 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- data/scripts/maps/LilycoveCity_House2.inc | 4 +-- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 6 ++-- data/scripts/maps/MauvilleCity.inc | 10 +++---- data/scripts/maps/MauvilleCity_GameCorner.inc | 30 ++++++++++---------- data/scripts/maps/MeteorFalls_1F_1R.inc | 4 +-- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 2 +- data/scripts/maps/Route104.inc | 4 +-- data/scripts/maps/Route104_Prototype.inc | 8 +++--- data/scripts/maps/Route105.inc | 2 +- data/scripts/maps/Route111.inc | 2 +- data/scripts/maps/Route114.inc | 4 +-- data/scripts/maps/Route116.inc | 2 +- data/scripts/maps/Route118.inc | 4 +-- data/scripts/maps/Route120.inc | 2 +- data/scripts/maps/Route123.inc | 4 +-- data/scripts/maps/Route123_BerryMastersHouse.inc | 20 +++++++------- .../maps/Route124_DivingTreasureHuntersHouse.inc | 4 +-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 4 +-- data/scripts/maps/SSTidalCorridor.inc | 4 +-- data/scripts/maps/SealedChamber_InnerRoom.inc | 4 +-- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 30 ++++++++++---------- data/scripts/maps/SootopolisCity_House6.inc | 8 +++--- data/scripts/maps/SouthernIsland_Interior.inc | 4 +-- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 4 +-- 36 files changed, 134 insertions(+), 134 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index de3ba5442..1bc38a099 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -8,9 +8,9 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end @@ -28,7 +28,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall - checkflag 239 + checkflag FLAG_USED_STORAGE_KEY goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 @@ -36,7 +36,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 removeitem ITEM_STORAGE_KEY, 1 - setflag 239 + setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index e6c143091..b09a6e5f1 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -8,21 +8,21 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end @@ -60,7 +60,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall - checkflag 240 + checkflag FLAG_USED_ROOM_1_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 @@ -68,7 +68,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_1_KEY, 1 - setflag 240 + setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 special DrawWholeMapView releaseall @@ -76,7 +76,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall - checkflag 241 + checkflag FLAG_USED_ROOM_2_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 @@ -84,7 +84,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_2_KEY, 1 - setflag 241 + setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD special DrawWholeMapView releaseall @@ -92,7 +92,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall - checkflag 242 + checkflag FLAG_USED_ROOM_4_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_4_KEY, 1 - setflag 242 + setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 special DrawWholeMapView releaseall @@ -108,7 +108,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall - checkflag 243 + checkflag FLAG_USED_ROOM_6_KEY goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 @@ -116,7 +116,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 removeitem ITEM_ROOM_6_KEY, 1 - setflag 243 + setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5a0e6105c..59f698c5f 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -13,9 +13,9 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar 0x8004, 10 special sub_8135668 - checkflag 238 + checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 - checkflag 237 + checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD specialvar 0x8007, sub_810F404 compare 0x8007, 50 @@ -387,16 +387,16 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer - checkflag 238 + checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1607C5 - checkflag 237 + checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar 0x8008, 42 - givedecoration 42 + setvar 0x8008, DECOR_SILVER_SHIELD + givedecoration DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF - setflag 237 + setflag FLAG_RECEIVED_SILVER_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 release end @@ -406,11 +406,11 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar 0x8008, 43 - givedecoration 43 + setvar 0x8008, DECOR_GOLD_SHIELD + givedecoration DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF - setflag 238 + setflag FLAG_RECEIVED_GOLD_SHIELD msgbox BattleTower_Lobby_Text_19ABAA, 4 release end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index ea4016147..3c0565678 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -252,13 +252,13 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - checkflag 230 + checkflag FLAG_RECEIVED_TM36 goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem ITEM_TM36 compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B - setflag 230 + setflag FLAG_RECEIVED_TM36 release end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index dcfe7705a..6c7509508 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -8,7 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer - checkflag 229 + checkflag FLAG_RECEIVED_TM27 goto_if_eq FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 @@ -30,7 +30,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 call FallarborTown_House1_EventScript_1A067F - setflag 229 + setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 release end @@ -58,7 +58,7 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer - checkflag 229 + checkflag FLAG_RECEIVED_TM27 goto_if_eq FallarborTown_House1_EventScript_153C86 checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY goto_if_eq FallarborTown_House1_EventScript_153C7C diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index b261e14fb..efccf20fc 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -7,15 +7,15 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall - checkflag 223 + checkflag FLAG_RECEIVED_MENTAL_HERB goto_if_eq FortreeCity_House4_EventScript_158204 - checkflag 224 + checkflag FLAG_WINGULL_DELIVERED_MAIL goto_if_eq FortreeCity_House4_EventScript_1581D6 - checkflag 222 + checkflag FLAG_WINGULL_SENT_ON_ERRAND goto_if_eq FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closemessage - setflag 222 + setflag FLAG_WINGULL_SENT_ON_ERRAND clearflag 934 applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 @@ -37,7 +37,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 giveitem ITEM_MENTAL_HERB compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B - setflag 223 + setflag FLAG_RECEIVED_MENTAL_HERB releaseall end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index dde0b0ebd..f2526b3c1 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -84,7 +84,7 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB msgbox LavaridgeTown_Text_16BDA4, 4 giveitem ITEM_GO_GOGGLES - setflag 221 + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16BE7D, 4 goto LavaridgeTown_EventScript_14E5F5 end @@ -92,7 +92,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 msgbox LavaridgeTown_Text_16BF92, 4 giveitem ITEM_GO_GOGGLES - setflag 221 + setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16C020, 4 goto LavaridgeTown_EventScript_14E5F5 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 5ec6731d4..c5e033422 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -28,13 +28,13 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer - checkflag 254 + checkflag FLAG_RECEIVED_CHARCOAL goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem ITEM_CHARCOAL compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B - setflag 254 + setflag FLAG_RECEIVED_CHARCOAL release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index ed07b2171..4c22a4883 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -211,7 +211,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall - checkflag 218 + checkflag FLAG_MET_WAILMER_TRAINER goto_if_eq LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 @@ -219,7 +219,7 @@ LilycoveCity_EventScript_14CCE5:: @ 814CCE5 msgbox LilycoveCity_Text_168675, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A083D waitmovement 0 - setflag 218 + setflag FLAG_MET_WAILMER_TRAINER releaseall end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index ae62caea7..69e2e6766 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -108,7 +108,7 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE checkflag SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA - checkflag 206 + checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq LilycoveCity_Harbor_EventScript_1598BA checkflag SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d3399f5ac..bbca8aa6d 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -4,13 +4,13 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer - checkflag 234 + checkflag FLAG_RECEIVED_TM44 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem ITEM_TM44 compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B - setflag 234 + setflag FLAG_RECEIVED_TM44 msgbox LilycoveCity_House2_Text_18B883, 4 release end diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 585b1e79b..db9855211 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -96,7 +96,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall - checkflag 236 + checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialvar 0x8004, sub_80C4D50 switch 0x8004 @@ -124,10 +124,10 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 - givedecoration 44 + givedecoration DECOR_GLASS_ORNAMENT compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 - setflag 236 + setflag FLAG_RECEIVED_GLASS_ORNAMENT closemessage releaseall end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 407a1141d..3889f55a6 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -8,7 +8,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 setflag SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 - checkflag 209 + checkflag FLAG_RECEIVED_TM24 call_if 1, MauvilleCity_EventScript_14C053 end @@ -284,15 +284,15 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer - checkflag 209 + checkflag FLAG_RECEIVED_TM24 goto_if_eq MauvilleCity_EventScript_14C368 compare 0x40ba, 2 goto_if_eq MauvilleCity_EventScript_14C33C - checkflag 208 + checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 giveitem ITEM_BASEMENT_KEY - setflag 208 + setflag FLAG_RECEIVED_BASEMENT_KEY msgbox MauvilleCity_Text_166331, 4 release end @@ -307,7 +307,7 @@ MauvilleCity_EventScript_14C33C:: @ 814C33C giveitem ITEM_TM24 compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B - setflag 209 + setflag FLAG_RECEIVED_TM24 msgbox MauvilleCity_Text_166488, 4 release end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 2e0231287..646546dc7 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -389,7 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer - checkflag 226 + checkflag FLAG_RECEIVED_STARTER_DOLL goto_if_eq MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 @@ -401,35 +401,35 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - getdecorname 1, 88 - checkdecor 88 + getdecorname 1, DECOR_TREECKO_DOLL + checkdecor DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 88 - setflag 226 + givedecoration DECOR_TREECKO_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - getdecorname 1, 89 - checkdecor 89 + getdecorname 1, DECOR_TORCHIC_DOLL + checkdecor DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 89 - setflag 226 + givedecoration DECOR_TORCHIC_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - getdecorname 1, 90 - checkdecor 90 + getdecorname 1, DECOR_MUDKIP_DOLL + checkdecor DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration 90 - setflag 226 + givedecoration DECOR_MUDKIP_DOLL + setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end @@ -460,12 +460,12 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C - checkflag 225 + checkflag FLAG_RECEIVED_20_COINS goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA checkcoins 16385 compare 0x4001, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA - setflag 225 + setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 playse 95 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 06abbc8f6..06774d400 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -215,9 +215,9 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer - checkflag 244 + checkflag FLAG_MET_PROF_COSMO goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E - setflag 244 + setflag FLAG_MET_PROF_COSMO msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f7f66b843..f66f7e6f1 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -17,7 +17,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B msgbox MossdeepCity_House2_Text_18D61E, 4 waitpokecry closemessage - setflag 224 + setflag FLAG_WINGULL_DELIVERED_MAIL clearflag 933 compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e0870e18a..d71c5478f 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -64,7 +64,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 msgbox MtPyre_Summit_Text_1B5FE6, 4 .endif giveitem ITEM_RED_OR_BLUE_ORB - setflag 212 + setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 02cad5688..b9c0deb63 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -31,13 +31,13 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag 246 + checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B - setflag 246 + setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 msgbox Route104_Text_1C5665, 4 release end diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 3c218747a..b3b256d79 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -16,9 +16,9 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B goto_if 0, Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 goto_if 0, Route104_Prototype_EventScript_160C99 - setflag 215 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 - checkflag 216 + checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 goto_if_eq Route104_Prototype_EventScript_160CFB release end @@ -43,9 +43,9 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 goto_if 0, Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 goto_if 0, Route104_Prototype_EventScript_160CF1 - setflag 216 + setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 - checkflag 215 + checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 goto_if_eq Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 1182dae7e..de7188aae 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -3,7 +3,7 @@ Route105_MapScripts:: @ 814F298 .byte 0 Route105_MapScript1_14F29E:: @ 814F29E - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route105_EventScript_14F2A8 end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 545e62921..343d666b2 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -4,7 +4,7 @@ Route111_MapScripts:: @ 814FF91 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route111_EventScript_14FFA6 end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 0730db23a..a3056c8ff 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -27,13 +27,13 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag 231 + checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 231 + setflag FLAG_RECEIVED_TM05 msgbox Route114_Text_1701C5, 4 release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 4853efdb3..003bcc397 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -58,7 +58,7 @@ Route116_EventScript_150A94:: @ 8150A94 call_if 1, Route116_EventScript_150AF9 removeobject LAST_TALKED clearflag 949 - setflag 256 + setflag FLAG_RECEIVED_REPEAT_BALL release end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index b96346f15..bf34b5426 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -9,7 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E Route118_EventScript_150F34:: @ 8150F34 lock faceplayer - checkflag 227 + checkflag FLAG_RECEIVED_GOOD_ROD goto_if_eq Route118_EventScript_150F89 msgbox Route118_Text_170F12, 5 compare RESULT, 1 @@ -21,7 +21,7 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 giveitem ITEM_GOOD_ROD - setflag 227 + setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index b2765e977..2bb43fc90 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -50,7 +50,7 @@ Route120_EventScript_151682:: @ 8151682 return Route120_MapScript1_151686:: @ 8151686 - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED call_if 0, Route120_EventScript_1516A2 checkflag 285 call_if 1, Route120_EventScript_1516B5 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 14c5a2dba..9ad0220bd 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -9,7 +9,7 @@ Route123_MapScript1_151C59:: @ 8151C59 Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer - checkflag 232 + checkflag FLAG_RECEIVED_TM19 goto_if_eq Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty @@ -19,7 +19,7 @@ Route123_EventScript_151C5D:: @ 8151C5D giveitem ITEM_TM19 compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B - setflag 232 + setflag FLAG_RECEIVED_TM19 msgbox Route123_Text_171E34, 4 release end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 64888759d..f9544d62e 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -86,57 +86,57 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E - checkflag 248 + checkflag FLAG_RECEIVED_SPELON_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_SPELON_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 248 + setflag FLAG_RECEIVED_SPELON_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F - checkflag 249 + checkflag FLAG_RECEIVED_PAMTRE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_PAMTRE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 249 + setflag FLAG_RECEIVED_PAMTRE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 - checkflag 250 + checkflag FLAG_RECEIVED_WATMEL_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_WATMEL_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 250 + setflag FLAG_RECEIVED_WATMEL_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 - checkflag 251 + checkflag FLAG_RECEIVED_DURIN_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_DURIN_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 251 + setflag FLAG_RECEIVED_DURIN_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 - checkflag 252 + checkflag FLAG_RECEIVED_BELUE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem ITEM_BELUE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 252 + setflag FLAG_RECEIVED_BELUE_BERRY goto Route123_BerryMastersHouse_EventScript_163C1D end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 7421e94e0..2f6f1b1e1 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -9,10 +9,10 @@ Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer - checkflag 217 + checkflag FLAG_MET_DIVING_TREASURE_HUNTER goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 - setflag 217 + setflag FLAG_MET_DIVING_TREASURE_HUNTER goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 23277711e..3756b5c72 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -181,7 +181,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer - checkflag 256 + checkflag FLAG_RECEIVED_REPEAT_BALL goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 0dfec5cfa..5be59b14e 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -8,13 +8,13 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer - checkflag 213 + checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem ITEM_PREMIER_BALL compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B - setflag 213 + setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 59ab89112..8c28628ea 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -163,7 +163,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer - checkflag 247 + checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto_if_eq SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 @@ -192,7 +192,7 @@ SSTidalCorridor_EventScript_15FE84:: @ 815FE84 goto_if 0, SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE goto_if 0, SSTidalCorridor_EventScript_15FED5 - setflag 247 + setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index 526ada367..a0c6314cc 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -6,7 +6,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbutton erasebox 0, 0, 29, 19 - checkflag 228 + checkflag FLAG_REGI_DOORS_OPENED goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord compare RESULT, 0 @@ -31,7 +31,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closemessage fadeinbgm 0 - setflag 228 + setflag FLAG_REGI_DOORS_OPENED releaseall end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 4195ad43a..ea2acf374 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -23,15 +23,15 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar 0x4002, 0 - checkflag 204 + checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 203 + checkflag FLAG_RECEIVED_GREEN_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 202 + checkflag FLAG_RECEIVED_PINK_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 201 + checkflag FLAG_RECEIVED_BLUE_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag 200 + checkflag FLAG_RECEIVED_RED_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 compare 0x4002, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D @@ -49,15 +49,15 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar 0x4001, 0 - checkflag 204 + checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE - checkflag 203 + checkflag FLAG_RECEIVED_GREEN_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 - checkflag 202 + checkflag FLAG_RECEIVED_PINK_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 - checkflag 201 + checkflag FLAG_RECEIVED_BLUE_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 - checkflag 200 + checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 getfirstpartypokename 0 switch 0x4001 @@ -88,7 +88,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 200 + setflag FLAG_RECEIVED_RED_SCARF giveitem ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 release @@ -99,7 +99,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 201 + setflag FLAG_RECEIVED_BLUE_SCARF giveitem ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 release @@ -110,7 +110,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 202 + setflag FLAG_RECEIVED_PINK_SCARF giveitem ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 release @@ -121,7 +121,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 203 + setflag FLAG_RECEIVED_GREEN_SCARF giveitem ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 release @@ -132,7 +132,7 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 - setflag 204 + setflag FLAG_RECEIVED_YELLOW_SCARF giveitem ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index a0fdc5ca4..1adf05991 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -4,16 +4,16 @@ SootopolisCity_House6_MapScripts:: @ 815B385 SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer - checkflag 245 + checkflag FLAG_RECEIVED_WAILMER_DOLL goto_if_eq SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, 5 compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 - givedecoration 117 + givedecoration DECOR_WAILMER_DOLL compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 - setflag 245 + setflag FLAG_RECEIVED_WAILMER_DOLL release end @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - getdecorname 1, 117 + getdecorname 1, DECOR_WAILMER_DOLL msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 8d6ed8ddc..0ff474138 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -44,11 +44,11 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 - checkflag 206 + checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq SouthernIsland_Interior_EventScript_160C08 checkflag SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 - setflag 206 + setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy applymovement 127, SouthernIsland_Interior_Movement_160C12 waitmovement 0 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 67554d26b..9726038d4 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -101,13 +101,13 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer - checkflag 235 + checkflag FLAG_RECEIVED_TM45 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem ITEM_TM45 compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B - setflag 235 + setflag FLAG_RECEIVED_TM45 release end -- cgit v1.2.3 From 503bd8e491eefea7e26d6882674487f9a9765297 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 13:20:55 -0800 Subject: Label script flags up to flag 288. --- data/scripts/maps/DewfordTown.inc | 4 ++-- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 6 +++--- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 4 ++-- data/scripts/maps/LilycoveCity.inc | 12 ++++++------ data/scripts/maps/LittlerootTown.inc | 2 +- data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 6 +++--- data/scripts/maps/MauvilleCity_House2.inc | 4 ++-- data/scripts/maps/MossdeepCity.inc | 4 ++-- data/scripts/maps/MtPyre_1F.inc | 4 ++-- data/scripts/maps/MtPyre_Summit.inc | 4 ++-- data/scripts/maps/Route104.inc | 8 ++++---- data/scripts/maps/Route109.inc | 4 ++-- data/scripts/maps/Route111_WinstrateFamilysHouse.inc | 4 ++-- data/scripts/maps/Route114_FossilManiacsHouse.inc | 4 ++-- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 2 +- data/scripts/maps/Route116.inc | 4 ++-- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/RustboroCity.inc | 6 +++--- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 6 +++--- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 ++-- data/scripts/maps/RustboroCity_Mart.inc | 4 ++-- data/scripts/maps/RustboroCity_PokemonSchool.inc | 4 ++-- data/scripts/maps/SSTidalCorridor.inc | 4 ++-- data/scripts/maps/SSTidalRooms.inc | 4 ++-- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 4 ++-- data/scripts/maps/SlateportCity_ContestHall.inc | 4 ++-- data/scripts/maps/SlateportCity_Harbor.inc | 4 ++-- data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 2 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 4 ++-- 33 files changed, 70 insertions(+), 70 deletions(-) (limited to 'data/scripts/maps') 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 -- cgit v1.2.3 From dde446225f01bab79119a5ad9413d7e779ce4b4b Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 3 Dec 2017 15:57:11 -0800 Subject: More script flags --- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- data/scripts/maps/DewfordTown_House2.inc | 4 ++-- data/scripts/maps/FortreeCity.inc | 4 ++-- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 8 ++++---- data/scripts/maps/MossdeepCity_StevensHouse.inc | 6 +++--- data/scripts/maps/PacifidlogTown_House2.inc | 16 ++++++++-------- data/scripts/maps/PetalburgCity_Mart.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 4 ++-- data/scripts/maps/Route120.inc | 4 ++-- data/scripts/maps/SlateportCity_Harbor.inc | 4 ++-- 13 files changed, 30 insertions(+), 30 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index eb912028a..2bec8ac39 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -4,7 +4,7 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer - checkflag 294 + checkflag FLAG_EXCHANGED_SCANNER goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index befe47404..29ae58a22 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -4,13 +4,13 @@ DewfordTown_House2_MapScripts:: @ 81535DB DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer - checkflag 289 + checkflag FLAG_RECEIVED_SILK_SCARF goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem ITEM_SILK_SCARF compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B - setflag 289 + setflag FLAG_RECEIVED_SILK_SCARF release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index ae0f53f5e..dd947d0e5 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -18,7 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955 FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer - checkflag 295 + checkflag FLAG_KECLEON_FLED_FORTREE goto_if_eq FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release @@ -82,7 +82,7 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 removeobject LAST_TALKED - setflag 295 + setflag FLAG_KECLEON_FLED_FORTREE release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 0b5886131..7ffffad78 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -422,6 +422,6 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B waitfieldeffect 30 savebgm 0 fadedefaultbgm - setflag 292 + setflag FLAG_MET_RIVAL_LILYCOVE release end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index f0847e740..54e2bd042 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -22,7 +22,7 @@ LittlerootTown_MapScript1_14D514:: @ 814D514 end LittlerootTown_EventScript_14D563:: @ 814D563 - setflag 301 + setflag FLAG_RIVAL_LEFT_FOR_ROUTE103 return LittlerootTown_EventScript_14D567:: @ 814D567 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index a58d16dd5..d65e943fd 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -137,7 +137,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB faceplayer checkflag FLAG_DEFEATED_RIVAL_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 - checkflag 301 + checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare 0x408d, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index c0a403117..020c39eac 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -30,7 +30,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall - checkflag 292 + checkflag FLAG_MET_RIVAL_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkplayergender compare RESULT, 0 @@ -117,18 +117,18 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED - setflag 293 + setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB - checkflag 293 + checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED - checkflag 293 + checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index ce24f2afd..5b2f281da 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -41,7 +41,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 giveitem ITEM_HM08 setflag FLAG_RECEIVED_HM08 - setflag 302 + setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 closemessage delay 20 @@ -89,7 +89,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag 968 - setflag 298 + setflag FLAG_RECEIVED_BELDUM releaseall end @@ -113,7 +113,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall - checkflag 302 + checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index e04a8caae..942f5626b 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -6,13 +6,13 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_1541B4 - checkflag 299 + checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if_eq PacifidlogTown_House2_EventScript_154254 - checkflag 300 + checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER call_if 1, PacifidlogTown_House2_EventScript_1541CE - checkflag 300 + checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER call_if 0, PacifidlogTown_House2_EventScript_1541D7 - setflag 300 + setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 goto_if 4, PacifidlogTown_House2_EventScript_1541EC @@ -23,7 +23,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 - checkflag 299 + checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, sub_810F908 compare RESULT, 0 @@ -40,7 +40,7 @@ PacifidlogTown_House2_EventScript_1541D7:: @ 81541D7 return PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 - clearflag 299 + clearflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK return PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC @@ -48,7 +48,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC giveitem ITEM_TM27 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B - setflag 299 + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release @@ -64,7 +64,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 giveitem ITEM_TM21 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B - setflag 299 + setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK special sub_810F950 msgbox PacifidlogTown_House2_Text_179283, 4 release diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index e4186eaae..66e247323 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -6,7 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 faceplayer message PetalburgCity_Mart_Text_1A0BE4 waitmessage - checkflag 296 + checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS goto_if_eq PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 0b0c72f70..c38d4d559 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -241,13 +241,13 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer - checkflag 297 + checkflag FLAG_RECEIVED_MIRACLE_SEED goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem ITEM_MIRACLE_SEED compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B - setflag 297 + setflag FLAG_RECEIVED_MIRACLE_SEED release end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index c6937170e..54f2d98a8 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -184,7 +184,7 @@ Route120_EventScript_15184A:: @ 815184A Route120_EventScript_151853:: @ 8151853 lock faceplayer - checkflag 290 + checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 goto_if_eq Route120_EventScript_151884 msgbox Route120_Text_171827, 5 compare RESULT, 0 @@ -194,7 +194,7 @@ Route120_EventScript_151853:: @ 8151853 Route120_EventScript_151877:: @ 8151877 msgbox Route120_Text_17193D, 4 - setflag 290 + setflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 2486099ef..daa6b1e7c 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -340,7 +340,7 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end @@ -353,7 +353,7 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A goto_if_eq SlateportCity_Harbor_EventScript_1A029B removeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 - setflag 294 + setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 end -- cgit v1.2.3 From 8dd25bcad09064f0b3314a71a62ad22f91b42bb3 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 4 Dec 2017 20:48:25 -0800 Subject: Start using constants for hide-show flags --- data/scripts/maps/InsideOfTruck.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 6 +++--- data/scripts/maps/Route101.inc | 6 +++--- data/scripts/maps/RustboroCity.inc | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 737bacf71..036523bf1 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -41,7 +41,7 @@ InsideOfTruck_EventScript_15FC68:: @ 815FC68 setflag 758 setflag 761 setflag 785 - setflag 722 + setflag FLAG_HIDE_MAY_UPSTAIRS setvar 0x4082, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 7ffffad78..b8c6b26f5 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -355,7 +355,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 call_if 1, LilycoveCity_EventScript_14CEEE compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 - clearflag 722 + clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag 849 goto LilycoveCity_EventScript_14CF6B end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 19addd4b4..47601a964 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -86,7 +86,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C waitmovement 0 playse 9 removeobject 10 - setflag 726 + setflag FLAG_HIDE_WALLY_PETALBURG delay 30 applymovement 255, PetalburgCity_Gym_Movement_1A0841 waitmovement 0 @@ -205,10 +205,10 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 compare 0x8008, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 - setflag 728 + setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar 0x4085, 1 setvar 0x4057, 2 - clearflag 726 + clearflag FLAG_HIDE_WALLY_PETALBURG clearflag 866 setflag 889 special InitBirchState diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 122e723a1..c9a364c80 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -230,9 +230,9 @@ Route101_EventScript_14EA7F:: @ 814EA7F waitmovement 0 msgbox Route101_Text_16D191, 4 special ScrSpecial_HealPlayerParty - setflag 720 - clearflag 721 - setflag 700 + setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA + clearflag FLAG_HIDE_BIRCH_IN_LAB + setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 clearflag 0x4000 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 8708bde71..358a946a6 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -178,7 +178,7 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 waitmovement 0 removeobject 9 setobjectxyperm 9, 30, 10 - clearflag 732 + clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN setvar 0x405a, 2 setvar 0x409a, 2 @@ -474,7 +474,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS - setflag 732 + setflag FLAG_HIDE_DEVON_RUSTBORO setvar 0x405a, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 -- cgit v1.2.3 From 65207e03662c639970ef19b372c21b8e28b6f097 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 9 Dec 2017 14:43:21 -0800 Subject: Label all flags up to 901 --- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 10 +++++----- data/scripts/maps/DewfordTown.inc | 14 +++++++------- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 2 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 14 +++++++------- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 6 +++--- data/scripts/maps/LilycoveCity_ContestLobby.inc | 16 ++++++++-------- data/scripts/maps/LittlerootTown.inc | 10 +++++----- data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 4 ++-- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 4 ++-- data/scripts/maps/PetalburgCity_Gym.inc | 4 ++-- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/Route104.inc | 6 +++--- data/scripts/maps/Route104_MrBrineysHouse.inc | 8 ++++---- data/scripts/maps/Route109.inc | 6 +++--- data/scripts/maps/Route111.inc | 8 ++++---- data/scripts/maps/Route119.inc | 4 ++-- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 ++-- data/scripts/maps/RustboroCity.inc | 10 +++++----- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 10 +++++----- data/scripts/maps/RusturfTunnel.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 16 ++++++++-------- data/scripts/maps/SkyPillar_Top.inc | 2 +- data/scripts/maps/SlateportCity.inc | 10 +++++----- data/scripts/maps/SlateportCity_Harbor.inc | 6 +++--- data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc | 4 ++-- data/scripts/maps/SlateportCity_SternsShipyard_1F.inc | 2 +- data/scripts/maps/VerdanturfTown.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 4 ++-- 36 files changed, 103 insertions(+), 103 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index c0437d804..a587fcc92 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -65,7 +65,7 @@ AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - setflag 852 + setflag FLAG_HIDE_GRUNTS_LILYCOVE release end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index c0a88a880..d0d19e4b9 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -68,13 +68,13 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 - setflag 816 - setflag 855 - setflag 856 - clearflag 815 + setflag FLAG_HIDE_WALLACE_SOOTOPOLIS + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED - clearflag 854 + clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag 916 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index b8da349f3..3d3240e81 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -135,10 +135,10 @@ DewfordTown_EventScript_14E151:: @ 814E151 applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 showobject 255, 0, 19 - clearflag 739 - clearflag 881 - clearflag 742 - setflag 743 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobject 4, 0, 11 setvar 0x408e, 2 resetobjectpriority 255, 0, 11 @@ -171,10 +171,10 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 setobjectpriority 2, 0, 24, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 - clearflag 741 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 - clearflag 744 - setflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 + setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobject 4, 0, 11 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index b13c930cf..ae3cbd4ad 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -136,7 +136,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 waitmovement 0 - setflag 781 + setflag FLAG_HIDE_PETALBURG_GYM_GUIDE warp MAP_EVER_GRANDE_CITY_HALL_OF_FAME, 255, 7, 16 waitstate releaseall diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index f6c62fbcb..70f3cbc3b 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -5,7 +5,7 @@ FallarborTown_MapScripts:: @ 814E7E0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN setvar 0x4086, 0 - setflag 800 + setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 5b1f1c948..1e50c2fd6 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -48,7 +48,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 playse 18 removeobject 4 - clearflag 870 + clearflag FLAG_HIDE_LANETTE release end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 036523bf1..6cf2d630b 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -26,10 +26,10 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 InsideOfTruck_EventScript_15FC45:: @ 815FC45 sethealplace 1 setvar 0x4092, 1 - setflag 759 - setflag 762 - setflag 784 - setflag 760 + setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_MAY + setflag FLAG_HIDE_BRENDAN_MOM + setflag FLAG_HIDE_BRENDAN_UPSTAIRS setvar 0x408c, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall @@ -38,9 +38,9 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 InsideOfTruck_EventScript_15FC68:: @ 815FC68 sethealplace 2 setvar 0x4092, 2 - setflag 758 - setflag 761 - setflag 785 + setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN + setflag FLAG_HIDE_MAY_MOM setflag FLAG_HIDE_MAY_UPSTAIRS setvar 0x4082, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 4948c17b3..29b5ef2b9 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -19,7 +19,7 @@ LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 return LavaridgeTown_EventScript_14E4DF:: @ 814E4DF - clearflag 877 + clearflag FLAG_HIDE_MT_CHIMNEY_PEOPLE return LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 40c1b6ea9..f6c34484e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -88,7 +88,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 - setflag 806 + setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar 0x4053, 1 goto LavaridgeTown_Gym_1F_EventScript_1537A7 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index b8c6b26f5..29a8497ed 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -6,7 +6,7 @@ LilycoveCity_MapScripts:: @ 814CA15 LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 - setflag 802 + setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE checkflag SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 @@ -356,7 +356,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CEF7 clearflag FLAG_HIDE_MAY_UPSTAIRS - clearflag 849 + clearflag FLAG_HIDE_MAY_PICHU_DOLL goto LilycoveCity_EventScript_14CF6B end @@ -392,7 +392,7 @@ LilycoveCity_EventScript_14CF12:: @ 814CF12 call_if 1, LilycoveCity_EventScript_14CF47 compare RESULT, 1 call_if 1, LilycoveCity_EventScript_14CF50 - clearflag 760 + clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B end diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index f0e515f13..7546fe41b 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,7 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 setvar 0x4099, 0 end @@ -97,23 +97,23 @@ LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 return LilycoveCity_ContestLobby_EventScript_1589D6:: @ 81589D6 - clearflag 776 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_LADY return LilycoveCity_ContestLobby_EventScript_1589DA:: @ 81589DA - clearflag 777 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_GIRL return LilycoveCity_ContestLobby_EventScript_1589DE:: @ 81589DE - clearflag 778 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTING_MAN return LilycoveCity_ContestLobby_EventScript_1589E2:: @ 81589E2 - clearflag 779 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_PAINTER return LilycoveCity_ContestLobby_EventScript_1589E6:: @ 81589E6 - clearflag 780 + clearflag FLAG_HIDE_LILYCOVE_MUSEUM_VISITORS return LilycoveCity_ContestLobby_EventScript_1589EA:: @ 81589EA @@ -188,7 +188,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B - checkflag 775 + checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A setvar 0x4099, 0 end @@ -583,7 +583,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 end LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 - setflag 775 + setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar 0x4094, 0x1 additem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 54e2bd042..117aa5579 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -52,7 +52,7 @@ LittlerootTown_EventScript_14D59A:: @ 814D59A return LittlerootTown_EventScript_14D5A6:: @ 814D5A6 - clearflag 752 + clearflag FLAG_HIDE_MOM_LITTLEROOT setobjectmovementtype 4, 8 checkplayergender compare RESULT, 0 @@ -80,7 +80,7 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF setvar 0x8004, 5 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 761 + setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 waitstate releaseall @@ -91,7 +91,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D setvar 0x8004, 14 setvar 0x8005, 8 call LittlerootTown_EventScript_14D62B - setflag 762 + setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 waitstate releaseall @@ -122,12 +122,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 - setflag 752 + setflag FLAG_HIDE_MOM_LITTLEROOT setvar 0x4092, 3 hideobject 255, 0, 0 closedoor 0x8004, 0x8005 waitdooranim - clearflag 868 + clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag 0x4000 return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 8e7a0854d..868e4f06e 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -107,7 +107,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer - checkflag 896 + checkflag FLAG_UNKNOWN_BIRCH_380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare 0x4084, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 0bc64765a..451219edb 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -156,8 +156,8 @@ MauvilleCity_EventScript_14C1D9:: @ 814C1D9 MauvilleCity_EventScript_14C22B:: @ 814C22B removeobject 6 removeobject 7 - clearflag 806 - clearflag 809 + clearflag FLAG_HIDE_WALLY_WANDAS_HOUSE + clearflag FLAG_HIDE_WALLY_FATHER_WANDAS_HOUSE setflag FLAG_DEFEATED_WALLY_MAUVILLE releaseall end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 06774d400..7ce6e3704 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -77,7 +77,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C removeobject 7 removeobject 8 removeobject 9 - setflag 819 + setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR setvar 0x40bf, 1 releaseall end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 9c32e989c..231865942 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -63,7 +63,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag 1229 setflag BADGE07_GET - clearflag 869 + clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag 915 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index e9456ae13..fd90210ca 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -71,8 +71,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 MtPyre_Summit_EventScript_15D57A:: @ 815D57A setflag FLAG_MT_PYRE_ORB_STOLEN setvar 0x4058, 1 - clearflag 840 - clearflag 835 + clearflag FLAG_HIDE_STERN_SLATEPORT + clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT setvar 0x40a0, 1 setvar 0x40b9, 1 return diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 47601a964..61476b085 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -209,8 +209,8 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 setvar 0x4085, 1 setvar 0x4057, 2 clearflag FLAG_HIDE_WALLY_PETALBURG - clearflag 866 - setflag 889 + clearflag FLAG_HIDE_WALLY_PETALBURG_GYM + setflag FLAG_HIDE_RIVAL_BIRCH_LAB special InitBirchState warp MAP_PETALBURG_CITY, 255, 15, 8 waitstate diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 9af5c1bdc..23ed60f9a 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -119,7 +119,7 @@ Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 setvar 0x4062, 1 setvar 0x4084, 4 - clearflag 889 + clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 clearflag 979 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 20044f020..ac8a48353 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -145,13 +145,13 @@ Route104_EventScript_14EFD5:: @ 814EFD5 setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, 0, 11, 0 - clearflag 740 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF - setflag 742 + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobject 7, 0, 19 copyvar 0x4096, 0x8008 resetobjectpriority 255, 0, 19 diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index aabc03439..3d775ccfe 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -11,7 +11,7 @@ Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 - setflag 814 + setflag FLAG_HIDE_RIVAL_RUSTBORO return Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 @@ -80,9 +80,9 @@ Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, 4 call Route104_MrBrineysHouse_EventScript_1A010C setvar 0x408e, 1 - clearflag 738 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE warp MAP_ROUTE104, 255, 13, 51 waitstate releaseall diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index f4838a211..1277168e0 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -43,14 +43,14 @@ Route109_EventScript_14F548:: @ 814F548 applymovement 255, Route109_Movement_14F670 waitmovement 0 addobject 4 - clearflag 743 + clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setobjectxyperm 2, 12, 8 addobject 2 setobjectpriority 2, 0, 11, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 - clearflag 740 - setflag 744 + clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN + setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 hideobject 1, 0, 24 msgbox Route109_Text_16B4B5, 4 closemessage diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 343d666b2..7d9c8aaaa 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -40,10 +40,10 @@ Route111_EventScript_15000C:: @ 815000C return Route111_EventScript_15000D:: @ 815000D - clearflag 768 - setflag 769 - setflag 770 - setflag 771 + clearflag FLAG_HIDE_VICTOR_WINSTRATE + setflag FLAG_HIDE_VICTORIA_WINSTRATE + setflag FLAG_HIDE_VIVI_WINSTRATE + setflag FLAG_HIDE_VICKI_WINSTRATE cleartrainerflag OPPONENT_VICTOR cleartrainerflag OPPONENT_VICTORIA cleartrainerflag OPPONENT_VIVI diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index ec47cbd79..5454fa946 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -33,8 +33,8 @@ Route119_MapScript1_15119B:: @ 815119B end Route119_EventScript_1511B9:: @ 81511B9 - setflag 893 - clearflag 892 + setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F setvar 0x40b3, 2 return diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 09bab727a..4ee12fe93 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -39,10 +39,10 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 closemessage setvar 0x40b3, 1 - clearflag 893 + clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm fadescreen 1 - setflag 890 + setflag FLAG_HIDE_EVIL_TEAM_WEATHER_INSTITUTE removeobject 1 removeobject 2 removeobject 3 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 358a946a6..ffe133906 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -183,11 +183,11 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setvar 0x405a, 2 setvar 0x409a, 2 setvar 0x406f, 1 - clearflag 891 - clearflag 880 - clearflag 878 - setflag 739 - setflag 881 + clearflag FLAG_HIDE_BRINEY_ROUTE116 + clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL + clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL + setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE releaseall end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0cd4a36a8..eca55c118 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -57,13 +57,13 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 setflag SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 - setflag 894 - clearflag 807 + setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 + clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL clearflag 983 - clearflag 739 - clearflag 881 + clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE + clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 1 - clearflag 814 + clearflag FLAG_HIDE_RIVAL_RUSTBORO setvar 0x408f, 1 releaseall end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 002071f2d..04364b661 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -345,7 +345,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA setflag FLAG_RECOVERED_DEVON_GOODS setvar 0x405a, 4 setvar 0x4090, 1 - setflag 891 + setflag FLAG_HIDE_BRINEY_ROUTE116 release end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index d38459c1c..9131dcdb3 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -192,23 +192,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 .endif setvar 0x407b, 1 - clearflag 855 - clearflag 856 - clearflag 816 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 + clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 + clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag 973 setvar 0x405e, 1 clearflag 944 clearflag 945 setflag SYS_WEATHER_CTRL - setflag 854 + setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag 967 setvar 0x40c6, 1 setvar 0x40a2, 1 - setflag 828 - setflag 829 - setflag 831 - setflag 859 + setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN + setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN + setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN setflag 946 warp MAP_ROUTE128, 255, 38, 22 waitstate diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index f22055bc4..b278fcfc2 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -19,7 +19,7 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 playpokecry SPECIES_RAYQUAZA, 2 delay 40 waitpokecry - setflag 773 + setflag FLAG_HIDE_RAYQUAZA setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index b94a0ffd3..567dd779b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -19,7 +19,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C SlateportCity_EventScript_14BA5C:: @ 814BA5C setflag FLAG_VISITED_SLATEPORT_CITY setvar 0x4086, 0 - setflag 803 + setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return SlateportCity_EventScript_14BA68:: @ 814BA68 @@ -533,10 +533,10 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 255, SlateportCity_Movement_14C008 waitmovement 0 removeobject 11 - clearflag 841 - clearflag 848 - clearflag 845 - clearflag 846 + clearflag FLAG_HIDE_STERN_SLATEPORT_HARBOR + clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR + clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR setvar 0x4058, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index daa6b1e7c..2e042b1e5 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -12,7 +12,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 - clearflag 860 + clearflag FLAG_HIDE_SS_TIDAL_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 @@ -73,8 +73,8 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage - setflag 821 - setflag 822 + setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT + setflag FLAG_HIDE_GRUNT_2_BLOCKING_HIDEOUT moveobjectoffscreen 4 setobjectmovementtype 4, 10 releaseall diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index a8411e067..db65a51db 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -74,7 +74,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 removeobject 4 fadescreen 0 delay 30 - setflag 883 + setflag FLAG_HIDE_EVIL_TEAM_OCEANIC_MUSEUM applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 @@ -86,7 +86,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 waitmovement 0 playse 9 removeobject 1 - setflag 900 + setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS clearflag 947 setflag 949 diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 7b2ae0d67..73d63fe06 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -19,7 +19,7 @@ SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A083D waitmovement 0 setflag FLAG_DOCK_REJECTED_DEVON_GOODS - setflag 882 + setflag FLAG_HIDE_EVIL_TEAM_SLATEPORT releaseall end diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index babbd8cce..b9e9b85a5 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -5,7 +5,7 @@ VerdanturfTown_MapScripts:: @ 814E854 VerdanturfTown_MapScript1_14E85A:: @ 814E85A setflag FLAG_VISITED_VERDANTURF_TOWN setvar 0x4086, 0 - setflag 801 + setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end VerdanturfTown_EventScript_14E866:: @ 814E866 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index e92cdcc82..7e48d3d90 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -8,7 +8,7 @@ VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 - setflag 858 + setflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD return VictoryRoad_1F_EventScript_15DE97:: @ 815DE97 @@ -41,7 +41,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 msgbox VictoryRoad_1F_Text_19782B, 4 trainerbattle 3, OPPONENT_WALLY_1, 0, VictoryRoad_1F_Text_197943 msgbox VictoryRoad_1F_Text_197967, 4 - clearflag 858 + clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD setvar 0x40c3, 1 -- cgit v1.2.3 From 58bf5392b36bc3a5c3559f218aff9f751dd90a64 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 10 Dec 2017 15:41:21 -0800 Subject: Label flags up to 973 --- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 6 ++-- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 2 +- data/scripts/maps/IslandCave.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 4 +-- data/scripts/maps/MauvilleCity.inc | 6 ++-- data/scripts/maps/MossdeepCity_Gym.inc | 4 +-- data/scripts/maps/MossdeepCity_House2.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 4 +-- data/scripts/maps/PetalburgCity_Gym.inc | 6 ++-- data/scripts/maps/Route104.inc | 4 +-- data/scripts/maps/Route111.inc | 8 ++--- data/scripts/maps/Route116.inc | 2 +- data/scripts/maps/SSTidalCorridor.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 8 ++--- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 16 +++++----- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 36 +++++++++++----------- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 6 ++-- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 ++-- data/scripts/maps/SlateportCity_Harbor.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +-- .../maps/SlateportCity_OceanicMuseum_2F.inc | 4 +-- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- 27 files changed, 73 insertions(+), 73 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 36df2cb3f..7d2003598 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -62,7 +62,7 @@ AncientTomb_EventScript_15F050:: @ 815F050 delay 40 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE - setflag 937 + setflag FLAG_HIDE_REGISTEEL setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 59f698c5f..2186c8534 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -20,7 +20,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C specialvar 0x8007, sub_810F404 compare 0x8007, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 - clearflag 941 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -28,12 +28,12 @@ BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar 0x8007, sub_810F404 compare 0x8007, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 - clearflag 941 + clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602E4:: @ 81602E4 - setflag 941 + setflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER return BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 1f3c0f105..608b0d892 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -5,7 +5,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 BattleTower_Outside_MapScript1_16015C:: @ 816015C setflag FLAG_UNLOCK_BATTLE_TOWER setvar 0x40bc, 0 - setflag 918 + setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end BattleTower_Outside_EventScript_160168:: @ 8160168 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index d0d19e4b9..b7711b1ad 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -77,7 +77,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag SYS_WEATHER_CTRL setvar 0x40b9, 2 - clearflag 916 + clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall end diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 3ca08a6de..29f48b95c 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -62,7 +62,7 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 delay 40 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE - setflag 935 + setflag FLAG_HIDE_REGIROCK setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index efccf20fc..23a96af51 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -16,7 +16,7 @@ FortreeCity_House4_EventScript_158188:: @ 8158188 msgbox FortreeCity_House4_Text_186835, 4 closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND - clearflag 934 + clearflag FLAG_HIDE_WINGULL_MOSSDEEP_HOUSE applymovement 3, FortreeCity_House4_Movement_158218 waitmovement 0 removeobject 3 diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 4b72b166c..7d6ecae1b 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -82,7 +82,7 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D delay 40 waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE - setflag 936 + setflag FLAG_HIDE_REGICE setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 29914a9b5..7078a83ca 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -11,11 +11,11 @@ LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F - clearflag 962 + clearflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return LilycoveCity_DepartmentStoreRooftop_EventScript_15A163:: @ 815A163 - setflag 962 + setflag FLAG_HIDE_ROOFTOP_LADY_LILYCOVE_MART return LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 451219edb..1109acc81 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -4,7 +4,7 @@ MauvilleCity_MapScripts:: @ 814C032 MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_VISITED_MAUVILLE_CITY - clearflag 961 + clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS setflag SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 @@ -13,8 +13,8 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 end MauvilleCity_EventScript_14C053:: @ 814C053 - clearflag 913 - setflag 912 + clearflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + setflag FLAG_HIDE_WATTSON_MAUVILLE return MauvilleCity_EventScript_14C05A:: @ 814C05A diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 231865942..de83fcb96 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -64,10 +64,10 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag 1229 setflag BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD - clearflag 915 + clearflag FLAG_UNKNOWN_393 setvar 0x8008, 7 call MossdeepCity_Gym_EventScript_1A01C0 - clearflag 905 + clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f66f7e6f1..f90fc9350 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -18,7 +18,7 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B waitpokecry closemessage setflag FLAG_WINGULL_DELIVERED_MAIL - clearflag 933 + clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE compare FACING, 2 call_if 1, MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 5b2f281da..345e75fa1 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -88,7 +88,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 - setflag 968 + setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM releaseall end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index fd90210ca..47a842b56 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -47,8 +47,8 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 removeobject 4 removeobject 5 removeobject 6 - setflag 916 - setflag 917 + setflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT + setflag FLAG_HIDE_GRUNTS_MT_PYRE_SUMMIT fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 61476b085..543c82135 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -401,11 +401,11 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 setvar 0x4085, 7 setflag BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 - setflag 913 - clearflag 912 + setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM + clearflag FLAG_HIDE_WATTSON_MAUVILLE setvar 0x8008, 5 call PetalburgCity_Gym_EventScript_1A01C0 - clearflag 940 + clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED special DrawWholeMapView goto PetalburgCity_Gym_EventScript_154A2C diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index ac8a48353..9595d00ab 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -21,11 +21,11 @@ Route104_EventScript_14EEAE:: @ 814EEAE goto_if 0, Route104_EventScript_14EEC4 checkflag BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 - clearflag 906 + clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC4:: @ 814EEC4 - setflag 906 + setflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return Route104_EventScript_14EEC8:: @ 814EEC8 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 7d9c8aaaa..6f310881a 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -56,8 +56,8 @@ Route111_EventScript_150023:: @ 8150023 goto_if_eq Route111_EventScript_15005F giveitem ITEM_ROOT_FOSSIL closemessage - setflag 963 - setflag 964 + setflag FLAG_HIDE_ROOT_FOSSIL + setflag FLAG_HIDE_CLAW_FOSSIL removeobject 34 delay 30 applymovement 35, Route111_Movement_1500AF @@ -78,8 +78,8 @@ Route111_EventScript_150069:: @ 8150069 goto_if_eq Route111_EventScript_1500A5 giveitem ITEM_CLAW_FOSSIL closemessage - setflag 964 - setflag 963 + setflag FLAG_HIDE_CLAW_FOSSIL + setflag FLAG_HIDE_ROOT_FOSSIL removeobject 35 delay 30 applymovement 34, Route111_Movement_1500AF diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index c9e33288b..34c685196 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -57,7 +57,7 @@ Route116_EventScript_150A94:: @ 8150A94 compare FACING, 4 call_if 1, Route116_EventScript_150AF9 removeobject LAST_TALKED - clearflag 949 + clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F setflag FLAG_RECEIVED_REPEAT_BALL release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 18018316a..18cff8320 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -142,7 +142,7 @@ SSTidalCorridor_EventScript_15FE17:: @ 815FE17 end SSTidalCorridor_EventScript_15FE36:: @ 815FE36 - setflag 951 + setflag FLAG_HIDE_TM_49_GIVER_SS_TIDAL return SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 9131dcdb3..fa19ee504 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -197,19 +197,19 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag 973 setvar 0x405e, 1 - clearflag 944 - clearflag 945 + clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 + clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 setflag SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - setflag 967 + setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE setvar 0x40c6, 1 setvar 0x40a2, 1 setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN setflag FLAG_HIDE_AWAKENED_MON_SEAFLOOR_CAVERN - setflag 946 + setflag FLAG_HIDE_EVIL_TEAM_GRUNTS_SEAFLOOR_CAVERN warp MAP_ROUTE128, 255, 38, 22 waitstate releaseall diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 1d852f41a..4bf77de75 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -90,13 +90,13 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E16C:: @ 815E16C end ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 - clearflag 952 - clearflag 953 - clearflag 954 - clearflag 955 - clearflag 956 - clearflag 957 - clearflag 958 - clearflag 959 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SALT_4 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 + clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 clearflag SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index d10f958fd..0be4b106c 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -21,7 +21,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 end ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 - checkflag 952 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA @@ -30,7 +30,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA - checkflag 953 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB checkflag SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB @@ -39,28 +39,28 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB - checkflag 956 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 setmaptile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 - checkflag 957 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B setmaptile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B - checkflag 958 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 setmaptile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 - checkflag 959 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 setmaptile 16, 13, 857, 1 return @@ -70,14 +70,14 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall - checkflag 956 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 20, 859, 0 special DrawWholeMapView - setflag 956 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 releaseall end @@ -88,53 +88,53 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall - checkflag 957 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 41, 10, 859, 0 special DrawWholeMapView - setflag 957 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall - checkflag 958 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 6, 9, 859, 0 special DrawWholeMapView - setflag 958 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall - checkflag 959 + checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 16, 13, 859, 0 special DrawWholeMapView - setflag 959 + setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 releaseall end ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall - checkflag 952 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 31, 8, 858, 0 special DrawWholeMapView - setflag 952 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 releaseall end @@ -145,13 +145,13 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall - checkflag 953 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B setmaptile 14, 26, 858, 0 special DrawWholeMapView - setflag 953 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 releaseall end diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index 9f4908cf6..adf7d5d9e 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 end ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF - checkflag 955 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 setmaptile 18, 2, 856, 1 return @@ -17,14 +17,14 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall - checkflag 955 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setmaptile 18, 2, 858, 0 special DrawWholeMapView - setflag 955 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 releaseall end diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index bffb7bd49..d6858bc15 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -7,7 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D end ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 - checkflag 954 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 setmaptile 11, 11, 856, 1 return @@ -17,14 +17,14 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall - checkflag 954 + checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B setmaptile 11, 11, 858, 0 special DrawWholeMapView - setflag 954 + setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 2e042b1e5..7f642c611 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -19,7 +19,7 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 savebgm BGM_EVIL_TEAM setobjectxyperm 4, 12, 13 setobjectmovementtype 4, 9 - setflag 905 + setflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR return SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index be5f5a8ff..0cb7b397e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -179,7 +179,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 - setflag 965 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse 9 removeobject 13 release @@ -188,7 +188,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 - setflag 965 + setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM playse 9 removeobject 13 release diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index db65a51db..7fcd0fff1 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -88,8 +88,8 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS - clearflag 947 - setflag 949 + clearflag FLAG_HIDE_DEVON_EMPLOYEE_ROUTE116 + setflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F release end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 0ff474138..8a978cc7d 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -65,7 +65,7 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 delay 50 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW - setflag 911 + setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY setflag SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate -- cgit v1.2.3 From 8d346b1baba8296f1a795b9add8f8f5ca5108d9f Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 14 Dec 2017 20:10:36 -0800 Subject: A few more flags --- data/scripts/maps/NewMauville_Inside.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 62b8f4d59..1b55cde28 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -169,7 +169,7 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry - setflag 974 + setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE setflag SYS_CTRL_OBJ_DELETE dowildbattle clearflag SYS_CTRL_OBJ_DELETE @@ -184,7 +184,7 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry - setflag 975 + setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE setflag SYS_CTRL_OBJ_DELETE dowildbattle clearflag SYS_CTRL_OBJ_DELETE @@ -199,7 +199,7 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C playpokecry SPECIES_VOLTORB, 2 delay 40 waitpokecry - setflag 976 + setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE setflag SYS_CTRL_OBJ_DELETE dowildbattle clearflag SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index fa19ee504..b66d4245d 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -195,7 +195,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS - clearflag 973 + clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS setvar 0x405e, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 -- cgit v1.2.3 From 03c75cfd9cfe896ab5ac78edf746fc1c1b24ef75 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 15 Dec 2017 10:49:58 -0800 Subject: Finish all regular hide-show flags --- data/scripts/maps/LittlerootTown.inc | 2 +- data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/Route103.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 117aa5579..07f6581c2 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -27,7 +27,7 @@ LittlerootTown_EventScript_14D563:: @ 814D563 LittlerootTown_EventScript_14D567:: @ 814D567 setvar 0x40c7, 2 - setflag 979 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN return LittlerootTown_EventScript_14D570:: @ 814D570 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 868e4f06e..871025f55 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -52,7 +52,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4 - clearflag 991 + clearflag FLAG_HIDE_BOY_ROUTE101 setvar 0x4084, 3 releaseall end diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 92120e362..64928f840 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -279,7 +279,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 waitmovement 0 removeobject 4 setvar 0x40c7, 2 - setflag 979 + setflag FLAG_HIDE_RIVAL_OLDALE_TOWN releaseall end diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 23ed60f9a..ee9decedc 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -122,7 +122,7 @@ Route103_EventScript_14ED46:: @ 814ED46 clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 setvar 0x40c7, 1 - clearflag 979 + clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index eca55c118..68039aac6 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -59,7 +59,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 clearflag FLAG_HIDE_BOYFRIEND_RUSTURF_TUNNEL - clearflag 983 + clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE setvar 0x4096, 1 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 9970d0490..e2b60f22e 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -11,7 +11,7 @@ Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB - setflag 980 + setflag FLAG_HIDE_UNDERWATER_SUBMARINE_INTERACTION end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF -- cgit v1.2.3 From 0a634a60c938b91635af51c1a991a0f45578b313 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 15 Dec 2017 11:46:10 -0800 Subject: Label item flags --- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 2bec8ac39..2430ba4af 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -9,7 +9,7 @@ AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 - checkflag 1078 + checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release -- cgit v1.2.3 From b14cdde8bd4afda2b0b73bb72b3cffc6961a5790 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 15 Dec 2017 14:59:25 -0800 Subject: Label landmark and daily flags. --- data/scripts/maps/AbandonedShip_Deck.inc | 2 +- data/scripts/maps/AncientTomb.inc | 2 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/DesertRuins.inc | 2 +- data/scripts/maps/DewfordTown_Gym.inc | 4 ++-- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 6 +++--- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 6 +++--- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 6 +++--- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 6 +++--- data/scripts/maps/FieryPath.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 4 ++-- data/scripts/maps/IslandCave.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 4 ++-- data/scripts/maps/LilycoveCity.inc | 6 +++--- data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc | 4 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 12 ++++++------ data/scripts/maps/MossdeepCity_Gym.inc | 4 ++-- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 18 +++++++++--------- data/scripts/maps/PetalburgCity_WallysHouse.inc | 4 ++-- data/scripts/maps/Route104_MrBrineysHouse.inc | 2 +- data/scripts/maps/Route104_PrettyPetalFlowerShop.inc | 8 ++++---- data/scripts/maps/Route109_SeashoreHouse.inc | 2 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 2 +- data/scripts/maps/Route111.inc | 6 +++--- data/scripts/maps/Route111_OldLadysRestStop.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 2 +- data/scripts/maps/Route114.inc | 4 ++-- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_LanettesHouse.inc | 2 +- data/scripts/maps/Route116_TunnelersRestHouse.inc | 2 +- data/scripts/maps/Route117_PokemonDayCare.inc | 2 +- data/scripts/maps/Route120.inc | 14 +++++++------- data/scripts/maps/Route123_BerryMastersHouse.inc | 12 ++++++------ .../maps/Route124_DivingTreasureHuntersHouse.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 4 ++-- data/scripts/maps/ScorchedSlab.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 2 +- data/scripts/maps/SkyPillar_Entrance.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 8 ++++---- data/scripts/maps/SootopolisCity_Gym_1F.inc | 4 ++-- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 2 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 6 +++--- 44 files changed, 97 insertions(+), 97 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_Deck.inc b/data/scripts/maps/AbandonedShip_Deck.inc index 49f837744..68d872f01 100644 --- a/data/scripts/maps/AbandonedShip_Deck.inc +++ b/data/scripts/maps/AbandonedShip_Deck.inc @@ -3,5 +3,5 @@ AbandonedShip_Deck_MapScripts:: @ 815E95A .byte 0 AbandonedShip_Deck_MapScript1_15E960:: @ 815E960 - setflag 2110 + setflag FLAG_LANDMARK_ABANDONED_SHIP end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 7d2003598..d28ce7fcc 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -14,7 +14,7 @@ AncientTomb_EventScript_15EFD8:: @ 815EFD8 return AncientTomb_MapScript1_15EFDC:: @ 815EFDC - setflag 2137 + setflag FLAG_LANDMARK_ANCIENT_TOMB end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 608b0d892..1a254f7df 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -3,7 +3,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 .byte 0 BattleTower_Outside_MapScript1_16015C:: @ 816015C - setflag FLAG_UNLOCK_BATTLE_TOWER + setflag FLAG_LANDMARK_BATTLE_TOWER setvar 0x40bc, 0 setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 29f48b95c..228ca21ac 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -28,7 +28,7 @@ DesertRuins_EventScript_15CB1B:: @ 815CB1B return DesertRuins_MapScript1_15CB52:: @ 815CB52 - setflag 2134 + setflag FLAG_LANDMARK_DESERT_RUINS end DesertRuins_EventScript_15CB56:: @ 815CB56 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 83dd7e78e..5a4e56857 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -112,7 +112,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 waitmessage call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 - setflag 1204 + setflag FLAG_DEFEATED_DEWFORD_GYM setflag BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 @@ -164,7 +164,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238 DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer - checkflag 1204 + checkflag FLAG_DEFEATED_DEWFORD_GYM goto_if_eq DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 3d3d56ff9..f7088e821 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 - checkflag 1248 + checkflag FLAG_DEFEATED_ELITE_4_DRAKE call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 compare 0x409c, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E @@ -41,7 +41,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer - checkflag 1248 + checkflag FLAG_DEFEATED_ELITE_4_DRAKE goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm 450, 0 msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 @@ -57,7 +57,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 setvar 0x8004, 0 special sub_810FF60 - setflag 1248 + setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 msgbox EverGrandeCity_DrakesRoom_Text_190E5D, 4 release diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 07f6e8877..be9e7a897 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 - checkflag 1247 + checkflag FLAG_DEFEATED_ELITE_4_GLACIA call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare 0x409c, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 @@ -41,7 +41,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer - checkflag 1247 + checkflag FLAG_DEFEATED_ELITE_4_GLACIA goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm 450, 0 msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 @@ -55,7 +55,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6F1:: @ 815B6F1 end EverGrandeCity_GlaciasRoom_EventScript_15B6FB:: @ 815B6FB - setflag 1247 + setflag FLAG_DEFEATED_ELITE_4_GLACIA call EverGrandeCity_GlaciasRoom_EventScript_1A0693 msgbox EverGrandeCity_GlaciasRoom_Text_190C8F, 4 release diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index b7c1618ba..5ffa16d37 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -24,7 +24,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F - checkflag 1246 + checkflag FLAG_DEFEATED_ELITE_4_PHOEBE call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare 0x409c, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A @@ -41,7 +41,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer - checkflag 1246 + checkflag FLAG_DEFEATED_ELITE_4_PHOEBE goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm 450, 0 msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 @@ -55,7 +55,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B657:: @ 815B657 end EverGrandeCity_PhoebesRoom_EventScript_15B661:: @ 815B661 - setflag 1246 + setflag FLAG_DEFEATED_ELITE_4_PHOEBE call EverGrandeCity_PhoebesRoom_EventScript_1A0693 msgbox EverGrandeCity_PhoebesRoom_Text_190A2A, 4 release diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index daca98176..6e958aeed 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F - checkflag 1245 + checkflag FLAG_DEFEATED_ELITE_4_SYDNEY call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 compare 0x409c, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A @@ -42,7 +42,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer - checkflag 1245 + checkflag FLAG_DEFEATED_ELITE_4_SYDNEY goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm 450, 0 msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 @@ -56,7 +56,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B5BD:: @ 815B5BD end EverGrandeCity_SidneysRoom_EventScript_15B5C7:: @ 815B5C7 - setflag 1245 + setflag FLAG_DEFEATED_ELITE_4_SYDNEY call EverGrandeCity_SidneysRoom_EventScript_1A0693 msgbox EverGrandeCity_SidneysRoom_Text_19086D, 4 release diff --git a/data/scripts/maps/FieryPath.inc b/data/scripts/maps/FieryPath.inc index bd984ad20..f0bd22071 100644 --- a/data/scripts/maps/FieryPath.inc +++ b/data/scripts/maps/FieryPath.inc @@ -3,5 +3,5 @@ FieryPath_MapScripts:: @ 815D318 .byte 0 FieryPath_MapScript1_15D31E:: @ 815D31E - setflag 2122 + setflag FLAG_LANDMARK_FIERY_PATH end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index abcb20c25..883274f29 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -28,7 +28,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 waitmessage call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 - setflag 1225 + setflag FLAG_DEFEATED_FORTREE_GYM setflag BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 @@ -67,7 +67,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer - checkflag 1225 + checkflag FLAG_DEFEATED_FORTREE_GYM goto_if_eq FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index 7d6ecae1b..fe8934fbd 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -28,7 +28,7 @@ IslandCave_EventScript_15EEDE:: @ 815EEDE return IslandCave_MapScript1_15EF15:: @ 815EF15 - setflag 2133 + setflag FLAG_LANDMARK_ISLAND_CAVE end S_OpenRegiceChamber:: @ 815EF19 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index f6c34484e..01b1dd08e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -81,7 +81,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 waitmessage call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 - setflag 1213 + setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 @@ -135,7 +135,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 29a8497ed..4ae27e827 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -64,15 +64,15 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer dodailyevents - checkflag 2255 + checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE goto_if_eq LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B - setflag 2255 + setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE msgbox LilycoveCity_Text_1C5B1D, 4 release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 7acd29523..cfcca25fb 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -11,12 +11,12 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E dodailyevents compare 0x4045, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 - checkflag 2250 + checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 - setflag 2250 + setflag FLAG_DAILY_PICKED_LOTTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 9b47bf493..142477ed5 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -3,7 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1565A7 switch 0x4093 case 0, MauvilleCity_Gym_EventScript_156491 @@ -82,7 +82,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB waitmessage call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 - setflag 1208 + setflag FLAG_DEFEATED_MAUVILLE_GYM setflag BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 @@ -111,7 +111,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -122,7 +122,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -133,7 +133,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA compare 0x4093, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA @@ -191,7 +191,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer - checkflag 1208 + checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index de83fcb96..66ff840ed 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -61,7 +61,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 waitmessage call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 - setflag 1229 + setflag FLAG_DEFEATED_MOSSDEEP_GYM setflag BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 @@ -210,7 +210,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer - checkflag 1229 + checkflag FLAG_DEFEATED_MOSSDEEP_GYM goto_if_eq MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 6429ff2f9..1234f5653 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -18,7 +18,7 @@ NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 return NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 - setflag 2112 + setflag FLAG_LANDMARK_NEW_MAUVILLE end NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 543c82135..07c6f8026 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -397,7 +397,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 waitmessage call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 - setflag 1217 + setflag FLAG_DEFEATED_PETALBURG_GYM setvar 0x4085, 7 setflag BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 @@ -765,7 +765,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -783,7 +783,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -801,7 +801,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -819,7 +819,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -837,7 +837,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -855,7 +855,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -873,7 +873,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -1021,7 +1021,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187 PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 282e064de..110b798b7 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -8,7 +8,7 @@ PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B @@ -51,7 +51,7 @@ PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 faceplayer checkflag FLAG_RECEIVED_HM03 goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D - checkflag 1217 + checkflag FLAG_DEFEATED_PETALBURG_GYM goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 3d775ccfe..9369f7573 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -3,7 +3,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 .byte 0 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 - setflag 2109 + setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare 0x4090, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag FLAG_RECEIVED_POKENAV diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 66173b0cc..bce884555 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -3,7 +3,7 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 .byte 0 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA - setflag 2108 + setflag FLAG_LANDMARK_FLOWER_SHOP checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 checkflag BADGE03_GET @@ -90,15 +90,15 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer dodailyevents - checkflag 2256 + checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B - setflag 2256 + setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP msgbox Route104_PrettyPetalFlowerShop_Text_1C6335, 4 release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index d365fa925..f60413d81 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -3,7 +3,7 @@ Route109_SeashoreHouse_MapScripts:: @ 8160DCA .byte 0 Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 - setflag 2111 + setflag FLAG_LANDMARK_SEASHORE_HOUSE end Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index bd4867c60..6424aff45 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -5,7 +5,7 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B .byte 0 Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B - setflag 2114 + setflag FLAG_LANDMARK_TRICK_HOUSE compare 0x40b5, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE compare 0x40c1, 1 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 6f310881a..3e089e354 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -121,13 +121,13 @@ Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer dodailyevents - checkflag 2252 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem ITEM_RAZZ_BERRY compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B - setflag 2252 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 special GetPlayerBigGuyGirlString msgbox Route111_Text_1C5781, 4 release @@ -236,7 +236,7 @@ Route111_EventScript_1501C9:: @ 81501C9 Route111_EventScript_1501D1:: @ 81501D1 lock faceplayer - setflag 2115 + setflag FLAG_LANDMARK_WINSTRATE_FAMILY msgbox Route111_Text_16F705, 5 compare RESULT, 1 goto_if_eq Route111_EventScript_1501F3 diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index 5576a44ff..c0fb6f489 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -3,7 +3,7 @@ Route111_OldLadysRestStop_MapScripts:: @ 815BFD1 .byte 0 Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 - setflag 2113 + setflag FLAG_LANDMARK_OLD_LADY_REST_SHOP end Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index d0b608339..078ac1006 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -3,7 +3,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A .byte 0 Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 - setflag 2116 + setflag FLAG_LANDMARK_GLASS_WORKSHOP compare 0x40be, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index a3056c8ff..3d1da2014 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,7 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag 2251 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 goto_if_eq Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 @@ -14,7 +14,7 @@ Route114_EventScript_150733:: @ 8150733 giveitem RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B - setflag 2251 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 msgbox Route114_Text_1C5861, 4 release end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 3cdd40d51..abf9ac883 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -3,7 +3,7 @@ Route114_FossilManiacsHouse_MapScripts:: @ 815C1B9 .byte 0 Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF - setflag 2135 + setflag FLAG_LANDMARK_FOSSIL_MANIACS_HOUSE end Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 3f5bbd909..b24cc9da2 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -3,7 +3,7 @@ Route114_LanettesHouse_MapScripts:: @ 815C258 .byte 0 Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E - setflag 2117 + setflag FLAG_LANDMARK_LANETTES_HOUSE end Route114_LanettesHouse_EventScript_15C262:: @ 815C262 diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 16f35b1f2..24091c4ac 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -3,7 +3,7 @@ Route116_TunnelersRestHouse_MapScripts:: @ 815C2DE .byte 0 Route116_TunnelersRestHouse_MapScript1_15C2E4:: @ 815C2E4 - setflag 2138 + setflag FLAG_LANDMARK_TUNNELERS_REST_HOUSE end Route116_TunnelersRestHouse_EventScript_15C2E8:: @ 815C2E8 diff --git a/data/scripts/maps/Route117_PokemonDayCare.inc b/data/scripts/maps/Route117_PokemonDayCare.inc index 2a3ee79e1..9ad740b4e 100644 --- a/data/scripts/maps/Route117_PokemonDayCare.inc +++ b/data/scripts/maps/Route117_PokemonDayCare.inc @@ -3,5 +3,5 @@ Route117_PokemonDayCare_MapScripts:: @ 815C319 .byte 0 Route117_PokemonDayCare_MapScript1_15C31F:: @ 815C31F - setflag 2118 + setflag FLAG_LANDMARK_POKEMON_DAYCARE end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 54f2d98a8..045fcbb43 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -113,7 +113,7 @@ Route120_EventScript_151739:: @ 8151739 lock faceplayer dodailyevents - checkflag 2254 + checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 goto_if_eq Route120_EventScript_151837 msgbox Route120_Text_1C58F1, 5 compare RESULT, 1 @@ -135,27 +135,27 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, 143 + setvar 0x8004, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, 144 + setvar 0x8004, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, 145 + setvar 0x8004, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, 146 + setvar 0x8004, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, 147 + setvar 0x8004, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end @@ -163,7 +163,7 @@ Route120_EventScript_151813:: @ 8151813 giveitem 0x8004 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B - setflag 2254 + setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 msgbox Route120_Text_1C5A0B, 4 release end diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index f9544d62e..dab303345 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -3,14 +3,14 @@ Route123_BerryMastersHouse_MapScripts:: @ 81639DF .byte 0 Route123_BerryMastersHouse_MapScript1_1639E5:: @ 81639E5 - setflag 2147 + setflag FLAG_LANDMARK_BERRY_MASTERS_HOUSE end Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer dodailyevents - checkflag 2253 + checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 @@ -19,7 +19,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 giveitem RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B - setflag 2253 + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER msgbox Route123_BerryMastersHouse_Text_1C5C66, 4 random 10 addvar RESULT, 20 @@ -40,7 +40,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer dodailyevents - checkflag 2257 + checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar 0x8004, 13 @@ -77,7 +77,7 @@ Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B @@ -146,7 +146,7 @@ Route123_BerryMastersHouse_EventScript_163C13:: @ 8163C13 end Route123_BerryMastersHouse_EventScript_163C1D:: @ 8163C1D - setflag 2257 + setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE msgbox Route123_BerryMastersHouse_Text_1C5E59, 4 release end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 2f6f1b1e1..55f3141fd 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -3,7 +3,7 @@ Route124_DivingTreasureHuntersHouse_MapScripts:: @ 8163DFA .byte 0 Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 - setflag 2139 + setflag FLAG_LANDMARK_HUNTERS_HOUSE end Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 816098829..e384014eb 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -14,7 +14,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE waitmessage call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 - setflag 1201 + setflag FLAG_DEFEATED_RUSTBORO_GYM setflag BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 @@ -47,7 +47,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977 RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer - checkflag 1201 + checkflag FLAG_DEFEATED_RUSTBORO_GYM goto_if_eq RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release diff --git a/data/scripts/maps/ScorchedSlab.inc b/data/scripts/maps/ScorchedSlab.inc index 112289083..f0ed9c005 100644 --- a/data/scripts/maps/ScorchedSlab.inc +++ b/data/scripts/maps/ScorchedSlab.inc @@ -3,5 +3,5 @@ ScorchedSlab_MapScripts:: @ 815F29D .byte 0 ScorchedSlab_MapScript1_15F2A3:: @ 815F2A3 - setflag 2136 + setflag FLAG_LANDMARK_SCORCHED_SLAB end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 27d44cad1..f9f081a8b 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -10,7 +10,7 @@ SealedChamber_OuterRoom_MapScript1_15F0D6:: @ 815F0D6 end SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 - setflag 2140 + setflag FLAG_LANDMARK_SEALED_CHAMBER end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB diff --git a/data/scripts/maps/SkyPillar_Entrance.inc b/data/scripts/maps/SkyPillar_Entrance.inc index 7a3927332..ab991d845 100644 --- a/data/scripts/maps/SkyPillar_Entrance.inc +++ b/data/scripts/maps/SkyPillar_Entrance.inc @@ -3,5 +3,5 @@ SkyPillar_Entrance_MapScripts:: @ 815F2BD .byte 0 SkyPillar_Entrance_MapScript1_15F2C3:: @ 815F2C3 - setflag 2142 + setflag FLAG_LANDMARK_SKY_PILLAR end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index c0229dc9c..ea64e9d29 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -92,16 +92,16 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F faceplayer dodailyevents special GetPlayerBigGuyGirlString - checkflag 2258 + checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS goto_if_eq SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 - addvar RESULT, 133 + addvar RESULT, ITEM_CHERI_BERRY giveitem RESULT compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B - setflag 2258 + setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS msgbox SootopolisCity_Text_1C64D0, 4 random 2 compare RESULT, 0 @@ -142,7 +142,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer - checkflag 1236 + checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM goto_if_eq SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 24c333bee..f3daa8c7f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -100,7 +100,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D waitmessage call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 - setflag 1236 + setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 @@ -124,7 +124,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer - checkflag 1236 + checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index da0fcf2cd..81c50559e 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -3,7 +3,7 @@ SouthernIsland_Exterior_MapScripts:: @ 8160AD6 .byte 0 SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC - setflag FLAG_UNLOCK_SOUTHERN_ISLAND + setflag FLAG_LANDMARK_SOUTHERN_ISLAND end SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index e2b60f22e..665cbf4af 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -5,7 +5,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E .byte 0 Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE - setflag 2119 + setflag FLAG_LANDMARK_SEAFLOOR_CAVERN checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB end diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index 0dd9aed7c..205a4315c 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -21,7 +21,7 @@ VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D faceplayer checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release @@ -44,7 +44,7 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 checkflag FLAG_DEFEATED_WALLY_MAUVILLE goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 @@ -67,7 +67,7 @@ VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA faceplayer checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 - checkflag 1213 + checkflag FLAG_DEFEATED_LAVARIDGE_GYM goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B checkflag FLAG_RUSTURF_TUNNEL_OPENED goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 -- cgit v1.2.3 From 88716f4c0e053a984eeb4bef92fefa42027dd22a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 17 Dec 2017 20:07:53 -0800 Subject: Use FLAG_ prefix for all flags --- data/scripts/maps/AncientTomb.inc | 10 +++++----- data/scripts/maps/AquaHideout_B1F.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 ++++---- data/scripts/maps/DesertRuins.inc | 10 +++++----- data/scripts/maps/DewfordTown_Gym.inc | 6 +++--- data/scripts/maps/EverGrandeCity.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 ++-- data/scripts/maps/FortreeCity_Gym.inc | 6 +++--- data/scripts/maps/IslandCave.inc | 14 +++++++------- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 +++--- data/scripts/maps/LilycoveCity.inc | 20 ++++++++++---------- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 4 ++-- data/scripts/maps/LilycoveCity_Harbor.inc | 8 ++++---- data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 2 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MagmaHideout_B1F.inc | 2 +- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_Gym.inc | 6 +++--- data/scripts/maps/MossdeepCity.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 6 +++--- data/scripts/maps/MossdeepCity_House4.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 14 +++++++------- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity_Gym.inc | 10 +++++----- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route104_PrettyPetalFlowerShop.inc | 2 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 ++-- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 ++-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 14 +++++++------- data/scripts/maps/Route114_LanettesHouse.inc | 2 +- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/Route124.inc | 2 +- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route126.inc | 2 +- data/scripts/maps/Route127.inc | 2 +- data/scripts/maps/Route128.inc | 2 +- data/scripts/maps/Route131.inc | 2 +- data/scripts/maps/RustboroCity.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 4 ++-- data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 6 +++--- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 6 +++--- data/scripts/maps/SkyPillar_Top.inc | 6 +++--- data/scripts/maps/SlateportCity.inc | 6 +++--- data/scripts/maps/SlateportCity_Harbor.inc | 8 ++++---- .../scripts/maps/SlateportCity_SternsShipyard_1F.inc | 4 ++-- data/scripts/maps/SootopolisCity.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 ++++---- data/scripts/maps/SouthernIsland_Interior.inc | 8 ++++---- 56 files changed, 138 insertions(+), 138 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index d28ce7fcc..268563660 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,7 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AncientTomb_EventScript_15EFD8 end @@ -18,7 +18,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag SYS_BRAILLE_FLY + checkflag FLAG_SYS_BRAILLE_FLY call_if 0, AncientTomb_EventScript_15EFEA end @@ -33,7 +33,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag SYS_BRAILLE_FLY + checkflag FLAG_SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbutton @@ -63,9 +63,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 waitpokecry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_HIDE_REGISTEEL - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 9498864c3..82d0c10c5 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,7 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, AquaHideout_B1F_EventScript_15D846 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index b7711b1ad..a2067fe60 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,7 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 end @@ -61,10 +61,10 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 waitpokecry - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar RESULT, sub_810E300 compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 @@ -75,7 +75,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setvar 0x409b, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS - clearflag SYS_WEATHER_CTRL + clearflag FLAG_SYS_WEATHER_CTRL setvar 0x40b9, 2 clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 228ca21ac..c767dd7e7 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,7 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, DesertRuins_EventScript_15CB0D end @@ -14,7 +14,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag SYS_BRAILLE_STRENGTH + checkflag FLAG_SYS_BRAILLE_STRENGTH call_if 0, DesertRuins_EventScript_15CB1B end @@ -33,7 +33,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag SYS_BRAILLE_STRENGTH + checkflag FLAG_SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbutton @@ -63,9 +63,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 waitpokecry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_HIDE_REGIROCK - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 5a4e56857..cbcb4d5eb 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -113,7 +113,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 call DewfordTown_Gym_EventScript_1A02C5 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag FLAG_DEFEATED_DEWFORD_GYM - setflag BADGE02_GET + setflag FLAG_BADGE02_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB @@ -177,14 +177,14 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag BADGE02_GET + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag BADGE02_GET + checkflag FLAG_BADGE02_GET goto_if_eq DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index c4f9ad315..b4fa64cae 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,7 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, EverGrandeCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 934e5a06c..a78338808 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -4,7 +4,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B sethealplace 20 - setflag SYS_POKEMON_LEAGUE_FLY + setflag FLAG_SYS_POKEMON_LEAGUE_FLY checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B end @@ -57,7 +57,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 883274f29..d3f7be155 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -29,7 +29,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 call FortreeCity_Gym_EventScript_1A02C5 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM - setflag BADGE06_GET + setflag FLAG_BADGE06_GET setvar 0x8008, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E @@ -80,14 +80,14 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if_eq FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index fe8934fbd..e8489eb8a 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,7 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, IslandCave_EventScript_15EED0 end @@ -14,7 +14,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT call_if 0, IslandCave_EventScript_15EEDE end @@ -40,12 +40,12 @@ S_OpenRegiceChamber:: @ 815EF19 setmaptile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN - setflag SYS_BRAILLE_WAIT + setflag FLAG_SYS_BRAILLE_WAIT end IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait @@ -61,7 +61,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag SYS_BRAILLE_WAIT + checkflag FLAG_SYS_BRAILLE_WAIT goto_if_eq IslandCave_EventScript_15EF95 special DoBrailleWait waitstate @@ -83,9 +83,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D waitpokecry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_HIDE_REGICE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRegiBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 01b1dd08e..a44368925 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -82,7 +82,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 call LavaridgeTown_Gym_1F_EventScript_1A02C5 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag FLAG_DEFEATED_LAVARIDGE_GYM - setflag BADGE04_GET + setflag FLAG_BADGE04_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB @@ -148,14 +148,14 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 4ae27e827..30f0ff36e 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -7,7 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar 0x4086, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E @@ -30,7 +30,7 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET call_if 1, LilycoveCity_EventScript_14CB2B end @@ -89,7 +89,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release @@ -147,7 +147,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release @@ -186,7 +186,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall @@ -349,7 +349,7 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CEEE @@ -361,7 +361,7 @@ LilycoveCity_EventScript_14CEA6:: @ 814CEA6 end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq LilycoveCity_EventScript_14CEE8 return @@ -374,7 +374,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,7 +386,7 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 1, LilycoveCity_EventScript_14CEDE compare RESULT, 0 call_if 1, LilycoveCity_EventScript_14CF47 @@ -401,7 +401,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7546fe41b..6a1bc09e8 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -589,7 +589,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 - setflag SYS_RIBBON_GET + setflag FLAG_SYS_RIBBON_GET end LilycoveCity_ContestLobby_EventScript_158F08:: @ 8158F08 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 62d35662d..3e4caf100 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,9 +3,9 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 69e2e6766..7385f8c72 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,7 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release @@ -106,11 +106,11 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if 0, LilycoveCity_Harbor_EventScript_1598BA checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag SYS_HAS_EON_TICKET + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage @@ -159,7 +159,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 4b9de4d15..d1be7b704 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 07f6581c2..52c52b798 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -861,7 +861,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 - setflag SYS_B_DASH + setflag FLAG_SYS_B_DASH setvar 0x4050, 4 release end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 871025f55..f78d30ec2 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -159,7 +159,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage - setflag SYS_POKEDEX_GET + setflag FLAG_SYS_POKEDEX_GET return LittlerootTown_ProfessorBirchsLab_EventScript_152E7B:: @ 8152E7B diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 3042d75dc..6dbdc0461 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,7 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, MagmaHideout_B1F_EventScript_15F2B8 end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 1109acc81..ae00ca369 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -5,7 +5,7 @@ MauvilleCity_MapScripts:: @ 814C032 MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_VISITED_MAUVILLE_CITY clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS - setflag SYS_TV_START + setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar 0x4093, 0 checkflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 142477ed5..d94436973 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -83,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A02C5 msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag FLAG_DEFEATED_MAUVILLE_GYM - setflag BADGE03_GET + setflag FLAG_BADGE03_GET addvar 0x4085, 1 compare 0x4085, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB @@ -204,14 +204,14 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if_eq MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 71b572ba2..31ed83b2a 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,7 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, MossdeepCity_EventScript_1A02C1 end diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 66ff840ed..0c27c28f7 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -62,7 +62,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 call MossdeepCity_Gym_EventScript_1A02C5 msgbox MossdeepCity_Gym_Text_18D128, 4 setflag FLAG_DEFEATED_MOSSDEEP_GYM - setflag BADGE07_GET + setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 setvar 0x8008, 7 @@ -228,14 +228,14 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 77953a959..fd400ad16 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,7 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 345e75fa1..55ee9ebac 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,7 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 1b55cde28..aa6cf6310 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -9,7 +9,7 @@ NewMauville_Inside_MapScript1_15E56F:: @ 815E56F call_if 1, NewMauville_Inside_EventScript_15E5DA compare 0x4002, 1 call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F end @@ -170,9 +170,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -185,9 +185,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end @@ -200,8 +200,8 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C delay 40 waitpokecry setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index d46831902..69503908a 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,7 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag SYS_POKEDEX_GET + checkflag FLAG_SYS_POKEDEX_GET goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 07c6f8026..e2967169f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -48,7 +48,7 @@ PetalburgCity_Gym_MapScript1_15451B:: @ 815451B call_if 1, PetalburgCity_Gym_EventScript_15453B compare 0x4085, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B end @@ -356,7 +356,7 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D goto_if_eq PetalburgCity_Gym_EventScript_1549B8 checkflag FLAG_RECEIVED_TM42 goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release @@ -399,7 +399,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag FLAG_DEFEATED_PETALBURG_GYM setvar 0x4085, 7 - setflag BADGE05_GET + setflag FLAG_BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE @@ -1034,14 +1034,14 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET goto_if_eq PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index c9a364c80..1810a6495 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -217,7 +217,7 @@ Route101_EventScript_14EA76:: @ 814EA76 Route101_EventScript_14EA7F:: @ 814EA7F lock faceplayer - setflag SYS_POKEMON_GET + setflag FLAG_SYS_POKEMON_GET setflag FLAG_RESCUED_BIRCH fadescreen 1 removeobject 4 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 9595d00ab..92f5d5593 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -19,7 +19,7 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 Route104_EventScript_14EEAE:: @ 814EEAE checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_EventScript_14EEC4 - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index bce884555..07abd21bc 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -6,7 +6,7 @@ Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag FLAG_LANDMARK_FLOWER_SHOP checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8fd9d3ea5..8e33517ca 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -28,7 +28,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 - setflag SYS_CYCLING_ROAD + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -55,7 +55,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall setvar 0x40a9, 0 - clearflag SYS_CYCLING_ROAD + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 1ca98817c..51cab5ddd 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -13,7 +13,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B specialvar RESULT, GetPlayerAvatarBike compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 - setflag SYS_CYCLING_ROAD + setflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 1 releaseall end @@ -32,7 +32,7 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall - clearflag SYS_CYCLING_ROAD + clearflag FLAG_SYS_CYCLING_ROAD setvar 0x4001, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 6424aff45..bf0c36ff3 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -63,37 +63,37 @@ Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag BADGE03_GET + checkflag FLAG_BADGE03_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag BADGE04_GET + checkflag FLAG_BADGE04_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag BADGE05_GET + checkflag FLAG_BADGE05_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 0, Route110_TrickHouseEntrance_EventScript_161088 return diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index b24cc9da2..87b0f2cd6 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -11,7 +11,7 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 faceplayer checkflag FLAG_RECEIVED_DOLL_LANETTE goto_if_eq Route114_LanettesHouse_EventScript_15C28F - setflag SYS_PC_LANETTE + setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE givedecoration DECOR_LOTAD_DOLL diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 5454fa946..fb3d75660 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,7 +4,7 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route119_EventScript_15117C end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 045fcbb43..209291a3a 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,7 +5,7 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, Route120_EventScript_151628 end @@ -227,9 +227,9 @@ Route120_EventScript_15189D:: @ 815189D waitpokecry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE goto Route120_EventScript_151908 end diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 71f58bb57..3e062bfdc 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,7 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route124_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 7c4754f4f..ea24434e2 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,7 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route125_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index d480512f8..a89087994 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,7 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route126_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index e7c6f602f..5fb122821 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,7 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route127_EventScript_1A02C1 end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 5b8ec42e0..b0e295db6 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,7 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index 09f555997..efa26ecd2 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,7 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, Route131_EventScript_15244E end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index ffe133906..7e3a0e191 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -36,7 +36,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 68039aac6..0e9786760 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -54,7 +54,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage - setflag SYS_POKENAV_GET + setflag FLAG_SYS_POKENAV_GET setflag FLAG_RECEIVED_POKENAV msgbox RustboroCity_DevonCorp_3F_Text_183439, 4 setflag FLAG_HIDE_TUNNER_DIGGER_ROUTE116 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index e384014eb..427be433d 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -15,7 +15,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE call RustboroCity_Gym_EventScript_1A02C5 msgbox RustboroCity_Gym_Text_1840D5, 4 setflag FLAG_DEFEATED_RUSTBORO_GYM - setflag BADGE01_GET + setflag FLAG_BADGE01_GET setvar 0x405a, 1 addvar 0x4085, 1 setvar 0x8008, 1 @@ -60,14 +60,14 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag BADGE01_GET + checkflag FLAG_BADGE01_GET goto_if_eq RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index b66d4245d..6a4d9af02 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -199,7 +199,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar 0x405e, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 - setflag SYS_WEATHER_CTRL + setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index f9f081a8b..7add1e6f3 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,7 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag SYS_BRAILLE_DIG + checkflag FLAG_SYS_BRAILLE_DIG call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 end @@ -109,7 +109,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag SYS_BRAILLE_DIG + checkflag FLAG_SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbutton diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 4bf77de75..fcff20944 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 @@ -20,7 +20,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag SYS_SHOAL_ITEM + checkflag FLAG_SYS_SHOAL_ITEM call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 @@ -98,5 +98,5 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E176:: @ 815E176 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 clearflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - clearflag SYS_SHOAL_ITEM + clearflag FLAG_SYS_SHOAL_ITEM return diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 0be4b106c..43dfa8afa 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,7 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF @@ -23,7 +23,7 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmaptile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA @@ -32,7 +32,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag SYS_SHOAL_TIDE + checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmaptile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index b278fcfc2..37da10220 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,7 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SkyPillar_Top_EventScript_15F312 end @@ -20,9 +20,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 delay 40 waitpokecry setflag FLAG_HIDE_RAYQUAZA - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE release end diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 567dd779b..c163685b2 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -199,9 +199,9 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BC63 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall @@ -235,7 +235,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 7f642c611..ae19d0326 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -7,7 +7,7 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setvar 0x4001, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 end @@ -159,7 +159,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release @@ -268,7 +268,7 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_Harbor_EventScript_15626F checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE goto_if_eq SlateportCity_Harbor_EventScript_156265 @@ -305,7 +305,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 73d63fe06..46dc8419c 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,9 +3,9 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag SYS_GAME_CLEAR + checkflag FLAG_SYS_GAME_CLEAR goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag BADGE07_GET + checkflag FLAG_BADGE07_GET goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C checkflag FLAG_DELIVERED_DEVON_GOODS goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index ea64e9d29..748dbe898 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -37,7 +37,7 @@ SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag FLAG_VISITED_SOOTOPOLIS_CITY checkflag FLAG_LEGENDARY_BATTLE_COMPLETED call_if 1, SootopolisCity_EventScript_14D159 - checkflag SYS_WEATHER_CTRL + checkflag FLAG_SYS_WEATHER_CTRL call_if 1, SootopolisCity_EventScript_14D123 end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index f3daa8c7f..6f99ba8a5 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -89,7 +89,7 @@ SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D checkflag FLAG_RECEIVED_TM03 goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag BADGE06_GET + checkflag FLAG_BADGE06_GET goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release @@ -101,7 +101,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D call SootopolisCity_Gym_1F_EventScript_1A02C5 msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM - setflag BADGE08_GET + setflag FLAG_BADGE08_GET setvar 0x8008, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 @@ -137,14 +137,14 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag BADGE08_GET + checkflag FLAG_BADGE08_GET goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 8a978cc7d..0a9ca6b89 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,7 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag SYS_CTRL_OBJ_DELETE + checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, SouthernIsland_Interior_EventScript_160B68 end @@ -46,7 +46,7 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag SYS_HAS_EON_TICKET + checkflag FLAG_SYS_HAS_EON_TICKET goto_if 0, SouthernIsland_Interior_EventScript_160C08 setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy @@ -66,10 +66,10 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 special RemoveCameraDummy setwildbattle SPECIES_LATIAS_OR_LATIOS, 50, ITEM_SOUL_DEW setflag FLAG_HIDE_LATIOS_OR_LATIAS_STATIONARY - setflag SYS_CTRL_OBJ_DELETE + setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartSouthernIslandBattle waitstate - clearflag SYS_CTRL_OBJ_DELETE + clearflag FLAG_SYS_CTRL_OBJ_DELETE releaseall end -- cgit v1.2.3 From a753c44277c050fb24aaf97a8947c7f54e0dacd7 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Wed, 20 Dec 2017 19:58:17 -0600 Subject: Use event script macro names from pokeemerald --- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 6 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 24 +- .../maps/AbandonedShip_HiddenFloorRooms.inc | 60 ++-- data/scripts/maps/AncientTomb.inc | 20 +- data/scripts/maps/BattleTower_Corridor.inc | 8 +- data/scripts/maps/BattleTower_Lobby.inc | 8 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 10 +- data/scripts/maps/DesertRuins.inc | 20 +- data/scripts/maps/DewfordTown.inc | 32 +- data/scripts/maps/DewfordTown_Gym.inc | 20 +- data/scripts/maps/DewfordTown_Hall.inc | 2 +- data/scripts/maps/DewfordTown_House1.inc | 4 +- data/scripts/maps/DewfordTown_House2.inc | 2 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 4 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 8 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 +- data/scripts/maps/FallarborTown.inc | 4 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 10 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 2 +- data/scripts/maps/FallarborTown_Mart.inc | 4 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/FortreeCity.inc | 6 +- data/scripts/maps/FortreeCity_DecorationShop.inc | 4 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 8 +- data/scripts/maps/FortreeCity_House2.inc | 2 +- data/scripts/maps/FortreeCity_House4.inc | 6 +- data/scripts/maps/FortreeCity_House5.inc | 4 +- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/GraniteCave_1F.inc | 2 +- data/scripts/maps/GraniteCave_B1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 12 +- data/scripts/maps/IslandCave.inc | 30 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 6 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 2 +- data/scripts/maps/LavaridgeTown_House.inc | 4 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/LilycoveCity.inc | 68 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 24 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 22 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 10 +- .../maps/LilycoveCity_DepartmentStore_5F.inc | 8 +- data/scripts/maps/LilycoveCity_Harbor.inc | 8 +- data/scripts/maps/LilycoveCity_House1.inc | 4 +- data/scripts/maps/LilycoveCity_House2.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 22 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/LittlerootTown.inc | 20 +- .../maps/LittlerootTown_BrendansHouse_1F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 6 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 6 +- data/scripts/maps/MauvilleCity.inc | 4 +- data/scripts/maps/MauvilleCity_BikeShop.inc | 12 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 62 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 52 +-- data/scripts/maps/MauvilleCity_House1.inc | 2 +- data/scripts/maps/MauvilleCity_House2.inc | 4 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 50 +-- data/scripts/maps/MossdeepCity_House1.inc | 2 +- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 2 +- data/scripts/maps/MossdeepCity_House4.inc | 4 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 12 +- data/scripts/maps/MtChimney.inc | 6 +- data/scripts/maps/MtPyre_1F.inc | 2 +- data/scripts/maps/MtPyre_2F.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 2 +- data/scripts/maps/NewMauville_Entrance.inc | 24 +- data/scripts/maps/NewMauville_Inside.inc | 178 +++++------ data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/PacifidlogTown.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 14 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 4 +- data/scripts/maps/PetalburgCity_Gym.inc | 52 +-- .../maps/PetalburgCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 4 +- data/scripts/maps/Route104.inc | 22 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 4 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 6 +- data/scripts/maps/Route105.inc | 4 +- data/scripts/maps/Route109.inc | 22 +- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +- data/scripts/maps/Route110.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 22 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 46 +-- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 16 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 356 ++++++++++----------- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 40 +-- data/scripts/maps/Route111.inc | 10 +- .../maps/Route111_WinstrateFamilysHouse.inc | 2 +- data/scripts/maps/Route113.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 38 +-- data/scripts/maps/Route114.inc | 8 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 2 +- data/scripts/maps/Route114_LanettesHouse.inc | 4 +- data/scripts/maps/Route116.inc | 2 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 2 +- data/scripts/maps/Route119_House.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 4 +- data/scripts/maps/Route120.inc | 30 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route123.inc | 2 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 16 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 8 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/RustboroCity.inc | 2 +- data/scripts/maps/RustboroCity_CuttersHouse.inc | 2 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 20 +- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_1F.inc | 4 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 2 +- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 2 +- data/scripts/maps/RustboroCity_House3.inc | 4 +- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 2 +- data/scripts/maps/RusturfTunnel.inc | 14 +- data/scripts/maps/SSTidalCorridor.inc | 8 +- data/scripts/maps/SSTidalRooms.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 6 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 14 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 36 +-- data/scripts/maps/SecretBase_YellowCave4.inc | 2 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 6 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 36 +-- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 8 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SkyPillar_2F.inc | 2 +- data/scripts/maps/SkyPillar_4F.inc | 2 +- data/scripts/maps/SkyPillar_Top.inc | 4 +- data/scripts/maps/SlateportCity.inc | 8 +- data/scripts/maps/SlateportCity_ContestHall.inc | 2 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 12 +- data/scripts/maps/SlateportCity_Harbor.inc | 12 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 26 +- data/scripts/maps/SootopolisCity.inc | 28 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 16 +- data/scripts/maps/SootopolisCity_House1.inc | 6 +- data/scripts/maps/SootopolisCity_House4.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 4 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 4 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 24 +- data/scripts/maps/Underwater_SealedChamber.inc | 2 +- data/scripts/maps/UnknownMap_25_34.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 12 +- .../maps/VerdanturfTown_FriendshipRatersHouse.inc | 4 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 4 +- 170 files changed, 1094 insertions(+), 1094 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index 1bc38a099..c27951abb 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -15,11 +15,11 @@ AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 - setmaptile 11, 4, 563, 1 + setmetatile 11, 4, 563, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9C0:: @ 815E9C0 - setmaptile 11, 4, 555, 1 + setmetatile 11, 4, 555, 1 return AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA @@ -35,7 +35,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 playse 21 - removeitem ITEM_STORAGE_KEY, 1 + takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 special DrawWholeMapView diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index b09a6e5f1..35e86543b 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -27,35 +27,35 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 - setmaptile 3, 8, 555, 1 + setmetatile 3, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD:: @ 815EBAD - setmaptile 6, 8, 555, 1 + setmetatile 6, 8, 555, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7:: @ 815EBB7 - setmaptile 3, 3, 538, 0 + setmetatile 3, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1:: @ 815EBC1 - setmaptile 9, 3, 538, 0 + setmetatile 9, 3, 538, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB:: @ 815EBCB - setmaptile 3, 8, 563, 1 + setmetatile 3, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5:: @ 815EBD5 - setmaptile 6, 8, 563, 1 + setmetatile 6, 8, 563, 1 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF:: @ 815EBDF - setmaptile 3, 3, 564, 0 + setmetatile 3, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 - setmaptile 9, 3, 564, 0 + setmetatile 9, 3, 564, 0 return AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 @@ -67,7 +67,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_1_KEY, 1 + takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 special DrawWholeMapView @@ -83,7 +83,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_2_KEY, 1 + takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD special DrawWholeMapView @@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_4_KEY, 1 + takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 special DrawWholeMapView @@ -115,7 +115,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 playse 21 - removeitem ITEM_ROOM_6_KEY, 1 + takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 special DrawWholeMapView diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index eb5c1dccd..c1e77a8c7 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -39,9 +39,9 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B delay 20 - setfieldeffect 0, 10 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 10 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4D4 compare RESULT, 0 @@ -69,13 +69,13 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEA:: @ 815EDEA AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB delay 20 - setfieldeffect 0, 8 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 8 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 11 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 11 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4FC compare RESULT, 0 @@ -86,17 +86,17 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 delay 20 - setfieldeffect 0, 16 - setfieldeffect 1, 3 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 3 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 25 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 25 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 - setfieldeffect 0, 24 - setfieldeffect 1, 6 - setfieldeffect 2, 0 + setfieldeffectargument 0, 24 + setfieldeffectargument 1, 6 + setfieldeffectargument 2, 0 dofieldeffect 54 specialvar RESULT, sub_810F4B0 compare RESULT, 0 @@ -109,30 +109,30 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE6A:: @ 815EE6A end AbandonedShip_HiddenFloorRooms_EventScript_15EE6B:: @ 815EE6B - setfieldeffect 0, 42 - setfieldeffect 1, 10 - setfieldeffect 2, 0 + setfieldeffectargument 0, 42 + setfieldeffectargument 1, 10 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE7B:: @ 815EE7B - setfieldeffect 0, 20 - setfieldeffect 1, 5 - setfieldeffect 2, 0 + setfieldeffectargument 0, 20 + setfieldeffectargument 1, 5 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE8B:: @ 815EE8B - setfieldeffect 0, 1 - setfieldeffect 1, 12 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 12 + setfieldeffectargument 2, 0 dofieldeffect 54 return AbandonedShip_HiddenFloorRooms_EventScript_15EE9B:: @ 815EE9B - setfieldeffect 0, 1 - setfieldeffect 1, 2 - setfieldeffect 2, 0 + setfieldeffectargument 0, 1 + setfieldeffectargument 1, 2 + setfieldeffectargument 2, 0 dofieldeffect 54 return diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index 268563660..b849f41ba 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -23,12 +23,12 @@ AncientTomb_MapScript1_15EFE0:: @ 815EFE0 end AncientTomb_EventScript_15EFEA:: @ 815EFEA - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return AncientTomb_EventScript_15F021:: @ 815F021 @@ -36,7 +36,7 @@ AncientTomb_EventScript_15F021:: @ 815F021 checkflag FLAG_SYS_BRAILLE_FLY goto_if_eq AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ AncientTomb_EventScript_15F038:: @ 815F038 AncientTomb_EventScript_15F042:: @ 815F042 lockall braillemessage AncientTomb_Braille_1C552E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,9 +58,9 @@ AncientTomb_EventScript_15F050:: @ 815F050 lock faceplayer waitse - playpokecry SPECIES_REGISTEEL, 2 + playmoncry SPECIES_REGISTEEL, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE setflag FLAG_HIDE_REGISTEEL setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index ac97aa14b..828d975fc 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -6,13 +6,13 @@ BattleTower_Corridor_MapScripts:: @ 8160845 BattleTower_Corridor_MapScript1_160850:: @ 8160850 compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E - setmaptile 12, 0, 519, 0 - setmaptile 12, 1, 527, 0 + setmetatile 12, 0, 519, 0 + setmetatile 12, 1, 527, 0 end BattleTower_Corridor_EventScript_16086E:: @ 816086E - setmaptile 15, 0, 519, 0 - setmaptile 15, 1, 527, 0 + setmetatile 15, 0, 519, 0 + setmetatile 15, 1, 527, 0 end BattleTower_Corridor_MapScript2_160881:: @ 8160881 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 2186c8534..69db45ede 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -379,7 +379,7 @@ BattleTower_Lobby_EventScript_16071E:: @ 816071E BattleTower_Lobby_EventScript_160727:: @ 8160727 lockall special ShowBattleTowerRecords - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -393,7 +393,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar 0x8008, DECOR_SILVER_SHIELD - givedecoration DECOR_SILVER_SHIELD + givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_SILVER_SHIELD @@ -407,7 +407,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar 0x8008, DECOR_GOLD_SHIELD - givedecoration DECOR_GOLD_SHIELD + givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF setflag FLAG_RECEIVED_GOLD_SHIELD @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - getdecorname 1, 0x8008 + bufferdecorationname 1, 0x8008 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 1a254f7df..e0aba0b9c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -67,7 +67,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 applymovement LAST_TALKED, BattleTower_Outside_Movement_1A0845 waitmovement 0 delay 30 - hideobject 5, 26, 4 + hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE setvar 0x8004, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index a2067fe60..1b5146760 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -38,9 +38,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special WaitWeather waitstate playse 209 - setfieldeffect 0, 9 - setfieldeffect 1, 13 - setfieldeffect 2, 0 + setfieldeffectargument 0, 9 + setfieldeffectargument 1, 13 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE @@ -58,9 +58,9 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 delay 60 setwildbattle SPECIES_GROUDON_OR_KYOGRE, 45, ITEM_NONE waitse - playpokecry SPECIES_GROUDON_OR_KYOGRE, 2 + playmoncry SPECIES_GROUDON_OR_KYOGRE, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartGroudonKyogreBattle waitstate diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index c767dd7e7..7aa56a82d 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -19,12 +19,12 @@ DesertRuins_MapScript1_15CB11:: @ 815CB11 end DesertRuins_EventScript_15CB1B:: @ 815CB1B - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return DesertRuins_MapScript1_15CB52:: @ 815CB52 @@ -36,7 +36,7 @@ DesertRuins_EventScript_15CB56:: @ 815CB56 checkflag FLAG_SYS_BRAILLE_STRENGTH goto_if_eq DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -49,7 +49,7 @@ DesertRuins_EventScript_15CB6D:: @ 815CB6D DesertRuins_EventScript_15CB77:: @ 815CB77 lockall braillemessage DesertRuins_Braille_1C54C8 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,9 +58,9 @@ DesertRuins_EventScript_15CB85:: @ 815CB85 lock faceplayer waitse - playpokecry SPECIES_REGIROCK, 2 + playmoncry SPECIES_REGIROCK, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGIROCK, 40, ITEM_NONE setflag FLAG_HIDE_REGIROCK setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 3d3240e81..bb1fdeda4 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -85,7 +85,7 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 DewfordTown_EventScript_14E0F0:: @ 814E0F0 msgbox DewfordTown_Text_16B6A8, 4 - giveitem ITEM_OLD_ROD + giveitem_std ITEM_OLD_ROD setflag FLAG_RECEIVED_OLD_ROD msgbox DewfordTown_Text_16B6F9, 4 release @@ -118,30 +118,30 @@ DewfordTown_EventScript_14E147:: @ 814E147 DewfordTown_EventScript_14E151:: @ 814E151 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 0 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E293 applymovement 255, DewfordTown_Movement_14E293 waitmovement 0 - showobject 255, 0, 19 + showobjectat 255, MAP_ROUTE104 call DewfordTown_EventScript_1A02EF applymovement 255, DewfordTown_Movement_14E405 waitmovement 0 - showobject 255, 0, 19 + showobjectat 255, MAP_ROUTE104 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - hideobject 4, 0, 11 + hideobjectat 4, MAP_DEWFORD_TOWN setvar 0x408e, 2 - resetobjectpriority 255, 0, 11 + resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 copyvar 0x4096, 0x8008 waitstate @@ -150,40 +150,40 @@ DewfordTown_EventScript_14E151:: @ 814E151 DewfordTown_EventScript_14E1D8:: @ 814E1D8 call DewfordTown_EventScript_1A010C - setobjectpriority 2, 0, 11, 0 - setobjectpriority 255, 0, 11, 1 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 + setobjectpriority 255, MAP_DEWFORD_TOWN, 1 applymovement 2, DewfordTown_Movement_14E40E waitmovement 0 removeobject 2 applymovement 255, DewfordTown_Movement_14E402 waitmovement 0 - hideobject 255, 0, 11 + hideobjectat 255, MAP_DEWFORD_TOWN call DewfordTown_EventScript_1A02E7 applymovement 4, DewfordTown_Movement_14E356 applymovement 255, DewfordTown_Movement_14E356 waitmovement 0 call DewfordTown_EventScript_1A02EF - showobject 255, 0, 24 + showobjectat 255, MAP_ROUTE109 applymovement 255, DewfordTown_Movement_14E409 waitmovement 0 setobjectxyperm 2, 21, 26 addobject 2 - setobjectpriority 2, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 applymovement 2, DewfordTown_Movement_14E410 waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_ROUTE109 addobject 1 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD - hideobject 4, 0, 11 + hideobjectat 4, MAP_DEWFORD_TOWN checkflag FLAG_DELIVERED_DEVON_GOODS call_if 0, DewfordTown_EventScript_14E281 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 11 - resetobjectpriority 2, 0, 24 + resetobjectpriority 255, MAP_DEWFORD_TOWN + resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 release end diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index cbcb4d5eb..afd918a96 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -20,23 +20,23 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 goto DewfordTown_Gym_EventScript_1530AE DewfordTown_Gym_EventScript_1530AA:: @ 81530AA - setdarklevel 0 + setflashradius 0 return DewfordTown_Gym_EventScript_1530AE:: @ 81530AE - setdarklevel 1 + setflashradius 1 return DewfordTown_Gym_EventScript_1530B2:: @ 81530B2 - setdarklevel 2 + setflashradius 2 return DewfordTown_Gym_EventScript_1530B6:: @ 81530B6 - setdarklevel 3 + setflashradius 3 return DewfordTown_Gym_EventScript_1530BA:: @ 81530BA - setdarklevel 4 + setflashradius 4 return DewfordTown_Gym_EventScript_1530BE:: @ 81530BE @@ -57,25 +57,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 playse 35 - animdarklevel 3 + animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 playse 35 - animdarklevel 2 + animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C playse 35 - animdarklevel 1 + animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 playse 35 - animdarklevel 0 + animateflash 0 call DewfordTown_Gym_EventScript_153071 return @@ -123,7 +123,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 end DewfordTown_Gym_EventScript_1531B5:: @ 81531B5 - giveitem ITEM_TM08 + giveitem_std ITEM_TM08 compare RESULT, 0 goto_if_eq DewfordTown_Gym_EventScript_1A029B msgbox DewfordTown_Gym_Text_1753BF, 4 diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 3c0565678..a3830ebb8 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -255,7 +255,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D checkflag FLAG_RECEIVED_TM36 goto_if_eq DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 - giveitem ITEM_TM36 + giveitem_std ITEM_TM36 compare RESULT, 0 goto_if_eq DewfordTown_Hall_EventScript_1A029B setflag FLAG_RECEIVED_TM36 diff --git a/data/scripts/maps/DewfordTown_House1.inc b/data/scripts/maps/DewfordTown_House1.inc index e8897b974..4a112eea2 100644 --- a/data/scripts/maps/DewfordTown_House1.inc +++ b/data/scripts/maps/DewfordTown_House1.inc @@ -13,8 +13,8 @@ DewfordTown_House1_EventScript_153001:: @ 8153001 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox DewfordTown_House1_Text_174CC8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index 29ae58a22..e704efa50 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -7,7 +7,7 @@ DewfordTown_House2_EventScript_1535DC:: @ 81535DC checkflag FLAG_RECEIVED_SILK_SCARF goto_if_eq DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 - giveitem ITEM_SILK_SCARF + giveitem_std ITEM_SILK_SCARF compare RESULT, 0 goto_if_eq DewfordTown_House2_EventScript_15360B setflag FLAG_RECEIVED_SILK_SCARF diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 70e75492e..c1288078f 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014 .byte 0 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A - sethealplace 15 + setrespawn 15 call DewfordTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 setvar 0x800b, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index ae3cbd4ad..d59476417 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -46,8 +46,8 @@ EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse 8 - setmaptile 6, 1, 838, 0 - setmaptile 6, 2, 839, 0 + setmetatile 6, 1, 838, 0 + setmetatile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index d9baaee89..904dc7531 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -51,16 +51,16 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 end EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41 - sethealplace 1 - fadescreendelay 1, 24 + setrespawn 1 + fadescreenspeed 1, 24 special GameClear waitstate releaseall end EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D - sethealplace 2 - fadescreendelay 1, 24 + setrespawn 2 + fadescreenspeed 1, 24 special GameClear waitstate releaseall diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 57262b211..018658416 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66 .byte 0 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C - sethealplace 11 + setrespawn 11 end EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 @@ -11,7 +11,7 @@ SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 setvar 0x800b, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a78338808..4a8919b98 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 .byte 0 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B - sethealplace 20 + setrespawn 20 setflag FLAG_SYS_POKEMON_LEAGUE_FLY checkflag FLAG_ENTERED_ELITE_FOUR call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B @@ -18,7 +18,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A setvar 0x800b, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 70f3cbc3b..8ea580e28 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -35,9 +35,9 @@ FallarborTown_EventScript_14E826:: @ 814E826 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox FallarborTown_Text_16C92C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index b483b0259..72da4cd40 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -23,14 +23,14 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, FallarborTown_ContestLobby_Movement_153A8C @@ -115,7 +115,7 @@ FallarborTown_ContestLobby_EventScript_153ABB:: @ 8153ABB FallarborTown_ContestLobby_EventScript_153AC2:: @ 8153AC2 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 6c7509508..17267f926 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -25,7 +25,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B setvar 0x8004, 280 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index c827eea7b..001863d5c 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -43,7 +43,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A compare 0x8004, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 - removeitem ITEM_HEART_SCALE, 1 + takeitem ITEM_HEART_SCALE, 1 goto FallarborTown_House2_EventScript_153D60 end diff --git a/data/scripts/maps/FallarborTown_Mart.inc b/data/scripts/maps/FallarborTown_Mart.inc index e6f715697..cfd239e8a 100644 --- a/data/scripts/maps/FallarborTown_Mart.inc +++ b/data/scripts/maps/FallarborTown_Mart.inc @@ -41,8 +41,8 @@ FallarborTown_Mart_EventScript_1539AE:: @ 81539AE lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox FallarborTown_Mart_Text_1770D3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 1e50c2fd6..dd6e83be3 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3 .byte 0 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 - sethealplace 17 + setrespawn 17 call FallarborTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 setvar 0x800b, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index dd947d0e5..239c1410d 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -8,7 +8,7 @@ FortreeCity_MapScript1_14C94E:: @ 814C94E end FortreeCity_MapScript1_14C952:: @ 814C952 - tileeffect 2 + setstepcallback 2 end FortreeCity_EventScript_14C955:: @ 814C955 @@ -76,9 +76,9 @@ FortreeCity_EventScript_14C9E4:: @ 814C9E4 applymovement LAST_TALKED, FortreeCity_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry applymovement LAST_TALKED, FortreeCity_Movement_14CA13 waitmovement 0 removeobject LAST_TALKED diff --git a/data/scripts/maps/FortreeCity_DecorationShop.inc b/data/scripts/maps/FortreeCity_DecorationShop.inc index fca20b866..56a360708 100644 --- a/data/scripts/maps/FortreeCity_DecorationShop.inc +++ b/data/scripts/maps/FortreeCity_DecorationShop.inc @@ -14,7 +14,7 @@ FortreeCity_DecorationShop_EventScript_15826A:: @ 815826A faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations1 + pokemartdecoration FortreeCity_DecorationShop_Decorations1 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end @@ -38,7 +38,7 @@ FortreeCity_DecorationShop_EventScript_158298:: @ 8158298 faceplayer message FortreeCity_DecorationShop_Text_1A0BE4 waitmessage - pokemartdecor FortreeCity_DecorationShop_Decorations2 + pokemartdecoration FortreeCity_DecorationShop_Decorations2 msgbox FortreeCity_DecorationShop_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index d3f7be155..a0eb6186a 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -36,7 +36,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 end FortreeCity_Gym_EventScript_157F3E:: @ 8157F3E - giveitem ITEM_TM40 + giveitem_std ITEM_TM40 compare RESULT, 0 goto_if_eq FortreeCity_Gym_EventScript_1A029B msgbox FortreeCity_Gym_Text_185F4A, 4 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 9ce96effe..14b9b2c31 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -28,7 +28,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox FortreeCity_House1_Text_185737, 4 release end @@ -58,8 +58,8 @@ FortreeCity_House1_EventScript_157EC0:: @ 8157EC0 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House1_Text_185888, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index 4d935e841..ae70b8644 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -21,7 +21,7 @@ FortreeCity_House2_EventScript_1580B4:: @ 81580B4 switch RESULT case 0, FortreeCity_House2_EventScript_158161 msgbox FortreeCity_House2_Text_1864C6, 4 - giveitem ITEM_TM10 + giveitem_std ITEM_TM10 compare RESULT, 0 goto_if_eq FortreeCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM10 diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 23a96af51..1b1b41877 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -34,7 +34,7 @@ FortreeCity_House4_EventScript_1581D6:: @ 81581D6 applymovement LAST_TALKED, FortreeCity_House4_Movement_1A0839 waitmovement 0 msgbox FortreeCity_House4_Text_186881, 4 - giveitem ITEM_MENTAL_HERB + giveitem_std ITEM_MENTAL_HERB compare RESULT, 0 goto_if_eq FortreeCity_House4_EventScript_1A029B setflag FLAG_RECEIVED_MENTAL_HERB @@ -60,8 +60,8 @@ FortreeCity_House4_EventScript_15821E:: @ 815821E lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox FortreeCity_House4_Text_18695C, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_House5.inc b/data/scripts/maps/FortreeCity_House5.inc index fe10b53b0..888ebe0e2 100644 --- a/data/scripts/maps/FortreeCity_House5.inc +++ b/data/scripts/maps/FortreeCity_House5.inc @@ -13,8 +13,8 @@ FortreeCity_House5_EventScript_158244:: @ 8158244 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox FortreeCity_House5_Text_186A4F, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 5268cbeed..b82927be1 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011 .byte 0 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 - sethealplace 7 + setrespawn 7 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B setvar 0x800b, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 1932940c4..33296e510 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -7,7 +7,7 @@ GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 checkflag FLAG_RECEIVED_HM05 goto_if_eq GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 - giveitem ITEM_HM05 + giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 msgbox GraniteCave_1F_Text_194A3E, 4 release diff --git a/data/scripts/maps/GraniteCave_B1F.inc b/data/scripts/maps/GraniteCave_B1F.inc index 07a95c3f1..c6be3feca 100644 --- a/data/scripts/maps/GraniteCave_B1F.inc +++ b/data/scripts/maps/GraniteCave_B1F.inc @@ -5,6 +5,6 @@ GraniteCave_B1F_MapScripts:: @ 815CBDD .byte 0 GraniteCave_B1F_MapScript1_15CBED:: @ 815CBED - tileeffect 7 + setstepcallback 7 setholewarp MAP_GRANITE_CAVE_B2F, 255, 0, 0 end diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index dc61a77bf..344ccd479 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -9,7 +9,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 - giveitem ITEM_TM47 + giveitem_std ITEM_TM47 compare RESULT, 0 call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 6cf2d630b..18cfb904d 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -4,13 +4,13 @@ InsideOfTruck_MapScripts:: @ 815FBFF .byte 0 InsideOfTruck_MapScript1_15FC0A:: @ 815FC0A - setmaptile 4, 1, 520, 0 - setmaptile 4, 2, 528, 0 - setmaptile 4, 3, 536, 0 + setmetatile 4, 1, 520, 0 + setmetatile 4, 2, 528, 0 + setmetatile 4, 3, 536, 0 end InsideOfTruck_MapScript1_15FC26:: @ 815FC26 - tileeffect 5 + setstepcallback 5 end InsideOfTruck_EventScript_15FC29:: @ 815FC29 @@ -24,7 +24,7 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 end InsideOfTruck_EventScript_15FC45:: @ 815FC45 - sethealplace 1 + setrespawn 1 setvar 0x4092, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY @@ -36,7 +36,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45 end InsideOfTruck_EventScript_15FC68:: @ 815FC68 - sethealplace 2 + setrespawn 2 setvar 0x4092, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index e8489eb8a..dbc71b6bb 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -19,12 +19,12 @@ IslandCave_MapScript1_15EED4:: @ 815EED4 end IslandCave_EventScript_15EEDE:: @ 815EEDE - setmaptile 7, 19, 553, 1 - setmaptile 8, 19, 553, 1 - setmaptile 9, 19, 553, 1 - setmaptile 7, 20, 565, 1 - setmaptile 8, 20, 565, 1 - setmaptile 9, 20, 565, 1 + setmetatile 7, 19, 553, 1 + setmetatile 8, 19, 553, 1 + setmetatile 9, 19, 553, 1 + setmetatile 7, 20, 565, 1 + setmetatile 8, 20, 565, 1 + setmetatile 9, 20, 565, 1 return IslandCave_MapScript1_15EF15:: @ 815EF15 @@ -32,12 +32,12 @@ IslandCave_MapScript1_15EF15:: @ 815EF15 end S_OpenRegiceChamber:: @ 815EF19 - setmaptile 7, 19, 554, 1 - setmaptile 8, 19, 555, 1 - setmaptile 9, 19, 556, 1 - setmaptile 7, 20, 562, 1 - setmaptile 8, 20, 563, 0 - setmaptile 9, 20, 564, 1 + setmetatile 7, 19, 554, 1 + setmetatile 8, 19, 555, 1 + setmetatile 9, 19, 556, 1 + setmetatile 7, 20, 562, 1 + setmetatile 8, 20, 563, 0 + setmetatile 9, 20, 564, 1 special DrawWholeMapView playse SE_BAN setflag FLAG_SYS_BRAILLE_WAIT @@ -69,7 +69,7 @@ IslandCave_EventScript_15EF7C:: @ 815EF7C end IslandCave_EventScript_15EF95:: @ 815EF95 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,9 +78,9 @@ IslandCave_EventScript_15EF9D:: @ 815EF9D lock faceplayer waitse - playpokecry SPECIES_REGICE, 2 + playmoncry SPECIES_REGICE, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_REGICE, 40, ITEM_NONE setflag FLAG_HIDE_REGICE setflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 6f910d0ad..c7efee318 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -4,7 +4,7 @@ JaggedPass_MapScripts:: @ 815D266 .byte 0 JaggedPass_MapScript1_15D271:: @ 815D271 - tileeffect 1 + setstepcallback 1 end JaggedPass_MapScript1_15D274:: @ 815D274 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 29b5ef2b9..8b4384ed8 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -83,7 +83,7 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 LavaridgeTown_EventScript_14E5AB:: @ 814E5AB msgbox LavaridgeTown_Text_16BDA4, 4 - giveitem ITEM_GO_GOGGLES + giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16BE7D, 4 goto LavaridgeTown_EventScript_14E5F5 @@ -91,7 +91,7 @@ LavaridgeTown_EventScript_14E5AB:: @ 814E5AB LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 msgbox LavaridgeTown_Text_16BF92, 4 - giveitem ITEM_GO_GOGGLES + giveitem_std ITEM_GO_GOGGLES setflag FLAG_RECEIVED_GO_GOGGLES msgbox LavaridgeTown_Text_16C020, 4 goto LavaridgeTown_EventScript_14E5F5 @@ -277,7 +277,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A msgbox LavaridgeTown_Text_16C174, 5 compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E7B2 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index a44368925..9dd1ae59d 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -94,7 +94,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 end LavaridgeTown_Gym_1F_EventScript_1537A7:: @ 81537A7 - giveitem ITEM_TM50 + giveitem_std ITEM_TM50 compare RESULT, 0 goto_if_eq LavaridgeTown_Gym_1F_EventScript_1A029B msgbox LavaridgeTown_Gym_1F_Text_176B8F, 4 diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index c5e033422..913734dd5 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -31,7 +31,7 @@ LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 checkflag FLAG_RECEIVED_CHARCOAL goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 - giveitem ITEM_CHARCOAL + giveitem_std ITEM_CHARCOAL compare RESULT, 0 goto_if_eq LavaridgeTown_HerbShop_EventScript_1A029B setflag FLAG_RECEIVED_CHARCOAL diff --git a/data/scripts/maps/LavaridgeTown_House.inc b/data/scripts/maps/LavaridgeTown_House.inc index c75cb9e4b..6fc14e0b6 100644 --- a/data/scripts/maps/LavaridgeTown_House.inc +++ b/data/scripts/maps/LavaridgeTown_House.inc @@ -9,8 +9,8 @@ LavaridgeTown_House_EventScript_1538B7:: @ 81538B7 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox LavaridgeTown_House_Text_176D94, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 9d0f31059..0efda9c1e 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C .byte 0 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 - sethealplace 16 + setrespawn 16 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B setvar 0x800b, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 30f0ff36e..6494f2a6f 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -15,18 +15,18 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 LilycoveCity_MapScript1_14CA3F:: @ 814CA3F .ifndef SAPPHIRE - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 680, 1 - setmaptile 71, 4, 681, 1 - setmaptile 72, 4, 682, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 688, 1 - setmaptile 71, 5, 689, 0 - setmaptile 72, 5, 690, 1 - setmaptile 69, 6, 446, 0 - setmaptile 70, 6, 447, 0 - setmaptile 71, 6, 368, 0 - setmaptile 72, 6, 445, 0 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 680, 1 + setmetatile 71, 4, 681, 1 + setmetatile 72, 4, 682, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 688, 1 + setmetatile 71, 5, 689, 0 + setmetatile 72, 5, 690, 1 + setmetatile 69, 6, 446, 0 + setmetatile 70, 6, 447, 0 + setmetatile 71, 6, 368, 0 + setmetatile 72, 6, 445, 0 .endif checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE call_if 0, LilycoveCity_EventScript_14CABE @@ -35,29 +35,29 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F end LilycoveCity_EventScript_14CABE:: @ 814CABE - setmaptile 76, 12, 656, 1 - setmaptile 77, 12, 657, 1 - setmaptile 76, 13, 672, 1 - setmaptile 77, 13, 673, 1 - setmaptile 76, 14, 664, 1 - setmaptile 77, 14, 665, 1 - setmaptile 76, 15, 672, 1 - setmaptile 77, 15, 673, 1 - setmaptile 77, 16, 664, 1 - setmaptile 78, 16, 665, 1 - setmaptile 77, 17, 672, 1 - setmaptile 78, 17, 673, 1 + setmetatile 76, 12, 656, 1 + setmetatile 77, 12, 657, 1 + setmetatile 76, 13, 672, 1 + setmetatile 77, 13, 673, 1 + setmetatile 76, 14, 664, 1 + setmetatile 77, 14, 665, 1 + setmetatile 76, 15, 672, 1 + setmetatile 77, 15, 673, 1 + setmetatile 77, 16, 664, 1 + setmetatile 78, 16, 665, 1 + setmetatile 77, 17, 672, 1 + setmetatile 78, 17, 673, 1 return LilycoveCity_EventScript_14CB2B:: @ 814CB2B - setmaptile 69, 4, 169, 1 - setmaptile 70, 4, 169, 1 - setmaptile 71, 4, 169, 1 - setmaptile 72, 4, 169, 1 - setmaptile 69, 5, 145, 1 - setmaptile 70, 5, 145, 1 - setmaptile 71, 5, 145, 1 - setmaptile 72, 5, 145, 1 + setmetatile 69, 4, 169, 1 + setmetatile 70, 4, 169, 1 + setmetatile 71, 4, 169, 1 + setmetatile 72, 4, 169, 1 + setmetatile 69, 5, 145, 1 + setmetatile 70, 5, 145, 1 + setmetatile 71, 5, 145, 1 + setmetatile 72, 5, 145, 1 return LilycoveCity_EventScript_14CB74:: @ 814CB74 @@ -69,7 +69,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE @@ -415,7 +415,7 @@ LilycoveCity_EventScript_14CF6B:: @ 814CF6B applymovement LAST_TALKED, LilycoveCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 6a1bc09e8..c97a01989 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -360,7 +360,7 @@ LilycoveCity_ContestLobby_EventScript_158C35:: @ 8158C35 LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 - choosecontestpkmn + choosecontestmon compare 0x8004, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 @@ -472,7 +472,7 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C addvar 0x8004, 1 - getnumberstring 1, 32772 + buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage addvar 0x8004, 65535 @@ -497,14 +497,14 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 playse 71 - setmaptile 9, 2, 545, 1 - setmaptile 9, 3, 609, 1 + setmetatile 9, 2, 545, 1 + setmetatile 9, 3, 609, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 playse 71 - setmaptile 9, 2, 721, 1 - setmaptile 9, 3, 729, 1 + setmetatile 9, 2, 721, 1 + setmetatile 9, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 2, LilycoveCity_ContestLobby_Movement_158EAE @@ -585,7 +585,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar 0x4094, 0x1 - additem ITEM_CONTEST_PASS, 1 + giveitem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 setvar CONTEST_RANK, 3 setvar 0x4099, 1 @@ -636,14 +636,14 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, LilycoveCity_ContestLobby_Movement_15901C @@ -765,7 +765,7 @@ LilycoveCity_ContestLobby_EventScript_15908D:: @ 815908D SlateportCity_ContestLobby_EventScript_15908D:: @ 815908D lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 7078a83ca..2806b6125 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -23,7 +23,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A167:: @ 815A167 faceplayer message LilycoveCity_DepartmentStoreRooftop_Text_1A0BE4 waitmessage - pokemartdecor LilycoveCity_DepartmentStoreRooftop_Decorations + pokemartdecoration LilycoveCity_DepartmentStoreRooftop_Decorations msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C02, 4 release end @@ -146,12 +146,12 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - getitemname 0, 0x4000 + bufferitemname 0, 0x4000 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -161,9 +161,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 @@ -173,9 +173,9 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - additem 0x4000, 1 - getitemname 1, 0x4000 - getstdstring 2, 14 + giveitem 0x4000, 1 + bufferitemname 1, 0x4000 + bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index cfcca25fb..dbfd79e98 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -40,7 +40,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare 0x8006, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - getitemname 0, 0x8005 + bufferitemname 0, 0x8005 compare 0x8004, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare 0x8004, 2 @@ -49,7 +49,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare 0x8004, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem 0x8005 + giveitem_std 0x8005 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -111,7 +111,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem 0x4045 + giveitem_std 0x4045 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 setvar 0x4045, 0 @@ -134,9 +134,9 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EF2:: @ 8159EF2 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox LilycoveCity_DepartmentStore_1F_Text_18C0C3, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc index 835a0f48d..184d3b816 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_5F.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A061:: @ 815A061 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items1 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items1 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -34,7 +34,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A094:: @ 815A094 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items2 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items2 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -59,7 +59,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0C2:: @ 815A0C2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items3 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items3 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end @@ -84,7 +84,7 @@ LilycoveCity_DepartmentStore_5F_EventScript_15A0F2:: @ 815A0F2 faceplayer message LilycoveCity_DepartmentStore_5F_Text_1A0BE4 waitmessage - pokemartbp LilycoveCity_DepartmentStore_5F_Items4 + pokemartdecoration2 LilycoveCity_DepartmentStore_5F_Items4 msgbox LilycoveCity_DepartmentStore_5F_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 7385f8c72..9687c73fe 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -79,13 +79,13 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare FACING, 2 call_if 1, LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -117,7 +117,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 13, 10 + hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR delay 60 addobject 4 delay 30 @@ -134,7 +134,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE compare FACING, 4 call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty setvar 0x8004, 2 call LilycoveCity_Harbor_EventScript_1A040E diff --git a/data/scripts/maps/LilycoveCity_House1.inc b/data/scripts/maps/LilycoveCity_House1.inc index 4defe37b8..15535a122 100644 --- a/data/scripts/maps/LilycoveCity_House1.inc +++ b/data/scripts/maps/LilycoveCity_House1.inc @@ -9,8 +9,8 @@ LilycoveCity_House1_EventScript_159B8F:: @ 8159B8F lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox LilycoveCity_House1_Text_18B82B, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index bbca8aa6d..d0065c9e8 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -7,7 +7,7 @@ LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 checkflag FLAG_RECEIVED_TM44 goto_if_eq LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 - giveitem ITEM_TM44 + giveitem_std ITEM_TM44 compare RESULT, 0 goto_if_eq LilycoveCity_House2_EventScript_1A029B setflag FLAG_RECEIVED_TM44 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index db9855211..577805fb2 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -33,32 +33,32 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD - setmaptile 10, 6, 606, 1 - setmaptile 11, 6, 607, 1 + setmetatile 10, 6, 606, 1 + setmetatile 11, 6, 607, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_158615:: @ 8158615 - setmaptile 18, 6, 604, 1 - setmaptile 19, 6, 605, 1 + setmetatile 18, 6, 604, 1 + setmetatile 19, 6, 605, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_15862D:: @ 815862D - setmaptile 14, 10, 608, 1 - setmaptile 15, 10, 609, 1 + setmetatile 14, 10, 608, 1 + setmetatile 15, 10, 609, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_158645:: @ 8158645 - setmaptile 6, 10, 602, 1 - setmaptile 7, 10, 603, 1 + setmetatile 6, 10, 602, 1 + setmetatile 7, 10, 603, 1 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D - setmaptile 2, 6, 610, 1 - setmaptile 3, 6, 611, 1 + setmetatile 2, 6, 610, 1 + setmetatile 3, 6, 611, 1 end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 @@ -124,7 +124,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158735:: @ 8158735 LilycoveCity_LilycoveMuseum_2F_EventScript_15875C:: @ 815875C applymovement 1, LilycoveCity_LilycoveMuseum_2F_Movement_1A0839 msgbox LilycoveCity_LilycoveMuseum_2F_Text_188120, 4 - givedecoration DECOR_GLASS_ORNAMENT + givedecoration_std DECOR_GLASS_ORNAMENT compare RESULT, 0 goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158783 setflag FLAG_RECEIVED_GLASS_ORNAMENT diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index d1be7b704..38428311b 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327 .byte 0 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D - sethealplace 8 + setrespawn 8 end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 setvar 0x800b, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 52c52b798..13c18d51e 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -124,7 +124,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT setvar 0x4092, 3 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY closedoor 0x8004, 0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT @@ -599,7 +599,7 @@ LittlerootTown_EventScript_14DB46:: @ 814DB46 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -611,7 +611,7 @@ LittlerootTown_EventScript_14DB6C:: @ 814DB6C waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -623,7 +623,7 @@ LittlerootTown_EventScript_14DB92:: @ 814DB92 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -635,7 +635,7 @@ LittlerootTown_EventScript_14DBB8:: @ 814DBB8 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -647,7 +647,7 @@ LittlerootTown_EventScript_14DBDE:: @ 814DBDE waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -659,7 +659,7 @@ LittlerootTown_EventScript_14DC04:: @ 814DC04 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -671,7 +671,7 @@ LittlerootTown_EventScript_14DC2A:: @ 814DC2A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -683,7 +683,7 @@ LittlerootTown_EventScript_14DC50:: @ 814DC50 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim return @@ -853,7 +853,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 - hideobject 4, 0, 9 + hideobjectat 4, MAP_LITTLEROOT_TOWN closedoor 0x8009, 0x800a waitdooranim goto LittlerootTown_EventScript_14DD2B diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 731e6fb5f..d4dd94aae 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -12,8 +12,8 @@ LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 @@ -23,7 +23,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152673:: @ 8152673 return LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 - setmaptile 3, 7, 659, 1 + setmetatile 3, 7, 659, 1 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index d65e943fd..e23a05243 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -12,8 +12,8 @@ LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E - setmaptile 5, 4, 624, 1 - setmaptile 5, 2, 616, 1 + setmetatile 5, 4, 624, 1 + setmetatile 5, 2, 616, 1 return LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 @@ -23,7 +23,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1528B1:: @ 81528B1 return LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE - setmaptile 6, 7, 659, 1 + setmetatile 6, 7, 659, 1 return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index f78d30ec2..6792c5932 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -24,7 +24,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE lockall - getfirstpartypokename 0 + bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage playfanfare 370 @@ -138,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 @@ -147,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 - giveitem ITEM_POKE_BALL, 5 + giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index ae00ca369..6a7e02848 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -291,7 +291,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 - giveitem ITEM_BASEMENT_KEY + giveitem_std ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY msgbox MauvilleCity_Text_166331, 4 release @@ -304,7 +304,7 @@ MauvilleCity_EventScript_14C332:: @ 814C332 MauvilleCity_EventScript_14C33C:: @ 814C33C msgbox MauvilleCity_Text_1663EB, 4 - giveitem ITEM_TM24 + giveitem_std ITEM_TM24 compare RESULT, 0 goto_if_eq MauvilleCity_EventScript_1A029B setflag FLAG_RECEIVED_TM24 diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index ef44a20bb..6c2dc57e1 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -46,13 +46,13 @@ MauvilleCity_BikeShop_EventScript_156824:: @ 8156824 MauvilleCity_BikeShop_EventScript_15682D:: @ 815682D msgbox MauvilleCity_BikeShop_Text_181332, 4 - giveitem ITEM_MACH_BIKE + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_156847:: @ 8156847 msgbox MauvilleCity_BikeShop_Text_18134A, 4 - giveitem ITEM_ACRO_BIKE + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end @@ -90,16 +90,16 @@ MauvilleCity_BikeShop_EventScript_1568BF:: @ 81568BF MauvilleCity_BikeShop_EventScript_1568C9:: @ 81568C9 incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181439, 4 - removeitem ITEM_ACRO_BIKE, 1 - giveitem ITEM_MACH_BIKE + takeitem ITEM_ACRO_BIKE, 1 + giveitem_std ITEM_MACH_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end MauvilleCity_BikeShop_EventScript_1568EA:: @ 81568EA incrementgamestat GAME_STAT_TRADED_BIKES msgbox MauvilleCity_BikeShop_Text_181408, 4 - removeitem ITEM_MACH_BIKE, 1 - giveitem ITEM_ACRO_BIKE + takeitem ITEM_MACH_BIKE, 1 + giveitem_std ITEM_ACRO_BIKE goto MauvilleCity_BikeShop_EventScript_156861 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 646546dc7..8228238f3 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -129,17 +129,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 setvar 0x4001, 1 - getdecorname 0, 88 + bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 setvar 0x4001, 2 - getdecorname 0, 89 + bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE setvar 0x4001, 3 - getdecorname 0, 90 + bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C @@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 88 - checkdecor 88 + bufferdecorationname 1, 88 + checkdecorspace 88 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 88 + givedecoration 88 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 89 - checkdecor 89 + bufferdecorationname 1, 89 + checkdecorspace 89 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 89 + givedecoration 89 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins 16386 compare 0x4002, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - getdecorname 1, 90 - checkdecor 90 + bufferdecorationname 1, 90 + checkdecorspace 90 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - adddecor 90 + givedecoration 90 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -252,27 +252,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 setvar 0x4001, 1 - getitemname 0, ITEM_TM32 + bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 setvar 0x4001, 2 - getitemname 0, ITEM_TM29 + bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 setvar 0x4001, 3 - getitemname 0, ITEM_TM35 + bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 setvar 0x4001, 4 - getitemname 0, ITEM_TM24 + bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE setvar 0x4001, 5 - getitemname 0, ITEM_TM13 + bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC @@ -295,7 +295,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 1500 - additem ITEM_TM32, 1 + giveitem ITEM_TM32, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -310,7 +310,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 3500 - additem ITEM_TM29, 1 + giveitem ITEM_TM29, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -325,7 +325,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM35, 1 + giveitem ITEM_TM35, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -340,7 +340,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM24, 1 + giveitem ITEM_TM24, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -355,7 +355,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C takecoins 4000 - additem ITEM_TM13, 1 + giveitem ITEM_TM13, 1 updatecoinsbox 0, 0 playse 95 msgbox MauvilleCity_GameCorner_Text_181F08, 4 @@ -401,34 +401,34 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 end MauvilleCity_GameCorner_EventScript_156FDB:: @ 8156FDB - getdecorname 1, DECOR_TREECKO_DOLL - checkdecor DECOR_TREECKO_DOLL + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_TREECKO_DOLL + givedecoration_std DECOR_TREECKO_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_157005:: @ 8157005 - getdecorname 1, DECOR_TORCHIC_DOLL - checkdecor DECOR_TORCHIC_DOLL + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_TORCHIC_DOLL + givedecoration_std DECOR_TORCHIC_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end MauvilleCity_GameCorner_EventScript_15702F:: @ 815702F - getdecorname 1, DECOR_MUDKIP_DOLL - checkdecor DECOR_MUDKIP_DOLL + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157059 msgbox MauvilleCity_GameCorner_Text_181F89, 4 - givedecoration DECOR_MUDKIP_DOLL + givedecoration_std DECOR_MUDKIP_DOLL setflag FLAG_RECEIVED_STARTER_DOLL goto MauvilleCity_GameCorner_EventScript_157072 end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index d94436973..799fb0992 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -18,31 +18,31 @@ MauvilleCity_Gym_EventScript_156491:: @ 8156491 end MauvilleCity_Gym_EventScript_15649B:: @ 815649B - setmaptile 4, 7, 560, 0 - setmaptile 4, 8, 568, 0 - setmaptile 5, 7, 561, 0 - setmaptile 5, 8, 569, 0 - setmaptile 3, 8, 578, 1 - setmaptile 3, 9, 538, 0 - setmaptile 3, 10, 593, 0 - setmaptile 1, 10, 546, 0 - setmaptile 1, 11, 554, 1 - setmaptile 2, 10, 547, 0 - setmaptile 2, 11, 555, 1 - setmaptile 4, 10, 546, 0 - setmaptile 4, 11, 554, 1 - setmaptile 5, 10, 547, 0 - setmaptile 5, 11, 555, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 12, 538, 0 - setmaptile 6, 13, 593, 0 - setmaptile 3, 11, 577, 1 - setmaptile 3, 12, 585, 1 - setmaptile 3, 13, 592, 1 - setmaptile 4, 13, 560, 0 - setmaptile 4, 14, 568, 0 - setmaptile 5, 13, 561, 0 - setmaptile 5, 14, 569, 0 + setmetatile 4, 7, 560, 0 + setmetatile 4, 8, 568, 0 + setmetatile 5, 7, 561, 0 + setmetatile 5, 8, 569, 0 + setmetatile 3, 8, 578, 1 + setmetatile 3, 9, 538, 0 + setmetatile 3, 10, 593, 0 + setmetatile 1, 10, 546, 0 + setmetatile 1, 11, 554, 1 + setmetatile 2, 10, 547, 0 + setmetatile 2, 11, 555, 1 + setmetatile 4, 10, 546, 0 + setmetatile 4, 11, 554, 1 + setmetatile 5, 10, 547, 0 + setmetatile 5, 11, 555, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 12, 538, 0 + setmetatile 6, 13, 593, 0 + setmetatile 3, 11, 577, 1 + setmetatile 3, 12, 585, 1 + setmetatile 3, 13, 592, 1 + setmetatile 4, 13, 560, 0 + setmetatile 4, 14, 568, 0 + setmetatile 5, 13, 561, 0 + setmetatile 5, 14, 569, 0 end MauvilleCity_Gym_EventScript_15657D:: @ 815657D @@ -96,7 +96,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB end MauvilleCity_Gym_EventScript_15661D:: @ 815661D - giveitem ITEM_TM34 + giveitem_std ITEM_TM34 compare RESULT, 0 goto_if_eq MauvilleCity_Gym_EventScript_1A029B msgbox MauvilleCity_Gym_Text_180E76, 4 diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index acb9f39fa..210288517 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -7,7 +7,7 @@ MauvilleCity_House1_EventScript_1569FD:: @ 81569FD checkflag FLAG_RECEIVED_HM06 goto_if_eq MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 - giveitem ITEM_HM06 + giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 msgbox MauvilleCity_House1_Text_181B64, 4 release diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 7104ebee7..a058003bc 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -28,8 +28,8 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 MauvilleCity_House2_EventScript_15731B:: @ 815731B msgbox MauvilleCity_House2_Text_182515, 4 - removeitem ITEM_HARBOR_MAIL, 1 - giveitem ITEM_COIN_CASE + takeitem ITEM_HARBOR_MAIL, 1 + giveitem_std ITEM_COIN_CASE setflag FLAG_RECEIVED_COIN_CASE goto MauvilleCity_House2_EventScript_15733D end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index 7122b8c3c..de30e21cd 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351 .byte 0 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357 - sethealplace 5 + setrespawn 5 call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B goto MauvilleCity_PokemonCenter_1F_EventScript_157365 end @@ -16,7 +16,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 setvar 0x800b, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 31ed83b2a..f165bd3ef 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -74,7 +74,7 @@ MossdeepCity_EventScript_14D027:: @ 814D027 compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 - giveitem ITEM_KINGS_ROCK + giveitem_std ITEM_KINGS_ROCK compare RESULT, 0 goto_if_eq MossdeepCity_EventScript_1A029B setflag FLAG_RECEIVED_KINGS_ROCK diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index afc02e82c..75fc3c6b8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -11,8 +11,8 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 - setmaptile 3, 0, 653, 1 - setmaptile 3, 1, 661, 1 + setmetatile 3, 0, 653, 1 + setmetatile 3, 1, 661, 1 return MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 94f44e311..12a94154b 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -48,14 +48,14 @@ MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 setvar 0x40c0, 1 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE setvar 0x40c0, 2 special ShowFieldMessageStringVar4 waitmessage - waitbutton + waitbuttonpress return MossdeepCity_GameCorner_B1F_Movement_15AEF9:: @ 815AEF9 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 0c27c28f7..b1550a4c1 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -26,26 +26,26 @@ MossdeepCity_Gym_EventScript_15A506:: @ 815A506 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A528:: @ 815A528 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A540:: @ 815A540 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A558:: @ 815A558 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 end MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B @@ -72,7 +72,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 end MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 - giveitem ITEM_TM04 + giveitem_std ITEM_TM04 compare RESULT, 0 goto_if_eq MossdeepCity_Gym_EventScript_1A029B msgbox MossdeepCity_Gym_Text_18D1CF, 4 @@ -87,8 +87,8 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 516, 0 - setmaptile 2, 7, 569, 1 + setmetatile 5, 5, 516, 0 + setmetatile 2, 7, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -102,8 +102,8 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 clearflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 5, 5, 524, 0 - setmaptile 2, 7, 568, 1 + setmetatile 5, 5, 524, 0 + setmetatile 2, 7, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -114,8 +114,8 @@ MossdeepCity_Gym_EventScript_15A646:: @ 815A646 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 516, 0 - setmaptile 8, 10, 569, 1 + setmetatile 8, 14, 516, 0 + setmetatile 8, 10, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -123,8 +123,8 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 8, 14, 517, 0 - setmaptile 8, 10, 568, 1 + setmetatile 8, 14, 517, 0 + setmetatile 8, 10, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -135,8 +135,8 @@ MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 524, 0 - setmaptile 17, 15, 569, 1 + setmetatile 15, 17, 524, 0 + setmetatile 17, 15, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -144,8 +144,8 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 15, 17, 516, 0 - setmaptile 17, 15, 568, 1 + setmetatile 15, 17, 516, 0 + setmetatile 17, 15, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -156,8 +156,8 @@ MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 525, 0 - setmaptile 5, 24, 569, 1 + setmetatile 1, 23, 525, 0 + setmetatile 5, 24, 569, 1 goto MossdeepCity_Gym_EventScript_15A619 end @@ -165,8 +165,8 @@ MossdeepCity_Gym_EventScript_15A71D:: @ 815A71D clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 - setmaptile 1, 23, 516, 0 - setmaptile 5, 24, 568, 1 + setmetatile 1, 23, 516, 0 + setmetatile 5, 24, 568, 1 goto MossdeepCity_Gym_EventScript_15A619 end diff --git a/data/scripts/maps/MossdeepCity_House1.inc b/data/scripts/maps/MossdeepCity_House1.inc index 62edffc8b..97a5fc452 100644 --- a/data/scripts/maps/MossdeepCity_House1.inc +++ b/data/scripts/maps/MossdeepCity_House1.inc @@ -4,7 +4,7 @@ MossdeepCity_House1_MapScripts:: @ 815A82E MossdeepCity_House1_EventScript_15A82F:: @ 815A82F lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox MossdeepCity_House1_Text_18D465, 4 specialvar RESULT, GetPokeblockNameByMonNature compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index f90fc9350..1da204ff0 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -13,9 +13,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox MossdeepCity_House2_Text_18D61E, 4 - waitpokecry + waitmoncry closemessage setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 63054a60c..6632ac793 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -10,7 +10,7 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 compare RESULT, 0 goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 - giveitem ITEM_SUPER_ROD + giveitem_std ITEM_SUPER_ROD setflag FLAG_RECEIVED_SUPER_ROD msgbox MossdeepCity_House3_Text_18D9E3, 4 release diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index fd400ad16..856ee1287 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -35,8 +35,8 @@ MossdeepCity_House4_EventScript_15AB77:: @ 815AB77 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox MossdeepCity_House4_Text_18E1E1, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 4ed3ea57e..c26238102 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0 .byte 0 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 - sethealplace 9 + setrespawn 9 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA setvar 0x800b, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 165742145..884124567 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -6,7 +6,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B faceplayer dodailyevents specialvar RESULT, GetWeekCount - getnumberstring 0, RESULT + buffernumberstring 0, RESULT compare RESULT, 0 call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 @@ -35,7 +35,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 - giveitem ITEM_SUN_STONE + giveitem_std ITEM_SUN_STONE compare RESULT, 0 goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_1A029B setflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 55ee9ebac..7e08cfa69 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -10,7 +10,7 @@ MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF - setmaptile 6, 4, 753, 1 + setmetatile 6, 4, 753, 1 return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 @@ -39,7 +39,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B applymovement 1, MossdeepCity_StevensHouse_Movement_15AA6E waitmovement 0 msgbox MossdeepCity_StevensHouse_Text_18DA77, 4 - giveitem ITEM_HM08 + giveitem_std ITEM_HM08 setflag FLAG_RECEIVED_HM08 setflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER msgbox MossdeepCity_StevensHouse_Text_18DB22, 4 @@ -74,7 +74,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 compare RESULT, 0 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar 0x8004, RESULT @@ -83,8 +83,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage - givepoke SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 - getspeciesname 1, SPECIES_BELDUM + givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 + bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 compare RESULT, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 @@ -125,6 +125,6 @@ MossdeepCity_StevensHouse_EventScript_15AB16:: @ 815AB16 end MossdeepCity_StevensHouse_EventScript_15AB20:: @ 815AB20 - giveitem ITEM_HM08, 1, 1 + giveitem_std ITEM_HM08, 1, 1 setflag FLAG_RECEIVED_HM08 end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index 0a3570d6d..a51695b59 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -9,7 +9,7 @@ MtChimney_MapScript1_15CF87:: @ 815CF87 end MtChimney_MapScript1_15CF92:: @ 815CF92 - tileeffect 1 + setstepcallback 1 end MtChimney_EventScript_15CF95:: @ 815CF95 @@ -27,7 +27,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 call_if 1, MtChimney_EventScript_15D000 - giveitem ITEM_LAVA_COOKIE + giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 hidemoneybox 0, 0 @@ -414,7 +414,7 @@ MtChimney_EventScript_15D17D:: @ 815D17D compare RESULT, 0 goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 - giveitem ITEM_METEORITE + giveitem_std ITEM_METEORITE setflag FLAG_RECEIVED_METEORITE releaseall end diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 5d6e42874..7073000d5 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -7,7 +7,7 @@ MtPyre_1F_EventScript_15D323:: @ 815D323 checkflag FLAG_RECEIVED_CLEANSE_TAG goto_if_eq MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 - giveitem ITEM_CLEANSE_TAG + giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 goto_if_eq MtPyre_1F_EventScript_1A029B setflag FLAG_RECEIVED_CLEANSE_TAG diff --git a/data/scripts/maps/MtPyre_2F.inc b/data/scripts/maps/MtPyre_2F.inc index 90ad1d9cc..1d2368597 100644 --- a/data/scripts/maps/MtPyre_2F.inc +++ b/data/scripts/maps/MtPyre_2F.inc @@ -5,7 +5,7 @@ MtPyre_2F_MapScripts:: @ 815D36E .byte 0 MtPyre_2F_MapScript1_15D37E:: @ 815D37E - tileeffect 7 + setstepcallback 7 setholewarp MAP_MT_PYRE_1F, 255, 0, 0 end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 47a842b56..73e2e4d97 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -63,7 +63,7 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 .else msgbox MtPyre_Summit_Text_1B5FE6, 4 .endif - giveitem ITEM_RED_OR_BLUE_ORB + giveitem_std ITEM_RED_OR_BLUE_ORB setflag FLAG_RECEIVED_RED_OR_BLUE_ORB releaseall end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 1234f5653..a88b35087 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -9,12 +9,12 @@ NewMauville_Entrance_MapScript1_15E495:: @ 815E495 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 - setmaptile 3, 0, 788, 1 - setmaptile 4, 0, 789, 1 - setmaptile 5, 0, 790, 1 - setmaptile 3, 1, 796, 1 - setmaptile 4, 1, 797, 1 - setmaptile 5, 1, 798, 1 + setmetatile 3, 0, 788, 1 + setmetatile 4, 0, 789, 1 + setmetatile 5, 0, 790, 1 + setmetatile 3, 1, 796, 1 + setmetatile 4, 1, 797, 1 + setmetatile 5, 1, 798, 1 return NewMauville_Entrance_MapScript1_15E4D8:: @ 815E4D8 @@ -33,12 +33,12 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 - setmaptile 3, 0, 707, 0 - setmaptile 4, 0, 708, 0 - setmaptile 5, 0, 709, 0 - setmaptile 3, 1, 715, 1 - setmaptile 4, 1, 716, 0 - setmaptile 5, 1, 717, 1 + setmetatile 3, 0, 707, 0 + setmetatile 4, 0, 708, 0 + setmetatile 5, 0, 709, 0 + setmetatile 3, 1, 715, 1 + setmetatile 4, 1, 716, 0 + setmetatile 5, 1, 717, 1 special DrawWholeMapView playse 20 setvar 0x40ba, 1 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index aa6cf6310..aefb23c61 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -48,83 +48,83 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 end NewMauville_Inside_EventScript_15E5DA:: @ 815E5DA - setmaptile 23, 34, 617, 1 - setmaptile 23, 35, 625, 1 - setmaptile 23, 36, 621, 0 - setmaptile 23, 37, 641, 0 - setmaptile 10, 16, 617, 1 - setmaptile 10, 17, 625, 1 - setmaptile 10, 18, 621, 0 - setmaptile 10, 19, 641, 0 - setmaptile 10, 0, 617, 1 - setmaptile 10, 1, 625, 1 - setmaptile 10, 2, 621, 0 - setmaptile 10, 3, 641, 0 - setmaptile 37, 33, 694, 1 - setmaptile 37, 34, 702, 1 - setmaptile 37, 35, 710, 1 - setmaptile 37, 36, 718, 1 - setmaptile 28, 22, 694, 1 - setmaptile 28, 23, 702, 1 - setmaptile 28, 24, 710, 1 - setmaptile 28, 25, 718, 1 - setmaptile 10, 24, 694, 1 - setmaptile 10, 25, 702, 1 - setmaptile 10, 26, 710, 1 - setmaptile 10, 27, 718, 1 - setmaptile 21, 2, 694, 1 - setmaptile 21, 3, 702, 1 - setmaptile 21, 4, 710, 1 - setmaptile 21, 5, 718, 1 - setmaptile 6, 11, 591, 0 - setmaptile 13, 10, 591, 0 - setmaptile 16, 22, 591, 0 - setmaptile 4, 26, 591, 0 - setmaptile 30, 38, 591, 0 - setmaptile 2, 11, 558, 0 - setmaptile 17, 10, 558, 0 - setmaptile 25, 18, 558, 0 - setmaptile 18, 36, 558, 0 + setmetatile 23, 34, 617, 1 + setmetatile 23, 35, 625, 1 + setmetatile 23, 36, 621, 0 + setmetatile 23, 37, 641, 0 + setmetatile 10, 16, 617, 1 + setmetatile 10, 17, 625, 1 + setmetatile 10, 18, 621, 0 + setmetatile 10, 19, 641, 0 + setmetatile 10, 0, 617, 1 + setmetatile 10, 1, 625, 1 + setmetatile 10, 2, 621, 0 + setmetatile 10, 3, 641, 0 + setmetatile 37, 33, 694, 1 + setmetatile 37, 34, 702, 1 + setmetatile 37, 35, 710, 1 + setmetatile 37, 36, 718, 1 + setmetatile 28, 22, 694, 1 + setmetatile 28, 23, 702, 1 + setmetatile 28, 24, 710, 1 + setmetatile 28, 25, 718, 1 + setmetatile 10, 24, 694, 1 + setmetatile 10, 25, 702, 1 + setmetatile 10, 26, 710, 1 + setmetatile 10, 27, 718, 1 + setmetatile 21, 2, 694, 1 + setmetatile 21, 3, 702, 1 + setmetatile 21, 4, 710, 1 + setmetatile 21, 5, 718, 1 + setmetatile 6, 11, 591, 0 + setmetatile 13, 10, 591, 0 + setmetatile 16, 22, 591, 0 + setmetatile 4, 26, 591, 0 + setmetatile 30, 38, 591, 0 + setmetatile 2, 11, 558, 0 + setmetatile 17, 10, 558, 0 + setmetatile 25, 18, 558, 0 + setmetatile 18, 36, 558, 0 return NewMauville_Inside_EventScript_15E728:: @ 815E728 - setmaptile 23, 34, 695, 1 - setmaptile 23, 35, 703, 1 - setmaptile 23, 36, 711, 1 - setmaptile 23, 37, 719, 1 - setmaptile 10, 16, 695, 1 - setmaptile 10, 17, 703, 1 - setmaptile 10, 18, 711, 1 - setmaptile 10, 19, 719, 1 - setmaptile 10, 0, 695, 1 - setmaptile 10, 1, 703, 1 - setmaptile 10, 2, 711, 1 - setmaptile 10, 3, 719, 1 - setmaptile 37, 33, 617, 1 - setmaptile 37, 34, 625, 1 - setmaptile 37, 35, 621, 0 - setmaptile 37, 36, 641, 0 - setmaptile 28, 22, 617, 1 - setmaptile 28, 23, 625, 1 - setmaptile 28, 24, 621, 0 - setmaptile 28, 25, 641, 0 - setmaptile 10, 24, 617, 1 - setmaptile 10, 25, 625, 1 - setmaptile 10, 26, 621, 0 - setmaptile 10, 27, 641, 0 - setmaptile 21, 2, 617, 1 - setmaptile 21, 3, 625, 1 - setmaptile 21, 4, 621, 0 - setmaptile 21, 5, 641, 0 - setmaptile 2, 11, 591, 0 - setmaptile 17, 10, 591, 0 - setmaptile 25, 18, 591, 0 - setmaptile 18, 36, 591, 0 - setmaptile 6, 11, 566, 0 - setmaptile 13, 10, 566, 0 - setmaptile 16, 22, 566, 0 - setmaptile 4, 26, 566, 0 - setmaptile 30, 38, 566, 0 + setmetatile 23, 34, 695, 1 + setmetatile 23, 35, 703, 1 + setmetatile 23, 36, 711, 1 + setmetatile 23, 37, 719, 1 + setmetatile 10, 16, 695, 1 + setmetatile 10, 17, 703, 1 + setmetatile 10, 18, 711, 1 + setmetatile 10, 19, 719, 1 + setmetatile 10, 0, 695, 1 + setmetatile 10, 1, 703, 1 + setmetatile 10, 2, 711, 1 + setmetatile 10, 3, 719, 1 + setmetatile 37, 33, 617, 1 + setmetatile 37, 34, 625, 1 + setmetatile 37, 35, 621, 0 + setmetatile 37, 36, 641, 0 + setmetatile 28, 22, 617, 1 + setmetatile 28, 23, 625, 1 + setmetatile 28, 24, 621, 0 + setmetatile 28, 25, 641, 0 + setmetatile 10, 24, 617, 1 + setmetatile 10, 25, 625, 1 + setmetatile 10, 26, 621, 0 + setmetatile 10, 27, 641, 0 + setmetatile 21, 2, 617, 1 + setmetatile 21, 3, 625, 1 + setmetatile 21, 4, 621, 0 + setmetatile 21, 5, 641, 0 + setmetatile 2, 11, 591, 0 + setmetatile 17, 10, 591, 0 + setmetatile 25, 18, 591, 0 + setmetatile 18, 36, 591, 0 + setmetatile 6, 11, 566, 0 + setmetatile 13, 10, 566, 0 + setmetatile 16, 22, 566, 0 + setmetatile 4, 26, 566, 0 + setmetatile 30, 38, 566, 0 return NewMauville_Inside_EventScript_15E876:: @ 815E876 @@ -136,15 +136,15 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 end NewMauville_Inside_EventScript_15E88B:: @ 815E88B - setmaptile 33, 6, 591, 0 - setmaptile 32, 2, 752, 1 - setmaptile 33, 2, 753, 1 - setmaptile 34, 2, 754, 1 - setmaptile 35, 2, 755, 1 - setmaptile 32, 3, 756, 1 - setmaptile 33, 3, 757, 1 - setmaptile 34, 3, 758, 1 - setmaptile 35, 3, 759, 1 + setmetatile 33, 6, 591, 0 + setmetatile 32, 2, 752, 1 + setmetatile 33, 2, 753, 1 + setmetatile 34, 2, 754, 1 + setmetatile 35, 2, 755, 1 + setmetatile 32, 3, 756, 1 + setmetatile 33, 3, 757, 1 + setmetatile 34, 3, 758, 1 + setmetatile 35, 3, 759, 1 special DrawWholeMapView return @@ -166,9 +166,9 @@ NewMauville_Inside_EventScript_15E900:: @ 815E900 faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_1_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -181,9 +181,9 @@ NewMauville_Inside_EventScript_15E91E:: @ 815E91E faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_2_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle @@ -196,9 +196,9 @@ NewMauville_Inside_EventScript_15E93C:: @ 815E93C faceplayer setwildbattle SPECIES_VOLTORB, 25, ITEM_NONE waitse - playpokecry SPECIES_VOLTORB, 2 + playmoncry SPECIES_VOLTORB, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_VOLTORB_3_NEW_MAUVILLE setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 64928f840..465cbcfc6 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -75,7 +75,7 @@ OldaleTown_EventScript_14DE35:: @ 814DE35 OldaleTown_EventScript_14DE4C:: @ 814DE4C msgbox OldaleTown_Text_16AF2F, 4 - giveitem ITEM_POTION + giveitem_std ITEM_POTION compare RESULT, 0 goto_if_eq OldaleTown_EventScript_14DE83 msgbox OldaleTown_Text_16AFE1, 4 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index 69503908a..cbf3acd27 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08 .byte 0 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E - sethealplace 14 + setrespawn 14 call OldaleTown_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 setvar 0x800b, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PacifidlogTown.inc b/data/scripts/maps/PacifidlogTown.inc index 085d083d8..d7ac80a0a 100644 --- a/data/scripts/maps/PacifidlogTown.inc +++ b/data/scripts/maps/PacifidlogTown.inc @@ -8,7 +8,7 @@ PacifidlogTown_MapScript1_14E8F9:: @ 814E8F9 end PacifidlogTown_MapScript1_14E8FD:: @ 814E8FD - tileeffect 3 + setstepcallback 3 end PacifidlogTown_EventScript_14E900:: @ 814E900 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index 942f5626b..f073201ca 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -45,7 +45,7 @@ PacifidlogTown_House2_EventScript_1541E8:: @ 81541E8 PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC msgbox PacifidlogTown_House2_Text_179169, 4 - giveitem ITEM_TM27 + giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -61,7 +61,7 @@ PacifidlogTown_House2_EventScript_15421B:: @ 815421B PacifidlogTown_House2_EventScript_154225:: @ 8154225 msgbox PacifidlogTown_House2_Text_17922D, 4 - giveitem ITEM_TM21 + giveitem_std ITEM_TM21 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK @@ -72,7 +72,7 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 PacifidlogTown_House2_EventScript_154254:: @ 8154254 specialvar RESULT, sub_810F908 - getnumberstring 0, RESULT + buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release end @@ -81,9 +81,9 @@ PacifidlogTown_House2_EventScript_154267:: @ 8154267 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 0 + playmoncry SPECIES_AZURILL, 0 msgbox PacifidlogTown_House2_Text_17938B, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_17939B, 4 release end @@ -92,9 +92,9 @@ PacifidlogTown_House2_EventScript_154282:: @ 8154282 lock faceplayer waitse - playpokecry SPECIES_AZURILL, 2 + playmoncry SPECIES_AZURILL, 2 msgbox PacifidlogTown_House2_Text_1793CC, 4 - waitpokecry + waitmoncry msgbox PacifidlogTown_House2_Text_1793DD, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index a2e033a24..624a221d5 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -28,7 +28,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E special sub_804DB68 special sub_804E174 waitstate - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 64dd5008c..95d5448e8 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF .byte 0 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 - sethealplace 19 + setrespawn 19 end @ 8154109 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index e2967169f..add786bf0 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -383,7 +383,7 @@ PetalburgCity_Gym_EventScript_1549B2:: @ 81549B2 return PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 - giveitem ITEM_ENIGMA_BERRY + giveitem_std ITEM_ENIGMA_BERRY compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setvar 0x402d, 0 @@ -412,7 +412,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 end PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C - giveitem ITEM_TM42 + giveitem_std ITEM_TM42 compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM42 @@ -962,51 +962,51 @@ PetalburgCity_Gym_EventScript_155081:: @ 8155081 return PetalburgCity_Gym_EventScript_1550A2:: @ 81550A2 - setmaptile 6, 85, 528, 0 - setmaptile 7, 85, 529, 0 - setmaptile 1, 98, 528, 0 - setmaptile 2, 98, 529, 0 + setmetatile 6, 85, 528, 0 + setmetatile 7, 85, 529, 0 + setmetatile 1, 98, 528, 0 + setmetatile 2, 98, 529, 0 return PetalburgCity_Gym_EventScript_1550C7:: @ 81550C7 - setmaptile 6, 46, 528, 0 - setmaptile 7, 46, 529, 0 - setmaptile 1, 59, 528, 0 - setmaptile 2, 59, 529, 0 + setmetatile 6, 46, 528, 0 + setmetatile 7, 46, 529, 0 + setmetatile 1, 59, 528, 0 + setmetatile 2, 59, 529, 0 return PetalburgCity_Gym_EventScript_1550EC:: @ 81550EC - setmaptile 6, 59, 528, 0 - setmaptile 7, 59, 529, 0 - setmaptile 1, 72, 528, 0 - setmaptile 2, 72, 529, 0 + setmetatile 6, 59, 528, 0 + setmetatile 7, 59, 529, 0 + setmetatile 1, 72, 528, 0 + setmetatile 2, 72, 529, 0 return PetalburgCity_Gym_EventScript_155111:: @ 8155111 - setmaptile 1, 20, 528, 0 - setmaptile 2, 20, 529, 0 + setmetatile 1, 20, 528, 0 + setmetatile 2, 20, 529, 0 return PetalburgCity_Gym_EventScript_155124:: @ 8155124 - setmaptile 6, 20, 528, 0 - setmaptile 7, 20, 529, 0 - setmaptile 1, 33, 528, 0 - setmaptile 2, 33, 529, 0 + setmetatile 6, 20, 528, 0 + setmetatile 7, 20, 529, 0 + setmetatile 1, 33, 528, 0 + setmetatile 2, 33, 529, 0 return PetalburgCity_Gym_EventScript_155149:: @ 8155149 - setmaptile 6, 33, 528, 0 - setmaptile 7, 33, 529, 0 + setmetatile 6, 33, 528, 0 + setmetatile 7, 33, 529, 0 return PetalburgCity_Gym_EventScript_15515C:: @ 815515C - setmaptile 1, 7, 528, 0 - setmaptile 2, 7, 529, 0 + setmetatile 1, 7, 528, 0 + setmetatile 2, 7, 529, 0 return PetalburgCity_Gym_EventScript_15516F:: @ 815516F - setmaptile 6, 7, 528, 0 - setmaptile 7, 7, 529, 0 + setmetatile 6, 7, 528, 0 + setmetatile 7, 7, 529, 0 return PetalburgCity_Gym_EventScript_155182:: @ 8155182 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index e2013a1d6..1dc99159a 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204 .byte 0 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A - sethealplace 3 + setrespawn 3 call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 setvar 0x800b, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 110b798b7..08bbcb0c7 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -25,7 +25,7 @@ PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 PetalburgCity_WallysHouse_EventScript_154406:: @ 8154406 msgbox PetalburgCity_WallysHouse_Text_179996, 4 - giveitem ITEM_HM03 + giveitem_std ITEM_HM03 setflag FLAG_RECEIVED_HM03 msgbox PetalburgCity_WallysHouse_Text_179B14, 4 release diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index c38d4d559..be74cbf4c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -90,7 +90,7 @@ PetalburgWoods_EventScript_15CDFA:: @ 815CDFA applymovement 255, PetalburgWoods_Movement_1A0845 waitmovement 0 msgbox PetalburgWoods_Text_19507E, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_15CE3F goto PetalburgWoods_EventScript_15CE4D @@ -244,7 +244,7 @@ PetalburgWoods_EventScript_15CEDC:: @ 815CEDC checkflag FLAG_RECEIVED_MIRACLE_SEED goto_if_eq PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 - giveitem ITEM_MIRACLE_SEED + giveitem_std ITEM_MIRACLE_SEED compare RESULT, 0 goto_if_eq PetalburgWoods_EventScript_1A029B setflag FLAG_RECEIVED_MIRACLE_SEED diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 92f5d5593..a04dcd86d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -34,7 +34,7 @@ Route104_EventScript_14EEC8:: @ 814EEC8 checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 goto_if_eq Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 - giveitem ITEM_CHESTO_BERRY + giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 @@ -53,7 +53,7 @@ Route104_EventScript_14EF09:: @ 814EF09 checkflag FLAG_RECEIVED_WHITE_HERB goto_if_eq Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 - giveitem ITEM_WHITE_HERB + giveitem_std ITEM_WHITE_HERB compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_WHITE_HERB @@ -107,7 +107,7 @@ Route104_EventScript_14EF93:: @ 814EF93 checkflag FLAG_RECEIVED_TM09 goto_if_eq Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 - giveitem ITEM_TM09 + giveitem_std ITEM_TM09 compare RESULT, 0 goto_if_eq Route104_EventScript_1A029B setflag FLAG_RECEIVED_TM09 @@ -124,14 +124,14 @@ Route104_EventScript_14EFCC:: @ 814EFCC end Route104_EventScript_14EFD5:: @ 814EFD5 - setobjectpriority 8, 0, 19, 0 - setobjectpriority 255, 0, 19, 0 + setobjectpriority 8, MAP_ROUTE104, 0 + setobjectpriority 255, MAP_ROUTE104, 0 applymovement 8, Route104_Movement_14F16C waitmovement 0 removeobject 8 applymovement 255, Route104_Movement_14F162 waitmovement 0 - hideobject 255, 0, 19 + hideobjectat 255, MAP_ROUTE104 call Route104_EventScript_1A02E7 applymovement 7, Route104_Movement_14F09F applymovement 255, Route104_Movement_14F09F @@ -139,12 +139,12 @@ Route104_EventScript_14EFD5:: @ 814EFD5 applymovement 255, Route104_Movement_14F166 waitmovement 0 call Route104_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route104_Movement_14F168 waitmovement 0 setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN applymovement 2, Route104_Movement_14F16F waitmovement 0 @@ -152,10 +152,10 @@ Route104_EventScript_14EFD5:: @ 814EFD5 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 - hideobject 7, 0, 19 + hideobjectat 7, MAP_ROUTE104 copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 19 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE104 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar 0x408e, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 9369f7573..4eb1d9705 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -92,8 +92,8 @@ Route104_MrBrineysHouse_EventScript_15BDD1:: @ 815BDD1 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route104_MrBrineysHouse_Text_191FB9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 07abd21bc..2de6bf51f 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -52,7 +52,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE73:: @ 815BE73 Route104_PrettyPetalFlowerShop_EventScript_15BE7C:: @ 815BE7C message Route104_PrettyPetalFlowerShop_Text_1A0C42 waitmessage - pokemartbp Route104_PrettyPetalFlowerShop_Items + pokemartdecoration2 Route104_PrettyPetalFlowerShop_Items msgbox Route104_PrettyPetalFlowerShop_Text_1A0C02, 4 release end @@ -80,7 +80,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 Route104_PrettyPetalFlowerShop_EventScript_15BEB9:: @ 815BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C6158, 4 - giveitem ITEM_WAILMER_PAIL + giveitem_std ITEM_WAILMER_PAIL msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 setflag FLAG_RECEIVED_WAILMER_PAIL release @@ -95,7 +95,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index de7188aae..30157e52f 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -8,8 +8,8 @@ Route105_MapScript1_14F29E:: @ 814F29E end Route105_EventScript_14F2A8:: @ 814F2A8 - setmaptile 9, 19, 124, 1 - setmaptile 9, 20, 145, 1 + setmetatile 9, 19, 124, 1 + setmetatile 9, 20, 145, 1 return Route105_EventScript_14F2BB:: @ 814F2BB diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 1277168e0..a9fa7d906 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -3,8 +3,8 @@ Route109_MapScripts:: @ 814F4D2 Route109_EventScript_14F4D3:: @ 814F4D3 call Route109_EventScript_1A010C - setobjectpriority 2, 0, 24, 0 - setobjectpriority 255, 0, 24, 0 + setobjectpriority 2, MAP_ROUTE109, 0 + setobjectpriority 255, MAP_ROUTE109, 0 applymovement 2, Route109_Movement_14F67B waitmovement 0 removeobject 2 @@ -33,30 +33,30 @@ Route109_EventScript_14F538:: @ 814F538 end Route109_EventScript_14F548:: @ 814F548 - hideobject 255, 0, 24 + hideobjectat 255, MAP_ROUTE109 call Route109_EventScript_1A02E7 applymovement 1, Route109_Movement_14F5BF applymovement 255, Route109_Movement_14F5BF waitmovement 0 call Route109_EventScript_1A02EF - showobject 255, 0, 11 + showobjectat 255, MAP_DEWFORD_TOWN applymovement 255, Route109_Movement_14F670 waitmovement 0 addobject 4 clearflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD setobjectxyperm 2, 12, 8 addobject 2 - setobjectpriority 2, 0, 11, 0 + setobjectpriority 2, MAP_DEWFORD_TOWN, 0 applymovement 2, Route109_Movement_14F67D waitmovement 0 clearflag FLAG_HIDE_MR_BRINEY_DEWFORD_TOWN setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 - hideobject 1, 0, 24 + hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage copyvar 0x4096, 0x8008 - resetobjectpriority 255, 0, 24 - resetobjectpriority 2, 0, 11 + resetobjectpriority 255, MAP_ROUTE109 + resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 release end @@ -331,7 +331,7 @@ Route109_EventScript_14F725:: @ 814F725 checkflag FLAG_RECEIVED_SOFT_SAND goto_if_eq Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 - giveitem ITEM_SOFT_SAND + giveitem_std ITEM_SOFT_SAND compare RESULT, 0 goto_if_eq Route109_EventScript_1A029B closemessage @@ -360,9 +360,9 @@ Route109_EventScript_14F788:: @ 814F788 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox Route109_Text_16E5CA, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index f60413d81..7a12f5850 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -27,7 +27,7 @@ Route109_SeashoreHouse_EventScript_160DFE:: @ 8160DFE Route109_SeashoreHouse_EventScript_160E08:: @ 8160E08 msgbox Route109_SeashoreHouse_Text_19B609, 4 - giveitem ITEM_SODA_POP, 6 + giveitem_std ITEM_SODA_POP, 6 compare RESULT, 0 goto_if_eq Route109_SeashoreHouse_EventScript_160E2C setflag FLAG_RECEIVED_6_SODA_POP @@ -61,7 +61,7 @@ Route109_SeashoreHouse_EventScript_160E5A:: @ 8160E5A takemoney 0x12c, 0 updatemoneybox 0, 0 nop - giveitem ITEM_SODA_POP + giveitem_std ITEM_SODA_POP hidemoneybox 0, 0 release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 146be5959..5e10782e9 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -420,7 +420,7 @@ Route110_EventScript_14FE8A:: @ 814FE8A end Route110_EventScript_14FEA5:: @ 814FEA5 - giveitem ITEM_ITEMFINDER + giveitem_std ITEM_ITEMFINDER return Route110_EventScript_14FEB2:: @ 814FEB2 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 12309207c..813cbb9e9 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -22,7 +22,7 @@ Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F addobject 1 - showobject 1, 29, 1 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_END turnobject 1, 4 end @@ -37,7 +37,7 @@ Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 end Route110_TrickHouseEnd_EventScript_161994:: @ 8161994 - setmaptile 10, 1, 539, 1 + setmetatile 10, 1, 539, 1 return Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E @@ -60,7 +60,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -73,7 +73,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -86,7 +86,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -99,7 +99,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -112,7 +112,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -125,7 +125,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -138,7 +138,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 setvar 0x40c1, 0 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar 0x40c1, 0 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endc compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index bf0c36ff3..b9582b64c 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -139,14 +139,14 @@ Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 addobject 1 - showobject 1, 29, 0 + showobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE turnobject 1, 4 turnobject 255, 3 end Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 addobject 1 - hideobject 1, 29, 0 + hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE switch 0x4044 case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 @@ -368,7 +368,7 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E end Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE - giveitem ITEM_RARE_CANDY + giveitem_std ITEM_RARE_CANDY compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -378,7 +378,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE end Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA - giveitem ITEM_TIMER_BALL + giveitem_std ITEM_TIMER_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -388,7 +388,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA end Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 - giveitem ITEM_HARD_STONE + giveitem_std ITEM_HARD_STONE compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -398,7 +398,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 end Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 - giveitem ITEM_SMOKE_BALL + giveitem_std ITEM_SMOKE_BALL compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -408,7 +408,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 end Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E - giveitem ITEM_TM12 + giveitem_std ITEM_TM12 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -418,7 +418,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E end Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA - giveitem ITEM_MAGNET + giveitem_std ITEM_MAGNET compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -428,7 +428,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA end Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 - giveitem ITEM_PP_MAX + giveitem_std ITEM_PP_MAX compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 @@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration 32 + givedecoration_std 32 .else - givedecoration 31 + givedecoration_std 31 .endif compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 @@ -501,7 +501,7 @@ Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 end Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD - setmaptile 5, 1, 537, 0 + setmetatile 5, 1, 537, 0 special DrawWholeMapView delay 20 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0856 @@ -607,7 +607,7 @@ Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 msgbox UnknownString_819CAD1, 4 playse SE_PIN setvar 0x40AB, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -618,7 +618,7 @@ Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 msgbox UnknownString_819CCCB, 4 playse SE_PIN setvar 0x40AC, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -629,7 +629,7 @@ Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 msgbox UnknownString_819CEF9, 4 playse SE_PIN setvar 0x40AD, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -640,7 +640,7 @@ Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB msgbox UnknownString_819D164, 4 playse SE_PIN setvar 0x40AE, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -651,7 +651,7 @@ Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 msgbox UnknownString_819D3A5, 4 playse SE_PIN setvar 0x40AF, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -662,7 +662,7 @@ Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D msgbox UnknownString_819DC0A, 4 playse SE_PIN setvar 0x40B0, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -673,7 +673,7 @@ Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 msgbox UnknownString_819DE8D, 4 playse SE_PIN setvar 0x40B1, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -684,7 +684,7 @@ Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F msgbox UnknownString_819E0FF, 4 playse SE_PIN setvar 0x40B2, 2 - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end @@ -757,9 +757,9 @@ Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B return Route110_TrickHouseEntrance_EventScript_161920:: @ 8161920 - setfieldeffect 0, 32772 - setfieldeffect 1, 32773 - setfieldeffect 2, 32774 + setfieldeffectargument 0, 32772 + setfieldeffectargument 1, 32773 + setfieldeffectargument 2, 32774 dofieldeffect 54 waitfieldeffect 54 delay 10 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 3a89c2db1..4fffd9914 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE end Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A - setmaptile 13, 1, 523, 0 + setmetatile 13, 1, 523, 0 end Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index f71a9611a..6425d05cb 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -70,23 +70,23 @@ Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 end Route110_TrickHousePuzzle2_EventScript_161E2C:: @ 8161E2C - setmaptile 14, 21, 601, 0 - setmaptile 1, 12, 618, 0 + setmetatile 14, 21, 601, 0 + setmetatile 1, 12, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E3F:: @ 8161E3F - setmaptile 8, 17, 601, 0 - setmaptile 12, 13, 618, 0 + setmetatile 8, 17, 601, 0 + setmetatile 12, 13, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E52:: @ 8161E52 - setmaptile 4, 10, 601, 0 - setmaptile 8, 4, 618, 0 + setmetatile 4, 10, 601, 0 + setmetatile 8, 4, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E65:: @ 8161E65 - setmaptile 5, 2, 601, 0 - setmaptile 12, 5, 618, 0 + setmetatile 5, 2, 601, 0 + setmetatile 12, 5, 618, 0 return Route110_TrickHousePuzzle2_EventScript_161E78:: @ 8161E78 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index a50ecd3ce..54cea16c9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -24,13 +24,13 @@ Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 - setmaptile 5, 20, 600, 0 - setmaptile 4, 12, 600, 0 - setmaptile 11, 10, 600, 0 - setmaptile 3, 8, 600, 0 - setmaptile 13, 7, 600, 0 - setmaptile 1, 3, 600, 0 - setmaptile 10, 2, 600, 0 + setmetatile 5, 20, 600, 0 + setmetatile 4, 12, 600, 0 + setmetatile 11, 10, 600, 0 + setmetatile 3, 8, 600, 0 + setmetatile 13, 7, 600, 0 + setmetatile 1, 3, 600, 0 + setmetatile 10, 2, 600, 0 compare 0x4008, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F compare 0x4008, 2 @@ -48,201 +48,201 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F - setmaptile 5, 20, 601, 0 + setmetatile 5, 20, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FA9:: @ 8161FA9 - setmaptile 4, 12, 601, 0 + setmetatile 4, 12, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FB3:: @ 8161FB3 - setmaptile 11, 10, 601, 0 + setmetatile 11, 10, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FBD:: @ 8161FBD - setmaptile 3, 8, 601, 0 + setmetatile 3, 8, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FC7:: @ 8161FC7 - setmaptile 13, 7, 601, 0 + setmetatile 13, 7, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FD1:: @ 8161FD1 - setmaptile 1, 3, 601, 0 + setmetatile 1, 3, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FDB:: @ 8161FDB - setmaptile 10, 2, 601, 0 + setmetatile 10, 2, 601, 0 return Route110_TrickHousePuzzle3_EventScript_161FE5:: @ 8161FE5 - setmaptile 1, 6, 587, 0 - setmaptile 2, 6, 588, 0 - setmaptile 1, 7, 595, 0 - setmaptile 2, 7, 596, 0 - setmaptile 4, 9, 587, 0 - setmaptile 5, 9, 588, 0 - setmaptile 4, 10, 595, 0 - setmaptile 5, 10, 596, 0 - setmaptile 4, 18, 587, 0 - setmaptile 5, 18, 588, 0 - setmaptile 4, 19, 595, 0 - setmaptile 5, 19, 596, 0 - setmaptile 7, 3, 587, 0 - setmaptile 8, 3, 588, 0 - setmaptile 7, 4, 595, 0 - setmaptile 8, 4, 596, 0 - setmaptile 7, 9, 587, 0 - setmaptile 8, 9, 588, 0 - setmaptile 7, 10, 595, 0 - setmaptile 8, 10, 596, 0 - setmaptile 7, 18, 587, 0 - setmaptile 8, 18, 588, 0 - setmaptile 7, 19, 595, 0 - setmaptile 8, 19, 596, 0 - setmaptile 13, 3, 587, 0 - setmaptile 14, 3, 588, 0 - setmaptile 13, 4, 595, 0 - setmaptile 14, 4, 596, 0 - setmaptile 13, 9, 587, 0 - setmaptile 14, 9, 588, 0 - setmaptile 13, 10, 595, 0 - setmaptile 14, 10, 596, 0 - setmaptile 13, 15, 587, 0 - setmaptile 14, 15, 588, 0 - setmaptile 13, 16, 595, 0 - setmaptile 14, 16, 596, 0 - setmaptile 3, 13, 589, 1 - setmaptile 3, 14, 597, 0 - setmaptile 6, 7, 589, 1 - setmaptile 6, 8, 597, 0 - setmaptile 9, 16, 589, 1 - setmaptile 9, 17, 597, 0 - setmaptile 12, 4, 589, 1 - setmaptile 12, 5, 597, 0 - setmaptile 12, 10, 589, 1 - setmaptile 12, 11, 597, 0 - setmaptile 1, 15, 568, 0 - setmaptile 2, 15, 569, 0 - setmaptile 1, 16, 576, 1 - setmaptile 2, 16, 577, 1 - setmaptile 4, 6, 568, 0 - setmaptile 5, 6, 569, 0 - setmaptile 4, 7, 576, 1 - setmaptile 5, 7, 577, 1 - setmaptile 7, 12, 568, 0 - setmaptile 8, 12, 569, 0 - setmaptile 7, 13, 576, 1 - setmaptile 8, 13, 577, 1 - setmaptile 10, 12, 568, 0 - setmaptile 11, 12, 569, 0 - setmaptile 10, 13, 576, 1 - setmaptile 11, 13, 577, 1 - setmaptile 10, 18, 568, 0 - setmaptile 11, 18, 569, 0 - setmaptile 10, 19, 576, 1 - setmaptile 11, 19, 577, 1 - setmaptile 3, 4, 570, 1 - setmaptile 3, 5, 578, 1 - setmaptile 6, 10, 570, 1 - setmaptile 6, 11, 578, 1 - setmaptile 6, 13, 570, 1 - setmaptile 6, 14, 578, 1 - setmaptile 6, 16, 570, 1 - setmaptile 6, 17, 578, 1 - setmaptile 9, 4, 570, 1 - setmaptile 9, 5, 578, 1 - setmaptile 9, 7, 570, 1 - setmaptile 9, 8, 578, 1 - setmaptile 12, 13, 570, 1 - setmaptile 12, 14, 578, 1 - setmaptile 12, 16, 570, 1 - setmaptile 12, 17, 578, 1 + setmetatile 1, 6, 587, 0 + setmetatile 2, 6, 588, 0 + setmetatile 1, 7, 595, 0 + setmetatile 2, 7, 596, 0 + setmetatile 4, 9, 587, 0 + setmetatile 5, 9, 588, 0 + setmetatile 4, 10, 595, 0 + setmetatile 5, 10, 596, 0 + setmetatile 4, 18, 587, 0 + setmetatile 5, 18, 588, 0 + setmetatile 4, 19, 595, 0 + setmetatile 5, 19, 596, 0 + setmetatile 7, 3, 587, 0 + setmetatile 8, 3, 588, 0 + setmetatile 7, 4, 595, 0 + setmetatile 8, 4, 596, 0 + setmetatile 7, 9, 587, 0 + setmetatile 8, 9, 588, 0 + setmetatile 7, 10, 595, 0 + setmetatile 8, 10, 596, 0 + setmetatile 7, 18, 587, 0 + setmetatile 8, 18, 588, 0 + setmetatile 7, 19, 595, 0 + setmetatile 8, 19, 596, 0 + setmetatile 13, 3, 587, 0 + setmetatile 14, 3, 588, 0 + setmetatile 13, 4, 595, 0 + setmetatile 14, 4, 596, 0 + setmetatile 13, 9, 587, 0 + setmetatile 14, 9, 588, 0 + setmetatile 13, 10, 595, 0 + setmetatile 14, 10, 596, 0 + setmetatile 13, 15, 587, 0 + setmetatile 14, 15, 588, 0 + setmetatile 13, 16, 595, 0 + setmetatile 14, 16, 596, 0 + setmetatile 3, 13, 589, 1 + setmetatile 3, 14, 597, 0 + setmetatile 6, 7, 589, 1 + setmetatile 6, 8, 597, 0 + setmetatile 9, 16, 589, 1 + setmetatile 9, 17, 597, 0 + setmetatile 12, 4, 589, 1 + setmetatile 12, 5, 597, 0 + setmetatile 12, 10, 589, 1 + setmetatile 12, 11, 597, 0 + setmetatile 1, 15, 568, 0 + setmetatile 2, 15, 569, 0 + setmetatile 1, 16, 576, 1 + setmetatile 2, 16, 577, 1 + setmetatile 4, 6, 568, 0 + setmetatile 5, 6, 569, 0 + setmetatile 4, 7, 576, 1 + setmetatile 5, 7, 577, 1 + setmetatile 7, 12, 568, 0 + setmetatile 8, 12, 569, 0 + setmetatile 7, 13, 576, 1 + setmetatile 8, 13, 577, 1 + setmetatile 10, 12, 568, 0 + setmetatile 11, 12, 569, 0 + setmetatile 10, 13, 576, 1 + setmetatile 11, 13, 577, 1 + setmetatile 10, 18, 568, 0 + setmetatile 11, 18, 569, 0 + setmetatile 10, 19, 576, 1 + setmetatile 11, 19, 577, 1 + setmetatile 3, 4, 570, 1 + setmetatile 3, 5, 578, 1 + setmetatile 6, 10, 570, 1 + setmetatile 6, 11, 578, 1 + setmetatile 6, 13, 570, 1 + setmetatile 6, 14, 578, 1 + setmetatile 6, 16, 570, 1 + setmetatile 6, 17, 578, 1 + setmetatile 9, 4, 570, 1 + setmetatile 9, 5, 578, 1 + setmetatile 9, 7, 570, 1 + setmetatile 9, 8, 578, 1 + setmetatile 12, 13, 570, 1 + setmetatile 12, 14, 578, 1 + setmetatile 12, 16, 570, 1 + setmetatile 12, 17, 578, 1 return Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 - setmaptile 1, 6, 571, 0 - setmaptile 2, 6, 572, 0 - setmaptile 1, 7, 579, 1 - setmaptile 2, 7, 580, 1 - setmaptile 4, 9, 571, 0 - setmaptile 5, 9, 572, 0 - setmaptile 4, 10, 579, 1 - setmaptile 5, 10, 580, 1 - setmaptile 4, 18, 571, 0 - setmaptile 5, 18, 572, 0 - setmaptile 4, 19, 579, 1 - setmaptile 5, 19, 580, 1 - setmaptile 7, 3, 571, 0 - setmaptile 8, 3, 572, 0 - setmaptile 7, 4, 579, 1 - setmaptile 8, 4, 580, 1 - setmaptile 7, 9, 571, 0 - setmaptile 8, 9, 572, 0 - setmaptile 7, 10, 579, 1 - setmaptile 8, 10, 580, 1 - setmaptile 7, 18, 571, 0 - setmaptile 8, 18, 572, 0 - setmaptile 7, 19, 579, 1 - setmaptile 8, 19, 580, 1 - setmaptile 13, 3, 571, 0 - setmaptile 14, 3, 572, 0 - setmaptile 13, 4, 579, 1 - setmaptile 14, 4, 580, 1 - setmaptile 13, 9, 571, 0 - setmaptile 14, 9, 572, 0 - setmaptile 13, 10, 579, 1 - setmaptile 14, 10, 580, 1 - setmaptile 13, 15, 571, 0 - setmaptile 14, 15, 572, 0 - setmaptile 13, 16, 579, 1 - setmaptile 14, 16, 580, 1 - setmaptile 3, 13, 573, 1 - setmaptile 3, 14, 581, 1 - setmaptile 6, 7, 573, 1 - setmaptile 6, 8, 581, 1 - setmaptile 9, 16, 573, 1 - setmaptile 9, 17, 581, 1 - setmaptile 12, 4, 573, 1 - setmaptile 12, 5, 581, 1 - setmaptile 12, 10, 573, 1 - setmaptile 12, 11, 581, 1 - setmaptile 1, 15, 584, 0 - setmaptile 2, 15, 585, 0 - setmaptile 1, 16, 592, 0 - setmaptile 2, 16, 593, 0 - setmaptile 4, 6, 584, 0 - setmaptile 5, 6, 585, 0 - setmaptile 4, 7, 592, 0 - setmaptile 5, 7, 593, 0 - setmaptile 7, 12, 584, 0 - setmaptile 8, 12, 585, 0 - setmaptile 7, 13, 592, 0 - setmaptile 8, 13, 593, 0 - setmaptile 10, 12, 584, 0 - setmaptile 11, 12, 585, 0 - setmaptile 10, 13, 592, 0 - setmaptile 11, 13, 593, 0 - setmaptile 10, 18, 584, 0 - setmaptile 11, 18, 585, 0 - setmaptile 10, 19, 592, 0 - setmaptile 11, 19, 593, 0 - setmaptile 3, 4, 586, 1 - setmaptile 3, 5, 594, 0 - setmaptile 6, 10, 586, 1 - setmaptile 6, 11, 594, 0 - setmaptile 6, 13, 586, 1 - setmaptile 6, 14, 594, 0 - setmaptile 6, 16, 586, 1 - setmaptile 6, 17, 594, 0 - setmaptile 9, 4, 586, 1 - setmaptile 9, 5, 594, 0 - setmaptile 9, 7, 586, 1 - setmaptile 9, 8, 594, 0 - setmaptile 12, 13, 586, 1 - setmaptile 12, 14, 594, 0 - setmaptile 12, 16, 586, 1 - setmaptile 12, 17, 594, 0 + setmetatile 1, 6, 571, 0 + setmetatile 2, 6, 572, 0 + setmetatile 1, 7, 579, 1 + setmetatile 2, 7, 580, 1 + setmetatile 4, 9, 571, 0 + setmetatile 5, 9, 572, 0 + setmetatile 4, 10, 579, 1 + setmetatile 5, 10, 580, 1 + setmetatile 4, 18, 571, 0 + setmetatile 5, 18, 572, 0 + setmetatile 4, 19, 579, 1 + setmetatile 5, 19, 580, 1 + setmetatile 7, 3, 571, 0 + setmetatile 8, 3, 572, 0 + setmetatile 7, 4, 579, 1 + setmetatile 8, 4, 580, 1 + setmetatile 7, 9, 571, 0 + setmetatile 8, 9, 572, 0 + setmetatile 7, 10, 579, 1 + setmetatile 8, 10, 580, 1 + setmetatile 7, 18, 571, 0 + setmetatile 8, 18, 572, 0 + setmetatile 7, 19, 579, 1 + setmetatile 8, 19, 580, 1 + setmetatile 13, 3, 571, 0 + setmetatile 14, 3, 572, 0 + setmetatile 13, 4, 579, 1 + setmetatile 14, 4, 580, 1 + setmetatile 13, 9, 571, 0 + setmetatile 14, 9, 572, 0 + setmetatile 13, 10, 579, 1 + setmetatile 14, 10, 580, 1 + setmetatile 13, 15, 571, 0 + setmetatile 14, 15, 572, 0 + setmetatile 13, 16, 579, 1 + setmetatile 14, 16, 580, 1 + setmetatile 3, 13, 573, 1 + setmetatile 3, 14, 581, 1 + setmetatile 6, 7, 573, 1 + setmetatile 6, 8, 581, 1 + setmetatile 9, 16, 573, 1 + setmetatile 9, 17, 581, 1 + setmetatile 12, 4, 573, 1 + setmetatile 12, 5, 581, 1 + setmetatile 12, 10, 573, 1 + setmetatile 12, 11, 581, 1 + setmetatile 1, 15, 584, 0 + setmetatile 2, 15, 585, 0 + setmetatile 1, 16, 592, 0 + setmetatile 2, 16, 593, 0 + setmetatile 4, 6, 584, 0 + setmetatile 5, 6, 585, 0 + setmetatile 4, 7, 592, 0 + setmetatile 5, 7, 593, 0 + setmetatile 7, 12, 584, 0 + setmetatile 8, 12, 585, 0 + setmetatile 7, 13, 592, 0 + setmetatile 8, 13, 593, 0 + setmetatile 10, 12, 584, 0 + setmetatile 11, 12, 585, 0 + setmetatile 10, 13, 592, 0 + setmetatile 11, 13, 593, 0 + setmetatile 10, 18, 584, 0 + setmetatile 11, 18, 585, 0 + setmetatile 10, 19, 592, 0 + setmetatile 11, 19, 593, 0 + setmetatile 3, 4, 586, 1 + setmetatile 3, 5, 594, 0 + setmetatile 6, 10, 586, 1 + setmetatile 6, 11, 594, 0 + setmetatile 6, 13, 586, 1 + setmetatile 6, 14, 594, 0 + setmetatile 6, 16, 586, 1 + setmetatile 6, 17, 594, 0 + setmetatile 9, 4, 586, 1 + setmetatile 9, 5, 594, 0 + setmetatile 9, 7, 586, 1 + setmetatile 9, 8, 594, 0 + setmetatile 12, 13, 586, 1 + setmetatile 12, 14, 594, 0 + setmetatile 12, 16, 586, 1 + setmetatile 12, 17, 594, 0 return Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 6756cd055..4ff925639 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -23,53 +23,53 @@ Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 - setmaptile 13, 17, 610, 0 - setmaptile 12, 16, 575, 1 + setmetatile 13, 17, 610, 0 + setmetatile 12, 16, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631A8:: @ 81631A8 - setmaptile 12, 13, 610, 0 - setmaptile 12, 11, 575, 1 + setmetatile 12, 13, 610, 0 + setmetatile 12, 11, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631BB:: @ 81631BB - setmaptile 7, 12, 610, 0 - setmaptile 5, 10, 575, 1 + setmetatile 7, 12, 610, 0 + setmetatile 5, 10, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631CE:: @ 81631CE - setmaptile 6, 6, 636, 0 - setmaptile 4, 4, 575, 1 + setmetatile 6, 6, 636, 0 + setmetatile 4, 4, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631E1:: @ 81631E1 - setmaptile 8, 4, 609, 0 - setmaptile 7, 5, 575, 1 + setmetatile 8, 4, 609, 0 + setmetatile 7, 5, 575, 1 return Route110_TrickHousePuzzle7_EventScript_1631F4:: @ 81631F4 - setmaptile 13, 17, 611, 0 - setmaptile 12, 16, 574, 1 + setmetatile 13, 17, 611, 0 + setmetatile 12, 16, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163207:: @ 8163207 - setmaptile 12, 13, 609, 0 - setmaptile 12, 11, 574, 1 + setmetatile 12, 13, 609, 0 + setmetatile 12, 11, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16321A:: @ 816321A - setmaptile 7, 12, 611, 0 - setmaptile 5, 10, 574, 1 + setmetatile 7, 12, 611, 0 + setmetatile 5, 10, 574, 1 return Route110_TrickHousePuzzle7_EventScript_16322D:: @ 816322D - setmaptile 6, 6, 635, 0 - setmaptile 4, 4, 574, 1 + setmetatile 6, 6, 635, 0 + setmetatile 4, 4, 574, 1 return Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 - setmaptile 8, 4, 608, 0 - setmaptile 7, 5, 574, 1 + setmetatile 8, 4, 608, 0 + setmetatile 7, 5, 574, 1 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 3e089e354..0a7e6befc 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -9,8 +9,8 @@ Route111_MapScript1_14FF9C:: @ 814FF9C end Route111_EventScript_14FFA6:: @ 814FFA6 - setmaptile 29, 86, 124, 1 - setmaptile 29, 87, 145, 1 + setmetatile 29, 86, 124, 1 + setmetatile 29, 87, 145, 1 return Route111_MapScript1_14FFB9:: @ 814FFB9 @@ -54,7 +54,7 @@ Route111_EventScript_150023:: @ 8150023 msgbox Route111_Text_16FA54, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_15005F - giveitem ITEM_ROOT_FOSSIL + giveitem_std ITEM_ROOT_FOSSIL closemessage setflag FLAG_HIDE_ROOT_FOSSIL setflag FLAG_HIDE_CLAW_FOSSIL @@ -76,7 +76,7 @@ Route111_EventScript_150069:: @ 8150069 msgbox Route111_Text_16FAED, 5 compare RESULT, 0 goto_if_eq Route111_EventScript_1500A5 - giveitem ITEM_CLAW_FOSSIL + giveitem_std ITEM_CLAW_FOSSIL closemessage setflag FLAG_HIDE_CLAW_FOSSIL setflag FLAG_HIDE_ROOT_FOSSIL @@ -124,7 +124,7 @@ Route111_EventScript_1500C5:: @ 81500C5 checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 goto_if_eq Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 - giveitem ITEM_RAZZ_BERRY + giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 goto_if_eq Route111_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 9896af5ae..981971e41 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -16,7 +16,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 - giveitem ITEM_MACHO_BRACE + giveitem_std ITEM_MACHO_BRACE compare RESULT, 0 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_1A029B setflag FLAG_RECEIVED_MACHO_BRACE diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 2eb34cdf3..37fd0ed3f 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -4,7 +4,7 @@ Route113_MapScripts:: @ 81505CC .byte 0 Route113_MapScript1_1505D7:: @ 81505D7 - tileeffect 1 + setstepcallback 1 end Route113_MapScript1_1505DA:: @ 81505DA diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 078ac1006..8d853b88d 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -22,7 +22,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 compare 0x40be, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 - giveitem ITEM_SOOT_SACK + giveitem_std ITEM_SOOT_SACK setvar 0x40be, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release @@ -68,7 +68,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 250 compare 0x4048, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -82,7 +82,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -96,7 +96,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 500 compare 0x4048, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -110,7 +110,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -124,7 +124,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 setvar 0x800a, 1000 compare 0x4048, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -139,7 +139,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 6000 compare 0x4048, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -154,7 +154,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 0x8008 + bufferdecorationname 0, 0x8008 setvar 0x800a, 8000 compare 0x4048, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 @@ -174,14 +174,14 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E Route113_GlassWorkshop_EventScript_163818:: @ 8163818 setvar 0x800a, 250 subvar 0x800a, 16456 - getnumberstring 0, 32778 + buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 subvar 0x800a, 16456 - getnumberstring 1, 32778 + buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -210,13 +210,13 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem 0x8008 + giveitem_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration 0x8008 + givedecoration_std 0x8008 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -247,49 +247,49 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar 0x8009, 0 setvar 0x8008, 39 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar 0x8009, 0 setvar 0x8008, 40 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar 0x8009, 0 setvar 0x8008, 41 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar 0x8009, 0 setvar 0x8008, 43 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar 0x8009, 0 setvar 0x8008, 42 - getitemname 0, 0x8008 + bufferitemname 0, 0x8008 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar 0x8009, 1 setvar 0x8008, 13 - getdecorname 0, 13 + bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar 0x8009, 1 setvar 0x8008, 6 - getdecorname 0, 6 + bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 3d1da2014..302c162b0 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -11,7 +11,7 @@ Route114_EventScript_150733:: @ 8150733 random 5 addvar RESULT, 15 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 @@ -30,7 +30,7 @@ Route114_EventScript_150782:: @ 8150782 checkflag FLAG_RECEIVED_TM05 goto_if_eq Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 - giveitem ITEM_TM05 + giveitem_std ITEM_TM05 compare RESULT, 0 goto_if_eq Route114_EventScript_1A029B setflag FLAG_RECEIVED_TM05 @@ -47,9 +47,9 @@ Route114_EventScript_1507C3:: @ 81507C3 lock faceplayer waitse - playpokecry SPECIES_POOCHYENA, 2 + playmoncry SPECIES_POOCHYENA, 2 msgbox Route114_Text_1701F9, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index abf9ac883..1a1445fde 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -12,7 +12,7 @@ Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 checkflag FLAG_RECEIVED_TM28 goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 - giveitem ITEM_TM28 + giveitem_std ITEM_TM28 compare RESULT, 0 goto_if_eq Route114_FossilManiacsHouse_EventScript_1A029B setflag FLAG_RECEIVED_TM28 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index 87b0f2cd6..f8ff5de73 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -14,9 +14,9 @@ Route114_LanettesHouse_EventScript_15C262:: @ 815C262 setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE - givedecoration DECOR_LOTAD_DOLL + givedecoration_std DECOR_LOTAD_DOLL .else - givedecoration DECOR_SEEDOT_DOLL + givedecoration_std DECOR_SEEDOT_DOLL .endif compare RESULT, 0 goto_if_eq Route114_LanettesHouse_EventScript_1A02AE diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 34c685196..9aadedb32 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -43,7 +43,7 @@ Route116_EventScript_150A7B:: @ 8150A7B Route116_EventScript_150A94:: @ 8150A94 setflag FLAG_MET_DEVON_EMPLOYEE - giveitem ITEM_REPEAT_BALL + giveitem_std ITEM_REPEAT_BALL compare RESULT, 0 goto_if_eq Route116_EventScript_150B12 msgbox Route116_Text_1707B8, 4 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index bf34b5426..ca69e01c4 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -20,7 +20,7 @@ Route118_EventScript_150F34:: @ 8150F34 Route118_EventScript_150F5E:: @ 8150F5E msgbox Route118_Text_170F46, 4 - giveitem ITEM_GOOD_ROD + giveitem_std ITEM_GOOD_ROD setflag FLAG_RECEIVED_GOOD_ROD msgbox Route118_Text_170F7E, 4 release diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index fb3d75660..aff1254a9 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -148,7 +148,7 @@ Route119_EventScript_151337:: @ 8151337 end Route119_EventScript_151352:: @ 8151352 - giveitem ITEM_HM02 + giveitem_std ITEM_HM02 setflag FLAG_RECEIVED_HM02 return diff --git a/data/scripts/maps/Route119_House.inc b/data/scripts/maps/Route119_House.inc index 42cc89068..76763c68e 100644 --- a/data/scripts/maps/Route119_House.inc +++ b/data/scripts/maps/Route119_House.inc @@ -9,8 +9,8 @@ Route119_House_EventScript_163DE7:: @ 8163DE7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox Route119_House_Text_19F406, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 4ee12fe93..991725b8c 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -55,14 +55,14 @@ Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A msgbox Route119_WeatherInstitute_2F_Text_19F1CF, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 playfanfare 370 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage - givepoke SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 + givemon SPECIES_CASTFORM, 25, ITEM_MYSTIC_WATER, 0x0, 0x0, 0 setflag FLAG_RECEIVED_CASTFORM msgbox Route119_WeatherInstitute_2F_Text_19F27D, 4 release diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 209291a3a..cd84f95af 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -59,15 +59,15 @@ Route120_MapScript1_151686:: @ 8151686 end Route120_EventScript_1516A2:: @ 81516A2 - setmaptile 7, 54, 124, 1 - setmaptile 7, 55, 145, 1 + setmetatile 7, 54, 124, 1 + setmetatile 7, 55, 145, 1 return Route120_EventScript_1516B5:: @ 81516B5 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 return Route120_EventScript_1516DA:: @ 81516DA @@ -160,7 +160,7 @@ Route120_EventScript_151808:: @ 8151808 end Route120_EventScript_151813:: @ 8151813 - giveitem 0x8004 + giveitem_std 0x8004 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -222,9 +222,9 @@ Route120_EventScript_15189D:: @ 815189D applymovement 30, Route120_Movement_1A0662 waitmovement 0 waitse - playpokecry SPECIES_KECLEON, 2 + playmoncry SPECIES_KECLEON, 2 delay 40 - waitpokecry + waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE setvar 0x8004, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE @@ -238,22 +238,22 @@ Route120_EventScript_151908:: @ 8151908 applymovement 255, Route120_Movement_1A0841 waitmovement 0 msgbox Route120_Text_171A40, 4 - giveitem ITEM_DEVON_SCOPE + giveitem_std ITEM_DEVON_SCOPE setflag FLAG_RECEIVED_DEVON_SCOPE msgbox Route120_Text_171B0E, 4 closemessage applymovement 31, Route120_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 31 waitfieldeffect 30 - setmaptile 13, 15, 663, 0 - setmaptile 12, 16, 671, 0 - setmaptile 12, 17, 161, 0 - setmaptile 13, 17, 161, 0 + setmetatile 13, 15, 663, 0 + setmetatile 12, 16, 671, 0 + setmetatile 12, 17, 161, 0 + setmetatile 13, 17, 161, 0 special DrawWholeMapView release end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 9f8753b76..431444dae 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -87,7 +87,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 end Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 - countpokemon + getpartysize compare RESULT, 6 goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index 9ad0220bd..adfebfe08 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -16,7 +16,7 @@ Route123_EventScript_151C5D:: @ 8151C5D compare RESULT, 0 goto_if_eq Route123_EventScript_151CAA msgbox Route123_Text_171DC2, 4 - giveitem ITEM_TM19 + giveitem_std ITEM_TM19 compare RESULT, 0 goto_if_eq Route123_EventScript_1A029B setflag FLAG_RECEIVED_TM19 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index dab303345..6948bff87 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -16,7 +16,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER @@ -24,7 +24,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 random 10 addvar RESULT, 20 addvar RESULT, 133 - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B msgbox Route123_BerryMastersHouse_Text_1C5C83, 4 @@ -78,7 +78,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 msgbox Route123_BerryMastersHouse_Text_1C5E0E, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B goto Route123_BerryMastersHouse_EventScript_163C1D @@ -89,7 +89,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E checkflag FLAG_RECEIVED_SPELON_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_SPELON_BERRY + giveitem_std ITEM_SPELON_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_SPELON_BERRY @@ -100,7 +100,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F checkflag FLAG_RECEIVED_PAMTRE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_PAMTRE_BERRY + giveitem_std ITEM_PAMTRE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_PAMTRE_BERRY @@ -111,7 +111,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 checkflag FLAG_RECEIVED_WATMEL_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_WATMEL_BERRY + giveitem_std ITEM_WATMEL_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_WATMEL_BERRY @@ -122,7 +122,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 checkflag FLAG_RECEIVED_DURIN_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_DURIN_BERRY + giveitem_std ITEM_DURIN_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_DURIN_BERRY @@ -133,7 +133,7 @@ Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 checkflag FLAG_RECEIVED_BELUE_BERRY goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 - giveitem ITEM_BELUE_BERRY + giveitem_std ITEM_BELUE_BERRY compare RESULT, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_1A029B setflag FLAG_RECEIVED_BELUE_BERRY diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 55f3141fd..4902d9f08 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -244,8 +244,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - getitemname 0, 0x8008 - getitemname 1, 0x8009 + bufferitemname 0, 0x8008 + bufferitemname 1, 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F @@ -259,8 +259,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - removeitem 0x8008, 1 - giveitem 0x8009 + takeitem 0x8008, 1 + giveitem_std 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare 0x4001, 0 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index b0e295db6..a81e73c3e 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -52,7 +52,7 @@ Route128_EventScript_15213F:: @ 815213F removeobject 5 removeobject 4 delay 100 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 waitfieldeffect 30 addobject 3 @@ -77,7 +77,7 @@ Route128_EventScript_15213F:: @ 815213F applymovement 3, Route128_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject 3 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 7e3a0e191..c45389b9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -468,7 +468,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D compare 0x4001, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 - giveitem ITEM_GREAT_BALL + giveitem_std ITEM_GREAT_BALL compare RESULT, 0 call_if 1, RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 77f2ee0a4..3371005c0 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -7,7 +7,7 @@ RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 checkflag FLAG_RECEIVED_HM01 goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 - giveitem ITEM_HM01 + giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 msgbox RustboroCity_CuttersHouse_Text_1851C9, 4 release diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 097fee3fb..89d59258d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -88,9 +88,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_ROOT_FOSSIL + bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_ROOT_FOSSIL, 1 + takeitem ITEM_ROOT_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 1 release @@ -106,9 +106,9 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 - getitemname 0, ITEM_CLAW_FOSSIL + bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 - removeitem ITEM_CLAW_FOSSIL, 1 + takeitem ITEM_CLAW_FOSSIL, 1 setvar 0x40c4, 1 setvar 0x40c5, 2 release @@ -132,9 +132,9 @@ RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A end RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 - getspeciesname 1, SPECIES_LILEEP + bufferspeciesname 1, SPECIES_LILEEP msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT @@ -144,7 +144,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 @@ -152,9 +152,9 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 end RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 - getspeciesname 1, SPECIES_ANORITH + bufferspeciesname 1, SPECIES_ANORITH msgbox RustboroCity_DevonCorp_2F_Text_183124, 4 - countpokemon + getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT @@ -164,7 +164,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage - givepoke SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 + givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 compare RESULT, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index 0e9786760..e2e70d4c0 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -48,7 +48,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157835 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 - giveitem ITEM_LETTER + giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 playfanfare 370 message RustboroCity_DevonCorp_3F_Text_183422 @@ -159,7 +159,7 @@ RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B RustboroCity_DevonCorp_3F_EventScript_157864:: @ 8157864 msgbox RustboroCity_DevonCorp_3F_Text_18353E, 4 - giveitem ITEM_EXP_SHARE + giveitem_std ITEM_EXP_SHARE compare RESULT, 0 goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1A029B setflag FLAG_RECEIVED_EXP_SHARE diff --git a/data/scripts/maps/RustboroCity_Flat2_1F.inc b/data/scripts/maps/RustboroCity_Flat2_1F.inc index b6b8b41b1..a6ba54ce7 100644 --- a/data/scripts/maps/RustboroCity_Flat2_1F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_1F.inc @@ -9,8 +9,8 @@ RustboroCity_Flat2_1F_EventScript_157D83:: @ 8157D83 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox RustboroCity_Flat2_1F_Text_185410, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 5be59b14e..3a2242c7a 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -11,7 +11,7 @@ RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 - giveitem ITEM_PREMIER_BALL + giveitem_std ITEM_PREMIER_BALL compare RESULT, 0 goto_if_eq RustboroCity_Flat2_2F_EventScript_1A029B setflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 427be433d..0dc403ec7 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -26,7 +26,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE end RustboroCity_Gym_EventScript_15793C:: @ 815793C - giveitem ITEM_TM39 + giveitem_std ITEM_TM39 compare RESULT, 0 goto_if_eq RustboroCity_Gym_EventScript_1A029B setflag FLAG_RECEIVED_TM39 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 53a845648..0cad33204 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - getspeciesname 0, 0x8009 + bufferspeciesname 0, 0x8009 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_House3.inc b/data/scripts/maps/RustboroCity_House3.inc index a5088175e..86d77c18e 100644 --- a/data/scripts/maps/RustboroCity_House3.inc +++ b/data/scripts/maps/RustboroCity_House3.inc @@ -13,8 +13,8 @@ RustboroCity_House3_EventScript_157DFF:: @ 8157DFF lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox RustboroCity_House3_Text_18567D, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index 53b481832..a1c0ac31b 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79 .byte 0 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F - sethealplace 6 + setrespawn 6 call RustboroCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 setvar 0x800b, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 9fd77bd6b..21fdf3d3b 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -84,7 +84,7 @@ RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE compare FACING, 3 call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 - giveitem ITEM_QUICK_CLAW + giveitem_std ITEM_QUICK_CLAW compare RESULT, 0 goto_if_eq RustboroCity_PokemonSchool_EventScript_1A029B closemessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 04364b661..64fce8118 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -64,7 +64,7 @@ RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 call_if 1, RusturfTunnel_EventScript_15C8EB compare 0x4001, 3 call_if 1, RusturfTunnel_EventScript_15C8EB - giveitem ITEM_HM04 + giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage @@ -300,9 +300,9 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox RusturfTunnel_Text_194188, 4 - waitpokecry + waitmoncry release end @@ -313,7 +313,7 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 - giveitem ITEM_DEVON_GOODS + giveitem_std ITEM_DEVON_GOODS closemessage applymovement 255, RusturfTunnel_Movement_15CA99 applymovement 6, RusturfTunnel_Movement_15CAA2 @@ -332,9 +332,9 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA message RusturfTunnel_Text_19434F waitmessage waitse - playpokecry SPECIES_WINGULL, 0 - waitbutton - waitpokecry + playmoncry SPECIES_WINGULL, 0 + waitbuttonpress + waitmoncry closemessage applymovement 5, RusturfTunnel_Movement_15CAB4 applymovement 7, RusturfTunnel_Movement_15CAC3 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 18cff8320..8e9a404a2 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -88,9 +88,9 @@ SSTidalCorridor_EventScript_15FD9F:: @ 815FD9F lock faceplayer waitse - playpokecry SPECIES_WINGULL, 0 + playmoncry SPECIES_WINGULL, 0 msgbox SSTidalCorridor_Text_199388, 4 - waitpokecry + waitmoncry release end @@ -122,7 +122,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 end SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 - sethealplace 8 + setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 @@ -132,7 +132,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 end SSTidalCorridor_EventScript_15FE17:: @ 815FE17 - sethealplace 4 + setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 checkflag FLAG_RECEIVED_TM49 call_if 1, SSTidalCorridor_EventScript_15FE36 diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 0a48ae453..0390177de 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -7,7 +7,7 @@ SSTidalRooms_EventScript_15FF06:: @ 815FF06 checkflag FLAG_RECEIVED_TM49 goto_if_eq SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 - giveitem ITEM_TM49 + giveitem_std ITEM_TM49 compare RESULT, 0 goto_if_eq SSTidalRooms_EventScript_1A029B setflag FLAG_RECEIVED_TM49 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 6a4d9af02..b31e8fc25 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -79,9 +79,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA setvar RESULT, 0 .endif playse 209 - setfieldeffect 0, 16 - setfieldeffect 1, 42 - setfieldeffect 2, 0 + setfieldeffectargument 0, 16 + setfieldeffectargument 1, 42 + setfieldeffectargument 2, 0 dofieldeffect 54 waitfieldeffect 54 .ifdef SAPPHIRE diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index a0c6314cc..cd778202c 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -4,7 +4,7 @@ SealedChamber_InnerRoom_MapScripts:: @ 815F1E7 SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53C1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 checkflag FLAG_REGI_DOORS_OPENED goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 @@ -42,7 +42,7 @@ SealedChamber_InnerRoom_EventScript_15F247:: @ 815F247 SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 lockall braillemessage SealedChamber_InnerRoom_Braille_1C53F2 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -50,7 +50,7 @@ SealedChamber_InnerRoom_EventScript_15F249:: @ 815F249 SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5414 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -58,7 +58,7 @@ SealedChamber_InnerRoom_EventScript_15F257:: @ 815F257 SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5435 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -66,7 +66,7 @@ SealedChamber_InnerRoom_EventScript_15F265:: @ 815F265 SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 lockall braillemessage SealedChamber_InnerRoom_Braille_1C545C - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -74,7 +74,7 @@ SealedChamber_InnerRoom_EventScript_15F273:: @ 815F273 SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 lockall braillemessage SealedChamber_InnerRoom_Braille_1C5470 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -82,7 +82,7 @@ SealedChamber_InnerRoom_EventScript_15F281:: @ 815F281 SealedChamber_InnerRoom_EventScript_15F28F:: @ 815F28F lockall braillemessage SealedChamber_InnerRoom_Braille_1C549B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index 7add1e6f3..ad17819c2 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -19,18 +19,18 @@ SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 - setmaptile 9, 1, 553, 1 - setmaptile 10, 1, 553, 1 - setmaptile 11, 1, 553, 1 - setmaptile 9, 2, 565, 1 - setmaptile 10, 2, 565, 1 - setmaptile 11, 2, 565, 1 + setmetatile 9, 1, 553, 1 + setmetatile 10, 1, 553, 1 + setmetatile 11, 1, 553, 1 + setmetatile 9, 2, 565, 1 + setmetatile 10, 2, 565, 1 + setmetatile 11, 2, 565, 1 return SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C lockall braillemessage SealedChamber_OuterRoom_Braille_1C534F - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -38,7 +38,7 @@ SealedChamber_OuterRoom_EventScript_15F12C:: @ 815F12C SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A lockall braillemessage SealedChamber_OuterRoom_Braille_1C5359 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -46,7 +46,7 @@ SealedChamber_OuterRoom_EventScript_15F13A:: @ 815F13A SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5363 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -54,7 +54,7 @@ SealedChamber_OuterRoom_EventScript_15F148:: @ 815F148 SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 lockall braillemessage SealedChamber_OuterRoom_Braille_1C536D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -62,7 +62,7 @@ SealedChamber_OuterRoom_EventScript_15F156:: @ 815F156 SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5377 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -70,7 +70,7 @@ SealedChamber_OuterRoom_EventScript_15F164:: @ 815F164 SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 lockall braillemessage SealedChamber_OuterRoom_Braille_1C5381 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -78,7 +78,7 @@ SealedChamber_OuterRoom_EventScript_15F172:: @ 815F172 SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 lockall braillemessage SealedChamber_OuterRoom_Braille_1C538B - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -86,7 +86,7 @@ SealedChamber_OuterRoom_EventScript_15F180:: @ 815F180 SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E lockall braillemessage SealedChamber_OuterRoom_Braille_1C5396 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -94,7 +94,7 @@ SealedChamber_OuterRoom_EventScript_15F18E:: @ 815F18E SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C lockall braillemessage SealedChamber_OuterRoom_Braille_1C539E - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -102,7 +102,7 @@ SealedChamber_OuterRoom_EventScript_15F19C:: @ 815F19C SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA lockall braillemessage SealedChamber_OuterRoom_Braille_1C53A9 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -112,7 +112,7 @@ SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 checkflag FLAG_SYS_BRAILLE_DIG goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end @@ -125,7 +125,7 @@ SealedChamber_OuterRoom_EventScript_15F1CF:: @ 815F1CF SealedChamber_OuterRoom_EventScript_15F1D9:: @ 815F1D9 lockall braillemessage SealedChamber_OuterRoom_Braille_1C53B1 - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index 302bc3930..f72c3d76e 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -6,7 +6,7 @@ SecretBase_YellowCave4_MapScripts:: @ 815F337 .byte 0 SecretBase_RedCave1_MapScript1_15F34C:: @ 815F34C - tileeffect 6 + setstepcallback 6 end SecretBase_RedCave1_MapScript1_15F34F:: @ 815F34F diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index fcff20944..533c46850 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -37,9 +37,9 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 - removeitem ITEM_SHOAL_SALT, 4 - removeitem ITEM_SHOAL_SHELL, 4 - giveitem ITEM_SHELL_BELL + takeitem ITEM_SHOAL_SALT, 4 + takeitem ITEM_SHOAL_SHELL, 4 + giveitem_std ITEM_SHELL_BELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_1A029B msgbox ShoalCave_LowTideEntranceRoom_Text_1C688E, 4 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index 43dfa8afa..b6aba9523 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -25,7 +25,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - setmaptile 31, 8, 856, 1 + setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end @@ -34,35 +34,35 @@ ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB checkflag FLAG_SYS_SHOAL_TIDE goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - setmaptile 14, 26, 856, 1 + setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 - setmaptile 41, 20, 857, 1 + setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B - setmaptile 41, 10, 857, 1 + setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 - setmaptile 6, 9, 857, 1 + setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 - setmaptile 16, 13, 857, 1 + setmetatile 16, 13, 857, 1 return ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 @@ -72,10 +72,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 20, 859, 0 + setmetatile 41, 20, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 releaseall @@ -90,10 +90,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 41, 10, 859, 0 + setmetatile 41, 10, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 releaseall @@ -103,10 +103,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 6, 9, 859, 0 + setmetatile 6, 9, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 releaseall @@ -116,10 +116,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 - giveitem ITEM_SHOAL_SHELL + giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 16, 13, 859, 0 + setmetatile 16, 13, 859, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 releaseall @@ -129,10 +129,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 31, 8, 858, 0 + setmetatile 31, 8, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_1 releaseall @@ -147,10 +147,10 @@ ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B - setmaptile 14, 26, 858, 0 + setmetatile 14, 26, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_2 releaseall diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index adf7d5d9e..c7cb08a9b 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 - setmaptile 18, 2, 856, 1 + setmetatile 18, 2, 856, 1 return ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 @@ -19,10 +19,10 @@ ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B - setmaptile 18, 2, 858, 0 + setmetatile 18, 2, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_4 releaseall @@ -39,7 +39,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F checkflag FLAG_RECEIVED_FOCUS_BAND goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 - giveitem ITEM_FOCUS_BAND + giveitem_std ITEM_FOCUS_BAND compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B setflag FLAG_RECEIVED_FOCUS_BAND diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index d6858bc15..efcad59d3 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -9,7 +9,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 - setmaptile 11, 11, 856, 1 + setmetatile 11, 11, 856, 1 return ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 @@ -19,10 +19,10 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 - giveitem ITEM_SHOAL_SALT + giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B - setmaptile 11, 11, 858, 0 + setmetatile 11, 11, 858, 0 special DrawWholeMapView setflag FLAG_HIDE_TOOK_SHOAL_SALT_3 releaseall diff --git a/data/scripts/maps/SkyPillar_2F.inc b/data/scripts/maps/SkyPillar_2F.inc index 3f388127b..bd87e8562 100644 --- a/data/scripts/maps/SkyPillar_2F.inc +++ b/data/scripts/maps/SkyPillar_2F.inc @@ -5,6 +5,6 @@ SkyPillar_2F_MapScripts:: @ 815F2C9 .byte 0 SkyPillar_2F_MapScript1_15F2D9:: @ 815F2D9 - tileeffect 7 + setstepcallback 7 setholewarp MAP_SKY_PILLAR_1F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_4F.inc b/data/scripts/maps/SkyPillar_4F.inc index f0b9a6f85..860f35b48 100644 --- a/data/scripts/maps/SkyPillar_4F.inc +++ b/data/scripts/maps/SkyPillar_4F.inc @@ -5,6 +5,6 @@ SkyPillar_4F_MapScripts:: @ 815F2E5 .byte 0 SkyPillar_4F_MapScript1_15F2F5:: @ 815F2F5 - tileeffect 7 + setstepcallback 7 setholewarp MAP_SKY_PILLAR_3F, 255, 0, 0 end diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 37da10220..07a78d2c4 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -16,9 +16,9 @@ SkyPillar_Top_EventScript_15F316:: @ 815F316 faceplayer setwildbattle SPECIES_RAYQUAZA, 70, ITEM_NONE waitse - playpokecry SPECIES_RAYQUAZA, 2 + playmoncry SPECIES_RAYQUAZA, 2 delay 40 - waitpokecry + waitmoncry setflag FLAG_HIDE_RAYQUAZA setflag FLAG_SYS_CTRL_OBJ_DELETE special ScrSpecial_StartRayquazaBattle diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index c163685b2..56fc0e59b 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -64,7 +64,7 @@ SlateportCity_Items1:: @ 814BAD0 SlateportCity_EventScript_14BAE0:: @ 814BAE0 lock faceplayer - getfirstpartypokename 0 + bufferleadmonspeciesname 0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 @@ -388,7 +388,7 @@ SlateportCity_EventScript_14BDF2:: @ 814BDF2 faceplayer message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations1 + pokemartdecoration SlateportCity_Decorations1 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -414,7 +414,7 @@ SlateportCity_EventScript_14BE20:: @ 814BE20 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations2 + pokemartdecoration SlateportCity_Decorations2 msgbox SlateportCity_Text_1A0C02, 4 release end @@ -446,7 +446,7 @@ SlateportCity_Decorations2:: @ 814BE40 goto_if 0, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage - pokemartdecor SlateportCity_Decorations3 + pokemartdecoration SlateportCity_Decorations3 msgbox SlateportCity_Text_1A0C02, 4 release end diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 220ca3374..0a6f40c75 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -15,7 +15,7 @@ SlateportCity_ContestHall_EventScript_15555E:: @ 815555E checkflag FLAG_RECEIVED_TM41 goto_if_eq SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 - giveitem ITEM_TM41 + giveitem_std ITEM_TM41 compare RESULT, 0 goto_if_eq SlateportCity_ContestHall_EventScript_1A029B setflag FLAG_RECEIVED_TM41 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 5a00f4830..c4a44d9c9 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -23,14 +23,14 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, SlateportCity_ContestLobby_Movement_1554DC @@ -106,7 +106,7 @@ SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 - giveitem ITEM_POKEBLOCK_CASE + giveitem_std ITEM_POKEBLOCK_CASE setflag FLAG_RECEIVED_POKEBLOCK_CASE releaseall end @@ -129,7 +129,7 @@ SlateportCity_ContestLobby_EventScript_155536:: @ 8155536 @ 815553F lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index ae19d0326..304013b08 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -222,13 +222,13 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 applymovement LAST_TALKED, SlateportCity_Harbor_Movement_1A0841 waitmovement 0 delay 30 - hideobject LAST_TALKED, 9, 8 + hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare FACING, 2 call_if 1, SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 - hideobject 255, 0, 0 + hideobjectat 255, MAP_PETALBURG_CITY setvar 0x8004, 5 call SlateportCity_Harbor_EventScript_1A040E return @@ -335,10 +335,10 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA msgbox SlateportCity_Harbor_Text_1803DD, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_TOOTH + giveitem_std ITEM_DEEP_SEA_TOOTH compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 @@ -348,10 +348,10 @@ SlateportCity_Harbor_EventScript_15632A:: @ 815632A msgbox SlateportCity_Harbor_Text_180412, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_156374 - giveitem ITEM_DEEP_SEA_SCALE + giveitem_std ITEM_DEEP_SEA_SCALE compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_1A029B - removeitem ITEM_SCANNER, 1 + takeitem ITEM_SCANNER, 1 msgbox SlateportCity_Harbor_Text_18046B, 4 setflag FLAG_EXCHANGED_SCANNER goto SlateportCity_Harbor_EventScript_156380 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 0cb7b397e..9e002e61e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -164,7 +164,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 waitmovement 0 msgbox SlateportCity_OceanicMuseum_1F_Text_17E582, 4 - giveitem ITEM_TM46 + giveitem_std ITEM_TM46 compare RESULT, 0 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155CC2 setflag FLAG_RECEIVED_TM46 diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index 9aa326f70..ac4e8f240 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF .byte 0 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 - sethealplace 4 + setrespawn 4 call SlateportCity_PokemonCenter_1F_EventScript_19FD1B end @@ -11,7 +11,7 @@ SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE setvar 0x800b, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 7f3c331bd..593e18fee 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -59,7 +59,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 - getfirstpartypokename 0 + bufferleadmonspeciesname 0 switch 0x4001 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 @@ -89,7 +89,7 @@ SlateportCity_PokemonFanClub_EventScript_1558A3:: @ 81558A3 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_RED_SCARF - giveitem ITEM_RED_SCARF + giveitem_std ITEM_RED_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC1B, 4 release end @@ -100,7 +100,7 @@ SlateportCity_PokemonFanClub_EventScript_1558D4:: @ 81558D4 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_BLUE_SCARF - giveitem ITEM_BLUE_SCARF + giveitem_std ITEM_BLUE_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DC74, 4 release end @@ -111,7 +111,7 @@ SlateportCity_PokemonFanClub_EventScript_155905:: @ 8155905 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_PINK_SCARF - giveitem ITEM_PINK_SCARF + giveitem_std ITEM_PINK_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DCCB, 4 release end @@ -122,7 +122,7 @@ SlateportCity_PokemonFanClub_EventScript_155936:: @ 8155936 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_GREEN_SCARF - giveitem ITEM_GREEN_SCARF + giveitem_std ITEM_GREEN_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD27, 4 release end @@ -133,7 +133,7 @@ SlateportCity_PokemonFanClub_EventScript_155967:: @ 8155967 goto_if_eq SlateportCity_PokemonFanClub_EventScript_155998 msgbox SlateportCity_PokemonFanClub_Text_17DB89, 4 setflag FLAG_RECEIVED_YELLOW_SCARF - giveitem ITEM_YELLOW_SCARF + giveitem_std ITEM_YELLOW_SCARF msgbox SlateportCity_PokemonFanClub_Text_17DD78, 4 release end @@ -212,7 +212,7 @@ SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 waitmovement 0 msgbox SlateportCity_PokemonFanClub_Text_17DF57, 4 - giveitem ITEM_SOOTHE_BELL + giveitem_std ITEM_SOOTHE_BELL compare RESULT, 0 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1A029B setflag FLAG_RECEIVED_SOOTHE_BELL @@ -236,9 +236,9 @@ SlateportCity_PokemonFanClub_EventScript_155A91:: @ 8155A91 lock faceplayer waitse - playpokecry SPECIES_SKITTY, 0 + playmoncry SPECIES_SKITTY, 0 msgbox SlateportCity_PokemonFanClub_Text_17E14E, 4 - waitpokecry + waitmoncry release end @@ -246,9 +246,9 @@ SlateportCity_PokemonFanClub_EventScript_155AA4:: @ 8155AA4 lock faceplayer waitse - playpokecry SPECIES_ZIGZAGOON, 0 + playmoncry SPECIES_ZIGZAGOON, 0 msgbox SlateportCity_PokemonFanClub_Text_17E164, 4 - waitpokecry + waitmoncry release end @@ -256,8 +256,8 @@ SlateportCity_PokemonFanClub_EventScript_155AB7:: @ 8155AB7 lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SlateportCity_PokemonFanClub_Text_17E178, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 748dbe898..f4842bd40 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -13,7 +13,7 @@ SootopolisCity_MapScript1_14D08D:: @ 814D08D SootopolisCity_EventScript_14D0A0:: @ 814D0A0 setobjectxyperm 3, 31, 18 - setmaptile 31, 32, 592, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 @@ -22,15 +22,15 @@ SootopolisCity_EventScript_14D0B1:: @ 814D0B1 return SootopolisCity_EventScript_14D0BB:: @ 814D0BB - setmaptile 9, 6, 584, 1 - setmaptile 9, 17, 584, 1 - setmaptile 9, 26, 584, 1 - setmaptile 44, 17, 584, 1 - setmaptile 8, 35, 584, 1 - setmaptile 53, 28, 584, 1 - setmaptile 45, 6, 584, 1 - setmaptile 48, 25, 584, 1 - setmaptile 31, 32, 592, 1 + setmetatile 9, 6, 584, 1 + setmetatile 9, 17, 584, 1 + setmetatile 9, 26, 584, 1 + setmetatile 44, 17, 584, 1 + setmetatile 8, 35, 584, 1 + setmetatile 53, 28, 584, 1 + setmetatile 45, 6, 584, 1 + setmetatile 48, 25, 584, 1 + setmetatile 31, 32, 592, 1 return SootopolisCity_MapScript1_14D10D:: @ 814D10D @@ -98,7 +98,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F random 10 addvar RESULT, 20 addvar RESULT, ITEM_CHERI_BERRY - giveitem RESULT + giveitem_std RESULT compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS @@ -111,7 +111,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F end SootopolisCity_EventScript_14D1FF:: @ 814D1FF - giveitem ITEM_FIGY_BERRY + giveitem_std ITEM_FIGY_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -119,7 +119,7 @@ SootopolisCity_EventScript_14D1FF:: @ 814D1FF end SootopolisCity_EventScript_14D220:: @ 814D220 - giveitem ITEM_IAPAPA_BERRY + giveitem_std ITEM_IAPAPA_BERRY compare RESULT, 0 goto_if_eq SootopolisCity_EventScript_1A029B msgbox SootopolisCity_Text_1C650B, 4 @@ -461,7 +461,7 @@ SootopolisCity_EventScript_14D4AD:: @ 814D4AD applymovement LAST_TALKED, SootopolisCity_Movement_1A0845 waitmovement 0 delay 50 - setfieldeffect 0, 1 + setfieldeffectargument 0, 1 dofieldeffect 30 delay 15 removeobject LAST_TALKED diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 6f99ba8a5..65ed13d87 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -10,7 +10,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C end SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 - tileeffect 4 + setstepcallback 4 end SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 @@ -25,16 +25,16 @@ SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 compare 0x4022, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 - setmaptile 8, 4, 519, 0 - setmaptile 8, 5, 519, 0 + setmetatile 8, 4, 519, 0 + setmetatile 8, 5, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF61:: @ 815AF61 - setmaptile 8, 10, 519, 0 - setmaptile 8, 11, 519, 0 + setmetatile 8, 10, 519, 0 + setmetatile 8, 11, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF73:: @ 815AF73 - setmaptile 8, 15, 519, 0 - setmaptile 8, 16, 519, 0 + setmetatile 8, 15, 519, 0 + setmetatile 8, 16, 519, 0 SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return @@ -108,7 +108,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D end SootopolisCity_Gym_1F_EventScript_15B056:: @ 815B056 - giveitem ITEM_TM03 + giveitem_std ITEM_TM03 compare RESULT, 0 goto_if_eq SootopolisCity_Gym_1F_EventScript_1A029B msgbox SootopolisCity_Gym_1F_Text_18F466, 4 diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 9a7b63c82..074c9a179 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -7,7 +7,7 @@ SootopolisCity_House1_EventScript_15B29B:: @ 815B29B checkflag FLAG_RECEIVED_TM31 goto_if_eq SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 - giveitem ITEM_TM31 + giveitem_std ITEM_TM31 setflag FLAG_RECEIVED_TM31 msgbox SootopolisCity_House1_Text_18FA03, 4 release @@ -22,8 +22,8 @@ SootopolisCity_House1_EventScript_15B2D1:: @ 815B2D1 lock faceplayer waitse - playpokecry SPECIES_KECLEON, 0 + playmoncry SPECIES_KECLEON, 0 msgbox SootopolisCity_House1_Text_18FA50, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House4.inc b/data/scripts/maps/SootopolisCity_House4.inc index c192a0340..b552cc6d6 100644 --- a/data/scripts/maps/SootopolisCity_House4.inc +++ b/data/scripts/maps/SootopolisCity_House4.inc @@ -13,8 +13,8 @@ SootopolisCity_House4_EventScript_15B35F:: @ 815B35F lock faceplayer waitse - playpokecry SPECIES_AZUMARILL, 0 + playmoncry SPECIES_AZUMARILL, 0 msgbox SootopolisCity_House4_Text_18FDD8, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index 1adf05991..fb91202f3 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -10,7 +10,7 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 compare RESULT, 0 call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 - givedecoration DECOR_WAILMER_DOLL + givedecoration_std DECOR_WAILMER_DOLL compare RESULT, 0 goto_if_eq SootopolisCity_House6_EventScript_15B3D7 setflag FLAG_RECEIVED_WAILMER_DOLL @@ -28,7 +28,7 @@ SootopolisCity_House6_EventScript_15B3CD:: @ 815B3CD end SootopolisCity_House6_EventScript_15B3D7:: @ 815B3D7 - getdecorname 1, DECOR_WAILMER_DOLL + bufferdecorationname 1, DECOR_WAILMER_DOLL msgbox SootopolisCity_House6_Text_1A0CEF, 4 msgbox SootopolisCity_House6_Text_18FF28, 4 release diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index df536004e..bdff79375 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -38,7 +38,7 @@ SootopolisCity_House8_EventScript_15B45C:: @ 815B45C SootopolisCity_House8_EventScript_15B466:: @ 815B466 msgbox SootopolisCity_House8_Text_19021D, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B488 closemessage @@ -87,7 +87,7 @@ SootopolisCity_House8_EventScript_15B4ED:: @ 815B4ED SootopolisCity_House8_EventScript_15B4F7:: @ 815B4F7 msgbox SootopolisCity_House8_Text_190536, 4 - giveitem ITEM_ELIXIR + giveitem_std ITEM_ELIXIR compare RESULT, 0 goto_if_eq SootopolisCity_House8_EventScript_15B519 closemessage diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 8bbb06575..7b87bc7fc 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -3,14 +3,14 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190 .byte 0 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 - sethealplace 10 + setrespawn 10 end @ 815B19A setvar 0x800B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 81c50559e..f62becf08 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -17,7 +17,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 applymovement LAST_TALKED, SouthernIsland_Exterior_Movement_1A0845 waitmovement 0 delay 30 - hideobject 1, 26, 9 + hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR setvar 0x8004, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 0a9ca6b89..ea2f852f4 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -54,9 +54,9 @@ SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 waitmovement 0 delay 50 waitse - playpokecry SPECIES_LATIAS_OR_LATIOS, 0 + playmoncry SPECIES_LATIAS_OR_LATIOS, 0 delay 30 - waitpokecry + waitmoncry addobject 2 delay 30 applymovement 127, SouthernIsland_Interior_Movement_160C16 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index 665cbf4af..d991a7096 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -20,18 +20,18 @@ Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 - setmaptile 5, 3, 542, 1 - setmaptile 6, 3, 542, 1 - setmaptile 7, 3, 542, 1 - setmaptile 8, 3, 542, 1 - setmaptile 5, 4, 552, 0 - setmaptile 6, 4, 552, 0 - setmaptile 7, 4, 552, 0 - setmaptile 8, 4, 552, 0 - setmaptile 5, 5, 552, 0 - setmaptile 6, 5, 552, 0 - setmaptile 7, 5, 552, 0 - setmaptile 8, 5, 552, 0 + setmetatile 5, 3, 542, 1 + setmetatile 6, 3, 542, 1 + setmetatile 7, 3, 542, 1 + setmetatile 8, 3, 542, 1 + setmetatile 5, 4, 552, 0 + setmetatile 6, 4, 552, 0 + setmetatile 7, 4, 552, 0 + setmetatile 8, 4, 552, 0 + setmetatile 5, 5, 552, 0 + setmetatile 6, 5, 552, 0 + setmetatile 7, 5, 552, 0 + setmetatile 8, 5, 552, 0 return Underwater_SeafloorCavern_MapScript1_15DA36:: @ 815DA36 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 733a060c3..cb5c713ee 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -21,7 +21,7 @@ Underwater_SealedChamber_EventScript_15F0AF:: @ 815F0AF Underwater_SealedChamber_EventScript_15F0B8:: @ 815F0B8 lockall braillemessage Underwater_SealedChamber_Braille_1C533D - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 213a3609a..1e0f14728 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -68,7 +68,7 @@ LinkContestRoom1_EventScript_15F61A:: @ 815F61A end LinkContestRoom1_EventScript_15F625:: @ 815F625 - hideobject 255, 0, 9 + hideobjectat 255, MAP_LITTLEROOT_TOWN call LinkContestRoom1_EventScript_15F919 end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 9726038d4..3694f089d 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -23,14 +23,14 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 playse 71 - setmaptile 4, 2, 545, 1 - setmaptile 4, 3, 609, 1 + setmetatile 4, 2, 545, 1 + setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 playse 71 - setmaptile 4, 2, 721, 1 - setmaptile 4, 3, 729, 1 + setmetatile 4, 2, 721, 1 + setmetatile 4, 3, 729, 1 special DrawWholeMapView delay 20 applymovement 1, VerdanturfTown_ContestLobby_Movement_153E35 @@ -104,7 +104,7 @@ VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 checkflag FLAG_RECEIVED_TM45 goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 - giveitem ITEM_TM45 + giveitem_std ITEM_TM45 compare RESULT, 0 goto_if_eq VerdanturfTown_ContestLobby_EventScript_1A029B setflag FLAG_RECEIVED_TM45 @@ -123,7 +123,7 @@ VerdanturfTown_ContestLobby_EventScript_153E80:: @ 8153E80 VerdanturfTown_ContestLobby_EventScript_153E89:: @ 8153E89 lockall special ShowBerryBlenderRecordWindow - waitbutton + waitbuttonpress erasebox 0, 0, 29, 19 releaseall end diff --git a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc index 1cfa785d3..ed60ec1c7 100644 --- a/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc +++ b/data/scripts/maps/VerdanturfTown_FriendshipRatersHouse.inc @@ -56,8 +56,8 @@ VerdanturfTown_FriendshipRatersHouse_EventScript_1540D9:: @ 81540D9 lock faceplayer waitse - playpokecry SPECIES_PIKACHU, 0 + playmoncry SPECIES_PIKACHU, 0 msgbox VerdanturfTown_FriendshipRatersHouse_Text_178CFD, 4 - waitpokecry + waitmoncry release end diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index a0b1f87de..598c3f60b 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09 .byte 0 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F - sethealplace 18 + setrespawn 18 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B end @@ -12,7 +12,7 @@ VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 setvar 0x800b, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage - waitbutton + waitbuttonpress release end -- cgit v1.2.3 From 4b5ad9de049a63b101b2bf5f2f2cb92beb26e5fb Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 12:36:12 -0600 Subject: Name and use temp var constants --- .../maps/AbandonedShip_HiddenFloorRooms.inc | 22 +-- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 +- data/scripts/maps/BattleTower_Corridor.inc | 6 +- data/scripts/maps/BattleTower_Elevator.inc | 10 +- data/scripts/maps/BattleTower_Lobby.inc | 32 ++-- data/scripts/maps/EverGrandeCity.inc | 2 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_Corridor1.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor2.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor3.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor4.inc | 2 +- data/scripts/maps/EverGrandeCity_Corridor5.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_HallOfFame.inc | 6 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 6 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 2 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 20 +-- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 42 ++--- data/scripts/maps/LilycoveCity_House3.inc | 10 +- data/scripts/maps/LittlerootTown.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 68 ++++----- data/scripts/maps/MossdeepCity.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MtPyre_Exterior.inc | 4 +- data/scripts/maps/NewMauville_Inside.inc | 16 +- data/scripts/maps/PetalburgCity.inc | 6 +- data/scripts/maps/PetalburgCity_Gym.inc | 2 +- data/scripts/maps/Route101.inc | 4 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 4 +- .../Route110_SeasideCyclingRoadSouthEntrance.inc | 4 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 14 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 24 +-- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 104 ++++++------- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 170 ++++++++++----------- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 2 +- data/scripts/maps/Route111.inc | 16 +- data/scripts/maps/Route113.inc | 6 +- data/scripts/maps/Route119.inc | 20 +-- data/scripts/maps/Route120.inc | 12 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 16 +- data/scripts/maps/RustboroCity.inc | 36 ++--- data/scripts/maps/RusturfTunnel.inc | 28 ++-- data/scripts/maps/SafariZone_Southeast.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 6 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 20 +-- data/scripts/maps/UnknownMap_25_34.inc | 100 ++++++------ 52 files changed, 445 insertions(+), 445 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index c1e77a8c7..343ef4233 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -3,20 +3,20 @@ AbandonedShip_HiddenFloorRooms_MapScripts:: @ 815ED01 .byte 0 AbandonedShip_HiddenFloorRooms_MapScript2_15ED07:: @ 815ED07 - map_script_2 0x4001, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 + map_script_2 VAR_TEMP_1, 0, AbandonedShip_HiddenFloorRooms_EventScript_15ED11 .2byte 0 AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 - setvar 0x4001, 1 - getplayerxy 0x4002, 0x4003 - setvar 0x4004, 1 - compare 0x4002, 21 + setvar VAR_TEMP_1, 1 + getplayerxy VAR_TEMP_2, VAR_TEMP_3 + setvar VAR_TEMP_4, 1 + compare VAR_TEMP_2, 21 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 - compare 0x4002, 36 + compare VAR_TEMP_2, 36 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F - compare 0x4003, 2 + compare VAR_TEMP_3, 2 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 - switch 0x4004 + switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 case 3, AbandonedShip_HiddenFloorRooms_EventScript_15EDC5 @@ -26,15 +26,15 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 end AbandonedShip_HiddenFloorRooms_EventScript_15ED89:: @ 815ED89 - addvar 0x4004, 1 + addvar VAR_TEMP_4, 1 return AbandonedShip_HiddenFloorRooms_EventScript_15ED8F:: @ 815ED8F - addvar 0x4004, 2 + addvar VAR_TEMP_4, 2 return AbandonedShip_HiddenFloorRooms_EventScript_15ED95:: @ 815ED95 - addvar 0x4004, 3 + addvar VAR_TEMP_4, 3 return AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index a587fcc92..0535af6f3 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -19,7 +19,7 @@ MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 3065c0cbb..7259e8305 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -3,11 +3,11 @@ BattleTower_BattleRoom_MapScripts:: @ 81608DB .byte 0 BattleTower_BattleRoom_MapScript2_1608E1:: @ 81608E1 - map_script_2 0x4000, 0, BattleTower_BattleRoom_EventScript_1608EB + map_script_2 VAR_TEMP_0, 0, BattleTower_BattleRoom_EventScript_1608EB .2byte 0 BattleTower_BattleRoom_EventScript_1608EB:: @ 81608EB - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 255, BattleTower_BattleRoom_Movement_160AB7 waitmovement 0 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 828d975fc..b0e957e6b 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -16,11 +16,11 @@ BattleTower_Corridor_EventScript_16086E:: @ 816086E end BattleTower_Corridor_MapScript2_160881:: @ 8160881 - map_script_2 0x4000, 0, BattleTower_Corridor_EventScript_16088B + map_script_2 VAR_TEMP_0, 0, BattleTower_Corridor_EventScript_16088B .2byte 0 BattleTower_Corridor_EventScript_16088B:: @ 816088B - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 compare 0x8006, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 @@ -34,7 +34,7 @@ BattleTower_Corridor_EventScript_1608B1:: @ 81608B1 waitmovement 0 BattleTower_Corridor_EventScript_1608C2:: @ 81608C2 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_BATTLE_ROOM, 255, 4, 8 waitstate end diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index c006cdffe..fccfcdb2c 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -4,11 +4,11 @@ BattleTower_Elevator_MapScripts:: @ 81607CF .byte 0 BattleTower_Elevator_MapScript2_1607DA:: @ 81607DA - map_script_2 0x4000, 0, BattleTower_Elevator_EventScript_1607E4 + map_script_2 VAR_TEMP_0, 0, BattleTower_Elevator_EventScript_1607E4 .2byte 0 BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 @@ -18,17 +18,17 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 1, BattleTower_Elevator_Movement_16083D applymovement 255, BattleTower_Elevator_Movement_160841 waitmovement 0 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 warp MAP_BATTLE_TOWER_CORRIDOR, 255, 8, 1 waitstate end BattleTower_Elevator_MapScript2_160821:: @ 8160821 - map_script_2 0x4001, 0, BattleTower_Elevator_EventScript_16082B + map_script_2 VAR_TEMP_1, 0, BattleTower_Elevator_EventScript_16082B .2byte 0 BattleTower_Elevator_EventScript_16082B:: @ 816082B - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 69db45ede..ca90b8b28 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -41,20 +41,20 @@ BattleTower_Lobby_MapScript1_1602E8:: @ 81602E8 end BattleTower_Lobby_MapScript2_1602EE:: @ 81602EE - map_script_2 0x4001, 0, BattleTower_Lobby_EventScript_1602F8 + map_script_2 VAR_TEMP_1, 0, BattleTower_Lobby_EventScript_1602F8 .2byte 0 BattleTower_Lobby_EventScript_1602F8:: @ 81602F8 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 turnobject 255, 2 end BattleTower_Lobby_MapScript2_160302:: @ 8160302 - map_script_2 0x4000, 0, BattleTower_Lobby_EventScript_16032C - map_script_2 0x4000, 1, BattleTower_Lobby_EventScript_160330 - map_script_2 0x4000, 2, BattleTower_Lobby_EventScript_160342 - map_script_2 0x4000, 3, BattleTower_Lobby_EventScript_160419 - map_script_2 0x4000, 4, BattleTower_Lobby_EventScript_16044B + map_script_2 VAR_TEMP_0, 0, BattleTower_Lobby_EventScript_16032C + map_script_2 VAR_TEMP_0, 1, BattleTower_Lobby_EventScript_160330 + map_script_2 VAR_TEMP_0, 2, BattleTower_Lobby_EventScript_160342 + map_script_2 VAR_TEMP_0, 3, BattleTower_Lobby_EventScript_160419 + map_script_2 VAR_TEMP_0, 4, BattleTower_Lobby_EventScript_16044B .2byte 0 BattleTower_Lobby_EventScript_16032C:: @ 816032C @@ -66,7 +66,7 @@ BattleTower_Lobby_EventScript_160330:: @ 8160330 faceplayer msgbox BattleTower_Lobby_Text_19A3FD, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -125,7 +125,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -133,7 +133,7 @@ BattleTower_Lobby_EventScript_160408:: @ 8160408 msgbox BattleTower_Lobby_Text_19A520, 4 waitmessage closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -152,7 +152,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 release end @@ -171,14 +171,14 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B setvar 0x8004, 8 setvar 0x8005, 0 special sub_8135668 - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 special SavePlayerParty special sub_8135A14 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_16049E:: @ 816049E @@ -230,7 +230,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar 0x8004, 5 special sub_8135668 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 setvar 0x8004, 11 special sub_8135668 setvar 0x8004, 0 @@ -243,7 +243,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 closemessage delay 2 call S_DoSaveDialog - setvar 0x4000, 5 + setvar VAR_TEMP_0, 5 erasebox 0, 0, 15, 10 compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_160642 @@ -255,7 +255,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 closemessage call BattleTower_Lobby_EventScript_160664 warp MAP_BATTLE_TOWER_ELEVATOR, 255, 1, 6 - setvar 0x4000, 0 + setvar VAR_TEMP_0, 0 waitstate BattleTower_Lobby_EventScript_160600:: @ 8160600 diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index b4fa64cae..9a1bd9fa7 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -21,5 +21,5 @@ EverGrandeCity_EventScript_14D4F7:: @ 814D4F7 EverGrandeCity_EventScript_14D500:: @ 814D500 setflag FLAG_VISITED_EVER_GRANDE_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index d59476417..1ca62b61c 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -9,7 +9,7 @@ EverGrandeCity_ChampionsRoom_MapScript1_15B7BF:: @ 815B7BF end EverGrandeCity_ChampionsRoom_MapScript2_15B7C5:: @ 815B7C5 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7CF .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF @@ -17,7 +17,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7CF:: @ 815B7CF end EverGrandeCity_ChampionsRoom_MapScript2_15B7D4:: @ 815B7D4 - map_script_2 0x4001, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_ChampionsRoom_EventScript_15B7DE .2byte 0 EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE @@ -27,7 +27,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B7DE:: @ 815B7DE delay 40 applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B802 waitmovement 0 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto EverGrandeCity_ChampionsRoom_EventScript_15B805 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_Corridor1.inc b/data/scripts/maps/EverGrandeCity_Corridor1.inc index 104504960..60d1f7253 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor1.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor1.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor1_MapScripts:: @ 815BA0C .byte 0 EverGrandeCity_Corridor1_MapScript2_15BA12:: @ 815BA12 - map_script_2 0x4001, 0, EverGrandeCity_Corridor1_EventScript_15BA1C + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor1_EventScript_15BA1C .2byte 0 EverGrandeCity_Corridor1_EventScript_15BA1C:: @ 815BA1C diff --git a/data/scripts/maps/EverGrandeCity_Corridor2.inc b/data/scripts/maps/EverGrandeCity_Corridor2.inc index c7c049020..d74be91c4 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor2.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor2.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor2_MapScripts:: @ 815BA21 .byte 0 EverGrandeCity_Corridor2_MapScript2_15BA27:: @ 815BA27 - map_script_2 0x4001, 0, EverGrandeCity_Corridor2_EventScript_15BA31 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor2_EventScript_15BA31 .2byte 0 EverGrandeCity_Corridor2_EventScript_15BA31:: @ 815BA31 diff --git a/data/scripts/maps/EverGrandeCity_Corridor3.inc b/data/scripts/maps/EverGrandeCity_Corridor3.inc index 1714db5cc..006e570ef 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor3.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor3.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor3_MapScripts:: @ 815BA36 .byte 0 EverGrandeCity_Corridor3_MapScript2_15BA3C:: @ 815BA3C - map_script_2 0x4001, 0, EverGrandeCity_Corridor3_EventScript_15BA46 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor3_EventScript_15BA46 .2byte 0 EverGrandeCity_Corridor3_EventScript_15BA46:: @ 815BA46 diff --git a/data/scripts/maps/EverGrandeCity_Corridor4.inc b/data/scripts/maps/EverGrandeCity_Corridor4.inc index 64cc234eb..2ae857aa8 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor4.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor4.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor4_MapScripts:: @ 815BA4B .byte 0 EverGrandeCity_Corridor4_MapScript2_15BA51:: @ 815BA51 - map_script_2 0x4001, 0, EverGrandeCity_Corridor4_EventScript_15BA5B + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor4_EventScript_15BA5B .2byte 0 EverGrandeCity_Corridor4_EventScript_15BA5B:: @ 815BA5B diff --git a/data/scripts/maps/EverGrandeCity_Corridor5.inc b/data/scripts/maps/EverGrandeCity_Corridor5.inc index 73c0b5a84..09ce304f6 100644 --- a/data/scripts/maps/EverGrandeCity_Corridor5.inc +++ b/data/scripts/maps/EverGrandeCity_Corridor5.inc @@ -3,7 +3,7 @@ EverGrandeCity_Corridor5_MapScripts:: @ 815BA60 .byte 0 EverGrandeCity_Corridor5_MapScript2_15BA66:: @ 815BA66 - map_script_2 0x4001, 0, EverGrandeCity_Corridor5_EventScript_15BA70 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_Corridor5_EventScript_15BA70 .2byte 0 EverGrandeCity_Corridor5_EventScript_15BA70:: @ 815BA70 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index f7088e821..ef86b1df2 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_DrakesRoom_MapScripts:: @ 815B70D .byte 0 @ 815B71D - map_script_2 0x4001, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_DrakesRoom_EventScript_15B727 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index be9e7a897..bffb94bc4 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_GlaciasRoom_MapScripts:: @ 815B673 .byte 0 EverGrandeCity_GlaciasRoom_MapScript2_15B683:: @ 815B683 - map_script_2 0x4001, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_GlaciasRoom_EventScript_15B68D .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D diff --git a/data/scripts/maps/EverGrandeCity_HallOfFame.inc b/data/scripts/maps/EverGrandeCity_HallOfFame.inc index 904dc7531..501f1e51c 100644 --- a/data/scripts/maps/EverGrandeCity_HallOfFame.inc +++ b/data/scripts/maps/EverGrandeCity_HallOfFame.inc @@ -4,7 +4,7 @@ EverGrandeCity_HallOfFame_MapScripts:: @ 815BB84 .byte 0 EverGrandeCity_HallOfFame_MapScript2_15BB8F:: @ 815BB8F - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BB99 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 @@ -12,7 +12,7 @@ EverGrandeCity_HallOfFame_EventScript_15BB99:: @ 815BB99 end EverGrandeCity_HallOfFame_MapScript2_15BB9E:: @ 815BB9E - map_script_2 0x4001, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_HallOfFame_EventScript_15BBA8 .2byte 0 EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 @@ -41,7 +41,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8 dofieldeffect 62 waitfieldeffect 62 delay 40 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call EverGrandeCity_HallOfFame_EventScript_19FC13 checkplayergender compare RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 5ffa16d37..8f0fe97f1 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -5,7 +5,7 @@ EverGrandeCity_PhoebesRoom_MapScripts:: @ 815B5D9 .byte 0 EverGrandeCity_PhoebesRoom_MapScript2_15B5E9:: @ 815B5E9 - map_script_2 0x4001, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_PhoebesRoom_EventScript_15B5F3 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 4a8919b98..63bb4cac3 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -49,10 +49,10 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall checkflag FLAG_ENTERED_ELITE_FOUR goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 11 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 11 call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 6e958aeed..50c951b17 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -21,7 +21,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B56A:: @ 815B56A EverGrandeCity_DrakesRoom_MapScript2_15B570:: @ 815B570 EverGrandeCity_SidneysRoom_MapScript2_15B570:: @ 815B570 - map_script_2 0x4001, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A + map_script_2 VAR_TEMP_1, 0, EverGrandeCity_SidneysRoom_EventScript_15B57A .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index a0eb6186a..5cacc8bf3 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -8,7 +8,7 @@ FortreeCity_Gym_MapScript1_157EDE:: @ 8157EDE end FortreeCity_Gym_MapScript2_157EE2:: @ 8157EE2 - map_script_2 0x4000, 16384, FortreeCity_Gym_EventScript_157EEC + map_script_2 VAR_TEMP_0, 16384, FortreeCity_Gym_EventScript_157EEC .2byte 0 FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index 18cfb904d..e3cef5fcb 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_15FC26:: @ 815FC26 InsideOfTruck_EventScript_15FC29:: @ 815FC29 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 checkplayergender compare RESULT, 0 goto_if_eq InsideOfTruck_EventScript_15FC45 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 9dd1ae59d..bbfe43bb6 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -8,34 +8,34 @@ LavaridgeTown_Gym_1F_MapScript1_153694:: @ 8153694 end LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F - setvar 0x400b, 0 - setvar 0x400c, 0 - setvar 0x400d, 0 - setvar 0x400e, 0 - setvar 0x400f, 0 + setvar VAR_TEMP_B, 0 + setvar VAR_TEMP_C, 0 + setvar VAR_TEMP_D, 0 + setvar VAR_TEMP_E, 0 + setvar VAR_TEMP_F, 0 checktrainerflag OPPONENT_COLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 - setvar 0x400b, 1 + setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 checktrainerflag OPPONENT_ZANE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 - setvar 0x400c, 1 + setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 checktrainerflag OPPONENT_AXLE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 - setvar 0x400d, 1 + setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 checktrainerflag OPPONENT_SADIE goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 - setvar 0x400e, 1 + setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 checktrainerflag OPPONENT_ANDY goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE - setvar 0x400f, 1 + setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index 2806b6125..ff7722f13 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -78,8 +78,8 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1CD:: @ 815A1CD LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE multichoice 16, 0, 42, 0 - copyvar 0x4001, RESULT - switch 0x4001 + copyvar VAR_TEMP_1, RESULT + switch VAR_TEMP_1 case 0, LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C case 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A227 case 2, LilycoveCity_DepartmentStoreRooftop_EventScript_15A232 @@ -88,17 +88,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C - setvar 0x4000, 26 + setvar VAR_TEMP_0, 26 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 - setvar 0x4000, 27 + setvar VAR_TEMP_0, 27 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 - setvar 0x4000, 28 + setvar VAR_TEMP_0, 28 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end @@ -127,54 +127,54 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 return LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop - bufferitemname 0, 0x4000 + bufferitemname 0, VAR_TEMP_0 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E - checkitemspace 0x4000, 1 + checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 playse 106 msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 - giveitem 0x4000, 1 - bufferitemname 1, 0x4000 + giveitem VAR_TEMP_0, 1 + bufferitemname 1, VAR_TEMP_0 bufferstdstring 2, 14 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index f700eed9d..03203ed47 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -4,7 +4,7 @@ LilycoveCity_House3_MapScripts:: @ 8159BE4 LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA random 4 - copyvar 0x4001, RESULT + copyvar VAR_TEMP_1, RESULT end LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 @@ -41,7 +41,7 @@ LilycoveCity_House3_EventScript_159C32:: @ 8159C32 LilycoveCity_House3_EventScript_159C49:: @ 8159C49 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -51,7 +51,7 @@ LilycoveCity_House3_EventScript_159C49:: @ 8159C49 LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -61,7 +61,7 @@ LilycoveCity_House3_EventScript_159C7D:: @ 8159C7D LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D @@ -71,7 +71,7 @@ LilycoveCity_House3_EventScript_159CB1:: @ 8159CB1 LilycoveCity_House3_EventScript_159CE5:: @ 8159CE5 lock faceplayer - switch 0x4001 + switch VAR_TEMP_1 case 0, LilycoveCity_House3_EventScript_159D19 case 1, LilycoveCity_House3_EventScript_159D23 case 2, LilycoveCity_House3_EventScript_159D2D diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 13c18d51e..17565f7e8 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -128,7 +128,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B closedoor 0x8004, 0x8005 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 return LittlerootTown_Movement_14D6AC:: @ 814D6AC diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 8228238f3..5b6c47a86 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -32,8 +32,8 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 end MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE - checkcoins 16385 - compare 0x4001, 9950 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9950 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 @@ -51,8 +51,8 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE end MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 - checkcoins 16385 - compare 0x4001, 9500 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 9500 goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 @@ -109,7 +109,7 @@ MauvilleCity_GameCorner_EventScript_156B88:: @ 8156B88 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156BA6 MauvilleCity_GameCorner_EventScript_156B9B:: @ 8156B9B @@ -128,17 +128,17 @@ MauvilleCity_GameCorner_EventScript_156BA6:: @ 8156BA6 end MauvilleCity_GameCorner_EventScript_156BE2:: @ 8156BE2 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferdecorationname 0, 88 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BF0:: @ 8156BF0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferdecorationname 0, 89 goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferdecorationname 0, 90 goto MauvilleCity_GameCorner_EventScript_156C0C @@ -146,15 +146,15 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 case 2, MauvilleCity_GameCorner_EventScript_156C80 case 3, MauvilleCity_GameCorner_EventScript_156CBA end MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 88 checkdecorspace 88 @@ -169,8 +169,8 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 end MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 89 checkdecorspace 89 @@ -185,8 +185,8 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 end MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA - checkcoins 16386 - compare 0x4002, 1000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, 90 checkdecorspace 90 @@ -230,7 +230,7 @@ MauvilleCity_GameCorner_EventScript_156D36:: @ 8156D36 message MauvilleCity_GameCorner_Text_181E17 waitmessage showcoinsbox 0, 0 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto MauvilleCity_GameCorner_EventScript_156D54 MauvilleCity_GameCorner_EventScript_156D49:: @ 8156D49 @@ -251,27 +251,27 @@ MauvilleCity_GameCorner_EventScript_156D54:: @ 8156D54 end MauvilleCity_GameCorner_EventScript_156DA6:: @ 8156DA6 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 bufferitemname 0, ITEM_TM32 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DB4:: @ 8156DB4 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 bufferitemname 0, ITEM_TM29 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DC2:: @ 8156DC2 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 bufferitemname 0, ITEM_TM35 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DD0:: @ 8156DD0 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 bufferitemname 0, ITEM_TM24 goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 bufferitemname 0, ITEM_TM13 goto MauvilleCity_GameCorner_EventScript_156DEC @@ -279,7 +279,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC msgbox MauvilleCity_GameCorner_Text_181E33, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 - switch 0x4001 + switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C case 2, MauvilleCity_GameCorner_EventScript_156E76 case 3, MauvilleCity_GameCorner_EventScript_156EB0 @@ -288,8 +288,8 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC end MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C - checkcoins 16386 - compare 0x4002, 1500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 1500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 @@ -303,8 +303,8 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C end MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 - checkcoins 16386 - compare 0x4002, 3500 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 3500 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 @@ -318,8 +318,8 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 end MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 @@ -333,8 +333,8 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 end MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 @@ -348,8 +348,8 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA end MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 - checkcoins 16386 - compare 0x4002, 4000 + checkcoins VAR_TEMP_2 + compare VAR_TEMP_2, 4000 goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 @@ -462,8 +462,8 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C checkflag FLAG_RECEIVED_20_COINS goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA - checkcoins 16385 - compare 0x4001, 1 + checkcoins VAR_TEMP_1 + compare VAR_TEMP_1, 1 goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS givecoins 20 diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index f165bd3ef..fd4b8cfbf 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -53,7 +53,7 @@ MossdeepCity_EventScript_14CFFF:: @ 814CFFF MossdeepCity_EventScript_14D008:: @ 814D008 setflag FLAG_VISITED_MOSSDEEP_CITY - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end MossdeepCity_EventScript_14D011:: @ 814D011 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 75fc3c6b8..527e29dd5 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -24,7 +24,7 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 setobjectxyperm 1, 3, 2 setobjectmovementtype 1, 8 return @@ -84,7 +84,7 @@ MossdeepCity_GameCorner_1F_Movement_15AD3F:: @ 815AD3F MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 lock faceplayer - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E59A, 4 release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 12a94154b..b27965d61 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -8,7 +8,7 @@ MossdeepCity_GameCorner_B1F_MapScript1_15AE60:: @ 815AE60 end MossdeepCity_GameCorner_B1F_MapScript2_15AE64:: @ 815AE64 - map_script_2 0x4001, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E + map_script_2 VAR_TEMP_1, 0, MossdeepCity_GameCorner_B1F_EventScript_15AE6E .2byte 0 MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E @@ -33,7 +33,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF waitmovement 0 special LoadPlayerParty - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 warp MAP_MOSSDEEP_CITY_GAME_CORNER_1F, 255, 3, 1 waitstate releaseall diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 550f74d9a..76f1736c2 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -7,8 +7,8 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C end MtPyre_Exterior_EventScript_15D492:: @ 815D492 - getplayerxy 0x4000, 0x4001 - compare 0x4001, 12 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 12 goto_if 0, MtPyre_Exterior_EventScript_15D4A3 return diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index aefb23c61..ba991bcf2 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -5,9 +5,9 @@ NewMauville_Inside_MapScripts:: @ 815E55F .byte 0 NewMauville_Inside_MapScript1_15E56F:: @ 815E56F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, NewMauville_Inside_EventScript_15E5DA - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, NewMauville_Inside_EventScript_15E728 checkflag FLAG_SYS_CTRL_OBJ_DELETE call_if 1, NewMauville_Inside_EventScript_15E58F @@ -18,8 +18,8 @@ NewMauville_Inside_EventScript_15E58F:: @ 815E58F return NewMauville_Inside_MapScript1_15E593:: @ 815E593 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E @@ -29,8 +29,8 @@ NewMauville_Inside_MapScript1_15E59E:: @ 815E59E NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall - setvar 0x4001, 1 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_2, 0 playse 21 call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView @@ -39,8 +39,8 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall - setvar 0x4001, 0 - setvar 0x4002, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 1 playse 21 call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 45cdce991..351b7ea85 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -25,7 +25,7 @@ PetalburgCity_MapScript2_14B73D:: @ 814B73D PetalburgCity_EventScript_14B747:: @ 814B747 lockall - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 special SavePlayerParty special PutZigzagoonInPlayerParty applymovement 2, PetalburgCity_Movement_14B7ED @@ -39,10 +39,10 @@ PetalburgCity_EventScript_14B747:: @ 814B747 waitmovement 0, 0, 2 msgbox PetalburgCity_Text_16D408, 4 closemessage - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 setvar 0x4057, 3 fadedefaultbgm - clearflag 0x4001 + clearflag FLAG_SPECIAL_FLAG_1 special LoadPlayerParty setvar 0x4085, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index add786bf0..0b6b3842f 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -194,7 +194,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage - setflag 0x4001 + setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 compare 0x8008, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 1810a6495..f03d7cc62 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -12,7 +12,7 @@ Route101_MapScript2_14E935:: @ 814E935 .2byte 0 Route101_EventScript_14E93F:: @ 814E93F - setflag 0x4000 + setflag FLAG_SPECIAL_FLAG_0 setvar 0x4060, 1 end @@ -235,7 +235,7 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_STARTERS_BAG setvar 0x4084, 2 setvar 0x4060, 3 - clearflag 0x4000 + clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate release diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 8e33517ca..6eedce42d 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -29,7 +29,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -56,6 +56,6 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A lockall setvar 0x40a9, 0 clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc index 51cab5ddd..2f54753ab 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadSouthEntrance.inc @@ -14,7 +14,7 @@ Route110_SeasideCyclingRoadSouthEntrance_EventScript_16348B:: @ 816348B compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634A6 setflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 releaseall end @@ -33,6 +33,6 @@ Route110_SeasideCyclingRoadSouthEntrance_Movement_1634BB:: @ 81634BB Route110_SeasideCyclingRoadSouthEntrance_EventScript_1634BD:: @ 81634BD lockall clearflag FLAG_SYS_CYCLING_ROAD - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 releaseall end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 813cbb9e9..aa1345c7e 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -6,18 +6,18 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 .byte 0 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 - setvar 0x4001, 0 - setvar 0x4002, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 special SetTrickHouseEndRoomFlag end Route110_TrickHouseEnd_MapScript2_161965:: @ 8161965 - map_script_2 0x4002, 0, Route110_TrickHouseEnd_EventScript_16196F + map_script_2 VAR_TEMP_2, 0, Route110_TrickHouseEnd_EventScript_16196F .2byte 0 Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F @@ -27,11 +27,11 @@ Route110_TrickHouseEnd_EventScript_16196F:: @ 816196F end Route110_TrickHouseEnd_MapScript2_16197C:: @ 816197C - map_script_2 0x4001, 0, Route110_TrickHouseEnd_EventScript_161986 + map_script_2 VAR_TEMP_1, 0, Route110_TrickHouseEnd_EventScript_161986 .2byte 0 Route110_TrickHouseEnd_EventScript_161986:: @ 8161986 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 call Route110_TrickHouseEnd_EventScript_161994 special DrawWholeMapView end @@ -44,7 +44,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E lock faceplayer msgbox Route110_TrickHouseEnd_Text_19C281, 4 - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 switch 0x4044 case 0, Route110_TrickHouseEnd_EventScript_161A0B case 1, Route110_TrickHouseEnd_EventScript_161A47 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 6425d05cb..19ebfbf50 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -4,21 +4,21 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 .byte 0 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C - compare 0x4002, 1 + compare VAR_TEMP_2, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F - compare 0x4003, 1 + compare VAR_TEMP_3, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 end Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 @@ -35,7 +35,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView @@ -44,7 +44,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView @@ -53,7 +53,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView @@ -62,7 +62,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 playse 21 call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 54cea16c9..be1f84c63 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -5,22 +5,22 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - setvar 0x4008, 0 - setvar 0x4009, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + setvar VAR_TEMP_8, 0 + setvar VAR_TEMP_9, 0 end Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 @@ -31,19 +31,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 13, 7, 600, 0 setmetatile 1, 3, 600, 0 setmetatile 10, 2, 600, 0 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB return @@ -247,43 +247,43 @@ Route110_TrickHousePuzzle3_EventScript_1622C8:: @ 81622C8 Route110_TrickHousePuzzle3_EventScript_1625AB:: @ 81625AB lockall - setvar 0x4008, 1 + setvar VAR_TEMP_8, 1 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625B7:: @ 81625B7 lockall - setvar 0x4008, 2 + setvar VAR_TEMP_8, 2 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625C3:: @ 81625C3 lockall - setvar 0x4008, 3 + setvar VAR_TEMP_8, 3 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625CF:: @ 81625CF lockall - setvar 0x4008, 4 + setvar VAR_TEMP_8, 4 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625DB:: @ 81625DB lockall - setvar 0x4008, 5 + setvar VAR_TEMP_8, 5 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625E7:: @ 81625E7 lockall - setvar 0x4008, 6 + setvar VAR_TEMP_8, 6 goto Route110_TrickHousePuzzle3_EventScript_1625FF end Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 lockall - setvar 0x4008, 7 + setvar VAR_TEMP_8, 7 goto Route110_TrickHousePuzzle3_EventScript_1625FF end @@ -295,76 +295,76 @@ Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF end Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4006, 0 - setvar 0x4007, 0 - compare 0x4008, 1 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_6, 0 + setvar VAR_TEMP_7, 0 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B - compare 0x4008, 6 + compare VAR_TEMP_8, 6 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 - compare 0x4008, 7 + compare VAR_TEMP_8, 7 call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return Route110_TrickHousePuzzle3_EventScript_162689:: @ 8162689 - setvar 0x4002, 1 + setvar VAR_TEMP_2, 1 return Route110_TrickHousePuzzle3_EventScript_16268F:: @ 816268F - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 return Route110_TrickHousePuzzle3_EventScript_162695:: @ 8162695 - setvar 0x4004, 1 + setvar VAR_TEMP_4, 1 return Route110_TrickHousePuzzle3_EventScript_16269B:: @ 816269B - setvar 0x4005, 1 + setvar VAR_TEMP_5, 1 return Route110_TrickHousePuzzle3_EventScript_1626A1:: @ 81626A1 - setvar 0x4006, 1 + setvar VAR_TEMP_6, 1 return Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 - setvar 0x4007, 1 + setvar VAR_TEMP_7, 1 return Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 - compare 0x4009, 0 + compare VAR_TEMP_9, 0 call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView - compare 0x4009, 1 + compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD - compare 0x4009, 0 + compare VAR_TEMP_9, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626E4 end Route110_TrickHousePuzzle3_EventScript_1626DD:: @ 81626DD - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 releaseall end Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 releaseall end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 4b9031715..695c532cf 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -3,12 +3,12 @@ Route110_TrickHousePuzzle5_MapScripts:: @ 81627B0 .byte 0 Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 - setvar 0x4001, 0 - setvar 0x4002, 0 - setvar 0x4003, 0 - setvar 0x4004, 0 - setvar 0x4005, 0 - setvar 0x4008, 0 + setvar VAR_TEMP_1, 0 + setvar VAR_TEMP_2, 0 + setvar VAR_TEMP_3, 0 + setvar VAR_TEMP_4, 0 + setvar VAR_TEMP_5, 0 + setvar VAR_TEMP_8, 0 end Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 @@ -27,9 +27,9 @@ Route110_TrickHousePuzzle5_EventScript_1627F2:: @ 81627F2 lockall applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end @@ -37,9 +37,9 @@ Route110_TrickHousePuzzle5_EventScript_162813:: @ 8162813 lockall applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4002, 1 + compare VAR_TEMP_2, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end @@ -47,9 +47,9 @@ Route110_TrickHousePuzzle5_EventScript_162834:: @ 8162834 lockall applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4003, 1 + compare VAR_TEMP_3, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end @@ -57,9 +57,9 @@ Route110_TrickHousePuzzle5_EventScript_162855:: @ 8162855 lockall applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4004, 1 + compare VAR_TEMP_4, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end @@ -67,109 +67,109 @@ Route110_TrickHousePuzzle5_EventScript_162876:: @ 8162876 lockall applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0839 waitmovement 0 - compare 0x4005, 1 + compare VAR_TEMP_5, 1 goto_if_eq Route110_TrickHousePuzzle5_EventScript_162DE9 - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162897:: @ 8162897 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628A3:: @ 81628A3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628AF:: @ 81628AF lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628BB:: @ 81628BB lockall - setvar 0x4009, 3 + setvar VAR_TEMP_9, 3 goto Route110_TrickHousePuzzle5_EventScript_16293F end Route110_TrickHousePuzzle5_EventScript_1628C7:: @ 81628C7 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628D3:: @ 81628D3 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_1629B3 end Route110_TrickHousePuzzle5_EventScript_1628DF:: @ 81628DF lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628EB:: @ 81628EB lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_1628F7:: @ 81628F7 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162A27 end Route110_TrickHousePuzzle5_EventScript_162903:: @ 8162903 lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16290F:: @ 816290F lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162A9B end Route110_TrickHousePuzzle5_EventScript_16291B:: @ 816291B lockall - setvar 0x4009, 0 + setvar VAR_TEMP_9, 0 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162927:: @ 8162927 lockall - setvar 0x4009, 1 + setvar VAR_TEMP_9, 1 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 lockall - setvar 0x4009, 2 + setvar VAR_TEMP_9, 2 goto Route110_TrickHousePuzzle5_EventScript_162B0F end Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F - setvar 0x4001, 1 - setvar 0x4008, 1 + setvar VAR_TEMP_1, 1 + setvar VAR_TEMP_8, 1 playse 21 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 @@ -180,18 +180,18 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F end Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 - setvar 0x4002, 1 - setvar 0x4008, 2 + setvar VAR_TEMP_2, 1 + setvar VAR_TEMP_8, 2 playse 21 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 @@ -202,18 +202,18 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 end Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 - setvar 0x4003, 1 - setvar 0x4008, 3 + setvar VAR_TEMP_3, 1 + setvar VAR_TEMP_8, 3 playse 21 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 @@ -224,18 +224,18 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 end Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B - setvar 0x4004, 1 - setvar 0x4008, 4 + setvar VAR_TEMP_4, 1 + setvar VAR_TEMP_8, 4 playse 21 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 @@ -246,18 +246,18 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B end Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F - setvar 0x4005, 1 - setvar 0x4008, 5 + setvar VAR_TEMP_5, 1 + setvar VAR_TEMP_8, 5 playse 21 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B - compare 0x4009, 2 + compare VAR_TEMP_9, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 - compare 0x4009, 3 + compare VAR_TEMP_9, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 @@ -418,80 +418,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 end Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 - compare 0x4009, 4 + compare VAR_TEMP_9, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 - compare 0x4009, 5 + compare VAR_TEMP_9, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B - compare 0x4008, 1 + compare VAR_TEMP_8, 1 call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 - compare 0x4008, 2 + compare VAR_TEMP_8, 2 call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 - compare 0x4008, 3 + compare VAR_TEMP_8, 3 call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C - compare 0x4008, 4 + compare VAR_TEMP_8, 4 call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 - compare 0x4008, 5 + compare VAR_TEMP_8, 5 call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 return diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index ddf845142..917b9483b 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -8,7 +8,7 @@ Route110_TrickHousePuzzle6_MapScript1_1630D8:: @ 81630D8 end Route110_TrickHousePuzzle6_MapScript2_1630DC:: @ 81630DC - map_script_2 0x4000, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 + map_script_2 VAR_TEMP_0, 16384, Route110_TrickHousePuzzle6_EventScript_1630E6 .2byte 0 Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 0a7e6befc..17d4f91c6 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -21,16 +21,16 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 end Route111_EventScript_14FFCD:: @ 814FFCD - getplayerxy 0x4000, 0x4001 - compare 0x4001, 34 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 34 goto_if 0, Route111_EventScript_15000C - compare 0x4001, 107 + compare VAR_TEMP_1, 107 goto_if 2, Route111_EventScript_15000C - compare 0x4001, 72 + compare VAR_TEMP_1, 72 goto_if 2, Route111_EventScript_150009 - compare 0x4000, 2000 + compare VAR_TEMP_0, 2000 goto_if 2, Route111_EventScript_15000C - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 @@ -166,7 +166,7 @@ Route111_EventScript_15013A:: @ 815013A checkitem ITEM_GO_GOGGLES, 1 compare RESULT, 0 goto_if_eq Route111_EventScript_150151 - setvar 0x4003, 1 + setvar VAR_TEMP_3, 1 releaseall end @@ -224,7 +224,7 @@ Route111_EventScript_1501BC:: @ 81501BC setweather 2 fadenewbgm 360 doweather - setvar 0x4003, 0 + setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 37fd0ed3f..82f7855e1 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -13,10 +13,10 @@ Route113_MapScript1_1505DA:: @ 81505DA end Route113_EventScript_1505E5:: @ 81505E5 - getplayerxy 0x4000, 0x4001 - compare 0x4000, 19 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_0, 19 goto_if 0, Route113_EventScript_150604 - compare 0x4000, 84 + compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_150604 setweather 7 return diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index aff1254a9..954be6f21 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -39,12 +39,12 @@ Route119_EventScript_1511B9:: @ 81511B9 return Route119_EventScript_1511C5:: @ 81511C5 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto Route119_EventScript_1511DB end Route119_EventScript_1511D0:: @ 81511D0 - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto Route119_EventScript_1511DB end @@ -57,16 +57,16 @@ Route119_EventScript_1511DB:: @ 81511DB compare RESULT, 1 call_if 1, Route119_EventScript_151259 delay 65 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513A6 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 25 addobject 16 @@ -154,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513D2 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513E1 removeobject 16 addobject 25 delay 30 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, Route119_EventScript_1513BC - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513C7 removeobject 25 setvar 0x4072, 1 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index cd84f95af..98c0cf20d 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -80,12 +80,12 @@ Route120_MapScript1_1516DF:: @ 81516DF end Route120_EventScript_1516EA:: @ 81516EA - getplayerxy 0x4000, 0x4001 - compare 0x4001, 14 + getplayerxy VAR_TEMP_0, VAR_TEMP_1 + compare VAR_TEMP_1, 14 goto_if 3, Route120_EventScript_151715 - compare 0x4001, 60 + compare VAR_TEMP_1, 60 goto_if 3, Route120_EventScript_151719 - compare 0x4001, 61 + compare VAR_TEMP_1, 61 goto_if 4, Route120_EventScript_151711 return @@ -98,9 +98,9 @@ Route120_EventScript_151715:: @ 8151715 return Route120_EventScript_151719:: @ 8151719 - compare 0x4000, 7 + compare VAR_TEMP_0, 7 goto_if 3, Route120_EventScript_151735 - compare 0x4000, 19 + compare VAR_TEMP_0, 19 goto_if 3, Route120_EventScript_151715 goto Route120_EventScript_151735 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 4902d9f08..04da2d9c7 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -23,13 +23,13 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E20:: @ 8163E20 Route124_DivingTreasureHuntersHouse_EventScript_163E2E:: @ 8163E2E call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164329 goto Route124_DivingTreasureHuntersHouse_EventScript_163EA2 end Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A @@ -45,19 +45,19 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A - addvar 0x4001, 1 + addvar VAR_TEMP_1, 1 return Route124_DivingTreasureHuntersHouse_EventScript_163E90:: @ 8163E90 - addvar 0x4001, 2 + addvar VAR_TEMP_1, 2 return Route124_DivingTreasureHuntersHouse_EventScript_163E96:: @ 8163E96 - addvar 0x4001, 4 + addvar VAR_TEMP_1, 4 return Route124_DivingTreasureHuntersHouse_EventScript_163E9C:: @ 8163E9C - addvar 0x4001, 8 + addvar VAR_TEMP_1, 8 return Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 @@ -68,7 +68,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_163EA2:: @ 8163EA2 Route124_DivingTreasureHuntersHouse_EventScript_163EB0:: @ 8163EB0 message Route124_DivingTreasureHuntersHouse_Text_19F5C5 waitmessage - switch 0x4001 + switch VAR_TEMP_1 case 1, Route124_DivingTreasureHuntersHouse_EventScript_163F61 case 2, Route124_DivingTreasureHuntersHouse_EventScript_163F87 case 3, Route124_DivingTreasureHuntersHouse_EventScript_163FAD @@ -263,7 +263,7 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 giveitem_std 0x8009 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 compare RESULT, 1 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c45389b9f..831cffaea 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -334,42 +334,42 @@ RustboroCity_EventScript_14C5FF:: @ 814C5FF RustboroCity_EventScript_14C614:: @ 814C614 waitse - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C620:: @ 814C620 lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C62C:: @ 814C62C lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C638:: @ 814C638 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C644:: @ 814C644 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C650 end RustboroCity_EventScript_14C650:: @ 814C650 - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C691 - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C6BD - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C6E9 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar 0x405a, 3 @@ -434,38 +434,38 @@ RustboroCity_Movement_14C74B:: @ 814C74B RustboroCity_EventScript_14C74D:: @ 814C74D lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C759:: @ 814C759 lockall - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C765:: @ 814C765 lockall - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C771:: @ 814C771 lockall - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 goto RustboroCity_EventScript_14C77D end RustboroCity_EventScript_14C77D:: @ 814C77D - compare 0x4001, 0 + compare VAR_TEMP_1, 0 call_if 1, RustboroCity_EventScript_14C7FE - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RustboroCity_EventScript_14C82A - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RustboroCity_EventScript_14C856 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C882 - compare 0x4001, 4 + compare VAR_TEMP_1, 4 call_if 1, RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 64fce8118..0063564a3 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -52,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8CA - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8DF - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C8EB - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8EB giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C880 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C892 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closemessage - compare 0x4001, 1 + compare VAR_TEMP_1, 1 call_if 1, RusturfTunnel_EventScript_15C8F7 - compare 0x4001, 2 + compare VAR_TEMP_1, 2 call_if 1, RusturfTunnel_EventScript_15C909 - compare 0x4001, 3 + compare VAR_TEMP_1, 3 call_if 1, RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall @@ -266,15 +266,15 @@ RusturfTunnel_Movement_15C994:: @ 815C994 step_end RusturfTunnel_EventScript_15C999:: @ 815C999 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 end RusturfTunnel_EventScript_15C99F:: @ 815C99F - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 end RusturfTunnel_EventScript_15C9A5:: @ 815C9A5 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 end RusturfTunnel_EventScript_15C9AB:: @ 815C9AB diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 6d31cf981..d11fc16d3 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -9,7 +9,7 @@ SafariZone_Southeast_MapScript2_160041:: @ 8160041 SafariZone_Southeast_EventScript_16004B:: @ 816004B lockall - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 applymovement 255, SafariZone_Southeast_Movement_160087 waitmovement 0 applymovement 1, SafariZone_Southeast_Movement_160089 @@ -52,7 +52,7 @@ SafariZone_Southeast_EventScript_16009E:: @ 816009E SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 lock faceplayer - compare 0x4001, 0 + compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 msgbox SafariZone_Southeast_Text_1C3A56, 5 compare RESULT, 1 @@ -62,7 +62,7 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 end SafariZone_Southeast_EventScript_1600D1:: @ 81600D1 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SafariZone_Southeast_Text_1C3B2D, 4 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 304013b08..5d7a38401 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -4,7 +4,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 compare 0x40a0, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag FLAG_SYS_GAME_CLEAR @@ -300,7 +300,7 @@ SlateportCity_Harbor_EventScript_156265:: @ 8156265 end SlateportCity_Harbor_EventScript_15626F:: @ 815626F - compare 0x4001, 1 + compare VAR_TEMP_1, 1 goto_if_eq SlateportCity_Harbor_EventScript_156380 checkitem ITEM_SCANNER, 1 compare RESULT, 1 @@ -369,7 +369,7 @@ SlateportCity_Harbor_EventScript_156374:: @ 8156374 end SlateportCity_Harbor_EventScript_156380:: @ 8156380 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 msgbox SlateportCity_Harbor_Text_180491, 4 release end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 593e18fee..40b410f77 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -22,7 +22,7 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 end SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 - setvar 0x4002, 0 + setvar VAR_TEMP_2, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_GREEN_SCARF @@ -33,7 +33,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 checkflag FLAG_RECEIVED_RED_SCARF call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - compare 0x4002, 5 + compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D compare 0x40b7, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE @@ -48,7 +48,7 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 - setvar 0x4001, 0 + setvar VAR_TEMP_1, 0 checkflag FLAG_RECEIVED_YELLOW_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE checkflag FLAG_RECEIVED_GREEN_SCARF @@ -60,7 +60,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 checkflag FLAG_RECEIVED_RED_SCARF call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferleadmonspeciesname 0 - switch 0x4001 + switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_155899 case 1, SlateportCity_PokemonFanClub_EventScript_1558A3 case 2, SlateportCity_PokemonFanClub_EventScript_1558D4 @@ -75,7 +75,7 @@ SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D return SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 - addvar 0x4002, 1 + addvar VAR_TEMP_2, 1 return SlateportCity_PokemonFanClub_EventScript_155899:: @ 8155899 @@ -150,7 +150,7 @@ SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 - setvar 0x4001, 1 + setvar VAR_TEMP_1, 1 return SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 @@ -160,7 +160,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA - setvar 0x4001, 2 + setvar VAR_TEMP_1, 2 return SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 @@ -170,7 +170,7 @@ SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 - setvar 0x4001, 3 + setvar VAR_TEMP_1, 3 return SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 @@ -180,7 +180,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 - setvar 0x4001, 4 + setvar VAR_TEMP_1, 4 return SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE @@ -190,7 +190,7 @@ SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 1e0f14728..c31eef6ba 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -7,7 +7,7 @@ UnknownMap_25_34_MapScripts:: @ 815F580 LinkContestRoom1_MapScript1_15F595:: @ 815F595 call LinkContestRoom1_EventScript_15F5A5 - setvar 0x4000, 1 + setvar VAR_TEMP_0, 1 call LinkContestRoom1_EventScript_15F630 end @@ -46,7 +46,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 - compare 0x4009, 1 + compare VAR_TEMP_9, 1 call_if 1, LinkContestRoom1_EventScript_15F600 end @@ -75,12 +75,12 @@ LinkContestRoom1_EventScript_15F625:: @ 815F625 LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 - compare 0x4000, 8 + compare VAR_TEMP_0, 8 goto_if 0, LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 - switch 0x4000 + switch VAR_TEMP_0 case 1, LinkContestRoom1_EventScript_15F699 case 2, LinkContestRoom1_EventScript_15F6A4 case 3, LinkContestRoom1_EventScript_15F6AF @@ -91,38 +91,38 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646 end LinkContestRoom1_EventScript_15F699:: @ 815F699 - copyvar 0x4014, 0x4001 - addvar 0x4000, 1 + copyvar 0x4014, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 - copyvar 0x4015, 0x4001 - addvar 0x4000, 1 + copyvar 0x4015, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF - copyvar 0x4016, 0x4001 - addvar 0x4000, 1 + copyvar 0x4016, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA - copyvar 0x4017, 0x4001 - addvar 0x4000, 1 + copyvar 0x4017, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 - copyvar 0x4018, 0x4001 - addvar 0x4000, 1 + copyvar 0x4018, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 - copyvar 0x4019, 0x4001 - addvar 0x4000, 1 + copyvar 0x4019, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB - copyvar 0x401a, 0x4001 - addvar 0x4000, 1 + copyvar 0x401a, VAR_TEMP_1 + addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 @@ -165,131 +165,131 @@ LinkContestRoom1_EventScript_15F6E6:: @ 815F6E6 end LinkContestRoom1_EventScript_15F859:: @ 815F859 - setvar 0x4001, 5 + setvar VAR_TEMP_1, 5 return LinkContestRoom1_EventScript_15F85F:: @ 815F85F - setvar 0x4001, 6 + setvar VAR_TEMP_1, 6 return LinkContestRoom1_EventScript_15F865:: @ 815F865 - setvar 0x4001, 7 + setvar VAR_TEMP_1, 7 return LinkContestRoom1_EventScript_15F86B:: @ 815F86B - setvar 0x4001, 8 + setvar VAR_TEMP_1, 8 return LinkContestRoom1_EventScript_15F871:: @ 815F871 - setvar 0x4001, 10 + setvar VAR_TEMP_1, 10 return LinkContestRoom1_EventScript_15F877:: @ 815F877 - setvar 0x4001, 11 + setvar VAR_TEMP_1, 11 return LinkContestRoom1_EventScript_15F87D:: @ 815F87D - setvar 0x4001, 12 + setvar VAR_TEMP_1, 12 return LinkContestRoom1_EventScript_15F883:: @ 815F883 - setvar 0x4001, 13 + setvar VAR_TEMP_1, 13 return LinkContestRoom1_EventScript_15F889:: @ 815F889 - setvar 0x4001, 14 + setvar VAR_TEMP_1, 14 return LinkContestRoom1_EventScript_15F88F:: @ 815F88F - setvar 0x4001, 15 + setvar VAR_TEMP_1, 15 return LinkContestRoom1_EventScript_15F895:: @ 815F895 - setvar 0x4001, 17 + setvar VAR_TEMP_1, 17 return LinkContestRoom1_EventScript_15F89B:: @ 815F89B - setvar 0x4001, 18 + setvar VAR_TEMP_1, 18 return LinkContestRoom1_EventScript_15F8A1:: @ 815F8A1 - setvar 0x4001, 19 + setvar VAR_TEMP_1, 19 return LinkContestRoom1_EventScript_15F8A7:: @ 815F8A7 - setvar 0x4001, 20 + setvar VAR_TEMP_1, 20 return LinkContestRoom1_EventScript_15F8AD:: @ 815F8AD - setvar 0x4001, 21 + setvar VAR_TEMP_1, 21 return LinkContestRoom1_EventScript_15F8B3:: @ 815F8B3 - setvar 0x4001, 22 + setvar VAR_TEMP_1, 22 return LinkContestRoom1_EventScript_15F8B9:: @ 815F8B9 - setvar 0x4001, 25 + setvar VAR_TEMP_1, 25 return LinkContestRoom1_EventScript_15F8BF:: @ 815F8BF - setvar 0x4001, 26 + setvar VAR_TEMP_1, 26 return LinkContestRoom1_EventScript_15F8C5:: @ 815F8C5 - setvar 0x4001, 27 + setvar VAR_TEMP_1, 27 return LinkContestRoom1_EventScript_15F8CB:: @ 815F8CB - setvar 0x4001, 47 + setvar VAR_TEMP_1, 47 return LinkContestRoom1_EventScript_15F8D1:: @ 815F8D1 - setvar 0x4001, 30 + setvar VAR_TEMP_1, 30 return LinkContestRoom1_EventScript_15F8D7:: @ 815F8D7 - setvar 0x4001, 31 + setvar VAR_TEMP_1, 31 return LinkContestRoom1_EventScript_15F8DD:: @ 815F8DD - setvar 0x4001, 32 + setvar VAR_TEMP_1, 32 return LinkContestRoom1_EventScript_15F8E3:: @ 815F8E3 - setvar 0x4001, 33 + setvar VAR_TEMP_1, 33 return LinkContestRoom1_EventScript_15F8E9:: @ 815F8E9 - setvar 0x4001, 34 + setvar VAR_TEMP_1, 34 return LinkContestRoom1_EventScript_15F8EF:: @ 815F8EF - setvar 0x4001, 35 + setvar VAR_TEMP_1, 35 return LinkContestRoom1_EventScript_15F8F5:: @ 815F8F5 - setvar 0x4001, 36 + setvar VAR_TEMP_1, 36 return LinkContestRoom1_EventScript_15F8FB:: @ 815F8FB - setvar 0x4001, 37 + setvar VAR_TEMP_1, 37 return LinkContestRoom1_EventScript_15F901:: @ 815F901 - setvar 0x4001, 38 + setvar VAR_TEMP_1, 38 return LinkContestRoom1_EventScript_15F907:: @ 815F907 - setvar 0x4001, 44 + setvar VAR_TEMP_1, 44 return LinkContestRoom1_EventScript_15F90D:: @ 815F90D - setvar 0x4001, 45 + setvar VAR_TEMP_1, 45 return LinkContestRoom1_EventScript_15F913:: @ 815F913 - setvar 0x4001, 46 + setvar VAR_TEMP_1, 46 return LinkContestRoom1_EventScript_15F919:: @ 815F919 -- cgit v1.2.3 From e696b89ff2902c283207e5f712ccc6c59f174555 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 22 Dec 2017 13:27:24 -0600 Subject: Name and use dynamic object gfx id vars --- data/scripts/maps/SlateportCity.inc | 8 ++++---- data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc | 8 ++++---- data/scripts/maps/SouthernIsland_Interior.inc | 8 ++++---- data/scripts/maps/UnknownMap_25_34.inc | 18 +++++++++--------- 4 files changed, 21 insertions(+), 21 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 56fc0e59b..796775aa2 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -4,11 +4,11 @@ SlateportCity_MapScripts:: @ 814BA36 SlateportCity_MapScript1_14BA3C:: @ 814BA3C .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif setvar 0x40aa, 0 call SlateportCity_EventScript_14BA5C diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 9e002e61e..98d2160a8 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -4,11 +4,11 @@ SlateportCity_OceanicMuseum_1F_MapScripts:: @ 8155ACA SlateportCity_OceanicMuseum_1F_MapScript1_155AD0:: @ 8155AD0 .ifdef SAPPHIRE - setvar 0x4010, MAP_OBJ_GFX_AQUA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_AQUA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_AQUA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_AQUA_MEMBER_M .else - setvar 0x4010, MAP_OBJ_GFX_MAGMA_MEMBER_F - setvar 0x4011, MAP_OBJ_GFX_MAGMA_MEMBER_M + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index ea2f852f4..6386c3b82 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -14,9 +14,9 @@ SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 SouthernIsland_Interior_MapScript1_160B6C:: @ 8160B6C .ifdef SAPPHIRE - setvar 0x4011, 188 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIOS .else - setvar 0x4011, 187 + setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_LATIAS .endif call SouthernIsland_Interior_EventScript_160B77 end @@ -30,11 +30,11 @@ SouthernIsland_Interior_EventScript_160B77:: @ 8160B77 end SouthernIsland_Interior_EventScript_160B8F:: @ 8160B8F - setvar 0x4010, 100 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 - setvar 0x4010, 105 + setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index c31eef6ba..6c25c34c5 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -91,37 +91,37 @@ LinkContestRoom1_EventScript_15F646:: @ 815F646 end LinkContestRoom1_EventScript_15F699:: @ 815F699 - copyvar 0x4014, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_4, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6A4:: @ 815F6A4 - copyvar 0x4015, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_5, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6AF:: @ 815F6AF - copyvar 0x4016, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_6, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6BA:: @ 815F6BA - copyvar 0x4017, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_7, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6C5:: @ 815F6C5 - copyvar 0x4018, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_8, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6D0:: @ 815F6D0 - copyvar 0x4019, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_9, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return LinkContestRoom1_EventScript_15F6DB:: @ 815F6DB - copyvar 0x401a, VAR_TEMP_1 + copyvar VAR_OBJ_GFX_ID_A, VAR_TEMP_1 addvar VAR_TEMP_0, 1 return @@ -421,9 +421,9 @@ VerdanturfTown_ContestLobby_EventScript_15FBDB:: @ 815FBDB return FallarborTown_ContestLobby_EventScript_15FBF3:: @ 815FBF3 - setvar 0x4013, 100 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_BRENDAN_NORMAL return FallarborTown_ContestLobby_EventScript_15FBF9:: @ 815FBF9 - setvar 0x4013, 105 + setvar VAR_OBJ_GFX_ID_3, MAP_OBJ_GFX_RIVAL_MAY_NORMAL return -- cgit v1.2.3 From 51247c3eb9dc1f8ecf4298ada62ed7c2f768b50e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sat, 23 Dec 2017 10:41:27 -0600 Subject: Name and use general purpose vars --- data/scripts/maps/BattleTower_Lobby.inc | 4 +- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 +- data/scripts/maps/DewfordTown.inc | 6 +- data/scripts/maps/DewfordTown_Gym.inc | 4 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 6 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 6 +- data/scripts/maps/FallarborTown.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/InsideOfTruck.inc | 8 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 6 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 6 +- data/scripts/maps/LilycoveCity.inc | 6 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 26 +-- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 22 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 8 +- data/scripts/maps/LilycoveCity_Harbor.inc | 2 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 4 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 16 +- data/scripts/maps/LittlerootTown.inc | 38 ++--- .../maps/LittlerootTown_BrendansHouse_1F.inc | 20 +-- .../maps/LittlerootTown_BrendansHouse_2F.inc | 6 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 22 +-- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 10 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 20 +-- data/scripts/maps/MauvilleCity.inc | 4 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 2 +- data/scripts/maps/MauvilleCity_Gym.inc | 20 +-- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 16 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 6 +- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtChimney_CableCarStation.inc | 8 +- data/scripts/maps/MtPyre_Summit.inc | 8 +- data/scripts/maps/NewMauville_Entrance.inc | 4 +- data/scripts/maps/NewMauville_Inside.inc | 6 +- data/scripts/maps/OldaleTown.inc | 4 +- data/scripts/maps/PetalburgCity.inc | 10 +- data/scripts/maps/PetalburgCity_Gym.inc | 30 ++-- .../maps/PetalburgCity_PokemonCenter_1F.inc | 6 +- data/scripts/maps/PetalburgWoods.inc | 2 +- data/scripts/maps/Route101.inc | 10 +- data/scripts/maps/Route103.inc | 10 +- data/scripts/maps/Route104.inc | 6 +- data/scripts/maps/Route104_MrBrineysHouse.inc | 4 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 16 +- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 10 +- data/scripts/maps/Route110_TrickHouseCorridor.inc | 2 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 24 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 174 ++++++++++----------- data/scripts/maps/Route110_TrickHousePuzzle1.inc | 6 +- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle4.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle6.inc | 4 +- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 14 +- data/scripts/maps/Route110_TrickHousePuzzle8.inc | 4 +- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 8 +- data/scripts/maps/Route113_GlassWorkshop.inc | 62 ++++---- data/scripts/maps/Route116.inc | 4 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 10 +- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 4 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 6 +- data/scripts/maps/Route121.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 6 +- data/scripts/maps/Route128.inc | 4 +- data/scripts/maps/RustboroCity.inc | 10 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 32 ++-- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 10 +- data/scripts/maps/RustboroCity_Gym.inc | 6 +- data/scripts/maps/RusturfTunnel.inc | 12 +- data/scripts/maps/SSTidalCorridor.inc | 36 ++--- data/scripts/maps/SafariZone_Southeast.inc | 8 +- data/scripts/maps/SeafloorCavern_Room9.inc | 8 +- data/scripts/maps/SecretBase_YellowCave4.inc | 2 +- data/scripts/maps/SlateportCity.inc | 22 +-- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 8 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 8 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 22 +-- data/scripts/maps/UnknownMap_25_34.inc | 8 +- data/scripts/maps/VerdanturfTown.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- 94 files changed, 513 insertions(+), 513 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index ca90b8b28..902ffd4ba 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -159,7 +159,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 BattleTower_Lobby_EventScript_16044B:: @ 816044B lock faceplayer - setvar 0x40bc, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 message BattleTower_Lobby_Text_19A5B1 waitmessage message BattleTower_Lobby_Text_19A5CE @@ -250,7 +250,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty special sub_8135A14 - setvar 0x40bc, 1 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index e0aba0b9c..69c160562 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -4,7 +4,7 @@ BattleTower_Outside_MapScripts:: @ 8160156 BattleTower_Outside_MapScript1_16015C:: @ 816015C setflag FLAG_LANDMARK_BATTLE_TOWER - setvar 0x40bc, 0 + setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 0 setflag FLAG_HIDE_REPORTER_BATTLE_TOWER end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 1b5146760..ee702c102 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -72,11 +72,11 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS_GYM - setvar 0x409b, 1 + setvar VAR_CAVE_OF_ORIGIN_B4F_STATE, 1 setflag FLAG_LEGENDARY_BATTLE_COMPLETED clearflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS clearflag FLAG_SYS_WEATHER_CTRL - setvar 0x40b9, 2 + setvar VAR_MT_PYRE_STATE, 2 clearflag FLAG_HIDE_LEADER_MT_PYRE_SUMMIT releaseall end diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index bb1fdeda4..c2e03bc38 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -140,10 +140,10 @@ DewfordTown_EventScript_14E151:: @ 814E151 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN - setvar 0x408e, 2 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 waitstate release end @@ -181,7 +181,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index afd918a96..42f1fccb1 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -114,8 +114,8 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 msgbox DewfordTown_Gym_Text_1752E6, 4 setflag FLAG_DEFEATED_DEWFORD_GYM setflag FLAG_BADGE02_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB setvar 0x8008, 2 call DewfordTown_Gym_EventScript_1A01C0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ef86b1df2..ec18ff9b5 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -13,20 +13,20 @@ EverGrandeCity_DrakesRoom_EventScript_15B727:: @ 815B727 end EverGrandeCity_DrakesRoom_MapScript2_15B72C:: @ 815B72C - map_script_2 0x409c, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 + map_script_2 VAR_ELITE_4_STATE, 3, EverGrandeCity_DrakesRoom_EventScript_15B736 .2byte 0 EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 lockall call EverGrandeCity_DrakesRoom_EventScript_1A0710 - setvar 0x409c, 4 + setvar VAR_ELITE_4_STATE, 4 releaseall end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 checkflag FLAG_DEFEATED_ELITE_4_DRAKE call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 - compare 0x409c, 4 + compare VAR_ELITE_4_STATE, 4 call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E end diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index bffb94bc4..0e5b493e2 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -13,20 +13,20 @@ EverGrandeCity_GlaciasRoom_EventScript_15B68D:: @ 815B68D end EverGrandeCity_GlaciasRoom_MapScript2_15B692:: @ 815B692 - map_script_2 0x409c, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C + map_script_2 VAR_ELITE_4_STATE, 2, EverGrandeCity_GlaciasRoom_EventScript_15B69C .2byte 0 EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C lockall call EverGrandeCity_GlaciasRoom_EventScript_1A0710 - setvar 0x409c, 3 + setvar VAR_ELITE_4_STATE, 3 releaseall end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 checkflag FLAG_DEFEATED_ELITE_4_GLACIA call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE - compare 0x409c, 3 + compare VAR_ELITE_4_STATE, 3 call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 8f0fe97f1..19219a626 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -13,20 +13,20 @@ EverGrandeCity_PhoebesRoom_EventScript_15B5F3:: @ 815B5F3 end EverGrandeCity_PhoebesRoom_MapScript2_15B5F8:: @ 815B5F8 - map_script_2 0x409c, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 + map_script_2 VAR_ELITE_4_STATE, 1, EverGrandeCity_PhoebesRoom_EventScript_15B602 .2byte 0 EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 lockall call EverGrandeCity_PhoebesRoom_EventScript_1A0710 - setvar 0x409c, 2 + setvar VAR_ELITE_4_STATE, 2 releaseall end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F checkflag FLAG_DEFEATED_ELITE_4_PHOEBE call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 - compare 0x409c, 2 + compare VAR_ELITE_4_STATE, 2 call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 50c951b17..f3df03b7d 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -7,7 +7,7 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F checkflag FLAG_DEFEATED_ELITE_4_SYDNEY call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 - compare 0x409c, 1 + compare VAR_ELITE_4_STATE, 1 call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A end @@ -29,13 +29,13 @@ EverGrandeCity_SidneysRoom_EventScript_15B57A:: @ 815B57A end EverGrandeCity_SidneysRoom_MapScript2_15B57F:: @ 815B57F - map_script_2 0x409c, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 + map_script_2 VAR_ELITE_4_STATE, 0, EverGrandeCity_SidneysRoom_EventScript_15B589 .2byte 0 EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 lockall call EverGrandeCity_SidneysRoom_EventScript_1A0710 - setvar 0x409c, 1 + setvar VAR_ELITE_4_STATE, 1 releaseall end diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 8ea580e28..23295f778 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -4,7 +4,7 @@ FallarborTown_MapScripts:: @ 814E7E0 FallarborTown_MapScript1_14E7E6:: @ 814E7E6 setflag FLAG_VISITED_FALLARBOR_TOWN - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_FALLARBOR clearflag FLAG_CONTEST_SKETCH_CREATED end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 72da4cd40..0e47f9859 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -13,7 +13,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD call FallarborTown_ContestLobby_EventScript_1539F8 special sub_80C4BF0 call FallarborTown_ContestLobby_EventScript_15FBDB - setvar 0x4088, 2 + setvar VAR_CONTEST_LOCATION, 2 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/InsideOfTruck.inc b/data/scripts/maps/InsideOfTruck.inc index e3cef5fcb..37fa85041 100644 --- a/data/scripts/maps/InsideOfTruck.inc +++ b/data/scripts/maps/InsideOfTruck.inc @@ -25,24 +25,24 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29 InsideOfTruck_EventScript_15FC45:: @ 815FC45 setrespawn 1 - setvar 0x4092, 1 + setvar VAR_LITTLEROOT_INTRO_STATE, 1 setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_MAY setflag FLAG_HIDE_BRENDAN_MOM setflag FLAG_HIDE_BRENDAN_UPSTAIRS - setvar 0x408c, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 3, 10 releaseall end InsideOfTruck_EventScript_15FC68:: @ 815FC68 setrespawn 2 - setvar 0x4092, 2 + setvar VAR_LITTLEROOT_INTRO_STATE, 2 setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN setflag FLAG_HIDE_MAY_MOM setflag FLAG_HIDE_MAY_UPSTAIRS - setvar 0x4082, 1 + setvar VAR_LITTLEROOT_HOUSES_STATE, 1 setdynamicwarp MAP_LITTLEROOT_TOWN, 255, 12, 10 releaseall end diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index c7efee318..1a4fd9bdc 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -8,7 +8,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 end JaggedPass_MapScript1_15D274:: @ 815D274 - compare 0x40bd, 1 + compare VAR_JAGGED_PASS_ASH_WEATHER, 1 call_if 1, JaggedPass_EventScript_15D280 end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 8b4384ed8..4ef3ae82c 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -9,7 +9,7 @@ LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE call_if 1, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 - compare 0x4053, 2 + compare VAR_LAVARIDGE_RIVAL_STATE, 2 call_if 1, LavaridgeTown_EventScript_14E4D0 end @@ -23,7 +23,7 @@ LavaridgeTown_EventScript_14E4DF:: @ 814E4DF return LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 - map_script_2 0x4053, 1, LavaridgeTown_EventScript_14E4ED + map_script_2 VAR_LAVARIDGE_RIVAL_STATE, 1, LavaridgeTown_EventScript_14E4ED .2byte 0 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED @@ -111,7 +111,7 @@ LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 compare 0x8008, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 - setvar 0x4053, 2 + setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm compare 0x8008, 0 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index bbfe43bb6..044f72d11 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -83,13 +83,13 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 msgbox LavaridgeTown_Gym_1F_Text_176A8C, 4 setflag FLAG_DEFEATED_LAVARIDGE_GYM setflag FLAG_BADGE04_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB setvar 0x8008, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE - setvar 0x4053, 1 + setvar VAR_LAVARIDGE_RIVAL_STATE, 1 goto LavaridgeTown_Gym_1F_EventScript_1537A7 end diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 6494f2a6f..33c81b108 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -5,7 +5,7 @@ LilycoveCity_MapScripts:: @ 814CA15 LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE checkflag FLAG_SYS_WEATHER_CTRL call_if 1, LilycoveCity_EventScript_1A02C1 @@ -263,7 +263,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_14CE46 case 1, LilycoveCity_EventScript_14CE56 case 2, LilycoveCity_EventScript_14CE66 @@ -294,7 +294,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 compare RESULT, 0 goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, LilycoveCity_EventScript_14CE76 case 1, LilycoveCity_EventScript_14CE86 case 2, LilycoveCity_EventScript_14CE96 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index c97a01989..bc61c5ecd 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -8,14 +8,14 @@ LilycoveCity_ContestLobby_MapScript1_158871:: @ 8158871 end LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 - map_script_2 0x4099, 1, LilycoveCity_ContestLobby_EventScript_158889 - map_script_2 0x4099, 2, LilycoveCity_ContestLobby_EventScript_158A5B + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1, LilycoveCity_ContestLobby_EventScript_158889 + map_script_2 VAR_LILYCOVE_CONTEST_LOBBY_STATE, 2, LilycoveCity_ContestLobby_EventScript_158A5B .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 @@ -42,7 +42,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closemessage special sub_80C4CEC - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158948 @@ -62,7 +62,7 @@ LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 closemessage applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 4 releaseall end @@ -190,7 +190,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A @@ -215,7 +215,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE msgbox LilycoveCity_ContestLobby_Text_188AE8, 4 closemessage special sub_80C4CEC - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 @@ -235,7 +235,7 @@ LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 closemessage applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 - setvar 0x4099, 0 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 removeobject 11 releaseall end @@ -481,9 +481,9 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 LilycoveCity_ContestLobby_EventScript_158DEE:: @ 8158DEE call LilycoveCity_ContestLobby_EventScript_158E0B - setvar 0x4086, 1 + setvar VAR_LINK_CONTEST_ROOM_STATE, 1 special sub_80C4F70 - setvar 0x4088, 5 + setvar VAR_CONTEST_LOCATION, 5 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_158F08 end @@ -577,18 +577,18 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 call LilycoveCity_ContestLobby_EventScript_158F86 special sub_80C4BF0 call LilycoveCity_ContestLobby_EventScript_15FBDB - setvar 0x4088, 4 + setvar VAR_CONTEST_LOCATION, 4 call LilycoveCity_ContestLobby_EventScript_158F08 waitstate end LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - copyvar 0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 setvar 0x800b, 8 setvar CONTEST_RANK, 3 - setvar 0x4099, 1 + setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index ca60bbc89..c25a014f3 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar 0x8005, 0x4043 + copyvar 0x8005, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage @@ -22,46 +22,46 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C LilycoveCity_DepartmentStoreElevator_EventScript_15A402:: @ 815A402 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_1F, 255, 2, 1 - compare 0x4043, 0 + compare VAR_DEPT_STORE_FLOOR, 0 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 0 + setvar VAR_DEPT_STORE_FLOOR, 0 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A425:: @ 815A425 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_2F, 255, 2, 1 - compare 0x4043, 1 + compare VAR_DEPT_STORE_FLOOR, 1 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 1 + setvar VAR_DEPT_STORE_FLOOR, 1 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A448:: @ 815A448 setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_3F, 255, 2, 1 - compare 0x4043, 2 + compare VAR_DEPT_STORE_FLOOR, 2 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 2 + setvar VAR_DEPT_STORE_FLOOR, 2 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A46B:: @ 815A46B setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_4F, 255, 2, 1 - compare 0x4043, 3 + compare VAR_DEPT_STORE_FLOOR, 3 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 3 + setvar VAR_DEPT_STORE_FLOOR, 3 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end LilycoveCity_DepartmentStoreElevator_EventScript_15A48E:: @ 815A48E setdynamicwarp MAP_LILYCOVE_CITY_DEPARTMENT_STORE_5F, 255, 2, 1 - compare 0x4043, 4 + compare VAR_DEPT_STORE_FLOOR, 4 goto_if_eq LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 call LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8 - setvar 0x4043, 4 + setvar VAR_DEPT_STORE_FLOOR, 4 goto LilycoveCity_DepartmentStoreElevator_EventScript_15A4B1 end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index dbfd79e98..6cdb3367e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -9,7 +9,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E lock faceplayer dodailyevents - compare 0x4045, 0 + compare VAR_LOTTERY_PRIZE, 0 goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar 0x4045, 0x8005 + copyvar VAR_LOTTERY_PRIZE, 0x8005 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end @@ -111,10 +111,10 @@ LilycoveCity_DepartmentStore_1F_EventScript_159EA7:: @ 8159EA7 LilycoveCity_DepartmentStore_1F_EventScript_159EB1:: @ 8159EB1 msgbox LilycoveCity_DepartmentStore_1F_Text_1C4FCC, 4 - giveitem_std 0x4045 + giveitem_std VAR_LOTTERY_PRIZE compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159EA7 - setvar 0x4045, 0 + setvar VAR_LOTTERY_PRIZE, 0 release end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9687c73fe..d1ac96d93 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -50,7 +50,7 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 msgbox LilycoveCity_Harbor_Text_18B47D, 5 compare RESULT, 0 goto_if_eq LilycoveCity_Harbor_EventScript_15997E - setvar 0x40b4, 5 + setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_15998A warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 577805fb2..74c53591d 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -62,7 +62,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15865D:: @ 815865D end LilycoveCity_LilycoveMuseum_2F_MapScript2_158670:: @ 8158670 - map_script_2 0x4094, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A + map_script_2 VAR_LILYCOVE_MUSEUM_2F_STATE, 0, LilycoveCity_LilycoveMuseum_2F_EventScript_15867A .2byte 0 LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A @@ -81,7 +81,7 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_15867A:: @ 815867A applymovement 255, LilycoveCity_LilycoveMuseum_2F_Movement_1586D3 waitmovement 0 msgbox LilycoveCity_LilycoveMuseum_2F_Text_187E1D, 3 - copyvar 0x4094, 0x1 + copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 releaseall end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 13217b340..31f849b9f 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -4,7 +4,7 @@ LilycoveCity_PokemonTrainerFanClub_MapScripts:: @ 815938A .byte 0 LilycoveCity_PokemonTrainerFanClub_MapScript2_159395:: @ 8159395 - map_script_2 0x4095, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F + map_script_2 VAR_LILYCOVE_FAN_CLUB_STATE, 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15939F .2byte 0 LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F @@ -24,7 +24,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15939F:: @ 815939F waitmovement 0 applymovement 4, LilycoveCity_PokemonTrainerFanClub_Movement_15940C waitmovement 0 - setvar 0x4095, 2 + setvar VAR_LILYCOVE_FAN_CLUB_STATE, 2 releaseall end @@ -61,9 +61,9 @@ LilycoveCity_PokemonTrainerFanClub_Movement_15940C:: @ 815940C step_end LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 - compare 0x4095, 1 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159515 - compare 0x4095, 2 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 2 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159429 end @@ -148,7 +148,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F faceplayer setvar 0x8004, 13 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -188,7 +188,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 faceplayer setvar 0x8004, 8 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -228,7 +228,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D faceplayer setvar 0x8004, 9 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -268,7 +268,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 faceplayer setvar 0x8004, 10 special sub_810FDAC - compare 0x4095, 0 + compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 17565f7e8..cd0a61fef 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -5,19 +5,19 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag FLAG_VISITED_LITTLEROOT_TOWN - compare 0x4092, 2 + compare VAR_LITTLEROOT_INTRO_STATE, 2 call_if 1, LittlerootTown_EventScript_14D57B checkflag FLAG_RESCUED_BIRCH call_if 0, LittlerootTown_EventScript_14D583 - compare 0x4050, 3 + compare VAR_LITTLEROOT_STATE, 3 call_if 1, LittlerootTown_EventScript_14D5A6 - compare 0x4082, 4 + compare VAR_LITTLEROOT_HOUSES_STATE, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x408c, 4 + compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 call_if 1, LittlerootTown_EventScript_14D570 - compare 0x40c7, 1 + compare VAR_OLDALE_STATE, 1 call_if 1, LittlerootTown_EventScript_14D567 - compare 0x408d, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 call_if 1, LittlerootTown_EventScript_14D563 end @@ -26,13 +26,13 @@ LittlerootTown_EventScript_14D563:: @ 814D563 return LittlerootTown_EventScript_14D567:: @ 814D567 - setvar 0x40c7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_RIVAL_OLDALE_TOWN return LittlerootTown_EventScript_14D570:: @ 814D570 - setvar 0x4082, 5 - setvar 0x408c, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE, 5 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 5 return LittlerootTown_EventScript_14D57B:: @ 814D57B @@ -40,7 +40,7 @@ LittlerootTown_EventScript_14D57B:: @ 814D57B return LittlerootTown_EventScript_14D583:: @ 814D583 - compare 0x4050, 0 + compare VAR_LITTLEROOT_STATE, 0 goto_if_eq LittlerootTown_EventScript_14D59A setobjectxyperm 1, 10, 1 setobjectmovementtype 1, 7 @@ -70,9 +70,9 @@ LittlerootTown_EventScript_14D5CD:: @ 814D5CD return LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 - map_script_2 0x4092, 1, LittlerootTown_EventScript_14D5EF - map_script_2 0x4092, 2, LittlerootTown_EventScript_14D60D - map_script_2 0x4092, 7, LittlerootTown_EventScript_14D6C5 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 1, LittlerootTown_EventScript_14D5EF + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 2, LittlerootTown_EventScript_14D60D + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 7, LittlerootTown_EventScript_14D6C5 .2byte 0 LittlerootTown_EventScript_14D5EF:: @ 814D5EF @@ -123,7 +123,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 255, LittlerootTown_Movement_14D6BD waitmovement 0 setflag FLAG_HIDE_MOM_LITTLEROOT - setvar 0x4092, 3 + setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY closedoor 0x8004, 0x8005 waitdooranim @@ -172,7 +172,7 @@ LittlerootTown_Movement_14D6C0:: @ 814D6C0 LittlerootTown_EventScript_14D6C5:: @ 814D6C5 lockall - setvar 0x4092, 8 + setvar VAR_LITTLEROOT_INTRO_STATE, 8 releaseall end @@ -191,7 +191,7 @@ LittlerootTown_EventScript_14D6DF:: @ 814D6DF goto_if_eq LittlerootTown_EventScript_14D72F checkflag FLAG_RESCUED_BIRCH goto_if_eq LittlerootTown_EventScript_14D722 - compare 0x4050, 0 + compare VAR_LITTLEROOT_STATE, 0 goto_if 5, LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release @@ -202,7 +202,7 @@ LittlerootTown_EventScript_14D708:: @ 814D708 closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 - setvar 0x4050, 2 + setvar VAR_LITTLEROOT_STATE, 2 release end @@ -319,7 +319,7 @@ LittlerootTown_EventScript_14D7C7:: @ 814D7C7 closemessage applymovement 1, LittlerootTown_Movement_1A083D waitmovement 0 - setvar 0x4050, 2 + setvar VAR_LITTLEROOT_STATE, 2 releaseall end @@ -862,7 +862,7 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 LittlerootTown_EventScript_14DD2B:: @ 814DD2B removeobject 4 setflag FLAG_SYS_B_DASH - setvar 0x4050, 4 + setvar VAR_LITTLEROOT_STATE, 4 release end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index d4dd94aae..ba530cefc 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B .byte 0 LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 @@ -27,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 return LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A - compare 0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 - compare 0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end @@ -51,11 +51,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_1526C4:: @ 81526C4 return LittlerootTown_BrendansHouse_1F_MapScript2_1526D0:: @ 81526D0 - map_script_2 0x4092, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 - map_script_2 0x4092, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA - map_script_2 0x4092, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 - map_script_2 0x4082, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 - map_script_2 0x4082, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_152722 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_BrendansHouse_1F_EventScript_1526FA + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_BrendansHouse_1F_EventScript_152733 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 1, LittlerootTown_BrendansHouse_1F_EventScript_152744 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_BrendansHouse_1F_EventScript_1B6CDE .2byte 0 LittlerootTown_BrendansHouse_1F_EventScript_1526FA:: @ 81526FA @@ -101,7 +101,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1730C2, 4 setflag FLAG_MET_RIVAL_MOM - setvar 0x4082, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE, 2 releaseall end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 8f3b07312..e7f3b6b62 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -6,10 +6,10 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE - compare 0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D - setvar 0x4089, 0 + setvar VAR_0x4089, 0 end LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE @@ -18,7 +18,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1527CE:: @ 81527CE return LittlerootTown_BrendansHouse_2F_MapScript2_1527DA:: @ 81527DA - map_script_2 0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 + map_script_2 VAR_0x4089, 0, LittlerootTown_BrendansHouse_2F_EventScript_1527E4 .2byte 0 LittlerootTown_BrendansHouse_2F_EventScript_1527E4:: @ 81527E4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e23a05243..e3255b289 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -5,7 +5,7 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 .byte 0 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E checkflag FLAG_RECEIVED_RUNNING_SHOES call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 @@ -27,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE return LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 - compare 0x4092, 3 + compare VAR_LITTLEROOT_INTRO_STATE, 3 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 - compare 0x4092, 5 + compare VAR_LITTLEROOT_INTRO_STATE, 5 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA - compare 0x4092, 6 + compare VAR_LITTLEROOT_INTRO_STATE, 6 call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 end @@ -51,11 +51,11 @@ LittlerootTown_MaysHouse_1F_EventScript_152902:: @ 8152902 return LittlerootTown_MaysHouse_1F_MapScript2_15290E:: @ 815290E - map_script_2 0x4092, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 - map_script_2 0x4092, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 - map_script_2 0x4092, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 - map_script_2 0x408c, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 - map_script_2 0x4082, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_152960 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 5, LittlerootTown_MaysHouse_1F_EventScript_152938 + map_script_2 VAR_LITTLEROOT_INTRO_STATE, 6, LittlerootTown_MaysHouse_1F_EventScript_152971 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE_2, 1, LittlerootTown_MaysHouse_1F_EventScript_152982 + map_script_2 VAR_LITTLEROOT_HOUSES_STATE, 3, LittlerootTown_MaysHouse_1F_EventScript_1B6CDE .2byte 0 LittlerootTown_MaysHouse_1F_EventScript_152938:: @ 8152938 @@ -101,7 +101,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 special GetRivalSonDaughterString msgbox LittlerootTown_MaysHouse_1F_Text_1730C2, 4 setflag FLAG_MET_RIVAL_MOM - setvar 0x408c, 2 + setvar VAR_LITTLEROOT_HOUSES_STATE_2, 2 releaseall end @@ -139,7 +139,7 @@ LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 - compare 0x408d, 3 + compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString msgbox LittlerootTown_BrendansHouse_1F_Text_1731C6, 4 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 020c39eac..ee449d263 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -6,10 +6,10 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B checkflag FLAG_DEFEATED_RIVAL_ROUTE103 call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A - compare 0x4092, 4 + compare VAR_LITTLEROOT_INTRO_STATE, 4 call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D - setvar 0x4089, 0 + setvar VAR_0x4089, 0 end LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A @@ -18,7 +18,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A7A:: @ 8152A7A return LittlerootTown_MaysHouse_2F_MapScript2_152A86:: @ 8152A86 - map_script_2 0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 + map_script_2 VAR_0x4089, 0, LittlerootTown_MaysHouse_2F_EventScript_152A90 .2byte 0 LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 @@ -39,8 +39,8 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse 9 removeobject LAST_TALKED - setvar 0x408d, 3 - setvar 0x4050, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 3 + setvar VAR_LITTLEROOT_STATE, 1 savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 6792c5932..35478a445 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -10,7 +10,7 @@ LittlerootTown_ProfessorBirchsLab_MapScript1_152C92:: @ 8152C92 end LittlerootTown_ProfessorBirchsLab_MapScript2_152C9D:: @ 8152C9D - map_script_2 0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CA7 .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 @@ -18,8 +18,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CA7:: @ 8152CA7 end LittlerootTown_ProfessorBirchsLab_MapScript2_152CAC:: @ 8152CAC - map_script_2 0x4084, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE - map_script_2 0x4084, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A + map_script_2 VAR_BIRCH_LAB_STATE, 2, LittlerootTown_ProfessorBirchsLab_EventScript_152CBE + map_script_2 VAR_BIRCH_LAB_STATE, 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D4A .2byte 0 LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE @@ -53,7 +53,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 msgbox LittlerootTown_ProfessorBirchsLab_Text_174015, 4 clearflag FLAG_HIDE_BOY_ROUTE101 - setvar 0x4084, 3 + setvar VAR_BIRCH_LAB_STATE, 3 releaseall end @@ -85,7 +85,7 @@ LittlerootTown_ProfessorBirchsLab_Movement_152D5B:: @ 8152D5B LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer - compare 0x4084, 3 + compare VAR_BIRCH_LAB_STATE, 3 goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 checkflag FLAG_BIRCH_AIDE_MET goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 @@ -109,7 +109,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A faceplayer checkflag FLAG_UNKNOWN_BIRCH_380 goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F - compare 0x4084, 5 + compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 release @@ -128,11 +128,11 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 - setvar 0x4084, 5 + setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED - setvar 0x4051, 1 - setvar 0x408d, 4 - setvar 0x4050, 3 + setvar VAR_ROUTE102_ACCESSIBLE, 1 + setvar VAR_LITTLEROOT_RIVAL_STATE, 4 + setvar VAR_LITTLEROOT_STATE, 3 releaseall end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6a7e02848..6861e46c8 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -7,7 +7,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 clearflag FLAG_HIDE_OCEANIC_MUSEUM_VISITORS setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - setvar 0x4093, 0 + setvar VAR_MAUVILLE_GYM_STATE, 0 checkflag FLAG_RECEIVED_TM24 call_if 1, MauvilleCity_EventScript_14C053 end @@ -286,7 +286,7 @@ MauvilleCity_EventScript_14C2F2:: @ 814C2F2 faceplayer checkflag FLAG_RECEIVED_TM24 goto_if_eq MauvilleCity_EventScript_14C368 - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_14C33C checkflag FLAG_RECEIVED_BASEMENT_KEY goto_if_eq MauvilleCity_EventScript_14C332 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 5b6c47a86..7dc063149 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -394,7 +394,7 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 msgbox MauvilleCity_GameCorner_Text_181F3D, 5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_157068 - switch 0x4023 + switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_156FDB case 1, MauvilleCity_GameCorner_EventScript_157005 case 2, MauvilleCity_GameCorner_EventScript_15702F diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 799fb0992..4e4d5cf31 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -5,7 +5,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1565A7 - switch 0x4093 + switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D case 2, MauvilleCity_Gym_EventScript_15658B @@ -71,7 +71,7 @@ MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB checkflag FLAG_RECEIVED_TM34 goto_if 0, MauvilleCity_Gym_EventScript_15661D - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 release @@ -84,8 +84,8 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB msgbox MauvilleCity_Gym_Text_180DDA, 4 setflag FLAG_DEFEATED_MAUVILLE_GYM setflag FLAG_BADGE03_GET - addvar 0x4085, 1 - compare 0x4085, 6 + addvar VAR_PETALBURG_GYM_STATE, 1 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB setvar 0x8008, 3 call MauvilleCity_Gym_EventScript_1A01C0 @@ -113,9 +113,9 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 1 + compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 1 + setvar VAR_MAUVILLE_GYM_STATE, 1 setvar 0x8004, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -124,9 +124,9 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 2 + compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 2 + setvar VAR_MAUVILLE_GYM_STATE, 2 setvar 0x8004, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -135,9 +135,9 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall checkflag FLAG_DEFEATED_MAUVILLE_GYM goto_if_eq MauvilleCity_Gym_EventScript_1566DA - compare 0x4093, 3 + compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA - setvar 0x4093, 3 + setvar VAR_MAUVILLE_GYM_STATE, 3 setvar 0x8004, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index 7ce6e3704..a3e396ab0 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -78,7 +78,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C removeobject 8 removeobject 9 setflag FLAG_HIDE_GRUNTS_BLOCKING_CABLE_CAR - setvar 0x40bf, 1 + setvar VAR_METEOR_FALLS_STATE, 1 releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 527e29dd5..1e7c26511 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -19,7 +19,7 @@ MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special ValidateEReaderTrainer compare RESULT, 0 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E - compare 0x40c0, 0 + compare VAR_GAME_CORNER_STATE, 0 call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF end @@ -35,9 +35,9 @@ MossdeepCity_GameCorner_1F_EventScript_15ACAF:: @ 815ACAF return MossdeepCity_GameCorner_1F_MapScript2_15ACBB:: @ 815ACBB - map_script_2 0x40c0, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 - map_script_2 0x40c0, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 - map_script_2 0x40c0, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 1, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 2, MossdeepCity_GameCorner_1F_EventScript_15ACD5 + map_script_2 VAR_GAME_CORNER_STATE, 3, MossdeepCity_GameCorner_1F_EventScript_15ACD5 .2byte 0 MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 @@ -49,14 +49,14 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 moveobjectoffscreen 1 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 - compare 0x40c0, 1 + compare VAR_GAME_CORNER_STATE, 1 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 - compare 0x40c0, 2 + compare VAR_GAME_CORNER_STATE, 2 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B - compare 0x40c0, 3 + compare VAR_GAME_CORNER_STATE, 3 call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty - setvar 0x40c0, 0 + setvar VAR_GAME_CORNER_STATE, 0 releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index b27965d61..9d4f26cfa 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -40,19 +40,19 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E end MossdeepCity_GameCorner_B1F_EventScript_15AED5:: @ 815AED5 - setvar 0x40c0, 3 + setvar VAR_GAME_CORNER_STATE, 3 msgbox MossdeepCity_GameCorner_B1F_Text_18E796, 4 return MossdeepCity_GameCorner_B1F_EventScript_15AEE3:: @ 815AEE3 - setvar 0x40c0, 1 + setvar VAR_GAME_CORNER_STATE, 1 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress return MossdeepCity_GameCorner_B1F_EventScript_15AEEE:: @ 815AEEE - setvar 0x40c0, 2 + setvar VAR_GAME_CORNER_STATE, 2 special ShowFieldMessageStringVar4 waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 7e08cfa69..a11b12fcc 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -14,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF return MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 - compare 0x40c6, 1 + compare VAR_STEVENS_HOUSE_STATE, 1 call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 end @@ -24,7 +24,7 @@ MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 return MossdeepCity_StevensHouse_MapScript2_15AA01:: @ 815AA01 - map_script_2 0x40c6, 0, MossdeepCity_StevensHouse_EventScript_15AA0B + map_script_2 VAR_STEVENS_HOUSE_STATE, 0, MossdeepCity_StevensHouse_EventScript_15AA0B .2byte 0 MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B @@ -47,7 +47,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B delay 20 applymovement 1, MossdeepCity_StevensHouse_Movement_15AA76 waitmovement 0 - setvar 0x40c6, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 releaseall end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a51695b59..a831f0dcc 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -4,7 +4,7 @@ MtChimney_MapScripts:: @ 815CF7C .byte 0 MtChimney_MapScript1_15CF87:: @ 815CF87 - setvar 0x40bd, 1 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 1 call MtChimney_EventScript_1A0196 end diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 9d99eb5fb..7b71ebd76 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -4,7 +4,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA .byte 0 MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 - compare 0x40a3, 1 + compare VAR_CABLE_CAR_STATION_STATE, 1 call_if 1, MtChimney_CableCarStation_EventScript_15C111 end @@ -14,7 +14,7 @@ MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 return MtChimney_CableCarStation_MapScript2_15C11D:: @ 815C11D - map_script_2 0x40a3, 1, MtChimney_CableCarStation_EventScript_15C127 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 1, MtChimney_CableCarStation_EventScript_15C127 .2byte 0 MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 @@ -22,7 +22,7 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 applymovement 255, MtChimney_CableCarStation_Movement_15C1B4 applymovement 1, MtChimney_CableCarStation_Movement_15C1AA waitmovement 0 - setvar 0x40a3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, 8 releaseall @@ -45,7 +45,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 setvar 0x8004, 1 - setvar 0x40a3, 2 + setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 73e2e4d97..34828f415 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -70,11 +70,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 MtPyre_Summit_EventScript_15D57A:: @ 815D57A setflag FLAG_MT_PYRE_ORB_STOLEN - setvar 0x4058, 1 + setvar VAR_SLATEPORT_STATE, 1 clearflag FLAG_HIDE_STERN_SLATEPORT clearflag FLAG_HIDE_GABBY_AND_TY_SLATEPORT - setvar 0x40a0, 1 - setvar 0x40b9, 1 + setvar VAR_SLATEPORT_HARBOR_STATE, 1 + setvar VAR_MT_PYRE_STATE, 1 return MtPyre_Summit_EventScript_15D593:: @ 815D593 @@ -287,7 +287,7 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 compare 0x8008, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 - setvar 0x40b9, 3 + setvar VAR_MT_PYRE_STATE, 3 releaseall end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index a88b35087..1e4cdf256 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -4,7 +4,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A .byte 0 NewMauville_Entrance_MapScript1_15E495:: @ 815E495 - compare 0x40ba, 0 + compare VAR_NEW_MAUVILLE_STATE, 0 call_if 1, NewMauville_Entrance_EventScript_15E4A1 end @@ -41,7 +41,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 5, 1, 717, 1 special DrawWholeMapView playse 20 - setvar 0x40ba, 1 + setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ba991bcf2..283b6bfed 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -23,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 end NewMauville_Inside_MapScript1_15E59E:: @ 815E59E - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 call_if 1, NewMauville_Inside_EventScript_15E88B end @@ -131,7 +131,7 @@ NewMauville_Inside_EventScript_15E876:: @ 815E876 lockall msgbox NewMauville_Inside_Text_1983B1, 4 call NewMauville_Inside_EventScript_15E88B - setvar 0x40ba, 2 + setvar VAR_NEW_MAUVILLE_STATE, 2 releaseall end @@ -150,7 +150,7 @@ NewMauville_Inside_EventScript_15E88B:: @ 815E88B NewMauville_Inside_EventScript_15E8E0:: @ 815E8E0 lockall - compare 0x40ba, 2 + compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq NewMauville_Inside_EventScript_15E8F6 msgbox NewMauville_Inside_Text_198315, 4 releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 465cbcfc6..329313e74 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -14,7 +14,7 @@ OldaleTown_MapScript1_14DD68:: @ 814DD68 end OldaleTown_EventScript_14DD8C:: @ 814DD8C - setvar 0x4051, 1 + setvar VAR_ROUTE102_ACCESSIBLE, 1 return OldaleTown_EventScript_14DD92:: @ 814DD92 @@ -278,7 +278,7 @@ OldaleTown_EventScript_14DFC6:: @ 814DFC6 applymovement 4, OldaleTown_Movement_14DFE5 waitmovement 0 removeobject 4 - setvar 0x40c7, 2 + setvar VAR_OLDALE_STATE, 2 setflag FLAG_HIDE_RIVAL_OLDALE_TOWN releaseall end diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 351b7ea85..caec9b4a2 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -5,9 +5,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag FLAG_VISITED_PETALBURG_CITY - compare 0x4057, 0 + compare VAR_PETALBURG_STATE, 0 call_if 1, PetalburgCity_EventScript_14B731 - compare 0x4057, 2 + compare VAR_PETALBURG_STATE, 2 call_if 1, PetalburgCity_EventScript_14B739 end @@ -20,7 +20,7 @@ PetalburgCity_EventScript_14B739:: @ 814B739 return PetalburgCity_MapScript2_14B73D:: @ 814B73D - map_script_2 0x4057, 2, PetalburgCity_EventScript_14B747 + map_script_2 VAR_PETALBURG_STATE, 2, PetalburgCity_EventScript_14B747 .2byte 0 PetalburgCity_EventScript_14B747:: @ 814B747 @@ -40,11 +40,11 @@ PetalburgCity_EventScript_14B747:: @ 814B747 msgbox PetalburgCity_Text_16D408, 4 closemessage clearflag FLAG_SPECIAL_FLAG_0 - setvar 0x4057, 3 + setvar VAR_PETALBURG_STATE, 3 fadedefaultbgm clearflag FLAG_SPECIAL_FLAG_1 special LoadPlayerParty - setvar 0x4085, 1 + setvar VAR_PETALBURG_GYM_STATE, 1 warp MAP_PETALBURG_CITY_GYM, 255, 4, 108 waitstate releaseall diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 0b6b3842f..727818f34 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -6,9 +6,9 @@ PetalburgCity_Gym_MapScripts:: @ 8154477 .byte 0 PetalburgCity_Gym_MapScript1_15448C:: @ 815448C - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 - compare 0x4085, 7 + compare VAR_PETALBURG_GYM_STATE, 7 call_if 4, PetalburgCity_Gym_EventScript_1544ED end @@ -44,9 +44,9 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED return PetalburgCity_Gym_MapScript1_15451B:: @ 815451B - compare 0x4085, 1 + compare VAR_PETALBURG_GYM_STATE, 1 call_if 1, PetalburgCity_Gym_EventScript_15453B - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 0, PetalburgCity_Gym_EventScript_154543 checkflag FLAG_SYS_GAME_CLEAR call_if 1, PetalburgCity_Gym_EventScript_15454B @@ -65,7 +65,7 @@ PetalburgCity_Gym_EventScript_15454B:: @ 815454B return PetalburgCity_Gym_MapScript2_154553:: @ 8154553 - map_script_2 0x4085, 1, PetalburgCity_Gym_EventScript_15455D + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15455D .2byte 0 PetalburgCity_Gym_EventScript_15455D:: @ 815455D @@ -73,7 +73,7 @@ PetalburgCity_Gym_EventScript_15455D:: @ 815455D end PetalburgCity_Gym_MapScript2_154562:: @ 8154562 - map_script_2 0x4085, 1, PetalburgCity_Gym_EventScript_15456C + map_script_2 VAR_PETALBURG_GYM_STATE, 1, PetalburgCity_Gym_EventScript_15456C .2byte 0 PetalburgCity_Gym_EventScript_15456C:: @ 815456C @@ -91,7 +91,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 255, PetalburgCity_Gym_Movement_1A0841 waitmovement 0 msgbox PetalburgCity_Gym_Text_17A2A4, 4 - setvar 0x4085, 2 + setvar VAR_PETALBURG_GYM_STATE, 2 releaseall end @@ -105,7 +105,7 @@ PetalburgCity_Gym_Movement_1545B4:: @ 81545B4 PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 lock faceplayer - switch 0x4085 + switch VAR_PETALBURG_GYM_STATE case 2, PetalburgCity_Gym_EventScript_154907 case 3, PetalburgCity_Gym_EventScript_154911 case 4, PetalburgCity_Gym_EventScript_15491B @@ -206,8 +206,8 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 - setvar 0x4085, 1 - setvar 0x4057, 2 + setvar VAR_PETALBURG_GYM_STATE, 1 + setvar VAR_PETALBURG_STATE, 2 clearflag FLAG_HIDE_WALLY_PETALBURG clearflag FLAG_HIDE_WALLY_PETALBURG_GYM setflag FLAG_HIDE_RIVAL_BIRCH_LAB @@ -372,7 +372,7 @@ PetalburgCity_Gym_EventScript_154969:: @ 8154969 checkpcitem ITEM_ENIGMA_BERRY, 1 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 - compare 0x402d, 0 + compare VAR_ENIGMA_BERRY_AVAILABLE, 0 goto_if_eq PetalburgCity_Gym_EventScript_1549B2 msgbox PetalburgCity_Gym_Text_1C5570, 4 setvar RESULT, 1 @@ -386,7 +386,7 @@ PetalburgCity_Gym_EventScript_1549B8:: @ 81549B8 giveitem_std ITEM_ENIGMA_BERRY compare RESULT, 0 goto_if_eq PetalburgCity_Gym_EventScript_1A029B - setvar 0x402d, 0 + setvar VAR_ENIGMA_BERRY_AVAILABLE, 0 release end @@ -398,7 +398,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A02C5 msgbox PetalburgCity_Gym_Text_17A805, 4 setflag FLAG_DEFEATED_PETALBURG_GYM - setvar 0x4085, 7 + setvar VAR_PETALBURG_GYM_STATE, 7 setflag FLAG_BADGE05_GET call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM @@ -592,7 +592,7 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 7 setvar 0x8009, 85 @@ -622,7 +622,7 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar 0x8008, 1 setvar 0x8009, 98 diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 1dc99159a..25af3e1cb 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -34,11 +34,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 end PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F - compare 0x4023, 0 + compare VAR_STARTER_MON, 0 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 - compare 0x4023, 1 + compare VAR_STARTER_MON, 1 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B - compare 0x4023, 2 + compare VAR_STARTER_MON, 2 call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index be74cbf4c..83bfe7da4 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -111,7 +111,7 @@ PetalburgWoods_EventScript_15CE4D:: @ 815CE4D PetalburgWoods_EventScript_15CE69:: @ 815CE69 removeobject 4 - setvar 0x4098, 1 + setvar VAR_PETALBURG_WOODS_STATE, 1 releaseall end diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index f03d7cc62..6749f2136 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -8,12 +8,12 @@ Route101_MapScript1_14E92F:: @ 814E92F end Route101_MapScript2_14E935:: @ 814E935 - map_script_2 0x4060, 0, Route101_EventScript_14E93F + map_script_2 VAR_ROUTE101_STATE, 0, Route101_EventScript_14E93F .2byte 0 Route101_EventScript_14E93F:: @ 814E93F setflag FLAG_SPECIAL_FLAG_0 - setvar 0x4060, 1 + setvar VAR_ROUTE101_STATE, 1 end Route101_EventScript_14E948:: @ 814E948 @@ -37,7 +37,7 @@ Route101_EventScript_14E948:: @ 814E948 waitmovement 0 msgbox Route101_Text_16D119, 4 closemessage - setvar 0x4060, 2 + setvar VAR_ROUTE101_STATE, 2 releaseall end @@ -233,8 +233,8 @@ Route101_EventScript_14EA7F:: @ 814EA7F setflag FLAG_HIDE_BIRCH_BATTLE_POOCHYENA clearflag FLAG_HIDE_BIRCH_IN_LAB setflag FLAG_HIDE_BIRCH_STARTERS_BAG - setvar 0x4084, 2 - setvar 0x4060, 3 + setvar VAR_BIRCH_LAB_STATE, 2 + setvar VAR_ROUTE101_STATE, 3 clearflag FLAG_SPECIAL_FLAG_0 warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5 waitstate diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index ee9decedc..35994cd45 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -26,7 +26,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D5B6, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC5D case 1, Route103_EventScript_14EC6D case 2, Route103_EventScript_14EC7D @@ -42,7 +42,7 @@ Route103_EventScript_14EC04:: @ 814EC04 applymovement 2, Route103_Movement_1A0835 waitmovement 0 msgbox Route103_Text_16D7A9, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route103_EventScript_14EC8D case 1, Route103_EventScript_14EC9D case 2, Route103_EventScript_14ECAD @@ -117,11 +117,11 @@ Route103_EventScript_14ED29:: @ 814ED29 Route103_EventScript_14ED46:: @ 814ED46 removeobject 2 - setvar 0x4062, 1 - setvar 0x4084, 4 + setvar VAR_ROUTE103_STATE, 1 + setvar VAR_BIRCH_LAB_STATE, 4 clearflag FLAG_HIDE_RIVAL_BIRCH_LAB setflag FLAG_DEFEATED_RIVAL_ROUTE103 - setvar 0x40c7, 1 + setvar VAR_OLDALE_STATE, 1 clearflag FLAG_HIDE_RIVAL_OLDALE_TOWN savebgm 0 fadedefaultbgm diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index a04dcd86d..1bf579d77 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -4,7 +4,7 @@ Route104_MapScripts:: @ 814EE8C .byte 0 Route104_MapScript2_14EE97:: @ 814EE97 - map_script_2 0x408e, 1, Route104_EventScript_14EEA1 + map_script_2 VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1, Route104_EventScript_14EEA1 .2byte 0 Route104_EventScript_14EEA1:: @ 814EEA1 @@ -153,11 +153,11 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 - setvar 0x408e, 0 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 checkflag FLAG_DELIVERED_STEVEN_LETTER goto_if 0, Route104_EventScript_14F08B checkflag FLAG_DELIVERED_STEVEN_LETTER diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 4eb1d9705..cb52908f5 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -4,7 +4,7 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE - compare 0x4090, 1 + compare VAR_BRINEY_HOUSE_STATE, 1 call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 checkflag FLAG_RECEIVED_POKENAV call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 @@ -79,7 +79,7 @@ Route104_MrBrineysHouse_EventScript_15BDA1:: @ 815BDA1 Route104_MrBrineysHouse_EventScript_15BDAB:: @ 815BDAB msgbox Route104_MrBrineysHouse_Text_191BFD, 4 call Route104_MrBrineysHouse_EventScript_1A010C - setvar 0x408e, 1 + setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 1 clearflag FLAG_HIDE_MR_BRINEY_ROUTE104 setflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE setflag FLAG_HIDE_PEEKO_BRINEY_HOUSE diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index a9fa7d906..61ad2bddd 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar 0x4096, 0x8008 + copyvar VAR_BRINEY_LOCATION, 0x8008 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 5e10782e9..9d6cc22d3 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -12,7 +12,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A0196 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 - compare 0x40a9, 1 + compare VAR_CYCLING_CHALLENGE_STATE, 1 call_if 1, Route110_EventScript_14F92F end @@ -21,12 +21,12 @@ Route110_EventScript_14F92F:: @ 814F92F return Route110_MapScript2_14F933:: @ 814F933 - map_script_2 0x40a9, 1, Route110_EventScript_14F93D + map_script_2 VAR_CYCLING_CHALLENGE_STATE, 1, Route110_EventScript_14F93D .2byte 0 Route110_EventScript_14F93D:: @ 814F93D special ScrSpecial_BeginCyclingRoadChallenge - setvar 0x40a9, 2 + setvar VAR_CYCLING_CHALLENGE_STATE, 2 return Route110_EventScript_14F946:: @ 814F946 @@ -149,7 +149,7 @@ Route110_EventScript_14FA53:: @ 814FA53 specialvar RESULT, GetPlayerAvatarBike compare RESULT, 1 goto_if_eq Route110_EventScript_14FA84 - compare 0x40a9, 0 + compare VAR_CYCLING_CHALLENGE_STATE, 0 goto_if_eq Route110_EventScript_14FA7A msgbox Route110_Text_16F26A, 4 release @@ -303,7 +303,7 @@ Route110_EventScript_14FCFB:: @ 814FCFB end Route110_EventScript_14FD09:: @ 814FD09 - setvar 0x40a9, 3 + setvar VAR_CYCLING_CHALLENGE_STATE, 3 savebgm 0 fadedefaultbgm return @@ -361,7 +361,7 @@ Route110_EventScript_14FDAC:: @ 814FDAC Route110_EventScript_14FDB1:: @ 814FDB1 msgbox Route110_Text_16E7A1, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route110_EventScript_14FDE0 case 1, Route110_EventScript_14FDF0 case 2, Route110_EventScript_14FE00 @@ -391,7 +391,7 @@ Route110_EventScript_14FE10:: @ 814FE10 Route110_EventScript_14FE2B:: @ 814FE2B msgbox Route110_Text_16E99A, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route110_EventScript_14FE5A case 1, Route110_EventScript_14FE6A case 2, Route110_EventScript_14FE7A @@ -443,7 +443,7 @@ Route110_EventScript_14FEB2:: @ 814FEB2 compare 0x8008, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 - setvar 0x4069, 1 + setvar VAR_ROUTE110_STATE, 1 savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index 6eedce42d..af72dedd0 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -3,14 +3,14 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 .byte 0 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE - compare 0x40a9, 3 + compare VAR_CYCLING_CHALLENGE_STATE, 3 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 - compare 0x40a9, 2 + compare VAR_CYCLING_CHALLENGE_STATE, 2 call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 - setvar 0x40a9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634EB:: @ 81634EB @@ -35,7 +35,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D:: @ 816351D @ You're on the Mach Bike! - setvar 0x40a9, 1 + setvar VAR_CYCLING_CHALLENGE_STATE, 1 return Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523:: @ 8163523 @@ -54,7 +54,7 @@ Route110_SeasideCyclingRoadNorthEntrance_Movement_163538:: @ 8163538 Route110_SeasideCyclingRoadNorthEntrance_EventScript_16353A:: @ 816353A @ Coord event directly in front of the gatesman heading right to left lockall - setvar 0x40a9, 0 + setvar VAR_CYCLING_CHALLENGE_STATE, 0 clearflag FLAG_SYS_CYCLING_ROAD setvar VAR_TEMP_1, 0 releaseall diff --git a/data/scripts/maps/Route110_TrickHouseCorridor.inc b/data/scripts/maps/Route110_TrickHouseCorridor.inc index 7b3d93118..be70476e6 100644 --- a/data/scripts/maps/Route110_TrickHouseCorridor.inc +++ b/data/scripts/maps/Route110_TrickHouseCorridor.inc @@ -3,5 +3,5 @@ Route110_TrickHouseCorridor_MapScripts:: @ 8161CEC .byte 0 Route110_TrickHouseCorridor_MapScript1_161CF2:: @ 8161CF2 - setvar 0x40b5, 1 + setvar VAR_TRICK_HOUSE_STATE, 1 end diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index aa1345c7e..c825c1234 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -45,7 +45,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E faceplayer msgbox Route110_TrickHouseEnd_Text_19C281, 4 setvar VAR_TEMP_2, 1 - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEnd_EventScript_161A0B case 1, Route110_TrickHouseEnd_EventScript_161A47 case 2, Route110_TrickHouseEnd_EventScript_161A83 @@ -59,7 +59,7 @@ Route110_TrickHouseEnd_EventScript_16199E:: @ 816199E Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B msgbox Route110_TrickHouseEnd_Text_19C2B2, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -72,7 +72,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 msgbox Route110_TrickHouseEnd_Text_19C333, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -85,7 +85,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 msgbox Route110_TrickHouseEnd_Text_19C3A7, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -98,7 +98,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF msgbox Route110_TrickHouseEnd_Text_19C41F, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -111,7 +111,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB msgbox Route110_TrickHouseEnd_Text_19C491, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -124,7 +124,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 msgbox Route110_TrickHouseEnd_Text_19C515, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -137,7 +137,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 msgbox Route110_TrickHouseEnd_Text_19C567, 4 msgbox Route110_TrickHouseEnd_Text_19C90B, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C4E @@ -165,7 +165,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF waitmovement 0 delay 30 msgbox Route110_TrickHouseEnd_Text_19C691, 4 - setvar 0x40c1, 0 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE givedecoration_std 32 .else @@ -186,19 +186,19 @@ Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 - addvar 0x4044, 1 + addvar VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 return Route110_TrickHouseEnd_EventScript_161C4E:: @ 8161C4E call Route110_TrickHouseEnd_EventScript_1A02A5 msgbox Route110_TrickHouseEnd_Text_19C92E, 4 - setvar 0x40c1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_161C61:: @ 8161C61 call Route110_TrickHouseEnd_EventScript_1A02B8 msgbox Route110_TrickHouseEnd_Text_19C7D7, 4 - setvar 0x40c1, 1 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 return Route110_TrickHouseEnd_EventScript_161C74:: @ 8161C74 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index b9582b64c..05b570482 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -6,19 +6,19 @@ Route110_TrickHouseEntrance_MapScripts:: @ 8160F2B Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B setflag FLAG_LANDMARK_TRICK_HOUSE - compare 0x40b5, 1 + compare VAR_TRICK_HOUSE_STATE, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FCE - compare 0x40c1, 1 + compare VAR_TRICK_HOUSE_PRIZE_PICKUP, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FB2 - compare 0x40a6, 1 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E - compare 0x40a7, 5 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 3 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - compare 0x40a7, 0 + compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 case 3, Route110_TrickHouseEntrance_EventScript_1610A6 @@ -26,39 +26,39 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B end Route110_TrickHouseEntrance_EventScript_160FB2:: @ 8160FB2 - setvar 0x40a5, 1 - compare 0x4044, 8 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_160FC8 - setvar 0x40a7, 2 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2 end Route110_TrickHouseEntrance_EventScript_160FC8:: @ 8160FC8 - setvar 0x40a7, 6 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6 end Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE - setvar 0x40b5, 0 - setvar 0x40a7, 5 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_STATE, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE - setvar 0x40a7, 0 - compare 0x4044, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_16103C - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_161046 - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_161050 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_16105A - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_161064 - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_16106E - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_161078 - compare 0x4044, 8 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 call_if 1, Route110_TrickHouseEntrance_EventScript_161082 return @@ -98,11 +98,11 @@ Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 - setvar 0x40a7, 4 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4 return Route110_TrickHouseEntrance_EventScript_161088:: @ 8161088 - setvar 0x40a7, 3 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 return Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E @@ -111,30 +111,30 @@ Route110_TrickHouseEntrance_EventScript_16108E:: @ 816108E end Route110_TrickHouseEntrance_EventScript_16109A:: @ 816109A - setvar 0x40a5, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 0 end Route110_TrickHouseEntrance_EventScript_1610A0:: @ 81610A0 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1610A6:: @ 81610A6 - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1610AC:: @ 81610AC - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_MapScript2_1610B2:: @ 81610B2 - map_script_2 0x40a6, 1, Route110_TrickHouseEntrance_EventScript_1610F4 - map_script_2 0x40a7, 0, Route110_TrickHouseEntrance_EventScript_161105 - map_script_2 0x40a7, 1, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 2, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 0x40a7, 3, Route110_TrickHouseEntrance_EventScript_1611AF - map_script_2 0x40a7, 4, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 5, Route110_TrickHouseEntrance_EventScript_1611AB - map_script_2 0x40a7, 6, Route110_TrickHouseEntrance_EventScript_1611BE + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1610F4 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0, Route110_TrickHouseEntrance_EventScript_161105 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 2, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3, Route110_TrickHouseEntrance_EventScript_1611AF + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 4, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5, Route110_TrickHouseEntrance_EventScript_1611AB + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 6, Route110_TrickHouseEntrance_EventScript_1611BE .2byte 0 Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 @@ -147,7 +147,7 @@ Route110_TrickHouseEntrance_EventScript_1610F4:: @ 81610F4 Route110_TrickHouseEntrance_EventScript_161105:: @ 8161105 addobject 1 hideobjectat 1, MAP_ROUTE110_TRICK_HOUSE_ENTRANCE - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_16116B case 1, Route110_TrickHouseEntrance_EventScript_161173 case 2, Route110_TrickHouseEntrance_EventScript_161193 @@ -207,13 +207,13 @@ Route110_TrickHouseEntrance_EventScript_1611BE:: @ 81611BE end Route110_TrickHouseEntrance_MapScript2_1611CD:: @ 81611CD - map_script_2 0x40a6, 1, Route110_TrickHouseEntrance_EventScript_1611D7 + map_script_2 VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1, Route110_TrickHouseEntrance_EventScript_1611D7 .2byte 0 Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closemessage @@ -224,8 +224,8 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 - setvar 0x40a7, 1 - setvar 0x40a6, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 0 releaseall end @@ -235,7 +235,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A lockall - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16124D case 2, Route110_TrickHouseEntrance_EventScript_16136E case 3, Route110_TrickHouseEntrance_EventScript_161330 @@ -248,24 +248,24 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 call_if 1, Route110_TrickHouseEntrance_EventScript_161303 - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 call_if 1, Route110_TrickHouseEntrance_EventScript_16130C closemessage - setvar 0x40a6, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 waitstate releaseall @@ -351,19 +351,19 @@ Route110_TrickHouseEntrance_EventScript_16136E:: @ 816136E applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C07E, 4 - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613CE - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 goto_if_eq Route110_TrickHouseEntrance_EventScript_1613FA - compare 0x4044, 3 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 goto_if_eq Route110_TrickHouseEntrance_EventScript_161426 - compare 0x4044, 4 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 goto_if_eq Route110_TrickHouseEntrance_EventScript_161452 - compare 0x4044, 5 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 goto_if_eq Route110_TrickHouseEntrance_EventScript_16147E - compare 0x4044, 6 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614AA - compare 0x4044, 7 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 goto_if_eq Route110_TrickHouseEntrance_EventScript_1614D6 end @@ -438,8 +438,8 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 end Route110_TrickHouseEntrance_EventScript_161502:: @ 8161502 - setvar 0x40c1, 0 - setvar 0x40a7, 3 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 applymovement 1, Route110_TrickHouseEntrance_Movement_1A0841 waitmovement 0 releaseall @@ -473,14 +473,14 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 - setvar 0x40c1, 0 - setvar 0x40a7, 5 + setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 releaseall end Route110_TrickHouseEntrance_EventScript_16158A:: @ 816158A lockall - switch 0x40a7 + switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_1615BD case 1, Route110_TrickHouseEntrance_EventScript_1615C7 case 4, Route110_TrickHouseEntrance_EventScript_1616B8 @@ -508,7 +508,7 @@ Route110_TrickHouseEntrance_EventScript_1615DD:: @ 81615DD waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_16165E waitmovement 0 - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_161660 case 1, Route110_TrickHouseEntrance_EventScript_16166B case 2, Route110_TrickHouseEntrance_EventScript_161676 @@ -577,7 +577,7 @@ Route110_TrickHouseEntrance_EventScript_1616B8:: @ 81616B8 end Route110_TrickHouseEntrance_EventScript_1616C2:: @ 81616C2 - compare 0x4044, 8 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 goto_if_eq Route110_TrickHouseEntrance_EventScript_1616D7 msgbox Route110_TrickHouseEntrance_Text_19BE6E, 4 releaseall @@ -590,7 +590,7 @@ Route110_TrickHouseEntrance_EventScript_1616D7:: @ 81616D7 gUnknown_081616E1:: @ 81616E1 lockall - switch 0x4044 + switch VAR_TRICK_HOUSE_ROOMS_COMPLETED case 0, Route110_TrickHouseEntrance_EventScript_161740 case 1, Route110_TrickHouseEntrance_EventScript_161769 case 2, Route110_TrickHouseEntrance_EventScript_161792 @@ -602,88 +602,88 @@ gUnknown_081616E1:: @ 81616E1 end Route110_TrickHouseEntrance_EventScript_161740:: @ 8161740 - compare 0x40AB, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CAD1, 4 playse SE_PIN - setvar 0x40AB, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161769:: @ 8161769 - compare 0x40AC, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CCCB, 4 playse SE_PIN - setvar 0x40AC, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161792:: @ 8161792 - compare 0x40AD, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819CEF9, 4 playse SE_PIN - setvar 0x40AD, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_1617BB:: @ 81617BB - compare 0x40AE, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D164, 4 playse SE_PIN - setvar 0x40AE, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_1617E4:: @ 81617E4 - compare 0x40AF, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819D3A5, 4 playse SE_PIN - setvar 0x40AF, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_16180D:: @ 816180D - compare 0x40B0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DC0A, 4 playse SE_PIN - setvar 0x40B0, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_161836:: @ 8161836 - compare 0x40B1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819DE8D, 4 playse SE_PIN - setvar 0x40B1, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall end Route110_TrickHouseEntrance_EventScript_16185F:: @ 816185F - compare 0x40B2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHouseEntrance_EventScript_161888 msgbox UnknownString_819E0FF, 4 playse SE_PIN - setvar 0x40B2, 2 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 2 setmetatile 13, 1, 523, 0 special DrawWholeMapView releaseall @@ -726,13 +726,13 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 lockall msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall - compare 0x4044, 0 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 - compare 0x4044, 1 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 - compare 0x4044, 2 + compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 call_if 1, Route110_TrickHouseEntrance_EventScript_16190B - setvar 0x40a5, 1 + setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle1.inc b/data/scripts/maps/Route110_TrickHousePuzzle1.inc index 4fffd9914..df0484baf 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle1.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle1.inc @@ -3,7 +3,7 @@ Route110_TrickHousePuzzle1_MapScripts:: @ 8161CF8 .byte 0 Route110_TrickHousePuzzle1_MapScript1_161CFE:: @ 8161CFE - compare 0x40ab, 2 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 2 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D0A end @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle1_EventScript_161D0A:: @ 8161D0A Route110_TrickHousePuzzle1_EventScript_161D14:: @ 8161D14 lockall - compare 0x40ab, 0 + compare VAR_TRICK_HOUSE_PUZZLE_1_STATE, 0 goto_if_eq Route110_TrickHousePuzzle1_EventScript_161D26 goto Route110_TrickHousePuzzle1_EventScript_161892 end Route110_TrickHousePuzzle1_EventScript_161D26:: @ 8161D26 - setvar 0x40ab, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_1_STATE, 1 goto Route110_TrickHousePuzzle1_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 19ebfbf50..9ebde8451 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -23,13 +23,13 @@ Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE Route110_TrickHousePuzzle2_EventScript_161DC3:: @ 8161DC3 lockall - compare 0x40ac, 0 + compare VAR_TRICK_HOUSE_PUZZLE_2_STATE, 0 goto_if_eq Route110_TrickHousePuzzle2_EventScript_161DD5 goto Route110_TrickHousePuzzle2_EventScript_161892 end Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 - setvar 0x40ac, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_2_STATE, 1 goto Route110_TrickHousePuzzle2_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index be1f84c63..cb129b06d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -370,13 +370,13 @@ Route110_TrickHousePuzzle3_EventScript_1626E4:: @ 81626E4 Route110_TrickHousePuzzle3_EventScript_1626EB:: @ 81626EB lockall - compare 0x40ad, 0 + compare VAR_TRICK_HOUSE_PUZZLE_3_STATE, 0 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626FD goto Route110_TrickHousePuzzle3_EventScript_161892 end Route110_TrickHousePuzzle3_EventScript_1626FD:: @ 81626FD - setvar 0x40ad, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_3_STATE, 1 goto Route110_TrickHousePuzzle3_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle4.inc b/data/scripts/maps/Route110_TrickHousePuzzle4.inc index 0c9fc426f..3808f1f2d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle4.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle4.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle4_MapScripts:: @ 816274D Route110_TrickHousePuzzle4_EventScript_16274E:: @ 816274E lockall - compare 0x40ae, 0 + compare VAR_TRICK_HOUSE_PUZZLE_4_STATE, 0 goto_if_eq Route110_TrickHousePuzzle4_EventScript_162760 goto Route110_TrickHousePuzzle4_EventScript_161892 end Route110_TrickHousePuzzle4_EventScript_162760:: @ 8162760 - setvar 0x40ae, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_4_STATE, 1 goto Route110_TrickHousePuzzle4_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 695c532cf..5fedee3a9 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -13,13 +13,13 @@ Route110_TrickHousePuzzle5_MapScript1_1627B6:: @ 81627B6 Route110_TrickHousePuzzle5_EventScript_1627D5:: @ 81627D5 lockall - compare 0x40af, 0 + compare VAR_TRICK_HOUSE_PUZZLE_5_STATE, 0 goto_if_eq Route110_TrickHousePuzzle5_EventScript_1627E7 goto Route110_TrickHousePuzzle5_EventScript_161892 end Route110_TrickHousePuzzle5_EventScript_1627E7:: @ 81627E7 - setvar 0x40af, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_5_STATE, 1 goto Route110_TrickHousePuzzle5_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle6.inc b/data/scripts/maps/Route110_TrickHousePuzzle6.inc index 917b9483b..971d2a275 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle6.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle6.inc @@ -17,13 +17,13 @@ Route110_TrickHousePuzzle6_EventScript_1630E6:: @ 81630E6 Route110_TrickHousePuzzle6_EventScript_1630EA:: @ 81630EA lockall - compare 0x40b0, 0 + compare VAR_TRICK_HOUSE_PUZZLE_6_STATE, 0 goto_if_eq Route110_TrickHousePuzzle6_EventScript_1630FC goto Route110_TrickHousePuzzle6_EventScript_161892 end Route110_TrickHousePuzzle6_EventScript_1630FC:: @ 81630FC - setvar 0x40b0, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_6_STATE, 1 goto Route110_TrickHousePuzzle6_EventScript_16189C end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 4ff925639..66aa8b5e7 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -73,7 +73,7 @@ Route110_TrickHousePuzzle7_EventScript_163240:: @ 8163240 return Route110_TrickHousePuzzle7_MapScript1_163253:: @ 8163253 - compare 0x40b6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16326E clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 clearflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -86,33 +86,33 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E end Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F - compare 0x40b6, 1 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B - map_script_2 0x40b6, 1, Route110_TrickHousePuzzle7_EventScript_163285 + map_script_2 VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1, Route110_TrickHousePuzzle7_EventScript_163285 .2byte 0 Route110_TrickHousePuzzle7_EventScript_163285:: @ 8163285 - setvar 0x40b6, 0 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 0 end Route110_TrickHousePuzzle7_EventScript_16328B:: @ 816328B lockall - compare 0x40b1, 0 + compare VAR_TRICK_HOUSE_PUZZLE_7_STATE, 0 goto_if_eq Route110_TrickHousePuzzle7_EventScript_16329D goto Route110_TrickHousePuzzle7_EventScript_161892 end Route110_TrickHousePuzzle7_EventScript_16329D:: @ 816329D - setvar 0x40b1, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE, 1 goto Route110_TrickHousePuzzle7_EventScript_16189C end Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 lockall - setvar 0x40b6, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 warpteleport MAP_ROUTE110_TRICK_HOUSE_PUZZLE7, 255, 3, 19 waitstate releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle8.inc b/data/scripts/maps/Route110_TrickHousePuzzle8.inc index 5f0b00684..2c55aae4c 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle8.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle8.inc @@ -3,13 +3,13 @@ Route110_TrickHousePuzzle8_MapScripts:: @ 816341B Route110_TrickHousePuzzle8_EventScript_16341C:: @ 816341C lockall - compare 0x40b2, 0 + compare VAR_TRICK_HOUSE_PUZZLE_8_STATE, 0 goto_if_eq Route110_TrickHousePuzzle8_EventScript_16342E goto Route110_TrickHousePuzzle8_EventScript_161892 end Route110_TrickHousePuzzle8_EventScript_16342E:: @ 816342E - setvar 0x40b2, 1 + setvar VAR_TRICK_HOUSE_PUZZLE_8_STATE, 1 goto Route110_TrickHousePuzzle8_EventScript_16189C end diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index d0d464207..f38a296e7 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -4,7 +4,7 @@ Route112_MapScripts:: @ 8150502 Route112_MapScript1_150508:: @ 8150508 call Route112_EventScript_1A0196 - setvar 0x40bd, 0 + setvar VAR_JAGGED_PASS_ASH_WEATHER, 0 end Route112_EventScript_150513:: @ 8150513 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index d414ca8ed..9c572c0ca 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -5,7 +5,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E setescapewarp MAP_ROUTE112, 255, 28, 28 - compare 0x40a3, 2 + compare VAR_CABLE_CAR_STATION_STATE, 2 call_if 1, Route112_CableCarStation_EventScript_15C052 end @@ -15,7 +15,7 @@ Route112_CableCarStation_EventScript_15C052:: @ 815C052 return Route112_CableCarStation_MapScript2_15C05E:: @ 815C05E - map_script_2 0x40a3, 2, Route112_CableCarStation_EventScript_15C068 + map_script_2 VAR_CABLE_CAR_STATION_STATE, 2, Route112_CableCarStation_EventScript_15C068 .2byte 0 Route112_CableCarStation_EventScript_15C068:: @ 815C068 @@ -23,7 +23,7 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 applymovement 255, Route112_CableCarStation_Movement_15C0F5 applymovement 1, Route112_CableCarStation_Movement_15C0EB waitmovement 0 - setvar 0x40a3, 0 + setvar VAR_CABLE_CAR_STATION_STATE, 0 setobjectxyperm 1, 6, 7 setobjectmovementtype 1, 8 releaseall @@ -46,7 +46,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 setvar 0x8004, 0 - setvar 0x40a3, 1 + setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp special sub_8123218 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 8d853b88d..3424fbb6f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -4,26 +4,26 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag FLAG_LANDMARK_GLASS_WORKSHOP - compare 0x40be, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 call_if 1, Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 return Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer - compare 0x40be, 10 + compare VAR_GLASS_WORKSHOP_STATE, 10 goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 - compare 0x40be, 2 + compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 - compare 0x40be, 1 + compare VAR_GLASS_WORKSHOP_STATE, 1 goto_if_eq Route113_GlassWorkshop_EventScript_1635AB msgbox Route113_GlassWorkshop_Text_19E4E6, 4 giveitem_std ITEM_SOOT_SACK - setvar 0x40be, 1 + setvar VAR_GLASS_WORKSHOP_STATE, 1 msgbox Route113_GlassWorkshop_Text_19E59B, 4 release end @@ -38,7 +38,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 - compare 0x4048, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waitmessage @@ -70,13 +70,13 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar 0x8008, 39 bufferitemname 0, 0x8008 setvar 0x800a, 250 - compare 0x4048, 250 + compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 10 - subvar 0x4048, 250 + setvar VAR_GLASS_WORKSHOP_STATE, 10 + subvar VAR_ASH_GATHER_COUNT, 250 goto Route113_GlassWorkshop_EventScript_163851 end @@ -84,13 +84,13 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar 0x8008, 40 bufferitemname 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 11 - subvar 0x4048, 500 + setvar VAR_GLASS_WORKSHOP_STATE, 11 + subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_163851 end @@ -98,13 +98,13 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar 0x8008, 41 bufferitemname 0, 0x8008 setvar 0x800a, 500 - compare 0x4048, 500 + compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 12 - subvar 0x4048, 500 + setvar VAR_GLASS_WORKSHOP_STATE, 12 + subvar VAR_ASH_GATHER_COUNT, 500 goto Route113_GlassWorkshop_EventScript_163851 end @@ -112,13 +112,13 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar 0x8008, 43 bufferitemname 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 13 - subvar 0x4048, 1000 + setvar VAR_GLASS_WORKSHOP_STATE, 13 + subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -126,13 +126,13 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar 0x8008, 42 bufferitemname 0, 0x8008 setvar 0x800a, 1000 - compare 0x4048, 1000 + compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 14 - subvar 0x4048, 1000 + setvar VAR_GLASS_WORKSHOP_STATE, 14 + subvar VAR_ASH_GATHER_COUNT, 1000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -141,13 +141,13 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar 0x8008, 13 bufferdecorationname 0, 0x8008 setvar 0x800a, 6000 - compare 0x4048, 6000 + compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 15 - subvar 0x4048, 6000 + setvar VAR_GLASS_WORKSHOP_STATE, 15 + subvar VAR_ASH_GATHER_COUNT, 6000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -156,13 +156,13 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar 0x8008, 6 bufferdecorationname 0, 0x8008 setvar 0x800a, 8000 - compare 0x4048, 8000 + compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_163845 - setvar 0x40be, 16 - subvar 0x4048, 8000 + setvar VAR_GLASS_WORKSHOP_STATE, 16 + subvar VAR_ASH_GATHER_COUNT, 8000 goto Route113_GlassWorkshop_EventScript_163851 end @@ -205,7 +205,7 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -234,7 +234,7 @@ Route113_GlassWorkshop_EventScript_1638C3:: @ 81638C3 end Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 - switch 0x40be + switch VAR_GLASS_WORKSHOP_STATE case 10, Route113_GlassWorkshop_EventScript_163925 case 11, Route113_GlassWorkshop_EventScript_163939 case 12, Route113_GlassWorkshop_EventScript_16394D @@ -299,7 +299,7 @@ Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 call_if 1, Route113_GlassWorkshop_EventScript_163889 compare 0x8009, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 - setvar 0x40be, 2 + setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 9aadedb32..b1b331d00 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -130,7 +130,7 @@ Route116_EventScript_150B5D:: @ 8150B5D lock faceplayer msgbox Route116_Text_17032A, 4 - setvar 0x406f, 2 + setvar VAR_ROUTE116_STATE, 2 release end @@ -140,7 +140,7 @@ Route116_EventScript_150B6E:: @ 8150B6E applymovement 255, Route116_Movement_1A083F waitmovement 0 msgbox Route116_Text_17032A, 4 - setvar 0x406f, 2 + setvar VAR_ROUTE116_STATE, 2 releaseall end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index ca69e01c4..bc2ab0a51 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -89,7 +89,7 @@ Route118_EventScript_151004:: @ 8151004 call_if 1, Route118_EventScript_151053 compare 0x8008, 2 call_if 1, Route118_EventScript_15105E - setvar 0x4071, 1 + setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall end diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 954be6f21..ca9acd2d5 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -27,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A014E call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 - compare 0x40b3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_EventScript_1511B9 special SetRoute119Weather end @@ -35,7 +35,7 @@ Route119_MapScript1_15119B:: @ 815119B Route119_EventScript_1511B9:: @ 81511B9 setflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_1F - setvar 0x40b3, 2 + setvar VAR_WEATHER_INSTITUTE_STATE, 2 return Route119_EventScript_1511C5:: @ 81511C5 @@ -89,7 +89,7 @@ Route119_EventScript_151259:: @ 8151259 Route119_EventScript_15125E:: @ 815125E msgbox Route119_Text_1710BB, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route119_EventScript_15128D case 1, Route119_EventScript_15129D case 2, Route119_EventScript_1512AD @@ -119,7 +119,7 @@ Route119_EventScript_1512BD:: @ 81512BD Route119_EventScript_1512D8:: @ 81512D8 msgbox Route119_Text_171358, 4 - switch 0x4023 + switch VAR_STARTER_MON case 0, Route119_EventScript_151307 case 1, Route119_EventScript_151317 case 2, Route119_EventScript_151327 @@ -166,7 +166,7 @@ Route119_EventScript_151362:: @ 8151362 compare VAR_TEMP_1, 2 call_if 1, Route119_EventScript_1513C7 removeobject 25 - setvar 0x4072, 1 + setvar VAR_ROUTE119_STATE, 1 savebgm 0 fadedefaultbgm releaseall diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 3dc9672e3..8a5c1033f 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -4,7 +4,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 end @@ -17,7 +17,7 @@ Route119_WeatherInstitute_1F_EventScript_163C4D:: @ 8163C4D lock faceplayer special GetPlayerBigGuyGirlString - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 goto_if_eq Route119_WeatherInstitute_1F_EventScript_163C67 msgbox Route119_WeatherInstitute_1F_Text_19ED22, 4 release diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 991725b8c..50f453465 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -4,9 +4,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 - compare 0x40b3, 0 + compare VAR_WEATHER_INSTITUTE_STATE, 0 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 - compare 0x40b3, 1 + compare VAR_WEATHER_INSTITUTE_STATE, 1 call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 end @@ -38,7 +38,7 @@ Route119_WeatherInstitute_2F_EventScript_163D2A:: @ 8163D2A Route119_WeatherInstitute_2F_EventScript_163D45:: @ 8163D45 msgbox Route119_WeatherInstitute_2F_Text_19F11B, 4 closemessage - setvar 0x40b3, 1 + setvar VAR_WEATHER_INSTITUTE_STATE, 1 clearflag FLAG_HIDE_WEATHER_INSTITUTE_WORKERS_2F fadedefaultbgm fadescreen 1 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index 39443d2f9..d1f153117 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -29,7 +29,7 @@ Route121_EventScript_151B25:: @ 8151B25 removeobject 12 removeobject 13 removeobject 14 - setvar 0x4074, 1 + setvar VAR_ROUTE121_STATE, 1 releaseall end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 431444dae..6235e3b1c 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -3,7 +3,7 @@ Route121_SafariZoneEntrance_MapScripts:: @ 815C323 .byte 0 Route121_SafariZoneEntrance_MapScript2_15C329:: @ 815C329 - map_script_2 0x40a4, 1, Route121_SafariZoneEntrance_EventScript_15C333 + map_script_2 VAR_SAFARI_ZONE_STATE, 1, Route121_SafariZoneEntrance_EventScript_15C333 .2byte 0 Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 @@ -11,7 +11,7 @@ Route121_SafariZoneEntrance_EventScript_15C333:: @ 815C333 applymovement 255, Route121_SafariZoneEntrance_Movement_15C348 waitmovement 0 special ExitSafariMode - setvar 0x40a4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end @@ -81,7 +81,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 applymovement 255, Route121_SafariZoneEntrance_Movement_15C47E waitmovement 0 special EnterSafariMode - setvar 0x40a4, 2 + setvar VAR_SAFARI_ZONE_STATE, 2 warp MAP_SAFARI_ZONE_SOUTHEAST, 255, 32, 33 waitstate end diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index a81e73c3e..7a08d0acb 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -10,7 +10,7 @@ Route128_MapScript1_152126:: @ 8152126 end Route128_MapScript2_152135:: @ 8152135 - map_script_2 0x407b, 1, Route128_EventScript_15213F + map_script_2 VAR_ROUTE128_STATE, 1, Route128_EventScript_15213F .2byte 0 Route128_EventScript_15213F:: @ 815213F @@ -82,7 +82,7 @@ Route128_EventScript_15213F:: @ 815213F delay 15 removeobject 3 waitfieldeffect 30 - setvar 0x407b, 2 + setvar VAR_ROUTE128_STATE, 2 releaseall end diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 831cffaea..efe390f8a 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -180,9 +180,9 @@ RustboroCity_EventScript_14C4F4:: @ 814C4F4 setobjectxyperm 9, 30, 10 clearflag FLAG_HIDE_DEVON_RUSTBORO setflag FLAG_DEVON_GOODS_STOLEN - setvar 0x405a, 2 - setvar 0x409a, 2 - setvar 0x406f, 1 + setvar VAR_RUSTBORO_STATE, 2 + setvar VAR_RUSTURF_TUNNEL_STATE, 2 + setvar VAR_ROUTE116_STATE, 1 clearflag FLAG_HIDE_BRINEY_ROUTE116 clearflag FLAG_HIDE_PEEKO_RUSTURF_TUNNEL clearflag FLAG_HIDE_GRUNT_RUSTURF_TUNNEL @@ -372,7 +372,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 compare VAR_TEMP_1, 3 call_if 1, RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F - setvar 0x405a, 3 + setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 msgbox RustboroCity_Text_166EA5, 4 releaseall @@ -475,7 +475,7 @@ RustboroCity_EventScript_14C77D:: @ 814C77D closemessage setflag FLAG_RETURNED_DEVON_GOODS setflag FLAG_HIDE_DEVON_RUSTBORO - setvar 0x405a, 5 + setvar VAR_RUSTBORO_STATE, 5 delay 30 warp MAP_RUSTBORO_CITY_DEVON_CORP_3F, 255, 2, 2 waitstate diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 89d59258d..71fc9731d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -3,18 +3,18 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA .byte 0 RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC - setvar 0x40c4, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 2 return RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag FLAG_MET_DEVON_EMPLOYEE goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 @@ -39,7 +39,7 @@ RustboroCity_DevonCorp_2F_EventScript_157519:: @ 8157519 RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC checkflag FLAG_RECEIVED_POKENAV goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 @@ -55,7 +55,7 @@ RustboroCity_DevonCorp_2F_EventScript_157543:: @ 8157543 RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release @@ -64,9 +64,9 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 lock faceplayer - compare 0x40c4, 2 + compare VAR_FOSSIL_RESURRECTION_STATE, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_15764A - compare 0x40c4, 1 + compare VAR_FOSSIL_RESURRECTION_STATE, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157640 msgbox RustboroCity_DevonCorp_2F_Text_182ED5, 4 checkitem ITEM_ROOT_FOSSIL, 1 @@ -91,8 +91,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 takeitem ITEM_ROOT_FOSSIL, 1 - setvar 0x40c4, 1 - setvar 0x40c5, 1 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 1 release end @@ -109,8 +109,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 takeitem ITEM_CLAW_FOSSIL, 1 - setvar 0x40c4, 1 - setvar 0x40c5, 2 + setvar VAR_FOSSIL_RESURRECTION_STATE, 1 + setvar VAR_WHICH_FOSSIL_REVIVED, 2 release end @@ -125,9 +125,9 @@ RustboroCity_DevonCorp_2F_EventScript_157640:: @ 8157640 end RustboroCity_DevonCorp_2F_EventScript_15764A:: @ 815764A - compare 0x40c5, 1 + compare VAR_WHICH_FOSSIL_REVIVED, 1 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157661 - compare 0x40c5, 2 + compare VAR_WHICH_FOSSIL_REVIVED, 2 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_1576B4 end @@ -138,7 +138,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT - setvar 0x40c4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E @@ -158,7 +158,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 copyvar 0x8004, RESULT - setvar 0x40c4, 0 + setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 message RustboroCity_DevonCorp_2F_Text_18319E diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index e2e70d4c0..af5d5d6ee 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -5,7 +5,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 .byte 0 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 - compare 0x408f, 0 + compare VAR_DEVON_CORP_3F_STATE, 0 call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D end @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D return RustboroCity_DevonCorp_3F_MapScript2_157739:: @ 8157739 - map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157743 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157743 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 @@ -23,7 +23,7 @@ RustboroCity_DevonCorp_3F_EventScript_157743:: @ 8157743 end RustboroCity_DevonCorp_3F_MapScript2_157748:: @ 8157748 - map_script_2 0x408f, 0, RustboroCity_DevonCorp_3F_EventScript_157752 + map_script_2 VAR_DEVON_CORP_3F_STATE, 0, RustboroCity_DevonCorp_3F_EventScript_157752 .2byte 0 RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 @@ -62,9 +62,9 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 clearflag FLAG_HIDE_GIRLFRIEND_RUSTURF_TUNNEL clearflag FLAG_HIDE_MR_BRINEY_ROUTE104_HOUSE clearflag FLAG_HIDE_PEEKO_BRINEY_HOUSE - setvar 0x4096, 1 + setvar VAR_BRINEY_LOCATION, 1 clearflag FLAG_HIDE_RIVAL_RUSTBORO - setvar 0x408f, 1 + setvar VAR_DEVON_CORP_3F_STATE, 1 releaseall end diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 0dc403ec7..7ed47d35c 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -16,11 +16,11 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE msgbox RustboroCity_Gym_Text_1840D5, 4 setflag FLAG_DEFEATED_RUSTBORO_GYM setflag FLAG_BADGE01_GET - setvar 0x405a, 1 - addvar 0x4085, 1 + setvar VAR_RUSTBORO_STATE, 1 + addvar VAR_PETALBURG_GYM_STATE, 1 setvar 0x8008, 1 call RustboroCity_Gym_EventScript_1A01C0 - compare 0x4085, 6 + compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 0063564a3..d50e7cec0 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -4,13 +4,13 @@ RusturfTunnel_MapScripts:: @ 815C745 .byte 0 RusturfTunnel_MapScript2_15C750:: @ 815C750 - map_script_2 0x409a, 4, RusturfTunnel_EventScript_15C7D1 - map_script_2 0x409a, 5, RusturfTunnel_EventScript_15C7D1 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 4, RusturfTunnel_EventScript_15C7D1 + map_script_2 VAR_RUSTURF_TUNNEL_STATE, 5, RusturfTunnel_EventScript_15C7D1 .2byte 0 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 - compare 0x409a, 2 + compare VAR_RUSTURF_TUNNEL_STATE, 2 call_if 1, RusturfTunnel_EventScript_15C773 end @@ -286,7 +286,7 @@ RusturfTunnel_EventScript_15C9AB:: @ 815C9AB waitmovement 0 moveobjectoffscreen 6 moveobjectoffscreen 7 - setvar 0x409a, 3 + setvar VAR_RUSTURF_TUNNEL_STATE, 3 releaseall end @@ -343,8 +343,8 @@ RusturfTunnel_EventScript_15C9EA:: @ 815C9EA removeobject 7 clearflag FLAG_DEVON_GOODS_STOLEN setflag FLAG_RECOVERED_DEVON_GOODS - setvar 0x405a, 4 - setvar 0x4090, 1 + setvar VAR_RUSTBORO_STATE, 4 + setvar VAR_BRINEY_HOUSE_STATE, 1 setflag FLAG_HIDE_BRINEY_ROUTE116 release end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index 8e9a404a2..fc018a7b9 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -3,15 +3,15 @@ SSTidalCorridor_MapScripts:: @ 815FC94 .byte 0 SSTidalCorridor_MapScript2_15FC9A:: @ 815FC9A - map_script_2 0x40b4, 1, SSTidalCorridor_EventScript_15FCBC - map_script_2 0x40b4, 5, SSTidalCorridor_EventScript_15FCD2 - map_script_2 0x40b4, 9, SSTidalCorridor_EventScript_15FD24 - map_script_2 0x40b4, 10, SSTidalCorridor_EventScript_15FD3A + map_script_2 VAR_PORTHOLE_STATE, 1, SSTidalCorridor_EventScript_15FCBC + map_script_2 VAR_PORTHOLE_STATE, 5, SSTidalCorridor_EventScript_15FCD2 + map_script_2 VAR_PORTHOLE_STATE, 9, SSTidalCorridor_EventScript_15FD24 + map_script_2 VAR_PORTHOLE_STATE, 10, SSTidalCorridor_EventScript_15FD3A .2byte 0 SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag - setvar 0x40b4, 2 + setvar VAR_PORTHOLE_STATE, 2 lockall playse 73 msgbox SSTidalCorridor_Text_199007, 4 @@ -19,7 +19,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC end SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 - setvar 0x40b4, 6 + setvar VAR_PORTHOLE_STATE, 6 lockall playse 73 msgbox SSTidalCorridor_Text_199088, 4 @@ -28,28 +28,28 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag - setvar 0x40b4, 7 + setvar VAR_PORTHOLE_STATE, 7 playse 73 msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag - setvar 0x40b4, 4 + setvar VAR_PORTHOLE_STATE, 4 playse 73 msgbox SSTidalRooms_Text_1990F8, 4 return gUnknown_0815FD0D:: @ 815FD0D - compare 0x40B4, 2 + compare VAR_PORTHOLE_STATE, 2 goto_if_eq SSTidalCorridor_EventScript_15FD24 - compare 0x40B4, 7 + compare VAR_PORTHOLE_STATE, 7 goto_if_eq SSTidalCorridor_EventScript_15FD3A end SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag - setvar 0x40b4, 3 + setvar VAR_PORTHOLE_STATE, 3 lockall playse 73 msgbox SSTidalCorridor_Text_199088, 4 @@ -58,7 +58,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag - setvar 0x40b4, 8 + setvar VAR_PORTHOLE_STATE, 8 lockall playse 73 msgbox SSTidalCorridor_Text_1990B4, 4 @@ -67,13 +67,13 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag - setvar 0x40b4, 8 + setvar VAR_PORTHOLE_STATE, 8 playse 73 msgbox SSTidalRooms_Text_1990B4, 4 return SSTidalRooms_EventScript_15FD64:: @ 815FD64 - switch 0x40b4 + switch VAR_PORTHOLE_STATE case 2, SSTidalRooms_EventScript_15FCF9 case 3, SSTidalRooms_EventScript_15FCF9 case 6, SSTidalRooms_EventScript_15FCE5 @@ -113,9 +113,9 @@ SSTidalCorridor_EventScript_15FDCD:: @ 815FDCD SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 lock faceplayer - compare 0x40b4, 4 + compare VAR_PORTHOLE_STATE, 4 goto_if_eq SSTidalCorridor_EventScript_15FDF8 - compare 0x40b4, 8 + compare VAR_PORTHOLE_STATE, 8 goto_if_eq SSTidalCorridor_EventScript_15FE17 msgbox SSTidalCorridor_Text_19913B, 4 release @@ -147,9 +147,9 @@ SSTidalCorridor_EventScript_15FE36:: @ 815FE36 SSTidalCorridor_EventScript_15FE3A:: @ 815FE3A lockall - compare 0x40b4, 2 + compare VAR_PORTHOLE_STATE, 2 goto_if_eq SSTidalCorridor_EventScript_15FE5B - compare 0x40b4, 7 + compare VAR_PORTHOLE_STATE, 7 goto_if_eq SSTidalCorridor_EventScript_15FE5B msgbox SSTidalCorridor_Text_199268, 4 releaseall diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index d11fc16d3..2dbd716cb 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -4,7 +4,7 @@ SafariZone_Southeast_MapScripts:: @ 8160036 .byte 0 SafariZone_Southeast_MapScript2_160041:: @ 8160041 - map_script_2 0x40a4, 2, SafariZone_Southeast_EventScript_16004B + map_script_2 VAR_SAFARI_ZONE_STATE, 2, SafariZone_Southeast_EventScript_16004B .2byte 0 SafariZone_Southeast_EventScript_16004B:: @ 816004B @@ -15,12 +15,12 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B applymovement 1, SafariZone_Southeast_Movement_160089 waitmovement 0 setobjectxyperm 1, 32, 34 - setvar 0x40a4, 0 + setvar VAR_SAFARI_ZONE_STATE, 0 releaseall end SafariZone_Southeast_MapScript1_160073:: @ 8160073 - compare 0x40a4, 2 + compare VAR_SAFARI_ZONE_STATE, 2 call_if 1, SafariZone_Southeast_EventScript_16007F end @@ -92,7 +92,7 @@ SafariZone_Southeast_EventScript_16011F:: @ 816011F end SafariZone_Southeast_EventScript_160139:: @ 8160139 - setvar 0x40a4, 1 + setvar VAR_SAFARI_ZONE_STATE, 1 special ExitSafariMode warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5 waitstate diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index b31e8fc25..f9bf888e2 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -191,20 +191,20 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4ECA, 4 .endif - setvar 0x407b, 1 + setvar VAR_ROUTE128_STATE, 1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 clearflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 clearflag FLAG_HIDE_WALLACE_SOOTOPOLIS clearflag FLAG_HIDE_STEVEN_SOOTOPOLIS - setvar 0x405e, 1 + setvar VAR_SOOTOPOLIS_STATE, 1 clearflag FLAG_HIDE_EVIL_LEADER_ROUTE128 clearflag FLAG_HIDE_OTHER_LEADER_ROUTE128 setflag FLAG_SYS_WEATHER_CTRL setflag FLAG_HIDE_SOOTOPOLIS_RESIDENTS setflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN setflag FLAG_HIDE_STEVEN_STEVENS_HOUSE - setvar 0x40c6, 1 - setvar 0x40a2, 1 + setvar VAR_STEVENS_HOUSE_STATE, 1 + setvar VAR_SEAFLOOR_CAVERN_STATE, 1 setflag FLAG_HIDE_EVIL_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_LEADER_SEAFLOOR_CAVERN setflag FLAG_HIDE_OTHER_TEAM_GRUNTS_SEAFLOOR_CAVERN diff --git a/data/scripts/maps/SecretBase_YellowCave4.inc b/data/scripts/maps/SecretBase_YellowCave4.inc index f72c3d76e..bb673b7b6 100644 --- a/data/scripts/maps/SecretBase_YellowCave4.inc +++ b/data/scripts/maps/SecretBase_YellowCave4.inc @@ -19,5 +19,5 @@ SecretBase_RedCave1_MapScript2_15F358:: @ 815F358 .2byte 0 SecretBase_RedCave1_MapScript2_15F362:: @ 815F362 - map_script_2 0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE + map_script_2 VAR_0x4097, 0, SecretBase_RedCave1_EventScript_1A2DDE .2byte 0 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 796775aa2..4079763a3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -10,15 +10,15 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar VAR_OBJ_GFX_ID_0, MAP_OBJ_GFX_MAGMA_MEMBER_F setvar VAR_OBJ_GFX_ID_1, MAP_OBJ_GFX_MAGMA_MEMBER_M .endif - setvar 0x40aa, 0 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C setflag FLAG_VISITED_SLATEPORT_CITY - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_SLATEPORT return @@ -95,7 +95,7 @@ SlateportCity_EventScript_14BB35:: @ 814BB35 SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release @@ -109,7 +109,7 @@ SlateportCity_EventScript_14BB56:: @ 814BB56 SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release @@ -123,7 +123,7 @@ SlateportCity_EventScript_14BB77:: @ 814BB77 SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BBA1 checkflag FLAG_RECEIVED_SECRET_POWER goto_if_eq SlateportCity_EventScript_14BBAB @@ -144,7 +144,7 @@ SlateportCity_EventScript_14BBAB:: @ 814BBAB SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release @@ -156,7 +156,7 @@ SlateportCity_EventScript_14BBCC:: @ 814BBCC end SlateportCity_EventScript_14BBD6:: @ 814BBD6 - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 goto_if_eq SlateportCity_EventScript_14BBEA msgbox SlateportCity_Text_164AA9, 2 end @@ -168,7 +168,7 @@ SlateportCity_EventScript_14BBEA:: @ 814BBEA SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release @@ -253,7 +253,7 @@ SlateportCity_EventScript_14BCAF:: @ 814BCAF SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer - compare 0x4058, 1 + compare VAR_SLATEPORT_STATE, 1 call_if 1, SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release @@ -537,7 +537,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC clearflag FLAG_HIDE_SUBMARINE_SHADOW_SLATEPORT_HARBOR clearflag FLAG_HIDE_GRUNT_1_SLATEPORT_HARBOR clearflag FLAG_HIDE_GRUNT_2_SLATEPORT_HARBOR - setvar 0x4058, 2 + setvar VAR_SLATEPORT_STATE, 2 warp MAP_SLATEPORT_CITY_HARBOR, 255, 11, 14 waitstate releaseall diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index c4a44d9c9..0e64282e4 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -13,7 +13,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D call SlateportCity_ContestLobby_EventScript_155448 special sub_80C4BF0 call SlateportCity_ContestLobby_EventScript_15FBDB - setvar 0x4088, 3 + setvar VAR_CONTEST_LOCATION, 3 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 5d7a38401..c13dbaf9c 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -5,7 +5,7 @@ SlateportCity_Harbor_MapScripts:: @ 8155F5D SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 - compare 0x40a0, 1 + compare VAR_SLATEPORT_HARBOR_STATE, 1 call_if 1, SlateportCity_Harbor_EventScript_155F89 checkflag FLAG_SYS_GAME_CLEAR call_if 1, SlateportCity_Harbor_EventScript_155F85 @@ -62,7 +62,7 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 6 removeobject 7 removeobject 8 - setvar 0x40a0, 2 + setvar VAR_SLATEPORT_HARBOR_STATE, 2 compare 0x8008, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C compare 0x8008, 1 @@ -193,7 +193,7 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F msgbox SlateportCity_Harbor_Text_17FB81, 5 compare RESULT, 0 goto_if_eq SlateportCity_Harbor_EventScript_15618A - setvar 0x40b4, 1 + setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_156196 warp MAP_SS_TIDAL_CORRIDOR, 255, 1, 10 waitstate @@ -274,7 +274,7 @@ SlateportCity_Harbor_EventScript_156211:: @ 8156211 goto_if_eq SlateportCity_Harbor_EventScript_156265 checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE goto_if_eq SlateportCity_Harbor_EventScript_156258 - compare 0x40a0, 2 + compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 98d2160a8..abbe3f78f 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -51,7 +51,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D updatemoneybox 0, 0 nop msgbox SlateportCity_OceanicMuseum_1F_Text_17E1DE, 4 - setvar 0x40aa, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end @@ -69,7 +69,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A SlateportCity_OceanicMuseum_1F_EventScript_155B7B:: @ 8155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E22D, 4 - setvar 0x40aa, 1 + setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 1 hidemoneybox 0, 0 releaseall end diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 40b410f77..6e7d2614b 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonFanClub_MapScript1_15576A:: @ 815576A SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B lock faceplayer - switch 0x40b7 + switch VAR_SLATEPORT_FAN_CLUB_STATE case 0, SlateportCity_PokemonFanClub_EventScript_155795 case 1, SlateportCity_PokemonFanClub_EventScript_1557A8 case 2, SlateportCity_PokemonFanClub_EventScript_1557FE @@ -16,7 +16,7 @@ SlateportCity_PokemonFanClub_EventScript_15576B:: @ 815576B end SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 - setvar 0x40b7, 1 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 1 msgbox SlateportCity_PokemonFanClub_Text_17D773, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 end @@ -35,7 +35,7 @@ SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 compare VAR_TEMP_2, 5 call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D - compare 0x40b7, 2 + compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 goto SlateportCity_PokemonFanClub_EventScript_155808 @@ -71,7 +71,7 @@ SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 end SlateportCity_PokemonFanClub_EventScript_15588D:: @ 815588D - setvar 0x40b7, 2 + setvar VAR_SLATEPORT_FAN_CLUB_STATE, 2 return SlateportCity_PokemonFanClub_EventScript_155893:: @ 8155893 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index f4842bd40..e29700981 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -45,7 +45,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 call SootopolisCity_EventScript_1A02C1 setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 - compare 0x405e, 1 + compare VAR_SOOTOPOLIS_STATE, 1 call_if 1, SootopolisCity_EventScript_14D142 return @@ -288,7 +288,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 setobjectmovementtype 5, 9 moveobjectoffscreen 10 setobjectmovementtype 10, 10 - setvar 0x405e, 2 + setvar VAR_SOOTOPOLIS_STATE, 2 releaseall end diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 65ed13d87..90748bbf5 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -6,7 +6,7 @@ SootopolisCity_Gym_1F_MapScripts:: @ 815AF07 .byte 0 SootopolisCity_Gym_1F_MapScript1_15AF1C:: @ 815AF1C - setvar 0x4022, 1 + setvar VAR_ICE_STEP_COUNT, 1 end SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 @@ -19,11 +19,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E - compare 0x4022, 8 + compare VAR_ICE_STEP_COUNT, 8 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 - compare 0x4022, 28 + compare VAR_ICE_STEP_COUNT, 28 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 - compare 0x4022, 69 + compare VAR_ICE_STEP_COUNT, 69 goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -40,14 +40,14 @@ SootopolisCity_Gym_1F_EventScript_15AF85:: @ 815AF85 return SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 - map_script_2 0x4022, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 - map_script_2 0x4022, 28, SootopolisCity_Gym_1F_EventScript_15AFBC - map_script_2 0x4022, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 - map_script_2 0x4022, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 + map_script_2 VAR_ICE_STEP_COUNT, 8, SootopolisCity_Gym_1F_EventScript_15AFA8 + map_script_2 VAR_ICE_STEP_COUNT, 28, SootopolisCity_Gym_1F_EventScript_15AFBC + map_script_2 VAR_ICE_STEP_COUNT, 69, SootopolisCity_Gym_1F_EventScript_15AFD0 + map_script_2 VAR_ICE_STEP_COUNT, 0, SootopolisCity_Gym_1F_EventScript_15AFE4 .2byte 0 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E @@ -55,7 +55,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 end SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E @@ -63,7 +63,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC end SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 - addvar 0x4022, 1 + addvar VAR_ICE_STEP_COUNT, 1 delay 40 playse 40 call SootopolisCity_Gym_1F_EventScript_15AF2E diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index 6c25c34c5..e2afd07dc 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -55,11 +55,11 @@ LinkContestRoom1_EventScript_15F600:: @ 815F600 return LinkContestRoom1_MapScript2_15F606:: @ 815F606 - map_script_2 0x4086, 1, LinkContestRoom1_EventScript_15F61A + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F61A .2byte 0 LinkContestRoom1_MapScript2_15F610:: @ 815F610 - map_script_2 0x4086, 1, LinkContestRoom1_EventScript_15F625 + map_script_2 VAR_LINK_CONTEST_ROOM_STATE, 1, LinkContestRoom1_EventScript_15F625 .2byte 0 LinkContestRoom1_EventScript_15F61A:: @ 815F61A @@ -293,7 +293,7 @@ LinkContestRoom1_EventScript_15F913:: @ 815F913 return LinkContestRoom1_EventScript_15F919:: @ 815F919 - switch 0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_15F956 case 2, LinkContestRoom1_EventScript_15F969 case 3, LinkContestRoom1_EventScript_15F9C4 @@ -372,7 +372,7 @@ LinkContestRoom1_EventScript_15FA70:: @ 815FA70 return LinkContestRoom1_EventScript_15FB64:: @ 815FB64 - switch 0x4088 + switch VAR_CONTEST_LOCATION case 1, LinkContestRoom1_EventScript_15FBA1 case 2, LinkContestRoom1_EventScript_15FBAD case 3, LinkContestRoom1_EventScript_15FBB9 diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index b9e9b85a5..ca2a3c245 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -4,7 +4,7 @@ VerdanturfTown_MapScripts:: @ 814E854 VerdanturfTown_MapScript1_14E85A:: @ 814E85A setflag FLAG_VISITED_VERDANTURF_TOWN - setvar 0x4086, 0 + setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_VERDANTURF end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 3694f089d..11568ad22 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -13,7 +13,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 call VerdanturfTown_ContestLobby_EventScript_153DA1 special sub_80C4BF0 call VerdanturfTown_ContestLobby_EventScript_15FBDB - setvar 0x4088, 1 + setvar VAR_CONTEST_LOCATION, 1 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 waitstate end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index 7e48d3d90..a206d5531 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -44,7 +44,7 @@ VictoryRoad_1F_EventScript_15DED3:: @ 815DED3 clearflag FLAG_HIDE_WALLY_BATTLE_VICTORY_ROAD moveobjectoffscreen 4 setflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - setvar 0x40c3, 1 + setvar VAR_VICTORY_ROAD_1F_STATE, 1 releaseall end -- cgit v1.2.3 From 1c8b05e7b059a98d4259f4129896d0cc1eaa3847 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 10:11:43 -0600 Subject: Name and use constants for special vars --- data/scripts/maps/AquaHideout_B2F.inc | 32 ++-- data/scripts/maps/BattleTower_BattleRoom.inc | 30 ++-- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 68 ++++---- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/DewfordTown.inc | 8 +- data/scripts/maps/DewfordTown_Gym.inc | 28 ++-- data/scripts/maps/DewfordTown_Hall.inc | 12 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 6 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 24 +-- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 16 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 20 +-- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 4 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 4 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 32 ++-- data/scripts/maps/LittlerootTown.inc | 120 +++++++------- .../maps/LittlerootTown_BrendansHouse_1F.inc | 14 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 14 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 4 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 24 +-- data/scripts/maps/MauvilleCity_Gym.inc | 14 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 38 ++--- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House3.inc | 24 +-- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 24 +-- data/scripts/maps/PetalburgCity_Gym.inc | 172 ++++++++++----------- .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 24 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 18 +-- data/scripts/maps/Route111.inc | 16 +- .../maps/Route111_WinstrateFamilysHouse.inc | 10 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 104 ++++++------- data/scripts/maps/Route118.inc | 12 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route120.inc | 26 ++-- data/scripts/maps/Route123_BerryMastersHouse.inc | 14 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 28 ++-- data/scripts/maps/RustboroCity.inc | 10 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 22 +-- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 60 +++---- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 18 +-- data/scripts/maps/SlateportCity_House1.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 6 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 2 +- 85 files changed, 617 insertions(+), 617 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 0535af6f3..534e91341 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -9,14 +9,14 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 playse 21 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0833 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0841 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 .ifdef SAPPHIRE - setvar 0x8009, 4 + setvar SPECIALVAR_9, 4 .else - setvar 0x8009, 3 + setvar SPECIALVAR_9, 3 .endif .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement SPECIALVAR_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement 0x8008, Movement_1A083F + applymovement SPECIALVAR_8, Movement_1A083F .else - applymovement 0x8008, AquaHideout_B2F_Movement_1A0843 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement 0x8009, AquaHideout_B2F_Movement_15D958 + applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D958 .else - applymovement 0x8009, AquaHideout_B2F_Movement_15D95D + applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject 0x8009 + removeobject SPECIALVAR_9 delay 20 - applymovement 0x8008, AquaHideout_B2F_Movement_1A0839 + applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 7259e8305..42e0a8821 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -21,25 +21,25 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmessage closemessage special ScrSpecial_HealPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 0 special sub_813556C waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 5 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 5 special sub_8135668 - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_8135668 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 @@ -89,23 +89,23 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty - setvar 0x8004, 0 - setvar 0x8005, 4 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 4 special sub_8135668 - setvar 0x8004, 2 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 1 special sub_8135668 - setvar 0x8004, 7 + setvar SPECIALVAR_4, 7 special sub_8135668 - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_8135668 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index b0e957e6b..4261f8457 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare 0x8006, 1 + compare SPECIALVAR_6, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar VAR_TEMP_0, 1 - compare 0x8006, 1 + compare SPECIALVAR_6, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 902ffd4ba..684bdc6bb 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -11,22 +11,22 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 end BattleTower_Lobby_EventScript_16029C:: @ 816029C - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 special sub_8135668 checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar 0x8007, sub_810F404 - compare 0x8007, 50 + specialvar SPECIALVAR_7, sub_810F404 + compare SPECIALVAR_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar 0x8007, sub_810F404 - compare 0x8007, 100 + specialvar SPECIALVAR_7, sub_810F404 + compare SPECIALVAR_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC @@ -75,7 +75,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 faceplayer message BattleTower_Lobby_Text_19A487 waitmessage - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D @@ -89,23 +89,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 msgbox BattleTower_Lobby_Text_19A719, 4 BattleTower_Lobby_EventScript_16037D:: @ 816037D - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 special sub_81358A4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_8135668 special DetermineBattleTowerPrize - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 special sub_8135BA0 playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar 0x8004, 0 - setvar 0x8005, 3 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 3 special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage @@ -116,7 +116,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitmessage playfanfare 370 waitfanfare - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 special sub_81358A4 compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 @@ -144,9 +144,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitmessage message BattleTower_Lobby_Text_19A589 waitmessage - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_8135668 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_8135BA0 playse 55 waitse @@ -164,12 +164,12 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage message BattleTower_Lobby_Text_19A5CE waitmessage - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special sub_8135BA0 playse 55 waitse - setvar 0x8004, 8 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 8 + setvar SPECIALVAR_5, 0 special sub_8135668 setvar VAR_TEMP_0, 5 special SavePlayerParty @@ -184,7 +184,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 @@ -209,11 +209,11 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar 0x8004, 1 - copyvar 0x8005, RESULT - copyvar 0x8006, RESULT + setvar SPECIALVAR_4, 1 + copyvar SPECIALVAR_5, RESULT + copyvar SPECIALVAR_6, RESULT special sub_8135668 msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 @@ -228,16 +228,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 special sub_8135668 setvar VAR_TEMP_0, 0 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_8135668 - setvar 0x8004, 0 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 1 special sub_8135668 - setvar 0x8004, 8 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 8 + setvar SPECIALVAR_5, 0 special sub_8135668 special LoadPlayerParty closemessage @@ -276,7 +276,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 special sub_8135668 goto BattleTower_Lobby_EventScript_160652 @@ -285,7 +285,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_8135668 BattleTower_Lobby_EventScript_160662:: @ 8160662 @@ -343,7 +343,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, 4 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -392,7 +392,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar 0x8008, DECOR_SILVER_SHIELD + setvar SPECIALVAR_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -406,7 +406,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar 0x8008, DECOR_GOLD_SHIELD + setvar SPECIALVAR_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecorationname 1, 0x8008 + bufferdecorationname 1, SPECIALVAR_8 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 69c160562..c766eed38 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -68,7 +68,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index c2e03bc38..9bc51f7d1 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -143,7 +143,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 waitstate release end @@ -181,7 +181,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 @@ -612,7 +612,7 @@ DewfordTown_EventScript_14E439:: @ 814E439 DewfordTown_EventScript_14E443:: @ 814E443 msgbox DewfordTown_Text_16BADC, 4 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 call DewfordTown_EventScript_1A00F3 lock faceplayer @@ -624,7 +624,7 @@ DewfordTown_EventScript_14E443:: @ 814E443 DewfordTown_EventScript_14E46E:: @ 814E46E incrementgamestat GAME_STAT_STARTED_TRENDS - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 42f1fccb1..797a79af0 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -10,12 +10,12 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 checktrainerflag OPPONENT_BRAWLY goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 - copyvar 0x8001, 0x8000 - compare 0x8000, 0 + copyvar SPECIALVAR_1, SPECIALVAR_0 + compare SPECIALVAR_0, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare 0x8000, 1 + compare SPECIALVAR_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare 0x8000, 2 + compare SPECIALVAR_0, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare 0x8000, 0x8001 + compare SPECIALVAR_0, SPECIALVAR_1 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar 0x8001, 0x8000 - compare 0x8000, 1 + copyvar SPECIALVAR_1, SPECIALVAR_0 + compare SPECIALVAR_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare 0x8000, 2 + compare SPECIALVAR_0, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare 0x8000, 3 + compare SPECIALVAR_0, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -80,20 +80,20 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 return DewfordTown_Gym_EventScript_153122:: @ 8153122 - setvar 0x8000, 0 + setvar SPECIALVAR_0, 0 checktrainerflag OPPONENT_HIDEKI goto_if 0, DewfordTown_Gym_EventScript_153135 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA goto_if 0, DewfordTown_Gym_EventScript_153143 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA goto_if 0, DewfordTown_Gym_EventScript_153151 - addvar 0x8000, 1 + addvar SPECIALVAR_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return @@ -117,7 +117,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index a3830ebb8..e2521f5e8 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -121,13 +121,13 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto DewfordTown_Hall_EventScript_15340A end @@ -191,9 +191,9 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare 0x8008, 1 + compare SPECIALVAR_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end @@ -210,9 +210,9 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index c1288078f..1bbcda5db 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A end DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index ec18ff9b5..2f0e2ea5f 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B end EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special sub_810FF60 setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index 018658416..a9a13246b 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 63bb4cac3..6e029a91f 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -15,7 +15,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 0e47f9859..c88471656 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -7,7 +7,7 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar 0x800b, 6 + setvar SPECIALVAR_B, 6 setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 17267f926..7f3b750a9 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -28,7 +28,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B - setvar 0x8004, 280 + setvar SPECIALVAR_4, 280 call FallarborTown_House1_EventScript_1A067F setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 001863d5c..7b222e671 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare 0x8005, 0 + compare SPECIALVAR_5, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index dd6e83be3..cf8f778fb 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 5cacc8bf3..4e300e66c 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET - setvar 0x8008, 6 + setvar SPECIALVAR_8, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 14b9b2c31..71a8f6378 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -6,29 +6,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 faceplayer checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD - setvar 0x8008, 1 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 1 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, FortreeCity_House1_EventScript_157E9F - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index b82927be1..22c3f0248 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 344ccd479..b19ac6635 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar 0x8004, ITEM_LETTER + setvar SPECIALVAR_4, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 4ef3ae82c..cfcf29ecc 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -28,7 +28,7 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 opendoor 12, 15 waitdooranim addobject 8 @@ -48,7 +48,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 @@ -68,7 +68,7 @@ LavaridgeTown_EventScript_14E570:: @ 814E570 LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare 0x8008, 0 + compare SPECIALVAR_8, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 044f72d11..3a5bbf20b 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -86,7 +86,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar VAR_LAVARIDGE_RIVAL_STATE, 1 diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index 0efda9c1e..b395ce744 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 end LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 33c81b108..4e27e0240 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -172,8 +172,8 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 releaseall diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index bc61c5ecd..976e0c89e 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -87,8 +87,8 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA case 3, LilycoveCity_ContestLobby_EventScript_1589DE @@ -361,7 +361,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestmon - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 compare RESULT, 0 @@ -392,7 +392,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 - copyvar 0x8008, 0x8004 + copyvar SPECIALVAR_8, SPECIALVAR_4 message LilycoveCity_ContestLobby_Text_1A67A3 waitmessage yesnobox 20, 8 @@ -417,7 +417,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 waitmessage - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT special sub_808363C waitstate compare RESULT, 3 @@ -429,7 +429,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer - switch 0x8004 + switch SPECIALVAR_4 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 case 1, LilycoveCity_ContestLobby_EventScript_158D82 case 2, LilycoveCity_ContestLobby_EventScript_158DC3 @@ -471,11 +471,11 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C - addvar 0x8004, 1 + addvar SPECIALVAR_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar 0x8004, 65535 + addvar SPECIALVAR_4, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -571,7 +571,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 - setvar 0x800b, 8 + setvar SPECIALVAR_B, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 @@ -586,7 +586,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 - setvar 0x800b, 8 + setvar SPECIALVAR_B, 8 setvar CONTEST_RANK, 3 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index c25a014f3..c58f484e2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar 0x8005, VAR_DEPT_STORE_FLOOR + copyvar SPECIALVAR_5, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 6cdb3367e..08f99f04e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -20,7 +20,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber - copyvar 0x8008, RESULT + copyvar SPECIALVAR_8, RESULT special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 @@ -33,23 +33,23 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare 0x8006, 0 + compare SPECIALVAR_6, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare 0x8006, 1 + compare SPECIALVAR_6, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, 0x8005 - compare 0x8004, 1 + bufferitemname 0, SPECIALVAR_5 + compare SPECIALVAR_4, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare 0x8004, 4 + compare SPECIALVAR_4, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std 0x8005 + giveitem_std SPECIALVAR_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar VAR_LOTTERY_PRIZE, 0x8005 + copyvar VAR_LOTTERY_PRIZE, SPECIALVAR_5 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index d1ac96d93..9805da6e7 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -136,7 +136,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call LilycoveCity_Harbor_EventScript_1A040E warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 74c53591d..f7a5dafad 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -98,8 +98,8 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialvar 0x8004, sub_80C4D50 - switch 0x8004 + specialvar SPECIALVAR_4, sub_80C4D50 + switch SPECIALVAR_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 02558e9d3..a6b500c15 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,7 +16,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 compare RESULT, 1 @@ -28,7 +28,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 1 special sub_80F9EEC fadescreen 0 - compare 0x8005, 4 + compare SPECIALVAR_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index 38428311b..c86fb3dbc 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 31f849b9f..3b63b2cd2 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -69,35 +69,35 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar 0x8004, 15 + setvar SPECIALVAR_4, 15 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D @@ -146,7 +146,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C @@ -186,7 +186,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 @@ -226,7 +226,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A @@ -266,7 +266,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 @@ -306,7 +306,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -339,7 +339,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer - setvar 0x8004, 12 + setvar SPECIALVAR_4, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -372,7 +372,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer - setvar 0x8004, 14 + setvar SPECIALVAR_4, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -405,7 +405,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer - setvar 0x8004, 15 + setvar SPECIALVAR_4, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index cd0a61fef..8dcb712dd 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -77,8 +77,8 @@ LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 LittlerootTown_EventScript_14D5EF:: @ 814D5EF lockall - setvar 0x8004, 5 - setvar 0x8005, 8 + setvar SPECIALVAR_4, 5 + setvar SPECIALVAR_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 @@ -88,8 +88,8 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF LittlerootTown_EventScript_14D60D:: @ 814D60D lockall - setvar 0x8004, 14 - setvar 0x8005, 8 + setvar SPECIALVAR_4, 14 + setvar SPECIALVAR_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 @@ -102,12 +102,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse 10 applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - opendoor 0x8004, 0x8005 + opendoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor 0x8004, 0x8005 + closedoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE @@ -117,7 +117,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - opendoor 0x8004, 0x8005 + opendoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD @@ -125,7 +125,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY - closedoor 0x8004, 0x8005 + closedoor SPECIALVAR_4, SPECIALVAR_5 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag FLAG_SPECIAL_FLAG_0 @@ -369,39 +369,39 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar 0x8008, 5 + setvar SPECIALVAR_8, 5 goto LittlerootTown_EventScript_14D8B6 end @@ -433,13 +433,13 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 end LittlerootTown_EventScript_14D926:: @ 814D926 - setvar 0x8009, 5 - setvar 0x800a, 8 + setvar SPECIALVAR_9, 5 + setvar SPECIALVAR_A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar 0x8009, 14 - setvar 0x800a, 8 + setvar SPECIALVAR_9, 14 + setvar SPECIALVAR_A, 8 return LittlerootTown_EventScript_14D93C:: @ 814D93C @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare 0x8008, 4 + compare SPECIALVAR_8, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare 0x8008, 5 + compare SPECIALVAR_8, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -595,96 +595,96 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim return @@ -849,12 +849,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - opendoor 0x8009, 0x800a + opendoor SPECIALVAR_9, SPECIALVAR_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor 0x8009, 0x800a + closedoor SPECIALVAR_9, SPECIALVAR_A waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index ba530cefc..b017f0254 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall - setvar 0x8004, 1 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall - setvar 0x8004, 0 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 0 + setvar SPECIALVAR_5, 1 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end @@ -116,9 +116,9 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall - setvar 0x8004, 1 - setvar 0x8005, 0 - applymovement 0x8004, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 0 + applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index e7f3b6b62..db1261736 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 @@ -68,7 +68,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 end gBrendanHouse_TurnPCOff:: @ 8152850 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index e3255b289..f48e84252 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end @@ -163,9 +163,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall - setvar 0x8004, 1 - setvar 0x8005, 1 - applymovement 0x8004, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 + applymovement SPECIALVAR_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index ee449d263..778ce6846 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 end LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C end gMayHouse_TurnPCOff:: @ 8152C75 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 35478a445..51fb1614d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -37,7 +37,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 7dc063149..7c071477d 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -524,7 +524,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -535,7 +535,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -546,7 +546,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -557,7 +557,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -568,7 +568,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -579,7 +579,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -590,7 +590,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 6 + setvar SPECIALVAR_4, 6 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -601,7 +601,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 7 + setvar SPECIALVAR_4, 7 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -612,7 +612,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 8 + setvar SPECIALVAR_4, 8 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -623,7 +623,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 9 + setvar SPECIALVAR_4, 9 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -634,7 +634,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 10 + setvar SPECIALVAR_4, 10 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -645,7 +645,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar 0x8004, 11 + setvar SPECIALVAR_4, 11 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 4e4d5cf31..b8be1d0ac 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -46,19 +46,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B end MauvilleCity_Gym_EventScript_15657D:: @ 815657D - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end @@ -87,7 +87,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView @@ -116,7 +116,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -127,7 +127,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index de30e21cd..c16b66482 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -13,7 +13,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 end MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9d4f26cfa..6d8aeee21 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -18,8 +18,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special PrintEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage - setvar 0x8004, 2 - setvar 0x8005, 0 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 0 special sub_813556C waitstate compare RESULT, 3 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index b1550a4c1..a1afd4e82 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -65,7 +65,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 - setvar 0x8008, 7 + setvar SPECIALVAR_8, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index c26238102..7f6220aa9 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index a11b12fcc..5f26583c9 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -77,7 +77,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 7b71ebd76..eac29a855 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -44,7 +44,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 34828f415..2cf8b7b8e 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -8,19 +8,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto MtPyre_Summit_EventScript_15D4E1 end @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -196,7 +196,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar 0x8004, ITEM_RED_OR_BLUE_ORB + setvar SPECIALVAR_4, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 @@ -246,19 +246,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto MtPyre_Summit_EventScript_15D6F2 end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index cbf3acd27..da913f4bd 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E end OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 624a221d5..2717be669 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -6,29 +6,29 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E faceplayer checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 - setvar 0x8008, 2 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 2 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index 95d5448e8..fa19f9d76 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 end @ 8154109 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index caec9b4a2..31e01f8ab 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -156,25 +156,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto PetalburgCity_EventScript_14B866 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 727818f34..2d95958a2 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -13,7 +13,7 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL call_if 1, PetalburgCity_Gym_EventScript_154FBB @@ -32,7 +32,7 @@ PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED - setvar 0x8005, 1 + setvar SPECIALVAR_5, 1 call PetalburgCity_Gym_EventScript_154F9A call PetalburgCity_Gym_EventScript_154FBB call PetalburgCity_Gym_EventScript_154FDC @@ -122,87 +122,87 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 end PetalburgCity_Gym_EventScript_15463D:: @ 815463D - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse 8 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE - setvar 0x8008, 5 + setvar SPECIALVAR_8, 5 call PetalburgCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED @@ -594,8 +594,8 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 85 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -624,8 +624,8 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 98 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -637,8 +637,8 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 46 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -650,8 +650,8 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 59 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -663,8 +663,8 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 59 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -676,8 +676,8 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 72 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -689,8 +689,8 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 20 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -702,8 +702,8 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 20 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -715,8 +715,8 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 33 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -728,8 +728,8 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 33 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -741,8 +741,8 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 1 - setvar 0x8009, 7 + setvar SPECIALVAR_8, 1 + setvar SPECIALVAR_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -754,8 +754,8 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar 0x8008, 7 - setvar 0x8009, 7 + setvar SPECIALVAR_8, 7 + setvar SPECIALVAR_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -771,7 +771,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 end PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FBB special DrawWholeMapView release @@ -789,7 +789,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 end PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FFD special DrawWholeMapView release @@ -807,7 +807,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E end PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_15503F special DrawWholeMapView release @@ -825,7 +825,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA end PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_155081 special DrawWholeMapView release @@ -843,7 +843,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 end PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_154FDC special DrawWholeMapView release @@ -861,7 +861,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 end PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_15501E special DrawWholeMapView release @@ -879,7 +879,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E end PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 - setvar 0x8005, 0 + setvar SPECIALVAR_5, 0 call PetalburgCity_Gym_EventScript_155060 special DrawWholeMapView release @@ -890,73 +890,73 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 end PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A - setvar 0x8004, 1 - compare 0x8005, 0 + setvar SPECIALVAR_4, 1 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB - setvar 0x8004, 2 - compare 0x8005, 0 + setvar SPECIALVAR_4, 2 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC - setvar 0x8004, 3 - compare 0x8005, 0 + setvar SPECIALVAR_4, 3 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD - setvar 0x8004, 4 - compare 0x8005, 0 + setvar SPECIALVAR_4, 4 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E - setvar 0x8004, 5 - compare 0x8005, 0 + setvar SPECIALVAR_4, 5 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F - setvar 0x8004, 6 - compare 0x8005, 0 + setvar SPECIALVAR_4, 6 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 - setvar 0x8004, 7 - compare 0x8005, 0 + setvar SPECIALVAR_4, 7 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 - setvar 0x8004, 8 - compare 0x8005, 0 + setvar SPECIALVAR_4, 8 + compare SPECIALVAR_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare 0x8005, 1 + compare SPECIALVAR_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 25af3e1cb..cb79bdf86 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A end PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 1bf579d77..4d3f03cd1 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -153,7 +153,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 61ad2bddd..35e59cdff 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar VAR_BRINEY_LOCATION, 0x8008 + copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 9d6cc22d3..e409a3cd6 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -309,17 +309,17 @@ Route110_EventScript_14FD09:: @ 814FD09 return Route110_EventScript_14FD13:: @ 814FD13 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 goto Route110_EventScript_14FD34 end @@ -337,11 +337,11 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF14 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF1F - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF56 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF5E - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route110_EventScript_14FF35 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route110_EventScript_14FF40 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 05b570482..5dad15672 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -736,23 +736,23 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 - setvar 0x8004, 6 - setvar 0x8005, 3 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 6 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 - setvar 0x8004, 11 - setvar 0x8005, 5 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 11 + setvar SPECIALVAR_5, 5 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B - setvar 0x8004, 9 - setvar 0x8005, 2 - setvar 0x8006, 0 + setvar SPECIALVAR_4, 9 + setvar SPECIALVAR_5, 2 + setvar SPECIALVAR_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 17d4f91c6..2463feb9c 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto Route111_EventScript_15013A end @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare 0x8004, 0 + compare SPECIALVAR_4, 0 call_if 1, Route111_EventScript_150188 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, Route111_EventScript_150193 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, Route111_EventScript_15019E - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 981971e41..32f8e41a3 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -4,7 +4,7 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 815BF24 Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 lock faceplayer - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -12,7 +12,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 @@ -31,7 +31,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 lock faceplayer - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -39,7 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer - setvar 0x8008, 4 + setvar SPECIALVAR_8, 4 checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 @@ -54,7 +54,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closemessage - applymovement 0x8008, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement SPECIALVAR_8, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index 9c572c0ca..fcdd565bc 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -45,7 +45,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 3424fbb6f..887f019f3 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -51,7 +51,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 end Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE - setvar 0x8009, 0 + setvar SPECIALVAR_9, 0 special ShowGlassWorkshopMenu waitstate switch RESULT @@ -67,9 +67,9 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 - setvar 0x800a, 250 + setvar SPECIALVAR_8, 39 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -81,9 +81,9 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar 0x8008, 40 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 + setvar SPECIALVAR_8, 40 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -95,9 +95,9 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 - setvar 0x800a, 500 + setvar SPECIALVAR_8, 41 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -109,9 +109,9 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 + setvar SPECIALVAR_8, 43 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -123,9 +123,9 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 - setvar 0x800a, 1000 + setvar SPECIALVAR_8, 42 + bufferitemname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -137,10 +137,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C - setvar 0x8009, 1 - setvar 0x8008, 13 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 6000 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 13 + bufferdecorationname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -152,10 +152,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD - setvar 0x8009, 1 - setvar 0x8008, 6 - bufferdecorationname 0, 0x8008 - setvar 0x800a, 8000 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 6 + bufferdecorationname 0, SPECIALVAR_8 + setvar SPECIALVAR_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -172,15 +172,15 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E end Route113_GlassWorkshop_EventScript_163818:: @ 8163818 - setvar 0x800a, 250 - subvar 0x800a, 16456 + setvar SPECIALVAR_A, 250 + subvar SPECIALVAR_A, 16456 buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 - subvar 0x800a, 16456 + subvar SPECIALVAR_A, 16456 buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage @@ -201,22 +201,22 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare SPECIALVAR_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare SPECIALVAR_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std 0x8008 + giveitem_std SPECIALVAR_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std 0x8008 + givedecoration_std SPECIALVAR_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -245,59 +245,59 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 end Route113_GlassWorkshop_EventScript_163925:: @ 8163925 - setvar 0x8009, 0 - setvar 0x8008, 39 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 39 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 - setvar 0x8009, 0 - setvar 0x8008, 40 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 40 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D - setvar 0x8009, 0 - setvar 0x8008, 41 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 41 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 - setvar 0x8009, 0 - setvar 0x8008, 43 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 43 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 - setvar 0x8009, 0 - setvar 0x8008, 42 - bufferitemname 0, 0x8008 + setvar SPECIALVAR_9, 0 + setvar SPECIALVAR_8, 42 + bufferitemname 0, SPECIALVAR_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 - setvar 0x8009, 1 - setvar 0x8008, 13 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 13 bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D - setvar 0x8009, 1 - setvar 0x8008, 6 + setvar SPECIALVAR_9, 1 + setvar SPECIALVAR_8, 6 bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare 0x8009, 0 + compare SPECIALVAR_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare 0x8009, 1 + compare SPECIALVAR_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index bc2ab0a51..051b30d54 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_151069 @@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 applymovement 255, Route118_Movement_1A0841 waitmovement 0 goto Route118_EventScript_151004 @@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_15106B @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closemessage - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, Route118_EventScript_151048 - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, Route118_EventScript_151053 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index ca9acd2d5..85938be18 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare 0x8004, 6 + compare SPECIALVAR_4, 6 call_if 1, Route119_EventScript_151193 - compare 0x8004, 7 + compare SPECIALVAR_4, 7 call_if 1, Route119_EventScript_151197 return diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 98c0cf20d..da0a65af1 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare 0x8004, 0 + compare SPECIALVAR_4, 0 call_if 1, Route120_EventScript_15166B - compare 0x8004, 1 + compare SPECIALVAR_4, 1 call_if 1, Route120_EventScript_151672 - compare 0x8004, 2 + compare SPECIALVAR_4, 2 call_if 1, Route120_EventScript_151676 - compare 0x8004, 3 + compare SPECIALVAR_4, 3 call_if 1, Route120_EventScript_15167A - compare 0x8004, 4 + compare SPECIALVAR_4, 4 call_if 1, Route120_EventScript_15167E - compare 0x8004, 5 + compare SPECIALVAR_4, 5 call_if 1, Route120_EventScript_151682 return @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar 0x8004, ITEM_FIGY_BERRY + setvar SPECIALVAR_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar 0x8004, ITEM_WIKI_BERRY + setvar SPECIALVAR_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar 0x8004, ITEM_MAGO_BERRY + setvar SPECIALVAR_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar 0x8004, ITEM_AGUAV_BERRY + setvar SPECIALVAR_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar 0x8004, ITEM_IAPAPA_BERRY + setvar SPECIALVAR_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std 0x8004 + giveitem_std SPECIALVAR_4 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -226,7 +226,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 6948bff87..0dbf1d345 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -43,7 +43,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 - setvar 0x8004, 13 + setvar SPECIALVAR_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare 0x8004, 0 + compare SPECIALVAR_4, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare 0x8004, 1 + compare SPECIALVAR_4, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare 0x8004, 2 + compare SPECIALVAR_4, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare 0x8004, 3 + compare SPECIALVAR_4, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare 0x8004, 4 + compare SPECIALVAR_4, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare 0x8004, 5 + compare SPECIALVAR_4, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 04da2d9c7..6d0bcc2c6 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,43 +224,43 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar 0x8008, 48 - setvar 0x8009, 95 + setvar SPECIALVAR_8, 48 + setvar SPECIALVAR_9, 95 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar 0x8008, 50 - setvar 0x8009, 96 + setvar SPECIALVAR_8, 50 + setvar SPECIALVAR_9, 96 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar 0x8008, 49 - setvar 0x8009, 97 + setvar SPECIALVAR_8, 49 + setvar SPECIALVAR_9, 97 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar 0x8008, 51 - setvar 0x8009, 98 + setvar SPECIALVAR_8, 51 + setvar SPECIALVAR_9, 98 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, 0x8008 - bufferitemname 1, 0x8009 + bufferitemname 0, SPECIALVAR_8 + bufferitemname 1, SPECIALVAR_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F - checkitemspace 0x8009, 1 + checkitemspace SPECIALVAR_9, 1 compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem 0x8008, 2 + checkitem SPECIALVAR_8, 2 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem 0x8008, 1 - giveitem_std 0x8009 + takeitem SPECIALVAR_8, 1 + giveitem_std SPECIALVAR_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index efe390f8a..e4cef9fa4 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -126,7 +126,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 0 + setvar SPECIALVAR_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 1 + setvar SPECIALVAR_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 3 + setvar SPECIALVAR_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar 0x8004, 4 + setvar SPECIALVAR_4, 4 goto RustboroCity_EventScript_14C4F4 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 71fc9731d..2e18bc55e 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -137,7 +137,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 @@ -157,7 +157,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar 0x8004, RESULT + copyvar SPECIALVAR_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 7ed47d35c..ef4d6fad1 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -18,7 +18,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 0cad33204..8761d3898 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -6,25 +6,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D faceplayer checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 - setvar 0x8008, 0 - copyvar 0x8004, 0x8008 + setvar SPECIALVAR_8, 0 + copyvar SPECIALVAR_4, SPECIALVAR_8 specialvar RESULT, sub_804D89C - copyvar 0x8009, RESULT + copyvar SPECIALVAR_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate - copyvar 0x800a, 0x8004 - compare 0x8004, 255 + copyvar SPECIALVAR_A, SPECIALVAR_4 + compare SPECIALVAR_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_5, SPECIALVAR_A specialvar RESULT, sub_804DB2C - copyvar 0x800b, RESULT - compare RESULT, 0x8009 + copyvar SPECIALVAR_B, RESULT + compare RESULT, SPECIALVAR_9 goto_if 5, RustboroCity_House1_EventScript_157D05 - copyvar 0x8004, 0x8008 - copyvar 0x8005, 0x800a + copyvar SPECIALVAR_4, SPECIALVAR_8 + copyvar SPECIALVAR_5, SPECIALVAR_A special sub_804DB68 special sub_804E174 waitstate @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferspeciesname 0, 0x8009 + bufferspeciesname 0, SPECIALVAR_9 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index a1c0ac31b..c9a2a48a4 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index f9bf888e2..fb332fbff 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -14,10 +14,10 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA lockall - setvar 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 5 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 4 + setvar SPECIALVAR_7, 5 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_15DD68 @@ -28,24 +28,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closemessage - addobject 0x8004 + addobject SPECIALVAR_4 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD36 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0839 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0839 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare 388 playse 107 special sub_80818A4 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0841 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 @@ -104,23 +104,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitmovement 0 special sub_80818FC waitstate - setvar 0x8004, 1 - setvar 0x8005, 1 + setvar SPECIALVAR_4, 1 + setvar SPECIALVAR_5, 1 special sub_810F758 waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 removeobject 1 delay 4 - setvar 0x8004, 2 - setvar 0x8005, 2 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 2 special sub_810F758 waitstate delay 30 - setvar 0x8004, 2 - setvar 0x8005, 3 - setvar 0x8006, 4 - setvar 0x8007, 5 + setvar SPECIALVAR_4, 2 + setvar SPECIALVAR_5, 3 + setvar SPECIALVAR_6, 4 + setvar SPECIALVAR_7, 5 .ifdef SAPPHIRE msgbox UnknownString_81B43F2, 4 .else @@ -135,7 +135,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closemessage - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD41 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 @@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closemessage playse 3 delay 20 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0845 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 @@ -153,14 +153,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closemessage - addobject 0x8005 - addobject 0x8006 - addobject 0x8007 - applymovement 0x8007, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8006, SeafloorCavern_Room9_Movement_15DD63 - applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD5A + addobject SPECIALVAR_5 + addobject SPECIALVAR_6 + addobject SPECIALVAR_7 + applymovement SPECIALVAR_7, SeafloorCavern_Room9_Movement_15DD63 + applymovement SPECIALVAR_6, SeafloorCavern_Room9_Movement_15DD63 + applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A083F + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 @@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse 21 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0833 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement 0x8004, SeafloorCavern_Room9_Movement_1A0835 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 @@ -183,8 +183,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closemessage - applymovement 0x8005, SeafloorCavern_Room9_Movement_15DD60 - applymovement 0x8004, SeafloorCavern_Room9_Movement_15DD46 + applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 0e64282e4..c481a0461 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -7,7 +7,7 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 end SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D - setvar 0x800b, 7 + setvar SPECIALVAR_B, 7 setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index c13dbaf9c..b8547fda9 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -24,25 +24,25 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall - setvar 0x8008, 0 + setvar SPECIALVAR_8, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar 0x8008, 1 + setvar SPECIALVAR_8, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar 0x8008, 2 + setvar SPECIALVAR_8, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar 0x8008, 3 + setvar SPECIALVAR_8, 3 applymovement 255, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 7 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 - compare 0x8008, 0 + compare SPECIALVAR_8, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare 0x8008, 1 + compare SPECIALVAR_8, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare 0x8008, 2 + compare SPECIALVAR_8, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare 0x8008, 3 + compare SPECIALVAR_8, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage @@ -229,7 +229,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar 0x8004, 5 + setvar SPECIALVAR_4, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index c72aa229a..80522f4c1 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare 0x8004, 255 + compare SPECIALVAR_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 7fcd0fff1..c261f3e83 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 - setvar 0x8004, 269 + setvar SPECIALVAR_4, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index ac4e8f240..f9b7c7fb3 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 end SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 90748bbf5..b7f0f996b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET - setvar 0x8008, 8 + setvar SPECIALVAR_8, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 end diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index bdff79375..a9810ed16 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -8,7 +8,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 msgbox SootopolisCity_House8_Text_1900F7, 4 special sub_80F9A0C waitstate - copyvar RESULT, 0x8004 + copyvar RESULT, SPECIALVAR_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize @@ -57,7 +57,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 msgbox SootopolisCity_House8_Text_190431, 4 special sub_80F9A0C waitstate - copyvar RESULT, 0x8004 + copyvar RESULT, SPECIALVAR_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 7b87bc7fc..1bbd30364 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 end @ 815B19A - setvar 0x800B, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index f62becf08..7624b3da3 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -18,7 +18,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar 0x8004, 2 + setvar SPECIALVAR_4, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 6386c3b82..63fd57a20 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -39,7 +39,7 @@ SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall - setvar 0x8008, 12 + setvar SPECIALVAR_8, 12 goto SouthernIsland_Interior_EventScript_160BA7 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index cb5c713ee..54a614576 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -3,10 +3,10 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 .byte 0 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 - getplayerxy 0x8004, 0x8005 - compare 0x8004, 12 + getplayerxy SPECIALVAR_4, SPECIALVAR_5 + compare SPECIALVAR_4, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare 0x8005, 44 + compare SPECIALVAR_5, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 11568ad22..83298dba6 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 end VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 - setvar 0x800b, 5 + setvar SPECIALVAR_B, 5 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index 598c3f60b..2323c139a 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 - setvar 0x800b, 1 + setvar SPECIALVAR_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress -- cgit v1.2.3 From 2c4d972f7c5a79ca94dca599b6e7b9e2c769cf70 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 24 Dec 2017 14:00:44 -0600 Subject: 'VAR_SPECIAL_X' instead of 'SPECIALVAR_X' --- data/scripts/maps/AquaHideout_B2F.inc | 32 ++-- data/scripts/maps/BattleTower_BattleRoom.inc | 30 ++-- data/scripts/maps/BattleTower_Corridor.inc | 4 +- data/scripts/maps/BattleTower_Lobby.inc | 68 ++++---- data/scripts/maps/BattleTower_Outside.inc | 2 +- data/scripts/maps/DewfordTown.inc | 8 +- data/scripts/maps/DewfordTown_Gym.inc | 28 ++-- data/scripts/maps/DewfordTown_Hall.inc | 12 +- data/scripts/maps/DewfordTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- .../maps/EverGrandeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/FallarborTown_House1.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 6 +- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/FortreeCity_Gym.inc | 2 +- data/scripts/maps/FortreeCity_House1.inc | 24 +-- data/scripts/maps/FortreeCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 16 +- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 2 +- .../maps/LavaridgeTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/LilycoveCity.inc | 4 +- data/scripts/maps/LilycoveCity_ContestLobby.inc | 20 +-- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 2 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 22 +-- data/scripts/maps/LilycoveCity_Harbor.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 4 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 4 +- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 2 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 32 ++-- data/scripts/maps/LittlerootTown.inc | 120 +++++++------- .../maps/LittlerootTown_BrendansHouse_1F.inc | 14 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 4 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 14 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 4 +- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 24 +-- data/scripts/maps/MauvilleCity_Gym.inc | 14 +- .../scripts/maps/MauvilleCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 4 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- .../scripts/maps/MossdeepCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 2 +- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 38 ++--- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House3.inc | 24 +-- .../maps/PacifidlogTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 24 +-- data/scripts/maps/PetalburgCity_Gym.inc | 172 ++++++++++----------- .../maps/PetalburgCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/Route104.inc | 2 +- data/scripts/maps/Route109.inc | 2 +- data/scripts/maps/Route110.inc | 24 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 18 +-- data/scripts/maps/Route111.inc | 16 +- .../maps/Route111_WinstrateFamilysHouse.inc | 10 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route113_GlassWorkshop.inc | 104 ++++++------- data/scripts/maps/Route118.inc | 12 +- data/scripts/maps/Route119.inc | 4 +- data/scripts/maps/Route120.inc | 26 ++-- data/scripts/maps/Route123_BerryMastersHouse.inc | 14 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 28 ++-- data/scripts/maps/RustboroCity.inc | 10 +- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 4 +- data/scripts/maps/RustboroCity_Gym.inc | 2 +- data/scripts/maps/RustboroCity_House1.inc | 22 +-- .../scripts/maps/RustboroCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SeafloorCavern_Room9.inc | 60 +++---- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/SlateportCity_Harbor.inc | 18 +-- data/scripts/maps/SlateportCity_House1.inc | 4 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 2 +- .../maps/SlateportCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 2 +- data/scripts/maps/SouthernIsland_Exterior.inc | 2 +- data/scripts/maps/SouthernIsland_Interior.inc | 2 +- data/scripts/maps/Underwater_SealedChamber.inc | 6 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- .../maps/VerdanturfTown_PokemonCenter_1F.inc | 2 +- 85 files changed, 617 insertions(+), 617 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 534e91341..5ec8197f9 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -9,14 +9,14 @@ AquaHideout_B2F_MapScript1_15D8B7:: @ 815D8B7 AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 playse 21 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0833 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0841 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0841 .endif waitmovement 0 setvar VAR_TEMP_1, 1 @@ -31,37 +31,37 @@ MagmaHideout_B2F_EventScript_15D8E1:: @ 815D8E1 end AquaHideout_B2F_EventScript_15D8FD:: @ 815D8FD - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 .ifdef SAPPHIRE - setvar SPECIALVAR_9, 4 + setvar VAR_SPECIAL_9, 4 .else - setvar SPECIALVAR_9, 3 + setvar VAR_SPECIAL_9, 3 .endif .ifdef SAPPHIRE - applymovement SPECIALVAR_8, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif waitmovement 0 delay 20 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_197162, 4 closemessage .ifdef SAPPHIRE - applymovement SPECIALVAR_8, Movement_1A083F + applymovement VAR_SPECIAL_8, Movement_1A083F .else - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0843 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0843 .endif .ifdef SAPPHIRE - applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D958 + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D958 .else - applymovement SPECIALVAR_9, AquaHideout_B2F_Movement_15D95D + applymovement VAR_SPECIAL_9, AquaHideout_B2F_Movement_15D95D .endif waitmovement 0 - removeobject SPECIALVAR_9 + removeobject VAR_SPECIAL_9 delay 20 - applymovement SPECIALVAR_8, AquaHideout_B2F_Movement_1A0839 + applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0839 waitmovement 0 msgbox AquaHideout_B2F_Text_1971AE, 4 setflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 42e0a8821..87ba8c01a 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -21,25 +21,25 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA waitmessage closemessage special ScrSpecial_HealPlayerParty - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 5 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 5 special sub_8135668 - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_8135668 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160961:: @ 8160961 - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 special sub_8135668 switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 @@ -89,23 +89,23 @@ BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 4 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 4 special sub_8135668 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 1 special sub_8135668 - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 special sub_8135668 - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_8135668 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 waitstate BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 special sub_8135BA0 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 diff --git a/data/scripts/maps/BattleTower_Corridor.inc b/data/scripts/maps/BattleTower_Corridor.inc index 4261f8457..965da8d9c 100644 --- a/data/scripts/maps/BattleTower_Corridor.inc +++ b/data/scripts/maps/BattleTower_Corridor.inc @@ -4,7 +4,7 @@ BattleTower_Corridor_MapScripts:: @ 8160845 .byte 0 BattleTower_Corridor_MapScript1_160850:: @ 8160850 - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq BattleTower_Corridor_EventScript_16086E setmetatile 12, 0, 519, 0 setmetatile 12, 1, 527, 0 @@ -21,7 +21,7 @@ BattleTower_Corridor_MapScript2_160881:: @ 8160881 BattleTower_Corridor_EventScript_16088B:: @ 816088B setvar VAR_TEMP_0, 1 - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 goto_if_eq BattleTower_Corridor_EventScript_1608B1 applymovement 1, BattleTower_Corridor_Movement_1608D5 applymovement 255, BattleTower_Corridor_Movement_1608D4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 684bdc6bb..527bae389 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -11,22 +11,22 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 end BattleTower_Lobby_EventScript_16029C:: @ 816029C - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 special sub_8135668 checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar SPECIALVAR_7, sub_810F404 - compare SPECIALVAR_7, 50 + specialvar VAR_SPECIAL_7, sub_810F404 + compare VAR_SPECIAL_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar SPECIALVAR_7, sub_810F404 - compare SPECIALVAR_7, 100 + specialvar VAR_SPECIAL_7, sub_810F404 + compare VAR_SPECIAL_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC @@ -75,7 +75,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 faceplayer message BattleTower_Lobby_Text_19A487 waitmessage - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D @@ -89,23 +89,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 msgbox BattleTower_Lobby_Text_19A719, 4 BattleTower_Lobby_EventScript_16037D:: @ 816037D - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 special sub_81358A4 compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_8135668 special DetermineBattleTowerPrize - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 special sub_8135BA0 playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 3 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 3 special sub_8135668 message BattleTower_Lobby_Text_19A4BB waitmessage @@ -116,7 +116,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD waitmessage playfanfare 370 waitfanfare - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 special sub_81358A4 compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 @@ -144,9 +144,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 waitmessage message BattleTower_Lobby_Text_19A589 waitmessage - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_8135668 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_8135BA0 playse 55 waitse @@ -164,12 +164,12 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage message BattleTower_Lobby_Text_19A5CE waitmessage - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special sub_8135BA0 playse 55 waitse - setvar SPECIALVAR_4, 8 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 special sub_8135668 setvar VAR_TEMP_0, 5 special SavePlayerParty @@ -184,7 +184,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_81358A4 compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 @@ -209,11 +209,11 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 2, BattleTower_Lobby_EventScript_160652 case 127, BattleTower_Lobby_EventScript_160652 special CheckPartyBattleTowerBanlist - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq BattleTower_Lobby_EventScript_16060D - setvar SPECIALVAR_4, 1 - copyvar SPECIALVAR_5, RESULT - copyvar SPECIALVAR_6, RESULT + setvar VAR_SPECIAL_4, 1 + copyvar VAR_SPECIAL_5, RESULT + copyvar VAR_SPECIAL_6, RESULT special sub_8135668 msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 @@ -228,16 +228,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 special sub_8135668 setvar VAR_TEMP_0, 0 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 special sub_8135668 - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 special sub_8135668 - setvar SPECIALVAR_4, 8 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + setvar VAR_SPECIAL_5, 0 special sub_8135668 special LoadPlayerParty closemessage @@ -276,7 +276,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 goto BattleTower_Lobby_EventScript_160662 BattleTower_Lobby_EventScript_160642:: @ 8160642 - setvar SPECIALVAR_4, 12 + setvar VAR_SPECIAL_4, 12 special sub_8135668 goto BattleTower_Lobby_EventScript_160652 @@ -285,7 +285,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 special sub_8135668 BattleTower_Lobby_EventScript_160662:: @ 8160662 @@ -343,7 +343,7 @@ BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 BattleTower_Lobby_EventScript_1606CC:: @ 81606CC msgbox BattleTower_Lobby_Text_19A7C3, 4 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 call BattleTower_Lobby_EventScript_1A00F3 lock faceplayer @@ -392,7 +392,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 - setvar SPECIALVAR_8, DECOR_SILVER_SHIELD + setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -406,7 +406,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 - setvar SPECIALVAR_8, DECOR_GOLD_SHIELD + setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_1607AF @@ -416,7 +416,7 @@ BattleTower_Lobby_EventScript_160773:: @ 8160773 end BattleTower_Lobby_EventScript_1607AF:: @ 81607AF - bufferdecorationname 1, SPECIALVAR_8 + bufferdecorationname 1, VAR_SPECIAL_8 msgbox BattleTower_Lobby_Text_1A0CEF, 4 msgbox BattleTower_Lobby_Text_19ABED, 4 release diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index c766eed38..3992ffd2c 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -68,7 +68,7 @@ BattleTower_Outside_EventScript_160232:: @ 8160232 waitmovement 0 delay 30 hideobjectat 5, MAP_BATTLE_TOWER_OUTSIDE - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 call BattleTower_Outside_EventScript_1A047C return diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 9bc51f7d1..dc733071f 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -143,7 +143,7 @@ DewfordTown_EventScript_14E151:: @ 814E151 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 2 resetobjectpriority 255, MAP_DEWFORD_TOWN warp MAP_ROUTE104_MR_BRINEYS_HOUSE, 255, 5, 4 - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 waitstate release end @@ -181,7 +181,7 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 checkflag FLAG_DELIVERED_DEVON_GOODS call_if 1, DewfordTown_EventScript_14E28A closemessage - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_DEWFORD_TOWN resetobjectpriority 2, MAP_ROUTE109 moveobjectoffscreen 2 @@ -612,7 +612,7 @@ DewfordTown_EventScript_14E439:: @ 814E439 DewfordTown_EventScript_14E443:: @ 814E443 msgbox DewfordTown_Text_16BADC, 4 - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 call DewfordTown_EventScript_1A00F3 lock faceplayer @@ -624,7 +624,7 @@ DewfordTown_EventScript_14E443:: @ 814E443 DewfordTown_EventScript_14E46E:: @ 814E46E incrementgamestat GAME_STAT_STARTED_TRENDS - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq DewfordTown_EventScript_14E48F msgbox DewfordTown_Text_16BB44, 4 release diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 797a79af0..ee7d77d6b 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -10,12 +10,12 @@ DewfordTown_Gym_EventScript_153071:: @ 8153071 checktrainerflag OPPONENT_BRAWLY goto_if_eq DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 - copyvar SPECIALVAR_1, SPECIALVAR_0 - compare SPECIALVAR_0, 0 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 0 goto_if_eq DewfordTown_Gym_EventScript_1530BA - compare SPECIALVAR_0, 1 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530B6 - compare SPECIALVAR_0, 2 + compare VAR_SPECIAL_0, 2 goto_if_eq DewfordTown_Gym_EventScript_1530B2 goto DewfordTown_Gym_EventScript_1530AE @@ -42,14 +42,14 @@ DewfordTown_Gym_EventScript_1530BA:: @ 81530BA DewfordTown_Gym_EventScript_1530BE:: @ 81530BE call DewfordTown_Gym_EventScript_153122 nop1 - compare SPECIALVAR_0, SPECIALVAR_1 + compare VAR_SPECIAL_0, VAR_SPECIAL_1 goto_if_eq DewfordTown_Gym_EventScript_1530F5 - copyvar SPECIALVAR_1, SPECIALVAR_0 - compare SPECIALVAR_0, 1 + copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 + compare VAR_SPECIAL_0, 1 goto_if_eq DewfordTown_Gym_EventScript_1530F6 - compare SPECIALVAR_0, 2 + compare VAR_SPECIAL_0, 2 goto_if_eq DewfordTown_Gym_EventScript_153101 - compare SPECIALVAR_0, 3 + compare VAR_SPECIAL_0, 3 goto_if_eq DewfordTown_Gym_EventScript_15310C DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 @@ -80,20 +80,20 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 return DewfordTown_Gym_EventScript_153122:: @ 8153122 - setvar SPECIALVAR_0, 0 + setvar VAR_SPECIAL_0, 0 checktrainerflag OPPONENT_HIDEKI goto_if 0, DewfordTown_Gym_EventScript_153135 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA goto_if 0, DewfordTown_Gym_EventScript_153143 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA goto_if 0, DewfordTown_Gym_EventScript_153151 - addvar SPECIALVAR_0, 1 + addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 return @@ -117,7 +117,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, DewfordTown_Gym_EventScript_1A00FB - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index e2521f5e8..e54ef8e50 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -121,13 +121,13 @@ DewfordTown_Hall_EventScript_1533E8:: @ 81533E8 DewfordTown_Hall_EventScript_1533F2:: @ 81533F2 lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto DewfordTown_Hall_EventScript_15340A end DewfordTown_Hall_EventScript_1533FE:: @ 81533FE lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto DewfordTown_Hall_EventScript_15340A end @@ -191,9 +191,9 @@ DewfordTown_Hall_EventScript_1534FC:: @ 81534FC DewfordTown_Hall_EventScript_1534FD:: @ 81534FD applymovement 8, DewfordTown_Hall_Movement_153599 waitmovement 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_15351E - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153534 end @@ -210,9 +210,9 @@ DewfordTown_Hall_EventScript_153534:: @ 8153534 DewfordTown_Hall_EventScript_153535:: @ 8153535 applymovement 7, DewfordTown_Hall_Movement_15359B waitmovement 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq DewfordTown_Hall_EventScript_153556 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 goto_if_eq DewfordTown_Hall_EventScript_153583 end diff --git a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc index 1bbcda5db..33d14e770 100644 --- a/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/DewfordTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A end DewfordTown_PokemonCenter_1F_EventScript_153023:: @ 8153023 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call DewfordTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index 2f0e2ea5f..d83745593 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -55,7 +55,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B78B:: @ 815B78B end EverGrandeCity_DrakesRoom_EventScript_15B795:: @ 815B795 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special sub_810FF60 setflag FLAG_DEFEATED_ELITE_4_DRAKE call EverGrandeCity_DrakesRoom_EventScript_1A0693 diff --git a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc index a9a13246b..374ef9472 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 SootopolisCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call SootopolisCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 6e029a91f..5957508ae 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -15,7 +15,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B return EverGrandeCity_PokemonLeague_EventScript_15BA9A:: @ 815BA9A - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call EverGrandeCity_PokemonLeague_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index c88471656..a0fd0ac3d 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -7,7 +7,7 @@ FallarborTown_ContestLobby_MapScript1_1539C7:: @ 81539C7 end FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD - setvar SPECIALVAR_B, 6 + setvar VAR_SPECIAL_B, 6 setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 7f3b750a9..3c5345f8f 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -28,7 +28,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA giveitem_std ITEM_TM27 compare RESULT, 0 goto_if_eq FallarborTown_House1_EventScript_1A029B - setvar SPECIALVAR_4, 280 + setvar VAR_SPECIAL_4, 280 call FallarborTown_House1_EventScript_1A067F setflag FLAG_RECEIVED_TM27 msgbox FallarborTown_House1_Text_177910, 4 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 7b222e671..081850326 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -26,12 +26,12 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 special sub_80F9A4C waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 special sub_80FA148 compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 - compare SPECIALVAR_5, 0 + compare VAR_SPECIAL_5, 0 goto_if_eq FallarborTown_House2_EventScript_153D44 goto FallarborTown_House2_EventScript_153D1A end @@ -40,7 +40,7 @@ FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 special sub_8132670 waitstate - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 msgbox FallarborTown_House2_Text_177CC3, 4 takeitem ITEM_HEART_SCALE, 1 diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index cf8f778fb..0c9880137 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9 end FallarborTown_PokemonCenter_1F_EventScript_153B02:: @ 8153B02 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call FallarborTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 4e300e66c..9217ba8f4 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -30,7 +30,7 @@ FortreeCity_Gym_EventScript_157F15:: @ 8157F15 msgbox FortreeCity_Gym_Text_185E73, 4 setflag FLAG_DEFEATED_FORTREE_GYM setflag FLAG_BADGE06_GET - setvar SPECIALVAR_8, 6 + setvar VAR_SPECIAL_8, 6 call FortreeCity_Gym_EventScript_1A01C0 goto FortreeCity_Gym_EventScript_157F3E end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index 71a8f6378..aee4141a8 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -6,29 +6,29 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 faceplayer checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED goto_if_eq FortreeCity_House1_EventScript_157EAD - setvar SPECIALVAR_8, 1 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 1 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_1856F7, 4 setflag FLAG_FORTREE_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ FortreeCity_House1_EventScript_157E95:: @ 8157E95 end FortreeCity_House1_EventScript_157E9F:: @ 8157E9F - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_185737, 4 release end diff --git a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc index 22c3f0248..6d847d7cc 100644 --- a/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/FortreeCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017 end FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call FortreeCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index b19ac6635..3d4a57c13 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -5,7 +5,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA lock faceplayer msgbox GraniteCave_StevensRoom_Text_194AE5, 4 - setvar SPECIALVAR_4, ITEM_LETTER + setvar VAR_SPECIAL_4, ITEM_LETTER call GraniteCave_StevensRoom_EventScript_1A067F setflag FLAG_DELIVERED_STEVEN_LETTER msgbox GraniteCave_StevensRoom_Text_194BDD, 4 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index cfcf29ecc..43a8ed7cd 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -28,7 +28,7 @@ LavaridgeTown_MapScript2_14E4E3:: @ 814E4E3 LavaridgeTown_EventScript_14E4ED:: @ 814E4ED lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 opendoor 12, 15 waitdooranim addobject 8 @@ -48,7 +48,7 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED call_if 1, LavaridgeTown_EventScript_14E56B compare RESULT, 1 call_if 1, LavaridgeTown_EventScript_14E570 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 @@ -68,7 +68,7 @@ LavaridgeTown_EventScript_14E570:: @ 814E570 LavaridgeTown_EventScript_14E575:: @ 814E575 lock faceplayer - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 checkplayergender compare RESULT, 0 call_if 1, LavaridgeTown_EventScript_14E56B @@ -99,22 +99,22 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E646 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LavaridgeTown_EventScript_14E69A - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 fadedefaultbgm - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 goto_if_eq LavaridgeTown_EventScript_14E644 releaseall end diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 3a5bbf20b..1bbad53bf 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -86,7 +86,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE setvar VAR_LAVARIDGE_RIVAL_STATE, 1 diff --git a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc index b395ce744..4e9c51380 100644 --- a/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/LavaridgeTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912 end LavaridgeTown_PokemonCenter_1F_EventScript_15391B:: @ 815391B - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call LavaridgeTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 4e27e0240..5c05639fd 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -172,8 +172,8 @@ LilycoveCity_EventScript_14CC79:: @ 814CC79 LilycoveCity_EventScript_14CC82:: @ 814CC82 lockall - specialvar SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 case 0, LilycoveCity_EventScript_14CCA2 msgbox LilycoveCity_Text_168EA4, 4 releaseall diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 976e0c89e..7a13b1c48 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -87,8 +87,8 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 return LilycoveCity_ContestLobby_EventScript_158994:: @ 8158994 - specialvar SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 case 1, LilycoveCity_ContestLobby_EventScript_1589D6 case 2, LilycoveCity_ContestLobby_EventScript_1589DA case 3, LilycoveCity_ContestLobby_EventScript_1589DE @@ -361,7 +361,7 @@ LilycoveCity_ContestLobby_EventScript_158C42:: @ 8158C42 msgbox LilycoveCity_ContestLobby_Text_188703, 4 setvar CONTEST_RANK, 0 choosecontestmon - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_ContestLobby_EventScript_158CEA special sub_80C43F4 compare RESULT, 0 @@ -392,7 +392,7 @@ LilycoveCity_ContestLobby_EventScript_158CB2:: @ 8158CB2 end LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 - copyvar SPECIALVAR_8, SPECIALVAR_4 + copyvar VAR_SPECIAL_8, VAR_SPECIAL_4 message LilycoveCity_ContestLobby_Text_1A67A3 waitmessage yesnobox 20, 8 @@ -417,7 +417,7 @@ LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 message LilycoveCity_ContestLobby_Text_1887C7 waitmessage - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT special sub_808363C waitstate compare RESULT, 3 @@ -429,7 +429,7 @@ LilycoveCity_ContestLobby_EventScript_158D24:: @ 8158D24 messageautoscroll LilycoveCity_ContestLobby_Text_18872A waitmessage contestlinktransfer - switch SPECIALVAR_4 + switch VAR_SPECIAL_4 case 0, LilycoveCity_ContestLobby_EventScript_158DD1 case 1, LilycoveCity_ContestLobby_EventScript_158D82 case 2, LilycoveCity_ContestLobby_EventScript_158DC3 @@ -471,11 +471,11 @@ LilycoveCity_ContestLobby_EventScript_158DC3:: @ 8158DC3 LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 special sub_80C496C - addvar SPECIALVAR_4, 1 + addvar VAR_SPECIAL_4, 1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar SPECIALVAR_4, 65535 + addvar VAR_SPECIAL_4, 65535 goto LilycoveCity_ContestLobby_EventScript_158DEE end @@ -571,7 +571,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 specialvar RESULT, sub_80C5044 compare RESULT, 1 goto_if_eq LilycoveCity_ContestLobby_EventScript_158EE8 - setvar SPECIALVAR_B, 8 + setvar VAR_SPECIAL_B, 8 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 @@ -586,7 +586,7 @@ LilycoveCity_ContestLobby_EventScript_158EE8:: @ 8158EE8 setflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR copyvar VAR_LILYCOVE_MUSEUM_2F_STATE, 0x1 giveitem ITEM_CONTEST_PASS, 1 - setvar SPECIALVAR_B, 8 + setvar VAR_SPECIAL_B, 8 setvar CONTEST_RANK, 3 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 1 setflag FLAG_SYS_RIBBON_GET diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index c58f484e2..8233504dd 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -6,7 +6,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C faceplayer checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF - copyvar SPECIALVAR_5, VAR_DEPT_STORE_FLOOR + copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR special sub_810E944 message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 08f99f04e..a9680e3a5 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -20,7 +20,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 waitmessage special RetrieveLotteryNumber - copyvar SPECIALVAR_8, RESULT + copyvar VAR_SPECIAL_8, RESULT special sub_810F9AC msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 @@ -33,23 +33,23 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E delay 10 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0839 waitmovement 0 - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY - compare SPECIALVAR_6, 0 + compare VAR_SPECIAL_6, 0 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A - compare SPECIALVAR_6, 1 + compare VAR_SPECIAL_6, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 - bufferitemname 0, SPECIALVAR_5 - compare SPECIALVAR_4, 1 + bufferitemname 0, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 1 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 - giveitem_std SPECIALVAR_5 + giveitem_std VAR_SPECIAL_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C goto LilycoveCity_DepartmentStore_1F_EventScript_159E6E @@ -100,7 +100,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159E93:: @ 8159E93 return LilycoveCity_DepartmentStore_1F_EventScript_159E9C:: @ 8159E9C - copyvar VAR_LOTTERY_PRIZE, SPECIALVAR_5 + copyvar VAR_LOTTERY_PRIZE, VAR_SPECIAL_5 goto LilycoveCity_DepartmentStore_1F_EventScript_159EA7 end diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9805da6e7..9554b8fa4 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -86,7 +86,7 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A call_if 1, LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 call LilycoveCity_Harbor_EventScript_1A040E return @@ -136,7 +136,7 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 call LilycoveCity_Harbor_EventScript_1A040E warp MAP_SOUTHERN_ISLAND_EXTERIOR, 255, 13, 22 waitstate diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index f7a5dafad..120054e91 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -98,8 +98,8 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall checkflag FLAG_RECEIVED_GLASS_ORNAMENT goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 - specialvar SPECIALVAR_4, sub_80C4D50 - switch SPECIALVAR_4 + specialvar VAR_SPECIAL_4, sub_80C4D50 + switch VAR_SPECIAL_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 2, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C case 3, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index a6b500c15..1024d30e9 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -16,7 +16,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 special sub_80F9A0C waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B special sub_80FA148 compare RESULT, 1 @@ -28,7 +28,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE fadescreen 1 special sub_80F9EEC fadescreen 0 - compare SPECIALVAR_5, 4 + compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index c86fb3dbc..f6eb35c98 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D end LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call LilycoveCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 3b63b2cd2..2db702ffc 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -69,35 +69,35 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 special sub_810FCE8 - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED - setvar SPECIALVAR_4, 12 + setvar VAR_SPECIAL_4, 12 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 - setvar SPECIALVAR_4, 15 + setvar VAR_SPECIAL_4, 15 specialvar RESULT, sub_810FD60 compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D @@ -146,7 +146,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159515:: @ 8159515 LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C @@ -186,7 +186,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15959C:: @ 815959C LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 @@ -226,7 +226,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159613:: @ 8159613 LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A @@ -266,7 +266,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15968A:: @ 815968A LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 special sub_810FDAC compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 @@ -306,7 +306,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159701:: @ 8159701 LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -339,7 +339,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159763:: @ 8159763 LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer - setvar SPECIALVAR_4, 12 + setvar VAR_SPECIAL_4, 12 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -372,7 +372,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5:: @ 81597C5 LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer - setvar SPECIALVAR_4, 14 + setvar VAR_SPECIAL_4, 14 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 @@ -405,7 +405,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159827:: @ 8159827 LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer - setvar SPECIALVAR_4, 15 + setvar VAR_SPECIAL_4, 15 special sub_810FDAC specialvar RESULT, sub_810FD60 compare RESULT, 1 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index 8dcb712dd..c11546bb5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -77,8 +77,8 @@ LittlerootTown_MapScript2_14D5D5:: @ 814D5D5 LittlerootTown_EventScript_14D5EF:: @ 814D5EF lockall - setvar SPECIALVAR_4, 5 - setvar SPECIALVAR_5, 8 + setvar VAR_SPECIAL_4, 5 + setvar VAR_SPECIAL_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN warpsilent MAP_LITTLEROOT_TOWN_BRENDANS_HOUSE_1F, 255, 8, 8 @@ -88,8 +88,8 @@ LittlerootTown_EventScript_14D5EF:: @ 814D5EF LittlerootTown_EventScript_14D60D:: @ 814D60D lockall - setvar SPECIALVAR_4, 14 - setvar SPECIALVAR_5, 8 + setvar VAR_SPECIAL_4, 14 + setvar VAR_SPECIAL_5, 8 call LittlerootTown_EventScript_14D62B setflag FLAG_HIDE_MOVING_TRUCK_MAY warpsilent MAP_LITTLEROOT_TOWN_MAYS_HOUSE_1F, 255, 2, 8 @@ -102,12 +102,12 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B playse 10 applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 - opendoor SPECIALVAR_4, SPECIALVAR_5 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim addobject 4 applymovement 4, LittlerootTown_Movement_14D6AC waitmovement 0 - closedoor SPECIALVAR_4, SPECIALVAR_5 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim delay 10 applymovement 4, LittlerootTown_Movement_14D6AE @@ -117,7 +117,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B applymovement 4, LittlerootTown_Movement_14D6B1 applymovement 255, LittlerootTown_Movement_14D6B8 waitmovement 0 - opendoor SPECIALVAR_4, SPECIALVAR_5 + opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim applymovement 4, LittlerootTown_Movement_14D6B5 applymovement 255, LittlerootTown_Movement_14D6BD @@ -125,7 +125,7 @@ LittlerootTown_EventScript_14D62B:: @ 814D62B setflag FLAG_HIDE_MOM_LITTLEROOT setvar VAR_LITTLEROOT_INTRO_STATE, 3 hideobjectat 255, MAP_PETALBURG_CITY - closedoor SPECIALVAR_4, SPECIALVAR_5 + closedoor VAR_SPECIAL_4, VAR_SPECIAL_5 waitdooranim clearflag FLAG_HIDE_FAT_MAN_LITTLEROOT clearflag FLAG_SPECIAL_FLAG_0 @@ -369,39 +369,39 @@ LittlerootTown_EventScript_14D857:: @ 814D857 LittlerootTown_EventScript_14D860:: @ 814D860 lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 setobjectxy 4, 10, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D873:: @ 814D873 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 setobjectxy 4, 11, 9 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D886:: @ 814D886 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D892:: @ 814D892 lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D89E:: @ 814D89E lockall - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 goto LittlerootTown_EventScript_14D8B6 end LittlerootTown_EventScript_14D8AA:: @ 814D8AA lockall - setvar SPECIALVAR_8, 5 + setvar VAR_SPECIAL_8, 5 goto LittlerootTown_EventScript_14D8B6 end @@ -433,13 +433,13 @@ LittlerootTown_EventScript_14D8B6:: @ 814D8B6 end LittlerootTown_EventScript_14D926:: @ 814D926 - setvar SPECIALVAR_9, 5 - setvar SPECIALVAR_A, 8 + setvar VAR_SPECIAL_9, 5 + setvar VAR_SPECIAL_A, 8 return LittlerootTown_EventScript_14D931:: @ 814D931 - setvar SPECIALVAR_9, 14 - setvar SPECIALVAR_A, 8 + setvar VAR_SPECIAL_9, 14 + setvar VAR_SPECIAL_A, 8 return LittlerootTown_EventScript_14D93C:: @ 814D93C @@ -453,32 +453,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 return LittlerootTown_EventScript_14D952:: @ 814D952 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA02 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA17 - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA2C - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14D9D8 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14D9ED - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DA56 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DA6B - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DA80 - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DA95 return @@ -553,32 +553,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 return LittlerootTown_EventScript_14DAAA:: @ 814DAAA - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DB46 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DB6C - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DB92 - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, LittlerootTown_EventScript_14DB30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, LittlerootTown_EventScript_14DB3B - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, LittlerootTown_EventScript_14DBDE - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, LittlerootTown_EventScript_14DC04 - compare SPECIALVAR_8, 4 + compare VAR_SPECIAL_8, 4 call_if 1, LittlerootTown_EventScript_14DC2A - compare SPECIALVAR_8, 5 + compare VAR_SPECIAL_8, 5 call_if 1, LittlerootTown_EventScript_14DC50 return @@ -595,96 +595,96 @@ LittlerootTown_EventScript_14DB3B:: @ 814DB3B LittlerootTown_EventScript_14DB46:: @ 814DB46 applymovement 4, LittlerootTown_Movement_14DCB4 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB6C:: @ 814DB6C applymovement 4, LittlerootTown_Movement_14DCBA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DB92:: @ 814DB92 applymovement 4, LittlerootTown_Movement_14DCC1 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBB8:: @ 814DBB8 applymovement 4, LittlerootTown_Movement_14DCC5 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DBDE:: @ 814DBDE applymovement 4, LittlerootTown_Movement_14DCCA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC04:: @ 814DC04 applymovement 4, LittlerootTown_Movement_14DCCF waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC2A:: @ 814DC2A applymovement 4, LittlerootTown_Movement_14DCD3 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return LittlerootTown_EventScript_14DC50:: @ 814DC50 applymovement 4, LittlerootTown_Movement_14DCDA waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim return @@ -849,12 +849,12 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 - opendoor SPECIALVAR_9, SPECIALVAR_A + opendoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim applymovement 4, LittlerootTown_Movement_14DCE0 waitmovement 0 hideobjectat 4, MAP_LITTLEROOT_TOWN - closedoor SPECIALVAR_9, SPECIALVAR_A + closedoor VAR_SPECIAL_9, VAR_SPECIAL_A waitdooranim goto LittlerootTown_EventScript_14DD2B end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index b017f0254..4ce1e277a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_BrendansHouse_1F_Movement_152720:: @ 8152720 LittlerootTown_BrendansHouse_1F_EventScript_152722:: @ 8152722 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6956 end LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 lockall - setvar SPECIALVAR_4, 0 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 0 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_BrendansHouse_1F_EventScript_1B6ABF end @@ -116,9 +116,9 @@ LittlerootTown_BrendansHouse_1F_Movement_152782:: @ 8152782 LittlerootTown_BrendansHouse_1F_EventScript_152789:: @ 8152789 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 0 - applymovement SPECIALVAR_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 0 + applymovement VAR_SPECIAL_4, LittlerootTown_BrendansHouse_1F_Movement_1A083F waitmovement 0 goto LittlerootTown_BrendansHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index db1261736..e0e1a1086 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -58,7 +58,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_15281E:: @ 815281E end LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_BrendansHouse_2F_Text_1A10D6, 4 @@ -68,7 +68,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 end gBrendanHouse_TurnPCOff:: @ 8152850 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index f48e84252..af7a2976b 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -76,15 +76,15 @@ LittlerootTown_MaysHouse_1F_Movement_15295E:: @ 815295E LittlerootTown_MaysHouse_1F_EventScript_152960:: @ 8152960 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6956 end LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 goto LittlerootTown_MaysHouse_1F_EventScript_1B6B2E end @@ -163,9 +163,9 @@ LittlerootTown_BrendansHouse_1F_EventScript_152A2B:: @ 8152A2B LittlerootTown_MaysHouse_1F_EventScript_152A35:: @ 8152A35 lockall - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 - applymovement SPECIALVAR_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 + applymovement VAR_SPECIAL_4, LittlerootTown_MaysHouse_1F_Movement_1A0843 waitmovement 0 goto LittlerootTown_MaysHouse_1F_EventScript_1B69B7 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 778ce6846..8bd9a01d2 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -206,7 +206,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C52:: @ 8152C52 end LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 special DoPCTurnOnEffect playse SE_PC_ON msgbox LittlerootTown_MaysHouse_2F_Text_1A10D6, 4 @@ -216,7 +216,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C end gMayHouse_TurnPCOff:: @ 8152C75 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 playse SE_PC_OFF special DoPCTurnOffEffect releaseall diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 51fb1614d..44adab6f1 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -37,7 +37,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE end LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 call LittlerootTown_ProfessorBirchsLab_EventScript_1A0678 goto LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 7c071477d..6befb5fb9 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -524,7 +524,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -535,7 +535,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -546,7 +546,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -557,7 +557,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -568,7 +568,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -579,7 +579,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -590,7 +590,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 6 + setvar VAR_SPECIAL_4, 6 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -601,7 +601,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 7 + setvar VAR_SPECIAL_4, 7 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -612,7 +612,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 8 + setvar VAR_SPECIAL_4, 8 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -623,7 +623,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 9 + setvar VAR_SPECIAL_4, 9 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -634,7 +634,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 10 + setvar VAR_SPECIAL_4, 10 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall @@ -645,7 +645,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 checkitem ITEM_COIN_CASE, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 - setvar SPECIALVAR_4, 11 + setvar VAR_SPECIAL_4, 11 specialvar RESULT, sub_810F424 playslotmachine RESULT releaseall diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index b8be1d0ac..05287c7de 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -46,19 +46,19 @@ MauvilleCity_Gym_EventScript_15649B:: @ 815649B end MauvilleCity_Gym_EventScript_15657D:: @ 815657D - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_15658B:: @ 815658B - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end MauvilleCity_Gym_EventScript_156599:: @ 8156599 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 special MauvilleGymSpecial1 goto MauvilleCity_Gym_EventScript_156491 end @@ -87,7 +87,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, MauvilleCity_Gym_EventScript_1A00FB - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView @@ -116,7 +116,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto MauvilleCity_Gym_EventScript_1566BA end @@ -127,7 +127,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto MauvilleCity_Gym_EventScript_1566BA end @@ -138,7 +138,7 @@ MauvilleCity_Gym_EventScript_156695:: @ 8156695 compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto MauvilleCity_Gym_EventScript_1566BA end diff --git a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc index c16b66482..85590f9c2 100644 --- a/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MauvilleCity_PokemonCenter_1F.inc @@ -13,7 +13,7 @@ MauvilleCity_PokemonCenter_1F_EventScript_157365:: @ 8157365 end MauvilleCity_PokemonCenter_1F_EventScript_157369:: @ 8157369 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call MauvilleCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 6d8aeee21..9395633e7 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -18,8 +18,8 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special PrintEReaderTrainerGreeting msgbox gStringVar4, 4 closemessage - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 0 special sub_813556C waitstate compare RESULT, 3 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index a1afd4e82..54a9546c4 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -65,7 +65,7 @@ MossdeepCity_Gym_EventScript_15A594:: @ 815A594 setflag FLAG_BADGE07_GET clearflag FLAG_HIDE_BRINEY_SLATEPORT_SHIPYARD clearflag FLAG_UNKNOWN_393 - setvar SPECIALVAR_8, 7 + setvar VAR_SPECIAL_8, 7 call MossdeepCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_WORKERS_SLATEPORT_HARBOR goto MossdeepCity_Gym_EventScript_15A5C6 diff --git a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc index 7f6220aa9..a722e666b 100644 --- a/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6 end MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call MossdeepCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 5f26583c9..eababfa6c 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -77,7 +77,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C getpartysize compare RESULT, 6 goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT removeobject 2 playfanfare 370 message MossdeepCity_StevensHouse_Text_18DD61 diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index eac29a855..6b919f2ca 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -44,7 +44,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C applymovement 1, MtChimney_CableCarStation_Movement_15C1A5 applymovement 255, MtChimney_CableCarStation_Movement_15C1AF waitmovement 0 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 2cf8b7b8e..9cd4eecd1 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -8,19 +8,19 @@ MtPyre_Summit_MapScript1_15D4B7:: @ 815D4B7 MtPyre_Summit_EventScript_15D4BD:: @ 815D4BD lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4C9:: @ 815D4C9 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D4E1 end MtPyre_Summit_EventScript_15D4D5:: @ 815D4D5 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto MtPyre_Summit_EventScript_15D4E1 end @@ -30,11 +30,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D593 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D59E - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 @@ -52,11 +52,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 fadescreen 0 delay 20 call MtPyre_Summit_EventScript_15D57A - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D5AA - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D5BF - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 @@ -196,7 +196,7 @@ MtPyre_Summit_EventScript_15D64A:: @ 815D64A end MtPyre_Summit_EventScript_15D669:: @ 815D669 - setvar SPECIALVAR_4, ITEM_RED_OR_BLUE_ORB + setvar VAR_SPECIAL_4, ITEM_RED_OR_BLUE_ORB call MtPyre_Summit_EventScript_1A067F closemessage applymovement LAST_TALKED, MtPyre_Summit_Movement_1A0841 @@ -246,19 +246,19 @@ MtPyre_Summit_EventScript_15D6C4:: @ 815D6C4 MtPyre_Summit_EventScript_15D6CE:: @ 815D6CE lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6DA:: @ 815D6DA lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto MtPyre_Summit_EventScript_15D6F2 end MtPyre_Summit_EventScript_15D6E6:: @ 815D6E6 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto MtPyre_Summit_EventScript_15D6F2 end @@ -268,11 +268,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 applymovement 2, MtPyre_Summit_Movement_1A0845 waitmovement 0 delay 50 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D75E - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D769 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 @@ -280,11 +280,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 msgbox MtPyre_Summit_Text_1B6848, 4 .endif closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, MtPyre_Summit_EventScript_15D77F - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, MtPyre_Summit_EventScript_15D78A - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index da913f4bd..d94e02227 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E end OldaleTown_PokemonCenter_1F_EventScript_152F17:: @ 8152F17 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call OldaleTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index 2717be669..b65c2e67d 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -6,29 +6,29 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E faceplayer checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED goto_if_eq PacifidlogTown_House3_EventScript_154338 - setvar SPECIALVAR_8, 2 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 2 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 setflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED release @@ -40,7 +40,7 @@ PacifidlogTown_House3_EventScript_154320:: @ 8154320 end PacifidlogTown_House3_EventScript_15432A:: @ 815432A - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794DF, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc index fa19f9d76..557b6497e 100644 --- a/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/PacifidlogTown_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105 end @ 8154109 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 31e01f8ab..2ac3f35f9 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -156,25 +156,25 @@ PetalburgCity_EventScript_14B82D:: @ 814B82D PetalburgCity_EventScript_14B836:: @ 814B836 lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B842:: @ 814B842 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B84E:: @ 814B84E lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_EventScript_14B866 end PetalburgCity_EventScript_14B85A:: @ 814B85A lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto PetalburgCity_EventScript_14B866 end @@ -187,23 +187,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B91B - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B930 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B93B - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_EventScript_14B965 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_EventScript_14B977 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_EventScript_14B989 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 2d95958a2..1bd1649cf 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -13,7 +13,7 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL call_if 1, PetalburgCity_Gym_EventScript_154FBB @@ -32,7 +32,7 @@ PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A call PetalburgCity_Gym_EventScript_154FBB call PetalburgCity_Gym_EventScript_154FDC @@ -122,87 +122,87 @@ PetalburgCity_Gym_EventScript_1545B9:: @ 81545B9 end PetalburgCity_Gym_EventScript_15463D:: @ 815463D - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154648:: @ 8154648 - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154653:: @ 8154653 - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_15465E:: @ 815465E - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto PetalburgCity_Gym_EventScript_154669 end PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse 8 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154800 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15481C - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154884 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15488F - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548A1 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548C5 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548D0 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548DB - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_15492F - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_154930 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_15493B - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_15493C - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_1548FC - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_1548F1 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm 420, 0 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, PetalburgCity_Gym_EventScript_15484E - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, PetalburgCity_Gym_EventScript_154860 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 @@ -403,7 +403,7 @@ PetalburgCity_Gym_EventScript_1549D6:: @ 81549D6 call PetalburgCity_Gym_EventScript_1A0424 setflag FLAG_HIDE_WATTSON_MAUVILLE_GYM clearflag FLAG_HIDE_WATTSON_MAUVILLE - setvar SPECIALVAR_8, 5 + setvar VAR_SPECIAL_8, 5 call PetalburgCity_Gym_EventScript_1A01C0 clearflag FLAG_HIDE_SLUDGE_BOMB_MAN_DEWFORD_HALL call PetalburgCity_Gym_EventScript_1544ED @@ -594,8 +594,8 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 85 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 85 msgbox PetalburgCity_Gym_Text_17B870, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -624,8 +624,8 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 98 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -637,8 +637,8 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 46 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -650,8 +650,8 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 59 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -663,8 +663,8 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 59 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -676,8 +676,8 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 72 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -689,8 +689,8 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 20 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -702,8 +702,8 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 20 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -715,8 +715,8 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 33 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -728,8 +728,8 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 33 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -741,8 +741,8 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 1 - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_8, 1 + setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -754,8 +754,8 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE goto_if 0, PetalburgCity_Gym_EventScript_154BB9 - setvar SPECIALVAR_8, 7 - setvar SPECIALVAR_9, 7 + setvar VAR_SPECIAL_8, 7 + setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, 5 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_154BA8 @@ -771,7 +771,7 @@ PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 end PetalburgCity_Gym_EventScript_154E1A:: @ 8154E1A - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_154FBB special DrawWholeMapView release @@ -789,7 +789,7 @@ PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 end PetalburgCity_Gym_EventScript_154E56:: @ 8154E56 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_154FFD special DrawWholeMapView release @@ -807,7 +807,7 @@ PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E end PetalburgCity_Gym_EventScript_154E92:: @ 8154E92 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_15503F special DrawWholeMapView release @@ -825,7 +825,7 @@ PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA end PetalburgCity_Gym_EventScript_154ECE:: @ 8154ECE - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_155081 special DrawWholeMapView release @@ -843,7 +843,7 @@ PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 end PetalburgCity_Gym_EventScript_154F0A:: @ 8154F0A - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_154FDC special DrawWholeMapView release @@ -861,7 +861,7 @@ PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 end PetalburgCity_Gym_EventScript_154F46:: @ 8154F46 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_15501E special DrawWholeMapView release @@ -879,7 +879,7 @@ PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E end PetalburgCity_Gym_EventScript_154F82:: @ 8154F82 - setvar SPECIALVAR_5, 0 + setvar VAR_SPECIAL_5, 0 call PetalburgCity_Gym_EventScript_155060 special DrawWholeMapView release @@ -890,73 +890,73 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 end PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A - setvar SPECIALVAR_4, 1 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 1 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB - setvar SPECIALVAR_4, 2 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 2 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC - setvar SPECIALVAR_4, 3 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 3 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD - setvar SPECIALVAR_4, 4 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 4 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E - setvar SPECIALVAR_4, 5 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 5 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F - setvar SPECIALVAR_4, 6 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 6 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 - setvar SPECIALVAR_4, 7 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 7 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 - setvar SPECIALVAR_4, 8 - compare SPECIALVAR_5, 0 + setvar VAR_SPECIAL_4, 8 + compare VAR_SPECIAL_5, 0 call_if 1, PetalburgCity_Gym_EventScript_155182 - compare SPECIALVAR_5, 1 + compare VAR_SPECIAL_5, 1 call_if 1, PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index cb79bdf86..8dda62ea1 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A end PetalburgCity_PokemonCenter_1F_EventScript_155213:: @ 8155213 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call PetalburgCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index 4d3f03cd1..b97d92c7d 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -153,7 +153,7 @@ Route104_EventScript_14EFD5:: @ 814EFD5 call Route104_EventScript_1A02EF setflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE104 hideobjectat 7, MAP_ROUTE104 - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE104 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 35e59cdff..f56081097 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -54,7 +54,7 @@ Route109_EventScript_14F548:: @ 814F548 hideobjectat 1, MAP_ROUTE109 msgbox Route109_Text_16B4B5, 4 closemessage - copyvar VAR_BRINEY_LOCATION, SPECIALVAR_8 + copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_ROUTE109 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index e409a3cd6..2b4293ed4 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -309,17 +309,17 @@ Route110_EventScript_14FD09:: @ 814FD09 return Route110_EventScript_14FD13:: @ 814FD13 - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD1E:: @ 814FD1E - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto Route110_EventScript_14FD34 end Route110_EventScript_14FD29:: @ 814FD29 - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 goto Route110_EventScript_14FD34 end @@ -337,11 +337,11 @@ Route110_EventScript_14FD34:: @ 814FD34 applymovement 28, Route110_Movement_1A0835 waitmovement 0 delay 30 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF14 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF1F - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 @@ -425,22 +425,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF56 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF5E - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route110_EventScript_14FF35 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route110_EventScript_14FF40 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 5dad15672..8a8dd2763 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -736,23 +736,23 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 end Route110_TrickHouseEntrance_EventScript_1618E1:: @ 81618E1 - setvar SPECIALVAR_4, 6 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 6 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_1618F6:: @ 81618F6 - setvar SPECIALVAR_4, 11 - setvar SPECIALVAR_5, 5 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 11 + setvar VAR_SPECIAL_5, 5 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return Route110_TrickHouseEntrance_EventScript_16190B:: @ 816190B - setvar SPECIALVAR_4, 9 - setvar SPECIALVAR_5, 2 - setvar SPECIALVAR_6, 0 + setvar VAR_SPECIAL_4, 9 + setvar VAR_SPECIAL_5, 2 + setvar VAR_SPECIAL_6, 0 call Route110_TrickHouseEntrance_EventScript_161920 return diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 2463feb9c..aa136559b 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -140,25 +140,25 @@ Route111_EventScript_150100:: @ 8150100 @ 815010A lockall - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto Route111_EventScript_15013A end Route111_EventScript_150116:: @ 8150116 lockall - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto Route111_EventScript_15013A end Route111_EventScript_150122:: @ 8150122 lockall - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto Route111_EventScript_15013A end @ 815012E lockall - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto Route111_EventScript_15013A end @@ -173,13 +173,13 @@ Route111_EventScript_15013A:: @ 815013A Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route111_EventScript_150188 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route111_EventScript_150193 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route111_EventScript_15019E - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 32f8e41a3..8352db786 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -4,7 +4,7 @@ Route111_WinstrateFamilysHouse_MapScripts:: @ 815BF24 Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 lock faceplayer - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 msgbox Route111_WinstrateFamilysHouse_Text_191FCE, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -12,7 +12,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF25:: @ 815BF25 Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 checkflag FLAG_RECEIVED_MACHO_BRACE goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 @@ -31,7 +31,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF72:: @ 815BF72 Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 lock faceplayer - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 msgbox Route111_WinstrateFamilysHouse_Text_192190, 4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 end @@ -39,7 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF80:: @ 815BF80 Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer - setvar SPECIALVAR_8, 4 + setvar VAR_SPECIAL_8, 4 checkflag FLAG_TEMP_4 goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 @@ -54,7 +54,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BFB6:: @ 815BFB6 Route111_WinstrateFamilysHouse_EventScript_15BFC4:: @ 815BFC4 closemessage - applymovement SPECIALVAR_8, Route111_WinstrateFamilysHouse_Movement_1A083D + applymovement VAR_SPECIAL_8, Route111_WinstrateFamilysHouse_Movement_1A083D waitmovement 0 release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index fcdd565bc..cba6c33e8 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -45,7 +45,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD applymovement 1, Route112_CableCarStation_Movement_15C0E6 applymovement 255, Route112_CableCarStation_Movement_15C0F0 waitmovement 0 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 887f019f3..bc32449cd 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -51,7 +51,7 @@ Route113_GlassWorkshop_EventScript_1635E4:: @ 81635E4 end Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE - setvar SPECIALVAR_9, 0 + setvar VAR_SPECIAL_9, 0 special ShowGlassWorkshopMenu waitstate switch RESULT @@ -67,9 +67,9 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar SPECIALVAR_8, 39 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 250 + setvar VAR_SPECIAL_8, 39 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -81,9 +81,9 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar SPECIALVAR_8, 40 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 500 + setvar VAR_SPECIAL_8, 40 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -95,9 +95,9 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar SPECIALVAR_8, 41 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 500 + setvar VAR_SPECIAL_8, 41 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -109,9 +109,9 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar SPECIALVAR_8, 43 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 1000 + setvar VAR_SPECIAL_8, 43 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -123,9 +123,9 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar SPECIALVAR_8, 42 - bufferitemname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 1000 + setvar VAR_SPECIAL_8, 42 + bufferitemname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -137,10 +137,10 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 end Route113_GlassWorkshop_EventScript_16378C:: @ 816378C - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 13 - bufferdecorationname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 6000 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 13 + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -152,10 +152,10 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C end Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 6 - bufferdecorationname 0, SPECIALVAR_8 - setvar SPECIALVAR_A, 8000 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 6 + bufferdecorationname 0, VAR_SPECIAL_8 + setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, 5 @@ -172,15 +172,15 @@ Route113_GlassWorkshop_EventScript_16380E:: @ 816380E end Route113_GlassWorkshop_EventScript_163818:: @ 8163818 - setvar SPECIALVAR_A, 250 - subvar SPECIALVAR_A, 16456 + setvar VAR_SPECIAL_A, 250 + subvar VAR_SPECIAL_A, 16456 buffernumberstring 0, 32778 msgbox Route113_GlassWorkshop_Text_19E697, 4 release end Route113_GlassWorkshop_EventScript_163830:: @ 8163830 - subvar SPECIALVAR_A, 16456 + subvar VAR_SPECIAL_A, 16456 buffernumberstring 1, 32778 message Route113_GlassWorkshop_Text_19E890 waitmessage @@ -201,22 +201,22 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare SPECIALVAR_9, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare SPECIALVAR_9, 1 + compare VAR_SPECIAL_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end Route113_GlassWorkshop_EventScript_163889:: @ 8163889 - giveitem_std SPECIALVAR_8 + giveitem_std VAR_SPECIAL_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638B4 return Route113_GlassWorkshop_EventScript_1638A1:: @ 81638A1 - givedecoration_std SPECIALVAR_8 + givedecoration_std VAR_SPECIAL_8 compare RESULT, 0 goto_if_eq Route113_GlassWorkshop_EventScript_1638C3 return @@ -245,59 +245,59 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 end Route113_GlassWorkshop_EventScript_163925:: @ 8163925 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 39 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 39 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 40 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 40 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 41 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 41 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 43 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 43 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 - setvar SPECIALVAR_9, 0 - setvar SPECIALVAR_8, 42 - bufferitemname 0, SPECIALVAR_8 + setvar VAR_SPECIAL_9, 0 + setvar VAR_SPECIAL_8, 42 + bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 13 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 13 bufferdecorationname 0, 13 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D - setvar SPECIALVAR_9, 1 - setvar SPECIALVAR_8, 6 + setvar VAR_SPECIAL_9, 1 + setvar VAR_SPECIAL_8, 6 bufferdecorationname 0, 6 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 - compare SPECIALVAR_9, 0 + compare VAR_SPECIAL_9, 0 call_if 1, Route113_GlassWorkshop_EventScript_163889 - compare SPECIALVAR_9, 1 + compare VAR_SPECIAL_9, 1 call_if 1, Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 051b30d54..b34c22a50 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -50,7 +50,7 @@ Route118_EventScript_150FA5:: @ 8150FA5 Route118_EventScript_150FAE:: @ 8150FAE lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_151069 @@ -60,7 +60,7 @@ Route118_EventScript_150FAE:: @ 8150FAE Route118_EventScript_150FCE:: @ 8150FCE lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 applymovement 255, Route118_Movement_1A0841 waitmovement 0 goto Route118_EventScript_151004 @@ -68,7 +68,7 @@ Route118_EventScript_150FCE:: @ 8150FCE Route118_EventScript_150FE4:: @ 8150FE4 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 applymovement 255, Route118_Movement_1A0841 waitmovement 0 applymovement 19, Route118_Movement_15106B @@ -83,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 delay 30 msgbox Route118_Text_170D66, 4 closemessage - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, Route118_EventScript_151048 - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, Route118_EventScript_151053 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 85938be18..95edf346c 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -9,9 +9,9 @@ Route119_MapScript1_151172:: @ 8151172 end Route119_EventScript_15117C:: @ 815117C - compare SPECIALVAR_4, 6 + compare VAR_SPECIAL_4, 6 call_if 1, Route119_EventScript_151193 - compare SPECIALVAR_4, 7 + compare VAR_SPECIAL_4, 7 call_if 1, Route119_EventScript_151197 return diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index da0a65af1..9e5ff95be 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -10,17 +10,17 @@ Route120_MapScript1_15161E:: @ 815161E end Route120_EventScript_151628:: @ 8151628 - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 call_if 1, Route120_EventScript_15166B - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 call_if 1, Route120_EventScript_151672 - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 call_if 1, Route120_EventScript_151676 - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 call_if 1, Route120_EventScript_15167A - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 call_if 1, Route120_EventScript_15167E - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 call_if 1, Route120_EventScript_151682 return @@ -135,32 +135,32 @@ Route120_EventScript_151739:: @ 8151739 end Route120_EventScript_1517DC:: @ 81517DC - setvar SPECIALVAR_4, ITEM_FIGY_BERRY + setvar VAR_SPECIAL_4, ITEM_FIGY_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517E7:: @ 81517E7 - setvar SPECIALVAR_4, ITEM_WIKI_BERRY + setvar VAR_SPECIAL_4, ITEM_WIKI_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517F2:: @ 81517F2 - setvar SPECIALVAR_4, ITEM_MAGO_BERRY + setvar VAR_SPECIAL_4, ITEM_MAGO_BERRY goto Route120_EventScript_151813 end Route120_EventScript_1517FD:: @ 81517FD - setvar SPECIALVAR_4, ITEM_AGUAV_BERRY + setvar VAR_SPECIAL_4, ITEM_AGUAV_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151808:: @ 8151808 - setvar SPECIALVAR_4, ITEM_IAPAPA_BERRY + setvar VAR_SPECIAL_4, ITEM_IAPAPA_BERRY goto Route120_EventScript_151813 end Route120_EventScript_151813:: @ 8151813 - giveitem_std SPECIALVAR_4 + giveitem_std VAR_SPECIAL_4 compare RESULT, 0 goto_if_eq Route120_EventScript_1A029B setflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 @@ -226,7 +226,7 @@ Route120_EventScript_15189D:: @ 815189D delay 40 waitmoncry setwildbattle SPECIES_KECLEON, 30, ITEM_NONE - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 setflag FLAG_SYS_CTRL_OBJ_DELETE dowildbattle clearflag FLAG_SYS_CTRL_OBJ_DELETE diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 0dbf1d345..26edb6fbb 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -43,7 +43,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 - setvar SPECIALVAR_4, 13 + setvar VAR_SPECIAL_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 lock faceplayer @@ -60,17 +60,17 @@ Route123_BerryMastersHouse_EventScript_163A9B:: @ 8163A9B end Route123_BerryMastersHouse_EventScript_163AAD:: @ 8163AAD - compare SPECIALVAR_4, 0 + compare VAR_SPECIAL_4, 0 goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 - compare SPECIALVAR_4, 1 + compare VAR_SPECIAL_4, 1 goto_if_eq Route123_BerryMastersHouse_EventScript_163B1E - compare SPECIALVAR_4, 2 + compare VAR_SPECIAL_4, 2 goto_if_eq Route123_BerryMastersHouse_EventScript_163B4F - compare SPECIALVAR_4, 3 + compare VAR_SPECIAL_4, 3 goto_if_eq Route123_BerryMastersHouse_EventScript_163B80 - compare SPECIALVAR_4, 4 + compare VAR_SPECIAL_4, 4 goto_if_eq Route123_BerryMastersHouse_EventScript_163BB1 - compare SPECIALVAR_4, 5 + compare VAR_SPECIAL_4, 5 goto_if_eq Route123_BerryMastersHouse_EventScript_163BE2 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 6d0bcc2c6..4061dcd7e 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,43 +224,43 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar SPECIALVAR_8, 48 - setvar SPECIALVAR_9, 95 + setvar VAR_SPECIAL_8, 48 + setvar VAR_SPECIAL_9, 95 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar SPECIALVAR_8, 50 - setvar SPECIALVAR_9, 96 + setvar VAR_SPECIAL_8, 50 + setvar VAR_SPECIAL_9, 96 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar SPECIALVAR_8, 49 - setvar SPECIALVAR_9, 97 + setvar VAR_SPECIAL_8, 49 + setvar VAR_SPECIAL_9, 97 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar SPECIALVAR_8, 51 - setvar SPECIALVAR_9, 98 + setvar VAR_SPECIAL_8, 51 + setvar VAR_SPECIAL_9, 98 goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 - bufferitemname 0, SPECIALVAR_8 - bufferitemname 1, SPECIALVAR_9 + bufferitemname 0, VAR_SPECIAL_8 + bufferitemname 1, VAR_SPECIAL_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F - checkitemspace SPECIALVAR_9, 1 + checkitemspace VAR_SPECIAL_9, 1 compare RESULT, 1 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 - checkitem SPECIALVAR_8, 2 + checkitem VAR_SPECIAL_8, 2 compare RESULT, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_1642D3 goto Route124_DivingTreasureHuntersHouse_EventScript_164315 end Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 - takeitem SPECIALVAR_8, 1 - giveitem_std SPECIALVAR_9 + takeitem VAR_SPECIAL_8, 1 + giveitem_std VAR_SPECIAL_9 msgbox Route124_DivingTreasureHuntersHouse_Text_19F606, 4 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index e4cef9fa4..47d216d9f 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -126,7 +126,7 @@ RustboroCity_EventScript_14C481:: @ 814C481 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 0 + setvar VAR_SPECIAL_4, 0 goto RustboroCity_EventScript_14C4F4 end @@ -134,7 +134,7 @@ RustboroCity_EventScript_14C498:: @ 814C498 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 1 + setvar VAR_SPECIAL_4, 1 goto RustboroCity_EventScript_14C4F4 end @@ -142,7 +142,7 @@ RustboroCity_EventScript_14C4AF:: @ 814C4AF lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 goto RustboroCity_EventScript_14C4F4 end @@ -150,7 +150,7 @@ RustboroCity_EventScript_14C4C6:: @ 814C4C6 lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 3 + setvar VAR_SPECIAL_4, 3 goto RustboroCity_EventScript_14C4F4 end @@ -158,7 +158,7 @@ RustboroCity_EventScript_14C4DD:: @ 814C4DD lockall setobjectxyperm 9, 14, 21 setobjectmovementtype 9, 10 - setvar SPECIALVAR_4, 4 + setvar VAR_SPECIAL_4, 4 goto RustboroCity_EventScript_14C4F4 end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 2e18bc55e..c997935cc 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -137,7 +137,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 @@ -157,7 +157,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 getpartysize compare RESULT, 6 goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157707 - copyvar SPECIALVAR_4, RESULT + copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON playfanfare 370 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index ef4d6fad1..1e2256b47 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -18,7 +18,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setflag FLAG_BADGE01_GET setvar VAR_RUSTBORO_STATE, 1 addvar VAR_PETALBURG_GYM_STATE, 1 - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 call_if 1, RustboroCity_Gym_EventScript_1A00FB diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 8761d3898..cf91c31bd 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -6,25 +6,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D faceplayer checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED goto_if_eq RustboroCity_House1_EventScript_157D13 - setvar SPECIALVAR_8, 0 - copyvar SPECIALVAR_4, SPECIALVAR_8 + setvar VAR_SPECIAL_8, 0 + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, sub_804D89C - copyvar SPECIALVAR_9, RESULT + copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB special sub_80F9A0C waitstate - copyvar SPECIALVAR_A, SPECIALVAR_4 - compare SPECIALVAR_4, 255 + copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 + compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A specialvar RESULT, sub_804DB2C - copyvar SPECIALVAR_B, RESULT - compare RESULT, SPECIALVAR_9 + copyvar VAR_SPECIAL_B, RESULT + compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 - copyvar SPECIALVAR_4, SPECIALVAR_8 - copyvar SPECIALVAR_5, SPECIALVAR_A + copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 + copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special sub_804DB68 special sub_804E174 waitstate @@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB end RustboroCity_House1_EventScript_157D05:: @ 8157D05 - bufferspeciesname 0, SPECIALVAR_9 + bufferspeciesname 0, VAR_SPECIAL_9 msgbox RustboroCity_House1_Text_184F8F, 4 release end diff --git a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc index c9a2a48a4..653cceb25 100644 --- a/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/RustboroCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F end RustboroCity_PokemonCenter_1F_EventScript_157B88:: @ 8157B88 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call RustboroCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index fb332fbff..574c7412e 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -14,10 +14,10 @@ SeafloorCavern_Room9_MapScript1_15DAEC:: @ 815DAEC SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA lockall - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 4 - setvar SPECIALVAR_7, 5 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_7, 5 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 applymovement 255, SeafloorCavern_Room9_Movement_15DD68 @@ -28,24 +28,24 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4850, 4 .endif closemessage - addobject SPECIALVAR_4 + addobject VAR_SPECIAL_4 applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD36 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD36 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B41D5, 4 .else msgbox SeafloorCavern_Room9_Text_1B486C, 4 .endif - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4201, 4 .else msgbox SeafloorCavern_Room9_Text_1B4897, 4 .endif - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0839 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0839 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4289, 4 @@ -92,7 +92,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA playfanfare 388 playse 107 special sub_80818A4 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0841 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 waitmovement 0 delay 150 @@ -104,23 +104,23 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA waitmovement 0 special sub_80818FC waitstate - setvar SPECIALVAR_4, 1 - setvar SPECIALVAR_5, 1 + setvar VAR_SPECIAL_4, 1 + setvar VAR_SPECIAL_5, 1 special sub_810F758 waitstate applymovement 1, SeafloorCavern_Room9_Movement_15DD57 waitmovement 0 removeobject 1 delay 4 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 2 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 2 special sub_810F758 waitstate delay 30 - setvar SPECIALVAR_4, 2 - setvar SPECIALVAR_5, 3 - setvar SPECIALVAR_6, 4 - setvar SPECIALVAR_7, 5 + setvar VAR_SPECIAL_4, 2 + setvar VAR_SPECIAL_5, 3 + setvar VAR_SPECIAL_6, 4 + setvar VAR_SPECIAL_7, 5 .ifdef SAPPHIRE msgbox UnknownString_81B43F2, 4 .else @@ -135,7 +135,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4ADB, 4 .endif closemessage - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD41 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD41 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B447A, 4 @@ -145,7 +145,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA closemessage playse 3 delay 20 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0845 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B45C6, 4 @@ -153,14 +153,14 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4C79, 4 .endif closemessage - addobject SPECIALVAR_5 - addobject SPECIALVAR_6 - addobject SPECIALVAR_7 - applymovement SPECIALVAR_7, SeafloorCavern_Room9_Movement_15DD63 - applymovement SPECIALVAR_6, SeafloorCavern_Room9_Movement_15DD63 - applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD5A + addobject VAR_SPECIAL_5 + addobject VAR_SPECIAL_6 + addobject VAR_SPECIAL_7 + applymovement VAR_SPECIAL_7, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_6, SeafloorCavern_Room9_Movement_15DD63 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD5A waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A083F + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B464D, 4 @@ -168,9 +168,9 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif playse 21 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0833 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_1A0835 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4723, 4 @@ -183,8 +183,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4E37, 4 .endif closemessage - applymovement SPECIALVAR_5, SeafloorCavern_Room9_Movement_15DD60 - applymovement SPECIALVAR_4, SeafloorCavern_Room9_Movement_15DD46 + applymovement VAR_SPECIAL_5, SeafloorCavern_Room9_Movement_15DD60 + applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_15DD46 waitmovement 0 .ifdef SAPPHIRE msgbox UnknownString_81B4818, 4 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index c481a0461..72528a929 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -7,7 +7,7 @@ SlateportCity_ContestLobby_MapScript1_155417:: @ 8155417 end SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D - setvar SPECIALVAR_B, 7 + setvar VAR_SPECIAL_B, 7 setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index b8547fda9..72f2d0382 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -24,25 +24,25 @@ SlateportCity_Harbor_EventScript_155F89:: @ 8155F89 SlateportCity_Harbor_EventScript_155F9B:: @ 8155F9B lockall - setvar SPECIALVAR_8, 0 + setvar VAR_SPECIAL_8, 0 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FA7:: @ 8155FA7 lockall - setvar SPECIALVAR_8, 1 + setvar VAR_SPECIAL_8, 1 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FB3:: @ 8155FB3 lockall - setvar SPECIALVAR_8, 2 + setvar VAR_SPECIAL_8, 2 goto SlateportCity_Harbor_EventScript_155FD5 end SlateportCity_Harbor_EventScript_155FBF:: @ 8155FBF lockall - setvar SPECIALVAR_8, 3 + setvar VAR_SPECIAL_8, 3 applymovement 255, SlateportCity_Harbor_Movement_1560C2 waitmovement 0 goto SlateportCity_Harbor_EventScript_155FD5 @@ -63,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 7 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 - compare SPECIALVAR_8, 0 + compare VAR_SPECIAL_8, 0 call_if 1, SlateportCity_Harbor_EventScript_15605C - compare SPECIALVAR_8, 1 + compare VAR_SPECIAL_8, 1 call_if 1, SlateportCity_Harbor_EventScript_156071 - compare SPECIALVAR_8, 2 + compare VAR_SPECIAL_8, 2 call_if 1, SlateportCity_Harbor_EventScript_156086 - compare SPECIALVAR_8, 3 + compare VAR_SPECIAL_8, 3 call_if 1, SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage @@ -229,7 +229,7 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 call_if 1, SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY - setvar SPECIALVAR_4, 5 + setvar VAR_SPECIAL_4, 5 call SlateportCity_Harbor_EventScript_1A040E return diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 80522f4c1..e760beab5 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -15,9 +15,9 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 special sub_80F9A0C waitstate - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 - compare SPECIALVAR_4, 255 + compare VAR_SPECIAL_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index c261f3e83..007e42f90 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -78,7 +78,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 255, SlateportCity_OceanicMuseum_2F_Movement_1A0843 waitmovement 0 msgbox SlateportCity_OceanicMuseum_2F_Text_17F352, 4 - setvar SPECIALVAR_4, 269 + setvar VAR_SPECIAL_4, 269 call SlateportCity_OceanicMuseum_2F_EventScript_1A067F msgbox SlateportCity_OceanicMuseum_2F_Text_17F433, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc index f9b7c7fb3..37b2b95ab 100644 --- a/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SlateportCity_PokemonCenter_1F.inc @@ -8,7 +8,7 @@ SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5 end SlateportCity_PokemonCenter_1F_EventScript_1563CE:: @ 81563CE - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call SlateportCity_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index b7f0f996b..9f2d6c35b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -102,7 +102,7 @@ SootopolisCity_Gym_1F_EventScript_15B02D:: @ 815B02D msgbox SootopolisCity_Gym_1F_Text_18F36B, 4 setflag FLAG_DEFEATED_SOOTOPOLIS_GYM setflag FLAG_BADGE08_GET - setvar SPECIALVAR_8, 8 + setvar VAR_SPECIAL_8, 8 call SootopolisCity_Gym_1F_EventScript_1A01C0 goto SootopolisCity_Gym_1F_EventScript_15B056 end diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index a9810ed16..6a72ec1da 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -8,7 +8,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 msgbox SootopolisCity_House8_Text_1900F7, 4 special sub_80F9A0C waitstate - copyvar RESULT, SPECIALVAR_4 + copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B448 special CompareShroomishSize @@ -57,7 +57,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 msgbox SootopolisCity_House8_Text_190431, 4 special sub_80F9A0C waitstate - copyvar RESULT, SPECIALVAR_4 + copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 goto_if_eq SootopolisCity_House8_EventScript_15B4D9 special CompareBarboachSize diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 1bbd30364..9eb5b4a57 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -7,7 +7,7 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 end @ 815B19A - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index 7624b3da3..ab2a73460 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -18,7 +18,7 @@ SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 waitmovement 0 delay 30 hideobjectat 1, MAP_SOUTHERN_ISLAND_EXTERIOR - setvar SPECIALVAR_4, 2 + setvar VAR_SPECIAL_4, 2 call SouthernIsland_Exterior_EventScript_1A047C warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index 63fd57a20..cbc451a18 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -39,7 +39,7 @@ SouthernIsland_Interior_EventScript_160B95:: @ 8160B95 SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B lockall - setvar SPECIALVAR_8, 12 + setvar VAR_SPECIAL_8, 12 goto SouthernIsland_Interior_EventScript_160BA7 end diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 54a614576..8d3e8e723 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -3,10 +3,10 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 .byte 0 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 - getplayerxy SPECIALVAR_4, SPECIALVAR_5 - compare SPECIALVAR_4, 12 + getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 + compare VAR_SPECIAL_4, 12 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 - compare SPECIALVAR_5, 44 + compare VAR_SPECIAL_5, 44 goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 83298dba6..568d9b207 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -7,7 +7,7 @@ VerdanturfTown_ContestLobby_MapScript1_153D70:: @ 8153D70 end VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 - setvar SPECIALVAR_B, 5 + setvar VAR_SPECIAL_B, 5 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 diff --git a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc index 2323c139a..956a28ac5 100644 --- a/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/VerdanturfTown_PokemonCenter_1F.inc @@ -9,7 +9,7 @@ VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F PacifidlogTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 VerdanturfTown_PokemonCenter_1F_EventScript_153F18:: @ 8153F18 - setvar SPECIALVAR_B, 1 + setvar VAR_SPECIAL_B, 1 call VerdanturfTown_PokemonCenter_1F_EventScript_19FD5B waitmessage waitbuttonpress -- cgit v1.2.3 From 80cddf0cd4946d85e5e23ec90c530ca2ea54732d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Tue, 26 Dec 2017 14:03:01 -0600 Subject: Add bg_hidden_item_event macro, and define hidden item flags --- data/scripts/maps/Route116.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index b1b331d00..5fab808bc 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -150,7 +150,7 @@ Route116_EventScript_150B8F:: @ 8150B8F checkitem ITEM_BLACK_GLASSES, 1 compare RESULT, 1 goto_if_eq Route116_EventScript_150BCA - specialvar RESULT, sub_810F828 + specialvar RESULT, FoundBlackGlasses compare RESULT, 1 goto_if_eq Route116_EventScript_150BBB msgbox Route116_Text_1708EE, 4 @@ -166,7 +166,7 @@ Route116_EventScript_150BBB:: @ 8150BBB Route116_EventScript_150BCA:: @ 8150BCA msgbox Route116_Text_1708EE, 4 msgbox Route116_Text_170921, 4 - specialvar RESULT, sub_810F828 + specialvar RESULT, FoundBlackGlasses compare RESULT, 1 goto_if_eq Route116_EventScript_150BF4 msgbox Route116_Text_170A03, 4 -- cgit v1.2.3 From 7f0ba304065a80d68b8610c4c8801839221677f6 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Sun, 31 Dec 2017 16:59:55 -0600 Subject: Port battle_setup names from pokeemerald --- data/scripts/maps/AbandonedShip_Rooms2_1F.inc | 4 ++-- data/scripts/maps/FallarborTown_ContestLobby.inc | 2 +- data/scripts/maps/JaggedPass.inc | 4 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- data/scripts/maps/MeteorFalls_1F_2R.inc | 6 +++--- data/scripts/maps/MtChimney.inc | 2 +- data/scripts/maps/MtPyre_6F.inc | 2 +- data/scripts/maps/PetalburgWoods.inc | 2 +- data/scripts/maps/Route102.inc | 2 +- data/scripts/maps/Route103.inc | 6 +++--- data/scripts/maps/Route104.inc | 6 +++--- data/scripts/maps/Route106.inc | 2 +- data/scripts/maps/Route107.inc | 2 +- data/scripts/maps/Route109.inc | 4 ++-- data/scripts/maps/Route110.inc | 8 ++++---- data/scripts/maps/Route111.inc | 6 +++--- data/scripts/maps/Route112.inc | 2 +- data/scripts/maps/Route113.inc | 4 ++-- data/scripts/maps/Route114.inc | 4 ++-- data/scripts/maps/Route115.inc | 6 +++--- data/scripts/maps/Route116.inc | 4 ++-- data/scripts/maps/Route117.inc | 12 ++++++------ data/scripts/maps/Route118.inc | 4 ++-- data/scripts/maps/Route119.inc | 4 ++-- data/scripts/maps/Route120.inc | 4 ++-- data/scripts/maps/Route121.inc | 4 ++-- data/scripts/maps/Route123.inc | 4 ++-- data/scripts/maps/Route124.inc | 6 +++--- data/scripts/maps/Route125.inc | 2 +- data/scripts/maps/Route128.inc | 4 ++-- data/scripts/maps/SlateportCity_ContestLobby.inc | 2 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 2 +- data/scripts/maps/VictoryRoad_1F.inc | 2 +- 33 files changed, 65 insertions(+), 65 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc index 5e8ab1062..e1e903cc0 100644 --- a/data/scripts/maps/AbandonedShip_Rooms2_1F.inc +++ b/data/scripts/maps/AbandonedShip_Rooms2_1F.inc @@ -3,7 +3,7 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 815EA67 AbandonedShip_Rooms2_1F_EventScript_15EA68:: @ 815EA68 trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1987C1, AbandonedShip_Rooms2_1F_Text_1987FE, AbandonedShip_Rooms2_1F_Text_19887F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EA93 msgbox AbandonedShip_Rooms2_1F_Text_198835, 6 @@ -16,7 +16,7 @@ AbandonedShip_Rooms2_1F_EventScript_15EA93:: @ 815EA93 AbandonedShip_Rooms2_1F_EventScript_15EAAE:: @ 815EAAE trainerbattle 4, OPPONENT_LOIS_AND_HAL_1, 0, AbandonedShip_Rooms2_1F_Text_1988CC, AbandonedShip_Rooms2_1F_Text_198916, AbandonedShip_Rooms2_1F_Text_19899A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq AbandonedShip_Rooms2_1F_EventScript_15EAD9 msgbox AbandonedShip_Rooms2_1F_Text_198934, 6 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index a0fd0ac3d..270575bcb 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -11,7 +11,7 @@ FallarborTown_ContestLobby_EventScript_1539CD:: @ 81539CD setvar CONTEST_RANK, 1 call FallarborTown_ContestLobby_EventScript_1A4E92 call FallarborTown_ContestLobby_EventScript_1539F8 - special sub_80C4BF0 + special SetContestTrainerGfxIds call FallarborTown_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 2 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index 1a4fd9bdc..bf1f0233d 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -24,7 +24,7 @@ JaggedPass_EventScript_15D285:: @ 815D285 JaggedPass_EventScript_15D29C:: @ 815D29C trainerbattle 0, OPPONENT_DIANA_1, 0, JaggedPass_Text_195E9E, JaggedPass_Text_195EDF - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D2C3 msgbox JaggedPass_Text_195F04, 6 @@ -37,7 +37,7 @@ JaggedPass_EventScript_15D2C3:: @ 815D2C3 JaggedPass_EventScript_15D2DA:: @ 815D2DA trainerbattle 0, OPPONENT_ETHAN_1, 0, JaggedPass_Text_195FF2, JaggedPass_Text_196032 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq JaggedPass_EventScript_15D301 msgbox JaggedPass_Text_196077, 6 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7a13b1c48..377c2908d 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -575,7 +575,7 @@ LilycoveCity_ContestLobby_EventScript_158EB0:: @ 8158EB0 setvar CONTEST_RANK, 3 call LilycoveCity_ContestLobby_EventScript_1A4E92 call LilycoveCity_ContestLobby_EventScript_158F86 - special sub_80C4BF0 + special SetContestTrainerGfxIds call LilycoveCity_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 4 call LilycoveCity_ContestLobby_EventScript_158F08 diff --git a/data/scripts/maps/MeteorFalls_1F_2R.inc b/data/scripts/maps/MeteorFalls_1F_2R.inc index b3a0c51fe..49d629294 100644 --- a/data/scripts/maps/MeteorFalls_1F_2R.inc +++ b/data/scripts/maps/MeteorFalls_1F_2R.inc @@ -3,7 +3,7 @@ MeteorFalls_1F_2R_MapScripts:: @ 815C678 MeteorFalls_1F_2R_EventScript_15C679:: @ 815C679 trainerbattle 0, OPPONENT_NICOLAS_1, 0, MeteorFalls_1F_2R_Text_1939C5, MeteorFalls_1F_2R_Text_193A35 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6A0 msgbox MeteorFalls_1F_2R_Text_193A60, 6 @@ -16,7 +16,7 @@ MeteorFalls_1F_2R_EventScript_15C6A0:: @ 815C6A0 MeteorFalls_1F_2R_EventScript_15C6B7:: @ 815C6B7 trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193BB7, MeteorFalls_1F_2R_Text_193C10, MeteorFalls_1F_2R_Text_193C9F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C6E2 msgbox MeteorFalls_1F_2R_Text_193C35, 6 @@ -29,7 +29,7 @@ MeteorFalls_1F_2R_EventScript_15C6E2:: @ 815C6E2 MeteorFalls_1F_2R_EventScript_15C6FD:: @ 815C6FD trainerbattle 4, OPPONENT_JOHN_AND_JAY_1, 0, MeteorFalls_1F_2R_Text_193D10, MeteorFalls_1F_2R_Text_193D6E, MeteorFalls_1F_2R_Text_193DFB - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MeteorFalls_1F_2R_EventScript_15C728 msgbox MeteorFalls_1F_2R_Text_193D9A, 6 diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index a831f0dcc..d93ec772a 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -440,7 +440,7 @@ MtChimney_EventScript_15D1DA:: @ 815D1DA MtChimney_EventScript_15D1E3:: @ 815D1E3 trainerbattle 0, OPPONENT_SHELBY_1, 0, MtChimney_Text_19597F, MtChimney_Text_1959D8 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtChimney_EventScript_15D20A msgbox MtChimney_Text_195A04, 6 diff --git a/data/scripts/maps/MtPyre_6F.inc b/data/scripts/maps/MtPyre_6F.inc index 433b533b3..ae09300a3 100644 --- a/data/scripts/maps/MtPyre_6F.inc +++ b/data/scripts/maps/MtPyre_6F.inc @@ -3,7 +3,7 @@ MtPyre_6F_MapScripts:: @ 815D447 MtPyre_6F_EventScript_15D448:: @ 815D448 trainerbattle 0, OPPONENT_VALERIE_1, 0, MtPyre_6F_Text_1969FE, MtPyre_6F_Text_196A30 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq MtPyre_6F_EventScript_15D46F msgbox MtPyre_6F_Text_196A4C, 6 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 83bfe7da4..73eb4f661 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -271,7 +271,7 @@ PetalburgWoods_EventScript_15CF27:: @ 815CF27 PetalburgWoods_EventScript_15CF3E:: @ 815CF3E trainerbattle 0, OPPONENT_JAMES_1, 0, PetalburgWoods_Text_19526A, PetalburgWoods_Text_1952AE - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq PetalburgWoods_EventScript_15CF65 msgbox PetalburgWoods_Text_1952CC, 6 diff --git a/data/scripts/maps/Route102.inc b/data/scripts/maps/Route102.inc index 95a0a4a1f..ad1571caa 100644 --- a/data/scripts/maps/Route102.inc +++ b/data/scripts/maps/Route102.inc @@ -19,7 +19,7 @@ Route102_EventScript_14EAF5:: @ 814EAF5 Route102_EventScript_14EAFE:: @ 814EAFE trainerbattle 0, OPPONENT_CALVIN_1, 0, Route102_Text_1B79C3, Route102_Text_1B7A2C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route102_EventScript_14EB25 msgbox Route102_Text_1B7A60, 6 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index 35994cd45..bfcbeb87a 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -173,7 +173,7 @@ Route103_EventScript_14ED94:: @ 814ED94 Route103_EventScript_14EDAB:: @ 814EDAB trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7DF7, Route103_Text_1B7E3B, Route103_Text_1B7EAC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EDD6 msgbox Route103_Text_1B7E50, 6 @@ -186,7 +186,7 @@ Route103_EventScript_14EDD6:: @ 814EDD6 Route103_EventScript_14EDF1:: @ 814EDF1 trainerbattle 4, OPPONENT_AMY_AND_LIV_1, 0, Route103_Text_1B7EFB, Route103_Text_1B7F20, Route103_Text_1B7F8E - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE1C msgbox Route103_Text_1B7F40, 6 @@ -204,7 +204,7 @@ Route103_EventScript_14EE37:: @ 814EE37 Route103_EventScript_14EE4E:: @ 814EE4E trainerbattle 0, OPPONENT_MIGUEL_1, 0, Route103_Text_1B82A9, Route103_Text_1B82EC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route103_EventScript_14EE75 msgbox Route103_Text_1B830D, 6 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index b97d92c7d..c90a97531 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -409,7 +409,7 @@ Route104_EventScript_14F189:: @ 814F189 Route104_EventScript_14F1A0:: @ 814F1A0 trainerbattle 0, OPPONENT_HALEY_1, 0, Route104_Text_1B8770, Route104_Text_1B87A7 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F1C7 msgbox Route104_Text_1B87C3, 6 @@ -422,7 +422,7 @@ Route104_EventScript_14F1C7:: @ 814F1C7 Route104_EventScript_14F1DE:: @ 814F1DE trainerbattle 0, OPPONENT_WINSTON_1, 0, Route104_Text_1B88D4, Route104_Text_1B8911 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F205 msgbox Route104_Text_1B8925, 6 @@ -435,7 +435,7 @@ Route104_EventScript_14F205:: @ 814F205 Route104_EventScript_14F21C:: @ 814F21C trainerbattle 0, OPPONENT_CINDY_1, 0, Route104_Text_1B8A24, Route104_Text_1B8A61 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route104_EventScript_14F243 msgbox Route104_Text_1B8A69, 6 diff --git a/data/scripts/maps/Route106.inc b/data/scripts/maps/Route106.inc index 2ec903363..ae65c7013 100644 --- a/data/scripts/maps/Route106.inc +++ b/data/scripts/maps/Route106.inc @@ -17,7 +17,7 @@ Route106_EventScript_14F34F:: @ 814F34F Route106_EventScript_14F366:: @ 814F366 trainerbattle 0, OPPONENT_ELLIOT_1, 0, Route106_Text_1B8EF0, Route106_Text_1B8F25 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route106_EventScript_14F38D msgbox Route106_Text_1B8F55, 6 diff --git a/data/scripts/maps/Route107.inc b/data/scripts/maps/Route107.inc index b6973407b..ad2d293fc 100644 --- a/data/scripts/maps/Route107.inc +++ b/data/scripts/maps/Route107.inc @@ -8,7 +8,7 @@ Route107_EventScript_14F3BC:: @ 814F3BC Route107_EventScript_14F3D3:: @ 814F3D3 trainerbattle 0, OPPONENT_TONY_1, 0, Route107_Text_1B933A, Route107_Text_1B9365 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route107_EventScript_14F3FA msgbox Route107_Text_1B938E, 6 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index f56081097..28bf046a4 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -396,7 +396,7 @@ Route109_EventScript_14F7F2:: @ 814F7F2 Route109_EventScript_14F809:: @ 814F809 trainerbattle 0, OPPONENT_RICKY_1, 0, Route109_Text_1B9C23, Route109_Text_1B9C65 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F830 msgbox Route109_Text_1B9C6E, 6 @@ -409,7 +409,7 @@ Route109_EventScript_14F830:: @ 814F830 Route109_EventScript_14F847:: @ 814F847 trainerbattle 0, OPPONENT_LOLA_1, 0, Route109_Text_1B9D54, Route109_Text_1B9D87 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route109_EventScript_14F86E msgbox Route109_Text_1B9D8E, 6 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 2b4293ed4..586031a1a 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -177,7 +177,7 @@ Route110_EventScript_14FAA5:: @ 814FAA5 Route110_EventScript_14FABC:: @ 814FABC trainerbattle 0, OPPONENT_EDWIN_1, 0, Route110_Text_1BA7D2, Route110_Text_1BA803 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FAE3 msgbox Route110_Text_1BA829, 6 @@ -205,7 +205,7 @@ Route110_EventScript_14FB28:: @ 814FB28 Route110_EventScript_14FB3F:: @ 814FB3F trainerbattle 0, OPPONENT_BENJAMIN_1, 0, Route110_Text_1BA352, Route110_Text_1BA379 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FB66 msgbox Route110_Text_1BA3A5, 6 @@ -223,7 +223,7 @@ Route110_EventScript_14FB7D:: @ 814FB7D Route110_EventScript_14FB94:: @ 814FB94 trainerbattle 0, OPPONENT_ABIGAIL_1, 0, Route110_Text_1BA4A0, Route110_Text_1BA50F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBBB msgbox Route110_Text_1BA52E, 6 @@ -236,7 +236,7 @@ Route110_EventScript_14FBBB:: @ 814FBBB Route110_EventScript_14FBD2:: @ 814FBD2 trainerbattle 0, OPPONENT_ISABEL_1, 0, Route110_Text_1BA990, Route110_Text_1BA9D0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route110_EventScript_14FBF9 msgbox Route110_Text_1BA9E9, 6 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index aa136559b..5336bd510 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -392,7 +392,7 @@ Route111_EventScript_1503EC:: @ 81503EC Route111_EventScript_150403:: @ 8150403 trainerbattle 0, OPPONENT_DUSTY_1, 0, Route111_Text_1BAEC9, Route111_Text_1BAF14 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_15042A msgbox Route111_Text_1BAF5B, 6 @@ -420,7 +420,7 @@ Route111_EventScript_15046F:: @ 815046F Route111_EventScript_150486:: @ 8150486 trainerbattle 0, OPPONENT_WILTON_1, 0, Route111_Text_1BB2E3, Route111_Text_1BB313 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504AD msgbox Route111_Text_1BB33E, 6 @@ -433,7 +433,7 @@ Route111_EventScript_1504AD:: @ 81504AD Route111_EventScript_1504C4:: @ 81504C4 trainerbattle 0, OPPONENT_BROOKE_1, 0, Route111_Text_1BB44F, Route111_Text_1BB49F - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route111_EventScript_1504EB msgbox Route111_Text_1BB4CE, 6 diff --git a/data/scripts/maps/Route112.inc b/data/scripts/maps/Route112.inc index f38a296e7..83d93f222 100644 --- a/data/scripts/maps/Route112.inc +++ b/data/scripts/maps/Route112.inc @@ -38,7 +38,7 @@ Route112_EventScript_150549:: @ 8150549 Route112_EventScript_150560:: @ 8150560 trainerbattle 0, OPPONENT_TRENT_1, 0, Route112_Text_1BB6A0, Route112_Text_1BB707 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route112_EventScript_150587 msgbox Route112_Text_1BB721, 6 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 82f7855e1..1b589fcde 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -60,7 +60,7 @@ Route113_EventScript_150652:: @ 8150652 Route113_EventScript_150669:: @ 8150669 trainerbattle 0, OPPONENT_MADELINE_1, 0, Route113_Text_1BBB27, Route113_Text_1BBB7A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_150690 msgbox Route113_Text_1BBB9A, 6 @@ -73,7 +73,7 @@ Route113_EventScript_150690:: @ 8150690 Route113_EventScript_1506A7:: @ 81506A7 trainerbattle 0, OPPONENT_LAO_1, 0, Route113_Text_1BBC59, Route113_Text_1BBC90 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route113_EventScript_1506CE msgbox Route113_Text_1BBCAB, 6 diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index 302c162b0..f6bb6d8ba 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -87,7 +87,7 @@ Route114_EventScript_150836:: @ 8150836 Route114_EventScript_15084D:: @ 815084D trainerbattle 0, OPPONENT_STEVE_1, 0, Route114_Text_1BC2F5, Route114_Text_1BC327 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_150874 msgbox Route114_Text_1BC337, 6 @@ -100,7 +100,7 @@ Route114_EventScript_150874:: @ 8150874 Route114_EventScript_15088B:: @ 815088B trainerbattle 0, OPPONENT_BERNIE_1, 0, Route114_Text_1BC45A, Route114_Text_1BC499 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route114_EventScript_1508B2 msgbox Route114_Text_1BC4B5, 6 diff --git a/data/scripts/maps/Route115.inc b/data/scripts/maps/Route115.inc index 8e0eb7855..f16c2088a 100644 --- a/data/scripts/maps/Route115.inc +++ b/data/scripts/maps/Route115.inc @@ -15,7 +15,7 @@ Route115_EventScript_150940:: @ 8150940 Route115_EventScript_150949:: @ 8150949 trainerbattle 0, OPPONENT_TIMOTHY_1, 0, Route115_Text_1BC9AC, Route115_Text_1BC9E6 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150970 msgbox Route115_Text_1BCA0E, 6 @@ -33,7 +33,7 @@ Route115_EventScript_150987:: @ 8150987 Route115_EventScript_15099E:: @ 815099E trainerbattle 0, OPPONENT_NOB_1, 0, Route115_Text_1BCB8A, Route115_Text_1BCBC1 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_1509C5 msgbox Route115_Text_1BCBDE, 6 @@ -46,7 +46,7 @@ Route115_EventScript_1509C5:: @ 81509C5 Route115_EventScript_1509DC:: @ 81509DC trainerbattle 0, OPPONENT_CYNDY_1, 0, Route115_Text_1BCCF4, Route115_Text_1BCD32 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route115_EventScript_150A03 msgbox Route115_Text_1BCD4C, 6 diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 5fab808bc..4e08705cf 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -240,7 +240,7 @@ Route116_EventScript_150C79:: @ 8150C79 Route116_EventScript_150C90:: @ 8150C90 trainerbattle 0, OPPONENT_JERRY_1, 0, Route116_Text_1BD1C0, Route116_Text_1BD21A - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150CB7 msgbox Route116_Text_1BD248, 6 @@ -263,7 +263,7 @@ Route116_EventScript_150CE5:: @ 8150CE5 Route116_EventScript_150CFC:: @ 8150CFC trainerbattle 0, OPPONENT_KAREN_1, 0, Route116_Text_1BD377, Route116_Text_1BD3AC - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route116_EventScript_150D23 msgbox Route116_Text_1BD3C3, 6 diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index 44c4c156c..fa648f79e 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -40,7 +40,7 @@ Route117_EventScript_150D84:: @ 8150D84 Route117_EventScript_150D8D:: @ 8150D8D trainerbattle 0, OPPONENT_ISAAC_1, 0, Route117_Text_1BD49E, Route117_Text_1BD4D9 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DB4 msgbox Route117_Text_1BD4F9, 6 @@ -53,7 +53,7 @@ Route117_EventScript_150DB4:: @ 8150DB4 Route117_EventScript_150DCB:: @ 8150DCB trainerbattle 0, OPPONENT_LYDIA_1, 0, Route117_Text_1BD634, Route117_Text_1BD67B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150DF2 msgbox Route117_Text_1BD69B, 6 @@ -66,7 +66,7 @@ Route117_EventScript_150DF2:: @ 8150DF2 Route117_EventScript_150E09:: @ 8150E09 trainerbattle 0, OPPONENT_DYLAN_1, 0, Route117_Text_1BD79A, Route117_Text_1BD7E0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E30 msgbox Route117_Text_1BD7F5, 6 @@ -79,7 +79,7 @@ Route117_EventScript_150E30:: @ 8150E30 Route117_EventScript_150E47:: @ 8150E47 trainerbattle 0, OPPONENT_MARIA_1, 0, Route117_Text_1BD914, Route117_Text_1BD965 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150E6E msgbox Route117_Text_1BD98F, 6 @@ -97,7 +97,7 @@ Route117_EventScript_150E85:: @ 8150E85 Route117_EventScript_150E9C:: @ 8150E9C trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDBC3, Route117_Text_1BDC07, Route117_Text_1BDC96 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150EC7 msgbox Route117_Text_1BDC44, 6 @@ -110,7 +110,7 @@ Route117_EventScript_150EC7:: @ 8150EC7 Route117_EventScript_150EE2:: @ 8150EE2 trainerbattle 4, OPPONENT_ANNA_AND_MEG_1, 0, Route117_Text_1BDCD2, Route117_Text_1BDD1E, Route117_Text_1BDD8B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route117_EventScript_150F0D msgbox Route117_Text_1BDD4E, 6 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index b34c22a50..63decb5d6 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -161,7 +161,7 @@ Route118_Movement_151086:: @ 8151086 Route118_EventScript_15108F:: @ 815108F trainerbattle 0, OPPONENT_ROSE_1, 0, Route118_Text_1BDFF4, Route118_Text_1BE03C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_1510B6 msgbox Route118_Text_1BE05E, 6 @@ -184,7 +184,7 @@ Route118_EventScript_1510E4:: @ 81510E4 Route118_EventScript_1510FB:: @ 81510FB trainerbattle 0, OPPONENT_DALTON_1, 0, Route118_Text_1BE3E8, Route118_Text_1BE406 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route118_EventScript_151122 msgbox Route118_Text_1BE413, 6 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 95edf346c..e82d7b313 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -296,7 +296,7 @@ Route119_EventScript_1514A8:: @ 81514A8 Route119_EventScript_1514BF:: @ 81514BF trainerbattle 0, OPPONENT_JACKSON_1, 0, Route119_Text_1BE8BB, Route119_Text_1BE90E - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_1514E6 msgbox Route119_Text_1BE937, 6 @@ -309,7 +309,7 @@ Route119_EventScript_1514E6:: @ 81514E6 Route119_EventScript_1514FD:: @ 81514FD trainerbattle 0, OPPONENT_CATHERINE_1, 0, Route119_Text_1BEA3A, Route119_Text_1BEA88 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route119_EventScript_151524 msgbox Route119_Text_1BEAB3, 6 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 9e5ff95be..d2866cceb 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -292,7 +292,7 @@ Route120_EventScript_1519B3:: @ 81519B3 Route120_EventScript_1519CA:: @ 81519CA trainerbattle 0, OPPONENT_ROBERT_1, 0, Route120_Text_1BF07E, Route120_Text_1BF0A5 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_1519F1 msgbox Route120_Text_1BF0C3, 6 @@ -315,7 +315,7 @@ Route120_EventScript_151A1F:: @ 8151A1F Route120_EventScript_151A36:: @ 8151A36 trainerbattle 0, OPPONENT_BRANDON_1, 0, Route120_Text_1BF32B, Route120_Text_1BF36B - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route120_EventScript_151A5D msgbox Route120_Text_1BF38D, 6 diff --git a/data/scripts/maps/Route121.inc b/data/scripts/maps/Route121.inc index d1f153117..6108b129d 100644 --- a/data/scripts/maps/Route121.inc +++ b/data/scripts/maps/Route121.inc @@ -73,7 +73,7 @@ Route121_EventScript_151B72:: @ 8151B72 Route121_EventScript_151B89:: @ 8151B89 trainerbattle 0, OPPONENT_WALTER_1, 0, Route121_Text_1BFA1B, Route121_Text_1BFA8C - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151BB0 msgbox Route121_Text_1BFA9D, 6 @@ -101,7 +101,7 @@ Route121_EventScript_151BF9:: @ 8151BF9 Route121_EventScript_151C14:: @ 8151C14 trainerbattle 0, OPPONENT_JESSICA_1, 0, Route121_Text_1BFE51, Route121_Text_1BFE80 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route121_EventScript_151C3B msgbox Route121_Text_1BFEAE, 6 diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index adfebfe08..a25c306cc 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -62,7 +62,7 @@ Route123_EventScript_151CFF:: @ 8151CFF Route123_EventScript_151D16:: @ 8151D16 trainerbattle 0, OPPONENT_CAMERON_1, 0, Route123_Text_1C013F, Route123_Text_1C01A3 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D3D msgbox Route123_Text_1C01B1, 6 @@ -75,7 +75,7 @@ Route123_EventScript_151D3D:: @ 8151D3D Route123_EventScript_151D54:: @ 8151D54 trainerbattle 0, OPPONENT_JACKI_1, 0, Route123_Text_1C028C, Route123_Text_1C0303 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route123_EventScript_151D7B msgbox Route123_Text_1C030F, 6 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 3e062bfdc..289ea2d29 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -23,7 +23,7 @@ Route124_EventScript_151E0F:: @ 8151E0F Route124_EventScript_151E26:: @ 8151E26 trainerbattle 0, OPPONENT_JENNY_1, 0, Route124_Text_1C07B4, Route124_Text_1C07F9 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151E4D msgbox Route124_Text_1C080E, 6 @@ -46,7 +46,7 @@ Route124_EventScript_151E7B:: @ 8151E7B Route124_EventScript_151E92:: @ 8151E92 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0ABD, Route124_Text_1C0B36, Route124_Text_1C0BC8 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151EBD msgbox Route124_Text_1C0B72, 6 @@ -59,7 +59,7 @@ Route124_EventScript_151EBD:: @ 8151EBD Route124_EventScript_151ED8:: @ 8151ED8 trainerbattle 4, OPPONENT_RITA_AND_SAM_1, 0, Route124_Text_1C0C0E, Route124_Text_1C0C4F, Route124_Text_1C0CE0 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route124_EventScript_151F03 msgbox Route124_Text_1C0C7F, 6 diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index ea24434e2..58bf75c51 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -29,7 +29,7 @@ Route125_EventScript_151F73:: @ 8151F73 Route125_EventScript_151F8A:: @ 8151F8A trainerbattle 0, OPPONENT_ERNEST_1, 0, Route125_Text_1C11AF, Route125_Text_1C11ED - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route125_EventScript_151FB1 msgbox Route125_Text_1C1208, 6 diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index 7a08d0acb..a97a1e93f 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -182,7 +182,7 @@ Route128_Movement_1522A1:: @ 81522A1 Route128_EventScript_1522A4:: @ 81522A4 trainerbattle 0, OPPONENT_ISAIAH_1, 0, Route128_Text_1C1C67, Route128_Text_1C1C95 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_1522CB msgbox Route128_Text_1C1CC3, 6 @@ -195,7 +195,7 @@ Route128_EventScript_1522CB:: @ 81522CB Route128_EventScript_1522E2:: @ 81522E2 trainerbattle 0, OPPONENT_KATELYN_1, 0, Route128_Text_1C1DB0, Route128_Text_1C1E25 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq Route128_EventScript_152309 msgbox Route128_Text_1C1E4A, 6 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 72528a929..2fd62e9af 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -11,7 +11,7 @@ SlateportCity_ContestLobby_EventScript_15541D:: @ 815541D setvar CONTEST_RANK, 2 call SlateportCity_ContestLobby_EventScript_1A4E92 call SlateportCity_ContestLobby_EventScript_155448 - special sub_80C4BF0 + special SetContestTrainerGfxIds call SlateportCity_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 3 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 568d9b207..016b2e7ba 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -11,7 +11,7 @@ VerdanturfTown_ContestLobby_EventScript_153D76:: @ 8153D76 setvar CONTEST_RANK, 0 call VerdanturfTown_ContestLobby_EventScript_1A4E92 call VerdanturfTown_ContestLobby_EventScript_153DA1 - special sub_80C4BF0 + special SetContestTrainerGfxIds call VerdanturfTown_ContestLobby_EventScript_15FBDB setvar VAR_CONTEST_LOCATION, 1 warp MAP_LINK_CONTEST_ROOM1, 255, 7, 5 diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index a206d5531..ed0440343 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -93,7 +93,7 @@ VictoryRoad_1F_EventScript_15DF28:: @ 815DF28 VictoryRoad_1F_EventScript_15DF31:: @ 815DF31 trainerbattle 0, OPPONENT_WALLY_3, 0, VictoryRoad_1F_Text_1979BA, VictoryRoad_1F_Text_197A23 - specialvar RESULT, sub_8082C68 + specialvar RESULT, ShouldTryRematchBattle compare RESULT, 1 goto_if_eq VictoryRoad_1F_EventScript_15DF58 msgbox VictoryRoad_1F_Text_197A47, 6 -- cgit v1.2.3 From 2da819cabb04e623dfb3830ad57ac6eed91efc65 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 09:34:13 -0600 Subject: Label TV specials, and port over some TV changes from pokeemerald --- data/scripts/maps/SlateportCity_House1.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index e760beab5..2a25ded19 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -30,12 +30,12 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 specialvar RESULT, ScriptGetPartyMonSpecies compare RESULT, SPECIES_EGG goto_if_eq SlateportCity_House1_EventScript_15571C - special sub_80BFAE0 - special sub_80BFB10 + special TV_CopyNicknameToStringVar1AndEnsureTerminated + special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 specialvar RESULT, sub_810F96C - special sub_80BFAE0 + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 msgbox SlateportCity_House1_Text_17D505, 5 @@ -58,8 +58,8 @@ SlateportCity_House1_EventScript_155726:: @ 8155726 SlateportCity_House1_EventScript_155730:: @ 8155730 msgbox SlateportCity_House1_Text_17D580, 4 call SlateportCity_House1_EventScript_1A0678 - specialvar RESULT, sub_80BF9B4 - special sub_80BFAE0 + specialvar RESULT, TV_PutNameRaterShowOnTheAirIfNicnkameChanged + special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_15575A msgbox SlateportCity_House1_Text_17D63A, 4 -- cgit v1.2.3 From 56e2fe07d4e46ab73320d33a457802da48f9729a Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 10:00:10 -0600 Subject: Label trendy phrase specials --- data/scripts/maps/DewfordTown_Hall.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index e54ef8e50..530a4e04d 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -5,7 +5,7 @@ DewfordTown_Hall_EventScript_153293:: @ 8153293 lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA5E4 + special TrendyPhraseIsOld compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532B2 msgbox DewfordTown_Hall_Text_1754C9, 4 @@ -29,7 +29,7 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - special sub_80EB83C + special BufferRandomHobbyOrLifestyleString msgbox DewfordTown_Hall_Text_1755F9, 5 compare RESULT, 1 goto_if_eq DewfordTown_Hall_EventScript_1532F6 @@ -87,7 +87,7 @@ DewfordTown_Hall_EventScript_153353:: @ 8153353 DewfordTown_Hall_EventScript_153363:: @ 8153363 lockall call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_1533CA case 4, DewfordTown_Hall_EventScript_1533CA @@ -133,7 +133,7 @@ DewfordTown_Hall_EventScript_1533FE:: @ 81533FE DewfordTown_Hall_EventScript_15340A:: @ 815340A call DewfordTown_Hall_EventScript_1A0102 - special sub_80FA648 + special GetDewfordHallPaintingNameIndex switch RESULT case 0, DewfordTown_Hall_EventScript_153470 case 1, DewfordTown_Hall_EventScript_153470 -- cgit v1.2.3 From 7158286302493c6fe34068926b351292af2cb6a9 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 1 Jan 2018 13:59:39 -0600 Subject: Label a bunch more specials --- .../maps/AbandonedShip_HiddenFloorRooms.inc | 8 +-- data/scripts/maps/BattleTower_BattleRoom.inc | 20 +++--- data/scripts/maps/BattleTower_Elevator.inc | 2 +- data/scripts/maps/BattleTower_Lobby.inc | 50 ++++++------- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/FallarborTown_House2.inc | 6 +- data/scripts/maps/FortreeCity_House1.inc | 10 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 4 +- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 8 +-- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 82 +++++++++++----------- data/scripts/maps/MauvilleCity_GameCorner.inc | 24 +++---- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 2 +- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 2 +- data/scripts/maps/PacifidlogTown_House2.inc | 8 +-- data/scripts/maps/PacifidlogTown_House3.inc | 10 +-- data/scripts/maps/RustboroCity_House1.inc | 10 +-- data/scripts/maps/SlateportCity_House1.inc | 4 +- data/scripts/maps/SootopolisCity_Gym_1F.inc | 2 +- data/scripts/maps/SootopolisCity_House8.inc | 4 +- 21 files changed, 131 insertions(+), 131 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 343ef4233..9ad419da1 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -43,7 +43,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B setfieldeffectargument 1, 10 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4D4 + specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 @@ -54,7 +54,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC4:: @ 815EDC4 end AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 - specialvar RESULT, sub_810F488 + specialvar RESULT, FoundAbandonedShipRoom1Key compare RESULT, 1 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 @@ -77,7 +77,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB setfieldeffectargument 1, 3 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4FC + specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 setfieldeffectargument 1, 6 setfieldeffectargument 2, 0 dofieldeffect 54 - specialvar RESULT, sub_810F4B0 + specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 87ba8c01a..7853b3598 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -23,16 +23,16 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA special ScrSpecial_HealPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate switch RESULT case 1, BattleTower_BattleRoom_EventScript_160961 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -40,7 +40,7 @@ BattleTower_BattleRoom_EventScript_1608FA:: @ 81608FA BattleTower_BattleRoom_EventScript_160961:: @ 8160961 setvar VAR_SPECIAL_4, 6 - special sub_8135668 + special SetBattleTowerProperty switch RESULT case 8, BattleTower_BattleRoom_EventScript_160A56 applymovement 1, BattleTower_BattleRoom_Movement_160AC6 @@ -53,7 +53,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 msgbox BattleTower_BattleRoom_Text_19ACDC, 4 special LoadPlayerParty special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty playfanfare 368 waitfanfare special ScrSpecial_HealPlayerParty @@ -91,14 +91,14 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 special LoadPlayerParty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 4 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 7 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 14 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 3 special sub_810FF60 warp MAP_BATTLE_TOWER_LOBBY, 255, 6, 6 @@ -106,7 +106,7 @@ BattleTower_BattleRoom_EventScript_160A56:: @ 8160A56 BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 setvar VAR_SPECIAL_4, 2 - special sub_8135BA0 + special SaveBattleTowerProgress message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage diff --git a/data/scripts/maps/BattleTower_Elevator.inc b/data/scripts/maps/BattleTower_Elevator.inc index fccfcdb2c..6749c5623 100644 --- a/data/scripts/maps/BattleTower_Elevator.inc +++ b/data/scripts/maps/BattleTower_Elevator.inc @@ -12,7 +12,7 @@ BattleTower_Elevator_EventScript_1607E4:: @ 81607E4 applymovement 1, BattleTower_Elevator_Movement_160835 applymovement 255, BattleTower_Elevator_Movement_160839 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate delay 64 applymovement 1, BattleTower_Elevator_Movement_16083D diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 527bae389..4058d5aae 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -6,18 +6,18 @@ BattleTower_Lobby_MapScripts:: @ 816027E .byte 0 BattleTower_Lobby_MapScript1_160293:: @ 8160293 - special sub_813610C + special TryEnableBravoTrainerBattleTower call BattleTower_Lobby_EventScript_16029C end BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar VAR_SPECIAL_4, 10 - special sub_8135668 + special SetBattleTowerProperty checkflag FLAG_RECEIVED_GOLD_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602E4 checkflag FLAG_RECEIVED_SILVER_SHIELD goto_if_eq BattleTower_Lobby_EventScript_1602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 50 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -25,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C return BattleTower_Lobby_EventScript_1602CD:: @ 81602CD - specialvar VAR_SPECIAL_7, sub_810F404 + specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 100 goto_if 0, BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER @@ -76,7 +76,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 message BattleTower_Lobby_Text_19A487 waitmessage setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_16037D special AwardBattleTowerRibbons @@ -90,23 +90,23 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 BattleTower_Lobby_EventScript_16037D:: @ 816037D setvar VAR_SPECIAL_4, 8 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 1 goto_if_eq BattleTower_Lobby_EventScript_1603AD message BattleTower_Lobby_Text_19A589 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty special DetermineBattleTowerPrize setvar VAR_SPECIAL_4, 3 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 3 - special sub_8135668 + special SetBattleTowerProperty message BattleTower_Lobby_Text_19A4BB waitmessage special GiveBattleTowerPrize @@ -117,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD playfanfare 370 waitfanfare setvar VAR_SPECIAL_4, 9 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 49 goto_if 5, BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 @@ -145,9 +145,9 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 message BattleTower_Lobby_Text_19A589 waitmessage setvar VAR_SPECIAL_4, 13 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse msgbox BattleTower_Lobby_Text_199FA9, 4 @@ -165,15 +165,15 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B message BattleTower_Lobby_Text_19A5CE waitmessage setvar VAR_SPECIAL_4, 1 - special sub_8135BA0 + special SaveBattleTowerProgress playse 55 waitse setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 5 special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage call BattleTower_Lobby_EventScript_160664 @@ -185,7 +185,7 @@ BattleTower_Lobby_EventScript_16049E:: @ 816049E lock faceplayer setvar VAR_SPECIAL_4, 0 - special sub_81358A4 + special BattleTowerUtil compare RESULT, 6 goto_if_eq BattleTower_Lobby_EventScript_160342 special SavePlayerParty @@ -214,7 +214,7 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA setvar VAR_SPECIAL_4, 1 copyvar VAR_SPECIAL_5, RESULT copyvar VAR_SPECIAL_6, RESULT - special sub_8135668 + special SetBattleTowerProperty msgbox BattleTower_Lobby_Text_19A07B, 4 fadescreen 1 special ChooseBattleTowerPlayerParty @@ -229,16 +229,16 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA BattleTower_Lobby_EventScript_160587:: @ 8160587 setvar VAR_SPECIAL_4, 5 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_TEMP_0, 0 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 setvar VAR_SPECIAL_5, 1 - special sub_8135668 + special SetBattleTowerProperty setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 - special sub_8135668 + special SetBattleTowerProperty special LoadPlayerParty closemessage delay 2 @@ -249,7 +249,7 @@ BattleTower_Lobby_EventScript_160587:: @ 8160587 goto_if_eq BattleTower_Lobby_EventScript_160642 incrementgamestat GAME_STAT_ENTERED_BATTLE_TOWER special SavePlayerParty - special sub_8135A14 + special SetBattleTowerParty setvar VAR_BRAVO_TRAINER_BATTLE_TOWER_ON, 1 msgbox BattleTower_Lobby_Text_19A0A8, 4 closemessage @@ -277,7 +277,7 @@ BattleTower_Lobby_EventScript_160635:: @ 8160635 BattleTower_Lobby_EventScript_160642:: @ 8160642 setvar VAR_SPECIAL_4, 12 - special sub_8135668 + special SetBattleTowerProperty goto BattleTower_Lobby_EventScript_160652 BattleTower_Lobby_EventScript_16064F:: @ 816064F @@ -286,7 +286,7 @@ BattleTower_Lobby_EventScript_16064F:: @ 816064F BattleTower_Lobby_EventScript_160652:: @ 8160652 msgbox BattleTower_Lobby_Text_199FA9, 4 setvar VAR_SPECIAL_4, 11 - special sub_8135668 + special SetBattleTowerProperty BattleTower_Lobby_EventScript_160662:: @ 8160662 release @@ -402,7 +402,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 end BattleTower_Lobby_EventScript_160773:: @ 8160773 - specialvar RESULT, sub_810F404 + specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 goto_if 0, BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index ee702c102..669b0a5fe 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -65,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 special ScrSpecial_StartGroudonKyogreBattle waitstate clearflag FLAG_SYS_CTRL_OBJ_DELETE - specialvar RESULT, sub_810E300 + specialvar RESULT, GetBattleOutcome compare RESULT, 1 call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 081850326..0546ef5be 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -24,11 +24,11 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 msgbox FallarborTown_House2_Text_177C3F, 4 - special sub_80F9A4C + special SelectMoveTutorMon waitstate compare VAR_SPECIAL_4, 255 goto_if_eq FallarborTown_House2_EventScript_153D60 - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq FallarborTown_House2_EventScript_153D52 compare VAR_SPECIAL_5, 0 @@ -38,7 +38,7 @@ FallarborTown_House2_EventScript_153CE4:: @ 8153CE4 FallarborTown_House2_EventScript_153D1A:: @ 8153D1A msgbox FallarborTown_House2_Text_177C5D, 4 - special sub_8132670 + special TeachMoveTutorMove waitstate compare VAR_SPECIAL_4, 0 goto_if_eq FallarborTown_House2_EventScript_153CE4 diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index aee4141a8..f6f8aafa6 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -8,25 +8,25 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 goto_if_eq FortreeCity_House1_EventScript_157EAD setvar VAR_SPECIAL_8, 1 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox FortreeCity_House1_Text_18568C, 5 compare RESULT, 0 goto_if_eq FortreeCity_House1_EventScript_157E95 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq FortreeCity_House1_EventScript_157E95 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, FortreeCity_House1_EventScript_157E9F copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox FortreeCity_House1_Text_1856F7, 4 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 00a10b655..7e221122b 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -8,7 +8,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 checkflag FLAG_TEMP_2 call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD - specialvar RESULT, sub_8090FC0 + specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 release diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 8233504dd..1198054f0 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -7,7 +7,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C checkflag FLAG_TEMP_2 call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR - special sub_810E944 + special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 waitmessage multichoice 0, 0, 57, 0 @@ -74,7 +74,7 @@ LilycoveCity_DepartmentStoreElevator_EventScript_15A4B8:: @ 815A4B8 erasebox 0, 0, 29, 19 applymovement LAST_TALKED, LilycoveCity_DepartmentStoreElevator_Movement_1A0845 waitmovement 0 - special sub_810EBEC + special ShakeScreenInElevator waitstate setflag FLAG_TEMP_2 return diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index a9680e3a5..d4dedb0c2 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -21,7 +21,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E waitmessage special RetrieveLotteryNumber copyvar VAR_SPECIAL_8, RESULT - special sub_810F9AC + special BufferLottoTicketNumber msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 1024d30e9..a3c8d23af 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -14,11 +14,11 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE msgbox LilycoveCity_MoveDeletersHouse_Text_18B68C, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B7B - special sub_80FA148 + special IsSelectedMonEgg compare RESULT, 1 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B71 special ScrSpecial_CountPokemonMoves @@ -26,7 +26,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159B64 msgbox LilycoveCity_MoveDeletersHouse_Text_18B6B0, 4 fadescreen 1 - special sub_80F9EEC + special SelectMove fadescreen 0 compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE @@ -39,7 +39,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE end LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 - special sub_80FA0DC + special DeleteMonMove playfanfare 378 waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 2db702ffc..4656f0182 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -68,37 +68,37 @@ LilycoveCity_PokemonTrainerFanClub_MapScript1_159412:: @ 8159412 end LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 - special sub_810FCE8 + special UpdateMovedLilycoveFanClubMembers setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar VAR_SPECIAL_4, 12 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar VAR_SPECIAL_4, 13 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar VAR_SPECIAL_4, 14 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar VAR_SPECIAL_4, 15 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end @@ -147,13 +147,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F lock faceplayer setvar VAR_SPECIAL_4, 13 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15959C - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159592 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A400, 4 @@ -161,7 +161,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15952F:: @ 815952F end LilycoveCity_PokemonTrainerFanClub_EventScript_15956E:: @ 815956E - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159588 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A36A, 4 @@ -187,13 +187,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 lock faceplayer setvar VAR_SPECIAL_4, 8 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159613 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159609 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A629, 4 @@ -201,7 +201,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1595A6:: @ 81595A6 end LilycoveCity_PokemonTrainerFanClub_EventScript_1595E5:: @ 81595E5 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1595FF msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A584, 4 @@ -227,13 +227,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D lock faceplayer setvar VAR_SPECIAL_4, 9 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15968A - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159680 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A814, 4 @@ -241,7 +241,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15961D:: @ 815961D end LilycoveCity_PokemonTrainerFanClub_EventScript_15965C:: @ 815965C - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159676 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18A71E, 4 @@ -267,13 +267,13 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 lock faceplayer setvar VAR_SPECIAL_4, 10 - special sub_810FDAC + special BufferStreakTrainerText compare VAR_LILYCOVE_FAN_CLUB_STATE, 0 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159701 - specialvar RESULT, sub_810FD60 + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596F7 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AB0A, 4 @@ -281,7 +281,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159694:: @ 8159694 end LilycoveCity_PokemonTrainerFanClub_EventScript_1596D3:: @ 81596D3 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1596ED msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AA39, 4 @@ -307,11 +307,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B lock faceplayer setvar VAR_SPECIAL_4, 11 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159763 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18ACC7, 4 @@ -319,7 +319,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15970B:: @ 815970B end LilycoveCity_PokemonTrainerFanClub_EventScript_15973F:: @ 815973F - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159759 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AC15, 4 @@ -340,11 +340,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D lock faceplayer setvar VAR_SPECIAL_4, 12 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597C5 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AE63, 4 @@ -352,7 +352,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_15976D:: @ 815976D end LilycoveCity_PokemonTrainerFanClub_EventScript_1597A1:: @ 81597A1 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1597BB msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AD6D, 4 @@ -373,11 +373,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF lock faceplayer setvar VAR_SPECIAL_4, 14 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159827 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B030, 4 @@ -385,7 +385,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_1597CF:: @ 81597CF end LilycoveCity_PokemonTrainerFanClub_EventScript_159803:: @ 8159803 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15981D msgbox LilycoveCity_PokemonTrainerFanClub_Text_18AF62, 4 @@ -406,11 +406,11 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 lock faceplayer setvar VAR_SPECIAL_4, 15 - special sub_810FDAC - specialvar RESULT, sub_810FD60 + special BufferStreakTrainerText + specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 7 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159889 msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B1FD, 4 @@ -418,7 +418,7 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159831:: @ 8159831 end LilycoveCity_PokemonTrainerFanClub_EventScript_159865:: @ 8159865 - specialvar RESULT, sub_810FCB0 + specialvar RESULT, GetNumMovedLilycoveFanClubMembers compare RESULT, 1 goto_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15987F msgbox LilycoveCity_PokemonTrainerFanClub_Text_18B16E, 4 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index 6befb5fb9..c2b785254 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -525,7 +525,7 @@ MauvilleCity_GameCorner_EventScript_157135:: @ 8157135 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 0 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -536,7 +536,7 @@ MauvilleCity_GameCorner_EventScript_157155:: @ 8157155 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 1 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -547,7 +547,7 @@ MauvilleCity_GameCorner_EventScript_157175:: @ 8157175 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 2 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -558,7 +558,7 @@ MauvilleCity_GameCorner_EventScript_157195:: @ 8157195 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 3 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -569,7 +569,7 @@ MauvilleCity_GameCorner_EventScript_1571B5:: @ 81571B5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 4 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -580,7 +580,7 @@ MauvilleCity_GameCorner_EventScript_1571D5:: @ 81571D5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 5 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -591,7 +591,7 @@ MauvilleCity_GameCorner_EventScript_1571F5:: @ 81571F5 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 6 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -602,7 +602,7 @@ MauvilleCity_GameCorner_EventScript_157215:: @ 8157215 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 7 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -613,7 +613,7 @@ MauvilleCity_GameCorner_EventScript_157235:: @ 8157235 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 8 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -624,7 +624,7 @@ MauvilleCity_GameCorner_EventScript_157255:: @ 8157255 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 9 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -635,7 +635,7 @@ MauvilleCity_GameCorner_EventScript_157275:: @ 8157275 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 10 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end @@ -646,7 +646,7 @@ MauvilleCity_GameCorner_EventScript_157295:: @ 8157295 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_1572B5 setvar VAR_SPECIAL_4, 11 - specialvar RESULT, sub_810F424 + specialvar RESULT, GetSlotMachineId playslotmachine RESULT releaseall end diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index 1e7c26511..ad3b366a8 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -92,7 +92,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty - special sub_810F414 + special BufferEReaderTrainerName msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9395633e7..9f20b6310 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -20,7 +20,7 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E closemessage setvar VAR_SPECIAL_4, 2 setvar VAR_SPECIAL_5, 0 - special sub_813556C + special StartSpecialBattle waitstate compare RESULT, 3 call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index f073201ca..df7f42a8b 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -25,7 +25,7 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK goto_if 0, PacifidlogTown_House2_EventScript_1A14DC - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 call_if 1, PacifidlogTown_House2_EventScript_1541E8 return @@ -49,7 +49,7 @@ PacifidlogTown_House2_EventScript_1541EC:: @ 81541EC compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end @@ -65,13 +65,13 @@ PacifidlogTown_House2_EventScript_154225:: @ 8154225 compare RESULT, 0 goto_if_eq PacifidlogTown_House2_EventScript_1A029B setflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - special sub_810F950 + special SetPacifidlogTMReceivedDay msgbox PacifidlogTown_House2_Text_179283, 4 release end PacifidlogTown_House2_EventScript_154254:: @ 8154254 - specialvar RESULT, sub_810F908 + specialvar RESULT, GetDaysUntilPacifidlogTMAvailable buffernumberstring 0, RESULT msgbox PacifidlogTown_House2_Text_1792F2, 4 release diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index b65c2e67d..f5f93f05a 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -8,25 +8,25 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E goto_if_eq PacifidlogTown_House3_EventScript_154338 setvar VAR_SPECIAL_8, 2 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox PacifidlogTown_House3_Text_17940E, 5 compare RESULT, 0 goto_if_eq PacifidlogTown_House3_EventScript_154320 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq PacifidlogTown_House3_EventScript_154320 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, PacifidlogTown_House3_EventScript_15432A copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate bufferspeciesname 0, VAR_SPECIAL_9 msgbox PacifidlogTown_House3_Text_1794C4, 4 diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index cf91c31bd..2e0d106bb 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -8,25 +8,25 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D goto_if_eq RustboroCity_House1_EventScript_157D13 setvar VAR_SPECIAL_8, 0 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 - specialvar RESULT, sub_804D89C + specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT msgbox RustboroCity_House1_Text_184EBA, 5 compare RESULT, 0 goto_if_eq RustboroCity_House1_EventScript_157CFB - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar VAR_SPECIAL_A, VAR_SPECIAL_4 compare VAR_SPECIAL_4, 255 goto_if_eq RustboroCity_House1_EventScript_157CFB copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - specialvar RESULT, sub_804DB2C + specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 goto_if 5, RustboroCity_House1_EventScript_157D05 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A - special sub_804DB68 - special sub_804E174 + special CreateInGameTradePokemon + special DoInGameTradeScene waitstate msgbox RustboroCity_House1_Text_184F6B, 4 setflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 2a25ded19..aa1157d7e 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -13,7 +13,7 @@ SlateportCity_House1_EventScript_15567B:: @ 815567B SlateportCity_House1_EventScript_15569C:: @ 815569C msgbox SlateportCity_House1_Text_17D4DB, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 goto_if 5, SlateportCity_House1_EventScript_1556C9 @@ -34,7 +34,7 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 special TV_CheckMonOTIDEqualsPlayerID compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - specialvar RESULT, sub_810F96C + specialvar RESULT, MonOTNameMatchesPlayer special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 9f2d6c35b..38514b03b 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -15,7 +15,7 @@ SootopolisCity_Gym_1F_MapScript1_15AF22:: @ 815AF22 SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 call SootopolisCity_Gym_1F_EventScript_15AF2E - special sub_8069D78 + special SetSootopolisGymCrackedIceMetatiles end SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E diff --git a/data/scripts/maps/SootopolisCity_House8.inc b/data/scripts/maps/SootopolisCity_House8.inc index 6a72ec1da..91dd3490b 100644 --- a/data/scripts/maps/SootopolisCity_House8.inc +++ b/data/scripts/maps/SootopolisCity_House8.inc @@ -6,7 +6,7 @@ SootopolisCity_House8_EventScript_15B401:: @ 815B401 lock faceplayer msgbox SootopolisCity_House8_Text_1900F7, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 @@ -55,7 +55,7 @@ SootopolisCity_House8_EventScript_15B492:: @ 815B492 lock faceplayer msgbox SootopolisCity_House8_Text_190431, 4 - special sub_80F9A0C + special SelectMonForNPCTrade waitstate copyvar RESULT, VAR_SPECIAL_4 compare RESULT, 255 -- cgit v1.2.3 From 5c427e8afed44ed3720cf97d6748fa9e806c9b83 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:37:52 -0800 Subject: Use song constants in scripts --- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 2 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 8 ++++---- data/scripts/maps/AquaHideout_B2F.inc | 2 +- data/scripts/maps/BattleTower_BattleRoom.inc | 4 ++-- data/scripts/maps/BattleTower_Lobby.inc | 10 +++++----- data/scripts/maps/CaveOfOrigin_B4F.inc | 4 ++-- data/scripts/maps/DewfordTown_Gym.inc | 8 ++++---- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 14 +++++++------- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 2 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 4 ++-- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 2 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 4 ++-- .../maps/FallarborTown_PokemonCenter_1F.inc | 2 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 6 +++--- data/scripts/maps/LilycoveCity.inc | 4 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 16 ++++++++-------- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 2 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 2 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 +++--- .../maps/LilycoveCity_DepartmentStore_1F.inc | 2 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 2 +- data/scripts/maps/LittlerootTown.inc | 4 ++-- .../maps/LittlerootTown_BrendansHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 6 +++--- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 4 ++-- data/scripts/maps/MauvilleCity.inc | 2 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 22 +++++++++++----------- data/scripts/maps/MauvilleCity_Gym.inc | 4 ++-- data/scripts/maps/MauvilleCity_House2.inc | 2 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 2 +- data/scripts/maps/MossdeepCity_Gym.inc | 2 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 4 ++-- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 4 ++-- data/scripts/maps/OldaleTown.inc | 2 +- data/scripts/maps/PetalburgCity.inc | 6 +++--- data/scripts/maps/PetalburgCity_Gym.inc | 6 +++--- data/scripts/maps/PetalburgWoods.inc | 4 ++-- data/scripts/maps/Route101.inc | 2 +- data/scripts/maps/Route103.inc | 8 ++++---- data/scripts/maps/Route110.inc | 6 +++--- data/scripts/maps/Route110_TrickHouseEnd.inc | 6 +++--- data/scripts/maps/Route110_TrickHouseEntrance.inc | 10 +++++----- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 ++++---- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 2 +- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 14 +++++++------- data/scripts/maps/Route110_TrickHousePuzzle7.inc | 10 +++++----- data/scripts/maps/Route111.inc | 4 ++-- data/scripts/maps/Route113_GlassWorkshop.inc | 2 +- data/scripts/maps/Route118.inc | 2 +- data/scripts/maps/Route119.inc | 4 ++-- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 2 +- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/RustboroCity.inc | 18 +++++++++--------- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 8 ++++---- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 4 ++-- data/scripts/maps/RusturfTunnel.inc | 4 ++-- data/scripts/maps/SSTidalCorridor.inc | 14 +++++++------- data/scripts/maps/SeafloorCavern_Room9.inc | 12 ++++++------ data/scripts/maps/SealedChamber_InnerRoom.inc | 8 ++++---- data/scripts/maps/SlateportCity.inc | 6 +++--- data/scripts/maps/SlateportCity_ContestLobby.inc | 4 ++-- .../maps/SlateportCity_OceanicMuseum_1F.inc | 6 +++--- .../maps/SlateportCity_OceanicMuseum_2F.inc | 4 ++-- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 2 +- data/scripts/maps/SootopolisCity.inc | 4 ++-- data/scripts/maps/SootopolisCity_Gym_1F.inc | 8 ++++---- data/scripts/maps/UnknownMap_25_34.inc | 10 +++++----- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 4 ++-- 73 files changed, 195 insertions(+), 195 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index c27951abb..b4d29632e 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -34,7 +34,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A msgbox AbandonedShip_Corridors_B1F_Text_198692, 4 - playse 21 + playse SE_PIN takeitem ITEM_STORAGE_KEY, 1 setflag FLAG_USED_STORAGE_KEY call AbandonedShip_Corridors_B1F_EventScript_15E9C0 diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 35e86543b..7b61190e5 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -66,7 +66,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_1_KEY, 1 setflag FLAG_USED_ROOM_1_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 @@ -82,7 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_2_KEY, 1 setflag FLAG_USED_ROOM_2_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD @@ -98,7 +98,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_4_KEY, 1 setflag FLAG_USED_ROOM_4_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 @@ -114,7 +114,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED msgbox AbandonedShip_HiddenFloorCorridors_Text_198E90, 4 - playse 21 + playse SE_PIN takeitem ITEM_ROOM_6_KEY, 1 setflag FLAG_USED_ROOM_6_KEY call AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 diff --git a/data/scripts/maps/AquaHideout_B2F.inc b/data/scripts/maps/AquaHideout_B2F.inc index 5ec8197f9..d7b47cdfd 100644 --- a/data/scripts/maps/AquaHideout_B2F.inc +++ b/data/scripts/maps/AquaHideout_B2F.inc @@ -10,7 +10,7 @@ AquaHideout_B2F_EventScript_15D8BD:: @ 815D8BD MagmaHideout_B2F_EventScript_15D8BD:: @ 815D8BD lockall setvar VAR_SPECIAL_8, 1 - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_8, AquaHideout_B2F_Movement_1A0833 waitmovement 0 .ifdef SAPPHIRE diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 7853b3598..1ee0d35d2 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -54,7 +54,7 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special LoadPlayerParty special SavePlayerParty special SetBattleTowerParty - playfanfare 368 + playfanfare BGM_ME_ASA waitfanfare special ScrSpecial_HealPlayerParty @@ -110,7 +110,7 @@ BattleTower_BattleRoom_EventScript_160A94:: @ 8160A94 message BattleTower_BattleRoom_Text_1C6CE1 delay 60 waitmessage - playse 55 + playse SE_SAVE waitse msgbox BattleTower_BattleRoom_Text_1C6D05, 4 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 4058d5aae..5700480e2 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -84,7 +84,7 @@ BattleTower_Lobby_EventScript_160342:: @ 8160342 goto_if_eq BattleTower_Lobby_EventScript_16037D message BattleTower_Lobby_Text_19A6BE waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare msgbox BattleTower_Lobby_Text_19A719, 4 @@ -100,7 +100,7 @@ BattleTower_Lobby_EventScript_16037D:: @ 816037D special DetermineBattleTowerPrize setvar VAR_SPECIAL_4, 3 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse BattleTower_Lobby_EventScript_1603AD:: @ 81603AD @@ -114,7 +114,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD case 0, BattleTower_Lobby_EventScript_160408 message BattleTower_Lobby_Text_19A506 waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare setvar VAR_SPECIAL_4, 9 special BattleTowerUtil @@ -148,7 +148,7 @@ BattleTower_Lobby_EventScript_160419:: @ 8160419 special SetBattleTowerProperty setvar VAR_SPECIAL_4, 0 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse msgbox BattleTower_Lobby_Text_199FA9, 4 closemessage @@ -166,7 +166,7 @@ BattleTower_Lobby_EventScript_16044B:: @ 816044B waitmessage setvar VAR_SPECIAL_4, 1 special SaveBattleTowerProgress - playse 55 + playse SE_SAVE waitse setvar VAR_SPECIAL_4, 8 setvar VAR_SPECIAL_5, 0 diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 669b0a5fe..904759cf1 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -37,7 +37,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 doweather special WaitWeather waitstate - playse 209 + playse SE_W197 setfieldeffectargument 0, 9 setfieldeffectargument 1, 13 setfieldeffectargument 2, 0 @@ -48,7 +48,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 .else setvar RESULT, 2 .endif - playse 107 + playse SE_TAMA special sub_80818A4 waitstate special sub_80818FC diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index ee7d77d6b..ba933dbe9 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -56,25 +56,25 @@ DewfordTown_Gym_EventScript_1530F5:: @ 81530F5 return DewfordTown_Gym_EventScript_1530F6:: @ 81530F6 - playse 35 + playse SE_MU_PACHI animateflash 3 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153101:: @ 8153101 - playse 35 + playse SE_MU_PACHI animateflash 2 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_15310C:: @ 815310C - playse 35 + playse SE_MU_PACHI animateflash 1 call DewfordTown_Gym_EventScript_153071 return DewfordTown_Gym_EventScript_153117:: @ 8153117 - playse 35 + playse SE_MU_PACHI animateflash 0 call DewfordTown_Gym_EventScript_153071 return diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 1ca62b61c..29c29c80b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -38,20 +38,20 @@ EverGrandeCity_ChampionsRoom_Movement_15B802:: @ 815B802 step_end EverGrandeCity_ChampionsRoom_EventScript_15B805:: @ 815B805 - playbgm 454, 0 + playbgm BGM_DAIGO, FALSE msgbox EverGrandeCity_ChampionsRoom_Text_190F9C, 4 trainerbattle 3, OPPONENT_STEVEN, 0, EverGrandeCity_ChampionsRoom_Text_1910A0 goto EverGrandeCity_ChampionsRoom_EventScript_15B821 end EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 - playse 8 + playse SE_DOOR setmetatile 6, 1, 838, 0 setmetatile 6, 2, 839, 0 special DrawWholeMapView msgbox EverGrandeCity_ChampionsRoom_Text_1910FE, 4 closemessage - playse 8 + playse SE_DOOR checkplayergender compare RESULT, 0 call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C @@ -67,17 +67,17 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 end EverGrandeCity_ChampionsRoom_EventScript_15B87C:: @ 815B87C - playbgm 415, 0 + playbgm BGM_GIRL_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B881:: @ 815B881 - playbgm 421, 0 + playbgm BGM_BOY_SUP, FALSE return EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 msgbox EverGrandeCity_ChampionsRoom_Text_191225, 4 delay 40 - playse 21 + playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmovement 0 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 @@ -90,7 +90,7 @@ EverGrandeCity_ChampionsRoom_EventScript_15B886:: @ 815B886 EverGrandeCity_ChampionsRoom_EventScript_15B8BB:: @ 815B8BB msgbox EverGrandeCity_ChampionsRoom_Text_1912B3, 4 delay 40 - playse 21 + playse SE_PIN applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0833 waitmovement 0 applymovement 2, EverGrandeCity_ChampionsRoom_Movement_1A0835 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index d83745593..a738264fe 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 faceplayer checkflag FLAG_DEFEATED_ELITE_4_DRAKE goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 goto EverGrandeCity_DrakesRoom_EventScript_15B795 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index 0e5b493e2..e3a4145d6 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA faceplayer checkflag FLAG_DEFEATED_ELITE_4_GLACIA goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 goto EverGrandeCity_GlaciasRoom_EventScript_15B6FB diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index 19219a626..d23f234db 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -43,7 +43,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 faceplayer checkflag FLAG_DEFEATED_ELITE_4_PHOEBE goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C goto EverGrandeCity_PhoebesRoom_EventScript_15B661 diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index 5957508ae..a787b0f90 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -64,7 +64,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 waitmovement 0 delay 10 - playfanfare 369 + playfanfare BGM_ME_BACHI message EverGrandeCity_PokemonLeague_Text_191804 waitmessage waitfanfare @@ -86,7 +86,7 @@ EverGrandeCity_PokemonLeague_EventScript_15BB3F:: @ 815BB3F return EverGrandeCity_PokemonLeague_EventScript_15BB4A:: @ 815BB4A - playse 32 + playse SE_HAZURE msgbox EverGrandeCity_PokemonLeague_Text_19179C, 4 releaseall end diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index f3df03b7d..4531845ab 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -44,7 +44,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 faceplayer checkflag FLAG_DEFEATED_ELITE_4_SYDNEY goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD - playbgm 450, 0 + playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 goto EverGrandeCity_SidneysRoom_EventScript_15B5C7 diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 270575bcb..641a201e3 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -22,13 +22,13 @@ FallarborTown_ContestLobby_EventScript_1539F8:: @ 81539F8 lockall applymovement 1, FallarborTown_ContestLobby_Movement_153A7C waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, FallarborTown_ContestLobby_Movement_153A7F waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc index 0c9880137..93a5115af 100644 --- a/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/FallarborTown_PokemonCenter_1F.inc @@ -46,7 +46,7 @@ FallarborTown_PokemonCenter_1F_EventScript_153B59:: @ 8153B59 end FallarborTown_PokemonCenter_1F_EventScript_153B69:: @ 8153B69 - playse 18 + playse SE_JIDO_DOA removeobject 4 clearflag FLAG_HIDE_LANETTE release diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index 3d4a57c13..c9616266e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -22,7 +22,7 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D - playse 9 + playse SE_KAIDAN removeobject 1 release end diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 43a8ed7cd..e81c3b69f 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -58,11 +58,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED end LavaridgeTown_EventScript_14E56B:: @ 814E56B - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return LavaridgeTown_EventScript_14E570:: @ 814E570 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return LavaridgeTown_EventScript_14E575:: @ 814E575 @@ -282,7 +282,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A goto_if_eq LavaridgeTown_EventScript_14E7A8 msgbox LavaridgeTown_Text_16C2B6, 4 setflag FLAG_RECEIVED_LAVARIDGE_EGG - playfanfare 370 + playfanfare BGM_FANFA4 message LavaridgeTown_Text_16C2EA waitfanfare waitmessage diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 5c05639fd..0d714003e 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -255,7 +255,7 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 end LilycoveCity_EventScript_14CD60:: @ 814CD60 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CDB0 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE @@ -286,7 +286,7 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 end LilycoveCity_EventScript_14CDD3:: @ 814CDD3 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 1, LilycoveCity_EventScript_14CE23 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 377c2908d..591587be8 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -72,13 +72,13 @@ LilycoveCity_ContestLobby_EventScript_158948:: @ 8158948 special sub_80C4858 applymovement 4, LilycoveCity_ContestLobby_Movement_158A4E waitmovement 0 - playse 21 + playse SE_PIN applymovement 4, LilycoveCity_ContestLobby_Movement_1A0833 waitmovement 0 applymovement 4, LilycoveCity_ContestLobby_Movement_158A52 waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -245,13 +245,13 @@ LilycoveCity_ContestLobby_EventScript_158B18:: @ 8158B18 special sub_80C4858 applymovement 11, LilycoveCity_ContestLobby_Movement_158B78 waitmovement 0 - playse 21 + playse SE_PIN applymovement 11, LilycoveCity_ContestLobby_Movement_1A0833 waitmovement 0 applymovement 11, LilycoveCity_ContestLobby_Movement_158B7C waitmovement 0 msgbox LilycoveCity_ContestLobby_Text_188BB5, 4 - playfanfare 370 + playfanfare BGM_FANFA4 msgbox LilycoveCity_ContestLobby_Text_188C03, 4 waitfanfare msgbox LilycoveCity_ContestLobby_Text_188C19, 4 @@ -496,13 +496,13 @@ LilycoveCity_ContestLobby_EventScript_158E0B:: @ 8158E0B closemessage applymovement 2, LilycoveCity_ContestLobby_Movement_158E9C waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 9, 2, 545, 1 setmetatile 9, 3, 609, 1 special DrawWholeMapView applymovement 2, LilycoveCity_ContestLobby_Movement_158EA0 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 9, 2, 721, 1 setmetatile 9, 3, 729, 1 special DrawWholeMapView @@ -635,13 +635,13 @@ LilycoveCity_ContestLobby_EventScript_158F86:: @ 8158F86 lockall applymovement 1, LilycoveCity_ContestLobby_Movement_15900B waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, LilycoveCity_ContestLobby_Movement_15900F waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index 3e4caf100..c8a3dcab9 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -41,7 +41,7 @@ LilycoveCity_CoveLilyMotel_1F_EventScript_158326:: @ 8158326 LilycoveCity_CoveLilyMotel_1F_EventScript_15834D:: @ 815834D lockall - playse 21 + playse SE_PIN applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0833 waitmovement 0 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0835 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 7e221122b..4878cc6bc 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -20,7 +20,7 @@ LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7:: @ 81583C7 LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0:: @ 81583D0 setflag FLAG_TEMP_2 - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare goto LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD end diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index ff7722f13..da4009759 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -147,7 +147,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C75F, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 @@ -159,7 +159,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 @@ -171,7 +171,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 - playse 106 + playse SE_JIHANKI msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C780, 4 giveitem VAR_TEMP_0, 1 bufferitemname 1, VAR_TEMP_0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index d4dedb0c2..12d8bfb4e 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -25,7 +25,7 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E msgbox LilycoveCity_DepartmentStore_1F_Text_1C4CF6, 4 applymovement 2, LilycoveCity_DepartmentStore_1F_Movement_1A0843 waitmovement 0 - playse 4 + playse SE_PC_ON special DoLotteryCornerComputerEffect special PickLotteryCornerTicket delay 220 diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index a3c8d23af..0c9a9054b 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -40,7 +40,7 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE LilycoveCity_MoveDeletersHouse_EventScript_159B53:: @ 8159B53 special DeleteMonMove - playfanfare 378 + playfanfare BGM_ME_WASURE waitfanfare msgbox LilycoveCity_MoveDeletersHouse_Text_18B71E, 4 releaseall diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index c11546bb5..ef2145bbb 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -99,7 +99,7 @@ LittlerootTown_EventScript_14D60D:: @ 814D60D LittlerootTown_EventScript_14D62B:: @ 814D62B delay 15 - playse 10 + playse SE_DANSA applymovement 255, LittlerootTown_Movement_14D6C0 waitmovement 0 opendoor VAR_SPECIAL_4, VAR_SPECIAL_5 @@ -868,7 +868,7 @@ LittlerootTown_EventScript_14DD2B:: @ 814DD2B LittlerootTown_EventScript_14DD38:: @ 814DD38 msgbox LittlerootTown_Text_16A8FD, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message LittlerootTown_Text_16AA32 waitfanfare waitmessage diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 4ce1e277a..8a86cd946 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_BrendansHouse_1F_EventScript_152733:: @ 8152733 LittlerootTown_BrendansHouse_1F_EventScript_152744:: @ 8152744 lockall - playse 21 + playse SE_PIN applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0833 waitmovement 0 applymovement 4, LittlerootTown_BrendansHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index af7a2976b..45e9e0783 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -90,7 +90,7 @@ LittlerootTown_MaysHouse_1F_EventScript_152971:: @ 8152971 LittlerootTown_MaysHouse_1F_EventScript_152982:: @ 8152982 lockall - playse 21 + playse SE_PIN applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0833 waitmovement 0 applymovement 4, LittlerootTown_MaysHouse_1F_Movement_1A0835 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 8bd9a01d2..34300b13e 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -37,7 +37,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A - playse 9 + playse SE_KAIDAN removeobject LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 setvar VAR_LITTLEROOT_STATE, 1 @@ -48,7 +48,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_17337E, 4 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 @@ -82,7 +82,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B3F:: @ 8152B3F LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735C9, 4 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0839 waitmovement 0 applymovement LAST_TALKED, LittlerootTown_BrendansHouse_2F_Movement_1A0833 diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 44adab6f1..e1cb348fd 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -27,7 +27,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE bufferleadmonspeciesname 0 message LittlerootTown_ProfessorBirchsLab_Text_173D94 waitmessage - playfanfare 370 + playfanfare BGM_FANFA4 waitfanfare msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 compare RESULT, 1 @@ -155,7 +155,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 return LittlerootTown_ProfessorBirchsLab_EventScript_152E6D:: @ 8152E6D - playfanfare 370 + playfanfare BGM_FANFA4 message LittlerootTown_ProfessorBirchsLab_Text_17422F waitfanfare waitmessage diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 6861e46c8..d7f0611e1 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -95,7 +95,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 msgbox MauvilleCity_Text_165D01, 4 applymovement 6, MauvilleCity_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 6, MauvilleCity_Movement_1A0833 waitmovement 0 applymovement 6, MauvilleCity_Movement_1A0835 diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c2b785254..c40c05d37 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -43,7 +43,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -62,7 +62,7 @@ MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 updatemoneybox 0, 0 nop updatecoinsbox 0, 5 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181CFE, 4 hidemoneybox 0, 0 hidecoinsbox 0, 5 @@ -163,7 +163,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 takecoins 1000 givedecoration 88 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -179,7 +179,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 takecoins 1000 givedecoration 89 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -195,7 +195,7 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA takecoins 1000 givedecoration 90 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 goto MauvilleCity_GameCorner_EventScript_156B9B end @@ -297,7 +297,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C takecoins 1500 giveitem ITEM_TM32, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -312,7 +312,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 takecoins 3500 giveitem ITEM_TM29, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -327,7 +327,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 takecoins 4000 giveitem ITEM_TM35, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -342,7 +342,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA takecoins 4000 giveitem ITEM_TM24, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -357,7 +357,7 @@ MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 takecoins 4000 giveitem ITEM_TM13, 1 updatecoinsbox 0, 0 - playse 95 + playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181F08, 4 goto MauvilleCity_GameCorner_EventScript_156D49 end @@ -468,7 +468,7 @@ MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 - playse 95 + playse SE_REGI goto MauvilleCity_GameCorner_EventScript_1570CA end diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index 05287c7de..fd9c673dc 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -91,7 +91,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 special DrawWholeMapView - playse 44 + playse SE_KI_GASYAN goto MauvilleCity_Gym_EventScript_15661D end @@ -146,7 +146,7 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial2 special MauvilleGymSpecial1 special DrawWholeMapView - playse 44 + playse SE_KI_GASYAN checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE goto_if_eq MauvilleCity_Gym_EventScript_1566E1 checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index a058003bc..32269ab89 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -14,7 +14,7 @@ MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 end MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 - playse 21 + playse SE_PIN applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0833 waitmovement 0 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index a3e396ab0..bf51408b8 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -18,7 +18,7 @@ MeteorFalls_1F_1R_EventScript_15C49C:: @ 815C49C applymovement 5, MeteorFalls_1F_1R_Movement_1A0841 applymovement 6, MeteorFalls_1F_1R_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 5, MeteorFalls_1F_1R_Movement_1A0833 waitmovement 0 applymovement 5, MeteorFalls_1F_1R_Movement_1A0835 diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index 54a9546c4..bc22ce3fe 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -94,7 +94,7 @@ MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA MossdeepCity_Gym_EventScript_15A619:: @ 815A619 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA releaseall end diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index eababfa6c..9aa9d8ef3 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -31,7 +31,7 @@ MossdeepCity_StevensHouse_EventScript_15AA0B:: @ 815AA0B lockall applymovement 1, MossdeepCity_StevensHouse_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 1, MossdeepCity_StevensHouse_Movement_1A0833 waitmovement 0 applymovement 1, MossdeepCity_StevensHouse_Movement_1A0835 @@ -79,7 +79,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C goto_if_eq MossdeepCity_StevensHouse_EventScript_15AADC copyvar VAR_SPECIAL_4, RESULT removeobject 2 - playfanfare 370 + playfanfare BGM_FANFA4 message MossdeepCity_StevensHouse_Text_18DD61 waitfanfare waitmessage diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 1e4cdf256..b7d68b257 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -40,7 +40,7 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC setmetatile 4, 1, 716, 0 setmetatile 5, 1, 717, 1 special DrawWholeMapView - playse 20 + playse SE_BAN setvar VAR_NEW_MAUVILLE_STATE, 1 releaseall end diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index 283b6bfed..ae33d7978 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -31,7 +31,7 @@ NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA lockall setvar VAR_TEMP_1, 1 setvar VAR_TEMP_2, 0 - playse 21 + playse SE_PIN call NewMauville_Inside_EventScript_15E5DA special DrawWholeMapView releaseall @@ -41,7 +41,7 @@ NewMauville_Inside_EventScript_15E5C2:: @ 815E5C2 lockall setvar VAR_TEMP_1, 0 setvar VAR_TEMP_2, 1 - playse 21 + playse SE_PIN call NewMauville_Inside_EventScript_15E728 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index 329313e74..a2d2616d3 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -43,7 +43,7 @@ OldaleTown_EventScript_14DDBC:: @ 814DDBC checkflag FLAG_TEMP_1 goto_if_eq OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 closemessage switch FACING diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index 2ac3f35f9..ea58f50c6 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -16,7 +16,7 @@ PetalburgCity_EventScript_14B731:: @ 814B731 return PetalburgCity_EventScript_14B739:: @ 814B739 - savebgm 420 + savebgm BGM_TSURETEK return PetalburgCity_MapScript2_14B73D:: @ 814B73D @@ -181,8 +181,8 @@ PetalburgCity_EventScript_14B85A:: @ 814B85A PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, PetalburgCity_Movement_1A0839 waitmovement 0 - playbgm 420, 0 - playse 21 + playbgm BGM_TSURETEK, FALSE + playse SE_PIN applymovement 9, PetalburgCity_Movement_1A0833 waitmovement 0 applymovement 9, PetalburgCity_Movement_1A0835 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 1bd1649cf..de141daf9 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -84,7 +84,7 @@ PetalburgCity_Gym_EventScript_15456C:: @ 815456C applymovement 255, PetalburgCity_Gym_Movement_1A0845 applymovement 10, PetalburgCity_Gym_Movement_1545B4 waitmovement 0 - playse 9 + playse SE_KAIDAN removeobject 10 setflag FLAG_HIDE_WALLY_PETALBURG delay 30 @@ -143,7 +143,7 @@ PetalburgCity_Gym_EventScript_15465E:: @ 815465E PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 - playse 8 + playse SE_DOOR compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_1547EE compare VAR_SPECIAL_8, 1 @@ -195,7 +195,7 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE compare VAR_SPECIAL_8, 0 call_if 1, PetalburgCity_Gym_EventScript_154835 compare VAR_SPECIAL_8, 1 diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 73eb4f661..149fd4e46 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -13,7 +13,7 @@ PetalburgWoods_EventScript_15CCA8:: @ 815CCA8 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 @@ -48,7 +48,7 @@ PetalburgWoods_EventScript_15CD42:: @ 815CD42 waitmovement 0 msgbox PetalburgWoods_Text_194D92, 4 closemessage - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE applymovement 3, PetalburgWoods_Movement_15CEC3 waitmovement 0 msgbox PetalburgWoods_Text_194DED, 4 diff --git a/data/scripts/maps/Route101.inc b/data/scripts/maps/Route101.inc index 6749f2136..6840c45f4 100644 --- a/data/scripts/maps/Route101.inc +++ b/data/scripts/maps/Route101.inc @@ -18,7 +18,7 @@ Route101_EventScript_14E93F:: @ 814E93F Route101_EventScript_14E948:: @ 814E948 lockall - playbgm 410, 1 + playbgm BGM_EVENT0, TRUE msgbox Route101_Text_16D10E, 4 closemessage setobjectxy 2, 0, 15 diff --git a/data/scripts/maps/Route103.inc b/data/scripts/maps/Route103.inc index bfcbeb87a..22c3fa391 100644 --- a/data/scripts/maps/Route103.inc +++ b/data/scripts/maps/Route103.inc @@ -18,7 +18,7 @@ Route103_EventScript_14EB92:: @ 814EB92 Route103_EventScript_14EBAB:: @ 814EBAB msgbox Route103_Text_16D57A, 4 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 @@ -34,7 +34,7 @@ Route103_EventScript_14EBAB:: @ 814EBAB Route103_EventScript_14EC04:: @ 814EC04 msgbox Route103_Text_16D762, 4 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE applymovement 2, Route103_Movement_1A0839 waitmovement 0 applymovement 2, Route103_Movement_1A0833 @@ -100,7 +100,7 @@ Route103_EventScript_14ECD9:: @ 814ECD9 Route103_EventScript_14ED0C:: @ 814ED0C applymovement 2, Route103_Movement_14ED67 waitmovement 0 - playse 10 + playse SE_DANSA applymovement 2, Route103_Movement_14ED6B waitmovement 0 goto Route103_EventScript_14ED46 @@ -109,7 +109,7 @@ Route103_EventScript_14ED0C:: @ 814ED0C Route103_EventScript_14ED29:: @ 814ED29 applymovement 2, Route103_Movement_14ED71 waitmovement 0 - playse 10 + playse SE_DANSA applymovement 2, Route103_Movement_14ED74 waitmovement 0 goto Route103_EventScript_14ED46 diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index 586031a1a..d5219582c 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -17,7 +17,7 @@ Route110_MapScript1_14F914:: @ 814F914 end Route110_EventScript_14F92F:: @ 814F92F - savebgm 403 @ Bicycle music + savebgm BGM_CYCLING return Route110_MapScript2_14F933:: @ 814F933 @@ -352,11 +352,11 @@ Route110_EventScript_14FD34:: @ 814FD34 end Route110_EventScript_14FDA7:: @ 814FDA7 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return Route110_EventScript_14FDAC:: @ 814FDAC - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return Route110_EventScript_14FDB1:: @ 814FDB1 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index c825c1234..e7e19b4dd 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -182,7 +182,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF Route110_TrickHouseEnd_EventScript_161C2E:: @ 8161C2E applymovement 1, Route110_TrickHouseEnd_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEnd_Movement_16131E waitmovement 0 removeobject 1 @@ -224,13 +224,13 @@ Route110_TrickHouseEnd_EventScript_161C95:: @ 8161C95 Route110_TrickHouseEnd_EventScript_161CA0:: @ 8161CA0 lockall turnobject 1, 3 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHouseEnd_Movement_1A0833 waitmovement 0 delay 20 applymovement 1, Route110_TrickHouseEnd_Movement_161CEA waitmovement 0 - playse 178 + playse SE_W153 applymovement 255, Route110_TrickHouseEnd_Movement_1A0845 waitmovement 0 msgbox Route110_TrickHouseEnd_Text_19CA8B, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 8a8dd2763..e5a216db4 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -220,7 +220,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 delay 20 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -243,7 +243,7 @@ Route110_TrickHouseEntrance_EventScript_16121A:: @ 816121A end Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D - playse 21 + playse SE_PIN applymovement 255, Route110_TrickHouseEntrance_Movement_1A0833 waitmovement 0 applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 @@ -336,7 +336,7 @@ Route110_TrickHouseEntrance_EventScript_161330:: @ 8161330 closemessage applymovement 1, Route110_TrickHouseEntrance_Movement_1A0839 waitmovement 0 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHouseEntrance_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_1A0835 @@ -469,7 +469,7 @@ Route110_TrickHouseEntrance_EventScript_161551:: @ 8161551 waitmovement 0 applymovement 1, Route110_TrickHouseEntrance_Movement_161315 waitmovement 0 - playse 178 + playse SE_W153 applymovement 1, Route110_TrickHouseEntrance_Movement_16131E waitmovement 0 removeobject 1 @@ -714,7 +714,7 @@ Route110_TrickHousePuzzle5_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle6_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle7_EventScript_16189C:: @ 816189C Route110_TrickHousePuzzle8_EventScript_16189C:: @ 816189C - playfanfare 370 + playfanfare BGM_FANFA4 message Route110_TrickHousePuzzle1_Text_19C1B8 waitfanfare waitmessage diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index 9ebde8451..b1cb0c9df 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -36,7 +36,7 @@ Route110_TrickHousePuzzle2_EventScript_161DD5:: @ 8161DD5 Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 lockall setvar VAR_TEMP_1, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E2C special DrawWholeMapView releaseall @@ -45,7 +45,7 @@ Route110_TrickHousePuzzle2_EventScript_161DE0:: @ 8161DE0 Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 lockall setvar VAR_TEMP_2, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E3F special DrawWholeMapView releaseall @@ -54,7 +54,7 @@ Route110_TrickHousePuzzle2_EventScript_161DF3:: @ 8161DF3 Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 lockall setvar VAR_TEMP_3, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E52 special DrawWholeMapView releaseall @@ -63,7 +63,7 @@ Route110_TrickHousePuzzle2_EventScript_161E06:: @ 8161E06 Route110_TrickHousePuzzle2_EventScript_161E19:: @ 8161E19 lockall setvar VAR_TEMP_4, 1 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle2_EventScript_161E65 special DrawWholeMapView releaseall diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index cb129b06d..8d5392ae8 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -289,7 +289,7 @@ Route110_TrickHousePuzzle3_EventScript_1625F3:: @ 81625F3 Route110_TrickHousePuzzle3_EventScript_1625FF:: @ 81625FF call Route110_TrickHousePuzzle3_EventScript_162612 - playse 21 + playse SE_PIN call Route110_TrickHousePuzzle3_EventScript_161F12 goto Route110_TrickHousePuzzle3_EventScript_1626AD end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 5fedee3a9..1bcdb8087 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -160,7 +160,7 @@ Route110_TrickHousePuzzle5_EventScript_162933:: @ 8162933 Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F setvar VAR_TEMP_1, 1 setvar VAR_TEMP_8, 1 - playse 21 + playse SE_PIN applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -182,7 +182,7 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 setvar VAR_TEMP_2, 1 setvar VAR_TEMP_8, 2 - playse 21 + playse SE_PIN applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -204,7 +204,7 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 setvar VAR_TEMP_3, 1 setvar VAR_TEMP_8, 3 - playse 21 + playse SE_PIN applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -226,7 +226,7 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B setvar VAR_TEMP_4, 1 setvar VAR_TEMP_8, 4 - playse 21 + playse SE_PIN applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -248,7 +248,7 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F setvar VAR_TEMP_5, 1 setvar VAR_TEMP_8, 5 - playse 21 + playse SE_PIN applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0833 waitmovement 0 applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 @@ -389,7 +389,7 @@ Route110_TrickHousePuzzle5_EventScript_162D6D:: @ 8162D6D Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 waitse - playse 32 + playse SE_HAZURE msgbox Route110_TrickHousePuzzle5_Text_19D5CF, 4 applymovement 1, Route110_TrickHousePuzzle5_Movement_16309F applymovement 2, Route110_TrickHousePuzzle5_Movement_16309F @@ -408,7 +408,7 @@ Route110_TrickHousePuzzle5_EventScript_162D90:: @ 8162D90 Route110_TrickHousePuzzle5_EventScript_162DDF:: @ 8162DDF waitse - playse 31 + playse SE_SEIKAI goto Route110_TrickHousePuzzle5_EventScript_162DE9 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index 66aa8b5e7..d1de7682f 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -126,7 +126,7 @@ Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 @@ -141,7 +141,7 @@ Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 @@ -156,7 +156,7 @@ Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 @@ -171,7 +171,7 @@ Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 @@ -186,7 +186,7 @@ Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView - playse 36 + playse SE_TK_KASYA checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 5336bd510..d0f4e6394 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -222,14 +222,14 @@ Route111_Movement_1501BA:: @ 81501BA Route111_EventScript_1501BC:: @ 81501BC setweather 2 - fadenewbgm 360 + fadenewbgm BGM_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 setweather 8 - fadenewbgm 409 + fadenewbgm BGM_ASHROAD doweather end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index bc32449cd..6c1e8559f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -197,7 +197,7 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 msgbox Route113_GlassWorkshop_Text_19E827, 4 closemessage fadescreen 1 - playse 5 + playse SE_SELECT delay 30 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 63decb5d6..0ed9e9b01 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -77,7 +77,7 @@ Route118_EventScript_150FE4:: @ 8150FE4 end Route118_EventScript_151004:: @ 8151004 - playse 10 + playse SE_DANSA applymovement 19, Route118_Movement_15106D waitmovement 0 delay 30 diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index e82d7b313..8d9f88474 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -80,11 +80,11 @@ Route119_EventScript_1511DB:: @ 81511DB end Route119_EventScript_151254:: @ 8151254 - playbgm 415, 1 + playbgm BGM_GIRL_SUP, TRUE return Route119_EventScript_151259:: @ 8151259 - playbgm 421, 1 + playbgm BGM_BOY_SUP, TRUE return Route119_EventScript_15125E:: @ 815125E diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index 50f453465..b36500345 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -58,7 +58,7 @@ Route119_WeatherInstitute_2F_EventScript_163D7A:: @ 8163D7A getpartysize compare RESULT, 6 goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DB4 - playfanfare 370 + playfanfare BGM_FANFA4 message Route119_WeatherInstitute_2F_Text_19F267 waitfanfare waitmessage diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 6235e3b1c..67fa830e9 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -71,7 +71,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 updatemoneybox 0, 0 nop msgbox Route121_SafariZoneEntrance_Text_1C38F4, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message Route121_SafariZoneEntrance_Text_1C3910 waitfanfare waitmessage diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index 47d216d9f..c6bdbbdb7 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -381,7 +381,7 @@ RustboroCity_EventScript_14C650:: @ 814C650 RustboroCity_EventScript_14C691:: @ 814C691 applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -393,7 +393,7 @@ RustboroCity_EventScript_14C691:: @ 814C691 RustboroCity_EventScript_14C6BD:: @ 814C6BD applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -405,7 +405,7 @@ RustboroCity_EventScript_14C6BD:: @ 814C6BD RustboroCity_EventScript_14C6E9:: @ 814C6E9 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -417,7 +417,7 @@ RustboroCity_EventScript_14C6E9:: @ 814C6E9 RustboroCity_EventScript_14C715:: @ 814C715 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -489,7 +489,7 @@ RustboroCity_EventScript_14C7F5:: @ 814C7F5 RustboroCity_EventScript_14C7FE:: @ 814C7FE applymovement 9, RustboroCity_Movement_1A0841 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -501,7 +501,7 @@ RustboroCity_EventScript_14C7FE:: @ 814C7FE RustboroCity_EventScript_14C82A:: @ 814C82A applymovement 9, RustboroCity_Movement_1A0843 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -513,7 +513,7 @@ RustboroCity_EventScript_14C82A:: @ 814C82A RustboroCity_EventScript_14C856:: @ 814C856 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -525,7 +525,7 @@ RustboroCity_EventScript_14C856:: @ 814C856 RustboroCity_EventScript_14C882:: @ 814C882 applymovement 9, RustboroCity_Movement_1A0845 waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 @@ -539,7 +539,7 @@ RustboroCity_EventScript_14C882:: @ 814C882 RustboroCity_EventScript_14C8B8:: @ 814C8B8 applymovement 9, RustboroCity_Movement_1A083F waitmovement 0 - playse 21 + playse SE_PIN applymovement 9, RustboroCity_Movement_1A0833 waitmovement 0 applymovement 9, RustboroCity_Movement_1A0835 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index c997935cc..9bbbaacfa 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -80,7 +80,7 @@ RustboroCity_DevonCorp_2F_EventScript_157564:: @ 8157564 RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 closemessage - playse 21 + playse SE_PIN applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -98,7 +98,7 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE closemessage - playse 21 + playse SE_PIN applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0833 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 @@ -140,7 +140,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage @@ -160,7 +160,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 copyvar VAR_SPECIAL_4, RESULT setvar VAR_FOSSIL_RESURRECTION_STATE, 0 setflag FLAG_RECEIVED_FOSSIL_MON - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_2F_Text_18319E waitfanfare waitmessage diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index af5d5d6ee..ff854d7ef 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -37,7 +37,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 waitmovement 0 msgbox RustboroCity_DevonCorp_3F_Text_183903, 4 closemessage - playbgm 420, 0 + playbgm BGM_TSURETEK, FALSE applymovement 2, RustboroCity_DevonCorp_3F_Movement_157803 applymovement 255, RustboroCity_DevonCorp_3F_Movement_157827 waitmovement 0 @@ -50,7 +50,7 @@ RustboroCity_DevonCorp_3F_EventScript_157752:: @ 8157752 msgbox RustboroCity_DevonCorp_3F_Text_18320B, 4 giveitem_std ITEM_LETTER msgbox RustboroCity_DevonCorp_3F_Text_18337E, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message RustboroCity_DevonCorp_3F_Text_183422 waitfanfare waitmessage diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index d50e7cec0..050cf28c2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -148,7 +148,7 @@ RusturfTunnel_EventScript_15C91B:: @ 815C91B return RusturfTunnel_EventScript_15C92D:: @ 815C92D - playse 21 + playse SE_PIN applymovement 1, RusturfTunnel_Movement_1A0833 waitmovement 0 applymovement 1, RusturfTunnel_Movement_1A0835 @@ -309,7 +309,7 @@ RusturfTunnel_EventScript_15C9D7:: @ 815C9D7 RusturfTunnel_EventScript_15C9EA:: @ 815C9EA lock faceplayer - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE msgbox RusturfTunnel_Text_19419B, 4 trainerbattle 3, OPPONENT_RUSTURF_TUNNEL_GRUNT, 0, RusturfTunnel_Text_194243 msgbox RusturfTunnel_Text_194274, 4 diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index fc018a7b9..dd5aee95c 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -13,7 +13,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 2 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199007, 4 releaseall end @@ -21,7 +21,7 @@ SSTidalCorridor_EventScript_15FCBC:: @ 815FCBC SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 setvar VAR_PORTHOLE_STATE, 6 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -29,14 +29,14 @@ SSTidalCorridor_EventScript_15FCD2:: @ 815FCD2 SSTidalRooms_EventScript_15FCE5:: @ 815FCE5 special SetSSTidalFlag setvar VAR_PORTHOLE_STATE, 7 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_199007, 4 return SSTidalRooms_EventScript_15FCF9:: @ 815FCF9 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 4 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_1990F8, 4 return @@ -51,7 +51,7 @@ SSTidalCorridor_EventScript_15FD24:: @ 815FD24 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 3 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_199088, 4 releaseall end @@ -60,7 +60,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 lockall - playse 73 + playse SE_PINPON msgbox SSTidalCorridor_Text_1990B4, 4 releaseall end @@ -68,7 +68,7 @@ SSTidalCorridor_EventScript_15FD3A:: @ 815FD3A SSTidalRooms_EventScript_15FD50:: @ 815FD50 special ResetSSTidalFlag setvar VAR_PORTHOLE_STATE, 8 - playse 73 + playse SE_PINPON msgbox SSTidalRooms_Text_1990B4, 4 return diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 574c7412e..54c99b371 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -78,7 +78,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 0 .endif - playse 209 + playse SE_W197 setfieldeffectargument 0, 16 setfieldeffectargument 1, 42 setfieldeffectargument 2, 0 @@ -89,8 +89,8 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else setvar RESULT, 1 .endif - playfanfare 388 - playse 107 + playfanfare BGM_ME_TAMA + playse SE_TAMA special sub_80818A4 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0841 applymovement 255, SeafloorCavern_Room9_Movement_1A0841 @@ -126,7 +126,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4A89, 4 .endif - playse 2 + playse SE_PC_LOGON applymovement 255, SeafloorCavern_Room9_Movement_1A083F waitmovement 0 .ifdef SAPPHIRE @@ -143,7 +143,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA msgbox SeafloorCavern_Room9_Text_1B4B11, 4 .endif closemessage - playse 3 + playse SE_PC_OFF delay 20 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0845 waitmovement 0 @@ -167,7 +167,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B4D02, 4 .endif - playse 21 + playse SE_PIN applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0833 waitmovement 0 applymovement VAR_SPECIAL_4, SeafloorCavern_Room9_Movement_1A0835 diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index cd778202c..d788be9b3 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -12,21 +12,21 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 fadeoutbgm 0 - playse 49 + playse SE_TRACK_MOVE special DoSealedChamberShakingEffect1 waitstate delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 special DoSealedChamberShakingEffect2 waitstate - playse 8 + playse SE_DOOR delay 40 msgbox SealedChamber_InnerRoom_Text_1A138B, 4 closemessage diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index 4079763a3..d39f788d8 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -73,7 +73,7 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 compare RESULT, 0 call_if 1, SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 - playfanfare 370 + playfanfare BGM_FANFA4 message SlateportCity_Text_1646DD waitfanfare waitmessage @@ -508,7 +508,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0841 waitmovement 0 msgbox SlateportCity_Text_1655E7, 4 - playbgm BGM_EVIL_TEAM, 0 + playbgm BGM_EVIL_TEAM, FALSE msgbox SlateportCity_Text_1656BC, 4 applymovement 6, SlateportCity_Movement_1A083F applymovement 1, SlateportCity_Movement_1A083F @@ -519,7 +519,7 @@ SlateportCity_EventScript_14BEBC:: @ 814BEBC applymovement 11, SlateportCity_Movement_1A0845 waitmovement 0 msgbox SlateportCity_Text_16578F, 4 - playse 21 + playse SE_PIN applymovement 11, SlateportCity_Movement_1A0833 waitmovement 0 applymovement 11, SlateportCity_Movement_1A0835 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 2fd62e9af..59c5b13fc 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -22,13 +22,13 @@ SlateportCity_ContestLobby_EventScript_155448:: @ 8155448 lockall applymovement 1, SlateportCity_ContestLobby_Movement_1554CC waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, SlateportCity_ContestLobby_Movement_1554CF waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index abbe3f78f..ad349932a 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -158,7 +158,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A lock faceplayer delay 8 - playse 21 + playse SE_PIN applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0833 waitmovement 0 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_1A0835 @@ -180,7 +180,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CD3 waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse 9 + playse SE_KAIDAN removeobject 13 release end @@ -189,7 +189,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155CAD:: @ 8155CAD applymovement 13, SlateportCity_OceanicMuseum_1F_Movement_155CCC waitmovement 0 setflag FLAG_HIDE_SCARED_GRUNT_OCEANIC_MUSEUM - playse 9 + playse SE_KAIDAN removeobject 13 release end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 007e42f90..5dae0bc6b 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -11,7 +11,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 faceplayer msgbox SlateportCity_OceanicMuseum_2F_Text_17ECFD, 4 closemessage - playbgm BGM_EVIL_TEAM, 1 + playbgm BGM_EVIL_TEAM, TRUE addobject 3 applymovement 3, SlateportCity_OceanicMuseum_2F_Movement_155EB4 waitmovement 0 @@ -84,7 +84,7 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 closemessage applymovement 1, SlateportCity_OceanicMuseum_2F_Movement_155E98 waitmovement 0 - playse 9 + playse SE_KAIDAN removeobject 1 setflag FLAG_HIDE_EVIL_TEAM_ROUTE110 setflag FLAG_DELIVERED_DEVON_GOODS diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index 6e7d2614b..f7cc67236 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -206,7 +206,7 @@ SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 end SlateportCity_PokemonFanClub_EventScript_155A3A:: @ 8155A3A - playse 21 + playse SE_PIN applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0833 waitmovement 0 applymovement LAST_TALKED, SlateportCity_PokemonFanClub_Movement_1A0835 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index e29700981..f2ccc9484 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -216,7 +216,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 applymovement 10, SootopolisCity_Movement_1A083F applymovement 255, SootopolisCity_Movement_1A0843 waitmovement 0 - playse 21 + playse SE_PIN applymovement 10, SootopolisCity_Movement_1A0833 waitmovement 0 applymovement 10, SootopolisCity_Movement_1A0835 @@ -237,7 +237,7 @@ SootopolisCity_EventScript_14D308:: @ 814D308 .else msgbox SootopolisCity_Text_169E82, 4 .endif - playse 21 + playse SE_PIN applymovement 5, SootopolisCity_Movement_1A0833 waitmovement 0 applymovement 5, SootopolisCity_Movement_1A0835 diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 38514b03b..35fa306e6 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -49,7 +49,7 @@ SootopolisCity_Gym_1F_MapScript2_15AF86:: @ 815AF86 SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -57,7 +57,7 @@ SootopolisCity_Gym_1F_EventScript_15AFA8:: @ 815AFA8 SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -65,7 +65,7 @@ SootopolisCity_Gym_1F_EventScript_15AFBC:: @ 815AFBC SootopolisCity_Gym_1F_EventScript_15AFD0:: @ 815AFD0 addvar VAR_ICE_STEP_COUNT, 1 delay 40 - playse 40 + playse SE_RU_GASHIN call SootopolisCity_Gym_1F_EventScript_15AF2E special DrawWholeMapView end @@ -75,7 +75,7 @@ SootopolisCity_Gym_1F_EventScript_15AFE4:: @ 815AFE4 delay 20 applymovement 255, SootopolisCity_Gym_1F_Movement_15AFFD waitmovement 0 - playse 43 + playse SE_RU_HYUU delay 60 warphole MAP_SOOTOPOLIS_CITY_GYM_B1F waitstate diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index e2afd07dc..ffd184ddf 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -26,23 +26,23 @@ LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 - savebgm 393 + savebgm BGM_TEST1 return LinkContestRoom1_EventScript_15F5E4:: @ 815F5E4 - savebgm 394 + savebgm BGM_TEST2 return LinkContestRoom1_EventScript_15F5E8:: @ 815F5E8 - savebgm 395 + savebgm BGM_TEST3 return LinkContestRoom1_EventScript_15F5EC:: @ 815F5EC - savebgm 396 + savebgm BGM_TEST4 return LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 - savebgm 440 + savebgm BGM_CONTEST0 return LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 016b2e7ba..37811dbc1 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -22,13 +22,13 @@ VerdanturfTown_ContestLobby_EventScript_153DA1:: @ 8153DA1 lockall applymovement 1, VerdanturfTown_ContestLobby_Movement_153E25 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 545, 1 setmetatile 4, 3, 609, 1 special DrawWholeMapView applymovement 1, VerdanturfTown_ContestLobby_Movement_153E28 waitmovement 0 - playse 71 + playse SE_HASHI setmetatile 4, 2, 721, 1 setmetatile 4, 3, 729, 1 special DrawWholeMapView -- cgit v1.2.3 From 88c42ade4bfb4a285444c327663e72c7f438adea Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 14:52:51 -0800 Subject: Use weather constants in scripts (and giveegg) --- data/scripts/maps/CaveOfOrigin_B4F.inc | 2 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 2 +- data/scripts/maps/MtPyre_Exterior.inc | 6 +++--- data/scripts/maps/Route111.inc | 6 +++--- data/scripts/maps/Route113.inc | 2 +- data/scripts/maps/Route120.inc | 6 +++--- data/scripts/maps/SeafloorCavern_Room9.inc | 2 +- 8 files changed, 14 insertions(+), 14 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 904759cf1..315dda886 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -33,7 +33,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 msgbox CaveOfOrigin_B4F_Text_1B4FE4, 4 .endif closemessage - setweather 0 + setweather WEATHER_NONE doweather special WaitWeather waitstate diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index bf1f0233d..efe5d6a6e 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -13,7 +13,7 @@ JaggedPass_MapScript1_15D274:: @ 815D274 end JaggedPass_EventScript_15D280:: @ 815D280 - setweather 7 + setweather WEATHER_ASH doweather return diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index e81c3b69f..f1a6deed0 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -286,7 +286,7 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A message LavaridgeTown_Text_16C2EA waitfanfare waitmessage - giveegg 360 + giveegg SPECIES_WYNAUT release end diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index 76f1736c2..ec5864df5 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -13,15 +13,15 @@ MtPyre_Exterior_EventScript_15D492:: @ 815D492 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 - setweather 6 + setweather WEATHER_FOG_1 return MtPyre_Exterior_EventScript_15D4A7:: @ 815D4A7 - setweather 6 + setweather WEATHER_FOG_1 doweather end MtPyre_Exterior_EventScript_15D4AC:: @ 815D4AC - setweather 2 + setweather WEATHER_SUNNY doweather end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index d0f4e6394..c3d807f66 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -34,7 +34,7 @@ Route111_EventScript_14FFCD:: @ 814FFCD goto_if 0, Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 - setweather 8 + setweather WEATHER_SANDSTORM Route111_EventScript_15000C:: @ 815000C return @@ -221,14 +221,14 @@ Route111_Movement_1501BA:: @ 81501BA step_end Route111_EventScript_1501BC:: @ 81501BC - setweather 2 + setweather WEATHER_SUNNY fadenewbgm BGM_DOORO_X1 doweather setvar VAR_TEMP_3, 0 end Route111_EventScript_1501C9:: @ 81501C9 - setweather 8 + setweather WEATHER_SANDSTORM fadenewbgm BGM_ASHROAD doweather end diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index 1b589fcde..a1593ba1e 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -18,7 +18,7 @@ Route113_EventScript_1505E5:: @ 81505E5 goto_if 0, Route113_EventScript_150604 compare VAR_TEMP_0, 84 goto_if 2, Route113_EventScript_150604 - setweather 7 + setweather WEATHER_ASH return Route113_EventScript_150604:: @ 8150604 diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index d2866cceb..3858c0e4f 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -90,11 +90,11 @@ Route120_EventScript_1516EA:: @ 81516EA return Route120_EventScript_151711:: @ 8151711 - setweather 1 + setweather WEATHER_CLOUDS return Route120_EventScript_151715:: @ 8151715 - setweather 2 + setweather WEATHER_SUNNY return Route120_EventScript_151719:: @ 8151719 @@ -106,7 +106,7 @@ Route120_EventScript_151719:: @ 8151719 end Route120_EventScript_151735:: @ 8151735 - setweather 3 + setweather WEATHER_RAIN_LIGHT return Route120_EventScript_151739:: @ 8151739 diff --git a/data/scripts/maps/SeafloorCavern_Room9.inc b/data/scripts/maps/SeafloorCavern_Room9.inc index 54c99b371..afc076a65 100644 --- a/data/scripts/maps/SeafloorCavern_Room9.inc +++ b/data/scripts/maps/SeafloorCavern_Room9.inc @@ -62,7 +62,7 @@ SeafloorCavern_Room9_EventScript_15DAFA:: @ 815DAFA .else msgbox SeafloorCavern_Room9_Text_1B49C1, 4 .endif - setweather 0 + setweather WEATHER_NONE doweather special sub_8081924 waitstate -- cgit v1.2.3 From c748287725a01561ba9f972b094d7b297cea2d8e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 15:24:19 -0800 Subject: Use -1 instead of 65535 for compare macro --- data/scripts/maps/LilycoveCity_ContestLobby.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 591587be8..bb13b95be 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -475,7 +475,7 @@ LilycoveCity_ContestLobby_EventScript_158DD1:: @ 8158DD1 buffernumberstring 1, 32772 messageautoscroll LilycoveCity_ContestLobby_Text_188845 waitmessage - addvar VAR_SPECIAL_4, 65535 + addvar VAR_SPECIAL_4, -1 goto LilycoveCity_ContestLobby_EventScript_158DEE end -- cgit v1.2.3 From 27024647438c3cfeb6218965821ac2c07122e132 Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 16:03:26 -0800 Subject: Use constants for some item names stored in script vars --- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 6 ++-- data/scripts/maps/MauvilleCity_GameCorner.inc | 18 ++++++------ data/scripts/maps/Route110_TrickHouseEnd.inc | 4 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 4 +-- data/scripts/maps/Route113_GlassWorkshop.inc | 32 +++++++++++----------- .../maps/Route124_DivingTreasureHuntersHouse.inc | 16 +++++------ 6 files changed, 40 insertions(+), 40 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index da4009759..cd5e0d980 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -88,17 +88,17 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1DE:: @ 815A1DE end LilycoveCity_DepartmentStoreRooftop_EventScript_15A21C:: @ 815A21C - setvar VAR_TEMP_0, 26 + setvar VAR_TEMP_0, ITEM_FRESH_WATER goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A227:: @ 815A227 - setvar VAR_TEMP_0, 27 + setvar VAR_TEMP_0, ITEM_SODA_POP goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A232:: @ 815A232 - setvar VAR_TEMP_0, 28 + setvar VAR_TEMP_0, ITEM_LEMONADE goto LilycoveCity_DepartmentStoreRooftop_EventScript_15A267 end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index c40c05d37..d150e1508 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -156,12 +156,12 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 88 - checkdecorspace 88 + bufferdecorationname 1, DECOR_TREECKO_DOLL + checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 88 + givedecoration DECOR_TREECKO_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -172,12 +172,12 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 89 - checkdecorspace 89 + bufferdecorationname 1, DECOR_TORCHIC_DOLL + checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 89 + givedecoration DECOR_TORCHIC_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 @@ -188,12 +188,12 @@ MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 - bufferdecorationname 1, 90 - checkdecorspace 90 + bufferdecorationname 1, DECOR_MUDKIP_DOLL + checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156D02 takecoins 1000 - givedecoration 90 + givedecoration DECOR_MUDKIP_DOLL updatecoinsbox 0, 0 playse SE_REGI msgbox MauvilleCity_GameCorner_Text_181E49, 4 diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index e7e19b4dd..68ce0f5a7 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -167,9 +167,9 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C691, 4 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 .ifdef SAPPHIRE - givedecoration_std 32 + givedecoration_std DECOR_BLUE_TENT .else - givedecoration_std 31 + givedecoration_std DECOR_RED_TENT .endc compare RESULT, 0 call_if 1, Route110_TrickHouseEnd_EventScript_161C61 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index e5a216db4..f34bba6e6 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -450,9 +450,9 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 waitmovement 0 msgbox Route110_TrickHouseEntrance_Text_19C128, 4 .ifdef SAPPHIRE - givedecoration_std 32 + givedecoration_std DECOR_BLUE_TENT .else - givedecoration_std 31 + givedecoration_std DECOR_RED_TENT .endif compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 6c1e8559f..e1bb038e3 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -67,7 +67,7 @@ Route113_GlassWorkshop_EventScript_1635EE:: @ 81635EE end Route113_GlassWorkshop_EventScript_163660:: @ 8163660 - setvar VAR_SPECIAL_8, 39 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 @@ -81,7 +81,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 end Route113_GlassWorkshop_EventScript_16369C:: @ 816369C - setvar VAR_SPECIAL_8, 40 + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 @@ -95,7 +95,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C end Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 - setvar VAR_SPECIAL_8, 41 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 @@ -109,7 +109,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 end Route113_GlassWorkshop_EventScript_163714:: @ 8163714 - setvar VAR_SPECIAL_8, 43 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 @@ -123,7 +123,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 end Route113_GlassWorkshop_EventScript_163750:: @ 8163750 - setvar VAR_SPECIAL_8, 42 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 @@ -138,7 +138,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 13 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 @@ -153,7 +153,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 6 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 @@ -246,50 +246,50 @@ Route113_GlassWorkshop_EventScript_1638D2:: @ 81638D2 Route113_GlassWorkshop_EventScript_163925:: @ 8163925 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 39 + setvar VAR_SPECIAL_8, ITEM_BLUE_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163939:: @ 8163939 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 40 + setvar VAR_SPECIAL_8, ITEM_YELLOW_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16394D:: @ 816394D setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 41 + setvar VAR_SPECIAL_8, ITEM_RED_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163961:: @ 8163961 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 43 + setvar VAR_SPECIAL_8, ITEM_WHITE_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163975:: @ 8163975 setvar VAR_SPECIAL_9, 0 - setvar VAR_SPECIAL_8, 42 + setvar VAR_SPECIAL_8, ITEM_BLACK_FLUTE bufferitemname 0, VAR_SPECIAL_8 goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_163989:: @ 8163989 setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 13 - bufferdecorationname 0, 13 + setvar VAR_SPECIAL_8, DECOR_PRETTY_CHAIR + bufferdecorationname 0, DECOR_PRETTY_CHAIR goto Route113_GlassWorkshop_EventScript_1639B1 end Route113_GlassWorkshop_EventScript_16399D:: @ 816399D setvar VAR_SPECIAL_9, 1 - setvar VAR_SPECIAL_8, 6 - bufferdecorationname 0, 6 + setvar VAR_SPECIAL_8, DECOR_PRETTY_DESK + bufferdecorationname 0, DECOR_PRETTY_DESK goto Route113_GlassWorkshop_EventScript_1639B1 end diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 4061dcd7e..bc71fac41 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -224,23 +224,23 @@ Route124_DivingTreasureHuntersHouse_EventScript_16420F:: @ 816420F end Route124_DivingTreasureHuntersHouse_EventScript_164256:: @ 8164256 - setvar VAR_SPECIAL_8, 48 - setvar VAR_SPECIAL_9, 95 + setvar VAR_SPECIAL_8, ITEM_RED_SHARD + setvar VAR_SPECIAL_9, ITEM_FIRE_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164265:: @ 8164265 - setvar VAR_SPECIAL_8, 50 - setvar VAR_SPECIAL_9, 96 + setvar VAR_SPECIAL_8, ITEM_YELLOW_SHARD + setvar VAR_SPECIAL_9, ITEM_THUNDER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164274:: @ 8164274 - setvar VAR_SPECIAL_8, 49 - setvar VAR_SPECIAL_9, 97 + setvar VAR_SPECIAL_8, ITEM_BLUE_SHARD + setvar VAR_SPECIAL_9, ITEM_WATER_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 - setvar VAR_SPECIAL_8, 51 - setvar VAR_SPECIAL_9, 98 + setvar VAR_SPECIAL_8, ITEM_GREEN_SHARD + setvar VAR_SPECIAL_9, ITEM_LEAF_STONE goto Route124_DivingTreasureHuntersHouse_EventScript_164292 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 -- cgit v1.2.3 From f0097860b0098ae465204152fb3a38d69422b27e Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Thu, 4 Jan 2018 16:19:02 -0800 Subject: Use MSGBOX_YESNO and YES/NO constants for yes/no message boxes --- data/scripts/maps/BattleTower_BattleRoom.inc | 18 +++--- data/scripts/maps/BattleTower_Lobby.inc | 12 ++-- data/scripts/maps/BattleTower_Outside.inc | 8 +-- data/scripts/maps/DewfordTown.inc | 16 ++--- data/scripts/maps/DewfordTown_Hall.inc | 6 +- data/scripts/maps/FallarborTown_House1.inc | 6 +- data/scripts/maps/FallarborTown_House2.inc | 4 +- data/scripts/maps/FortreeCity.inc | 4 +- data/scripts/maps/FortreeCity_House1.inc | 4 +- data/scripts/maps/LavaridgeTown.inc | 4 +- data/scripts/maps/LilycoveCity.inc | 12 ++-- data/scripts/maps/LilycoveCity_ContestLobby.inc | 24 ++++---- .../maps/LilycoveCity_DepartmentStore_1F.inc | 4 +- data/scripts/maps/LilycoveCity_Harbor.inc | 8 +-- data/scripts/maps/LilycoveCity_House3.inc | 4 +- .../maps/LilycoveCity_LilycoveMuseum_1F.inc | 6 +- .../maps/LilycoveCity_MoveDeletersHouse.inc | 12 ++-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 18 +++--- data/scripts/maps/MauvilleCity.inc | 8 +-- data/scripts/maps/MauvilleCity_BikeShop.inc | 18 +++--- data/scripts/maps/MauvilleCity_GameCorner.inc | 12 ++-- data/scripts/maps/MauvilleCity_House2.inc | 6 +- data/scripts/maps/MossdeepCity.inc | 4 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 8 +-- data/scripts/maps/MossdeepCity_House3.inc | 4 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 8 +-- data/scripts/maps/MtChimney.inc | 8 +-- data/scripts/maps/MtChimney_CableCarStation.inc | 6 +- data/scripts/maps/MtPyre_Summit.inc | 24 ++++---- data/scripts/maps/NewMauville_Entrance.inc | 4 +- data/scripts/maps/PacifidlogTown_House3.inc | 4 +- data/scripts/maps/PacifidlogTown_House4.inc | 6 +- data/scripts/maps/PetalburgCity_Gym.inc | 72 +++++++++++----------- data/scripts/maps/Route104_MrBrineysHouse.inc | 12 ++-- .../maps/Route104_PrettyPetalFlowerShop.inc | 12 ++-- data/scripts/maps/Route109.inc | 4 +- data/scripts/maps/Route109_SeashoreHouse.inc | 4 +- data/scripts/maps/Route110_TrickHouseEntrance.inc | 4 +- data/scripts/maps/Route111.inc | 12 ++-- data/scripts/maps/Route111_OldLadysRestStop.inc | 12 ++-- data/scripts/maps/Route112_CableCarStation.inc | 6 +- data/scripts/maps/Route113_GlassWorkshop.inc | 28 ++++----- data/scripts/maps/Route114_LanettesHouse.inc | 8 +-- data/scripts/maps/Route118.inc | 6 +- data/scripts/maps/Route120.inc | 14 ++--- data/scripts/maps/Route121_SafariZoneEntrance.inc | 8 +-- .../maps/Route124_DivingTreasureHuntersHouse.inc | 8 +-- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 16 ++--- data/scripts/maps/RustboroCity_House1.inc | 4 +- data/scripts/maps/SafariZone_Southeast.inc | 4 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 4 +- data/scripts/maps/SlateportCity.inc | 6 +- data/scripts/maps/SlateportCity_Harbor.inc | 16 ++--- data/scripts/maps/SlateportCity_House1.inc | 12 ++-- .../maps/SlateportCity_OceanicMuseum_1F.inc | 4 +- data/scripts/maps/SootopolisCity.inc | 4 +- data/scripts/maps/SootopolisCity_House2.inc | 6 +- data/scripts/maps/SootopolisCity_House3.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 4 +- data/scripts/maps/SouthernIsland_Exterior.inc | 4 +- 60 files changed, 294 insertions(+), 294 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/BattleTower_BattleRoom.inc b/data/scripts/maps/BattleTower_BattleRoom.inc index 1ee0d35d2..ce7d7c0e9 100644 --- a/data/scripts/maps/BattleTower_BattleRoom.inc +++ b/data/scripts/maps/BattleTower_BattleRoom.inc @@ -59,24 +59,24 @@ BattleTower_BattleRoom_EventScript_160961:: @ 8160961 special ScrSpecial_HealPlayerParty BattleTower_BattleRoom_EventScript_1609B2:: @ 81609B2 - msgbox BattleTower_BattleRoom_Text_19AD09, 5 + msgbox BattleTower_BattleRoom_Text_19AD09, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_1609E0 - case 1, BattleTower_BattleRoom_EventScript_160A3C + case NO, BattleTower_BattleRoom_EventScript_1609E0 + case YES, BattleTower_BattleRoom_EventScript_160A3C case 127, BattleTower_BattleRoom_EventScript_1609E0 BattleTower_BattleRoom_EventScript_1609E0:: @ 81609E0 - msgbox BattleTower_BattleRoom_Text_19AD3C, 5 + msgbox BattleTower_BattleRoom_Text_19AD3C, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_160A0E - case 1, BattleTower_BattleRoom_EventScript_160A94 + case NO, BattleTower_BattleRoom_EventScript_160A0E + case YES, BattleTower_BattleRoom_EventScript_160A94 case 127, BattleTower_BattleRoom_EventScript_160A0E BattleTower_BattleRoom_EventScript_160A0E:: @ 8160A0E - msgbox BattleTower_BattleRoom_Text_19AD66, 5 + msgbox BattleTower_BattleRoom_Text_19AD66, MSGBOX_YESNO switch RESULT - case 0, BattleTower_BattleRoom_EventScript_1609B2 - case 1, BattleTower_BattleRoom_EventScript_160AB1 + case NO, BattleTower_BattleRoom_EventScript_1609B2 + case YES, BattleTower_BattleRoom_EventScript_160AB1 case 127, BattleTower_BattleRoom_EventScript_1609B2 BattleTower_BattleRoom_EventScript_160A3C:: @ 8160A3C diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 5700480e2..14b85c5b0 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -221,10 +221,10 @@ BattleTower_Lobby_EventScript_1604FA:: @ 81604FA waitstate compare RESULT, 0 goto_if_eq BattleTower_Lobby_EventScript_16064F - msgbox BattleTower_Lobby_Text_199FDA, 5 + msgbox BattleTower_Lobby_Text_199FDA, MSGBOX_YESNO switch RESULT - case 0, BattleTower_Lobby_EventScript_16064F - case 1, BattleTower_Lobby_EventScript_160587 + case NO, BattleTower_Lobby_EventScript_16064F + case YES, BattleTower_Lobby_EventScript_160587 case 127, BattleTower_Lobby_EventScript_16064F BattleTower_Lobby_EventScript_160587:: @ 8160587 @@ -334,10 +334,10 @@ BattleTower_Lobby_Movement_16069A:: @ 816069A BattleTower_Lobby_EventScript_1606A5:: @ 81606A5 lock faceplayer - msgbox BattleTower_Lobby_Text_19A747, 5 + msgbox BattleTower_Lobby_Text_19A747, MSGBOX_YESNO switch RESULT - case 1, BattleTower_Lobby_EventScript_1606CC - case 0, BattleTower_Lobby_EventScript_1606F7 + case YES, BattleTower_Lobby_EventScript_1606CC + case NO, BattleTower_Lobby_EventScript_1606F7 release end diff --git a/data/scripts/maps/BattleTower_Outside.inc b/data/scripts/maps/BattleTower_Outside.inc index 3992ffd2c..8f6cb4305 100644 --- a/data/scripts/maps/BattleTower_Outside.inc +++ b/data/scripts/maps/BattleTower_Outside.inc @@ -35,8 +35,8 @@ BattleTower_Outside_EventScript_1601C6:: @ 81601C6 end BattleTower_Outside_EventScript_1601D0:: @ 81601D0 - msgbox BattleTower_Outside_Text_199DF2, 5 - compare RESULT, 0 + msgbox BattleTower_Outside_Text_199DF2, MSGBOX_YESNO + compare RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 @@ -46,8 +46,8 @@ BattleTower_Outside_EventScript_1601D0:: @ 81601D0 end BattleTower_Outside_EventScript_1601FB:: @ 81601FB - msgbox BattleTower_Outside_Text_199E0E, 5 - compare RESULT, 0 + msgbox BattleTower_Outside_Text_199E0E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq BattleTower_Outside_EventScript_160226 msgbox BattleTower_Outside_Text_199E4B, 4 call BattleTower_Outside_EventScript_160232 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index dc733071f..50c9d8991 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -42,8 +42,8 @@ DewfordTown_EventScript_14E06B:: @ 814E06B end DewfordTown_EventScript_14E076:: @ 814E076 - msgbox DewfordTown_Text_16B3BC, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B3BC, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E093 msgbox DewfordTown_Text_16B471, 4 release @@ -76,10 +76,10 @@ DewfordTown_EventScript_14E0C6:: @ 814E0C6 faceplayer checkflag FLAG_RECEIVED_OLD_ROD goto_if_eq DewfordTown_EventScript_14E11B - msgbox DewfordTown_Text_16B665, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B665, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E0F0 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_EventScript_14E111 end @@ -598,10 +598,10 @@ DewfordTown_EventScript_14E413:: @ 814E413 lock faceplayer call DewfordTown_EventScript_1A0102 - msgbox DewfordTown_Text_16B9CE, 5 - compare RESULT, 1 + msgbox DewfordTown_Text_16B9CE, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E439 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_EventScript_14E443 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index 530a4e04d..c4ccc769c 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -30,10 +30,10 @@ DewfordTown_Hall_EventScript_1532CD:: @ 81532CD faceplayer call DewfordTown_Hall_EventScript_1A0102 special BufferRandomHobbyOrLifestyleString - msgbox DewfordTown_Hall_Text_1755F9, 5 - compare RESULT, 1 + msgbox DewfordTown_Hall_Text_1755F9, MSGBOX_YESNO + compare RESULT, YES goto_if_eq DewfordTown_Hall_EventScript_1532F6 - compare RESULT, 0 + compare RESULT, NO goto_if_eq DewfordTown_Hall_EventScript_153300 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index 3c5345f8f..d2b27f478 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -22,7 +22,7 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA call_if 0, FallarborTown_House1_EventScript_153C2D checkflag FLAG_TEMP_2 call_if 1, FallarborTown_House1_EventScript_153C3E - compare RESULT, 0 + compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 giveitem_std ITEM_TM27 @@ -37,11 +37,11 @@ FallarborTown_House1_EventScript_153BDA:: @ 8153BDA FallarborTown_House1_EventScript_153C2D:: @ 8153C2D msgbox FallarborTown_House1_Text_177755, 4 - msgbox FallarborTown_House1_Text_17780E, 5 + msgbox FallarborTown_House1_Text_17780E, MSGBOX_YESNO return FallarborTown_House1_EventScript_153C3E:: @ 8153C3E - msgbox FallarborTown_House1_Text_1779B8, 5 + msgbox FallarborTown_House1_Text_1779B8, MSGBOX_YESNO return FallarborTown_House1_EventScript_153C47:: @ 8153C47 diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 0546ef5be..7ceaabdef 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -16,9 +16,9 @@ FallarborTown_House2_EventScript_153CB6:: @ 8153CB6 checkitem ITEM_HEART_SCALE, 1 compare RESULT, 0 goto_if_eq FallarborTown_House2_EventScript_153D60 - msgbox FallarborTown_House2_Text_177BDB, 5 + msgbox FallarborTown_House2_Text_177BDB, MSGBOX_YESNO switch RESULT - case 0, FallarborTown_House2_EventScript_153D60 + case NO, FallarborTown_House2_EventScript_153D60 goto FallarborTown_House2_EventScript_153CE4 end diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 239c1410d..937b435a6 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -64,8 +64,8 @@ FortreeCity_EventScript_14C9B3:: @ 814C9B3 end FortreeCity_EventScript_14C9CF:: @ 814C9CF - msgbox FortreeCity_Text_16788B, 5 - compare RESULT, 1 + msgbox FortreeCity_Text_16788B, MSGBOX_YESNO + compare RESULT, YES goto_if_eq FortreeCity_EventScript_14C9E4 release end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index f6f8aafa6..b308aa836 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -10,8 +10,8 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox FortreeCity_House1_Text_18568C, 5 - compare RESULT, 0 + msgbox FortreeCity_House1_Text_18568C, MSGBOX_YESNO + compare RESULT, NO goto_if_eq FortreeCity_House1_EventScript_157E95 special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index f1a6deed0..44a1e141b 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -274,8 +274,8 @@ LavaridgeTown_EventScript_14E75A:: @ 814E75A faceplayer checkflag FLAG_RECEIVED_LAVARIDGE_EGG goto_if_eq LavaridgeTown_EventScript_14E79E - msgbox LavaridgeTown_Text_16C174, 5 - compare RESULT, 0 + msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LavaridgeTown_EventScript_14E7B2 getpartysize compare RESULT, 6 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 0d714003e..6ed8054f8 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -260,7 +260,7 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 call_if 1, LilycoveCity_EventScript_14CDB0 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CDB9 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 switch VAR_STARTER_MON @@ -270,11 +270,11 @@ LilycoveCity_EventScript_14CD60:: @ 814CD60 end LilycoveCity_EventScript_14CDB0:: @ 814CDB0 - msgbox LilycoveCity_Text_167B55, 5 + msgbox LilycoveCity_Text_167B55, MSGBOX_YESNO return LilycoveCity_EventScript_14CDB9:: @ 814CDB9 - msgbox LilycoveCity_Text_1679BF, 5 + msgbox LilycoveCity_Text_1679BF, MSGBOX_YESNO return LilycoveCity_EventScript_14CDC2:: @ 814CDC2 @@ -291,7 +291,7 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 call_if 1, LilycoveCity_EventScript_14CE23 checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE call_if 0, LilycoveCity_EventScript_14CE2C - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 switch VAR_STARTER_MON @@ -301,11 +301,11 @@ LilycoveCity_EventScript_14CDD3:: @ 814CDD3 end LilycoveCity_EventScript_14CE23:: @ 814CE23 - msgbox LilycoveCity_Text_168067, 5 + msgbox LilycoveCity_Text_168067, MSGBOX_YESNO return LilycoveCity_EventScript_14CE2C:: @ 814CE2C - msgbox LilycoveCity_Text_167F75, 5 + msgbox LilycoveCity_Text_167F75, MSGBOX_YESNO return LilycoveCity_EventScript_14CE35:: @ 814CE35 diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index bb13b95be..7aceecef6 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -30,10 +30,10 @@ LilycoveCity_ContestLobby_EventScript_158898:: @ 8158898 fadescreen 1 drawcontestwinner 0 lockall - msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158918 releaseall end @@ -55,8 +55,8 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE end LilycoveCity_ContestLobby_EventScript_158918:: @ 8158918 - msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_1588DE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -204,10 +204,10 @@ LilycoveCity_ContestLobby_EventScript_158A6A:: @ 8158A6A lockall fadescreen 1 drawcontestwinner 0 - msgbox LilycoveCity_ContestLobby_Text_1889FD, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_1889FD, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE - compare RESULT, 0 + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158AE8 end @@ -228,8 +228,8 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE end LilycoveCity_ContestLobby_EventScript_158AE8:: @ 8158AE8 - msgbox LilycoveCity_ContestLobby_Text_188C41, 5 - compare RESULT, 1 + msgbox LilycoveCity_ContestLobby_Text_188C41, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LilycoveCity_ContestLobby_EventScript_158AAE msgbox LilycoveCity_ContestLobby_Text_188CBD, 4 closemessage @@ -327,8 +327,8 @@ LilycoveCity_ContestLobby_EventScript_158BBA:: @ 8158BBA end LilycoveCity_ContestLobby_EventScript_158BC4:: @ 8158BC4 - msgbox LilycoveCity_ContestLobby_Text_188521, 5 - compare RESULT, 0 + msgbox LilycoveCity_ContestLobby_Text_188521, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_ContestLobby_EventScript_158C35 call S_DoSaveDialog erasebox 0, 0, 15, 9 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index 12d8bfb4e..db2b8edf9 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -13,8 +13,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 checkflag FLAG_DAILY_PICKED_LOTTO_TICKET goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C - msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, 5 - compare RESULT, 0 + msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 setflag FLAG_DAILY_PICKED_LOTTO_TICKET message LilycoveCity_DepartmentStore_1F_Text_1C4CC6 diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 9554b8fa4..3b884c233 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -47,8 +47,8 @@ LilycoveCity_Harbor_EventScript_159929:: @ 8159929 end LilycoveCity_Harbor_EventScript_159933:: @ 8159933 - msgbox LilycoveCity_Harbor_Text_18B47D, 5 - compare RESULT, 0 + msgbox LilycoveCity_Harbor_Text_18B47D, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E setvar VAR_PORTHOLE_STATE, 5 call LilycoveCity_Harbor_EventScript_15998A @@ -58,8 +58,8 @@ LilycoveCity_Harbor_EventScript_159933:: @ 8159933 end LilycoveCity_Harbor_EventScript_15995B:: @ 815995B - msgbox LilycoveCity_Harbor_Text_18B499, 5 - compare RESULT, 0 + msgbox LilycoveCity_Harbor_Text_18B499, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_Harbor_EventScript_15997E call LilycoveCity_Harbor_EventScript_15998A warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 diff --git a/data/scripts/maps/LilycoveCity_House3.inc b/data/scripts/maps/LilycoveCity_House3.inc index 03203ed47..1a569bf5b 100644 --- a/data/scripts/maps/LilycoveCity_House3.inc +++ b/data/scripts/maps/LilycoveCity_House3.inc @@ -10,8 +10,8 @@ LilycoveCity_House3_MapScript1_159BEA:: @ 8159BEA LilycoveCity_House3_EventScript_159BF3:: @ 8159BF3 lock faceplayer - msgbox LilycoveCity_House3_Text_18B8CC, 5 - compare RESULT, 0 + msgbox LilycoveCity_House3_Text_18B8CC, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_House3_EventScript_159C1D msgbox LilycoveCity_House3_Text_18BA2B, 4 closemessage diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc index 5d5b04114..95338f231 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_1F.inc @@ -22,10 +22,10 @@ LilycoveCity_LilycoveMuseum_1F_EventScript_15844F:: @ 815844F end LilycoveCity_LilycoveMuseum_1F_EventScript_158458:: @ 8158458 - msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, 5 - compare RESULT, 0 + msgbox LilycoveCity_LilycoveMuseum_1F_Text_187495, MSGBOX_YESNO + compare RESULT, NO goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158477 - compare RESULT, 1 + compare RESULT, YES goto_if_eq LilycoveCity_LilycoveMuseum_1F_EventScript_158481 end diff --git a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc index 0c9a9054b..8b8500a9c 100644 --- a/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc +++ b/data/scripts/maps/LilycoveCity_MoveDeletersHouse.inc @@ -5,10 +5,10 @@ LilycoveCity_MoveDeletersHouse_EventScript_159AAE:: @ 8159AAE lockall applymovement 1, LilycoveCity_MoveDeletersHouse_Movement_1A0839 waitmovement 0 - msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B622, MSGBOX_YESNO switch RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_159ADE - case 0, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159ADE + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall end @@ -31,10 +31,10 @@ LilycoveCity_MoveDeletersHouse_EventScript_159ADE:: @ 8159ADE compare VAR_SPECIAL_5, 4 goto_if_eq LilycoveCity_MoveDeletersHouse_EventScript_159ADE special ScrSpecial_GetPokemonNicknameAndMoveName - msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, 5 + msgbox LilycoveCity_MoveDeletersHouse_Text_18B6F2, MSGBOX_YESNO switch RESULT - case 1, LilycoveCity_MoveDeletersHouse_EventScript_159B53 - case 0, LilycoveCity_MoveDeletersHouse_EventScript_159B7B + case YES, LilycoveCity_MoveDeletersHouse_EventScript_159B53 + case NO, LilycoveCity_MoveDeletersHouse_EventScript_159B7B releaseall end diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index e1cb348fd..10e4712bb 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -29,10 +29,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CBE:: @ 8152CBE waitmessage playfanfare BGM_FANFA4 waitfanfare - msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173EF8, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CEA - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152CFA end @@ -43,10 +43,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152CEA:: @ 8152CEA end LittlerootTown_ProfessorBirchsLab_EventScript_152CFA:: @ 8152CFA - msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_173F3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end @@ -58,10 +58,10 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D19:: @ 8152D19 end LittlerootTown_ProfessorBirchsLab_EventScript_152D2B:: @ 8152D2B - msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, 5 - compare RESULT, 1 + msgbox LittlerootTown_ProfessorBirchsLab_Text_174075, MSGBOX_YESNO + compare RESULT, YES goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D19 - compare RESULT, 0 + compare RESULT, NO goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D2B end diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index d7f0611e1..652a25f6f 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -100,14 +100,14 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 waitmovement 0 applymovement 6, MauvilleCity_Movement_1A0835 waitmovement 0 - msgbox MauvilleCity_Text_165D50, 5 + msgbox MauvilleCity_Text_165D50, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 end MauvilleCity_EventScript_14C154:: @ 814C154 - compare RESULT, 1 + compare RESULT, YES call_if 1, MauvilleCity_EventScript_14C23C - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_EventScript_14C285 closemessage switch FACING @@ -185,7 +185,7 @@ MauvilleCity_EventScript_14C285:: @ 814C285 MauvilleCity_EventScript_14C292:: @ 814C292 applymovement 6, MauvilleCity_Movement_1A0839 waitmovement 0 - msgbox MauvilleCity_Text_165EE2, 5 + msgbox MauvilleCity_Text_165EE2, MSGBOX_YESNO goto MauvilleCity_EventScript_14C154 end diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 6c2dc57e1..6bd7f0f4f 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -9,18 +9,18 @@ MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 checkflag FLAG_DECLINED_BIKE goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 - msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end MauvilleCity_BikeShop_EventScript_1567D1:: @ 81567D1 - msgbox MauvilleCity_BikeShop_Text_181016, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_156824 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_156817 end @@ -63,10 +63,10 @@ MauvilleCity_BikeShop_EventScript_156861:: @ 8156861 end MauvilleCity_BikeShop_EventScript_15686E:: @ 815686E - msgbox MauvilleCity_BikeShop_Text_1813A0, 5 - compare RESULT, 1 + msgbox MauvilleCity_BikeShop_Text_1813A0, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_BikeShop_EventScript_15688D - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_BikeShop_EventScript_1568BF end diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index d150e1508..e938a1b4c 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -143,8 +143,8 @@ MauvilleCity_GameCorner_EventScript_156BFE:: @ 8156BFE goto MauvilleCity_GameCorner_EventScript_156C0C MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C - msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156D0D switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156C46 @@ -276,8 +276,8 @@ MauvilleCity_GameCorner_EventScript_156DDE:: @ 8156DDE goto MauvilleCity_GameCorner_EventScript_156DEC MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC - msgbox MauvilleCity_GameCorner_Text_181E33, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181E33, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_156F77 switch VAR_TEMP_1 case 1, MauvilleCity_GameCorner_EventScript_156E3C @@ -391,8 +391,8 @@ MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 faceplayer checkflag FLAG_RECEIVED_STARTER_DOLL goto_if_eq MauvilleCity_GameCorner_EventScript_157072 - msgbox MauvilleCity_GameCorner_Text_181F3D, 5 - compare RESULT, 0 + msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_157068 switch VAR_STARTER_MON case 0, MauvilleCity_GameCorner_EventScript_156FDB diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 32269ab89..9d3bce68a 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -19,10 +19,10 @@ MauvilleCity_House2_EventScript_1572E5:: @ 81572E5 waitmovement 0 applymovement LAST_TALKED, MauvilleCity_House2_Movement_1A0835 waitmovement 0 - msgbox MauvilleCity_House2_Text_1824D8, 5 - compare RESULT, 1 + msgbox MauvilleCity_House2_Text_1824D8, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MauvilleCity_House2_EventScript_15731B - compare RESULT, 0 + compare RESULT, NO goto_if_eq MauvilleCity_House2_EventScript_157347 end diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index fd4b8cfbf..3d1baf143 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -70,8 +70,8 @@ MossdeepCity_EventScript_14D027:: @ 814D027 faceplayer checkflag FLAG_RECEIVED_KINGS_ROCK goto_if_eq MossdeepCity_EventScript_14D069 - msgbox MossdeepCity_Text_1690A9, 5 - compare RESULT, 0 + msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 msgbox MossdeepCity_Text_169117, 4 giveitem_std ITEM_KINGS_ROCK diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index ad3b366a8..eac7f4adb 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -93,14 +93,14 @@ MossdeepCity_GameCorner_1F_EventScript_15AD42:: @ 815AD42 MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 special SavePlayerParty special BufferEReaderTrainerName - msgbox MossdeepCity_GameCorner_1F_Text_18E650, 5 - compare RESULT, 0 + msgbox MossdeepCity_GameCorner_1F_Text_18E650, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 call MossdeepCity_GameCorner_1F_EventScript_15ADF5 compare RESULT, 0 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 - msgbox MossdeepCity_GameCorner_1F_Text_18E741, 5 - compare RESULT, 0 + msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO + compare RESULT, NO call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index 6632ac793..fb44685d8 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -6,8 +6,8 @@ MossdeepCity_House3_EventScript_15A972:: @ 815A972 faceplayer checkflag FLAG_RECEIVED_SUPER_ROD goto_if_eq MossdeepCity_House3_EventScript_15A9B1 - msgbox MossdeepCity_House3_Text_18D909, 5 - compare RESULT, 0 + msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB msgbox MossdeepCity_House3_Text_18D9A9, 4 giveitem_std ITEM_SUPER_ROD diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index 9aa9d8ef3..ce2f2aad5 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -71,8 +71,8 @@ MossdeepCity_StevensHouse_Movement_15AA76:: @ 815AA76 MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C lockall - msgbox MossdeepCity_StevensHouse_Text_18DD12, 5 - compare RESULT, 0 + msgbox MossdeepCity_StevensHouse_Text_18DD12, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MossdeepCity_StevensHouse_EventScript_15AAE6 getpartysize compare RESULT, 6 @@ -85,8 +85,8 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C waitmessage givemon SPECIES_BELDUM, 5, ITEM_NONE, 0x0, 0x0, 0 bufferspeciesname 1, SPECIES_BELDUM - msgbox MossdeepCity_StevensHouse_Text_1A1102, 5 - compare RESULT, 1 + msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index d93ec772a..be4799a45 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -17,8 +17,8 @@ MtChimney_EventScript_15CF95:: @ 815CF95 faceplayer showmoneybox 0, 0 nop - msgbox MtChimney_Text_195760, 5 - compare RESULT, 0 + msgbox MtChimney_Text_195760, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MtChimney_EventScript_15D00B checkmoney 0xc8, 0 compare RESULT, 0 @@ -410,8 +410,8 @@ MtChimney_EventScript_15D17D:: @ 815D17D goto_if 0, MtChimney_EventScript_15D1D0 checkflag FLAG_RECEIVED_METEORITE goto_if_eq MtChimney_EventScript_15D1C6 - msgbox MtChimney_Text_195870, 5 - compare RESULT, 0 + msgbox MtChimney_Text_195870, MSGBOX_YESNO + compare RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC msgbox MtChimney_Text_1958C6, 4 giveitem_std ITEM_METEORITE diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index 6b919f2ca..aefc68bda 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -31,10 +31,10 @@ MtChimney_CableCarStation_EventScript_15C127:: @ 815C127 MtChimney_CableCarStation_EventScript_15C14B:: @ 815C14B lock faceplayer - msgbox MtChimney_CableCarStation_Text_19256A, 5 - compare RESULT, 1 + msgbox MtChimney_CableCarStation_Text_19256A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq MtChimney_CableCarStation_EventScript_15C16C - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtChimney_CableCarStation_EventScript_15C19B end diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 9cd4eecd1..56ef5db79 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -139,13 +139,13 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF lock faceplayer .ifdef SAPPHIRE - msgbox UnknownString_81B586F, 5 + msgbox UnknownString_81B586F, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B64B3, 5 + msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES call_if 1, MtPyre_Summit_EventScript_15D611 - compare RESULT, 0 + compare RESULT, NO call_if 1, MtPyre_Summit_EventScript_15D61A release end @@ -185,13 +185,13 @@ MtPyre_Summit_EventScript_15D623:: @ 815D623 MtPyre_Summit_EventScript_15D64A:: @ 815D64A .ifdef SAPPHIRE - msgbox UnknownString_81B5647, 5 + msgbox UnknownString_81B5647, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B6283, 5 + msgbox MtPyre_Summit_Text_1B6283, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end @@ -216,13 +216,13 @@ MtPyre_Summit_EventScript_15D669:: @ 815D669 MtPyre_Summit_EventScript_15D69B:: @ 815D69B .ifdef SAPPHIRE - msgbox UnknownString_81B56AB, 5 + msgbox UnknownString_81B56AB, MSGBOX_YESNO .else - msgbox MtPyre_Summit_Text_1B62E7, 5 + msgbox MtPyre_Summit_Text_1B62E7, MSGBOX_YESNO .endif - compare RESULT, 1 + compare RESULT, YES goto_if_eq MtPyre_Summit_EventScript_15D669 - compare RESULT, 0 + compare RESULT, NO goto_if_eq MtPyre_Summit_EventScript_15D69B end diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index b7d68b257..2a4d8afce 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -29,8 +29,8 @@ NewMauville_Entrance_EventScript_15E4DC:: @ 815E4DC checkitem ITEM_BASEMENT_KEY, 1 compare RESULT, 0 goto_if_eq NewMauville_Entrance_EventScript_15E55D - msgbox NewMauville_Entrance_Text_1982D4, 5 - compare RESULT, 0 + msgbox NewMauville_Entrance_Text_1982D4, MSGBOX_YESNO + compare RESULT, NO goto_if_eq NewMauville_Entrance_EventScript_15E55D msgbox NewMauville_Entrance_Text_1982EA, 4 setmetatile 3, 0, 707, 0 diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index f5f93f05a..f51aea6f7 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -10,8 +10,8 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox PacifidlogTown_House3_Text_17940E, 5 - compare RESULT, 0 + msgbox PacifidlogTown_House3_Text_17940E, MSGBOX_YESNO + compare RESULT, NO goto_if_eq PacifidlogTown_House3_EventScript_154320 special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/PacifidlogTown_House4.inc b/data/scripts/maps/PacifidlogTown_House4.inc index b7a6c9f86..584366c88 100644 --- a/data/scripts/maps/PacifidlogTown_House4.inc +++ b/data/scripts/maps/PacifidlogTown_House4.inc @@ -12,10 +12,10 @@ PacifidlogTown_House4_EventScript_154355:: @ 8154355 PacifidlogTown_House4_EventScript_15435E:: @ 815435E lock faceplayer - msgbox PacifidlogTown_House4_Text_17963D, 5 - compare RESULT, 1 + msgbox PacifidlogTown_House4_Text_17963D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PacifidlogTown_House4_EventScript_15437F - compare RESULT, 0 + compare RESULT, NO goto_if_eq PacifidlogTown_House4_EventScript_154389 end diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index de141daf9..406f260b0 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -596,10 +596,10 @@ PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 85 - msgbox PetalburgCity_Gym_Text_17B870, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -626,10 +626,10 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 98 - msgbox PetalburgCity_Gym_Text_17B8D4, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -639,10 +639,10 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 - msgbox PetalburgCity_Gym_Text_17B90F, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -652,10 +652,10 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 - msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -665,10 +665,10 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 - msgbox PetalburgCity_Gym_Text_17B950, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -678,10 +678,10 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 - msgbox PetalburgCity_Gym_Text_17B98A, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -691,10 +691,10 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -704,10 +704,10 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 - msgbox PetalburgCity_Gym_Text_17B9C5, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -717,10 +717,10 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 - msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -730,10 +730,10 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 - msgbox PetalburgCity_Gym_Text_17BA00, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -743,10 +743,10 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end @@ -756,10 +756,10 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 goto_if 0, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 - msgbox PetalburgCity_Gym_Text_17BA3D, 5 - compare RESULT, 1 + msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq PetalburgCity_Gym_EventScript_154BA8 - compare RESULT, 0 + compare RESULT, NO goto_if_eq PetalburgCity_Gym_EventScript_154BB7 end diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index cb52908f5..4718f9bb9 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -36,8 +36,8 @@ Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB Route104_MrBrineysHouse_EventScript_15BD0E:: @ 815BD0E setflag FLAG_MR_BRINEY_SAILING_INTRO msgbox Route104_MrBrineysHouse_Text_191A82, 4 - msgbox Route104_MrBrineysHouse_Text_191AAD, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191AAD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end @@ -53,15 +53,15 @@ Route104_MrBrineysHouse_EventScript_15BD32:: @ 815BD32 end Route104_MrBrineysHouse_EventScript_15BD65:: @ 815BD65 - msgbox Route104_MrBrineysHouse_Text_191CC3, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191CC3, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end Route104_MrBrineysHouse_EventScript_15BD7E:: @ 815BD7E - msgbox Route104_MrBrineysHouse_Text_191DA6, 5 - compare RESULT, 0 + msgbox Route104_MrBrineysHouse_Text_191DA6, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route104_MrBrineysHouse_EventScript_15BD97 goto Route104_MrBrineysHouse_EventScript_15BDAB end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index 2de6bf51f..f7fbb58b5 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -24,19 +24,19 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, 5 - compare RESULT, 1 + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare RESULT, NO call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A - msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, 5 - compare RESULT, 1 + msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A - compare RESULT, 0 + compare RESULT, NO call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index 28bf046a4..c0344f150 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -278,8 +278,8 @@ Route109_EventScript_14F680:: @ 814F680 Route109_EventScript_14F691:: @ 814F691 message Route109_Text_16E0F9 - msgbox Route109_Text_16E0F9, 5 - compare RESULT, 0 + msgbox Route109_Text_16E0F9, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route109_EventScript_14F6F1 goto Route109_EventScript_14F6E2 end diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 7a12f5850..4c1574824 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -42,8 +42,8 @@ Route109_SeashoreHouse_EventScript_160E2C:: @ 8160E2C Route109_SeashoreHouse_EventScript_160E36:: @ 8160E36 showmoneybox 0, 0 nop - msgbox Route109_SeashoreHouse_Text_19B702, 5 - compare RESULT, 1 + msgbox Route109_SeashoreHouse_Text_19B702, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route109_SeashoreHouse_EventScript_160E5A msgbox Route109_SeashoreHouse_Text_19B773, 4 hidemoneybox 0, 0 diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index f34bba6e6..232d324a4 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -493,9 +493,9 @@ Route110_TrickHouseEntrance_EventScript_1615BD:: @ 81615BD end Route110_TrickHouseEntrance_EventScript_1615C7:: @ 81615C7 - msgbox Route110_TrickHouseEntrance_Text_19BE7D, 5 + msgbox Route110_TrickHouseEntrance_Text_19BE7D, MSGBOX_YESNO closemessage - compare RESULT, 1 + compare RESULT, YES goto_if_eq Route110_TrickHouseEntrance_EventScript_1615DD releaseall end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c3d807f66..c338091a0 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -51,8 +51,8 @@ Route111_EventScript_15000D:: @ 815000D Route111_EventScript_150023:: @ 8150023 lockall - msgbox Route111_Text_16FA54, 5 - compare RESULT, 0 + msgbox Route111_Text_16FA54, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_15005F giveitem_std ITEM_ROOT_FOSSIL closemessage @@ -73,8 +73,8 @@ Route111_EventScript_15005F:: @ 815005F Route111_EventScript_150069:: @ 8150069 lockall - msgbox Route111_Text_16FAED, 5 - compare RESULT, 0 + msgbox Route111_Text_16FAED, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route111_EventScript_1500A5 giveitem_std ITEM_CLAW_FOSSIL closemessage @@ -237,8 +237,8 @@ Route111_EventScript_1501D1:: @ 81501D1 lock faceplayer setflag FLAG_LANDMARK_WINSTRATE_FAMILY - msgbox Route111_Text_16F705, 5 - compare RESULT, 1 + msgbox Route111_Text_16F705, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_EventScript_1501F3 msgbox Route111_Text_16F785, 4 release diff --git a/data/scripts/maps/Route111_OldLadysRestStop.inc b/data/scripts/maps/Route111_OldLadysRestStop.inc index c0fb6f489..1263c4b83 100644 --- a/data/scripts/maps/Route111_OldLadysRestStop.inc +++ b/data/scripts/maps/Route111_OldLadysRestStop.inc @@ -9,10 +9,10 @@ Route111_OldLadysRestStop_MapScript1_15BFD7:: @ 815BFD7 Route111_OldLadysRestStop_EventScript_15BFDB:: @ 815BFDB lock faceplayer - msgbox Route111_OldLadysRestStop_Text_1923AF, 5 - compare RESULT, 1 + msgbox Route111_OldLadysRestStop_Text_1923AF, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end @@ -20,10 +20,10 @@ Route111_OldLadysRestStop_EventScript_15BFFC:: @ 815BFFC msgbox Route111_OldLadysRestStop_Text_192423, 4 closemessage call Route111_OldLadysRestStop_EventScript_1A02CA - msgbox Route111_OldLadysRestStop_Text_19244D, 5 - compare RESULT, 1 + msgbox Route111_OldLadysRestStop_Text_19244D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route111_OldLadysRestStop_EventScript_15BFFC - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route111_OldLadysRestStop_EventScript_15C029 end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index cba6c33e8..adbea780e 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -32,10 +32,10 @@ Route112_CableCarStation_EventScript_15C068:: @ 815C068 Route112_CableCarStation_EventScript_15C08C:: @ 815C08C lock faceplayer - msgbox Route112_CableCarStation_Text_1924F5, 5 - compare RESULT, 1 + msgbox Route112_CableCarStation_Text_1924F5, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route112_CableCarStation_EventScript_15C0AD - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route112_CableCarStation_EventScript_15C0DC end diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index e1bb038e3..3f991277f 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -72,8 +72,8 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 10 subvar VAR_ASH_GATHER_COUNT, 250 @@ -86,8 +86,8 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 11 subvar VAR_ASH_GATHER_COUNT, 500 @@ -100,8 +100,8 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 12 subvar VAR_ASH_GATHER_COUNT, 500 @@ -114,8 +114,8 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 13 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -128,8 +128,8 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 14 subvar VAR_ASH_GATHER_COUNT, 1000 @@ -143,8 +143,8 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 15 subvar VAR_ASH_GATHER_COUNT, 6000 @@ -158,8 +158,8 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 goto_if 0, Route113_GlassWorkshop_EventScript_163830 - msgbox Route113_GlassWorkshop_Text_19E7CD, 5 - compare RESULT, 0 + msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 setvar VAR_GLASS_WORKSHOP_STATE, 16 subvar VAR_ASH_GATHER_COUNT, 8000 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index f8ff5de73..c34d4fc7e 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -31,16 +31,16 @@ Route114_LanettesHouse_EventScript_15C28F:: @ 815C28F Route114_LanettesHouse_EventScript_15C299:: @ 815C299 lockall - msgbox Route114_LanettesHouse_Text_192B4A, 5 - compare RESULT, 1 + msgbox Route114_LanettesHouse_Text_192B4A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route114_LanettesHouse_EventScript_15C2B7 msgbox Route114_LanettesHouse_Text_192DA9, 4 releaseall end Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 - msgbox Route114_LanettesHouse_Text_192C01, 5 - compare RESULT, 1 + msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index 0ed9e9b01..a4452d989 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -11,10 +11,10 @@ Route118_EventScript_150F34:: @ 8150F34 faceplayer checkflag FLAG_RECEIVED_GOOD_ROD goto_if_eq Route118_EventScript_150F89 - msgbox Route118_Text_170F12, 5 - compare RESULT, 1 + msgbox Route118_Text_170F12, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route118_EventScript_150F5E - compare RESULT, 0 + compare RESULT, NO goto_if_eq Route118_EventScript_150F7F end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index 3858c0e4f..bacdcd7dd 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -115,10 +115,10 @@ Route120_EventScript_151739:: @ 8151739 dodailyevents checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 goto_if_eq Route120_EventScript_151837 - msgbox Route120_Text_1C58F1, 5 - compare RESULT, 1 + msgbox Route120_Text_1C58F1, MSGBOX_YESNO + compare RESULT, YES call_if 1, Route120_EventScript_151841 - compare RESULT, 0 + compare RESULT, NO call_if 1, Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT @@ -186,8 +186,8 @@ Route120_EventScript_151853:: @ 8151853 faceplayer checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 goto_if_eq Route120_EventScript_151884 - msgbox Route120_Text_171827, 5 - compare RESULT, 0 + msgbox Route120_Text_171827, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end @@ -199,8 +199,8 @@ Route120_EventScript_151877:: @ 8151877 end Route120_EventScript_151884:: @ 8151884 - msgbox Route120_Text_17196F, 5 - compare RESULT, 0 + msgbox Route120_Text_17196F, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route120_EventScript_151877 goto Route120_EventScript_15189D end diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index 67fa830e9..ded372aa6 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -33,8 +33,8 @@ Route121_SafariZoneEntrance_EventScript_15C351:: @ 815C351 Route121_SafariZoneEntrance_EventScript_15C35A:: @ 815C35A lock faceplayer - msgbox Route121_SafariZoneEntrance_Text_1C3704, 5 - compare RESULT, 1 + msgbox Route121_SafariZoneEntrance_Text_1C3704, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C379 msgbox Route121_SafariZoneEntrance_Text_1C373C, 4 release @@ -51,8 +51,8 @@ Route121_SafariZoneEntrance_EventScript_15C383:: @ 815C383 waitmovement 0 showmoneybox 0, 0 nop - msgbox Route121_SafariZoneEntrance_Text_1C3832, 5 - compare RESULT, 1 + msgbox Route121_SafariZoneEntrance_Text_1C3832, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route121_SafariZoneEntrance_EventScript_15C3B3 msgbox Route121_SafariZoneEntrance_Text_1C3895, 4 goto Route121_SafariZoneEntrance_EventScript_15C46C diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index bc71fac41..9423cf845 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -246,8 +246,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_164283:: @ 8164283 Route124_DivingTreasureHuntersHouse_EventScript_164292:: @ 8164292 bufferitemname 0, VAR_SPECIAL_8 bufferitemname 1, VAR_SPECIAL_9 - msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, 5 - compare RESULT, 0 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F5E0, MSGBOX_YESNO + compare RESULT, NO goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_16431F checkitemspace VAR_SPECIAL_9, 1 compare RESULT, 1 @@ -265,8 +265,8 @@ Route124_DivingTreasureHuntersHouse_EventScript_1642D3:: @ 81642D3 call Route124_DivingTreasureHuntersHouse_EventScript_163E44 compare VAR_TEMP_1, 0 goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_164333 - msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, 5 - compare RESULT, 1 + msgbox Route124_DivingTreasureHuntersHouse_Text_19F629, MSGBOX_YESNO + compare RESULT, YES goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163EB0 goto Route124_DivingTreasureHuntersHouse_EventScript_16431F end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 9bbbaacfa..179140378 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -85,8 +85,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575A6:: @ 81575A6 waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_ROOT_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -103,8 +103,8 @@ RustboroCity_DevonCorp_2F_EventScript_1575EE:: @ 81575EE waitmovement 0 applymovement 5, RustboroCity_DevonCorp_2F_Movement_1A0835 waitmovement 0 - msgbox RustboroCity_DevonCorp_2F_Text_182F35, 5 - compare RESULT, 0 + msgbox RustboroCity_DevonCorp_2F_Text_182F35, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157636 bufferitemname 0, ITEM_CLAW_FOSSIL msgbox RustboroCity_DevonCorp_2F_Text_183023, 4 @@ -145,8 +145,8 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 waitfanfare waitmessage givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -165,8 +165,8 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 waitfanfare waitmessage givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 - msgbox RustboroCity_DevonCorp_2F_Text_1A1102, 5 - compare RESULT, 1 + msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO + compare RESULT, YES call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index 2e0d106bb..c0f1bc689 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -10,8 +10,8 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo copyvar VAR_SPECIAL_9, RESULT - msgbox RustboroCity_House1_Text_184EBA, 5 - compare RESULT, 0 + msgbox RustboroCity_House1_Text_184EBA, MSGBOX_YESNO + compare RESULT, NO goto_if_eq RustboroCity_House1_EventScript_157CFB special SelectMonForNPCTrade waitstate diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index 2dbd716cb..b3eb297e9 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -54,8 +54,8 @@ SafariZone_Southeast_EventScript_1600A7:: @ 81600A7 faceplayer compare VAR_TEMP_1, 0 goto_if_eq SafariZone_Southeast_EventScript_1600D1 - msgbox SafariZone_Southeast_Text_1C3A56, 5 - compare RESULT, 1 + msgbox SafariZone_Southeast_Text_1C3A56, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SafariZone_Southeast_EventScript_1600E0 msgbox SafariZone_Southeast_Text_1C3A9C, 4 release diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 533c46850..4dcd88761 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -28,8 +28,8 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 checkitem ITEM_SHOAL_SHELL, 4 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 - msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, 5 - compare RESULT, 0 + msgbox ShoalCave_LowTideEntranceRoom_Text_1C6793, MSGBOX_YESNO + compare RESULT, NO goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index d39f788d8..ae8534ad9 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -287,10 +287,10 @@ SlateportCity_EventScript_14BCFD:: @ 814BCFD SlateportCity_EventScript_14BD06:: @ 814BD06 lock faceplayer - msgbox SlateportCity_Text_1650F1, 5 - compare RESULT, 1 + msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO + compare RESULT, YES call_if 1, SlateportCity_EventScript_14BD28 - compare RESULT, 0 + compare RESULT, NO call_if 1, SlateportCity_EventScript_14BD31 release end diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 72f2d0382..4be5c6daf 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -190,8 +190,8 @@ SlateportCity_Harbor_EventScript_156135:: @ 8156135 end SlateportCity_Harbor_EventScript_15613F:: @ 815613F - msgbox SlateportCity_Harbor_Text_17FB81, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_17FB81, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A setvar VAR_PORTHOLE_STATE, 1 call SlateportCity_Harbor_EventScript_156196 @@ -201,8 +201,8 @@ SlateportCity_Harbor_EventScript_15613F:: @ 815613F end SlateportCity_Harbor_EventScript_156167:: @ 8156167 - msgbox SlateportCity_Harbor_Text_17FB9C, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_17FB9C, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_15618A call SlateportCity_Harbor_EventScript_156196 warp MAP_BATTLE_TOWER_OUTSIDE, 255, 19, 23 @@ -332,8 +332,8 @@ SlateportCity_Harbor_EventScript_1562B3:: @ 81562B3 end SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA - msgbox SlateportCity_Harbor_Text_1803DD, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_1803DD, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_TOOTH compare RESULT, 0 @@ -345,8 +345,8 @@ SlateportCity_Harbor_EventScript_1562EA:: @ 81562EA end SlateportCity_Harbor_EventScript_15632A:: @ 815632A - msgbox SlateportCity_Harbor_Text_180412, 5 - compare RESULT, 0 + msgbox SlateportCity_Harbor_Text_180412, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SlateportCity_Harbor_EventScript_156374 giveitem_std ITEM_DEEP_SEA_SCALE compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index aa1157d7e..13de091cb 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -4,10 +4,10 @@ SlateportCity_House1_MapScripts:: @ 815567A SlateportCity_House1_EventScript_15567B:: @ 815567B lock faceplayer - msgbox SlateportCity_House1_Text_17D46A, 5 - compare RESULT, 1 + msgbox SlateportCity_House1_Text_17D46A, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_House1_EventScript_15569C - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end @@ -38,10 +38,10 @@ SlateportCity_House1_EventScript_1556C9:: @ 81556C9 special TV_CopyNicknameToStringVar1AndEnsureTerminated compare RESULT, 1 goto_if_eq SlateportCity_House1_EventScript_155726 - msgbox SlateportCity_House1_Text_17D505, 5 - compare RESULT, 1 + msgbox SlateportCity_House1_Text_17D505, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_House1_EventScript_155730 - compare RESULT, 0 + compare RESULT, NO goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index ad349932a..5d0fdb411 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -33,8 +33,8 @@ SlateportCity_OceanicMuseum_1F_EventScript_155AF5:: @ 8155AF5 SlateportCity_OceanicMuseum_1F_EventScript_155B06:: @ 8155B06 showmoneybox 0, 0 nop - msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, 5 - compare RESULT, 1 + msgbox SlateportCity_OceanicMuseum_1F_Text_17E18D, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155B2D closemessage hidemoneybox 0, 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index f2ccc9484..367677751 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -127,8 +127,8 @@ SootopolisCity_EventScript_14D220:: @ 814D220 end SootopolisCity_EventScript_14D241:: @ 814D241 - msgbox SootopolisCity_Text_1C6540, 5 - compare RESULT, 1 + msgbox SootopolisCity_Text_1C6540, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SootopolisCity_EventScript_14D25E msgbox SootopolisCity_Text_1C6626, 4 release diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index 011806291..e32e993dd 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -4,10 +4,10 @@ SootopolisCity_House2_MapScripts:: @ 815B2E4 SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 lock faceplayer - msgbox SootopolisCity_House2_Text_18FA66, 5 - compare RESULT, 1 + msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO + compare RESULT, YES call_if 1, SootopolisCity_House2_EventScript_15B307 - compare RESULT, 0 + compare RESULT, NO call_if 1, SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House3.inc b/data/scripts/maps/SootopolisCity_House3.inc index f1bf0bf19..6ffa30d3d 100644 --- a/data/scripts/maps/SootopolisCity_House3.inc +++ b/data/scripts/maps/SootopolisCity_House3.inc @@ -4,8 +4,8 @@ SootopolisCity_House3_MapScripts:: @ 815B319 SootopolisCity_House3_EventScript_15B31A:: @ 815B31A lock faceplayer - msgbox SootopolisCity_House3_Text_18FB36, 5 - compare RESULT, 1 + msgbox SootopolisCity_House3_Text_18FB36, MSGBOX_YESNO + compare RESULT, YES goto_if_eq SootopolisCity_House3_EventScript_15B339 msgbox SootopolisCity_House3_Text_18FBC0, 4 release diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index fb91202f3..d2fb4ed7b 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -6,8 +6,8 @@ SootopolisCity_House6_EventScript_15B386:: @ 815B386 faceplayer checkflag FLAG_RECEIVED_WAILMER_DOLL goto_if_eq SootopolisCity_House6_EventScript_15B3CD - msgbox SootopolisCity_House6_Text_18FEA1, 5 - compare RESULT, 0 + msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO + compare RESULT, NO call_if 1, SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration_std DECOR_WAILMER_DOLL diff --git a/data/scripts/maps/SouthernIsland_Exterior.inc b/data/scripts/maps/SouthernIsland_Exterior.inc index ab2a73460..874e3e901 100644 --- a/data/scripts/maps/SouthernIsland_Exterior.inc +++ b/data/scripts/maps/SouthernIsland_Exterior.inc @@ -9,8 +9,8 @@ SouthernIsland_Exterior_MapScript1_160ADC:: @ 8160ADC SouthernIsland_Exterior_EventScript_160AE0:: @ 8160AE0 lock faceplayer - msgbox SouthernIsland_Exterior_Text_1C5215, 5 - compare RESULT, 0 + msgbox SouthernIsland_Exterior_Text_1C5215, MSGBOX_YESNO + compare RESULT, NO goto_if_eq SouthernIsland_Exterior_EventScript_160B25 msgbox SouthernIsland_Exterior_Text_1C5281, 4 closemessage -- cgit v1.2.3 From aed64560bc222e4ea5ccec266c0d77859a05eaac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 11:36:47 -0800 Subject: Add friendly macros for goto_if and call_if variants --- data/scripts/maps/AbandonedShip_CaptainsOffice.inc | 6 +- data/scripts/maps/AbandonedShip_Corridors_B1F.inc | 9 +- .../maps/AbandonedShip_HiddenFloorCorridors.inc | 36 ++--- .../maps/AbandonedShip_HiddenFloorRooms.inc | 14 +- data/scripts/maps/AncientTomb.inc | 9 +- data/scripts/maps/AquaHideout_1F.inc | 6 +- data/scripts/maps/AquaHideout_B1F.inc | 3 +- data/scripts/maps/BattleTower_Lobby.inc | 20 +-- data/scripts/maps/CaveOfOrigin_1F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B1F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B2F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B3F.inc | 3 +- data/scripts/maps/CaveOfOrigin_B4F.inc | 8 +- data/scripts/maps/DesertRuins.inc | 9 +- data/scripts/maps/DewfordTown.inc | 12 +- data/scripts/maps/DewfordTown_Gym.inc | 20 +-- data/scripts/maps/DewfordTown_Hall.inc | 7 +- data/scripts/maps/DewfordTown_House2.inc | 3 +- data/scripts/maps/EverGrandeCity.inc | 3 +- data/scripts/maps/EverGrandeCity_ChampionsRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_DrakesRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_GlaciasRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_PhoebesRoom.inc | 8 +- data/scripts/maps/EverGrandeCity_PokemonLeague.inc | 13 +- data/scripts/maps/EverGrandeCity_SidneysRoom.inc | 8 +- data/scripts/maps/FallarborTown.inc | 3 +- data/scripts/maps/FallarborTown_ContestLobby.inc | 3 +- data/scripts/maps/FallarborTown_House1.inc | 15 +- data/scripts/maps/FallarborTown_House2.inc | 3 +- data/scripts/maps/FortreeCity.inc | 3 +- data/scripts/maps/FortreeCity_Gym.inc | 12 +- data/scripts/maps/FortreeCity_House1.inc | 5 +- data/scripts/maps/FortreeCity_House2.inc | 6 +- data/scripts/maps/FortreeCity_House4.inc | 9 +- data/scripts/maps/GraniteCave_1F.inc | 3 +- data/scripts/maps/GraniteCave_StevensRoom.inc | 10 +- data/scripts/maps/IslandCave.inc | 12 +- data/scripts/maps/JaggedPass.inc | 2 +- data/scripts/maps/LavaridgeTown.inc | 42 +++-- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 14 +- data/scripts/maps/LavaridgeTown_HerbShop.inc | 3 +- data/scripts/maps/LilycoveCity.inc | 65 +++----- data/scripts/maps/LilycoveCity_ContestLobby.inc | 19 +-- .../scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc | 6 +- .../scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc | 6 +- .../maps/LilycoveCity_DepartmentStoreElevator.inc | 3 +- .../maps/LilycoveCity_DepartmentStoreRooftop.inc | 22 +-- .../maps/LilycoveCity_DepartmentStore_1F.inc | 17 +- data/scripts/maps/LilycoveCity_Harbor.inc | 23 ++- data/scripts/maps/LilycoveCity_House2.inc | 3 +- .../maps/LilycoveCity_LilycoveMuseum_2F.inc | 33 ++-- .../scripts/maps/LilycoveCity_PokemonCenter_1F.inc | 3 +- .../maps/LilycoveCity_PokemonTrainerFanClub.inc | 16 +- data/scripts/maps/LittlerootTown.inc | 103 ++++++------ .../maps/LittlerootTown_BrendansHouse_1F.inc | 11 +- .../maps/LittlerootTown_BrendansHouse_2F.inc | 5 +- data/scripts/maps/LittlerootTown_MaysHouse_1F.inc | 21 ++- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 34 ++-- .../maps/LittlerootTown_ProfessorBirchsLab.inc | 20 ++- data/scripts/maps/MagmaHideout_B1F.inc | 3 +- data/scripts/maps/MauvilleCity.inc | 20 +-- data/scripts/maps/MauvilleCity_BikeShop.inc | 6 +- data/scripts/maps/MauvilleCity_GameCorner.inc | 28 ++-- data/scripts/maps/MauvilleCity_Gym.inc | 35 ++-- data/scripts/maps/MauvilleCity_House1.inc | 3 +- data/scripts/maps/MauvilleCity_House2.inc | 3 +- data/scripts/maps/MeteorFalls_1F_1R.inc | 3 +- data/scripts/maps/MossdeepCity.inc | 6 +- data/scripts/maps/MossdeepCity_GameCorner_1F.inc | 20 +-- data/scripts/maps/MossdeepCity_GameCorner_B1F.inc | 6 +- data/scripts/maps/MossdeepCity_Gym.inc | 36 ++--- data/scripts/maps/MossdeepCity_House2.inc | 4 +- data/scripts/maps/MossdeepCity_House3.inc | 3 +- data/scripts/maps/MossdeepCity_House4.inc | 3 +- data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc | 7 +- data/scripts/maps/MossdeepCity_StevensHouse.inc | 10 +- data/scripts/maps/MtChimney.inc | 8 +- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/MtPyre_1F.inc | 3 +- data/scripts/maps/MtPyre_Exterior.inc | 2 +- data/scripts/maps/MtPyre_Summit.inc | 37 ++--- data/scripts/maps/NewMauville_Entrance.inc | 2 +- data/scripts/maps/NewMauville_Inside.inc | 9 +- data/scripts/maps/OldaleTown.inc | 18 +-- data/scripts/maps/OldaleTown_Mart.inc | 6 +- data/scripts/maps/OldaleTown_PokemonCenter_1F.inc | 3 +- data/scripts/maps/PacifidlogTown_House2.inc | 18 +-- data/scripts/maps/PacifidlogTown_House3.inc | 5 +- data/scripts/maps/PetalburgCity.inc | 20 +-- data/scripts/maps/PetalburgCity_Gym.inc | 179 ++++++++++----------- data/scripts/maps/PetalburgCity_Mart.inc | 3 +- .../maps/PetalburgCity_PokemonCenter_1F.inc | 6 +- data/scripts/maps/PetalburgCity_WallysHouse.inc | 21 +-- data/scripts/maps/PetalburgWoods.inc | 3 +- data/scripts/maps/Route104.inc | 21 +-- data/scripts/maps/Route104_MrBrineysHouse.inc | 14 +- .../maps/Route104_PrettyPetalFlowerShop.inc | 26 ++- data/scripts/maps/Route104_Prototype.inc | 30 ++-- data/scripts/maps/Route105.inc | 3 +- data/scripts/maps/Route109.inc | 6 +- data/scripts/maps/Route109_SeashoreHouse.inc | 15 +- data/scripts/maps/Route110.inc | 24 +-- .../Route110_SeasideCyclingRoadNorthEntrance.inc | 6 +- data/scripts/maps/Route110_TrickHouseEnd.inc | 26 +-- data/scripts/maps/Route110_TrickHouseEntrance.inc | 83 +++++----- data/scripts/maps/Route110_TrickHousePuzzle2.inc | 8 +- data/scripts/maps/Route110_TrickHousePuzzle3.inc | 36 ++--- data/scripts/maps/Route110_TrickHousePuzzle5.inc | 90 +++++------ data/scripts/maps/Route110_TrickHousePuzzle7.inc | 77 +++------ data/scripts/maps/Route111.inc | 26 ++- .../maps/Route111_WinstrateFamilysHouse.inc | 6 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- data/scripts/maps/Route113.inc | 4 +- data/scripts/maps/Route113_GlassWorkshop.inc | 28 ++-- data/scripts/maps/Route114.inc | 6 +- data/scripts/maps/Route114_FossilManiacsHouse.inc | 3 +- data/scripts/maps/Route114_FossilManiacsTunnel.inc | 3 +- data/scripts/maps/Route114_LanettesHouse.inc | 5 +- data/scripts/maps/Route116.inc | 28 ++-- data/scripts/maps/Route116_TunnelersRestHouse.inc | 3 +- data/scripts/maps/Route117.inc | 3 +- data/scripts/maps/Route118.inc | 9 +- data/scripts/maps/Route119.inc | 29 ++-- data/scripts/maps/Route119_WeatherInstitute_1F.inc | 2 +- data/scripts/maps/Route119_WeatherInstitute_2F.inc | 7 +- data/scripts/maps/Route120.inc | 48 +++--- data/scripts/maps/Route121_SafariZoneEntrance.inc | 2 +- data/scripts/maps/Route123.inc | 3 +- data/scripts/maps/Route123_BerryMastersHouse.inc | 21 +-- data/scripts/maps/Route124.inc | 3 +- .../maps/Route124_DivingTreasureHuntersHouse.inc | 11 +- data/scripts/maps/Route125.inc | 3 +- data/scripts/maps/Route126.inc | 3 +- data/scripts/maps/Route127.inc | 3 +- data/scripts/maps/Route128.inc | 3 +- data/scripts/maps/Route131.inc | 3 +- data/scripts/maps/RustboroCity.inc | 35 ++-- data/scripts/maps/RustboroCity_CuttersHouse.inc | 3 +- data/scripts/maps/RustboroCity_DevonCorp_1F.inc | 27 ++-- data/scripts/maps/RustboroCity_DevonCorp_2F.inc | 20 ++- data/scripts/maps/RustboroCity_DevonCorp_3F.inc | 11 +- data/scripts/maps/RustboroCity_Flat2_2F.inc | 3 +- data/scripts/maps/RustboroCity_Gym.inc | 14 +- data/scripts/maps/RustboroCity_House1.inc | 5 +- data/scripts/maps/RustboroCity_Mart.inc | 6 +- data/scripts/maps/RustboroCity_PokemonSchool.inc | 7 +- data/scripts/maps/RusturfTunnel.inc | 27 ++-- data/scripts/maps/SSTidalCorridor.inc | 25 ++- data/scripts/maps/SSTidalRooms.inc | 3 +- data/scripts/maps/SafariZone_Southeast.inc | 2 +- data/scripts/maps/SealedChamber_InnerRoom.inc | 3 +- data/scripts/maps/SealedChamber_OuterRoom.inc | 6 +- .../scripts/maps/ShoalCave_LowTideEntranceRoom.inc | 8 +- data/scripts/maps/ShoalCave_LowTideInnerRoom.inc | 45 ++---- data/scripts/maps/ShoalCave_LowTideLowerRoom.inc | 9 +- data/scripts/maps/ShoalCave_LowTideStairsRoom.inc | 6 +- data/scripts/maps/SkyPillar_Top.inc | 3 +- data/scripts/maps/SlateportCity.inc | 43 +++-- data/scripts/maps/SlateportCity_ContestHall.inc | 3 +- data/scripts/maps/SlateportCity_ContestLobby.inc | 3 +- data/scripts/maps/SlateportCity_Harbor.inc | 32 ++-- data/scripts/maps/SlateportCity_House1.inc | 2 +- .../maps/SlateportCity_OceanicMuseum_1F.inc | 5 +- .../maps/SlateportCity_OceanicMuseum_2F.inc | 10 +- data/scripts/maps/SlateportCity_PokemonFanClub.inc | 47 +++--- .../maps/SlateportCity_SternsShipyard_1F.inc | 12 +- data/scripts/maps/SootopolisCity.inc | 38 ++--- data/scripts/maps/SootopolisCity_Gym_1F.inc | 21 +-- data/scripts/maps/SootopolisCity_House1.inc | 3 +- data/scripts/maps/SootopolisCity_House2.inc | 4 +- data/scripts/maps/SootopolisCity_House6.inc | 5 +- data/scripts/maps/SootopolisCity_Mart.inc | 12 +- .../maps/SootopolisCity_PokemonCenter_1F.inc | 12 +- data/scripts/maps/SouthernIsland_Interior.inc | 9 +- data/scripts/maps/Underwater_SeafloorCavern.inc | 6 +- data/scripts/maps/Underwater_SealedChamber.inc | 4 +- data/scripts/maps/UnknownMap_25_34.inc | 14 +- data/scripts/maps/VerdanturfTown.inc | 6 +- data/scripts/maps/VerdanturfTown_ContestLobby.inc | 3 +- data/scripts/maps/VerdanturfTown_WandasHouse.inc | 24 +-- data/scripts/maps/VictoryRoad_1F.inc | 3 +- 181 files changed, 1089 insertions(+), 1558 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc index 2430ba4af..22c76847a 100644 --- a/data/scripts/maps/AbandonedShip_CaptainsOffice.inc +++ b/data/scripts/maps/AbandonedShip_CaptainsOffice.inc @@ -4,13 +4,11 @@ AbandonedShip_CaptainsOffice_MapScripts:: @ 815EAF4 AbandonedShip_CaptainsOffice_EventScript_15EAF5:: @ 815EAF5 lock faceplayer - checkflag FLAG_EXCHANGED_SCANNER - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_set FLAG_EXCHANGED_SCANNER, AbandonedShip_CaptainsOffice_EventScript_15EB2D checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB23 - checkflag FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2 - goto_if_eq AbandonedShip_CaptainsOffice_EventScript_15EB2D + goto_if_set FLAG_ITEM_ABANDONED_SHIP_HIDDEN_FLOOR_ROOMS_2, AbandonedShip_CaptainsOffice_EventScript_15EB2D msgbox AbandonedShip_CaptainsOffice_Text_198C85, 4 release end diff --git a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc index b4d29632e..c34f2c28b 100644 --- a/data/scripts/maps/AbandonedShip_Corridors_B1F.inc +++ b/data/scripts/maps/AbandonedShip_Corridors_B1F.inc @@ -8,10 +8,8 @@ AbandonedShip_Corridors_B1F_MapScript1_15E99A:: @ 815E99A end AbandonedShip_Corridors_B1F_MapScript1_15E9A3:: @ 815E9A3 - checkflag FLAG_USED_STORAGE_KEY - call_if 0, AbandonedShip_Corridors_B1F_EventScript_15E9B6 - checkflag FLAG_USED_STORAGE_KEY - call_if 1, AbandonedShip_Corridors_B1F_EventScript_15E9C0 + call_if_unset FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9B6 + call_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15E9C0 end AbandonedShip_Corridors_B1F_EventScript_15E9B6:: @ 815E9B6 @@ -28,8 +26,7 @@ AbandonedShip_Corridors_B1F_EventScript_15E9CA:: @ 815E9CA AbandonedShip_Corridors_B1F_EventScript_15E9D3:: @ 815E9D3 lockall - checkflag FLAG_USED_STORAGE_KEY - goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA14 + goto_if_set FLAG_USED_STORAGE_KEY, AbandonedShip_Corridors_B1F_EventScript_15EA14 checkitem ITEM_STORAGE_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_Corridors_B1F_EventScript_15EA0A diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc index 7b61190e5..e8e48a6f6 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc @@ -8,22 +8,14 @@ AbandonedShip_HiddenFloorCorridors_MapScript1_15EB51:: @ 815EB51 end AbandonedShip_HiddenFloorCorridors_MapScript1_15EB5A:: @ 815EB5A - checkflag FLAG_USED_ROOM_1_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB - checkflag FLAG_USED_ROOM_2_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 - checkflag FLAG_USED_ROOM_4_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF - checkflag FLAG_USED_ROOM_6_KEY - call_if 0, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 - checkflag FLAG_USED_ROOM_1_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 - checkflag FLAG_USED_ROOM_2_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD - checkflag FLAG_USED_ROOM_4_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 - checkflag FLAG_USED_ROOM_6_KEY - call_if 1, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 + call_if_unset FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBCB + call_if_unset FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBD5 + call_if_unset FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBDF + call_if_unset FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9 + call_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3 + call_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBAD + call_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBB7 + call_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15EBC1 end AbandonedShip_HiddenFloorCorridors_EventScript_15EBA3:: @ 815EBA3 @@ -60,8 +52,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBE9:: @ 815EBE9 AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 lockall - checkflag FLAG_USED_ROOM_1_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_1_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_1_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECCF @@ -76,8 +67,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EBF3:: @ 815EBF3 AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A lockall - checkflag FLAG_USED_ROOM_2_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_2_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_2_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECD9 @@ -92,8 +82,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC2A:: @ 815EC2A AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 lockall - checkflag FLAG_USED_ROOM_4_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_4_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_4_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECE3 @@ -108,8 +97,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_15EC61:: @ 815EC61 AbandonedShip_HiddenFloorCorridors_EventScript_15EC98:: @ 815EC98 lockall - checkflag FLAG_USED_ROOM_6_KEY - goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 + goto_if_set FLAG_USED_ROOM_6_KEY, AbandonedShip_HiddenFloorCorridors_EventScript_15ECF7 checkitem ITEM_ROOM_6_KEY, 1 compare RESULT, 0 goto_if_eq AbandonedShip_HiddenFloorCorridors_EventScript_15ECED diff --git a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc index 9ad419da1..7f9b06500 100644 --- a/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc +++ b/data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc @@ -11,11 +11,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED11:: @ 815ED11 getplayerxy VAR_TEMP_2, VAR_TEMP_3 setvar VAR_TEMP_4, 1 compare VAR_TEMP_2, 21 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED89 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED89 compare VAR_TEMP_2, 36 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED8F + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED8F compare VAR_TEMP_3, 2 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED95 + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15ED95 switch VAR_TEMP_4 case 1, AbandonedShip_HiddenFloorRooms_EventScript_15ED9B case 2, AbandonedShip_HiddenFloorRooms_EventScript_15EDC4 @@ -45,7 +45,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15ED9B:: @ 815ED9B dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom4Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE8B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE8B waitfieldeffect 54 delay 10 end @@ -59,7 +59,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDC5:: @ 815EDC5 goto_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EDEA delay 20 compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE6B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE6B waitfieldeffect 54 delay 10 end @@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EDEB:: @ 815EDEB dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom6Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE9B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE9B waitfieldeffect 54 delay 10 end @@ -100,7 +100,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_15EE23:: @ 815EE23 dofieldeffect 54 specialvar RESULT, FoundAbandonedShipRoom2Key compare RESULT, 0 - call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_15EE7B + call_if_eq AbandonedShip_HiddenFloorRooms_EventScript_15EE7B waitfieldeffect 54 delay 10 end diff --git a/data/scripts/maps/AncientTomb.inc b/data/scripts/maps/AncientTomb.inc index b849f41ba..8ff39c0a4 100644 --- a/data/scripts/maps/AncientTomb.inc +++ b/data/scripts/maps/AncientTomb.inc @@ -5,8 +5,7 @@ AncientTomb_MapScripts:: @ 815EFBE .byte 0 AncientTomb_MapScript1_15EFCE:: @ 815EFCE - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AncientTomb_EventScript_15EFD8 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AncientTomb_EventScript_15EFD8 end AncientTomb_EventScript_15EFD8:: @ 815EFD8 @@ -18,8 +17,7 @@ AncientTomb_MapScript1_15EFDC:: @ 815EFDC end AncientTomb_MapScript1_15EFE0:: @ 815EFE0 - checkflag FLAG_SYS_BRAILLE_FLY - call_if 0, AncientTomb_EventScript_15EFEA + call_if_unset FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15EFEA end AncientTomb_EventScript_15EFEA:: @ 815EFEA @@ -33,8 +31,7 @@ AncientTomb_EventScript_15EFEA:: @ 815EFEA AncientTomb_EventScript_15F021:: @ 815F021 lockall - checkflag FLAG_SYS_BRAILLE_FLY - goto_if_eq AncientTomb_EventScript_15F038 + goto_if_set FLAG_SYS_BRAILLE_FLY, AncientTomb_EventScript_15F038 braillemessage AncientTomb_Braille_1C552E waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/AquaHideout_1F.inc b/data/scripts/maps/AquaHideout_1F.inc index 028a0ee7b..ee49ba695 100644 --- a/data/scripts/maps/AquaHideout_1F.inc +++ b/data/scripts/maps/AquaHideout_1F.inc @@ -10,8 +10,7 @@ AquaHideout_1F_EventScript_15D7CE:: @ 815D7CE MagmaHideout_1F_EventScript_15D7CE:: @ 815D7CE lock faceplayer - checkflag FLAG_MT_PYRE_ORB_STOLEN - goto_if_eq AquaHideout_1F_EventScript_15D7E3 + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D7E3 msgbox AquaHideout_1F_Text_196AFD, 4 release end @@ -25,8 +24,7 @@ AquaHideout_1F_EventScript_15D7ED:: @ 815D7ED MagmaHideout_1F_EventScript_15D7ED:: @ 815D7ED lock faceplayer - checkflag FLAG_MT_PYRE_ORB_STOLEN - goto_if_eq AquaHideout_1F_EventScript_15D802 + goto_if_set FLAG_MT_PYRE_ORB_STOLEN, AquaHideout_1F_EventScript_15D802 msgbox AquaHideout_1F_Text_196C83, 4 release end diff --git a/data/scripts/maps/AquaHideout_B1F.inc b/data/scripts/maps/AquaHideout_B1F.inc index 82d0c10c5..3be8d487d 100644 --- a/data/scripts/maps/AquaHideout_B1F.inc +++ b/data/scripts/maps/AquaHideout_B1F.inc @@ -4,8 +4,7 @@ AquaHideout_B1F_MapScripts:: @ 815D831 .byte 0 AquaHideout_B1F_MapScript1_15D83C:: @ 815D83C - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, AquaHideout_B1F_EventScript_15D846 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, AquaHideout_B1F_EventScript_15D846 end AquaHideout_B1F_EventScript_15D846:: @ 815D846 diff --git a/data/scripts/maps/BattleTower_Lobby.inc b/data/scripts/maps/BattleTower_Lobby.inc index 14b85c5b0..57eb62dfe 100644 --- a/data/scripts/maps/BattleTower_Lobby.inc +++ b/data/scripts/maps/BattleTower_Lobby.inc @@ -13,13 +13,11 @@ BattleTower_Lobby_MapScript1_160293:: @ 8160293 BattleTower_Lobby_EventScript_16029C:: @ 816029C setvar VAR_SPECIAL_4, 10 special SetBattleTowerProperty - checkflag FLAG_RECEIVED_GOLD_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1602E4 - checkflag FLAG_RECEIVED_SILVER_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1602CD + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1602E4 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_1602CD specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 50 - goto_if 0, BattleTower_Lobby_EventScript_1602E4 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -27,7 +25,7 @@ BattleTower_Lobby_EventScript_16029C:: @ 816029C BattleTower_Lobby_EventScript_1602CD:: @ 81602CD specialvar VAR_SPECIAL_7, GetBestBattleTowerStreak compare VAR_SPECIAL_7, 100 - goto_if 0, BattleTower_Lobby_EventScript_1602E4 + goto_if_lt BattleTower_Lobby_EventScript_1602E4 clearflag FLAG_HIDE_AWARD_MAN_BATTLE_TOWER special sub_810F8FC return @@ -119,7 +117,7 @@ BattleTower_Lobby_EventScript_1603AD:: @ 81603AD setvar VAR_SPECIAL_4, 9 special BattleTowerUtil compare RESULT, 49 - goto_if 5, BattleTower_Lobby_EventScript_1603F8 + goto_if_ne BattleTower_Lobby_EventScript_1603F8 msgbox BattleTower_Lobby_Text_19A617, 4 BattleTower_Lobby_EventScript_1603F8:: @ 81603F8 @@ -387,10 +385,8 @@ BattleTower_Lobby_EventScript_160727:: @ 8160727 BattleTower_Lobby_EventScript_160733:: @ 8160733 lock faceplayer - checkflag FLAG_RECEIVED_GOLD_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_1607C5 - checkflag FLAG_RECEIVED_SILVER_SHIELD - goto_if_eq BattleTower_Lobby_EventScript_160773 + goto_if_set FLAG_RECEIVED_GOLD_SHIELD, BattleTower_Lobby_EventScript_1607C5 + goto_if_set FLAG_RECEIVED_SILVER_SHIELD, BattleTower_Lobby_EventScript_160773 msgbox BattleTower_Lobby_Text_19A9EE, 4 setvar VAR_SPECIAL_8, DECOR_SILVER_SHIELD givedecoration_std DECOR_SILVER_SHIELD @@ -404,7 +400,7 @@ BattleTower_Lobby_EventScript_160733:: @ 8160733 BattleTower_Lobby_EventScript_160773:: @ 8160773 specialvar RESULT, GetBestBattleTowerStreak compare RESULT, 100 - goto_if 0, BattleTower_Lobby_EventScript_1607C5 + goto_if_lt BattleTower_Lobby_EventScript_1607C5 msgbox BattleTower_Lobby_Text_19AAC4, 4 setvar VAR_SPECIAL_8, DECOR_GOLD_SHIELD givedecoration_std DECOR_GOLD_SHIELD diff --git a/data/scripts/maps/CaveOfOrigin_1F.inc b/data/scripts/maps/CaveOfOrigin_1F.inc index 6411aad49..58c6563f6 100644 --- a/data/scripts/maps/CaveOfOrigin_1F.inc +++ b/data/scripts/maps/CaveOfOrigin_1F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_1F_MapScripts:: @ 815DD6C .byte 0 CaveOfOrigin_1F_MapScript1_15DD72:: @ 815DD72 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_1F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B1F.inc b/data/scripts/maps/CaveOfOrigin_B1F.inc index b8d4149b6..c79eb088e 100644 --- a/data/scripts/maps/CaveOfOrigin_B1F.inc +++ b/data/scripts/maps/CaveOfOrigin_B1F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B1F_MapScripts:: @ 815DD7C .byte 0 CaveOfOrigin_B1F_MapScript1_15DD82:: @ 815DD82 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B1F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B1F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B2F.inc b/data/scripts/maps/CaveOfOrigin_B2F.inc index 9b014d0e9..66b02ee9f 100644 --- a/data/scripts/maps/CaveOfOrigin_B2F.inc +++ b/data/scripts/maps/CaveOfOrigin_B2F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B2F_MapScripts:: @ 815DD8C .byte 0 CaveOfOrigin_B2F_MapScript1_15DD92:: @ 815DD92 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B2F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B2F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B3F.inc b/data/scripts/maps/CaveOfOrigin_B3F.inc index d6f7bdaf1..8084ceb43 100644 --- a/data/scripts/maps/CaveOfOrigin_B3F.inc +++ b/data/scripts/maps/CaveOfOrigin_B3F.inc @@ -3,6 +3,5 @@ CaveOfOrigin_B3F_MapScripts:: @ 815DD9C .byte 0 CaveOfOrigin_B3F_MapScript1_15DDA2:: @ 815DDA2 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B3F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B3F_EventScript_1A04E3 end diff --git a/data/scripts/maps/CaveOfOrigin_B4F.inc b/data/scripts/maps/CaveOfOrigin_B4F.inc index 315dda886..aa79e1213 100644 --- a/data/scripts/maps/CaveOfOrigin_B4F.inc +++ b/data/scripts/maps/CaveOfOrigin_B4F.inc @@ -4,8 +4,7 @@ CaveOfOrigin_B4F_MapScripts:: @ 815DDAC .byte 0 CaveOfOrigin_B4F_MapScript1_15DDB7:: @ 815DDB7 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, CaveOfOrigin_B4F_EventScript_15DDC1 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, CaveOfOrigin_B4F_EventScript_15DDC1 end CaveOfOrigin_B4F_EventScript_15DDC1:: @ 815DDC1 @@ -19,8 +18,7 @@ CaveOfOrigin_B4F_MapScript1_15DDC5:: @ 815DDC5 setmaplayoutindex 313 .endif call CaveOfOrigin_B4F_EventScript_1A01B5 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, CaveOfOrigin_B4F_EventScript_1A04E3 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, CaveOfOrigin_B4F_EventScript_1A04E3 end CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 @@ -67,7 +65,7 @@ CaveOfOrigin_B4F_EventScript_15DDD7:: @ 815DDD7 clearflag FLAG_SYS_CTRL_OBJ_DELETE specialvar RESULT, GetBattleOutcome compare RESULT, 1 - call_if 1, CaveOfOrigin_B4F_EventScript_15DE73 + call_if_eq CaveOfOrigin_B4F_EventScript_15DE73 setflag FLAG_HIDE_WALLACE_SOOTOPOLIS setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_1 setflag FLAG_HIDE_CAVE_OF_ORIGIN_ENTRANCE_WOMAN_2 diff --git a/data/scripts/maps/DesertRuins.inc b/data/scripts/maps/DesertRuins.inc index 7aa56a82d..2627a8261 100644 --- a/data/scripts/maps/DesertRuins.inc +++ b/data/scripts/maps/DesertRuins.inc @@ -5,8 +5,7 @@ DesertRuins_MapScripts:: @ 815CAF3 .byte 0 DesertRuins_MapScript1_15CB03:: @ 815CB03 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, DesertRuins_EventScript_15CB0D + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, DesertRuins_EventScript_15CB0D end DesertRuins_EventScript_15CB0D:: @ 815CB0D @@ -14,8 +13,7 @@ DesertRuins_EventScript_15CB0D:: @ 815CB0D return DesertRuins_MapScript1_15CB11:: @ 815CB11 - checkflag FLAG_SYS_BRAILLE_STRENGTH - call_if 0, DesertRuins_EventScript_15CB1B + call_if_unset FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB1B end DesertRuins_EventScript_15CB1B:: @ 815CB1B @@ -33,8 +31,7 @@ DesertRuins_MapScript1_15CB52:: @ 815CB52 DesertRuins_EventScript_15CB56:: @ 815CB56 lockall - checkflag FLAG_SYS_BRAILLE_STRENGTH - goto_if_eq DesertRuins_EventScript_15CB6D + goto_if_set FLAG_SYS_BRAILLE_STRENGTH, DesertRuins_EventScript_15CB6D braillemessage DesertRuins_Braille_1C54C8 waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/DewfordTown.inc b/data/scripts/maps/DewfordTown.inc index 50c9d8991..e7aeccbd0 100644 --- a/data/scripts/maps/DewfordTown.inc +++ b/data/scripts/maps/DewfordTown.inc @@ -9,8 +9,7 @@ DewfordTown_MapScript1_14DFFE:: @ 814DFFE DewfordTown_EventScript_14E002:: @ 814E002 lock faceplayer - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, DewfordTown_EventScript_14E076 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, DewfordTown_EventScript_14E076 message DewfordTown_Text_16B522 waitmessage multichoicedefault 21, 6, 0, 2, 0 @@ -74,8 +73,7 @@ DewfordTown_EventScript_14E0BD:: @ 814E0BD DewfordTown_EventScript_14E0C6:: @ 814E0C6 lock faceplayer - checkflag FLAG_RECEIVED_OLD_ROD - goto_if_eq DewfordTown_EventScript_14E11B + goto_if_set FLAG_RECEIVED_OLD_ROD, DewfordTown_EventScript_14E11B msgbox DewfordTown_Text_16B665, MSGBOX_YESNO compare RESULT, YES goto_if_eq DewfordTown_EventScript_14E0F0 @@ -176,10 +174,8 @@ DewfordTown_EventScript_14E1D8:: @ 814E1D8 clearflag FLAG_HIDE_MR_BRINEY_BOAT_ROUTE109 setflag FLAG_HIDE_MR_BRINEY_BOAT_DEWFORD hideobjectat 4, MAP_DEWFORD_TOWN - checkflag FLAG_DELIVERED_DEVON_GOODS - call_if 0, DewfordTown_EventScript_14E281 - checkflag FLAG_DELIVERED_DEVON_GOODS - call_if 1, DewfordTown_EventScript_14E28A + call_if_unset FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E281 + call_if_set FLAG_DELIVERED_DEVON_GOODS, DewfordTown_EventScript_14E28A closemessage copyvar VAR_BRINEY_LOCATION, VAR_SPECIAL_8 resetobjectpriority 255, MAP_DEWFORD_TOWN diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index ba933dbe9..2dc15d92c 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -82,17 +82,17 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 checktrainerflag OPPONENT_HIDEKI - goto_if 0, DewfordTown_Gym_EventScript_153135 + goto_if_lt DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 checktrainerflag OPPONENT_TESSA - goto_if 0, DewfordTown_Gym_EventScript_153143 + goto_if_lt DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 checktrainerflag OPPONENT_LAURA - goto_if 0, DewfordTown_Gym_EventScript_153151 + goto_if_lt DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 @@ -100,8 +100,7 @@ DewfordTown_Gym_EventScript_153151:: @ 8153151 DewfordTown_Gym_EventScript_153152:: @ 8153152 trainerbattle 1, OPPONENT_BRAWLY, 0, DewfordTown_Gym_Text_175182, DewfordTown_Gym_Text_175246, DewfordTown_Gym_EventScript_153177 - checkflag FLAG_RECEIVED_TM08 - goto_if 0, DewfordTown_Gym_EventScript_1531B5 + goto_if_unset FLAG_RECEIVED_TM08, DewfordTown_Gym_EventScript_1531B5 msgbox DewfordTown_Gym_Text_175412, 4 release end @@ -116,7 +115,7 @@ DewfordTown_Gym_EventScript_153177:: @ 8153177 setflag FLAG_BADGE02_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, DewfordTown_Gym_EventScript_1A00FB + call_if_eq DewfordTown_Gym_EventScript_1A00FB setvar VAR_SPECIAL_8, 2 call DewfordTown_Gym_EventScript_1A01C0 goto DewfordTown_Gym_EventScript_1531B5 @@ -164,8 +163,7 @@ DewfordTown_Gym_EventScript_153238:: @ 8153238 DewfordTown_Gym_EventScript_15323F:: @ 815323F lock faceplayer - checkflag FLAG_DEFEATED_DEWFORD_GYM - goto_if_eq DewfordTown_Gym_EventScript_153254 + goto_if_set FLAG_DEFEATED_DEWFORD_GYM, DewfordTown_Gym_EventScript_153254 msgbox DewfordTown_Gym_Text_174D98, 4 release end @@ -177,15 +175,13 @@ DewfordTown_Gym_EventScript_153254:: @ 8153254 DewfordTown_Gym_EventScript_15325E:: @ 815325E lockall - checkflag FLAG_BADGE02_GET - goto_if_eq DewfordTown_Gym_EventScript_15327E + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end DewfordTown_Gym_EventScript_15326E:: @ 815326E lockall - checkflag FLAG_BADGE02_GET - goto_if_eq DewfordTown_Gym_EventScript_15327E + goto_if_set FLAG_BADGE02_GET, DewfordTown_Gym_EventScript_15327E goto DewfordTown_Gym_EventScript_153288 end diff --git a/data/scripts/maps/DewfordTown_Hall.inc b/data/scripts/maps/DewfordTown_Hall.inc index c4ccc769c..84334068e 100644 --- a/data/scripts/maps/DewfordTown_Hall.inc +++ b/data/scripts/maps/DewfordTown_Hall.inc @@ -218,9 +218,9 @@ DewfordTown_Hall_EventScript_153535:: @ 8153535 DewfordTown_Hall_EventScript_153556:: @ 8153556 compare FACING, 2 - call_if 1, DewfordTown_Hall_EventScript_15356D + call_if_eq DewfordTown_Hall_EventScript_15356D compare FACING, 1 - call_if 1, DewfordTown_Hall_EventScript_153578 + call_if_eq DewfordTown_Hall_EventScript_153578 return DewfordTown_Hall_EventScript_15356D:: @ 815356D @@ -252,8 +252,7 @@ DewfordTown_Hall_EventScript_15359D:: @ 815359D lock faceplayer call DewfordTown_Hall_EventScript_1A0102 - checkflag FLAG_RECEIVED_TM36 - goto_if_eq DewfordTown_Hall_EventScript_1535D1 + goto_if_set FLAG_RECEIVED_TM36, DewfordTown_Hall_EventScript_1535D1 msgbox DewfordTown_Hall_Text_175E13, 4 giveitem_std ITEM_TM36 compare RESULT, 0 diff --git a/data/scripts/maps/DewfordTown_House2.inc b/data/scripts/maps/DewfordTown_House2.inc index e704efa50..a2341bc76 100644 --- a/data/scripts/maps/DewfordTown_House2.inc +++ b/data/scripts/maps/DewfordTown_House2.inc @@ -4,8 +4,7 @@ DewfordTown_House2_MapScripts:: @ 81535DB DewfordTown_House2_EventScript_1535DC:: @ 81535DC lock faceplayer - checkflag FLAG_RECEIVED_SILK_SCARF - goto_if_eq DewfordTown_House2_EventScript_153615 + goto_if_set FLAG_RECEIVED_SILK_SCARF, DewfordTown_House2_EventScript_153615 msgbox DewfordTown_House2_Text_175EFE, 4 giveitem_std ITEM_SILK_SCARF compare RESULT, 0 diff --git a/data/scripts/maps/EverGrandeCity.inc b/data/scripts/maps/EverGrandeCity.inc index 9a1bd9fa7..293780716 100644 --- a/data/scripts/maps/EverGrandeCity.inc +++ b/data/scripts/maps/EverGrandeCity.inc @@ -3,8 +3,7 @@ EverGrandeCity_MapScripts:: @ 814D4D5 .byte 0 EverGrandeCity_MapScript1_14D4DB:: @ 814D4DB - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, EverGrandeCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, EverGrandeCity_EventScript_1A02C1 end EverGrandeCity_EventScript_14D4E5:: @ 814D4E5 diff --git a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc index 29c29c80b..78009271b 100644 --- a/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc +++ b/data/scripts/maps/EverGrandeCity_ChampionsRoom.inc @@ -54,9 +54,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B821:: @ 815B821 playse SE_DOOR checkplayergender compare RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B87C + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B87C compare RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B881 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B881 addobject 2 call EverGrandeCity_ChampionsRoom_EventScript_15B9BD checkplayergender @@ -129,9 +129,9 @@ EverGrandeCity_ChampionsRoom_EventScript_15B8F0:: @ 815B8F0 msgbox EverGrandeCity_ChampionsRoom_Text_191546, 4 checkplayergender compare RESULT, 0 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9AB + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9AB compare RESULT, 1 - call_if 1, EverGrandeCity_ChampionsRoom_EventScript_15B9B4 + call_if_eq EverGrandeCity_ChampionsRoom_EventScript_15B9B4 closemessage applymovement 1, EverGrandeCity_ChampionsRoom_Movement_15B9FF applymovement 255, EverGrandeCity_ChampionsRoom_Movement_15B9E0 diff --git a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc index a738264fe..8eb7bbc45 100644 --- a/data/scripts/maps/EverGrandeCity_DrakesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_DrakesRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_DrakesRoom_EventScript_15B736:: @ 815B736 end EverGrandeCity_DrakesRoom_MapScript1_15B743:: @ 815B743 - checkflag FLAG_DEFEATED_ELITE_4_DRAKE - call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B758 + call_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B758 compare VAR_ELITE_4_STATE, 4 - call_if 1, EverGrandeCity_DrakesRoom_EventScript_15B75E + call_if_eq EverGrandeCity_DrakesRoom_EventScript_15B75E end EverGrandeCity_DrakesRoom_EventScript_15B758:: @ 815B758 @@ -41,8 +40,7 @@ EverGrandeCity_DrakesRoom_EventScript_15B75E:: @ 815B75E EverGrandeCity_DrakesRoom_EventScript_15B764:: @ 815B764 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_DRAKE - goto_if_eq EverGrandeCity_DrakesRoom_EventScript_15B78B + goto_if_set FLAG_DEFEATED_ELITE_4_DRAKE, EverGrandeCity_DrakesRoom_EventScript_15B78B playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_DrakesRoom_Text_190CEB, 4 trainerbattle 3, OPPONENT_DRAKE, 0, EverGrandeCity_DrakesRoom_Text_190E42 diff --git a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc index e3a4145d6..a72b84440 100644 --- a/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc +++ b/data/scripts/maps/EverGrandeCity_GlaciasRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_GlaciasRoom_EventScript_15B69C:: @ 815B69C end EverGrandeCity_GlaciasRoom_MapScript1_15B6A9:: @ 815B6A9 - checkflag FLAG_DEFEATED_ELITE_4_GLACIA - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6BE + call_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6BE compare VAR_ELITE_4_STATE, 3 - call_if 1, EverGrandeCity_GlaciasRoom_EventScript_15B6C4 + call_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6C4 end EverGrandeCity_GlaciasRoom_EventScript_15B6BE:: @ 815B6BE @@ -41,8 +40,7 @@ EverGrandeCity_GlaciasRoom_EventScript_15B6C4:: @ 815B6C4 EverGrandeCity_GlaciasRoom_EventScript_15B6CA:: @ 815B6CA lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_GLACIA - goto_if_eq EverGrandeCity_GlaciasRoom_EventScript_15B6F1 + goto_if_set FLAG_DEFEATED_ELITE_4_GLACIA, EverGrandeCity_GlaciasRoom_EventScript_15B6F1 playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_GlaciasRoom_Text_190AF9, 4 trainerbattle 3, OPPONENT_GLACIA, 0, EverGrandeCity_GlaciasRoom_Text_190C01 diff --git a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc index d23f234db..2d09f1ebb 100644 --- a/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc +++ b/data/scripts/maps/EverGrandeCity_PhoebesRoom.inc @@ -24,10 +24,9 @@ EverGrandeCity_PhoebesRoom_EventScript_15B602:: @ 815B602 end EverGrandeCity_PhoebesRoom_MapScript1_15B60F:: @ 815B60F - checkflag FLAG_DEFEATED_ELITE_4_PHOEBE - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B624 + call_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B624 compare VAR_ELITE_4_STATE, 2 - call_if 1, EverGrandeCity_PhoebesRoom_EventScript_15B62A + call_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B62A end EverGrandeCity_PhoebesRoom_EventScript_15B624:: @ 815B624 @@ -41,8 +40,7 @@ EverGrandeCity_PhoebesRoom_EventScript_15B62A:: @ 815B62A EverGrandeCity_PhoebesRoom_EventScript_15B630:: @ 815B630 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_PHOEBE - goto_if_eq EverGrandeCity_PhoebesRoom_EventScript_15B657 + goto_if_set FLAG_DEFEATED_ELITE_4_PHOEBE, EverGrandeCity_PhoebesRoom_EventScript_15B657 playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_PhoebesRoom_Text_1908F5, 4 trainerbattle 3, OPPONENT_PHOEBE, 0, EverGrandeCity_PhoebesRoom_Text_190A0C diff --git a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc index a787b0f90..a8eb820ea 100644 --- a/data/scripts/maps/EverGrandeCity_PokemonLeague.inc +++ b/data/scripts/maps/EverGrandeCity_PokemonLeague.inc @@ -5,8 +5,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B setrespawn 20 setflag FLAG_SYS_POKEMON_LEAGUE_FLY - checkflag FLAG_ENTERED_ELITE_FOUR - call_if 0, EverGrandeCity_PokemonLeague_EventScript_15BA8B + call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B end EverGrandeCity_PokemonLeague_EventScript_15BA8B:: @ 815BA8B @@ -47,18 +46,16 @@ EverGrandeCity_PokemonLeague_Items:: @ 815BAC0 EverGrandeCity_PokemonLeague_EventScript_15BAD2:: @ 815BAD2 lockall - checkflag FLAG_ENTERED_ELITE_FOUR - goto_if_eq EverGrandeCity_PokemonLeague_EventScript_15BB57 + goto_if_set FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BB57 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 11 - call_if 4, EverGrandeCity_PokemonLeague_EventScript_15BB34 + call_if_ge EverGrandeCity_PokemonLeague_EventScript_15BB34 compare VAR_TEMP_0, 8 - call_if 3, EverGrandeCity_PokemonLeague_EventScript_15BB3F + call_if_le EverGrandeCity_PokemonLeague_EventScript_15BB3F message EverGrandeCity_PokemonLeague_Text_1916FD waitmessage delay 75 - checkflag FLAG_BADGE06_GET - goto_if 0, EverGrandeCity_PokemonLeague_EventScript_15BB4A + goto_if_unset FLAG_BADGE06_GET, EverGrandeCity_PokemonLeague_EventScript_15BB4A closemessage applymovement 3, EverGrandeCity_PokemonLeague_Movement_15BB7E applymovement 4, EverGrandeCity_PokemonLeague_Movement_15BB81 diff --git a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc index 4531845ab..45a729c0a 100644 --- a/data/scripts/maps/EverGrandeCity_SidneysRoom.inc +++ b/data/scripts/maps/EverGrandeCity_SidneysRoom.inc @@ -5,10 +5,9 @@ EverGrandeCity_SidneysRoom_MapScripts:: @ 815B53F .byte 0 EverGrandeCity_SidneysRoom_MapScript1_15B54F:: @ 815B54F - checkflag FLAG_DEFEATED_ELITE_4_SYDNEY - call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B564 + call_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B564 compare VAR_ELITE_4_STATE, 1 - call_if 1, EverGrandeCity_SidneysRoom_EventScript_15B56A + call_if_eq EverGrandeCity_SidneysRoom_EventScript_15B56A end EverGrandeCity_SidneysRoom_EventScript_15B564:: @ 815B564 @@ -42,8 +41,7 @@ EverGrandeCity_SidneysRoom_EventScript_15B589:: @ 815B589 EverGrandeCity_SidneysRoom_EventScript_15B596:: @ 815B596 lock faceplayer - checkflag FLAG_DEFEATED_ELITE_4_SYDNEY - goto_if_eq EverGrandeCity_SidneysRoom_EventScript_15B5BD + goto_if_set FLAG_DEFEATED_ELITE_4_SYDNEY, EverGrandeCity_SidneysRoom_EventScript_15B5BD playbgm BGM_SITENNOU, FALSE msgbox EverGrandeCity_SidneysRoom_Text_190728, 4 trainerbattle 3, OPPONENT_SIDNEY, 0, EverGrandeCity_SidneysRoom_Text_190823 diff --git a/data/scripts/maps/FallarborTown.inc b/data/scripts/maps/FallarborTown.inc index 23295f778..a168a0ef5 100644 --- a/data/scripts/maps/FallarborTown.inc +++ b/data/scripts/maps/FallarborTown.inc @@ -12,8 +12,7 @@ FallarborTown_MapScript1_14E7E6:: @ 814E7E6 FallarborTown_EventScript_14E7F5:: @ 814E7F5 lock faceplayer - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if_eq FallarborTown_EventScript_14E80A + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_EventScript_14E80A msgbox FallarborTown_Text_16C7FF, 4 release end diff --git a/data/scripts/maps/FallarborTown_ContestLobby.inc b/data/scripts/maps/FallarborTown_ContestLobby.inc index 641a201e3..11dd6159e 100644 --- a/data/scripts/maps/FallarborTown_ContestLobby.inc +++ b/data/scripts/maps/FallarborTown_ContestLobby.inc @@ -92,8 +92,7 @@ FallarborTown_ContestLobby_EventScript_153A8E:: @ 8153A8E end FallarborTown_ContestLobby_EventScript_153A97:: @ 8153A97 - checkflag FLAG_CONTEST_SKETCH_CREATED - goto_if_eq FallarborTown_ContestLobby_EventScript_153AA9 + goto_if_set FLAG_CONTEST_SKETCH_CREATED, FallarborTown_ContestLobby_EventScript_153AA9 msgbox FallarborTown_ContestLobby_Text_177246, 2 end diff --git a/data/scripts/maps/FallarborTown_House1.inc b/data/scripts/maps/FallarborTown_House1.inc index d2b27f478..f62a2da37 100644 --- a/data/scripts/maps/FallarborTown_House1.inc +++ b/data/scripts/maps/FallarborTown_House1.inc @@ -8,8 +8,7 @@ FallarborTown_House1_MapScript1_153BB4:: @ 8153BB4 FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 lock faceplayer - checkflag FLAG_RECEIVED_TM27 - goto_if_eq FallarborTown_House1_EventScript_153C54 + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C54 checkitem ITEM_METEORITE, 1 compare RESULT, 1 goto_if_eq FallarborTown_House1_EventScript_153BDA @@ -18,10 +17,8 @@ FallarborTown_House1_EventScript_153BB5:: @ 8153BB5 end FallarborTown_House1_EventScript_153BDA:: @ 8153BDA - checkflag FLAG_TEMP_2 - call_if 0, FallarborTown_House1_EventScript_153C2D - checkflag FLAG_TEMP_2 - call_if 1, FallarborTown_House1_EventScript_153C3E + call_if_unset FLAG_TEMP_2, FallarborTown_House1_EventScript_153C2D + call_if_set FLAG_TEMP_2, FallarborTown_House1_EventScript_153C3E compare RESULT, NO goto_if_eq FallarborTown_House1_EventScript_153C47 msgbox FallarborTown_House1_Text_1778C4, 4 @@ -58,10 +55,8 @@ FallarborTown_House1_EventScript_153C54:: @ 8153C54 FallarborTown_House1_EventScript_153C5E:: @ 8153C5E lock faceplayer - checkflag FLAG_RECEIVED_TM27 - goto_if_eq FallarborTown_House1_EventScript_153C86 - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if_eq FallarborTown_House1_EventScript_153C7C + goto_if_set FLAG_RECEIVED_TM27, FallarborTown_House1_EventScript_153C86 + goto_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, FallarborTown_House1_EventScript_153C7C msgbox FallarborTown_House1_Text_177A2B, 4 release end diff --git a/data/scripts/maps/FallarborTown_House2.inc b/data/scripts/maps/FallarborTown_House2.inc index 7ceaabdef..bb1656fc2 100644 --- a/data/scripts/maps/FallarborTown_House2.inc +++ b/data/scripts/maps/FallarborTown_House2.inc @@ -5,8 +5,7 @@ FallarborTown_House2_EventScript_153C91:: @ 8153C91 lockall applymovement 1, FallarborTown_House2_Movement_1A0839 waitmovement 0 - checkflag FLAG_TEMP_1 - goto_if_eq FallarborTown_House2_EventScript_153CB6 + goto_if_set FLAG_TEMP_1, FallarborTown_House2_EventScript_153CB6 msgbox FallarborTown_House2_Text_177AF4, 4 setflag FLAG_TEMP_1 goto FallarborTown_House2_EventScript_153CB6 diff --git a/data/scripts/maps/FortreeCity.inc b/data/scripts/maps/FortreeCity.inc index 937b435a6..e576df5bd 100644 --- a/data/scripts/maps/FortreeCity.inc +++ b/data/scripts/maps/FortreeCity.inc @@ -18,8 +18,7 @@ FortreeCity_EventScript_14C955:: @ 814C955 FortreeCity_EventScript_14C95E:: @ 814C95E lock faceplayer - checkflag FLAG_KECLEON_FLED_FORTREE - goto_if_eq FortreeCity_EventScript_14C973 + goto_if_set FLAG_KECLEON_FLED_FORTREE, FortreeCity_EventScript_14C973 msgbox FortreeCity_Text_1675C2, 4 release end diff --git a/data/scripts/maps/FortreeCity_Gym.inc b/data/scripts/maps/FortreeCity_Gym.inc index 9217ba8f4..94df378f8 100644 --- a/data/scripts/maps/FortreeCity_Gym.inc +++ b/data/scripts/maps/FortreeCity_Gym.inc @@ -17,8 +17,7 @@ FortreeCity_Gym_EventScript_157EEC:: @ 8157EEC FortreeCity_Gym_EventScript_157EF0:: @ 8157EF0 trainerbattle 1, OPPONENT_WINONA, 0, FortreeCity_Gym_Text_185CCB, FortreeCity_Gym_Text_185DBA, FortreeCity_Gym_EventScript_157F15 - checkflag FLAG_RECEIVED_TM40 - goto_if 0, FortreeCity_Gym_EventScript_157F3E + goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_157F3E msgbox FortreeCity_Gym_Text_185F98, 4 release end @@ -67,8 +66,7 @@ FortreeCity_Gym_EventScript_157FA7:: @ 8157FA7 FortreeCity_Gym_EventScript_157FBE:: @ 8157FBE lock faceplayer - checkflag FLAG_DEFEATED_FORTREE_GYM - goto_if_eq FortreeCity_Gym_EventScript_157FD3 + goto_if_set FLAG_DEFEATED_FORTREE_GYM, FortreeCity_Gym_EventScript_157FD3 msgbox FortreeCity_Gym_Text_18589C, 4 release end @@ -80,15 +78,13 @@ FortreeCity_Gym_EventScript_157FD3:: @ 8157FD3 FortreeCity_Gym_EventScript_157FDD:: @ 8157FDD lockall - checkflag FLAG_BADGE06_GET - goto_if_eq FortreeCity_Gym_EventScript_157FFD + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end FortreeCity_Gym_EventScript_157FED:: @ 8157FED lockall - checkflag FLAG_BADGE06_GET - goto_if_eq FortreeCity_Gym_EventScript_157FFD + goto_if_set FLAG_BADGE06_GET, FortreeCity_Gym_EventScript_157FFD goto FortreeCity_Gym_EventScript_158007 end diff --git a/data/scripts/maps/FortreeCity_House1.inc b/data/scripts/maps/FortreeCity_House1.inc index b308aa836..443cc3a5c 100644 --- a/data/scripts/maps/FortreeCity_House1.inc +++ b/data/scripts/maps/FortreeCity_House1.inc @@ -4,8 +4,7 @@ FortreeCity_House1_MapScripts:: @ 8157E12 FortreeCity_House1_EventScript_157E13:: @ 8157E13 lock faceplayer - checkflag FLAG_FORTREE_NPC_TRADE_COMPLETED - goto_if_eq FortreeCity_House1_EventScript_157EAD + goto_if_set FLAG_FORTREE_NPC_TRADE_COMPLETED, FortreeCity_House1_EventScript_157EAD setvar VAR_SPECIAL_8, 1 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ FortreeCity_House1_EventScript_157E13:: @ 8157E13 specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, FortreeCity_House1_EventScript_157E9F + goto_if_ne FortreeCity_House1_EventScript_157E9F copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/FortreeCity_House2.inc b/data/scripts/maps/FortreeCity_House2.inc index ae70b8644..107c3708c 100644 --- a/data/scripts/maps/FortreeCity_House2.inc +++ b/data/scripts/maps/FortreeCity_House2.inc @@ -4,10 +4,8 @@ FortreeCity_House2_MapScripts:: @ 81580B3 FortreeCity_House2_EventScript_1580B4:: @ 81580B4 lock faceplayer - checkflag FLAG_RECEIVED_TM10 - goto_if_eq FortreeCity_House2_EventScript_158157 - checkflag FLAG_MET_HIDDEN_POWER_GIVER - call_if 0, FortreeCity_House2_EventScript_15814B + goto_if_set FLAG_RECEIVED_TM10, FortreeCity_House2_EventScript_158157 + call_if_unset FLAG_MET_HIDDEN_POWER_GIVER, FortreeCity_House2_EventScript_15814B msgbox FortreeCity_House2_Text_186360, 4 multichoice 21, 8, 54, 1 switch RESULT diff --git a/data/scripts/maps/FortreeCity_House4.inc b/data/scripts/maps/FortreeCity_House4.inc index 1b1b41877..490ef0c9b 100644 --- a/data/scripts/maps/FortreeCity_House4.inc +++ b/data/scripts/maps/FortreeCity_House4.inc @@ -7,12 +7,9 @@ FortreeCity_House4_EventScript_15817F:: @ 815817F FortreeCity_House4_EventScript_158188:: @ 8158188 lockall - checkflag FLAG_RECEIVED_MENTAL_HERB - goto_if_eq FortreeCity_House4_EventScript_158204 - checkflag FLAG_WINGULL_DELIVERED_MAIL - goto_if_eq FortreeCity_House4_EventScript_1581D6 - checkflag FLAG_WINGULL_SENT_ON_ERRAND - goto_if_eq FortreeCity_House4_EventScript_1581C2 + goto_if_set FLAG_RECEIVED_MENTAL_HERB, FortreeCity_House4_EventScript_158204 + goto_if_set FLAG_WINGULL_DELIVERED_MAIL, FortreeCity_House4_EventScript_1581D6 + goto_if_set FLAG_WINGULL_SENT_ON_ERRAND, FortreeCity_House4_EventScript_1581C2 msgbox FortreeCity_House4_Text_186835, 4 closemessage setflag FLAG_WINGULL_SENT_ON_ERRAND diff --git a/data/scripts/maps/GraniteCave_1F.inc b/data/scripts/maps/GraniteCave_1F.inc index 33296e510..7419b5866 100644 --- a/data/scripts/maps/GraniteCave_1F.inc +++ b/data/scripts/maps/GraniteCave_1F.inc @@ -4,8 +4,7 @@ GraniteCave_1F_MapScripts:: @ 815CBA6 GraniteCave_1F_EventScript_15CBA7:: @ 815CBA7 lock faceplayer - checkflag FLAG_RECEIVED_HM05 - goto_if_eq GraniteCave_1F_EventScript_15CBD3 + goto_if_set FLAG_RECEIVED_HM05, GraniteCave_1F_EventScript_15CBD3 msgbox GraniteCave_1F_Text_194917, 4 giveitem_std ITEM_HM05 setflag FLAG_RECEIVED_HM05 diff --git a/data/scripts/maps/GraniteCave_StevensRoom.inc b/data/scripts/maps/GraniteCave_StevensRoom.inc index c9616266e..9c69e649e 100644 --- a/data/scripts/maps/GraniteCave_StevensRoom.inc +++ b/data/scripts/maps/GraniteCave_StevensRoom.inc @@ -11,17 +11,17 @@ GraniteCave_StevensRoom_EventScript_15CBFA:: @ 815CBFA msgbox GraniteCave_StevensRoom_Text_194BDD, 4 giveitem_std ITEM_TM47 compare RESULT, 0 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC83 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC83 msgbox GraniteCave_StevensRoom_Text_194C8D, 4 closemessage compare FACING, 2 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 1 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC78 + call_if_eq GraniteCave_StevensRoom_EventScript_15CC78 compare FACING, 3 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D compare FACING, 4 - call_if 1, GraniteCave_StevensRoom_EventScript_15CC6D + call_if_eq GraniteCave_StevensRoom_EventScript_15CC6D playse SE_KAIDAN removeobject 1 release diff --git a/data/scripts/maps/IslandCave.inc b/data/scripts/maps/IslandCave.inc index dbc71b6bb..d8576e883 100644 --- a/data/scripts/maps/IslandCave.inc +++ b/data/scripts/maps/IslandCave.inc @@ -5,8 +5,7 @@ IslandCave_MapScripts:: @ 815EEB6 .byte 0 IslandCave_MapScript1_15EEC6:: @ 815EEC6 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, IslandCave_EventScript_15EED0 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, IslandCave_EventScript_15EED0 end IslandCave_EventScript_15EED0:: @ 815EED0 @@ -14,8 +13,7 @@ IslandCave_EventScript_15EED0:: @ 815EED0 return IslandCave_MapScript1_15EED4:: @ 815EED4 - checkflag FLAG_SYS_BRAILLE_WAIT - call_if 0, IslandCave_EventScript_15EEDE + call_if_unset FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EEDE end IslandCave_EventScript_15EEDE:: @ 815EEDE @@ -45,8 +43,7 @@ S_OpenRegiceChamber:: @ 815EF19 IslandCave_EventScript_15EF59:: @ 815EF59 lockall - checkflag FLAG_SYS_BRAILLE_WAIT - goto_if_eq IslandCave_EventScript_15EF72 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF72 braillemessage IslandCave_Braille_1C54FC special DoBrailleWait waitstate @@ -61,8 +58,7 @@ IslandCave_EventScript_15EF72:: @ 815EF72 IslandCave_EventScript_15EF7C:: @ 815EF7C lockall braillemessage IslandCave_Braille_1C54FC - checkflag FLAG_SYS_BRAILLE_WAIT - goto_if_eq IslandCave_EventScript_15EF95 + goto_if_set FLAG_SYS_BRAILLE_WAIT, IslandCave_EventScript_15EF95 special DoBrailleWait waitstate goto IslandCave_EventScript_15EF95 diff --git a/data/scripts/maps/JaggedPass.inc b/data/scripts/maps/JaggedPass.inc index efe5d6a6e..d75420e88 100644 --- a/data/scripts/maps/JaggedPass.inc +++ b/data/scripts/maps/JaggedPass.inc @@ -9,7 +9,7 @@ JaggedPass_MapScript1_15D271:: @ 815D271 JaggedPass_MapScript1_15D274:: @ 815D274 compare VAR_JAGGED_PASS_ASH_WEATHER, 1 - call_if 1, JaggedPass_EventScript_15D280 + call_if_eq JaggedPass_EventScript_15D280 end JaggedPass_EventScript_15D280:: @ 815D280 diff --git a/data/scripts/maps/LavaridgeTown.inc b/data/scripts/maps/LavaridgeTown.inc index 44a1e141b..a7f71baf6 100644 --- a/data/scripts/maps/LavaridgeTown.inc +++ b/data/scripts/maps/LavaridgeTown.inc @@ -5,12 +5,11 @@ LavaridgeTown_MapScripts:: @ 814E4A3 LavaridgeTown_MapScript1_14E4AE:: @ 814E4AE setflag FLAG_VISITED_LAVARIDGE_TOWN - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - call_if 1, LavaridgeTown_EventScript_14E4DF + call_if_set FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, LavaridgeTown_EventScript_14E4DF call LavaridgeTown_EventScript_1A014E call LavaridgeTown_EventScript_1A0172 compare VAR_LAVARIDGE_RIVAL_STATE, 2 - call_if 1, LavaridgeTown_EventScript_14E4D0 + call_if_eq LavaridgeTown_EventScript_14E4D0 end LavaridgeTown_EventScript_14E4D0:: @ 814E4D0 @@ -45,11 +44,11 @@ LavaridgeTown_EventScript_14E4ED:: @ 814E4ED waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_14E56B compare RESULT, 1 - call_if 1, LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_14E570 compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E68F + call_if_eq LavaridgeTown_EventScript_14E68F checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB @@ -71,9 +70,9 @@ LavaridgeTown_EventScript_14E575:: @ 814E575 setvar VAR_SPECIAL_8, 0 checkplayergender compare RESULT, 0 - call_if 1, LavaridgeTown_EventScript_14E56B + call_if_eq LavaridgeTown_EventScript_14E56B compare RESULT, 1 - call_if 1, LavaridgeTown_EventScript_14E570 + call_if_eq LavaridgeTown_EventScript_14E570 checkplayergender compare RESULT, 0 goto_if_eq LavaridgeTown_EventScript_14E5AB @@ -100,16 +99,16 @@ LavaridgeTown_EventScript_14E5D0:: @ 814E5D0 LavaridgeTown_EventScript_14E5F5:: @ 814E5F5 closemessage compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E646 + call_if_eq LavaridgeTown_EventScript_14E646 compare VAR_SPECIAL_8, 0 - call_if 1, LavaridgeTown_EventScript_14E64E + call_if_eq LavaridgeTown_EventScript_14E64E removeobject 8 addobject 7 delay 30 compare VAR_SPECIAL_8, 1 - call_if 1, LavaridgeTown_EventScript_14E69A + call_if_eq LavaridgeTown_EventScript_14E69A compare VAR_SPECIAL_8, 0 - call_if 1, LavaridgeTown_EventScript_14E6A5 + call_if_eq LavaridgeTown_EventScript_14E6A5 removeobject 7 setvar VAR_LAVARIDGE_RIVAL_STATE, 2 savebgm 0 @@ -129,13 +128,13 @@ LavaridgeTown_EventScript_14E646:: @ 814E646 LavaridgeTown_EventScript_14E64E:: @ 814E64E compare FACING, 2 - call_if 1, LavaridgeTown_EventScript_14E67B + call_if_eq LavaridgeTown_EventScript_14E67B compare FACING, 1 - call_if 1, LavaridgeTown_EventScript_14E680 + call_if_eq LavaridgeTown_EventScript_14E680 compare FACING, 3 - call_if 1, LavaridgeTown_EventScript_14E685 + call_if_eq LavaridgeTown_EventScript_14E685 compare FACING, 4 - call_if 1, LavaridgeTown_EventScript_14E68A + call_if_eq LavaridgeTown_EventScript_14E68A return LavaridgeTown_EventScript_14E67B:: @ 814E67B @@ -166,13 +165,13 @@ LavaridgeTown_EventScript_14E69A:: @ 814E69A LavaridgeTown_EventScript_14E6A5:: @ 814E6A5 compare FACING, 2 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 compare FACING, 1 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 compare FACING, 3 - call_if 1, LavaridgeTown_EventScript_14E6DD + call_if_eq LavaridgeTown_EventScript_14E6DD compare FACING, 4 - call_if 1, LavaridgeTown_EventScript_14E6D2 + call_if_eq LavaridgeTown_EventScript_14E6D2 return LavaridgeTown_EventScript_14E6D2:: @ 814E6D2 @@ -272,8 +271,7 @@ LavaridgeTown_EventScript_14E751:: @ 814E751 LavaridgeTown_EventScript_14E75A:: @ 814E75A lock faceplayer - checkflag FLAG_RECEIVED_LAVARIDGE_EGG - goto_if_eq LavaridgeTown_EventScript_14E79E + goto_if_set FLAG_RECEIVED_LAVARIDGE_EGG, LavaridgeTown_EventScript_14E79E msgbox LavaridgeTown_Text_16C174, MSGBOX_YESNO compare RESULT, NO goto_if_eq LavaridgeTown_EventScript_14E7B2 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 1bbad53bf..52d614436 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -70,8 +70,7 @@ LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 LavaridgeTown_Gym_1F_EventScript_153741:: @ 8153741 trainerbattle 1, OPPONENT_FLANNERY, 0, LavaridgeTown_Gym_1F_Text_176801, LavaridgeTown_Gym_1F_Text_176960, LavaridgeTown_Gym_1F_EventScript_153766 - checkflag FLAG_RECEIVED_TM50 - goto_if 0, LavaridgeTown_Gym_1F_EventScript_1537A7 + goto_if_unset FLAG_RECEIVED_TM50, LavaridgeTown_Gym_1F_EventScript_1537A7 msgbox LavaridgeTown_Gym_1F_Text_176C4A, 4 release end @@ -85,7 +84,7 @@ LavaridgeTown_Gym_1F_EventScript_153766:: @ 8153766 setflag FLAG_BADGE04_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, LavaridgeTown_Gym_1F_EventScript_1A00FB + call_if_eq LavaridgeTown_Gym_1F_EventScript_1A00FB setvar VAR_SPECIAL_8, 4 call LavaridgeTown_Gym_1F_EventScript_1A01C0 setflag FLAG_HIDE_WALLY_WANDAS_HOUSE @@ -135,8 +134,7 @@ LavaridgeTown_Gym_1F_EventScript_15383E:: @ 815383E LavaridgeTown_Gym_1F_EventScript_153859:: @ 8153859 lock faceplayer - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq LavaridgeTown_Gym_1F_EventScript_15386E + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, LavaridgeTown_Gym_1F_EventScript_15386E msgbox LavaridgeTown_Gym_1F_Text_176312, 4 release end @@ -148,15 +146,13 @@ LavaridgeTown_Gym_1F_EventScript_15386E:: @ 815386E LavaridgeTown_Gym_1F_EventScript_153878:: @ 8153878 lockall - checkflag FLAG_BADGE04_GET - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end LavaridgeTown_Gym_1F_EventScript_153888:: @ 8153888 lockall - checkflag FLAG_BADGE04_GET - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153898 + goto_if_set FLAG_BADGE04_GET, LavaridgeTown_Gym_1F_EventScript_153898 goto LavaridgeTown_Gym_1F_EventScript_1538A2 end diff --git a/data/scripts/maps/LavaridgeTown_HerbShop.inc b/data/scripts/maps/LavaridgeTown_HerbShop.inc index 913734dd5..71fc2cbfe 100644 --- a/data/scripts/maps/LavaridgeTown_HerbShop.inc +++ b/data/scripts/maps/LavaridgeTown_HerbShop.inc @@ -28,8 +28,7 @@ LavaridgeTown_HerbShop_EventScript_15364C:: @ 815364C LavaridgeTown_HerbShop_EventScript_153655:: @ 8153655 lock faceplayer - checkflag FLAG_RECEIVED_CHARCOAL - goto_if_eq LavaridgeTown_HerbShop_EventScript_153684 + goto_if_set FLAG_RECEIVED_CHARCOAL, LavaridgeTown_HerbShop_EventScript_153684 msgbox LavaridgeTown_HerbShop_Text_1761A2, 4 giveitem_std ITEM_CHARCOAL compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity.inc b/data/scripts/maps/LilycoveCity.inc index 6ed8054f8..ee29b0f05 100644 --- a/data/scripts/maps/LilycoveCity.inc +++ b/data/scripts/maps/LilycoveCity.inc @@ -7,8 +7,7 @@ LilycoveCity_MapScript1_14CA20:: @ 814CA20 setflag FLAG_VISITED_LILYCOVE_CITY setvar VAR_LINK_CONTEST_ROOM_STATE, 0 setflag FLAG_HIDE_CONTEST_REPORTER_LILYCOVE - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, LilycoveCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, LilycoveCity_EventScript_1A02C1 call LilycoveCity_EventScript_1A0196 call LilycoveCity_EventScript_1A014E end @@ -28,10 +27,8 @@ LilycoveCity_MapScript1_14CA3F:: @ 814CA3F setmetatile 71, 6, 368, 0 setmetatile 72, 6, 445, 0 .endif - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - call_if 0, LilycoveCity_EventScript_14CABE - checkflag FLAG_BADGE07_GET - call_if 1, LilycoveCity_EventScript_14CB2B + call_if_unset FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CABE + call_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CB2B end LilycoveCity_EventScript_14CABE:: @ 814CABE @@ -64,8 +61,7 @@ LilycoveCity_EventScript_14CB74:: @ 814CB74 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_LILYCOVE - goto_if_eq LilycoveCity_EventScript_14CBB4 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_LILYCOVE, LilycoveCity_EventScript_14CBB4 msgbox LilycoveCity_Text_1C5A7A, 4 random 10 addvar RESULT, ITEM_CHERI_BERRY @@ -89,8 +85,7 @@ LilycoveCity_EventScript_14CBBE:: @ 814CBBE LilycoveCity_EventScript_14CBC7:: @ 814CBC7 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_EventScript_14CBDC + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CBDC msgbox LilycoveCity_Text_168750, 4 release end @@ -107,8 +102,7 @@ LilycoveCity_EventScript_14CBE6:: @ 814CBE6 LilycoveCity_EventScript_14CBEF:: @ 814CBEF lock faceplayer - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq LilycoveCity_EventScript_14CC04 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC04 msgbox LilycoveCity_Text_1688C1, 4 release end @@ -121,8 +115,7 @@ LilycoveCity_EventScript_14CC04:: @ 814CC04 LilycoveCity_EventScript_14CC0E:: @ 814CC0E lock faceplayer - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq LilycoveCity_EventScript_14CC23 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, LilycoveCity_EventScript_14CC23 msgbox LilycoveCity_Text_1689BF, 4 release end @@ -147,8 +140,7 @@ LilycoveCity_EventScript_14CC3F:: @ 814CC3F LilycoveCity_EventScript_14CC48:: @ 814CC48 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_EventScript_14CC5D + goto_if_set FLAG_BADGE07_GET, LilycoveCity_EventScript_14CC5D msgbox LilycoveCity_Text_168C16, 4 release end @@ -186,8 +178,7 @@ LilycoveCity_EventScript_14CCA2:: @ 814CCA2 LilycoveCity_EventScript_14CCAC:: @ 814CCAC lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CCC0 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CCC0 msgbox LilycoveCity_Text_168EDA, 4 releaseall end @@ -211,8 +202,7 @@ LilycoveCity_EventScript_14CCDC:: @ 814CCDC LilycoveCity_EventScript_14CCE5:: @ 814CCE5 lockall - checkflag FLAG_MET_WAILMER_TRAINER - goto_if_eq LilycoveCity_EventScript_14CD18 + goto_if_set FLAG_MET_WAILMER_TRAINER, LilycoveCity_EventScript_14CD18 msgbox LilycoveCity_Text_16864A, 4 applymovement LAST_TALKED, LilycoveCity_Movement_1A0839 waitmovement 0 @@ -256,10 +246,8 @@ LilycoveCity_EventScript_14CD46:: @ 814CD46 LilycoveCity_EventScript_14CD60:: @ 814CD60 playbgm BGM_GIRL_SUP, TRUE - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 1, LilycoveCity_EventScript_14CDB0 - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 0, LilycoveCity_EventScript_14CDB9 + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB0 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CDB9 compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CDC2 msgbox LilycoveCity_Text_167B94, 4 @@ -287,10 +275,8 @@ LilycoveCity_EventScript_14CDC2:: @ 814CDC2 LilycoveCity_EventScript_14CDD3:: @ 814CDD3 playbgm BGM_BOY_SUP, TRUE - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 1, LilycoveCity_EventScript_14CE23 - checkflag FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE - call_if 0, LilycoveCity_EventScript_14CE2C + call_if_set FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE23 + call_if_unset FLAG_DECLINED_RIVAL_BATTLE_LILYCOVE, LilycoveCity_EventScript_14CE2C compare RESULT, NO goto_if_eq LilycoveCity_EventScript_14CE35 msgbox LilycoveCity_Text_1680A9, 4 @@ -349,20 +335,18 @@ LilycoveCity_EventScript_14CE96:: @ 814CE96 LilycoveCity_EventScript_14CEA6:: @ 814CEA6 msgbox LilycoveCity_Text_167C6B, 4 setvar RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - call_if 1, LilycoveCity_EventScript_14CEEE + call_if_eq LilycoveCity_EventScript_14CEEE compare RESULT, 1 - call_if 1, LilycoveCity_EventScript_14CEF7 + call_if_eq LilycoveCity_EventScript_14CEF7 clearflag FLAG_HIDE_MAY_UPSTAIRS clearflag FLAG_HIDE_MAY_PICHU_DOLL goto LilycoveCity_EventScript_14CF6B end LilycoveCity_EventScript_14CEDE:: @ 814CEDE - checkflag FLAG_BADGE08_GET - goto_if_eq LilycoveCity_EventScript_14CEE8 + goto_if_set FLAG_BADGE08_GET, LilycoveCity_EventScript_14CEE8 return LilycoveCity_EventScript_14CEE8:: @ 814CEE8 @@ -374,8 +358,7 @@ LilycoveCity_EventScript_14CEEE:: @ 814CEEE return LilycoveCity_EventScript_14CEF7:: @ 814CEF7 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CF09 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF09 msgbox LilycoveCity_Text_167DDD, 4 return @@ -386,12 +369,11 @@ LilycoveCity_EventScript_14CF09:: @ 814CF09 LilycoveCity_EventScript_14CF12:: @ 814CF12 msgbox LilycoveCity_Text_168149, 4 setvar RESULT, 0 - checkflag FLAG_BADGE06_GET - call_if 1, LilycoveCity_EventScript_14CEDE + call_if_set FLAG_BADGE06_GET, LilycoveCity_EventScript_14CEDE compare RESULT, 0 - call_if 1, LilycoveCity_EventScript_14CF47 + call_if_eq LilycoveCity_EventScript_14CF47 compare RESULT, 1 - call_if 1, LilycoveCity_EventScript_14CF50 + call_if_eq LilycoveCity_EventScript_14CF50 clearflag FLAG_HIDE_BRENDAN_UPSTAIRS goto LilycoveCity_EventScript_14CF6B end @@ -401,8 +383,7 @@ LilycoveCity_EventScript_14CF47:: @ 814CF47 return LilycoveCity_EventScript_14CF50:: @ 814CF50 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_EventScript_14CF62 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_EventScript_14CF62 msgbox LilycoveCity_Text_168282, 4 return diff --git a/data/scripts/maps/LilycoveCity_ContestLobby.inc b/data/scripts/maps/LilycoveCity_ContestLobby.inc index 7aceecef6..a04629903 100644 --- a/data/scripts/maps/LilycoveCity_ContestLobby.inc +++ b/data/scripts/maps/LilycoveCity_ContestLobby.inc @@ -13,8 +13,7 @@ LilycoveCity_ContestLobby_MapScript2_158877:: @ 8158877 .2byte 0 LilycoveCity_ContestLobby_EventScript_158889:: @ 8158889 - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_if_eq LilycoveCity_ContestLobby_EventScript_158898 + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158898 setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end @@ -45,7 +44,7 @@ LilycoveCity_ContestLobby_EventScript_1588DE:: @ 81588DE setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_158948 + call_if_eq LilycoveCity_ContestLobby_EventScript_158948 applymovement 4, LilycoveCity_ContestLobby_Movement_158A43 waitmovement 0 removeobject 4 @@ -188,8 +187,7 @@ LilycoveCity_ContestLobby_Movement_158A52:: @ 8158A52 step_end LilycoveCity_ContestLobby_EventScript_158A5B:: @ 8158A5B - checkflag FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR - goto_if_eq LilycoveCity_ContestLobby_EventScript_158A6A + goto_if_set FLAG_HIDE_LILYCOVE_MUSEUM_CURATOR, LilycoveCity_ContestLobby_EventScript_158A6A setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 end @@ -218,7 +216,7 @@ LilycoveCity_ContestLobby_EventScript_158AAE:: @ 8158AAE setvar VAR_LILYCOVE_CONTEST_LOBBY_STATE, 0 specialvar RESULT, GiveMonArtistRibbon compare RESULT, 1 - call_if 1, LilycoveCity_ContestLobby_EventScript_158B18 + call_if_eq LilycoveCity_ContestLobby_EventScript_158B18 applymovement 11, LilycoveCity_ContestLobby_Movement_158B6D waitmovement 0 removeobject 11 @@ -307,8 +305,7 @@ LilycoveCity_ContestLobby_EventScript_158B85:: @ 8158B85 checkitem ITEM_CONTEST_PASS, 1 compare RESULT, 0 goto_if_eq LilycoveCity_ContestLobby_EventScript_158BBA - checkflag FLAG_TEMP_2 - goto_if_eq LilycoveCity_ContestLobby_EventScript_158BAE + goto_if_set FLAG_TEMP_2, LilycoveCity_ContestLobby_EventScript_158BAE message LilycoveCity_ContestLobby_Text_18848C waitmessage setflag FLAG_TEMP_2 @@ -402,8 +399,7 @@ LilycoveCity_ContestLobby_EventScript_158CC0:: @ 8158CC0 end LilycoveCity_ContestLobby_EventScript_158CEA:: @ 8158CEA - checkflag FLAG_TEMP_3 - call_if 0, LilycoveCity_ContestLobby_EventScript_158BC4 + call_if_unset FLAG_TEMP_3, LilycoveCity_ContestLobby_EventScript_158BC4 message LilycoveCity_ContestLobby_Text_1886DC waitmessage multichoice 0, 0, 4, 0 @@ -707,8 +703,7 @@ LilycoveCity_ContestLobby_EventScript_15901E:: @ 815901E end LilycoveCity_ContestLobby_EventScript_159027:: @ 8159027 - checkflag FLAG_RECEIVED_CONTEST_PASS - goto_if 0, LilycoveCity_ContestLobby_EventScript_159039 + goto_if_unset FLAG_RECEIVED_CONTEST_PASS, LilycoveCity_ContestLobby_EventScript_159039 msgbox LilycoveCity_ContestLobby_Text_188DDA, 2 end diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc index c8a3dcab9..b80b0873b 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_1F.inc @@ -3,10 +3,8 @@ LilycoveCity_CoveLilyMotel_1F_MapScripts:: @ 81582C4 LilycoveCity_CoveLilyMotel_1F_EventScript_1582C5:: @ 81582C5 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_158326 - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_CoveLilyMotel_1F_EventScript_158326 + goto_if_set FLAG_BADGE07_GET, LilycoveCity_CoveLilyMotel_1F_EventScript_1582FF msgbox LilycoveCity_CoveLilyMotel_1F_Text_186B71, 4 applymovement 1, LilycoveCity_CoveLilyMotel_1F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc index 4878cc6bc..06b982610 100644 --- a/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc +++ b/data/scripts/maps/LilycoveCity_CoveLilyMotel_2F.inc @@ -4,10 +4,8 @@ LilycoveCity_CoveLilyMotel_2F_MapScripts:: @ 81583A0 LilycoveCity_CoveLilyMotel_2F_EventScript_1583A1:: @ 81583A1 lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 - checkflag FLAG_TEMP_2 - call_if 1, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD + call_if_unset FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583C7 + call_if_set FLAG_TEMP_2, LilycoveCity_CoveLilyMotel_2F_EventScript_1583DD specialvar RESULT, CompletedHoennPokedex compare RESULT, 1 goto_if_eq LilycoveCity_CoveLilyMotel_2F_EventScript_1583D0 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc index 1198054f0..f895ea99d 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreElevator.inc @@ -4,8 +4,7 @@ LilycoveCity_DepartmentStoreElevator_MapScripts:: @ 815A39B LilycoveCity_DepartmentStoreElevator_EventScript_15A39C:: @ 815A39C lock faceplayer - checkflag FLAG_TEMP_2 - call_if 0, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF + call_if_unset FLAG_TEMP_2, LilycoveCity_DepartmentStoreElevator_EventScript_15A4CF copyvar VAR_SPECIAL_5, VAR_DEPT_STORE_FLOOR special DisplayCurrentElevatorFloor message LilycoveCity_DepartmentStoreElevator_Text_1A0EF6 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc index cd5e0d980..e2274110c 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStoreRooftop.inc @@ -5,9 +5,9 @@ LilycoveCity_DepartmentStoreRooftop_MapScripts:: @ 815A13F LilycoveCity_DepartmentStoreRooftop_MapScript1_15A145:: @ 815A145 getpricereduction 3 compare RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F compare RESULT, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A163 end LilycoveCity_DepartmentStoreRooftop_EventScript_15A15F:: @ 815A15F @@ -53,7 +53,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A1A0:: @ 815A1A0 faceplayer getpricereduction 3 compare RESULT, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A1BA msgbox LilycoveCity_DepartmentStoreRooftop_Text_18C61F, 4 release end @@ -128,22 +128,22 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A260:: @ 815A260 LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A23D compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A244 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A24B compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A37A checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 compare VAR_TEMP_1, 0 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A252 compare VAR_TEMP_1, 1 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A259 compare VAR_TEMP_1, 2 - call_if 1, LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 + call_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A260 updatemoneybox 0, 0 nop bufferitemname 0, VAR_TEMP_0 @@ -155,7 +155,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 @@ -167,7 +167,7 @@ LilycoveCity_DepartmentStoreRooftop_EventScript_15A267:: @ 815A267 msgbox LilycoveCity_DepartmentStoreRooftop_Text_1A0C8C, 4 random 64 compare RESULT, 0 - goto_if 5, LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E + goto_if_ne LilycoveCity_DepartmentStoreRooftop_EventScript_15A36E checkitemspace VAR_TEMP_0, 1 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStoreRooftop_EventScript_15A388 diff --git a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc index db2b8edf9..f6b23bc05 100644 --- a/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc +++ b/data/scripts/maps/LilycoveCity_DepartmentStore_1F.inc @@ -10,9 +10,8 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E faceplayer dodailyevents compare VAR_LOTTERY_PRIZE, 0 - goto_if 5, LilycoveCity_DepartmentStore_1F_EventScript_159EB1 - checkflag FLAG_DAILY_PICKED_LOTTO_TICKET - goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E4C + goto_if_ne LilycoveCity_DepartmentStore_1F_EventScript_159EB1 + goto_if_set FLAG_DAILY_PICKED_LOTTO_TICKET, LilycoveCity_DepartmentStore_1F_EventScript_159E4C msgbox LilycoveCity_DepartmentStore_1F_Text_1C4B5E, MSGBOX_YESNO compare RESULT, NO goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E56 @@ -37,18 +36,18 @@ LilycoveCity_DepartmentStore_1F_EventScript_159D5E:: @ 8159D5E goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E60 incrementgamestat GAME_STAT_WON_POKEMON_LOTTERY compare VAR_SPECIAL_6, 0 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E3A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E3A compare VAR_SPECIAL_6, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E43 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E43 bufferitemname 0, VAR_SPECIAL_5 compare VAR_SPECIAL_4, 1 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E78 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E78 compare VAR_SPECIAL_4, 2 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E81 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E81 compare VAR_SPECIAL_4, 3 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E8A + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E8A compare VAR_SPECIAL_4, 4 - call_if 1, LilycoveCity_DepartmentStore_1F_EventScript_159E93 + call_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E93 giveitem_std VAR_SPECIAL_5 compare RESULT, 0 goto_if_eq LilycoveCity_DepartmentStore_1F_EventScript_159E9C diff --git a/data/scripts/maps/LilycoveCity_Harbor.inc b/data/scripts/maps/LilycoveCity_Harbor.inc index 3b884c233..5dc217585 100644 --- a/data/scripts/maps/LilycoveCity_Harbor.inc +++ b/data/scripts/maps/LilycoveCity_Harbor.inc @@ -16,8 +16,7 @@ LilycoveCity_Harbor_EventScript_1598A2:: @ 81598A2 end LilycoveCity_Harbor_EventScript_1598BA:: @ 81598BA - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_Harbor_EventScript_1598CD + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598CD msgbox LilycoveCity_Harbor_Text_18B306, 4 release end @@ -81,9 +80,9 @@ LilycoveCity_Harbor_EventScript_15998A:: @ 815998A delay 30 hideobjectat LAST_TALKED, MAP_LILYCOVE_CITY_HARBOR compare FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_SPECIAL_4, 2 @@ -106,12 +105,9 @@ LilycoveCity_Harbor_EventScript_1599E4:: @ 81599E4 end LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE - checkflag FLAG_SYS_GAME_CLEAR - goto_if 0, LilycoveCity_Harbor_EventScript_1598BA - checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS - goto_if_eq LilycoveCity_Harbor_EventScript_1598BA - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, LilycoveCity_Harbor_EventScript_1598BA + goto_if_unset FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_1598BA + goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, LilycoveCity_Harbor_EventScript_1598BA + goto_if_unset FLAG_SYS_HAS_EON_TICKET, LilycoveCity_Harbor_EventScript_1598BA msgbox LilycoveCity_Harbor_Text_1C50F2, 4 closemessage applymovement LAST_TALKED, LilycoveCity_Harbor_Movement_1A0841 @@ -130,9 +126,9 @@ LilycoveCity_Harbor_EventScript_1599EE:: @ 81599EE delay 30 removeobject 4 compare FACING, 2 - call_if 1, LilycoveCity_Harbor_EventScript_1599D9 + call_if_eq LilycoveCity_Harbor_EventScript_1599D9 compare FACING, 4 - call_if 1, LilycoveCity_Harbor_EventScript_1599CE + call_if_eq LilycoveCity_Harbor_EventScript_1599CE delay 30 hideobjectat 255, MAP_PETALBURG_CITY special ScrSpecial_HealPlayerParty @@ -159,8 +155,7 @@ LilycoveCity_Harbor_Movement_159A89:: @ 8159A89 LilycoveCity_Harbor_EventScript_159A8D:: @ 8159A8D lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq LilycoveCity_Harbor_EventScript_159AA2 + goto_if_set FLAG_SYS_GAME_CLEAR, LilycoveCity_Harbor_EventScript_159AA2 msgbox LilycoveCity_Harbor_Text_18B504, 4 release end diff --git a/data/scripts/maps/LilycoveCity_House2.inc b/data/scripts/maps/LilycoveCity_House2.inc index d0065c9e8..0572c23cc 100644 --- a/data/scripts/maps/LilycoveCity_House2.inc +++ b/data/scripts/maps/LilycoveCity_House2.inc @@ -4,8 +4,7 @@ LilycoveCity_House2_MapScripts:: @ 8159BA2 LilycoveCity_House2_EventScript_159BA3:: @ 8159BA3 lock faceplayer - checkflag FLAG_RECEIVED_TM44 - goto_if_eq LilycoveCity_House2_EventScript_159BDA + goto_if_set FLAG_RECEIVED_TM44, LilycoveCity_House2_EventScript_159BDA msgbox LilycoveCity_House2_Text_18B83C, 4 giveitem_std ITEM_TM44 compare RESULT, 0 diff --git a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc index 120054e91..9cf3ecbd7 100644 --- a/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc +++ b/data/scripts/maps/LilycoveCity_LilycoveMuseum_2F.inc @@ -4,32 +4,27 @@ LilycoveCity_LilycoveMuseum_2F_MapScripts:: @ 81585AC .byte 0 LilycoveCity_LilycoveMuseum_2F_MapScript1_1585B7:: @ 81585B7 - checkflag FLAG_COOL_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585C6:: @ 81585C6 - checkflag FLAG_BEAUTY_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158615 + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158615 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585D5:: @ 81585D5 - checkflag FLAG_CUTE_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15862D + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15862D goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585E4:: @ 81585E4 - checkflag FLAG_SMART_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158645 + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158645 goto LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1585F3:: @ 81585F3 - checkflag FLAG_TOUGH_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15865D + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15865D end LilycoveCity_LilycoveMuseum_2F_EventScript_1585FD:: @ 81585FD @@ -96,8 +91,7 @@ LilycoveCity_LilycoveMuseum_2F_Movement_1586D5:: @ 81586D5 LilycoveCity_LilycoveMuseum_2F_EventScript_1586D8:: @ 81586D8 lockall - checkflag FLAG_RECEIVED_GLASS_ORNAMENT - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158793 + goto_if_set FLAG_RECEIVED_GLASS_ORNAMENT, LilycoveCity_LilycoveMuseum_2F_EventScript_158793 specialvar VAR_SPECIAL_4, sub_80C4D50 switch VAR_SPECIAL_4 case 1, LilycoveCity_LilycoveMuseum_2F_EventScript_15872C @@ -146,36 +140,31 @@ LilycoveCity_LilycoveMuseum_2F_EventScript_158793:: @ 8158793 LilycoveCity_LilycoveMuseum_2F_EventScript_15879D:: @ 815879D lockall - checkflag FLAG_CUTE_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15883C + goto_if_set FLAG_CUTE_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15883C msgbox LilycoveCity_LilycoveMuseum_2F_Text_188219, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587B0:: @ 81587B0 lockall - checkflag FLAG_TOUGH_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158858 + goto_if_set FLAG_TOUGH_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158858 msgbox LilycoveCity_LilycoveMuseum_2F_Text_18824C, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587C3:: @ 81587C3 lockall - checkflag FLAG_COOL_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_158820 + goto_if_set FLAG_COOL_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_158820 msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882B4, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587D6:: @ 81587D6 lockall - checkflag FLAG_BEAUTY_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15882E + goto_if_set FLAG_BEAUTY_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15882E msgbox LilycoveCity_LilycoveMuseum_2F_Text_188281, 3 end LilycoveCity_LilycoveMuseum_2F_EventScript_1587E9:: @ 81587E9 lockall - checkflag FLAG_SMART_PAINTING_MADE - goto_if_eq LilycoveCity_LilycoveMuseum_2F_EventScript_15884A + goto_if_set FLAG_SMART_PAINTING_MADE, LilycoveCity_LilycoveMuseum_2F_EventScript_15884A msgbox LilycoveCity_LilycoveMuseum_2F_Text_1882E6, 3 end diff --git a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc index f6eb35c98..cff88caf0 100644 --- a/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/LilycoveCity_PokemonCenter_1F.inc @@ -21,8 +21,7 @@ LilycoveCity_PokemonCenter_1F_EventScript_15933F:: @ 815933F LilycoveCity_PokemonCenter_1F_EventScript_159348:: @ 8159348 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq LilycoveCity_PokemonCenter_1F_EventScript_15935D + goto_if_set FLAG_BADGE07_GET, LilycoveCity_PokemonCenter_1F_EventScript_15935D msgbox LilycoveCity_PokemonCenter_1F_Text_18A048, 4 release end diff --git a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc index 4656f0182..85ee953ac 100644 --- a/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc +++ b/data/scripts/maps/LilycoveCity_PokemonTrainerFanClub.inc @@ -72,35 +72,35 @@ LilycoveCity_PokemonTrainerFanClub_EventScript_159429:: @ 8159429 setvar VAR_SPECIAL_4, 8 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5 setvar VAR_SPECIAL_4, 9 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594DD setvar VAR_SPECIAL_4, 10 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594E5 setvar VAR_SPECIAL_4, 11 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594ED setvar VAR_SPECIAL_4, 12 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594F5 setvar VAR_SPECIAL_4, 13 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_1594FD setvar VAR_SPECIAL_4, 14 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_159505 + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_159505 setvar VAR_SPECIAL_4, 15 specialvar RESULT, ShouldMoveLilycoveFanClubMember compare RESULT, 0 - call_if 1, LilycoveCity_PokemonTrainerFanClub_EventScript_15950D + call_if_eq LilycoveCity_PokemonTrainerFanClub_EventScript_15950D end LilycoveCity_PokemonTrainerFanClub_EventScript_1594D5:: @ 81594D5 diff --git a/data/scripts/maps/LittlerootTown.inc b/data/scripts/maps/LittlerootTown.inc index ef2145bbb..57ad9aae5 100644 --- a/data/scripts/maps/LittlerootTown.inc +++ b/data/scripts/maps/LittlerootTown.inc @@ -6,19 +6,18 @@ LittlerootTown_MapScripts:: @ 814D509 LittlerootTown_MapScript1_14D514:: @ 814D514 setflag FLAG_VISITED_LITTLEROOT_TOWN compare VAR_LITTLEROOT_INTRO_STATE, 2 - call_if 1, LittlerootTown_EventScript_14D57B - checkflag FLAG_RESCUED_BIRCH - call_if 0, LittlerootTown_EventScript_14D583 + call_if_eq LittlerootTown_EventScript_14D57B + call_if_unset FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D583 compare VAR_LITTLEROOT_STATE, 3 - call_if 1, LittlerootTown_EventScript_14D5A6 + call_if_eq LittlerootTown_EventScript_14D5A6 compare VAR_LITTLEROOT_HOUSES_STATE, 4 - call_if 1, LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_14D570 compare VAR_LITTLEROOT_HOUSES_STATE_2, 4 - call_if 1, LittlerootTown_EventScript_14D570 + call_if_eq LittlerootTown_EventScript_14D570 compare VAR_OLDALE_STATE, 1 - call_if 1, LittlerootTown_EventScript_14D567 + call_if_eq LittlerootTown_EventScript_14D567 compare VAR_LITTLEROOT_RIVAL_STATE, 3 - call_if 1, LittlerootTown_EventScript_14D563 + call_if_eq LittlerootTown_EventScript_14D563 end LittlerootTown_EventScript_14D563:: @ 814D563 @@ -56,9 +55,9 @@ LittlerootTown_EventScript_14D5A6:: @ 814D5A6 setobjectmovementtype 4, 8 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D5C5 + call_if_eq LittlerootTown_EventScript_14D5C5 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D5CD + call_if_eq LittlerootTown_EventScript_14D5CD return LittlerootTown_EventScript_14D5C5:: @ 814D5C5 @@ -187,12 +186,10 @@ LittlerootTown_EventScript_14D6D6:: @ 814D6D6 LittlerootTown_EventScript_14D6DF:: @ 814D6DF lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq LittlerootTown_EventScript_14D72F - checkflag FLAG_RESCUED_BIRCH - goto_if_eq LittlerootTown_EventScript_14D722 + goto_if_set FLAG_ADVENTURE_STARTED, LittlerootTown_EventScript_14D72F + goto_if_set FLAG_RESCUED_BIRCH, LittlerootTown_EventScript_14D722 compare VAR_LITTLEROOT_STATE, 0 - goto_if 5, LittlerootTown_EventScript_14D708 + goto_if_ne LittlerootTown_EventScript_14D708 msgbox LittlerootTown_Text_16ACEB, 4 release end @@ -335,9 +332,9 @@ LittlerootTown_EventScript_14D808:: @ 814D808 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D822 + call_if_eq LittlerootTown_EventScript_14D822 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D82B + call_if_eq LittlerootTown_EventScript_14D82B releaseall end @@ -353,9 +350,9 @@ LittlerootTown_EventScript_14D834:: @ 814D834 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D84E + call_if_eq LittlerootTown_EventScript_14D84E compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D857 + call_if_eq LittlerootTown_EventScript_14D857 releaseall end @@ -408,27 +405,27 @@ LittlerootTown_EventScript_14D8AA:: @ 814D8AA LittlerootTown_EventScript_14D8B6:: @ 814D8B6 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D93C + call_if_eq LittlerootTown_EventScript_14D93C compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D947 + call_if_eq LittlerootTown_EventScript_14D947 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_14D926 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D931 + call_if_eq LittlerootTown_EventScript_14D931 msgbox LittlerootTown_Text_16A8EE, 4 closemessage checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D952 + call_if_eq LittlerootTown_EventScript_14D952 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D995 + call_if_eq LittlerootTown_EventScript_14D995 call LittlerootTown_EventScript_14DD38 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14DAAA + call_if_eq LittlerootTown_EventScript_14DAAA compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14DAED + call_if_eq LittlerootTown_EventScript_14DAED goto LittlerootTown_EventScript_14DD2B end @@ -454,32 +451,32 @@ LittlerootTown_EventScript_14D947:: @ 814D947 LittlerootTown_EventScript_14D952:: @ 814D952 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_14D9D8 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_14D9ED compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DA02 + call_if_eq LittlerootTown_EventScript_14DA02 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DA17 + call_if_eq LittlerootTown_EventScript_14DA17 compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DA2C + call_if_eq LittlerootTown_EventScript_14DA2C compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DA41 + call_if_eq LittlerootTown_EventScript_14DA41 return LittlerootTown_EventScript_14D995:: @ 814D995 compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14D9D8 + call_if_eq LittlerootTown_EventScript_14D9D8 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14D9ED + call_if_eq LittlerootTown_EventScript_14D9ED compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DA56 + call_if_eq LittlerootTown_EventScript_14DA56 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DA6B + call_if_eq LittlerootTown_EventScript_14DA6B compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DA80 + call_if_eq LittlerootTown_EventScript_14DA80 compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DA95 + call_if_eq LittlerootTown_EventScript_14DA95 return LittlerootTown_EventScript_14D9D8:: @ 814D9D8 @@ -554,32 +551,32 @@ LittlerootTown_EventScript_14DA95:: @ 814DA95 LittlerootTown_EventScript_14DAAA:: @ 814DAAA compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_14DB30 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_14DB3B compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DB46 + call_if_eq LittlerootTown_EventScript_14DB46 compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DB6C + call_if_eq LittlerootTown_EventScript_14DB6C compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DB92 + call_if_eq LittlerootTown_EventScript_14DB92 compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DBB8 + call_if_eq LittlerootTown_EventScript_14DBB8 return LittlerootTown_EventScript_14DAED:: @ 814DAED compare VAR_SPECIAL_8, 0 - call_if 1, LittlerootTown_EventScript_14DB30 + call_if_eq LittlerootTown_EventScript_14DB30 compare VAR_SPECIAL_8, 1 - call_if 1, LittlerootTown_EventScript_14DB3B + call_if_eq LittlerootTown_EventScript_14DB3B compare VAR_SPECIAL_8, 2 - call_if 1, LittlerootTown_EventScript_14DBDE + call_if_eq LittlerootTown_EventScript_14DBDE compare VAR_SPECIAL_8, 3 - call_if 1, LittlerootTown_EventScript_14DC04 + call_if_eq LittlerootTown_EventScript_14DC04 compare VAR_SPECIAL_8, 4 - call_if 1, LittlerootTown_EventScript_14DC2A + call_if_eq LittlerootTown_EventScript_14DC2A compare VAR_SPECIAL_8, 5 - call_if 1, LittlerootTown_EventScript_14DC50 + call_if_eq LittlerootTown_EventScript_14DC50 return LittlerootTown_EventScript_14DB30:: @ 814DB30 @@ -843,9 +840,9 @@ LittlerootTown_EventScript_14DCE2:: @ 814DCE2 faceplayer checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_EventScript_14D926 + call_if_eq LittlerootTown_EventScript_14D926 compare RESULT, 1 - call_if 1, LittlerootTown_EventScript_14D931 + call_if_eq LittlerootTown_EventScript_14D931 call LittlerootTown_EventScript_14DD38 applymovement 4, LittlerootTown_Movement_1A0841 waitmovement 0 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc index 8a86cd946..1de2e91a4 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_1F.inc @@ -6,9 +6,8 @@ LittlerootTown_BrendansHouse_1F_MapScripts:: @ 815263B LittlerootTown_BrendansHouse_1F_MapScript1_15264B:: @ 815264B compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 0, LittlerootTown_BrendansHouse_1F_EventScript_152660 - checkflag FLAG_RECEIVED_RUNNING_SHOES - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_152673 + call_if_lt LittlerootTown_BrendansHouse_1F_EventScript_152660 + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_BrendansHouse_1F_EventScript_152673 end LittlerootTown_BrendansHouse_1F_EventScript_152660:: @ 8152660 @@ -28,11 +27,11 @@ LittlerootTown_BrendansHouse_1F_EventScript_152680:: @ 8152680 LittlerootTown_BrendansHouse_1F_MapScript1_15268A:: @ 815268A compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526C4 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526C4 compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526AC + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526AC compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 1, LittlerootTown_BrendansHouse_1F_EventScript_1526B8 + call_if_eq LittlerootTown_BrendansHouse_1F_EventScript_1526B8 end LittlerootTown_BrendansHouse_1F_EventScript_1526AC:: @ 81526AC diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index e0e1a1086..ed6818fa0 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -4,10 +4,9 @@ LittlerootTown_BrendansHouse_2F_MapScripts:: @ 81527A4 .byte 0 LittlerootTown_BrendansHouse_2F_MapScript1_1527AF:: @ 81527AF - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - call_if 0, LittlerootTown_BrendansHouse_2F_EventScript_1527CE + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_2F_EventScript_1527CE compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_1B6950 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_1B6950 call LittlerootTown_BrendansHouse_2F_EventScript_1A2F3D setvar VAR_0x4089, 0 end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc index 45e9e0783..8096589aa 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_1F.inc @@ -6,9 +6,8 @@ LittlerootTown_MaysHouse_1F_MapScripts:: @ 8152879 LittlerootTown_MaysHouse_1F_MapScript1_152889:: @ 8152889 compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 0, LittlerootTown_MaysHouse_1F_EventScript_15289E - checkflag FLAG_RECEIVED_RUNNING_SHOES - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528B1 + call_if_lt LittlerootTown_MaysHouse_1F_EventScript_15289E + call_if_set FLAG_RECEIVED_RUNNING_SHOES, LittlerootTown_MaysHouse_1F_EventScript_1528B1 end LittlerootTown_MaysHouse_1F_EventScript_15289E:: @ 815289E @@ -28,11 +27,11 @@ LittlerootTown_MaysHouse_1F_EventScript_1528BE:: @ 81528BE LittlerootTown_MaysHouse_1F_MapScript1_1528C8:: @ 81528C8 compare VAR_LITTLEROOT_INTRO_STATE, 3 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_152902 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_152902 compare VAR_LITTLEROOT_INTRO_STATE, 5 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528EA + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528EA compare VAR_LITTLEROOT_INTRO_STATE, 6 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1528F6 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1528F6 end LittlerootTown_MaysHouse_1F_EventScript_1528EA:: @ 81528EA @@ -118,9 +117,9 @@ LittlerootTown_MaysHouse_1F_Movement_1529C0:: @ 81529C0 lockall checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E1 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E1 compare RESULT, 1 - call_if 1, LittlerootTown_MaysHouse_1F_EventScript_1529E2 + call_if_eq LittlerootTown_MaysHouse_1F_EventScript_1529E2 releaseall end @@ -135,10 +134,8 @@ LittlerootTown_BrendansHouse_1F_EventScript_1529EB:: @ 81529EB LittlerootTown_MaysHouse_1F_EventScript_1529EB:: @ 81529EB lock faceplayer - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A21 - checkflag FLAG_RIVAL_LEFT_FOR_ROUTE103 - goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A17 + goto_if_set FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A21 + goto_if_set FLAG_RIVAL_LEFT_FOR_ROUTE103, LittlerootTown_BrendansHouse_1F_EventScript_152A17 compare VAR_LITTLEROOT_RIVAL_STATE, 3 goto_if_eq LittlerootTown_BrendansHouse_1F_EventScript_152A2B special GetRivalSonDaughterString diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 34300b13e..ede58e7a5 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -4,10 +4,9 @@ LittlerootTown_MaysHouse_2F_MapScripts:: @ 8152A50 .byte 0 LittlerootTown_MaysHouse_2F_MapScript1_152A5B:: @ 8152A5B - checkflag FLAG_DEFEATED_RIVAL_ROUTE103 - call_if 0, LittlerootTown_MaysHouse_2F_EventScript_152A7A + call_if_unset FLAG_DEFEATED_RIVAL_ROUTE103, LittlerootTown_MaysHouse_2F_EventScript_152A7A compare VAR_LITTLEROOT_INTRO_STATE, 4 - call_if 1, LittlerootTown_MaysHouse_2F_EventScript_1B6950 + call_if_eq LittlerootTown_MaysHouse_2F_EventScript_1B6950 call LittlerootTown_MaysHouse_2F_EventScript_1A2F3D setvar VAR_0x4089, 0 end @@ -30,13 +29,12 @@ LittlerootTown_MaysHouse_2F_EventScript_152A90:: @ 8152A90 LittlerootTown_BrendansHouse_2F_EventScript_152A9D:: @ 8152A9D LittlerootTown_MaysHouse_2F_EventScript_152A9D:: @ 8152A9D lockall - checkflag FLAG_MET_RIVAL_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BB5 + goto_if_set FLAG_MET_RIVAL_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BB5 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152AD4 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152AD4 compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B4A + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B4A playse SE_KAIDAN removeobject LAST_TALKED setvar VAR_LITTLEROOT_RIVAL_STATE, 3 @@ -58,11 +56,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152AD4:: @ 8152AD4 msgbox LittlerootTown_BrendansHouse_2F_Text_1733AF, 4 closemessage compare FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B29 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B29 compare FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B34 + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B34 compare FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B3F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B3F return LittlerootTown_BrendansHouse_2F_EventScript_152B29:: @ 8152B29 @@ -92,11 +90,11 @@ LittlerootTown_BrendansHouse_2F_EventScript_152B4A:: @ 8152B4A msgbox LittlerootTown_BrendansHouse_2F_Text_1735FC, 4 closemessage compare FACING, 4 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 2 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152B9F + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152B9F compare FACING, 3 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BAA + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BAA return LittlerootTown_BrendansHouse_2F_EventScript_152B9F:: @ 8152B9F @@ -114,22 +112,20 @@ LittlerootTown_BrendansHouse_2F_EventScript_152BB5:: @ 8152BB5 waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BDB + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BDB compare RESULT, 1 - call_if 1, LittlerootTown_BrendansHouse_2F_EventScript_152BED + call_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BED setflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE releaseall end LittlerootTown_BrendansHouse_2F_EventScript_152BDB:: @ 8152BDB - checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152BFF + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152BFF msgbox LittlerootTown_BrendansHouse_2F_Text_1737AE, 4 return LittlerootTown_BrendansHouse_2F_EventScript_152BED:: @ 8152BED - checkflag FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE - goto_if_eq LittlerootTown_BrendansHouse_2F_EventScript_152C08 + goto_if_set FLAG_MET_RIVAL_IN_HOUSE_AFTER_LILYCOVE, LittlerootTown_BrendansHouse_2F_EventScript_152C08 msgbox LittlerootTown_BrendansHouse_2F_Text_1738F2, 4 return diff --git a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc index 10e4712bb..7608ba65d 100644 --- a/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc +++ b/data/scripts/maps/LittlerootTown_ProfessorBirchsLab.inc @@ -86,9 +86,8 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D63:: @ 8152D63 lock faceplayer compare VAR_BIRCH_LAB_STATE, 3 - goto_if 4, LittlerootTown_ProfessorBirchsLab_EventScript_152D90 - checkflag FLAG_BIRCH_AIDE_MET - goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152D86 + goto_if_ge LittlerootTown_ProfessorBirchsLab_EventScript_152D90 + goto_if_set FLAG_BIRCH_AIDE_MET, LittlerootTown_ProfessorBirchsLab_EventScript_152D86 msgbox LittlerootTown_ProfessorBirchsLab_Text_173B29, 4 setflag FLAG_BIRCH_AIDE_MET release @@ -107,8 +106,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152D90:: @ 8152D90 LittlerootTown_ProfessorBirchsLab_EventScript_152D9A:: @ 8152D9A lock faceplayer - checkflag FLAG_UNKNOWN_BIRCH_380 - goto_if 0, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F + goto_if_unset FLAG_UNKNOWN_BIRCH_380, LittlerootTown_ProfessorBirchsLab_EventScript_1A037F compare VAR_BIRCH_LAB_STATE, 5 goto_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E7B msgbox LittlerootTown_ProfessorBirchsLab_Text_1740B4, 4 @@ -125,9 +123,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152DBA:: @ 8152DBA waitmovement 0 checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E13 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E13 compare RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E40 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E40 setvar VAR_BIRCH_LAB_STATE, 5 setflag FLAG_ADVENTURE_STARTED setvar VAR_ROUTE102_ACCESSIBLE, 1 @@ -140,7 +138,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E13:: @ 8152E13 msgbox LittlerootTown_ProfessorBirchsLab_Text_1743D4, 4 giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E85 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E85 msgbox LittlerootTown_ProfessorBirchsLab_Text_17443D, 4 setvar RESULT, 0 return @@ -149,7 +147,7 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152E40:: @ 8152E40 msgbox LittlerootTown_ProfessorBirchsLab_Text_17453C, 4 giveitem_std ITEM_POKE_BALL, 5 compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152E8E + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152E8E msgbox LittlerootTown_ProfessorBirchsLab_Text_17458C, 4 setvar RESULT, 1 return @@ -189,9 +187,9 @@ LittlerootTown_ProfessorBirchsLab_EventScript_152EA3:: @ 8152EA3 faceplayer checkplayergender compare RESULT, 0 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EBE + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EBE compare RESULT, 1 - call_if 1, LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 + call_if_eq LittlerootTown_ProfessorBirchsLab_EventScript_152EC7 release end diff --git a/data/scripts/maps/MagmaHideout_B1F.inc b/data/scripts/maps/MagmaHideout_B1F.inc index 6dbdc0461..a55d260ab 100644 --- a/data/scripts/maps/MagmaHideout_B1F.inc +++ b/data/scripts/maps/MagmaHideout_B1F.inc @@ -3,8 +3,7 @@ MagmaHideout_B1F_MapScripts:: @ 815F2A8 .byte 0 MagmaHideout_B1F_MapScript1_15F2AE:: @ 815F2AE - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, MagmaHideout_B1F_EventScript_15F2B8 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, MagmaHideout_B1F_EventScript_15F2B8 end MagmaHideout_B1F_EventScript_15F2B8:: @ 815F2B8 diff --git a/data/scripts/maps/MauvilleCity.inc b/data/scripts/maps/MauvilleCity.inc index 652a25f6f..03974ddae 100644 --- a/data/scripts/maps/MauvilleCity.inc +++ b/data/scripts/maps/MauvilleCity.inc @@ -8,8 +8,7 @@ MauvilleCity_MapScript1_14C038:: @ 814C038 setflag FLAG_SYS_TV_START clearflag FLAG_MAUVILLE_GYM_BARRIERS_STATE setvar VAR_MAUVILLE_GYM_STATE, 0 - checkflag FLAG_RECEIVED_TM24 - call_if 1, MauvilleCity_EventScript_14C053 + call_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C053 end MauvilleCity_EventScript_14C053:: @ 814C053 @@ -52,8 +51,7 @@ MauvilleCity_EventScript_14C099:: @ 814C099 MauvilleCity_EventScript_14C0A2:: @ 814C0A2 lock faceplayer - checkflag FLAG_TV_EXPLAINED - goto_if_eq MauvilleCity_EventScript_14C0BA + goto_if_set FLAG_TV_EXPLAINED, MauvilleCity_EventScript_14C0BA msgbox MauvilleCity_Text_16674A, 4 setflag FLAG_TV_EXPLAINED release @@ -67,8 +65,7 @@ MauvilleCity_EventScript_14C0BA:: @ 814C0BA MauvilleCity_EventScript_14C0C4:: @ 814C0C4 lock faceplayer - checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - goto_if_eq MauvilleCity_EventScript_14C0E4 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C0E4 msgbox MauvilleCity_Text_165B76, 4 closemessage applymovement 7, MauvilleCity_Movement_1A083D @@ -86,8 +83,7 @@ MauvilleCity_EventScript_14C0E4:: @ 814C0E4 MauvilleCity_EventScript_14C0F9:: @ 814C0F9 lockall - checkflag FLAG_DECLINED_WALLY_BATTLE_MAUVILLE - goto_if_eq MauvilleCity_EventScript_14C292 + goto_if_set FLAG_DECLINED_WALLY_BATTLE_MAUVILLE, MauvilleCity_EventScript_14C292 applymovement 6, MauvilleCity_Movement_1A0843 waitmovement 0 msgbox MauvilleCity_Text_165BE3, 4 @@ -106,7 +102,7 @@ MauvilleCity_EventScript_14C0F9:: @ 814C0F9 MauvilleCity_EventScript_14C154:: @ 814C154 compare RESULT, YES - call_if 1, MauvilleCity_EventScript_14C23C + call_if_eq MauvilleCity_EventScript_14C23C compare RESULT, NO goto_if_eq MauvilleCity_EventScript_14C285 closemessage @@ -284,12 +280,10 @@ MauvilleCity_Movement_14C2E8:: @ 814C2E8 MauvilleCity_EventScript_14C2F2:: @ 814C2F2 lock faceplayer - checkflag FLAG_RECEIVED_TM24 - goto_if_eq MauvilleCity_EventScript_14C368 + goto_if_set FLAG_RECEIVED_TM24, MauvilleCity_EventScript_14C368 compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_EventScript_14C33C - checkflag FLAG_RECEIVED_BASEMENT_KEY - goto_if_eq MauvilleCity_EventScript_14C332 + goto_if_set FLAG_RECEIVED_BASEMENT_KEY, MauvilleCity_EventScript_14C332 msgbox MauvilleCity_Text_1661C1, 4 giveitem_std ITEM_BASEMENT_KEY setflag FLAG_RECEIVED_BASEMENT_KEY diff --git a/data/scripts/maps/MauvilleCity_BikeShop.inc b/data/scripts/maps/MauvilleCity_BikeShop.inc index 6bd7f0f4f..08f11d641 100644 --- a/data/scripts/maps/MauvilleCity_BikeShop.inc +++ b/data/scripts/maps/MauvilleCity_BikeShop.inc @@ -4,10 +4,8 @@ MauvilleCity_BikeShop_MapScripts:: @ 8156795 MauvilleCity_BikeShop_EventScript_156796:: @ 8156796 lock faceplayer - checkflag FLAG_RECEIVED_BIKE - goto_if_eq MauvilleCity_BikeShop_EventScript_15686E - checkflag FLAG_DECLINED_BIKE - goto_if_eq MauvilleCity_BikeShop_EventScript_1567D1 + goto_if_set FLAG_RECEIVED_BIKE, MauvilleCity_BikeShop_EventScript_15686E + goto_if_set FLAG_DECLINED_BIKE, MauvilleCity_BikeShop_EventScript_1567D1 msgbox MauvilleCity_BikeShop_Text_180F9F, 4 msgbox MauvilleCity_BikeShop_Text_181016, MSGBOX_YESNO compare RESULT, YES diff --git a/data/scripts/maps/MauvilleCity_GameCorner.inc b/data/scripts/maps/MauvilleCity_GameCorner.inc index e938a1b4c..2b784aeb9 100644 --- a/data/scripts/maps/MauvilleCity_GameCorner.inc +++ b/data/scripts/maps/MauvilleCity_GameCorner.inc @@ -34,7 +34,7 @@ MauvilleCity_GameCorner_EventScript_156A60:: @ 8156A60 MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9950 - goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x3e8, 0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C @@ -53,7 +53,7 @@ MauvilleCity_GameCorner_EventScript_156AAE:: @ 8156AAE MauvilleCity_GameCorner_EventScript_156AF0:: @ 8156AF0 checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 9500 - goto_if 4, MauvilleCity_GameCorner_EventScript_156B5C + goto_if_ge MauvilleCity_GameCorner_EventScript_156B5C checkmoney 0x2710, 0 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156B3C @@ -155,7 +155,7 @@ MauvilleCity_GameCorner_EventScript_156C0C:: @ 8156C0C MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TREECKO_DOLL checkdecorspace DECOR_TREECKO_DOLL compare RESULT, 0 @@ -171,7 +171,7 @@ MauvilleCity_GameCorner_EventScript_156C46:: @ 8156C46 MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_TORCHIC_DOLL checkdecorspace DECOR_TORCHIC_DOLL compare RESULT, 0 @@ -187,7 +187,7 @@ MauvilleCity_GameCorner_EventScript_156C80:: @ 8156C80 MauvilleCity_GameCorner_EventScript_156CBA:: @ 8156CBA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156CF4 + goto_if_lt MauvilleCity_GameCorner_EventScript_156CF4 bufferdecorationname 1, DECOR_MUDKIP_DOLL checkdecorspace DECOR_MUDKIP_DOLL compare RESULT, 0 @@ -290,7 +290,7 @@ MauvilleCity_GameCorner_EventScript_156DEC:: @ 8156DEC MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 1500 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM32, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -305,7 +305,7 @@ MauvilleCity_GameCorner_EventScript_156E3C:: @ 8156E3C MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 3500 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM29, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -320,7 +320,7 @@ MauvilleCity_GameCorner_EventScript_156E76:: @ 8156E76 MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM35, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -335,7 +335,7 @@ MauvilleCity_GameCorner_EventScript_156EB0:: @ 8156EB0 MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM24, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -350,7 +350,7 @@ MauvilleCity_GameCorner_EventScript_156EEA:: @ 8156EEA MauvilleCity_GameCorner_EventScript_156F24:: @ 8156F24 checkcoins VAR_TEMP_2 compare VAR_TEMP_2, 4000 - goto_if 0, MauvilleCity_GameCorner_EventScript_156F5E + goto_if_lt MauvilleCity_GameCorner_EventScript_156F5E checkitemspace ITEM_TM13, 1 compare RESULT, 0 goto_if_eq MauvilleCity_GameCorner_EventScript_156F6C @@ -389,8 +389,7 @@ MauvilleCity_GameCorner_EventScript_156F8D:: @ 8156F8D MauvilleCity_GameCorner_EventScript_156F96:: @ 8156F96 lock faceplayer - checkflag FLAG_RECEIVED_STARTER_DOLL - goto_if_eq MauvilleCity_GameCorner_EventScript_157072 + goto_if_set FLAG_RECEIVED_STARTER_DOLL, MauvilleCity_GameCorner_EventScript_157072 msgbox MauvilleCity_GameCorner_Text_181F3D, MSGBOX_YESNO compare RESULT, NO goto_if_eq MauvilleCity_GameCorner_EventScript_157068 @@ -460,11 +459,10 @@ MauvilleCity_GameCorner_EventScript_15707C:: @ 815707C end MauvilleCity_GameCorner_EventScript_15709C:: @ 815709C - checkflag FLAG_RECEIVED_20_COINS - goto_if_eq MauvilleCity_GameCorner_EventScript_1570CA + goto_if_set FLAG_RECEIVED_20_COINS, MauvilleCity_GameCorner_EventScript_1570CA checkcoins VAR_TEMP_1 compare VAR_TEMP_1, 1 - goto_if 4, MauvilleCity_GameCorner_EventScript_1570CA + goto_if_ge MauvilleCity_GameCorner_EventScript_1570CA setflag FLAG_RECEIVED_20_COINS givecoins 20 msgbox MauvilleCity_GameCorner_Text_18208E, 4 diff --git a/data/scripts/maps/MauvilleCity_Gym.inc b/data/scripts/maps/MauvilleCity_Gym.inc index fd9c673dc..1dc7fc0c7 100644 --- a/data/scripts/maps/MauvilleCity_Gym.inc +++ b/data/scripts/maps/MauvilleCity_Gym.inc @@ -3,8 +3,7 @@ MauvilleCity_Gym_MapScripts:: @ 8156450 .byte 0 MauvilleCity_Gym_MapScript1_156456:: @ 8156456 - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1565A7 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1565A7 switch VAR_MAUVILLE_GYM_STATE case 0, MauvilleCity_Gym_EventScript_156491 case 1, MauvilleCity_Gym_EventScript_15657D @@ -13,8 +12,7 @@ MauvilleCity_Gym_MapScript1_156456:: @ 8156456 end MauvilleCity_Gym_EventScript_156491:: @ 8156491 - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if_eq MauvilleCity_Gym_EventScript_15649B + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_15649B end MauvilleCity_Gym_EventScript_15649B:: @ 815649B @@ -69,8 +67,7 @@ MauvilleCity_Gym_EventScript_1565A7:: @ 81565A7 MauvilleCity_Gym_EventScript_1565AB:: @ 81565AB trainerbattle 1, OPPONENT_WATTSON, 0, MauvilleCity_Gym_Text_180C32, MauvilleCity_Gym_Text_180D64, MauvilleCity_Gym_EventScript_1565DB - checkflag FLAG_RECEIVED_TM34 - goto_if 0, MauvilleCity_Gym_EventScript_15661D + goto_if_unset FLAG_RECEIVED_TM34, MauvilleCity_Gym_EventScript_15661D compare VAR_NEW_MAUVILLE_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_156641 msgbox MauvilleCity_Gym_Text_180EDB, 4 @@ -86,7 +83,7 @@ MauvilleCity_Gym_EventScript_1565DB:: @ 81565DB setflag FLAG_BADGE03_GET addvar VAR_PETALBURG_GYM_STATE, 1 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, MauvilleCity_Gym_EventScript_1A00FB + call_if_eq MauvilleCity_Gym_EventScript_1A00FB setvar VAR_SPECIAL_8, 3 call MauvilleCity_Gym_EventScript_1A01C0 special MauvilleGymSpecial3 @@ -111,8 +108,7 @@ MauvilleCity_Gym_EventScript_156641:: @ 8156641 MauvilleCity_Gym_EventScript_15664B:: @ 815664B lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 1 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 1 @@ -122,8 +118,7 @@ MauvilleCity_Gym_EventScript_15664B:: @ 815664B MauvilleCity_Gym_EventScript_156670:: @ 8156670 lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 2 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 2 @@ -133,8 +128,7 @@ MauvilleCity_Gym_EventScript_156670:: @ 8156670 MauvilleCity_Gym_EventScript_156695:: @ 8156695 lockall - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_1566DA + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_1566DA compare VAR_MAUVILLE_GYM_STATE, 3 goto_if_eq MauvilleCity_Gym_EventScript_1566DA setvar VAR_MAUVILLE_GYM_STATE, 3 @@ -147,10 +141,8 @@ MauvilleCity_Gym_EventScript_1566BA:: @ 81566BA special MauvilleGymSpecial1 special DrawWholeMapView playse SE_KI_GASYAN - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if_eq MauvilleCity_Gym_EventScript_1566E1 - checkflag FLAG_MAUVILLE_GYM_BARRIERS_STATE - goto_if 0, MauvilleCity_Gym_EventScript_1566DC + goto_if_set FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566E1 + goto_if_unset FLAG_MAUVILLE_GYM_BARRIERS_STATE, MauvilleCity_Gym_EventScript_1566DC releaseall end @@ -191,8 +183,7 @@ MauvilleCity_Gym_EventScript_15672B:: @ 815672B MauvilleCity_Gym_EventScript_156742:: @ 8156742 lock faceplayer - checkflag FLAG_DEFEATED_MAUVILLE_GYM - goto_if_eq MauvilleCity_Gym_EventScript_156757 + goto_if_set FLAG_DEFEATED_MAUVILLE_GYM, MauvilleCity_Gym_EventScript_156757 msgbox MauvilleCity_Gym_Text_180815, 4 release end @@ -204,15 +195,13 @@ MauvilleCity_Gym_EventScript_156757:: @ 8156757 MauvilleCity_Gym_EventScript_156761:: @ 8156761 lockall - checkflag FLAG_BADGE03_GET - goto_if_eq MauvilleCity_Gym_EventScript_156781 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end MauvilleCity_Gym_EventScript_156771:: @ 8156771 lockall - checkflag FLAG_BADGE03_GET - goto_if_eq MauvilleCity_Gym_EventScript_156781 + goto_if_set FLAG_BADGE03_GET, MauvilleCity_Gym_EventScript_156781 goto MauvilleCity_Gym_EventScript_15678B end diff --git a/data/scripts/maps/MauvilleCity_House1.inc b/data/scripts/maps/MauvilleCity_House1.inc index 210288517..eb21a49e9 100644 --- a/data/scripts/maps/MauvilleCity_House1.inc +++ b/data/scripts/maps/MauvilleCity_House1.inc @@ -4,8 +4,7 @@ MauvilleCity_House1_MapScripts:: @ 81569FC MauvilleCity_House1_EventScript_1569FD:: @ 81569FD lock faceplayer - checkflag FLAG_RECEIVED_HM06 - goto_if_eq MauvilleCity_House1_EventScript_156A29 + goto_if_set FLAG_RECEIVED_HM06, MauvilleCity_House1_EventScript_156A29 msgbox MauvilleCity_House1_Text_181B1A, 4 giveitem_std ITEM_HM06 setflag FLAG_RECEIVED_HM06 diff --git a/data/scripts/maps/MauvilleCity_House2.inc b/data/scripts/maps/MauvilleCity_House2.inc index 9d3bce68a..f18d278b5 100644 --- a/data/scripts/maps/MauvilleCity_House2.inc +++ b/data/scripts/maps/MauvilleCity_House2.inc @@ -4,8 +4,7 @@ MauvilleCity_House2_MapScripts:: @ 81572BF MauvilleCity_House2_EventScript_1572C0:: @ 81572C0 lock faceplayer - checkflag FLAG_RECEIVED_COIN_CASE - goto_if_eq MauvilleCity_House2_EventScript_15733D + goto_if_set FLAG_RECEIVED_COIN_CASE, MauvilleCity_House2_EventScript_15733D msgbox MauvilleCity_House2_Text_18244E, 4 checkitem ITEM_HARBOR_MAIL, 1 compare RESULT, 1 diff --git a/data/scripts/maps/MeteorFalls_1F_1R.inc b/data/scripts/maps/MeteorFalls_1F_1R.inc index bf51408b8..272d7ed6e 100644 --- a/data/scripts/maps/MeteorFalls_1F_1R.inc +++ b/data/scripts/maps/MeteorFalls_1F_1R.inc @@ -215,8 +215,7 @@ MeteorFalls_1F_1R_Movement_15C64F:: @ 815C64F MeteorFalls_1F_1R_EventScript_15C656:: @ 815C656 lock faceplayer - checkflag FLAG_MET_PROF_COSMO - goto_if_eq MeteorFalls_1F_1R_EventScript_15C66E + goto_if_set FLAG_MET_PROF_COSMO, MeteorFalls_1F_1R_EventScript_15C66E setflag FLAG_MET_PROF_COSMO msgbox MeteorFalls_1F_1R_Text_1937EB, 4 release diff --git a/data/scripts/maps/MossdeepCity.inc b/data/scripts/maps/MossdeepCity.inc index 3d1baf143..7ec338927 100644 --- a/data/scripts/maps/MossdeepCity.inc +++ b/data/scripts/maps/MossdeepCity.inc @@ -7,8 +7,7 @@ MossdeepCity_MapScript1_14CF98:: @ 814CF98 clearflag FLAG_MOSSDEEP_GYM_SWITCH_2 clearflag FLAG_MOSSDEEP_GYM_SWITCH_3 clearflag FLAG_MOSSDEEP_GYM_SWITCH_4 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, MossdeepCity_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, MossdeepCity_EventScript_1A02C1 end MossdeepCity_EventScript_14CFAE:: @ 814CFAE @@ -68,8 +67,7 @@ MossdeepCity_EventScript_14D011:: @ 814D011 MossdeepCity_EventScript_14D027:: @ 814D027 lock faceplayer - checkflag FLAG_RECEIVED_KINGS_ROCK - goto_if_eq MossdeepCity_EventScript_14D069 + goto_if_set FLAG_RECEIVED_KINGS_ROCK, MossdeepCity_EventScript_14D069 msgbox MossdeepCity_Text_1690A9, MSGBOX_YESNO compare RESULT, NO goto_if_eq MossdeepCity_EventScript_14D073 diff --git a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc index eac7f4adb..364778613 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_1F.inc @@ -7,7 +7,7 @@ MossdeepCity_GameCorner_1F_MapScripts:: @ 815AC52 MossdeepCity_GameCorner_1F_MapScript1_15AC62:: @ 815AC62 special ValidateEReaderTrainer compare RESULT, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC71 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC71 end MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 @@ -18,9 +18,9 @@ MossdeepCity_GameCorner_1F_EventScript_15AC71:: @ 815AC71 MossdeepCity_GameCorner_1F_MapScript1_15AC84:: @ 815AC84 special ValidateEReaderTrainer compare RESULT, 0 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AC9E + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AC9E compare VAR_GAME_CORNER_STATE, 0 - call_if 5, MossdeepCity_GameCorner_1F_EventScript_15ACAF + call_if_ne MossdeepCity_GameCorner_1F_EventScript_15ACAF end MossdeepCity_GameCorner_1F_EventScript_15AC9E:: @ 815AC9E @@ -50,11 +50,11 @@ MossdeepCity_GameCorner_1F_EventScript_15ACD5:: @ 815ACD5 applymovement 255, MossdeepCity_GameCorner_1F_Movement_1A0841 waitmovement 0 compare VAR_GAME_CORNER_STATE, 1 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD22 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD22 compare VAR_GAME_CORNER_STATE, 2 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD2B + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD2B compare VAR_GAME_CORNER_STATE, 3 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AD34 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AD34 special LoadPlayerParty setvar VAR_GAME_CORNER_STATE, 0 releaseall @@ -101,7 +101,7 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 goto_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 msgbox MossdeepCity_GameCorner_1F_Text_18E741, MSGBOX_YESNO compare RESULT, NO - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15ADE8 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15ADE8 special LoadPlayerParty call S_DoSaveDialog compare RESULT, 0 @@ -112,11 +112,11 @@ MossdeepCity_GameCorner_1F_EventScript_15AD59:: @ 815AD59 msgbox MossdeepCity_GameCorner_1F_Text_18E777, 4 closemessage compare FACING, 2 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE04 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE04 compare FACING, 4 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE16 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE16 compare FACING, 3 - call_if 1, MossdeepCity_GameCorner_1F_EventScript_15AE28 + call_if_eq MossdeepCity_GameCorner_1F_EventScript_15AE28 warp MAP_MOSSDEEP_CITY_GAME_CORNER_B1F, 255, 3, 1 waitstate release diff --git a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc index 9f20b6310..f62693756 100644 --- a/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc +++ b/data/scripts/maps/MossdeepCity_GameCorner_B1F.inc @@ -23,11 +23,11 @@ MossdeepCity_GameCorner_B1F_EventScript_15AE6E:: @ 815AE6E special StartSpecialBattle waitstate compare RESULT, 3 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AED5 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AED5 compare RESULT, 1 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEE3 + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEE3 compare RESULT, 2 - call_if 1, MossdeepCity_GameCorner_B1F_EventScript_15AEEE + call_if_eq MossdeepCity_GameCorner_B1F_EventScript_15AEEE closemessage special ScrSpecial_HealPlayerParty applymovement 255, MossdeepCity_GameCorner_B1F_Movement_15AEFF diff --git a/data/scripts/maps/MossdeepCity_Gym.inc b/data/scripts/maps/MossdeepCity_Gym.inc index bc22ce3fe..341962431 100644 --- a/data/scripts/maps/MossdeepCity_Gym.inc +++ b/data/scripts/maps/MossdeepCity_Gym.inc @@ -3,26 +3,22 @@ MossdeepCity_Gym_MapScripts:: @ 815A4D3 .byte 0 MossdeepCity_Gym_MapScript1_15A4D9:: @ 815A4D9 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 - goto_if_eq MossdeepCity_Gym_EventScript_15A510 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A510 goto MossdeepCity_Gym_EventScript_15A4E8 end MossdeepCity_Gym_EventScript_15A4E8:: @ 815A4E8 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 - goto_if_eq MossdeepCity_Gym_EventScript_15A528 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A528 goto MossdeepCity_Gym_EventScript_15A4F7 end MossdeepCity_Gym_EventScript_15A4F7:: @ 815A4F7 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 - goto_if_eq MossdeepCity_Gym_EventScript_15A540 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A540 goto MossdeepCity_Gym_EventScript_15A506 end MossdeepCity_Gym_EventScript_15A506:: @ 815A506 - checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 - goto_if_eq MossdeepCity_Gym_EventScript_15A558 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A558 end MossdeepCity_Gym_EventScript_15A510:: @ 815A510 @@ -50,8 +46,7 @@ MossdeepCity_Gym_EventScript_15A558:: @ 815A558 MossdeepCity_Gym_EventScript_15A56B:: @ 815A56B trainerbattle 8, OPPONENT_TATE_AND_LIZA, 0, MossdeepCity_Gym_Text_18CF02, MossdeepCity_Gym_Text_18D077, MossdeepCity_Gym_Text_18D324, MossdeepCity_Gym_EventScript_15A594 - checkflag FLAG_RECEIVED_TM04 - goto_if 0, MossdeepCity_Gym_EventScript_15A5C6 + goto_if_unset FLAG_RECEIVED_TM04, MossdeepCity_Gym_EventScript_15A5C6 msgbox MossdeepCity_Gym_Text_18D273, 4 release end @@ -82,8 +77,7 @@ MossdeepCity_Gym_EventScript_15A5C6:: @ 815A5C6 MossdeepCity_Gym_EventScript_15A5EA:: @ 815A5EA lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_1 - goto_if_eq MossdeepCity_Gym_EventScript_15A621 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_1, MossdeepCity_Gym_EventScript_15A621 setflag FLAG_MOSSDEEP_GYM_SWITCH_1 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -109,8 +103,7 @@ MossdeepCity_Gym_EventScript_15A621:: @ 815A621 MossdeepCity_Gym_EventScript_15A646:: @ 815A646 lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_2 - goto_if_eq MossdeepCity_Gym_EventScript_15A675 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_2, MossdeepCity_Gym_EventScript_15A675 setflag FLAG_MOSSDEEP_GYM_SWITCH_2 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -130,8 +123,7 @@ MossdeepCity_Gym_EventScript_15A675:: @ 815A675 MossdeepCity_Gym_EventScript_15A69A:: @ 815A69A lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_3 - goto_if_eq MossdeepCity_Gym_EventScript_15A6C9 + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_3, MossdeepCity_Gym_EventScript_15A6C9 setflag FLAG_MOSSDEEP_GYM_SWITCH_3 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -151,8 +143,7 @@ MossdeepCity_Gym_EventScript_15A6C9:: @ 815A6C9 MossdeepCity_Gym_EventScript_15A6EE:: @ 815A6EE lockall - checkflag FLAG_MOSSDEEP_GYM_SWITCH_4 - goto_if_eq MossdeepCity_Gym_EventScript_15A71D + goto_if_set FLAG_MOSSDEEP_GYM_SWITCH_4, MossdeepCity_Gym_EventScript_15A71D setflag FLAG_MOSSDEEP_GYM_SWITCH_4 applymovement 255, MossdeepCity_Gym_Movement_15A7F7 waitmovement 0 @@ -210,8 +201,7 @@ MossdeepCity_Gym_EventScript_15A7C1:: @ 815A7C1 MossdeepCity_Gym_EventScript_15A7D8:: @ 815A7D8 lock faceplayer - checkflag FLAG_DEFEATED_MOSSDEEP_GYM - goto_if_eq MossdeepCity_Gym_EventScript_15A7ED + goto_if_set FLAG_DEFEATED_MOSSDEEP_GYM, MossdeepCity_Gym_EventScript_15A7ED msgbox MossdeepCity_Gym_Text_18C7E3, 4 release end @@ -228,15 +218,13 @@ MossdeepCity_Gym_Movement_15A7F7:: @ 815A7F7 MossdeepCity_Gym_EventScript_15A7FA:: @ 815A7FA lockall - checkflag FLAG_BADGE07_GET - goto_if_eq MossdeepCity_Gym_EventScript_15A81A + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end MossdeepCity_Gym_EventScript_15A80A:: @ 815A80A lockall - checkflag FLAG_BADGE07_GET - goto_if_eq MossdeepCity_Gym_EventScript_15A81A + goto_if_set FLAG_BADGE07_GET, MossdeepCity_Gym_EventScript_15A81A goto MossdeepCity_Gym_EventScript_15A824 end diff --git a/data/scripts/maps/MossdeepCity_House2.inc b/data/scripts/maps/MossdeepCity_House2.inc index 1da204ff0..415dbfc33 100644 --- a/data/scripts/maps/MossdeepCity_House2.inc +++ b/data/scripts/maps/MossdeepCity_House2.inc @@ -20,9 +20,9 @@ MossdeepCity_House2_EventScript_15A87B:: @ 815A87B setflag FLAG_WINGULL_DELIVERED_MAIL clearflag FLAG_HIDE_WINGULL_FORTREE_HOUSE compare FACING, 2 - call_if 1, MossdeepCity_House2_EventScript_15A8AE + call_if_eq MossdeepCity_House2_EventScript_15A8AE compare FACING, 3 - call_if 1, MossdeepCity_House2_EventScript_15A8B9 + call_if_eq MossdeepCity_House2_EventScript_15A8B9 removeobject 3 release end diff --git a/data/scripts/maps/MossdeepCity_House3.inc b/data/scripts/maps/MossdeepCity_House3.inc index fb44685d8..4c4d6cbdd 100644 --- a/data/scripts/maps/MossdeepCity_House3.inc +++ b/data/scripts/maps/MossdeepCity_House3.inc @@ -4,8 +4,7 @@ MossdeepCity_House3_MapScripts:: @ 815A971 MossdeepCity_House3_EventScript_15A972:: @ 815A972 lock faceplayer - checkflag FLAG_RECEIVED_SUPER_ROD - goto_if_eq MossdeepCity_House3_EventScript_15A9B1 + goto_if_set FLAG_RECEIVED_SUPER_ROD, MossdeepCity_House3_EventScript_15A9B1 msgbox MossdeepCity_House3_Text_18D909, MSGBOX_YESNO compare RESULT, NO goto_if_eq MossdeepCity_House3_EventScript_15A9BB diff --git a/data/scripts/maps/MossdeepCity_House4.inc b/data/scripts/maps/MossdeepCity_House4.inc index 856ee1287..5fb0f97ff 100644 --- a/data/scripts/maps/MossdeepCity_House4.inc +++ b/data/scripts/maps/MossdeepCity_House4.inc @@ -4,8 +4,7 @@ MossdeepCity_House4_MapScripts:: @ 815AB30 MossdeepCity_House4_EventScript_15AB31:: @ 815AB31 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq MossdeepCity_House4_EventScript_15AB46 + goto_if_set FLAG_SYS_GAME_CLEAR, MossdeepCity_House4_EventScript_15AB46 msgbox MossdeepCity_House4_Text_18E0E3, 4 release end diff --git a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc index 884124567..83b859c26 100644 --- a/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc +++ b/data/scripts/maps/MossdeepCity_SpaceCenter_1F.inc @@ -8,9 +8,9 @@ MossdeepCity_SpaceCenter_1F_EventScript_15AB8B:: @ 815AB8B specialvar RESULT, GetWeekCount buffernumberstring 0, RESULT compare RESULT, 0 - call_if 1, MossdeepCity_SpaceCenter_1F_EventScript_15ABBA + call_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15ABBA compare RESULT, 1 - call_if 4, MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 + call_if_ge MossdeepCity_SpaceCenter_1F_EventScript_15ABC3 closemessage applymovement LAST_TALKED, MossdeepCity_SpaceCenter_1F_Movement_1A083D waitmovement 0 @@ -32,8 +32,7 @@ MossdeepCity_SpaceCenter_1F_EventScript_15ABCC:: @ 815ABCC MossdeepCity_SpaceCenter_1F_EventScript_15ABD5:: @ 815ABD5 lock faceplayer - checkflag FLAG_RECEIVED_SUN_STONE_MOSSDEEP - goto_if_eq MossdeepCity_SpaceCenter_1F_EventScript_15AC0C + goto_if_set FLAG_RECEIVED_SUN_STONE_MOSSDEEP, MossdeepCity_SpaceCenter_1F_EventScript_15AC0C msgbox MossdeepCity_SpaceCenter_1F_Text_18E335, 4 giveitem_std ITEM_SUN_STONE compare RESULT, 0 diff --git a/data/scripts/maps/MossdeepCity_StevensHouse.inc b/data/scripts/maps/MossdeepCity_StevensHouse.inc index ce2f2aad5..d9ad70f70 100644 --- a/data/scripts/maps/MossdeepCity_StevensHouse.inc +++ b/data/scripts/maps/MossdeepCity_StevensHouse.inc @@ -5,8 +5,7 @@ MossdeepCity_StevensHouse_MapScripts:: @ 815A9C5 .byte 0 MossdeepCity_StevensHouse_MapScript1_15A9D5:: @ 815A9D5 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, MossdeepCity_StevensHouse_EventScript_15A9DF + call_if_unset FLAG_SYS_GAME_CLEAR, MossdeepCity_StevensHouse_EventScript_15A9DF end MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF @@ -15,7 +14,7 @@ MossdeepCity_StevensHouse_EventScript_15A9DF:: @ 815A9DF MossdeepCity_StevensHouse_MapScript1_15A9E9:: @ 815A9E9 compare VAR_STEVENS_HOUSE_STATE, 1 - call_if 1, MossdeepCity_StevensHouse_EventScript_15A9F5 + call_if_eq MossdeepCity_StevensHouse_EventScript_15A9F5 end MossdeepCity_StevensHouse_EventScript_15A9F5:: @ 815A9F5 @@ -87,7 +86,7 @@ MossdeepCity_StevensHouse_EventScript_15AA7C:: @ 815AA7C bufferspeciesname 1, SPECIES_BELDUM msgbox MossdeepCity_StevensHouse_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, MossdeepCity_StevensHouse_EventScript_1A0678 + call_if_eq MossdeepCity_StevensHouse_EventScript_1A0678 setflag FLAG_HIDE_BELDUM_BALL_STEVENS_HOUSE setflag FLAG_RECEIVED_BELDUM releaseall @@ -113,8 +112,7 @@ MossdeepCity_StevensHouse_EventScript_15AAF9:: @ 815AAF9 MossdeepCity_StevensHouse_EventScript_15AB02:: @ 815AB02 lockall - checkflag FLAG_OMIT_DIVE_FROM_STEVEN_LETTER - goto_if_eq MossdeepCity_StevensHouse_EventScript_15AB16 + goto_if_set FLAG_OMIT_DIVE_FROM_STEVEN_LETTER, MossdeepCity_StevensHouse_EventScript_15AB16 msgbox MossdeepCity_StevensHouse_Text_18DF1A, 4 releaseall end diff --git a/data/scripts/maps/MtChimney.inc b/data/scripts/maps/MtChimney.inc index be4799a45..ac7c00013 100644 --- a/data/scripts/maps/MtChimney.inc +++ b/data/scripts/maps/MtChimney.inc @@ -26,7 +26,7 @@ MtChimney_EventScript_15CF95:: @ 815CF95 msgbox MtChimney_Text_1957A9, 4 checkitemspace ITEM_LAVA_COOKIE, 1 compare RESULT, 1 - call_if 1, MtChimney_EventScript_15D000 + call_if_eq MtChimney_EventScript_15D000 giveitem_std ITEM_LAVA_COOKIE compare RESULT, 0 goto_if_eq MtChimney_EventScript_15CFF3 @@ -406,10 +406,8 @@ MtChimney_EventScript_15D174:: @ 815D174 MtChimney_EventScript_15D17D:: @ 815D17D lockall - checkflag FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY - goto_if 0, MtChimney_EventScript_15D1D0 - checkflag FLAG_RECEIVED_METEORITE - goto_if_eq MtChimney_EventScript_15D1C6 + goto_if_unset FLAG_DEFEATED_EVIL_TEAM_MT_CHIMNEY, MtChimney_EventScript_15D1D0 + goto_if_set FLAG_RECEIVED_METEORITE, MtChimney_EventScript_15D1C6 msgbox MtChimney_Text_195870, MSGBOX_YESNO compare RESULT, NO goto_if_eq MtChimney_EventScript_15D1BC diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index aefc68bda..d73c427f8 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -5,7 +5,7 @@ MtChimney_CableCarStation_MapScripts:: @ 815C0FA MtChimney_CableCarStation_MapScript1_15C105:: @ 815C105 compare VAR_CABLE_CAR_STATION_STATE, 1 - call_if 1, MtChimney_CableCarStation_EventScript_15C111 + call_if_eq MtChimney_CableCarStation_EventScript_15C111 end MtChimney_CableCarStation_EventScript_15C111:: @ 815C111 diff --git a/data/scripts/maps/MtPyre_1F.inc b/data/scripts/maps/MtPyre_1F.inc index 7073000d5..f34c31da0 100644 --- a/data/scripts/maps/MtPyre_1F.inc +++ b/data/scripts/maps/MtPyre_1F.inc @@ -4,8 +4,7 @@ MtPyre_1F_MapScripts:: @ 815D322 MtPyre_1F_EventScript_15D323:: @ 815D323 lock faceplayer - checkflag FLAG_RECEIVED_CLEANSE_TAG - goto_if_eq MtPyre_1F_EventScript_15D352 + goto_if_set FLAG_RECEIVED_CLEANSE_TAG, MtPyre_1F_EventScript_15D352 msgbox MtPyre_1F_Text_196151, 4 giveitem_std ITEM_CLEANSE_TAG compare RESULT, 0 diff --git a/data/scripts/maps/MtPyre_Exterior.inc b/data/scripts/maps/MtPyre_Exterior.inc index ec5864df5..f8b4141d7 100644 --- a/data/scripts/maps/MtPyre_Exterior.inc +++ b/data/scripts/maps/MtPyre_Exterior.inc @@ -9,7 +9,7 @@ MtPyre_Exterior_MapScript1_15D48C:: @ 815D48C MtPyre_Exterior_EventScript_15D492:: @ 815D492 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 12 - goto_if 0, MtPyre_Exterior_EventScript_15D4A3 + goto_if_lt MtPyre_Exterior_EventScript_15D4A3 return MtPyre_Exterior_EventScript_15D4A3:: @ 815D4A3 diff --git a/data/scripts/maps/MtPyre_Summit.inc b/data/scripts/maps/MtPyre_Summit.inc index 56ef5db79..d37100938 100644 --- a/data/scripts/maps/MtPyre_Summit.inc +++ b/data/scripts/maps/MtPyre_Summit.inc @@ -31,11 +31,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 waitmovement 0 delay 50 compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D593 + call_if_eq MtPyre_Summit_EventScript_15D593 compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D59E + call_if_eq MtPyre_Summit_EventScript_15D59E compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D59F + call_if_eq MtPyre_Summit_EventScript_15D59F .ifdef SAPPHIRE msgbox UnknownString_81B52B0, 4 .else @@ -53,11 +53,11 @@ MtPyre_Summit_EventScript_15D4E1:: @ 815D4E1 delay 20 call MtPyre_Summit_EventScript_15D57A compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D5AA + call_if_eq MtPyre_Summit_EventScript_15D5AA compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D5BF + call_if_eq MtPyre_Summit_EventScript_15D5BF compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D5CA + call_if_eq MtPyre_Summit_EventScript_15D5CA .ifdef SAPPHIRE msgbox UnknownString_81B53AB, 4 .else @@ -144,9 +144,9 @@ MtPyre_Summit_EventScript_15D5EF:: @ 815D5EF msgbox MtPyre_Summit_Text_1B64B3, MSGBOX_YESNO .endif compare RESULT, YES - call_if 1, MtPyre_Summit_EventScript_15D611 + call_if_eq MtPyre_Summit_EventScript_15D611 compare RESULT, NO - call_if 1, MtPyre_Summit_EventScript_15D61A + call_if_eq MtPyre_Summit_EventScript_15D61A release end @@ -169,12 +169,9 @@ MtPyre_Summit_EventScript_15D61A:: @ 815D61A MtPyre_Summit_EventScript_15D623:: @ 815D623 lock faceplayer - 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 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if_eq MtPyre_Summit_EventScript_15D6BA + goto_if_set FLAG_RETURNED_RED_OR_BLUE_ORB, MtPyre_Summit_EventScript_15D6C4 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, MtPyre_Summit_EventScript_15D64A + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, MtPyre_Summit_EventScript_15D6BA .ifdef SAPPHIRE msgbox UnknownString_81B54BE, 4 .else @@ -269,11 +266,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 waitmovement 0 delay 50 compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D75E + call_if_eq MtPyre_Summit_EventScript_15D75E compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D769 + call_if_eq MtPyre_Summit_EventScript_15D769 compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D774 + call_if_eq MtPyre_Summit_EventScript_15D774 .ifdef SAPPHIRE msgbox UnknownString_81B5BFC, 4 .else @@ -281,11 +278,11 @@ MtPyre_Summit_EventScript_15D6F2:: @ 815D6F2 .endif closemessage compare VAR_SPECIAL_8, 0 - call_if 1, MtPyre_Summit_EventScript_15D77F + call_if_eq MtPyre_Summit_EventScript_15D77F compare VAR_SPECIAL_8, 1 - call_if 1, MtPyre_Summit_EventScript_15D78A + call_if_eq MtPyre_Summit_EventScript_15D78A compare VAR_SPECIAL_8, 2 - call_if 1, MtPyre_Summit_EventScript_15D795 + call_if_eq MtPyre_Summit_EventScript_15D795 removeobject 2 setvar VAR_MT_PYRE_STATE, 3 releaseall diff --git a/data/scripts/maps/NewMauville_Entrance.inc b/data/scripts/maps/NewMauville_Entrance.inc index 2a4d8afce..1c8bdfb3f 100644 --- a/data/scripts/maps/NewMauville_Entrance.inc +++ b/data/scripts/maps/NewMauville_Entrance.inc @@ -5,7 +5,7 @@ NewMauville_Entrance_MapScripts:: @ 815E48A NewMauville_Entrance_MapScript1_15E495:: @ 815E495 compare VAR_NEW_MAUVILLE_STATE, 0 - call_if 1, NewMauville_Entrance_EventScript_15E4A1 + call_if_eq NewMauville_Entrance_EventScript_15E4A1 end NewMauville_Entrance_EventScript_15E4A1:: @ 815E4A1 diff --git a/data/scripts/maps/NewMauville_Inside.inc b/data/scripts/maps/NewMauville_Inside.inc index ae33d7978..e045cda5d 100644 --- a/data/scripts/maps/NewMauville_Inside.inc +++ b/data/scripts/maps/NewMauville_Inside.inc @@ -6,11 +6,10 @@ NewMauville_Inside_MapScripts:: @ 815E55F NewMauville_Inside_MapScript1_15E56F:: @ 815E56F compare VAR_TEMP_1, 1 - call_if 1, NewMauville_Inside_EventScript_15E5DA + call_if_eq NewMauville_Inside_EventScript_15E5DA compare VAR_TEMP_2, 1 - call_if 1, NewMauville_Inside_EventScript_15E728 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, NewMauville_Inside_EventScript_15E58F + call_if_eq NewMauville_Inside_EventScript_15E728 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, NewMauville_Inside_EventScript_15E58F end NewMauville_Inside_EventScript_15E58F:: @ 815E58F @@ -24,7 +23,7 @@ NewMauville_Inside_MapScript1_15E593:: @ 815E593 NewMauville_Inside_MapScript1_15E59E:: @ 815E59E compare VAR_NEW_MAUVILLE_STATE, 2 - call_if 1, NewMauville_Inside_EventScript_15E88B + call_if_eq NewMauville_Inside_EventScript_15E88B end NewMauville_Inside_EventScript_15E5AA:: @ 815E5AA diff --git a/data/scripts/maps/OldaleTown.inc b/data/scripts/maps/OldaleTown.inc index a2d2616d3..9b1c9dd80 100644 --- a/data/scripts/maps/OldaleTown.inc +++ b/data/scripts/maps/OldaleTown.inc @@ -5,12 +5,9 @@ OldaleTown_MapScripts:: @ 814DD62 OldaleTown_MapScript1_14DD68:: @ 814DD68 call OldaleTown_EventScript_1A014E setflag FLAG_VISITED_OLDALE_TOWN - checkflag FLAG_ADVENTURE_STARTED - call_if 0, OldaleTown_EventScript_14DD92 - checkflag FLAG_RECEIVED_POTION_OLDALE - call_if 0, OldaleTown_EventScript_14DD9E - checkflag FLAG_ADVENTURE_STARTED - call_if 1, OldaleTown_EventScript_14DD8C + call_if_unset FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD92 + call_if_unset FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DD9E + call_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DD8C end OldaleTown_EventScript_14DD8C:: @ 814DD8C @@ -38,10 +35,8 @@ OldaleTown_EventScript_14DDB3:: @ 814DDB3 OldaleTown_EventScript_14DDBC:: @ 814DDBC lock faceplayer - checkflag FLAG_RECEIVED_POTION_OLDALE - goto_if_eq OldaleTown_EventScript_14DE79 - checkflag FLAG_TEMP_1 - goto_if_eq OldaleTown_EventScript_14DE79 + goto_if_set FLAG_RECEIVED_POTION_OLDALE, OldaleTown_EventScript_14DE79 + goto_if_set FLAG_TEMP_1, OldaleTown_EventScript_14DE79 setflag FLAG_TEMP_1 playbgm BGM_TSURETEK, FALSE msgbox OldaleTown_Text_16AEF2, 4 @@ -195,8 +190,7 @@ OldaleTown_Movement_14DECB:: @ 814DECB OldaleTown_EventScript_14DEDF:: @ 814DEDF lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_EventScript_14DF26 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_EventScript_14DF26 msgbox OldaleTown_Text_16B0CC, 4 closemessage applymovement 3, OldaleTown_Movement_1A083D diff --git a/data/scripts/maps/OldaleTown_Mart.inc b/data/scripts/maps/OldaleTown_Mart.inc index f90c787c2..15cf40027 100644 --- a/data/scripts/maps/OldaleTown_Mart.inc +++ b/data/scripts/maps/OldaleTown_Mart.inc @@ -6,8 +6,7 @@ OldaleTown_Mart_EventScript_152F79:: @ 8152F79 faceplayer message OldaleTown_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_Mart_EventScript_152FA8 + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FA8 pokemart OldaleTown_Mart_Items1 msgbox OldaleTown_Mart_Text_1A0C02, 4 release @@ -43,8 +42,7 @@ OldaleTown_Mart_Items2:: @ 8152FB8 OldaleTown_Mart_EventScript_152FC6:: @ 8152FC6 lock faceplayer - checkflag FLAG_ADVENTURE_STARTED - goto_if_eq OldaleTown_Mart_EventScript_152FDB + goto_if_set FLAG_ADVENTURE_STARTED, OldaleTown_Mart_EventScript_152FDB msgbox OldaleTown_Mart_Text_174A8A, 4 release end diff --git a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc index d94e02227..c993807c6 100644 --- a/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc +++ b/data/scripts/maps/OldaleTown_PokemonCenter_1F.inc @@ -26,8 +26,7 @@ OldaleTown_PokemonCenter_1F_EventScript_152F2E:: @ 8152F2E OldaleTown_PokemonCenter_1F_EventScript_152F37:: @ 8152F37 lock faceplayer - checkflag FLAG_SYS_POKEDEX_GET - goto_if_eq OldaleTown_PokemonCenter_1F_EventScript_152F4C + goto_if_set FLAG_SYS_POKEDEX_GET, OldaleTown_PokemonCenter_1F_EventScript_152F4C msgbox OldaleTown_PokemonCenter_1F_Text_1749C0, 4 release end diff --git a/data/scripts/maps/PacifidlogTown_House2.inc b/data/scripts/maps/PacifidlogTown_House2.inc index df7f42a8b..8ad949bf2 100644 --- a/data/scripts/maps/PacifidlogTown_House2.inc +++ b/data/scripts/maps/PacifidlogTown_House2.inc @@ -6,28 +6,24 @@ PacifidlogTown_House2_EventScript_154168:: @ 8154168 faceplayer dodailyevents call PacifidlogTown_House2_EventScript_1541B4 - checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - goto_if_eq PacifidlogTown_House2_EventScript_154254 - checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER - call_if 1, PacifidlogTown_House2_EventScript_1541CE - checkflag FLAG_MET_FANCLUB_YOUNGER_BROTHER - call_if 0, PacifidlogTown_House2_EventScript_1541D7 + goto_if_set FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_154254 + call_if_set FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541CE + call_if_unset FLAG_MET_FANCLUB_YOUNGER_BROTHER, PacifidlogTown_House2_EventScript_1541D7 setflag FLAG_MET_FANCLUB_YOUNGER_BROTHER specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - goto_if 4, PacifidlogTown_House2_EventScript_1541EC + goto_if_ge PacifidlogTown_House2_EventScript_1541EC specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 2 - goto_if 4, PacifidlogTown_House2_EventScript_15421B + goto_if_ge PacifidlogTown_House2_EventScript_15421B goto PacifidlogTown_House2_EventScript_154225 end PacifidlogTown_House2_EventScript_1541B4:: @ 81541B4 - checkflag FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK - goto_if 0, PacifidlogTown_House2_EventScript_1A14DC + goto_if_unset FLAG_RECEIVED_FANCLUB_TM_THIS_WEEK, PacifidlogTown_House2_EventScript_1A14DC specialvar RESULT, GetDaysUntilPacifidlogTMAvailable compare RESULT, 0 - call_if 1, PacifidlogTown_House2_EventScript_1541E8 + call_if_eq PacifidlogTown_House2_EventScript_1541E8 return PacifidlogTown_House2_EventScript_1541CE:: @ 81541CE diff --git a/data/scripts/maps/PacifidlogTown_House3.inc b/data/scripts/maps/PacifidlogTown_House3.inc index f51aea6f7..3b21ac996 100644 --- a/data/scripts/maps/PacifidlogTown_House3.inc +++ b/data/scripts/maps/PacifidlogTown_House3.inc @@ -4,8 +4,7 @@ PacifidlogTown_House3_MapScripts:: @ 815429D PacifidlogTown_House3_EventScript_15429E:: @ 815429E lock faceplayer - checkflag FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED - goto_if_eq PacifidlogTown_House3_EventScript_154338 + goto_if_set FLAG_PACIFIDLOG_NPC_TRADE_COMPLETED, PacifidlogTown_House3_EventScript_154338 setvar VAR_SPECIAL_8, 2 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ PacifidlogTown_House3_EventScript_15429E:: @ 815429E specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, PacifidlogTown_House3_EventScript_15432A + goto_if_ne PacifidlogTown_House3_EventScript_15432A copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/PetalburgCity.inc b/data/scripts/maps/PetalburgCity.inc index ea58f50c6..cb47a0edd 100644 --- a/data/scripts/maps/PetalburgCity.inc +++ b/data/scripts/maps/PetalburgCity.inc @@ -6,9 +6,9 @@ PetalburgCity_MapScripts:: @ 814B70C PetalburgCity_MapScript1_14B717:: @ 814B717 setflag FLAG_VISITED_PETALBURG_CITY compare VAR_PETALBURG_STATE, 0 - call_if 1, PetalburgCity_EventScript_14B731 + call_if_eq PetalburgCity_EventScript_14B731 compare VAR_PETALBURG_STATE, 2 - call_if 1, PetalburgCity_EventScript_14B739 + call_if_eq PetalburgCity_EventScript_14B739 end PetalburgCity_EventScript_14B731:: @ 814B731 @@ -188,23 +188,23 @@ PetalburgCity_EventScript_14B866:: @ 814B866 applymovement 9, PetalburgCity_Movement_1A0835 waitmovement 0 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_EventScript_14B91B + call_if_eq PetalburgCity_EventScript_14B91B compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_EventScript_14B930 + call_if_eq PetalburgCity_EventScript_14B930 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_EventScript_14B93B + call_if_eq PetalburgCity_EventScript_14B93B compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_EventScript_14B950 + call_if_eq PetalburgCity_EventScript_14B950 msgbox PetalburgCity_Text_16438A, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_EventScript_14B965 + call_if_eq PetalburgCity_EventScript_14B965 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_EventScript_14B977 + call_if_eq PetalburgCity_EventScript_14B977 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_EventScript_14B989 + call_if_eq PetalburgCity_EventScript_14B989 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_EventScript_14B99B + call_if_eq PetalburgCity_EventScript_14B99B msgbox PetalburgCity_Text_164426, 4 applymovement 9, PetalburgCity_Movement_1A0843 applymovement 255, PetalburgCity_Movement_1A0843 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 406f260b0..54c0e89f6 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -9,26 +9,26 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C compare VAR_PETALBURG_GYM_STATE, 6 goto_if_eq PetalburgCity_Gym_EventScript_1544A3 compare VAR_PETALBURG_GYM_STATE, 7 - call_if 4, PetalburgCity_Gym_EventScript_1544ED + call_if_ge PetalburgCity_Gym_EventScript_1544ED end PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A checktrainerflag OPPONENT_RANDALL - call_if 1, PetalburgCity_Gym_EventScript_154FBB + call_if_eq PetalburgCity_Gym_EventScript_154FBB checktrainerflag OPPONENT_MARY - call_if 1, PetalburgCity_Gym_EventScript_154FDC + call_if_eq PetalburgCity_Gym_EventScript_154FDC checktrainerflag OPPONENT_PARKER - call_if 1, PetalburgCity_Gym_EventScript_154FFD + call_if_eq PetalburgCity_Gym_EventScript_154FFD checktrainerflag OPPONENT_LORI - call_if 1, PetalburgCity_Gym_EventScript_15501E + call_if_eq PetalburgCity_Gym_EventScript_15501E checktrainerflag OPPONENT_GEORGE - call_if 1, PetalburgCity_Gym_EventScript_15503F + call_if_eq PetalburgCity_Gym_EventScript_15503F checktrainerflag OPPONENT_JODY - call_if 1, PetalburgCity_Gym_EventScript_155060 + call_if_eq PetalburgCity_Gym_EventScript_155060 checktrainerflag OPPONENT_BERKE - call_if 1, PetalburgCity_Gym_EventScript_155081 + call_if_eq PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -45,11 +45,10 @@ PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED PetalburgCity_Gym_MapScript1_15451B:: @ 815451B compare VAR_PETALBURG_GYM_STATE, 1 - call_if 1, PetalburgCity_Gym_EventScript_15453B + call_if_eq PetalburgCity_Gym_EventScript_15453B compare VAR_PETALBURG_GYM_STATE, 6 - call_if 0, PetalburgCity_Gym_EventScript_154543 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, PetalburgCity_Gym_EventScript_15454B + call_if_lt PetalburgCity_Gym_EventScript_154543 + call_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_15454B end PetalburgCity_Gym_EventScript_15453B:: @ 815453B @@ -145,65 +144,65 @@ PetalburgCity_Gym_EventScript_154669:: @ 8154669 addobject 10 playse SE_DOOR compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1547EE + call_if_eq PetalburgCity_Gym_EventScript_1547EE compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_154800 + call_if_eq PetalburgCity_Gym_EventScript_154800 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_15481C + call_if_eq PetalburgCity_Gym_EventScript_15481C compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_15481C + call_if_eq PetalburgCity_Gym_EventScript_15481C msgbox PetalburgCity_Gym_Text_179F07, 4 msgbox PetalburgCity_Gym_Text_179F37, 4 msgbox PetalburgCity_Gym_Text_179F70, 4 msgbox PetalburgCity_Gym_Text_17A03A, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_154884 + call_if_eq PetalburgCity_Gym_EventScript_154884 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_15488F + call_if_eq PetalburgCity_Gym_EventScript_15488F compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548A1 + call_if_eq PetalburgCity_Gym_EventScript_1548A1 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548B3 + call_if_eq PetalburgCity_Gym_EventScript_1548B3 msgbox PetalburgCity_Gym_Text_17A04A, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1548C5 + call_if_eq PetalburgCity_Gym_EventScript_1548C5 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_1548D0 + call_if_eq PetalburgCity_Gym_EventScript_1548D0 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548DB + call_if_eq PetalburgCity_Gym_EventScript_1548DB compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548E6 + call_if_eq PetalburgCity_Gym_EventScript_1548E6 msgbox PetalburgCity_Gym_Text_17A0A8, 4 msgbox PetalburgCity_Gym_Text_17A0EB, 4 msgbox PetalburgCity_Gym_Text_17A156, 4 compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_15492F + call_if_eq PetalburgCity_Gym_EventScript_15492F compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_154930 + call_if_eq PetalburgCity_Gym_EventScript_154930 compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_15493B + call_if_eq PetalburgCity_Gym_EventScript_15493B compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_15493C + call_if_eq PetalburgCity_Gym_EventScript_15493C compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_1548FC + call_if_eq PetalburgCity_Gym_EventScript_1548FC compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_1548F1 + call_if_eq PetalburgCity_Gym_EventScript_1548F1 msgbox PetalburgCity_Gym_Text_17A171, 4 closemessage setflag FLAG_SPECIAL_FLAG_1 playbgm BGM_TSURETEK, FALSE compare VAR_SPECIAL_8, 0 - call_if 1, PetalburgCity_Gym_EventScript_154835 + call_if_eq PetalburgCity_Gym_EventScript_154835 compare VAR_SPECIAL_8, 1 - call_if 1, PetalburgCity_Gym_EventScript_15484E + call_if_eq PetalburgCity_Gym_EventScript_15484E compare VAR_SPECIAL_8, 2 - call_if 1, PetalburgCity_Gym_EventScript_154860 + call_if_eq PetalburgCity_Gym_EventScript_154860 compare VAR_SPECIAL_8, 3 - call_if 1, PetalburgCity_Gym_EventScript_154872 + call_if_eq PetalburgCity_Gym_EventScript_154872 removeobject 10 setflag FLAG_HIDE_WALLY_MOM_PETALBURG_1 setvar VAR_PETALBURG_GYM_STATE, 1 @@ -354,10 +353,8 @@ PetalburgCity_Gym_EventScript_15493D:: @ 815493D call PetalburgCity_Gym_EventScript_154969 compare RESULT, 1 goto_if_eq PetalburgCity_Gym_EventScript_1549B8 - checkflag FLAG_RECEIVED_TM42 - goto_if 0, PetalburgCity_Gym_EventScript_154A2C - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq PetalburgCity_Gym_EventScript_154B69 + goto_if_unset FLAG_RECEIVED_TM42, PetalburgCity_Gym_EventScript_154A2C + goto_if_set FLAG_SYS_GAME_CLEAR, PetalburgCity_Gym_EventScript_154B69 msgbox PetalburgCity_Gym_Text_17AA6B, 4 release end @@ -420,22 +417,22 @@ PetalburgCity_Gym_EventScript_154A2C:: @ 8154A2C msgbox PetalburgCity_Gym_Text_17A976, 4 closemessage compare FACING, 2 - call_if 1, PetalburgCity_Gym_EventScript_154ABC + call_if_eq PetalburgCity_Gym_EventScript_154ABC compare FACING, 1 - call_if 1, PetalburgCity_Gym_EventScript_154AC7 + call_if_eq PetalburgCity_Gym_EventScript_154AC7 compare FACING, 3 - call_if 1, PetalburgCity_Gym_EventScript_154AD2 + call_if_eq PetalburgCity_Gym_EventScript_154AD2 compare FACING, 4 - call_if 1, PetalburgCity_Gym_EventScript_154ADD + call_if_eq PetalburgCity_Gym_EventScript_154ADD delay 70 compare FACING, 2 - call_if 1, PetalburgCity_Gym_EventScript_154AE8 + call_if_eq PetalburgCity_Gym_EventScript_154AE8 compare FACING, 1 - call_if 1, PetalburgCity_Gym_EventScript_154AF3 + call_if_eq PetalburgCity_Gym_EventScript_154AF3 compare FACING, 3 - call_if 1, PetalburgCity_Gym_EventScript_154AFE + call_if_eq PetalburgCity_Gym_EventScript_154AFE compare FACING, 4 - call_if 1, PetalburgCity_Gym_EventScript_154B09 + call_if_eq PetalburgCity_Gym_EventScript_154B09 msgbox PetalburgCity_Gym_Text_17A9F6, 4 release end @@ -593,7 +590,7 @@ PetalburgCity_Gym_EventScript_154B69:: @ 8154B69 PetalburgCity_Gym_EventScript_154B73:: @ 8154B73 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 85 msgbox PetalburgCity_Gym_Text_17B870, MSGBOX_YESNO @@ -623,7 +620,7 @@ PetalburgCity_Gym_EventScript_154BB9:: @ 8154BB9 PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 lockall compare VAR_PETALBURG_GYM_STATE, 6 - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 98 msgbox PetalburgCity_Gym_Text_17B8D4, MSGBOX_YESNO @@ -636,7 +633,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall checktrainerflag OPPONENT_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -649,7 +646,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall checktrainerflag OPPONENT_RANDALL - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -662,7 +659,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall checktrainerflag OPPONENT_MARY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -675,7 +672,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall checktrainerflag OPPONENT_MARY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -688,7 +685,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall checktrainerflag OPPONENT_PARKER - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -701,7 +698,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall checktrainerflag OPPONENT_LORI - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -714,7 +711,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall checktrainerflag OPPONENT_LORI - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -727,7 +724,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall checktrainerflag OPPONENT_GEORGE - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -740,7 +737,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall checktrainerflag OPPONENT_JODY - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -753,7 +750,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall checktrainerflag OPPONENT_BERKE - goto_if 0, PetalburgCity_Gym_EventScript_154BB9 + goto_if_lt PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -765,8 +762,7 @@ PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 PetalburgCity_Gym_EventScript_154DF6:: @ 8154DF6 trainerbattle 2, OPPONENT_RANDALL, 0, PetalburgCity_Gym_Text_17ADA5, PetalburgCity_Gym_Text_17AE11, PetalburgCity_Gym_EventScript_154E1A - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154E29 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E29 msgbox PetalburgCity_Gym_Text_17AE30, 6 end @@ -783,8 +779,7 @@ PetalburgCity_Gym_EventScript_154E29:: @ 8154E29 PetalburgCity_Gym_EventScript_154E32:: @ 8154E32 trainerbattle 2, OPPONENT_PARKER, 0, PetalburgCity_Gym_Text_17AF5A, PetalburgCity_Gym_Text_17AF98, PetalburgCity_Gym_EventScript_154E56 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154E65 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154E65 msgbox PetalburgCity_Gym_Text_17AFD3, 6 end @@ -801,8 +796,7 @@ PetalburgCity_Gym_EventScript_154E65:: @ 8154E65 PetalburgCity_Gym_EventScript_154E6E:: @ 8154E6E trainerbattle 2, OPPONENT_GEORGE, 0, PetalburgCity_Gym_Text_17B058, PetalburgCity_Gym_Text_17B0F7, PetalburgCity_Gym_EventScript_154E92 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154EA1 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EA1 msgbox PetalburgCity_Gym_Text_17B12C, 6 end @@ -819,8 +813,7 @@ PetalburgCity_Gym_EventScript_154EA1:: @ 8154EA1 PetalburgCity_Gym_EventScript_154EAA:: @ 8154EAA trainerbattle 2, OPPONENT_BERKE, 0, PetalburgCity_Gym_Text_17B237, PetalburgCity_Gym_Text_17B2C0, PetalburgCity_Gym_EventScript_154ECE - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154EDD + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154EDD msgbox PetalburgCity_Gym_Text_17B2E4, 6 end @@ -837,8 +830,7 @@ PetalburgCity_Gym_EventScript_154EDD:: @ 8154EDD PetalburgCity_Gym_EventScript_154EE6:: @ 8154EE6 trainerbattle 2, OPPONENT_MARY, 0, PetalburgCity_Gym_Text_17B3F7, PetalburgCity_Gym_Text_17B454, PetalburgCity_Gym_EventScript_154F0A - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F19 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F19 msgbox PetalburgCity_Gym_Text_17B46F, 6 end @@ -855,8 +847,7 @@ PetalburgCity_Gym_EventScript_154F19:: @ 8154F19 PetalburgCity_Gym_EventScript_154F22:: @ 8154F22 trainerbattle 2, OPPONENT_LORI, 0, PetalburgCity_Gym_Text_17B58D, PetalburgCity_Gym_Text_17B5CB, PetalburgCity_Gym_EventScript_154F46 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F55 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F55 msgbox PetalburgCity_Gym_Text_17B5EA, 6 end @@ -873,8 +864,7 @@ PetalburgCity_Gym_EventScript_154F55:: @ 8154F55 PetalburgCity_Gym_EventScript_154F5E:: @ 8154F5E trainerbattle 2, OPPONENT_JODY, 0, PetalburgCity_Gym_Text_17B6D4, PetalburgCity_Gym_Text_17B732, PetalburgCity_Gym_EventScript_154F82 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_154F91 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_154F91 msgbox PetalburgCity_Gym_Text_17B749, 6 end @@ -892,72 +882,72 @@ PetalburgCity_Gym_EventScript_154F91:: @ 8154F91 PetalburgCity_Gym_EventScript_154F9A:: @ 8154F9A setvar VAR_SPECIAL_4, 1 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550A2 return PetalburgCity_Gym_EventScript_154FBB:: @ 8154FBB setvar VAR_SPECIAL_4, 2 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550C7 return PetalburgCity_Gym_EventScript_154FDC:: @ 8154FDC setvar VAR_SPECIAL_4, 3 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_1550EC return PetalburgCity_Gym_EventScript_154FFD:: @ 8154FFD setvar VAR_SPECIAL_4, 4 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155111 return PetalburgCity_Gym_EventScript_15501E:: @ 815501E setvar VAR_SPECIAL_4, 5 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155124 return PetalburgCity_Gym_EventScript_15503F:: @ 815503F setvar VAR_SPECIAL_4, 6 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_155149 return PetalburgCity_Gym_EventScript_155060:: @ 8155060 setvar VAR_SPECIAL_4, 7 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15515C return PetalburgCity_Gym_EventScript_155081:: @ 8155081 setvar VAR_SPECIAL_4, 8 compare VAR_SPECIAL_5, 0 - call_if 1, PetalburgCity_Gym_EventScript_155182 + call_if_eq PetalburgCity_Gym_EventScript_155182 compare VAR_SPECIAL_5, 1 - call_if 1, PetalburgCity_Gym_EventScript_155187 + call_if_eq PetalburgCity_Gym_EventScript_155187 call PetalburgCity_Gym_EventScript_15516F return @@ -1021,8 +1011,7 @@ PetalburgCity_Gym_EventScript_155187:: @ 8155187 PetalburgCity_Gym_EventScript_15518B:: @ 815518B lock faceplayer - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_Gym_EventScript_1551A0 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_Gym_EventScript_1551A0 msgbox PetalburgCity_Gym_Text_17AB96, 4 release end @@ -1034,15 +1023,13 @@ PetalburgCity_Gym_EventScript_1551A0:: @ 81551A0 PetalburgCity_Gym_EventScript_1551AA:: @ 81551AA lockall - checkflag FLAG_BADGE05_GET - goto_if_eq PetalburgCity_Gym_EventScript_1551CA + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end PetalburgCity_Gym_EventScript_1551BA:: @ 81551BA lockall - checkflag FLAG_BADGE05_GET - goto_if_eq PetalburgCity_Gym_EventScript_1551CA + goto_if_set FLAG_BADGE05_GET, PetalburgCity_Gym_EventScript_1551CA goto PetalburgCity_Gym_EventScript_1551D4 end diff --git a/data/scripts/maps/PetalburgCity_Mart.inc b/data/scripts/maps/PetalburgCity_Mart.inc index 66e247323..7584f6f19 100644 --- a/data/scripts/maps/PetalburgCity_Mart.inc +++ b/data/scripts/maps/PetalburgCity_Mart.inc @@ -6,8 +6,7 @@ PetalburgCity_Mart_EventScript_1552B0:: @ 81552B0 faceplayer message PetalburgCity_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_PETALBURG_MART_EXPANDED_ITEMS - goto_if_eq PetalburgCity_Mart_EventScript_1552EA + goto_if_set FLAG_PETALBURG_MART_EXPANDED_ITEMS, PetalburgCity_Mart_EventScript_1552EA pokemart PetalburgCity_Mart_Items1 msgbox PetalburgCity_Mart_Text_1A0C02, 4 release diff --git a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc index 8dda62ea1..136cc11c5 100644 --- a/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/PetalburgCity_PokemonCenter_1F.inc @@ -35,11 +35,11 @@ PetalburgCity_PokemonCenter_1F_EventScript_155233:: @ 8155233 PetalburgCity_PokemonCenter_1F_EventScript_15524F:: @ 815524F compare VAR_STARTER_MON, 0 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155272 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155272 compare VAR_STARTER_MON, 1 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_15527B + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_15527B compare VAR_STARTER_MON, 2 - call_if 1, PetalburgCity_PokemonCenter_1F_EventScript_155284 + call_if_eq PetalburgCity_PokemonCenter_1F_EventScript_155284 release end diff --git a/data/scripts/maps/PetalburgCity_WallysHouse.inc b/data/scripts/maps/PetalburgCity_WallysHouse.inc index 08bbcb0c7..d642d70ed 100644 --- a/data/scripts/maps/PetalburgCity_WallysHouse.inc +++ b/data/scripts/maps/PetalburgCity_WallysHouse.inc @@ -4,22 +4,17 @@ PetalburgCity_WallysHouse_MapScripts:: @ 81543C3 PetalburgCity_WallysHouse_EventScript_1543C4:: @ 81543C4 lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq PetalburgCity_WallysHouse_EventScript_1543F7 - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_154427 - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_WallysHouse_EventScript_154406 - checkflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY - goto_if_eq PetalburgCity_WallysHouse_EventScript_15443B + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, PetalburgCity_WallysHouse_EventScript_1543F7 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154427 + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154406 + goto_if_set FLAG_THANKED_FOR_PLAYING_WITH_WALLY, PetalburgCity_WallysHouse_EventScript_15443B msgbox PetalburgCity_WallysHouse_Text_179805, 4 setflag FLAG_THANKED_FOR_PLAYING_WITH_WALLY release end PetalburgCity_WallysHouse_EventScript_1543F7:: @ 81543F7 - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_154431 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_154431 goto PetalburgCity_WallysHouse_EventScript_154406 end @@ -49,10 +44,8 @@ PetalburgCity_WallysHouse_EventScript_15443B:: @ 815443B PetalburgCity_WallysHouse_EventScript_154445:: @ 8154445 lock faceplayer - checkflag FLAG_RECEIVED_HM03 - goto_if_eq PetalburgCity_WallysHouse_EventScript_15446D - checkflag FLAG_DEFEATED_PETALBURG_GYM - goto_if_eq PetalburgCity_WallysHouse_EventScript_154463 + goto_if_set FLAG_RECEIVED_HM03, PetalburgCity_WallysHouse_EventScript_15446D + goto_if_set FLAG_DEFEATED_PETALBURG_GYM, PetalburgCity_WallysHouse_EventScript_154463 msgbox PetalburgCity_WallysHouse_Text_179C2C, 4 release end diff --git a/data/scripts/maps/PetalburgWoods.inc b/data/scripts/maps/PetalburgWoods.inc index 149fd4e46..17908440c 100644 --- a/data/scripts/maps/PetalburgWoods.inc +++ b/data/scripts/maps/PetalburgWoods.inc @@ -241,8 +241,7 @@ PetalburgWoods_EventScript_15CED3:: @ 815CED3 PetalburgWoods_EventScript_15CEDC:: @ 815CEDC lock faceplayer - checkflag FLAG_RECEIVED_MIRACLE_SEED - goto_if_eq PetalburgWoods_EventScript_15CF0B + goto_if_set FLAG_RECEIVED_MIRACLE_SEED, PetalburgWoods_EventScript_15CF0B msgbox PetalburgWoods_Text_19549E, 4 giveitem_std ITEM_MIRACLE_SEED compare RESULT, 0 diff --git a/data/scripts/maps/Route104.inc b/data/scripts/maps/Route104.inc index c90a97531..a3824efcf 100644 --- a/data/scripts/maps/Route104.inc +++ b/data/scripts/maps/Route104.inc @@ -17,10 +17,8 @@ Route104_MapScript1_14EEA8:: @ 814EEA8 end Route104_EventScript_14EEAE:: @ 814EEAE - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_EventScript_14EEC4 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_EventScript_14EEC4 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_EventScript_14EEC4 + goto_if_unset FLAG_BADGE03_GET, Route104_EventScript_14EEC4 clearflag FLAG_HIDE_FLOWER_SHOP_WORKER_OUTSIDE return @@ -31,8 +29,7 @@ Route104_EventScript_14EEC4:: @ 814EEC4 Route104_EventScript_14EEC8:: @ 814EEC8 lock faceplayer - checkflag FLAG_RECEIVED_CHESTO_BERRY_ROUTE104 - goto_if_eq Route104_EventScript_14EEFF + goto_if_set FLAG_RECEIVED_CHESTO_BERRY_ROUTE104, Route104_EventScript_14EEFF msgbox Route104_Text_1C55B9, 4 giveitem_std ITEM_CHESTO_BERRY compare RESULT, 0 @@ -50,8 +47,7 @@ Route104_EventScript_14EEFF:: @ 814EEFF Route104_EventScript_14EF09:: @ 814EF09 lock faceplayer - checkflag FLAG_RECEIVED_WHITE_HERB - goto_if_eq Route104_EventScript_14EF38 + goto_if_set FLAG_RECEIVED_WHITE_HERB, Route104_EventScript_14EF38 msgbox Route104_Text_16DD91, 4 giveitem_std ITEM_WHITE_HERB compare RESULT, 0 @@ -104,8 +100,7 @@ Route104_EventScript_14EF8A:: @ 814EF8A Route104_EventScript_14EF93:: @ 814EF93 lock faceplayer - checkflag FLAG_RECEIVED_TM09 - goto_if_eq Route104_EventScript_14EFC2 + goto_if_set FLAG_RECEIVED_TM09, Route104_EventScript_14EFC2 msgbox Route104_Text_16DC5F, 4 giveitem_std ITEM_TM09 compare RESULT, 0 @@ -158,10 +153,8 @@ Route104_EventScript_14EFD5:: @ 814EFD5 resetobjectpriority 2, MAP_DEWFORD_TOWN moveobjectoffscreen 2 setvar VAR_BOARD_BRINEY_BOAT_ROUTE104_STATE, 0 - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_EventScript_14F08B - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if_eq Route104_EventScript_14F095 + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F08B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, Route104_EventScript_14F095 end Route104_EventScript_14F08B:: @ 814F08B diff --git a/data/scripts/maps/Route104_MrBrineysHouse.inc b/data/scripts/maps/Route104_MrBrineysHouse.inc index 4718f9bb9..514b1b9cc 100644 --- a/data/scripts/maps/Route104_MrBrineysHouse.inc +++ b/data/scripts/maps/Route104_MrBrineysHouse.inc @@ -5,9 +5,8 @@ Route104_MrBrineysHouse_MapScripts:: @ 815BCB2 Route104_MrBrineysHouse_MapScript1_15BCB8:: @ 815BCB8 setflag FLAG_LANDMARK_MR_BRINEY_HOUSE compare VAR_BRINEY_HOUSE_STATE, 1 - call_if 1, Route104_MrBrineysHouse_EventScript_15BCD4 - checkflag FLAG_RECEIVED_POKENAV - call_if 1, Route104_MrBrineysHouse_EventScript_15BCD0 + call_if_eq Route104_MrBrineysHouse_EventScript_15BCD4 + call_if_set FLAG_RECEIVED_POKENAV, Route104_MrBrineysHouse_EventScript_15BCD0 end Route104_MrBrineysHouse_EventScript_15BCD0:: @ 815BCD0 @@ -24,12 +23,9 @@ Route104_MrBrineysHouse_EventScript_15BCD4:: @ 815BCD4 Route104_MrBrineysHouse_EventScript_15BCEB:: @ 815BCEB lock faceplayer - checkflag FLAG_MR_BRINEY_SAILING_INTRO - call_if 0, Route104_MrBrineysHouse_EventScript_15BD0E - checkflag FLAG_DELIVERED_STEVEN_LETTER - goto_if 0, Route104_MrBrineysHouse_EventScript_15BD65 - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, Route104_MrBrineysHouse_EventScript_15BD7E + call_if_unset FLAG_MR_BRINEY_SAILING_INTRO, Route104_MrBrineysHouse_EventScript_15BD0E + goto_if_unset FLAG_DELIVERED_STEVEN_LETTER, Route104_MrBrineysHouse_EventScript_15BD65 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route104_MrBrineysHouse_EventScript_15BD7E goto Route104_MrBrineysHouse_EventScript_15BD32 end diff --git a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc index f7fbb58b5..5e70a8ec2 100644 --- a/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc +++ b/data/scripts/maps/Route104_PrettyPetalFlowerShop.inc @@ -4,10 +4,8 @@ Route104_PrettyPetalFlowerShop_MapScripts:: @ 815BDE4 Route104_PrettyPetalFlowerShop_MapScript1_15BDEA:: @ 815BDEA setflag FLAG_LANDMARK_FLOWER_SHOP - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 - checkflag FLAG_BADGE03_GET - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if_unset FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE03 + goto_if_unset FLAG_BADGE03_GET, Route104_PrettyPetalFlowerShop_EventScript_15BE03 setflag FLAG_TEMP_1 end @@ -18,26 +16,24 @@ Route104_PrettyPetalFlowerShop_EventScript_15BE03:: @ 815BE03 Route104_PrettyPetalFlowerShop_EventScript_15BE0B:: @ 815BE0B lock faceplayer - checkflag FLAG_TEMP_1 - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE7C + goto_if_set FLAG_TEMP_1, Route104_PrettyPetalFlowerShop_EventScript_15BE7C msgbox Route104_PrettyPetalFlowerShop_Text_1C5EC6, 4 - checkflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE4A + goto_if_set FLAG_MET_PRETTY_PETAL_SHOP_OWNER, Route104_PrettyPetalFlowerShop_EventScript_15BE4A setflag FLAG_MET_PRETTY_PETAL_SHOP_OWNER msgbox Route104_PrettyPetalFlowerShop_Text_1C5F48, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, NO - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end Route104_PrettyPetalFlowerShop_EventScript_15BE4A:: @ 815BE4A msgbox Route104_PrettyPetalFlowerShop_Text_1C5F1B, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE6A + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE6A compare RESULT, NO - call_if 1, Route104_PrettyPetalFlowerShop_EventScript_15BE73 + call_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BE73 release end @@ -72,8 +68,7 @@ Route104_PrettyPetalFlowerShop_Items:: @ 815BE94 Route104_PrettyPetalFlowerShop_EventScript_15BEA4:: @ 815BEA4 lock faceplayer - checkflag FLAG_RECEIVED_WAILMER_PAIL - goto_if 0, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 + goto_if_unset FLAG_RECEIVED_WAILMER_PAIL, Route104_PrettyPetalFlowerShop_EventScript_15BEB9 msgbox Route104_PrettyPetalFlowerShop_Text_1C61E8, 4 release end @@ -90,8 +85,7 @@ Route104_PrettyPetalFlowerShop_EventScript_15BEDA:: @ 815BEDA lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP - goto_if_eq Route104_PrettyPetalFlowerShop_EventScript_15BF1A + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FLOWER_SHOP, Route104_PrettyPetalFlowerShop_EventScript_15BF1A msgbox Route104_PrettyPetalFlowerShop_Text_1C62DA, 4 random 8 addvar RESULT, ITEM_CHERI_BERRY diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index b3b256d79..7f1c4ca75 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -5,21 +5,20 @@ Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_CINDY_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_LUCAS_2 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 checktrainerflag OPPONENT_MIKE_1 - goto_if 0, Route104_Prototype_EventScript_160C99 + goto_if_lt Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 - checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 - goto_if_eq Route104_Prototype_EventScript_160CFB + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB release end @@ -32,21 +31,20 @@ Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer checktrainerflag OPPONENT_BRIANNA_1 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_CINDY_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_LUCAS_2 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 checktrainerflag OPPONENT_MIKE_1 - goto_if 0, Route104_Prototype_EventScript_160CF1 + goto_if_lt Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 - checkflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 - goto_if_eq Route104_Prototype_EventScript_160CFB + goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB release end diff --git a/data/scripts/maps/Route105.inc b/data/scripts/maps/Route105.inc index 30157e52f..305a2e9af 100644 --- a/data/scripts/maps/Route105.inc +++ b/data/scripts/maps/Route105.inc @@ -3,8 +3,7 @@ Route105_MapScripts:: @ 814F298 .byte 0 Route105_MapScript1_14F29E:: @ 814F29E - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route105_EventScript_14F2A8 + call_if_unset FLAG_REGI_DOORS_OPENED, Route105_EventScript_14F2A8 end Route105_EventScript_14F2A8:: @ 814F2A8 diff --git a/data/scripts/maps/Route109.inc b/data/scripts/maps/Route109.inc index c0344f150..c70365b6a 100644 --- a/data/scripts/maps/Route109.inc +++ b/data/scripts/maps/Route109.inc @@ -271,8 +271,7 @@ Route109_Movement_14F67D:: @ 814F67D Route109_EventScript_14F680:: @ 814F680 lock faceplayer - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, Route109_EventScript_14F691 + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, Route109_EventScript_14F691 goto Route109_EventScript_14F6AF end @@ -328,8 +327,7 @@ Route109_EventScript_14F725:: @ 814F725 lock faceplayer special GetPlayerBigGuyGirlString - checkflag FLAG_RECEIVED_SOFT_SAND - goto_if_eq Route109_EventScript_14F762 + goto_if_set FLAG_RECEIVED_SOFT_SAND, Route109_EventScript_14F762 msgbox Route109_Text_16E433, 4 giveitem_std ITEM_SOFT_SAND compare RESULT, 0 diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index 4c1574824..e52958c50 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -9,12 +9,9 @@ Route109_SeashoreHouse_MapScript1_160DD0:: @ 8160DD0 Route109_SeashoreHouse_EventScript_160DD4:: @ 8160DD4 lock faceplayer - checkflag FLAG_RECEIVED_6_SODA_POP - goto_if_eq Route109_SeashoreHouse_EventScript_160E36 - checkflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS - goto_if_eq Route109_SeashoreHouse_EventScript_160E08 - checkflag FLAG_TEMP_2 - goto_if_eq Route109_SeashoreHouse_EventScript_160DFE + goto_if_set FLAG_RECEIVED_6_SODA_POP, Route109_SeashoreHouse_EventScript_160E36 + goto_if_set FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS, Route109_SeashoreHouse_EventScript_160E08 + goto_if_set FLAG_TEMP_2, Route109_SeashoreHouse_EventScript_160DFE msgbox Route109_SeashoreHouse_Text_19B4D9, 4 setflag FLAG_TEMP_2 release @@ -95,11 +92,11 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 checktrainerflag OPPONENT_DWAYNE - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_JOHANNA - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 checktrainerflag OPPONENT_SIMON - goto_if 0, Route109_SeashoreHouse_EventScript_160F29 + goto_if_lt Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route110.inc b/data/scripts/maps/Route110.inc index d5219582c..070340760 100644 --- a/data/scripts/maps/Route110.inc +++ b/data/scripts/maps/Route110.inc @@ -13,7 +13,7 @@ Route110_MapScript1_14F914:: @ 814F914 call Route110_EventScript_1A014E call Route110_EventScript_1A0172 compare VAR_CYCLING_CHALLENGE_STATE, 1 - call_if 1, Route110_EventScript_14F92F + call_if_eq Route110_EventScript_14F92F end Route110_EventScript_14F92F:: @ 814F92F @@ -327,9 +327,9 @@ Route110_EventScript_14FD34:: @ 814FD34 lockall checkplayergender compare RESULT, 0 - call_if 1, Route110_EventScript_14FDA7 + call_if_eq Route110_EventScript_14FDA7 compare RESULT, 1 - call_if 1, Route110_EventScript_14FDAC + call_if_eq Route110_EventScript_14FDAC applymovement 28, Route110_Movement_1A0845 waitmovement 0 applymovement 28, Route110_Movement_1A0833 @@ -338,11 +338,11 @@ Route110_EventScript_14FD34:: @ 814FD34 waitmovement 0 delay 30 compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF14 + call_if_eq Route110_EventScript_14FF14 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF1F + call_if_eq Route110_EventScript_14FF1F compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF2A + call_if_eq Route110_EventScript_14FF2A checkplayergender compare RESULT, 0 goto_if_eq Route110_EventScript_14FDB1 @@ -426,22 +426,22 @@ Route110_EventScript_14FEA5:: @ 814FEA5 Route110_EventScript_14FEB2:: @ 814FEB2 closemessage compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF56 + call_if_eq Route110_EventScript_14FF56 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF5E + call_if_eq Route110_EventScript_14FF5E compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF66 + call_if_eq Route110_EventScript_14FF66 setobjectmovementtype 28, 10 setobjectmovementtype 29, 10 removeobject 28 addobject 29 delay 45 compare VAR_SPECIAL_8, 1 - call_if 1, Route110_EventScript_14FF35 + call_if_eq Route110_EventScript_14FF35 compare VAR_SPECIAL_8, 2 - call_if 1, Route110_EventScript_14FF40 + call_if_eq Route110_EventScript_14FF40 compare VAR_SPECIAL_8, 3 - call_if 1, Route110_EventScript_14FF4B + call_if_eq Route110_EventScript_14FF4B removeobject 29 setvar VAR_ROUTE110_STATE, 1 savebgm 0 diff --git a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc index af72dedd0..f05e2caa2 100644 --- a/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc +++ b/data/scripts/maps/Route110_SeasideCyclingRoadNorthEntrance.inc @@ -4,9 +4,9 @@ Route110_SeasideCyclingRoadNorthEntrance_MapScripts:: @ 81634C8 Route110_SeasideCyclingRoadNorthEntrance_MapScript1_1634CE:: @ 81634CE compare VAR_CYCLING_CHALLENGE_STATE, 3 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 compare VAR_CYCLING_CHALLENGE_STATE, 2 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5 end Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634E5:: @ 81634E5 @@ -25,7 +25,7 @@ Route110_SeasideCyclingRoadNorthEntrance_EventScript_1634F7:: @ 81634F7 lockall specialvar RESULT, GetPlayerAvatarBike @ player state? compare RESULT, 2 - call_if 1, Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D + call_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_16351D compare RESULT, 0 goto_if_eq Route110_SeasideCyclingRoadNorthEntrance_EventScript_163523 setflag FLAG_SYS_CYCLING_ROAD diff --git a/data/scripts/maps/Route110_TrickHouseEnd.inc b/data/scripts/maps/Route110_TrickHouseEnd.inc index 68ce0f5a7..020c61258 100644 --- a/data/scripts/maps/Route110_TrickHouseEnd.inc +++ b/data/scripts/maps/Route110_TrickHouseEnd.inc @@ -7,7 +7,7 @@ Route110_TrickHouseEnd_MapScripts:: @ 8161936 Route110_TrickHouseEnd_MapScript1_16194B:: @ 816194B compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_161994 + call_if_eq Route110_TrickHouseEnd_EventScript_161994 end Route110_TrickHouseEnd_MapScript1_161957:: @ 8161957 @@ -62,7 +62,7 @@ Route110_TrickHouseEnd_EventScript_161A0B:: @ 8161A0B setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_RARE_CANDY compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -75,7 +75,7 @@ Route110_TrickHouseEnd_EventScript_161A47:: @ 8161A47 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TIMER_BALL compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -88,7 +88,7 @@ Route110_TrickHouseEnd_EventScript_161A83:: @ 8161A83 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_HARD_STONE compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -101,7 +101,7 @@ Route110_TrickHouseEnd_EventScript_161ABF:: @ 8161ABF setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_SMOKE_BALL compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -114,7 +114,7 @@ Route110_TrickHouseEnd_EventScript_161AFB:: @ 8161AFB setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_TM12 compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -127,7 +127,7 @@ Route110_TrickHouseEnd_EventScript_161B37:: @ 8161B37 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_MAGNET compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -140,7 +140,7 @@ Route110_TrickHouseEnd_EventScript_161B73:: @ 8161B73 setvar VAR_TRICK_HOUSE_PRIZE_PICKUP, 0 giveitem_std ITEM_PP_MAX compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C4E + call_if_eq Route110_TrickHouseEnd_EventScript_161C4E msgbox Route110_TrickHouseEnd_Text_19C9BD, 4 closemessage call Route110_TrickHouseEnd_EventScript_161C2E @@ -151,13 +151,13 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF msgbox Route110_TrickHouseEnd_Text_19C5AF, 4 closemessage compare FACING, 1 - call_if 1, Route110_TrickHouseEnd_EventScript_161C74 + call_if_eq Route110_TrickHouseEnd_EventScript_161C74 compare FACING, 2 - call_if 1, Route110_TrickHouseEnd_EventScript_161C7F + call_if_eq Route110_TrickHouseEnd_EventScript_161C7F compare FACING, 3 - call_if 1, Route110_TrickHouseEnd_EventScript_161C8A + call_if_eq Route110_TrickHouseEnd_EventScript_161C8A compare FACING, 4 - call_if 1, Route110_TrickHouseEnd_EventScript_161C95 + call_if_eq Route110_TrickHouseEnd_EventScript_161C95 delay 30 msgbox Route110_TrickHouseEnd_Text_19C602, 4 closemessage @@ -172,7 +172,7 @@ Route110_TrickHouseEnd_EventScript_161BAF:: @ 8161BAF givedecoration_std DECOR_RED_TENT .endc compare RESULT, 0 - call_if 1, Route110_TrickHouseEnd_EventScript_161C61 + call_if_eq Route110_TrickHouseEnd_EventScript_161C61 msgbox Route110_TrickHouseEnd_Text_19C85C, 4 call Route110_TrickHouseEnd_EventScript_161C2E special ResetTrickHouseEndRoomFlag diff --git a/data/scripts/maps/Route110_TrickHouseEntrance.inc b/data/scripts/maps/Route110_TrickHouseEntrance.inc index 232d324a4..527f09d27 100644 --- a/data/scripts/maps/Route110_TrickHouseEntrance.inc +++ b/data/scripts/maps/Route110_TrickHouseEntrance.inc @@ -13,11 +13,11 @@ Route110_TrickHouseEntrance_MapScript1_160F3B:: @ 8160F3B compare VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_16108E compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE compare VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_160FDE + call_if_eq Route110_TrickHouseEntrance_EventScript_160FDE switch VAR_TRICK_HOUSE_ENTRANCE_STATE_3 case 0, Route110_TrickHouseEntrance_EventScript_16109A case 1, Route110_TrickHouseEntrance_EventScript_1610A0 @@ -45,56 +45,49 @@ Route110_TrickHouseEntrance_EventScript_160FCE:: @ 8160FCE Route110_TrickHouseEntrance_EventScript_160FDE:: @ 8160FDE setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_3, 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_16103C + call_if_eq Route110_TrickHouseEntrance_EventScript_16103C compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_161046 + call_if_eq Route110_TrickHouseEntrance_EventScript_161046 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_161050 + call_if_eq Route110_TrickHouseEntrance_EventScript_161050 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_16105A + call_if_eq Route110_TrickHouseEntrance_EventScript_16105A compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_161064 + call_if_eq Route110_TrickHouseEntrance_EventScript_161064 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_16106E + call_if_eq Route110_TrickHouseEntrance_EventScript_16106E compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_161078 + call_if_eq Route110_TrickHouseEntrance_EventScript_161078 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 8 - call_if 1, Route110_TrickHouseEntrance_EventScript_161082 + call_if_eq Route110_TrickHouseEntrance_EventScript_161082 return Route110_TrickHouseEntrance_EventScript_16103C:: @ 816103C - checkflag FLAG_BADGE03_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE03_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161046:: @ 8161046 - checkflag FLAG_BADGE04_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE04_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161050:: @ 8161050 - checkflag FLAG_BADGE05_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE05_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16105A:: @ 816105A - checkflag FLAG_BADGE06_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE06_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161064:: @ 8161064 - checkflag FLAG_BADGE07_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE07_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_16106E:: @ 816106E - checkflag FLAG_BADGE08_GET - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_BADGE08_GET, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161078:: @ 8161078 - checkflag FLAG_SYS_GAME_CLEAR - call_if 0, Route110_TrickHouseEntrance_EventScript_161088 + call_if_unset FLAG_SYS_GAME_CLEAR, Route110_TrickHouseEntrance_EventScript_161088 return Route110_TrickHouseEntrance_EventScript_161082:: @ 8161082 @@ -214,7 +207,7 @@ Route110_TrickHouseEntrance_EventScript_1611D7:: @ 81611D7 lockall delay 20 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_161327 + call_if_eq Route110_TrickHouseEntrance_EventScript_161327 msgbox Route110_TrickHouseEntrance_Text_19BD82, 4 closemessage delay 20 @@ -249,21 +242,21 @@ Route110_TrickHouseEntrance_EventScript_16124D:: @ 816124D applymovement 255, Route110_TrickHouseEntrance_Movement_1A0835 waitmovement 0 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612CD + call_if_eq Route110_TrickHouseEntrance_EventScript_1612CD compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612D6 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612D6 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612DF + call_if_eq Route110_TrickHouseEntrance_EventScript_1612DF compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 3 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612E8 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612E8 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 4 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612F1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1612F1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 5 - call_if 1, Route110_TrickHouseEntrance_EventScript_1612FA + call_if_eq Route110_TrickHouseEntrance_EventScript_1612FA compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 6 - call_if 1, Route110_TrickHouseEntrance_EventScript_161303 + call_if_eq Route110_TrickHouseEntrance_EventScript_161303 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 7 - call_if 1, Route110_TrickHouseEntrance_EventScript_16130C + call_if_eq Route110_TrickHouseEntrance_EventScript_16130C closemessage setvar VAR_TRICK_HOUSE_ENTRANCE_STATE_2, 1 warp MAP_ROUTE110_TRICK_HOUSE_ENTRANCE, 255, 6, 2 @@ -372,7 +365,7 @@ Route110_TrickHouseEntrance_EventScript_1613CE:: @ 81613CE compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -382,7 +375,7 @@ Route110_TrickHouseEntrance_EventScript_1613FA:: @ 81613FA compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -392,7 +385,7 @@ Route110_TrickHouseEntrance_EventScript_161426:: @ 8161426 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -402,7 +395,7 @@ Route110_TrickHouseEntrance_EventScript_161452:: @ 8161452 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -412,7 +405,7 @@ Route110_TrickHouseEntrance_EventScript_16147E:: @ 816147E compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -422,7 +415,7 @@ Route110_TrickHouseEntrance_EventScript_1614AA:: @ 81614AA compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -432,7 +425,7 @@ Route110_TrickHouseEntrance_EventScript_1614D6:: @ 81614D6 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161502 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02A5 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02A5 msgbox Route110_TrickHouseEntrance_Text_19C0FC, 4 releaseall end @@ -457,7 +450,7 @@ Route110_TrickHouseEntrance_EventScript_161518:: @ 8161518 compare RESULT, 1 goto_if_eq Route110_TrickHouseEntrance_EventScript_161551 compare RESULT, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1A02B8 + call_if_eq Route110_TrickHouseEntrance_EventScript_1A02B8 msgbox Route110_TrickHouseEntrance_Text_19C18D, 4 releaseall end @@ -727,11 +720,11 @@ Route110_TrickHouseEntrance_EventScript_1618B0:: @ 81618B0 msgbox Route110_TrickHouseEntrance_Text_19BA56, 4 releaseall compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 0 - call_if 1, Route110_TrickHouseEntrance_EventScript_1618E1 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618E1 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 1 - call_if 1, Route110_TrickHouseEntrance_EventScript_1618F6 + call_if_eq Route110_TrickHouseEntrance_EventScript_1618F6 compare VAR_TRICK_HOUSE_ROOMS_COMPLETED, 2 - call_if 1, Route110_TrickHouseEntrance_EventScript_16190B + call_if_eq Route110_TrickHouseEntrance_EventScript_16190B setvar VAR_TRICK_HOUSE_ENTRANCE_STATE, 1 end diff --git a/data/scripts/maps/Route110_TrickHousePuzzle2.inc b/data/scripts/maps/Route110_TrickHousePuzzle2.inc index b1cb0c9df..cdde15d1a 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle2.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle2.inc @@ -5,13 +5,13 @@ Route110_TrickHousePuzzle2_MapScripts:: @ 8161D76 Route110_TrickHousePuzzle2_MapScript1_161D81:: @ 8161D81 compare VAR_TEMP_1, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E2C + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E2C compare VAR_TEMP_2, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E3F + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E3F compare VAR_TEMP_3, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E52 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E52 compare VAR_TEMP_4, 1 - call_if 1, Route110_TrickHousePuzzle2_EventScript_161E65 + call_if_eq Route110_TrickHousePuzzle2_EventScript_161E65 end Route110_TrickHousePuzzle2_MapScript1_161DAE:: @ 8161DAE diff --git a/data/scripts/maps/Route110_TrickHousePuzzle3.inc b/data/scripts/maps/Route110_TrickHousePuzzle3.inc index 8d5392ae8..14a021e8d 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle3.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle3.inc @@ -6,9 +6,9 @@ Route110_TrickHousePuzzle3_MapScripts:: @ 8161EBD Route110_TrickHousePuzzle3_MapScript1_161EC8:: @ 8161EC8 call Route110_TrickHousePuzzle3_EventScript_161F12 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 end Route110_TrickHousePuzzle3_MapScript1_161EE4:: @ 8161EE4 @@ -32,19 +32,19 @@ Route110_TrickHousePuzzle3_EventScript_161F12:: @ 8161F12 setmetatile 1, 3, 600, 0 setmetatile 10, 2, 600, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161F9F + call_if_eq Route110_TrickHousePuzzle3_EventScript_161F9F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FA9 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FA9 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FB3 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FB3 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FBD + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FBD compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FC7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FC7 compare VAR_TEMP_8, 6 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FD1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FD1 compare VAR_TEMP_8, 7 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FDB + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FDB return Route110_TrickHousePuzzle3_EventScript_161F9F:: @ 8161F9F @@ -303,19 +303,19 @@ Route110_TrickHousePuzzle3_EventScript_162612:: @ 8162612 setvar VAR_TEMP_6, 0 setvar VAR_TEMP_7, 0 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162683 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162683 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162689 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162689 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle3_EventScript_16268F + call_if_eq Route110_TrickHousePuzzle3_EventScript_16268F compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle3_EventScript_162695 + call_if_eq Route110_TrickHousePuzzle3_EventScript_162695 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle3_EventScript_16269B + call_if_eq Route110_TrickHousePuzzle3_EventScript_16269B compare VAR_TEMP_8, 6 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A1 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A1 compare VAR_TEMP_8, 7 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1626A7 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1626A7 return Route110_TrickHousePuzzle3_EventScript_162683:: @ 8162683 @@ -348,9 +348,9 @@ Route110_TrickHousePuzzle3_EventScript_1626A7:: @ 81626A7 Route110_TrickHousePuzzle3_EventScript_1626AD:: @ 81626AD compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle3_EventScript_161FE5 + call_if_eq Route110_TrickHousePuzzle3_EventScript_161FE5 compare VAR_TEMP_9, 0 - call_if 1, Route110_TrickHousePuzzle3_EventScript_1622C8 + call_if_eq Route110_TrickHousePuzzle3_EventScript_1622C8 special DrawWholeMapView compare VAR_TEMP_9, 1 goto_if_eq Route110_TrickHousePuzzle3_EventScript_1626DD diff --git a/data/scripts/maps/Route110_TrickHousePuzzle5.inc b/data/scripts/maps/Route110_TrickHousePuzzle5.inc index 1bcdb8087..5ec1a4d64 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle5.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle5.inc @@ -166,11 +166,11 @@ Route110_TrickHousePuzzle5_EventScript_16293F:: @ 816293F applymovement 1, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D423, 4 random 3 switch RESULT @@ -188,11 +188,11 @@ Route110_TrickHousePuzzle5_EventScript_1629B3:: @ 81629B3 applymovement 2, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19D636, 4 random 3 switch RESULT @@ -210,11 +210,11 @@ Route110_TrickHousePuzzle5_EventScript_162A27:: @ 8162A27 applymovement 3, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D7D3, 4 random 3 switch RESULT @@ -232,11 +232,11 @@ Route110_TrickHousePuzzle5_EventScript_162A9B:: @ 8162A9B applymovement 4, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162DF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162DF3 compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E2B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E2B compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E63 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E63 msgbox Route110_TrickHousePuzzle5_Text_19D93D, 4 random 3 switch RESULT @@ -254,11 +254,11 @@ Route110_TrickHousePuzzle5_EventScript_162B0F:: @ 8162B0F applymovement 5, Route110_TrickHousePuzzle5_Movement_1A0835 waitmovement 0 compare VAR_TEMP_9, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162E9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162E9B compare VAR_TEMP_9, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162ED3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162ED3 compare VAR_TEMP_9, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F0B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F0B msgbox Route110_TrickHousePuzzle5_Text_19DA9A, 4 random 3 switch RESULT @@ -419,80 +419,80 @@ Route110_TrickHousePuzzle5_EventScript_162DE9:: @ 8162DE9 Route110_TrickHousePuzzle5_EventScript_162DF3:: @ 8162DF3 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F43 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F43 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F4E + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F4E compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F59 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F59 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F64 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F64 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F6F + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F6F return Route110_TrickHousePuzzle5_EventScript_162E2B:: @ 8162E2B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F7A + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F7A compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F85 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F85 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F90 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F90 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162F9B + call_if_eq Route110_TrickHousePuzzle5_EventScript_162F9B compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FA6 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FA6 return Route110_TrickHousePuzzle5_EventScript_162E63:: @ 8162E63 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FB1 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FB1 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FBC + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FBC compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FC7 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FC7 compare VAR_TEMP_9, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FD2 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FD2 compare VAR_TEMP_9, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FDD + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FDD return Route110_TrickHousePuzzle5_EventScript_162E9B:: @ 8162E9B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FE8 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FE8 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FF3 + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FF3 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_162FFE + call_if_eq Route110_TrickHousePuzzle5_EventScript_162FFE compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163009 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163009 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163014 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163014 return Route110_TrickHousePuzzle5_EventScript_162ED3:: @ 8162ED3 compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16301F + call_if_eq Route110_TrickHousePuzzle5_EventScript_16301F compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16302A + call_if_eq Route110_TrickHousePuzzle5_EventScript_16302A compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163035 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163035 compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163040 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163040 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16304B + call_if_eq Route110_TrickHousePuzzle5_EventScript_16304B return Route110_TrickHousePuzzle5_EventScript_162F0B:: @ 8162F0B compare VAR_TEMP_8, 1 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163056 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163056 compare VAR_TEMP_8, 2 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163061 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163061 compare VAR_TEMP_8, 3 - call_if 1, Route110_TrickHousePuzzle5_EventScript_16306C + call_if_eq Route110_TrickHousePuzzle5_EventScript_16306C compare VAR_TEMP_8, 4 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163077 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163077 compare VAR_TEMP_8, 5 - call_if 1, Route110_TrickHousePuzzle5_EventScript_163082 + call_if_eq Route110_TrickHousePuzzle5_EventScript_163082 return Route110_TrickHousePuzzle5_EventScript_162F43:: @ 8162F43 diff --git a/data/scripts/maps/Route110_TrickHousePuzzle7.inc b/data/scripts/maps/Route110_TrickHousePuzzle7.inc index d1de7682f..1ee608166 100644 --- a/data/scripts/maps/Route110_TrickHousePuzzle7.inc +++ b/data/scripts/maps/Route110_TrickHousePuzzle7.inc @@ -10,16 +10,11 @@ Route110_TrickHousePuzzle7_MapScript1_163161:: @ 8163161 end Route110_TrickHousePuzzle7_EventScript_163167:: @ 8163167 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 return Route110_TrickHousePuzzle7_EventScript_163195:: @ 8163195 @@ -87,7 +82,7 @@ Route110_TrickHousePuzzle7_EventScript_16326E:: @ 816326E Route110_TrickHousePuzzle7_MapScript1_16326F:: @ 816326F compare VAR_TRICK_HOUSE_PUZZLE_7_STATE_2, 1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163167 + call_if_eq Route110_TrickHousePuzzle7_EventScript_163167 end Route110_TrickHousePuzzle7_MapScript2_16327B:: @ 816327B @@ -121,76 +116,56 @@ Route110_TrickHousePuzzle7_EventScript_1632A8:: @ 81632A8 Route110_TrickHousePuzzle7_EventScript_1632B9:: @ 81632B9 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 0, Route110_TrickHousePuzzle7_EventScript_163195 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - call_if 1, Route110_TrickHousePuzzle7_EventScript_1631F4 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_163195 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1631F4 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633A4 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633A9 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A4 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_1, Route110_TrickHousePuzzle7_EventScript_1633A9 end Route110_TrickHousePuzzle7_EventScript_1632E8:: @ 81632E8 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631A8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163207 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1631A8 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_163207 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633AE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633B3 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633AE + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_2, Route110_TrickHousePuzzle7_EventScript_1633B3 end Route110_TrickHousePuzzle7_EventScript_163317:: @ 8163317 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631BB - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - call_if 1, Route110_TrickHousePuzzle7_EventScript_16321A + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1631BB + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_16321A special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633B8 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633BD + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633B8 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_3, Route110_TrickHousePuzzle7_EventScript_1633BD end Route110_TrickHousePuzzle7_EventScript_163346:: @ 8163346 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631CE - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - call_if 1, Route110_TrickHousePuzzle7_EventScript_16322D + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1631CE + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_16322D special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633C2 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633C7 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C2 + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_4, Route110_TrickHousePuzzle7_EventScript_1633C7 end Route110_TrickHousePuzzle7_EventScript_163375:: @ 8163375 lockall delay 32 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 0, Route110_TrickHousePuzzle7_EventScript_1631E1 - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - call_if 1, Route110_TrickHousePuzzle7_EventScript_163240 + call_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1631E1 + call_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_163240 special DrawWholeMapView playse SE_TK_KASYA - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - goto_if 0, Route110_TrickHousePuzzle7_EventScript_1633CC - checkflag FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5 - goto_if_eq Route110_TrickHousePuzzle7_EventScript_1633D1 + goto_if_unset FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633CC + goto_if_set FLAG_TRICK_HOUSE_PUZZLE_7_SWITCH_5, Route110_TrickHousePuzzle7_EventScript_1633D1 end Route110_TrickHousePuzzle7_EventScript_1633A4:: @ 81633A4 diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index c338091a0..11af07dce 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -4,8 +4,7 @@ Route111_MapScripts:: @ 814FF91 .byte 0 Route111_MapScript1_14FF9C:: @ 814FF9C - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route111_EventScript_14FFA6 + call_if_unset FLAG_REGI_DOORS_OPENED, Route111_EventScript_14FFA6 end Route111_EventScript_14FFA6:: @ 814FFA6 @@ -17,21 +16,21 @@ Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 checktrainerflag OPPONENT_VICKY - goto_if 0, Route111_EventScript_15000D + goto_if_lt Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 34 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C compare VAR_TEMP_1, 107 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_1, 72 - goto_if 2, Route111_EventScript_150009 + goto_if_gt Route111_EventScript_150009 compare VAR_TEMP_0, 2000 - goto_if 2, Route111_EventScript_15000C + goto_if_gt Route111_EventScript_15000C compare VAR_TEMP_0, 8 - goto_if 0, Route111_EventScript_15000C + goto_if_lt Route111_EventScript_15000C Route111_EventScript_150009:: @ 8150009 setweather WEATHER_SANDSTORM @@ -121,8 +120,7 @@ Route111_EventScript_1500C5:: @ 81500C5 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE111 - goto_if_eq Route111_EventScript_150100 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE111, Route111_EventScript_150100 msgbox Route111_Text_1C56F0, 4 giveitem_std ITEM_RAZZ_BERRY compare RESULT, 0 @@ -174,13 +172,13 @@ Route111_EventScript_150151:: @ 8150151 msgbox Route111_Text_1A0F93, 4 closemessage compare VAR_SPECIAL_4, 0 - call_if 1, Route111_EventScript_150188 + call_if_eq Route111_EventScript_150188 compare VAR_SPECIAL_4, 1 - call_if 1, Route111_EventScript_150193 + call_if_eq Route111_EventScript_150193 compare VAR_SPECIAL_4, 2 - call_if 1, Route111_EventScript_15019E + call_if_eq Route111_EventScript_15019E compare VAR_SPECIAL_4, 3 - call_if 1, Route111_EventScript_1501A9 + call_if_eq Route111_EventScript_1501A9 releaseall end diff --git a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc index 8352db786..020b51791 100644 --- a/data/scripts/maps/Route111_WinstrateFamilysHouse.inc +++ b/data/scripts/maps/Route111_WinstrateFamilysHouse.inc @@ -13,8 +13,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF3A:: @ 815BF3A lock faceplayer setvar VAR_SPECIAL_8, 3 - checkflag FLAG_RECEIVED_MACHO_BRACE - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BF72 + goto_if_set FLAG_RECEIVED_MACHO_BRACE, Route111_WinstrateFamilysHouse_EventScript_15BF72 msgbox Route111_WinstrateFamilysHouse_Text_19208A, 4 giveitem_std ITEM_MACHO_BRACE compare RESULT, 0 @@ -40,8 +39,7 @@ Route111_WinstrateFamilysHouse_EventScript_15BF95:: @ 815BF95 lock faceplayer setvar VAR_SPECIAL_8, 4 - checkflag FLAG_TEMP_4 - goto_if_eq Route111_WinstrateFamilysHouse_EventScript_15BFB6 + goto_if_set FLAG_TEMP_4, Route111_WinstrateFamilysHouse_EventScript_15BFB6 msgbox Route111_WinstrateFamilysHouse_Text_192219, 4 setflag FLAG_TEMP_4 goto Route111_WinstrateFamilysHouse_EventScript_15BFC4 diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index adbea780e..96eb68046 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -6,7 +6,7 @@ Route112_CableCarStation_MapScripts:: @ 815C033 Route112_CableCarStation_MapScript1_15C03E:: @ 815C03E setescapewarp MAP_ROUTE112, 255, 28, 28 compare VAR_CABLE_CAR_STATION_STATE, 2 - call_if 1, Route112_CableCarStation_EventScript_15C052 + call_if_eq Route112_CableCarStation_EventScript_15C052 end Route112_CableCarStation_EventScript_15C052:: @ 815C052 diff --git a/data/scripts/maps/Route113.inc b/data/scripts/maps/Route113.inc index a1593ba1e..41b289db0 100644 --- a/data/scripts/maps/Route113.inc +++ b/data/scripts/maps/Route113.inc @@ -15,9 +15,9 @@ Route113_MapScript1_1505DA:: @ 81505DA Route113_EventScript_1505E5:: @ 81505E5 getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_0, 19 - goto_if 0, Route113_EventScript_150604 + goto_if_lt Route113_EventScript_150604 compare VAR_TEMP_0, 84 - goto_if 2, Route113_EventScript_150604 + goto_if_gt Route113_EventScript_150604 setweather WEATHER_ASH return diff --git a/data/scripts/maps/Route113_GlassWorkshop.inc b/data/scripts/maps/Route113_GlassWorkshop.inc index 3f991277f..e42a6f89a 100644 --- a/data/scripts/maps/Route113_GlassWorkshop.inc +++ b/data/scripts/maps/Route113_GlassWorkshop.inc @@ -5,7 +5,7 @@ Route113_GlassWorkshop_MapScripts:: @ 816354A Route113_GlassWorkshop_MapScript1_163550:: @ 8163550 setflag FLAG_LANDMARK_GLASS_WORKSHOP compare VAR_GLASS_WORKSHOP_STATE, 1 - call_if 1, Route113_GlassWorkshop_EventScript_16355F + call_if_eq Route113_GlassWorkshop_EventScript_16355F end Route113_GlassWorkshop_EventScript_16355F:: @ 816355F @@ -16,7 +16,7 @@ Route113_GlassWorkshop_EventScript_163565:: @ 8163565 lock faceplayer compare VAR_GLASS_WORKSHOP_STATE, 10 - goto_if 4, Route113_GlassWorkshop_EventScript_1638D2 + goto_if_ge Route113_GlassWorkshop_EventScript_1638D2 compare VAR_GLASS_WORKSHOP_STATE, 2 goto_if_eq Route113_GlassWorkshop_EventScript_1635B5 compare VAR_GLASS_WORKSHOP_STATE, 1 @@ -39,7 +39,7 @@ Route113_GlassWorkshop_EventScript_1635B5:: @ 81635B5 goto_if_eq Route113_GlassWorkshop_EventScript_1635E4 msgbox Route113_GlassWorkshop_Text_19E65B, 4 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_163818 + goto_if_lt Route113_GlassWorkshop_EventScript_163818 message Route113_GlassWorkshop_Text_19E757 waitmessage goto Route113_GlassWorkshop_EventScript_1635EE @@ -71,7 +71,7 @@ Route113_GlassWorkshop_EventScript_163660:: @ 8163660 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 250 compare VAR_ASH_GATHER_COUNT, 250 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -85,7 +85,7 @@ Route113_GlassWorkshop_EventScript_16369C:: @ 816369C bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -99,7 +99,7 @@ Route113_GlassWorkshop_EventScript_1636D8:: @ 81636D8 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 500 compare VAR_ASH_GATHER_COUNT, 500 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -113,7 +113,7 @@ Route113_GlassWorkshop_EventScript_163714:: @ 8163714 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -127,7 +127,7 @@ Route113_GlassWorkshop_EventScript_163750:: @ 8163750 bufferitemname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 1000 compare VAR_ASH_GATHER_COUNT, 1000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -142,7 +142,7 @@ Route113_GlassWorkshop_EventScript_16378C:: @ 816378C bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 6000 compare VAR_ASH_GATHER_COUNT, 6000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -157,7 +157,7 @@ Route113_GlassWorkshop_EventScript_1637CD:: @ 81637CD bufferdecorationname 0, VAR_SPECIAL_8 setvar VAR_SPECIAL_A, 8000 compare VAR_ASH_GATHER_COUNT, 8000 - goto_if 0, Route113_GlassWorkshop_EventScript_163830 + goto_if_lt Route113_GlassWorkshop_EventScript_163830 msgbox Route113_GlassWorkshop_Text_19E7CD, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route113_GlassWorkshop_EventScript_163845 @@ -202,9 +202,9 @@ Route113_GlassWorkshop_EventScript_163851:: @ 8163851 fadescreen 0 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare VAR_SPECIAL_9, 0 - call_if 1, Route113_GlassWorkshop_EventScript_163889 + call_if_eq Route113_GlassWorkshop_EventScript_163889 compare VAR_SPECIAL_9, 1 - call_if 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end @@ -296,9 +296,9 @@ Route113_GlassWorkshop_EventScript_16399D:: @ 816399D Route113_GlassWorkshop_EventScript_1639B1:: @ 81639B1 msgbox Route113_GlassWorkshop_Text_19E9D7, 4 compare VAR_SPECIAL_9, 0 - call_if 1, Route113_GlassWorkshop_EventScript_163889 + call_if_eq Route113_GlassWorkshop_EventScript_163889 compare VAR_SPECIAL_9, 1 - call_if 1, Route113_GlassWorkshop_EventScript_1638A1 + call_if_eq Route113_GlassWorkshop_EventScript_1638A1 setvar VAR_GLASS_WORKSHOP_STATE, 2 release end diff --git a/data/scripts/maps/Route114.inc b/data/scripts/maps/Route114.inc index f6bb6d8ba..30ab8c572 100644 --- a/data/scripts/maps/Route114.inc +++ b/data/scripts/maps/Route114.inc @@ -5,8 +5,7 @@ Route114_EventScript_150733:: @ 8150733 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE114 - goto_if_eq Route114_EventScript_150778 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE114, Route114_EventScript_150778 msgbox Route114_Text_1C5803, 4 random 5 addvar RESULT, 15 @@ -27,8 +26,7 @@ Route114_EventScript_150778:: @ 8150778 Route114_EventScript_150782:: @ 8150782 lock faceplayer - checkflag FLAG_RECEIVED_TM05 - goto_if_eq Route114_EventScript_1507B9 + goto_if_set FLAG_RECEIVED_TM05, Route114_EventScript_1507B9 msgbox Route114_Text_170154, 4 giveitem_std ITEM_TM05 compare RESULT, 0 diff --git a/data/scripts/maps/Route114_FossilManiacsHouse.inc b/data/scripts/maps/Route114_FossilManiacsHouse.inc index 1a1445fde..b191db5f6 100644 --- a/data/scripts/maps/Route114_FossilManiacsHouse.inc +++ b/data/scripts/maps/Route114_FossilManiacsHouse.inc @@ -9,8 +9,7 @@ Route114_FossilManiacsHouse_MapScript1_15C1BF:: @ 815C1BF Route114_FossilManiacsHouse_EventScript_15C1C3:: @ 815C1C3 lock faceplayer - checkflag FLAG_RECEIVED_TM28 - goto_if_eq Route114_FossilManiacsHouse_EventScript_15C1F2 + goto_if_set FLAG_RECEIVED_TM28, Route114_FossilManiacsHouse_EventScript_15C1F2 msgbox Route114_FossilManiacsHouse_Text_1925E1, 4 giveitem_std ITEM_TM28 compare RESULT, 0 diff --git a/data/scripts/maps/Route114_FossilManiacsTunnel.inc b/data/scripts/maps/Route114_FossilManiacsTunnel.inc index 2ce9c1bfa..740a48314 100644 --- a/data/scripts/maps/Route114_FossilManiacsTunnel.inc +++ b/data/scripts/maps/Route114_FossilManiacsTunnel.inc @@ -4,8 +4,7 @@ Route114_FossilManiacsTunnel_MapScripts:: @ 815C20E Route114_FossilManiacsTunnel_EventScript_15C20F:: @ 815C20F lock faceplayer - checkflag FLAG_RECEIVED_FOSSIL_MON - goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C24E + goto_if_set FLAG_RECEIVED_FOSSIL_MON, Route114_FossilManiacsTunnel_EventScript_15C24E checkitem ITEM_ROOT_FOSSIL, 1 compare RESULT, 1 goto_if_eq Route114_FossilManiacsTunnel_EventScript_15C244 diff --git a/data/scripts/maps/Route114_LanettesHouse.inc b/data/scripts/maps/Route114_LanettesHouse.inc index c34d4fc7e..30eb844ac 100644 --- a/data/scripts/maps/Route114_LanettesHouse.inc +++ b/data/scripts/maps/Route114_LanettesHouse.inc @@ -9,8 +9,7 @@ Route114_LanettesHouse_MapScript1_15C25E:: @ 815C25E Route114_LanettesHouse_EventScript_15C262:: @ 815C262 lock faceplayer - checkflag FLAG_RECEIVED_DOLL_LANETTE - goto_if_eq Route114_LanettesHouse_EventScript_15C28F + goto_if_set FLAG_RECEIVED_DOLL_LANETTE, Route114_LanettesHouse_EventScript_15C28F setflag FLAG_SYS_PC_LANETTE msgbox Route114_LanettesHouse_Text_192A0D, 4 .ifdef SAPPHIRE @@ -41,7 +40,7 @@ Route114_LanettesHouse_EventScript_15C299:: @ 815C299 Route114_LanettesHouse_EventScript_15C2B7:: @ 815C2B7 msgbox Route114_LanettesHouse_Text_192C01, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route114_LanettesHouse_EventScript_15C2CC + call_if_eq Route114_LanettesHouse_EventScript_15C2CC releaseall end diff --git a/data/scripts/maps/Route116.inc b/data/scripts/maps/Route116.inc index 4e08705cf..eea14e25d 100644 --- a/data/scripts/maps/Route116.inc +++ b/data/scripts/maps/Route116.inc @@ -3,8 +3,7 @@ Route116_MapScripts:: @ 8150A31 .byte 0 Route116_MapScript1_150A37:: @ 8150A37 - checkflag FLAG_RECOVERED_DEVON_GOODS - call_if 1, Route116_EventScript_150A41 + call_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A41 end Route116_EventScript_150A41:: @ 8150A41 @@ -14,10 +13,8 @@ Route116_EventScript_150A41:: @ 8150A41 Route116_EventScript_150A49:: @ 8150A49 lock faceplayer - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq Route116_EventScript_150A67 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq Route116_EventScript_150A71 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, Route116_EventScript_150A67 + goto_if_set FLAG_DEVON_GOODS_STOLEN, Route116_EventScript_150A71 msgbox Route116_Text_1703CF, 4 release end @@ -35,8 +32,7 @@ Route116_EventScript_150A71:: @ 8150A71 Route116_EventScript_150A7B:: @ 8150A7B lock faceplayer - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq Route116_EventScript_150B04 + goto_if_set FLAG_MET_DEVON_EMPLOYEE, Route116_EventScript_150B04 msgbox Route116_Text_1705AE, 4 goto Route116_EventScript_150A94 end @@ -49,13 +45,13 @@ Route116_EventScript_150A94:: @ 8150A94 msgbox Route116_Text_1707B8, 4 closemessage compare FACING, 2 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 1 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 3 - call_if 1, Route116_EventScript_150AEE + call_if_eq Route116_EventScript_150AEE compare FACING, 4 - call_if 1, Route116_EventScript_150AF9 + call_if_eq Route116_EventScript_150AF9 removeobject LAST_TALKED clearflag FLAG_HIDE_EMPLOYEE_DEVON_CORP_3F setflag FLAG_RECEIVED_REPEAT_BALL @@ -182,13 +178,13 @@ Route116_EventScript_150BF4:: @ 8150BF4 Route116_EventScript_150C03:: @ 8150C03 delay 20 compare FACING, 2 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 1 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 3 - call_if 1, Route116_EventScript_150C37 + call_if_eq Route116_EventScript_150C37 compare FACING, 4 - call_if 1, Route116_EventScript_150C42 + call_if_eq Route116_EventScript_150C42 removeobject LAST_TALKED release end diff --git a/data/scripts/maps/Route116_TunnelersRestHouse.inc b/data/scripts/maps/Route116_TunnelersRestHouse.inc index 24091c4ac..5ec6ef642 100644 --- a/data/scripts/maps/Route116_TunnelersRestHouse.inc +++ b/data/scripts/maps/Route116_TunnelersRestHouse.inc @@ -17,8 +17,7 @@ Route116_TunnelersRestHouse_EventScript_15C2F1:: @ 815C2F1 Route116_TunnelersRestHouse_EventScript_15C2FA:: @ 815C2FA lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq Route116_TunnelersRestHouse_EventScript_15C30F + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, Route116_TunnelersRestHouse_EventScript_15C30F msgbox Route116_TunnelersRestHouse_Text_193135, 4 release end diff --git a/data/scripts/maps/Route117.inc b/data/scripts/maps/Route117.inc index fa648f79e..9f42412ab 100644 --- a/data/scripts/maps/Route117.inc +++ b/data/scripts/maps/Route117.inc @@ -7,8 +7,7 @@ Route117_MapScript1_150D40:: @ 8150D40 end Route117_EventScript_150D46:: @ 8150D46 - checkflag FLAG_PENDING_DAYCARE_EGG - goto_if 0, Route117_EventScript_150D56 + goto_if_unset FLAG_PENDING_DAYCARE_EGG, Route117_EventScript_150D56 setobjectxyperm 3, 47, 6 Route117_EventScript_150D56:: @ 8150D56 diff --git a/data/scripts/maps/Route118.inc b/data/scripts/maps/Route118.inc index a4452d989..569a7103e 100644 --- a/data/scripts/maps/Route118.inc +++ b/data/scripts/maps/Route118.inc @@ -9,8 +9,7 @@ Route118_MapScript1_150F2E:: @ 8150F2E Route118_EventScript_150F34:: @ 8150F34 lock faceplayer - checkflag FLAG_RECEIVED_GOOD_ROD - goto_if_eq Route118_EventScript_150F89 + goto_if_set FLAG_RECEIVED_GOOD_ROD, Route118_EventScript_150F89 msgbox Route118_Text_170F12, MSGBOX_YESNO compare RESULT, YES goto_if_eq Route118_EventScript_150F5E @@ -84,11 +83,11 @@ Route118_EventScript_151004:: @ 8151004 msgbox Route118_Text_170D66, 4 closemessage compare VAR_SPECIAL_8, 0 - call_if 1, Route118_EventScript_151048 + call_if_eq Route118_EventScript_151048 compare VAR_SPECIAL_8, 1 - call_if 1, Route118_EventScript_151053 + call_if_eq Route118_EventScript_151053 compare VAR_SPECIAL_8, 2 - call_if 1, Route118_EventScript_15105E + call_if_eq Route118_EventScript_15105E setvar VAR_ROUTE118_STATE, 1 removeobject 19 releaseall diff --git a/data/scripts/maps/Route119.inc b/data/scripts/maps/Route119.inc index 8d9f88474..4b9f3ce5f 100644 --- a/data/scripts/maps/Route119.inc +++ b/data/scripts/maps/Route119.inc @@ -4,15 +4,14 @@ Route119_MapScripts:: @ 8151167 .byte 0 Route119_MapScript1_151172:: @ 8151172 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route119_EventScript_15117C + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route119_EventScript_15117C end Route119_EventScript_15117C:: @ 815117C compare VAR_SPECIAL_4, 6 - call_if 1, Route119_EventScript_151193 + call_if_eq Route119_EventScript_151193 compare VAR_SPECIAL_4, 7 - call_if 1, Route119_EventScript_151197 + call_if_eq Route119_EventScript_151197 return Route119_EventScript_151193:: @ 8151193 @@ -28,7 +27,7 @@ Route119_MapScript1_15119B:: @ 815119B call Route119_EventScript_1A0172 call Route119_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_EventScript_1511B9 + call_if_eq Route119_EventScript_1511B9 special SetRoute119Weather end @@ -53,21 +52,21 @@ Route119_EventScript_1511DB:: @ 81511DB addobject 25 checkplayergender compare RESULT, 0 - call_if 1, Route119_EventScript_151254 + call_if_eq Route119_EventScript_151254 compare RESULT, 1 - call_if 1, Route119_EventScript_151259 + call_if_eq Route119_EventScript_151259 delay 65 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513A6 + call_if_eq Route119_EventScript_1513A6 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513B1 + call_if_eq Route119_EventScript_1513B1 applymovement 255, Route119_Movement_1A0845 waitmovement 0 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513D2 + call_if_eq Route119_EventScript_1513D2 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513E1 + call_if_eq Route119_EventScript_1513E1 removeobject 25 addobject 16 delay 30 @@ -155,16 +154,16 @@ Route119_EventScript_151352:: @ 8151352 Route119_EventScript_151362:: @ 8151362 closemessage compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513D2 + call_if_eq Route119_EventScript_1513D2 compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513E1 + call_if_eq Route119_EventScript_1513E1 removeobject 16 addobject 25 delay 30 compare VAR_TEMP_1, 1 - call_if 1, Route119_EventScript_1513BC + call_if_eq Route119_EventScript_1513BC compare VAR_TEMP_1, 2 - call_if 1, Route119_EventScript_1513C7 + call_if_eq Route119_EventScript_1513C7 removeobject 25 setvar VAR_ROUTE119_STATE, 1 savebgm 0 diff --git a/data/scripts/maps/Route119_WeatherInstitute_1F.inc b/data/scripts/maps/Route119_WeatherInstitute_1F.inc index 8a5c1033f..e5ca6550b 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_1F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_1F.inc @@ -5,7 +5,7 @@ Route119_WeatherInstitute_1F_MapScripts:: @ 8163C2A Route119_WeatherInstitute_1F_MapScript1_163C30:: @ 8163C30 call Route119_WeatherInstitute_1F_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_1F_EventScript_163C41 + call_if_eq Route119_WeatherInstitute_1F_EventScript_163C41 end Route119_WeatherInstitute_1F_EventScript_163C41:: @ 8163C41 diff --git a/data/scripts/maps/Route119_WeatherInstitute_2F.inc b/data/scripts/maps/Route119_WeatherInstitute_2F.inc index b36500345..81037941f 100644 --- a/data/scripts/maps/Route119_WeatherInstitute_2F.inc +++ b/data/scripts/maps/Route119_WeatherInstitute_2F.inc @@ -5,9 +5,9 @@ Route119_WeatherInstitute_2F_MapScripts:: @ 8163CC2 Route119_WeatherInstitute_2F_MapScript1_163CC8:: @ 8163CC8 call Route119_WeatherInstitute_2F_EventScript_1A0196 compare VAR_WEATHER_INSTITUTE_STATE, 0 - call_if 1, Route119_WeatherInstitute_2F_EventScript_163CE4 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CE4 compare VAR_WEATHER_INSTITUTE_STATE, 1 - call_if 1, Route119_WeatherInstitute_2F_EventScript_163CF0 + call_if_eq Route119_WeatherInstitute_2F_EventScript_163CF0 end Route119_WeatherInstitute_2F_EventScript_163CE4:: @ 8163CE4 @@ -87,7 +87,6 @@ Route119_WeatherInstitute_2F_Movement_163DC8:: @ 8163DC8 Route119_WeatherInstitute_2F_EventScript_163DCC:: @ 8163DCC lock faceplayer - checkflag FLAG_RECEIVED_CASTFORM - goto_if_eq Route119_WeatherInstitute_2F_EventScript_163DBE + goto_if_set FLAG_RECEIVED_CASTFORM, Route119_WeatherInstitute_2F_EventScript_163DBE goto Route119_WeatherInstitute_2F_EventScript_163D7A end diff --git a/data/scripts/maps/Route120.inc b/data/scripts/maps/Route120.inc index bacdcd7dd..b49834564 100644 --- a/data/scripts/maps/Route120.inc +++ b/data/scripts/maps/Route120.inc @@ -5,23 +5,22 @@ Route120_MapScripts:: @ 815160E .byte 0 Route120_MapScript1_15161E:: @ 815161E - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, Route120_EventScript_151628 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, Route120_EventScript_151628 end Route120_EventScript_151628:: @ 8151628 compare VAR_SPECIAL_4, 0 - call_if 1, Route120_EventScript_15166B + call_if_eq Route120_EventScript_15166B compare VAR_SPECIAL_4, 1 - call_if 1, Route120_EventScript_151672 + call_if_eq Route120_EventScript_151672 compare VAR_SPECIAL_4, 2 - call_if 1, Route120_EventScript_151676 + call_if_eq Route120_EventScript_151676 compare VAR_SPECIAL_4, 3 - call_if 1, Route120_EventScript_15167A + call_if_eq Route120_EventScript_15167A compare VAR_SPECIAL_4, 4 - call_if 1, Route120_EventScript_15167E + call_if_eq Route120_EventScript_15167E compare VAR_SPECIAL_4, 5 - call_if 1, Route120_EventScript_151682 + call_if_eq Route120_EventScript_151682 return Route120_EventScript_15166B:: @ 815166B @@ -50,12 +49,9 @@ Route120_EventScript_151682:: @ 8151682 return Route120_MapScript1_151686:: @ 8151686 - checkflag FLAG_REGI_DOORS_OPENED - call_if 0, Route120_EventScript_1516A2 - checkflag FLAG_RECEIVED_DEVON_SCOPE - call_if 1, Route120_EventScript_1516B5 - checkflag FLAG_RECEIVED_DEVON_SCOPE - call_if 0, Route120_EventScript_1516DA + call_if_unset FLAG_REGI_DOORS_OPENED, Route120_EventScript_1516A2 + call_if_set FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516B5 + call_if_unset FLAG_RECEIVED_DEVON_SCOPE, Route120_EventScript_1516DA end Route120_EventScript_1516A2:: @ 81516A2 @@ -82,11 +78,11 @@ Route120_MapScript1_1516DF:: @ 81516DF Route120_EventScript_1516EA:: @ 81516EA getplayerxy VAR_TEMP_0, VAR_TEMP_1 compare VAR_TEMP_1, 14 - goto_if 3, Route120_EventScript_151715 + goto_if_le Route120_EventScript_151715 compare VAR_TEMP_1, 60 - goto_if 3, Route120_EventScript_151719 + goto_if_le Route120_EventScript_151719 compare VAR_TEMP_1, 61 - goto_if 4, Route120_EventScript_151711 + goto_if_ge Route120_EventScript_151711 return Route120_EventScript_151711:: @ 8151711 @@ -99,9 +95,9 @@ Route120_EventScript_151715:: @ 8151715 Route120_EventScript_151719:: @ 8151719 compare VAR_TEMP_0, 7 - goto_if 3, Route120_EventScript_151735 + goto_if_le Route120_EventScript_151735 compare VAR_TEMP_0, 19 - goto_if 3, Route120_EventScript_151715 + goto_if_le Route120_EventScript_151715 goto Route120_EventScript_151735 end @@ -113,13 +109,12 @@ Route120_EventScript_151739:: @ 8151739 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_ROUTE120 - goto_if_eq Route120_EventScript_151837 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_ROUTE120, Route120_EventScript_151837 msgbox Route120_Text_1C58F1, MSGBOX_YESNO compare RESULT, YES - call_if 1, Route120_EventScript_151841 + call_if_eq Route120_EventScript_151841 compare RESULT, NO - call_if 1, Route120_EventScript_15184A + call_if_eq Route120_EventScript_15184A specialvar RESULT, GetPlayerTrainerIdOnesDigit switch RESULT case 0, Route120_EventScript_1517DC @@ -184,8 +179,7 @@ Route120_EventScript_15184A:: @ 815184A Route120_EventScript_151853:: @ 8151853 lock faceplayer - checkflag FLAG_NOT_READY_FOR_BATTLE_ROUTE120 - goto_if_eq Route120_EventScript_151884 + goto_if_set FLAG_NOT_READY_FOR_BATTLE_ROUTE120, Route120_EventScript_151884 msgbox Route120_Text_171827, MSGBOX_YESNO compare RESULT, NO goto_if_eq Route120_EventScript_151877 @@ -209,9 +203,9 @@ Route120_EventScript_15189D:: @ 815189D msgbox Route120_Text_1719A0, 4 closemessage compare FACING, 2 - call_if 1, Route120_EventScript_15197F + call_if_eq Route120_EventScript_15197F compare FACING, 3 - call_if 1, Route120_EventScript_15198A + call_if_eq Route120_EventScript_15198A applymovement 31, Route120_Movement_1A083F waitmovement 0 delay 20 diff --git a/data/scripts/maps/Route121_SafariZoneEntrance.inc b/data/scripts/maps/Route121_SafariZoneEntrance.inc index ded372aa6..2648e19ce 100644 --- a/data/scripts/maps/Route121_SafariZoneEntrance.inc +++ b/data/scripts/maps/Route121_SafariZoneEntrance.inc @@ -89,7 +89,7 @@ Route121_SafariZoneEntrance_EventScript_15C3B3:: @ 815C3B3 Route121_SafariZoneEntrance_EventScript_15C425:: @ 815C425 getpartysize compare RESULT, 6 - goto_if 5, Route121_SafariZoneEntrance_EventScript_15C44F + goto_if_ne Route121_SafariZoneEntrance_EventScript_15C44F specialvar RESULT, CheckFreePokemonStorageSpace compare RESULT, 1 goto_if_eq Route121_SafariZoneEntrance_EventScript_15C44F diff --git a/data/scripts/maps/Route123.inc b/data/scripts/maps/Route123.inc index a25c306cc..5f77ea023 100644 --- a/data/scripts/maps/Route123.inc +++ b/data/scripts/maps/Route123.inc @@ -9,8 +9,7 @@ Route123_MapScript1_151C59:: @ 8151C59 Route123_EventScript_151C5D:: @ 8151C5D lock faceplayer - checkflag FLAG_RECEIVED_TM19 - goto_if_eq Route123_EventScript_151CAC + goto_if_set FLAG_RECEIVED_TM19, Route123_EventScript_151CAC msgbox Route123_Text_171D83, 4 special IsGrassTypeInParty compare RESULT, 0 diff --git a/data/scripts/maps/Route123_BerryMastersHouse.inc b/data/scripts/maps/Route123_BerryMastersHouse.inc index 26edb6fbb..3356df83b 100644 --- a/data/scripts/maps/Route123_BerryMastersHouse.inc +++ b/data/scripts/maps/Route123_BerryMastersHouse.inc @@ -10,8 +10,7 @@ Route123_BerryMastersHouse_EventScript_1639E9:: @ 81639E9 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER - goto_if_eq Route123_BerryMastersHouse_EventScript_163A5A + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER, Route123_BerryMastersHouse_EventScript_163A5A msgbox Route123_BerryMastersHouse_Text_1C5BC4, 4 random 10 addvar RESULT, 20 @@ -40,8 +39,7 @@ Route123_BerryMastersHouse_EventScript_163A64:: @ 8163A64 lock faceplayer dodailyevents - checkflag FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE - goto_if_eq Route123_BerryMastersHouse_EventScript_163C13 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_FROM_BERRYMASTER_WIFE, Route123_BerryMastersHouse_EventScript_163C13 msgbox Route123_BerryMastersHouse_Text_1C5D24, 4 setvar VAR_SPECIAL_4, 13 call Route123_BerryMastersHouse_EventScript_1A00F3 @@ -86,8 +84,7 @@ Route123_BerryMastersHouse_EventScript_163AF0:: @ 8163AF0 end Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E - checkflag FLAG_RECEIVED_SPELON_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_SPELON_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_SPELON_BERRY compare RESULT, 0 @@ -97,8 +94,7 @@ Route123_BerryMastersHouse_EventScript_163B1E:: @ 8163B1E end Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F - checkflag FLAG_RECEIVED_PAMTRE_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_PAMTRE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_PAMTRE_BERRY compare RESULT, 0 @@ -108,8 +104,7 @@ Route123_BerryMastersHouse_EventScript_163B4F:: @ 8163B4F end Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 - checkflag FLAG_RECEIVED_WATMEL_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_WATMEL_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_WATMEL_BERRY compare RESULT, 0 @@ -119,8 +114,7 @@ Route123_BerryMastersHouse_EventScript_163B80:: @ 8163B80 end Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 - checkflag FLAG_RECEIVED_DURIN_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_DURIN_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_DURIN_BERRY compare RESULT, 0 @@ -130,8 +124,7 @@ Route123_BerryMastersHouse_EventScript_163BB1:: @ 8163BB1 end Route123_BerryMastersHouse_EventScript_163BE2:: @ 8163BE2 - checkflag FLAG_RECEIVED_BELUE_BERRY - goto_if_eq Route123_BerryMastersHouse_EventScript_163AF0 + goto_if_set FLAG_RECEIVED_BELUE_BERRY, Route123_BerryMastersHouse_EventScript_163AF0 msgbox Route123_BerryMastersHouse_Text_1C5DC1, 4 giveitem_std ITEM_BELUE_BERRY compare RESULT, 0 diff --git a/data/scripts/maps/Route124.inc b/data/scripts/maps/Route124.inc index 289ea2d29..3f02fc6e3 100644 --- a/data/scripts/maps/Route124.inc +++ b/data/scripts/maps/Route124.inc @@ -3,8 +3,7 @@ Route124_MapScripts:: @ 8151DDF .byte 0 Route124_MapScript1_151DE5:: @ 8151DE5 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route124_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route124_EventScript_1A02C1 end Route124_EventScript_151DEF:: @ 8151DEF diff --git a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc index 9423cf845..7bcddfe19 100644 --- a/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc +++ b/data/scripts/maps/Route124_DivingTreasureHuntersHouse.inc @@ -9,8 +9,7 @@ Route124_DivingTreasureHuntersHouse_MapScript1_163E00:: @ 8163E00 Route124_DivingTreasureHuntersHouse_EventScript_163E04:: @ 8163E04 lock faceplayer - checkflag FLAG_MET_DIVING_TREASURE_HUNTER - goto_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E20 + goto_if_set FLAG_MET_DIVING_TREASURE_HUNTER, Route124_DivingTreasureHuntersHouse_EventScript_163E20 msgbox Route124_DivingTreasureHuntersHouse_Text_19F416, 4 setflag FLAG_MET_DIVING_TREASURE_HUNTER goto Route124_DivingTreasureHuntersHouse_EventScript_163E2E @@ -32,16 +31,16 @@ Route124_DivingTreasureHuntersHouse_EventScript_163E44:: @ 8163E44 setvar VAR_TEMP_1, 0 checkitem ITEM_RED_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E8A + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E8A checkitem ITEM_YELLOW_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E90 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E90 checkitem ITEM_BLUE_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E96 + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E96 checkitem ITEM_GREEN_SHARD, 1 compare RESULT, 1 - call_if 1, Route124_DivingTreasureHuntersHouse_EventScript_163E9C + call_if_eq Route124_DivingTreasureHuntersHouse_EventScript_163E9C return Route124_DivingTreasureHuntersHouse_EventScript_163E8A:: @ 8163E8A diff --git a/data/scripts/maps/Route125.inc b/data/scripts/maps/Route125.inc index 58bf75c51..a1495ac83 100644 --- a/data/scripts/maps/Route125.inc +++ b/data/scripts/maps/Route125.inc @@ -3,8 +3,7 @@ Route125_MapScripts:: @ 8151F1E .byte 0 Route125_MapScript1_151F24:: @ 8151F24 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route125_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route125_EventScript_1A02C1 end Route125_EventScript_151F2E:: @ 8151F2E diff --git a/data/scripts/maps/Route126.inc b/data/scripts/maps/Route126.inc index a89087994..4a28abfb7 100644 --- a/data/scripts/maps/Route126.inc +++ b/data/scripts/maps/Route126.inc @@ -3,8 +3,7 @@ Route126_MapScripts:: @ 8151FFE .byte 0 Route126_MapScript1_152004:: @ 8152004 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route126_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route126_EventScript_1A02C1 end Route126_EventScript_15200E:: @ 815200E diff --git a/data/scripts/maps/Route127.inc b/data/scripts/maps/Route127.inc index 5fb122821..7552f7c5d 100644 --- a/data/scripts/maps/Route127.inc +++ b/data/scripts/maps/Route127.inc @@ -3,8 +3,7 @@ Route127_MapScripts:: @ 815206A .byte 0 Route127_MapScript1_152070:: @ 8152070 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route127_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route127_EventScript_1A02C1 end Route127_EventScript_15207A:: @ 815207A diff --git a/data/scripts/maps/Route128.inc b/data/scripts/maps/Route128.inc index a97a1e93f..6550db979 100644 --- a/data/scripts/maps/Route128.inc +++ b/data/scripts/maps/Route128.inc @@ -4,8 +4,7 @@ Route128_MapScripts:: @ 815211B .byte 0 Route128_MapScript1_152126:: @ 8152126 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, Route128_EventScript_1A02C1 + call_if_set FLAG_SYS_WEATHER_CTRL, Route128_EventScript_1A02C1 call Route128_EventScript_1A0196 end diff --git a/data/scripts/maps/Route131.inc b/data/scripts/maps/Route131.inc index efa26ecd2..ffd204bb9 100644 --- a/data/scripts/maps/Route131.inc +++ b/data/scripts/maps/Route131.inc @@ -3,8 +3,7 @@ Route131_MapScripts:: @ 815243E .byte 0 Route131_MapScript1_152444:: @ 8152444 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, Route131_EventScript_15244E + call_if_set FLAG_SYS_GAME_CLEAR, Route131_EventScript_15244E end Route131_EventScript_15244E:: @ 815244E diff --git a/data/scripts/maps/RustboroCity.inc b/data/scripts/maps/RustboroCity.inc index c6bdbbdb7..415138d67 100644 --- a/data/scripts/maps/RustboroCity.inc +++ b/data/scripts/maps/RustboroCity.inc @@ -11,8 +11,7 @@ RustboroCity_MapScript1_14C378:: @ 814C378 RustboroCity_EventScript_14C386:: @ 814C386 lock faceplayer - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_EventScript_14C39B + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_EventScript_14C39B msgbox RustboroCity_Text_16689D, 4 release end @@ -36,8 +35,7 @@ RustboroCity_EventScript_14C3B1:: @ 814C3B1 RustboroCity_EventScript_14C3BA:: @ 814C3BA lock faceplayer - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_EventScript_14C3CF + goto_if_set FLAG_BADGE01_GET, RustboroCity_EventScript_14C3CF msgbox RustboroCity_Text_16696D, 4 release end @@ -50,8 +48,7 @@ RustboroCity_EventScript_14C3CF:: @ 814C3CF RustboroCity_EventScript_14C3D9:: @ 814C3D9 lock faceplayer - checkflag FLAG_RECEIVED_POKENAV - goto_if_eq RustboroCity_EventScript_14C3EE + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_EventScript_14C3EE msgbox RustboroCity_Text_166B86, 4 release end @@ -326,8 +323,7 @@ RustboroCity_Movement_14C5F7:: @ 814C5F7 RustboroCity_EventScript_14C5FF:: @ 814C5FF lock faceplayer - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_EventScript_14C614 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_EventScript_14C614 msgbox RustboroCity_Text_166F6B, 4 release end @@ -364,13 +360,13 @@ RustboroCity_EventScript_14C644:: @ 814C644 RustboroCity_EventScript_14C650:: @ 814C650 compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C691 + call_if_eq RustboroCity_EventScript_14C691 compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C6BD + call_if_eq RustboroCity_EventScript_14C6BD compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C6E9 + call_if_eq RustboroCity_EventScript_14C6E9 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C715 + call_if_eq RustboroCity_EventScript_14C715 setflag FLAG_UNKNOWN_9F setvar VAR_RUSTBORO_STATE, 3 moveobjectoffscreen 9 @@ -458,19 +454,19 @@ RustboroCity_EventScript_14C771:: @ 814C771 RustboroCity_EventScript_14C77D:: @ 814C77D compare VAR_TEMP_1, 0 - call_if 1, RustboroCity_EventScript_14C7FE + call_if_eq RustboroCity_EventScript_14C7FE compare VAR_TEMP_1, 1 - call_if 1, RustboroCity_EventScript_14C82A + call_if_eq RustboroCity_EventScript_14C82A compare VAR_TEMP_1, 2 - call_if 1, RustboroCity_EventScript_14C856 + call_if_eq RustboroCity_EventScript_14C856 compare VAR_TEMP_1, 3 - call_if 1, RustboroCity_EventScript_14C882 + call_if_eq RustboroCity_EventScript_14C882 compare VAR_TEMP_1, 4 - call_if 1, RustboroCity_EventScript_14C8B8 + call_if_eq RustboroCity_EventScript_14C8B8 msgbox RustboroCity_Text_166FB4, 4 giveitem_std ITEM_GREAT_BALL compare RESULT, 0 - call_if 1, RustboroCity_EventScript_14C7F5 + call_if_eq RustboroCity_EventScript_14C7F5 msgbox RustboroCity_Text_16707F, 4 closemessage setflag FLAG_RETURNED_DEVON_GOODS @@ -549,8 +545,7 @@ RustboroCity_EventScript_14C8B8:: @ 814C8B8 RustboroCity_EventScript_14C8DA:: @ 814C8DA lock faceplayer - checkflag FLAG_MET_RIVAL_RUSTBORO - goto_if_eq RustboroCity_EventScript_14C917 + goto_if_set FLAG_MET_RIVAL_RUSTBORO, RustboroCity_EventScript_14C917 checkplayergender compare RESULT, 0 goto_if_eq RustboroCity_EventScript_14C8FD diff --git a/data/scripts/maps/RustboroCity_CuttersHouse.inc b/data/scripts/maps/RustboroCity_CuttersHouse.inc index 3371005c0..e18a1e029 100644 --- a/data/scripts/maps/RustboroCity_CuttersHouse.inc +++ b/data/scripts/maps/RustboroCity_CuttersHouse.inc @@ -4,8 +4,7 @@ RustboroCity_CuttersHouse_MapScripts:: @ 8157D26 RustboroCity_CuttersHouse_EventScript_157D27:: @ 8157D27 lock faceplayer - checkflag FLAG_RECEIVED_HM01 - goto_if_eq RustboroCity_CuttersHouse_EventScript_157D53 + goto_if_set FLAG_RECEIVED_HM01, RustboroCity_CuttersHouse_EventScript_157D53 msgbox RustboroCity_CuttersHouse_Text_18509C, 4 giveitem_std ITEM_HM01 setflag FLAG_RECEIVED_HM01 diff --git a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc index f9e902763..7b56c72a2 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_1F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_1F.inc @@ -3,8 +3,7 @@ RustboroCity_DevonCorp_1F_MapScripts:: @ 8157406 .byte 0 RustboroCity_DevonCorp_1F_MapScript1_15740C:: @ 815740C - checkflag FLAG_RETURNED_DEVON_GOODS - call_if 0, RustboroCity_DevonCorp_1F_EventScript_157416 + call_if_unset FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157416 end RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 @@ -15,10 +14,8 @@ RustboroCity_DevonCorp_1F_EventScript_157416:: @ 8157416 RustboroCity_DevonCorp_1F_EventScript_157422:: @ 8157422 lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15744A - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157440 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15744A + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157440 msgbox RustboroCity_DevonCorp_1F_Text_1829A4, 4 release end @@ -36,12 +33,9 @@ RustboroCity_DevonCorp_1F_EventScript_15744A:: @ 815744A RustboroCity_DevonCorp_1F_EventScript_157454:: @ 8157454 lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_15747B - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_15747B + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_157485 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_157485 msgbox RustboroCity_DevonCorp_1F_Text_182AF0, 4 release end @@ -59,12 +53,9 @@ RustboroCity_DevonCorp_1F_EventScript_157485:: @ 8157485 RustboroCity_DevonCorp_1F_EventScript_15748F:: @ 815748F lock faceplayer - checkflag FLAG_RETURNED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574B6 - checkflag FLAG_RECOVERED_DEVON_GOODS - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 - checkflag FLAG_DEVON_GOODS_STOLEN - goto_if_eq RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_set FLAG_RETURNED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574B6 + goto_if_set FLAG_RECOVERED_DEVON_GOODS, RustboroCity_DevonCorp_1F_EventScript_1574C0 + goto_if_set FLAG_DEVON_GOODS_STOLEN, RustboroCity_DevonCorp_1F_EventScript_1574C0 msgbox RustboroCity_DevonCorp_1F_Text_1828EE, 4 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc index 179140378..b7b36dd6d 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_2F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_2F.inc @@ -4,7 +4,7 @@ RustboroCity_DevonCorp_2F_MapScripts:: @ 81574CA RustboroCity_DevonCorp_2F_MapScript1_1574D0:: @ 81574D0 compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC end RustboroCity_DevonCorp_2F_EventScript_1574DC:: @ 81574DC @@ -15,7 +15,7 @@ RustboroCity_DevonCorp_2F_EventScript_1574E2:: @ 81574E2 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182B81, 4 release end @@ -24,9 +24,8 @@ RustboroCity_DevonCorp_2F_EventScript_1574F9:: @ 81574F9 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157519 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_DevonCorp_2F_EventScript_157519 msgbox RustboroCity_DevonCorp_2F_Text_182BD8, 4 release end @@ -40,9 +39,8 @@ RustboroCity_DevonCorp_2F_EventScript_157523:: @ 8157523 lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC - checkflag FLAG_RECEIVED_POKENAV - goto_if_eq RustboroCity_DevonCorp_2F_EventScript_157543 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC + goto_if_set FLAG_RECEIVED_POKENAV, RustboroCity_DevonCorp_2F_EventScript_157543 msgbox RustboroCity_DevonCorp_2F_Text_182D2A, 4 release end @@ -56,7 +54,7 @@ RustboroCity_DevonCorp_2F_EventScript_15754D:: @ 815754D lock faceplayer compare VAR_FOSSIL_RESURRECTION_STATE, 1 - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1574DC + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1574DC msgbox RustboroCity_DevonCorp_2F_Text_182E6B, 4 release end @@ -147,7 +145,7 @@ RustboroCity_DevonCorp_2F_EventScript_157661:: @ 8157661 givemon SPECIES_LILEEP, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end @@ -167,7 +165,7 @@ RustboroCity_DevonCorp_2F_EventScript_1576B4:: @ 81576B4 givemon SPECIES_ANORITH, 20, ITEM_NONE, 0x0, 0x0, 0 msgbox RustboroCity_DevonCorp_2F_Text_1A1102, MSGBOX_YESNO compare RESULT, YES - call_if 1, RustboroCity_DevonCorp_2F_EventScript_1A0678 + call_if_eq RustboroCity_DevonCorp_2F_EventScript_1A0678 release end diff --git a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc index ff854d7ef..0b71effee 100644 --- a/data/scripts/maps/RustboroCity_DevonCorp_3F.inc +++ b/data/scripts/maps/RustboroCity_DevonCorp_3F.inc @@ -6,7 +6,7 @@ RustboroCity_DevonCorp_3F_MapScripts:: @ 8157711 RustboroCity_DevonCorp_3F_MapScript1_157721:: @ 8157721 compare VAR_DEVON_CORP_3F_STATE, 0 - call_if 1, RustboroCity_DevonCorp_3F_EventScript_15772D + call_if_eq RustboroCity_DevonCorp_3F_EventScript_15772D end RustboroCity_DevonCorp_3F_EventScript_15772D:: @ 815772D @@ -146,10 +146,8 @@ RustboroCity_DevonCorp_3F_Movement_157835:: @ 8157835 RustboroCity_DevonCorp_3F_EventScript_15783B:: @ 815783B lock faceplayer - 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 + goto_if_set FLAG_RECEIVED_EXP_SHARE, RustboroCity_DevonCorp_3F_EventScript_15789B + goto_if_set FLAG_DELIVERED_STEVEN_LETTER, RustboroCity_DevonCorp_3F_EventScript_157864 msgbox RustboroCity_DevonCorp_3F_Text_18351E, 4 closemessage applymovement LAST_TALKED, RustboroCity_DevonCorp_3F_Movement_1A083D @@ -181,8 +179,7 @@ RustboroCity_DevonCorp_3F_EventScript_15789B:: @ 815789B RustboroCity_DevonCorp_3F_EventScript_1578B0:: @ 81578B0 lock faceplayer - checkflag FLAG_RECEIVED_REPEAT_BALL - goto_if_eq RustboroCity_DevonCorp_3F_EventScript_1578C5 + goto_if_set FLAG_RECEIVED_REPEAT_BALL, RustboroCity_DevonCorp_3F_EventScript_1578C5 msgbox RustboroCity_DevonCorp_3F_Text_18395C, 4 release end diff --git a/data/scripts/maps/RustboroCity_Flat2_2F.inc b/data/scripts/maps/RustboroCity_Flat2_2F.inc index 3a2242c7a..5ed9ac0ef 100644 --- a/data/scripts/maps/RustboroCity_Flat2_2F.inc +++ b/data/scripts/maps/RustboroCity_Flat2_2F.inc @@ -8,8 +8,7 @@ RustboroCity_Flat2_2F_EventScript_157D97:: @ 8157D97 RustboroCity_Flat2_2F_EventScript_157DA0:: @ 8157DA0 lock faceplayer - checkflag FLAG_RECEIVED_PREMIER_BALL_RUSTBORO - goto_if_eq RustboroCity_Flat2_2F_EventScript_157DCF + goto_if_set FLAG_RECEIVED_PREMIER_BALL_RUSTBORO, RustboroCity_Flat2_2F_EventScript_157DCF msgbox RustboroCity_Flat2_2F_Text_185461, 4 giveitem_std ITEM_PREMIER_BALL compare RESULT, 0 diff --git a/data/scripts/maps/RustboroCity_Gym.inc b/data/scripts/maps/RustboroCity_Gym.inc index 1e2256b47..bcd597541 100644 --- a/data/scripts/maps/RustboroCity_Gym.inc +++ b/data/scripts/maps/RustboroCity_Gym.inc @@ -3,8 +3,7 @@ RustboroCity_Gym_MapScripts:: @ 81578D8 RustboroCity_Gym_EventScript_1578D9:: @ 81578D9 trainerbattle 1, OPPONENT_ROXANNE, 0, RustboroCity_Gym_Text_183EE5, RustboroCity_Gym_Text_183FC4, RustboroCity_Gym_EventScript_1578FE - checkflag FLAG_RECEIVED_TM39 - goto_if 0, RustboroCity_Gym_EventScript_15793C + goto_if_unset FLAG_RECEIVED_TM39, RustboroCity_Gym_EventScript_15793C msgbox RustboroCity_Gym_Text_184252, 4 release end @@ -21,7 +20,7 @@ RustboroCity_Gym_EventScript_1578FE:: @ 81578FE setvar VAR_SPECIAL_8, 1 call RustboroCity_Gym_EventScript_1A01C0 compare VAR_PETALBURG_GYM_STATE, 6 - call_if 1, RustboroCity_Gym_EventScript_1A00FB + call_if_eq RustboroCity_Gym_EventScript_1A00FB goto RustboroCity_Gym_EventScript_15793C end @@ -47,8 +46,7 @@ RustboroCity_Gym_EventScript_157977:: @ 8157977 RustboroCity_Gym_EventScript_15798E:: @ 815798E lock faceplayer - checkflag FLAG_DEFEATED_RUSTBORO_GYM - goto_if_eq RustboroCity_Gym_EventScript_1579A3 + goto_if_set FLAG_DEFEATED_RUSTBORO_GYM, RustboroCity_Gym_EventScript_1579A3 msgbox RustboroCity_Gym_Text_183A4B, 4 release end @@ -60,15 +58,13 @@ RustboroCity_Gym_EventScript_1579A3:: @ 81579A3 RustboroCity_Gym_EventScript_1579AD:: @ 81579AD lockall - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_Gym_EventScript_1579CD + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end RustboroCity_Gym_EventScript_1579BD:: @ 81579BD lockall - checkflag FLAG_BADGE01_GET - goto_if_eq RustboroCity_Gym_EventScript_1579CD + goto_if_set FLAG_BADGE01_GET, RustboroCity_Gym_EventScript_1579CD goto RustboroCity_Gym_EventScript_1579D7 end diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc index c0f1bc689..abbac505b 100644 --- a/data/scripts/maps/RustboroCity_House1.inc +++ b/data/scripts/maps/RustboroCity_House1.inc @@ -4,8 +4,7 @@ RustboroCity_House1_MapScripts:: @ 8157C7C RustboroCity_House1_EventScript_157C7D:: @ 8157C7D lock faceplayer - checkflag FLAG_RUSTBORO_NPC_TRADE_COMPLETED - goto_if_eq RustboroCity_House1_EventScript_157D13 + goto_if_set FLAG_RUSTBORO_NPC_TRADE_COMPLETED, RustboroCity_House1_EventScript_157D13 setvar VAR_SPECIAL_8, 0 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 specialvar RESULT, GetInGameTradeSpeciesInfo @@ -22,7 +21,7 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D specialvar RESULT, GetTradeSpecies copyvar VAR_SPECIAL_B, RESULT compare RESULT, VAR_SPECIAL_9 - goto_if 5, RustboroCity_House1_EventScript_157D05 + goto_if_ne RustboroCity_House1_EventScript_157D05 copyvar VAR_SPECIAL_4, VAR_SPECIAL_8 copyvar VAR_SPECIAL_5, VAR_SPECIAL_A special CreateInGameTradePokemon diff --git a/data/scripts/maps/RustboroCity_Mart.inc b/data/scripts/maps/RustboroCity_Mart.inc index 69f977e79..c8e3f3a43 100644 --- a/data/scripts/maps/RustboroCity_Mart.inc +++ b/data/scripts/maps/RustboroCity_Mart.inc @@ -6,10 +6,8 @@ RustboroCity_Mart_EventScript_157BD4:: @ 8157BD4 faceplayer message RustboroCity_Mart_Text_1A0BE4 waitmessage - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if 0, RustboroCity_Mart_EventScript_157BEF - checkflag FLAG_MET_DEVON_EMPLOYEE - goto_if_eq RustboroCity_Mart_EventScript_157C18 + goto_if_unset FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157BEF + goto_if_set FLAG_MET_DEVON_EMPLOYEE, RustboroCity_Mart_EventScript_157C18 end RustboroCity_Mart_EventScript_157BEF:: @ 8157BEF diff --git a/data/scripts/maps/RustboroCity_PokemonSchool.inc b/data/scripts/maps/RustboroCity_PokemonSchool.inc index 21fdf3d3b..155df8de5 100644 --- a/data/scripts/maps/RustboroCity_PokemonSchool.inc +++ b/data/scripts/maps/RustboroCity_PokemonSchool.inc @@ -77,12 +77,11 @@ RustboroCity_PokemonSchool_EventScript_157AC5:: @ 8157AC5 RustboroCity_PokemonSchool_EventScript_157ACE:: @ 8157ACE lock faceplayer - checkflag FLAG_RECEIVED_QUICK_CLAW - goto_if_eq RustboroCity_PokemonSchool_EventScript_157B34 + goto_if_set FLAG_RECEIVED_QUICK_CLAW, RustboroCity_PokemonSchool_EventScript_157B34 compare FACING, 4 - call_if 1, RustboroCity_PokemonSchool_EventScript_157B1E + call_if_eq RustboroCity_PokemonSchool_EventScript_157B1E compare FACING, 3 - call_if 1, RustboroCity_PokemonSchool_EventScript_157B29 + call_if_eq RustboroCity_PokemonSchool_EventScript_157B29 msgbox RustboroCity_PokemonSchool_Text_1846A2, 4 giveitem_std ITEM_QUICK_CLAW compare RESULT, 0 diff --git a/data/scripts/maps/RusturfTunnel.inc b/data/scripts/maps/RusturfTunnel.inc index 050cf28c2..7c715b6c2 100644 --- a/data/scripts/maps/RusturfTunnel.inc +++ b/data/scripts/maps/RusturfTunnel.inc @@ -11,7 +11,7 @@ RusturfTunnel_MapScript2_15C750:: @ 815C750 RusturfTunnel_MapScript1_15C762:: @ 815C762 call RusturfTunnel_EventScript_1A0196 compare VAR_RUSTURF_TUNNEL_STATE, 2 - call_if 1, RusturfTunnel_EventScript_15C773 + call_if_eq RusturfTunnel_EventScript_15C773 end RusturfTunnel_EventScript_15C773:: @ 815C773 @@ -32,8 +32,7 @@ RusturfTunnel_EventScript_15C782:: @ 815C782 RusturfTunnel_EventScript_15C799:: @ 815C799 lock faceplayer - checkflag FLAG_TEMP_1 - goto_if_eq RusturfTunnel_EventScript_15C7BC + goto_if_set FLAG_TEMP_1, RusturfTunnel_EventScript_15C7BC setflag FLAG_TEMP_1 msgbox RusturfTunnel_Text_1944C5, 4 closemessage @@ -53,35 +52,35 @@ RusturfTunnel_EventScript_15C7BC:: @ 815C7BC RusturfTunnel_EventScript_15C7D1:: @ 815C7D1 lockall compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C8CA + call_if_eq RusturfTunnel_EventScript_15C8CA compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C8DF + call_if_eq RusturfTunnel_EventScript_15C8DF compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8EA + call_if_eq RusturfTunnel_EventScript_15C8EA call RusturfTunnel_EventScript_15C92D msgbox RusturfTunnel_Text_19461D, 4 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C8EB + call_if_eq RusturfTunnel_EventScript_15C8EB compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8EB + call_if_eq RusturfTunnel_EventScript_15C8EB giveitem_std ITEM_HM04 setflag FLAG_RECEIVED_HM04 msgbox RusturfTunnel_Text_194693, 4 closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C880 + call_if_eq RusturfTunnel_EventScript_15C880 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C892 + call_if_eq RusturfTunnel_EventScript_15C892 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C8AE + call_if_eq RusturfTunnel_EventScript_15C8AE msgbox RusturfTunnel_Text_194706, 4 closemessage compare VAR_TEMP_1, 1 - call_if 1, RusturfTunnel_EventScript_15C8F7 + call_if_eq RusturfTunnel_EventScript_15C8F7 compare VAR_TEMP_1, 2 - call_if 1, RusturfTunnel_EventScript_15C909 + call_if_eq RusturfTunnel_EventScript_15C909 compare VAR_TEMP_1, 3 - call_if 1, RusturfTunnel_EventScript_15C91B + call_if_eq RusturfTunnel_EventScript_15C91B call RusturfTunnel_EventScript_1A0442 releaseall end diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index dd5aee95c..cd830f2b0 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -124,8 +124,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 setrespawn 8 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11 waitstate release @@ -134,8 +133,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8 SSTidalCorridor_EventScript_15FE17:: @ 815FE17 setrespawn 4 msgbox SSTidalCorridor_Text_1991F4, 4 - checkflag FLAG_RECEIVED_TM49 - call_if 1, SSTidalCorridor_EventScript_15FE36 + call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36 warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11 waitstate release @@ -163,8 +161,7 @@ SSTidalCorridor_EventScript_15FE5B:: @ 815FE5B SSTidalCorridor_EventScript_15FE60:: @ 815FE60 lock faceplayer - checkflag FLAG_DEFEATED_SS_TIDAL_TRAINERS - goto_if_eq SSTidalCorridor_EventScript_15FE7A + goto_if_set FLAG_DEFEATED_SS_TIDAL_TRAINERS, SSTidalCorridor_EventScript_15FE7A call SSTidalCorridor_EventScript_15FE84 msgbox SSTidalCorridor_Text_199203, 4 release @@ -177,21 +174,21 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A SSTidalCorridor_EventScript_15FE84:: @ 815FE84 checktrainerflag OPPONENT_PHILLIP - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEONARD - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_COLTON - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_TUCKER - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_THOMAS - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_LEA_AND_JED - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_GARRET - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 checktrainerflag OPPONENT_ANETTE - goto_if 0, SSTidalCorridor_EventScript_15FED5 + goto_if_lt SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return diff --git a/data/scripts/maps/SSTidalRooms.inc b/data/scripts/maps/SSTidalRooms.inc index 0390177de..58e7c3235 100644 --- a/data/scripts/maps/SSTidalRooms.inc +++ b/data/scripts/maps/SSTidalRooms.inc @@ -4,8 +4,7 @@ SSTidalRooms_MapScripts:: @ 815FF05 SSTidalRooms_EventScript_15FF06:: @ 815FF06 lock faceplayer - checkflag FLAG_RECEIVED_TM49 - goto_if_eq SSTidalRooms_EventScript_15FF3D + goto_if_set FLAG_RECEIVED_TM49, SSTidalRooms_EventScript_15FF3D msgbox SSTidalRooms_Text_199B65, 4 giveitem_std ITEM_TM49 compare RESULT, 0 diff --git a/data/scripts/maps/SafariZone_Southeast.inc b/data/scripts/maps/SafariZone_Southeast.inc index b3eb297e9..493aa55a1 100644 --- a/data/scripts/maps/SafariZone_Southeast.inc +++ b/data/scripts/maps/SafariZone_Southeast.inc @@ -21,7 +21,7 @@ SafariZone_Southeast_EventScript_16004B:: @ 816004B SafariZone_Southeast_MapScript1_160073:: @ 8160073 compare VAR_SAFARI_ZONE_STATE, 2 - call_if 1, SafariZone_Southeast_EventScript_16007F + call_if_eq SafariZone_Southeast_EventScript_16007F end SafariZone_Southeast_EventScript_16007F:: @ 816007F diff --git a/data/scripts/maps/SealedChamber_InnerRoom.inc b/data/scripts/maps/SealedChamber_InnerRoom.inc index d788be9b3..11aba3ac8 100644 --- a/data/scripts/maps/SealedChamber_InnerRoom.inc +++ b/data/scripts/maps/SealedChamber_InnerRoom.inc @@ -6,8 +6,7 @@ SealedChamber_InnerRoom_EventScript_15F1E8:: @ 815F1E8 braillemessage SealedChamber_InnerRoom_Braille_1C53C1 waitbuttonpress erasebox 0, 0, 29, 19 - checkflag FLAG_REGI_DOORS_OPENED - goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 + goto_if_set FLAG_REGI_DOORS_OPENED, SealedChamber_InnerRoom_EventScript_15F247 specialvar RESULT, CheckRelicanthWailord compare RESULT, 0 goto_if_eq SealedChamber_InnerRoom_EventScript_15F247 diff --git a/data/scripts/maps/SealedChamber_OuterRoom.inc b/data/scripts/maps/SealedChamber_OuterRoom.inc index ad17819c2..1f2159010 100644 --- a/data/scripts/maps/SealedChamber_OuterRoom.inc +++ b/data/scripts/maps/SealedChamber_OuterRoom.inc @@ -14,8 +14,7 @@ SealedChamber_OuterRoom_MapScript1_15F0E7:: @ 815F0E7 end SealedChamber_OuterRoom_MapScript1_15F0EB:: @ 815F0EB - checkflag FLAG_SYS_BRAILLE_DIG - call_if 0, SealedChamber_OuterRoom_EventScript_15F0F5 + call_if_unset FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F0F5 end SealedChamber_OuterRoom_EventScript_15F0F5:: @ 815F0F5 @@ -109,8 +108,7 @@ SealedChamber_OuterRoom_EventScript_15F1AA:: @ 815F1AA SealedChamber_OuterRoom_EventScript_15F1B8:: @ 815F1B8 lockall - checkflag FLAG_SYS_BRAILLE_DIG - goto_if_eq SealedChamber_OuterRoom_EventScript_15F1CF + goto_if_set FLAG_SYS_BRAILLE_DIG, SealedChamber_OuterRoom_EventScript_15F1CF braillemessage SealedChamber_OuterRoom_Braille_1C53B1 waitbuttonpress erasebox 0, 0, 29, 19 diff --git a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc index 4dcd88761..2005cb67b 100644 --- a/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideEntranceRoom.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideEntranceRoom_MapScripts:: @ 815E057 ShoalCave_LowTideEntranceRoom_MapScript1_15E05D:: @ 815E05D special UpdateShoalTideFlag - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E06E + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideEntranceRoom_EventScript_15E06E goto ShoalCave_LowTideEntranceRoom_EventScript_15E072 ShoalCave_LowTideEntranceRoom_EventScript_15E06E:: @ 815E06E @@ -20,8 +19,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 lock faceplayer dodailyevents - checkflag FLAG_SYS_SHOAL_ITEM - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E176 + call_if_set FLAG_SYS_SHOAL_ITEM, ShoalCave_LowTideEntranceRoom_EventScript_15E176 checkitem ITEM_SHOAL_SALT, 4 compare RESULT, 0 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E138 @@ -33,7 +31,7 @@ ShoalCave_LowTideEntranceRoom_EventScript_15E076:: @ 815E076 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E16C checkitemspace ITEM_SHELL_BELL, 1 compare RESULT, 0 - call_if 1, ShoalCave_LowTideEntranceRoom_EventScript_15E106 + call_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E106 compare RESULT, 2 goto_if_eq ShoalCave_LowTideEntranceRoom_EventScript_15E12E msgbox ShoalCave_LowTideEntranceRoom_Text_1C6808, 4 diff --git a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc index b6aba9523..21997d076 100644 --- a/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideInnerRoom.inc @@ -4,8 +4,7 @@ ShoalCave_LowTideInnerRoom_MapScripts:: @ 815E192 .byte 0 ShoalCave_LowTideInnerRoom_MapScript1_15E19D:: @ 815E19D - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1AB + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1AB goto ShoalCave_LowTideInnerRoom_EventScript_15E1AF ShoalCave_LowTideInnerRoom_EventScript_15E1AB:: @ 815E1AB @@ -21,47 +20,39 @@ ShoalCave_LowTideInnerRoom_MapScript1_15E1B3:: @ 815E1B3 end ShoalCave_LowTideInnerRoom_EventScript_15E1B9:: @ 815E1B9 - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E1DA + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1DA setmetatile 31, 8, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1DA end ShoalCave_LowTideInnerRoom_EventScript_15E1DA:: @ 815E1DA - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB - checkflag FLAG_SYS_SHOAL_TIDE - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E1FB + goto_if_set FLAG_SYS_SHOAL_TIDE, ShoalCave_LowTideInnerRoom_EventScript_15E1FB setmetatile 14, 26, 856, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E1FB end ShoalCave_LowTideInnerRoom_EventScript_15E1FB:: @ 815E1FB - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E213 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E213 setmetatile 41, 20, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E213 end ShoalCave_LowTideInnerRoom_EventScript_15E213:: @ 815E213 - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E22B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E22B setmetatile 41, 10, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E22B end ShoalCave_LowTideInnerRoom_EventScript_15E22B:: @ 815E22B - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E243 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E243 setmetatile 6, 9, 857, 1 goto ShoalCave_LowTideInnerRoom_EventScript_15E243 end ShoalCave_LowTideInnerRoom_EventScript_15E243:: @ 815E243 - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E256 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E256 setmetatile 16, 13, 857, 1 return @@ -70,8 +61,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E256:: @ 815E256 ShoalCave_LowTideInnerRoom_EventScript_15E257:: @ 815E257 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_1, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -88,8 +78,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E289:: @ 815E289 ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_2, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -101,8 +90,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E293:: @ 815E293 ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_3 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_3, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -114,8 +102,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2C5:: @ 815E2C5 ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SHELL_4 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E289 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SHELL_4, ShoalCave_LowTideInnerRoom_EventScript_15E289 giveitem_std ITEM_SHOAL_SHELL compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -127,8 +114,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E2F7:: @ 815E2F7 ShoalCave_LowTideInnerRoom_EventScript_15E329:: @ 815E329 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_1 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_1, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B @@ -145,8 +131,7 @@ ShoalCave_LowTideInnerRoom_EventScript_15E35B:: @ 815E35B ShoalCave_LowTideInnerRoom_EventScript_15E365:: @ 815E365 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_2 - goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_15E35B + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_2, ShoalCave_LowTideInnerRoom_EventScript_15E35B giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideInnerRoom_EventScript_1A029B diff --git a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc index c7cb08a9b..19223a499 100644 --- a/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideLowerRoom.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideLowerRoom_MapScript1_15E3F9:: @ 815E3F9 end ShoalCave_LowTideLowerRoom_EventScript_15E3FF:: @ 815E3FF - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E412 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E412 setmetatile 18, 2, 856, 1 return @@ -17,8 +16,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E412:: @ 815E412 ShoalCave_LowTideLowerRoom_EventScript_15E413:: @ 815E413 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_4 - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E445 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_4, ShoalCave_LowTideLowerRoom_EventScript_15E445 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_1A029B @@ -36,8 +34,7 @@ ShoalCave_LowTideLowerRoom_EventScript_15E445:: @ 815E445 ShoalCave_LowTideLowerRoom_EventScript_15E44F:: @ 815E44F lock faceplayer - checkflag FLAG_RECEIVED_FOCUS_BAND - goto_if_eq ShoalCave_LowTideLowerRoom_EventScript_15E47E + goto_if_set FLAG_RECEIVED_FOCUS_BAND, ShoalCave_LowTideLowerRoom_EventScript_15E47E msgbox ShoalCave_LowTideLowerRoom_Text_198200, 4 giveitem_std ITEM_FOCUS_BAND compare RESULT, 0 diff --git a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc index efcad59d3..5f9726038 100644 --- a/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc +++ b/data/scripts/maps/ShoalCave_LowTideStairsRoom.inc @@ -7,8 +7,7 @@ ShoalCave_LowTideStairsRoom_MapScript1_15E39D:: @ 815E39D end ShoalCave_LowTideStairsRoom_EventScript_15E3A3:: @ 815E3A3 - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3B6 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3B6 setmetatile 11, 11, 856, 1 return @@ -17,8 +16,7 @@ ShoalCave_LowTideStairsRoom_EventScript_15E3B6:: @ 815E3B6 ShoalCave_LowTideStairsRoom_EventScript_15E3B7:: @ 815E3B7 lockall - checkflag FLAG_HIDE_TOOK_SHOAL_SALT_3 - goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_15E3E9 + goto_if_set FLAG_HIDE_TOOK_SHOAL_SALT_3, ShoalCave_LowTideStairsRoom_EventScript_15E3E9 giveitem_std ITEM_SHOAL_SALT compare RESULT, 0 goto_if_eq ShoalCave_LowTideStairsRoom_EventScript_1A029B diff --git a/data/scripts/maps/SkyPillar_Top.inc b/data/scripts/maps/SkyPillar_Top.inc index 07a78d2c4..82149a4bc 100644 --- a/data/scripts/maps/SkyPillar_Top.inc +++ b/data/scripts/maps/SkyPillar_Top.inc @@ -3,8 +3,7 @@ SkyPillar_Top_MapScripts:: @ 815F302 .byte 0 SkyPillar_Top_MapScript1_15F308:: @ 815F308 - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SkyPillar_Top_EventScript_15F312 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SkyPillar_Top_EventScript_15F312 end SkyPillar_Top_EventScript_15F312:: @ 815F312 diff --git a/data/scripts/maps/SlateportCity.inc b/data/scripts/maps/SlateportCity.inc index ae8534ad9..4af912ed3 100644 --- a/data/scripts/maps/SlateportCity.inc +++ b/data/scripts/maps/SlateportCity.inc @@ -13,7 +13,7 @@ SlateportCity_MapScript1_14BA3C:: @ 814BA3C setvar VAR_SLATEPORT_MUSEUM_1F_STATE, 0 call SlateportCity_EventScript_14BA5C compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BA68 + call_if_eq SlateportCity_EventScript_14BA68 end SlateportCity_EventScript_14BA5C:: @ 814BA5C @@ -68,10 +68,10 @@ SlateportCity_EventScript_14BAE0:: @ 814BAE0 msgbox SlateportCity_Text_164682, 4 specialvar RESULT, LeadMonHasEffortRibbon compare RESULT, 1 - call_if 1, SlateportCity_EventScript_14BB35 + call_if_eq SlateportCity_EventScript_14BB35 specialvar RESULT, ScrSpecial_AreLeadMonEVsMaxedOut compare RESULT, 0 - call_if 1, SlateportCity_EventScript_14BB2B + call_if_eq SlateportCity_EventScript_14BB2B msgbox SlateportCity_Text_164691, 4 playfanfare BGM_FANFA4 message SlateportCity_Text_1646DD @@ -96,7 +96,7 @@ SlateportCity_EventScript_14BB3F:: @ 814BB3F lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BB56 + call_if_eq SlateportCity_EventScript_14BB56 msgbox SlateportCity_Text_164814, 4 release end @@ -110,7 +110,7 @@ SlateportCity_EventScript_14BB60:: @ 814BB60 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BB77 + call_if_eq SlateportCity_EventScript_14BB77 msgbox SlateportCity_Text_1648A0, 4 release end @@ -124,9 +124,8 @@ SlateportCity_EventScript_14BB81:: @ 814BB81 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BBA1 - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if_eq SlateportCity_EventScript_14BBAB + call_if_eq SlateportCity_EventScript_14BBA1 + goto_if_set FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BBAB msgbox SlateportCity_Text_164937, 4 release end @@ -145,7 +144,7 @@ SlateportCity_EventScript_14BBB5:: @ 814BBB5 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BBCC + call_if_eq SlateportCity_EventScript_14BBCC msgbox SlateportCity_Text_164A30, 4 release end @@ -169,7 +168,7 @@ SlateportCity_EventScript_14BBF3:: @ 814BBF3 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BC0A + call_if_eq SlateportCity_EventScript_14BC0A msgbox SlateportCity_Text_164B34, 4 release end @@ -182,8 +181,7 @@ SlateportCity_EventScript_14BC0A:: @ 814BC0A SlateportCity_EventScript_14BC14:: @ 814BC14 lock faceplayer - checkflag FLAG_DOCK_REJECTED_DEVON_GOODS - goto_if_eq SlateportCity_EventScript_14BC29 + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_EventScript_14BC29 msgbox SlateportCity_Text_164BBF, 4 release end @@ -199,10 +197,8 @@ SlateportCity_EventScript_14BC33:: @ 814BC33 SlateportCity_EventScript_14BC3C:: @ 814BC3C lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_EventScript_14BC63 - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_EventScript_14BC59 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BC63 + goto_if_set FLAG_BADGE07_GET, SlateportCity_EventScript_14BC59 msgbox SlateportCity_Text_1658A0, 4 releaseall end @@ -235,8 +231,7 @@ SlateportCity_EventScript_14BC88:: @ 814BC88 SlateportCity_EventScript_14BC91:: @ 814BC91 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_EventScript_14BCA5 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_EventScript_14BCA5 msgbox SlateportCity_Text_165A8B, 4 releaseall end @@ -254,7 +249,7 @@ SlateportCity_EventScript_14BCB8:: @ 814BCB8 lock faceplayer compare VAR_SLATEPORT_STATE, 1 - call_if 1, SlateportCity_EventScript_14BCCF + call_if_eq SlateportCity_EventScript_14BCCF msgbox SlateportCity_Text_164F9E, 4 release end @@ -289,9 +284,9 @@ SlateportCity_EventScript_14BD06:: @ 814BD06 faceplayer msgbox SlateportCity_Text_1650F1, MSGBOX_YESNO compare RESULT, YES - call_if 1, SlateportCity_EventScript_14BD28 + call_if_eq SlateportCity_EventScript_14BD28 compare RESULT, NO - call_if 1, SlateportCity_EventScript_14BD31 + call_if_eq SlateportCity_EventScript_14BD31 release end @@ -410,8 +405,7 @@ SlateportCity_EventScript_14BE16:: @ 814BE16 SlateportCity_EventScript_14BE20:: @ 814BE20 lock faceplayer - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if 0, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage pokemartdecoration SlateportCity_Decorations2 @@ -442,8 +436,7 @@ SlateportCity_Decorations2:: @ 814BE40 @ 814BE60 lock faceplayer - checkflag FLAG_RECEIVED_SECRET_POWER - goto_if 0, SlateportCity_EventScript_14BE16 + goto_if_unset FLAG_RECEIVED_SECRET_POWER, SlateportCity_EventScript_14BE16 message SlateportCity_Text_1A0BE4 waitmessage pokemartdecoration SlateportCity_Decorations3 diff --git a/data/scripts/maps/SlateportCity_ContestHall.inc b/data/scripts/maps/SlateportCity_ContestHall.inc index 0a6f40c75..4151579a2 100644 --- a/data/scripts/maps/SlateportCity_ContestHall.inc +++ b/data/scripts/maps/SlateportCity_ContestHall.inc @@ -12,8 +12,7 @@ SlateportCity_ContestHall_EventScript_155555:: @ 8155555 SlateportCity_ContestHall_EventScript_15555E:: @ 815555E lock faceplayer - checkflag FLAG_RECEIVED_TM41 - goto_if_eq SlateportCity_ContestHall_EventScript_155595 + goto_if_set FLAG_RECEIVED_TM41, SlateportCity_ContestHall_EventScript_155595 msgbox SlateportCity_ContestHall_Text_17CCE2, 4 giveitem_std ITEM_TM41 compare RESULT, 0 diff --git a/data/scripts/maps/SlateportCity_ContestLobby.inc b/data/scripts/maps/SlateportCity_ContestLobby.inc index 59c5b13fc..22f797968 100644 --- a/data/scripts/maps/SlateportCity_ContestLobby.inc +++ b/data/scripts/maps/SlateportCity_ContestLobby.inc @@ -101,8 +101,7 @@ SlateportCity_ContestLobby_EventScript_1554F0:: @ 81554F0 SlateportCity_ContestLobby_EventScript_1554F9:: @ 81554F9 lockall - checkflag FLAG_RECEIVED_POKEBLOCK_CASE - goto_if_eq SlateportCity_ContestLobby_EventScript_155526 + goto_if_set FLAG_RECEIVED_POKEBLOCK_CASE, SlateportCity_ContestLobby_EventScript_155526 applymovement 7, SlateportCity_ContestLobby_Movement_1A0839 waitmovement 0 msgbox SlateportCity_ContestLobby_Text_17CA67, 4 diff --git a/data/scripts/maps/SlateportCity_Harbor.inc b/data/scripts/maps/SlateportCity_Harbor.inc index 4be5c6daf..82a17b0a6 100644 --- a/data/scripts/maps/SlateportCity_Harbor.inc +++ b/data/scripts/maps/SlateportCity_Harbor.inc @@ -6,9 +6,8 @@ SlateportCity_Harbor_MapScript1_155F63:: @ 8155F63 setescapewarp MAP_SLATEPORT_CITY, 255, 28, 13 setvar VAR_TEMP_1, 0 compare VAR_SLATEPORT_HARBOR_STATE, 1 - call_if 1, SlateportCity_Harbor_EventScript_155F89 - checkflag FLAG_SYS_GAME_CLEAR - call_if 1, SlateportCity_Harbor_EventScript_155F85 + call_if_eq SlateportCity_Harbor_EventScript_155F89 + call_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_155F85 end SlateportCity_Harbor_EventScript_155F85:: @ 8155F85 @@ -64,13 +63,13 @@ SlateportCity_Harbor_EventScript_155FD5:: @ 8155FD5 removeobject 8 setvar VAR_SLATEPORT_HARBOR_STATE, 2 compare VAR_SPECIAL_8, 0 - call_if 1, SlateportCity_Harbor_EventScript_15605C + call_if_eq SlateportCity_Harbor_EventScript_15605C compare VAR_SPECIAL_8, 1 - call_if 1, SlateportCity_Harbor_EventScript_156071 + call_if_eq SlateportCity_Harbor_EventScript_156071 compare VAR_SPECIAL_8, 2 - call_if 1, SlateportCity_Harbor_EventScript_156086 + call_if_eq SlateportCity_Harbor_EventScript_156086 compare VAR_SPECIAL_8, 3 - call_if 1, SlateportCity_Harbor_EventScript_156086 + call_if_eq SlateportCity_Harbor_EventScript_156086 msgbox SlateportCity_Harbor_Text_17FE60, 4 closemessage setflag FLAG_HIDE_GRUNT_1_BLOCKING_HIDEOUT @@ -159,8 +158,7 @@ SlateportCity_Harbor_Movement_1560C2:: @ 81560C2 SlateportCity_Harbor_EventScript_1560C4:: @ 81560C4 lock faceplayer - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_Harbor_EventScript_1560D9 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_1560D9 msgbox SlateportCity_Harbor_Text_17FA0A, 4 release end @@ -224,9 +222,9 @@ SlateportCity_Harbor_EventScript_156196:: @ 8156196 delay 30 hideobjectat LAST_TALKED, MAP_SLATEPORT_CITY_HARBOR compare FACING, 2 - call_if 1, SlateportCity_Harbor_EventScript_1561EF + call_if_eq SlateportCity_Harbor_EventScript_1561EF compare FACING, 4 - call_if 1, SlateportCity_Harbor_EventScript_1561E4 + call_if_eq SlateportCity_Harbor_EventScript_1561E4 delay 30 hideobjectat 255, MAP_PETALBURG_CITY setvar VAR_SPECIAL_4, 5 @@ -268,12 +266,9 @@ SlateportCity_Harbor_EventScript_156208:: @ 8156208 SlateportCity_Harbor_EventScript_156211:: @ 8156211 lock faceplayer - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_Harbor_EventScript_15626F - checkflag FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE - goto_if_eq SlateportCity_Harbor_EventScript_156265 - checkflag FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE - goto_if_eq SlateportCity_Harbor_EventScript_156258 + goto_if_set FLAG_BADGE07_GET, SlateportCity_Harbor_EventScript_15626F + goto_if_set FLAG_EVIL_TEAM_ESCAPED_STERN_SPOKE, SlateportCity_Harbor_EventScript_156265 + goto_if_set FLAG_EVIL_TEAM_ESCAPED_IN_SUBMARINE, SlateportCity_Harbor_EventScript_156258 compare VAR_SLATEPORT_HARBOR_STATE, 2 goto_if_eq SlateportCity_Harbor_EventScript_15624E msgbox SlateportCity_Harbor_Text_17FD1C, 4 @@ -305,8 +300,7 @@ SlateportCity_Harbor_EventScript_15626F:: @ 815626F checkitem ITEM_SCANNER, 1 compare RESULT, 1 goto_if_eq SlateportCity_Harbor_EventScript_1562A7 - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_Harbor_EventScript_15629D + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_Harbor_EventScript_15629D msgbox SlateportCity_Harbor_Text_18017B, 4 release end diff --git a/data/scripts/maps/SlateportCity_House1.inc b/data/scripts/maps/SlateportCity_House1.inc index 13de091cb..be2955937 100644 --- a/data/scripts/maps/SlateportCity_House1.inc +++ b/data/scripts/maps/SlateportCity_House1.inc @@ -16,7 +16,7 @@ SlateportCity_House1_EventScript_15569C:: @ 815569C special SelectMonForNPCTrade waitstate compare VAR_SPECIAL_4, 255 - goto_if 5, SlateportCity_House1_EventScript_1556C9 + goto_if_ne SlateportCity_House1_EventScript_1556C9 compare VAR_SPECIAL_4, 255 goto_if_eq SlateportCity_House1_EventScript_1556BF end diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc index 5d0fdb411..c8ece697d 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_1F.inc @@ -57,8 +57,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155B2D:: @ 8155B2D end SlateportCity_OceanicMuseum_1F_EventScript_155B5A:: @ 8155B5A - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if 0, SlateportCity_OceanicMuseum_1F_EventScript_155B7B + goto_if_unset FLAG_DELIVERED_DEVON_GOODS, SlateportCity_OceanicMuseum_1F_EventScript_155B7B msgbox SlateportCity_OceanicMuseum_1F_Text_17E1F5, 4 closemessage hidemoneybox 0, 0 @@ -173,7 +172,7 @@ SlateportCity_OceanicMuseum_1F_EventScript_155C3A:: @ 8155C3A compare FACING, 2 goto_if_eq SlateportCity_OceanicMuseum_1F_EventScript_155C98 compare FACING, 2 - goto_if 5, SlateportCity_OceanicMuseum_1F_EventScript_155CAD + goto_if_ne SlateportCity_OceanicMuseum_1F_EventScript_155CAD end SlateportCity_OceanicMuseum_1F_EventScript_155C98:: @ 8155C98 diff --git a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc index 5dae0bc6b..d84982e2e 100644 --- a/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc +++ b/data/scripts/maps/SlateportCity_OceanicMuseum_2F.inc @@ -22,21 +22,21 @@ SlateportCity_OceanicMuseum_2F_EventScript_155CE6:: @ 8155CE6 applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EC5 waitmovement 0 compare FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 compare FACING, 4 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E62 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E62 msgbox SlateportCity_OceanicMuseum_2F_Text_17EDAE, 4 compare FACING, 4 - call_if 5, SlateportCity_OceanicMuseum_2F_EventScript_155E6D + call_if_ne SlateportCity_OceanicMuseum_2F_EventScript_155E6D msgbox SlateportCity_OceanicMuseum_2F_Text_17EDD7, 4 msgbox SlateportCity_OceanicMuseum_2F_Text_17EE01, 4 closemessage applymovement 4, SlateportCity_OceanicMuseum_2F_Movement_155EB2 waitmovement 0 compare FACING, 1 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E78 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E78 compare FACING, 3 - call_if 1, SlateportCity_OceanicMuseum_2F_EventScript_155E83 + call_if_eq SlateportCity_OceanicMuseum_2F_EventScript_155E83 trainerbattle 3, OPPONENT_MUSEUM_2F_GRUNT_1, 0, SlateportCity_OceanicMuseum_2F_Text_17EE4E msgbox SlateportCity_OceanicMuseum_2F_Text_17EE66, 4 closemessage diff --git a/data/scripts/maps/SlateportCity_PokemonFanClub.inc b/data/scripts/maps/SlateportCity_PokemonFanClub.inc index f7cc67236..6a8c88e1e 100644 --- a/data/scripts/maps/SlateportCity_PokemonFanClub.inc +++ b/data/scripts/maps/SlateportCity_PokemonFanClub.inc @@ -23,18 +23,13 @@ SlateportCity_PokemonFanClub_EventScript_155795:: @ 8155795 SlateportCity_PokemonFanClub_EventScript_1557A8:: @ 81557A8 setvar VAR_TEMP_2, 0 - checkflag FLAG_RECEIVED_YELLOW_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_GREEN_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_PINK_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_BLUE_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 - checkflag FLAG_RECEIVED_RED_SCARF - call_if 1, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 + call_if_set FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_155893 compare VAR_TEMP_2, 5 - call_if 1, SlateportCity_PokemonFanClub_EventScript_15588D + call_if_eq SlateportCity_PokemonFanClub_EventScript_15588D compare VAR_SLATEPORT_FAN_CLUB_STATE, 2 goto_if_eq SlateportCity_PokemonFanClub_EventScript_1557FE msgbox SlateportCity_PokemonFanClub_Text_17DA14, 4 @@ -49,16 +44,11 @@ SlateportCity_PokemonFanClub_EventScript_1557FE:: @ 81557FE SlateportCity_PokemonFanClub_EventScript_155808:: @ 8155808 msgbox SlateportCity_PokemonFanClub_Text_17DA49, 4 setvar VAR_TEMP_1, 0 - checkflag FLAG_RECEIVED_YELLOW_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559FE - checkflag FLAG_RECEIVED_GREEN_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559E7 - checkflag FLAG_RECEIVED_PINK_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559D0 - checkflag FLAG_RECEIVED_BLUE_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559B9 - checkflag FLAG_RECEIVED_RED_SCARF - call_if 0, SlateportCity_PokemonFanClub_EventScript_1559A2 + call_if_unset FLAG_RECEIVED_YELLOW_SCARF, SlateportCity_PokemonFanClub_EventScript_1559FE + call_if_unset FLAG_RECEIVED_GREEN_SCARF, SlateportCity_PokemonFanClub_EventScript_1559E7 + call_if_unset FLAG_RECEIVED_PINK_SCARF, SlateportCity_PokemonFanClub_EventScript_1559D0 + call_if_unset FLAG_RECEIVED_BLUE_SCARF, SlateportCity_PokemonFanClub_EventScript_1559B9 + call_if_unset FLAG_RECEIVED_RED_SCARF, SlateportCity_PokemonFanClub_EventScript_1559A2 bufferleadmonspeciesname 0 switch VAR_TEMP_1 case 0, SlateportCity_PokemonFanClub_EventScript_155899 @@ -146,7 +136,7 @@ SlateportCity_PokemonFanClub_EventScript_155998:: @ 8155998 SlateportCity_PokemonFanClub_EventScript_1559A2:: @ 81559A2 specialvar RESULT, CheckLeadMonCool compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559B3 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559B3 return SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 @@ -156,7 +146,7 @@ SlateportCity_PokemonFanClub_EventScript_1559B3:: @ 81559B3 SlateportCity_PokemonFanClub_EventScript_1559B9:: @ 81559B9 specialvar RESULT, CheckLeadMonBeauty compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559CA + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559CA return SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA @@ -166,7 +156,7 @@ SlateportCity_PokemonFanClub_EventScript_1559CA:: @ 81559CA SlateportCity_PokemonFanClub_EventScript_1559D0:: @ 81559D0 specialvar RESULT, CheckLeadMonCute compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559E1 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559E1 return SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 @@ -176,7 +166,7 @@ SlateportCity_PokemonFanClub_EventScript_1559E1:: @ 81559E1 SlateportCity_PokemonFanClub_EventScript_1559E7:: @ 81559E7 specialvar RESULT, CheckLeadMonSmart compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_1559F8 + call_if_eq SlateportCity_PokemonFanClub_EventScript_1559F8 return SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 @@ -186,7 +176,7 @@ SlateportCity_PokemonFanClub_EventScript_1559F8:: @ 81559F8 SlateportCity_PokemonFanClub_EventScript_1559FE:: @ 81559FE specialvar RESULT, CheckLeadMonTough compare RESULT, 1 - call_if 1, SlateportCity_PokemonFanClub_EventScript_155A0F + call_if_eq SlateportCity_PokemonFanClub_EventScript_155A0F return SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F @@ -196,12 +186,11 @@ SlateportCity_PokemonFanClub_EventScript_155A0F:: @ 8155A0F SlateportCity_PokemonFanClub_EventScript_155A15:: @ 8155A15 lock faceplayer - checkflag FLAG_RECEIVED_SOOTHE_BELL - goto_if_eq SlateportCity_PokemonFanClub_EventScript_155A75 + goto_if_set FLAG_RECEIVED_SOOTHE_BELL, SlateportCity_PokemonFanClub_EventScript_155A75 msgbox SlateportCity_PokemonFanClub_Text_17DE6B, 4 specialvar RESULT, GetLeadMonFriendshipScore compare RESULT, 4 - goto_if 4, SlateportCity_PokemonFanClub_EventScript_155A3A + goto_if_ge SlateportCity_PokemonFanClub_EventScript_155A3A release end diff --git a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc index 46dc8419c..dd31e8e26 100644 --- a/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc +++ b/data/scripts/maps/SlateportCity_SternsShipyard_1F.inc @@ -3,14 +3,10 @@ SlateportCity_SternsShipyard_1F_MapScripts:: @ 8155335 SlateportCity_SternsShipyard_1F_EventScript_155336:: @ 8155336 lockall - checkflag FLAG_SYS_GAME_CLEAR - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_155388 - checkflag FLAG_BADGE07_GET - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_15539C - checkflag FLAG_DELIVERED_DEVON_GOODS - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553CF - checkflag FLAG_DOCK_REJECTED_DEVON_GOODS - goto_if_eq SlateportCity_SternsShipyard_1F_EventScript_1553B0 + goto_if_set FLAG_SYS_GAME_CLEAR, SlateportCity_SternsShipyard_1F_EventScript_155388 + goto_if_set FLAG_BADGE07_GET, SlateportCity_SternsShipyard_1F_EventScript_15539C + goto_if_set FLAG_DELIVERED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553CF + goto_if_set FLAG_DOCK_REJECTED_DEVON_GOODS, SlateportCity_SternsShipyard_1F_EventScript_1553B0 msgbox SlateportCity_SternsShipyard_1F_Text_17C14B, 4 applymovement 1, SlateportCity_SternsShipyard_1F_Movement_1A0839 waitmovement 0 diff --git a/data/scripts/maps/SootopolisCity.inc b/data/scripts/maps/SootopolisCity.inc index 367677751..669d4ecfa 100644 --- a/data/scripts/maps/SootopolisCity.inc +++ b/data/scripts/maps/SootopolisCity.inc @@ -5,10 +5,8 @@ SootopolisCity_MapScripts:: @ 814D07D .byte 0 SootopolisCity_MapScript1_14D08D:: @ 814D08D - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 0, SootopolisCity_EventScript_14D0A0 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 1, SootopolisCity_EventScript_14D0B1 + call_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0A0 + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_EventScript_14D0B1 end SootopolisCity_EventScript_14D0A0:: @ 814D0A0 @@ -17,8 +15,7 @@ SootopolisCity_EventScript_14D0A0:: @ 814D0A0 return SootopolisCity_EventScript_14D0B1:: @ 814D0B1 - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 0, SootopolisCity_EventScript_14D0BB + call_if_unset FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D0BB return SootopolisCity_EventScript_14D0BB:: @ 814D0BB @@ -35,10 +32,8 @@ SootopolisCity_EventScript_14D0BB:: @ 814D0BB SootopolisCity_MapScript1_14D10D:: @ 814D10D setflag FLAG_VISITED_SOOTOPOLIS_CITY - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - call_if 1, SootopolisCity_EventScript_14D159 - checkflag FLAG_SYS_WEATHER_CTRL - call_if 1, SootopolisCity_EventScript_14D123 + call_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D159 + call_if_set FLAG_SYS_WEATHER_CTRL, SootopolisCity_EventScript_14D123 end SootopolisCity_EventScript_14D123:: @ 814D123 @@ -46,7 +41,7 @@ SootopolisCity_EventScript_14D123:: @ 814D123 setobjectxyperm 1, 29, 19 setobjectxyperm 2, 33, 19 compare VAR_SOOTOPOLIS_STATE, 1 - call_if 1, SootopolisCity_EventScript_14D142 + call_if_eq SootopolisCity_EventScript_14D142 return SootopolisCity_EventScript_14D142:: @ 814D142 @@ -68,8 +63,7 @@ SootopolisCity_MapScript1_14D165:: @ 814D165 SootopolisCity_EventScript_14D16E:: @ 814D16E lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D183 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D183 msgbox SootopolisCity_Text_1696A4, 4 release end @@ -92,8 +86,7 @@ SootopolisCity_EventScript_14D19F:: @ 814D19F faceplayer dodailyevents special GetPlayerBigGuyGirlString - checkflag FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS - goto_if_eq SootopolisCity_EventScript_14D241 + goto_if_set FLAG_DAILY_RECEIVED_BERRY_SOOTOPOLIS, SootopolisCity_EventScript_14D241 msgbox SootopolisCity_Text_1C63F2, 4 random 10 addvar RESULT, 20 @@ -142,8 +135,7 @@ SootopolisCity_EventScript_14D25E:: @ 814D25E SootopolisCity_EventScript_14D268:: @ 814D268 lock faceplayer - checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM - goto_if_eq SootopolisCity_EventScript_14D27D + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_EventScript_14D27D msgbox SootopolisCity_Text_16A4D6, 4 release end @@ -156,8 +148,7 @@ SootopolisCity_EventScript_14D27D:: @ 814D27D SootopolisCity_EventScript_14D287:: @ 814D287 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D29C + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D29C msgbox SootopolisCity_Text_169813, 4 release end @@ -170,8 +161,7 @@ SootopolisCity_EventScript_14D29C:: @ 814D29C SootopolisCity_EventScript_14D2A6:: @ 814D2A6 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D2BB + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2BB msgbox SootopolisCity_Text_1698A0, 4 release end @@ -184,8 +174,7 @@ SootopolisCity_EventScript_14D2BB:: @ 814D2BB SootopolisCity_EventScript_14D2C5:: @ 814D2C5 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D2DA + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D2DA msgbox SootopolisCity_Text_1697A7, 4 release end @@ -445,8 +434,7 @@ SootopolisCity_EventScript_14D48F:: @ 814D48F SootopolisCity_EventScript_14D498:: @ 814D498 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_EventScript_14D4AD + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_EventScript_14D4AD .ifdef SAPPHIRE msgbox SootopolisCity_Text_169DA6, 4 .else diff --git a/data/scripts/maps/SootopolisCity_Gym_1F.inc b/data/scripts/maps/SootopolisCity_Gym_1F.inc index 35fa306e6..44bcda12f 100644 --- a/data/scripts/maps/SootopolisCity_Gym_1F.inc +++ b/data/scripts/maps/SootopolisCity_Gym_1F.inc @@ -20,11 +20,11 @@ SootopolisCity_Gym_1F_MapScript1_15AF25:: @ 815AF25 SootopolisCity_Gym_1F_EventScript_15AF2E:: @ 815AF2E compare VAR_ICE_STEP_COUNT, 8 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF85 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF85 compare VAR_ICE_STEP_COUNT, 28 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF73 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF73 compare VAR_ICE_STEP_COUNT, 69 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15AF61 + goto_if_lt SootopolisCity_Gym_1F_EventScript_15AF61 setmetatile 8, 4, 519, 0 setmetatile 8, 5, 519, 0 @@ -87,10 +87,8 @@ SootopolisCity_Gym_1F_Movement_15AFFD:: @ 815AFFD SootopolisCity_Gym_1F_EventScript_15AFFF:: @ 815AFFF trainerbattle 1, OPPONENT_WALLACE, 0, SootopolisCity_Gym_1F_Text_18F0CA, SootopolisCity_Gym_1F_Text_18F282, SootopolisCity_Gym_1F_EventScript_15B02D - checkflag FLAG_RECEIVED_TM03 - goto_if 0, SootopolisCity_Gym_1F_EventScript_15B056 - checkflag FLAG_BADGE06_GET - goto_if 0, SootopolisCity_Gym_1F_EventScript_15B07A + goto_if_unset FLAG_RECEIVED_TM03, SootopolisCity_Gym_1F_EventScript_15B056 + goto_if_unset FLAG_BADGE06_GET, SootopolisCity_Gym_1F_EventScript_15B07A msgbox SootopolisCity_Gym_1F_Text_18F4D7, 4 release end @@ -124,8 +122,7 @@ SootopolisCity_Gym_1F_EventScript_15B07A:: @ 815B07A SootopolisCity_Gym_1F_EventScript_15B084:: @ 815B084 lock faceplayer - checkflag FLAG_DEFEATED_SOOTOPOLIS_GYM - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B099 + goto_if_set FLAG_DEFEATED_SOOTOPOLIS_GYM, SootopolisCity_Gym_1F_EventScript_15B099 msgbox SootopolisCity_Gym_1F_Text_18E8A5, 4 release end @@ -137,15 +134,13 @@ SootopolisCity_Gym_1F_EventScript_15B099:: @ 815B099 SootopolisCity_Gym_1F_EventScript_15B0A3:: @ 815B0A3 lockall - checkflag FLAG_BADGE08_GET - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end SootopolisCity_Gym_1F_EventScript_15B0B3:: @ 815B0B3 lockall - checkflag FLAG_BADGE08_GET - goto_if_eq SootopolisCity_Gym_1F_EventScript_15B0C3 + goto_if_set FLAG_BADGE08_GET, SootopolisCity_Gym_1F_EventScript_15B0C3 goto SootopolisCity_Gym_1F_EventScript_15B0CD end diff --git a/data/scripts/maps/SootopolisCity_House1.inc b/data/scripts/maps/SootopolisCity_House1.inc index 074c9a179..67be3738b 100644 --- a/data/scripts/maps/SootopolisCity_House1.inc +++ b/data/scripts/maps/SootopolisCity_House1.inc @@ -4,8 +4,7 @@ SootopolisCity_House1_MapScripts:: @ 815B29A SootopolisCity_House1_EventScript_15B29B:: @ 815B29B lock faceplayer - checkflag FLAG_RECEIVED_TM31 - goto_if_eq SootopolisCity_House1_EventScript_15B2C7 + goto_if_set FLAG_RECEIVED_TM31, SootopolisCity_House1_EventScript_15B2C7 msgbox SootopolisCity_House1_Text_18F991, 4 giveitem_std ITEM_TM31 setflag FLAG_RECEIVED_TM31 diff --git a/data/scripts/maps/SootopolisCity_House2.inc b/data/scripts/maps/SootopolisCity_House2.inc index e32e993dd..d714993d4 100644 --- a/data/scripts/maps/SootopolisCity_House2.inc +++ b/data/scripts/maps/SootopolisCity_House2.inc @@ -6,9 +6,9 @@ SootopolisCity_House2_EventScript_15B2E5:: @ 815B2E5 faceplayer msgbox SootopolisCity_House2_Text_18FA66, MSGBOX_YESNO compare RESULT, YES - call_if 1, SootopolisCity_House2_EventScript_15B307 + call_if_eq SootopolisCity_House2_EventScript_15B307 compare RESULT, NO - call_if 1, SootopolisCity_House2_EventScript_15B310 + call_if_eq SootopolisCity_House2_EventScript_15B310 release end diff --git a/data/scripts/maps/SootopolisCity_House6.inc b/data/scripts/maps/SootopolisCity_House6.inc index d2fb4ed7b..24c59500a 100644 --- a/data/scripts/maps/SootopolisCity_House6.inc +++ b/data/scripts/maps/SootopolisCity_House6.inc @@ -4,11 +4,10 @@ SootopolisCity_House6_MapScripts:: @ 815B385 SootopolisCity_House6_EventScript_15B386:: @ 815B386 lock faceplayer - checkflag FLAG_RECEIVED_WAILMER_DOLL - goto_if_eq SootopolisCity_House6_EventScript_15B3CD + goto_if_set FLAG_RECEIVED_WAILMER_DOLL, SootopolisCity_House6_EventScript_15B3CD msgbox SootopolisCity_House6_Text_18FEA1, MSGBOX_YESNO compare RESULT, NO - call_if 1, SootopolisCity_House6_EventScript_15B3C3 + call_if_eq SootopolisCity_House6_EventScript_15B3C3 msgbox SootopolisCity_House6_Text_18FF12, 4 givedecoration_std DECOR_WAILMER_DOLL compare RESULT, 0 diff --git a/data/scripts/maps/SootopolisCity_Mart.inc b/data/scripts/maps/SootopolisCity_Mart.inc index 115ed0453..1687bd91e 100644 --- a/data/scripts/maps/SootopolisCity_Mart.inc +++ b/data/scripts/maps/SootopolisCity_Mart.inc @@ -29,10 +29,8 @@ SootopolisCity_Mart_Items:: @ 815B234 SootopolisCity_Mart_EventScript_15B24A:: @ 815B24A lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_Mart_EventScript_15B268 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_Mart_EventScript_15B268 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B268 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B268 msgbox SootopolisCity_Mart_Text_18F8D7, 4 release end @@ -45,10 +43,8 @@ SootopolisCity_Mart_EventScript_15B268:: @ 815B268 SootopolisCity_Mart_EventScript_15B272:: @ 815B272 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_Mart_EventScript_15B290 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_Mart_EventScript_15B290 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_Mart_EventScript_15B290 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_Mart_EventScript_15B290 msgbox SootopolisCity_Mart_Text_18F96B, 4 release end diff --git a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc index 9eb5b4a57..820dd4858 100644 --- a/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc +++ b/data/scripts/maps/SootopolisCity_PokemonCenter_1F.inc @@ -17,10 +17,8 @@ SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196 SootopolisCity_PokemonCenter_1F_EventScript_15B1A8:: @ 815B1A8 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1C6 msgbox SootopolisCity_PokemonCenter_1F_Text_18F770, 4 release end @@ -33,10 +31,8 @@ SootopolisCity_PokemonCenter_1F_EventScript_15B1C6:: @ 815B1C6 SootopolisCity_PokemonCenter_1F_EventScript_15B1D0:: @ 815B1D0 lock faceplayer - checkflag FLAG_LEGENDARY_BATTLE_COMPLETED - goto_if_eq SootopolisCity_PokemonCenter_1F_EventScript_15B1EE - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if 0, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_set FLAG_LEGENDARY_BATTLE_COMPLETED, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE + goto_if_unset FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, SootopolisCity_PokemonCenter_1F_EventScript_15B1EE msgbox SootopolisCity_PokemonCenter_1F_Text_18F860, 4 release end diff --git a/data/scripts/maps/SouthernIsland_Interior.inc b/data/scripts/maps/SouthernIsland_Interior.inc index cbc451a18..5878a43d5 100644 --- a/data/scripts/maps/SouthernIsland_Interior.inc +++ b/data/scripts/maps/SouthernIsland_Interior.inc @@ -4,8 +4,7 @@ SouthernIsland_Interior_MapScripts:: @ 8160B53 .byte 0 SouthernIsland_Interior_MapScript1_160B5E:: @ 8160B5E - checkflag FLAG_SYS_CTRL_OBJ_DELETE - call_if 1, SouthernIsland_Interior_EventScript_160B68 + call_if_set FLAG_SYS_CTRL_OBJ_DELETE, SouthernIsland_Interior_EventScript_160B68 end SouthernIsland_Interior_EventScript_160B68:: @ 8160B68 @@ -44,10 +43,8 @@ SouthernIsland_Interior_EventScript_160B9B:: @ 8160B9B end SouthernIsland_Interior_EventScript_160BA7:: @ 8160BA7 - checkflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS - goto_if_eq SouthernIsland_Interior_EventScript_160C08 - checkflag FLAG_SYS_HAS_EON_TICKET - goto_if 0, SouthernIsland_Interior_EventScript_160C08 + goto_if_set FLAG_ECOUNTERED_LATIAS_OR_LATIOS, SouthernIsland_Interior_EventScript_160C08 + goto_if_unset FLAG_SYS_HAS_EON_TICKET, SouthernIsland_Interior_EventScript_160C08 setflag FLAG_ECOUNTERED_LATIAS_OR_LATIOS special SpawnCameraDummy applymovement 127, SouthernIsland_Interior_Movement_160C12 diff --git a/data/scripts/maps/Underwater_SeafloorCavern.inc b/data/scripts/maps/Underwater_SeafloorCavern.inc index d991a7096..d34558e40 100644 --- a/data/scripts/maps/Underwater_SeafloorCavern.inc +++ b/data/scripts/maps/Underwater_SeafloorCavern.inc @@ -6,8 +6,7 @@ Underwater_SeafloorCavern_MapScripts:: @ 815D99E Underwater_SeafloorCavern_MapScript1_15D9AE:: @ 815D9AE setflag FLAG_LANDMARK_SEAFLOOR_CAVERN - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - goto_if_eq Underwater_SeafloorCavern_EventScript_15D9BB + goto_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9BB end Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB @@ -15,8 +14,7 @@ Underwater_SeafloorCavern_EventScript_15D9BB:: @ 815D9BB end Underwater_SeafloorCavern_MapScript1_15D9BF:: @ 815D9BF - checkflag FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN - call_if 1, Underwater_SeafloorCavern_EventScript_15D9C9 + call_if_set FLAG_LEGEND_ESCAPED_SEAFLOOR_CAVERN, Underwater_SeafloorCavern_EventScript_15D9C9 end Underwater_SeafloorCavern_EventScript_15D9C9:: @ 815D9C9 diff --git a/data/scripts/maps/Underwater_SealedChamber.inc b/data/scripts/maps/Underwater_SealedChamber.inc index 8d3e8e723..3151c4575 100644 --- a/data/scripts/maps/Underwater_SealedChamber.inc +++ b/data/scripts/maps/Underwater_SealedChamber.inc @@ -5,9 +5,9 @@ Underwater_SealedChamber_MapScripts:: @ 815F080 Underwater_SealedChamber_MapScript1_15F086:: @ 815F086 getplayerxy VAR_SPECIAL_4, VAR_SPECIAL_5 compare VAR_SPECIAL_4, 12 - goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 compare VAR_SPECIAL_5, 44 - goto_if 5, Underwater_SealedChamber_EventScript_15F0A6 + goto_if_ne Underwater_SealedChamber_EventScript_15F0A6 goto Underwater_SealedChamber_EventScript_15F0AF Underwater_SealedChamber_EventScript_15F0A6:: @ 815F0A6 diff --git a/data/scripts/maps/UnknownMap_25_34.inc b/data/scripts/maps/UnknownMap_25_34.inc index ffd184ddf..44b9463b4 100644 --- a/data/scripts/maps/UnknownMap_25_34.inc +++ b/data/scripts/maps/UnknownMap_25_34.inc @@ -14,15 +14,15 @@ LinkContestRoom1_MapScript1_15F595:: @ 815F595 LinkContestRoom1_EventScript_15F5A5:: @ 815F5A5 special ScriptGetMultiplayerId compare RESULT, 0 - call_if 1, LinkContestRoom1_EventScript_15F5E0 + call_if_eq LinkContestRoom1_EventScript_15F5E0 compare RESULT, 1 - call_if 1, LinkContestRoom1_EventScript_15F5E4 + call_if_eq LinkContestRoom1_EventScript_15F5E4 compare RESULT, 2 - call_if 1, LinkContestRoom1_EventScript_15F5E8 + call_if_eq LinkContestRoom1_EventScript_15F5E8 compare RESULT, 3 - call_if 1, LinkContestRoom1_EventScript_15F5EC + call_if_eq LinkContestRoom1_EventScript_15F5EC compare RESULT, 4 - call_if 1, LinkContestRoom1_EventScript_15F5F0 + call_if_eq LinkContestRoom1_EventScript_15F5F0 return LinkContestRoom1_EventScript_15F5E0:: @ 815F5E0 @@ -47,7 +47,7 @@ LinkContestRoom1_EventScript_15F5F0:: @ 815F5F0 LinkContestRoom1_MapScript1_15F5F4:: @ 815F5F4 compare VAR_TEMP_9, 1 - call_if 1, LinkContestRoom1_EventScript_15F600 + call_if_eq LinkContestRoom1_EventScript_15F600 end LinkContestRoom1_EventScript_15F600:: @ 815F600 @@ -76,7 +76,7 @@ LinkContestRoom1_EventScript_15F630:: @ 815F630 call LinkContestRoom1_EventScript_15F6E6 call LinkContestRoom1_EventScript_15F646 compare VAR_TEMP_0, 8 - goto_if 0, LinkContestRoom1_EventScript_15F630 + goto_if_lt LinkContestRoom1_EventScript_15F630 return LinkContestRoom1_EventScript_15F646:: @ 815F646 diff --git a/data/scripts/maps/VerdanturfTown.inc b/data/scripts/maps/VerdanturfTown.inc index ca2a3c245..c8adf85c3 100644 --- a/data/scripts/maps/VerdanturfTown.inc +++ b/data/scripts/maps/VerdanturfTown.inc @@ -11,8 +11,7 @@ VerdanturfTown_MapScript1_14E85A:: @ 814E85A VerdanturfTown_EventScript_14E866:: @ 814E866 lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_EventScript_14E885 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E885 msgbox VerdanturfTown_Text_16CAEB, 4 applymovement 2, VerdanturfTown_Movement_1A083D waitmovement 0 @@ -37,8 +36,7 @@ VerdanturfTown_EventScript_14E8A2:: @ 814E8A2 VerdanturfTown_EventScript_14E8AB:: @ 814E8AB lock faceplayer - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_EventScript_14E8C0 + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_EventScript_14E8C0 msgbox VerdanturfTown_Text_16CD4D, 4 release end diff --git a/data/scripts/maps/VerdanturfTown_ContestLobby.inc b/data/scripts/maps/VerdanturfTown_ContestLobby.inc index 37811dbc1..85b524c99 100644 --- a/data/scripts/maps/VerdanturfTown_ContestLobby.inc +++ b/data/scripts/maps/VerdanturfTown_ContestLobby.inc @@ -101,8 +101,7 @@ VerdanturfTown_ContestLobby_EventScript_153E3E:: @ 8153E3E VerdanturfTown_ContestLobby_EventScript_153E47:: @ 8153E47 lock faceplayer - checkflag FLAG_RECEIVED_TM45 - goto_if_eq VerdanturfTown_ContestLobby_EventScript_153E76 + goto_if_set FLAG_RECEIVED_TM45, VerdanturfTown_ContestLobby_EventScript_153E76 msgbox VerdanturfTown_ContestLobby_Text_177DEC, 4 giveitem_std ITEM_TM45 compare RESULT, 0 diff --git a/data/scripts/maps/VerdanturfTown_WandasHouse.inc b/data/scripts/maps/VerdanturfTown_WandasHouse.inc index 205a4315c..4410beaba 100644 --- a/data/scripts/maps/VerdanturfTown_WandasHouse.inc +++ b/data/scripts/maps/VerdanturfTown_WandasHouse.inc @@ -4,8 +4,7 @@ VerdanturfTown_WandasHouse_MapScripts:: @ 8153F5A VerdanturfTown_WandasHouse_EventScript_153F5B:: @ 8153F5B lock faceplayer - checkflag FLAG_WALLY_SPEECH - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F73 + goto_if_set FLAG_WALLY_SPEECH, VerdanturfTown_WandasHouse_EventScript_153F73 msgbox VerdanturfTown_WandasHouse_Text_1783F6, 4 setflag FLAG_WALLY_SPEECH release @@ -19,10 +18,8 @@ VerdanturfTown_WandasHouse_EventScript_153F73:: @ 8153F73 VerdanturfTown_WandasHouse_EventScript_153F7D:: @ 8153F7D lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FA5 - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153F9B + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_153FA5 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153F9B msgbox VerdanturfTown_WandasHouse_Text_17859A, 4 release end @@ -44,10 +41,8 @@ VerdanturfTown_WandasHouse_EventScript_153FAF:: @ 8153FAF VerdanturfTown_WandasHouse_EventScript_153FB8:: @ 8153FB8 lock faceplayer - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FE0 - checkflag FLAG_DEFEATED_WALLY_MAUVILLE - goto_if_eq VerdanturfTown_WandasHouse_EventScript_153FD6 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_153FE0 + goto_if_set FLAG_DEFEATED_WALLY_MAUVILLE, VerdanturfTown_WandasHouse_EventScript_153FD6 msgbox VerdanturfTown_WandasHouse_Text_1787FB, 4 release end @@ -65,12 +60,9 @@ VerdanturfTown_WandasHouse_EventScript_153FE0:: @ 8153FE0 VerdanturfTown_WandasHouse_EventScript_153FEA:: @ 8153FEA lock faceplayer - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - goto_if_eq VerdanturfTown_WandasHouse_EventScript_154025 - checkflag FLAG_DEFEATED_LAVARIDGE_GYM - goto_if_eq VerdanturfTown_WandasHouse_EventScript_15401B - checkflag FLAG_RUSTURF_TUNNEL_OPENED - goto_if_eq VerdanturfTown_WandasHouse_EventScript_154011 + goto_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VerdanturfTown_WandasHouse_EventScript_154025 + goto_if_set FLAG_DEFEATED_LAVARIDGE_GYM, VerdanturfTown_WandasHouse_EventScript_15401B + goto_if_set FLAG_RUSTURF_TUNNEL_OPENED, VerdanturfTown_WandasHouse_EventScript_154011 msgbox VerdanturfTown_WandasHouse_Text_1788B1, 4 release end diff --git a/data/scripts/maps/VictoryRoad_1F.inc b/data/scripts/maps/VictoryRoad_1F.inc index ed0440343..4f3180318 100644 --- a/data/scripts/maps/VictoryRoad_1F.inc +++ b/data/scripts/maps/VictoryRoad_1F.inc @@ -3,8 +3,7 @@ VictoryRoad_1F_MapScripts:: @ 815DE83 .byte 0 VictoryRoad_1F_MapScript1_15DE89:: @ 815DE89 - checkflag FLAG_DEFEATED_WALLY_VICTORY_ROAD - call_if 1, VictoryRoad_1F_EventScript_15DE93 + call_if_set FLAG_DEFEATED_WALLY_VICTORY_ROAD, VictoryRoad_1F_EventScript_15DE93 end VictoryRoad_1F_EventScript_15DE93:: @ 815DE93 -- cgit v1.2.3 From 43b4ba34dc05dc6be31b58f0b18df1b3d57f608d Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Fri, 5 Jan 2018 12:39:57 -0800 Subject: Add friendly macros for checking trainer flags --- data/scripts/maps/DewfordTown_Gym.inc | 12 +++---- data/scripts/maps/LavaridgeTown_Gym_1F.inc | 30 ++++++---------- data/scripts/maps/PetalburgCity_Gym.inc | 51 ++++++++++------------------ data/scripts/maps/Route104_Prototype.inc | 36 +++++++------------- data/scripts/maps/Route109_SeashoreHouse.inc | 9 ++--- data/scripts/maps/Route111.inc | 3 +- data/scripts/maps/SSTidalCorridor.inc | 24 +++++-------- 7 files changed, 55 insertions(+), 110 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/DewfordTown_Gym.inc b/data/scripts/maps/DewfordTown_Gym.inc index 2dc15d92c..7cdf3dd6a 100644 --- a/data/scripts/maps/DewfordTown_Gym.inc +++ b/data/scripts/maps/DewfordTown_Gym.inc @@ -7,8 +7,7 @@ DewfordTown_Gym_MapScript1_15306B:: @ 815306B end DewfordTown_Gym_EventScript_153071:: @ 8153071 - checktrainerflag OPPONENT_BRAWLY - goto_if_eq DewfordTown_Gym_EventScript_1530AA + goto_if_trainer_defeated OPPONENT_BRAWLY, DewfordTown_Gym_EventScript_1530AA call DewfordTown_Gym_EventScript_153122 copyvar VAR_SPECIAL_1, VAR_SPECIAL_0 compare VAR_SPECIAL_0, 0 @@ -81,18 +80,15 @@ DewfordTown_Gym_EventScript_153117:: @ 8153117 DewfordTown_Gym_EventScript_153122:: @ 8153122 setvar VAR_SPECIAL_0, 0 - checktrainerflag OPPONENT_HIDEKI - goto_if_lt DewfordTown_Gym_EventScript_153135 + goto_if_trainer_not_defeated OPPONENT_HIDEKI, DewfordTown_Gym_EventScript_153135 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153135:: @ 8153135 - checktrainerflag OPPONENT_TESSA - goto_if_lt DewfordTown_Gym_EventScript_153143 + goto_if_trainer_not_defeated OPPONENT_TESSA, DewfordTown_Gym_EventScript_153143 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153143:: @ 8153143 - checktrainerflag OPPONENT_LAURA - goto_if_lt DewfordTown_Gym_EventScript_153151 + goto_if_trainer_not_defeated OPPONENT_LAURA, DewfordTown_Gym_EventScript_153151 addvar VAR_SPECIAL_0, 1 DewfordTown_Gym_EventScript_153151:: @ 8153151 diff --git a/data/scripts/maps/LavaridgeTown_Gym_1F.inc b/data/scripts/maps/LavaridgeTown_Gym_1F.inc index 52d614436..c0604400e 100644 --- a/data/scripts/maps/LavaridgeTown_Gym_1F.inc +++ b/data/scripts/maps/LavaridgeTown_Gym_1F.inc @@ -13,56 +13,46 @@ LavaridgeTown_Gym_1F_EventScript_15369F:: @ 815369F setvar VAR_TEMP_D, 0 setvar VAR_TEMP_E, 0 setvar VAR_TEMP_F, 0 - checktrainerflag OPPONENT_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536C6 + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_1536C6 setvar VAR_TEMP_B, 1 LavaridgeTown_Gym_1F_EventScript_1536C6:: @ 81536C6 - checktrainerflag OPPONENT_ZANE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536D4 + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_1536D4 setvar VAR_TEMP_C, 1 LavaridgeTown_Gym_1F_EventScript_1536D4:: @ 81536D4 - checktrainerflag OPPONENT_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536E2 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_1536E2 setvar VAR_TEMP_D, 1 LavaridgeTown_Gym_1F_EventScript_1536E2:: @ 81536E2 - checktrainerflag OPPONENT_SADIE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536F0 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_1536F0 setvar VAR_TEMP_E, 1 LavaridgeTown_Gym_1F_EventScript_1536F0:: @ 81536F0 - checktrainerflag OPPONENT_ANDY - goto_if_eq LavaridgeTown_Gym_1F_EventScript_1536FE + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_1536FE setvar VAR_TEMP_F, 1 LavaridgeTown_Gym_1F_EventScript_1536FE:: @ 81536FE return LavaridgeTown_Gym_1F_EventScript_1536FF:: @ 81536FF - checktrainerflag OPPONENT_COLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_15370C + goto_if_trainer_defeated OPPONENT_COLE, LavaridgeTown_Gym_1F_EventScript_15370C setobjectmovementtype 2, 63 LavaridgeTown_Gym_1F_EventScript_15370C:: @ 815370C - checktrainerflag OPPONENT_ZANE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153719 + goto_if_trainer_defeated OPPONENT_ZANE, LavaridgeTown_Gym_1F_EventScript_153719 setobjectmovementtype 3, 63 LavaridgeTown_Gym_1F_EventScript_153719:: @ 8153719 - checktrainerflag OPPONENT_AXLE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153726 + goto_if_trainer_defeated OPPONENT_AXLE, LavaridgeTown_Gym_1F_EventScript_153726 setobjectmovementtype 4, 63 LavaridgeTown_Gym_1F_EventScript_153726:: @ 8153726 - checktrainerflag OPPONENT_SADIE - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153733 + goto_if_trainer_defeated OPPONENT_SADIE, LavaridgeTown_Gym_1F_EventScript_153733 setobjectmovementtype 5, 63 LavaridgeTown_Gym_1F_EventScript_153733:: @ 8153733 - checktrainerflag OPPONENT_ANDY - goto_if_eq LavaridgeTown_Gym_1F_EventScript_153740 + goto_if_trainer_defeated OPPONENT_ANDY, LavaridgeTown_Gym_1F_EventScript_153740 setobjectmovementtype 7, 63 LavaridgeTown_Gym_1F_EventScript_153740:: @ 8153740 diff --git a/data/scripts/maps/PetalburgCity_Gym.inc b/data/scripts/maps/PetalburgCity_Gym.inc index 54c0e89f6..1199b3571 100644 --- a/data/scripts/maps/PetalburgCity_Gym.inc +++ b/data/scripts/maps/PetalburgCity_Gym.inc @@ -15,20 +15,13 @@ PetalburgCity_Gym_MapScript1_15448C:: @ 815448C PetalburgCity_Gym_EventScript_1544A3:: @ 81544A3 setvar VAR_SPECIAL_5, 1 call PetalburgCity_Gym_EventScript_154F9A - checktrainerflag OPPONENT_RANDALL - call_if_eq PetalburgCity_Gym_EventScript_154FBB - checktrainerflag OPPONENT_MARY - call_if_eq PetalburgCity_Gym_EventScript_154FDC - checktrainerflag OPPONENT_PARKER - call_if_eq PetalburgCity_Gym_EventScript_154FFD - checktrainerflag OPPONENT_LORI - call_if_eq PetalburgCity_Gym_EventScript_15501E - checktrainerflag OPPONENT_GEORGE - call_if_eq PetalburgCity_Gym_EventScript_15503F - checktrainerflag OPPONENT_JODY - call_if_eq PetalburgCity_Gym_EventScript_155060 - checktrainerflag OPPONENT_BERKE - call_if_eq PetalburgCity_Gym_EventScript_155081 + call_if_trainer_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154FBB + call_if_trainer_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154FDC + call_if_trainer_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154FFD + call_if_trainer_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_15501E + call_if_trainer_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_15503F + call_if_trainer_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_155060 + call_if_trainer_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_155081 end PetalburgCity_Gym_EventScript_1544ED:: @ 81544ED @@ -632,8 +625,7 @@ PetalburgCity_Gym_EventScript_154BC3:: @ 8154BC3 PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 lockall - checktrainerflag OPPONENT_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 46 msgbox PetalburgCity_Gym_Text_17B90F, MSGBOX_YESNO @@ -645,8 +637,7 @@ PetalburgCity_Gym_EventScript_154BF8:: @ 8154BF8 PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B lockall - checktrainerflag OPPONENT_RANDALL - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_RANDALL, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -658,8 +649,7 @@ PetalburgCity_Gym_EventScript_154C2B:: @ 8154C2B PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E lockall - checktrainerflag OPPONENT_MARY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 59 msgbox PetalburgCity_Gym_Text_17B950, MSGBOX_YESNO @@ -671,8 +661,7 @@ PetalburgCity_Gym_EventScript_154C5E:: @ 8154C5E PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 lockall - checktrainerflag OPPONENT_MARY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_MARY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 72 msgbox PetalburgCity_Gym_Text_17B98A, MSGBOX_YESNO @@ -684,8 +673,7 @@ PetalburgCity_Gym_EventScript_154C91:: @ 8154C91 PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 lockall - checktrainerflag OPPONENT_PARKER - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_PARKER, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -697,8 +685,7 @@ PetalburgCity_Gym_EventScript_154CC4:: @ 8154CC4 PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 lockall - checktrainerflag OPPONENT_LORI - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 20 msgbox PetalburgCity_Gym_Text_17B9C5, MSGBOX_YESNO @@ -710,8 +697,7 @@ PetalburgCity_Gym_EventScript_154CF7:: @ 8154CF7 PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A lockall - checktrainerflag OPPONENT_LORI - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_LORI, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -723,8 +709,7 @@ PetalburgCity_Gym_EventScript_154D2A:: @ 8154D2A PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D lockall - checktrainerflag OPPONENT_GEORGE - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_GEORGE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 33 msgbox PetalburgCity_Gym_Text_17BA00, MSGBOX_YESNO @@ -736,8 +721,7 @@ PetalburgCity_Gym_EventScript_154D5D:: @ 8154D5D PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 lockall - checktrainerflag OPPONENT_JODY - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_JODY, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 1 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO @@ -749,8 +733,7 @@ PetalburgCity_Gym_EventScript_154D90:: @ 8154D90 PetalburgCity_Gym_EventScript_154DC3:: @ 8154DC3 lockall - checktrainerflag OPPONENT_BERKE - goto_if_lt PetalburgCity_Gym_EventScript_154BB9 + goto_if_trainer_not_defeated OPPONENT_BERKE, PetalburgCity_Gym_EventScript_154BB9 setvar VAR_SPECIAL_8, 7 setvar VAR_SPECIAL_9, 7 msgbox PetalburgCity_Gym_Text_17BA3D, MSGBOX_YESNO diff --git a/data/scripts/maps/Route104_Prototype.inc b/data/scripts/maps/Route104_Prototype.inc index 7f1c4ca75..e0aba01c9 100644 --- a/data/scripts/maps/Route104_Prototype.inc +++ b/data/scripts/maps/Route104_Prototype.inc @@ -4,18 +4,12 @@ Route104_Prototype_MapScripts:: @ 8160C4A Route104_Prototype_EventScript_160C4B:: @ 8160C4B lock faceplayer - checktrainerflag OPPONENT_BRIANNA_1 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_CINDY_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_LUCAS_2 - goto_if_lt Route104_Prototype_EventScript_160C99 - checktrainerflag OPPONENT_MIKE_1 - goto_if_lt Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160C99 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160C99 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_1 msgbox Route104_Prototype_Text_19B267, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_2, Route104_Prototype_EventScript_160CFB @@ -30,18 +24,12 @@ Route104_Prototype_EventScript_160C99:: @ 8160C99 Route104_Prototype_EventScript_160CA3:: @ 8160CA3 lock faceplayer - checktrainerflag OPPONENT_BRIANNA_1 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_CINDY_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_AMY_AND_LIV_3 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_GINA_AND_MIA_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_LUCAS_2 - goto_if_lt Route104_Prototype_EventScript_160CF1 - checktrainerflag OPPONENT_MIKE_1 - goto_if_lt Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_BRIANNA_1, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_CINDY_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_AMY_AND_LIV_3, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_GINA_AND_MIA_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_LUCAS_2, Route104_Prototype_EventScript_160CF1 + goto_if_trainer_not_defeated OPPONENT_MIKE_1, Route104_Prototype_EventScript_160CF1 setflag FLAG_ROUTE104_PROTOTYPE_COMPLETED_2 msgbox Route104_Prototype_Text_19B2E9, 4 goto_if_set FLAG_ROUTE104_PROTOTYPE_COMPLETED_1, Route104_Prototype_EventScript_160CFB diff --git a/data/scripts/maps/Route109_SeashoreHouse.inc b/data/scripts/maps/Route109_SeashoreHouse.inc index e52958c50..13d37e7bd 100644 --- a/data/scripts/maps/Route109_SeashoreHouse.inc +++ b/data/scripts/maps/Route109_SeashoreHouse.inc @@ -91,12 +91,9 @@ Route109_SeashoreHouse_EventScript_160EEE:: @ 8160EEE end Route109_SeashoreHouse_EventScript_160F09:: @ 8160F09 - checktrainerflag OPPONENT_DWAYNE - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_JOHANNA - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 - checktrainerflag OPPONENT_SIMON - goto_if_lt Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_DWAYNE, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_JOHANNA, Route109_SeashoreHouse_EventScript_160F29 + goto_if_trainer_not_defeated OPPONENT_SIMON, Route109_SeashoreHouse_EventScript_160F29 setflag FLAG_DEFEATED_SEASHORE_HOUSE_TRAINERS release end diff --git a/data/scripts/maps/Route111.inc b/data/scripts/maps/Route111.inc index 11af07dce..99fa29efb 100644 --- a/data/scripts/maps/Route111.inc +++ b/data/scripts/maps/Route111.inc @@ -15,8 +15,7 @@ Route111_EventScript_14FFA6:: @ 814FFA6 Route111_MapScript1_14FFB9:: @ 814FFB9 call Route111_EventScript_14FFCD call Route111_EventScript_1AE313 - checktrainerflag OPPONENT_VICKY - goto_if_lt Route111_EventScript_15000D + goto_if_trainer_not_defeated OPPONENT_VICKY, Route111_EventScript_15000D end Route111_EventScript_14FFCD:: @ 814FFCD diff --git a/data/scripts/maps/SSTidalCorridor.inc b/data/scripts/maps/SSTidalCorridor.inc index cd830f2b0..7bc5a7fdd 100644 --- a/data/scripts/maps/SSTidalCorridor.inc +++ b/data/scripts/maps/SSTidalCorridor.inc @@ -173,22 +173,14 @@ SSTidalCorridor_EventScript_15FE7A:: @ 815FE7A end SSTidalCorridor_EventScript_15FE84:: @ 815FE84 - checktrainerflag OPPONENT_PHILLIP - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEONARD - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_COLTON - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_TUCKER - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_THOMAS - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_LEA_AND_JED - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_GARRET - goto_if_lt SSTidalCorridor_EventScript_15FED5 - checktrainerflag OPPONENT_ANETTE - goto_if_lt SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_PHILLIP, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEONARD, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_COLTON, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_TUCKER, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_THOMAS, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_LEA_AND_JED, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_GARRET, SSTidalCorridor_EventScript_15FED5 + goto_if_trainer_not_defeated OPPONENT_ANETTE, SSTidalCorridor_EventScript_15FED5 setflag FLAG_DEFEATED_SS_TIDAL_TRAINERS goto SSTidalCorridor_EventScript_15FE7A return -- cgit v1.2.3 From 2692979c40ce3bc93901ea7194c68c01d14c1c9f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 5 Jan 2018 21:46:59 -0500 Subject: some renaming --- data/scripts/maps/MtChimney_CableCarStation.inc | 2 +- data/scripts/maps/Route112_CableCarStation.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'data/scripts/maps') diff --git a/data/scripts/maps/MtChimney_CableCarStation.inc b/data/scripts/maps/MtChimney_CableCarStation.inc index aefc68bda..6b0858bc5 100644 --- a/data/scripts/maps/MtChimney_CableCarStation.inc +++ b/data/scripts/maps/MtChimney_CableCarStation.inc @@ -48,7 +48,7 @@ MtChimney_CableCarStation_EventScript_15C16C:: @ 815C16C setvar VAR_CABLE_CAR_STATION_STATE, 2 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end diff --git a/data/scripts/maps/Route112_CableCarStation.inc b/data/scripts/maps/Route112_CableCarStation.inc index adbea780e..0264342ea 100644 --- a/data/scripts/maps/Route112_CableCarStation.inc +++ b/data/scripts/maps/Route112_CableCarStation.inc @@ -49,7 +49,7 @@ Route112_CableCarStation_EventScript_15C0AD:: @ 815C0AD setvar VAR_CABLE_CAR_STATION_STATE, 1 incrementgamestat GAME_STAT_RODE_CABLE_CAR special CableCarWarp - special sub_8123218 + special CableCar waitstate release end -- cgit v1.2.3