dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Use metatile labels for decor gfx

Browse Source
This commit is contained in:
GriffinR
2020-04-13 14:43:50 -04:00
parent 96958ba5e9
commit 8d3b7bd0b1
4 changed files with 384 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/secret_base.c
View File

@@ -1176,7 +1176,7 @@ void SecretBasePerStepCallback(u8 taskId)
VarSet(VAR_SECRET_BASE_STEP_COUNTER, VarGet(VAR_SECRET_BASE_STEP_COUNTER) + 1);
behavior = MapGridGetMetatileBehaviorAt(x, y);
tileId = MapGridGetMetatileIdAt(x, y);
if (tileId == METATILE_SecretBase_Board_Top || tileId == METATILE_SecretBase_Board_Bottom)
if (tileId == METATILE_SecretBase_SolidBoard_Top || tileId == METATILE_SecretBase_SolidBoard_Bottom)
{
if (sInFriendSecretBase == TRUE)
{
@@ -1204,13 +1204,13 @@ void SecretBasePerStepCallback(u8 taskId)
if (sInFriendSecretBase == TRUE)
VarSet(VAR_SECRET_BASE_LOW_TV_FLAGS, VarGet(VAR_SECRET_BASE_LOW_TV_FLAGS) | SECRET_BASE_USED_TENT);
}
else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_RightCorner)
|| (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_LeftCorner))
else if ((behavior == MB_IMPASSABLE_NORTHEAST && tileId == METATILE_SecretBase_Stand_CornerRight)
|| (behavior == MB_IMPASSABLE_NORTHWEST && MapGridGetMetatileIdAt(x, y) == METATILE_SecretBase_Stand_CornerLeft))
{
if (sInFriendSecretBase == TRUE)
VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_USED_STAND);
}
else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_Stairs)
else if (behavior == MB_IMPASSABLE_WEST_AND_EAST && tileId == METATILE_SecretBase_Slide_StairLanding)
{
if (sInFriendSecretBase == TRUE)
{
@@ -1218,7 +1218,7 @@ void SecretBasePerStepCallback(u8 taskId)
VarSet(VAR_SECRET_BASE_HIGH_TV_FLAGS, VarGet(VAR_SECRET_BASE_HIGH_TV_FLAGS) | SECRET_BASE_DECLINED_SLIDE);
}
}
else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide)
else if (behavior == MB_SLIDE_SOUTH && tileId == METATILE_SecretBase_Slide_SlideTop)
{
if (sInFriendSecretBase == TRUE)
{
@@ -1846,12 +1846,12 @@ void CheckInteractedWithFriendsFurnitureBottom(void)
case METATILE_SecretBase_RedPlant_Base2:
case METATILE_SecretBase_TropicalPlant_Base1:
case METATILE_SecretBase_TropicalPlant_Base2:
case METATILE_SecretBase_PrettyFlower_Base1:
case METATILE_SecretBase_PrettyFlower_Base2:
case METATILE_SecretBase_ColorfulFlowers_BaseLeft1:
case METATILE_SecretBase_ColorfulFlowers_BaseRight1:
case METATILE_SecretBase_ColorfulFlowers_BaseLeft2:
case METATILE_SecretBase_ColorfulFlowers_BaseRight2:
case METATILE_SecretBase_PrettyFlowers_Base1:
case METATILE_SecretBase_PrettyFlowers_Base2:
case METATILE_SecretBase_ColorfulPlant_BaseLeft1:
case METATILE_SecretBase_ColorfulPlant_BaseRight1:
case METATILE_SecretBase_ColorfulPlant_BaseLeft2:
case METATILE_SecretBase_ColorfulPlant_BaseRight2:
case METATILE_SecretBase_BigPlant_BaseLeft1:
case METATILE_SecretBase_BigPlant_BaseRight1:
case METATILE_SecretBase_BigPlant_BaseLeft2: