dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Misc labels in battle facilities

Browse Source
This commit is contained in:
GriffinR
2021-03-20 23:47:08 -04:00
committed by huderlem
parent 9eb5794482
commit 6127c6f32e
7 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/constants/battle_pike.h
+2 -2
View File
@@ -42,8 +42,8 @@
#define BATTLE_PIKE_FUNC_SET_IN_WILD_MON_ROOM 6 #define BATTLE_PIKE_FUNC_SET_IN_WILD_MON_ROOM 6
#define BATTLE_PIKE_FUNC_CLEAR_IN_WILD_MON_ROOM 7 #define BATTLE_PIKE_FUNC_CLEAR_IN_WILD_MON_ROOM 7
#define BATTLE_PIKE_FUNC_SAVE 8 #define BATTLE_PIKE_FUNC_SAVE 8
#define BATTLE_PIKE_FUNC_NULL_9 9 #define BATTLE_PIKE_FUNC_DUMMY_1 9
#define BATTLE_PIKE_FUNC_NULL_10 10 #define BATTLE_PIKE_FUNC_DUMMY_2 10
#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS 11 #define BATTLE_PIKE_FUNC_GET_ROOM_STATUS 11
#define BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON 12 #define BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON 12
#define BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS 13 #define BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS 13
include/trainer_hill.h
-1
View File
@@ -66,7 +66,6 @@ void InitTrainerHillBattleStruct(void);
void FreeTrainerHillBattleStruct(void); void FreeTrainerHillBattleStruct(void);
void CopyTrainerHillTrainerText(u8 which, u16 trainerId); void CopyTrainerHillTrainerText(u8 which, u16 trainerId);
bool8 InTrainerHillChallenge(void); bool8 InTrainerHillChallenge(void);
void nullsub_129(void);
void PrintOnTrainerHillRecordsWindow(void); void PrintOnTrainerHillRecordsWindow(void);
void LoadTrainerHillObjectEventTemplates(void); void LoadTrainerHillObjectEventTemplates(void);
bool32 LoadTrainerHillFloorObjectEventScripts(void); bool32 LoadTrainerHillFloorObjectEventScripts(void);
src/battle_arena.c
+2 -1
View File
@@ -774,7 +774,8 @@ void BattleArena_DeductMindPoints(u8 battler, u16 stringId)
} }
} }
void sub_81A586C(u8 battler) // Unused. // Unused
static void UpdateHPAtStart(u8 battler)
{ {
u16 *hpAtStart = gBattleStruct->arenaStartHp; u16 *hpAtStart = gBattleStruct->arenaStartHp;
src/battle_factory_screen.c
+12 -12
View File
@@ -529,7 +529,7 @@ static const union AnimCmd * const sAnims_Select_Pokeball[] =
sAnim_Select_Pokeball_Moving, sAnim_Select_Pokeball_Moving,
}; };
static const union AffineAnimCmd gUnknown_0861050C[] = static const union AffineAnimCmd sAffineAnim_Select_MonPicBg_Opening[] =
{ {
AFFINEANIMCMD_FRAME(5, 5, 0, 0), AFFINEANIMCMD_FRAME(5, 5, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_FRAME(0, 0, 0, 1),
@@ -545,7 +545,7 @@ static const union AffineAnimCmd gUnknown_0861050C[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_0861056C[] = static const union AffineAnimCmd sAffineAnim_Select_MonPicBg_Closing[] =
{ {
AFFINEANIMCMD_FRAME(128, 5, 0, 0), AFFINEANIMCMD_FRAME(128, 5, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_FRAME(0, 0, 0, 1),
@@ -559,7 +559,7 @@ static const union AffineAnimCmd gUnknown_0861056C[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_086105BC[] = static const union AffineAnimCmd sAffineAnim_Select_MonPicBg_Open[] =
{ {
AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(256, 256, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
@@ -567,9 +567,9 @@ static const union AffineAnimCmd gUnknown_086105BC[] =
static const union AffineAnimCmd * const sAffineAnims_Select_MonPicBgAnim[] = static const union AffineAnimCmd * const sAffineAnims_Select_MonPicBgAnim[] =
{ {
gUnknown_0861050C, sAffineAnim_Select_MonPicBg_Opening,
gUnknown_0861056C, sAffineAnim_Select_MonPicBg_Closing,
gUnknown_086105BC, sAffineAnim_Select_MonPicBg_Open,
}; };
static const struct SpriteTemplate sSpriteTemplate_Select_Pokeball = static const struct SpriteTemplate sSpriteTemplate_Select_Pokeball =
@@ -780,7 +780,7 @@ static const union AnimCmd * const sAnims_Swap_Pokeball[] =
sAnim_Swap_Pokeball_Moving, sAnim_Swap_Pokeball_Moving,
}; };
static const union AffineAnimCmd gUnknown_08610768[] = static const union AffineAnimCmd sAffineAnim_Swap_MonPicBg_Opening[] =
{ {
AFFINEANIMCMD_FRAME(5, 5, 0, 0), AFFINEANIMCMD_FRAME(5, 5, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_FRAME(0, 0, 0, 1),
@@ -796,7 +796,7 @@ static const union AffineAnimCmd gUnknown_08610768[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_086107C8[] = static const union AffineAnimCmd sAffineAnim_Swap_MonPicBg_Closing[] =
{ {
AFFINEANIMCMD_FRAME(128, 5, 0, 0), AFFINEANIMCMD_FRAME(128, 5, 0, 0),
AFFINEANIMCMD_FRAME(0, 0, 0, 1), AFFINEANIMCMD_FRAME(0, 0, 0, 1),
@@ -810,7 +810,7 @@ static const union AffineAnimCmd gUnknown_086107C8[] =
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
}; };
static const union AffineAnimCmd gUnknown_08610818[] = static const union AffineAnimCmd sAffineAnim_Swap_MonPicBg_Open[] =
{ {
AFFINEANIMCMD_FRAME(256, 256, 0, 0), AFFINEANIMCMD_FRAME(256, 256, 0, 0),
AFFINEANIMCMD_END, AFFINEANIMCMD_END,
@@ -818,9 +818,9 @@ static const union AffineAnimCmd gUnknown_08610818[] =
static const union AffineAnimCmd * const sAffineAnims_Swap_MonPicBgAnim[] = static const union AffineAnimCmd * const sAffineAnims_Swap_MonPicBgAnim[] =
{ {
gUnknown_08610768, sAffineAnim_Swap_MonPicBg_Opening,
gUnknown_086107C8, sAffineAnim_Swap_MonPicBg_Closing,
gUnknown_08610818, sAffineAnim_Swap_MonPicBg_Open,
}; };
static const struct SpriteTemplate sSpriteTemplate_Swap_Pokeball = static const struct SpriteTemplate sSpriteTemplate_Swap_Pokeball =
src/battle_pike.c
+6 -6
View File
@@ -57,8 +57,8 @@ static void GetRoomType(void);
static void SetInWildMonRoom(void); static void SetInWildMonRoom(void);
static void ClearInWildMonRoom(void); static void ClearInWildMonRoom(void);
static void SavePikeChallenge(void); static void SavePikeChallenge(void);
static void nullsub_76(void); static void PikeDummy1(void);
static void nullsub_124(void); static void PikeDummy2(void);
static void GetRoomInflictedStatus(void); static void GetRoomInflictedStatus(void);
static void GetRoomInflictedStatusMon(void); static void GetRoomInflictedStatusMon(void);
static void HealOneOrTwoMons(void); static void HealOneOrTwoMons(void);
@@ -488,8 +488,8 @@ static void (* const sBattlePikeFunctions[])(void) =
[BATTLE_PIKE_FUNC_SET_IN_WILD_MON_ROOM] = SetInWildMonRoom, [BATTLE_PIKE_FUNC_SET_IN_WILD_MON_ROOM] = SetInWildMonRoom,
[BATTLE_PIKE_FUNC_CLEAR_IN_WILD_MON_ROOM] = ClearInWildMonRoom, [BATTLE_PIKE_FUNC_CLEAR_IN_WILD_MON_ROOM] = ClearInWildMonRoom,
[BATTLE_PIKE_FUNC_SAVE] = SavePikeChallenge, [BATTLE_PIKE_FUNC_SAVE] = SavePikeChallenge,
[BATTLE_PIKE_FUNC_NULL_9] = nullsub_76, [BATTLE_PIKE_FUNC_DUMMY_1] = PikeDummy1,
[BATTLE_PIKE_FUNC_NULL_10] = nullsub_124, [BATTLE_PIKE_FUNC_DUMMY_2] = PikeDummy2,
[BATTLE_PIKE_FUNC_GET_ROOM_STATUS] = GetRoomInflictedStatus, [BATTLE_PIKE_FUNC_GET_ROOM_STATUS] = GetRoomInflictedStatus,
[BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON] = GetRoomInflictedStatusMon, [BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON] = GetRoomInflictedStatusMon,
[BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS] = HealOneOrTwoMons, [BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS] = HealOneOrTwoMons,
@@ -715,12 +715,12 @@ static void SavePikeChallenge(void)
TrySavingData(SAVE_LINK); TrySavingData(SAVE_LINK);
} }
static void nullsub_76(void) static void PikeDummy1(void)
{ {
} }
static void nullsub_124(void) static void PikeDummy2(void)
{ {
} }
src/battle_tower.c
+2 -6
View File
@@ -878,12 +878,8 @@ static const u16 sFrontierTrainerIdRangesHard[][2] =
{FRONTIER_TRAINER_JAXON, FRONTIER_TRAINER_GRETEL}, // 200 - 299 {FRONTIER_TRAINER_JAXON, FRONTIER_TRAINER_GRETEL}, // 200 - 299
}; };
// Trainer IDs? Don't make sense as part of previous array, min/max relationship reversed and never accessed // Unknown, unused data
static const u16 sUnused_085DFA1A[][2] = static const u16 sUnused[] = { 179, 141, 200, 183 };
{
{179, 141}, // FRONTIER_TRAINER_ALISON - FRONTIER_TRAINER_KAYDEN
{200, 183}, // FRONTIER_TRAINER_JAXON - FRONTIER_TRAINER_HUNTER
};
static const u8 sBattleTowerPartySizes[FRONTIER_MODE_COUNT] = static const u8 sBattleTowerPartySizes[FRONTIER_MODE_COUNT] =
{ {
src/trainer_hill.c
+5 -5
View File
@@ -74,7 +74,7 @@ static void GetChallengeWon(void);
static void TrainerHillSetTag(void); static void TrainerHillSetTag(void);
static void SetUpDataStruct(void); static void SetUpDataStruct(void);
static void FreeDataStruct(void); static void FreeDataStruct(void);
static void nullsub_2(void); static void TrainerHillDummy(void);
static void SetTimerValue(u32 *dst, u32 val); static void SetTimerValue(u32 *dst, u32 val);
static u32 GetTimerValue(u32 *src); static u32 GetTimerValue(u32 *src);
static void SetTrainerHillMonLevel(struct Pokemon *mon, u8 level); static void SetTrainerHillMonLevel(struct Pokemon *mon, u8 level);
@@ -358,7 +358,7 @@ static void SetUpDataStruct(void)
sHillData = AllocZeroed(sizeof(*sHillData)); sHillData = AllocZeroed(sizeof(*sHillData));
sHillData->floorId = gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F; sHillData->floorId = gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F;
CpuCopy32(sDataPerTag[gSaveBlock1Ptr->trainerHill.tag], &sHillData->tag, sizeof(sHillData->tag) + 4 * sizeof(struct TrHillFloor)); CpuCopy32(sDataPerTag[gSaveBlock1Ptr->trainerHill.tag], &sHillData->tag, sizeof(sHillData->tag) + 4 * sizeof(struct TrHillFloor));
nullsub_2(); TrainerHillDummy();
} }
} }
@@ -397,7 +397,7 @@ void CopyTrainerHillTrainerText(u8 which, u16 trainerId)
static void TrainerHillStartChallenge(void) static void TrainerHillStartChallenge(void)
{ {
nullsub_2(); TrainerHillDummy();
if (!ReadTrainerHillAndValidate()) if (!ReadTrainerHillAndValidate())
gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 1; gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 1;
else else
@@ -573,12 +573,12 @@ static void IsTrainerHillChallengeActive(void)
gSpecialVar_Result = TRUE; gSpecialVar_Result = TRUE;
} }
void nullsub_129(void) static void TrainerHillDummy_Unused(void)
{ {
} }
static void nullsub_2(void) static void TrainerHillDummy(void)
{ {
} }