diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2018-05-23 18:24:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-23 18:24:30 -0500 |
| commit | de2fe2cbbae599d9b336cb6762e3a03445cd5027 (patch) | |
| tree | d8cea366e68eca40bac0a6c0edf0c85a27eda520 /src/field_specials.c | |
| parent | 294d223dd0218c64267b6b6851575150e36593fb (diff) | |
| parent | 22e6e3532900b2470d0134f1347981d77828b22c (diff) | |
Merge pull request #616 from huderlem/misc
Misc labeling
Diffstat (limited to 'src/field_specials.c')
| -rw-r--r-- | src/field_specials.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/field_specials.c b/src/field_specials.c index a4b891dbe..4bb9ad801 100644 --- a/src/field_specials.c +++ b/src/field_specials.c @@ -356,7 +356,7 @@ void SpawnBerryBlenderLinkPlayerSprites(void) { if (myLinkPlayerNumber != i) { - rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(0, gLinkPlayers[i].gender); + rivalAvatarGraphicsId = GetRivalAvatarGraphicsIdByStateIdAndGender(PLAYER_AVATAR_STATE_NORMAL, gLinkPlayers[i].gender); SpawnSpecialFieldObjectParametrized(rivalAvatarGraphicsId, unknown_083F8358[j], 0xf0 - i, unknown_083F835C[j][0] + x + 7, unknown_083F835C[j][1] + y + 7, 0); j++; if (j == 4) @@ -1759,7 +1759,7 @@ void GlassWorkshopUpdateScrollIndicators(u8 newPos, u8 maxItems) void SpawnCameraDummy(void) { u8 mapObjectId = SpawnSpecialFieldObjectParametrized(7, 8, 0x7f, gSaveBlock1.pos.x + 7, gSaveBlock1.pos.y + 7, 3); - gMapObjects[mapObjectId].mapobj_bit_13 = 1; + gMapObjects[mapObjectId].invisible = 1; CameraObjectSetFollowedObjectId(gMapObjects[mapObjectId].spriteId); } |