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

Document Sky Pillar outside

Browse Source
This commit is contained in:
GriffinR
2019-11-08 03:37:46 -05:00
committed by huderlem
parent a727c16012
commit 8702972067
26 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_control_avatar.c
+2 -2
View File
@@ -373,8 +373,8 @@ static const u8 *GetInteractedMetatileScript(struct MapPosition *position, u8 me
return EventScript_PC;
if (MetatileBehavior_IsClosedSootopolisDoor(metatileBehavior) == TRUE)
return EventScript_ClosedSootopolisDoor;
if (MetatileBehavior_IsUnknownClosedDoor(metatileBehavior) == TRUE)
return SkyPillar_Outside_EventScript_2393F9;
if (MetatileBehavior_IsSkyPillarClosedDoor(metatileBehavior) == TRUE)
return SkyPillar_Outside_EventScript_ClosedDoor;
if (MetatileBehavior_IsCableBoxResults1(metatileBehavior) == TRUE)
return EventScript_CableBoxResults;
if (MetatileBehavior_IsPokeblockFeeder(metatileBehavior) == TRUE)
src/metatile_behavior.c
+3 -3
View File
@@ -244,7 +244,7 @@ static const u8 sTileBitAttributes[] =
[MB_CABLE_BOX_RESULTS_2] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_WIRELESS_BOX_RESULTS] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_TRAINER_HILL_TIMER] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNKNOWN_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_SKY_PILLAR_CLOSED_DOOR] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNUSED_EB] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNUSED_EC] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
[MB_UNUSED_ED] = TILE_ATTRIBUTES(FALSE, FALSE, FALSE),
@@ -1172,9 +1172,9 @@ bool8 MetatileBehavior_IsClosedSootopolisDoor(u8 metatileBehavior)
return FALSE;
}
bool8 MetatileBehavior_IsUnknownClosedDoor(u8 metatileBehavior)
bool8 MetatileBehavior_IsSkyPillarClosedDoor(u8 metatileBehavior)
{
if (metatileBehavior == MB_UNKNOWN_CLOSED_DOOR)
if (metatileBehavior == MB_SKY_PILLAR_CLOSED_DOOR)
return TRUE;
else
return FALSE;