diff options
Diffstat (limited to 'src/decoration.c')
| -rw-r--r-- | src/decoration.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/decoration.c b/src/decoration.c index 47dcae2dc..4c9e4509a 100644 --- a/src/decoration.c +++ b/src/decoration.c @@ -2272,13 +2272,13 @@ void AddDecorationIconObjectFromEventObject(struct UnkStruct_02038900 * unk_0203 sub_8100874(unk_02038900); sub_810070C(unk_02038900->palette, ((u16 *)gMapHeader.mapData->secondaryTileset->metatiles + 8 * unk_02038900->decoration->tiles[0])[7] >> 12); LoadSpritePalette(&gUnknown_083EC954); - gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0]; - gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83EC93C, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 0); + gUnknown_020391A8 = gSprites[gFieldCamera.trackedSpriteId].data[0]; + gFieldCamera.trackedSpriteId = CreateSprite(&gSpriteTemplate_83EC93C, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 0); } else { - gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0]; - gUnknown_03004880.unk4 = AddPseudoEventObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 1); - gSprites[gUnknown_03004880.unk4].oam.priority = 1; + gUnknown_020391A8 = gSprites[gFieldCamera.trackedSpriteId].data[0]; + gFieldCamera.trackedSpriteId = AddPseudoEventObject(unk_02038900->decoration->tiles[0], sub_81009A8, gUnknown_083EC900[unk_02038900->decoration->shape].x, gUnknown_083EC900[unk_02038900->decoration->shape].y, 1); + gSprites[gFieldCamera.trackedSpriteId].oam.priority = 1; } } @@ -2299,7 +2299,7 @@ void SetUpPlacingDecorationPlayerAvatar(u8 taskId, struct UnkStruct_02038900 *un } gSprites[gUnknown_020391A9].oam.priority = 1; DestroySprite(&gSprites[gUnknown_020391A8]); - gUnknown_020391A8 = gUnknown_03004880.unk4; + gUnknown_020391A8 = gFieldCamera.trackedSpriteId; } void sub_80FF960(u8 taskId) @@ -3723,9 +3723,9 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) { GetPlayerFacingDirection(); Menu_EraseWindowRect(0, 0, 29, 19); - gUnknown_020391A8 = gSprites[gUnknown_03004880.unk4].data[0]; + gUnknown_020391A8 = gSprites[gFieldCamera.trackedSpriteId].data[0]; sub_81016C8(); - gUnknown_03004880.unk4 = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0); + gFieldCamera.trackedSpriteId = CreateSprite(&gSpriteTemplate_83ECA88, 0x78, 0x50, 0); if (gSaveBlock2.playerGender == MALE) { gUnknown_020391A9 = AddPseudoEventObject(0xc1, SpriteCallbackDummy, 0x88, 0x48, 0); @@ -3735,7 +3735,7 @@ void SetUpPuttingAwayDecorationPlayerAvatar(void) } gSprites[gUnknown_020391A9].oam.priority = 1; DestroySprite(&gSprites[gUnknown_020391A8]); - gUnknown_020391A8 = gUnknown_03004880.unk4; + gUnknown_020391A8 = gFieldCamera.trackedSpriteId; gSprites[gUnknown_020391A8].oam.priority = 1; } |