diff options
Diffstat (limited to 'maps/OlivineTimsHouse.asm')
| -rw-r--r-- | maps/OlivineTimsHouse.asm | 35 |
1 files changed, 14 insertions, 21 deletions
diff --git a/maps/OlivineTimsHouse.asm b/maps/OlivineTimsHouse.asm index 5d1b19263..60263cf3c 100644 --- a/maps/OlivineTimsHouse.asm +++ b/maps/OlivineTimsHouse.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const OLIVINETIMSHOUSE_TIM OlivineTimsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks Tim: faceplayer opentext - trade NPCTRADE_TIM + trade NPC_TRADE_TIM waitbutton closetext end @@ -20,22 +18,17 @@ TimsHouseBookshelf: jumpstd magazinebookshelf OlivineTimsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 3, OLIVINE_CITY - warp_def 3, 7, 3, OLIVINE_CITY + db 2 ; warp events + warp_event 2, 7, OLIVINE_CITY, 3 + warp_event 3, 7, OLIVINE_CITY, 3 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, TimsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, TimsHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 + db 1 ; object events + object_event 2, 3, SPRITE_FISHING_GURU, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, Tim, -1 |