diff options
| author | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 13:20:03 -0800 |
|---|---|---|
| committer | Marcus Huderle <huderlem@gmail.com> | 2017-11-11 13:20:03 -0800 |
| commit | 92fda2cc0d5afa76e94927cb72ceac9700f54c1b (patch) | |
| tree | 24a7840f1c49602a6ad033ea6cc1cb27b7e12be4 /src/field/use_pokeblock.c | |
| parent | 955c5a8e90c9afba35114c583628f74f849a0da4 (diff) | |
| parent | 999c4d59793e761ca71ab7b27272de46d78de138 (diff) | |
Merge remote-tracking branch 'upstream/master' into pokenav
Diffstat (limited to 'src/field/use_pokeblock.c')
| -rw-r--r-- | src/field/use_pokeblock.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/field/use_pokeblock.c b/src/field/use_pokeblock.c index bac231856..54ed89ef2 100644 --- a/src/field/use_pokeblock.c +++ b/src/field/use_pokeblock.c @@ -22,10 +22,10 @@ #ifdef GERMAN extern const u16 ConditionUpDownPalette[16]; -extern const u32 ConditionUpDownTiles[0x80]; +extern const u8 ConditionUpDownTiles[0x200]; #else const u16 ConditionUpDownPalette[] = INCBIN_U16("graphics/misc/condition_up_down.gbapal"); -const u32 ConditionUpDownTiles[] = INCBIN_U32("graphics/misc/condition_up_down.4bpp"); +const u8 ConditionUpDownTiles[] = INCBIN_U8("graphics/misc/condition_up_down.4bpp"); #endif static const u32 sContestStatsMonData[] = { @@ -49,7 +49,7 @@ static const u8 *const sContextStatNames[] = { }; static const struct SpriteSheet gSpriteSheet_ConditionUpDown = { - (u8 *)ConditionUpDownTiles, + ConditionUpDownTiles, sizeof ConditionUpDownTiles, GFX_TAG_CONDITIONUPDOWN }; |