diff options
author | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
---|---|---|
committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-10-26 23:55:36 +0200 |
commit | 52be8eeaf15da7b281d48c51b1f4d06740a86c76 (patch) | |
tree | ac1c7d0a092f4d16c9ebef0b2538ef46b80c44d5 /src/battle_script_commands.c | |
parent | dc273cc19d842e8831548a1342af857aae2886c9 (diff) | |
parent | 2778e9ad3dc249eb4cce84be3ac1dfcc7ab850d5 (diff) |
Merge branch 'master' into battle_tower
Diffstat (limited to 'src/battle_script_commands.c')
-rw-r--r-- | src/battle_script_commands.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_script_commands.c b/src/battle_script_commands.c index 33d86924f..87783a6de 100644 --- a/src/battle_script_commands.c +++ b/src/battle_script_commands.c @@ -731,7 +731,7 @@ static const u8* const sMoveEffectBS_Ptrs[] = static const struct WindowTemplate sUnusedWinTemplate = {0, 1, 3, 7, 0xF, 0x1F, 0x3F}; static const u16 sUnknown_0831C2C8[] = INCBIN_U16("graphics/battle_interface/unk_battlebox.gbapal"); -static const u8 sUnknown_0831C2E8[] = INCBIN_U8("graphics/battle_interface/unk_battlebox.4bpp.lz"); +static const u32 sUnknown_0831C2E8[] = INCBIN_U32("graphics/battle_interface/unk_battlebox.4bpp.lz"); // unused static const u8 sRubyLevelUpStatBoxStats[] = |