Rename BATTLETYPE_SHINY to BATTLETYPE_FORCESHINY (#1058)

* 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 <snorlaxmonster@users.noreply.github.com>
This commit is contained in:
SnorlaxMonster
2023-07-27 10:51:34 +10:00
committed by GitHub
parent 94df3c5aa3
commit c931b98a81
5 changed files with 6 additions and 6 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,6 +1,6 @@
BattleCommand_Teleport:
ld a, [wBattleType]
cp BATTLETYPE_SHINY
cp BATTLETYPE_FORCESHINY
jr z, .failed
cp BATTLETYPE_TRAP
jr z, .failed

View File

@@ -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