diff options
Diffstat (limited to 'maps/GoldenrodPPSpeechHouse.asm')
| -rw-r--r-- | maps/GoldenrodPPSpeechHouse.asm | 40 |
1 files changed, 17 insertions, 23 deletions
diff --git a/maps/GoldenrodPPSpeechHouse.asm b/maps/GoldenrodPPSpeechHouse.asm index 8aeb6511f..d41659542 100644 --- a/maps/GoldenrodPPSpeechHouse.asm +++ b/maps/GoldenrodPPSpeechHouse.asm @@ -1,18 +1,15 @@ -GoldenrodPPSpeechHouse_MapScriptHeader: ; 0x55648 - ; trigger count +GoldenrodPPSpeechHouse_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x5564a -FisherScript_0x5564a: ; 0x5564a +FisherScript_0x5564a: jumptextfaceplayer UnknownText_0x55659 -; 0x5564d -LassScript_0x5564d: ; 0x5564d +LassScript_0x5564d: jumptextfaceplayer UnknownText_0x556ca -; 0x55650 GoldenrodPPSpeechHouseBookshelf2: jumpstd difficultbookshelf @@ -23,7 +20,7 @@ GoldenrodPPSpeechHouseBookshelf1: GoldenrodPPSpeechHouseRadio: jumpstd radio2 -UnknownText_0x55659: ; 0x55659 +UnknownText_0x55659: text "Once while I was" line "battling, my" @@ -36,9 +33,8 @@ UnknownText_0x55659: ; 0x55659 para "moves were all" line "gone." done -; 0x556ca -UnknownText_0x556ca: ; 0x556ca +UnknownText_0x556ca: text "Sometimes, a" line "healthy #MON" @@ -50,28 +46,26 @@ UnknownText_0x556ca: ; 0x556ca cont "MON CENTER or use" cont "an item." done -; 0x55741 -GoldenrodPPSpeechHouse_MapEventHeader: ; 0x55741 +GoldenrodPPSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY warp_def $7, $3, 7, GROUP_GOLDENROD_CITY, MAP_GOLDENROD_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 3 - signpost 1, 0, $0, GoldenrodPPSpeechHouseBookshelf1 - signpost 1, 1, $0, GoldenrodPPSpeechHouseBookshelf2 - signpost 1, 7, $0, GoldenrodPPSpeechHouseRadio + signpost 1, 0, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf1 + signpost 1, 1, SIGNPOST_READ, GoldenrodPPSpeechHouseBookshelf2 + signpost 1, 7, SIGNPOST_READ, GoldenrodPPSpeechHouseRadio - ; people-events +.PersonEvents: db 2 - person_event SPRITE_FISHER, 8, 6, $4, $10, 255, 255, $a0, 0, FisherScript_0x5564a, $ffff - person_event SPRITE_LASS, 7, 9, $8, $10, 255, 255, $0, 0, LassScript_0x5564d, $ffff -; 0x5577a + person_event SPRITE_FISHER, 8, 6, OW_UP | $0, $10, -1, -1, (PAL_OW_GREEN << 4) | $80, 0, FisherScript_0x5564a, -1 + person_event SPRITE_LASS, 7, 9, OW_LEFT | $0, $10, -1, -1, $0, 0, LassScript_0x5564d, -1 |