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
@@ -10,8 +10,7 @@ FiveIsland_WaterLabyrinth_EventScript_EggGentleman::
goto_if_set FLAG_NO_ROOM_FOR_TOGEPI_EGG, FiveIsland_WaterLabyrinth_EventScript_ReturnForEgg
msgbox FiveIsland_WaterLabyrinth_Text_LetMeTakeLookAtMons
specialvar VAR_RESULT, GetLeadMonFriendship
compare VAR_RESULT, 6 @ Max friendship
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship
goto_if_eq VAR_RESULT, 6, FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship
msgbox FiveIsland_WaterLabyrinth_Text_HmmISeeIsee
release
end
@@ -29,8 +28,7 @@ FiveIsland_WaterLabyrinth_EventScript_LeadMonMaxFriendship::
FiveIsland_WaterLabyrinth_EventScript_TryGiveEgg::
getpartysize
compare VAR_RESULT, PARTY_SIZE
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg
goto_if_eq VAR_RESULT, PARTY_SIZE, FiveIsland_WaterLabyrinth_EventScript_NoRoomForEgg
setflag FLAG_GOT_TOGEPI_EGG
giveegg SPECIES_TOGEPI
textcolor NPC_TEXT_COLOR_NEUTRAL
@@ -48,13 +46,11 @@ FiveIsland_WaterLabyrinth_EventScript_PostEggComment::
bufferspeciesname STR_VAR_2, SPECIES_TOGEPI
setvar VAR_0x8004, SPECIES_TOGEPI
specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
compare VAR_RESULT, TRUE
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
goto_if_eq VAR_RESULT, TRUE, FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
bufferspeciesname STR_VAR_2, SPECIES_TOGETIC
setvar VAR_0x8004, SPECIES_TOGETIC
specialvar VAR_RESULT, PlayerPartyContainsSpeciesWithPlayerID
compare VAR_RESULT, TRUE
goto_if_eq FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
goto_if_eq VAR_RESULT, TRUE, FiveIsland_WaterLabyrinth_EventScript_MonDaisyComment
msgbox FiveIsland_WaterLabyrinth_Text_GladIMetSomeoneLikeYou
release
end