ref: 2ff7b40d8294d386332b7895a5afec0269b153fd
parent: 174ef99e0e0caf5e8af2825d0034c9f7b72784f8
author: SatoMew <SatoMew@users.noreply.github.com>
date: Tue Sep 22 14:38:29 EDT 2020
Replace ghost Marowak's ambiguous constant
--- a/constants/pokemon_constants.asm
+++ b/constants/pokemon_constants.asm
@@ -206,4 +206,4 @@
STARTER3 EQU BULBASAUR
; ghost in Pokémon Tower
-GHOST_MON EQU MAROWAK
+RESTLESS_SOUL EQU MAROWAK
--- a/engine/battle/common_text.asm
+++ b/engine/battle/common_text.asm
@@ -33,7 +33,7 @@
call IsItemInBag
ld a, [wEnemyMonSpecies2]
ld [wcf91], a
- cp GHOST_MON
+ cp RESTLESS_SOUL
jr z, .isMarowak
ld a, b
and a
--- a/engine/battle/core.asm
+++ b/engine/battle/core.asm
@@ -6784,7 +6784,7 @@
call LoadEnemyMonData
call DoBattleTransitionAndInitBattleVariables
ld a, [wCurOpponent]
- cp GHOST_MON
+ cp RESTLESS_SOUL
jr z, .isGhost
call IsGhostBattle
jr nz, .isNoGhost
--- a/engine/battle/ghost_marowak_anim.asm
+++ b/engine/battle/ghost_marowak_anim.asm
@@ -11,7 +11,7 @@
xor a
ldh [hAutoBGTransferEnabled], a ; disable BG transfer so we don't see the Marowak too soon
; replace ghost pic with Marowak in BG
- ld a, GHOST_MON
+ ld a, RESTLESS_SOUL
ld [wChangeMonPicEnemyTurnSpecies], a
ld a, $1
ldh [hWhoseTurn], a
--- a/engine/items/item_effects.asm
+++ b/engine/items/item_effects.asm
@@ -170,7 +170,7 @@
cp POKEMON_TOWER_6F
jr nz, .loop
ld a, [wEnemyMonSpecies2]
- cp GHOST_MON
+ cp RESTLESS_SOUL
ld b, $10 ; can't be caught value
jp z, .setAnimData