Merge pull request #56 from SatoMew/master

Give ghost Marowak a constant

constants/pokemon_constants.asm

@@ -192,3 +192,6 @@ const_value = 1
 	const VICTREEBEL   ; $BE
 
 NUM_POKEMON_INDEXES EQU const_value + -1
+
+; ghost Marowak in Pokémon Tower
+RESTLESS_SOUL EQU MAROWAK

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

engine/battle/common_text.asm

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

engine/battle/ghost_marowak_anim.asm

@@ -12,7 +12,7 @@ MarowakAnim:
 	xor a
 	ld [H_AUTOBGTRANSFERENABLED], 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, RESTLESS_SOUL
 	ld [wChangeMonPicEnemyTurnSpecies], a
 	ld a, $1
 	ld [H_WHOSETURN], a

engine/items/items.asm

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

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