diff options
| -rw-r--r-- | engine/overworld/map_objects.asm | 6 | ||||
| -rw-r--r-- | wram.asm | 12 |
2 files changed, 11 insertions, 7 deletions
diff --git a/engine/overworld/map_objects.asm b/engine/overworld/map_objects.asm index 62b1df41..5559dde7 100644 --- a/engine/overworld/map_objects.asm +++ b/engine/overworld/map_objects.asm @@ -2716,12 +2716,12 @@ InitSprites: .DeterminePriorities: xor a - ld hl, wMovementPointer + ld hl, wObjectPriorities ld bc, NUM_OBJECT_STRUCTS call ByteFill ld d, 0 ld bc, wObjectStructs - ld hl, wMovementPointer + ld hl, wObjectPriorities .loop push hl call DoesObjectHaveASprite @@ -2768,7 +2768,7 @@ InitSprites: ret .InitSpritesByPriority: - ld hl, wMovementPointer + ld hl, wObjectPriorities .next_sprite ld a, [hli] ld d, a @@ -1232,15 +1232,18 @@ wPlayerMovement:: db ; ce88 wMovementObject:: db ; ce8b wMovementDataBank:: db ; ce8c wMovementDataAddress:: dw ; ce8d -wce8f:: db ; ce8f +wce8f:: dw ; ce8f - ds 3 + ds 2 wMovementByteWasControlSwitch:: db ; ce93 -wMovementPointer:: dw ; ce94 - ds 3 +UNION ; ce94 +wObjectPriorities:: ds NUM_OBJECT_STRUCTS ; ce94 +NEXTU ; ce94 +wMovementPointer:: dw ; ce94 + ds 3 wTempObjectCopyMapObjectIndex:: db ; ce99 wTempObjectCopySprite:: db ; ce9a wTempObjectCopySpriteVTile:: db ; ce9b @@ -1250,6 +1253,7 @@ wTempObjectCopyRange:: db ; ce9e wTempObjectCopyX:: db ; ce9f wTempObjectCopyY:: db ; cea0 wTempObjectCopyRadius:: db ; cea1 +ENDU ; cea1 ds 1 |