WARNING: THIS SITE IS A MIRROR OF GITHUB.COM / IT CANNOT LOGIN OR REGISTER ACCOUNTS / THE CONTENTS ARE PROVIDED AS-IS / THIS SITE ASSUMES NO RESPONSIBILITY FOR ANY DISPLAYED CONTENT OR LINKS / IF YOU FOUND SOMETHING MAY NOT GOOD FOR EVERYONE, CONTACT ADMIN AT ilovescratch@foxmail.com
Skip to content

Commit c010226

Browse files
committed
Use SCREEN_HEIGHT_PX + OAM_Y_OFS constant when hiding sprites
1 parent ebac4b9 commit c010226

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

engine/battle/animations.asm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1318,7 +1318,7 @@ AdjustOAMBlockXPos2:
13181318
jr c, .skipPuttingEntryOffScreen
13191319
; put off-screen if X >= 168
13201320
dec hl
1321-
ld a, 160
1321+
ld a, SCREEN_HEIGHT_PX + OAM_Y_OFS
13221322
ld [hli], a
13231323
.skipPuttingEntryOffScreen
13241324
ld [hl], a
@@ -2379,7 +2379,7 @@ FallingObjects_UpdateOAMEntry:
23792379
inc a
23802380
cp 112
23812381
jr c, .next
2382-
ld a, 160 ; if Y >= 112, put it off-screen
2382+
ld a, SCREEN_HEIGHT_PX + OAM_Y_OFS ; if Y >= 112, put it off-screen
23832383
.next
23842384
ld [hli], a ; Y
23852385
ld a, [wFallingObjectMovementByte]

engine/gfx/sprite_oam.asm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,15 +149,15 @@ PrepareOAMData::
149149
ld l, a
150150
ld h, HIGH(wShadowOAM)
151151
ld de, OBJ_SIZE
152-
ld b, $a0
152+
ld b, SCREEN_HEIGHT_PX + OAM_Y_OFS
153153
ld a, [wMovementFlags]
154154
bit BIT_LEDGE_OR_FISHING, a
155-
ld a, $a0
155+
ld a, LOW(wShadowOAMEnd)
156156
jr z, .clear
157157

158158
; Don't clear the last 4 entries because they are used for the shadow in the
159159
; jumping down ledge animation and the rod in the fishing animation.
160-
ld a, $90
160+
ld a, LOW(wShadowOAMSprite36)
161161

162162
.clear
163163
cp l

engine/items/town_map.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ TownMapSpriteBlinkingAnimation::
613613
ld b, OAM_COUNT - 4
614614
ld de, OBJ_SIZE
615615
.hideSpritesLoop
616-
ld [hl], $a0
616+
ld [hl], SCREEN_HEIGHT_PX + OAM_Y_OFS
617617
add hl, de
618618
dec b
619619
jr nz, .hideSpritesLoop

engine/menus/start_sub_menus.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -683,7 +683,7 @@ SwitchPartyMon_ClearGfx:
683683
ld de, OBJ_SIZE
684684
ld c, e
685685
.clearMonOAMLoop
686-
ld [hl], $a0
686+
ld [hl], SCREEN_HEIGHT_PX + OAM_Y_OFS
687687
add hl, de
688688
dec c
689689
jr nz, .clearMonOAMLoop

engine/movie/splash.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ AnimateShootingStar:
6464
ld c, 4
6565
ld de, OBJ_SIZE
6666
.clearOAMLoop
67-
ld [hl], 160
67+
ld [hl], SCREEN_HEIGHT_PX + OAM_Y_OFS
6868
add hl, de
6969
dec c
7070
jr nz, .clearOAMLoop

engine/overworld/player_animations.asm

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -209,13 +209,13 @@ LeaveMapThroughHoleAnim:
209209
ld [wShadowOAMSprite02TileID], a
210210
ld a, [wShadowOAMSprite01TileID]
211211
ld [wShadowOAMSprite03TileID], a
212-
ld a, $a0
212+
ld a, SCREEN_HEIGHT_PX + OAM_Y_OFS
213213
ld [wShadowOAMSprite00YCoord], a
214214
ld [wShadowOAMSprite01YCoord], a
215215
ld c, 2
216216
call DelayFrames
217217
; hide upper half of player's sprite
218-
ld a, $a0
218+
ld a, SCREEN_HEIGHT_PX + OAM_Y_OFS
219219
ld [wShadowOAMSprite02YCoord], a
220220
ld [wShadowOAMSprite03YCoord], a
221221
call GBFadeOutToWhite
@@ -423,7 +423,7 @@ FishingAnim:
423423
ld a, [wSpritePlayerStateData1ImageIndex] ; (image index is locked to standing images)
424424
cp SPRITE_FACING_UP
425425
jr nz, .skipHidingFishingRod
426-
ld a, $a0
426+
ld a, SCREEN_HEIGHT_PX + OAM_Y_OFS
427427
ld [wShadowOAMSprite39YCoord], a
428428

429429
.skipHidingFishingRod

home/clear_sprites.asm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ ClearSprites::
99
ret
1010

1111
HideSprites::
12-
ld a, 160
12+
ld a, SCREEN_HEIGHT_PX + OAM_Y_OFS
1313
ld hl, wShadowOAM
1414
ld de, OBJ_SIZE
1515
ld b, OAM_COUNT

0 commit comments

Comments
 (0)