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/CeruleanTradeSpeechHouse.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/CeruleanTradeSpeechHouse.asm')
| -rw-r--r-- | maps/CeruleanTradeSpeechHouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/CeruleanTradeSpeechHouse.asm b/maps/CeruleanTradeSpeechHouse.asm index 97ae15f7..3bf6cf96 100644 --- a/maps/CeruleanTradeSpeechHouse.asm +++ b/maps/CeruleanTradeSpeechHouse.asm @@ -1,13 +1,13 @@ - object_const_def ; object_event constants + object_const_def const CERULEANTRADESPEECHHOUSE_GRANNY const CERULEANTRADESPEECHHOUSE_GRAMPS const CERULEANTRADESPEECHHOUSE_RHYDON const CERULEANTRADESPEECHHOUSE_ZUBAT CeruleanTradeSpeechHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks CeruleanTradeSpeechHouseGrannyScript: jumptextfaceplayer CeruleanTradeSpeechHouseGrannyText @@ -54,15 +54,15 @@ CeruleanTradeSpeechHouseZubatText: CeruleanTradeSpeechHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, CERULEAN_CITY, 3 warp_event 3, 7, CERULEAN_CITY, 3 - db 0 ; coord events + def_coord_events - db 0 ; bg events + def_bg_events - db 4 ; object events + def_object_events object_event 2, 4, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrannyScript, -1 object_event 1, 2, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseGrampsScript, -1 object_event 5, 2, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, CeruleanTradeSpeechHouseRhydonScript, -1 |