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

Added Teal Mask item graphics + updated install instructions (#3527)

Browse source 
Co-authored-by: Eduardo Quezada D'Ottone <eduardo602002@gmail.com>
This commit is contained in:
hedara90 2023-11-10 01:57:04 +01:00 committed by GitHub
parent b5b67973bd
commit 7ccdd4b5b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
26 changed files with 296 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
INSTALL.md
View file

@ -82,7 +82,7 @@ Some tips before proceeding:
4. Certain packages are required to build pokeemerald. Install these packages by running the following command:
```bash
sudo apt install build-essential binutils-arm-none-eabi git libpng-dev
sudo apt install build-essential binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi git libpng-dev
```
<details>
<summary><i>Note...</i></summary>
@ -329,28 +329,28 @@ Open Terminal and enter the following commands, depending on which distro you're
### Debian/Ubuntu-based distributions
Run the following command to install the necessary packages:
```bash
sudo apt install build-essential binutils-arm-none-eabi git libpng-dev
sudo apt install build-essential binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi git libpng-dev
```
Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to-store-pokeemerald-linux).
<details>
<summary><i>Note for legacy repos...</i></summary>
> If the repository you plan to build has an **[older revision of the INSTALL.md](https://github.com/pret/pokeemerald/blob/571c598/INSTALL.md)**,
> then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to
> then you will have to install devkitARM. Install all the above packages except for the arm-none-eabi packages, and follow the instructions to
> [install devkitARM on Debian/Ubuntu-based distributions](#installing-devkitarm-on-debianubuntu-based-distributions).
</details>
### Arch Linux
Run this command as root to install the necessary packages:
```bash
pacman -S base-devel arm-none-eabi-binutils git libpng
pacman -S base-devel arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib git libpng
```
Then proceed to [Choosing where to store pokeemerald (Linux)](#choosing-where-to-store-pokeemerald-linux).
<details>
<summary><i>Note for legacy repos...</i></summary>
> If the repository you plan to build has an **[older revision of the INSTALL.md](https://github.com/pret/pokeemerald/blob/571c598/INSTALL.md)**,
> then you will have to install devkitARM. Install all the above packages except binutils-arm-none-eabi, and follow the instructions to
> then you will have to install devkitARM. Install all the above packages except for the arm-none-eabi packages, and follow the instructions to
> [install devkitARM on Arch Linux](#installing-devkitarm-on-arch-linux).
</details>

15
graphics/items/icon_palettes/clever_mochi.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
0 0 0
32 32 32
40 40 40
112 104 24
72 64 32
192 184 8
216 208 8
240 240 96
248 248 0
248 248 160
248 248 216

17
graphics/items/icon_palettes/cornerstone_mask.pal Normal file
View file

@ -0,0 +1,17 @@
JASC-PAL
0100
14
0 49 0
32 24 24
48 48 48
72 72 80
104 88 56
16 112 160
32 112 128
112 104 112
32 152 192
136 144 144
168 168 168
48 208 240
208 184 120
240 240 240

15
graphics/items/icon_palettes/fresh_start_mochi.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
0 0 0
32 32 32
40 40 40
128 120 128
63 63 63
176 168 168
216 208 216
192 192 192
224 232 224
240 232 240
248 248 248

15
graphics/items/icon_palettes/genius_mochi.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
0 0 0
32 32 32
40 40 40
72 40 88
72 40 88
96 40 128
96 40 120
88 40 112
112 48 160
128 72 176
128 80 176

18
graphics/items/icon_palettes/glimmering_charm.pal Normal file
View file

@ -0,0 +1,18 @@
JASC-PAL
0100
15
114 109 97
0 0 0
115 62 231
57 95 90
52 103 15
48 101 216
225 59 159
136 154 143
60 195 171
76 204 74
202 150 255
142 191 235
242 193 215
238 219 161
255 255 255

15
graphics/items/icon_palettes/health_mochi.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
0 0 0
32 32 32
40 40 40
32 64 86
32 96 128
16 128 176
0 144 208
0 176 240
0 192 248
72 200 248
88 208 240

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

@ -0,0 +1,19 @@
JASC-PAL
0100
16
110 101 110
0 0 0
40 40 40
72 40 40
136 48 48
184 48 48
72 88 88
104 88 48
232 64 48
224 128 128
192 144 64
168 160 152
32 200 232
224 160 64
248 200 72
248 248 248

15
graphics/items/icon_palettes/masterpiece_teacup.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
56 48 48
64 48 56
80 48 32
56 56 56
72 64 72
80 64 48
96 64 40
104 98 96
174 163 155
208 200 192
224 224 208

15
graphics/items/icon_palettes/muscle_mochi.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
0 0 0
32 32 32
40 40 40
80 32 32
128 32 32
192 0 8
248 40 48
248 32 32
248 0 0
248 64 64
248 80 80

15
graphics/items/icon_palettes/resist_mochi.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
0 0 0
32 32 32
40 40 40
48 32 32
40 40 40
56 48 56
48 48 48
48 48 48
64 64 64
72 72 72
88 88 88

15
graphics/items/icon_palettes/swift_mochi.pal Normal file
View file

@ -0,0 +1,15 @@
JASC-PAL
0100
12
0 0 0
0 0 0
32 32 32
40 40 40
24 88 56
24 48 40
8 128 64
8 152 72
32 120 96
0 176 80
48 192 112
80 200 144

17
graphics/items/icon_palettes/syrupy_apple.pal Normal file
View file

@ -0,0 +1,17 @@
JASC-PAL
0100
14
0 97 0
36 39 38
78 40 38
192 24 40
100 72 55
240 48 40
192 114 31
248 112 48
248 112 104
248 135 16
248 135 20
248 144 120
242 159 28
216 192 184

14
graphics/items/icon_palettes/unremarkable_teacup.pal Normal file
View file

@ -0,0 +1,14 @@
JASC-PAL
0100
11
0 0 0
56 48 48
64 48 56
56 56 56
72 64 72
80 64 48
96 64 40
104 98 96
174 163 155
208 200 192
224 224 208

16
graphics/items/icon_palettes/wellspring_mask.pal Normal file
View file

@ -0,0 +1,16 @@
JASC-PAL
0100
13
0 0 0
16 16 16
40 40 40
32 48 56
24 80 128
80 88 88
32 104 112
0 128 232
56 144 176
152 160 160
56 200 232
192 208 216
248 248 248

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 383 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 324 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 368 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 328 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 262 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 318 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 323 B

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

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 364 B

24
include/graphics.h
View file

@ -9163,6 +9163,12 @@ extern const u32 gItemIcon_LinkingCord[];
extern const u32 gItemIconPalette_LinkingCord[];
extern const u32 gItemIcon_PeatBlock[];
extern const u32 gItemIconPalette_PeatBlock[];
extern const u32 gItemIcon_SyrupyApple[];
extern const u32 gItemIconPalette_SyrupyApple[];
extern const u32 gItemIcon_UnremarkableTeacup[];
extern const u32 gItemIconPalette_UnremarkableTeacup[];
extern const u32 gItemIcon_MasterpieceTeacup[];
extern const u32 gItemIconPalette_MasterpieceTeacup[];
// Nectars
extern const u32 gItemIcon_RedNectar[];
extern const u32 gItemIconPalette_RedNectar[];
@ -9875,6 +9881,8 @@ extern const u32 gItemIcon_CatchingCharm[];
extern const u32 gItemIconPalette_CatchingCharm[];
extern const u32 gItemIcon_ExpCharm[];
extern const u32 gItemIconPalette_ExpCharm[];
extern const u32 gItemIcon_GlimmeringCharm[];
extern const u32 gItemIconPalette_GlimmeringCharm[];
// Form-changing Key Items
extern const u32 gItemIcon_RotomCatalog[];
extern const u32 gItemIconPalette_RotomCatalog[];
@ -10067,6 +10075,22 @@ extern const u32 gItemIconPalette_BerserkGene[];
extern const u32 gItemIcon_FairyFeather[];
extern const u32 gItemIconPalette_FairyFeather[];
extern const u32 gItemIcon_Mochi[];
extern const u32 gItemIconPalette_HealthMochi[];
extern const u32 gItemIconPalette_MuscleMochi[];
extern const u32 gItemIconPalette_ResistMochi[];
extern const u32 gItemIconPalette_GeniusMochi[];
extern const u32 gItemIconPalette_CleverMochi[];
extern const u32 gItemIconPalette_SwiftMochi[];
extern const u32 gItemIconPalette_FreshStartMochi[];
extern const u32 gItemIcon_WellspringMask[];
extern const u32 gItemIconPalette_WellspringMask[];
extern const u32 gItemIcon_HearthflameMask[];
extern const u32 gItemIconPalette_HearthflameMask[];
extern const u32 gItemIcon_CornerstoneMask[];
extern const u32 gItemIconPalette_CornerstoneMask[];
extern const u32 gItemIcon_ReturnToFieldArrow[];
extern const u32 gItemIconPalette_ReturnToFieldArrow[];

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

@ -654,6 +654,15 @@ const u32 gItemIconPalette_LinkingCord[] = INCBIN_U32("graphics/items/icon_palet
const u32 gItemIcon_PeatBlock[] = INCBIN_U32("graphics/items/icons/peat_block.4bpp.lz");
const u32 gItemIconPalette_PeatBlock[] = INCBIN_U32("graphics/items/icon_palettes/peat_block.gbapal.lz");
const u32 gItemIcon_SyrupyApple[] = INCBIN_U32("graphics/items/icons/syrupy_apple.4bpp.lz");
const u32 gItemIconPalette_SyrupyApple[] = INCBIN_U32("graphics/items/icon_palettes/syrupy_apple.gbapal.lz");
const u32 gItemIcon_UnremarkableTeacup[] = INCBIN_U32("graphics/items/icons/unremarkable_teacup.4bpp.lz");
const u32 gItemIconPalette_UnremarkableTeacup[] = INCBIN_U32("graphics/items/icon_palettes/unremarkable_teacup.gbapal.lz");
const u32 gItemIcon_MasterpieceTeacup[] = INCBIN_U32("graphics/items/icons/masterpiece_teacup.4bpp.lz");
const u32 gItemIconPalette_MasterpieceTeacup[] = INCBIN_U32("graphics/items/icon_palettes/masterpiece_teacup.gbapal.lz");
// Nectars
const u32 gItemIcon_RedNectar[] = INCBIN_U32("graphics/items/icons/red_nectar.4bpp.lz");
@ -1746,6 +1755,9 @@ const u32 gItemIconPalette_CatchingCharm[] = INCBIN_U32("graphics/items/icon_pal
const u32 gItemIcon_ExpCharm[] = INCBIN_U32("graphics/items/icons/exp_charm.4bpp.lz");
const u32 gItemIconPalette_ExpCharm[] = INCBIN_U32("graphics/items/icon_palettes/exp_charm.gbapal.lz");
const u32 gItemIcon_GlimmeringCharm[] = INCBIN_U32("graphics/items/icons/glimmering_charm.4bpp.lz");
const u32 gItemIconPalette_GlimmeringCharm[] = INCBIN_U32("graphics/items/icon_palettes/glimmering_charm.gbapal.lz");
// Form-changing Key Items
const u32 gItemIcon_RotomCatalog[] = INCBIN_U32("graphics/items/icons/rotom_catalog.4bpp.lz");
@ -2010,6 +2022,26 @@ const u32 gItemIconPalette_DragonTeraShard[] = INCBIN_U32("graphics/items/icon_p
const u32 gItemIconPalette_SteelTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/steel_tera_shard.gbapal.lz");
const u32 gItemIconPalette_FairyTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/fairy_tera_shard.gbapal.lz");
// Mochi
const u32 gItemIcon_Mochi[] = INCBIN_U32("graphics/items/icons/mochi.4bpp.lz");
const u32 gItemIconPalette_HealthMochi[] = INCBIN_U32("graphics/items/icon_palettes/health_mochi.gbapal.lz");
const u32 gItemIconPalette_MuscleMochi[] = INCBIN_U32("graphics/items/icon_palettes/muscle_mochi.gbapal.lz");
const u32 gItemIconPalette_ResistMochi[] = INCBIN_U32("graphics/items/icon_palettes/resist_mochi.gbapal.lz");
const u32 gItemIconPalette_GeniusMochi[] = INCBIN_U32("graphics/items/icon_palettes/genius_mochi.gbapal.lz");
const u32 gItemIconPalette_CleverMochi[] = INCBIN_U32("graphics/items/icon_palettes/clever_mochi.gbapal.lz");
const u32 gItemIconPalette_SwiftMochi[] = INCBIN_U32("graphics/items/icon_palettes/swift_mochi.gbapal.lz");
const u32 gItemIconPalette_FreshStartMochi[] = INCBIN_U32("graphics/items/icon_palettes/fresh_start_mochi.gbapal.lz");
// Ogerpon masks
const u32 gItemIcon_WellspringMask[] = INCBIN_U32("graphics/items/icons/wellspring_mask.4bpp.lz");
const u32 gItemIconPalette_WellspringMask[] = INCBIN_U32("graphics/items/icon_palettes/wellspring_mask.gbapal.lz");
const u32 gItemIcon_HearthflameMask[] = INCBIN_U32("graphics/items/icons/hearthflame_mask.4bpp.lz");
const u32 gItemIconPalette_HearthflameMask[] = INCBIN_U32("graphics/items/icon_palettes/hearthflame_mask.gbapal.lz");
const u32 gItemIcon_CornerstoneMask[] = INCBIN_U32("graphics/items/icons/cornerstone_mask.4bpp.lz");
const u32 gItemIconPalette_CornerstoneMask[] = INCBIN_U32("graphics/items/icon_palettes/cornerstone_mask.gbapal.lz");
// Misc. Items
const u32 gItemIcon_AdamantCrystal[] = INCBIN_U32("graphics/items/icons/adamant_crystal.4bpp.lz");

28
src/data/item_icon_table.h
View file

@ -845,20 +845,20 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
[ITEM_PEAT_BLOCK] = {gItemIcon_PeatBlock, gItemIconPalette_PeatBlock},
[ITEM_BERSERK_GENE] = {gItemIcon_BerserkGene, gItemIconPalette_BerserkGene},
[ITEM_FAIRY_FEATHER] = {gItemIcon_FairyFeather, gItemIconPalette_FairyFeather},
[ITEM_SYRUPY_APPLE] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_SyrupyApple, gItemIconPalette_SyrupyApple},
[ITEM_UNREMARKABLE_TEACUP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_UnremarkableTeacup, gItemIconPalette_UnremarkableTeacup},
[ITEM_MASTERPIECE_TEACUP] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_MasterpieceTeacup, gItemIconPalette_MasterpieceTeacup},
[ITEM_CORNERSTONE_MASK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_CornerstoneMask, gItemIconPalette_CornerstoneMask},
[ITEM_WELLSPRING_MASK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_WellspringMask, gItemIconPalette_WellspringMask},
[ITEM_HEARTHFLAME_MASK] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_HearthflameMask, gItemIconPalette_HearthflameMask},
[ITEM_HEALTH_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_HealthMochi},
[ITEM_MUSCLE_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_MuscleMochi},
[ITEM_RESIST_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_ResistMochi},
[ITEM_GENIUS_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_GeniusMochi},
[ITEM_CLEVER_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_CleverMochi},
[ITEM_SWIFT_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_SwiftMochi},
[ITEM_FRESH_START_MOCHI] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_Mochi, gItemIconPalette_FreshStartMochi},
[ITEM_GLIMMERING_CHARM] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GlimmeringCharm, gItemIconPalette_GlimmeringCharm},
[ITEM_SYRUPY_APPLE] = {gItemIcon_SyrupyApple, gItemIconPalette_SyrupyApple},
[ITEM_UNREMARKABLE_TEACUP] = {gItemIcon_UnremarkableTeacup, gItemIconPalette_UnremarkableTeacup},
[ITEM_MASTERPIECE_TEACUP] = {gItemIcon_MasterpieceTeacup, gItemIconPalette_MasterpieceTeacup},
[ITEM_CORNERSTONE_MASK] = {gItemIcon_CornerstoneMask, gItemIconPalette_CornerstoneMask},
[ITEM_WELLSPRING_MASK] = {gItemIcon_WellspringMask, gItemIconPalette_WellspringMask},
[ITEM_HEARTHFLAME_MASK] = {gItemIcon_HearthflameMask, gItemIconPalette_HearthflameMask},
[ITEM_HEALTH_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_HealthMochi},
[ITEM_MUSCLE_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_MuscleMochi},
[ITEM_RESIST_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_ResistMochi},
[ITEM_GENIUS_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_GeniusMochi},
[ITEM_CLEVER_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_CleverMochi},
[ITEM_SWIFT_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_SwiftMochi},
[ITEM_FRESH_START_MOCHI] = {gItemIcon_Mochi, gItemIconPalette_FreshStartMochi},
[ITEM_GLIMMERING_CHARM] = {gItemIcon_GlimmeringCharm, gItemIconPalette_GlimmeringCharm},
// Return to field arrow
[ITEMS_COUNT] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
};