ref: 0d5cf5c8b9066b407f8dc1879dad56d53f5d0179
parent: 367a10420350cce7315880e3edf03cdcdf0257b3
author: Rangi <35663410+Rangi42@users.noreply.github.com>
date: Wed Aug 10 17:24:56 EDT 2022
Refer to "Rival", not "Silver" (#983) Fixes #982
--- a/constants/sprite_constants.asm
+++ b/constants/sprite_constants.asm
@@ -5,7 +5,7 @@
const SPRITE_CHRIS ; 01
const SPRITE_CHRIS_BIKE ; 02
const SPRITE_GAMEBOY_KID ; 03
- const SPRITE_SILVER ; 04
+ const SPRITE_RIVAL ; 04
const SPRITE_OAK ; 05
const SPRITE_RED ; 06
const SPRITE_BLUE ; 07
--- a/data/maps/outdoor_sprites.asm
+++ b/data/maps/outdoor_sprites.asm
@@ -202,7 +202,7 @@
db SPRITE_YOUNGSTER
db SPRITE_LASS
db SPRITE_BIKER
- db SPRITE_SILVER
+ db SPRITE_RIVAL
db SPRITE_BLUE
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
@@ -320,7 +320,7 @@
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_BIG_SNORLAX
- db SPRITE_SILVER
+ db SPRITE_RIVAL
db SPRITE_TEACHER
db SPRITE_FISHER
db SPRITE_COOLTRAINER_M
@@ -345,7 +345,7 @@
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_BIG_SNORLAX
- db SPRITE_SILVER
+ db SPRITE_RIVAL
db SPRITE_TEACHER
db SPRITE_FISHER
db SPRITE_COOLTRAINER_M
@@ -370,7 +370,7 @@
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_BIG_SNORLAX
- db SPRITE_SILVER
+ db SPRITE_RIVAL
db SPRITE_TEACHER
db SPRITE_FISHER
db SPRITE_COOLTRAINER_M
@@ -453,7 +453,7 @@
db SPRITE_TEACHER
db SPRITE_AZALEA_ROCKET
db SPRITE_LASS
- db SPRITE_SILVER
+ db SPRITE_RIVAL
db SPRITE_FRUIT_TREE
db SPRITE_SLOWPOKE
@@ -665,7 +665,7 @@
db SPRITE_POKEFAN_M
db SPRITE_GRAMPS
db SPRITE_FAIRY
- db SPRITE_SILVER
+ db SPRITE_RIVAL
db SPRITE_FISHING_GURU
db SPRITE_POKE_BALL
db SPRITE_POKEDEX
--- a/data/sprites/sprites.asm
+++ b/data/sprites/sprites.asm
@@ -10,7 +10,7 @@
overworld_sprite ChrisSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite ChrisBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite GameboyKidSpriteGFX, 12, STANDING_SPRITE, PAL_OW_GREEN
- overworld_sprite SilverSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
+ overworld_sprite RivalSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite OakSpriteGFX, 12, WALKING_SPRITE, PAL_OW_BROWN
overworld_sprite RedSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
overworld_sprite BlueSpriteGFX, 12, WALKING_SPRITE, PAL_OW_RED
--- a/data/trainers/sprites.asm
+++ b/data/trainers/sprites.asm
@@ -9,7 +9,7 @@
db SPRITE_JASMINE
db SPRITE_CHUCK
db SPRITE_CLAIR
- db SPRITE_SILVER
+ db SPRITE_RIVAL
db SPRITE_OAK
db SPRITE_WILL
db SPRITE_CHRIS
--- a/engine/events/std_scripts.asm
+++ b/engine/events/std_scripts.asm
@@ -594,7 +594,7 @@
setflag ENGINE_ROCKET_SIGNAL_ON_CH20
setflag ENGINE_ROCKETS_IN_MAHOGANY
variablesprite SPRITE_WEIRD_TREE, SPRITE_SUDOWOODO
- variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_SILVER
+ variablesprite SPRITE_OLIVINE_RIVAL, SPRITE_RIVAL
variablesprite SPRITE_AZALEA_ROCKET, SPRITE_ROCKET
variablesprite SPRITE_FUCHSIA_GYM_1, SPRITE_JANINE
variablesprite SPRITE_FUCHSIA_GYM_2, SPRITE_JANINE
--- a/engine/menus/naming_screen.asm
+++ b/engine/menus/naming_screen.asm
@@ -131,8 +131,8 @@
db "YOUR NAME?@"
.Rival:
- ld de, SilverSpriteGFX
- ld b, BANK(SilverSpriteGFX)
+ ld de, RivalSpriteGFX
+ ld b, BANK(RivalSpriteGFX)
call .LoadSprite
hlcoord 5, 2
ld de, .RivalNameString
--- a/gfx/sprites.asm
+++ b/gfx/sprites.asm
@@ -3,7 +3,7 @@
ChrisSpriteGFX:: INCBIN "gfx/sprites/chris.2bpp"
ChrisBikeSpriteGFX:: INCBIN "gfx/sprites/chris_bike.2bpp"
GameboyKidSpriteGFX:: INCBIN "gfx/sprites/gameboy_kid.2bpp"
-SilverSpriteGFX:: INCBIN "gfx/sprites/silver.2bpp"
+RivalSpriteGFX:: INCBIN "gfx/sprites/rival.2bpp"
OakSpriteGFX:: INCBIN "gfx/sprites/oak.2bpp"
RedSpriteGFX:: INCBIN "gfx/sprites/red.2bpp"
BlueSpriteGFX:: INCBIN "gfx/sprites/blue.2bpp"
binary files /dev/null b/gfx/sprites/rival.png differ
binary files a/gfx/sprites/silver.png /dev/null differ
--- a/maps/AzaleaTown.asm
+++ b/maps/AzaleaTown.asm
@@ -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 @@
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 @@
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 @@
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 @@
.Totodile:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
- setlasttalked AZALEATOWN_SILVER
+ setlasttalked AZALEATOWN_RIVAL
loadtrainer RIVAL1, RIVAL1_2_CHIKORITA
startbattle
dontrestartmapmusic
@@ -83,7 +83,7 @@
.Chikorita:
winlosstext AzaleaTownRivalWinText, AzaleaTownRivalLossText
- setlasttalked AZALEATOWN_SILVER
+ setlasttalked AZALEATOWN_RIVAL
loadtrainer RIVAL1, RIVAL1_2_CYNDAQUIL
startbattle
dontrestartmapmusic
@@ -97,9 +97,9 @@
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
--- a/maps/BurnedTower1F.asm
+++ b/maps/BurnedTower1F.asm
@@ -1,7 +1,7 @@
object_const_def
const BURNEDTOWER1F_ROCK
const BURNEDTOWER1F_EUSINE
- const BURNEDTOWER1F_SILVER
+ const BURNEDTOWER1F_RIVAL
const BURNEDTOWER1F_MORTY
const BURNEDTOWER1F_POKE_BALL
@@ -48,16 +48,16 @@
end
BurnedTowerRivalBattleScript:
- showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 15
+ showemote EMOTE_SHOCK, BURNEDTOWER1F_RIVAL, 15
special FadeOutMusic
pause 15
- turnobject BURNEDTOWER1F_SILVER, RIGHT
+ turnobject BURNEDTOWER1F_RIVAL, RIGHT
pause 15
- applymovement PLAYER, BurnedTowerMovement_PlayerWalksToSilver
- applymovement BURNEDTOWER1F_SILVER, BurnedTowerMovement_SilverWalksToPlayer
+ applymovement PLAYER, BurnedTowerMovement_PlayerWalksToRival
+ applymovement BURNEDTOWER1F_RIVAL, BurnedTowerMovement_RivalWalksToPlayer
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
- writetext BurnedTowerSilver_BeforeText
+ writetext BurnedTowerRival_BeforeText
waitbutton
closetext
checkevent EVENT_GOT_TOTODILE_FROM_ELM
@@ -64,8 +64,8 @@
iftrue .totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue .chikorita
- winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
- setlasttalked BURNEDTOWER1F_SILVER
+ winlosstext BurnedTowerRival_WinText, BurnedTowerRival_LossText
+ setlasttalked BURNEDTOWER1F_RIVAL
loadtrainer RIVAL1, RIVAL1_3_TOTODILE
startbattle
dontrestartmapmusic
@@ -73,8 +73,8 @@
sjump .returnfrombattle
.totodile
- winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
- setlasttalked BURNEDTOWER1F_SILVER
+ winlosstext BurnedTowerRival_WinText, BurnedTowerRival_LossText
+ setlasttalked BURNEDTOWER1F_RIVAL
loadtrainer RIVAL1, RIVAL1_3_CHIKORITA
startbattle
dontrestartmapmusic
@@ -82,8 +82,8 @@
sjump .returnfrombattle
.chikorita
- winlosstext BurnedTowerSilver_WinText, BurnedTowerSilver_LossText
- setlasttalked BURNEDTOWER1F_SILVER
+ winlosstext BurnedTowerRival_WinText, BurnedTowerRival_LossText
+ setlasttalked BURNEDTOWER1F_RIVAL
loadtrainer RIVAL1, RIVAL1_3_CYNDAQUIL
startbattle
dontrestartmapmusic
@@ -93,7 +93,7 @@
.returnfrombattle
playmusic MUSIC_RIVAL_AFTER
opentext
- writetext BurnedTowerSilver_AfterText1
+ writetext BurnedTowerRival_AfterText1
waitbutton
closetext
setscene SCENE_BURNEDTOWER1F_NOOP
@@ -109,9 +109,9 @@
pause 15
applymovement PLAYER, BurnedTower1FMovement_PlayerStartsToFall
playsound SFX_KINESIS
- showemote EMOTE_SHOCK, BURNEDTOWER1F_SILVER, 20
+ showemote EMOTE_SHOCK, BURNEDTOWER1F_RIVAL, 20
opentext
- writetext BurnedTowerSilver_AfterText2
+ writetext BurnedTowerRival_AfterText2
waitbutton
closetext
setevent EVENT_HOLE_IN_BURNED_TOWER
@@ -137,11 +137,11 @@
BurnedTower1FHPUp:
itemball HP_UP
-BurnedTowerMovement_PlayerWalksToSilver:
+BurnedTowerMovement_PlayerWalksToRival:
step LEFT
step_end
-BurnedTowerMovement_SilverWalksToPlayer:
+BurnedTowerMovement_RivalWalksToPlayer:
step RIGHT
step_end
@@ -157,7 +157,7 @@
step DOWN
step_end
-BurnedTowerSilver_BeforeText:
+BurnedTowerRival_BeforeText:
text "<……> <……> <……>"
para "…Oh, it's you."
@@ -181,7 +181,7 @@
line "fault!"
done
-BurnedTowerSilver_WinText:
+BurnedTowerRival_WinText:
text "…Humph!"
para "This is why I hate"
@@ -191,7 +191,7 @@
line "challenge in it."
done
-BurnedTowerSilver_AfterText1:
+BurnedTowerRival_AfterText1:
text "…Aw, whatever."
para "You would never be"
@@ -201,7 +201,7 @@
line "anyway."
done
-BurnedTowerSilver_LossText:
+BurnedTowerRival_LossText:
text "…Humph!"
para "This is why I hate"
@@ -211,7 +211,7 @@
line "of my time."
done
-BurnedTowerSilver_AfterText2:
+BurnedTowerRival_AfterText2:
text "Humph!"
para "What are you doing"
@@ -304,6 +304,6 @@
def_object_events
object_event 15, 4, SPRITE_ROCK, SPRITEMOVEDATA_SMASHABLE_ROCK, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, BurnedTower1FRock, -1
object_event 12, 12, SPRITE_SUPER_NERD, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, BurnedTower1FEusineScript, EVENT_BURNED_TOWER_1F_EUSINE
- object_event 8, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
+ object_event 8, 9, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, 0, OBJECTTYPE_TRAINER, 3, ObjectEvent, EVENT_RIVAL_BURNED_TOWER
object_event 14, 14, SPRITE_MORTY, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, BurnedTower1FMortyScript, EVENT_BURNED_TOWER_MORTY
object_event 14, 2, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, BurnedTower1FHPUp, EVENT_BURNED_TOWER_1F_HP_UP
--- a/maps/CherrygroveCity.asm
+++ b/maps/CherrygroveCity.asm
@@ -1,6 +1,6 @@
object_const_def
const CHERRYGROVECITY_GRAMPS
- const CHERRYGROVECITY_SILVER
+ const CHERRYGROVECITY_RIVAL
const CHERRYGROVECITY_TEACHER
const CHERRYGROVECITY_YOUNGSTER
const CHERRYGROVECITY_FISHER
@@ -98,15 +98,15 @@
closetext
end
-CherrygroveSilverSceneSouth:
- moveobject CHERRYGROVECITY_SILVER, 39, 7
-CherrygroveSilverSceneNorth:
+CherrygroveRivalSceneSouth:
+ moveobject CHERRYGROVECITY_RIVAL, 39, 7
+CherrygroveRivalSceneNorth:
turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
- appear CHERRYGROVECITY_SILVER
- applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalWalksToYou
+ appear CHERRYGROVECITY_RIVAL
+ applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalWalksToYou
turnobject PLAYER, RIGHT
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
@@ -117,8 +117,8 @@
iftrue .Totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue .Chikorita
- winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
- setlasttalked CHERRYGROVECITY_SILVER
+ winlosstext RivalCherrygroveWinText, RivalCherrygroveLossText
+ setlasttalked CHERRYGROVECITY_RIVAL
loadtrainer RIVAL1, RIVAL1_1_TOTODILE
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
@@ -128,8 +128,8 @@
sjump .AfterYourDefeat
.Totodile:
- winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
- setlasttalked CHERRYGROVECITY_SILVER
+ winlosstext RivalCherrygroveWinText, RivalCherrygroveLossText
+ setlasttalked CHERRYGROVECITY_RIVAL
loadtrainer RIVAL1, RIVAL1_1_CHIKORITA
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
@@ -139,8 +139,8 @@
sjump .AfterYourDefeat
.Chikorita:
- winlosstext SilverCherrygroveWinText, SilverCherrygroveLossText
- setlasttalked CHERRYGROVECITY_SILVER
+ winlosstext RivalCherrygroveWinText, RivalCherrygroveLossText
+ setlasttalked CHERRYGROVECITY_RIVAL
loadtrainer RIVAL1, RIVAL1_1_CYNDAQUIL
loadvar VAR_BATTLETYPE, BATTLETYPE_CANLOSE
startbattle
@@ -167,8 +167,8 @@
playsound SFX_TACKLE
applymovement PLAYER, CherrygroveCity_RivalPushesYouOutOfTheWay
turnobject PLAYER, LEFT
- applymovement CHERRYGROVECITY_SILVER, CherrygroveCity_RivalExitsStageLeft
- disappear CHERRYGROVECITY_SILVER
+ applymovement CHERRYGROVECITY_RIVAL, CherrygroveCity_RivalExitsStageLeft
+ disappear CHERRYGROVECITY_RIVAL
setscene SCENE_CHERRYGROVECITY_NOOP
special HealParty
playmapmusic
@@ -451,7 +451,7 @@
line "what I mean!"
done
-SilverCherrygroveWinText:
+RivalCherrygroveWinText:
text "Humph. Are you"
line "happy you won?"
done
@@ -467,7 +467,7 @@
cont "trainer."
done
-SilverCherrygroveLossText:
+RivalCherrygroveLossText:
text "Humph. That was a"
line "waste of time."
done
@@ -555,8 +555,8 @@
warp_event 31, 11, CHERRYGROVE_EVOLUTION_SPEECH_HOUSE, 1
def_coord_events
- coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneNorth
- coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveSilverSceneSouth
+ coord_event 33, 6, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveRivalSceneNorth
+ coord_event 33, 7, SCENE_CHERRYGROVECITY_MEET_RIVAL, CherrygroveRivalSceneSouth
def_bg_events
bg_event 30, 8, BGEVENT_READ, CherrygroveCitySign
@@ -566,7 +566,7 @@
def_object_events
object_event 32, 6, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, CherrygroveCityGuideGent, EVENT_GUIDE_GENT_IN_HIS_HOUSE
- object_event 39, 6, SPRITE_SILVER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
+ object_event 39, 6, SPRITE_RIVAL, SPRITEMOVEDATA_SPINRANDOM_SLOW, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_CHERRYGROVE_CITY
object_event 27, 12, SPRITE_TEACHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CherrygroveTeacherScript, -1
object_event 23, 7, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 1, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, CherrygroveYoungsterScript, -1
object_event 7, 12, SPRITE_FISHER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, MysticWaterGuy, -1
--- a/maps/DragonShrine.asm
+++ b/maps/DragonShrine.asm
@@ -230,7 +230,7 @@
end
.BeatRivalInMtMoon:
- writetext DragonShrineSilverIsInTrainingText
+ writetext DragonShrineRivalIsInTrainingText
waitbutton
closetext
end
@@ -543,7 +543,7 @@
line "grandfather."
done
-DragonShrineSilverIsInTrainingText:
+DragonShrineRivalIsInTrainingText:
text "A boy close to"
line "your age is in"
cont "training here."
--- a/maps/DragonsDenB1F.asm
+++ b/maps/DragonsDenB1F.asm
@@ -1,7 +1,7 @@
object_const_def
const DRAGONSDENB1F_POKE_BALL1
const DRAGONSDENB1F_CLAIR
- const DRAGONSDENB1F_SILVER
+ const DRAGONSDENB1F_RIVAL
const DRAGONSDENB1F_COOLTRAINER_M
const DRAGONSDENB1F_COOLTRAINER_F
const DRAGONSDENB1F_TWIN1
@@ -15,7 +15,7 @@
scene_script DragonsDenB1FNoop2Scene, SCENE_DRAGONSDENB1F_CLAIR_GIVES_TM
def_callbacks
- callback MAPCALLBACK_NEWMAP, DragonsDenB1FCheckSilverCallback
+ callback MAPCALLBACK_NEWMAP, DragonsDenB1FCheckRivalCallback
DragonsDenB1FNoop1Scene:
end
@@ -23,21 +23,21 @@
DragonsDenB1FNoop2Scene:
end
-DragonsDenB1FCheckSilverCallback:
+DragonsDenB1FCheckRivalCallback:
checkevent EVENT_BEAT_RIVAL_IN_MT_MOON
iftrue .CheckDay
- disappear DRAGONSDENB1F_SILVER
+ disappear DRAGONSDENB1F_RIVAL
endcallback
.CheckDay:
readvar VAR_WEEKDAY
- ifequal TUESDAY, .AppearSilver
- ifequal THURSDAY, .AppearSilver
- disappear DRAGONSDENB1F_SILVER
+ ifequal TUESDAY, .AppearRival
+ ifequal THURSDAY, .AppearRival
+ disappear DRAGONSDENB1F_RIVAL
endcallback
-.AppearSilver:
- appear DRAGONSDENB1F_SILVER
+.AppearRival:
+ appear DRAGONSDENB1F_RIVAL
endcallback
DragonsDenB1F_ClairScene:
@@ -151,13 +151,13 @@
closetext
end
-DragonsDenB1FSilverScript:
+DragonsDenB1FRivalScript:
playmusic MUSIC_RIVAL_ENCOUNTER
faceplayer
opentext
checkevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
- iftrue .SilverTalkAgain
- writetext SilverText_Training1
+ iftrue .RivalTalkAgain
+ writetext RivalText_Training1
waitbutton
closetext
setevent EVENT_TEMPORARY_UNTIL_MAP_RELOAD_1
@@ -164,8 +164,8 @@
special RestartMapMusic
end
-.SilverTalkAgain:
- writetext SilverText_Training2
+.RivalTalkAgain:
+ writetext RivalText_Training2
waitbutton
closetext
special RestartMapMusic
@@ -287,7 +287,7 @@
line "in DRAGON'S DEN."
done
-SilverText_Training1:
+RivalText_Training1:
text "…"
line "What? <PLAYER>?"
@@ -307,7 +307,7 @@
line "MON trainer…"
done
-SilverText_Training2:
+RivalText_Training2:
text "…"
para "Whew…"
@@ -423,7 +423,7 @@
def_object_events
object_event 35, 16, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FDragonFangScript, EVENT_DRAGONS_DEN_B1F_DRAGON_FANG
object_event 14, 30, SPRITE_CLAIR, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_DRAGONS_DEN_CLAIR
- object_event 20, 23, SPRITE_SILVER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FSilverScript, EVENT_RIVAL_DRAGONS_DEN
+ object_event 20, 23, SPRITE_RIVAL, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, DragonsDenB1FRivalScript, EVENT_RIVAL_DRAGONS_DEN
object_event 20, 8, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 4, TrainerCooltrainermDarin, -1
object_event 8, 8, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 3, TrainerCooltrainerfCara, -1
object_event 4, 17, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_TRAINER, 1, TrainerTwinsLeaandpia1, -1
--- a/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
+++ b/maps/GoldenrodUndergroundSwitchRoomEntrances.asm
@@ -43,7 +43,7 @@
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SUPER_NERD
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL1
const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_POKE_BALL2
- const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ const GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
GoldenrodUndergroundSwitchRoomEntrances_MapScripts:
def_scene_scripts
@@ -117,45 +117,45 @@
GoldenrodUndergroundSwitchRoomEntrancesTeacherScript:
jumptextfaceplayer GoldenrodUndergroundSwitchRoomEntrances_TeacherText
-UndergroundSilverScene1:
+UndergroundRivalScene1:
turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
playsound SFX_EXIT_BUILDING
- appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
waitsfx
- applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement1
+ applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL, UndergroundRivalApproachMovement1
turnobject PLAYER, RIGHT
- scall UndergroundSilverBattleScript
- applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement1
+ scall UndergroundRivalBattleScript
+ applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL, UndergroundRivalRetreatMovement1
playsound SFX_EXIT_BUILDING
- disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
waitsfx
playmapmusic
end
-UndergroundSilverScene2:
+UndergroundRivalScene2:
turnobject PLAYER, RIGHT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
playsound SFX_EXIT_BUILDING
- appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ appear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
waitsfx
- applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverApproachMovement2
+ applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL, UndergroundRivalApproachMovement2
turnobject PLAYER, RIGHT
- scall UndergroundSilverBattleScript
- applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER, UndergroundSilverRetreatMovement2
+ scall UndergroundRivalBattleScript
+ applymovement GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL, UndergroundRivalRetreatMovement2
playsound SFX_EXIT_BUILDING
- disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ disappear GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
setscene SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_NOOP
waitsfx
playmapmusic
end
-UndergroundSilverBattleScript:
+UndergroundRivalBattleScript:
checkevent EVENT_RIVAL_BURNED_TOWER
iftrue .Continue
setevent EVENT_RIVAL_BURNED_TOWER
@@ -163,7 +163,7 @@
.Continue:
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
- writetext UndergroundSilverBeforeText
+ writetext UndergroundRivalBeforeText
waitbutton
closetext
setevent EVENT_RIVAL_GOLDENROD_UNDERGROUND
@@ -171,8 +171,8 @@
iftrue .Totodile
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue .Chikorita
- winlosstext UndergroundSilverWinText, UndergroundSilverLossText
- setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ winlosstext UndergroundRivalWinText, UndergroundRivalLossText
+ setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
loadtrainer RIVAL1, RIVAL1_4_TOTODILE
startbattle
dontrestartmapmusic
@@ -180,8 +180,8 @@
sjump .FinishRivalBattle
.Totodile:
- winlosstext UndergroundSilverWinText, UndergroundSilverLossText
- setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ winlosstext UndergroundRivalWinText, UndergroundRivalLossText
+ setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
loadtrainer RIVAL1, RIVAL1_4_CHIKORITA
startbattle
dontrestartmapmusic
@@ -189,8 +189,8 @@
sjump .FinishRivalBattle
.Chikorita:
- winlosstext UndergroundSilverWinText, UndergroundSilverLossText
- setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_SILVER
+ winlosstext UndergroundRivalWinText, UndergroundRivalLossText
+ setlasttalked GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL
loadtrainer RIVAL1, RIVAL1_4_CYNDAQUIL
startbattle
dontrestartmapmusic
@@ -200,7 +200,7 @@
.FinishRivalBattle:
playmusic MUSIC_RIVAL_AFTER
opentext
- writetext UndergroundSilverAfterText
+ writetext UndergroundRivalAfterText
waitbutton
closetext
end
@@ -635,7 +635,7 @@
GoldenrodUndergroundSwitchRoomEntrancesHiddenRevive:
hiddenitem REVIVE, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_HIDDEN_REVIVE
-UndergroundSilverApproachMovement1:
+UndergroundRivalApproachMovement1:
step DOWN
step LEFT
step LEFT
@@ -642,7 +642,7 @@
step LEFT
step_end
-UndergroundSilverApproachMovement2:
+UndergroundRivalApproachMovement2:
step DOWN
step DOWN
step LEFT
@@ -650,7 +650,7 @@
step LEFT
step_end
-UndergroundSilverRetreatMovement1:
+UndergroundRivalRetreatMovement1:
step RIGHT
step RIGHT
step RIGHT
@@ -657,7 +657,7 @@
step UP
step_end
-UndergroundSilverRetreatMovement2:
+UndergroundRivalRetreatMovement2:
step RIGHT
step RIGHT
step RIGHT
@@ -665,7 +665,7 @@
step UP
step_end
-UndergroundSilverBeforeText:
+UndergroundRivalBeforeText:
text "Hold it!"
para "I saw you, so I"
@@ -688,7 +688,7 @@
line "debts!"
done
-UndergroundSilverWinText:
+UndergroundRivalWinText:
text "…Why…"
line "Why do I lose?"
@@ -701,7 +701,7 @@
para "So why do I lose?"
done
-UndergroundSilverAfterText:
+UndergroundRivalAfterText:
text "…I don't under-"
line "stand…"
@@ -737,7 +737,7 @@
line "#MON trainer!"
done
-UndergroundSilverLossText:
+UndergroundRivalLossText:
text "Humph. This is my"
line "real power, wimp."
@@ -944,8 +944,8 @@
warp_event 21, 29, GOLDENROD_CITY, 13
def_coord_events
- coord_event 19, 4, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE, UndergroundSilverScene1
- coord_event 19, 5, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE, UndergroundSilverScene2
+ coord_event 19, 4, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE, UndergroundRivalScene1
+ coord_event 19, 5, SCENE_GOLDENRODUNDERGROUNDSWITCHROOMENTRANCES_RIVAL_BATTLE, UndergroundRivalScene2
def_bg_events
bg_event 16, 1, BGEVENT_READ, Switch1Script
@@ -966,4 +966,4 @@
object_event 19, 27, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, GoldenrodUndergroundSwitchRoomEntrancesSuperNerdScript, -1
object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesSmokeBall, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_SMOKE_BALL
object_event 14, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, GoldenrodUndergroundSwitchRoomEntrancesFullHeal, EVENT_GOLDENROD_UNDERGROUND_SWITCH_ROOM_ENTRANCES_FULL_HEAL
- object_event 23, 3, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
+ object_event 23, 3, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_GOLDENROD_UNDERGROUND
--- a/maps/IndigoPlateauPokecenter1F.asm
+++ b/maps/IndigoPlateauPokecenter1F.asm
@@ -2,7 +2,7 @@
const INDIGOPLATEAUPOKECENTER1F_NURSE
const INDIGOPLATEAUPOKECENTER1F_CLERK
const INDIGOPLATEAUPOKECENTER1F_COOLTRAINER_M
- const INDIGOPLATEAUPOKECENTER1F_SILVER
+ const INDIGOPLATEAUPOKECENTER1F_RIVAL
const INDIGOPLATEAUPOKECENTER1F_GRAMPS
const INDIGOPLATEAUPOKECENTER1F_ABRA
@@ -52,13 +52,13 @@
ifequal THURSDAY, PlateauRivalScriptDone
ifequal FRIDAY, PlateauRivalScriptDone
ifequal SATURDAY, PlateauRivalScriptDone
- moveobject INDIGOPLATEAUPOKECENTER1F_SILVER, 17, 9
- appear INDIGOPLATEAUPOKECENTER1F_SILVER
+ moveobject INDIGOPLATEAUPOKECENTER1F_RIVAL, 17, 9
+ appear INDIGOPLATEAUPOKECENTER1F_RIVAL
turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
- applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement1
+ applymovement INDIGOPLATEAUPOKECENTER1F_RIVAL, PlateauRivalMovement1
playmusic MUSIC_RIVAL_ENCOUNTER
turnobject PLAYER, RIGHT
sjump PlateauRivalBattleCommon
@@ -74,12 +74,12 @@
ifequal THURSDAY, PlateauRivalScriptDone
ifequal FRIDAY, PlateauRivalScriptDone
ifequal SATURDAY, PlateauRivalScriptDone
- appear INDIGOPLATEAUPOKECENTER1F_SILVER
+ appear INDIGOPLATEAUPOKECENTER1F_RIVAL
turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
- applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalMovement2
+ applymovement INDIGOPLATEAUPOKECENTER1F_RIVAL, PlateauRivalMovement2
playmusic MUSIC_RIVAL_ENCOUNTER
turnobject PLAYER, LEFT
PlateauRivalBattleCommon:
@@ -94,7 +94,7 @@
iftrue .Chikorita
; Cyndaquil
winlosstext PlateauRivalWinText, PlateauRivalLoseText
- setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER
+ setlasttalked INDIGOPLATEAUPOKECENTER1F_RIVAL
loadtrainer RIVAL2, RIVAL2_2_TOTODILE
startbattle
dontrestartmapmusic
@@ -103,7 +103,7 @@
.Totodile:
winlosstext PlateauRivalWinText, PlateauRivalLoseText
- setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER
+ setlasttalked INDIGOPLATEAUPOKECENTER1F_RIVAL
loadtrainer RIVAL2, RIVAL2_2_CHIKORITA
startbattle
dontrestartmapmusic
@@ -112,7 +112,7 @@
.Chikorita:
winlosstext PlateauRivalWinText, PlateauRivalLoseText
- setlasttalked INDIGOPLATEAUPOKECENTER1F_SILVER
+ setlasttalked INDIGOPLATEAUPOKECENTER1F_RIVAL
loadtrainer RIVAL2, RIVAL2_2_CYNDAQUIL
startbattle
dontrestartmapmusic
@@ -126,8 +126,8 @@
waitbutton
closetext
turnobject PLAYER, DOWN
- applymovement INDIGOPLATEAUPOKECENTER1F_SILVER, PlateauRivalLeavesMovement
- disappear INDIGOPLATEAUPOKECENTER1F_SILVER
+ applymovement INDIGOPLATEAUPOKECENTER1F_RIVAL, PlateauRivalLeavesMovement
+ disappear INDIGOPLATEAUPOKECENTER1F_RIVAL
setscene SCENE_INDIGOPLATEAUPOKECENTER1F_RIVAL_BATTLE
playmapmusic
setflag ENGINE_INDIGO_PLATEAU_RIVAL_FIGHT
@@ -319,6 +319,6 @@
object_event 3, 7, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FNurseScript, -1
object_event 11, 7, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FClerkScript, -1
object_event 11, 11, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, IndigoPlateauPokecenter1FCooltrainerMScript, -1
- object_event 16, 9, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
+ object_event 16, 9, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_INDIGO_PLATEAU_POKECENTER_RIVAL
object_event 1, 9, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, TeleportGuyScript, EVENT_TELEPORT_GUY
object_event 0, 9, SPRITE_JYNX, SPRITEMOVEDATA_POKEMON, 0, 0, -1, -1, PAL_NPC_BROWN, OBJECTTYPE_SCRIPT, 0, AbraScript, EVENT_TELEPORT_GUY
--- a/maps/MountMoon.asm
+++ b/maps/MountMoon.asm
@@ -1,5 +1,5 @@
object_const_def
- const MOUNTMOON_SILVER
+ const MOUNTMOON_RIVAL
MountMoon_MapScripts:
def_scene_scripts
@@ -20,10 +20,10 @@
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
@@ -30,8 +30,8 @@
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 @@
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 @@
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 @@
.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 @@
step DOWN
step_end
-MountMoonSilverTextBefore:
+MountMoonRivalTextBefore:
text "<……> <……> <……>"
para "It's been a while,"
@@ -105,7 +105,7 @@
line "show you!"
done
-MountMoonSilverTextWin:
+MountMoonRivalTextWin:
text "<……> <……> <……>"
para "I thought I raised"
@@ -118,7 +118,7 @@
line "wasn't enough…"
done
-MountMoonSilverTextAfter:
+MountMoonRivalTextAfter:
text "<……> <……> <……>"
para "…You won, fair"
@@ -144,7 +144,7 @@
line "beating you."
done
-MountMoonSilverTextLoss:
+MountMoonRivalTextLoss:
text "<……> <……> <……>"
para "I've repaid my"
@@ -176,4 +176,4 @@
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
--- a/maps/NewBarkTown.asm
+++ b/maps/NewBarkTown.asm
@@ -1,7 +1,7 @@
object_const_def
const NEWBARKTOWN_TEACHER
const NEWBARKTOWN_FISHER
- const NEWBARKTOWN_SILVER
+ const NEWBARKTOWN_RIVAL
NewBarkTown_MapScripts:
def_scene_scripts
@@ -104,25 +104,25 @@
NewBarkTownFisherScript:
jumptextfaceplayer Text_ElmDiscoveredNewMon
-NewBarkTownSilverScript:
+NewBarkTownRivalScript:
opentext
writetext NewBarkTownRivalText1
waitbutton
closetext
- turnobject NEWBARKTOWN_SILVER, LEFT
+ turnobject NEWBARKTOWN_RIVAL, LEFT
opentext
writetext NewBarkTownRivalText2
waitbutton
closetext
- follow PLAYER, NEWBARKTOWN_SILVER
- applymovement PLAYER, NewBarkTown_SilverPushesYouAwayMovement
+ follow PLAYER, NEWBARKTOWN_RIVAL
+ applymovement PLAYER, NewBarkTown_RivalPushesYouAwayMovement
stopfollow
pause 5
- turnobject NEWBARKTOWN_SILVER, DOWN
+ turnobject NEWBARKTOWN_RIVAL, DOWN
pause 5
playsound SFX_TACKLE
- applymovement PLAYER, NewBarkTown_SilverShovesYouOutMovement
- applymovement NEWBARKTOWN_SILVER, NewBarkTown_SilverReturnsToTheShadowsMovement
+ applymovement PLAYER, NewBarkTown_RivalShovesYouOutMovement
+ applymovement NEWBARKTOWN_RIVAL, NewBarkTown_RivalReturnsToTheShadowsMovement
end
NewBarkTownSign:
@@ -170,12 +170,12 @@
turn_head LEFT
step_end
-NewBarkTown_SilverPushesYouAwayMovement:
+NewBarkTown_RivalPushesYouAwayMovement:
turn_head UP
step DOWN
step_end
-NewBarkTown_SilverShovesYouOutMovement:
+NewBarkTown_RivalShovesYouOutMovement:
turn_head UP
fix_facing
jump_step DOWN
@@ -182,7 +182,7 @@
remove_fixed_facing
step_end
-NewBarkTown_SilverReturnsToTheShadowsMovement:
+NewBarkTown_RivalReturnsToTheShadowsMovement:
step RIGHT
step_end
@@ -301,4 +301,4 @@
def_object_events
object_event 6, 8, SPRITE_TEACHER, SPRITEMOVEDATA_SPINRANDOM_SLOW, 1, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownTeacherScript, -1
object_event 12, 9, SPRITE_FISHER, SPRITEMOVEDATA_WALK_UP_DOWN, 0, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, NewBarkTownFisherScript, -1
- object_event 3, 2, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownSilverScript, EVENT_RIVAL_NEW_BARK_TOWN
+ object_event 3, 2, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, NewBarkTownRivalScript, EVENT_RIVAL_NEW_BARK_TOWN
--- a/maps/SlowpokeWellB1F.asm
+++ b/maps/SlowpokeWellB1F.asm
@@ -54,7 +54,7 @@
waitbutton
closetext
setevent EVENT_CLEARED_SLOWPOKE_WELL
- variablesprite SPRITE_AZALEA_ROCKET, SPRITE_SILVER
+ variablesprite SPRITE_AZALEA_ROCKET, SPRITE_RIVAL
setmapscene AZALEA_TOWN, SCENE_AZALEATOWN_RIVAL_BATTLE
clearevent EVENT_ILEX_FOREST_APPRENTICE
clearevent EVENT_ILEX_FOREST_FARFETCHD
--- a/maps/SproutTower3F.asm
+++ b/maps/SproutTower3F.asm
@@ -5,7 +5,7 @@
const SPROUTTOWER3F_SAGE4
const SPROUTTOWER3F_POKE_BALL1
const SPROUTTOWER3F_POKE_BALL2
- const SPROUTTOWER3F_SILVER
+ const SPROUTTOWER3F_RIVAL
SproutTower3F_MapScripts:
def_scene_scripts
@@ -32,21 +32,21 @@
playsound SFX_ELEVATOR
earthquake 79
applymovement PLAYER, SproutTower3FPlayerApproachesRivalMovement
- applymovement SPROUTTOWER3F_SILVER, SproutTower3FRivalApproachesElderMovement
+ applymovement SPROUTTOWER3F_RIVAL, SproutTower3FRivalApproachesElderMovement
opentext
writetext SproutTowerElderLecturesRivalText
waitbutton
closetext
- showemote EMOTE_SHOCK, SPROUTTOWER3F_SILVER, 15
- turnobject SPROUTTOWER3F_SILVER, DOWN
+ showemote EMOTE_SHOCK, SPROUTTOWER3F_RIVAL, 15
+ turnobject SPROUTTOWER3F_RIVAL, DOWN
pause 15
- applymovement SPROUTTOWER3F_SILVER, SproutTower3FRivalLeavesElderMovement
+ applymovement SPROUTTOWER3F_RIVAL, SproutTower3FRivalLeavesElderMovement
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
writetext SproutTowerRivalOnlyCareAboutStrongText
waitbutton
closetext
- turnobject SPROUTTOWER3F_SILVER, UP
+ turnobject SPROUTTOWER3F_RIVAL, UP
opentext
writetext SproutTowerRivalUsedEscapeRopeText
pause 15
@@ -54,7 +54,7 @@
playsound SFX_WARP_TO
special FadeBlackQuickly
special ReloadSpritesNoPalettes
- disappear SPROUTTOWER3F_SILVER
+ disappear SPROUTTOWER3F_RIVAL
waitsfx
special FadeInQuickly
setscene SCENE_SPROUTTOWER3F_NOOP
@@ -351,4 +351,4 @@
object_event 11, 11, SPRITE_SAGE, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerSageNeal, -1
object_event 6, 14, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FPotion, EVENT_SPROUT_TOWER_3F_POTION
object_event 14, 1, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, SproutTower3FEscapeRope, EVENT_SPROUT_TOWER_3F_ESCAPE_ROPE
- object_event 10, 4, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
+ object_event 10, 4, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_SPROUT_TOWER
--- a/maps/TeamRocketBaseB3F.asm
+++ b/maps/TeamRocketBaseB3F.asm
@@ -7,7 +7,7 @@
const TEAMROCKETBASEB3F_SCIENTIST1
const TEAMROCKETBASEB3F_SCIENTIST2
const TEAMROCKETBASEB3F_ROCKET3
- const TEAMROCKETBASEB3F_SILVER
+ const TEAMROCKETBASEB3F_RIVAL
const TEAMROCKETBASEB3F_POKE_BALL1
const TEAMROCKETBASEB3F_POKE_BALL2
const TEAMROCKETBASEB3F_POKE_BALL3
@@ -65,8 +65,8 @@
turnobject PLAYER, LEFT
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
- appear TEAMROCKETBASEB3F_SILVER
- applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalEnterMovement
+ appear TEAMROCKETBASEB3F_RIVAL
+ applymovement TEAMROCKETBASEB3F_RIVAL, RocketBaseRivalEnterMovement
turnobject PLAYER, LEFT
playmusic MUSIC_RIVAL_ENCOUNTER
opentext
@@ -75,8 +75,8 @@
closetext
playsound SFX_TACKLE
applymovement PLAYER, RocketBaseRivalShovesPlayerMovement
- applymovement TEAMROCKETBASEB3F_SILVER, RocketBaseRivalLeavesMovement
- disappear TEAMROCKETBASEB3F_SILVER
+ applymovement TEAMROCKETBASEB3F_RIVAL, RocketBaseRivalLeavesMovement
+ disappear TEAMROCKETBASEB3F_RIVAL
setscene SCENE_TEAMROCKETBASEB3F_ROCKET_BOSS
special RestartMapMusic
end
@@ -598,7 +598,7 @@
object_event 23, 11, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 0, TrainerScientistRoss, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 11, 15, SPRITE_SCIENTIST, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_TRAINER, 3, TrainerScientistMitch, EVENT_TEAM_ROCKET_BASE_POPULATION
object_event 24, 14, SPRITE_ROCKET, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, TeamRocketBaseB3FRocketScript, EVENT_TEAM_ROCKET_BASE_POPULATION
- object_event 4, 5, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
+ object_event 4, 5, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_TEAM_ROCKET_BASE
object_event 1, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FProtein, EVENT_TEAM_ROCKET_BASE_B3F_PROTEIN
object_event 3, 12, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FXSpecial, EVENT_TEAM_ROCKET_BASE_B3F_X_SPECIAL
object_event 28, 9, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, TeamRocketBaseB3FFullHeal, EVENT_TEAM_ROCKET_BASE_B3F_FULL_HEAL
--- a/maps/VictoryRoad.asm
+++ b/maps/VictoryRoad.asm
@@ -1,5 +1,5 @@
object_const_def
- const VICTORYROAD_SILVER
+ const VICTORYROAD_RIVAL
const VICTORYROAD_POKE_BALL1
const VICTORYROAD_POKE_BALL2
const VICTORYROAD_POKE_BALL3
@@ -20,16 +20,16 @@
end
VictoryRoadRivalLeft:
- moveobject VICTORYROAD_SILVER, 18, 11
+ moveobject VICTORYROAD_RIVAL, 18, 11
turnobject PLAYER, DOWN
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
- appear VICTORYROAD_SILVER
- applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleApproachMovement1
+ appear VICTORYROAD_RIVAL
+ applymovement VICTORYROAD_RIVAL, VictoryRoadRivalBattleApproachMovement1
scall VictoryRoadRivalNext
- applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement1
- disappear VICTORYROAD_SILVER
+ applymovement VICTORYROAD_RIVAL, VictoryRoadRivalBattleExitMovement1
+ disappear VICTORYROAD_RIVAL
setscene SCENE_VICTORYROAD_NOOP
playmapmusic
end
@@ -39,11 +39,11 @@
showemote EMOTE_SHOCK, PLAYER, 15
special FadeOutMusic
pause 15
- appear VICTORYROAD_SILVER
- applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleApproachMovement2
+ appear VICTORYROAD_RIVAL
+ applymovement VICTORYROAD_RIVAL, VictoryRoadRivalBattleApproachMovement2
scall VictoryRoadRivalNext
- applymovement VICTORYROAD_SILVER, VictoryRoadRivalBattleExitMovement2
- disappear VICTORYROAD_SILVER
+ applymovement VICTORYROAD_RIVAL, VictoryRoadRivalBattleExitMovement2
+ disappear VICTORYROAD_RIVAL
setscene SCENE_VICTORYROAD_NOOP
playmapmusic
end
@@ -61,7 +61,7 @@
checkevent EVENT_GOT_CHIKORITA_FROM_ELM
iftrue .GotChikorita
winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
- setlasttalked VICTORYROAD_SILVER
+ setlasttalked VICTORYROAD_RIVAL
loadtrainer RIVAL1, RIVAL1_5_TOTODILE
startbattle
dontrestartmapmusic
@@ -70,7 +70,7 @@
.GotTotodile:
winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
- setlasttalked VICTORYROAD_SILVER
+ setlasttalked VICTORYROAD_RIVAL
loadtrainer RIVAL1, RIVAL1_5_CHIKORITA
startbattle
dontrestartmapmusic
@@ -79,7 +79,7 @@
.GotChikorita:
winlosstext VictoryRoadRivalDefeatText, VictoryRoadRivalVictoryText
- setlasttalked VICTORYROAD_SILVER
+ setlasttalked VICTORYROAD_RIVAL
loadtrainer RIVAL1, RIVAL1_5_CYNDAQUIL
startbattle
dontrestartmapmusic
@@ -260,7 +260,7 @@
bg_event 3, 65, BGEVENT_ITEM, VictoryRoadHiddenFullHeal
def_object_events
- object_event 18, 13, SPRITE_SILVER, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
+ object_event 18, 13, SPRITE_RIVAL, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, ObjectEvent, EVENT_RIVAL_VICTORY_ROAD
object_event 3, 28, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadTMEarthquake, EVENT_VICTORY_ROAD_TM_EARTHQUAKE
object_event 12, 48, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadMaxRevive, EVENT_VICTORY_ROAD_MAX_REVIVE
object_event 18, 29, SPRITE_POKE_BALL, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_ITEMBALL, 0, VictoryRoadFullRestore, EVENT_VICTORY_ROAD_FULL_RESTORE