diff options
Diffstat (limited to 'maps/CherrygroveGymSpeechHouse.asm')
| -rw-r--r-- | maps/CherrygroveGymSpeechHouse.asm | 38 |
1 files changed, 16 insertions, 22 deletions
diff --git a/maps/CherrygroveGymSpeechHouse.asm b/maps/CherrygroveGymSpeechHouse.asm index 95df5f8e6..f95fe3396 100644 --- a/maps/CherrygroveGymSpeechHouse.asm +++ b/maps/CherrygroveGymSpeechHouse.asm @@ -1,23 +1,20 @@ -CherrygroveGymSpeechHouse_MapScriptHeader: ; 0x196adf - ; trigger count +CherrygroveGymSpeechHouse_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x196ae1 -PokefanMScript_0x196ae1: ; 0x196ae1 +PokefanMScript_0x196ae1: jumptextfaceplayer UnknownText_0x196aea -; 0x196ae4 -BugCatcherScript_0x196ae4: ; 0x196ae4 +BugCatcherScript_0x196ae4: jumptextfaceplayer UnknownText_0x196b65 -; 0x196ae7 CherrygroveGymSpeechHouseBookshelf: jumpstd picturebookshelf -UnknownText_0x196aea: ; 0x196aea +UnknownText_0x196aea: text "You're trying to" line "see how good you" @@ -30,9 +27,8 @@ UnknownText_0x196aea: ; 0x196aea para "all over JOHTO and" line "collect BADGES." done -; 0x196b65 -UnknownText_0x196b65: ; 0x196b65 +UnknownText_0x196b65: text "When I get older," line "I'm going to be a" cont "GYM LEADER!" @@ -43,27 +39,25 @@ UnknownText_0x196b65: ; 0x196b65 para "friend's to make" line "them tougher!" done -; 0x196bd1 -CherrygroveGymSpeechHouse_MapEventHeader: ; 0x196bd1 +CherrygroveGymSpeechHouse_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 2 warp_def $7, $2, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY warp_def $7, $3, 3, GROUP_CHERRYGROVE_CITY, MAP_CHERRYGROVE_CITY - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 2 - signpost 1, 0, $0, CherrygroveGymSpeechHouseBookshelf - signpost 1, 1, $0, CherrygroveGymSpeechHouseBookshelf + signpost 1, 0, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf + signpost 1, 1, SIGNPOST_READ, CherrygroveGymSpeechHouseBookshelf - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 7, 6, $6, $0, 255, 255, $0, 0, PokefanMScript_0x196ae1, $ffff - person_event SPRITE_BUG_CATCHER, 9, 9, $5, $1, 255, 255, $80, 0, BugCatcherScript_0x196ae4, $ffff -; 0x196c05 + person_event SPRITE_POKEFAN_M, 7, 6, OW_UP | $2, $0, -1, -1, $0, 0, PokefanMScript_0x196ae1, -1 + person_event SPRITE_BUG_CATCHER, 9, 9, OW_UP | $1, $1, -1, -1, (PAL_OW_RED << 4) | $80, 0, BugCatcherScript_0x196ae4, -1 |