diff options
Diffstat (limited to 'maps/Route21.asm')
| -rw-r--r-- | maps/Route21.asm | 57 |
1 files changed, 20 insertions, 37 deletions
diff --git a/maps/Route21.asm b/maps/Route21.asm index 2efee7505..e3a321365 100644 --- a/maps/Route21.asm +++ b/maps/Route21.asm @@ -1,14 +1,13 @@ -Route21_MapScriptHeader: ; 0x1ac812 +Route21_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x1ac814 -TrainerSwimmermSeth: ; 0x1ac814 +TrainerSwimmermSeth: ; bit/flag number - dw $5a5 + dw EVENT_BEAT_SWIMMERM_SETH ; trainer group && trainer id db SWIMMERM, SETH @@ -24,20 +23,18 @@ TrainerSwimmermSeth: ; 0x1ac814 ; script when talk again dw SwimmermSethScript -; 0x1ac820 -SwimmermSethScript: ; 0x1ac820 +SwimmermSethScript: talkaftercancel loadfont writetext UnknownText_0x1ac873 closetext loadmovesprites end -; 0x1ac828 -TrainerSwimmerfNikki: ; 0x1ac828 +TrainerSwimmerfNikki: ; bit/flag number - dw $3f8 + dw EVENT_BEAT_SWIMMERF_NIKKI ; trainer group && trainer id db SWIMMERF, NIKKI @@ -53,20 +50,18 @@ TrainerSwimmerfNikki: ; 0x1ac828 ; script when talk again dw SwimmerfNikkiScript -; 0x1ac834 -SwimmerfNikkiScript: ; 0x1ac834 +SwimmerfNikkiScript: talkaftercancel loadfont writetext UnknownText_0x1ac8f1 closetext loadmovesprites end -; 0x1ac83c -TrainerFisherArnold: ; 0x1ac83c +TrainerFisherArnold: ; bit/flag number - dw $450 + dw EVENT_BEAT_FISHER_ARNOLD ; trainer group && trainer id db FISHER, ARNOLD @@ -82,73 +77,62 @@ TrainerFisherArnold: ; 0x1ac83c ; script when talk again dw FisherArnoldScript -; 0x1ac848 -FisherArnoldScript: ; 0x1ac848 +FisherArnoldScript: talkaftercancel loadfont writetext UnknownText_0x1ac95c closetext loadmovesprites end -; 0x1ac850 -SwimmermSethSeenText: ; 0x1ac850 +SwimmermSethSeenText: text "Land ho! Gotta" line "keep going!" done -; 0x1ac86c -SwimmermSethBeatenText: ; 0x1ac86c +SwimmermSethBeatenText: text "Glug…" done -; 0x1ac873 -UnknownText_0x1ac873: ; 0x1ac873 +UnknownText_0x1ac873: text "This arrogant guy" line "was at CINNABAR's" cont "volcano." done -; 0x1ac8a0 -SwimmerfNikkiSeenText: ; 0x1ac8a0 +SwimmerfNikkiSeenText: text "If I win, you have" line "to help me with my" cont "suntan lotion!" done -; 0x1ac8d6 -SwimmerfNikkiBeatenText: ; 0x1ac8d6 +SwimmerfNikkiBeatenText: text "I'm worried about" line "sunburn…" done -; 0x1ac8f1 -UnknownText_0x1ac8f1: ; 0x1ac8f1 +UnknownText_0x1ac8f1: text "I have to watch" line "out for blemishes" cont "caused by the sun." done -; 0x1ac927 -FisherArnoldSeenText: ; 0x1ac927 +FisherArnoldSeenText: text "I'm bored by fish-" line "ing. Let's battle!" done -; 0x1ac94c -FisherArnoldBeatenText: ; 0x1ac94c +FisherArnoldBeatenText: text "Utter failure…" done -; 0x1ac95c -UnknownText_0x1ac95c: ; 0x1ac95c +UnknownText_0x1ac95c: text "I'll just go back" line "to fishing…" done -; 0x1ac97a -Route21_MapEventHeader: ; 0x1ac97a +Route21_MapEventHeader: ; filler db 0, 0 @@ -166,4 +150,3 @@ Route21_MapEventHeader: ; 0x1ac97a person_event SPRITE_SWIMMER_GIRL, 20, 15, $a, $0, 255, 255, $a2, 3, TrainerSwimmerfNikki, $ffff person_event SPRITE_SWIMMER_GUY, 34, 6, $9, $0, 255, 255, $82, 4, TrainerSwimmermSeth, $ffff person_event SPRITE_FISHER, 26, 18, $7, $0, 255, 255, $a2, 1, TrainerFisherArnold, $ffff -; 0x1ac9a7 |