summaryrefslogtreecommitdiff
path: root/include/battle_controllers.h
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2021-04-03 12:38:07 -0400
committerGriffinR <griffin.g.richards@gmail.com>2021-04-03 14:07:31 -0400
commitf4d8a91ba44d7bcf0f9df8db7ca5f7aeb688497f (patch)
tree958b10102dbfef018659eb490ba46eb4de330bc9 /include/battle_controllers.h
parent9ea9ffde09c9f3ca1772045935b3b0bd858232a0 (diff)
Misc battle script cleanup
Diffstat (limited to 'include/battle_controllers.h')
-rw-r--r--include/battle_controllers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index da76ab0c6..34e916b0f 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -156,7 +156,7 @@ enum
CONTROLLER_CLEARUNKFLAG,
CONTROLLER_TOGGLEUNKFLAG,
CONTROLLER_HITANIMATION,
- CONTROLLER_42,
+ CONTROLLER_CANTSWITCH,
CONTROLLER_PLAYSE,
CONTROLLER_PLAYFANFAREORBGM,
CONTROLLER_FAINTINGCRY,
@@ -227,7 +227,7 @@ void BtlController_EmitSetUnkVar(u8 bufferId, u8 b); // unused
void BtlController_EmitClearUnkFlag(u8 bufferId); // unused
void BtlController_EmitToggleUnkFlag(u8 bufferId); // unused
void BtlController_EmitHitAnimation(u8 bufferId);
-void BtlController_EmitCmd42(u8 bufferId);
+void BtlController_EmitCantSwitch(u8 bufferId);
void BtlController_EmitPlaySE(u8 bufferId, u16 songId);
void BtlController_EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM);
void BtlController_EmitFaintingCry(u8 bufferId);