diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-11-13 20:00:20 +0100 |
commit | 516a5b2219c99050153d989a65478f960b54f75a (patch) | |
tree | 97a12007165839735210f0f777a019cf3ecc060d /include/battle_script_commands.h | |
parent | 19d9cff2ff582d68d5aa76fd9d2068a6407e1466 (diff) | |
parent | d1fe93bf4adfb691ba3a9220a469e0e40483d809 (diff) |
fix merge conflicts, review changes
Diffstat (limited to 'include/battle_script_commands.h')
-rw-r--r-- | include/battle_script_commands.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index a466abc04..ebfeabccc 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -57,6 +57,6 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); bool8 UproarWakeUpCheck(u8 bank); extern void (* const gBattleScriptingCommandsTable[])(void); -extern const u8 gUnknown_0831C494[]; +extern const u8 gUnknown_0831C494[][4]; #endif // GUARD_BATTLE_SCRIPT_COMMANDS_H |