diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index 43a70e7ef2c..1600ba96f09 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -988,6 +988,9 @@ export default class BattleScene extends SceneBase {
 				return Utils.randSeedInt(6);
 			case Species.ALCREMIE:
 				return Utils.randSeedInt(9);
+			case Species.ROCKRUFF:
+				console.log('rockruff species called')
+				return Utils.randSeedInt(2);
 			case Species.MEOWSTIC:
 			case Species.INDEEDEE:
 			case Species.BASCULEGION:
@@ -1010,7 +1013,6 @@ export default class BattleScene extends SceneBase {
 			}
 			return 0;
 		}
-
 		return this.arena.getSpeciesFormIndex(species);
 	}
 
diff --git a/src/data/pokemon-evolutions.ts b/src/data/pokemon-evolutions.ts
index 192f6b8f017..53096437673 100644
--- a/src/data/pokemon-evolutions.ts
+++ b/src/data/pokemon-evolutions.ts
@@ -1393,10 +1393,10 @@ export const pokemonEvolutions: PokemonEvolutions = {
     new SpeciesEvolution(Species.CRABOMINABLE, 1, EvolutionItem.ICE_STONE, null)
   ],
   [Species.ROCKRUFF]: [
-    new SpeciesFormEvolution(Species.LYCANROC, '', 'midday', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DAY) && (p.hasAbility(Abilities.OWN_TEMPO) === false)), null),
-    new SpeciesFormEvolution(Species.LYCANROC, '', 'dusk', 25, null, new SpeciesEvolutionCondition(p =>  p.hasAbility(Abilities.OWN_TEMPO)), null),
+    new SpeciesFormEvolution(Species.LYCANROC, '', 'midday', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.DAY) && (p.formIndex === 0)), null),
+    new SpeciesFormEvolution(Species.LYCANROC, '', 'dusk', 25, null, new SpeciesEvolutionCondition(p =>  p.formIndex === 1), null),
     // new SpeciesFormEvolution(Species.LYCANROC, '', 'dusk', 25, null, new SpeciesEvolutionCondition(p =>  p.scene.getSpeciesFormIndex(p.species) === 1), null),
-    new SpeciesFormEvolution(Species.LYCANROC, '', 'midnight', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT) && (p.hasAbility(Abilities.OWN_TEMPO) === false)), null)
+    new SpeciesFormEvolution(Species.LYCANROC, '', 'midnight', 25, null, new SpeciesEvolutionCondition(p => (p.scene.arena.getTimeOfDay() === TimeOfDay.NIGHT) && (p.formIndex === 0)), null)
   ],
   [Species.STEENEE]: [
     new SpeciesEvolution(Species.TSAREENA, 28, null, new SpeciesEvolutionCondition(p => p.moveset.filter(m => m.moveId === Moves.STOMP).length > 0), SpeciesWildEvolutionDelay.LONG)
diff --git a/src/overrides.ts b/src/overrides.ts
index 2b6106a7419..e3050d55319 100644
--- a/src/overrides.ts
+++ b/src/overrides.ts
@@ -23,7 +23,7 @@ import { Stat } from './data/pokemon-stat';
 export const SEED_OVERRIDE: string = '';
 export const WEATHER_OVERRIDE: WeatherType = WeatherType.NONE;
 export const DOUBLE_BATTLE_OVERRIDE: boolean = false;
-export const STARTING_WAVE_OVERRIDE: integer = 0;
+export const STARTING_WAVE_OVERRIDE: integer = 15;
 export const STARTING_BIOME_OVERRIDE: Biome = Biome.TOWN;
 // default 1000
 export const STARTING_MONEY_OVERRIDE: integer = 0;
@@ -35,7 +35,7 @@ export const STARTING_MONEY_OVERRIDE: integer = 0;
 // forms can be found in pokemon-species.ts
 export const STARTER_FORM_OVERRIDE: integer = 0;
 // default 5 or 20 for Daily
-export const STARTING_LEVEL_OVERRIDE: integer = 0;
+export const STARTING_LEVEL_OVERRIDE: integer = 24;
 export const ABILITY_OVERRIDE: Abilities = Abilities.NONE;
 export const PASSIVE_ABILITY_OVERRIDE: Abilities = Abilities.NONE;
 export const MOVESET_OVERRIDE: Array<Moves> = [];
@@ -57,7 +57,7 @@ export const OPP_VARIANT_OVERRIDE: Variant = 0;
  * @example SPECIES_OVERRIDE = Species.Bulbasaur;
  */
 export const STARTER_SPECIES_OVERRIDE: Species | integer = 0;
-export const OPP_SPECIES_OVERRIDE: Species | integer = 0;
+export const OPP_SPECIES_OVERRIDE: Species | integer = Species.ROCKRUFF;
 
 /**
  * MODIFIER / ITEM OVERRIDES