summaryrefslogtreecommitdiff
path: root/src/secret_base.c
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@users.noreply.github.com>2020-03-17 10:39:37 -0400
committerGitHub <noreply@github.com>2020-03-17 10:39:37 -0400
commit784e29352d0278a43a199722d205be5060f402a0 (patch)
tree3a06a39427da7de4738085963f304b18160a3d19 /src/secret_base.c
parent7a059c75a6d120f353b44d7716fd014516bc2dc4 (diff)
parent4485d51522a05e40c3c3458169c389b9a0421c3e (diff)
Merge pull request #985 from mrgriffin/decoration
Document decoration.c
Diffstat (limited to 'src/secret_base.c')
-rw-r--r--src/secret_base.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/secret_base.c b/src/secret_base.c
index 31fd901e0..ec48e9b51 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -543,23 +543,23 @@ void InitSecretBaseDecorationSprites(void)
objectEventId = 0;
if (!CurMapIsSecretBase())
{
- decorations = gSaveBlock1Ptr->playerRoomDecor;
- decorationPositions = gSaveBlock1Ptr->playerRoomDecorPos;
- numDecorations = 12;
+ decorations = gSaveBlock1Ptr->playerRoomDecorations;
+ decorationPositions = gSaveBlock1Ptr->playerRoomDecorationPositions;
+ numDecorations = DECOR_MAX_PLAYERS_HOUSE;
}
else
{
u16 secretBaseId = VarGet(VAR_CURRENT_SECRET_BASE);
decorations = gSaveBlock1Ptr->secretBases[secretBaseId].decorations;
decorationPositions = gSaveBlock1Ptr->secretBases[secretBaseId].decorationPositions;
- numDecorations = 16;
+ numDecorations = DECOR_MAX_SECRET_BASE;
}
for (i = 0; i < numDecorations; i++)
{
if (decorations[i] == DECOR_NONE)
continue;
-
+
permission = gDecorations[decorations[i]].permission;
category = gDecorations[decorations[i]].category;
if (permission == DECORPERM_SPRITE)