From 5e55e217be271ec0827a8561e7ce85dbc545640a Mon Sep 17 00:00:00 2001
From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com>
Date: Sun, 5 Nov 2023 12:21:28 +0000
Subject: [PATCH] Revert "Gym Scaling proof of concept"

This reverts commit 442b9b9956a502cfe1fb55e5900709d4ac2345d5.
---
 constants/trainer_constants.asm |  3 --
 data/trainers/parties.asm       | 62 ++++-----------------------------
 maps/VioletGym.asm              | 20 +----------
 3 files changed, 8 insertions(+), 77 deletions(-)

diff --git a/constants/trainer_constants.asm b/constants/trainer_constants.asm
index 1dbf4e8..f3c769b 100644
--- a/constants/trainer_constants.asm
+++ b/constants/trainer_constants.asm
@@ -30,9 +30,6 @@ DEF NUM_NONTRAINER_PHONECONTACTS EQU const_value - 1
 DEF KRIS EQU __trainer_class__
 	trainerclass FALKNER ; 1
 	const FALKNER1
-	const FALKNER2
-	const FALKNER3
-	const FALKNER4
 
 	trainerclass WHITNEY ; 2
 	const WHITNEY1
diff --git a/data/trainers/parties.asm b/data/trainers/parties.asm
index d19bd9d..0e4f73d 100644
--- a/data/trainers/parties.asm
+++ b/data/trainers/parties.asm
@@ -13,58 +13,13 @@ FalknerGroup:
 	next_list_item ; FALKNER (1)
 	db "FALKNER@", TRAINERTYPE_MOVES
 	db 7
-	dw HOOTHOOT
-	dw TACKLE, GROWL, FORESIGHT, NO_MOVE
+	dw PIDGEY
+	dw TACKLE, MUD_SLAP, NO_MOVE, NO_MOVE
 	db 9
 	dw PIDGEOTTO
-	dw TACKLE, SAND_ATTACK, GUST, MUD_SLAP
+	dw TACKLE, MUD_SLAP, GUST, NO_MOVE
 	db -1 ; end
-	
-	next_list_item ; FALKNER (2)
-	db "FALKNER@", TRAINERTYPE_MOVES
-	db 14
-	dw HOOTHOOT
-	dw TACKLE, PECK, FORESIGHT, MUD_SLAP
-	db 14
-	dw SPEAROW
-	dw PECK, MUD_SLAP, LEER, FURY_ATTACK
-	db 18
-	dw PIDGEOTTO
-	dw SWIFT, SAND_ATTACK, GUST, MUD_SLAP
-	db -1 ; end
-	
-	next_list_item ; FALKNER (3)
-	db "FALKNER@", TRAINERTYPE_MOVES
-	db 18
-	dw HOOTHOOT
-	dw TACKLE, PECK, HYPNOSIS, MUD_SLAP
-	db 18
-	dw SPEAROW
-	dw PECK, MUD_SLAP, LEER, FURY_ATTACK
-	db 19
-	dw MURKROW
-	dw PECK, PURSUIT, HAZE, MUD_SLAP
-	db 21
-	dw PIDGEOTTO
-	dw SWIFT, SAND_ATTACK, GUST, MUD_SLAP
-	db -1 ; end
-	
-	next_list_item ; FALKNER (4)
-	db "FALKNER@", TRAINERTYPE_MOVES
-	db 21
-	dw NOCTOWL
-	dw TACKLE, PECK, HYPNOSIS, MUD_SLAP
-	db 21
-	dw FEAROW
-	dw PECK, MUD_SLAP, LEER, FURY_ATTACK
-	db 22
-	dw MURKROW
-	dw PECK, PURSUIT, HAZE, MUD_SLAP
-	db 24
-	dw PIDGEOTTO
-	dw SWIFT, SAND_ATTACK, GUST, MUD_SLAP
-	db -1 ; end
-	
+
 	end_list_items
 
 WhitneyGroup:
@@ -73,9 +28,6 @@ WhitneyGroup:
 	db 18
 	dw CLEFAIRY
 	dw DOUBLESLAP, MIMIC, ENCORE, METRONOME
-	db 18
-	dw SNUBBULL
-	dw TACKLE, TAIL_WHIP, CHARM, BITE ; It learns Scary Face, but I don't think Whitney would like it, and it does need Tackle...
 	db 20
 	dw MILTANK
 	dw ROLLOUT, ATTRACT, STOMP, MILK_DRINK
@@ -87,11 +39,11 @@ BugsyGroup:
 	next_list_item ; BUGSY (1)
 	db "BUGSY@", TRAINERTYPE_MOVES
 	db 14
-	dw METAPOD ; I think keeping this is important considering what Bugsy is doing - researching move retention
+	dw METAPOD
 	dw TACKLE, STRING_SHOT, HARDEN, NO_MOVE
 	db 14
-	dw YANMA
-	dw LEECH_LIFE, FORESIGHT, QUICK_ATTACK, DOUBLE_TEAM
+	dw KAKUNA
+	dw POISON_STING, STRING_SHOT, HARDEN, NO_MOVE
 	db 16
 	dw SCYTHER
 	dw QUICK_ATTACK, LEER, FURY_CUTTER, NO_MOVE
diff --git a/maps/VioletGym.asm b/maps/VioletGym.asm
index 9bcb6f1..5320a0f 100644
--- a/maps/VioletGym.asm
+++ b/maps/VioletGym.asm
@@ -18,26 +18,8 @@ VioletGymFalknerScript:
 	waitbutton
 	closetext
 	winlosstext FalknerWinLossText, 0
-	
-	; Gym Scaling code
-	; This is incredibly inefficient, but so is the phone code that does a similar thing, so...cope. Seethe. Mald. Sue me.
-	; Also, this code has a flaw in that it presumes you went through the default gym order...
-	
-	loadtrainer FALKNER, FALKNER2
-	checkflag EVENT_BEAT_BUGSY
-	iftrue .okyoucanloadnow
-	loadtrainer FALKNER, FALKNER3
-	checkflag EVENT_BEAT_WHITNEY
-	iftrue .okyoucanloadnow
-	loadtrainer FALKNER, FALKNER4
-	checkflag EVENT_BEAT_MORTY
-	iftrue .okyoucanloadnow
-	
-	; If nothing else has been beaten, then Falkner hasn't been fought before, so we can load this now. It's slow, though.
 	loadtrainer FALKNER, FALKNER1
-
-.okyoucanloadnow
-	startbattle ; Now start the battle.
+	startbattle
 	reloadmapafterbattle
 	setevent EVENT_BEAT_FALKNER
 	opentext