From ccfcdb4e7766b693ccdacf423d17f6e8c36e73ac Mon Sep 17 00:00:00 2001 From: "Michael R. Cook" Date: Tue, 13 Jan 2026 21:15:47 +0100 Subject: [PATCH 1/2] fix: player can now MoveUp --- galactic-armada/src/main/states/gameplay/objects/player.asm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/galactic-armada/src/main/states/gameplay/objects/player.asm b/galactic-armada/src/main/states/gameplay/objects/player.asm index 5dc58c7b..17cd0cac 100644 --- a/galactic-armada/src/main/states/gameplay/objects/player.asm +++ b/galactic-armada/src/main/states/gameplay/objects/player.asm @@ -234,9 +234,9 @@ MoveUp: sub PLAYER_MOVE_SPEED ld [wPlayerPositionY], a - ld a, [wPlayerPositionY] + ld a, [wPlayerPositionY+1] sbc 0 - ld [wPlayerPositionY], a + ld [wPlayerPositionY+1], a ret From 5356b1e51d3bd3cd3be97fc024441845ea81989b Mon Sep 17 00:00:00 2001 From: "Michael R. Cook" Date: Wed, 14 Jan 2026 23:59:24 +0100 Subject: [PATCH 2/2] Trim some blank lines --- .../src/main/states/gameplay/objects/player.asm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/galactic-armada/src/main/states/gameplay/objects/player.asm b/galactic-armada/src/main/states/gameplay/objects/player.asm index 17cd0cac..b7095ac9 100644 --- a/galactic-armada/src/main/states/gameplay/objects/player.asm +++ b/galactic-armada/src/main/states/gameplay/objects/player.asm @@ -41,7 +41,7 @@ InitializePlayer:: ld [wPlayerPositionX+1], a ld [wPlayerPositionY+1], a - + CopyPlayerTileDataIntoVRAM: ; Copy the player's tile data into VRAM ld de, playerShipTileData @@ -77,7 +77,7 @@ UpdatePlayer_HandleInput: and PADF_A call nz, TryShoot ; ANCHOR_END: player-update-start - + ; ANCHOR: player-update-flashing ld a, [mPlayerFlash+0] @@ -99,7 +99,7 @@ UpdatePlayer_UpdateSprite_CheckFlashing: ld a, c sbc 0 ld c, a - + UpdatePlayer_UpdateSprite_DecreaseFlashing: @@ -144,7 +144,7 @@ UpdatePlayer_UpdateSprite: ld b, a ld a, [wPlayerPositionX+1] ld d, a - + srl d rr b srl d @@ -168,7 +168,7 @@ UpdatePlayer_UpdateSprite: rr c srl e rr c - + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ; Drawing the palyer metasprite ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -212,7 +212,7 @@ TryShoot: ; ANCHOR: player-damage DamagePlayer:: - + xor a ld [mPlayerFlash], a