diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:49:26 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-07-24 09:57:16 -0400 |
| commit | dcb24bc72428a60e37c1dfa7a93dc46bff7bd5ed (patch) | |
| tree | 4788cafe99972e5b4f6528affb925c9d7eb24134 /maps/AzaleaTown.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/AzaleaTown.asm')
| -rw-r--r-- | maps/AzaleaTown.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/AzaleaTown.asm b/maps/AzaleaTown.asm index da84cf04e..7e771e86a 100644 --- a/maps/AzaleaTown.asm +++ b/maps/AzaleaTown.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const AZALEATOWN_AZALEA_ROCKET1 const AZALEATOWN_GRAMPS const AZALEATOWN_TEACHER @@ -13,12 +13,12 @@ const AZALEATOWN_KURT_OUTSIDE AzaleaTown_MapScripts: - db 3 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_AZALEATOWN_NOTHING scene_script .DummyScene1 ; SCENE_AZALEATOWN_RIVAL_BATTLE scene_script .DummyScene2 ; SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .Flypoint .DummyScene0: @@ -456,7 +456,7 @@ AzaleaTownIlexForestSignText: AzaleaTown_MapEvents: db 0, 0 ; filler - db 8 ; warp events + def_warp_events warp_event 15, 9, AZALEA_POKECENTER_1F, 1 warp_event 21, 13, CHARCOAL_KILN, 1 warp_event 21, 5, AZALEA_MART, 2 @@ -466,12 +466,12 @@ AzaleaTown_MapEvents: warp_event 2, 10, ILEX_FOREST_AZALEA_GATE, 3 warp_event 2, 11, ILEX_FOREST_AZALEA_GATE, 4 - db 3 ; coord events + def_coord_events coord_event 5, 10, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene1 coord_event 5, 11, SCENE_AZALEATOWN_RIVAL_BATTLE, AzaleaTownRivalBattleScene2 coord_event 9, 6, SCENE_AZALEATOWN_KURT_RETURNS_GS_BALL, AzaleaTownCelebiScene - db 9 ; bg events + def_bg_events bg_event 19, 9, BGEVENT_READ, AzaleaTownSign bg_event 10, 9, BGEVENT_READ, KurtsHouseSign bg_event 14, 15, BGEVENT_READ, AzaleaGymSign @@ -482,7 +482,7 @@ AzaleaTown_MapEvents: bg_event 3, 9, BGEVENT_READ, AzaleaTownIlextForestSign bg_event 31, 6, BGEVENT_ITEM, AzaleaTownHiddenFullHeal - db 12 ; object events + def_object_events object_event 31, 9, SPRITE_AZALEA_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownRocket1Script, EVENT_AZALEA_TOWN_SLOWPOKETAIL_ROCKET object_event 21, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, AzaleaTownGrampsScript, -1 object_event 15, 13, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 2, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, AzaleaTownTeacherScript, -1 |