diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2019-01-24 21:42:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-24 21:42:44 -0500 |
| commit | 9ecc991814986fdadecd83247adf13e10eaf77ed (patch) | |
| tree | c7a356e72b31deee8cc91e05d4da173796231610 /engine | |
| parent | 79ea091ff627d5e3613799698b5bf1ea95f45148 (diff) | |
| parent | e288ef20d539a04042c5e91cc562db04bb33b707 (diff) | |
Merge pull request #593 from mid-kid/temp
More patches
Diffstat (limited to 'engine')
| -rw-r--r-- | engine/events/map_name_sign.asm | 2 | ||||
| -rw-r--r-- | engine/events/mom_phone.asm | 2 | ||||
| -rw-r--r-- | engine/gfx/pic_animation.asm | 4 | ||||
| -rw-r--r-- | engine/movie/title.asm | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/engine/events/map_name_sign.asm b/engine/events/map_name_sign.asm index 0b6b2b203..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, 5 + ld c, (SCREEN_WIDTH - 2) / 4 + 1 jr .enterloop .continueloop 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/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] |