thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2026-02-06 15:45:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Define a constant for the ghost Marowak (hard-coded throughout the engine, like the starters)

Browse source
This commit is contained in:
Rangi 2020-08-31 10:58:41 -04:00
parent bfd9f617c9
commit 8ce20e5c31
8 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engine/battle/common_text.asm
View file

@ -33,7 +33,7 @@ PrintBeginningBattleText:
call IsItemInBag
ld a, [wEnemyMonSpecies2]
ld [wcf91], a
cp MAROWAK
cp GHOST_MON
jr z, .isMarowak
ld a, b
and a

2
engine/battle/core.asm
View file

@ -6784,7 +6784,7 @@ InitWildBattle:
call LoadEnemyMonData
call DoBattleTransitionAndInitBattleVariables
ld a, [wCurOpponent]
cp MAROWAK
cp GHOST_MON
jr z, .isGhost
call IsGhostBattle
jr nz, .isNoGhost

2
engine/battle/ghost_marowak_anim.asm
View file

@ -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, MAROWAK
ld a, GHOST_MON
ld [wChangeMonPicEnemyTurnSpecies], a
ld a, $1
ldh [hWhoseTurn], a