Merge branch 'master' of github.com:pret/pokeemerald into trade

2018-12-31 02:30:30 -06:00
parent ec780bb209 58f130d007
commit d004ce065c
779 changed files with 5227 additions and 8501 deletions
--- a/src/save.c
+++ b/src/save.c
@@ -923,7 +923,7 @@ void sub_8153688(u8 taskId)
        break;
    case 3:
        if (taskData[2] == 0)
-            sub_8076D5C();
+            SetContinueGameWarpStatusToDynamicWarp();
        sub_8153380();
        taskData[0] = 4;
        break;
@@ -946,7 +946,7 @@ void sub_8153688(u8 taskId)
        break;
    case 7:
        if (taskData[2] == 0)
-            sav2_gender2_inplace_and_xFE();
+            ClearContinueGameWarpStatus2();
        sub_800ADF8();
        taskData[0] = 8;
        break;