mirror of
https://github.com/pret/pokered.git
synced 2024-10-22 22:55:31 +00:00
Define a constant for the ghost Marowak (hard-coded throughout the engine, like the starters)
This commit is contained in:
parent
bfd9f617c9
commit
8ce20e5c31
8 changed files with 14 additions and 9 deletions
|
@ -32,7 +32,6 @@ INCLUDE "constants/credits_constants.asm"
|
|||
INCLUDE "constants/audio_constants.asm"
|
||||
INCLUDE "constants/music_constants.asm"
|
||||
INCLUDE "constants/tileset_constants.asm"
|
||||
INCLUDE "constants/starter_mons.asm"
|
||||
INCLUDE "constants/event_constants.asm"
|
||||
INCLUDE "constants/text_constants.asm"
|
||||
INCLUDE "constants/menu_constants.asm"
|
||||
|
|
|
@ -199,3 +199,11 @@
|
|||
const VICTREEBEL ; $BE
|
||||
|
||||
NUM_POKEMON_INDEXES EQU const_value - 1
|
||||
|
||||
; starters
|
||||
STARTER1 EQU CHARMANDER
|
||||
STARTER2 EQU SQUIRTLE
|
||||
STARTER3 EQU BULBASAUR
|
||||
|
||||
; ghost in Pokémon Tower
|
||||
GHOST_MON EQU MAROWAK
|
||||
|
|
|
@ -1,3 +0,0 @@
|
|||
STARTER1 EQU CHARMANDER
|
||||
STARTER2 EQU SQUIRTLE
|
||||
STARTER3 EQU BULBASAUR
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -170,7 +170,7 @@ ItemUseBall:
|
|||
cp POKEMON_TOWER_6F
|
||||
jr nz, .loop
|
||||
ld a, [wEnemyMonSpecies2]
|
||||
cp MAROWAK
|
||||
cp GHOST_MON
|
||||
ld b, $10 ; can't be caught value
|
||||
jp z, .setAnimData
|
||||
|
||||
|
|
|
@ -117,15 +117,16 @@ DisplayTitleScreen:
|
|||
call SaveScreenTilesToBuffer2
|
||||
call LoadScreenTilesFromBuffer2
|
||||
call EnableLCD
|
||||
|
||||
IF DEF(_RED)
|
||||
ld a, CHARMANDER ; which Pokemon to show first on the title screen
|
||||
ENDC
|
||||
IF DEF(_BLUE)
|
||||
ld a, SQUIRTLE ; which Pokemon to show first on the title screen
|
||||
ENDC
|
||||
|
||||
ld [wTitleMonSpecies], a
|
||||
call LoadTitleMonSprite
|
||||
|
||||
ld a, HIGH(vBGMap0 + $300)
|
||||
call TitleScreenCopyTileMapToVRAM
|
||||
call SaveScreenTilesToBuffer1
|
||||
|
|
Loading…
Reference in a new issue