Skip to content

Commit

Permalink
Consistently format WRAM values (pret#476)
Browse files Browse the repository at this point in the history
* Use `db` instead of `ds 1`

* Use a `UNION` for overlapping `db`/`dw`
  • Loading branch information
Rangi42 authored and PokefanMarcel committed Oct 18, 2024
1 parent cbd1b9d commit 4a27c08
Showing 1 changed file with 6 additions and 3 deletions.
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 @@ -2159,7 +2162,7 @@ wSerialEnemyDataBlock:: ; ds $1a8

ds 9

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

wEnemyMons::
Expand Down

0 comments on commit 4a27c08

Please sign in to comment.