diff options
Diffstat (limited to 'maps/GoldenrodNameRater.asm')
| -rw-r--r-- | maps/GoldenrodNameRater.asm | 47 |
1 files changed, 20 insertions, 27 deletions
diff --git a/maps/GoldenrodNameRater.asm b/maps/GoldenrodNameRater.asm index fc3369a21..16ffddb2c 100644 --- a/maps/GoldenrodNameRater.asm +++ b/maps/GoldenrodNameRater.asm @@ -1,17 +1,15 @@ -const_value set 2 + const_def 2 ; object constants const GOLDENRODNAMERATER_NAME_RATER GoldenrodNameRater_MapScripts: -.SceneScripts: - db 0 + db 0 ; scene scripts -.MapCallbacks: - db 0 + db 0 ; callbacks GoldenrodNameRater: faceplayer opentext - special Special_NameRater + special NameRater waitbutton closetext end @@ -22,26 +20,21 @@ GoldenrodNameRaterBookshelf: GoldenrodNameRaterRadio: jumpstd radio2 -INCLUDE "data/unused/sweet_honey_text.asm" +INCLUDE "data/text/unused_sweet_honey.asm" GoldenrodNameRater_MapEvents: - ; filler - db 0, 0 - -.Warps: - db 2 - warp_def 2, 7, 8, GOLDENROD_CITY - warp_def 3, 7, 8, GOLDENROD_CITY - -.CoordEvents: - db 0 - -.BGEvents: - db 3 - bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf - bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf - bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio - -.ObjectEvents: - db 1 - object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 + db 0, 0 ; filler + + db 2 ; warp events + warp_event 2, 7, GOLDENROD_CITY, 8 + warp_event 3, 7, GOLDENROD_CITY, 8 + + db 0 ; coord events + + db 3 ; bg events + bg_event 0, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 1, 1, BGEVENT_READ, GoldenrodNameRaterBookshelf + bg_event 7, 1, BGEVENT_READ, GoldenrodNameRaterRadio + + db 1 ; object events + object_event 2, 4, SPRITE_GENTLEMAN, SPRITEMOVEDATA_STANDING_DOWN, 2, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodNameRater, -1 |