summaryrefslogtreecommitdiff
path: root/wram.asm
diff options
context:
space:
mode:
authoreinstein95 <einstein95@users.noreply.github.com>2017-09-30 21:55:14 +1300
committereinstein95 <einstein95@users.noreply.github.com>2017-09-30 21:55:14 +1300
commit9d864ede0e89cd95c9d2ff090a218bd64611fdee (patch)
treed4b18f8eb867228fc6e81356bceadf3be188cc2f /wram.asm
parent66e9f2288377f697bd8a63b9fe7dbe4a314ff200 (diff)
parent5c2419383118280465a89657fed34ed6562f2981 (diff)
Update for rgbds 0.3.3HEADmaster
Diffstat (limited to 'wram.asm')
-rwxr-xr-xwram.asm6
1 files changed, 5 insertions, 1 deletions
diff --git a/wram.asm b/wram.asm
index 41db5c8d..63c30217 100755
--- a/wram.asm
+++ b/wram.asm
@@ -3142,10 +3142,12 @@ wEnemyPartyCount:: ds 1 ; d89c
wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d
; Overload enemy party data
+UNION
+
wWaterRate:: db ; d8a4
wWaterMons:: db ; d8a5
- ds wWaterRate - @
+NEXTU
wEnemyMons:: ; d8a4
wEnemyMon1:: party_struct wEnemyMon1
@@ -3158,6 +3160,8 @@ wEnemyMon6:: party_struct wEnemyMon6
wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d9ac
wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d9ee
+ENDU
+
wTrainerHeaderPtr:: ; da30
ds 2