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

Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

Browse Source
This commit is contained in:
GriffinR
2023-01-30 10:23:08 -05:00
parent c39f3161d2 e001949f42
commit ef12c2a7f9
235 changed files with 6442 additions and 8846 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))