From 62059aafd56a3f975d30072052ea453a2c9cd9ba Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Mon, 12 Jun 2023 12:48:08 +0100
Subject: [PATCH] Bug fixes

- Fixes a bug where the Game Corner poster would pretend to be an Arbok. Very effective disguise.
- Fixes some text in Celadon University that would simply look odd. I need to use hyphens more, the rest of the game does it!
- Decapitalised the "normal-type" in Viridian Pre-Gym to match the rest of the game.
- Changed some SFX cues to use the level-up sound, but it's clearly crysaudio that causes this. Will talk with Dannye.
---
 data/maps/objects/GameCorner.asm  | 4 ++--
 engine/menus/party_menu.asm       | 2 +-
 engine/pokemon/learn_move.asm     | 2 +-
 scripts/GameCorner.asm            | 4 ++--
 text/CeladonUniversityInside.asm  | 9 ++++-----
 text/CeladonUniversityOutside.asm | 4 ++--
 text/ViridianPreGym.asm           | 4 ++--
 7 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/data/maps/objects/GameCorner.asm b/data/maps/objects/GameCorner.asm
index d84f5ab3..4c91b9e1 100644
--- a/data/maps/objects/GameCorner.asm
+++ b/data/maps/objects/GameCorner.asm
@@ -7,7 +7,7 @@ GameCorner_Object:
 	warp_event 17,  4, ROCKET_HIDEOUT_B1F, 2
 
 	def_bg_events
-	bg_event  9,  4, 12 ; CeladonGameCornerText12
+	bg_event  9,  4, 13 ; CeladonGameCornerText12
 
 	def_object_events
 	object_event  2,  6, SPRITE_BEAUTY, STAY, DOWN, 1 ; person
@@ -21,6 +21,6 @@ GameCorner_Object:
 	object_event 14, 11, SPRITE_CLERK, STAY, LEFT, 9 ; person
 	object_event 17, 13, SPRITE_GENTLEMAN, STAY, RIGHT, 10 ; person
 	object_event  9,  5, SPRITE_ROCKET, STAY, UP, 11, OPP_ROCKET, 7
-	object_event  6,  6, SPRITE_ARBOK, STAY, DOWN, 14 ; Arbok attendant
+	object_event  6,  6, SPRITE_ARBOK, STAY, DOWN, 12 ; Arbok attendant
 
 	def_warps_to GAME_CORNER
diff --git a/engine/menus/party_menu.asm b/engine/menus/party_menu.asm
index ecfa7288..c8410cb7 100644
--- a/engine/menus/party_menu.asm
+++ b/engine/menus/party_menu.asm
@@ -334,7 +334,7 @@ ReviveText:
 
 RareCandyText:
 	text_far _RareCandyText
-	sound_get_item_1 ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
+	sound_level_up ; probably supposed to play SFX_LEVEL_UP but the wrong music bank is loaded
 	text_promptbutton
 	text_end
 
diff --git a/engine/pokemon/learn_move.asm b/engine/pokemon/learn_move.asm
index 0377caa4..d5cca8fc 100644
--- a/engine/pokemon/learn_move.asm
+++ b/engine/pokemon/learn_move.asm
@@ -185,7 +185,7 @@ TryingToLearn:
 
 LearnedMove1Text:
 	text_far _LearnedMove1Text
-	sound_get_item_1 ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle
+	sound_level_up ; plays SFX_GET_ITEM_1 in the party menu (rare candy) and plays SFX_LEVEL_UP in battle
 	text_promptbutton
 	text_end
 
diff --git a/scripts/GameCorner.asm b/scripts/GameCorner.asm
index e14cb927..a509a724 100644
--- a/scripts/GameCorner.asm
+++ b/scripts/GameCorner.asm
@@ -56,7 +56,7 @@ CeladonGameCornerScript1:
 	jp z, CeladonGameCornerScript_48c07
 	ld a, $f0
 	ld [wJoyIgnore], a
-	ld a, $d
+	ld a, $e ; was d, accounting for arbok
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
 	ld a, $b
@@ -128,9 +128,9 @@ GameCorner_TextPointers:
 	dw CeladonGameCornerText9
 	dw CeladonGameCornerText10
 	dw CeladonGameCornerText11
+	dw GameCornerArbok
 	dw CeladonGameCornerText12
 	dw CeladonGameCornerText13
-	dw GameCornerArbok
 
 CeladonGameCornerText1:
 	text_far _CeladonGameCornerText1
diff --git a/text/CeladonUniversityInside.asm b/text/CeladonUniversityInside.asm
index cf5b247f..a82faa07 100644
--- a/text/CeladonUniversityInside.asm
+++ b/text/CeladonUniversityInside.asm
@@ -63,8 +63,8 @@ _BookcaseText1::
 _BookcaseText2::
 	text "In 1899, PROF."
 	line "WESTWOOD of Japan"
-	cont "discovered"
-	cont "#MON evolution,"
+	cont "discovered #-"
+	cont "MON evolution,"
 	cont "documenting 50"
 	cont "species."
 	
@@ -90,9 +90,8 @@ _BookcaseText3::
 	text "The modern #"
 	line "BALL was made by"
 	cont "researchers at"
-	cont "CELADON"
-	cont "UNIVERSITY"
-	cont "in 1925."
+	cont "CELADON UNIVER-"
+	cont "SITY in 1925."
 	
 	done
 
diff --git a/text/CeladonUniversityOutside.asm b/text/CeladonUniversityOutside.asm
index f9bfec35..7123a7a2 100644
--- a/text/CeladonUniversityOutside.asm
+++ b/text/CeladonUniversityOutside.asm
@@ -44,8 +44,8 @@ _CeladonUniversityOutsideLoseText3::
 
 _CeladonUniversityOutsideLoseText4::
 	text "One"
-	line "day I'll"
-	cont "beat you!"
+	line "day I'll beat"
+	cont "you!"
 	prompt
 
 _CeladonUniversityOutsideWinText::
diff --git a/text/ViridianPreGym.asm b/text/ViridianPreGym.asm
index e2dd860b..7070995d 100644
--- a/text/ViridianPreGym.asm
+++ b/text/ViridianPreGym.asm
@@ -65,7 +65,7 @@ _YujirouAfterBattleText2::
 	para "..."
 	
 	para "I had all the"
-	line "best NORMAL-"
+	line "best normal-"
 	cont "type #MON."
 	
 	para "Maybe it's me?"
@@ -75,7 +75,7 @@ _YujirouAfterBattleText2::
 _ViridianPreGymBattleText1::
 	text "Did you know that"
 	line "the best #MON"
-	cont "are NORMAL-type?"
+	cont "are normal-type?"
 	done
 
 _ViridianPreGymEndBattleText1::