Use 'goto_if_eq VAR, value, Script' syntax

This commit is contained in:
GriffinR
2022-08-09 20:40:03 -04:00
parent 60fc8c5e22
commit f113da30ad
171 changed files with 1992 additions and 3453 deletions
+4 -8
View File
@@ -16,8 +16,7 @@ TrainerTower_Lobby_OnResume::
setvar VAR_TEMP_2, 0
ttower_resumetimer
ttower_shouldexit
compare VAR_RESULT, FALSE
goto_if_eq TrainerTower_Lobby_OnResumeEnd
goto_if_eq VAR_RESULT, FALSE, TrainerTower_Lobby_OnResumeEnd
@ Never reached, above always FALSE
setvar VAR_TEMP_0, 0
setobjectxy OBJ_EVENT_ID_PLAYER, 9, 7
@@ -34,8 +33,7 @@ TrainerTower_Lobby_OnReturnToField::
end
TrainerTower_Lobby_OnLoad::
compare VAR_TEMP_D, 17
call_if_eq TrainerTower_Lobby_OpenCounterBarrier
call_if_eq VAR_TEMP_D, 17, TrainerTower_Lobby_OpenCounterBarrier
end
TrainerTower_Lobby_OpenCounterBarrier::
@@ -112,8 +110,7 @@ TrainerTower_Lobby_EventScript_Receptionist::
lock
faceplayer
ttower_getbeatchallenge
compare VAR_RESULT, TRUE
goto_if_eq TrainerTower_Lobby_EventScript_ThanksForCompeting
goto_if_eq VAR_RESULT, TRUE, TrainerTower_Lobby_EventScript_ThanksForCompeting
msgbox TrainerTower_Lobby_Text_GiveItYourBest
goto TrainerTower_Lobby_EventScript_ReceptionistEnd
@@ -155,8 +152,7 @@ TrainerTower_Lobby_EventScript_EntryTrigger::
textcolor NPC_TEXT_COLOR_FEMALE
msgbox TrainerTower_Lobby_Text_WelcomeToTrainerTower
ttower_getnumfloors
compare VAR_RESULT, FALSE
goto_if_eq TrainerTower_Lobby_EventScript_AllFloorsUsed
goto_if_eq VAR_RESULT, FALSE, TrainerTower_Lobby_EventScript_AllFloorsUsed
msgbox TrainerTower_Lobby_Text_TrainersUpToFloorNum
goto TrainerTower_Lobby_EventScript_AskEnterChallenge