From 2299dcdc0e7853caf337d4f654547b572d152a36 Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Thu, 6 Apr 2023 02:22:34 +0100
Subject: [PATCH] Bug fixes from playtest

- Puts back Channelers to allow progress for now; currently goes to undefined places
- Tweaked two trainer parties with odd mons
- Jessie/James sprite in proper place
- Put little girl text back because it caused a problem
- One Celadon Gym cut tree removed to allow cut-less progress
- Fixed the rival picking the wrong team vs eevee
- Fixed the rival loading wrong in s.s. anne
---
 data/maps/objects/SSAnne2F.asm         |   2 +-
 data/trainers/parties.asm              |  26 ++++++++++++-------------
 {data => gfx}/trainers/jessiejames.png | Bin
 maps/CeladonGym.blk                    |   2 +-
 scripts/PokemonTower2F.asm             |   4 ++--
 text/CeladonMartRoof.asm               |   4 ++--
 6 files changed, 19 insertions(+), 19 deletions(-)
 rename {data => gfx}/trainers/jessiejames.png (100%)

diff --git a/data/maps/objects/SSAnne2F.asm b/data/maps/objects/SSAnne2F.asm
index cfd93189..53ec755f 100644
--- a/data/maps/objects/SSAnne2F.asm
+++ b/data/maps/objects/SSAnne2F.asm
@@ -16,6 +16,6 @@ SSAnne2F_Object:
 
 	def_object_events
 	object_event  3,  7, SPRITE_WAITER, WALK, UP_DOWN, 1 ; person
-	object_event 36,  4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL1, 1
+	object_event 36,  4, SPRITE_BLUE, STAY, DOWN, 2, OPP_RIVAL2, 1
 
 	def_warps_to SS_ANNE_2F
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index 8d7a6d38..2579863c 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -92,13 +92,13 @@ BugCatcherData:
 	db 9, WEEDLE, KAKUNA, CATERPIE, METAPOD, 0
 	db 11, CATERPIE, METAPOD, 0
 ; Mt. Moon 1F
-	db 11, PARA, PARAS, 0
+	db 12, PARA, PARAS, 0
 	db 10, CATERPIE, METAPOD, PARA, 0
 ; Route 24
 	db 14, CATERPIE, WEEDLE, 0
 ; Route 6
 	db 16, WEEDLE, CATERPIE, WEEDLE, 0
-	db 20, BUTTERFREE, 0 ; this is that one boss fight-like one
+	db 17, BUTTERFREE, 0 ; this is that one boss fight-like one, levelled down for learnset reasons
 ; Unused - this will be used in the Silph Gauntlet
 	db 62, SCIZOR, BEEDRILL, PARASECT, VENOMOTH, PURAKKUSU, KLEAVOR, 0
 ; Route 9
@@ -625,10 +625,10 @@ GentlemanData:
 
 ChannelerData:
 ; Unused
-;	db 22, GASTLY, 0
-;	db 24, GASTLY, 0
-;	db 23, GASTLY, GASTLY, 0
-;	db 24, GASTLY, 0
+	db 22, GASTLY, 0
+	db 24, GASTLY, 0
+	db 23, GASTLY, GASTLY, 0
+	db 24, GASTLY, 0
 ; Pokémon Tower 3F
 	db 23, MIKON, GASTLY, 0
 	db 24, VULPIX, 0
@@ -640,19 +640,19 @@ ChannelerData:
 	db 24, GASTLY, 0
 	db 23, GASTLY, GASTLY, 0
 ; Unused
-;	db 24, GASTLY, 0
+	db 24, GASTLY, 0
 ; Pokémon Tower 4F, now unused 
-;	db 22, GASTLY, 0
+	db 22, GASTLY, 0
 ; Unused
 ;	db 24, GASTLY, 0
 ; Pokémon Tower 5F, now unused 
-;	db 23, HAUNTER, 0
+	db 23, HAUNTER, 0
 ; Unused
-;	db 24, GASTLY, 0
+	db 24, GASTLY, 0
 ; Pokémon Tower 5F, now unused 
-;	db 22, GASTLY, 0
-;	db 24, GASTLY, 0
-;	db 22, HAUNTER, 0
+	db 22, GASTLY, 0
+	db 24, GASTLY, 0
+	db 22, HAUNTER, 0
 ; Pokémon Tower 6F
 	db 22, GASTLY, CUBONE, HAUNTER, 0
 	db 24, GASTLY, VULPIX, 0
diff --git a/data/trainers/jessiejames.png b/gfx/trainers/jessiejames.png
similarity index 100%
rename from data/trainers/jessiejames.png
rename to gfx/trainers/jessiejames.png
diff --git a/maps/CeladonGym.blk b/maps/CeladonGym.blk
index dcecc50c..c330efcd 100644
--- a/maps/CeladonGym.blk
+++ b/maps/CeladonGym.blk
@@ -1 +1 @@
-




38:933<3=33;?>3344356344321
\ No newline at end of file
+




38:93353=33;?>3344356344321
\ No newline at end of file
diff --git a/scripts/PokemonTower2F.asm b/scripts/PokemonTower2F.asm
index be2ba1d6..8f8b5f5d 100644
--- a/scripts/PokemonTower2F.asm
+++ b/scripts/PokemonTower2F.asm
@@ -170,10 +170,10 @@ PokemonTower2Text1:
 .Pikachu ;
 	cp STARTER4 
 	jr nz, .Eevee
-	ld a, $10
+	ld a, $9
 	jr .done
 .Eevee
-	ld a, $9
+	ld a, $10
 	jr .done
 .done
 	ld [wTrainerNo], a
diff --git a/text/CeladonMartRoof.asm b/text/CeladonMartRoof.asm
index 26136a7d..f3e8fe91 100644
--- a/text/CeladonMartRoof.asm
+++ b/text/CeladonMartRoof.asm
@@ -59,8 +59,8 @@ _CeladonMartRoofText_4850f::
 	text " contains"
 	line "ROCK SLIDE!"
 
-	;para "It can spook the" removing misleading info ~ PvK
-	;line "target sometimes!@"
+	para "It can spook the" ; want to remove, but it's weird when done
+	line "target sometimes!@"
 	text_end
 
 _CeladonMartRoofText_48515::