Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added sprite and palettes for Teal Mask items and updated install instructions #3527

Merged
merged 10 commits into from
Nov 10, 2023
Merged

Added sprite and palettes for Teal Mask items and updated install instructions #3527

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4e49c23
Added sprites for Mochi items
hedara90 Nov 4, 2023
cea3661
Applied fix to CI issue
hedara90 Nov 5, 2023
0e80762
Merge branch 'upcoming' into mochi-graphics
AsparagusEduardo Nov 5, 2023
240b951
Renamed mochi sprite
hedara90 Nov 6, 2023
4b7503a
Added the rest of the Teal Mask items excluding Glimmering charm
hedara90 Nov 6, 2023
2563a24
Added Glimmering Charm the lazy way
hedara90 Nov 6, 2023
d34cd01
Merge branch 'mochi-graphics' of hidden.github.com:hedara90/pokeemera…
hedara90 Nov 6, 2023
b645f59
Merge branch 'upcoming' into mochi-graphics
hedara90 Nov 6, 2023
4d86e3a
Merge branch 'upcoming' into mochi-graphics
hedara90 Nov 9, 2023
037cd02
Merge branch 'upcoming' into mochi-graphics
AsparagusEduardo Nov 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions INSTALL.md
View file
Open in desktop
AsparagusEduardo marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>

Expand Down
15 changes: 15 additions & 0 deletions graphics/items/icon_palettes/clever_mochi.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions graphics/items/icon_palettes/fresh_start_mochi.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 15 additions & 0 deletions graphics/items/icon_palettes/genius_mochi.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions graphics/items/icon_palettes/health_mochi.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
15 changes: 15 additions & 0 deletions graphics/items/icon_palettes/muscle_mochi.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 15 additions & 0 deletions graphics/items/icon_palettes/resist_mochi.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 changes: 15 additions & 0 deletions graphics/items/icon_palettes/swift_mochi.pal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file added graphics/items/icons/health_mochi.png
View file
Open in desktop
hedara90 marked this conversation as resolved.
Show resolved Hide resolved
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions include/graphics.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9291,6 +9291,15 @@ 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_ReturnToFieldArrow[];
extern const u32 gItemIconPalette_ReturnToFieldArrow[];

Expand Down
11 changes: 11 additions & 0 deletions src/data/graphics/items.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2010,6 +2010,17 @@ 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/health_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");

// Misc. Items

const u32 gItemIcon_AdamantCrystal[] = INCBIN_U32("graphics/items/icons/adamant_crystal.4bpp.lz");
Expand Down
14 changes: 7 additions & 7 deletions src/data/item_icon_table.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -851,13 +851,13 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] =
[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_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_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GlimmeringCharm, gItemIconPalette_GlimmeringCharm},
// Return to field arrow
[ITEMS_COUNT] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
Expand Down
Loading