diff options
Diffstat (limited to 'maps/SafariZoneWardensHome.asm')
| -rw-r--r-- | maps/SafariZoneWardensHome.asm | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/maps/SafariZoneWardensHome.asm b/maps/SafariZoneWardensHome.asm index e7295d594..41a2db11d 100644 --- a/maps/SafariZoneWardensHome.asm +++ b/maps/SafariZoneWardensHome.asm @@ -1,12 +1,10 @@ -const_value set 2 + const_def 2 ; object constants const SAFARIZONEWARDENSHOME_LASS SafariZoneWardensHome_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks WardensGranddaughter: faceplayer @@ -77,24 +75,19 @@ SafariZonePhotoText: done SafariZoneWardensHome_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 6, FUCHSIA_CITY - warp_def 3, 7, 6, FUCHSIA_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 4 - bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf - bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf - bg_event 7, 0, BGEVENT_READ, WardenPhoto - bg_event 9, 0, BGEVENT_READ, SafariZonePhoto - -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, FUCHSIA_CITY, 6 + warp_event 3, 7, FUCHSIA_CITY, 6 + + db 0 ; coord events + + db 4 ; bg events + bg_event 0, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 1, 1, BGEVENT_READ, WardensHomeBookshelf + bg_event 7, 0, BGEVENT_READ, WardenPhoto + bg_event 9, 0, BGEVENT_READ, SafariZonePhoto + + db 1 ; object events + object_event 2, 4, SPRITE_LASS, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, WardensGranddaughter, -1 |