Merge branch 'master' into doc-overworld

2020-07-28 17:46:17 -04:00
parent 4a42e2a710 96b904bf80
commit e06de33cbd
31 changed files with 119 additions and 134 deletions
--- a/src/item_use.c
+++ b/src/item_use.c
@@ -721,7 +721,7 @@ static void ItemUseOnFieldCB_WailmerPailBerry(u8 taskId)

 static bool8 TryToWaterSudowoodo(void)
 {
-    u16 x, y;
+    s16 x, y;
    u8 z;
    u8 objId;
    GetXYCoordsOneStepInFrontOfPlayer(&x, &y);