summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_pyramid.c310
-rw-r--r--src/battle_pyramid_bag.c8
-rw-r--r--src/field_control_avatar.c2
-rw-r--r--src/field_screen_effect.c2
-rw-r--r--src/frontier_pass.c2
-rw-r--r--src/overworld.c8
-rw-r--r--src/start_menu.c25
-rw-r--r--src/union_room.c2
-rw-r--r--src/wild_encounter.c6
9 files changed, 184 insertions, 181 deletions
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index e876b6e17..493526fad 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -77,14 +77,14 @@ static void GiveBattlePyramidPrize(void);
static void SeedPyramidFloor(void);
static void SetPickupItem(void);
static void HidePyramidItem(void);
-static void InitPyramidFacilityTrainers(void);
+static void SetPyramidFacilityTrainers(void);
static void ShowPostBattleHintText(void);
static void UpdatePyramidWinStreak(void);
static void GetInBattlePyramid(void);
static void UpdatePyramidLightRadius(void);
static void ClearPyramidPartyHeldItems(void);
static void SetPyramidFloorPalette(void);
-static void sub_81A9828(void);
+static void BattlePyramidStartMenu(void);
static void RestorePyramidPlayerParty(void);
static void InitPyramidBagItems(u8 lvlMode);
static u8 GetPyramidFloorTemplateId(void);
@@ -525,200 +525,200 @@ static const u8 sTrainerTextGroups[50][2] =
static const u8 *const sExitDirectionHintTexts1[] =
{
- BattlePyramid_ExitHintUp_Text1,
- BattlePyramid_ExitHintLeft_Text1,
- BattlePyramid_ExitHintRight_Text1,
- BattlePyramid_ExitHintDown_Text1,
+ BattlePyramid_Text_ExitHintUp1,
+ BattlePyramid_Text_ExitHintLeft1,
+ BattlePyramid_Text_ExitHintRight1,
+ BattlePyramid_Text_ExitHintDown1,
};
static const u8 *const sRemainingItemsHintTexts1[] =
{
- BattlePyramid_ZeroItemsRemaining_Text1,
- BattlePyramid_OneItemRemaining_Text1,
- BattlePyramid_TwoItemsRemaining_Text1,
- BattlePyramid_ThreeItemsRemaining_Text1,
- BattlePyramid_FourItemsRemaining_Text1,
- BattlePyramid_FiveItemsRemaining_Text1,
- BattlePyramid_SixItemsRemaining_Text1,
- BattlePyramid_SevenItemsRemaining_Text1,
- BattlePyramid_EightItemsRemaining_Text1,
+ BattlePyramid_Text_ZeroItemsRemaining1,
+ BattlePyramid_Text_OneItemRemaining1,
+ BattlePyramid_Text_TwoItemsRemaining1,
+ BattlePyramid_Text_ThreeItemsRemaining1,
+ BattlePyramid_Text_FourItemsRemaining1,
+ BattlePyramid_Text_FiveItemsRemaining1,
+ BattlePyramid_Text_SixItemsRemaining1,
+ BattlePyramid_Text_SevenItemsRemaining1,
+ BattlePyramid_Text_EightItemsRemaining1,
};
static const u8 *const sRemainingTrainersHintTexts1[] =
{
- BattlePyramid_ZeroTrainersRemaining_Text1,
- BattlePyramid_OneTrainersRemaining_Text1,
- BattlePyramid_TwoTrainersRemaining_Text1,
- BattlePyramid_ThreeTrainersRemaining_Text1,
- BattlePyramid_FourTrainersRemaining_Text1,
- BattlePyramid_FiveTrainersRemaining_Text1,
- BattlePyramid_SixTrainersRemaining_Text1,
- BattlePyramid_SevenTrainersRemaining_Text1,
+ BattlePyramid_Text_ZeroTrainersRemaining1,
+ BattlePyramid_Text_OneTrainersRemaining1,
+ BattlePyramid_Text_TwoTrainersRemaining1,
+ BattlePyramid_Text_ThreeTrainersRemaining1,
+ BattlePyramid_Text_FourTrainersRemaining1,
+ BattlePyramid_Text_FiveTrainersRemaining1,
+ BattlePyramid_Text_SixTrainersRemaining1,
+ BattlePyramid_Text_SevenTrainersRemaining1,
};
static const u8 *const sExitDirectionHintTexts2[] =
{
- BattlePyramid_ExitHintUp_Text2,
- BattlePyramid_ExitHintLeft_Text2,
- BattlePyramid_ExitHintRight_Text2,
- BattlePyramid_ExitHintDown_Text2,
+ BattlePyramid_Text_ExitHintUp2,
+ BattlePyramid_Text_ExitHintLeft2,
+ BattlePyramid_Text_ExitHintRight2,
+ BattlePyramid_Text_ExitHintDown2,
};
static const u8 *const sRemainingItemsHintTexts2[] =
{
- BattlePyramid_ZeroItemsRemaining_Text2,
- BattlePyramid_OneItemRemaining_Text2,
- BattlePyramid_TwoItemsRemaining_Text2,
- BattlePyramid_ThreeItemsRemaining_Text2,
- BattlePyramid_FourItemsRemaining_Text2,
- BattlePyramid_FiveItemsRemaining_Text2,
- BattlePyramid_SixItemsRemaining_Text2,
- BattlePyramid_SevenItemsRemaining_Text2,
- BattlePyramid_EightItemsRemaining_Text2,
+ BattlePyramid_Text_ZeroItemsRemaining2,
+ BattlePyramid_Text_OneItemRemaining2,
+ BattlePyramid_Text_TwoItemsRemaining2,
+ BattlePyramid_Text_ThreeItemsRemaining2,
+ BattlePyramid_Text_FourItemsRemaining2,
+ BattlePyramid_Text_FiveItemsRemaining2,
+ BattlePyramid_Text_SixItemsRemaining2,
+ BattlePyramid_Text_SevenItemsRemaining2,
+ BattlePyramid_Text_EightItemsRemaining2,
};
static const u8 *const sRemainingTrainersHintTexts2[] =
{
- BattlePyramid_ZeroTrainersRemaining_Text2,
- BattlePyramid_OneTrainersRemaining_Text2,
- BattlePyramid_TwoTrainersRemaining_Text2,
- BattlePyramid_ThreeTrainersRemaining_Text2,
- BattlePyramid_FourTrainersRemaining_Text2,
- BattlePyramid_FiveTrainersRemaining_Text2,
- BattlePyramid_SixTrainersRemaining_Text2,
- BattlePyramid_SevenTrainersRemaining_Text2,
+ BattlePyramid_Text_ZeroTrainersRemaining2,
+ BattlePyramid_Text_OneTrainersRemaining2,
+ BattlePyramid_Text_TwoTrainersRemaining2,
+ BattlePyramid_Text_ThreeTrainersRemaining2,
+ BattlePyramid_Text_FourTrainersRemaining2,
+ BattlePyramid_Text_FiveTrainersRemaining2,
+ BattlePyramid_Text_SixTrainersRemaining2,
+ BattlePyramid_Text_SevenTrainersRemaining2,
};
static const u8 *const sExitDirectionHintTexts3[] =
{
- BattlePyramid_ExitHintUp_Text3,
- BattlePyramid_ExitHintLeft_Text3,
- BattlePyramid_ExitHintRight_Text3,
- BattlePyramid_ExitHintDown_Text3,
+ BattlePyramid_Text_ExitHintUp3,
+ BattlePyramid_Text_ExitHintLeft3,
+ BattlePyramid_Text_ExitHintRight3,
+ BattlePyramid_Text_ExitHintDown3,
};
static const u8 *const sRemainingItemsHintTexts3[] =
{
- BattlePyramid_ZeroItemsRemaining_Text3,
- BattlePyramid_OneItemRemaining_Text3,
- BattlePyramid_TwoItemsRemaining_Text3,
- BattlePyramid_ThreeItemsRemaining_Text3,
- BattlePyramid_FourItemsRemaining_Text3,
- BattlePyramid_FiveItemsRemaining_Text3,
- BattlePyramid_SixItemsRemaining_Text3,
- BattlePyramid_SevenItemsRemaining_Text3,
- BattlePyramid_EightItemsRemaining_Text3,
+ BattlePyramid_Text_ZeroItemsRemaining3,
+ BattlePyramid_Text_OneItemRemaining3,
+ BattlePyramid_Text_TwoItemsRemaining3,
+ BattlePyramid_Text_ThreeItemsRemaining3,
+ BattlePyramid_Text_FourItemsRemaining3,
+ BattlePyramid_Text_FiveItemsRemaining3,
+ BattlePyramid_Text_SixItemsRemaining3,
+ BattlePyramid_Text_SevenItemsRemaining3,
+ BattlePyramid_Text_EightItemsRemaining3,
};
static const u8 *const sRemainingTrainersHintTexts3[] =
{
- BattlePyramid_ZeroTrainersRemaining_Text3,
- BattlePyramid_OneTrainersRemaining_Text3,
- BattlePyramid_TwoTrainersRemaining_Text3,
- BattlePyramid_ThreeTrainersRemaining_Text3,
- BattlePyramid_FourTrainersRemaining_Text3,
- BattlePyramid_FiveTrainersRemaining_Text3,
- BattlePyramid_SixTrainersRemaining_Text3,
- BattlePyramid_SevenTrainersRemaining_Text3,
+ BattlePyramid_Text_ZeroTrainersRemaining3,
+ BattlePyramid_Text_OneTrainersRemaining3,
+ BattlePyramid_Text_TwoTrainersRemaining3,
+ BattlePyramid_Text_ThreeTrainersRemaining3,
+ BattlePyramid_Text_FourTrainersRemaining3,
+ BattlePyramid_Text_FiveTrainersRemaining3,
+ BattlePyramid_Text_SixTrainersRemaining3,
+ BattlePyramid_Text_SevenTrainersRemaining3,
};
static const u8 *const sExitDirectionHintTexts4[] =
{
- BattlePyramid_ExitHintUp_Text4,
- BattlePyramid_ExitHintLeft_Text4,
- BattlePyramid_ExitHintRight_Text4,
- BattlePyramid_ExitHintDown_Text4,
+ BattlePyramid_Text_ExitHintUp4,
+ BattlePyramid_Text_ExitHintLeft4,
+ BattlePyramid_Text_ExitHintRight4,
+ BattlePyramid_Text_ExitHintDown4,
};
static const u8 *const sRemainingItemsHintTexts4[] =
{
- BattlePyramid_ZeroItemsRemaining_Text4,
- BattlePyramid_OneItemRemaining_Text4,
- BattlePyramid_TwoItemsRemaining_Text4,
- BattlePyramid_ThreeItemsRemaining_Text4,
- BattlePyramid_FourItemsRemaining_Text4,
- BattlePyramid_FiveItemsRemaining_Text4,
- BattlePyramid_SixItemsRemaining_Text4,
- BattlePyramid_SevenItemsRemaining_Text4,
- BattlePyramid_EightItemsRemaining_Text4,
+ BattlePyramid_Text_ZeroItemsRemaining4,
+ BattlePyramid_Text_OneItemRemaining4,
+ BattlePyramid_Text_TwoItemsRemaining4,
+ BattlePyramid_Text_ThreeItemsRemaining4,
+ BattlePyramid_Text_FourItemsRemaining4,
+ BattlePyramid_Text_FiveItemsRemaining4,
+ BattlePyramid_Text_SixItemsRemaining4,
+ BattlePyramid_Text_SevenItemsRemaining4,
+ BattlePyramid_Text_EightItemsRemaining4,
};
static const u8 *const sRemainingTrainersHintTexts4[] =
{
- BattlePyramid_ZeroTrainersRemaining_Text4,
- BattlePyramid_OneTrainersRemaining_Text4,
- BattlePyramid_TwoTrainersRemaining_Text4,
- BattlePyramid_ThreeTrainersRemaining_Text4,
- BattlePyramid_FourTrainersRemaining_Text4,
- BattlePyramid_FiveTrainersRemaining_Text4,
- BattlePyramid_SixTrainersRemaining_Text4,
- BattlePyramid_SevenTrainersRemaining_Text4,
+ BattlePyramid_Text_ZeroTrainersRemaining4,
+ BattlePyramid_Text_OneTrainersRemaining4,
+ BattlePyramid_Text_TwoTrainersRemaining4,
+ BattlePyramid_Text_ThreeTrainersRemaining4,
+ BattlePyramid_Text_FourTrainersRemaining4,
+ BattlePyramid_Text_FiveTrainersRemaining4,
+ BattlePyramid_Text_SixTrainersRemaining4,
+ BattlePyramid_Text_SevenTrainersRemaining4,
};
static const u8 *const sExitDirectionHintTexts5[] =
{
- BattlePyramid_ExitHintUp_Text5,
- BattlePyramid_ExitHintLeft_Text5,
- BattlePyramid_ExitHintRight_Text5,
- BattlePyramid_ExitHintDown_Text5,
+ BattlePyramid_Text_ExitHintUp5,
+ BattlePyramid_Text_ExitHintLeft5,
+ BattlePyramid_Text_ExitHintRight5,
+ BattlePyramid_Text_ExitHintDown5,
};
static const u8 *const sRemainingItemsHintTexts5[] =
{
- BattlePyramid_ZeroItemsRemaining_Text5,
- BattlePyramid_OneItemRemaining_Text5,
- BattlePyramid_TwoItemsRemaining_Text5,
- BattlePyramid_ThreeItemsRemaining_Text5,
- BattlePyramid_FourItemsRemaining_Text5,
- BattlePyramid_FiveItemsRemaining_Text5,
- BattlePyramid_SixItemsRemaining_Text5,
- BattlePyramid_SevenItemsRemaining_Text5,
- BattlePyramid_EightItemsRemaining_Text5,
+ BattlePyramid_Text_ZeroItemsRemaining5,
+ BattlePyramid_Text_OneItemRemaining5,
+ BattlePyramid_Text_TwoItemsRemaining5,
+ BattlePyramid_Text_ThreeItemsRemaining5,
+ BattlePyramid_Text_FourItemsRemaining5,
+ BattlePyramid_Text_FiveItemsRemaining5,
+ BattlePyramid_Text_SixItemsRemaining5,
+ BattlePyramid_Text_SevenItemsRemaining5,
+ BattlePyramid_Text_EightItemsRemaining5,
};
static const u8 *const sRemainingTrainersHintTexts5[] =
{
- BattlePyramid_ZeroTrainersRemaining_Text5,
- BattlePyramid_OneTrainersRemaining_Text5,
- BattlePyramid_TwoTrainersRemaining_Text5,
- BattlePyramid_ThreeTrainersRemaining_Text5,
- BattlePyramid_FourTrainersRemaining_Text5,
- BattlePyramid_FiveTrainersRemaining_Text5,
- BattlePyramid_SixTrainersRemaining_Text5,
- BattlePyramid_SevenTrainersRemaining_Text5,
+ BattlePyramid_Text_ZeroTrainersRemaining5,
+ BattlePyramid_Text_OneTrainersRemaining5,
+ BattlePyramid_Text_TwoTrainersRemaining5,
+ BattlePyramid_Text_ThreeTrainersRemaining5,
+ BattlePyramid_Text_FourTrainersRemaining5,
+ BattlePyramid_Text_FiveTrainersRemaining5,
+ BattlePyramid_Text_SixTrainersRemaining5,
+ BattlePyramid_Text_SevenTrainersRemaining5,
};
static const u8 *const sExitDirectionHintTexts6[] =
{
- BattlePyramid_ExitHintUp_Text6,
- BattlePyramid_ExitHintLeft_Text6,
- BattlePyramid_ExitHintRight_Text6,
- BattlePyramid_ExitHintDown_Text6,
+ BattlePyramid_Text_ExitHintUp6,
+ BattlePyramid_Text_ExitHintLeft6,
+ BattlePyramid_Text_ExitHintRight6,
+ BattlePyramid_Text_ExitHintDown6,
};
static const u8 *const sRemainingItemsHintTexts6[] =
{
- BattlePyramid_ZeroItemsRemaining_Text6,
- BattlePyramid_OneItemRemaining_Text6,
- BattlePyramid_TwoItemsRemaining_Text6,
- BattlePyramid_ThreeItemsRemaining_Text6,
- BattlePyramid_FourItemsRemaining_Text6,
- BattlePyramid_FiveItemsRemaining_Text6,
- BattlePyramid_SixItemsRemaining_Text6,
- BattlePyramid_SevenItemsRemaining_Text6,
- BattlePyramid_EightItemsRemaining_Text6,
+ BattlePyramid_Text_ZeroItemsRemaining6,
+ BattlePyramid_Text_OneItemRemaining6,
+ BattlePyramid_Text_TwoItemsRemaining6,
+ BattlePyramid_Text_ThreeItemsRemaining6,
+ BattlePyramid_Text_FourItemsRemaining6,
+ BattlePyramid_Text_FiveItemsRemaining6,
+ BattlePyramid_Text_SixItemsRemaining6,
+ BattlePyramid_Text_SevenItemsRemaining6,
+ BattlePyramid_Text_EightItemsRemaining6,
};
static const u8 *const sRemainingTrainersHintTexts6[] =
{
- BattlePyramid_ZeroTrainersRemaining_Text6,
- BattlePyramid_OneTrainersRemaining_Text6,
- BattlePyramid_TwoTrainersRemaining_Text6,
- BattlePyramid_ThreeTrainersRemaining_Text6,
- BattlePyramid_FourTrainersRemaining_Text6,
- BattlePyramid_FiveTrainersRemaining_Text6,
- BattlePyramid_SixTrainersRemaining_Text6,
- BattlePyramid_SevenTrainersRemaining_Text6,
+ BattlePyramid_Text_ZeroTrainersRemaining6,
+ BattlePyramid_Text_OneTrainersRemaining6,
+ BattlePyramid_Text_TwoTrainersRemaining6,
+ BattlePyramid_Text_ThreeTrainersRemaining6,
+ BattlePyramid_Text_FourTrainersRemaining6,
+ BattlePyramid_Text_FiveTrainersRemaining6,
+ BattlePyramid_Text_SixTrainersRemaining6,
+ BattlePyramid_Text_SevenTrainersRemaining6,
};
static const u8 *const *const sPostBattleHintTexts1[] =
@@ -787,24 +787,24 @@ static const u8 sHintTextTypes[] =
static void (* const sBattlePyramidFunctions[])(void) =
{
- [BATTLE_PYRAMID_FUNC_INIT] = InitPyramidChallenge,
- [BATTLE_PYRAMID_FUNC_GET_DATA] = GetBattlePyramidData,
- [BATTLE_PYRAMID_FUNC_SET_DATA] = SetBattlePyramidData,
- [BATTLE_PYRAMID_FUNC_SAVE] = SavePyramidChallenge,
- [BATTLE_PYRAMID_FUNC_SET_PRIZE] = SetBattlePyramidPrize,
- [BATTLE_PYRAMID_FUNC_GIVE_PRIZE] = GiveBattlePyramidPrize,
- [BATTLE_PYRAMID_FUNC_SEED_FLOOR] = SeedPyramidFloor,
- [BATTLE_PYRAMID_FUNC_SET_ITEM] = SetPickupItem,
- [BATTLE_PYRAMID_FUNC_HIDE_ITEM] = HidePyramidItem,
- [BATTLE_PYRAMID_FUNC_INIT_TRAINERS] = InitPyramidFacilityTrainers,
- [BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT] = ShowPostBattleHintText,
- [BATTLE_PYRAMID_FUNC_UPDATE_STREAK] = UpdatePyramidWinStreak,
- [BATTLE_PYRAMID_FUNC_IS_IN] = GetInBattlePyramid,
- [BATTLE_PYRAMID_FUNC_UPDATE_LIGHT] = UpdatePyramidLightRadius,
- [BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS] = ClearPyramidPartyHeldItems,
+ [BATTLE_PYRAMID_FUNC_INIT] = InitPyramidChallenge,
+ [BATTLE_PYRAMID_FUNC_GET_DATA] = GetBattlePyramidData,
+ [BATTLE_PYRAMID_FUNC_SET_DATA] = SetBattlePyramidData,
+ [BATTLE_PYRAMID_FUNC_SAVE] = SavePyramidChallenge,
+ [BATTLE_PYRAMID_FUNC_SET_PRIZE] = SetBattlePyramidPrize,
+ [BATTLE_PYRAMID_FUNC_GIVE_PRIZE] = GiveBattlePyramidPrize,
+ [BATTLE_PYRAMID_FUNC_SEED_FLOOR] = SeedPyramidFloor,
+ [BATTLE_PYRAMID_FUNC_SET_ITEM] = SetPickupItem,
+ [BATTLE_PYRAMID_FUNC_HIDE_ITEM] = HidePyramidItem,
+ [BATTLE_PYRAMID_FUNC_SET_TRAINERS] = SetPyramidFacilityTrainers,
+ [BATTLE_PYRAMID_FUNC_SHOW_HINT_TEXT] = ShowPostBattleHintText,
+ [BATTLE_PYRAMID_FUNC_UPDATE_STREAK] = UpdatePyramidWinStreak,
+ [BATTLE_PYRAMID_FUNC_IS_IN] = GetInBattlePyramid,
+ [BATTLE_PYRAMID_FUNC_UPDATE_LIGHT] = UpdatePyramidLightRadius,
+ [BATTLE_PYRAMID_FUNC_CLEAR_HELD_ITEMS] = ClearPyramidPartyHeldItems,
[BATTLE_PYRAMID_FUNC_SET_FLOOR_PALETTE] = SetPyramidFloorPalette,
- [BATTLE_PYRAMID_FUNC_16] = sub_81A9828,
- [BATTLE_PYRAMID_FUNC_RESTORE_PARTY] = RestorePyramidPlayerParty,
+ [BATTLE_PYRAMID_FUNC_START_MENU] = BattlePyramidStartMenu,
+ [BATTLE_PYRAMID_FUNC_RESTORE_PARTY] = RestorePyramidPlayerParty,
};
static const u16 sShortStreakRewardItems[] = {ITEM_HP_UP, ITEM_PROTEIN, ITEM_IRON, ITEM_CALCIUM, ITEM_CARBOS, ITEM_ZINC};
@@ -1029,7 +1029,7 @@ static void HidePyramidItem(void)
}
}
-static void InitPyramidFacilityTrainers(void)
+static void SetPyramidFacilityTrainers(void)
{
gFacilityTrainers = gBattleFrontierTrainers;
}
@@ -1193,9 +1193,10 @@ static void Task_SetPyramidFloorPalette(u8 taskId)
}
}
-static void sub_81A9828(void)
+// Unused. Handled by BuildStartMenuActions
+static void BattlePyramidStartMenu(void)
{
- sub_809FDD4();
+ ShowBattlePyramidStartMenu();
}
static void RestorePyramidPlayerParty(void)
@@ -1417,7 +1418,7 @@ u8 GetPyramidRunMultiplier(void)
u8 InBattlePyramid(void)
{
- if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
return 1;
else if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP)
return 2;
@@ -1427,11 +1428,11 @@ u8 InBattlePyramid(void)
bool8 InBattlePyramid_(void)
{
- return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE
+ return gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR
|| gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP;
}
-void sub_81A9E90(void)
+void PausePyramidChallenge(void)
{
if (InBattlePyramid())
{
@@ -1475,9 +1476,10 @@ u8 GetBattlePyramindTrainerEncounterMusicId(u16 trainerId)
return TRAINER_ENCOUNTER_MUSIC_MALE;
}
-void sub_81A9F80(void)
+// Unused
+static void BattlePyramidRetireChallenge(void)
{
- ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88);
+ ScriptContext1_SetupScript(BattlePyramid_Retire);
}
static u16 GetUniqueTrainerId(u8 eventObjectId)
@@ -1528,7 +1530,7 @@ void GenerateBattlePyramidFloorLayout(u16 *backupMapData, bool8 setPlayerPositio
{
u16 *map;
int yOffset, xOffset;
- const struct MapLayout *mapLayout = gMapLayouts[floorLayoutOffsets[i] + LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE];
+ const struct MapLayout *mapLayout = gMapLayouts[floorLayoutOffsets[i] + LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR];
const u16 *layoutMap = mapLayout->map;
gBackupMapLayout.map = backupMapData;
diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 59592e49d..5a9fd5687 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -39,7 +39,7 @@ EWRAM_DATA struct PyramidBagCursorData gPyramidBagCursorData = {0};
// This file's functions.
static void Task_HandlePyramidBagInput(u8 taskId);
-static void sub_81C4F44(u8 taskId);
+static void Task_ChooseItemsToTossFromPyramidBag(u8 taskId);
static void sub_81C5B4C(u8 taskId);
static void Task_BeginItemSwap(u8 taskId);
static void sub_81C5D20(u8 taskId);
@@ -354,14 +354,14 @@ static void sub_81C4F10(void)
GoToBattlePyramidBagMenu(1, CB2_SetUpReshowBattleScreenAfterMenu2);
}
-void sub_81C4F24(void)
+void ChooseItemsToTossFromPyramidBag(void)
{
ScriptContext2_Enable();
FadeScreen(1, 0);
- CreateTask(sub_81C4F44, 10);
+ CreateTask(Task_ChooseItemsToTossFromPyramidBag, 10);
}
-static void sub_81C4F44(u8 taskId)
+static void Task_ChooseItemsToTossFromPyramidBag(u8 taskId)
{
if (!gPaletteFade.active)
{
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c
index 852fa2e1b..5b2d26b3c 100644
--- a/src/field_control_avatar.c
+++ b/src/field_control_avatar.c
@@ -517,7 +517,7 @@ static bool8 TryStartMiscWalkingScripts(u16 metatileBehavior)
}
else if (MetatileBehavior_IsBattlePyramidWarp(metatileBehavior))
{
- ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252BE8);
+ ScriptContext1_SetupScript(BattlePyramid_WarpToNextFloor);
return TRUE;
}
else if (MetatileBehavior_IsSecretBaseGlitterMat(metatileBehavior) == TRUE)
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c
index 076859c28..74bb65b4c 100644
--- a/src/field_screen_effect.c
+++ b/src/field_screen_effect.c
@@ -429,7 +429,7 @@ static void sub_80AF660(u8 taskId)
if (WaitForWeatherFadeIn() == TRUE)
{
DestroyTask(taskId);
- CreateTask(sub_809FA34, 80);
+ CreateTask(Task_ShowStartMenu, 80);
}
}
diff --git a/src/frontier_pass.c b/src/frontier_pass.c
index 6832c4f66..79c1ce6f4 100644
--- a/src/frontier_pass.c
+++ b/src/frontier_pass.c
@@ -1558,7 +1558,7 @@ static u8 MapNumToFrontierFacilityId(u16 mapNum) // id + 1, zero means not a fro
|| mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PIKE_ROOM_WILD_MONS))
return FRONTIER_FACILITY_PIKE + 1;
else if (mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_LOBBY)
- || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ || mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
|| mapNum == MAP_NUM(BATTLE_FRONTIER_BATTLE_PYRAMID_TOP))
return FRONTIER_FACILITY_PYRAMID + 1;
else
diff --git a/src/overworld.c b/src/overworld.c
index c288f2e00..e837ed902 100644
--- a/src/overworld.c
+++ b/src/overworld.c
@@ -852,7 +852,7 @@ static void mli0_load_map(u32 a1)
LoadCurrentMapData();
if (!(sUnknown_020322D8 & 1))
{
- if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
LoadBattlePyramidEventObjectTemplates();
else if (InTrainerHill())
LoadTrainerHillEventObjectTemplates();
@@ -880,7 +880,7 @@ static void mli0_load_map(u32 a1)
RunOnTransitionMapScript();
UpdateLocationHistoryForRoamer();
RoamerMoveToOtherLocationSet();
- if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
InitBattlePyramidMap(FALSE);
else if (InTrainerHill())
InitTrainerHillMap();
@@ -1720,7 +1720,7 @@ void CB2_ContinueSavedGame(void)
LoadSaveblockMapHeader();
ClearDiveAndHoleWarps();
trainerHillMapId = GetCurrentTrainerHillMapId();
- if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
LoadBattlePyramidFloorEventObjectScripts();
else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE)
LoadTrainerHillFloorEventObjectScripts();
@@ -1730,7 +1730,7 @@ void CB2_ContinueSavedGame(void)
UnfreezeEventObjects();
DoTimeBasedEvents();
sub_8084788();
- if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
InitBattlePyramidMap(TRUE);
else if (trainerHillMapId != 0)
InitTrainerHillMap();
diff --git a/src/start_menu.c b/src/start_menu.c
index c24497d74..d0e28cf02 100644
--- a/src/start_menu.c
+++ b/src/start_menu.c
@@ -512,14 +512,14 @@ static bool8 sub_809FA00(void)
return TRUE;
}
-void sub_809FA18(void) // Called from field_screen.s
+void sub_809FA18(void)
{
sUnknown_02037619[0] = 0;
sUnknown_02037619[1] = 0;
gFieldCallback2 = sub_809FA00;
}
-void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s
+void Task_ShowStartMenu(u8 taskId)
{
struct Task* task = &gTasks[taskId];
@@ -539,7 +539,7 @@ void sub_809FA34(u8 taskId) // Referenced in field_screen.s and rom_8011DC0.s
}
}
-void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s
+void ShowStartMenu(void)
{
if (!IsUpdateLinkStateCBActive())
{
@@ -547,7 +547,7 @@ void ShowStartMenu(void) // Called from overworld.c and field_control_avatar.s
sub_808B864();
sub_808BCF4();
}
- CreateStartMenuTask(sub_809FA34);
+ CreateStartMenuTask(Task_ShowStartMenu);
ScriptContext2_Enable();
}
@@ -743,11 +743,12 @@ static bool8 StartMenuBattlePyramidRetireCallback(void)
return FALSE;
}
-void sub_809FDD4(void)
+// Functionally unused
+void ShowBattlePyramidStartMenu(void)
{
ClearDialogWindowAndFrameToTransparent(0, FALSE);
ScriptUnfreezeEventObjects();
- CreateStartMenuTask(sub_809FA34);
+ CreateStartMenuTask(Task_ShowStartMenu);
ScriptContext2_Enable();
}
@@ -827,7 +828,7 @@ static bool8 BattlePyramidRetireCallback(void)
ClearDialogWindowAndFrameToTransparent(0, TRUE);
ScriptUnfreezeEventObjects();
ScriptContext2_Disable();
- ScriptContext1_SetupScript(BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88);
+ ScriptContext1_SetupScript(BattlePyramid_Retire);
return TRUE;
}
@@ -853,7 +854,7 @@ static u8 RunSaveCallback(void)
return sSaveDialogCallback();
}
-void SaveGame(void) // Called from cable_club.s
+void SaveGame(void)
{
InitSave();
CreateTask(SaveGameTask, 0x50);
@@ -1048,7 +1049,7 @@ static u8 SaveDoSaveCallback(void)
u8 saveStatus;
IncrementGameStat(GAME_STAT_SAVED_GAME);
- sub_81A9E90();
+ PausePyramidChallenge();
if (gDifferentSaveFile == TRUE)
{
@@ -1202,7 +1203,7 @@ static bool32 sub_80A03E4(u8 *par1)
return FALSE;
}
-void sub_80A0514(void) // Called from cable_club.s
+void sub_80A0514(void)
{
if (sub_80A03E4(&gMain.state))
{
@@ -1371,7 +1372,7 @@ static void sub_80A08A4(u8 taskId)
}
}
-void sub_80A08CC(void) // Referenced in data/specials.inc and data/scripts/maps/BattleFrontier_BattleTowerLobby.inc
+void sub_80A08CC(void)
{
u8 taskId = CreateTask(sub_8153688, 0x5);
gTasks[taskId].data[2] = 1;
@@ -1386,7 +1387,7 @@ static void HideStartMenuWindow(void)
ScriptContext2_Disable();
}
-void HideStartMenu(void) // Called from map_name_popup.s
+void HideStartMenu(void)
{
PlaySE(SE_SELECT);
HideStartMenuWindow();
diff --git a/src/union_room.c b/src/union_room.c
index 735778ebb..ba973a7d9 100644
--- a/src/union_room.c
+++ b/src/union_room.c
@@ -2423,7 +2423,7 @@ void sub_80156E0(u8 taskId)
}
break;
case 23:
- if (!FuncIsActiveTask(sub_809FA34))
+ if (!FuncIsActiveTask(Task_ShowStartMenu))
{
sub_8011090(0x40, 0, 0);
data->state = 4;
diff --git a/src/wild_encounter.c b/src/wild_encounter.c
index cb6dba1d4..52aac17f3 100644
--- a/src/wild_encounter.c
+++ b/src/wild_encounter.c
@@ -485,7 +485,7 @@ static bool8 DoWildEncounterRateTest(u32 encounterRate, bool8 ignoreAbility)
{
u32 ability = GetMonAbility(&gPlayerParty[0]);
- if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (ability == ABILITY_STENCH && gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
encounterRate = encounterRate * 3 / 4;
else if (ability == ABILITY_STENCH)
encounterRate /= 2;
@@ -548,7 +548,7 @@ bool8 StandardWildEncounter(u16 currMetaTileBehavior, u16 previousMetaTileBehavi
BattleSetup_StartBattlePikeWildBattle();
return TRUE;
}
- if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
{
headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
if (previousMetaTileBehavior != currMetaTileBehavior && !DoGlobalWildEncounterDiceRoll())
@@ -686,7 +686,7 @@ bool8 SweetScentWildEncounter(void)
BattleSetup_StartBattlePikeWildBattle();
return TRUE;
}
- if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE)
+ if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR)
{
headerId = gSaveBlock2Ptr->frontier.curChallengeBattleNum;
if (TryGenerateWildMon(gBattlePyramidWildMonHeaders[headerId].landMonsInfo, WILD_AREA_LAND, 0) != TRUE)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 10:53:17 +0000