Merge remote-tracking branch 'upstream' into tustin2121-patch-5

2020-01-13 20:26:20 -06:00
parent 5007d279fe 22931846d6
commit 5a2d676e71
1553 changed files with 106038 additions and 112232 deletions
--- a/include/fldeff.h
+++ b/include/fldeff.h
@@ -28,8 +28,8 @@ bool8 sub_80E1584(void);

 // soft-boiled
 bool8 SetUpFieldMove_SoftBoiled(void);
-void sub_81615A8(u8 taskId);
-void sub_8161560(u8 taskId);
+void Task_TryUseSoftboiledOnPartyMon(u8 taskId);
+void ChooseMonForSoftboiled(u8 taskId);

 // flash
 bool8 SetUpFieldMove_Flash(void);