diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-10-04 15:39:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-04 15:39:27 -0400 |
| commit | 32ea7a94857e1373a642cf9981fa3aaa4cdcb5d4 (patch) | |
| tree | f0f4632100cc17077c8c35617106e9b1b1be88c7 /engine/battle/bank3d_battle.asm | |
| parent | Merge pull request #53 from pinksylveon/patch-2 (diff) | |
| parent | Add constant for ghost Marowak like pokered (diff) | |
| download | pokeyellow-32ea7a94857e1373a642cf9981fa3aaa4cdcb5d4.tar.gz pokeyellow-32ea7a94857e1373a642cf9981fa3aaa4cdcb5d4.tar.xz pokeyellow-32ea7a94857e1373a642cf9981fa3aaa4cdcb5d4.zip | |
Merge pull request #56 from SatoMew/master
Give ghost Marowak a constant
Diffstat (limited to 'engine/battle/bank3d_battle.asm')
| -rw-r--r-- | engine/battle/bank3d_battle.asm | 2 |
1 files changed, 1 insertions, 1 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 |