thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-12-20 01:31:31 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #294 from SatoMew/master

Browse source 
Give a better label to ghost Marowak's constant
This commit is contained in:
Rangi 2020-09-22 15:10:02 -04:00 committed by GitHub
parent 174ef99e0e e535af3dff
commit 3e830f98d8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 198 additions and 198 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
constants/pokemon_constants.asm
View file

@ -206,4 +206,4 @@ STARTER2 EQU SQUIRTLE
STARTER3 EQU BULBASAUR STARTER3 EQU BULBASAUR
; ghost in Pokémon Tower ; ghost in Pokémon Tower
GHOST_MON EQU MAROWAK RESTLESS_SOUL EQU MAROWAK

2
engine/battle/common_text.asm
View file

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

2
engine/battle/core.asm
View file

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

2
engine/battle/ghost_marowak_anim.asm
View file

@ -11,7 +11,7 @@ MarowakAnim:
xor a xor a
ldh [hAutoBGTransferEnabled], a ; disable BG transfer so we don't see the Marowak too soon ldh [hAutoBGTransferEnabled], a ; disable BG transfer so we don't see the Marowak too soon
; replace ghost pic with Marowak in BG ; replace ghost pic with Marowak in BG
ld a, GHOST_MON ld a, RESTLESS_SOUL
ld [wChangeMonPicEnemyTurnSpecies], a ld [wChangeMonPicEnemyTurnSpecies], a
ld a, $1 ld a, $1
ldh [hWhoseTurn], a ldh [hWhoseTurn], a

2
engine/items/item_effects.asm
View file

@ -170,7 +170,7 @@ ItemUseBall:
cp POKEMON_TOWER_6F cp POKEMON_TOWER_6F
jr nz, .loop jr nz, .loop
ld a, [wEnemyMonSpecies2] ld a, [wEnemyMonSpecies2]
cp GHOST_MON cp RESTLESS_SOUL
ld b, $10 ; can't be caught value ld b, $10 ; can't be caught value
jp z, .setAnimData jp z, .setAnimData

4
scripts/PokemonTower6F.asm
View file

@ -32,7 +32,7 @@ PokemonTower6Script0:
ld a, $6 ld a, $6
ldh [hSpriteIndexOrTextID], a ldh [hSpriteIndexOrTextID], a
call DisplayTextID call DisplayTextID
ld a, MAROWAK ld a, RESTLESS_SOUL
ld [wCurOpponent], a ld [wCurOpponent], a
ld a, 30 ld a, 30
ld [wCurEnemyLVL], a ld [wCurEnemyLVL], a
@ -134,7 +134,7 @@ PokemonTower6Text7:
text_asm text_asm
ld hl, PokemonTower2Text_60c1f ld hl, PokemonTower2Text_60c1f
call PrintText call PrintText
ld a, MAROWAK ld a, RESTLESS_SOUL
call PlayCry call PlayCry
call WaitForSoundToFinish call WaitForSoundToFinish
ld c, 30 ld c, 30