diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-09-22 15:10:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-22 15:10:02 -0400 |
| commit | 3e830f98d824ea2412ba1c08e05b177b186ec330 (patch) | |
| tree | 0666b5acdda71c75973aa83c805769d9d02e6d72 /engine | |
| parent | 174ef99e0e0caf5e8af2825d0034c9f7b72784f8 (diff) | |
| parent | e535af3dffd5df0bc868a983a1006f603bb17722 (diff) | |
Merge pull request #294 from SatoMew/master
Give a better label to ghost Marowak's constant
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/common_text.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 2 | ||||
| -rwxr-xr-x | engine/items/item_effects.asm | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 8c9e6afa..0e270424 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -33,7 +33,7 @@ PrintBeginningBattleText: call IsItemInBag ld a, [wEnemyMonSpecies2] ld [wcf91], a - cp GHOST_MON + cp RESTLESS_SOUL jr z, .isMarowak ld a, b and a diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 8289ecc9..4628e86a 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -6784,7 +6784,7 @@ InitWildBattle: call LoadEnemyMonData call DoBattleTransitionAndInitBattleVariables ld a, [wCurOpponent] - cp GHOST_MON + cp RESTLESS_SOUL jr z, .isGhost call IsGhostBattle jr nz, .isNoGhost diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 975bb937..6760c3d5 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/engine/battle/ghost_marowak_anim.asm @@ -11,7 +11,7 @@ MarowakAnim: 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 diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 244474ef..d4164332 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -170,7 +170,7 @@ ItemUseBall: 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 |