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/MrFujisHouse.asm | |
| parent | 89c47f21701caf32641573264d83ca16eb0aed91 (diff) | |
Use def_* macros for automatic map event counts
Resolves #742
Diffstat (limited to 'maps/MrFujisHouse.asm')
| -rw-r--r-- | maps/MrFujisHouse.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/maps/MrFujisHouse.asm b/maps/MrFujisHouse.asm index 40812e704..28f359115 100644 --- a/maps/MrFujisHouse.asm +++ b/maps/MrFujisHouse.asm @@ -1,4 +1,4 @@ - object_const_def ; object_event constants + object_const_def const MRFUJISHOUSE_SUPER_NERD const MRFUJISHOUSE_LASS const MRFUJISHOUSE_PSYDUCK @@ -6,9 +6,9 @@ const MRFUJISHOUSE_PIDGEY MrFujisHouse_MapScripts: - db 0 ; scene scripts + def_scene_scripts - db 0 ; callbacks + def_callbacks MrFujisHouseSuperNerdScript: jumptextfaceplayer MrFujisHouseSuperNerdText @@ -80,17 +80,17 @@ MrFujisPidgeyText: MrFujisHouse_MapEvents: db 0, 0 ; filler - db 2 ; warp events + def_warp_events warp_event 2, 7, LAVENDER_TOWN, 2 warp_event 3, 7, LAVENDER_TOWN, 2 - db 0 ; coord events + def_coord_events - db 2 ; bg events + def_bg_events bg_event 0, 1, BGEVENT_READ, MrFujisHouseBookshelf bg_event 1, 1, BGEVENT_READ, MrFujisHouseBookshelf - db 5 ; object events + def_object_events object_event 4, 1, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MrFujisHouseSuperNerdScript, -1 object_event 3, 4, SPRITE_LASS, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisHouseLassScript, -1 object_event 7, 4, SPRITE_RHYDON, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, MrFujisPsyduck, -1 |