From c931b98a8144b4d5c5bce8444ffc658ddf41ffd7 Mon Sep 17 00:00:00 2001 From: SnorlaxMonster Date: Thu, 27 Jul 2023 10:51:34 +1000 Subject: [PATCH] Rename BATTLETYPE_SHINY to BATTLETYPE_FORCESHINY (#1058) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Rename BATTLETYPE_SHINY to BATTLETYPE_FORCED_SHINY The name BATTLETYPE_SHINY gave the impression that it applied to all battles with Shiny Pokémon, rather than merely battles with forced Shiny Pokémon (i.e. Red Gyarados only). * Rename to BATTLETYPE_FORCESHINY Align name of BATTLETYPE with BATTLETYPE_FORCEITEM --------- Co-authored-by: SnorlaxMonster --- constants/battle_constants.asm | 2 +- engine/battle/core.asm | 4 ++-- engine/battle/effect_commands.asm | 2 +- engine/battle/move_effects/teleport.asm | 2 +- maps/LakeOfRage.asm | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/constants/battle_constants.asm b/constants/battle_constants.asm index e6a1f3665..1d6871e68 100644 --- a/constants/battle_constants.asm +++ b/constants/battle_constants.asm @@ -90,7 +90,7 @@ DEF SPDSPCDV_SHINY EQU $AA const BATTLETYPE_FISH const BATTLETYPE_ROAMING const BATTLETYPE_CONTEST - const BATTLETYPE_SHINY + const BATTLETYPE_FORCESHINY const BATTLETYPE_TREE const BATTLETYPE_TRAP const BATTLETYPE_FORCEITEM diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 7d46f22c0..e1ca02770 100644 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -3682,7 +3682,7 @@ TryToRunAwayFromBattle: jp z, .cant_escape cp BATTLETYPE_CELEBI jp z, .cant_escape - cp BATTLETYPE_SHINY + cp BATTLETYPE_FORCESHINY jp z, .cant_escape cp BATTLETYPE_SUICUNE jp z, .cant_escape @@ -6108,7 +6108,7 @@ LoadEnemyMon: ; Forced shiny battle type ; Used by Red Gyarados at Lake of Rage - cp BATTLETYPE_SHINY + cp BATTLETYPE_FORCESHINY jr nz, .GenerateDVs ld b, ATKDEFDV_SHINY ; $ea diff --git a/engine/battle/effect_commands.asm b/engine/battle/effect_commands.asm index e22a3b2b3..f2240d1fc 100644 --- a/engine/battle/effect_commands.asm +++ b/engine/battle/effect_commands.asm @@ -4955,7 +4955,7 @@ SetBattleDraw: BattleCommand_ForceSwitch: ld a, [wBattleType] - cp BATTLETYPE_SHINY + cp BATTLETYPE_FORCESHINY jp z, .fail cp BATTLETYPE_TRAP jp z, .fail diff --git a/engine/battle/move_effects/teleport.asm b/engine/battle/move_effects/teleport.asm index 650ef5994..87d2c6571 100644 --- a/engine/battle/move_effects/teleport.asm +++ b/engine/battle/move_effects/teleport.asm @@ -1,6 +1,6 @@ BattleCommand_Teleport: ld a, [wBattleType] - cp BATTLETYPE_SHINY + cp BATTLETYPE_FORCESHINY jr z, .failed cp BATTLETYPE_TRAP jr z, .failed diff --git a/maps/LakeOfRage.asm b/maps/LakeOfRage.asm index 51a7b9db0..58e6c4cee 100644 --- a/maps/LakeOfRage.asm +++ b/maps/LakeOfRage.asm @@ -85,7 +85,7 @@ RedGyarados: cry GYARADOS closetext loadwildmon GYARADOS, 30 - loadvar VAR_BATTLETYPE, BATTLETYPE_SHINY + loadvar VAR_BATTLETYPE, BATTLETYPE_FORCESHINY startbattle ifequal LOSE, .NotBeaten disappear LAKEOFRAGE_GYARADOS