diff options
| author | yenatch <yenatch@gmail.com> | 2017-09-29 22:41:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-29 22:41:34 -0400 |
| commit | 5c2419383118280465a89657fed34ed6562f2981 (patch) | |
| tree | 4844873fcd027d8f238be629d283663d5fcafc9b /wram.asm | |
| parent | fc9712596f6122fc114e0136c19795b36ee4868b (diff) | |
| parent | d7fae287e49652f05c137ed20ce27e43d07b7514 (diff) | |
Merge pull request #167 from Pokechu22/rgbds-0.3.3
Update for RGBDS 0.3.3
Diffstat (limited to 'wram.asm')
| -rwxr-xr-x | wram.asm | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -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 |