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/GoldenrodGameCorner.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/GoldenrodGameCorner.asm')
| -rw-r--r-- | maps/GoldenrodGameCorner.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/GoldenrodGameCorner.asm b/maps/GoldenrodGameCorner.asm index 6974a056..b9a501ba 100644 --- a/maps/GoldenrodGameCorner.asm +++ b/maps/GoldenrodGameCorner.asm @@ -6,7 +6,7 @@ GOLDENRODGAMECORNER_SANDSHREW_COINS EQU 700 GOLDENRODGAMECORNER_EKANS_COINS EQU 700 GOLDENRODGAMECORNER_DRATINI_COINS EQU 2100 - object_const_def ; object_event constants + object_const_def const GOLDENRODGAMECORNER_CLERK const GOLDENRODGAMECORNER_RECEPTIONIST1 const GOLDENRODGAMECORNER_RECEPTIONIST2 @@ -20,9 +20,9 @@ GOLDENRODGAMECORNER_DRATINI_COINS EQU 2100 const GOLDENRODGAMECORNER_POKEFAN_M2 GoldenrodGameCorner_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks GoldenrodGameCornerCoinVendorScript: jumpstd GameCornerCoinVendorScript @@ -482,13 +482,13 @@ GoldenrodGameCornerPokefanM2Text: GoldenrodGameCorner_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 13, GOLDENROD_CITY, 11 warp_event 3, 13, GOLDENROD_CITY, 11 - db 0 ; coord events + def_coord_events - db 30 ; bg events + def_bg_events bg_event 6, 6, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 6, 7, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript bg_event 6, 8, BGEVENT_READ, GoldenrodGameCornerSlotsMachineScript @@ -520,7 +520,7 @@ GoldenrodGameCorner_MapEvents: bg_event 18, 10, BGEVENT_READ, GoldenrodGameCornerCardFlipMachineScript bg_event 18, 11, BGEVENT_RIGHT, GoldenrodGameCornerCardFlipMachineScript - db 11 ; object events + def_object_events object_event 3, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerCoinVendorScript, -1 object_event 16, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerTMVendorScript, -1 object_event 18, 2, SPRITE_RECEPTIONIST, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, GoldenrodGameCornerPrizeMonVendorScript, -1 |