diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-26 16:29:43 -0400 |
| commit | d24f1c71149b59c50dba57e500f30b223a54a25f (patch) | |
| tree | 140ad8c04b396af2e0d55f3218bfb3e428391f42 /maps/FightingDojo.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/FightingDojo.asm')
| -rw-r--r-- | maps/FightingDojo.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/FightingDojo.asm b/maps/FightingDojo.asm index 7b81f5f4..afb87b45 100644 --- a/maps/FightingDojo.asm +++ b/maps/FightingDojo.asm @@ -1,11 +1,11 @@ - object_const_def ; object_event constants + object_const_def const FIGHTINGDOJO_BLACK_BELT const FIGHTINGDOJO_POKE_BALL FightingDojo_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks FightingDojoBlackBelt: jumptextfaceplayer FightingDojoBlackBeltText @@ -43,16 +43,16 @@ FightingDojoSign2Text: FightingDojo_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 4, 11, SAFFRON_CITY, 1 warp_event 5, 11, SAFFRON_CITY, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 4, 0, BGEVENT_READ, FightingDojoSign1 bg_event 5, 0, BGEVENT_READ, FightingDojoSign2 - db 2 ; object events + def_object_events object_event 4, 4, SPRITE_BLACK_BELT, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, FightingDojoBlackBelt, -1 object_event 3, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, FightingDojoFocusBand, EVENT_PICKED_UP_FOCUS_BAND |