diff options
| author | Frogg <froggestspirit@gmail.com> | 2021-04-10 19:04:59 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-10 19:04:59 -0400 |
| commit | ec6b1ea3735ff98a9714b219e4a999894ecc6010 (patch) | |
| tree | fff7823aa15ce633de1bc4132574c1d081a84a93 /include/battle_controllers.h | |
| parent | 677b4fc394516deab5b5c86c94a2a1443cb52151 (diff) | |
| parent | 09a9efd5c57909c215a66b85f3255190c8882940 (diff) | |
Merge pull request #2 from pret/master
update
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); |