summaryrefslogtreecommitdiff
path: root/data/scripts/maps/RustboroCity_House1.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/maps/RustboroCity_House1.inc')
-rw-r--r--data/scripts/maps/RustboroCity_House1.inc16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/scripts/maps/RustboroCity_House1.inc b/data/scripts/maps/RustboroCity_House1.inc
index 402fff1d3..b983617e0 100644
--- a/data/scripts/maps/RustboroCity_House1.inc
+++ b/data/scripts/maps/RustboroCity_House1.inc
@@ -5,24 +5,24 @@ RustboroCity_House1_EventScript_157C7D:: @ 8157C7D
lock
faceplayer
checkflag 153
- jumpeq RustboroCity_House1_EventScript_157D13
+ goto_if_eq RustboroCity_House1_EventScript_157D13
setvar 0x8008, 0
copyvar 0x8004, 0x8008
- specialval RESULT, sub_804D89C
+ specialvar RESULT, sub_804D89C
copyvar 0x8009, RESULT
msgbox RustboroCity_House1_Text_184EBA, 5
compare RESULT, 0
- jumpeq RustboroCity_House1_EventScript_157CFB
+ goto_if_eq RustboroCity_House1_EventScript_157CFB
special sub_80F9A0C
waitstate
copyvar 0x800a, 0x8004
compare 0x8004, 255
- jumpeq RustboroCity_House1_EventScript_157CFB
+ goto_if_eq RustboroCity_House1_EventScript_157CFB
copyvar 0x8005, 0x800a
- specialval RESULT, sub_804DB2C
+ specialvar RESULT, sub_804DB2C
copyvar 0x800b, RESULT
- comparevars RESULT, 0x8009
- jumpif 5, RustboroCity_House1_EventScript_157D05
+ compare RESULT, 0x8009
+ goto_if 5, RustboroCity_House1_EventScript_157D05
copyvar 0x8004, 0x8008
copyvar 0x8005, 0x800a
special sub_804DB68
@@ -39,7 +39,7 @@ RustboroCity_House1_EventScript_157CFB:: @ 8157CFB
end
RustboroCity_House1_EventScript_157D05:: @ 8157D05
- bufferpoke 0, 0x8009
+ getspeciesname 0, 0x8009
msgbox RustboroCity_House1_Text_184F8F, 4
release
end