summaryrefslogtreecommitdiff
path: root/maps/Route15FuchsiaGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route15FuchsiaGate.asm')
-rw-r--r--maps/Route15FuchsiaGate.asm29
1 files changed, 11 insertions, 18 deletions
diff --git a/maps/Route15FuchsiaGate.asm b/maps/Route15FuchsiaGate.asm
index 80966bd2b..3d31256f7 100644
--- a/maps/Route15FuchsiaGate.asm
+++ b/maps/Route15FuchsiaGate.asm
@@ -2,11 +2,9 @@ const_value set 2
const ROUTE15FUCHSIAGATE_OFFICER
Route15FuchsiaGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route15FuchsiaGateOfficerScript:
jumptextfaceplayer Route15FuchsiaGateOfficerText
@@ -20,22 +18,17 @@ Route15FuchsiaGateOfficerText:
done
Route15FuchsiaGate_MapEvents:
- ; filler
- db 0, 0
+ db 0, 0 ; filler
-.Warps:
- db 4
- warp_def 0, 4, 8, FUCHSIA_CITY
- warp_def 0, 5, 9, FUCHSIA_CITY
- warp_def 9, 4, 1, ROUTE_15
- warp_def 9, 5, 2, ROUTE_15
+ db 4 ; warp events
+ warp_event 0, 4, 8, FUCHSIA_CITY
+ warp_event 0, 5, 9, FUCHSIA_CITY
+ warp_event 9, 4, 1, ROUTE_15
+ warp_event 9, 5, 2, ROUTE_15
-.CoordEvents:
- db 0
+ db 0 ; coord events
-.BGEvents:
- db 0
+ db 0 ; bg events
-.ObjectEvents:
- db 1
+ db 1 ; object events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route15FuchsiaGateOfficerScript, -1