diff options
author | Marcus Huderle <huderlem@gmail.com> | 2017-12-24 14:23:52 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-12-24 14:23:52 -0600 |
commit | e3078400bbdb3e8416806127290b9a2d68cfb3b8 (patch) | |
tree | 7ef9993608fc9c6e426ce908957ac07f72b8f650 /src/field/field_specials.c | |
parent | b827bd9a5a44e17fa9fced591465fc64a619a134 (diff) | |
parent | e5c216e5066dac26fad64cb2e7bb6a5f0d40bf3f (diff) |
Merge pull request #492 from PikalaxALT/decompile_data
Decompile data and abstract away some explicit memcpy calls
Diffstat (limited to 'src/field/field_specials.c')
-rw-r--r-- | src/field/field_specials.c | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/src/field/field_specials.c b/src/field/field_specials.c index 43921ed55..8cb1ba487 100644 --- a/src/field/field_specials.c +++ b/src/field/field_specials.c @@ -312,28 +312,23 @@ u8 GetLinkPartnerNames(void) return nLinkPlayers; } -const u8 gUnknown_083F8358[4] = {7, 9, 8, 10}; -const s8 gUnknown_083F835C[4][2] = { - { 0, 1}, - { 1, 0}, - { 0, -1}, - {-1, 0} -}; - void SpawnBerryBlenderLinkPlayerSprites(void) { - u8 unknown_083F8358[4]; - u8 unknown_083F835C[4][2]; + u8 j = 0; + s16 x = 0; + s16 y = 0; + u8 unknown_083F8358[] = {7, 9, 8, 10}; + s8 unknown_083F835C[][2] = { + { 0, 1}, + { 1, 0}, + { 0, -1}, + {-1, 0} + }; u8 myLinkPlayerNumber; u8 playerDirectionLowerNybble; u8 rivalAvatarGraphicsId; u8 i; - u8 j = 0; - s16 x = 0; - s16 y = 0; - memcpy(unknown_083F8358, gUnknown_083F8358, sizeof gUnknown_083F8358); - memcpy(unknown_083F835C, gUnknown_083F835C, sizeof gUnknown_083F835C); myLinkPlayerNumber = sub_8008218(); playerDirectionLowerNybble = player_get_direction_lower_nybble(); switch (playerDirectionLowerNybble) @@ -362,7 +357,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void) if (myLinkPlayerNumber != i) { rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gLinkPlayers[i].gender); - SpawnSpecialFieldObjectParametrized(rivalAvatarGraphicsId, unknown_083F8358[j], 0xf0 - i, (s8)unknown_083F835C[j][0] + x + 7, (s8)unknown_083F835C[j][1] + y + 7, 0); + SpawnSpecialFieldObjectParametrized(rivalAvatarGraphicsId, unknown_083F8358[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); j++; if (j == 4) { |