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/Route30BerryHouse.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/Route30BerryHouse.asm')
| -rw-r--r-- | maps/Route30BerryHouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/Route30BerryHouse.asm b/maps/Route30BerryHouse.asm index a996067a5..d7c68d2af 100644 --- a/maps/Route30BerryHouse.asm +++ b/maps/Route30BerryHouse.asm @@ -1,10 +1,10 @@ - object_const_def ; object_event constants + object_const_def const ROUTE30BERRYHOUSE_POKEFAN_M Route30BerryHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks Route30BerryHousePokefanMScript: faceplayer @@ -47,15 +47,15 @@ Route30BerrySpeechHouseCheckTreesText: Route30BerryHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, ROUTE_30, 1 warp_event 3, 7, ROUTE_30, 1 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, Route30BerryHouseBookshelf bg_event 1, 1, BGEVENT_READ, Route30BerryHouseBookshelf - db 1 ; object events + def_object_events object_event 2, 3, SPRITE_POKEFAN_M, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, Route30BerryHousePokefanMScript, -1 |