1 files changed, 18 insertions, 15 deletions

diff --git a/src/secret_base.c b/src/secret_base.c
index e3c06a75d..e2b7e20f1 100644
--- a/src/secret_base.c
+++ b/src/secret_base.c
@@ -3,10 +3,11 @@
 #include "global.h"
 #include "constants/decorations.h"
 #include "malloc.h"
+#include "main.h"
 #include "task.h"
 #include "palette.h"
-#include "list_menu.h"
 #include "window.h"
+#include "list_menu.h"
 #include "menu.h"
 #include "menu_helpers.h"
 #include "menu_indicators.h"
@@ -39,6 +40,8 @@
 #include "tv.h"
 #include "secret_base.h"
 
+extern void mapldr_default(void);
+
 // Static type declarations
 
 struct SecretBaseListMenuBuffer {
@@ -61,7 +64,7 @@ EWRAM_DATA struct SecretBaseListMenuBuffer *gUnknown_0203A020 = NULL;
 
 void sub_80E9C9C(u8 taskId);
 void game_continue(u8 taskId);
-void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu);
+void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu);
 void sub_80E9E00(u8 taskId);
 void sub_80E9E44(u8 taskId);
 void sub_80E9E90(u8 taskId);
@@ -244,7 +247,7 @@ void sub_80E8C98(void)
 
 void sub_80E8CB0(s16 *xPtr, s16 *yPtr, u16 tile)
 {
-    struct MapData *mapData;
+    const struct MapData *mapData;
     s16 x;
     s16 y;
 
@@ -322,7 +325,7 @@ void sub_80E8E18(void)
     VarSet(VAR_SECRET_BASE_MAP, gMapHeader.regionMapSectionId);
 }
 
-void sub_80E8EE0(struct MapEvents *events)
+void sub_80E8EE0(struct MapEvents const *events)
 {
     u16 bgEventIndex;
     u16 i;
@@ -386,7 +389,7 @@ void sub_80E8FD0(u8 taskId)
             sub_80E8F9C();
             warp_in();
             gFieldCallback = sub_80AF168;
-            SetMainCallback2(c2_load_new_map);
+            SetMainCallback2(CB2_LoadMap);
             DestroyTask(taskId);
             break;
     }
@@ -411,7 +414,7 @@ bool8 sub_80E909C(void)
 void sub_80E90C8(u8 taskId)
 {
     FieldObjectTurn(&gMapObjects[gPlayerAvatar.mapObjectId], DIR_NORTH);
-    if (sub_80ABDFC() == TRUE)
+    if (IsWeatherNotFadingIn() == TRUE)
     {
         EnableBothScriptContexts();
         DestroyTask(taskId);
@@ -444,7 +447,7 @@ void sub_80E916C(u8 taskId)
         Overworld_SetWarpDestination(gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1, gUnknown_0858CFE8[idx + 2], gUnknown_0858CFE8[idx + 3]);
         warp_in();
         gFieldCallback = sub_80E9108;
-        SetMainCallback2(c2_load_new_map);
+        SetMainCallback2(CB2_LoadMap);
         DestroyTask(taskId);
     }
 }
@@ -642,7 +645,7 @@ void sub_80E96A4(u8 taskId)
             copy_saved_warp2_bank_and_enter_x_to_warp1(0x7e);
             warp_in();
             gFieldCallback = mapldr_default;
-            SetMainCallback2(c2_load_new_map);
+            SetMainCallback2(CB2_LoadMap);
             ScriptContext2_Disable();
             DestroyTask(taskId);
             break;
@@ -773,7 +776,7 @@ void sub_80E9AD0(void)
     u16 i;
     u16 j;
     s16 tile;
-    struct MapEvents *events;
+    const struct MapEvents *events;
 
     events = gMapHeader.events;
     for (i = 0; i < events->bgEventCount; i ++)
@@ -908,13 +911,13 @@ void game_continue(u8 taskId)
         data[3] = 8;
     }
     gMultiuseListMenuTemplate = gUnknown_0858D07C;
-    gMultiuseListMenuTemplate.unk_10 = data[6];
+    gMultiuseListMenuTemplate.windowId = data[6];
     gMultiuseListMenuTemplate.totalItems = data[0];
     gMultiuseListMenuTemplate.items = gUnknown_0203A020->items;
     gMultiuseListMenuTemplate.maxShowed = data[3];
 }
 
-void sub_80E9DEC(u32 a0, bool8 flag, struct ListMenu *menu)
+void sub_80E9DEC(s32 a0, bool8 flag, struct ListMenu *menu)
 {
     if (flag != TRUE)
     {
@@ -948,14 +951,14 @@ void sub_80E9E90(u8 taskId)
 
     data = gTasks[taskId].data;
     input = ListMenuHandleInputGetItemId(data[5]);
-    sub_81AE860(data[5], &data[2], &data[1]);
+    ListMenuGetScrollAndRow(data[5], &data[2], &data[1]);
     switch (input)
     {
         case -1:
             break;
         case -2:
             PlaySE(SE_SELECT);
-            sub_81AE6C8(data[5], NULL, NULL);
+            DestroyListMenuTask(data[5], NULL, NULL);
             RemoveScrollIndicatorArrowPair(data[8]);
             sub_819746C(data[6], 0);
             ClearWindowTilemap(data[6]);
@@ -1037,7 +1040,7 @@ void sub_80EA08C(u8 taskId)
 
     data = gTasks[taskId].data;
     sub_8197434(0, 0);
-    sub_81AE6C8(data[5], &data[2], &data[1]);
+    DestroyListMenuTask(data[5], &data[2], &data[1]);
     gSaveBlock1Ptr->secretBases[data[4]].sbr_field_1_6 = 0;
     game_continue(taskId);
     sub_812225C(&data[2], &data[1], data[3], data[0]);
@@ -1056,7 +1059,7 @@ void sub_80EA13C(u8 taskId)
 
     data = gTasks[taskId].data;
     sub_8197434(0, 0);
-    sub_81AE6C8(data[5], &data[2], &data[1]);
+    DestroyListMenuTask(data[5], &data[2], &data[1]);
     sub_80E9E00(taskId);
     gTasks[taskId].func = sub_80E9E90;
 }