diff options
| author | Sylvie <35663410+Rangi42@users.noreply.github.com> | 2024-10-07 12:03:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-07 12:03:48 -0400 |
| commit | a8f26148e33c9dd26ac6ec24060349048a1ce95d (patch) | |
| tree | 8932b97229c0ae5c5f3887602fd8002685fa6fc5 /ram | |
| parent | `FreezeEnemyTrainerSprite` -> `SetEnemyTrainerToStayAndFaceAnyDirection` (diff) | |
| download | pokeyellow-a8f26148e33c9dd26ac6ec24060349048a1ce95d.tar.gz pokeyellow-a8f26148e33c9dd26ac6ec24060349048a1ce95d.tar.xz pokeyellow-a8f26148e33c9dd26ac6ec24060349048a1ce95d.zip | |
Consistently format WRAM values (#476)
* Use `db` instead of `ds 1`
* Use a `UNION` for overlapping `db`/`dw`
Diffstat (limited to 'ram')
| -rw-r--r-- | ram/wram.asm | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/ram/wram.asm b/ram/wram.asm index 8a774edf..66a2d332 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -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:: @@ -2137,7 +2140,7 @@ wSerialEnemyDataBlock:: ; ds $1a8 ds 9 -wEnemyPartyCount:: ds 1 +wEnemyPartyCount:: db wEnemyPartySpecies:: ds PARTY_LENGTH + 1 wEnemyMons:: |