diff --git a/graphics/items/icon_palettes/bug_tera_shard.pal b/graphics/items/icon_palettes/bug_tera_shard.pal new file mode 100644 index 0000000000..548020fdf9 --- /dev/null +++ b/graphics/items/icon_palettes/bug_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +241 247 180 +185 237 206 +153 229 190 +208 225 193 +107 164 67 +155 224 232 +110 219 159 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dark_tera_shard.pal b/graphics/items/icon_palettes/dark_tera_shard.pal new file mode 100644 index 0000000000..b855250a4f --- /dev/null +++ b/graphics/items/icon_palettes/dark_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +177 181 211 +233 170 159 +168 164 170 +153 149 153 +45 44 49 +200 72 57 +100 108 167 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dragon_tera_shard.pal b/graphics/items/icon_palettes/dragon_tera_shard.pal new file mode 100644 index 0000000000..f86711a334 --- /dev/null +++ b/graphics/items/icon_palettes/dragon_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +199 221 235 +225 185 216 +202 138 188 +146 188 216 +32 75 132 +215 142 134 +173 57 140 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/electric_tera_shard.pal b/graphics/items/icon_palettes/electric_tera_shard.pal new file mode 100644 index 0000000000..15b393c850 --- /dev/null +++ b/graphics/items/icon_palettes/electric_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +220 238 231 +249 247 189 +243 243 174 +242 227 174 +209 155 7 +173 214 99 +147 87 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fairy_tera_shard.pal b/graphics/items/icon_palettes/fairy_tera_shard.pal new file mode 100644 index 0000000000..58d6cae33a --- /dev/null +++ b/graphics/items/icon_palettes/fairy_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +213 224 243 +243 199 212 +139 131 164 +188 205 234 +187 54 111 +225 165 149 +226 147 172 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fighting_tera_shard.pal b/graphics/items/icon_palettes/fighting_tera_shard.pal new file mode 100644 index 0000000000..5ce8656904 --- /dev/null +++ b/graphics/items/icon_palettes/fighting_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +248 191 188 +244 207 147 +241 188 105 +246 112 0 +178 63 0 +251 235 141 +233 157 39 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/fire_tera_shard.pal b/graphics/items/icon_palettes/fire_tera_shard.pal new file mode 100644 index 0000000000..406b90e981 --- /dev/null +++ b/graphics/items/icon_palettes/fire_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +233 199 215 +243 181 145 +232 185 185 +186 38 40 +105 20 26 +253 245 121 +239 148 99 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/flying_tera_shard.pal b/graphics/items/icon_palettes/flying_tera_shard.pal new file mode 100644 index 0000000000..461d9e5b8a --- /dev/null +++ b/graphics/items/icon_palettes/flying_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +212 242 239 +198 191 239 +171 194 230 +157 239 231 +40 84 165 +215 175 232 +66 128 226 +171 202 223 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ghost_tera_shard.pal b/graphics/items/icon_palettes/ghost_tera_shard.pal new file mode 100644 index 0000000000..bba3a968f2 --- /dev/null +++ b/graphics/items/icon_palettes/ghost_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +214 227 249 +208 175 239 +172 164 226 +188 183 231 +46 27 178 +234 76 104 +160 101 225 +171 202 223 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/grass_tera_shard.pal b/graphics/items/icon_palettes/grass_tera_shard.pal new file mode 100644 index 0000000000..ce10ab10ce --- /dev/null +++ b/graphics/items/icon_palettes/grass_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +211 233 194 +202 233 173 +171 225 199 +0 161 79 +255 239 132 +167 219 139 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ground_tera_shard.pal b/graphics/items/icon_palettes/ground_tera_shard.pal new file mode 100644 index 0000000000..b2168640b9 --- /dev/null +++ b/graphics/items/icon_palettes/ground_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +232 214 212 +209 205 177 +216 198 174 +225 207 175 +159 104 0 +204 210 214 +188 182 142 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/ice_tera_shard.pal b/graphics/items/icon_palettes/ice_tera_shard.pal new file mode 100644 index 0000000000..61ac07f673 --- /dev/null +++ b/graphics/items/icon_palettes/ice_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +237 235 231 +183 224 242 +76 171 182 +58 121 135 +137 157 224 +183 221 224 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/normal_tera_shard.pal b/graphics/items/icon_palettes/normal_tera_shard.pal new file mode 100644 index 0000000000..5792b00342 --- /dev/null +++ b/graphics/items/icon_palettes/normal_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +241 241 229 +236 218 200 +221 219 215 +224 222 218 +159 146 133 +175 204 224 +223 197 166 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/poison_tera_shard.pal b/graphics/items/icon_palettes/poison_tera_shard.pal new file mode 100644 index 0000000000..92eb2adafc --- /dev/null +++ b/graphics/items/icon_palettes/poison_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +188 233 208 +213 161 233 +202 138 188 +195 179 220 +74 23 153 +227 101 191 +165 72 209 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/psychic_tera_shard.pal b/graphics/items/icon_palettes/psychic_tera_shard.pal new file mode 100644 index 0000000000..e4c7e58604 --- /dev/null +++ b/graphics/items/icon_palettes/psychic_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +201 199 238 +225 181 237 +202 138 188 +228 181 216 +167 25 135 +217 120 165 +189 109 220 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/rock_tera_shard.pal b/graphics/items/icon_palettes/rock_tera_shard.pal new file mode 100644 index 0000000000..8575ff4d73 --- /dev/null +++ b/graphics/items/icon_palettes/rock_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +227 210 173 +192 187 225 +171 164 209 +209 172 159 +159 57 18 +171 139 179 +123 123 198 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/steel_tera_shard.pal b/graphics/items/icon_palettes/steel_tera_shard.pal new file mode 100644 index 0000000000..9dd861037d --- /dev/null +++ b/graphics/items/icon_palettes/steel_tera_shard.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 255 92 +0 0 0 +255 255 255 +220 227 225 +196 209 205 +168 183 189 +202 208 215 +57 67 89 +182 154 134 +121 147 155 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/water_tera_shard.pal b/graphics/items/icon_palettes/water_tera_shard.pal new file mode 100644 index 0000000000..db62ce1e34 --- /dev/null +++ b/graphics/items/icon_palettes/water_tera_shard.pal @@ -0,0 +1,13 @@ +JASC-PAL +0100 +10 +0 255 92 +0 0 0 +255 255 255 +221 246 229 +194 223 242 +166 174 226 +192 196 234 +57 67 189 +145 233 225 +137 195 227 diff --git a/graphics/items/icons/tera_shard.png b/graphics/items/icons/tera_shard.png new file mode 100644 index 0000000000..c4e9854865 Binary files /dev/null and b/graphics/items/icons/tera_shard.png differ diff --git a/include/graphics.h b/include/graphics.h index 87635d43a1..00727abacd 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -9028,6 +9028,27 @@ extern const u32 gItemIconPalette_TeraOrb[]; extern const u32 gItemIcon_TinyBambooShoot[]; extern const u32 gItemIconPalette_TinyBambooShoot[]; +// Tera Shards +extern const u32 gItemIcon_TeraShard[]; +extern const u32 gItemIconPalette_NormalTeraShard[]; +extern const u32 gItemIconPalette_FireTeraShard[]; +extern const u32 gItemIconPalette_WaterTeraShard[]; +extern const u32 gItemIconPalette_GrassTeraShard[]; +extern const u32 gItemIconPalette_ElectricTeraShard[]; +extern const u32 gItemIconPalette_IceTeraShard[]; +extern const u32 gItemIconPalette_FightingTeraShard[]; +extern const u32 gItemIconPalette_PoisonTeraShard[]; +extern const u32 gItemIconPalette_GroundTeraShard[]; +extern const u32 gItemIconPalette_FlyingTeraShard[]; +extern const u32 gItemIconPalette_PsychicTeraShard[]; +extern const u32 gItemIconPalette_BugTeraShard[]; +extern const u32 gItemIconPalette_RockTeraShard[]; +extern const u32 gItemIconPalette_GhostTeraShard[]; +extern const u32 gItemIconPalette_DarkTeraShard[]; +extern const u32 gItemIconPalette_DragonTeraShard[]; +extern const u32 gItemIconPalette_SteelTeraShard[]; +extern const u32 gItemIconPalette_FairyTeraShard[]; + extern const u32 gItemIcon_AdamantCrystal[]; extern const u32 gItemIconPalette_AdamantCrystal[]; extern const u32 gItemIcon_GriseousCore[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index 327fab0370..60cd7d5187 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -1988,7 +1988,29 @@ const u32 gItemIconPalette_TeraOrb[] = INCBIN_U32("graphics/items/icon_palettes/ const u32 gItemIcon_TinyBambooShoot[] = INCBIN_U32("graphics/items/icons/tiny_bamboo_shoot.4bpp.lz"); const u32 gItemIconPalette_TinyBambooShoot[] = INCBIN_U32("graphics/items/icon_palettes/tiny_bamboo_shoot.gbapal.lz"); -// Tera Shards here +// Tera Shards + +const u32 gItemIcon_TeraShard[] = INCBIN_U32("graphics/items/icons/tera_shard.4bpp.lz"); +const u32 gItemIconPalette_NormalTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/normal_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_FireTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/fire_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_WaterTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/water_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_GrassTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/grass_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_ElectricTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/electric_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_IceTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/ice_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_FightingTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/fighting_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_PoisonTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/poison_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_GroundTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/ground_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_FlyingTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/flying_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_PsychicTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/psychic_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_BugTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/bug_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_RockTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/rock_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_GhostTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/ghost_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_DarkTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/dark_tera_shard.gbapal.lz"); +const u32 gItemIconPalette_DragonTeraShard[] = INCBIN_U32("graphics/items/icon_palettes/dragon_tera_shard.gbapal.lz"); +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"); + +// Misc. Items const u32 gItemIcon_AdamantCrystal[] = INCBIN_U32("graphics/items/icons/adamant_crystal.4bpp.lz"); const u32 gItemIconPalette_AdamantCrystal[] = INCBIN_U32("graphics/items/icon_palettes/adamant_crystal.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 0e8112260a..a0a207be2d 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -819,24 +819,24 @@ const u32 *const gItemIconTable[ITEMS_COUNT + 1][2] = [ITEM_SCROLL_OF_WATERS] = {gItemIcon_ScrollOfWaters, gItemIconPalette_ScrollOfWaters}, [ITEM_TERA_ORB] = {gItemIcon_TeraOrb, gItemIconPalette_TeraOrb}, [ITEM_TINY_BAMBOO_SHOOT] = {gItemIcon_TinyBambooShoot, gItemIconPalette_TinyBambooShoot}, - [ITEM_BUG_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_BugTeraShard, gItemIconPalette_BugTeraShard}, - [ITEM_DARK_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_DarkTeraShard, gItemIconPalette_DarkTeraShard}, - [ITEM_DRAGON_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_DragonTeraShard, gItemIconPalette_DragonTeraShard}, - [ITEM_ELECTRIC_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_ElectricTeraShard, gItemIconPalette_ElectricTeraShard}, - [ITEM_FAIRY_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FairyTeraShard, gItemIconPalette_FairyTeraShard}, - [ITEM_FIGHTING_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FightingTeraShard, gItemIconPalette_FightingTeraShard}, - [ITEM_FIRE_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FireTeraShard, gItemIconPalette_FireTeraShard}, - [ITEM_FLYING_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_FlyingTeraShard, gItemIconPalette_FlyingTeraShard}, - [ITEM_GHOST_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GhostTeraShard, gItemIconPalette_GhostTeraShard}, - [ITEM_GRASS_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GrassTeraShard, gItemIconPalette_GrassTeraShard}, - [ITEM_GROUND_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_GroundTeraShard, gItemIconPalette_GroundTeraShard}, - [ITEM_ICE_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_IceTeraShard, gItemIconPalette_IceTeraShard}, - [ITEM_NORMAL_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_NormalTeraShard, gItemIconPalette_NormalTeraShard}, - [ITEM_POISON_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_PoisonTeraShard, gItemIconPalette_PoisonTeraShard}, - [ITEM_PSYCHIC_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_PsychicTeraShard, gItemIconPalette_PsychicTeraShard}, - [ITEM_ROCK_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_RockTeraShard, gItemIconPalette_RockTeraShard}, - [ITEM_STEEL_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_SteelTeraShard, gItemIconPalette_SteelTeraShard}, - [ITEM_WATER_TERA_SHARD] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // {gItemIcon_WaterTeraShard, gItemIconPalette_WaterTeraShard}, + [ITEM_BUG_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_BugTeraShard}, + [ITEM_DARK_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_DarkTeraShard}, + [ITEM_DRAGON_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_DragonTeraShard}, + [ITEM_ELECTRIC_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_ElectricTeraShard}, + [ITEM_FAIRY_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FairyTeraShard}, + [ITEM_FIGHTING_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FightingTeraShard}, + [ITEM_FIRE_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FireTeraShard}, + [ITEM_FLYING_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_FlyingTeraShard}, + [ITEM_GHOST_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_GhostTeraShard}, + [ITEM_GRASS_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_GrassTeraShard}, + [ITEM_GROUND_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_GroundTeraShard}, + [ITEM_ICE_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_IceTeraShard}, + [ITEM_NORMAL_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_NormalTeraShard}, + [ITEM_POISON_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_PoisonTeraShard}, + [ITEM_PSYCHIC_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_PsychicTeraShard}, + [ITEM_ROCK_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_RockTeraShard}, + [ITEM_STEEL_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_SteelTeraShard}, + [ITEM_WATER_TERA_SHARD] = {gItemIcon_TeraShard, gItemIconPalette_WaterTeraShard}, [ITEM_ADAMANT_CRYSTAL] = {gItemIcon_AdamantCrystal, gItemIconPalette_AdamantCrystal}, [ITEM_GRISEOUS_CORE] = {gItemIcon_GriseousCore, gItemIconPalette_GriseousCore}, [ITEM_LUSTROUS_GLOBE] = {gItemIcon_LustrousGlobe, gItemIconPalette_LustrousGlobe},