From 7ccdd4b5b3efa4bdb8fb8999e1d9a738e8fa738a Mon Sep 17 00:00:00 2001 From: hedara90 <90hedara@gmail.com> Date: Fri, 10 Nov 2023 01:57:04 +0100 Subject: [PATCH] Added Teal Mask item graphics + updated install instructions (#3527) Co-authored-by: Eduardo Quezada D'Ottone --- INSTALL.md | 10 +++--- graphics/items/icon_palettes/clever_mochi.pal | 15 ++++++++ .../items/icon_palettes/cornerstone_mask.pal | 17 ++++++++++ .../items/icon_palettes/fresh_start_mochi.pal | 15 ++++++++ graphics/items/icon_palettes/genius_mochi.pal | 15 ++++++++ .../items/icon_palettes/glimmering_charm.pal | 18 ++++++++++ graphics/items/icon_palettes/health_mochi.pal | 15 ++++++++ .../items/icon_palettes/hearthflame_mask.pal | 19 +++++++++++ .../icon_palettes/masterpiece_teacup.pal | 15 ++++++++ graphics/items/icon_palettes/muscle_mochi.pal | 15 ++++++++ graphics/items/icon_palettes/resist_mochi.pal | 15 ++++++++ graphics/items/icon_palettes/swift_mochi.pal | 15 ++++++++ graphics/items/icon_palettes/syrupy_apple.pal | 17 ++++++++++ .../icon_palettes/unremarkable_teacup.pal | 14 ++++++++ .../items/icon_palettes/wellspring_mask.pal | 16 +++++++++ graphics/items/icons/cornerstone_mask.png | Bin 0 -> 383 bytes graphics/items/icons/glimmering_charm.png | Bin 0 -> 324 bytes graphics/items/icons/hearthflame_mask.png | Bin 0 -> 368 bytes graphics/items/icons/masterpiece_teacup.png | Bin 0 -> 328 bytes graphics/items/icons/mochi.png | Bin 0 -> 262 bytes graphics/items/icons/syrupy_apple.png | Bin 0 -> 318 bytes graphics/items/icons/unremarkable_teacup.png | Bin 0 -> 323 bytes graphics/items/icons/wellspring_mask.png | Bin 0 -> 364 bytes include/graphics.h | 24 +++++++++++++ src/data/graphics/items.h | 32 ++++++++++++++++++ src/data/item_icon_table.h | 28 +++++++-------- 26 files changed, 296 insertions(+), 19 deletions(-) create mode 100644 graphics/items/icon_palettes/clever_mochi.pal create mode 100644 graphics/items/icon_palettes/cornerstone_mask.pal create mode 100644 graphics/items/icon_palettes/fresh_start_mochi.pal create mode 100644 graphics/items/icon_palettes/genius_mochi.pal create mode 100644 graphics/items/icon_palettes/glimmering_charm.pal create mode 100644 graphics/items/icon_palettes/health_mochi.pal create mode 100644 graphics/items/icon_palettes/hearthflame_mask.pal create mode 100644 graphics/items/icon_palettes/masterpiece_teacup.pal create mode 100644 graphics/items/icon_palettes/muscle_mochi.pal create mode 100644 graphics/items/icon_palettes/resist_mochi.pal create mode 100644 graphics/items/icon_palettes/swift_mochi.pal create mode 100644 graphics/items/icon_palettes/syrupy_apple.pal create mode 100644 graphics/items/icon_palettes/unremarkable_teacup.pal create mode 100644 graphics/items/icon_palettes/wellspring_mask.pal create mode 100644 graphics/items/icons/cornerstone_mask.png create mode 100644 graphics/items/icons/glimmering_charm.png create mode 100644 graphics/items/icons/hearthflame_mask.png create mode 100644 graphics/items/icons/masterpiece_teacup.png create mode 100644 graphics/items/icons/mochi.png create mode 100644 graphics/items/icons/syrupy_apple.png create mode 100644 graphics/items/icons/unremarkable_teacup.png create mode 100644 graphics/items/icons/wellspring_mask.png diff --git a/INSTALL.md b/INSTALL.md index af2e844677..f82649d7e2 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -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 ```
Note... @@ -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).
Note for legacy repos... > 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).
### 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).
Note for legacy repos... > 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).
diff --git a/graphics/items/icon_palettes/clever_mochi.pal b/graphics/items/icon_palettes/clever_mochi.pal new file mode 100644 index 0000000000..dfb6467f26 --- /dev/null +++ b/graphics/items/icon_palettes/clever_mochi.pal @@ -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 diff --git a/graphics/items/icon_palettes/cornerstone_mask.pal b/graphics/items/icon_palettes/cornerstone_mask.pal new file mode 100644 index 0000000000..06affcc19b --- /dev/null +++ b/graphics/items/icon_palettes/cornerstone_mask.pal @@ -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 diff --git a/graphics/items/icon_palettes/fresh_start_mochi.pal b/graphics/items/icon_palettes/fresh_start_mochi.pal new file mode 100644 index 0000000000..55eeac0ce3 --- /dev/null +++ b/graphics/items/icon_palettes/fresh_start_mochi.pal @@ -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 diff --git a/graphics/items/icon_palettes/genius_mochi.pal b/graphics/items/icon_palettes/genius_mochi.pal new file mode 100644 index 0000000000..7a91b8fbf9 --- /dev/null +++ b/graphics/items/icon_palettes/genius_mochi.pal @@ -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 diff --git a/graphics/items/icon_palettes/glimmering_charm.pal b/graphics/items/icon_palettes/glimmering_charm.pal new file mode 100644 index 0000000000..813886d85a --- /dev/null +++ b/graphics/items/icon_palettes/glimmering_charm.pal @@ -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 diff --git a/graphics/items/icon_palettes/health_mochi.pal b/graphics/items/icon_palettes/health_mochi.pal new file mode 100644 index 0000000000..930e98ebfb --- /dev/null +++ b/graphics/items/icon_palettes/health_mochi.pal @@ -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 diff --git a/graphics/items/icon_palettes/hearthflame_mask.pal b/graphics/items/icon_palettes/hearthflame_mask.pal new file mode 100644 index 0000000000..1df0621797 --- /dev/null +++ b/graphics/items/icon_palettes/hearthflame_mask.pal @@ -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 diff --git a/graphics/items/icon_palettes/masterpiece_teacup.pal b/graphics/items/icon_palettes/masterpiece_teacup.pal new file mode 100644 index 0000000000..9c37a09d7b --- /dev/null +++ b/graphics/items/icon_palettes/masterpiece_teacup.pal @@ -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 diff --git a/graphics/items/icon_palettes/muscle_mochi.pal b/graphics/items/icon_palettes/muscle_mochi.pal new file mode 100644 index 0000000000..6198ef6e9d --- /dev/null +++ b/graphics/items/icon_palettes/muscle_mochi.pal @@ -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 diff --git a/graphics/items/icon_palettes/resist_mochi.pal b/graphics/items/icon_palettes/resist_mochi.pal new file mode 100644 index 0000000000..87da8140dd --- /dev/null +++ b/graphics/items/icon_palettes/resist_mochi.pal @@ -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 diff --git a/graphics/items/icon_palettes/swift_mochi.pal b/graphics/items/icon_palettes/swift_mochi.pal new file mode 100644 index 0000000000..90fb43493b --- /dev/null +++ b/graphics/items/icon_palettes/swift_mochi.pal @@ -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 diff --git a/graphics/items/icon_palettes/syrupy_apple.pal b/graphics/items/icon_palettes/syrupy_apple.pal new file mode 100644 index 0000000000..2243d3df3e --- /dev/null +++ b/graphics/items/icon_palettes/syrupy_apple.pal @@ -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 diff --git a/graphics/items/icon_palettes/unremarkable_teacup.pal b/graphics/items/icon_palettes/unremarkable_teacup.pal new file mode 100644 index 0000000000..c70426f432 --- /dev/null +++ b/graphics/items/icon_palettes/unremarkable_teacup.pal @@ -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 diff --git a/graphics/items/icon_palettes/wellspring_mask.pal b/graphics/items/icon_palettes/wellspring_mask.pal new file mode 100644 index 0000000000..8e64a3ffcf --- /dev/null +++ b/graphics/items/icon_palettes/wellspring_mask.pal @@ -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 diff --git a/graphics/items/icons/cornerstone_mask.png b/graphics/items/icons/cornerstone_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..dcca6725d4c5c4347edbd70fddf76a8216e066a5 GIT binary patch literal 383 zcmV-_0f7FAP)CfGYq100DGTPE!Ct z=GbNc0004EOGiWihy@);0002?NklE1H0#XYh9I3^Hix&jW?#>VC4<{-|t zax3FmtIUfGLAGo!@v>Sub8+cK5NC(aEi3bKbJJ}gv!#0vPd#+8%Hi=mwIa-(u%bp>z;7z&CP8J8D9JSxDzSX3@3 d$N&RSCID7FOFa+Omq`Es002ovPDHLkV1gjwmkj^_ literal 0 HcmV?d00001 diff --git a/graphics/items/icons/glimmering_charm.png b/graphics/items/icons/glimmering_charm.png new file mode 100644 index 0000000000000000000000000000000000000000..bbed0dcb0490aea8ea664740b7aefc1561505ba5 GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w-2k5u*P`4+AhX!+xn+EmNjkql z>Wzoi^E+ns+Z$Hx8fF%Qq71Y;hFp6sq(#jM5!X}*SYVr#vgGn|=q>(X7rf^#=dUcb6P=JT!c z%ggiI3vR5p*stAQJn#BmYoqPe%q}-~nwP(yW66H?aQXLlcgx>%Dag#TE`LAII*!5k z=exVsR|9O{i;gcgxrND Q1O33@>FVdQ&MBb@041`2^Z)<= literal 0 HcmV?d00001 diff --git a/graphics/items/icons/hearthflame_mask.png b/graphics/items/icons/hearthflame_mask.png new file mode 100644 index 0000000000000000000000000000000000000000..accb5a8077e878b3340eee00d0f270c464e9caf9 GIT binary patch literal 368 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wg8-ip*PPOHAX7s_!$U)(!@yvN zfq_RvL`HYh7ML)4>oz zKmT)pfZHVY{oO}=zt8pcJ&O`Je&oiXB)9ghpJNr;Ulwh5EpOl0{nm7X@2kH`YRA;h zUH{}Dv+UXZtYev8Ztu++E$$v%ZeRC$#=`GhDg9^X9oCZz?s@AFna*S0HU+VBlb25n!NTVPWCn z;1S?pkl>(^k(97*@$3sH4m@~p;ewpUEucEak|4ie28U-i(m7${OFU6ltmiUq164A5#`#+PD3LZTxmpV&I6}JU%UB#?;$axD}!<((f`#AJ3vK`CG zR@A@D@pG?O9Bb#!sO*j5hqR57C(Jy_Si_`n`p*Tvz6rw0=0{mnqZU=PNL)Br&F18? z@8!aNwuJKJsjGP`lMi3%+4}gB(5+4Lb6?!t8s+P@@|sns{l#^!Z|(oKA@FqnPo@fK WuZ{CPABX}y#Ng@b=d#Wzp$Pz_f_)MI literal 0 HcmV?d00001 diff --git a/graphics/items/icons/mochi.png b/graphics/items/icons/mochi.png new file mode 100644 index 0000000000000000000000000000000000000000..9d033b1bd8d811d853dc43d91f20e4285a1fc0c3 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wl>na*S0D`p3JMAu8X5`?VG0Qi z0u37&CR||H@PXmL504W+A})ML&)oMJsEDy7$S;_|;n|HeAZLQ7i(`ny<+=SEd7BLc zTy@nP)hA54ubzBf#O0OGH5-=Nzt?O-wB846p8Whj=V!C!Z24)^9iH06_ALT=$J5o%Wt~$( F697?9VUqv= literal 0 HcmV?d00001 diff --git a/graphics/items/icons/syrupy_apple.png b/graphics/items/icons/syrupy_apple.png new file mode 100644 index 0000000000000000000000000000000000000000..e5c4efdfa6db35c437c955a7221f4a3c237d71c7 GIT binary patch literal 318 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;wtpJ}8SB69e6?HW~4YdOj8Yv#; z9}F}O6v_W6F!)iB@uOYfN4v<62^F8_%iK7yqjRRG7f=^tNswPKgTu2MX&_FLx4R2N z2dk_Hkh9g(#W6(Ua&iI#BO@D2!k&%?hFrTexSV$OEOOLawXjiOUPi`>jslIA;}TL* zYm{<$o;a%TgtjyWEo4gQ+t{(da0YXTs8kNeB!=R$7AHrA37gBcXGrorno@QrgZ1+% z?#4MCvUdd&GzHjKFtjY3bD>Cqp-5<=rGxj;Mv)o8Z4ag}g&HiWS0HU+VBlb20R$cn9sv#p z2@V<=NeSx~&%SWtz=H=D<}v>$0xDuG3GxeOaCmkj4a7yUu}+XL;&Mm9x$1v>{5*HyE>IJ{X`Ey%RXv;DzZzOqo4LXq}no28z*vR~sr z)wdjoW%!per|!Iqm%w+gQx9AsSEs-3-74BJi^u&auX6}jmbJ{$uA?TcDdq={9+>g? z&r-)V>sNfUd%~;mVbcZ?tL+h~Zzj!Py zu2}GL<+qsa$>~dzi=OUoHK@t+bE`K$)oWOJ-O^s5Hi`h}Yb@o2TX*YSNDkfKnc0AaZ*^(l8fpNN*(45rne-%u3(-t`` zT-`F$b?!lFmG(_W%8Tnm`~3sI?l;sjnya(--^H8U*EqN4%nv(|z~v>vHkniKL(d8~ zMW-o_Qzf*kovP-VJ}7(6A9C-CrGeSHrrr15Ru;t;Rj%2&qhM38$HjELZ-FYo9kcD~ z@7Q)diF-KPJm!$+)81b9XL0<-kv*b(e=0Q$SBqDPDF3pWwj<`=tNfcDb4_@nJI;Jw zQ1I*4ukWk3KbY>TAbm;T&>wT1)(5jw)?V#h?sR5<*{+xD_K$rw$Q#6h!j-|()z4*} HQ$iB}oT!nY literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index 46de942326..d55118dde5 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -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[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 2ef587d994..e853c40bc1 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -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"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index de6e92371b..ed9a158650 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -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}, };