summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/battle_pike.c49
-rw-r--r--src/battle_pyramid.c696
-rw-r--r--src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h82
-rw-r--r--src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h82
-rw-r--r--src/frontier_data.c233
-rw-r--r--src/frontier_util.c32
6 files changed, 812 insertions, 362 deletions
diff --git a/src/battle_pike.c b/src/battle_pike.c
index c11850285..38d3e7d4a 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -41,7 +41,6 @@ struct Unk0861231C
u8 unk2;
u8 unk3;
u8 unk4;
- u8 unk5;//? unused ?
};
struct PikeWildMon
@@ -104,7 +103,7 @@ static bool8 sub_81A7D8C(struct Task *task);
static bool8 sub_81A7DE8(struct Task *task);
// Const rom data.
-const struct PikeWildMon gUnknown_086121D4[] =
+static const struct PikeWildMon sLvl50_Mons1[] =
{
{
.species = SPECIES_SEVIPER,
@@ -123,7 +122,7 @@ const struct PikeWildMon gUnknown_086121D4[] =
}
};
-const struct PikeWildMon gUnknown_086121F8[] =
+static const struct PikeWildMon sLvl50_Mons2[] =
{
{
.species = SPECIES_SEVIPER,
@@ -142,7 +141,7 @@ const struct PikeWildMon gUnknown_086121F8[] =
}
};
-const struct PikeWildMon gUnknown_0861221C[] =
+static const struct PikeWildMon sLvl50_Mons3[] =
{
{
.species = SPECIES_SEVIPER,
@@ -161,7 +160,7 @@ const struct PikeWildMon gUnknown_0861221C[] =
}
};
-const struct PikeWildMon gUnknown_08612240[] =
+static const struct PikeWildMon sLvl50_Mons4[] =
{
{
.species = SPECIES_SEVIPER,
@@ -180,15 +179,15 @@ const struct PikeWildMon gUnknown_08612240[] =
}
};
-const struct PikeWildMon *const gUnknown_08612264[] =
+static const struct PikeWildMon *const sLvl50Mons[] =
{
- gUnknown_086121D4,
- gUnknown_086121F8,
- gUnknown_0861221C,
- gUnknown_08612240
+ sLvl50_Mons1,
+ sLvl50_Mons2,
+ sLvl50_Mons3,
+ sLvl50_Mons4
};
-const struct PikeWildMon gUnknown_08612274[] =
+static const struct PikeWildMon sLvlOpen_Mons1[] =
{
{
.species = SPECIES_SEVIPER,
@@ -207,7 +206,7 @@ const struct PikeWildMon gUnknown_08612274[] =
}
};
-const struct PikeWildMon gUnknown_08612298[] =
+static const struct PikeWildMon sLvlOpen_Mons2[] =
{
{
.species = SPECIES_SEVIPER,
@@ -226,7 +225,7 @@ const struct PikeWildMon gUnknown_08612298[] =
}
};
-const struct PikeWildMon gUnknown_086122BC[] =
+static const struct PikeWildMon sLvlOpen_Mons3[] =
{
{
.species = SPECIES_SEVIPER,
@@ -245,7 +244,7 @@ const struct PikeWildMon gUnknown_086122BC[] =
}
};
-const struct PikeWildMon gUnknown_086122E0[] =
+static const struct PikeWildMon sLvlOpen_Mons4[] =
{
{
.species = SPECIES_SEVIPER,
@@ -264,21 +263,21 @@ const struct PikeWildMon gUnknown_086122E0[] =
}
};
-const struct PikeWildMon *const gUnknown_08612304[] =
+static const struct PikeWildMon *const sLvlOpenMons[] =
{
- gUnknown_08612274,
- gUnknown_08612298,
- gUnknown_086122BC,
- gUnknown_086122E0
+ sLvlOpen_Mons1,
+ sLvlOpen_Mons2,
+ sLvlOpen_Mons3,
+ sLvlOpen_Mons4
};
-const struct PikeWildMon *const *const gUnknown_08612314[2] =
+static const struct PikeWildMon *const *const sWildMons[2] =
{
- gUnknown_08612264,
- gUnknown_08612304
+ [FRONTIER_LVL_50] = sLvl50Mons,
+ [FRONTIER_LVL_OPEN] = sLvlOpenMons
};
-const struct Unk0861231C gUnknown_0861231C[] =
+static const struct Unk0861231C gUnknown_0861231C[] =
{
{
.unk0 = 0x0012,
@@ -432,7 +431,7 @@ const struct Unk0861231C gUnknown_0861231C[] =
}
};
-const u16 gUnknown_086123E4[][6] =
+static const u16 gUnknown_086123E4[][6] =
{
{0x0a29, 0x0630, 0x0a01, 0x140f, 0x1020, 0x270e},
{0x0a2a, 0x081d, 0x061b, 0x1034, 0x1e20, 0x0a29},
@@ -1104,7 +1103,7 @@ bool32 TryGenerateBattlePikeWildMon(bool8 checkKeenEyeIntimidate)
s32 monLevel;
u8 headerId = GetBattlePikeWildMonHeaderId();
u32 lvlMode = gSaveBlock2Ptr->frontier.lvlMode;
- const struct PikeWildMon *const *const wildMons = gUnknown_08612314[lvlMode];
+ const struct PikeWildMon *const *const wildMons = sWildMons[lvlMode];
u32 abilityBit;
s32 pikeMonId = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL);
pikeMonId = SpeciesToPikeMonId(pikeMonId);
diff --git a/src/battle_pyramid.c b/src/battle_pyramid.c
index 29176db7a..23343ba20 100644
--- a/src/battle_pyramid.c
+++ b/src/battle_pyramid.c
@@ -6,6 +6,7 @@
#include "battle_setup.h"
#include "battle_tower.h"
#include "save.h"
+#include "strings.h"
#include "fieldmap.h"
#include "palette.h"
#include "field_message_box.h"
@@ -22,25 +23,50 @@
#include "script.h"
#include "malloc.h"
#include "overworld.h"
+#include "event_scripts.h"
#include "constants/battle_frontier.h"
#include "constants/event_objects.h"
#include "constants/event_object_movement_constants.h"
#include "constants/items.h"
#include "constants/maps.h"
#include "constants/moves.h"
+#include "constants/species.h"
extern u8 gSelectedOrderFromParty[3];
extern void door_upload_tiles(void);
extern const struct MapLayout *const gMapLayouts[];
-
+extern const u16 gUnknown_08D856C8[][16];
extern const u16 gBattleFrontierHeldItems[];
extern const struct FacilityMon gBattleFrontierMons[];
extern const struct BattleFrontierTrainer gBattleFrontierTrainers[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C88[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C4F[];
-extern const u8 BattleFrontier_BattlePyramidEmptySquare_EventScript_252C6A[];
+#define TOTAL_ROUNDS 20
+#define PICKUP_ITEMS_PER_ROUND 10
+
+struct PyramidWildMon
+{
+ u16 species;
+ u8 lvl;
+ u8 abilityBit;
+ u16 moves[4];
+};
+
+struct Struct_08613650
+{
+ u8 unk0;
+ u8 unk1;
+ u8 unk2;
+ u8 unk3;
+ u8 runMultiplier;
+ u8 unk5[8];
+};
+
+struct ClassMusic
+{
+ u8 class;
+ u8 music;
+};
// This file's functions.
static void sub_81A8E9C(void);
@@ -74,6 +100,664 @@ static bool8 sub_81AA648(u8, u8);
static bool8 sub_81AA760(u8 arg0, u8 *mapNums, u8 whichMap, u8 id);
static bool8 sub_81AA810(u8 arg0, u8 x, u8 y, u8 *mapNums, u8 whichMap, u8 id);
+// Const rom data.
+#include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h"
+#include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h"
+
+static const struct Struct_08613650 gUnknown_08613650[] =
+{
+ {
+ .unk0 = 0x07,
+ .unk1 = 0x03,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x80,
+ .unk5 = {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03}
+ },
+ {
+ .unk0 = 0x06,
+ .unk1 = 0x03,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x80,
+ .unk5 = {0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04}
+ },
+ {
+ .unk0 = 0x05,
+ .unk1 = 0x03,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x78,
+ .unk5 = {0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05}
+ },
+ {
+ .unk0 = 0x04,
+ .unk1 = 0x04,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x78,
+ .unk5 = {0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06}
+ },
+ {
+ .unk0 = 0x04,
+ .unk1 = 0x04,
+ .unk2 = 0x00,
+ .unk3 = 0x01,
+ .runMultiplier = 0x70,
+ .unk5 = {0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07}
+ },
+ {
+ .unk0 = 0x03,
+ .unk1 = 0x05,
+ .unk2 = 0x00,
+ .unk3 = 0x02,
+ .runMultiplier = 0x70,
+ .unk5 = {0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c}
+ },
+ {
+ .unk0 = 0x03,
+ .unk1 = 0x05,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x68,
+ .unk5 = {0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d}
+ },
+ {
+ .unk0 = 0x02,
+ .unk1 = 0x04,
+ .unk2 = 0x00,
+ .unk3 = 0x01,
+ .runMultiplier = 0x68,
+ .unk5 = {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e}
+ },
+ {
+ .unk0 = 0x04,
+ .unk1 = 0x05,
+ .unk2 = 0x00,
+ .unk3 = 0x02,
+ .runMultiplier = 0x60,
+ .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}
+ },
+ {
+ .unk0 = 0x03,
+ .unk1 = 0x06,
+ .unk2 = 0x00,
+ .unk3 = 0x04,
+ .runMultiplier = 0x60,
+ .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}
+ },
+ {
+ .unk0 = 0x02,
+ .unk1 = 0x03,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x58,
+ .unk5 = {0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d}
+ },
+ {
+ .unk0 = 0x04,
+ .unk1 = 0x05,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x58,
+ .unk5 = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b}
+ },
+ {
+ .unk0 = 0x03,
+ .unk1 = 0x07,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x50,
+ .unk5 = {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c}
+ },
+ {
+ .unk0 = 0x02,
+ .unk1 = 0x04,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x50,
+ .unk5 = {0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d}
+ },
+ {
+ .unk0 = 0x03,
+ .unk1 = 0x06,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x50,
+ .unk5 = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e}
+ },
+ {
+ .unk0 = 0x03,
+ .unk1 = 0x08,
+ .unk2 = 0x00,
+ .unk3 = 0x00,
+ .runMultiplier = 0x50,
+ .unk5 = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f}
+ }
+};
+
+static const u8 gUnknown_08613750[34][2] =
+{
+ {0x28, 0x00},
+ {0x46, 0x01},
+ {0x5a, 0x02},
+ {0x64, 0x03},
+ {0x23, 0x01},
+ {0x37, 0x02},
+ {0x4b, 0x03},
+ {0x5a, 0x04},
+ {0x64, 0x0a},
+ {0x23, 0x02},
+ {0x37, 0x03},
+ {0x4b, 0x04},
+ {0x5a, 0x05},
+ {0x64, 0x0b},
+ {0x23, 0x03},
+ {0x37, 0x04},
+ {0x4b, 0x05},
+ {0x5a, 0x06},
+ {0x64, 0x0c},
+ {0x23, 0x04},
+ {0x37, 0x05},
+ {0x4b, 0x06},
+ {0x5a, 0x07},
+ {0x64, 0x0d},
+ {0x23, 0x05},
+ {0x37, 0x06},
+ {0x4b, 0x07},
+ {0x5a, 0x08},
+ {0x64, 0x0e},
+ {0x23, 0x06},
+ {0x37, 0x07},
+ {0x4b, 0x08},
+ {0x5a, 0x09},
+ {0x64, 0x0f}
+};
+
+static const u8 gUnknown_08613794[] =
+{
+ 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00
+};
+
+static const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
+{
+ {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+};
+
+static const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
+{
+ {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+ {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
+ {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
+};
+
+static const u8 gUnknown_08613ABC[63][2] =
+{
+ {0x1f, 0x00},
+ {0x2e, 0x01},
+ {0x3d, 0x02},
+ {0x47, 0x03},
+ {0x51, 0x04},
+ {0x5b, 0x05},
+ {0x5e, 0x06},
+ {0x61, 0x07},
+ {0x64, 0x08},
+ {0x0f, 0x00},
+ {0x2e, 0x01},
+ {0x3d, 0x02},
+ {0x47, 0x03},
+ {0x51, 0x04},
+ {0x5b, 0x05},
+ {0x5e, 0x06},
+ {0x61, 0x08},
+ {0x64, 0x09},
+ {0x0f, 0x00},
+ {0x1e, 0x01},
+ {0x3d, 0x02},
+ {0x47, 0x03},
+ {0x51, 0x04},
+ {0x5b, 0x05},
+ {0x5e, 0x06},
+ {0x61, 0x07},
+ {0x64, 0x08},
+ {0x1c, 0x00},
+ {0x2b, 0x01},
+ {0x3a, 0x02},
+ {0x44, 0x03},
+ {0x4e, 0x04},
+ {0x58, 0x05},
+ {0x5c, 0x07},
+ {0x60, 0x08},
+ {0x64, 0x09},
+ {0x0f, 0x00},
+ {0x2b, 0x01},
+ {0x3a, 0x02},
+ {0x44, 0x03},
+ {0x4e, 0x04},
+ {0x58, 0x05},
+ {0x5c, 0x06},
+ {0x60, 0x07},
+ {0x64, 0x09},
+ {0x0f, 0x00},
+ {0x1e, 0x01},
+ {0x3a, 0x02},
+ {0x44, 0x03},
+ {0x4e, 0x04},
+ {0x58, 0x05},
+ {0x5c, 0x06},
+ {0x60, 0x07},
+ {0x64, 0x08},
+ {0x1c, 0x00},
+ {0x2b, 0x01},
+ {0x3a, 0x02},
+ {0x44, 0x03},
+ {0x4e, 0x04},
+ {0x58, 0x05},
+ {0x5c, 0x06},
+ {0x60, 0x08},
+ {0x64, 0x09},
+};
+
+static const u8 gUnknown_08613B3A[] = {0x00, 0x09, 0x12, 0x1b, 0x24, 0x2d, 0x36};
+
+static const struct ClassMusic gUnknown_08613B44[54] =
+{
+ {0x03, 0x06},
+ {0x0b, 0x06},
+ {0x0d, 0x06},
+ {0x0f, 0x01},
+ {0x2b, 0x04},
+ {0x2d, 0x01},
+ {0x24, 0x09},
+ {0x29, 0x04},
+ {0x05, 0x05},
+ {0x18, 0x04},
+ {0x2f, 0x00},
+ {0x2e, 0x09},
+ {0x11, 0x0c},
+ {0x10, 0x0b},
+ {0x1e, 0x0d},
+ {0x08, 0x01},
+ {0x17, 0x03},
+ {0x0c, 0x04},
+ {0x38, 0x04},
+ {0x1c, 0x03},
+ {0x1a, 0x00},
+ {0x19, 0x0b},
+ {0x09, 0x07},
+ {0x31, 0x07},
+ {0x35, 0x07},
+ {0x36, 0x01},
+ {0x33, 0x00},
+ {0x2a, 0x03},
+ {0x16, 0x0d},
+ {0x0e, 0x03},
+ {0x15, 0x01},
+ {0x14, 0x01},
+ {0x2c, 0x01},
+ {0x1b, 0x02},
+ {0x04, 0x01},
+ {0x07, 0x03},
+ {0x34, 0x05},
+ {0x32, 0x00},
+ {0x37, 0x02},
+ {0x1d, 0x04},
+ {0x22, 0x09},
+ {0x1f, 0x01},
+ {0x25, 0x00},
+ {0x0a, 0x04},
+ {0x28, 0x00},
+ {0x06, 0x05},
+ {0x27, 0x0b},
+ {0x26, 0x00},
+ {0x13, 0x00},
+ {0x12, 0x02},
+ {0x39, 0x08},
+ {0x02, 0x0b},
+ {0x20, 0x01},
+ {0x21, 0x00},
+};
+
+static const u8 gUnknown_08613C1C[50][2] =
+{
+ {0x0d, 0x03},
+ {0x0e, 0x04},
+ {0x10, 0x01},
+ {0x11, 0x00},
+ {0x03, 0x02},
+ {0x12, 0x03},
+ {0x0c, 0x03},
+ {0x13, 0x03},
+ {0x14, 0x03},
+ {0x15, 0x02},
+ {0x17, 0x02},
+ {0x07, 0x02},
+ {0x0a, 0x04},
+ {0x19, 0x02},
+ {0x1a, 0x02},
+ {0x1b, 0x00},
+ {0x1d, 0x02},
+ {0x1e, 0x02},
+ {0x1f, 0x03},
+ {0x20, 0x04},
+ {0x26, 0x00},
+ {0x27, 0x01},
+ {0x29, 0x04},
+ {0x2a, 0x05},
+ {0x09, 0x04},
+ {0x16, 0x05},
+ {0x2b, 0x00},
+ {0x2d, 0x04},
+ {0x2e, 0x02},
+ {0x30, 0x02},
+ {0x32, 0x02},
+ {0x31, 0x03},
+ {0x2f, 0x03},
+ {0x33, 0x03},
+ {0x34, 0x02},
+ {0x04, 0x02},
+ {0x35, 0x00},
+ {0x36, 0x03},
+ {0x37, 0x03},
+ {0x38, 0x03},
+ {0x1c, 0x01},
+ {0x3a, 0x02},
+ {0x05, 0x02},
+ {0x42, 0x02},
+ {0x02, 0x03},
+ {0x44, 0x02},
+ {0x45, 0x03},
+ {0x47, 0x03},
+ {0x43, 0x00},
+ {0x00, 0x04},
+};
+
+static const u8 *const gUnknown_08613C80[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_252D2D,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252D57,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252D81,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252DAB,
+};
+
+static const u8 *const gUnknown_08613C90[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_25330B,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2532CC,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25328B,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253248,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253206,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2531C4,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253183,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253140,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2530FD,
+};
+
+static const u8 *const gUnknown_08613CB4[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_2544A6,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25445A,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25440B,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2543BA,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25436A,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25431A,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2542CB,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25427A,
+};
+
+static const u8 *const gUnknown_08613CD4[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_252DD5,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252E03,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252E31,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252E5F,
+};
+
+static const u8 *const gUnknown_08613CE4[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_25362E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2535D4,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253578,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25351A,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2534BD,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253460,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253404,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2533A6,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25334D,
+};
+
+static const u8 *const gUnknown_08613D08[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_25471E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2546CC,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25467C,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25462A,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2545D9,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254588,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254538,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2544E6,
+};
+
+static const u8 *const gUnknown_08613D28[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_252E8D,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252EAA,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252EC7,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252EE4,
+};
+
+static const u8 *const gUnknown_08613D38[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_2539EC,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253980,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253915,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2538A8,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25383C,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2537D0,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253765,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2536F8,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25368B,
+};
+
+static const u8 *const gUnknown_08613D5C[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_254A0B,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2549AE,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25494D,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2548EB,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25488A,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254829,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2547C9,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254767,
+};
+
+static const u8 *const gUnknown_08613D7C[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_252F01,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252F3A,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252F73,
+ BattleFrontier_BattlePyramidEmptySquare_Text_252FAC,
+};
+
+static const u8 *const gUnknown_08613D8C[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_253D3E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253CE0,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253C87,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253C2C,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253BD2,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253B78,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253B1F,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253AC4,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253A69,
+};
+
+static const u8 *const gUnknown_08613DB0[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_254C3E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254BF1,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254BAE,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254B69,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254B25,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254AE1,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254A9E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254A59,
+};
+
+static const u8 *const gUnknown_08613DD0[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_252FE5,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253000,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25301B,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253036,
+};
+
+static const u8 *const gUnknown_08613DE0[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_253F6C,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253F34,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253EFA,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253EBE,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253E83,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253E48,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253E0E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253DD2,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253D96,
+};
+
+static const u8 *const gUnknown_08613E04[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_254E6E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254E27,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254DE0,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254D97,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254D4F,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254D07,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254CC0,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254C77,
+};
+
+static const u8 *const gUnknown_08613E24[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_253051,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25307C,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2530A7,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2530D2,
+};
+
+static const u8 *const gUnknown_08613E34[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_25422B,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2541DD,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25418D,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25413B,
+ BattleFrontier_BattlePyramidEmptySquare_Text_2540EA,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254099,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254049,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253FF7,
+ BattleFrontier_BattlePyramidEmptySquare_Text_253FA5,
+};
+
+static const u8 *const gUnknown_08613E58[] =
+{
+ BattleFrontier_BattlePyramidEmptySquare_Text_255068,
+ BattleFrontier_BattlePyramidEmptySquare_Text_25502F,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254FF6,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254FBB,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254F81,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254F47,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254F0E,
+ BattleFrontier_BattlePyramidEmptySquare_Text_254ED3,
+};
+
+static const u8 *const *const gUnknown_08613E78[] =
+{
+ gUnknown_08613C80,
+ gUnknown_08613C90,
+ gUnknown_08613CB4,
+};
+
+static const u8 *const *const gUnknown_08613E84[] =
+{
+ gUnknown_08613CD4,
+ gUnknown_08613CE4,
+ gUnknown_08613D08,
+};
+
+static const u8 *const *const gUnknown_08613E90[] =
+{
+ gUnknown_08613D28,
+ gUnknown_08613D38,
+ gUnknown_08613D5C,
+};
+
+static const u8 *const *const gUnknown_08613E9C[] =
+{
+ gUnknown_08613D7C,
+ gUnknown_08613D8C,
+ gUnknown_08613DB0,
+};
+
+static const u8 *const *const gUnknown_08613EA8[] =
+{
+ gUnknown_08613DD0,
+ gUnknown_08613DE0,
+ gUnknown_08613E04,
+};
+
+static const u8 *const *const gUnknown_08613EB4[] =
+{
+ gUnknown_08613E24,
+ gUnknown_08613E34,
+ gUnknown_08613E58,
+};
+
+static const u8 *const *const *const gUnknown_08613EC0[] =
+{
+ gUnknown_08613E78,
+ gUnknown_08613E84,
+ gUnknown_08613E90,
+ gUnknown_08613E9C,
+ gUnknown_08613EA8,
+ gUnknown_08613EB4,
+};
+
static const u8 gUnknown_08613ED8[] = {3, 4, 5, 6, 7, 8, 3, 4};
static void (* const sBattlePyramidFunctions[])(void) =
@@ -637,9 +1321,9 @@ void GenerateBattlePyramidWildMon(void)
round = TOTAL_ROUNDS - 1;
if (lvl != FRONTIER_LVL_50)
- wildMons = gBattlePyramidOpenLevelWildMonPointers[round];
+ wildMons = sOpenLevelWildMonPointers[round];
else
- wildMons = gBattlePyramidLevel50WildMonPointers[round];
+ wildMons = sLevel50WildMonPointers[round];
id = GetMonData(&gEnemyParty[0], MON_DATA_SPECIES, NULL) - 1;
SetMonData(&gEnemyParty[0], MON_DATA_SPECIES, &wildMons[id].species);
diff --git a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h
index 0248ce958..50bc1c856 100644
--- a/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h
+++ b/src/data/battle_frontier/battle_pyramid_level_50_wild_mons.h
@@ -1,5 +1,5 @@
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round1[] =
+static const struct PyramidWildMon sLevel50WildMons_Round1[] =
{
{
.species = SPECIES_PLUSLE,
@@ -51,7 +51,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round1[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round2[] =
+static const struct PyramidWildMon sLevel50WildMons_Round2[] =
{
{
.species = SPECIES_GULPIN,
@@ -103,7 +103,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round2[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round3[] =
+static const struct PyramidWildMon sLevel50WildMons_Round3[] =
{
{
.species = SPECIES_GROWLITHE,
@@ -155,7 +155,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round3[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round4[] =
+static const struct PyramidWildMon sLevel50WildMons_Round4[] =
{
{
.species = SPECIES_DUNSPARCE,
@@ -207,7 +207,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round4[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round5[] =
+static const struct PyramidWildMon sLevel50WildMons_Round5[] =
{
{
.species = SPECIES_HAUNTER,
@@ -259,7 +259,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round5[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round6[] =
+static const struct PyramidWildMon sLevel50WildMons_Round6[] =
{
{
.species = SPECIES_DIGLETT,
@@ -311,7 +311,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round6[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round7[] =
+static const struct PyramidWildMon sLevel50WildMons_Round7[] =
{
{
.species = SPECIES_GLALIE,
@@ -363,7 +363,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round7[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round8[] =
+static const struct PyramidWildMon sLevel50WildMons_Round8[] =
{
{
.species = SPECIES_WEEZING,
@@ -415,7 +415,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round8[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round9[] =
+static const struct PyramidWildMon sLevel50WildMons_Round9[] =
{
{
.species = SPECIES_WOBBUFFET,
@@ -467,7 +467,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round9[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round10[] =
+static const struct PyramidWildMon sLevel50WildMons_Round10[] =
{
{
.species = SPECIES_GOLEM,
@@ -519,7 +519,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round10[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round11[] =
+static const struct PyramidWildMon sLevel50WildMons_Round11[] =
{
{
.species = SPECIES_POLIWRATH,
@@ -571,7 +571,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round11[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round12[] =
+static const struct PyramidWildMon sLevel50WildMons_Round12[] =
{
{
.species = SPECIES_QUAGSIRE,
@@ -623,7 +623,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round12[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round13[] =
+static const struct PyramidWildMon sLevel50WildMons_Round13[] =
{
{
.species = SPECIES_PINECO,
@@ -675,7 +675,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round13[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round14[] =
+static const struct PyramidWildMon sLevel50WildMons_Round14[] =
{
{
.species = SPECIES_SABLEYE,
@@ -727,7 +727,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round14[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round15[] =
+static const struct PyramidWildMon sLevel50WildMons_Round15[] =
{
{
.species = SPECIES_OCTILLERY,
@@ -779,7 +779,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round15[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round16[] =
+static const struct PyramidWildMon sLevel50WildMons_Round16[] =
{
{
.species = SPECIES_DUSKULL,
@@ -831,7 +831,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round16[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round17[] =
+static const struct PyramidWildMon sLevel50WildMons_Round17[] =
{
{
.species = SPECIES_MAWILE,
@@ -883,7 +883,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round17[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round18[] =
+static const struct PyramidWildMon sLevel50WildMons_Round18[] =
{
{
.species = SPECIES_DRAGONAIR,
@@ -935,7 +935,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round18[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round19[] =
+static const struct PyramidWildMon sLevel50WildMons_Round19[] =
{
{
.species = SPECIES_ARCANINE,
@@ -987,7 +987,7 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round19[] =
}
};
-const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round20[] =
+static const struct PyramidWildMon sLevel50WildMons_Round20[] =
{
{
.species = SPECIES_KANGASKHAN,
@@ -1039,26 +1039,26 @@ const struct PyramidWildMon gBattlePyramidLevel50WildMons_Round20[] =
}
};
-const struct PyramidWildMon *const gBattlePyramidLevel50WildMonPointers[] =
+static const struct PyramidWildMon *const sLevel50WildMonPointers[] =
{
- gBattlePyramidLevel50WildMons_Round1,
- gBattlePyramidLevel50WildMons_Round2,
- gBattlePyramidLevel50WildMons_Round3,
- gBattlePyramidLevel50WildMons_Round4,
- gBattlePyramidLevel50WildMons_Round5,
- gBattlePyramidLevel50WildMons_Round6,
- gBattlePyramidLevel50WildMons_Round7,
- gBattlePyramidLevel50WildMons_Round8,
- gBattlePyramidLevel50WildMons_Round9,
- gBattlePyramidLevel50WildMons_Round10,
- gBattlePyramidLevel50WildMons_Round11,
- gBattlePyramidLevel50WildMons_Round12,
- gBattlePyramidLevel50WildMons_Round13,
- gBattlePyramidLevel50WildMons_Round14,
- gBattlePyramidLevel50WildMons_Round15,
- gBattlePyramidLevel50WildMons_Round16,
- gBattlePyramidLevel50WildMons_Round17,
- gBattlePyramidLevel50WildMons_Round18,
- gBattlePyramidLevel50WildMons_Round19,
- gBattlePyramidLevel50WildMons_Round20
+ sLevel50WildMons_Round1,
+ sLevel50WildMons_Round2,
+ sLevel50WildMons_Round3,
+ sLevel50WildMons_Round4,
+ sLevel50WildMons_Round5,
+ sLevel50WildMons_Round6,
+ sLevel50WildMons_Round7,
+ sLevel50WildMons_Round8,
+ sLevel50WildMons_Round9,
+ sLevel50WildMons_Round10,
+ sLevel50WildMons_Round11,
+ sLevel50WildMons_Round12,
+ sLevel50WildMons_Round13,
+ sLevel50WildMons_Round14,
+ sLevel50WildMons_Round15,
+ sLevel50WildMons_Round16,
+ sLevel50WildMons_Round17,
+ sLevel50WildMons_Round18,
+ sLevel50WildMons_Round19,
+ sLevel50WildMons_Round20
};
diff --git a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h
index 154a92799..6409e73b1 100644
--- a/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h
+++ b/src/data/battle_frontier/battle_pyramid_open_level_wild_mons.h
@@ -1,5 +1,5 @@
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round1[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round1[] =
{
{
.species = SPECIES_PLUSLE,
@@ -51,7 +51,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round1[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round2[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round2[] =
{
{
.species = SPECIES_GULPIN,
@@ -103,7 +103,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round2[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round3[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round3[] =
{
{
.species = SPECIES_GROWLITHE,
@@ -155,7 +155,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round3[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round4[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round4[] =
{
{
.species = SPECIES_DUNSPARCE,
@@ -207,7 +207,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round4[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round5[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round5[] =
{
{
.species = SPECIES_HAUNTER,
@@ -259,7 +259,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round5[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round6[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round6[] =
{
{
.species = SPECIES_DIGLETT,
@@ -311,7 +311,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round6[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round7[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round7[] =
{
{
.species = SPECIES_GLALIE,
@@ -363,7 +363,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round7[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round8[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round8[] =
{
{
.species = SPECIES_WEEZING,
@@ -415,7 +415,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round8[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round9[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round9[] =
{
{
.species = SPECIES_WOBBUFFET,
@@ -467,7 +467,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round9[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round10[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round10[] =
{
{
.species = SPECIES_GOLEM,
@@ -519,7 +519,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round10[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round11[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round11[] =
{
{
.species = SPECIES_POLIWRATH,
@@ -571,7 +571,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round11[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round12[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round12[] =
{
{
.species = SPECIES_QUAGSIRE,
@@ -623,7 +623,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round12[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round13[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round13[] =
{
{
.species = SPECIES_PINECO,
@@ -675,7 +675,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round13[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round14[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round14[] =
{
{
.species = SPECIES_SABLEYE,
@@ -727,7 +727,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round14[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round15[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round15[] =
{
{
.species = SPECIES_OCTILLERY,
@@ -779,7 +779,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round15[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round16[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round16[] =
{
{
.species = SPECIES_DUSKULL,
@@ -831,7 +831,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round16[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round17[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round17[] =
{
{
.species = SPECIES_MAWILE,
@@ -883,7 +883,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round17[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round18[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round18[] =
{
{
.species = SPECIES_DRAGONAIR,
@@ -935,7 +935,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round18[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round19[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round19[] =
{
{
.species = SPECIES_ARCANINE,
@@ -987,7 +987,7 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round19[] =
}
};
-const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round20[] =
+static const struct PyramidWildMon sOpenLevelWildMons_Round20[] =
{
{
.species = SPECIES_KANGASKHAN,
@@ -1039,26 +1039,26 @@ const struct PyramidWildMon gBattlePyramidOpenLevelWildMons_Round20[] =
}
};
-const struct PyramidWildMon *const gBattlePyramidOpenLevelWildMonPointers[] =
+static const struct PyramidWildMon *const sOpenLevelWildMonPointers[] =
{
- gBattlePyramidOpenLevelWildMons_Round1,
- gBattlePyramidOpenLevelWildMons_Round2,
- gBattlePyramidOpenLevelWildMons_Round3,
- gBattlePyramidOpenLevelWildMons_Round4,
- gBattlePyramidOpenLevelWildMons_Round5,
- gBattlePyramidOpenLevelWildMons_Round6,
- gBattlePyramidOpenLevelWildMons_Round7,
- gBattlePyramidOpenLevelWildMons_Round8,
- gBattlePyramidOpenLevelWildMons_Round9,
- gBattlePyramidOpenLevelWildMons_Round10,
- gBattlePyramidOpenLevelWildMons_Round11,
- gBattlePyramidOpenLevelWildMons_Round12,
- gBattlePyramidOpenLevelWildMons_Round13,
- gBattlePyramidOpenLevelWildMons_Round14,
- gBattlePyramidOpenLevelWildMons_Round15,
- gBattlePyramidOpenLevelWildMons_Round16,
- gBattlePyramidOpenLevelWildMons_Round17,
- gBattlePyramidOpenLevelWildMons_Round18,
- gBattlePyramidOpenLevelWildMons_Round19,
- gBattlePyramidOpenLevelWildMons_Round20
+ sOpenLevelWildMons_Round1,
+ sOpenLevelWildMons_Round2,
+ sOpenLevelWildMons_Round3,
+ sOpenLevelWildMons_Round4,
+ sOpenLevelWildMons_Round5,
+ sOpenLevelWildMons_Round6,
+ sOpenLevelWildMons_Round7,
+ sOpenLevelWildMons_Round8,
+ sOpenLevelWildMons_Round9,
+ sOpenLevelWildMons_Round10,
+ sOpenLevelWildMons_Round11,
+ sOpenLevelWildMons_Round12,
+ sOpenLevelWildMons_Round13,
+ sOpenLevelWildMons_Round14,
+ sOpenLevelWildMons_Round15,
+ sOpenLevelWildMons_Round16,
+ sOpenLevelWildMons_Round17,
+ sOpenLevelWildMons_Round18,
+ sOpenLevelWildMons_Round19,
+ sOpenLevelWildMons_Round20
};
diff --git a/src/frontier_data.c b/src/frontier_data.c
deleted file mode 100644
index e79bf07fb..000000000
--- a/src/frontier_data.c
+++ /dev/null
@@ -1,233 +0,0 @@
-#include "global.h"
-
-#include "battle_pyramid.h"
-
-#include "constants/moves.h"
-#include "constants/species.h"
-#include "constants/items.h"
-
-#include "data/battle_frontier/battle_pyramid_level_50_wild_mons.h"
-#include "data/battle_frontier/battle_pyramid_open_level_wild_mons.h"
-
-const struct Struct_08613650 gUnknown_08613650[] =
-{
- {
- .unk0 = 0x07,
- .unk1 = 0x03,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x80,
- .unk5 = {0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x03}
- },
- {
- .unk0 = 0x06,
- .unk1 = 0x03,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x80,
- .unk5 = {0x01, 0x01, 0x02, 0x02, 0x03, 0x03, 0x04, 0x04}
- },
- {
- .unk0 = 0x05,
- .unk1 = 0x03,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x78,
- .unk5 = {0x02, 0x02, 0x03, 0x03, 0x04, 0x04, 0x05, 0x05}
- },
- {
- .unk0 = 0x04,
- .unk1 = 0x04,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x78,
- .unk5 = {0x03, 0x03, 0x04, 0x04, 0x05, 0x05, 0x06, 0x06}
- },
- {
- .unk0 = 0x04,
- .unk1 = 0x04,
- .unk2 = 0x00,
- .unk3 = 0x01,
- .runMultiplier = 0x70,
- .unk5 = {0x04, 0x04, 0x05, 0x05, 0x06, 0x06, 0x07, 0x07}
- },
- {
- .unk0 = 0x03,
- .unk1 = 0x05,
- .unk2 = 0x00,
- .unk3 = 0x02,
- .runMultiplier = 0x70,
- .unk5 = {0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c}
- },
- {
- .unk0 = 0x03,
- .unk1 = 0x05,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x68,
- .unk5 = {0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d}
- },
- {
- .unk0 = 0x02,
- .unk1 = 0x04,
- .unk2 = 0x00,
- .unk3 = 0x01,
- .runMultiplier = 0x68,
- .unk5 = {0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e}
- },
- {
- .unk0 = 0x04,
- .unk1 = 0x05,
- .unk2 = 0x00,
- .unk3 = 0x02,
- .runMultiplier = 0x60,
- .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}
- },
- {
- .unk0 = 0x03,
- .unk1 = 0x06,
- .unk2 = 0x00,
- .unk3 = 0x04,
- .runMultiplier = 0x60,
- .unk5 = {0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f}
- },
- {
- .unk0 = 0x02,
- .unk1 = 0x03,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x58,
- .unk5 = {0x0c, 0x0d, 0x0e, 0x0c, 0x0d, 0x0e, 0x0c, 0x0d}
- },
- {
- .unk0 = 0x04,
- .unk1 = 0x05,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x58,
- .unk5 = {0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b}
- },
- {
- .unk0 = 0x03,
- .unk1 = 0x07,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x50,
- .unk5 = {0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c}
- },
- {
- .unk0 = 0x02,
- .unk1 = 0x04,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x50,
- .unk5 = {0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d, 0x0d}
- },
- {
- .unk0 = 0x03,
- .unk1 = 0x06,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x50,
- .unk5 = {0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e, 0x0e}
- },
- {
- .unk0 = 0x03,
- .unk1 = 0x08,
- .unk2 = 0x00,
- .unk3 = 0x00,
- .runMultiplier = 0x50,
- .unk5 = {0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f, 0x0f}
- }
-};
-
-const u8 gUnknown_08613750[34][2] =
-{
- {0x28, 0x00},
- {0x46, 0x01},
- {0x5a, 0x02},
- {0x64, 0x03},
- {0x23, 0x01},
- {0x37, 0x02},
- {0x4b, 0x03},
- {0x5a, 0x04},
- {0x64, 0x0a},
- {0x23, 0x02},
- {0x37, 0x03},
- {0x4b, 0x04},
- {0x5a, 0x05},
- {0x64, 0x0b},
- {0x23, 0x03},
- {0x37, 0x04},
- {0x4b, 0x05},
- {0x5a, 0x06},
- {0x64, 0x0c},
- {0x23, 0x04},
- {0x37, 0x05},
- {0x4b, 0x06},
- {0x5a, 0x07},
- {0x64, 0x0d},
- {0x23, 0x05},
- {0x37, 0x06},
- {0x4b, 0x07},
- {0x5a, 0x08},
- {0x64, 0x0e},
- {0x23, 0x06},
- {0x37, 0x07},
- {0x4b, 0x08},
- {0x5a, 0x09},
- {0x64, 0x0f}
-};
-
-const u8 gUnknown_08613794[] =
-{
- 0x00, 0x04, 0x09, 0x0e, 0x13, 0x18, 0x1d, 0x00
-};
-
-const u16 sPickupItemsLvl50[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
-{
- {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
-};
-
-const u16 sPickupItemsLvlOpen[TOTAL_ROUNDS][PICKUP_ITEMS_PER_ROUND] =
-{
- {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_CHERI_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_PECHA_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_RAWST_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_CHESTO_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPEED, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_ACCURACY, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_SPECIAL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_GUARD_SPEC, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_FLUFFY_TAIL, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_BRIGHT_POWDER, ITEM_SHELL_BELL, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_DIRE_HIT, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_LEFTOVERS, ITEM_CHOICE_BAND, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
- {ITEM_HYPER_POTION, ITEM_X_ATTACK, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LUM_BERRY, ITEM_REVIVE, ITEM_SCOPE_LENS, ITEM_FOCUS_BAND, ITEM_MAX_REVIVE, ITEM_SACRED_ASH},
- {ITEM_HYPER_POTION, ITEM_X_DEFEND, ITEM_LUM_BERRY, ITEM_ETHER, ITEM_LEPPA_BERRY, ITEM_REVIVE, ITEM_QUICK_CLAW, ITEM_KINGS_ROCK, ITEM_FULL_RESTORE, ITEM_MAX_ELIXIR},
-};
diff --git a/src/frontier_util.c b/src/frontier_util.c
index 7ba8746a1..5af7b3db7 100644
--- a/src/frontier_util.c
+++ b/src/frontier_util.c
@@ -44,7 +44,7 @@ struct FrontierBrainMon
u16 heldItem;
u8 fixedIV;
u8 nature;
- u8 evs[6];
+ u8 evs[NUM_STATS];
u16 moves[4];
};
@@ -684,7 +684,7 @@ const u16 gFrontierBannedSpecies[] =
SPECIES_KYOGRE, SPECIES_GROUDON, SPECIES_RAYQUAZA, SPECIES_JIRACHI, SPECIES_DEOXYS, 0xFFFF
};
-const u8 *const gUnknown_08611CB0[][2] =
+static const u8 *const gUnknown_08611CB0[][2] =
{
{gText_BattleTower2, gUnknown_085ED164},
{gText_BattleTower2, gUnknown_085ED170},
@@ -698,13 +698,13 @@ const u8 *const gUnknown_08611CB0[][2] =
{gText_BattleTower2, gUnknown_085ED188},
};
-const u8 *const gLevelModeText[] =
+static const u8 *const gLevelModeText[] =
{
gText_RecordsLv50,
gText_RecordsOpenLevel,
};
-const u8 *const gFacilityToRecordsText[] =
+static const u8 *const gHallFacilityToRecordsText[] =
{
gText_FrontierFacilityWinStreak,
gText_FrontierFacilityWinStreak,
@@ -718,7 +718,7 @@ const u8 *const gFacilityToRecordsText[] =
gText_FrontierFacilityWinStreak,
};
-const u16 gFacilityToBrainTrainerId[] =
+static const u16 gFacilityToBrainTrainerId[] =
{
[FRONTIER_FACILITY_TOWER] = TRAINER_ANABEL,
[FRONTIER_FACILITY_DOME] = TRAINER_TUCKER,
@@ -729,7 +729,7 @@ const u16 gFacilityToBrainTrainerId[] =
[FRONTIER_FACILITY_PYRAMID] = TRAINER_BRANDON,
};
-const u8 *const gUnknown_08611D40[] =
+static const u8 *const gUnknown_08611D40[] =
{
gText_082C843F,
gText_082C848B,
@@ -740,7 +740,7 @@ const u8 *const gUnknown_08611D40[] =
gText_082C86C3,
};
-const u8 *const gUnknown_08611D5C[] =
+static const u8 *const gUnknown_08611D5C[] =
{
gText_082C8458,
gText_082C84C1,
@@ -751,7 +751,7 @@ const u8 *const gUnknown_08611D5C[] =
gText_082C86FE,
};
-const u8 *const gUnknown_08611D78[] =
+static const u8 *const gUnknown_08611D78[] =
{
gText_082C846C,
gText_082C84D0,
@@ -762,7 +762,7 @@ const u8 *const gUnknown_08611D78[] =
gText_082C8739,
};
-const u8 *const gUnknown_08611D94[] =
+static const u8 *const gUnknown_08611D94[] =
{
gText_082C8480,
gText_082C84F7,
@@ -773,13 +773,13 @@ const u8 *const gUnknown_08611D94[] =
gText_082C877B,
};
-const u8 *const *const gUnknown_08611DB0[] =
+static const u8 *const *const gUnknown_08611DB0[] =
{
gUnknown_08611D40,
gUnknown_08611D78,
};
-const u8 *const *const gUnknown_08611DB8[] =
+static const u8 *const *const gUnknown_08611DB8[] =
{
gUnknown_08611D5C,
gUnknown_08611D94,
@@ -2224,8 +2224,8 @@ static void Print1PRecord(s32 position, s32 x, s32 y, struct RankingHall1P *hall
if (winStreak > 9999)
winStreak = 9999;
ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4);
- StringExpandPlaceholders(gStringVar4, gFacilityToRecordsText[hallFacilityId]);
- AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
+ StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[hallFacilityId]);
+ AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[hallFacilityId], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
}
}
@@ -2251,8 +2251,8 @@ static void Print2PRecord(s32 position, s32 x, s32 y, struct RankingHall2P *hall
if (winStreak > 9999)
winStreak = 9999;
ConvertIntToDecimalStringN(gStringVar2, winStreak, STR_CONV_MODE_RIGHT_ALIGN, 4);
- StringExpandPlaceholders(gStringVar4, gFacilityToRecordsText[9]);
- AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gFacilityToRecordsText[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
+ StringExpandPlaceholders(gStringVar4, gHallFacilityToRecordsText[9]);
+ AddTextPrinterParameterized(gRecordsWindowId, 1, gStringVar4, GetStringRightAlignXOffset(1, gHallFacilityToRecordsText[9], 0xC8), (8 * (y + 5 * position)) + 1, TEXT_SPEED_FF, NULL);
}
}
@@ -2510,7 +2510,7 @@ void CreateFrontierBrainPokemon(void)
TRUE, j,
TRUE, FRONTIER_BRAIN_OTID);
SetMonData(&gEnemyParty[monPartyId], MON_DATA_HELD_ITEM, &sFrontierBrainsMons[facility][symbol][i].heldItem);
- for (j = 0; j < 6; j++)
+ for (j = 0; j < NUM_STATS; j++)
SetMonData(&gEnemyParty[monPartyId], MON_DATA_HP_EV + j, &sFrontierBrainsMons[facility][symbol][i].evs[j]);
friendship = 0xFF;
for (j = 0; j < 4; j++)
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-06 19:32:24 +0000