mirror of
https://github.com/thornAvery/kep-hack.git
synced 2026-02-21 14:48:43 +13:00
Merge branch 'mistress' into renewables
This commit is contained in:
commit
684a075631
52 changed files with 300 additions and 98 deletions
|
|
@ -2038,6 +2038,9 @@ LoadWalkingPlayerSpriteGraphics::
|
|||
ld a, [wPlayerSex]
|
||||
and a
|
||||
jr z, .AreGuy1
|
||||
ld de, TealSprite
|
||||
cp a, 2
|
||||
jr z, .AreGuy1
|
||||
ld de, GreenSprite
|
||||
.AreGuy1
|
||||
ld hl,vNPCSprites
|
||||
|
|
@ -2053,6 +2056,9 @@ LoadBikePlayerSpriteGraphics::
|
|||
ld a, [wPlayerSex]
|
||||
and a
|
||||
jr z, .AreGuy2
|
||||
ld de, TealBikeSprite
|
||||
cp a, 2
|
||||
jr z, .AreGuy2
|
||||
ld de, GreenBikeSprite
|
||||
.AreGuy2
|
||||
ld hl, vNPCSprites
|
||||
|
|
|
|||
|
|
@ -522,6 +522,8 @@ TextCommand_SOUND::
|
|||
jr z, .pokemonCry
|
||||
cp TX_SOUND_CRY_NIDORINA
|
||||
jr z, .pokemonCry
|
||||
cp TX_SOUND_CRY_NIDOREIGN
|
||||
jr z, .pokemonCry
|
||||
ld a, [hl]
|
||||
call PlaySound
|
||||
call WaitForSoundToFinish
|
||||
|
|
@ -542,7 +544,7 @@ TextCommandSounds::
|
|||
db TX_SOUND_GET_ITEM_1, SFX_GET_ITEM_1 ; actually plays SFX_LEVEL_UP when the battle music engine is loaded
|
||||
db TX_SOUND_CAUGHT_MON, SFX_CAUGHT_MON
|
||||
db TX_SOUND_POKEDEX_RATING, SFX_POKEDEX_RATING ; unused
|
||||
db TX_SOUND_GET_ITEM_1_DUPLICATE, SFX_GET_ITEM_1 ; unused
|
||||
db TX_SOUND_CRY_NIDOREIGN, NIDOREIGN ; Was SFX_GET_ITEM_1 duplicate
|
||||
db TX_SOUND_GET_ITEM_2, SFX_GET_ITEM_2
|
||||
db TX_SOUND_GET_KEY_ITEM, SFX_GET_KEY_ITEM
|
||||
db TX_SOUND_DEX_PAGE_ADDED, SFX_DEX_PAGE_ADDED
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue