Skip to content

Commit

Permalink
Jasmine rebattle
Browse files Browse the repository at this point in the history
  • Loading branch information
surskitty committed Mar 5, 2018
1 parent d1e418d commit 528f7fb
Showing 1 changed file with 25 additions and 1 deletion.
26 changes: 25 additions & 1 deletion maps/OlivineGym.asm
Expand Up @@ -15,6 +15,8 @@ JasmineScript_0x9c12f:
writetext Jasmine_SteelTypeIntro
waitbutton
closetext
checkevent EVENT_GOT_SS_TICKET_FROM_ELM
iftrue .Rematch
winlosstext Jasmine_BetterTrainer, 0
loadtrainer JASMINE, JASMINE1
startbattle
Expand Down Expand Up @@ -47,6 +49,20 @@ JasmineScript_0x9c12f:
closetext
end

.Rematch:
winlosstext Jasmine_Rematch, 0
loadtrainer JASMINE, 2
startbattle
reloadmapafterbattle
setevent EVENT_BEAT_JASMINE
opentext
verbosegiveitem TM_IRON_TAIL
verbosegiveitem TM_SANDSTORM
writetext Jasmine_IronTailSpeech
waitbutton
closetext
end

OlivineGymActivateRockets:
ifequal 7, .RadioTowerRockets
ifequal 6, .GoldenrodRockets
Expand All @@ -60,7 +76,7 @@ OlivineGymActivateRockets:

OlivineGymGuyScript:
faceplayer
checkevent EVENT_BEAT_JASMINE
checkflag ENGINE_MINERALBADGE
iftrue .OlivineGymGuyWinScript
checkevent EVENT_JASMINE_RETURNED_TO_GYM
iffalse .OlivineGymGuyPreScript
Expand Down Expand Up @@ -162,6 +178,14 @@ Jasmine_GoodLuck:
cont "but good luck…"
done

Jasmine_Rematch:
text "…You are a better"
line "trainer than me,"

para "in both skill and"
line "kindness."
done

OlivineGymGuyText:
text "JASMINE uses the"
line "newly discovered"
Expand Down

0 comments on commit 528f7fb

Please sign in to comment.