diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2020-02-13 15:13:30 -0500 |
commit | 3b2eaeedbc4c658389c7fceb93e6bbd07e8a6283 (patch) | |
tree | e9a403e858cf8d93cfee9eb80b5d8c79cc4e4159 /include/battle_controllers.h | |
parent | cafbffd5b82836d779ec446e2362a9885fd18c4a (diff) | |
parent | b4f4d2c0f03462dcdf3492aad27890294600eb2e (diff) |
Merge branch 'master' into modern_gcc
Diffstat (limited to 'include/battle_controllers.h')
-rw-r--r-- | include/battle_controllers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h index 5dae99ecd..695daabbc 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -193,4 +193,4 @@ void BtlController_EmitLinkStandbyMsg(u8 a, u8 b); void BtlController_EmitResetActionMoveSelection(u8 a, u8 b); void BtlController_EmitCmd55(u8 a, u8 b); -#endif // GUARD_BATTLE_CONTROLLERS_H
\ No newline at end of file +#endif // GUARD_BATTLE_CONTROLLERS_H |