From a8f26148e33c9dd26ac6ec24060349048a1ce95d Mon Sep 17 00:00:00 2001 From: Sylvie <35663410+Rangi42@users.noreply.github.com> Date: Mon, 7 Oct 2024 12:03:48 -0400 Subject: [PATCH] Consistently format WRAM values (#476) * Use `db` instead of `ds 1` * Use a `UNION` for overlapping `db`/`dw` --- ram/wram.asm | 9 ++++++--- 1 file 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::