diff options
Diffstat (limited to 'maps/GoldenrodPPSpeechHouse.asm')
| -rw-r--r-- | maps/GoldenrodPPSpeechHouse.asm | 45 |
1 files changed, 19 insertions, 26 deletions
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 416ed37c7..2f43993d1 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,13 +1,11 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODPPSPEECHHOUSE_FISHER const GOLDENRODPPSPEECHHOUSE_LASS GoldenrodPPSpeechHouse_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodPPSpeechHouseFisherScript: jumptextfaceplayer GoldenrodPPSpeechHouseFisherText @@ -52,24 +50,19 @@ GoldenrodPPSpeechHouseLassText: done GoldenrodPPSpeechHouse_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 7, GOLDENROD_CITY - warp_def 3, 7, 7, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 - bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 - bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio - -.ObjectEvents: - db 2 - object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 - object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 7 + warp_event 3, 7, GOLDENROD_CITY, 7 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf1 + bg_event 1, 1, BGEVENT_READ, GoldenrodPPSpeechHouseBookshelf2 + bg_event 7, 1, BGEVENT_READ, GoldenrodPPSpeechHouseRadio + + db 2 ; object events + object_event 2, 4, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseFisherScript, -1 + object_event 5, 3, SPRITE_LASS, SPRITEMOVEDATA_STANDING_LEFT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodPPSpeechHouseLassScript, -1 |