summaryrefslogtreecommitdiff
path: root/maps/PewterMart.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/PewterMart.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/PewterMart.asm')
-rw-r--r--maps/PewterMart.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/PewterMart.asm b/maps/PewterMart.asm
index 26fe796e..44822741 100644
--- a/maps/PewterMart.asm
+++ b/maps/PewterMart.asm
@@ -1,12 +1,12 @@
- object_const_def ; object_event constants
+ object_const_def
const PEWTERMART_CLERK
const PEWTERMART_YOUNGSTER
const PEWTERMART_SUPER_NERD
PewterMart_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
PewterMartClerkScript:
opentext
@@ -46,15 +46,15 @@ PewterMartSuperNerdText:
PewterMart_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 2, 7, PEWTER_CITY, 3
warp_event 3, 7, PEWTER_CITY, 3
- db 0 ; coord events
+ def_coord_events
- db 0 ; bg events
+ def_bg_events
- db 3 ; object events
+ def_object_events
object_event 1, 3, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartClerkScript, -1
object_event 9, 2, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, PewterMartYoungsterScript, -1
object_event 6, 6, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, PewterMartSuperNerdScript, -1