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
+25 -50
View File
@@ -74,8 +74,7 @@ CinnabarIsland_Gym_EventScript_DefeatedBlaine::
CinnabarIsland_Gym_EventScript_GiveTM38::
msgbox CinnabarIsland_Gym_Text_ExplainVolcanoBadge
checkitemspace ITEM_TM38
compare VAR_RESULT, FALSE
goto_if_eq CinnabarIsland_Gym_EventScript_NoRoomForTM38
goto_if_eq VAR_RESULT, FALSE, CinnabarIsland_Gym_EventScript_NoRoomForTM38
giveitem_msg CinnabarIsland_Gym_Text_ReceivedTM38FromBlaine, ITEM_TM38
setflag FLAG_GOT_TM38_FROM_BLAINE
msgbox CinnabarIsland_Gym_Text_FireBlastIsUltimateFireMove
@@ -217,10 +216,8 @@ CinnabarIsland_Gym_EventScript_Quz1Right::
CinnabarIsland_Gym_EventScript_Quiz1::
msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
msgbox CinnabarIsland_Gym_Text_QuizQuestion1, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz1Correct
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz1Incorrect
goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz1Correct
goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz1Incorrect
end
CinnabarIsland_Gym_EventScript_CorrectAnswer::
@@ -263,10 +260,8 @@ CinnabarIsland_Gym_EventScript_Quiz1Incorrect::
end
CinnabarIsland_Gym_EventScript_BattleQuinn::
compare VAR_TEMP_1, 0
call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachLeft
compare VAR_TEMP_1, 1
call_if_eq CinnabarIsland_Gym_EventScript_QuinnApproachRight
call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_QuinnApproachLeft
call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_QuinnApproachRight
textcolor NPC_TEXT_COLOR_MALE
msgbox CinnabarIsland_Gym_Text_QuinnIntro
trainerbattle_no_intro TRAINER_BURGLAR_QUINN, CinnabarIsland_Gym_Text_QuinnDefeat
@@ -311,10 +306,8 @@ CinnabarIsland_Gym_EventScript_Quiz2Right::
CinnabarIsland_Gym_EventScript_Quiz2::
msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
msgbox CinnabarIsland_Gym_Text_QuizQuestion2, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Incorrect
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz2Correct
goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz2Incorrect
goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz2Correct
end
CinnabarIsland_Gym_EventScript_Quiz2Correct::
@@ -339,10 +332,8 @@ CinnabarIsland_Gym_EventScript_Quiz2Incorrect::
end
CinnabarIsland_Gym_EventScript_BattleAvery::
compare VAR_TEMP_1, 0
call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachLeft
compare VAR_TEMP_1, 1
call_if_eq CinnabarIsland_Gym_EventScript_AveryApproachRight
call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_AveryApproachLeft
call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_AveryApproachRight
textcolor NPC_TEXT_COLOR_MALE
msgbox CinnabarIsland_Gym_Text_AveryIntro
trainerbattle_no_intro TRAINER_SUPER_NERD_AVERY, CinnabarIsland_Gym_Text_AveryDefeat
@@ -396,10 +387,8 @@ CinnabarIsland_Gym_EventScript_Quiz3Right::
CinnabarIsland_Gym_EventScript_Quiz3::
msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
msgbox CinnabarIsland_Gym_Text_QuizQuestion3, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Incorrect
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz3Correct
goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz3Incorrect
goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz3Correct
end
CinnabarIsland_Gym_EventScript_Quiz3Correct::
@@ -424,10 +413,8 @@ CinnabarIsland_Gym_EventScript_Quiz3Incorrect::
end
CinnabarIsland_Gym_EventScript_BattleRamon::
compare VAR_TEMP_1, 0
call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachLeft
compare VAR_TEMP_1, 1
call_if_eq CinnabarIsland_Gym_EventScript_RamonApproachRight
call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_RamonApproachLeft
call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_RamonApproachRight
textcolor NPC_TEXT_COLOR_MALE
msgbox CinnabarIsland_Gym_Text_RamonIntro
trainerbattle_no_intro TRAINER_BURGLAR_RAMON, CinnabarIsland_Gym_Text_RamonDefeat
@@ -472,10 +459,8 @@ CinnabarIsland_Gym_EventScript_Quiz4Right::
CinnabarIsland_Gym_EventScript_Quiz4::
msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
msgbox CinnabarIsland_Gym_Text_QuizQuestion4, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Incorrect
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz4Correct
goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz4Incorrect
goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz4Correct
end
CinnabarIsland_Gym_EventScript_Quiz4Correct::
@@ -500,10 +485,8 @@ CinnabarIsland_Gym_EventScript_Quiz4Incorrect::
end
CinnabarIsland_Gym_EventScript_BattleDerek::
compare VAR_TEMP_1, 0
call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachLeft
compare VAR_TEMP_1, 1
call_if_eq CinnabarIsland_Gym_EventScript_DerekApproachRight
call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_DerekApproachLeft
call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_DerekApproachRight
textcolor NPC_TEXT_COLOR_MALE
msgbox CinnabarIsland_Gym_Text_DerekIntro
trainerbattle_no_intro TRAINER_SUPER_NERD_DEREK, CinnabarIsland_Gym_Text_DerekDefeat
@@ -548,10 +531,8 @@ CinnabarIsland_Gym_EventScript_Quiz5Right::
CinnabarIsland_Gym_EventScript_Quiz5::
msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
msgbox CinnabarIsland_Gym_Text_QuizQuestion5, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Correct
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz5Incorrect
goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz5Correct
goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz5Incorrect
end
CinnabarIsland_Gym_EventScript_Quiz5Correct::
@@ -576,10 +557,8 @@ CinnabarIsland_Gym_EventScript_Quiz5Incorrect::
end
CinnabarIsland_Gym_EventScript_BattleDusty::
compare VAR_TEMP_1, 0
call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachLeft
compare VAR_TEMP_1, 1
call_if_eq CinnabarIsland_Gym_EventScript_DustyApproachRight
call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_DustyApproachLeft
call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_DustyApproachRight
textcolor NPC_TEXT_COLOR_MALE
msgbox CinnabarIsland_Gym_Text_DustyIntro
trainerbattle_no_intro TRAINER_BURGLAR_DUSTY, CinnabarIsland_Gym_Text_DustyDefeat
@@ -624,10 +603,8 @@ CinnabarIsland_Gym_EventScript_Quiz6Right::
CinnabarIsland_Gym_EventScript_Quiz6::
msgbox CinnabarIsland_Gym_Text_PokemonQuizRules
msgbox CinnabarIsland_Gym_Text_QuizQuestion6, MSGBOX_YESNO
compare VAR_RESULT, YES
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Incorrect
compare VAR_RESULT, NO
goto_if_eq CinnabarIsland_Gym_EventScript_Quiz6Correct
goto_if_eq VAR_RESULT, YES, CinnabarIsland_Gym_EventScript_Quiz6Incorrect
goto_if_eq VAR_RESULT, NO, CinnabarIsland_Gym_EventScript_Quiz6Correct
end
CinnabarIsland_Gym_EventScript_Quiz6Correct::
@@ -652,10 +629,8 @@ CinnabarIsland_Gym_EventScript_Quiz6Incorrect::
end
CinnabarIsland_Gym_EventScript_BattleZac::
compare VAR_TEMP_1, 0
call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachLeft
compare VAR_TEMP_1, 1
call_if_eq CinnabarIsland_Gym_EventScript_ZacApproachRight
call_if_eq VAR_TEMP_1, 0, CinnabarIsland_Gym_EventScript_ZacApproachLeft
call_if_eq VAR_TEMP_1, 1, CinnabarIsland_Gym_EventScript_ZacApproachRight
textcolor NPC_TEXT_COLOR_MALE
msgbox CinnabarIsland_Gym_Text_ZacIntro
trainerbattle_no_intro TRAINER_SUPER_NERD_ZAC, CinnabarIsland_Gym_Text_ZacDefeat