summaryrefslogtreecommitdiff
path: root/maps/Route7SaffronGate.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-26 16:29:43 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-26 16:29:43 -0400
commitd24f1c71149b59c50dba57e500f30b223a54a25f (patch)
tree140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/Route7SaffronGate.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/Route7SaffronGate.asm')
-rw-r--r--maps/Route7SaffronGate.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route7SaffronGate.asm b/maps/Route7SaffronGate.asm
index 4835a87e..7aca3e90 100644
--- a/maps/Route7SaffronGate.asm
+++ b/maps/Route7SaffronGate.asm
@@ -1,10 +1,10 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE7SAFFRONGATE_OFFICER
Route7SaffronGate_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
Route7SaffronGuardScript:
faceplayer
@@ -46,15 +46,15 @@ Route7SaffronGuardSeriousText:
Route7SaffronGate_MapEvents:
db 0, 0 ; filler
- db 4 ; warp events
+ def_warp_events
warp_event 0, 4, ROUTE_7, 1
warp_event 0, 5, ROUTE_7, 2
warp_event 9, 4, SAFFRON_CITY, 10
warp_event 9, 5, SAFFRON_CITY, 11
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 1 ; object events
+ def_object_events
object_event 5, 2, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route7SaffronGuardScript, -1