diff options
Diffstat (limited to 'engine/battle')
| -rw-r--r-- | engine/battle/bank3d_battle.asm | 2 | ||||
| -rw-r--r-- | engine/battle/common_text.asm | 2 | ||||
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/battle/bank3d_battle.asm b/engine/battle/bank3d_battle.asm index 0cf24fe1..5edc4571 100644 --- a/engine/battle/bank3d_battle.asm +++ b/engine/battle/bank3d_battle.asm @@ -62,7 +62,7 @@ InitWildBattle: callab LoadEnemyMonData callab DoBattleTransitionAndInitBattleVariables ld a, [wCurOpponent] - cp MAROWAK + cp RESTLESS_SOUL jr z, .isGhost callab IsGhostBattle jr nz, .isNoGhost diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index e8f4f002..1c85efe9 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -49,7 +49,7 @@ PrintBeginningBattleText: call IsItemInBag ld a, [wEnemyMonSpecies2] ld [wcf91], a - cp MAROWAK + cp RESTLESS_SOUL jr z, .isMarowak ld a, b and a diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 5bb3e308..972d5bf5 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -12,7 +12,7 @@ MarowakAnim: xor a ld [H_AUTOBGTRANSFERENABLED], a ; disable BG transfer so we don't see the Marowak too soon ; replace ghost pic with Marowak in BG - ld a, MAROWAK + ld a, RESTLESS_SOUL ld [wChangeMonPicEnemyTurnSpecies], a ld a, $1 ld [H_WHOSETURN], a |