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/LakeOfRage.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/LakeOfRage.asm')
| -rw-r--r-- | maps/LakeOfRage.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 38cc24060..23e32d407 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const LAKEOFRAGE_LANCE const LAKEOFRAGE_GRAMPS const LAKEOFRAGE_SUPER_NERD1 @@ -13,11 +13,11 @@ const LAKEOFRAGE_POKE_BALL2 LakeOfRage_MapScripts: - db 2 ; scene scripts + def_scene_scripts scene_script .DummyScene0 ; unusable scene_script .DummyScene1 ; unusable - db 2 ; callbacks + def_callbacks callback MAPCALLBACK_NEWMAP, .FlyPoint callback MAPCALLBACK_OBJECTS, .Wesley @@ -494,20 +494,20 @@ FishingGurusHouseSignText: LakeOfRage_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 7, 3, LAKE_OF_RAGE_HIDDEN_POWER_HOUSE, 1 warp_event 27, 31, LAKE_OF_RAGE_MAGIKARP_HOUSE, 1 - db 0 ; coord events + def_coord_events - db 5 ; bg events + def_bg_events bg_event 21, 27, BGEVENT_READ, LakeOfRageSign bg_event 25, 31, BGEVENT_READ, MagikarpHouseSignScript bg_event 11, 28, BGEVENT_ITEM, LakeOfRageHiddenFullRestore bg_event 4, 4, BGEVENT_ITEM, LakeOfRageHiddenRareCandy bg_event 35, 5, BGEVENT_ITEM, LakeOfRageHiddenMaxPotion - db 12 ; object events + def_object_events object_event 21, 28, SPRITE_LANCE, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageLanceScript, EVENT_LAKE_OF_RAGE_LANCE object_event 20, 26, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageGrampsScript, -1 object_event 36, 13, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, LakeOfRageSuperNerdScript, -1 |