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

38
maps/MountMoon.asm
View File

@@ -1,5 +1,5 @@
object_const_def
const MOUNTMOON_SILVER
const MOUNTMOON_RIVAL
MountMoon_MapScripts:
def_scene_scripts
@@ -20,18 +20,18 @@ MountMoonRivalBattleScript:
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
applymovement MOUNTMOON_SILVER, MountMoonSilverMovementBefore
applymovement MOUNTMOON_RIVAL, MountMoonRivalMovementBefore
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext MountMoonSilverTextBefore
writetext MountMoonRivalTextBefore
waitbutton
closetext
checkevent EVENT_GOT_TOTODILE_FROM_ELM
iftrue .Totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue .Chikorita
winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss
setlasttalked MOUNTMOON_SILVER
winlosstext MountMoonRivalTextWin, MountMoonRivalTextLoss
setlasttalked MOUNTMOON_RIVAL
loadtrainer RIVAL2, RIVAL2_1_TOTODILE
startbattle
dontrestartmapmusic
@@ -39,8 +39,8 @@ MountMoonRivalBattleScript:
sjump .FinishBattle
.Totodile:
winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss
setlasttalked MOUNTMOON_SILVER
winlosstext MountMoonRivalTextWin, MountMoonRivalTextLoss
setlasttalked MOUNTMOON_RIVAL
loadtrainer RIVAL2, RIVAL2_1_CHIKORITA
startbattle
dontrestartmapmusic
@@ -48,8 +48,8 @@ MountMoonRivalBattleScript:
sjump .FinishBattle
.Chikorita:
winlosstext MountMoonSilverTextWin, MountMoonSilverTextLoss
setlasttalked MOUNTMOON_SILVER
winlosstext MountMoonRivalTextWin, MountMoonRivalTextLoss
setlasttalked MOUNTMOON_RIVAL
loadtrainer RIVAL2, RIVAL2_1_CYNDAQUIL
startbattle
dontrestartmapmusic
@@ -59,23 +59,23 @@ MountMoonRivalBattleScript:
.FinishBattle:
playmusic MUSIC_RIVAL_AFTER
opentext
writetext MountMoonSilverTextAfter
writetext MountMoonRivalTextAfter
waitbutton
closetext
applymovement MOUNTMOON_SILVER, MountMoonSilverMovementAfter
disappear MOUNTMOON_SILVER
applymovement MOUNTMOON_RIVAL, MountMoonRivalMovementAfter
disappear MOUNTMOON_RIVAL
setscene SCENE_MOUNTMOON_NOOP
setevent EVENT_BEAT_RIVAL_IN_MT_MOON
playmapmusic
end
MountMoonSilverMovementBefore:
MountMoonRivalMovementBefore:
step LEFT
step LEFT
step LEFT
step_end
MountMoonSilverMovementAfter:
MountMoonRivalMovementAfter:
step RIGHT
step RIGHT
step DOWN
@@ -85,7 +85,7 @@ MountMoonSilverMovementAfter:
step DOWN
step_end
MountMoonSilverTextBefore:
MountMoonRivalTextBefore:
text "<……> <……> <……>"
para "It's been a while,"
@@ -105,7 +105,7 @@ MountMoonSilverTextBefore:
line "show you!"
done
MountMoonSilverTextWin:
MountMoonRivalTextWin:
text "<……> <……> <……>"
para "I thought I raised"
@@ -118,7 +118,7 @@ MountMoonSilverTextWin:
line "wasn't enough…"
done
MountMoonSilverTextAfter:
MountMoonRivalTextAfter:
text "<……> <……> <……>"
para "…You won, fair"
@@ -144,7 +144,7 @@ MountMoonSilverTextAfter:
line "beating you."
done
MountMoonSilverTextLoss:
MountMoonRivalTextLoss:
text "<……> <……> <……>"
para "I've repaid my"
@@ -176,4 +176,4 @@ MountMoon_MapEvents:
def_bg_events
def_object_events
object_event 7, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL
object_event 7, 3, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_MT_MOON_RIVAL