summaryrefslogtreecommitdiff
path: root/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/PalletTown_PlayersHouse_1F/scripts.inc')
-rw-r--r--data/maps/PalletTown_PlayersHouse_1F/scripts.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
index 89eabeea1..900dd06aa 100644
--- a/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
+++ b/data/maps/PalletTown_PlayersHouse_1F/scripts.inc
@@ -4,13 +4,13 @@ PalletTown_PlayersHouse_1F_MapScripts:: @ 8168C08
PalletTown_PlayersHouse_1F_EventScript_168C09:: @ 8168C09
lock
faceplayer
- checkflag FLAG_0x258
- goto_if_eq EventScript_168C4A
+ checkflag FLAG_BEAT_RIVAL_IN_OAKS_LAB
+ goto_if TRUE, EventScript_168C4A
checkplayergender
compare_var_to_value VAR_RESULT, 0
- call_if 1, EventScript_168C38
+ call_if eq, EventScript_168C38
compare_var_to_value VAR_RESULT, 1
- call_if 1, EventScript_168C41
+ call_if eq, EventScript_168C41
closemessage
applymovement 1, Movement_1A75E5
waitmovement 0
@@ -28,7 +28,7 @@ EventScript_168C41:: @ 8168C41
EventScript_168C4A:: @ 8168C4A
msgbox gUnknown_818D3D1
closemessage
- call EventScript_1A6C26
+ call EventScript_FadeOut_Heal_FadeIn
msgbox gUnknown_818D3F8
release
end
@@ -36,7 +36,7 @@ EventScript_168C4A:: @ 8168C4A
PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
lockall
compare_var_to_value VAR_FACING, 2
- goto_if_eq EventScript_168C78
+ goto_if eq, EventScript_168C78
msgbox gUnknown_818D4F9
releaseall
end
@@ -44,9 +44,9 @@ PalletTown_PlayersHouse_1F_EventScript_168C62:: @ 8168C62
EventScript_168C78:: @ 8168C78
checkplayergender
compare_var_to_value VAR_RESULT, 0
- call_if 1, EventScript_168C91
+ call_if eq, EventScript_168C91
compare_var_to_value VAR_RESULT, 1
- call_if 1, EventScript_168C9A
+ call_if eq, EventScript_168C9A
releaseall
end