summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2013-10-01 01:03:08 -0400
committeryenatch <yenatch@gmail.com>2013-10-01 01:03:08 -0400
commite5b5e1238d9d976f617eab3a4ca2d1d659bbabf7 (patch)
treefde69bc97da0d16731c65e4160966ed10cb1cbe9
parent0f8c8e2d52e5299598754aa634facfe4ff447de7 (diff)
script command unknown0xa8 is wait
-rw-r--r--engine/scripting.asm4
-rw-r--r--maps/GoldenrodMagnetTrainStation.asm2
-rw-r--r--maps/SaffronTrainStation.asm2
3 files changed, 4 insertions, 4 deletions
diff --git a/engine/scripting.asm b/engine/scripting.asm
index b5b2ca707..515fb975b 100644
--- a/engine/scripting.asm
+++ b/engine/scripting.asm
@@ -167,7 +167,7 @@ ScriptCommandTable: ; 0x96cb1
dw Script_displaylocation
dw Script_unknown0xa6
dw Script_unknown0xa7
- dw Script_unknown0xa8
+ dw Script_wait
dw Script_unknown0xa9
; 0x96e05
@@ -3211,7 +3211,7 @@ DisplayCredits:
ret
; 0x97c05
-Script_unknown0xa8: ; 0x97c05
+Script_wait: ; 0x97c05
; script command 0xa8
; parameters:
; unknown (SingleByteParam)
diff --git a/maps/GoldenrodMagnetTrainStation.asm b/maps/GoldenrodMagnetTrainStation.asm
index fc469d450..119fd231b 100644
--- a/maps/GoldenrodMagnetTrainStation.asm
+++ b/maps/GoldenrodMagnetTrainStation.asm
@@ -40,7 +40,7 @@ UnknownScript_0x550fa: ; 0x550fa
warpcheck
newloadmap $f9
applymovement $0, MovementData_0x55122
- unknown0xa8 $14
+ wait $14
end
; 0x55122
diff --git a/maps/SaffronTrainStation.asm b/maps/SaffronTrainStation.asm
index b1da13c5c..599a19d71 100644
--- a/maps/SaffronTrainStation.asm
+++ b/maps/SaffronTrainStation.asm
@@ -40,7 +40,7 @@ UnknownScript_0x18a82c: ; 0x18a82c
warpcheck
newloadmap $f9
applymovement $0, MovementData_0x18a854
- unknown0xa8 $14
+ wait $14
end
; 0x18a854