Use unions rather than negative offsets

This commit is contained in:
Pokechu22 2017-09-29 19:16:08 -07:00
parent 9ea25bc8cd
commit 901844f536

View file

@ -3137,10 +3137,12 @@ wEnemyPartyCount:: ds 1 ; d89c
wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d wEnemyPartyMons:: ds PARTY_LENGTH + 1 ; d89d
; Overload enemy party data ; Overload enemy party data
UNION
wWaterRate:: db ; d8a4 wWaterRate:: db ; d8a4
wWaterMons:: db ; d8a5 wWaterMons:: db ; d8a5
ds wWaterRate - @ NEXTU
wEnemyMons:: ; d8a4 wEnemyMons:: ; d8a4
wEnemyMon1:: party_struct wEnemyMon1 wEnemyMon1:: party_struct wEnemyMon1
@ -3153,6 +3155,8 @@ wEnemyMon6:: party_struct wEnemyMon6
wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d9ac wEnemyMonOT:: ds NAME_LENGTH * PARTY_LENGTH ; d9ac
wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d9ee wEnemyMonNicks:: ds NAME_LENGTH * PARTY_LENGTH ; d9ee
ENDU
wTrainerHeaderPtr:: ; da30 wTrainerHeaderPtr:: ; da30
ds 2 ds 2