diff options
| author | dannye <33dannye@gmail.com> | 2022-09-11 23:34:59 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2022-09-12 00:53:37 -0500 |
| commit | ecab35295aefb44227ba38f257dc40c8c10474e3 (patch) | |
| tree | d04160bc19180ee50a941d121f90cc7071e7a672 /engine/movie | |
| parent | Replace Hard-Coded Number With Constant (diff) | |
| parent | Add `UNUSED_TYPE`/`UNUSED_TYPE_END` constants (diff) | |
| download | pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.gz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.tar.xz pokeyellow-ecab35295aefb44227ba38f257dc40c8c10474e3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/movie')
| -rw-r--r-- | engine/movie/evolution.asm | 2 | ||||
| -rw-r--r-- | engine/movie/splash.asm | 2 | ||||
| -rw-r--r-- | engine/movie/trade.asm | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/movie/evolution.asm b/engine/movie/evolution.asm index 2cf841c8..37e10188 100644 --- a/engine/movie/evolution.asm +++ b/engine/movie/evolution.asm @@ -8,7 +8,7 @@ EvolveMon: push af xor a ld [wLowHealthAlarm], a - ld [wChannelSoundIDs + Ch5], a + ld [wChannelSoundIDs + CHAN5], a call StopAllMusic ld a, $1 ldh [hAutoBGTransferEnabled], a diff --git a/engine/movie/splash.asm b/engine/movie/splash.asm index 13f80bb1..03337525 100644 --- a/engine/movie/splash.asm +++ b/engine/movie/splash.asm @@ -7,7 +7,7 @@ LoadShootingStarGraphics: call UpdateGBCPal_OBP1 ld de, AnimationTileset2 tile 3 ; star tile (top left quadrant) ld hl, vChars1 tile $20 - lb bc, BANK(AnimationTileset2), $01 + lb bc, BANK(AnimationTileset2), 1 call CopyVideoData ld de, AnimationTileset2 tile 19 ; star tile (bottom left quadrant) ld hl, vChars1 tile $21 diff --git a/engine/movie/trade.asm b/engine/movie/trade.asm index 3617f40a..7143701b 100644 --- a/engine/movie/trade.asm +++ b/engine/movie/trade.asm @@ -624,7 +624,7 @@ Trade_WriteCircledMonOAM: Trade_AddOffsetsToOAMCoords: ld hl, wShadowOAM - ld c, $14 ; SCREEN_WIDTH? + ld c, $14 .loop ld a, [wBaseCoordY] add [hl] |