summaryrefslogtreecommitdiff
path: root/src/battle_controller_safari.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-04-10 12:41:35 -0400
committerGitHub <noreply@github.com>2021-04-10 12:41:35 -0400
commitf6016838b1b0e2f0cf752b3b44c63e9e9776de4f (patch)
treec08712b996af85f4fce6156e48eaef86ec2a0fda /src/battle_controller_safari.c
parent5e82db8dc3f10229635d6825fbcfc742740043f2 (diff)
parentfe1b757af5ae8e8942d747863d04c4c33e5399d8 (diff)
Merge pull request #1397 from GriffinRichards/doc-moremisc
Clean up battle scripts
Diffstat (limited to 'src/battle_controller_safari.c')
-rw-r--r--src/battle_controller_safari.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_controller_safari.c b/src/battle_controller_safari.c
index 22c01586d..0fdf32fb6 100644
--- a/src/battle_controller_safari.c
+++ b/src/battle_controller_safari.c
@@ -67,7 +67,7 @@ static void SafariHandleSetUnkVar(void);
static void SafariHandleClearUnkFlag(void);
static void SafariHandleToggleUnkFlag(void);
static void SafariHandleHitAnimation(void);
-static void SafariHandleCmd42(void);
+static void SafariHandleCantSwitch(void);
static void SafariHandlePlaySE(void);
static void SafariHandlePlayFanfareOrBGM(void);
static void SafariHandleFaintingCry(void);
@@ -131,7 +131,7 @@ static void (*const sSafariBufferCommands[CONTROLLER_CMDS_COUNT])(void) =
[CONTROLLER_CLEARUNKFLAG] = SafariHandleClearUnkFlag,
[CONTROLLER_TOGGLEUNKFLAG] = SafariHandleToggleUnkFlag,
[CONTROLLER_HITANIMATION] = SafariHandleHitAnimation,
- [CONTROLLER_42] = SafariHandleCmd42,
+ [CONTROLLER_CANTSWITCH] = SafariHandleCantSwitch,
[CONTROLLER_PLAYSE] = SafariHandlePlaySE,
[CONTROLLER_PLAYFANFAREORBGM] = SafariHandlePlayFanfareOrBGM,
[CONTROLLER_FAINTINGCRY] = SafariHandleFaintingCry,
@@ -580,7 +580,7 @@ static void SafariHandleHitAnimation(void)
SafariBufferExecCompleted();
}
-static void SafariHandleCmd42(void)
+static void SafariHandleCantSwitch(void)
{
SafariBufferExecCompleted();
}