Skip to content
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.

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

Consistently format WRAM values #476

Merged
merged 2 commits into from
Oct 7, 2024
Merged
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions ram/wram.asm
Original file line number Diff line number Diff line change
Expand Up @@ -496,10 +496,13 @@ wPlayerMonMinimized:: db

ds 13

; number of hits by enemy in attacks like Double Slap, etc.
wEnemyNumHits:: ; db
UNION
; the amount of damage accumulated by the enemy while biding
wEnemyBideAccumulatedDamage:: dw
NEXTU
; number of hits by enemy in attacks like Double Slap, etc.
wEnemyNumHits:: db
ENDU

ds 8
wMiscBattleDataEnd::
Expand Down Expand Up @@ -2137,7 +2140,7 @@ wSerialEnemyDataBlock:: ; ds $1a8

ds 9

wEnemyPartyCount:: ds 1
wEnemyPartyCount:: db
wEnemyPartySpecies:: ds PARTY_LENGTH + 1

wEnemyMons::
Expand Down