diff options
Diffstat (limited to 'maps/Route10South.asm')
-rw-r--r-- | maps/Route10South.asm | 96 |
1 files changed, 25 insertions, 71 deletions
diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 363dde504..764a8b715 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,138 +1,92 @@ -Route10South_MapScriptHeader: ; 0x1ae3f4 - ; trigger count +Route10South_MapScriptHeader: +.MapTriggers: db 0 - ; callback count +.MapCallbacks: db 0 -; 0x1ae3f6 -TrainerHikerJim: ; 0x1ae3f6 - ; bit/flag number - dw $534 +TrainerHikerJim: + trainer EVENT_BEAT_HIKER_JIM, HIKER, JIM, HikerJimSeenText, HikerJimBeatenText, $0000, HikerJimScript - ; trainer group && trainer id - db HIKER, JIM - - ; text when seen - dw HikerJimSeenText - - ; text when trainer beaten - dw HikerJimBeatenText - - ; script when lost - dw $0000 - - ; script when talk again - dw HikerJimScript -; 0x1ae402 - -HikerJimScript: ; 0x1ae402 +HikerJimScript: talkaftercancel loadfont writetext UnknownText_0x1ae43b closetext loadmovesprites end -; 0x1ae40a - -TrainerPokefanmRobert: ; 0x1ae40a - ; bit/flag number - dw $4cf - - ; trainer group && trainer id - db POKEFANM, ROBERT - - ; text when seen - dw PokefanmRobertSeenText - - ; text when trainer beaten - dw PokefanmRobertBeatenText - - ; script when lost - dw $0000 - ; script when talk again - dw PokefanmRobertScript -; 0x1ae416 +TrainerPokefanmRobert: + trainer EVENT_BEAT_POKEFANM_ROBERT, POKEFANM, ROBERT, PokefanmRobertSeenText, PokefanmRobertBeatenText, $0000, PokefanmRobertScript -PokefanmRobertScript: ; 0x1ae416 +PokefanmRobertScript: talkaftercancel loadfont writetext UnknownText_0x1ae4a9 closetext loadmovesprites end -; 0x1ae41e -MapRoute10SouthSignpost0Script: ; 0x1ae41e +MapRoute10SouthSignpost0Script: jumptext UnknownText_0x1ae4dc -; 0x1ae421 -HikerJimSeenText: ; 0x1ae421 +HikerJimSeenText: text "Hahahah!" done -; 0x1ae42b -HikerJimBeatenText: ; 0x1ae42b +HikerJimBeatenText: text "Hahaha-hachoo!" done -; 0x1ae43b -UnknownText_0x1ae43b: ; 0x1ae43b +UnknownText_0x1ae43b: text "Hay fever is" line "making me sneeze!" cont "Ahahah-CHOO!" done -; 0x1ae468 -PokefanmRobertSeenText: ; 0x1ae468 +PokefanmRobertSeenText: text "You like #MON," line "don't you?" para "Me too!" done -; 0x1ae48a -PokefanmRobertBeatenText: ; 0x1ae48a +PokefanmRobertBeatenText: text "I'd have to say" line "that's my loss." done -; 0x1ae4a9 -UnknownText_0x1ae4a9: ; 0x1ae4a9 +UnknownText_0x1ae4a9: text "Look what you did" line "to my #MON…" para "I won't forget" line "this…" done -; 0x1ae4dc -UnknownText_0x1ae4dc: ; 0x1ae4dc +UnknownText_0x1ae4dc: text "ROUTE 10" para "CERULEAN CITY -" line "LAVENDER TOWN" done -; 0x1ae504 -Route10South_MapEventHeader: ; 0x1ae504 +Route10South_MapEventHeader: ; filler db 0, 0 - ; warps +.Warps: db 1 warp_def $1, $6, 2, GROUP_ROCK_TUNNEL_1F, MAP_ROCK_TUNNEL_1F - ; xy triggers +.XYTriggers: db 0 - ; signposts +.Signposts: db 1 - signpost 3, 5, $0, MapRoute10SouthSignpost0Script + signpost 3, 5, SIGNPOST_READ, MapRoute10SouthSignpost0Script - ; people-events +.PersonEvents: db 2 - person_event SPRITE_POKEFAN_M, 7, 21, $8, $0, 255, 255, $b2, 3, TrainerHikerJim, $ffff - person_event SPRITE_POKEFAN_M, 14, 12, $a, $0, 255, 255, $82, 3, TrainerPokefanmRobert, $ffff -; 0x1ae52e + person_event SPRITE_POKEFAN_M, 7, 21, OW_LEFT | $0, $0, -1, -1, (PAL_OW_BROWN << 4) | $82, 3, TrainerHikerJim, -1 + person_event SPRITE_POKEFAN_M, 14, 12, OW_LEFT | $2, $0, -1, -1, (PAL_OW_RED << 4) | $82, 3, TrainerPokefanmRobert, -1 |