From 901844f536e7eef58045c3dbeb6387e2c78ba870 Mon Sep 17 00:00:00 2001 From: Pokechu22 Date: Fri, 29 Sep 2017 19:16:08 -0700 Subject: Use unions rather than negative offsets --- wram.asm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3