summaryrefslogtreecommitdiff
path: root/engine
diff options
context:
space:
mode:
authormid-kid <esteve.varela@gmail.com>2019-01-15 13:06:16 +0100
committermid-kid <esteve.varela@gmail.com>2019-01-15 13:06:16 +0100
commit5f60cc24cf0935c4908151f0462e67a08d59558d (patch)
tree9e35d189dc4f6448aaea340bad5967e9a1cc9924 /engine
parent1853e3d127556103fe5828b8589305192106d27e (diff)
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.
Diffstat (limited to 'engine')
-rw-r--r--engine/events/mom_phone.asm2
-rw-r--r--engine/gfx/pic_animation.asm4
2 files changed, 3 insertions, 3 deletions
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