diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 11:56:50 +0100 |
| commit | 4683cdc30cbe81db56b69dfeb7a1fb32fe6641e2 (patch) | |
| tree | c7c791620bcb6849a24b549b4a5c48abec281c10 /src/data/graphics | |
| parent | 606fb71392651dac4f5f8773c4117f35de7b087e (diff) | |
| parent | 0b91d2948a431a5d44166544897a550061c01a31 (diff) | |
Merge branch 'master' into weather
Diffstat (limited to 'src/data/graphics')
| -rw-r--r-- | src/data/graphics/items.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 0f91c2250..26da9061d 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -134,7 +134,7 @@ const u32 gItemIconPalette_GreenShard[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_HPUp[] = INCBIN_U32("graphics/items/icons/hp_up.4bpp.lz"); const u32 gItemIconPalette_HPUp[] = INCBIN_U32("graphics/items/icon_palettes/hp_up.gbapal.lz"); -const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); +const u32 gItemIcon_Vitamin[] = INCBIN_U32("graphics/items/icons/vitamin.4bpp.lz"); const u32 gItemIconPalette_Protein[] = INCBIN_U32("graphics/items/icon_palettes/protein.gbapal.lz"); const u32 gItemIconPalette_Iron[] = INCBIN_U32("graphics/items/icon_palettes/iron.gbapal.lz"); const u32 gItemIconPalette_Carbos[] = INCBIN_U32("graphics/items/icon_palettes/carbos.gbapal.lz"); |