diff options
author | garak <garakmon@gmail.com> | 2018-10-21 15:12:18 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-21 15:12:18 -0400 |
commit | 7a9c7e5f068a2ec88ce6fe24a5c72f4b4ae7f48b (patch) | |
tree | b8e391c9e856a2546075d44cba353c4b100a52ef /src/battle_script_commands.c | |
parent | 2bb286ab4e3a967ce129d82cdad0ede4d744fa73 (diff) | |
parent | 804d0a4b6a12907974ffd8cb20f6ed6c527b663b (diff) |
Merge branch 'master' into sprite-tags
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[] = |