diff options
| -rw-r--r-- | constants.asm | 1 | ||||
| -rw-r--r-- | constants/pokemon_constants.asm | 8 | ||||
| -rwxr-xr-x | constants/starter_mons.asm | 3 | ||||
| -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 |
8 files changed, 14 insertions, 9 deletions
diff --git a/constants.asm b/constants.asm index 3d428283..36a7acf5 100644 --- a/constants.asm +++ b/constants.asm @@ -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" diff --git a/constants/pokemon_constants.asm b/constants/pokemon_constants.asm index 5a91f0f8..7312dbf1 100644 --- a/constants/pokemon_constants.asm +++ b/constants/pokemon_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 diff --git a/constants/starter_mons.asm b/constants/starter_mons.asm deleted file mode 100755 index 16de35d4..00000000 --- a/constants/starter_mons.asm +++ /dev/null @@ -1,3 +0,0 @@ -STARTER1 EQU CHARMANDER -STARTER2 EQU SQUIRTLE -STARTER3 EQU BULBASAUR 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 |