Future/pokecrystal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refer to "Rival", not "Silver" (#983)

Browse Source 
Fixes #982
This commit is contained in:
Rangi
2022-08-10 21:24:56 -04:00
committed by GitHub
parent 367a104203
commit 0d5cf5c8b9
21 changed files with 190 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
maps/AzaleaTown.asm
View File

@@ -8,7 +8,7 @@
const AZALEATOWN_SLOWPOKE3
const AZALEATOWN_SLOWPOKE4
const AZALEATOWN_FRUIT_TREE
const AZALEATOWN_SILVER
const AZALEATOWN_RIVAL
const AZALEATOWN_AZALEA_ROCKET3
const AZALEATOWN_KURT_OUTSIDE
@@ -35,13 +35,13 @@ AzaleaTownFlypointCallback:
endcallback
AzaleaTownRivalBattleScene1:
moveobject AZALEATOWN_SILVER, 11, 11
moveobject AZALEATOWN_RIVAL, 11, 11
turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement1
appear AZALEATOWN_RIVAL
applymovement AZALEATOWN_RIVAL, AzaleaTownRivalBattleApproachMovement1
turnobject PLAYER, DOWN
sjump AzaleaTownRivalBattleScript
@@ -50,8 +50,8 @@ AzaleaTownRivalBattleScene2:
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
appear AZALEATOWN_SILVER
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleApproachMovement2
appear AZALEATOWN_RIVAL
applymovement AZALEATOWN_RIVAL, AzaleaTownRivalBattleApproachMovement2
turnobject PLAYER, UP
AzaleaTownRivalBattleScript:
playmusic MUSIC_RIVAL_ENCOUNTER
@@ -65,7 +65,7 @@ AzaleaTownRivalBattleScript:
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue .Chikorita
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
setlasttalked AZALEATOWN_SILVER
setlasttalked AZALEATOWN_RIVAL
loadtrainer RIVAL1, RIVAL1_2_TOTODILE
startbattle
dontrestartmapmusic
@@ -74,7 +74,7 @@ AzaleaTownRivalBattleScript:
.Totodile:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
setlasttalked AZALEATOWN_SILVER
setlasttalked AZALEATOWN_RIVAL
loadtrainer RIVAL1, RIVAL1_2_CHIKORITA
startbattle
dontrestartmapmusic
@@ -83,7 +83,7 @@ AzaleaTownRivalBattleScript:
.Chikorita:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
setlasttalked AZALEATOWN_SILVER
setlasttalked AZALEATOWN_RIVAL
loadtrainer RIVAL1, RIVAL1_2_CYNDAQUIL
startbattle
dontrestartmapmusic
@@ -97,9 +97,9 @@ AzaleaTownRivalBattleScript:
waitbutton
closetext
turnobject PLAYER, LEFT
applymovement AZALEATOWN_SILVER, AzaleaTownRivalBattleExitMovement
applymovement AZALEATOWN_RIVAL, AzaleaTownRivalBattleExitMovement
playsound SFX_EXIT_BUILDING
disappear AZALEATOWN_SILVER
disappear AZALEATOWN_RIVAL
setscene SCENE_AZALEATOWN_NOOP
waitsfx
playmapmusic