diff options
Diffstat (limited to 'maps/GuideGentsHouse.asm')
-rw-r--r-- | maps/GuideGentsHouse.asm | 33 |
1 files changed, 13 insertions, 20 deletions
diff --git a/maps/GuideGentsHouse.asm b/maps/GuideGentsHouse.asm index 136d0da66..376aa0d0c 100644 --- a/maps/GuideGentsHouse.asm +++ b/maps/GuideGentsHouse.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const GUIDEGENTSHOUSE_GRAMPS GuideGentsHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GuideGentsHouseGuideGent: jumptextfaceplayer GuideGentsHouseGuideGentText @@ -28,22 +26,17 @@ GuideGentsHouseGuideGentText: done GuideGentsHouse_MapEvents: - ; filler - db 0, 0 + db 0, 0 ; filler -.Warps: - db 2 - warp_def 2, 7, 4, CHERRYGROVE_CITY - warp_def 3, 7, 4, CHERRYGROVE_CITY + db 2 ; warp events + warp_event 2, 7, CHERRYGROVE_CITY, 4 + warp_event 3, 7, CHERRYGROVE_CITY, 4 -.CoordEvents: - db 0 + db 0 ; coord events -.BGEvents: - db 2 - bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf - bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf + db 2 ; bg events + bg_event 0, 1, BGEVENT_READ, GuideGentsHouseBookshelf + bg_event 1, 1, BGEVENT_READ, GuideGentsHouseBookshelf -.ObjectEvents: - db 1 - object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE + db 1 ; object events + object_event 2, 3, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GuideGentsHouseGuideGent, EVENT_GUIDE_GENT_VISIBLE_IN_CHERRYGROVE |