thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

HGSS-style first rival fight

Browse source 
Now the rival doesn't awkwardly say his name is ???, using the trainer card from HGSS instead. Includes the funny lookaround gaffe among other bits. Changed the trainer class as well, making it seamless.
This commit is contained in:
Llinos Evans 2024-07-29 15:30:04 +01:00
parent a4044f0929
commit d55f848761
13 changed files with 99 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

93
maps/CherrygroveCity.asm
View file

@ -128,7 +128,7 @@ CherrygroveRivalSceneNorth:
iftrue .Chikorita
winlosstext RivalCherrygroveWinText, RivalCherrygroveLossText
setlasttalked CHERRYGROVECITY_RIVAL
loadtrainer RIVAL1, RIVAL1_1_TOTODILE
loadtrainer PASSERBY, RIVAL1_1_TOTODILE
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
@ -139,7 +139,7 @@ CherrygroveRivalSceneNorth:
.Totodile:
winlosstext RivalCherrygroveWinText, RivalCherrygroveLossText
setlasttalked CHERRYGROVECITY_RIVAL
loadtrainer RIVAL1, RIVAL1_1_CHIKORITA
loadtrainer PASSERBY, RIVAL1_1_CHIKORITA
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
@ -150,7 +150,7 @@ CherrygroveRivalSceneNorth:
.Chikorita:
winlosstext RivalCherrygroveWinText, RivalCherrygroveLossText
setlasttalked CHERRYGROVECITY_RIVAL
loadtrainer RIVAL1, RIVAL1_1_CYNDAQUIL
loadtrainer PASSERBY, RIVAL1_1_CYNDAQUIL
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
dontrestartmapmusic
@ -161,7 +161,7 @@ CherrygroveRivalSceneNorth:
.AfterVictorious:
playmusic MUSIC_RIVAL_AFTER
opentext
writetext CherrygroveRivalText_YouWon
writetext CherrygroveRivalText_AfterBattle
waitbutton
closetext
sjump .FinishRival
@ -169,14 +169,35 @@ CherrygroveRivalSceneNorth:
.AfterYourDefeat:
playmusic MUSIC_RIVAL_AFTER
opentext
writetext CherrygroveRivalText_YouLost
writetext CherrygroveRivalText_AfterBattle
waitbutton
closetext
.FinishRival:
playsound SFX_TACKLE
applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
turnobject PLAYER, LEFT
; New HGSS-styled scene
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageOops
showemote EMOTE_SHOCK, CHERRYGROVECITY_RIVAL, 15
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageSearchForCard1
pause 10
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageSearchForCard2
pause 10
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageSearchForCard3
pause 10
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageSearchForCard4
pause 10
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageSearchForCard5
pause 10
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageCollectCard
turnobject PLAYER, UP
opentext
writetext RivalThatsMyCardText
waitbutton
closetext
applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageLeft
disappear CHERRYGROVECITY_RIVAL
setscene SCENE_CHERRYGROVECITY_NOOP
special HealParty
@ -326,6 +347,49 @@ CherrygroveCity_RivalPushesYouOutOfTheWay:
turn_head UP
step_end
CherrygroveCity_RivalExitsStageOops:
big_step LEFT
big_step LEFT
big_step LEFT
big_step LEFT
step_end
CherrygroveCity_RivalExitsStageSearchForCard1:
turn_head DOWN
step_end
CherrygroveCity_RivalExitsStageSearchForCard2:
turn_head UP
step_end
CherrygroveCity_RivalExitsStageSearchForCard3:
turn_head DOWN
step_end
CherrygroveCity_RivalExitsStageSearchForCard4:
turn_head LEFT
step_end
CherrygroveCity_RivalExitsStageSearchForCard5:
turn_head RIGHT
step_end
CherrygroveCity_RivalExitsStageCollectCard:
big_step RIGHT
big_step RIGHT
big_step RIGHT
turn_head DOWN
step_end
RivalThatsMyCardText:
text "Give that back!"
line "That's my TRAINER"
cont "CARD!"
para "Gah! You saw my"
line "name<……>"
done
CherrygroveCity_RivalExitsStageLeft:
big_step LEFT
big_step LEFT
@ -477,10 +541,14 @@ RivalCherrygroveWinText:
line "happy you won?"
done
CherrygroveRivalText_YouLost:
; merged into one due to redundancy
CherrygroveRivalText_AfterBattle:
text "<……> <……> <……>"
para "My name's ???."
para "Want to know who"
line "I am?"
para "<……>"
para "I'm going to be"
line "the world's great-"
@ -493,17 +561,6 @@ RivalCherrygroveLossText:
line "waste of time."
done
CherrygroveRivalText_YouWon:
text "<……> <……> <……>"
para "My name's ???."
para "I'm going to be"
line "the world's great-"
cont "est #MON"
cont "trainer."
done
CherrygroveTeacherText_NoMapCard:
text "Did you talk to"
line "the old man by the"