diff options
| author | dannye <33dannye@gmail.com> | 2024-10-09 21:56:57 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2024-10-09 21:56:57 -0500 |
| commit | 942c5f13eadb828dbf9dd6f75dfece007b53f353 (patch) | |
| tree | 0013406b83f352bed3f9b8247e7a73d11a150828 /ram | |
| parent | Rename off-by-one wram labels (diff) | |
| parent | Renamed pokemon-asm-tools to gb-asm-tools (diff) | |
| download | pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.tar.gz pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.tar.xz pokeyellow-942c5f13eadb828dbf9dd6f75dfece007b53f353.zip | |
Merge branch 'master' of https://github.com/pret/pokered
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:: |