diff options
author | GriffinR <griffin.g.richards@gmail.com> | 2020-07-18 20:24:09 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-18 20:24:09 -0400 |
commit | af09e73d6733245ea61189f339b81ab68f645c17 (patch) | |
tree | d425cff00e4c7dd8a564dbf17091d0d5d5f563fe /include/battle_script_commands.h | |
parent | e129d04b931a4fc0e6584b4340dc57b9162264d5 (diff) | |
parent | 8e6dd3bafeab105f079e120d3b2cd7e61cf10477 (diff) |
Merge branch 'master' into doc-overworld
Diffstat (limited to 'include/battle_script_commands.h')
-rw-r--r-- | include/battle_script_commands.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/battle_script_commands.h b/include/battle_script_commands.h index 142ac1f7b..ee3676463 100644 --- a/include/battle_script_commands.h +++ b/include/battle_script_commands.h @@ -1,6 +1,8 @@ #ifndef GUARD_BATTLE_SCRIPT_COMMANDS_H #define GUARD_BATTLE_SCRIPT_COMMANDS_H +#include "constants/pokemon.h" + #define WINDOW_CLEAR 0x1 #define WINDOW_x80 0x80 @@ -16,6 +18,6 @@ void HandleBattleWindow(u8 xStart, u8 yStart, u8 xEnd, u8 yEnd, u8 flags); bool8 UproarWakeUpCheck(u8 battlerId); extern void (* const gBattleScriptingCommandsTable[])(void); -extern const u8 gUnknown_0831C494[][4]; +extern const u8 gBattlePalaceNatureToMoveGroupLikelihood[NUM_NATURES][4]; #endif // GUARD_BATTLE_SCRIPT_COMMANDS_H |