dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Reformat compare + goto_if/call_if to single statements

Browse Source
This commit is contained in:
GriffinR
2021-11-18 23:06:30 -05:00
parent c57efdba5d
commit e66ea0cb99
293 changed files with 2990 additions and 5978 deletions
Download Patch File Download Diff File Expand all files Collapse all files

213
data/maps/SootopolisCity/scripts.inc
View File

@@ -51,32 +51,20 @@ SootopolisCity_EventScript_LockGymDoor::
SootopolisCity_OnTransition:
setflag FLAG_VISITED_SOOTOPOLIS_CITY
compare VAR_SOOTOPOLIS_CITY_STATE, 1
call_if_eq SootopolisCity_EventScript_HideMapNamePopup
compare VAR_SKY_PILLAR_STATE, 1
call_if_eq SootopolisCity_EventScript_HideMapNamePopup
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_HideMapNamePopup
call_if_eq VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_HideMapNamePopup
call SootopolisCity_EventScript_SetWeather
call SootopolisCity_EventScript_SetLayout
compare VAR_SOOTOPOLIS_CITY_STATE, 1
call_if_eq SootopolisCity_EventScript_SetBattleSpectators
compare VAR_SOOTOPOLIS_CITY_STATE, 2
call_if_eq SootopolisCity_EventScript_SetBattleSpectators
compare VAR_SOOTOPOLIS_CITY_STATE, 3
call_if_eq SootopolisCity_EventScript_SetBattleSpectators
compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_eq SootopolisCity_EventScript_SetBattleSpectators
compare VAR_SOOTOPOLIS_CITY_STATE, 5
call_if_eq SootopolisCity_EventScript_SetBattleSpectators
compare VAR_SOOTOPOLIS_CITY_STATE, 2
call_if_eq SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
compare VAR_SOOTOPOLIS_CITY_STATE, 3
call_if_eq SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
compare VAR_SOOTOPOLIS_CITY_STATE, 4
call_if_eq SootopolisCity_EventScript_SetExitCaveOfOriginObjPos
compare VAR_SOOTOPOLIS_CITY_STATE, 5
call_if_eq SootopolisCity_EventScript_SetOutsideGymObjPos
compare VAR_SOOTOPOLIS_CITY_STATE, 6
call_if_eq SootopolisCity_EventScript_SetExpertBlockCaveEntrance
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_SetBattleSpectators
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_SetBattleSpectators
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 3, SootopolisCity_EventScript_SetBattleSpectators
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 4, SootopolisCity_EventScript_SetBattleSpectators
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_SetBattleSpectators
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 3, SootopolisCity_EventScript_CheckSetEnterCaveOfOriginObjPos
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 4, SootopolisCity_EventScript_SetExitCaveOfOriginObjPos
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_SetOutsideGymObjPos
call_if_eq VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_SetExpertBlockCaveEntrance
end
SootopolisCity_EventScript_HideMapNamePopup::
@@ -95,20 +83,13 @@ SootopolisCity_EventScript_SetBattleSpectators::
return
SootopolisCity_EventScript_SetLayout::
compare VAR_SOOTOPOLIS_CITY_STATE, 0
goto_if_eq SootopolisCity_EventScript_SetNormalLayout
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_SetNormalLayout
compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
compare VAR_SOOTOPOLIS_CITY_STATE, 3
goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
compare VAR_SOOTOPOLIS_CITY_STATE, 4
goto_if_eq SootopolisCity_EventScript_SetLegendariesLayout
compare VAR_SKY_PILLAR_STATE, 1
goto_if_le SootopolisCity_EventScript_SetLegendariesLayout
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 0, SootopolisCity_EventScript_SetNormalLayout
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_SetNormalLayout
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_SetLegendariesLayout
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_SetLegendariesLayout
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 3, SootopolisCity_EventScript_SetLegendariesLayout
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 4, SootopolisCity_EventScript_SetLegendariesLayout
goto_if_le VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_SetLegendariesLayout
return
SootopolisCity_EventScript_SetNormalLayout::
@@ -119,16 +100,11 @@ SootopolisCity_EventScript_SetLegendariesLayout::
return
SootopolisCity_EventScript_SetWeather::
compare VAR_SOOTOPOLIS_CITY_STATE, 0
goto_if_eq SootopolisCity_EventScript_SetNormalWeather
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_SetNormalWeather
compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_eq SootopolisCity_EventScript_SetDownpour
compare VAR_SKY_PILLAR_STATE, 1
goto_if_eq SootopolisCity_EventScript_SetDownpour
compare VAR_SKY_PILLAR_STATE, 1
goto_if_le Common_EventScript_SetAbnormalWeather
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 0, SootopolisCity_EventScript_SetNormalWeather
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_SetNormalWeather
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_SetDownpour
goto_if_eq VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_SetDownpour
goto_if_le VAR_SKY_PILLAR_STATE, 1, Common_EventScript_SetAbnormalWeather
return
SootopolisCity_EventScript_SetNormalWeather::
@@ -158,12 +134,9 @@ SootopolisCity_EventScript_SetOutsideGymObjPos::
setobjectxyperm LOCALID_STEVEN, 29, 33
setobjectxyperm LOCALID_MAXIE, 33, 35
setobjectxyperm LOCALID_ARCHIE, 34, 35
compare VAR_SOOTOPOLIS_WALLACE_STATE, 0
call_if_eq SootopolisCity_EventScript_SetWallaceMiddle
compare VAR_SOOTOPOLIS_WALLACE_STATE, 1
call_if_eq SootopolisCity_EventScript_SetWallaceRight
compare VAR_SOOTOPOLIS_WALLACE_STATE, 2
call_if_eq SootopolisCity_EventScript_SetWallaceLeft
call_if_eq VAR_SOOTOPOLIS_WALLACE_STATE, 0, SootopolisCity_EventScript_SetWallaceMiddle
call_if_eq VAR_SOOTOPOLIS_WALLACE_STATE, 1, SootopolisCity_EventScript_SetWallaceRight
call_if_eq VAR_SOOTOPOLIS_WALLACE_STATE, 2, SootopolisCity_EventScript_SetWallaceLeft
return
SootopolisCity_EventScript_SetWallaceMiddle::
@@ -190,10 +163,8 @@ SootopolisCity_OnWarp:
.2byte 0
SootopolisCity_EventScript_PlayerFaceLegendaries::
compare VAR_SKY_PILLAR_STATE, 1
call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries1
compare VAR_SKY_PILLAR_STATE, 2
call_if_eq SootopolisCity_EventScript_PlayerFaceLegendaries2
call_if_eq VAR_SKY_PILLAR_STATE, 1, SootopolisCity_EventScript_PlayerFaceLegendaries1
call_if_eq VAR_SKY_PILLAR_STATE, 2, SootopolisCity_EventScript_PlayerFaceLegendaries2
end
SootopolisCity_EventScript_PlayerFaceLegendaries1::
@@ -218,10 +189,8 @@ SootopolisCity_OnFrame:
SootopolisCity_EventScript_StartLegendariesScene::
lockall
special StorePlayerCoordsInVars
compare VAR_0x8004, 43
goto_if_ne SootopolisCity_EventScript_LegendariesSceneFromDive
compare VAR_0x8005, 32
goto_if_ne SootopolisCity_EventScript_LegendariesSceneFromDive
goto_if_ne VAR_0x8004, 43, SootopolisCity_EventScript_LegendariesSceneFromDive
goto_if_ne VAR_0x8005, 32, SootopolisCity_EventScript_LegendariesSceneFromDive
goto SootopolisCity_EventScript_LegendariesSceneFromPokeCenter
end
@@ -509,10 +478,8 @@ SootopolisCity_Movement_GroudonIdle:
SootopolisCity_EventScript_StartRayquazaScene::
lockall
special StorePlayerCoordsInVars
compare VAR_0x8004, 43
goto_if_ne SootopolisCity_EventScript_RayquazaSceneFromDive
compare VAR_0x8005, 32
goto_if_ne SootopolisCity_EventScript_RayquazaSceneFromDive
goto_if_ne VAR_0x8004, 43, SootopolisCity_EventScript_RayquazaSceneFromDive
goto_if_ne VAR_0x8005, 32, SootopolisCity_EventScript_RayquazaSceneFromDive
goto SootopolisCity_EventScript_RayquazaSceneFromPokeCenter
end
@@ -717,12 +684,9 @@ SootopolisCity_Movement_UnusedPanBack:
SootopolisCity_EventScript_CaveOfOriginExpert::
lock
faceplayer
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_ExpertPostLegendaries
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_ExpertLegendaries
compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_ge SootopolisCity_EventScript_ExpertLeadToCave
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_ExpertPostLegendaries
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_ExpertLegendaries
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_ExpertLeadToCave
msgbox SootopolisCity_Text_CaveOfOriginPleaseLeave, MSGBOX_DEFAULT
release
end
@@ -745,12 +709,9 @@ SootopolisCity_EventScript_ExpertLegendaries::
SootopolisCity_EventScript_Kiri::
lock
faceplayer
compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_le SootopolisCity_EventScript_KiriGiveBerry
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_KiriGiveBerry
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_KiriRayquaza
goto_if_le VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_KiriGiveBerry
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_KiriGiveBerry
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_KiriRayquaza
msgbox SootopolisCity_Text_BigPokemonFighting, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_KIRI, Common_Movement_FaceOriginalDirection
@@ -774,37 +735,31 @@ SootopolisCity_EventScript_KiriGiveBerry::
addvar VAR_RESULT, NUM_KIRI_BERRIES_SKIPPED
addvar VAR_RESULT, FIRST_BERRY_INDEX
giveitem VAR_RESULT
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
setflag FLAG_DAILY_SOOTOPOLIS_RECEIVED_BERRY
msgbox SootopolisCity_Text_GiveYouThisBerryToo, MSGBOX_DEFAULT
random 2
compare VAR_RESULT, 0
goto_if_eq SootopolisCity_EventScript_GiveFigyBerry
compare VAR_RESULT, 1
goto_if_eq SootopolisCity_EventScript_GiveIapapaBerry
goto_if_eq VAR_RESULT, 0, SootopolisCity_EventScript_GiveFigyBerry
goto_if_eq VAR_RESULT, 1, SootopolisCity_EventScript_GiveIapapaBerry
end
SootopolisCity_EventScript_GiveFigyBerry::
giveitem ITEM_FIGY_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
release
end
SootopolisCity_EventScript_GiveIapapaBerry::
giveitem ITEM_IAPAPA_BERRY
compare VAR_RESULT, FALSE
goto_if_eq Common_EventScript_ShowBagIsFull
goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
msgbox SootopolisCity_Text_WhatKindOfWishInYourName, MSGBOX_DEFAULT
release
end
SootopolisCity_EventScript_KiriReceivedBerry::
msgbox SootopolisCity_Text_LikeSeasonBornIn, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq SootopolisCity_EventScript_KiriLikeSeasonBornIn
goto_if_eq VAR_RESULT, YES, SootopolisCity_EventScript_KiriLikeSeasonBornIn
msgbox SootopolisCity_Text_OhDoesntMatter, MSGBOX_DEFAULT
release
end
@@ -818,8 +773,7 @@ SootopolisCity_EventScript_Woman2::
lockall
applymovement LOCALID_WOMAN_2, Common_Movement_FacePlayer
waitmovement 0
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_Woman2Rayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Woman2Rayquaza
msgbox SootopolisCity_Text_WeatherWentWild, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_WOMAN_2, Common_Movement_FaceOriginalDirection
@@ -835,8 +789,7 @@ SootopolisCity_EventScript_Woman2Rayquaza::
SootopolisCity_EventScript_Man::
lock
faceplayer
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_ManPostLegendaries
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_ManPostLegendaries
msgbox SootopolisCity_Text_NoOrdinaryTourist, MSGBOX_DEFAULT
release
end
@@ -849,12 +802,9 @@ SootopolisCity_EventScript_ManPostLegendaries::
SootopolisCity_EventScript_Woman1::
lock
faceplayer
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_Woman1PostLegendaries
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_Woman1Rayquaza
compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_ge SootopolisCity_EventScript_Woman1Legendaries
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_Woman1PostLegendaries
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Woman1Rayquaza
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_Woman1Legendaries
msgbox SootopolisCity_Text_SootopolisSkyBeautiful, MSGBOX_DEFAULT
release
end
@@ -881,12 +831,9 @@ SootopolisCity_EventScript_NinjaBoy::
lockall
applymovement LOCALID_NINJA_BOY, Common_Movement_FacePlayer
waitmovement 0
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_NinjaBoyRayquaza
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_NinjaBoyNormal
compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_le SootopolisCity_EventScript_NinjaBoyNormal
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_NinjaBoyRayquaza
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_NinjaBoyNormal
goto_if_le VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_NinjaBoyNormal
msgbox SootopolisCity_Text_ThisIsWicked, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_NINJA_BOY, Common_Movement_FaceOriginalDirection
@@ -908,13 +855,10 @@ SootopolisCity_EventScript_Boy1::
lockall
applymovement LOCALID_BOY_1, Common_Movement_FacePlayer
waitmovement 0
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_Boy1Rayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Boy1Rayquaza
goto_if_set FLAG_SYS_GAME_CLEAR, SootopolisCity_EventScript_Boy1GameClear
compare VAR_SOOTOPOLIS_CITY_STATE, 6
goto_if_ge SootopolisCity_EventScript_Boy1Normal
compare VAR_SOOTOPOLIS_CITY_STATE, 1
goto_if_le SootopolisCity_EventScript_Boy1Normal
goto_if_ge VAR_SOOTOPOLIS_CITY_STATE, 6, SootopolisCity_EventScript_Boy1Normal
goto_if_le VAR_SOOTOPOLIS_CITY_STATE, 1, SootopolisCity_EventScript_Boy1Normal
msgbox SootopolisCity_Text_GiantPokemonSuddenlyAppeared, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_BOY_1, Common_Movement_FaceOriginalDirection
@@ -954,12 +898,9 @@ SootopolisCity_EventScript_Steven::
applymovement LOCALID_STEVEN, Common_Movement_FacePlayer
waitmovement 0
call_if_unset FLAG_STEVEN_GUIDES_TO_CAVE_OF_ORIGIN, SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin
compare VAR_SOOTOPOLIS_CITY_STATE, 2
goto_if_eq SootopolisCity_EventScript_StevenHelpWallace
compare VAR_SOOTOPOLIS_CITY_STATE, 3
goto_if_eq SootopolisCity_EventScript_StevenHelpedWallace
compare VAR_SOOTOPOLIS_CITY_STATE, 4
goto_if_eq SootopolisCity_EventScript_StevenHelpedWallace
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 2, SootopolisCity_EventScript_StevenHelpWallace
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 3, SootopolisCity_EventScript_StevenHelpedWallace
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 4, SootopolisCity_EventScript_StevenHelpedWallace
goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_StevenMaxieArchieLeft
msgbox SootopolisCity_Text_SoThatsRayquaza, MSGBOX_DEFAULT
releaseall
@@ -983,10 +924,8 @@ SootopolisCity_EventScript_StevenHelpedWallace::
SootopolisCity_EventScript_StevenLeadPlayerCaveOfOrigin::
msgbox SootopolisCity_Text_InvolvedWithCrisisComeWithMe, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_EventScript_StartWalkToCaveOfOriginWest
compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth
call_if_eq VAR_FACING, DIR_WEST, SootopolisCity_EventScript_StartWalkToCaveOfOriginWest
call_if_eq VAR_FACING, DIR_NORTH, SootopolisCity_EventScript_StartWalkToCaveOfOriginNorth
msgbox SootopolisCity_Text_DoesThisMakeYourFearPokemon, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_STEVEN, SootopolisCity_Movement_StevenWalkToCaveOfOrigin
@@ -1287,8 +1226,7 @@ SootopolisCity_EventScript_Boy2::
lockall
applymovement LOCALID_BOY_2, Common_Movement_FacePlayer
waitmovement 0
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_Boy2Rayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_Boy2Rayquaza
msgbox SootopolisCity_Text_TwoPokemonArentAngry, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_BOY_2, Common_Movement_FaceOriginalDirection
@@ -1304,8 +1242,7 @@ SootopolisCity_EventScript_Boy2Rayquaza::
SootopolisCity_EventScript_BlackBelt::
lockall
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_BlackBeltRayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_BlackBeltRayquaza
msgbox SootopolisCity_Text_GoRedAndBlueMon, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_BLACK_BELT, Common_Movement_FacePlayer
@@ -1328,8 +1265,7 @@ SootopolisCity_EventScript_Girl::
lockall
applymovement LOCALID_GIRL, Common_Movement_FacePlayer
waitmovement 0
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_GirlRayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_GirlRayquaza
msgbox SootopolisCity_Text_SootopolisWillBeWrecked, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_GIRL, Common_Movement_FaceOriginalDirection
@@ -1347,8 +1283,7 @@ SootopolisCity_EventScript_Maniac::
lockall
applymovement LOCALID_MANIAC, Common_Movement_FacePlayer
waitmovement 0
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_ManiacRayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_ManiacRayquaza
msgbox SootopolisCity_Text_SeeingLegendWithOwnEyes, MSGBOX_DEFAULT
closemessage
applymovement LOCALID_MANIAC, Common_Movement_FaceOriginalDirection
@@ -1364,8 +1299,7 @@ SootopolisCity_EventScript_ManiacRayquaza::
SootopolisCity_EventScript_Wallace::
lock
faceplayer
compare VAR_SOOTOPOLIS_CITY_STATE, 4
goto_if_eq SootopolisCity_EventScript_GoToSkyPillar
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 4, SootopolisCity_EventScript_GoToSkyPillar
goto_if_set FLAG_RECEIVED_HM07, SootopolisCity_EventScript_GoToGym
goto_if_set FLAG_SOOTOPOLIS_ARCHIE_MAXIE_LEAVE, SootopolisCity_EventScript_GiveWaterfall
msgbox SootopolisCity_Text_AquaMagmaDidntMeanHarm, MSGBOX_DEFAULT
@@ -1378,12 +1312,9 @@ SootopolisCity_EventScript_GiveWaterfall::
setflag FLAG_RECEIVED_HM07
msgbox SootopolisCity_Text_ExplainWaterfallGoToGym, MSGBOX_DEFAULT
closemessage
compare VAR_FACING, DIR_NORTH
call_if_eq SootopolisCity_EventScript_WallaceMoveFromGym
compare VAR_FACING, DIR_EAST
call_if_eq SootopolisCity_EventScript_WallaceMoveFromGym
compare VAR_FACING, DIR_WEST
call_if_eq SootopolisCity_EventScript_WallaceMoveFromGymWest
call_if_eq VAR_FACING, DIR_NORTH, SootopolisCity_EventScript_WallaceMoveFromGym
call_if_eq VAR_FACING, DIR_EAST, SootopolisCity_EventScript_WallaceMoveFromGym
call_if_eq VAR_FACING, DIR_WEST, SootopolisCity_EventScript_WallaceMoveFromGymWest
release
end
@@ -1423,8 +1354,7 @@ SootopolisCity_Movement_WallaceMoveFromGymWest:
SootopolisCity_EventScript_Maxie::
lockall
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_MaxieRayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_MaxieRayquaza
msgbox SootopolisCity_Text_GroudonPleaseStop, MSGBOX_DEFAULT
closemessage
releaseall
@@ -1439,8 +1369,7 @@ SootopolisCity_EventScript_MaxieRayquaza::
SootopolisCity_EventScript_Archie::
lockall
compare VAR_SOOTOPOLIS_CITY_STATE, 5
goto_if_eq SootopolisCity_EventScript_ArchieRayquaza
goto_if_eq VAR_SOOTOPOLIS_CITY_STATE, 5, SootopolisCity_EventScript_ArchieRayquaza
msgbox SootopolisCity_Text_KyogreCalmDown, MSGBOX_DEFAULT
closemessage
releaseall