Skip to content

Fix inconsistent variable name for 'PlayerFlash' #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avivace merged 1 commit into from
Jul 29, 2026
+12 −12
Merged

Fix inconsistent variable name for 'PlayerFlash' #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions galactic-armada/src/main/states/gameplay/objects/player.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ SECTION "PlayerVariables", WRAM0
wPlayerPositionX:: dw
wPlayerPositionY:: dw

mPlayerFlash: dw
wPlayerFlash: dw
; ANCHOR_END: player-start
; ANCHOR: player-data
SECTION "Player", ROM0
Expand All @@ -28,8 +28,8 @@ playerTestMetaSprite::
InitializePlayer::

xor a
ld [mPlayerFlash], a
ld [mPlayerFlash+1], a
ld [wPlayerFlash], a
ld [wPlayerFlash+1], a

; Place in the middle of the screen
xor a
Expand Down Expand Up @@ -79,10 +79,10 @@ UpdatePlayer_HandleInput:


; ANCHOR: player-update-flashing
ld a, [mPlayerFlash+0]
ld a, [wPlayerFlash+0]
ld b, a

ld a, [mPlayerFlash+1]
ld a, [wPlayerFlash+1]
ld c, a

UpdatePlayer_UpdateSprite_CheckFlashing:
Expand All @@ -103,9 +103,9 @@ UpdatePlayer_UpdateSprite_CheckFlashing:
UpdatePlayer_UpdateSprite_DecreaseFlashing:

ld a, b
ld [mPlayerFlash], a
ld [wPlayerFlash], a
ld a, c
ld [mPlayerFlash+1], a
ld [wPlayerFlash+1], a

; descale bc
srl c
Expand All @@ -131,8 +131,8 @@ UpdatePlayer_UpdateSprite_Flashing:
UpdatePlayer_UpdateSprite_StopFlashing:

xor a
ld [mPlayerFlash],a
ld [mPlayerFlash+1],a
ld [wPlayerFlash],a
ld [wPlayerFlash+1],a
; ANCHOR_END: player-update-flashing

; ANCHOR: player-update-sprite
Expand Down Expand Up @@ -215,9 +215,9 @@ DamagePlayer::
ld [wUpdateHud], a; Tell gameplay-state to update hud

xor a
ld [mPlayerFlash], a
ld [wPlayerFlash], a
inc a
ld [mPlayerFlash+1], a
ld [wPlayerFlash+1], a

ld a, [wLives]
dec a
Expand Down
2 changes: 1 addition & 1 deletion src/part3/the-player.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ If we get past all of the "wPlayerFlash" logic, we'll draw our player using the
{{#include ../../galactic-armada/src/main/states/gameplay/objects/player.asm:player-update-sprite}}
```

That's the end our our "UpdatePlayer" function. The final bit of code for our player handles when they are damaged. When an enemy damages the player, we want to decrease our lives by one. We'll also start flashing by giving our 'mPlayerFlash' variable a non-zero value. In the gameplay game state, if we've lost all lives, gameplay will end.
That's the end our our "UpdatePlayer" function. The final bit of code for our player handles when they are damaged. When an enemy damages the player, we want to decrease our lives by one. We'll also start flashing by giving our 'wPlayerFlash' variable a non-zero value. In the gameplay game state, if we've lost all lives, gameplay will end.

```rgbasm,linenos,start={{#line_no_of "" ../../galactic-armada/src/main/states/gameplay/objects/player.asm:player-damage}}
{{#include ../../galactic-armada/src/main/states/gameplay/objects/player.asm:player-damage}}
Expand Down
Loading