From 4fa1524e75b6b9dd6002f547be797ae93ed3af1e Mon Sep 17 00:00:00 2001
From: Lylian <lylian270104@gmail.com>
Date: Wed, 5 Jun 2024 19:03:43 +0200
Subject: [PATCH] undo override changes

---
 pokerogue        |  1 +
 src/overrides.ts | 22 +++++++++++-----------
 2 files changed, 12 insertions(+), 11 deletions(-)
 create mode 160000 pokerogue

diff --git a/pokerogue b/pokerogue
new file mode 160000
index 00000000000..b532a6b2d01
--- /dev/null
+++ b/pokerogue
@@ -0,0 +1 @@
+Subproject commit b532a6b2d013032bda987a8560cb412ffc284189
diff --git a/src/overrides.ts b/src/overrides.ts
index 0fd67ceebd7..661f2d14253 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -38,13 +38,13 @@ export const IMMEDIATE_HATCH_EGGS_OVERRIDE: boolean = false;
 // default 1000
 export const STARTING_MONEY_OVERRIDE: integer = 0;
 export const POKEBALL_OVERRIDE: { active: boolean, pokeballs: PokeballCounts } = {
-  active: true,
+  active: false,
   pokeballs: {
     [PokeballType.POKEBALL]: 5,
     [PokeballType.GREAT_BALL]: 0,
     [PokeballType.ULTRA_BALL]: 0,
     [PokeballType.ROGUE_BALL]: 0,
-    [PokeballType.MASTER_BALL]: 50,
+    [PokeballType.MASTER_BALL]: 0,
   }
 };
 
@@ -53,21 +53,21 @@ export const POKEBALL_OVERRIDE: { active: boolean, pokeballs: PokeballCounts } =
  */
 
 // forms can be found in pokemon-species.ts
-export const STARTER_FORM_OVERRIDE: integer = 60;
+export const STARTER_FORM_OVERRIDE: integer = 0;
 // default 5 or 20 for Daily
-export const STARTING_LEVEL_OVERRIDE: integer = 60;
+export const STARTING_LEVEL_OVERRIDE: integer = 0;
 /**
  * SPECIES OVERRIDE
  * will only apply to the first starter in your party or each enemy pokemon
  * default is 0 to not override
  * @example SPECIES_OVERRIDE = Species.Bulbasaur;
  */
-export const STARTER_SPECIES_OVERRIDE: Species | integer = Species.COBALION;
+export const STARTER_SPECIES_OVERRIDE: Species | integer = 0;
 export const ABILITY_OVERRIDE: Abilities = Abilities.NONE;
 export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
 export const STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE;
 export const GENDER_OVERRIDE: Gender = null;
-export const MOVESET_OVERRIDE: Array<Moves> = [Moves.RETALIATE];
+export const MOVESET_OVERRIDE: Array<Moves> = [];
 export const SHINY_OVERRIDE: boolean = false;
 export const VARIANT_OVERRIDE: Variant = 0;
 
@@ -75,13 +75,13 @@ export const VARIANT_OVERRIDE: Variant = 0;
  * OPPONENT / ENEMY OVERRIDES
  */
 
-export const OPP_SPECIES_OVERRIDE: Species | integer = Species.ENTEI;
-export const OPP_LEVEL_OVERRIDE: number = 50;
+export const OPP_SPECIES_OVERRIDE: Species | integer = 0;
+export const OPP_LEVEL_OVERRIDE: number = 0;
 export const OPP_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
 export const OPP_PASSIVE_ABILITY_OVERRIDE = Abilities.NONE;
 export const OPP_STATUS_OVERRIDE: StatusEffect = StatusEffect.NONE;
 export const OPP_GENDER_OVERRIDE: Gender = null;
-export const OPP_MOVESET_OVERRIDE: Array<Moves> = [Moves.BLAZING_TORQUE];
+export const OPP_MOVESET_OVERRIDE: Array<Moves> = [];
 export const OPP_SHINY_OVERRIDE: boolean = false;
 export const OPP_VARIANT_OVERRIDE: Variant = 0;
 
@@ -108,5 +108,5 @@ interface ModifierOverride {
 export const STARTING_MODIFIER_OVERRIDE: Array<ModifierOverride> = [];
 export const OPP_MODIFIER_OVERRIDE: Array<ModifierOverride> = [];
 
-export const STARTING_HELD_ITEMS_OVERRIDE: Array<ModifierOverride> = [{name:"BERRY", count:2, type: BerryType.LUM}];
-export const OPP_HELD_ITEMS_OVERRIDE: Array<ModifierOverride> = [{name:"BERRY", count:2, type: BerryType.LUM}];
+export const STARTING_HELD_ITEMS_OVERRIDE: Array<ModifierOverride> = [];
+export const OPP_HELD_ITEMS_OVERRIDE: Array<ModifierOverride> = [];