diff options
Diffstat (limited to 'ram')
| -rw-r--r-- | ram/wram.asm | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ram/wram.asm b/ram/wram.asm index c72329fb..8d983753 100644 --- a/ram/wram.asm +++ b/ram/wram.asm @@ -639,10 +639,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:: @@ -1919,7 +1922,7 @@ wOptions:: db wObtainedBadges:: flag_array NUM_BADGES - ds 1 +wUnusedObtainedBadges:: db wLetterPrintingDelayFlags:: db @@ -2395,7 +2398,7 @@ wSerialEnemyDataBlock:: ; ds $1a8 ds 9 -wEnemyPartyCount:: ds 1 +wEnemyPartyCount:: db wEnemyPartySpecies:: ds PARTY_LENGTH + 1 wEnemyMons:: |