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/MahoganyTown.asm | |
| parent | 6ca1857732502a60251e3738cbccc6d0067eaed2 (diff) | |
Use def_* macros for automatic map event counts
Diffstat (limited to 'maps/MahoganyTown.asm')
| -rw-r--r-- | maps/MahoganyTown.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/MahoganyTown.asm b/maps/MahoganyTown.asm index b98baa26..b4b2bd34 100644 --- a/maps/MahoganyTown.asm +++ b/maps/MahoganyTown.asm @@ -1,17 +1,17 @@ MAHOGANYTOWN_RAGECANDYBAR_PRICE EQU 300 - object_const_def ; object_event constants + object_const_def const MAHOGANYTOWN_POKEFAN_M const MAHOGANYTOWN_GRAMPS const MAHOGANYTOWN_FISHER const MAHOGANYTOWN_LASS MahoganyTown_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_DEFAULT scene_script .DummyScene1 ; SCENE_FINISHED - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint .DummyScene0: @@ -246,24 +246,24 @@ MahoganyGymSignText: MahoganyTown_MapEvents: db 0, 0 ; filler - db 5 ; warp events + def_warp_events warp_event 11, 7, MAHOGANY_MART_1F, 1 warp_event 17, 7, MAHOGANY_RED_GYARADOS_SPEECH_HOUSE, 1 warp_event 6, 13, MAHOGANY_GYM, 1 warp_event 15, 13, MAHOGANY_POKECENTER_1F, 1 warp_event 9, 1, ROUTE_43_MAHOGANY_GATE, 3 - db 2 ; coord events + def_coord_events coord_event 19, 8, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript coord_event 19, 9, SCENE_DEFAULT, MahoganyTownTryARageCandyBarScript - db 4 ; bg events + def_bg_events bg_event 1, 5, BGEVENT_READ, MahoganyTownSign bg_event 9, 7, BGEVENT_READ, MahoganyTownRagecandybarSign bg_event 3, 13, BGEVENT_READ, MahoganyGymSign bg_event 16, 13, BGEVENT_READ, MahoganyTownPokecenterSign - db 4 ; object events + def_object_events object_event 19, 8, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownPokefanMScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_EAST object_event 6, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MahoganyTownGrampsScript, -1 object_event 6, 14, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MahoganyTownFisherScript, EVENT_MAHOGANY_TOWN_POKEFAN_M_BLOCKS_GYM |