summaryrefslogtreecommitdiff
path: root/data/maps/LavenderTown_House2/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/LavenderTown_House2/scripts.inc')
-rw-r--r--data/maps/LavenderTown_House2/scripts.inc40
1 files changed, 20 insertions, 20 deletions
diff --git a/data/maps/LavenderTown_House2/scripts.inc b/data/maps/LavenderTown_House2/scripts.inc
index cd9e5e8d7..b6d5ae142 100644
--- a/data/maps/LavenderTown_House2/scripts.inc
+++ b/data/maps/LavenderTown_House2/scripts.inc
@@ -5,20 +5,20 @@ LavenderTown_House2_EventScript_16B266:: @ 816B266
lock
faceplayer
msgbox gUnknown_8193A4B, MSGBOX_YESNO
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16B287
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16B2AA
+ compare VAR_RESULT, YES
+ goto_if_eq EventScript_16B287
+ compare VAR_RESULT, NO
+ goto_if_eq EventScript_16B2AA
end
EventScript_16B287:: @ 816B287
msgbox gUnknown_8193AA6
special Special_ChooseMonFromParty
waitstate
- compare_var_to_value VAR_0x8004, 6
- goto_if lt, EventScript_16B2B4
- compare_var_to_value VAR_0x8004, 6
- goto_if ge, EventScript_16B2AA
+ compare VAR_0x8004, PARTY_SIZE
+ goto_if_lt EventScript_16B2B4
+ compare VAR_0x8004, PARTY_SIZE
+ goto_if_ge EventScript_16B2AA
end
EventScript_16B2AA:: @ 816B2AA
@@ -28,21 +28,21 @@ EventScript_16B2AA:: @ 816B2AA
EventScript_16B2B4:: @ 816B2B4
specialvar VAR_RESULT, Special_GetSpeciesOfPartySlot_x8004
- compare_var_to_value VAR_RESULT, SPECIES_EGG
- goto_if eq, EventScript_16B307
+ compare VAR_RESULT, SPECIES_EGG
+ goto_if_eq EventScript_16B307
special TV_CopyNicknameToStringVar1AndEnsureTerminated
special TV_CheckMonOTIDEqualsPlayerID
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16B311
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16B311
specialvar VAR_RESULT, Special_BufferMonOTNameAndCompareToPlayerName
special TV_CopyNicknameToStringVar1AndEnsureTerminated
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16B311
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16B311
msgbox gUnknown_8193AD2, MSGBOX_YESNO
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16B31B
- compare_var_to_value VAR_RESULT, 0
- goto_if eq, EventScript_16B2AA
+ compare VAR_RESULT, YES
+ goto_if_eq EventScript_16B31B
+ compare VAR_RESULT, NO
+ goto_if_eq EventScript_16B2AA
end
EventScript_16B307:: @ 816B307
@@ -60,8 +60,8 @@ EventScript_16B31B:: @ 816B31B
call EventScript_1A74EB
specialvar VAR_RESULT, NameRaterWasNicknameChanged
special TV_CopyNicknameToStringVar1AndEnsureTerminated
- compare_var_to_value VAR_RESULT, 1
- goto_if eq, EventScript_16B345
+ compare VAR_RESULT, 1
+ goto_if_eq EventScript_16B345
msgbox gUnknown_8193BF0
release
end