diff options
Diffstat (limited to 'engine')
| -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 | ||||
| -rwxr-xr-x | engine/items/items.asm | 2 |
4 files changed, 4 insertions, 4 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 diff --git a/engine/items/items.asm b/engine/items/items.asm index 15c7c24f..e935f292 100755 --- a/engine/items/items.asm +++ b/engine/items/items.asm @@ -181,7 +181,7 @@ ItemUseBall: cp POKEMON_TOWER_6F jr nz, .loop ld a, [wEnemyMonSpecies2] - cp MAROWAK + cp RESTLESS_SOUL ld b, $10 ; can't be caught value jp z, .setAnimData |