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

Merge branch 'upcoming' of https://github.com/MartyKen/pokeemerald-expansion into upcoming

Browse source
This commit is contained in:
MartyKen 2024-03-11 10:56:30 +01:00
commit 53462c4088
8 changed files with 15 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
graphics/items/icon_palettes/aux_evasion.pal
View file

@ -1,7 +1,7 @@
JASC-PAL
0100
16
188 2 218
173 24 196
48 48 48
82 217 219
241 204 148
@ -10,9 +10,9 @@ JASC-PAL
207 125 36
156 229 230
213 238 238
255 255 255
255 195 114
72 62 51
255 255 255
73 64 66
169 133 92
39 112 112
0 0 0

2
graphics/items/icon_palettes/aux_guard.pal
View file

@ -1,7 +1,7 @@
JASC-PAL
0100
16
188 2 218
2 218 216
48 48 48
106 103 192
235 243 184

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 339 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 342 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 342 B

4
include/graphics.h
View file

@ -1715,9 +1715,11 @@ 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 gItemIcon_AuxEvasion[];
extern const u32 gItemIconPalette_AuxEvasion[];
extern const u32 gItemIcon_AuxGuard[];
extern const u32 gItemIconPalette_AuxGuard[];
extern const u32 gItemIcon_AuxPower[];
extern const u32 gItemIconPalette_AuxPower[];
extern const u32 gItemIcon_AuxPowerguard[];
extern const u32 gItemIconPalette_AuxPowerguard[];

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

@ -2071,9 +2071,13 @@ 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 gItemIcon_AuxEvasion[] = INCBIN_U32("graphics/items/icons/aux_evasion.4bpp.lz");
const u32 gItemIconPalette_AuxEvasion[] = INCBIN_U32("graphics/items/icon_palettes/aux_evasion.gbapal.lz");
const u32 gItemIcon_AuxGuard[] = INCBIN_U32("graphics/items/icons/aux_guard.4bpp.lz");
const u32 gItemIconPalette_AuxGuard[] = INCBIN_U32("graphics/items/icon_palettes/aux_guard.gbapal.lz");
const u32 gItemIcon_AuxPower[] = INCBIN_U32("graphics/items/icons/aux_power.4bpp.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");

6
src/data/item_icon_table.h
View file

@ -865,9 +865,9 @@ 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_AuxBottle, gItemIconPalette_AuxEvasion},
[ITEM_AUX_GUARD] = {gItemIcon_AuxBottle, gItemIconPalette_AuxGuard},
[ITEM_AUX_POWER] = {gItemIcon_AuxBottle, gItemIconPalette_AuxPower},
[ITEM_AUX_EVASION] = {gItemIcon_AuxEvasion, gItemIconPalette_AuxEvasion},
[ITEM_AUX_GUARD] = {gItemIcon_AuxGuard, gItemIconPalette_AuxGuard},
[ITEM_AUX_POWER] = {gItemIcon_AuxPower, gItemIconPalette_AuxPower},
[ITEM_AUX_POWERGUARD] = {gItemIcon_AuxPowerguard, gItemIconPalette_AuxPowerguard},
[ITEM_CHOICE_DUMPLING] = {gItemIcon_ChoiceDumpling, gItemIconPalette_ChoiceDumpling},
[ITEM_SWAP_SNACK] = {gItemIcon_SwapSnack, gItemIconPalette_SwapSnack},