diff options
Diffstat (limited to 'maps/Route20.asm')
| -rw-r--r-- | maps/Route20.asm | 66 |
1 files changed, 23 insertions, 43 deletions
diff --git a/maps/Route20.asm b/maps/Route20.asm index c81882bf9..a049c156c 100644 --- a/maps/Route20.asm +++ b/maps/Route20.asm @@ -1,4 +1,4 @@ -Route20_MapScriptHeader: ; 0x1acd20 +Route20_MapScriptHeader: ; trigger count db 0 @@ -8,16 +8,14 @@ Route20_MapScriptHeader: ; 0x1acd20 ; callbacks dbw 5, UnknownScript_0x1acd25 -; 0x1acd25 -UnknownScript_0x1acd25: ; 0x1acd25 +UnknownScript_0x1acd25: setevent $00d7 return -; 0x1acd29 -TrainerSwimmerfNicole: ; 0x1acd29 +TrainerSwimmerfNicole: ; bit/flag number - dw $3f5 + dw EVENT_BEAT_SWIMMERF_NICOLE ; trainer group && trainer id db SWIMMERF, NICOLE @@ -33,20 +31,18 @@ TrainerSwimmerfNicole: ; 0x1acd29 ; script when talk again dw SwimmerfNicoleScript -; 0x1acd35 -SwimmerfNicoleScript: ; 0x1acd35 +SwimmerfNicoleScript: talkaftercancel loadfont writetext UnknownText_0x1acd93 closetext loadmovesprites end -; 0x1acd3d -TrainerSwimmerfLori: ; 0x1acd3d +TrainerSwimmerfLori: ; bit/flag number - dw $3f6 + dw EVENT_BEAT_SWIMMERF_LORI ; trainer group && trainer id db SWIMMERF, LORI @@ -62,20 +58,18 @@ TrainerSwimmerfLori: ; 0x1acd3d ; script when talk again dw SwimmerfLoriScript -; 0x1acd49 -SwimmerfLoriScript: ; 0x1acd49 +SwimmerfLoriScript: talkaftercancel loadfont writetext UnknownText_0x1ace15 closetext loadmovesprites end -; 0x1acd51 -TrainerSwimmermCameron: ; 0x1acd51 +TrainerSwimmermCameron: ; bit/flag number - dw $5a4 + dw EVENT_BEAT_SWIMMERM_CAMERON ; trainer group && trainer id db SWIMMERM, CAMERON @@ -91,93 +85,80 @@ TrainerSwimmermCameron: ; 0x1acd51 ; script when talk again dw SwimmermCameronScript -; 0x1acd5d -SwimmermCameronScript: ; 0x1acd5d +SwimmermCameronScript: talkaftercancel loadfont writetext UnknownText_0x1ace8b closetext loadmovesprites end -; 0x1acd65 -MapRoute20Signpost0Script: ; 0x1acd65 +MapRoute20Signpost0Script: jumptext UnknownText_0x1acec2 -; 0x1acd68 -SwimmerfNicoleSeenText: ; 0x1acd68 +SwimmerfNicoleSeenText: text "I feel so much" line "lighter in water." done -; 0x1acd8a -SwimmerfNicoleBeatenText: ; 0x1acd8a +SwimmerfNicoleBeatenText: text "Oh, no!" done -; 0x1acd93 -UnknownText_0x1acd93: ; 0x1acd93 +UnknownText_0x1acd93: text "Swimming exercises" line "your full body." para "It's really good" line "for you." done -; 0x1acdd0 -SwimmerfLoriSeenText: ; 0x1acdd0 +SwimmerfLoriSeenText: text "What an impressive" line "collection of GYM" para "BADGES. We should" line "battle!" done -; 0x1ace10 -SwimmerfLoriBeatenText: ; 0x1ace10 +SwimmerfLoriBeatenText: text "No!" done -; 0x1ace15 -UnknownText_0x1ace15: ; 0x1ace15 +UnknownText_0x1ace15: text "SURF is no longer" line "the only HM move" cont "you use in water." done -; 0x1ace4b -SwimmermCameronSeenText: ; 0x1ace4b +SwimmermCameronSeenText: text "I guess it's im-" line "possible to swim" para "all the way to" line "JOHTO." done -; 0x1ace83 -SwimmermCameronBeatenText: ; 0x1ace83 +SwimmermCameronBeatenText: text "Aiyah!" done -; 0x1ace8b -UnknownText_0x1ace8b: ; 0x1ace8b +UnknownText_0x1ace8b: text "Besides the sea, I" line "can also swim in" cont "ponds and rivers." done -; 0x1acec2 -UnknownText_0x1acec2: ; 0x1acec2 +UnknownText_0x1acec2: text "What does this" line "sign say?" para "CINNABAR GYM" line "LEADER: BLAINE" done -; 0x1acef8 -Route20_MapEventHeader: ; 0x1acef8 +Route20_MapEventHeader: ; filler db 0, 0 @@ -197,4 +178,3 @@ Route20_MapEventHeader: ; 0x1acef8 person_event SPRITE_SWIMMER_GIRL, 12, 56, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNicole, $ffff person_event SPRITE_SWIMMER_GIRL, 17, 49, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfLori, $ffff person_event SPRITE_SWIMMER_GUY, 17, 16, $a, $0, 255, 255, $82, 3, TrainerSwimmermCameron, $ffff -; 0x1acf2f |