summaryrefslogtreecommitdiff
path: root/maps/OlivineGym.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/OlivineGym.asm
parent6ca1857732502a60251e3738cbccc6d0067eaed2 (diff)
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/OlivineGym.asm')
-rw-r--r--maps/OlivineGym.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/OlivineGym.asm b/maps/OlivineGym.asm
index db552a46..27bb6100 100644
--- a/maps/OlivineGym.asm
+++ b/maps/OlivineGym.asm
@@ -1,11 +1,11 @@
- object_const_def ; object_event constants
+ object_const_def
const OLIVINEGYM_JASMINE
const OLIVINEGYM_GYM_GUIDE
OlivineGym_MapScripts:
- db 0 ; scene scripts
+ def_scene_scripts
- db 0 ; callbacks
+ def_callbacks
OlivineGymJasmineScript:
faceplayer
@@ -198,16 +198,16 @@ OlivineGymGuidePreText:
OlivineGym_MapEvents:
db 0, 0 ; filler
- db 2 ; warp events
+ def_warp_events
warp_event 4, 15, OLIVINE_CITY, 2
warp_event 5, 15, OLIVINE_CITY, 2
- db 0 ; coord events
+ def_coord_events
- db 2 ; bg events
+ def_bg_events
bg_event 3, 13, BGEVENT_READ, OlivineGymStatue
bg_event 6, 13, BGEVENT_READ, OlivineGymStatue
- db 2 ; object events
+ def_object_events
object_event 5, 3, SPRITE_JASMINE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymJasmineScript, EVENT_OLIVINE_GYM_JASMINE
object_event 7, 13, SPRITE_GYM_GUIDE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OlivineGymGuideScript, -1