1 files changed, 70 insertions, 659 deletions
diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h
index cd06228dd..c7409f3b2 100644
--- a/src/data/pokemon/item_effects.h
+++ b/src/data/pokemon/item_effects.h
@@ -1,661 +1,72 @@
-//
-
-//
-
-#ifndef POKERUBY_ITEM_EFFECTS_H
-#define POKERUBY_ITEM_EFFECTS_H
-
-const u8 gItemEffect_Potion[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    20
-};
-
-const u8 gItemEffect_Antidote[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_BurnHeal[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x08,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_IceHeal[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_Awakening[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x20,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_ParalyzeHeal[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x02,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_FullRestore[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x3f,
-    0x04,
-    0x00,
-    0xff
-};
-
-const u8 gItemEffect_MaxPotion[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    0xff
-};
-
-const u8 gItemEffect_HyperPotion[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    200
-};
-
-const u8 gItemEffect_SuperPotion[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    50
-};
-
-const u8 gItemEffect_FullHeal[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x3f,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_Revive[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x44,
-    0x00,
-    0xfe
-};
-
-const u8 gItemEffect_MaxRevive[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x44,
-    0x00,
-    0xff
-};
-
-const u8 gItemEffect_FreshWater[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    50
-};
-
-const u8 gItemEffect_SodaPop[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    60
-};
-
-const u8 gItemEffect_Lemonade[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    80
-};
-
-const u8 gItemEffect_MoomooMilk[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    100
-};
-
-const u8 gItemEffect_EnergyPowder[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0xe0,
-    50,
-    0xfb,
-    0xfb,
-    0xf6
-};
-
-const u8 gItemEffect_EnergyRoot[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0xe0,
-    200,
-    0xf6,
-    0xf6,
-    0xf1
-};
-
-const u8 gItemEffect_HealPowder[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x3f,
-    0x00,
-    0xe0,
-    0xfb,
-    0xfb,
-    0xf6
-};
-
-const u8 gItemEffect_RevivalHerb[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x44,
-    0xe0,
-    0xfe,
-    0xf1,
-    0xf1,
-    0xec
-};
-
-const u8 gItemEffect_Ether[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x18,
-    0x00,
-    0x0a
-};
-
-const u8 gItemEffect_MaxEther[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x18,
-    0x00,
-    0x7f
-};
-
-const u8 gItemEffect_Elixir[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x08,
-    0x00,
-    0x0a
-};
-
-const u8 gItemEffect_MaxElixir[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x08,
-    0x00,
-    0x7f
-};
-
-const u8 gItemEffect_LavaCookie[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x3f,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_BlueFlute[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x20,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_YellowFlute[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_RedFlute[] = {
-    0x80,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_BerryJuice[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    20
-};
-
-const u8 gItemEffect_SacredAsh[] = {
-    0x40,
-    0x00,
-    0x00,
-    0x00,
-    0x44,
-    0x00,
-    0xff
-};
-
-const u8 gItemEffect_HPUp[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0xe0,
-    0x0a,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_Protein[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x02,
-    0xe0,
-    0x0a,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_Iron[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xe1,
-    0x0a,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_Carbos[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xe2,
-    0x0a,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_Calcium[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xe8,
-    0x0a,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_RareCandy[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x40,
-    0x44,
-    0xe0,
-    253,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_PPUp[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x20,
-    0xe0,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_Zinc[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xe4,
-    0x0a,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_PPMax[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0xf0,
-    0x05,
-    0x03,
-    0x02
-};
-
-const u8 gItemEffect_GuardSpec[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x80,
-    0x00,
-    0x60,
-    0x01,
-    0x01
-};
-
-const u8 gItemEffect_DireHit[] = {
-    0x20,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x60,
-    0x01,
-    0x01
-};
-
-const u8 gItemEffect_XAttack[] = {
-    0x01,
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x60,
-    0x01,
-    0x01
-};
-
-const u8 gItemEffect_XDefend[] = {
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x00,
-    0x60,
-    0x01,
-    0x01
-};
-
-const u8 gItemEffect_XSpeed[] = {
-    0x00,
-    0x01,
-    0x00,
-    0x00,
-    0x00,
-    0x60,
-    0x01,
-    0x01
-};
-
-const u8 gItemEffect_XAccuracy[] = {
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00,
-    0x60,
-    0x01,
-    0x01
-};
-
-const u8 gItemEffect_XSpecial[] = {
-    0x00,
-    0x00,
-    0x01,
-    0x00,
-    0x00,
-    0x60,
-    0x01,
-    0x01
-};
-
-const u8 gItemEffect_SunStone[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x80,
-    0x00
-};
-
-const u8 gItemEffect_MoonStone[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x80,
-    0x00
-};
-
-const u8 gItemEffect_FireStone[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x80,
-    0x00
-};
-
-const u8 gItemEffect_ThunderStone[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x80,
-    0x00
-};
-
-const u8 gItemEffect_WaterStone[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x80,
-    0x00
-};
-
-const u8 gItemEffect_LeafStone[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x80,
-    0x00
-};
-
-const u8 gItemEffect_CheriBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x02,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_ChestoBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x20,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_PechaBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x10,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_RawstBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x08,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_AspearBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_LeppaBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x18,
-    0x00,
-    0x0a
-};
-
-const u8 gItemEffect_OranBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    10
-};
-
-const u8 gItemEffect_PersimBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x01,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_LumBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x3f,
-    0x00,
-    0x00
-};
-
-const u8 gItemEffect_SitrusBerry[] = {
-    0x00,
-    0x00,
-    0x00,
-    0x00,
-    0x04,
-    0x00,
-    30
-};
-
-const u8 *const gItemEffectTable[] = {
+#ifndef GUARD_ITEM_EFFECTS_H
+#define GUARD_ITEM_EFFECTS_H
+
+const u8 gItemEffect_Potion[]       = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20};
+const u8 gItemEffect_Antidote[]     = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00};
+const u8 gItemEffect_BurnHeal[]     = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00};
+const u8 gItemEffect_IceHeal[]      = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
+const u8 gItemEffect_Awakening[]    = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
+const u8 gItemEffect_ParalyzeHeal[] = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00};
+const u8 gItemEffect_FullRestore[]  = {0x00, 0x00, 0x00, 0x3f, 0x04, 0x00, 0xff};
+const u8 gItemEffect_MaxPotion[]    = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0xff};
+const u8 gItemEffect_HyperPotion[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 200};
+const u8 gItemEffect_SuperPotion[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50};
+const u8 gItemEffect_FullHeal[]     = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
+const u8 gItemEffect_Revive[]       = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xfe};
+const u8 gItemEffect_MaxRevive[]    = {0x00, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff};
+const u8 gItemEffect_FreshWater[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 50};
+const u8 gItemEffect_SodaPop[]      = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 60};
+const u8 gItemEffect_Lemonade[]     = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 80};
+const u8 gItemEffect_MoomooMilk[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 100};
+const u8 gItemEffect_EnergyPowder[] = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 50, 0xfb, 0xfb, 0xf6};
+const u8 gItemEffect_EnergyRoot[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0xe0, 200, 0xf6, 0xf6, 0xf1};
+const u8 gItemEffect_HealPowder[]   = {0x00, 0x00, 0x00, 0x3f, 0x00, 0xe0, 0xfb, 0xfb, 0xf6};
+const u8 gItemEffect_RevivalHerb[]  = {0x00, 0x00, 0x00, 0x00, 0x44, 0xe0, 0xfe, 0xf1, 0xf1, 0xec};
+const u8 gItemEffect_Ether[]        = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a};
+const u8 gItemEffect_MaxEther[]     = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x7f};
+const u8 gItemEffect_Elixir[]       = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x0a};
+const u8 gItemEffect_MaxElixir[]    = {0x00, 0x00, 0x00, 0x00, 0x08, 0x00, 0x7f};
+const u8 gItemEffect_LavaCookie[]   = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
+const u8 gItemEffect_BlueFlute[]    = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
+const u8 gItemEffect_YellowFlute[]  = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
+const u8 gItemEffect_RedFlute[]     = {0x80, 0x00, 0x00, 0x00, 0x00, 0x00};
+const u8 gItemEffect_BerryJuice[]   = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 20};
+const u8 gItemEffect_SacredAsh[]    = {0x40, 0x00, 0x00, 0x00, 0x44, 0x00, 0xff};
+const u8 gItemEffect_HPUp[]         = {0x00, 0x00, 0x00, 0x00, 0x01, 0xe0, 0x0a, 0x05, 0x03, 0x02};
+const u8 gItemEffect_Protein[]      = {0x00, 0x00, 0x00, 0x00, 0x02, 0xe0, 0x0a, 0x05, 0x03, 0x02};
+const u8 gItemEffect_Iron[]         = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe1, 0x0a, 0x05, 0x03, 0x02};
+const u8 gItemEffect_Carbos[]       = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe2, 0x0a, 0x05, 0x03, 0x02};
+const u8 gItemEffect_Calcium[]      = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe8, 0x0a, 0x05, 0x03, 0x02};
+const u8 gItemEffect_RareCandy[]    = {0x00, 0x00, 0x00, 0x40, 0x44, 0xe0,  253, 0x05, 0x03, 0x02};
+const u8 gItemEffect_PPUp[]         = {0x00, 0x00, 0x00, 0x00, 0x20, 0xe0, 0x05, 0x03, 0x02};
+const u8 gItemEffect_Zinc[]         = {0x00, 0x00, 0x00, 0x00, 0x00, 0xe4, 0x0a, 0x05, 0x03, 0x02};
+const u8 gItemEffect_PPMax[]        = {0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x05, 0x03, 0x02};
+const u8 gItemEffect_GuardSpec[]    = {0x00, 0x00, 0x00, 0x80, 0x00, 0x60, 0x01, 0x01};
+const u8 gItemEffect_DireHit[]      = {0x20, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
+const u8 gItemEffect_XAttack[]      = {0x01, 0x00, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
+const u8 gItemEffect_XDefend[]      = {0x00, 0x10, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
+const u8 gItemEffect_XSpeed[]       = {0x00, 0x01, 0x00, 0x00, 0x00, 0x60, 0x01, 0x01};
+const u8 gItemEffect_XAccuracy[]    = {0x00, 0x00, 0x10, 0x00, 0x00, 0x60, 0x01, 0x01};
+const u8 gItemEffect_XSpecial[]     = {0x00, 0x00, 0x01, 0x00, 0x00, 0x60, 0x01, 0x01};
+const u8 gItemEffect_SunStone[]     = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
+const u8 gItemEffect_MoonStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
+const u8 gItemEffect_FireStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
+const u8 gItemEffect_ThunderStone[] = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
+const u8 gItemEffect_WaterStone[]   = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
+const u8 gItemEffect_LeafStone[]    = {0x00, 0x00, 0x00, 0x00, 0x80, 0x00};
+const u8 gItemEffect_CheriBerry[]   = {0x00, 0x00, 0x00, 0x02, 0x00, 0x00};
+const u8 gItemEffect_ChestoBerry[]  = {0x00, 0x00, 0x00, 0x20, 0x00, 0x00};
+const u8 gItemEffect_PechaBerry[]   = {0x00, 0x00, 0x00, 0x10, 0x00, 0x00};
+const u8 gItemEffect_RawstBerry[]   = {0x00, 0x00, 0x00, 0x08, 0x00, 0x00};
+const u8 gItemEffect_AspearBerry[]  = {0x00, 0x00, 0x00, 0x04, 0x00, 0x00};
+const u8 gItemEffect_LeppaBerry[]   = {0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x0a};
+const u8 gItemEffect_OranBerry[]    = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 10};
+const u8 gItemEffect_PersimBerry[]  = {0x00, 0x00, 0x00, 0x01, 0x00, 0x00};
+const u8 gItemEffect_LumBerry[]     = {0x00, 0x00, 0x00, 0x3f, 0x00, 0x00};
+const u8 gItemEffect_SitrusBerry[]  = {0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 30};
+
+const u8 *const gItemEffectTable[] =
+{
     gItemEffect_Potion,
     gItemEffect_Antidote,
     gItemEffect_BurnHeal,
@@ -821,4 +232,4 @@ const u8 *const gItemEffectTable[] = {
     NULL
 };
 
-#endif //POKERUBY_ITEM_EFFECTS_H
+#endif //GUARD_ITEM_EFFECTS_H