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/battle | |
| parent | Merge pull request #292 from Akatsuki-py/fix/ExecuteCurMapScriptInTable (diff) | |
| parent | Fix alignment in Pokémon name constants (diff) | |
| download | pokeyellow-3e830f98d824ea2412ba1c08e05b177b186ec330.tar.gz pokeyellow-3e830f98d824ea2412ba1c08e05b177b186ec330.tar.xz pokeyellow-3e830f98d824ea2412ba1c08e05b177b186ec330.zip | |
Merge pull request #294 from SatoMew/master
Give a better label to ghost Marowak's constant
Diffstat (limited to 'engine/battle')
| -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 |
3 files changed, 3 insertions, 3 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 |