summaryrefslogtreecommitdiff
path: root/src/trainer_hill.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-03-20 23:47:08 -0400
committerhuderlem <huderlem@gmail.com>2021-03-22 15:30:19 -0500
commit6127c6f32e25aec976c290b717a2e4fddffc30d1 (patch)
tree12025ca0eb99340fed1537c10c5a0b74691e94c4 /src/trainer_hill.c
parent9eb5794482fc1d529a866f53a6cadb743d8f9e2c (diff)
Misc labels in battle facilities
Diffstat (limited to 'src/trainer_hill.c')
-rw-r--r--src/trainer_hill.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/trainer_hill.c b/src/trainer_hill.c
index 18d56723c..3bc6c970b 100644
--- a/src/trainer_hill.c
+++ b/src/trainer_hill.c
@@ -74,7 +74,7 @@ static void GetChallengeWon(void);
static void TrainerHillSetTag(void);
static void SetUpDataStruct(void);
static void FreeDataStruct(void);
-static void nullsub_2(void);
+static void TrainerHillDummy(void);
static void SetTimerValue(u32 *dst, u32 val);
static u32 GetTimerValue(u32 *src);
static void SetTrainerHillMonLevel(struct Pokemon *mon, u8 level);
@@ -358,7 +358,7 @@ static void SetUpDataStruct(void)
sHillData = AllocZeroed(sizeof(*sHillData));
sHillData->floorId = gMapHeader.mapLayoutId - LAYOUT_TRAINER_HILL_1F;
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)
{
- nullsub_2();
+ TrainerHillDummy();
if (!ReadTrainerHillAndValidate())
gSaveBlock1Ptr->trainerHill.field_3D6E_0f = 1;
else
@@ -573,12 +573,12 @@ static void IsTrainerHillChallengeActive(void)
gSpecialVar_Result = TRUE;
}
-void nullsub_129(void)
+static void TrainerHillDummy_Unused(void)
{
}
-static void nullsub_2(void)
+static void TrainerHillDummy(void)
{
}