dionmoustos/Pokemon-Firered
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clarify MB_SEMI_DEEP_WATER name

Browse Source
This commit is contained in:
GriffinR
2023-01-17 21:23:33 -05:00
parent edb3182144
commit dd90956cbb
6 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/party_menu.c
+2 -2
View File
@@ -4063,7 +4063,7 @@ static bool8 SetUpFieldMove_Surf(void)
s16 x, y;
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
if (MetatileBehavior_IsSemiDeepWater(MapGridGetMetatileBehaviorAt(x, y)) != TRUE
if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) != TRUE
&& PartyHasMonWithSurf() == TRUE
&& IsPlayerFacingSurfableFishableWater() == TRUE)
{
@@ -4085,7 +4085,7 @@ static void DisplayCantUseSurfMessage(void)
else
{
GetXYCoordsOneStepInFrontOfPlayer(&x, &y);
if (MetatileBehavior_IsSemiDeepWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
if (MetatileBehavior_IsFastWater(MapGridGetMetatileBehaviorAt(x, y)) == TRUE)
DisplayPartyMenuStdMessage(PARTY_MSG_CURRENT_TOO_FAST);
else if ((gSaveBlock1Ptr->location.mapGroup == MAP_GROUP(ROUTE17))
&& ((gSaveBlock1Ptr->location.mapNum == MAP_NUM(ROUTE17))