diff options
Diffstat (limited to 'data/maps/PalletTown_PlayersHouse_1F/scripts.inc')
| -rw-r--r-- | data/maps/PalletTown_PlayersHouse_1F/scripts.inc | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc index 900dd06aa..6dc0a1a47 100644 --- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc +++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc @@ -4,15 +4,14 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08 PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09 lock faceplayer - checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB - goto_if TRUE, EventScript_168C4A + goto_if_set FLAG_BEAT_RIVAL_IN_OAKS_LAB, EventScript_168C4A checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_168C38 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_168C41 + compare VAR_RESULT, MALE + call_if_eq EventScript_168C38 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_168C41 closemessage - applymovement 1, Movement_1A75E5 + applymovement 1, Movement_FaceOriginalDirection waitmovement 0 release end @@ -28,25 +27,25 @@ EventScript_168C41:: @ 8168C41 EventScript_168C4A:: @ 8168C4A msgbox gUnknown_818D3D1 closemessage - call EventScript_FadeOut_Heal_FadeIn + call EventScript_OutOfCenterPartyHeal msgbox gUnknown_818D3F8 release end PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62 lockall - compare_var_to_value VAR_FACING, 2 - goto_if eq, EventScript_168C78 + compare VAR_FACING, DIR_NORTH + goto_if_eq EventScript_168C78 msgbox gUnknown_818D4F9 releaseall end EventScript_168C78:: @ 8168C78 checkplayergender - compare_var_to_value VAR_RESULT, 0 - call_if eq, EventScript_168C91 - compare_var_to_value VAR_RESULT, 1 - call_if eq, EventScript_168C9A + compare VAR_RESULT, MALE + call_if_eq EventScript_168C91 + compare VAR_RESULT, FEMALE + call_if_eq EventScript_168C9A releaseall end |