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

This commit is contained in:
Marcus Huderle committed 2020-01-13 20:26:20 -06:00
commit 5a2d676e71
1553 files changed
+106035 -112229

No files matched your search

+2 -2
View File
@@ -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);