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/CeladonDeptStore6F.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/CeladonDeptStore6F.asm')
| -rw-r--r-- | maps/CeladonDeptStore6F.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CeladonDeptStore6F.asm b/maps/CeladonDeptStore6F.asm index efdfd566..fe27df8c 100644 --- a/maps/CeladonDeptStore6F.asm +++ b/maps/CeladonDeptStore6F.asm @@ -2,14 +2,14 @@ CELADONDEPTSTORE6F_FRESH_WATER_PRICE EQU 200 CELADONDEPTSTORE6F_SODA_POP_PRICE EQU 300 CELADONDEPTSTORE6F_LEMONADE_PRICE EQU 350 - object_const_def ; object_event constants + object_const_def const CELADONDEPTSTORE6F_SUPER_NERD const CELADONDEPTSTORE6F_YOUNGSTER CeladonDeptStore6F_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeladonDeptStore6FSuperNerdScript: jumptextfaceplayer CeladonDeptStore6FSuperNerdText @@ -145,13 +145,13 @@ CeladonDeptStore6FDirectoryText: CeladonDeptStore6F_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 15, 0, CELADON_DEPT_STORE_5F, 2 warp_event 2, 0, CELADON_DEPT_STORE_ELEVATOR, 1 - db 0 ; coord events + def_coord_events - db 6 ; bg events + def_bg_events bg_event 14, 0, BGEVENT_READ, CeladonDeptStore6FDirectory bg_event 3, 0, BGEVENT_READ, CeladonDeptStore1FElevatorButton bg_event 8, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine @@ -159,6 +159,6 @@ CeladonDeptStore6F_MapEvents: bg_event 10, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine bg_event 11, 1, BGEVENT_UP, CeladonDeptStore6FVendingMachine - db 2 ; object events + def_object_events object_event 9, 2, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FSuperNerdScript, -1 object_event 12, 5, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CeladonDeptStore6FYoungsterScript, -1 |