summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-10-04 15:39:27 -0400
committerGitHub <noreply@github.com>2020-10-04 15:39:27 -0400
commit32ea7a94857e1373a642cf9981fa3aaa4cdcb5d4 (patch)
treef0f4632100cc17077c8c35617106e9b1b1be88c7 /scripts
parentc3c17cabc6c85fb7f70c030b25f5978d57dbf4bc (diff)
parent8d359d48bacbd39e02a9119064310ba160b5528d (diff)
Merge pull request #56 from SatoMew/master
Give ghost Marowak a constant
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/PokemonTower6F.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/PokemonTower6F.asm b/scripts/PokemonTower6F.asm
index 14c07c48..962d33eb 100755
--- a/scripts/PokemonTower6F.asm
+++ b/scripts/PokemonTower6F.asm
@@ -32,7 +32,7 @@ PokemonTower6Script0:
ld a, $6
ld [hSpriteIndexOrTextID], a
call DisplayTextID
- ld a, MAROWAK
+ ld a, RESTLESS_SOUL
ld [wCurOpponent], a
ld a, 30
ld [wCurEnemyLVL], a
@@ -154,7 +154,7 @@ PokemonTower6Text7:
TX_ASM
ld hl, PokemonTower2Text_60c1f
call PrintText
- ld a, MAROWAK
+ ld a, RESTLESS_SOUL
call PlayCry
call WaitForSoundToFinish
ld c, 30