Made follower disappear when decorating.
Decreased number of max sprite decorations to 13.
This commit is contained in:
parent
b1ea5fb8c3
commit
0d3061574c
1 changed files with 11 additions and 1 deletions
|
@ -41,7 +41,7 @@
|
||||||
|
|
||||||
#define PLACE_DECORATION_SELECTOR_TAG 0xbe5
|
#define PLACE_DECORATION_SELECTOR_TAG 0xbe5
|
||||||
#define PLACE_DECORATION_PLAYER_TAG 0x008
|
#define PLACE_DECORATION_PLAYER_TAG 0x008
|
||||||
#define NUM_DECORATION_FLAGS (FLAG_DECORATION_14 - FLAG_DECORATION_1 + 1)
|
#define NUM_DECORATION_FLAGS (FLAG_DECORATION_13 - FLAG_DECORATION_1 + 1)
|
||||||
|
|
||||||
#define tCursorX data[0]
|
#define tCursorX data[0]
|
||||||
#define tCursorY data[1]
|
#define tCursorY data[1]
|
||||||
|
@ -1360,6 +1360,7 @@ static void Task_PlaceDecoration(u8 taskId)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
|
RemoveFollowingPokemon();
|
||||||
gPaletteFade.bufferTransferDisabled = TRUE;
|
gPaletteFade.bufferTransferDisabled = TRUE;
|
||||||
ConfigureCameraObjectForPlacingDecoration(&sPlaceDecorationGraphicsDataBuffer, gCurDecorationItems[gCurDecorationIndex]);
|
ConfigureCameraObjectForPlacingDecoration(&sPlaceDecorationGraphicsDataBuffer, gCurDecorationItems[gCurDecorationIndex]);
|
||||||
SetUpDecorationShape(taskId);
|
SetUpDecorationShape(taskId);
|
||||||
|
@ -1615,6 +1616,14 @@ static bool8 CanPlaceDecoration(u8 taskId, const struct Decoration *decoration)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// If sprite(like), check if there is an available object event slot for it
|
||||||
|
if (decoration->permission == DECORPERM_SPRITE) {
|
||||||
|
for (i = 0; i < NUM_DECORATION_FLAGS; i++)
|
||||||
|
if (FlagGet(FLAG_DECORATION_1 + i) == TRUE)
|
||||||
|
return TRUE;
|
||||||
|
return FALSE;
|
||||||
|
}
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2316,6 +2325,7 @@ static void Task_ContinuePuttingAwayDecorations(u8 taskId)
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case 1:
|
case 1:
|
||||||
|
RemoveFollowingPokemon();
|
||||||
SetUpPuttingAwayDecorationPlayerAvatar();
|
SetUpPuttingAwayDecorationPlayerAvatar();
|
||||||
FadeInFromBlack();
|
FadeInFromBlack();
|
||||||
tState = 2;
|
tState = 2;
|
||||||
|
|
Loading…
Reference in a new issue