From 5f60cc24cf0935c4908151f0462e67a08d59558d Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 15 Jan 2019 13:06:16 +0100 Subject: 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. --- engine/events/mom_phone.asm | 2 +- engine/gfx/pic_animation.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engine') 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 -- cgit v1.2.3 From a21507f22a0a93fe2b0b67073dd9f847864e49a9 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Tue, 15 Jan 2019 13:08:40 +0100 Subject: Document wSuicuneFrame Also fixed inmediate in PlaceMapNameFrame.FillTopBottom to calculate the amount of loops required. (It fills two tiles in the first iteration, and four in the remaining, hence the `-2` and `+1` part). --- engine/events/map_name_sign.asm | 2 +- engine/movie/title.asm | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'engine') diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 0b6b2b203..7bdbe8e8a 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -242,7 +242,7 @@ PlaceMapNameFrame: ret .FillTopBottom: - ld c, 5 + ld c, ((SCREEN_WIDTH - 2) - 2) / 4 + 1 jr .enterloop .continueloop diff --git a/engine/movie/title.asm b/engine/movie/title.asm index 26b30c3ee..a48b71e62 100644 --- a/engine/movie/title.asm +++ b/engine/movie/title.asm @@ -208,7 +208,7 @@ _TitleScreen: ldh [hBGMapMode], a xor a - ld [wd002], a + ld [wSuicuneFrame], a ; Play starting sound effect call SFXChannelsOff @@ -218,7 +218,7 @@ _TitleScreen: ret SuicuneFrameIterator: - ld hl, wd002 + ld hl, wSuicuneFrame ld a, [hl] ld c, a inc [hl] -- cgit v1.2.3 From e288ef20d539a04042c5e91cc562db04bb33b707 Mon Sep 17 00:00:00 2001 From: mid-kid Date: Fri, 18 Jan 2019 16:17:50 +0100 Subject: Fix map name frame calculation --- engine/events/map_name_sign.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'engine') diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 7bdbe8e8a..6162378a9 100644 --- a/engine/events/map_name_sign.asm +++ b/engine/events/map_name_sign.asm @@ -242,7 +242,7 @@ PlaceMapNameFrame: ret .FillTopBottom: - ld c, ((SCREEN_WIDTH - 2) - 2) / 4 + 1 + ld c, (SCREEN_WIDTH - 2) / 4 + 1 jr .enterloop .continueloop -- cgit v1.2.3