diff options
Diffstat (limited to 'maps/Route10South.asm')
| -rw-r--r-- | maps/Route10South.asm | 46 |
1 files changed, 16 insertions, 30 deletions
diff --git a/maps/Route10South.asm b/maps/Route10South.asm index 363dde504..a9955dfb2 100644 --- a/maps/Route10South.asm +++ b/maps/Route10South.asm @@ -1,14 +1,13 @@ -Route10South_MapScriptHeader: ; 0x1ae3f4 +Route10South_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x1ae3f6 -TrainerHikerJim: ; 0x1ae3f6 +TrainerHikerJim: ; bit/flag number - dw $534 + dw EVENT_BEAT_HIKER_JIM ; trainer group && trainer id db HIKER, JIM @@ -24,20 +23,18 @@ TrainerHikerJim: ; 0x1ae3f6 ; script when talk again dw HikerJimScript -; 0x1ae402 -HikerJimScript: ; 0x1ae402 +HikerJimScript: talkaftercancel loadfont writetext UnknownText_0x1ae43b closetext loadmovesprites end -; 0x1ae40a -TrainerPokefanmRobert: ; 0x1ae40a +TrainerPokefanmRobert: ; bit/flag number - dw $4cf + dw EVENT_BEAT_POKEFANM_ROBERT ; trainer group && trainer id db POKEFANM, ROBERT @@ -53,70 +50,60 @@ TrainerPokefanmRobert: ; 0x1ae40a ; script when talk again dw PokefanmRobertScript -; 0x1ae416 -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 @@ -135,4 +122,3 @@ Route10South_MapEventHeader: ; 0x1ae504 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 |