diff options
Diffstat (limited to 'maps/Route6SaffronGate.asm')
| -rw-r--r-- | maps/Route6SaffronGate.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/Route6SaffronGate.asm b/maps/Route6SaffronGate.asm index 569180738..c0de7ff54 100644 --- a/maps/Route6SaffronGate.asm +++ b/maps/Route6SaffronGate.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const ROUTE6SAFFRONGATE_OFFICER Route6SaffronGate_MapScripts: -.SceneScripts: - db 1 + db 1 ; scene scripts scene_script .DummyScene -.MapCallbacks: - db 0 + db 0 ; callbacks .DummyScene: end @@ -58,22 +56,17 @@ Route6SaffronGuardMagnetTrainText: done Route6SaffronGate_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 4 - warp_def 4, 0, 12, SAFFRON_CITY - warp_def 5, 0, 13, SAFFRON_CITY - warp_def 4, 7, 2, ROUTE_6 - warp_def 5, 7, 2, ROUTE_6 + db 4 ; warp events + warp_event 4, 0, SAFFRON_CITY, 12 + warp_event 5, 0, SAFFRON_CITY, 13 + warp_event 4, 7, ROUTE_6, 2 + warp_event 5, 7, ROUTE_6, 2 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 0 + db 0 ; bg events -.ObjectEvents: - db 1 - object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 + db 1 ; object events + object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route6SaffronGuardScript, -1 |