summaryrefslogtreecommitdiff
path: root/maps/Route35GoldenrodGate.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-24 09:49:26 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-24 09:57:16 -0400
commitdcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch)
tree4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/Route35GoldenrodGate.asm
parent89c47f21701caf32641573264d83ca16eb0aed91 (diff)
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route35GoldenrodGate.asm')
-rw-r--r--maps/Route35GoldenrodGate.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route35GoldenrodGate.asm b/maps/Route35GoldenrodGate.asm
index b45970af2..eedbbddd4 100644
--- a/maps/Route35GoldenrodGate.asm
+++ b/maps/Route35GoldenrodGate.asm
@@ -1,12 +1,12 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE35GOLDENRODGATE_RANDY
const ROUTE35GOLDENRODGATE_POKEFAN_F
const ROUTE35GOLDENRODGATE_FISHER
Route35GoldenrodGate_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
RandyScript:
faceplayer
@@ -198,17 +198,17 @@ Route35GoldenrodGateFisherText:
Route35GoldenrodGate_MapEvents:
db 0, 0 ; filler
- db 4 ; warp events
+ def_warp_events
warp_event 4, 0, ROUTE_35, 1
warp_event 5, 0, ROUTE_35, 2
warp_event 4, 7, GOLDENROD_CITY, 12
warp_event 5, 7, GOLDENROD_CITY, 12
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 3 ; object events
+ def_object_events
object_event 0, 4, SPRITE_OFFICER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, RandyScript, -1
object_event 6, 4, SPRITE_POKEFAN_F, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGatePokefanFScript, -1
object_event 3, 2, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, Route35GoldenrodGateFisherScript, -1