diff options
Diffstat (limited to 'maps/CeladonGym.asm')
| -rw-r--r-- | maps/CeladonGym.asm | 111 |
1 files changed, 39 insertions, 72 deletions
diff --git a/maps/CeladonGym.asm b/maps/CeladonGym.asm index 8439ecaf8..07e6ac36e 100644 --- a/maps/CeladonGym.asm +++ b/maps/CeladonGym.asm @@ -1,16 +1,15 @@ -CeladonGym_MapScriptHeader: ; 0x72a68 +CeladonGym_MapScriptHeader: ; trigger count db 0 ; callback count db 0 -; 0x72a6a -ErikaScript_0x72a6a: ; 0x72a6a +ErikaScript_0x72a6a: faceplayer loadfont - checkflag $0026 - iftrue UnknownScript_0x72a9b + checkflag ENGINE_RAINBOWBADGE + iftrue .FightDone writetext UnknownText_0x72b28 closetext loadmovesprites @@ -18,7 +17,7 @@ ErikaScript_0x72a6a: ; 0x72a6a loadtrainer ERIKA, 1 startbattle returnafterbattle - setevent $04c8 + setevent EVENT_BEAT_ERIKA setevent EVENT_BEAT_LASS_MICHELLE setevent EVENT_BEAT_PICNICKER_TANYA setevent EVENT_BEAT_BEAUTY_JULIA @@ -27,8 +26,8 @@ ErikaScript_0x72a6a: ; 0x72a6a writetext UnknownText_0x72c96 playsound SFX_GET_BADGE waitbutton - setflag $0026 -UnknownScript_0x72a9b: ; 0x72a9b + setflag ENGINE_RAINBOWBADGE +.FightDone checkevent EVENT_GOT_TM19_GIGA_DRAIN iftrue UnknownScript_0x72aae writetext UnknownText_0x72cb0 @@ -36,14 +35,13 @@ UnknownScript_0x72a9b: ; 0x72a9b verbosegiveitem TM_GIGA_DRAIN, 1 iffalse UnknownScript_0x72aae setevent EVENT_GOT_TM19_GIGA_DRAIN -UnknownScript_0x72aae: ; 0x72aae +UnknownScript_0x72aae: writetext UnknownText_0x72d8f closetext loadmovesprites end -; 0x72ab4 -TrainerLassMichelle: ; 0x72ab4 +TrainerLassMichelle: ; bit/flag number dw $51d @@ -61,18 +59,16 @@ TrainerLassMichelle: ; 0x72ab4 ; script when talk again dw LassMichelleScript -; 0x72ac0 -LassMichelleScript: ; 0x72ac0 +LassMichelleScript: talkaftercancel loadfont writetext UnknownText_0x72e30 closetext loadmovesprites end -; 0x72ac8 -TrainerPicnickerTanya: ; 0x72ac8 +TrainerPicnickerTanya: ; bit/flag number dw $490 @@ -90,18 +86,16 @@ TrainerPicnickerTanya: ; 0x72ac8 ; script when talk again dw PicnickerTanyaScript -; 0x72ad4 -PicnickerTanyaScript: ; 0x72ad4 +PicnickerTanyaScript: talkaftercancel loadfont writetext UnknownText_0x72e8e closetext loadmovesprites end -; 0x72adc -TrainerBeautyJulia: ; 0x72adc +TrainerBeautyJulia: ; bit/flag number dw $4ba @@ -119,18 +113,16 @@ TrainerBeautyJulia: ; 0x72adc ; script when talk again dw BeautyJuliaScript -; 0x72ae8 -BeautyJuliaScript: ; 0x72ae8 +BeautyJuliaScript: talkaftercancel loadfont writetext UnknownText_0x72f01 closetext loadmovesprites end -; 0x72af0 -TrainerTwinsJoandzoe1: ; 0x72af0 +TrainerTwinsJoandzoe1: ; bit/flag number dw $468 @@ -148,18 +140,16 @@ TrainerTwinsJoandzoe1: ; 0x72af0 ; script when talk again dw TwinsJoandzoe1Script -; 0x72afc -TwinsJoandzoe1Script: ; 0x72afc +TwinsJoandzoe1Script: talkaftercancel loadfont writetext UnknownText_0x72f70 closetext loadmovesprites end -; 0x72b04 -TrainerTwinsJoandzoe2: ; 0x72b04 +TrainerTwinsJoandzoe2: ; bit/flag number dw $468 @@ -177,16 +167,14 @@ TrainerTwinsJoandzoe2: ; 0x72b04 ; script when talk again dw TwinsJoandzoe2Script -; 0x72b10 -TwinsJoandzoe2Script: ; 0x72b10 +TwinsJoandzoe2Script: talkaftercancel loadfont writetext UnknownText_0x72fc0 closetext loadmovesprites end -; 0x72b18 CeladonGymStatue: checkflag ENGINE_RAINBOWBADGE @@ -196,7 +184,7 @@ CeladonGymStatue: trainertotext ERIKA, 1, $1 jumpstd gymstatue2 -UnknownText_0x72b28: ; 0x72b28 +UnknownText_0x72b28: text "ERIKA: Hello…" line "Lovely weather," @@ -223,9 +211,8 @@ UnknownText_0x72b28: ; 0x72b28 para "Very well, but I" line "shall not lose." done -; 0x72c3e -UnknownText_0x72c3e: ; 0x72c3e +UnknownText_0x72c3e: text "ERIKA: Oh!" line "I concede defeat…" @@ -235,15 +222,13 @@ UnknownText_0x72c3e: ; 0x72c3e para "I shall give you" line "RAINBOWBADGE…" done -; 0x72c96 -UnknownText_0x72c96: ; 0x72c96 +UnknownText_0x72c96: text "<PLAYER> received" line "RAINBOWBADGE." done -; 0x72cb0 -UnknownText_0x72cb0: ; 0x72cb0 +UnknownText_0x72cb0: text "ERIKA: That was a" line "delightful match." @@ -263,9 +248,8 @@ UnknownText_0x72cb0: ; 0x72cb0 para "Please use it if" line "it pleases you…" done -; 0x72d8f -UnknownText_0x72d8f: ; 0x72d8f +UnknownText_0x72d8f: text "ERIKA: Losing" line "leaves a bitter" cont "aftertaste…" @@ -276,102 +260,86 @@ UnknownText_0x72d8f: ; 0x72d8f para "trainers spurs me" line "to do better…" done -; 0x72dfc -LassMichelleSeenText: ; 0x72dfc +LassMichelleSeenText: text "Do you think a" line "girls-only GYM" cont "is rare?" done -; 0x72e24 -LassMichelleBeatenText: ; 0x72e24 +LassMichelleBeatenText: text "Oh, bleah!" done -; 0x72e30 -UnknownText_0x72e30: ; 0x72e30 +UnknownText_0x72e30: text "I just got care-" line "less, that's all!" done -; 0x72e53 -PicnickerTanyaSeenText: ; 0x72e53 +PicnickerTanyaSeenText: text "Oh, a battle?" line "That's kind of" cont "scary, but OK!" done -; 0x72e7f -PicnickerTanyaBeatenText: ; 0x72e7f +PicnickerTanyaBeatenText: text "Oh, that's it?" done -; 0x72e8e -UnknownText_0x72e8e: ; 0x72e8e +UnknownText_0x72e8e: text "Oh, look at all" line "your BADGES. No" para "wonder I couldn't" line "win!" done -; 0x72ec5 -BeautyJuliaSeenText: ; 0x72ec5 +BeautyJuliaSeenText: text "Were you looking" line "at these flowers" cont "or at me?" done -; 0x72ef2 -BeautyJuliaBeatenText: ; 0x72ef2 +BeautyJuliaBeatenText: text "How annoying!" done -; 0x72f01 -UnknownText_0x72f01: ; 0x72f01 +UnknownText_0x72f01: text "How do I go about" line "becoming ladylike" cont "like ERIKA?" done -; 0x72f32 -TwinsJoandzoe1SeenText: ; 0x72f32 +TwinsJoandzoe1SeenText: text "We'll show you" line "#MON moves that" cont "ERIKA taught us!" done -; 0x72f62 -TwinsJoandzoe1BeatenText: ; 0x72f62 +TwinsJoandzoe1BeatenText: text "Oh… We lost…" done -; 0x72f70 -UnknownText_0x72f70: ; 0x72f70 +UnknownText_0x72f70: text "ERIKA will get you" line "back for us!" done -; 0x72f91 -TwinsJoandzoe2SeenText: ; 0x72f91 +TwinsJoandzoe2SeenText: text "We're going to" line "protect ERIKA!" done -; 0x72faf -TwinsJoandzoe2BeatenText: ; 0x72faf +TwinsJoandzoe2BeatenText: text "We couldn't win…" done -; 0x72fc0 -UnknownText_0x72fc0: ; 0x72fc0 +UnknownText_0x72fc0: text "ERIKA is much," line "much stronger!" done -; 0x72fdf -CeladonGym_MapEventHeader: ; 0x72fdf +CeladonGym_MapEventHeader: ; filler db 0, 0 @@ -396,4 +364,3 @@ CeladonGym_MapEventHeader: ; 0x72fdf person_event SPRITE_BUENA, 9, 7, $9, $0, 255, 255, $92, 2, TrainerBeautyJulia, $ffff person_event SPRITE_TWIN, 14, 8, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe1, $ffff person_event SPRITE_TWIN, 14, 9, $6, $0, 255, 255, $82, 1, TrainerTwinsJoandzoe2, $ffff -; 0x73047 |