diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-07-31 13:30:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-31 13:30:40 -0400 |
| commit | 3e60a7840653e50845abf10bb02cd1b519dcd80f (patch) | |
| tree | cb4a0d227a238ebdeb3b6cb9fdb92781bcc4f5e7 /include/battle_controllers.h | |
| parent | 602855ea99d8015ef5b7709f6fb1e9fd167239e2 (diff) | |
| parent | d391486247cc9f29d85787d6711f7cb993cf6585 (diff) | |
Merge branch 'master' into doc-frontierpass2
Diffstat (limited to 'include/battle_controllers.h')
| -rw-r--r-- | include/battle_controllers.h | 4 |
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); |