From 8f979578e72a2d6d4df7d18c58caf028bef02076 Mon Sep 17 00:00:00 2001
From: AJ Fontaine <fontbane@gmail.com>
Date: Wed, 16 Oct 2024 13:17:10 -0400
Subject: [PATCH] Address nits

---
 src/battle-scene.ts          | 4 ++--
 src/data/balance/starters.ts | 6 +++---
 src/modifier/modifier.ts     | 4 ++--
 src/phases/faint-phase.ts    | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/battle-scene.ts b/src/battle-scene.ts
index f1b87021234..e61b1e48b0a 100644
--- a/src/battle-scene.ts
+++ b/src/battle-scene.ts
@@ -95,7 +95,7 @@ import { ExpPhase } from "#app/phases/exp-phase";
 import { ShowPartyExpBarPhase } from "#app/phases/show-party-exp-bar-phase";
 import { MysteryEncounterMode } from "#enums/mystery-encounter-mode";
 import { ExpGainsSpeed } from "#enums/exp-gains-speed";
-import { FRIENDSHIP_GAIN_VICTORY } from "#app/data/balance/starters";
+import { FRIENDSHIP_GAIN_FROM_BATTLE } from "#app/data/balance/starters";
 
 export const bypassLogin = import.meta.env.VITE_BYPASS_LOGIN === "1";
 
@@ -3053,7 +3053,7 @@ export default class BattleScene extends SceneBase {
         const pId = partyMember.id;
         const participated = participantIds.has(pId);
         if (participated && pokemonDefeated) {
-          partyMember.addFriendship(FRIENDSHIP_GAIN_VICTORY);
+          partyMember.addFriendship(FRIENDSHIP_GAIN_FROM_BATTLE);
           const machoBraceModifier = partyMember.getHeldItems().find(m => m instanceof PokemonIncrementingStatModifier);
           if (machoBraceModifier && machoBraceModifier.stackCount < machoBraceModifier.getMaxStackCount(this)) {
             machoBraceModifier.stackCount++;
diff --git a/src/data/balance/starters.ts b/src/data/balance/starters.ts
index 4aa9121e6d7..bf3a1f7ad56 100644
--- a/src/data/balance/starters.ts
+++ b/src/data/balance/starters.ts
@@ -4,9 +4,9 @@ export const POKERUS_STARTER_COUNT = 5;
 
 // #region Friendship constants
 export const CLASSIC_CANDY_FRIENDSHIP_MULTIPLIER = 2;
-export const FRIENDSHIP_GAIN_VICTORY = 2;
-export const FRIENDSHIP_GAIN_RARE_CANDY = 5;
-export const FRIENDSHIP_LOSS_FAINT = 10;
+export const FRIENDSHIP_GAIN_FROM_BATTLE = 2;
+export const FRIENDSHIP_GAIN_FROM_RARE_CANDY = 5;
+export const FRIENDSHIP_LOSS_FROM_FAINT = 10;
 
 /**
  * Function to get the cumulative friendship threshold at which a candy is earned
diff --git a/src/modifier/modifier.ts b/src/modifier/modifier.ts
index 34de22e45ff..8ee3c0c7375 100644
--- a/src/modifier/modifier.ts
+++ b/src/modifier/modifier.ts
@@ -30,7 +30,7 @@ import { StatusEffect } from "#enums/status-effect";
 import i18next from "i18next";
 import { type DoubleBattleChanceBoosterModifierType, type EvolutionItemModifierType, type FormChangeItemModifierType, type ModifierOverride, type ModifierType, type PokemonBaseStatTotalModifierType, type PokemonExpBoosterModifierType, type PokemonFriendshipBoosterModifierType, type PokemonMoveAccuracyBoosterModifierType, type PokemonMultiHitModifierType, type TerastallizeModifierType, type TmModifierType, getModifierType, ModifierPoolType, ModifierTypeGenerator, modifierTypes, PokemonHeldItemModifierType } from "./modifier-type";
 import { Color, ShadowColor } from "#enums/color";
-import { FRIENDSHIP_GAIN_RARE_CANDY } from "#app/data/balance/starters";
+import { FRIENDSHIP_GAIN_FROM_RARE_CANDY } from "#app/data/balance/starters";
 
 export type ModifierPredicate = (modifier: Modifier) => boolean;
 
@@ -2214,7 +2214,7 @@ export class PokemonLevelIncrementModifier extends ConsumablePokemonModifier {
       playerPokemon.levelExp = 0;
     }
 
-    playerPokemon.addFriendship(FRIENDSHIP_GAIN_RARE_CANDY);
+    playerPokemon.addFriendship(FRIENDSHIP_GAIN_FROM_RARE_CANDY);
 
     playerPokemon.scene.unshiftPhase(new LevelUpPhase(playerPokemon.scene, playerPokemon.scene.getParty().indexOf(playerPokemon), playerPokemon.level - levelCount.value, playerPokemon.level));
 
diff --git a/src/phases/faint-phase.ts b/src/phases/faint-phase.ts
index f5a01e8ce0e..d3431f86aaf 100644
--- a/src/phases/faint-phase.ts
+++ b/src/phases/faint-phase.ts
@@ -19,7 +19,7 @@ import { SwitchPhase } from "./switch-phase";
 import { VictoryPhase } from "./victory-phase";
 import { SpeciesFormChangeActiveTrigger } from "#app/data/pokemon-forms";
 import { SwitchType } from "#enums/switch-type";
-import { FRIENDSHIP_LOSS_FAINT } from "#app/data/balance/starters";
+import { FRIENDSHIP_LOSS_FROM_FAINT } from "#app/data/balance/starters";
 
 export class FaintPhase extends PokemonPhase {
   private preventEndure: boolean;
@@ -128,7 +128,7 @@ export class FaintPhase extends PokemonPhase {
 
     pokemon.faintCry(() => {
       if (pokemon instanceof PlayerPokemon) {
-        pokemon.addFriendship(FRIENDSHIP_LOSS_FAINT);
+        pokemon.addFriendship(FRIENDSHIP_LOSS_FROM_FAINT);
       }
       pokemon.hideInfo();
       this.scene.playSound("se/faint");