From 5f60cc24cf0935c4908151f0462e67a08d59558d Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Tue, 15 Jan 2019 13:06:16 +0100
Subject: [PATCH] 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.
---
 constants/sfx_constants.asm  | 4 ++--
 engine/events/mom_phone.asm  | 2 +-
 engine/gfx/pic_animation.asm | 4 ++--
 gfx/pokemon/anims.asm        | 2 --
 gfx/pokemon/unown_anims.asm  | 2 --
 5 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/constants/sfx_constants.asm b/constants/sfx_constants.asm
index 37fd908db..b58af59ea 100644
--- 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
diff --git a/engine/events/mom_phone.asm b/engine/events/mom_phone.asm
index 6e14e33d9..0a8dbef29 100644
--- 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
 
diff --git a/engine/gfx/pic_animation.asm b/engine/gfx/pic_animation.asm
index 6d8b52d44..88dc1f6d9 100644
--- a/engine/gfx/pic_animation.asm
+++ b/engine/gfx/pic_animation.asm
@@ -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
diff --git a/gfx/pokemon/anims.asm b/gfx/pokemon/anims.asm
index 761e7125c..e8f490cb2 100644
--- 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"
diff --git a/gfx/pokemon/unown_anims.asm b/gfx/pokemon/unown_anims.asm
index 6e8d251d5..6aa239e8e 100644
--- 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"