From 3e5d64a070e1f2bf34fd91634106e8a9f9f259e9 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 7 Mar 2019 13:47:02 -0300 Subject: [PATCH 1/3] Fixed the Protective Pads' description. --- src/data/text/item_descriptions.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index afb907fe93..7a8b4f1a48 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -444,7 +444,7 @@ const u8 gLopunniteItemDescription[] = _("This stone enables\nLopunny to Mega\nE const u8 gSalamenciteItemDescription[] = _("This stone enables\nSalamence to Mega\nEvolve in battle."); const u8 gBeedrilliteItemDescription[] = _("This stone enables\nBeedrill to Mega\nEvolve in battle."); const u8 gMegaBraceletItemDescription[] = _("Allows Pokémon holding\na Mega Stone to Mega\nEvolve in battle."); -const u8 gProtectPadsItemDescription[] = _("Guards the holder\nfrom effects caused\nby contact moves."); +const u8 gProtectPadsItemDescription[] = _("Guard the holder\nfrom contact move\neffects."); const u8 gTerrainExtenderItemDescription[] = _("Extends the length\nof the active\nbattle terrain."); const u8 gElectricSeedItemDescription[] = _("Boosts Defense on\nElectric Terrain,\nbut only one time."); const u8 gGrassySeedItemDescription[] = _("Boosts Defense on\nGrassy Terrain,\nbut only one time."); From 25ff138ead324bcab95574400f39422b27337820 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 7 Mar 2019 13:52:46 -0300 Subject: [PATCH 2/3] Reordered the Item IDs a little bit to add the Safety Goggles and also added their item data. --- include/constants/items.h | 113 +++++++++++++++--------------- src/data/items.h | 18 +++++ src/data/text/item_descriptions.h | 1 + 3 files changed, 76 insertions(+), 56 deletions(-) diff --git a/include/constants/items.h b/include/constants/items.h index bdd4212e11..176750a16b 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -541,65 +541,66 @@ // Gen6 Items #define ITEM_ASSAULT_VEST 448 #define ITEM_PIXIE_PLATE 449 -#define ITEM_GENGARITE 450 -#define ITEM_GARDEVOIRITE 451 -#define ITEM_AMPHAROSITE 452 -#define ITEM_VENUSAURITE 453 -#define ITEM_CHARIZARDITE_X 454 -#define ITEM_BLASTOISINITE 455 -#define ITEM_MEWTWONITE_X 456 -#define ITEM_MEWTWONITE_Y 457 -#define ITEM_BLAZIKENITE 458 -#define ITEM_MEDICHAMITE 459 -#define ITEM_HOUNDOOMINITE 460 -#define ITEM_AGGRONITE 461 -#define ITEM_BANETTITE 462 -#define ITEM_TYRANITARITE 463 -#define ITEM_SCIZORITE 464 -#define ITEM_PINSIRITE 465 -#define ITEM_AERODACTYLITE 466 -#define ITEM_LUCARIONITE 467 -#define ITEM_ABOMASITE 468 -#define ITEM_KANGASKHANITE 469 -#define ITEM_GYARADOSITE 470 -#define ITEM_ABSOLITE 471 -#define ITEM_CHARIZARDITE_Y 472 -#define ITEM_ALAKAZITE 473 -#define ITEM_HERACRONITE 474 -#define ITEM_MAWILITE 475 -#define ITEM_MANECTITE 476 -#define ITEM_GARCHOMPITE 477 -#define ITEM_LATIASITE 478 -#define ITEM_LATIOSITE 479 -#define ITEM_SWAMPERTITE 480 -#define ITEM_SCEPTILITE 481 -#define ITEM_SABLENITE 482 -#define ITEM_ALTARIANITE 483 -#define ITEM_GALLADITE 484 -#define ITEM_AUDINITE 485 -#define ITEM_METAGROSSITE 486 -#define ITEM_SHARPEDONITE 487 -#define ITEM_SLOWBRONITE 488 -#define ITEM_STEELIXITE 489 -#define ITEM_PIDGEOTITE 490 -#define ITEM_GLALITITE 491 -#define ITEM_DIANCITE 492 -#define ITEM_CAMERUPTITE 493 -#define ITEM_LOPUNNITE 494 -#define ITEM_SALAMENCITE 495 -#define ITEM_BEEDRILLITE 496 -#define ITEM_MEGA_BRACELET 497 +#define ITEM_SAFETY_GOGGLES 450 +#define ITEM_GENGARITE 451 +#define ITEM_GARDEVOIRITE 452 +#define ITEM_AMPHAROSITE 453 +#define ITEM_VENUSAURITE 454 +#define ITEM_CHARIZARDITE_X 455 +#define ITEM_BLASTOISINITE 456 +#define ITEM_MEWTWONITE_X 457 +#define ITEM_MEWTWONITE_Y 458 +#define ITEM_BLAZIKENITE 459 +#define ITEM_MEDICHAMITE 460 +#define ITEM_HOUNDOOMINITE 461 +#define ITEM_AGGRONITE 462 +#define ITEM_BANETTITE 463 +#define ITEM_TYRANITARITE 464 +#define ITEM_SCIZORITE 465 +#define ITEM_PINSIRITE 466 +#define ITEM_AERODACTYLITE 467 +#define ITEM_LUCARIONITE 468 +#define ITEM_ABOMASITE 469 +#define ITEM_KANGASKHANITE 470 +#define ITEM_GYARADOSITE 471 +#define ITEM_ABSOLITE 472 +#define ITEM_CHARIZARDITE_Y 473 +#define ITEM_ALAKAZITE 474 +#define ITEM_HERACRONITE 475 +#define ITEM_MAWILITE 476 +#define ITEM_MANECTITE 477 +#define ITEM_GARCHOMPITE 478 +#define ITEM_LATIASITE 479 +#define ITEM_LATIOSITE 480 +#define ITEM_SWAMPERTITE 481 +#define ITEM_SCEPTILITE 482 +#define ITEM_SABLENITE 483 +#define ITEM_ALTARIANITE 484 +#define ITEM_GALLADITE 485 +#define ITEM_AUDINITE 486 +#define ITEM_METAGROSSITE 487 +#define ITEM_SHARPEDONITE 488 +#define ITEM_SLOWBRONITE 489 +#define ITEM_STEELIXITE 490 +#define ITEM_PIDGEOTITE 491 +#define ITEM_GLALITITE 492 +#define ITEM_DIANCITE 493 +#define ITEM_CAMERUPTITE 494 +#define ITEM_LOPUNNITE 495 +#define ITEM_SALAMENCITE 496 +#define ITEM_BEEDRILLITE 497 +#define ITEM_MEGA_BRACELET 498 // Gen7 hold effects -#define ITEM_PROTECTIVE_PADS 498 -#define ITEM_TERRAIN_EXTENDER 499 -#define ITEM_ELECTRIC_SEED 500 -#define ITEM_GRASSY_SEED 501 -#define ITEM_MISTY_SEED 502 -#define ITEM_PSYCHIC_SEED 503 -#define ITEM_ADRENALINE_ORB 504 +#define ITEM_PROTECTIVE_PADS 499 +#define ITEM_TERRAIN_EXTENDER 500 +#define ITEM_ELECTRIC_SEED 501 +#define ITEM_GRASSY_SEED 502 +#define ITEM_MISTY_SEED 503 +#define ITEM_PSYCHIC_SEED 504 +#define ITEM_ADRENALINE_ORB 505 -#define ITEMS_COUNT 505 +#define ITEMS_COUNT 506 #define ITEM_FIELD_ARROW ITEMS_COUNT #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY diff --git a/src/data/items.h b/src/data/items.h index 768bac00c8..6751b018ef 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -8128,6 +8128,24 @@ const struct Item gItems[] = .battleUseFunc = NULL, .secondaryId = 0, }, + + [ITEM_SAFETY_GOGGLES] = + { + .name = _("SafetyGoggles"), + .itemId = ITEM_SAFETY_GOGGLES, + .price = 4000, + .holdEffect = HOLD_EFFECT_SAFETY_GOOGLES, + .holdEffectParam = 0, + .description = gSafetyGogglesItemDescription, + .importance = 0, + .unk19 = 0, + .pocket = POCKET_ITEMS, + .type = 4, + .fieldUseFunc = ItemUseOutOfBattle_CannotUse, + .battleUsage = 0, + .battleUseFunc = NULL, + .secondaryId = 0, + }, [ITEM_GENGARITE] = { diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 7a8b4f1a48..57671d1e72 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -398,6 +398,7 @@ const u8 gNormalGemItemDescription[] = _("Increases the\npower of Normal\nType m const u8 gFairyGemItemDescription[] = _("Increases the\npower of Fairy\nType moves."); const u8 gAssaultVestItemDescription[] = _("Raises Sp. Def but\nprevents the use of\nstatus moves."); const u8 gPixiePlateItemDescription[] = _("A stone tablet that\nboosts the power of\nFairy-type moves."); +const u8 gSafetyGogglesItemDescription[] = _("Protect from\nweather damage and\npowder moves."); const u8 gGengariteItemDescription[] = _("This stone enables\nGengar to Mega\nEvolve in battle."); const u8 gGardevoiriteItemDescription[] = _("This stone enables\nGardevoir to Mega\nEvolve in battle."); const u8 gAmpharositeItemDescription[] = _("This stone enables\nAmpharos to Mega\nEvolve in battle."); From 7d7e54c59a70416c4e736e3b09b471cea7eaf091 Mon Sep 17 00:00:00 2001 From: LOuroboros Date: Thu, 7 Mar 2019 13:54:54 -0300 Subject: [PATCH 3/3] Added the item sprite of the Safety Goggles. --- graphics/items/icon_palettes/safety_goggles.png | Bin 0 -> 386 bytes graphics/items/icons/safety_goggles.png | Bin 0 -> 386 bytes include/graphics.h | 2 ++ src/data/graphics/items.h | 3 +++ src/data/item_icon_table.h | 1 + 5 files changed, 6 insertions(+) create mode 100755 graphics/items/icon_palettes/safety_goggles.png create mode 100755 graphics/items/icons/safety_goggles.png diff --git a/graphics/items/icon_palettes/safety_goggles.png b/graphics/items/icon_palettes/safety_goggles.png new file mode 100755 index 0000000000000000000000000000000000000000..7a1efab67adffd72893d7ab8383ab500014ac898 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xu?EJb+&fI^cfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0=j-CMiXDcR}&wQFMZL`gH zTyQQ}$I+*H{O!E5BC8#H8k}CONhoK1x%tPGW3T3J{^$L#-{D8nnfs1MvR?I_5NC3E zF1WV7boW!a(n;%bd_*EvuH)IFdD5~VH7j3X+3DDo@{XHKdS){z9j|#2CTx?}eemVh zNTt@-eb%j(iQ1L&6|pP{nnhV`|HC#5oxFHlL}%rl4Bq?fb!UYg?Ui`$+~0f> KKbLh*2~7ZYQHg>8 literal 0 HcmV?d00001 diff --git a/graphics/items/icons/safety_goggles.png b/graphics/items/icons/safety_goggles.png new file mode 100755 index 0000000000000000000000000000000000000000..7a1efab67adffd72893d7ab8383ab500014ac898 GIT binary patch literal 386 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaN3?zjj6;1;w_7YEDSN6xu?EJb+&fI^cfkNUX zt`Q}{`DrEPiAAXl?mjL+V-(6#ixiCYObT0=j-CMiXDcR}&wQFMZL`gH zTyQQ}$I+*H{O!E5BC8#H8k}CONhoK1x%tPGW3T3J{^$L#-{D8nnfs1MvR?I_5NC3E zF1WV7boW!a(n;%bd_*EvuH)IFdD5~VH7j3X+3DDo@{XHKdS){z9j|#2CTx?}eemVh zNTt@-eb%j(iQ1L&6|pP{nnhV`|HC#5oxFHlL}%rl4Bq?fb!UYg?Ui`$+~0f> KKbLh*2~7ZYQHg>8 literal 0 HcmV?d00001 diff --git a/include/graphics.h b/include/graphics.h index 5137f63942..ed25ae8e3c 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3996,6 +3996,8 @@ extern const u32 gItemIcon_AssaultVest[]; extern const u32 gItemIconPalette_AssaultVest[]; extern const u32 gItemIcon_PixiePlate[]; extern const u32 gItemIconPalette_PixiePlate[]; +extern const u32 gItemIcon_SafetyGoggles[]; +extern const u32 gItemIconPalette_SafetyGoggles[]; extern const u32 gItemIcon_Gengarite[]; extern const u32 gItemIconPalette_Gengarite[]; extern const u32 gItemIcon_Gardevoirite[]; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index d2026b3ba9..e20edbd647 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -962,6 +962,9 @@ const u32 gItemIconPalette_AssaultVest[] = INCBIN_U32("graphics/items/icon_palet const u32 gItemIcon_PixiePlate[] = INCBIN_U32("graphics/items/icons/pixie_plate.4bpp.lz"); const u32 gItemIconPalette_PixiePlate[] = INCBIN_U32("graphics/items/icon_palettes/pixie_plate.gbapal.lz"); +const u32 gItemIcon_SafetyGoggles[] = INCBIN_U32("graphics/items/icons/safety_goggles.4bpp.lz"); +const u32 gItemIconPalette_SafetyGoggles[] = INCBIN_U32("graphics/items/icon_palettes/safety_goggles.gbapal.lz"); + const u32 gItemIcon_Gengarite[] = INCBIN_U32("graphics/items/icons/gengarite.4bpp.lz"); const u32 gItemIconPalette_Gengarite[] = INCBIN_U32("graphics/items/icon_palettes/gengarite.gbapal.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 793a326a51..2b160ae202 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -478,6 +478,7 @@ const u32 *const gItemIconTable[][2] = // Gen 6 Items [ITEM_ASSAULT_VEST] = {gItemIcon_AssaultVest, gItemIconPalette_AssaultVest}, [ITEM_PIXIE_PLATE] = {gItemIcon_PixiePlate, gItemIconPalette_PixiePlate}, + [ITEM_SAFETY_GOGGLES] = {gItemIcon_SafetyGoggles, gItemIconPalette_SafetyGoggles}, [ITEM_GENGARITE] = {gItemIcon_Gengarite, gItemIconPalette_Gengarite}, [ITEM_GARDEVOIRITE] = {gItemIcon_Gardevoirite, gItemIconPalette_Gardevoirite}, [ITEM_AMPHAROSITE] = {gItemIcon_Ampharosite, gItemIconPalette_Ampharosite},