diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-18 22:15:38 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-18 22:15:38 -0800 |
| commit | 4a365e9230962daf875a0444d51d76639c07c827 (patch) | |
| tree | be7332caa25d9711fd12921e347332993e5b0ff1 /src/field/fldeff_softboiled.c | |
| parent | 8edb453c9de6459f4da78522b248a2e507ba1f08 (diff) | |
| parent | 79650185e2af1748a9728f6e9209d64f93cdb050 (diff) | |
Merge pull request #462 from ProjectRevoTPP/sprite_struct
change Sprite struct to use a data array instead of manual declares.
Diffstat (limited to 'src/field/fldeff_softboiled.c')
| -rw-r--r-- | src/field/fldeff_softboiled.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/field/fldeff_softboiled.c b/src/field/fldeff_softboiled.c index b2c3d9bd1..c2a315233 100644 --- a/src/field/fldeff_softboiled.c +++ b/src/field/fldeff_softboiled.c @@ -82,8 +82,8 @@ static void sub_8133D50(u8 taskId) { struct Sprite *sprites = gSprites; - unk1 = sprites[EWRAM_1000.unk1].data0; - unk2 = sprites[EWRAM_1000.unk2].data0; + unk1 = sprites[EWRAM_1000.unk1].data[0]; + unk2 = sprites[EWRAM_1000.unk2].data[0]; if (unk1 > 5 || unk2 > 5) { @@ -91,7 +91,7 @@ static void sub_8133D50(u8 taskId) { return; } - EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data0]; + EWRAM_1C000.unk0 = &gPlayerParty[sprites[EWRAM_1000.unk2].data[0]]; hp = GetMonData(EWRAM_1C000.unk0, MON_DATA_HP); if (hp == 0 || unk1 == unk2 || GetMonData(EWRAM_1C000.unk0, MON_DATA_MAX_HP) == hp) @@ -102,7 +102,7 @@ static void sub_8133D50(u8 taskId) { PlaySE(SE_KAIFUKU); - EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data0; + EWRAM_1C000.unk5 = gSprites[EWRAM_1000.unk1].data[0]; pokemon = &gPlayerParty[EWRAM_1C000.unk5]; EWRAM_1C000.unk0 = pokemon; |