From 13d4d533f7c5904391309e72f4b7937210b1c476 Mon Sep 17 00:00:00 2001
From: Rangi <remy.oukaour+rangi42@gmail.com>
Date: Fri, 6 Nov 2020 10:33:58 -0500
Subject: Sync more with pokeyellow

---
 engine/battle/core.asm               | 14 +++++++-------
 engine/battle/trainer_ai.asm         |  4 ++--
 engine/overworld/healing_machine.asm |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'engine')

diff --git a/engine/battle/core.asm b/engine/battle/core.asm
index 30ff68bc..c524d111 100755
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -1132,22 +1132,22 @@ ChooseNextMon:
 HandlePlayerBlackOut:
 	ld a, [wLinkState]
 	cp LINK_STATE_BATTLING
-	jr z, .notSony1Battle
+	jr z, .notRival1Battle
 	ld a, [wCurOpponent]
 	cp OPP_RIVAL1
-	jr nz, .notSony1Battle
-	hlcoord 0, 0  ; sony 1 battle
+	jr nz, .notRival1Battle
+	hlcoord 0, 0  ; rival 1 battle
 	lb bc, 8, 21
 	call ClearScreenArea
 	call ScrollTrainerPicAfterBattle
 	ld c, 40
 	call DelayFrames
-	ld hl, Sony1WinText
+	ld hl, Rival1WinText
 	call PrintText
 	ld a, [wCurMap]
 	cp OAKS_LAB
 	ret z            ; starter battle in oak's lab: don't black out
-.notSony1Battle
+.notRival1Battle
 	ld b, SET_PAL_BATTLE_BLACK
 	call RunPaletteCommand
 	ld hl, PlayerBlackedOutText2
@@ -1164,8 +1164,8 @@ HandlePlayerBlackOut:
 	scf
 	ret
 
-Sony1WinText:
-	text_far _Sony1WinText
+Rival1WinText:
+	text_far _Rival1WinText
 	text_end
 
 PlayerBlackedOutText2:
diff --git a/engine/battle/trainer_ai.asm b/engine/battle/trainer_ai.asm
index 0de67f42..d70f98a1 100644
--- a/engine/battle/trainer_ai.asm
+++ b/engine/battle/trainer_ai.asm
@@ -394,7 +394,7 @@ SabrinaAI:
 	ret nc
 	jp AIUseHyperPotion
 
-Sony2AI:
+Rival2AI:
 	cp 13 percent - 1
 	ret nc
 	ld a, 5
@@ -402,7 +402,7 @@ Sony2AI:
 	ret nc
 	jp AIUsePotion
 
-Sony3AI:
+Rival3AI:
 	cp 13 percent - 1
 	ret nc
 	ld a, 5
diff --git a/engine/overworld/healing_machine.asm b/engine/overworld/healing_machine.asm
index 40ca6f65..62abc7ee 100755
--- a/engine/overworld/healing_machine.asm
+++ b/engine/overworld/healing_machine.asm
@@ -35,7 +35,7 @@ AnimateHealingMachine:
 	dec b
 	jr nz, .partyLoop
 	ld a, [wAudioROMBank]
-	cp BANK(Audio3_UpdateMusic)
+	cp BANK("Audio Engine 3")
 	ld [wAudioSavedROMBank], a
 	jr nz, .next
 	ld a, SFX_STOP_ALL_MUSIC
-- 
cgit v1.3.1-sl0p