SONY -> RIVAL

engine/battle/core.asm

@@ -921,7 +921,7 @@ TrainerBattleVictory:
 	ld b, MUSIC_DEFEATED_TRAINER
 .gymleader
 	ld a, [wTrainerClass]
-	cp SONY3 ; final battle against rival
+	cp RIVAL3 ; final battle against rival
 	jr nz, .notrival
 	ld b, MUSIC_DEFEATED_GYM_LEADER
 	ld hl, wFlags_D733
@@ -1134,7 +1134,7 @@ HandlePlayerBlackOut:
 	cp LINK_STATE_BATTLING
 	jr z, .notSony1Battle
 	ld a, [wCurOpponent]
-	cp OPP_SONY1
+	cp OPP_RIVAL1
 	jr nz, .notSony1Battle
 	hlcoord 0, 0  ; sony 1 battle
 	lb bc, 8, 21

engine/battle/get_trainer_name.asm

@@ -5,11 +5,11 @@ GetTrainerName_::
 	jr nz, .foundName
 	ld hl, wRivalName
 	ld a, [wTrainerClass]
-	cp SONY1
+	cp RIVAL1
 	jr z, .foundName
-	cp SONY2
+	cp RIVAL2
 	jr z, .foundName
-	cp SONY3
+	cp RIVAL3
 	jr z, .foundName
 	ld [wd0b5], a
 	ld a, TRAINER_NAME

engine/battle/read_trainer_party.asm

@@ -116,7 +116,7 @@ ReadTrainer:
 
 ; no matches found. is this trainer champion rival?
 	ld a, b
-	cp SONY3
+	cp RIVAL3
 	jr z, .ChampionRival
 	jr .FinishUp ; nope
 .GiveTeamMoves

engine/link/cable_club.asm

@@ -274,7 +274,7 @@ CableClub_DoBattleOrTradeAgain:
 	jr nz, .trading
 	ld a, LINK_STATE_BATTLING
 	ld [wLinkState], a
-	ld a, OPP_SONY1
+	ld a, OPP_RIVAL1
 	ld [wCurOpponent], a
 	call ClearScreen
 	call Delay3

engine/overworld/auto_movement.asm

@@ -286,7 +286,7 @@ FreezeEnemyTrainerSprite::
 	jp SetSpriteMovementBytesToFF
 
 RivalIDs:
-	db OPP_SONY1
-	db OPP_SONY2
-	db OPP_SONY3
+	db OPP_RIVAL1
+	db OPP_RIVAL2
+	db OPP_RIVAL3
 	db -1 ; end