Merge pull request #294 from SatoMew/master

Give a better label to ghost Marowak's constant

constants/pokemon_constants.asm

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

engine/battle/common_text.asm

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

engine/battle/core.asm

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

engine/battle/ghost_marowak_anim.asm

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

engine/items/item_effects.asm

@@ -170,7 +170,7 @@ ItemUseBall:
 	cp POKEMON_TOWER_6F
 	jr nz, .loop
 	ld a, [wEnemyMonSpecies2]
-	cp GHOST_MON
+	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
 	ldh [hSpriteIndexOrTextID], a
 	call DisplayTextID
-	ld a, MAROWAK
+	ld a, RESTLESS_SOUL
 	ld [wCurOpponent], a
 	ld a, 30
 	ld [wCurEnemyLVL], a
@@ -134,7 +134,7 @@ PokemonTower6Text7:
 	text_asm
 	ld hl, PokemonTower2Text_60c1f
 	call PrintText
-	ld a, MAROWAK
+	ld a, RESTLESS_SOUL
 	call PlayCry
 	call WaitForSoundToFinish
 	ld c, 30