ref: 5f60cc24cf0935c4908151f0462e67a08d59558d
parent: 1853e3d127556103fe5828b8589305192106d27e
author: mid-kid <[email protected]>
date: Tue Jan 15 08:06:16 EST 2019
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.
--- a/constants/sfx_constants.asm
+++ b/constants/sfx_constants.asm
@@ -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
--- a/engine/events/mom_phone.asm
+++ b/engine/events/mom_phone.asm
@@ -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
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -892,12 +892,12 @@
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
--- a/gfx/pokemon/anims.asm
+++ b/gfx/pokemon/anims.asm
@@ -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"
--- a/gfx/pokemon/unown_anims.asm
+++ b/gfx/pokemon/unown_anims.asm
@@ -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"