atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PLA aux item sprites (#4160)

Browse source 
* PLA aux item sprites

* Sprite sharing
This commit is contained in:
MartyKen 2024-02-10 18:08:09 +01:00 committed by GitHub
parent af95a09961
commit 81fdfdd90b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 94 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
graphics/items/icon_palettes/aux_evasion.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
188 2 218
48 48 48
82 217 219
241 204 148
61 166 166
252 179 109
207 125 36
156 229 230
213 238 238
255 255 255
255 195 114
72 62 51
169 133 92
39 112 112
0 0 0
0 0 0

19
graphics/items/icon_palettes/aux_guard.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
188 2 218
48 48 48
106 103 192
235 243 184
71 86 155
193 188 124
147 138 83
140 139 199
206 204 243
255 255 255
189 182 163
72 62 51
137 125 102
68 58 101
0 0 0
0 0 0

19
graphics/items/icon_palettes/aux_power.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
188 2 218
48 48 48
201 90 114
241 204 148
151 70 70
221 180 90
168 111 70
233 135 170
237 172 195
255 255 255
230 209 174
72 62 51
137 125 102
101 51 58
0 0 0
0 0 0

19
graphics/items/icon_palettes/aux_powerguard.pal Normal file
View file

@ -0,0 +1,19 @@
JASC-PAL
0100
16
0 216 216
60 54 48
212 178 180
144 68 64
224 228 216
136 124 96
144 132 120
64 84 152
104 100 192
232 132 168
144 84 136
200 88 112
64 56 96
208 196 184
248 252 248
112 76 104

BIN
graphics/items/icons/aux_bottle.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 342 B

BIN
graphics/items/icons/aux_powerguard.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 344 B

6
include/graphics.h
View file

@ -1715,6 +1715,12 @@ extern const u32 gItemIcon_FineRemedy[];
extern const u32 gItemIconPalette_FineRemedy[];
extern const u32 gItemIcon_SuperbRemedy[];
extern const u32 gItemIconPalette_SuperbRemedy[];
extern const u32 gItemIcon_AuxBottle[];
extern const u32 gItemIconPalette_AuxEvasion[];
extern const u32 gItemIconPalette_AuxGuard[];
extern const u32 gItemIconPalette_AuxPower[];
extern const u32 gItemIcon_AuxPowerguard[];
extern const u32 gItemIconPalette_AuxPowerguard[];
extern const u32 gItemIcon_ChoiceDumpling[];
extern const u32 gItemIconPalette_ChoiceDumpling[];
extern const u32 gItemIcon_JubilifeMuffin[];

8
src/data/graphics/items.h
View file

@ -2071,6 +2071,14 @@ const u32 gItemIconPalette_FineRemedy[] = INCBIN_U32("graphics/items/icon_palett
const u32 gItemIcon_SuperbRemedy[] = INCBIN_U32("graphics/items/icons/superb_remedy.4bpp.lz");
const u32 gItemIconPalette_SuperbRemedy[] = INCBIN_U32("graphics/items/icon_palettes/superb_remedy.gbapal.lz");
const u32 gItemIcon_AuxBottle[] = INCBIN_U32("graphics/items/icons/aux_bottle.4bpp.lz");
const u32 gItemIconPalette_AuxEvasion[] = INCBIN_U32("graphics/items/icon_palettes/aux_evasion.gbapal.lz");
const u32 gItemIconPalette_AuxGuard[] = INCBIN_U32("graphics/items/icon_palettes/aux_guard.gbapal.lz");
const u32 gItemIconPalette_AuxPower[] = INCBIN_U32("graphics/items/icon_palettes/aux_power.gbapal.lz");
const u32 gItemIcon_AuxPowerguard[] = INCBIN_U32("graphics/items/icons/aux_powerguard.4bpp.lz");
const u32 gItemIconPalette_AuxPowerguard[] = INCBIN_U32("graphics/items/icon_palettes/aux_powerguard.gbapal.lz");
const u32 gItemIcon_ChoiceDumpling[] = INCBIN_U32("graphics/items/icons/choice_dumpling.4bpp.lz");
const u32 gItemIconPalette_ChoiceDumpling[] = INCBIN_U32("graphics/items/icon_palettes/choice_dumpling.gbapal.lz");

8
src/data/item_icon_table.h
View file

@ -865,10 +865,10 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
[ITEM_REMEDY] = {gItemIcon_Remedy, gItemIconPalette_Remedy},
[ITEM_FINE_REMEDY] = {gItemIcon_FineRemedy, gItemIconPalette_FineRemedy},
[ITEM_SUPERB_REMEDY] = {gItemIcon_SuperbRemedy, gItemIconPalette_SuperbRemedy},
[ITEM_AUX_EVASION] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxEvasion, gItemIconPalette_AuxEvasion},
[ITEM_AUX_GUARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxGuard, gItemIconPalette_AuxGuard},
[ITEM_AUX_POWER] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxPower, gItemIconPalette_AuxPower},
[ITEM_AUX_POWERGUARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_AuxPowerguard, gItemIconPalette_AuxPowerguard},
[ITEM_AUX_EVASION] = {gItemIcon_AuxBottle, gItemIconPalette_AuxEvasion},
[ITEM_AUX_GUARD] = {gItemIcon_AuxBottle, gItemIconPalette_AuxGuard},
[ITEM_AUX_POWER] = {gItemIcon_AuxBottle, gItemIconPalette_AuxPower},
[ITEM_AUX_POWERGUARD] = {gItemIcon_AuxPowerguard, gItemIconPalette_AuxPowerguard},
[ITEM_CHOICE_DUMPLING] = {gItemIcon_ChoiceDumpling, gItemIconPalette_ChoiceDumpling},
[ITEM_SWAP_SNACK] = {gItemIcon_SwapSnack, gItemIconPalette_SwapSnack},
[ITEM_TWICE_SPICED_RADISH] = {gItemIcon_TwiceSpicedRadish, gItemIconPalette_TwiceSpicedRadish},