Merge pull request #103 from LOuroboros/battle_engine_v2

Protective Pads' description and Safety Goggles

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

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[];

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");
 

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},

src/data/items.h

@@ -8129,6 +8129,24 @@ const struct Item gItems[] =
         .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] =
 	{
         .name = _("Gengarite"),

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.");
@@ -444,7 +445,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.");