summaryrefslogtreecommitdiff
path: root/maps/Route39.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/Route39.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/Route39.asm')
-rw-r--r--maps/Route39.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route39.asm b/maps/Route39.asm
index 6debd435..e0015d63 100644
--- a/maps/Route39.asm
+++ b/maps/Route39.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const ROUTE39_SAILOR
const ROUTE39_POKEFAN_M
const ROUTE39_POKEFAN_F
@@ -10,9 +10,9 @@
const ROUTE39_FRUIT_TREE
Route39_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
Route39Miltank:
opentext
@@ -277,19 +277,19 @@ Route39TrainerTipsText:
Route39_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 1, 3, ROUTE_39_BARN, 1
warp_event 5, 3, ROUTE_39_FARMHOUSE, 1
- db 0 ; coord events
+ def_coord_events
- db 4 ; bg events
+ def_bg_events
bg_event 5, 31, BGEVENT_READ, Route39TrainerTips
bg_event 9, 5, BGEVENT_READ, MoomooFarmSign
bg_event 15, 7, BGEVENT_READ, Route39Sign
bg_event 5, 13, BGEVENT_ITEM, Route39HiddenNugget
- db 9 ; object events
+ def_object_events
object_event 13, 29, SPRITE_SAILOR, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 5, TrainerSailorEugene, -1
object_event 11, 19, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerPokefanmDerek, -1
object_event 13, 22, SPRITE_POKEFAN_F, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 5, TrainerPokefanfRuth, -1