summaryrefslogtreecommitdiff
path: root/maps/CharcoalKiln.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/CharcoalKiln.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/CharcoalKiln.asm')
-rw-r--r--maps/CharcoalKiln.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CharcoalKiln.asm b/maps/CharcoalKiln.asm
index 24fe8e37..9b6d171e 100644
--- a/maps/CharcoalKiln.asm
+++ b/maps/CharcoalKiln.asm
@@ -1,12 +1,12 @@
- object_const_def ; object_event constants
+ object_const_def
const CHARCOALKILN_BLACK_BELT
const CHARCOALKILN_YOUNGSTER
const CHARCOALKILN_MOLTRES
CharcoalKiln_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
CharcoalKilnBoss:
faceplayer
@@ -149,18 +149,18 @@ FarfetchdText:
CharcoalKiln_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 2, 7, AZALEA_TOWN, 2
warp_event 3, 7, AZALEA_TOWN, 2
- db 0 ; coord events
+ def_coord_events
- db 3 ; bg events
+ def_bg_events
bg_event 0, 1, BGEVENT_READ, CharcoalKilnBookshelf
bg_event 1, 1, BGEVENT_READ, CharcoalKilnBookshelf
bg_event 7, 1, BGEVENT_READ, CharcoalKilnRadio
- db 3 ; object events
+ def_object_events
object_event 2, 3, SPRITE_BLACK_BELT, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnBoss, EVENT_CHARCOAL_KILN_BOSS
object_event 5, 3, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CharcoalKilnApprentice, EVENT_CHARCOAL_KILN_APPRENTICE
object_event 5, 6, SPRITE_MOLTRES, SPRITEMOVEDATA_POKEMON, 2, 2, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CharcoalKilnFarfetchd, EVENT_CHARCOAL_KILN_FARFETCH_D