Remove old references to battle pyramid

7 files changed, 15 insertions, 24 deletions

diff --git a/asm/overworld.s b/asm/overworld.s
index e70702710..21016a0b9 100644
--- a/asm/overworld.s
+++ b/asm/overworld.s
@@ -1718,7 +1718,7 @@ sub_8055864: @ 8055864
 	bl sav1_reset_battle_music_maybe
 	bl mapheader_run_script_with_tag_x3
 	bl TryRegenerateRenewableHiddenItems
-	bl not_trainer_tower_battle_pyramid
+	bl InitMap
 	ldr r4, _0805591C @ =gMapHeader
 	ldr r0, [r4]
 	bl copy_map_tileset2_to_vram_2
@@ -1798,7 +1798,7 @@ _08055974:
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMoveToOtherLocationSet
 	bl sub_8110920
-	bl not_trainer_tower_battle_pyramid
+	bl InitMap
 	pop {r4}
 	pop {r0}
 	bx r0
@@ -1823,7 +1823,7 @@ sub_80559A8: @ 80559A8
 	bl sub_8110920
 	bl sub_8111708
 	bl set_current_map_header_from_sav1
-	bl not_trainer_tower_battle_pyramid
+	bl InitMap
 	pop {r0}
 	bx r0
 	.align 2, 0
@@ -3843,7 +3843,7 @@ CB2_ContinueSavedGame: @ 8056938
 	bl sub_80550A8
 	bl UnfreezeObjectEvents
 	bl sub_8054E40
-	bl sub_80589E8
+	bl InitMapFromSavedGame
 	bl PlayTimeCounter_Start
 	bl ScriptContext1_Init
 	bl ScriptContext2_Disable
@@ -5128,7 +5128,7 @@ sub_8057430: @ 8057430
 	bl sub_80550A8
 	bl UnfreezeObjectEvents
 	bl sub_8054E40
-	bl sub_80589E8
+	bl InitMapFromSavedGame
 	bl PlayTimeCounter_Start
 	bl ScriptContext1_Init
 	ldr r1, _08057488 @ =gUnknown_2031DE0
diff --git a/include/constants/party_menu.h b/include/constants/party_menu.h
index 28ce39cd3..0c958ccc5 100644
--- a/include/constants/party_menu.h
+++ b/include/constants/party_menu.h
@@ -64,7 +64,6 @@
 #define PARTY_MENU_TYPE_UNION_ROOM_TRADE          9  // trading board
 #define PARTY_MENU_TYPE_SPIN_TRADE                10 // Unused beta for Gen IV's Spin Trade
 #define PARTY_MENU_TYPE_MINIGAME                  11
-#define PARTY_MENU_TYPE_STORE_PYRAMID_HELD_ITEMS  12
 
 #define PARTY_ACTION_CHOOSE_MON         0
 #define PARTY_ACTION_SEND_OUT           1
diff --git a/include/global.h b/include/global.h
index e33159898..14028808f 100644
--- a/include/global.h
+++ b/include/global.h
@@ -168,13 +168,6 @@ struct BerryPickingResults // possibly used in the game itself? Size may be wron
     u8 field_F;
 };
 
-struct PyramidBag
-{
-    u16 items_Lvl50[10];
-    u16 items_OpenLvl[10];
-    u8 quantity[10];
-};
-
 struct BerryCrush
 {
     u16 berryCrushResults[4];
diff --git a/include/script.h b/include/script.h
index c0b23e248..db52fa412 100644
--- a/include/script.h
+++ b/include/script.h
@@ -48,7 +48,7 @@ void ScriptContext2_RunNewScript(const u8 *ptr);
 u8 *mapheader_get_tagged_pointer(u8 tag);
 void mapheader_run_script_by_tag(u8 tag);
 u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag);
-void mapheader_run_script_with_tag_x1(void);
+void RunOnLoadMapScript(void);
 void mapheader_run_script_with_tag_x3(void);
 void mapheader_run_script_with_tag_x5(void);
 void mapheader_run_script_with_tag_x7(void);
diff --git a/src/battle_main.c b/src/battle_main.c
index fd8aeffbc..17fbb58b4 100644
--- a/src/battle_main.c
+++ b/src/battle_main.c
@@ -4163,7 +4163,6 @@ bool8 TryRunFromBattle(u8 battler)
 {
     bool8 effect = FALSE;
     u8 holdEffect;
-    u8 pyramidMultiplier;
     u8 speedVar;
 
     if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY)
diff --git a/src/fieldmap.c b/src/fieldmap.c
index d64215295..db3a18e04 100644
--- a/src/fieldmap.c
+++ b/src/fieldmap.c
@@ -16,7 +16,7 @@ struct ConnectionFlags
     u8 east:1;
 };
 
-void sub_8058A00(struct MapHeader *mapHeader);
+static void InitMapLayoutData(struct MapHeader *mapHeader);
 void map_copy_with_padding(u16 *map, u16 width, u16 height);
 void mapheader_copy_mapdata_of_adjacent_maps(struct MapHeader *mapHeader);
 void fillSouthConnection(struct MapHeader const *mapHeader, struct MapHeader const *connectedMapHeader, s32 offset);
@@ -63,20 +63,20 @@ const struct MapHeader * mapconnection_get_mapheader(struct MapConnection * conn
     return Overworld_GetMapHeaderByGroupAndId(connection->mapGroup, connection->mapNum);
 }
 
-void not_trainer_tower_battle_pyramid(void)
+void InitMap(void)
 {
-    sub_8058A00(&gMapHeader);
-    mapheader_run_script_with_tag_x1();
+    InitMapLayoutData(&gMapHeader);
+    RunOnLoadMapScript();
 }
 
-void sub_80589E8(void)
+void InitMapFromSavedGame(void)
 {
-    sub_8058A00(&gMapHeader);
+    InitMapLayoutData(&gMapHeader);
     LoadSavedMapView();
-    mapheader_run_script_with_tag_x1();
+    RunOnLoadMapScript();
 }
 
-void sub_8058A00(struct MapHeader * mapHeader)
+static void InitMapLayoutData(struct MapHeader * mapHeader)
 {
     const struct MapLayout * mapLayout = mapHeader->mapLayout;
     CpuFastFill(0x03FF03FF, gBackupMapLayout, sizeof(gBackupMapLayout));
diff --git a/src/script.c b/src/script.c
index 0a4b69bac..99bfa9999 100644
--- a/src/script.c
+++ b/src/script.c
@@ -406,7 +406,7 @@ u8 *mapheader_get_first_match_from_tagged_ptr_list(u8 tag)
     }
 }
 
-void mapheader_run_script_with_tag_x1(void)
+void RunOnLoadMapScript(void)
 {
     mapheader_run_script_by_tag(1);
 }