summaryrefslogtreecommitdiff
path: root/maps/Route43Gate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route43Gate.asm')
-rw-r--r--maps/Route43Gate.asm47
1 files changed, 26 insertions, 21 deletions
diff --git a/maps/Route43Gate.asm b/maps/Route43Gate.asm
index c4fafdf81..2702e9fcb 100644
--- a/maps/Route43Gate.asm
+++ b/maps/Route43Gate.asm
@@ -1,3 +1,8 @@
+const_value set 2
+ const ROUTE43GATE_OFFICER
+ const ROUTE43GATE_ROCKET1
+ const ROUTE43GATE_ROCKET2
+
Route43Gate_MapScriptHeader:
.MapTriggers:
db 2
@@ -33,18 +38,18 @@ UnknownScript_0x19abd5:
UnknownScript_0x19abda:
playmusic MUSIC_ROCKET_ENCOUNTER
checkcode VAR_FACING
- if_equal $0, UnknownScript_0x19abea
- if_equal $1, UnknownScript_0x19ac38
+ if_equal DOWN, UnknownScript_0x19abea
+ if_equal UP, UnknownScript_0x19ac38
dotrigger $1
end
UnknownScript_0x19abea:
applymovement PLAYER, MovementData_0x19aca2
- showemote EMOTE_SHOCK, $4, 15
- applymovement $4, MovementData_0x19acbb
- spriteface $3, UP
- showemote EMOTE_SHOCK, $3, 15
- applymovement $3, MovementData_0x19aca4
+ showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
+ applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acbb
+ spriteface ROUTE43GATE_ROCKET1, UP
+ showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
+ applymovement ROUTE43GATE_ROCKET1, MovementData_0x19aca4
loadfont
writetext UnknownText_0x19acd2
keeptextopen
@@ -64,19 +69,19 @@ UnknownScript_0x19ac1d:
UnknownScript_0x19ac28:
keeptextopen
- loadmovesprites
- applymovement $3, MovementData_0x19acaa
- applymovement $4, MovementData_0x19acc1
+ closetext
+ applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaa
+ applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc1
dotrigger $1
special RestartMapMusic
end
UnknownScript_0x19ac38:
- showemote EMOTE_SHOCK, $3, 15
- applymovement $3, MovementData_0x19acaf
- spriteface $4, DOWN
- showemote EMOTE_SHOCK, $4, 15
- applymovement $4, MovementData_0x19acc7
+ showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET1, 15
+ applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acaf
+ spriteface ROUTE43GATE_ROCKET2, DOWN
+ showemote EMOTE_SHOCK, ROUTE43GATE_ROCKET2, 15
+ applymovement ROUTE43GATE_ROCKET2, MovementData_0x19acc7
loadfont
writetext UnknownText_0x19acd2
keeptextopen
@@ -96,9 +101,9 @@ UnknownScript_0x19ac67:
UnknownScript_0x19ac72:
keeptextopen
- loadmovesprites
- applymovement $4, MovementData_0x19accd
- applymovement $3, MovementData_0x19acb5
+ closetext
+ applymovement ROUTE43GATE_ROCKET2, MovementData_0x19accd
+ applymovement ROUTE43GATE_ROCKET1, MovementData_0x19acb5
dotrigger $1
special RestartMapMusic
end
@@ -116,14 +121,14 @@ OfficerScript_0x19ac85:
verbosegiveitem TM_SLUDGE_BOMB
iffalse UnknownScript_0x19aca0
setevent EVENT_GOT_TM36_SLUDGE_BOMB
- loadmovesprites
+ closetext
end
UnknownScript_0x19ac9c:
writetext UnknownText_0x19ae2d
- closetext
+ waitbutton
UnknownScript_0x19aca0:
- loadmovesprites
+ closetext
end
MovementData_0x19aca2: