summaryrefslogtreecommitdiff
path: root/maps/VioletCity.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/VioletCity.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/VioletCity.asm')
-rw-r--r--maps/VioletCity.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/VioletCity.asm b/maps/VioletCity.asm
index a0b311e7..dd688ade 100644
--- a/maps/VioletCity.asm
+++ b/maps/VioletCity.asm
@@ -1,4 +1,4 @@
- object_const_def ; object_event constants
+ object_const_def
const VIOLETCITY_EARL
const VIOLETCITY_LASS
const VIOLETCITY_SUPER_NERD
@@ -9,9 +9,9 @@
const VIOLETCITY_POKE_BALL2
VioletCity_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 1 ; callbacks
+ def_callbacks
callback MAPCALLBACK_NEWMAP, .FlyPoint
.FlyPoint:
@@ -279,7 +279,7 @@ EarlsPokemonAcademySignText:
VioletCity_MapEvents:
db 0, 0 ; filler
- db 9 ; warp events
+ def_warp_events
warp_event 9, 17, VIOLET_MART, 2
warp_event 18, 17, VIOLET_GYM, 1
warp_event 30, 17, EARLS_POKEMON_ACADEMY, 1
@@ -290,9 +290,9 @@ VioletCity_MapEvents:
warp_event 39, 24, ROUTE_31_VIOLET_GATE, 1
warp_event 39, 25, ROUTE_31_VIOLET_GATE, 2
- db 0 ; coord events
+ def_coord_events
- db 7 ; bg events
+ def_bg_events
bg_event 24, 20, BGEVENT_READ, VioletCitySign
bg_event 15, 17, BGEVENT_READ, VioletGymSign
bg_event 24, 8, BGEVENT_READ, SproutTowerSign
@@ -301,7 +301,7 @@ VioletCity_MapEvents:
bg_event 10, 17, BGEVENT_READ, VioletCityMartSign
bg_event 37, 14, BGEVENT_ITEM, VioletCityHiddenHyperPotion
- db 8 ; object events
+ def_object_events
object_event 13, 16, SPRITE_FISHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityEarlScript, EVENT_VIOLET_CITY_EARL
object_event 28, 28, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, VioletCityLassScript, -1
object_event 24, 14, SPRITE_SUPER_NERD, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, VioletCitySuperNerdScript, -1