diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-31 10:58:41 -0400 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-08-31 10:58:41 -0400 |
| commit | 8ce20e5c31ed2255e708e6a38c7b75d3d8bee48c (patch) | |
| tree | 8c4770326f0b1b347a84f7adf4e7d3f447a51992 /engine | |
| parent | bfd9f617c96af851ad4100b752ea967ef8989edc (diff) | |
Define a constant for the ghost Marowak (hard-coded throughout the engine, like the starters)
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/battle/common_text.asm | 2 | ||||
| -rwxr-xr-x | engine/battle/core.asm | 2 | ||||
| -rw-r--r-- | engine/battle/ghost_marowak_anim.asm | 2 | ||||
| -rwxr-xr-x | engine/items/item_effects.asm | 2 | ||||
| -rwxr-xr-x | engine/movie/title.asm | 3 |
5 files changed, 6 insertions, 5 deletions
diff --git a/engine/battle/common_text.asm b/engine/battle/common_text.asm index 9f6f90b6..8c9e6afa 100644 --- a/engine/battle/common_text.asm +++ b/engine/battle/common_text.asm @@ -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 diff --git a/engine/battle/core.asm b/engine/battle/core.asm index 4f35ba39..8289ecc9 100755 --- a/engine/battle/core.asm +++ b/engine/battle/core.asm @@ -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 diff --git a/engine/battle/ghost_marowak_anim.asm b/engine/battle/ghost_marowak_anim.asm index 7405c40b..975bb937 100644 --- a/engine/battle/ghost_marowak_anim.asm +++ b/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, MAROWAK + ld a, GHOST_MON ld [wChangeMonPicEnemyTurnSpecies], a ld a, $1 ldh [hWhoseTurn], a diff --git a/engine/items/item_effects.asm b/engine/items/item_effects.asm index 9a030d9d..244474ef 100755 --- a/engine/items/item_effects.asm +++ b/engine/items/item_effects.asm @@ -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 diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 7b883cfd..a75c64ee 100755 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -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 |