summaryrefslogtreecommitdiff
path: root/maps/Route32RuinsOfAlphGate.asm
diff options
context:
space:
mode:
Diffstat (limited to 'maps/Route32RuinsOfAlphGate.asm')
-rw-r--r--maps/Route32RuinsOfAlphGate.asm45
1 files changed, 19 insertions, 26 deletions
diff --git a/maps/Route32RuinsOfAlphGate.asm b/maps/Route32RuinsOfAlphGate.asm
index 345e46dd4..3329d54f5 100644
--- a/maps/Route32RuinsOfAlphGate.asm
+++ b/maps/Route32RuinsOfAlphGate.asm
@@ -1,14 +1,12 @@
-const_value set 2
+ const_def 2 ; object constants
const ROUTE32RUINSOFALPHGATE_OFFICER
const ROUTE32RUINSOFALPHGATE_POKEFAN_M
const ROUTE32RUINSOFALPHGATE_YOUNGSTER
Route32RuinsOfAlphGate_MapScripts:
-.SceneScripts:
- db 0
+ db 0 ; scene scripts
-.MapCallbacks:
- db 0
+ db 0 ; callbacks
Route32RuinsOfAlphGateOfficerScript:
jumptextfaceplayer Route32RuinsOfAlphGateOfficerText
@@ -47,24 +45,19 @@ Route32RuinsOfAlphGateYoungsterText:
done
Route32RuinsOfAlphGate_MapEvents:
- ; filler
- db 0, 0
-
-.Warps:
- db 4
- warp_def 0, 4, 10, RUINS_OF_ALPH_OUTSIDE
- warp_def 0, 5, 11, RUINS_OF_ALPH_OUTSIDE
- warp_def 9, 4, 2, ROUTE_32
- warp_def 9, 5, 3, ROUTE_32
-
-.CoordEvents:
- db 0
-
-.BGEvents:
- db 0
-
-.ObjectEvents:
- db 3
- object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
- object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
- object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1
+ db 0, 0 ; filler
+
+ db 4 ; warp events
+ warp_event 0, 4, RUINS_OF_ALPH_OUTSIDE, 10
+ warp_event 0, 5, RUINS_OF_ALPH_OUTSIDE, 11
+ warp_event 9, 4, ROUTE_32, 2
+ warp_event 9, 5, ROUTE_32, 3
+
+ db 0 ; coord events
+
+ db 0 ; bg events
+
+ db 3 ; object events
+ object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateOfficerScript, -1
+ object_event 8, 2, SPRITE_POKEFAN_M, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGatePokefanMScript, -1
+ object_event 1, 6, SPRITE_YOUNGSTER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route32RuinsOfAlphGateYoungsterScript, -1