summaryrefslogtreecommitdiff
path: root/data/maps/EverGrandeCity_ChampionsRoom
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/EverGrandeCity_ChampionsRoom')
-rw-r--r--data/maps/EverGrandeCity_ChampionsRoom/scripts.inc18
1 files changed, 6 insertions, 12 deletions
diff --git a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
index d33c57df8..103942280 100644
--- a/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
+++ b/data/maps/EverGrandeCity_ChampionsRoom/scripts.inc
@@ -57,17 +57,13 @@ EverGrandeCity_ChampionsRoom_EventScript_Defeated::
closemessage
playse SE_DOOR
checkplayergender
- compare VAR_RESULT, MALE
- call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic
- compare VAR_RESULT, FEMALE
- call_if_eq EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic
+ call_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic
+ call_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_PlayBrendanMusic
addobject LOCALID_RIVAL
call EverGrandeCity_ChampionsRoom_EventScript_RivalApproachPlayer
checkplayergender
- compare VAR_RESULT, MALE
- goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayAdvice
- compare VAR_RESULT, FEMALE
- goto_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice
+ goto_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_MayAdvice
+ goto_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_BrendanAdvice
end
EverGrandeCity_ChampionsRoom_EventScript_PlayMayMusic::
@@ -132,10 +128,8 @@ EverGrandeCity_ChampionsRoom_EventScript_BirchArrivesExitForHoF::
waitmovement 0
msgbox EverGrandeCity_ChampionsRoom_Text_WallaceWaitOutside, MSGBOX_DEFAULT
checkplayergender
- compare VAR_RESULT, MALE
- call_if_eq EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations
- compare VAR_RESULT, FEMALE
- call_if_eq EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations
+ call_if_eq VAR_RESULT, MALE, EverGrandeCity_ChampionsRoom_EventScript_MayCongratulations
+ call_if_eq VAR_RESULT, FEMALE, EverGrandeCity_ChampionsRoom_EventScript_BrendanCongratulations
closemessage
applymovement LOCALID_WALLACE, EverGrandeCity_ChampionsRoom_Movement_WallaceExit
applymovement OBJ_EVENT_ID_PLAYER, EverGrandeCity_ChampionsRoom_Movement_PlayerExit