diff options
Diffstat (limited to 'maps/Route16Gate.asm')
| -rw-r--r-- | maps/Route16Gate.asm | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/maps/Route16Gate.asm b/maps/Route16Gate.asm index d59425640..0eb121e05 100644 --- a/maps/Route16Gate.asm +++ b/maps/Route16Gate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE16GATE_OFFICER Route16Gate_MapScripts: -.SceneScripts: - db 1 - scene_script .DummyScene + db 1 ; scene scripts + scene_script .DummyScene ; SCENE_DEFAULT -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -22,7 +20,7 @@ UnknownScript_0x733ed: UnknownScript_0x733f3: showemote EMOTE_SHOCK, ROUTE16GATE_OFFICER, 15 - spriteface PLAYER, UP + objectface PLAYER, UP opentext writetext UnknownText_0x73496 waitbutton @@ -61,24 +59,19 @@ UnknownText_0x73496: done Route16Gate_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 4 - warp_def 0, 4, 4, ROUTE_16 - warp_def 0, 5, 5, ROUTE_16 - warp_def 9, 4, 2, ROUTE_16 - warp_def 9, 5, 3, ROUTE_16 - -.CoordEvents: - db 2 - coord_event 5, 4, 0, UnknownScript_0x733ed - coord_event 5, 5, 0, UnknownScript_0x733ed - -.BGEvents: - db 0 - -.ObjectEvents: - db 1 - object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 + db 0, 0 ; filler + + db 4 ; warp events + warp_event 0, 4, ROUTE_16, 4 + warp_event 0, 5, ROUTE_16, 5 + warp_event 9, 4, ROUTE_16, 2 + warp_event 9, 5, ROUTE_16, 3 + + db 2 ; coord events + coord_event 5, 4, SCENE_DEFAULT, UnknownScript_0x733ed + coord_event 5, 5, SCENE_DEFAULT, UnknownScript_0x733ed + + db 0 ; bg events + + db 1 ; object events + object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route16GateOfficerScript, -1 |