diff options
| author | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-02 17:35:44 -0500 |
|---|---|---|
| committer | Phlosioneer <mattmdrr2@gmail.com> | 2019-03-02 17:35:44 -0500 |
| commit | 9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (patch) | |
| tree | 3122377a548140355ae1a3350212cc52827bc9ac /src/berry_blender.c | |
| parent | 3716da5430a976d05afecdf82f43f14fc2584949 (diff) | |
| parent | 043071ae12aa6854119a44304a5facbd58fa3624 (diff) | |
Merge branch 'master' into main-menu-state-machine
Diffstat (limited to 'src/berry_blender.c')
| -rw-r--r-- | src/berry_blender.c | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/berry_blender.c b/src/berry_blender.c index 0241fa26d..8d852819b 100644 --- a/src/berry_blender.c +++ b/src/berry_blender.c @@ -34,6 +34,8 @@ #include "battle_records.h" #include "graphics.h" #include "new_game.h" +#include "save.h" +#include "link.h" #define BLENDER_SCORE_BEST 0 #define BLENDER_SCORE_GOOD 1 @@ -140,15 +142,8 @@ extern const u8 gText_Space[]; extern const u8 gText_BlenderMaxSpeedRecord[]; extern const u8 gText_234Players[]; -extern void sub_800A418(void); -extern u8 sub_800A9D8(void); extern void sub_81AABF0(void (*callback)(void)); extern void sub_800B4C0(void); -extern void ClearLinkCallback(void); -extern void sub_8009F8C(void); -extern void sub_8153430(void); -extern bool8 sub_8153474(void); -extern void sub_80EECEC(void); // this file's functions static void BerryBlender_SetBackgroundsPos(void); @@ -2600,7 +2595,7 @@ static bool8 LinkPlayAgainHandleSaving(void) } break; case 2: - sub_8153430(); + FullSaveGame(); sBerryBlenderData->field_1A0++; sBerryBlenderData->framesToWait = 0; break; @@ -2614,7 +2609,7 @@ static bool8 LinkPlayAgainHandleSaving(void) case 4: if (IsLinkTaskFinished()) { - if (sub_8153474()) + if (CheckSaveFile()) { sBerryBlenderData->field_1A0 = 5; } |