From 16026fe91d5628f138be434841ae764534946b2c Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sun, 21 Oct 2018 00:06:42 +0200
Subject: More battle tower.

---
 src/start_menu.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index dcb2c4154..aaa9fec2c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -383,14 +383,14 @@ static void ShowSafariBallsWindow(void)
 
 static void ShowPyramidFloorWindow(void)
 {
-    if (gSaveBlock2Ptr->frontier.field_CB2 == 7)
+    if (gSaveBlock2Ptr->frontier.curChallengeBattleNum == 7)
         sBattlePyramidFloorWindowId = AddWindow(&sPyramidFloorWindowTemplate_1);
     else
         sBattlePyramidFloorWindowId = AddWindow(&sPyramidFloorWindowTemplate_2);
 
     PutWindowTilemap(sBattlePyramidFloorWindowId);
     NewMenuHelpers_DrawStdWindowFrame(sBattlePyramidFloorWindowId, FALSE);
-    StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->frontier.field_CB2]);
+    StringCopy(gStringVar1, sPyramindFloorNames[gSaveBlock2Ptr->frontier.curChallengeBattleNum]);
     StringExpandPlaceholders(gStringVar4, gText_BattlePyramidFloor);
     AddTextPrinterParameterized(sBattlePyramidFloorWindowId, 1, gStringVar4, 0, 1, 0xFF, NULL);
     CopyWindowToVram(sBattlePyramidFloorWindowId, 2);
-- 
cgit v1.2.3


From 7de1c4bd141bc793873b12acd7f1eaae7474bfbc Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Tue, 30 Oct 2018 22:17:03 +0100
Subject: Make frontier util compile

---
 src/start_menu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index aaa9fec2c..c587d3820 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -12,7 +12,7 @@
 #include "task.h"
 #include "overworld.h"
 #include "link.h"
-#include "battle_frontier_2.h"
+#include "frontier_util.h"
 #include "rom_818CFC8.h"
 #include "field_specials.h"
 #include "event_object_movement.h"
-- 
cgit v1.2.3


From 0bb51037d7d3e257a84b1488016441aafd34b020 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Thu, 1 Nov 2018 21:31:10 +0100
Subject: Finish frontier util

---
 src/start_menu.c | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index c587d3820..81c4213e7 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -35,6 +35,8 @@
 #include "field_player_avatar.h"
 #include "battle_pyramid_bag.h"
 
+extern bool8 InBattlePike(void);
+
 // Menu actions
 enum
 {
-- 
cgit v1.2.3


From 7dd4ed70601039d0c811752211b4aefa1d09b69b Mon Sep 17 00:00:00 2001
From: Diegoisawesome <diego@domoreaweso.me>
Date: Mon, 5 Nov 2018 14:45:54 -0600
Subject: r5/r6 swap on sub_80E2578

---
 src/start_menu.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/start_menu.c')

diff --git a/src/start_menu.c b/src/start_menu.c
index dcb2c4154..1b9294e1c 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -977,14 +977,14 @@ static u8 SaveConfirmSaveCallback(void)
 
 static u8 SaveYesNoCallback(void)
 {
-    sub_8197930(); // Show Yes/No menu
+    DisplayYesNoMenu(); // Show Yes/No menu
     sSaveDialogCallback = SaveConfirmInputCallback;
     return SAVE_IN_PROGRESS;
 }
 
 static u8 SaveConfirmInputCallback(void)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0: // Yes
         switch (gSaveFileStatus)
@@ -1037,14 +1037,14 @@ static u8 SaveConfirmOverwriteNoCallback(void)
 
 static u8 SaveConfirmOverwriteCallback(void)
 {
-    sub_8197930(); // Show Yes/No menu
+    DisplayYesNoMenu(); // Show Yes/No menu
     sSaveDialogCallback = SaveOverwriteInputCallback;
     return SAVE_IN_PROGRESS;
 }
 
 static u8 SaveOverwriteInputCallback(void)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0: // Yes
         sSaveDialogCallback = SaveSavingMessageCallback;
@@ -1168,7 +1168,7 @@ static u8 BattlePyramidRetireYesNoCallback(void)
 
 static u8 BattlePyramidRetireInputCallback(void)
 {
-    switch (Menu_ProcessInputNoWrap_())
+    switch (Menu_ProcessInputNoWrapClearOnChoose())
     {
     case 0: // Yes
         return SAVE_CANCELED;
-- 
cgit v1.2.3