pokehacks/pokecrystal-board
0
0
Fork 0
mirror of https://gitlab.com/xCrystal/pokecrystal-board.git synced 2024-11-16 11:27:33 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix some constants

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants/sfx_constants.asm
View File

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

2
engine/events/mom_phone.asm
View File

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

4
engine/gfx/pic_animation.asm
View File

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

2
gfx/pokemon/anims.asm
View File

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

2
gfx/pokemon/unown_anims.asm
View File

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