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/CeladonCafe.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/CeladonCafe.asm')
| -rw-r--r-- | maps/CeladonCafe.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CeladonCafe.asm b/maps/CeladonCafe.asm index 0c88311a..e0937c0a 100644 --- a/maps/CeladonCafe.asm +++ b/maps/CeladonCafe.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const CELADONCAFE_SUPER_NERD const CELADONCAFE_FISHER1 const CELADONCAFE_FISHER2 @@ -6,9 +6,9 @@ const CELADONCAFE_TEACHER CeladonCafe_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonCafeChef: faceplayer @@ -208,17 +208,17 @@ NoRoomForLeftoversText: CeladonCafe_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 6, 7, CELADON_CITY, 9 warp_event 7, 7, CELADON_CITY, 9 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 5, 0, BGEVENT_READ, EatathonContestPoster bg_event 7, 1, BGEVENT_READ, CeladonCafeTrashcan - db 5 ; object events + def_object_events object_event 9, 3, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeladonCafeChef, -1 object_event 4, 6, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher1, -1 object_event 1, 7, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeladonCafeFisher2, -1 |