ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added icon for Clear Amulet (#3078)

Browse Source 
* Update graphics.h

* Update item_icon_table.h

* Update items.h

* Add files via upload

added icon for clear amulet, shards still missing.

* Add files via upload

added clear amulet's palette

* Update graphics.h
This commit is contained in:
PacFire 2023-06-27 01:19:33 +03:00 committed by GitHub
parent f9bf91a2f0
commit 4b3b9b5e0a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
graphics/items/icon_palettes/clear_amulet.pal Normal file
View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 255 148
86 46 12
0 0 0
231 114 114
164 57 65
179 83 91
245 211 240
234 173 227
255 255 255
239 218 139
225 187 43
127 97 27
203 178 239
140 200 244
203 248 255
150 240 255

BIN
graphics/items/icons/clear_amulet.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 434 B

2
include/graphics.h
View File

@ -8843,6 +8843,8 @@ extern const u32 gItemIconPalette_Sapphire[];
// GEN IX ITEMS // GEN IX ITEMS
extern const u32 gItemIcon_AbilityShield[]; extern const u32 gItemIcon_AbilityShield[];
extern const u32 gItemIconPalette_AbilityShield[]; extern const u32 gItemIconPalette_AbilityShield[];
extern const u32 gItemIcon_ClearAmulet[];
extern const u32 gItemIconPalette_ClearAmulet[];
extern const u32 gItemIcon_AuspiciousArmor[]; extern const u32 gItemIcon_AuspiciousArmor[];
extern const u32 gItemIconPalette_AuspiciousArmor[]; extern const u32 gItemIconPalette_AuspiciousArmor[];
extern const u32 gItemIcon_BigBambooShoot[]; extern const u32 gItemIcon_BigBambooShoot[];

4
src/data/graphics/items.h
View File

@ -1943,8 +1943,8 @@ const u32 gItemIconPalette_Sapphire[] = INCBIN_U32("graphics/items/icon_palettes
const u32 gItemIcon_AbilityShield[] = INCBIN_U32("graphics/items/icons/ability_shield.4bpp.lz"); const u32 gItemIcon_AbilityShield[] = INCBIN_U32("graphics/items/icons/ability_shield.4bpp.lz");
const u32 gItemIconPalette_AbilityShield[] = INCBIN_U32("graphics/items/icon_palettes/ability_shield.gbapal.lz"); const u32 gItemIconPalette_AbilityShield[] = INCBIN_U32("graphics/items/icon_palettes/ability_shield.gbapal.lz");
//const u32 gItemIcon_ClearAmulet[] = INCBIN_U32("graphics/items/icons/clear_amulet.4bpp.lz"); const u32 gItemIcon_ClearAmulet[] = INCBIN_U32("graphics/items/icons/clear_amulet.4bpp.lz");
//const u32 gItemIconPalette_ClearAmulet[] = INCBIN_U32("graphics/items/icon_palettes/clear_amulet.gbapal.lz"); const u32 gItemIconPalette_ClearAmulet[] = INCBIN_U32("graphics/items/icon_palettes/clear_amulet.gbapal.lz");
const u32 gItemIcon_PunchingGlove[] = INCBIN_U32("graphics/items/icons/punching_glove.4bpp.lz"); const u32 gItemIcon_PunchingGlove[] = INCBIN_U32("graphics/items/icons/punching_glove.4bpp.lz");
const u32 gItemIconPalette_PunchingGlove[] = INCBIN_U32("graphics/items/icon_palettes/punching_glove.gbapal.lz"); const u32 gItemIconPalette_PunchingGlove[] = INCBIN_U32("graphics/items/icon_palettes/punching_glove.gbapal.lz");

2
src/data/item_icon_table.h
View File

@ -804,7 +804,7 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
[ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby}, [ITEM_RUBY] = {gItemIcon_Gem, gItemIconPalette_Ruby},
[ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire}, [ITEM_SAPPHIRE] = {gItemIcon_Gem, gItemIconPalette_Sapphire},
[ITEM_ABILITY_SHIELD] = {gItemIcon_AbilityShield, gItemIconPalette_AbilityShield}, [ITEM_ABILITY_SHIELD] = {gItemIcon_AbilityShield, gItemIconPalette_AbilityShield},
[ITEM_CLEAR_AMULET] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_ClearAmulet, gItemIconPalette_ClearAmulet}, [ITEM_CLEAR_AMULET] = {gItemIcon_ClearAmulet, gItemIconPalette_ClearAmulet},
[ITEM_PUNCHING_GLOVE] = {gItemIcon_PunchingGlove, gItemIconPalette_PunchingGlove}, [ITEM_PUNCHING_GLOVE] = {gItemIcon_PunchingGlove, gItemIconPalette_PunchingGlove},
[ITEM_COVERT_CLOAK] = {gItemIcon_CovertCloak, gItemIconPalette_CovertCloak}, [ITEM_COVERT_CLOAK] = {gItemIcon_CovertCloak, gItemIconPalette_CovertCloak},
[ITEM_LOADED_DICE] = {gItemIcon_LoadedDice, gItemIconPalette_LoadedDice}, [ITEM_LOADED_DICE] = {gItemIcon_LoadedDice, gItemIconPalette_LoadedDice},