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/RuinsOfAlphResearchCenter.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/RuinsOfAlphResearchCenter.asm')
| -rw-r--r-- | maps/RuinsOfAlphResearchCenter.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/RuinsOfAlphResearchCenter.asm b/maps/RuinsOfAlphResearchCenter.asm index b05fee90c..956551e1c 100644 --- a/maps/RuinsOfAlphResearchCenter.asm +++ b/maps/RuinsOfAlphResearchCenter.asm @@ -1,14 +1,14 @@ - object_const_def ; object_event constants + object_const_def const RUINSOFALPHRESEARCHCENTER_SCIENTIST1 const RUINSOFALPHRESEARCHCENTER_SCIENTIST2 const RUINSOFALPHRESEARCHCENTER_SCIENTIST3 RuinsOfAlphResearchCenter_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; SCENE_RUINSOFALPHRESEARCHCENTER_NOTHING scene_script .GetUnownDex ; SCENE_RUINSOFALPHRESEARCHCENTER_GET_UNOWN_DEX - db 1 ; callbacks + def_callbacks callback MAPCALLBACK_OBJECTS, .ScientistCallback .DummyScene0: @@ -394,18 +394,18 @@ RuinsOfAlphResearchCenterAcademicBooksText: RuinsOfAlphResearchCenter_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, RUINS_OF_ALPH_OUTSIDE, 6 warp_event 3, 7, RUINS_OF_ALPH_OUTSIDE, 6 - db 0 ; coord events + def_coord_events - db 3 ; bg events + def_bg_events bg_event 6, 5, BGEVENT_READ, RuinsOfAlphResearchCenterBookshelf bg_event 3, 4, BGEVENT_READ, RuinsOfAlphResearchCenterComputer bg_event 7, 1, BGEVENT_READ, RuinsOfAlphResearchCenterPrinter - db 3 ; object events + def_object_events object_event 4, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist1Script, -1 object_event 5, 2, SPRITE_SCIENTIST, SPRITEMOVEDATA_WANDER, 2, 1, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist2Script, -1 object_event 2, 5, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, RuinsOfAlphResearchCenterScientist3Script, EVENT_RUINS_OF_ALPH_RESEARCH_CENTER_SCIENTIST |