summaryrefslogtreecommitdiff
path: root/src/battle_controller_safari.c
diff options
context:
space:
mode:
authorhuderlem <huderlem@gmail.com>2019-03-03 09:28:35 -0600
committerGitHub <noreply@github.com>2019-03-03 09:28:35 -0600
commitc9d2fcabefb149f259f97b59e15b4d635c52d2c6 (patch)
tree3122377a548140355ae1a3350212cc52827bc9ac /src/battle_controller_safari.c
parent043071ae12aa6854119a44304a5facbd58fa3624 (diff)
parent9372731c3ef1ac5f7ed59a85b071bde7b87d2460 (diff)
Merge pull request #553 from Phlosioneer/main-menu-state-machine
Document main_menu state machine, name window constants
Diffstat (limited to 'src/battle_controller_safari.c')
-rw-r--r--src/battle_controller_safari.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 54ba04ab4..b7223844f 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -84,7 +84,7 @@ static void SafariHandleBattleAnimation(void);
static void SafariHandleLinkStandbyMsg(void);
static void SafariHandleResetActionMoveSelection(void);
static void SafariHandleCmd55(void);
-static void nullsub_115(void);
+static void SpriteCB_Null5(void);
static void SafariBufferRunCommand(void);
static void SafariBufferExecCompleted(void);
@@ -148,10 +148,10 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
SafariHandleLinkStandbyMsg,
SafariHandleResetActionMoveSelection,
SafariHandleCmd55,
- nullsub_115
+ SpriteCB_Null5
};
-static void nullsub_114(void)
+static void SpriteCB_Null4(void)
{
}
@@ -688,6 +688,6 @@ static void SafariHandleCmd55(void)
gBattlerControllerFuncs[gActiveBattler] = sub_81595E4;
}
-static void nullsub_115(void)
+static void SpriteCB_Null5(void)
{
}