aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPokechu22 <Pokechu022@gmail.com>2017-09-29 19:16:08 -0700
committerPokechu22 <Pokechu022@gmail.com>2017-09-29 19:16:08 -0700
commit901844f536e7eef58045c3dbeb6387e2c78ba870 (patch)
treebfb94c2f0cd29633a6a68e27b024685f7c52677c
parentReplace deprecated mnemonics by the correct ones (diff)
downloadpokeyellow-901844f536e7eef58045c3dbeb6387e2c78ba870.tar.gz
pokeyellow-901844f536e7eef58045c3dbeb6387e2c78ba870.tar.xz
pokeyellow-901844f536e7eef58045c3dbeb6387e2c78ba870.zip
Use unions rather than negative offsets
-rwxr-xr-xwram.asm6
1 files changed, 5 insertions, 1 deletions
diff --git a/wram.asm b/wram.asm
index cc2d332a..628e0664 100755
--- a/wram.asm
+++ b/wram.asm
@@ -3137,10 +3137,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
@@ -3153,6 +3155,8 @@ wEnemyMon6:: party_struct wEnemyMon6
wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d9ac
wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d9ee
+ENDU
+
wTrainerHeaderPtr:: ; da30
ds 2