thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-14 09:06:41 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Define a constant for the ghost Marowak (hard-coded throughout the engine, like the starters)

Browse source
This commit is contained in:
Rangi 2020-08-31 10:58:41 -04:00
parent bfd9f617c9
commit 8ce20e5c31
8 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants.asm
View file

@ -32,7 +32,6 @@ INCLUDE "constants/credits_constants.asm"
INCLUDE "constants/audio_constants.asm" INCLUDE "constants/audio_constants.asm"
INCLUDE "constants/music_constants.asm" INCLUDE "constants/music_constants.asm"
INCLUDE "constants/tileset_constants.asm" INCLUDE "constants/tileset_constants.asm"
INCLUDE "constants/starter_mons.asm"
INCLUDE "constants/event_constants.asm" INCLUDE "constants/event_constants.asm"
INCLUDE "constants/text_constants.asm" INCLUDE "constants/text_constants.asm"
INCLUDE "constants/menu_constants.asm" INCLUDE "constants/menu_constants.asm"

8
constants/pokemon_constants.asm
View file

@ -199,3 +199,11 @@
const VICTREEBEL ; $BE const VICTREEBEL ; $BE
NUM_POKEMON_INDEXES EQU const_value - 1 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

3
constants/starter_mons.asm
View file

@ -1,3 +0,0 @@
STARTER1 EQU CHARMANDER
STARTER2 EQU SQUIRTLE
STARTER3 EQU BULBASAUR

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 MAROWAK cp GHOST_MON
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 MAROWAK cp GHOST_MON
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, MAROWAK ld a, GHOST_MON
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 MAROWAK cp GHOST_MON
ld b, $10 ; can't be caught value ld b, $10 ; can't be caught value
jp z, .setAnimData jp z, .setAnimData

3
engine/movie/title.asm
View file

@ -117,15 +117,16 @@ DisplayTitleScreen:
call SaveScreenTilesToBuffer2 call SaveScreenTilesToBuffer2
call LoadScreenTilesFromBuffer2 call LoadScreenTilesFromBuffer2
call EnableLCD call EnableLCD
IF DEF(_RED) IF DEF(_RED)
ld a, CHARMANDER ; which Pokemon to show first on the title screen ld a, CHARMANDER ; which Pokemon to show first on the title screen
ENDC ENDC
IF DEF(_BLUE) IF DEF(_BLUE)
ld a, SQUIRTLE ; which Pokemon to show first on the title screen ld a, SQUIRTLE ; which Pokemon to show first on the title screen
ENDC ENDC
ld [wTitleMonSpecies], a ld [wTitleMonSpecies], a
call LoadTitleMonSprite call LoadTitleMonSprite
ld a, HIGH(vBGMap0 + $300) ld a, HIGH(vBGMap0 + $300)
call TitleScreenCopyTileMapToVRAM call TitleScreenCopyTileMapToVRAM
call SaveScreenTilesToBuffer1 call SaveScreenTilesToBuffer1