Merge pull request #593 from mid-kid/temp

More patches
This commit is contained in:
Rangi
2019-01-24 21:42:44 -05:00
committed by GitHub
10 changed files with 11 additions and 14 deletions

View File

@@ -242,7 +242,7 @@ PlaceMapNameFrame:
ret
.FillTopBottom:
ld c, 5
ld c, (SCREEN_WIDTH - 2) / 4 + 1
jr .enterloop
.continueloop

View File

@@ -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

View File

@@ -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

View File

@@ -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]