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/core.asm | |
| 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/core.asm')
| -rwxr-xr-x | engine/battle/core.asm | 2 |
1 files changed, 1 insertions, 1 deletions
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 |