From 996b5175889a30c668b0c0af21101f8fa84e5b5e Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Sun, 6 Oct 2024 01:27:28 -0400 Subject: [PATCH 1/2] Use `db` instead of `ds 1` --- ram/wram.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ram/wram.asm b/ram/wram.asm index 8a774edf8c..b33c5c7549 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -2137,7 +2137,7 @@ wSerialEnemyDataBlock:: ; ds $1a8 ds 9 -wEnemyPartyCount:: ds 1 +wEnemyPartyCount:: db wEnemyPartySpecies:: ds PARTY_LENGTH + 1 wEnemyMons:: From 0c65521afe9873d58a198dddb7a9522b84be6ac7 Mon Sep 17 00:00:00 2001 From: Rangi42 Date: Mon, 7 Oct 2024 11:51:22 -0400 Subject: [PATCH 2/2] Use a UNION for overlapping `db`/`dw` --- ram/wram.asm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ram/wram.asm b/ram/wram.asm index b33c5c7549..66a2d332c7 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::