Fix some constants

Glass ting SFX were added in crystal.
PicAnimations and UnownAnimations are expected to be in the same bank as
their pointers, because the pointers are not BANK()-referenced
separately.
This commit is contained in:
mid-kid 2019-01-15 13:06:16 +01:00
parent 1853e3d127
commit 5f60cc24cf
5 changed files with 5 additions and 9 deletions

View File

@ -189,10 +189,10 @@
const SFX_TRAIN_ARRIVED ; b9
const SFX_STOP_SLOT ; ba
const SFX_2_BOOPS ; bb
const SFX_GLASS_TING ; bc
const SFX_GLASS_TING_2 ; bd
; new to Crystal
const SFX_GLASS_TING ; bc
const SFX_GLASS_TING_2 ; bd
const SFX_INTRO_UNOWN_1 ; be
const SFX_INTRO_UNOWN_2 ; bf
const SFX_INTRO_UNOWN_3 ; c0

View File

@ -1,7 +1,7 @@
NUM_MOM_ITEMS_1 EQUS "((MomItems_1.End - MomItems_1) / 8)"
NUM_MOM_ITEMS_2 EQUS "((MomItems_2.End - MomItems_2) / 8)"
const_value = 1
const_def 1
const MOM_ITEM
const MOM_DOLL

View File

@ -892,12 +892,12 @@ GetMonAnimPointer:
call PokeAnim_IsEgg
jr z, .egg
ld c, BANK(UnownAnimations)
ld c, BANK(UnownAnimationPointers) ; aka BANK(UnownAnimationIdlePointers)
ld hl, UnownAnimationPointers
ld de, UnownAnimationIdlePointers
call PokeAnim_IsUnown
jr z, .unown
ld c, BANK(PicAnimations)
ld c, BANK(AnimationPointers) ; aka BANK(AnimationIdlePointers)
ld hl, AnimationPointers
ld de, AnimationIdlePointers
.unown

View File

@ -1,5 +1,3 @@
PicAnimations: ; used only for BANK(PicAnimations)
BulbasaurAnimation: INCLUDE "gfx/pokemon/bulbasaur/anim.asm"
IvysaurAnimation: INCLUDE "gfx/pokemon/ivysaur/anim.asm"
VenusaurAnimation: INCLUDE "gfx/pokemon/venusaur/anim.asm"

View File

@ -1,5 +1,3 @@
UnownAnimations: ; used only for BANK(UnownAnimations)
UnownAAnimation: INCLUDE "gfx/pokemon/unown_a/anim.asm"
UnownBAnimation: INCLUDE "gfx/pokemon/unown_b/anim.asm"
UnownCAnimation: INCLUDE "gfx/pokemon/unown_c/anim.asm"