Identify wObjectPriorities

This commit is contained in:
Rangi 2020-06-15 23:28:24 -04:00
parent bb0264e619
commit 4342ced31f
3 changed files with 17 additions and 8 deletions

View File

@ -314,7 +314,7 @@ UpdateStackTop:
FindStackTop: FindStackTop:
; Find the furthest point that sp has traversed to. ; Find the furthest point that sp has traversed to.
; This is distinct from the current value of sp. ; This is distinct from the current value of sp.
ld hl, wStack - $ff ld hl, wStackBottom
.loop .loop
ld a, [hl] ld a, [hl]
or a or a

View File

@ -2781,12 +2781,12 @@ InitSprites:
.DeterminePriorities: .DeterminePriorities:
xor a xor a
ld hl, wMovementPointer ld hl, wObjectPriorities
ld bc, NUM_OBJECT_STRUCTS ld bc, NUM_OBJECT_STRUCTS
call ByteFill call ByteFill
ld d, 0 ld d, 0
ld bc, wObjectStructs ld bc, wObjectStructs
ld hl, wMovementPointer ld hl, wObjectPriorities
.loop .loop
push hl push hl
call DoesObjectHaveASprite call DoesObjectHaveASprite
@ -2833,7 +2833,7 @@ InitSprites:
ret ret
.InitSpritesByPriority: .InitSpritesByPriority:
ld hl, wMovementPointer ld hl, wObjectPriorities
.next_sprite .next_sprite
ld a, [hli] ld a, [hli]
ld d, a ld d, a

View File

@ -166,18 +166,26 @@ wScriptVar:: db ; c2dd
wPlayerNextMovement:: db wPlayerNextMovement:: db
wPlayerMovement:: db wPlayerMovement:: db
ds 2 ds 2
wc2e2:: wc2e2::
wMovementObject:: wMovementObject::
db db
wMovementDataBank:: db wMovementDataBank:: db
wMovementDataAddress:: dw wMovementDataAddress:: dw
wc2e6:: ds 4 wc2e6:: dw
ds 2
wMovementByteWasControlSwitch:: db wMovementByteWasControlSwitch:: db
UNION ; c2eb
wObjectPriorities:: ds NUM_OBJECT_STRUCTS ; c2eb
NEXTU ; c2eb
wMovementPointer:: dw ; c2eb wMovementPointer:: dw ; c2eb
ds 3 ds 3
wTempObjectCopyMapObjectIndex:: db ; c2f0 wTempObjectCopyMapObjectIndex:: db ; c2f0
wTempObjectCopySprite:: db ; c2f1 wTempObjectCopySprite:: db ; c2f1
wTempObjectCopySpriteVTile:: db ; c2f2 wTempObjectCopySpriteVTile:: db ; c2f2
@ -187,6 +195,7 @@ wTempObjectCopyRange:: db ; c2f5
wTempObjectCopyX:: db ; c2f6 wTempObjectCopyX:: db ; c2f6
wTempObjectCopyY:: db ; c2f7 wTempObjectCopyY:: db ; c2f7
wTempObjectCopyRadius:: db ; c2f8 wTempObjectCopyRadius:: db ; c2f8
ENDU ; c2f8
ds 1 ds 1
@ -2466,7 +2475,7 @@ wStartMinute:: db ; d4b8
wStartSecond:: db ; d4b9 wStartSecond:: db ; d4b9
wRTC:: ds 4 ; d4ba wRTC:: ds 4 ; d4ba
ds 4 ds 4
wDST:: ; d4c2 wDST:: ; d4c2