summaryrefslogtreecommitdiff
path: root/src/battle_pike.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-03-29 20:56:15 -0400
committerGitHub <noreply@github.com>2021-03-29 20:56:15 -0400
commit50e9666e1637b15bd57fd7ee88180e50d2eb5e8c (patch)
treeb1543b6d79695862cb60d686548dd1a996b69e8c /src/battle_pike.c
parentdea07dc8656c8fb32f5b389b9f4f9a30fe26e555 (diff)
parente8b6b4b65e3b53f5fcf83035b9f848c5ef6378bd (diff)
Merge branch 'master' into doc-introcred
Diffstat (limited to 'src/battle_pike.c')
-rw-r--r--src/battle_pike.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/battle_pike.c b/src/battle_pike.c
index ccb52fda2..ed89f5ed9 100644
--- a/src/battle_pike.c
+++ b/src/battle_pike.c
@@ -57,8 +57,8 @@ static void GetRoomType(void);
static void SetInWildMonRoom(void);
static void ClearInWildMonRoom(void);
static void SavePikeChallenge(void);
-static void nullsub_76(void);
-static void nullsub_124(void);
+static void PikeDummy1(void);
+static void PikeDummy2(void);
static void GetRoomInflictedStatus(void);
static void GetRoomInflictedStatusMon(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_CLEAR_IN_WILD_MON_ROOM] = ClearInWildMonRoom,
[BATTLE_PIKE_FUNC_SAVE] = SavePikeChallenge,
- [BATTLE_PIKE_FUNC_NULL_9] = nullsub_76,
- [BATTLE_PIKE_FUNC_NULL_10] = nullsub_124,
+ [BATTLE_PIKE_FUNC_DUMMY_1] = PikeDummy1,
+ [BATTLE_PIKE_FUNC_DUMMY_2] = PikeDummy2,
[BATTLE_PIKE_FUNC_GET_ROOM_STATUS] = GetRoomInflictedStatus,
[BATTLE_PIKE_FUNC_GET_ROOM_STATUS_MON] = GetRoomInflictedStatusMon,
[BATTLE_PIKE_FUNC_HEAL_ONE_TWO_MONS] = HealOneOrTwoMons,
@@ -715,12 +715,12 @@ static void SavePikeChallenge(void)
TrySavingData(SAVE_LINK);
}
-static void nullsub_76(void)
+static void PikeDummy1(void)
{
}
-static void nullsub_124(void)
+static void PikeDummy2(void)
{
}