diff --git a/data/battle_anim_scripts.s b/data/battle_anim_scripts.s index 0d5ce89a8..f366d4426 100644 --- a/data/battle_anim_scripts.s +++ b/data/battle_anim_scripts.s @@ -10331,15 +10331,15 @@ General_SubstituteAppear: General_PokeblockThrow: createvisualtask sub_817345C, 2, 0 - createvisualtask sub_81732B0, 2 + createvisualtask AnimTask_LoadPokeblockGfx, 2 delay 0 waitplaysewithpan SE_W026, SOUND_PAN_ATTACKER, 22 - createsprite gBattleAnimSpriteTemplate_85E5338, ANIM_TARGET, 3, -18, 12, 0, 32 + createsprite gPokeblockSpriteTemplate, ANIM_TARGET, 3, -18, 12, 0, 32 delay 50 loopsewithpan SE_W039, SOUND_PAN_TARGET, 19, 2 createvisualtask AnimTask_SwayMon, 5, 1, 8, 1536, 2, ANIM_TARGET waitforvisualfinish - createvisualtask sub_81732E4, 2 + createvisualtask AnimTask_FreePokeblockGfx, 2 end General_ItemKnockoff: @@ -10516,7 +10516,7 @@ General_Hail: goto Move_HAIL General_LeechSeedDrain: - createvisualtask sub_817351C, 5 + createvisualtask AnimTask_GetBattlersFromArg, 5 delay 0 goto Move_ABSORB @@ -10535,7 +10535,7 @@ General_MonHit: General_ItemSteal: loadspritegfx ANIM_TAG_ITEM_BAG createvisualtask sub_8117F30, 2 - createvisualtask sub_8172ED0, 2 + createvisualtask AnimTask_TargetToEffectBattler, 2 delay 1 createsprite gItemStealSpriteTemplate, ANIM_ATTACKER, 2, 0, -5, 10, 2, -1 end @@ -10664,8 +10664,8 @@ General_WishHeal: end AnimScript_82D85A3: - createvisualtask sub_8172E9C, 2 - jumpreteq 1, AnimScript_82D85B4 + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2 + jumprettrue AnimScript_82D85B4 AnimScript_82D85B2: waitforvisualfinish return @@ -10675,8 +10675,8 @@ AnimScript_82D85B4: goto AnimScript_82D85B2 AnimScript_82D85C3: - createvisualtask sub_8172E9C, 2 - jumpreteq 1, AnimScript_82D85D4 + createvisualtask AnimTask_IsAttackerBehindSubstitute, 2 + jumprettrue AnimScript_82D85D4 AnimScript_82D85D2: waitforvisualfinish return diff --git a/data/battle_scripts_2.s b/data/battle_scripts_2.s index b74f557a7..7484cb66f 100644 --- a/data/battle_scripts_2.s +++ b/data/battle_scripts_2.s @@ -26,6 +26,21 @@ gBattlescriptsForBallThrow:: @ 82DBD08 .4byte BattleScript_BallThrow .4byte BattleScript_BallThrow .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow + .4byte BattleScript_BallThrow .align 2 gBattlescriptsForUsingItem:: @ 82DBD3C diff --git a/graphics/battle_anims/sprites/red_brick.png b/graphics/battle_anims/sprites/pokeblock.png similarity index 100% rename from graphics/battle_anims/sprites/red_brick.png rename to graphics/battle_anims/sprites/pokeblock.png diff --git a/graphics/interface/ball/particles2.png b/graphics/interface/ball/particles2.png new file mode 100644 index 000000000..9056c253c Binary files /dev/null and b/graphics/interface/ball/particles2.png differ diff --git a/graphics/items/icon_palettes/beast_ball.pal b/graphics/items/icon_palettes/beast_ball.pal new file mode 100644 index 000000000..371cd6904 --- /dev/null +++ b/graphics/items/icon_palettes/beast_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +90 57 246 +57 57 180 +90 90 255 +164 164 197 +57 98 255 +65 106 213 +65 172 255 +139 205 255 +74 82 82 +238 213 57 +189 156 98 +156 106 65 +0 0 0 +49 49 49 diff --git a/graphics/items/icon_palettes/cherish_ball.pal b/graphics/items/icon_palettes/cherish_ball.pal new file mode 100644 index 000000000..d0ef73747 --- /dev/null +++ b/graphics/items/icon_palettes/cherish_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +74 82 82 +205 57 32 +164 57 41 +222 65 49 +255 65 49 +255 115 106 +255 156 156 +255 255 255 +0 0 0 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dream_ball.pal b/graphics/items/icon_palettes/dream_ball.pal new file mode 100644 index 000000000..5782ed7e4 --- /dev/null +++ b/graphics/items/icon_palettes/dream_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +255 98 164 +197 123 156 +230 156 189 +255 131 189 +255 180 213 +255 213 238 +106 82 139 +131 98 197 +123 123 131 +74 82 82 +0 0 0 +49 49 49 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/dusk_ball.pal b/graphics/items/icon_palettes/dusk_ball.pal new file mode 100644 index 000000000..7b6bf1de7 --- /dev/null +++ b/graphics/items/icon_palettes/dusk_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +41 139 41 +65 172 65 +82 139 82 +98 213 57 +148 255 82 +123 115 41 +255 106 8 +156 57 0 +222 74 0 +189 32 0 +115 41 24 +0 0 0 +82 82 82 +49 49 49 diff --git a/graphics/items/icon_palettes/fast_ball.pal b/graphics/items/icon_palettes/fast_ball.pal new file mode 100644 index 000000000..22b9e6212 --- /dev/null +++ b/graphics/items/icon_palettes/fast_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +148 131 65 +246 205 57 +213 172 49 +238 139 65 +205 106 41 +255 180 131 +0 0 0 +49 49 49 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/friend_ball.pal b/graphics/items/icon_palettes/friend_ball.pal new file mode 100644 index 000000000..051f2e119 --- /dev/null +++ b/graphics/items/icon_palettes/friend_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +90 106 123 +74 82 82 +139 197 57 +189 230 131 +123 164 57 +246 222 16 +172 148 65 +197 90 74 +230 139 131 +0 0 0 +49 49 49 diff --git a/graphics/items/icon_palettes/heal_ball.pal b/graphics/items/icon_palettes/heal_ball.pal new file mode 100644 index 000000000..86f787665 --- /dev/null +++ b/graphics/items/icon_palettes/heal_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +246 139 180 +255 180 230 +255 106 213 +238 82 197 +213 16 172 +106 98 197 +123 148 205 +139 172 222 +90 139 205 +255 246 213 +230 180 115 +255 205 172 +0 0 0 +49 49 49 diff --git a/graphics/items/icon_palettes/heavy_ball.pal b/graphics/items/icon_palettes/heavy_ball.pal new file mode 100644 index 000000000..3a02d3d7d --- /dev/null +++ b/graphics/items/icon_palettes/heavy_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +82 123 222 +57 90 164 +131 172 238 +197 205 213 +90 106 123 +115 131 148 +148 164 180 +74 82 82 +0 0 0 +49 49 49 +0 0 0 diff --git a/graphics/items/icon_palettes/level_ball.pal b/graphics/items/icon_palettes/level_ball.pal new file mode 100644 index 000000000..0b8a16082 --- /dev/null +++ b/graphics/items/icon_palettes/level_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +255 222 189 +238 189 148 +156 98 57 +222 148 90 +180 148 123 +123 106 98 +222 74 57 +255 139 131 +0 0 0 +49 49 49 diff --git a/graphics/items/icon_palettes/love_ball.pal b/graphics/items/icon_palettes/love_ball.pal new file mode 100644 index 000000000..7c8a8f3c9 --- /dev/null +++ b/graphics/items/icon_palettes/love_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +246 164 205 +222 131 180 +255 197 230 +189 90 156 +139 82 123 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +0 0 0 +49 49 49 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/lure_ball.pal b/graphics/items/icon_palettes/lure_ball.pal new file mode 100644 index 000000000..f202c0888 --- /dev/null +++ b/graphics/items/icon_palettes/lure_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 90 106 +255 164 180 +156 131 180 +222 205 246 +164 164 197 +123 123 131 +74 115 139 +41 148 205 +74 180 222 +74 82 82 +255 197 82 +238 139 90 +0 0 0 +49 49 49 diff --git a/graphics/items/icon_palettes/moon_ball.pal b/graphics/items/icon_palettes/moon_ball.pal new file mode 100644 index 000000000..0f1f67178 --- /dev/null +++ b/graphics/items/icon_palettes/moon_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +98 115 148 +123 139 156 +74 197 238 +65 148 172 +156 255 255 +74 82 82 +189 172 106 +246 205 65 +255 230 164 +0 0 0 +49 49 49 diff --git a/graphics/items/icon_palettes/park_ball.pal b/graphics/items/icon_palettes/park_ball.pal new file mode 100644 index 000000000..5817b9997 --- /dev/null +++ b/graphics/items/icon_palettes/park_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +123 115 131 +164 164 197 +123 123 131 +32 123 222 +115 131 123 +213 213 205 +246 213 82 +255 230 139 +222 156 41 +255 139 49 +0 0 0 +49 49 49 +0 0 0 +0 0 0 diff --git a/graphics/items/icon_palettes/quick_ball.pal b/graphics/items/icon_palettes/quick_ball.pal new file mode 100644 index 000000000..ca7754aa2 --- /dev/null +++ b/graphics/items/icon_palettes/quick_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +106 106 115 +115 189 255 +41 139 213 +41 106 123 +189 255 255 +74 82 82 +189 222 180 +255 255 0 +255 255 213 +156 148 41 +205 189 41 +255 255 255 +0 0 0 +49 49 49 diff --git a/graphics/items/icon_palettes/sport_ball.pal b/graphics/items/icon_palettes/sport_ball.pal new file mode 100644 index 000000000..38c8fd8c8 --- /dev/null +++ b/graphics/items/icon_palettes/sport_ball.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +180 180 180 +255 255 255 +222 205 246 +164 164 197 +123 123 131 +74 82 82 +255 213 57 +255 148 57 +222 90 57 +156 74 57 +0 0 0 +49 49 49 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/graphics/items/icons/beast_ball.png b/graphics/items/icons/beast_ball.png new file mode 100644 index 000000000..3d25009fc Binary files /dev/null and b/graphics/items/icons/beast_ball.png differ diff --git a/graphics/items/icons/cherish_ball.png b/graphics/items/icons/cherish_ball.png new file mode 100644 index 000000000..7efdf22dc Binary files /dev/null and b/graphics/items/icons/cherish_ball.png differ diff --git a/graphics/items/icons/dream_ball.png b/graphics/items/icons/dream_ball.png new file mode 100644 index 000000000..e429add9e Binary files /dev/null and b/graphics/items/icons/dream_ball.png differ diff --git a/graphics/items/icons/dusk_ball.png b/graphics/items/icons/dusk_ball.png new file mode 100644 index 000000000..a723c095b Binary files /dev/null and b/graphics/items/icons/dusk_ball.png differ diff --git a/graphics/items/icons/fast_ball.png b/graphics/items/icons/fast_ball.png new file mode 100644 index 000000000..2eb8ddd02 Binary files /dev/null and b/graphics/items/icons/fast_ball.png differ diff --git a/graphics/items/icons/friend_ball.png b/graphics/items/icons/friend_ball.png new file mode 100644 index 000000000..7c2c8ce14 Binary files /dev/null and b/graphics/items/icons/friend_ball.png differ diff --git a/graphics/items/icons/heal_ball.png b/graphics/items/icons/heal_ball.png new file mode 100644 index 000000000..765c7326c Binary files /dev/null and b/graphics/items/icons/heal_ball.png differ diff --git a/graphics/items/icons/heavy_ball.png b/graphics/items/icons/heavy_ball.png new file mode 100644 index 000000000..c66678ebb Binary files /dev/null and b/graphics/items/icons/heavy_ball.png differ diff --git a/graphics/items/icons/level_ball.png b/graphics/items/icons/level_ball.png new file mode 100644 index 000000000..7943f8e85 Binary files /dev/null and b/graphics/items/icons/level_ball.png differ diff --git a/graphics/items/icons/love_ball.png b/graphics/items/icons/love_ball.png new file mode 100644 index 000000000..0040eb0de Binary files /dev/null and b/graphics/items/icons/love_ball.png differ diff --git a/graphics/items/icons/lure_ball.png b/graphics/items/icons/lure_ball.png new file mode 100644 index 000000000..765049c75 Binary files /dev/null and b/graphics/items/icons/lure_ball.png differ diff --git a/graphics/items/icons/moon_ball.png b/graphics/items/icons/moon_ball.png new file mode 100644 index 000000000..cc67522d4 Binary files /dev/null and b/graphics/items/icons/moon_ball.png differ diff --git a/graphics/items/icons/park_ball.png b/graphics/items/icons/park_ball.png new file mode 100644 index 000000000..c527ac1cc Binary files /dev/null and b/graphics/items/icons/park_ball.png differ diff --git a/graphics/items/icons/quick_ball.png b/graphics/items/icons/quick_ball.png new file mode 100644 index 000000000..6f39b934f Binary files /dev/null and b/graphics/items/icons/quick_ball.png differ diff --git a/graphics/items/icons/sport_ball.png b/graphics/items/icons/sport_ball.png new file mode 100644 index 000000000..20549f7d3 Binary files /dev/null and b/graphics/items/icons/sport_ball.png differ diff --git a/include/berry.h b/include/berry.h index e6da0517d..931fe4cae 100644 --- a/include/berry.h +++ b/include/berry.h @@ -36,12 +36,6 @@ enum BERRY_STAGE_SPARKLING = 0xFF, }; -#define NUM_BERRIES (LAST_BERRY_INDEX - FIRST_BERRY_INDEX) - -extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; -extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; -extern const u8 *const gBerryTreePaletteSlotTablePointers[]; - void ClearEnigmaBerries(void); void SetEnigmaBerry(u8 *src); bool32 IsEnigmaBerryValid(void); diff --git a/include/constants/battle_anim.h b/include/constants/battle_anim.h index 1209dfa19..0a023f0c2 100644 --- a/include/constants/battle_anim.h +++ b/include/constants/battle_anim.h @@ -276,7 +276,7 @@ #define ANIM_TAG_GREEN_SPIKE (ANIM_SPRITES_START + 266) #define ANIM_TAG_WHITE_CIRCLE_OF_LIGHT (ANIM_SPRITES_START + 267) #define ANIM_TAG_GLOWY_BLUE_ORB (ANIM_SPRITES_START + 268) -#define ANIM_TAG_RED_BRICK (ANIM_SPRITES_START + 269) +#define ANIM_TAG_POKEBLOCK (ANIM_SPRITES_START + 269) #define ANIM_TAG_WHITE_FEATHER (ANIM_SPRITES_START + 270) #define ANIM_TAG_SPARKLE_6 (ANIM_SPRITES_START + 271) #define ANIM_TAG_SPLASH (ANIM_SPRITES_START + 272) diff --git a/include/event_object_movement.h b/include/event_object_movement.h index 4f3f99cd1..93f73e635 100644 --- a/include/event_object_movement.h +++ b/include/event_object_movement.h @@ -64,6 +64,10 @@ extern const struct OamData gEventObjectBaseOam_32x32; extern const struct SpriteTemplate *const gFieldEffectObjectTemplatePointers[]; extern const u8 gReflectionEffectPaletteMap[]; +extern const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[]; +extern const struct SpriteFrameImage *const gBerryTreePicTablePointers[]; +extern const u8 *const gBerryTreePaletteSlotTablePointers[]; + void ResetEventObjects(void); u8 GetMoveDirectionAnimNum(u8); u8 GetEventObjectIdByLocalIdAndMap(u8, u8, u8); diff --git a/include/event_scripts.h b/include/event_scripts.h index da96d29d8..fc0b3cde0 100644 --- a/include/event_scripts.h +++ b/include/event_scripts.h @@ -18,6 +18,7 @@ extern const u8 EventScript_TryDoRematchBattle[]; extern const u8 SecretBase_EventScript_DollInteract[]; extern const u8 SecretBase_EventScript_CushionInteract[]; +extern const u8 BerryTreeScript[]; extern const u8 gTVBravoTrainerText00[]; extern const u8 gTVBravoTrainerText01[]; diff --git a/include/graphics.h b/include/graphics.h index dc6110857..f6119807b 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -3412,6 +3412,36 @@ extern const u32 gItemIcon_TimerBall[]; extern const u32 gItemIcon_LuxuryBall[]; extern const u32 gItemIconPalette_LuxuryBall[]; extern const u32 gItemIcon_PremierBall[]; +extern const u32 gItemIcon_LevelBall[]; +extern const u32 gItemIconPalette_LevelBall[]; +extern const u32 gItemIcon_LureBall[]; +extern const u32 gItemIconPalette_LureBall[]; +extern const u32 gItemIcon_MoonBall[]; +extern const u32 gItemIconPalette_MoonBall[]; +extern const u32 gItemIcon_FriendBall[]; +extern const u32 gItemIconPalette_FriendBall[]; +extern const u32 gItemIcon_LoveBall[]; +extern const u32 gItemIconPalette_LoveBall[]; +extern const u32 gItemIcon_HeavyBall[]; +extern const u32 gItemIconPalette_HeavyBall[]; +extern const u32 gItemIcon_FastBall[]; +extern const u32 gItemIconPalette_FastBall[]; +extern const u32 gItemIcon_SportBall[]; +extern const u32 gItemIconPalette_SportBall[]; +extern const u32 gItemIcon_DuskBall[]; +extern const u32 gItemIconPalette_DuskBall[]; +extern const u32 gItemIcon_QuickBall[]; +extern const u32 gItemIconPalette_QuickBall[]; +extern const u32 gItemIcon_HealBall[]; +extern const u32 gItemIconPalette_HealBall[]; +extern const u32 gItemIcon_CherishBall[]; +extern const u32 gItemIconPalette_CherishBall[]; +extern const u32 gItemIcon_ParkBall[]; +extern const u32 gItemIconPalette_ParkBall[]; +extern const u32 gItemIcon_DreamBall[]; +extern const u32 gItemIconPalette_DreamBall[]; +extern const u32 gItemIcon_BeastBall[]; +extern const u32 gItemIconPalette_BeastBall[]; // Medicine extern const u32 gItemIcon_Potion[]; extern const u32 gItemIconPalette_Potion[]; @@ -4682,7 +4712,7 @@ extern const u32 gBattleAnimSpriteGfx_IcicleSpear[]; extern const u32 gBattleAnimSpriteGfx_Hail[]; extern const u32 gBattleAnimSpriteGfx_GlowyRedOrb[]; extern const u32 gBattleAnimSpriteGfx_GreenSpike[]; -extern const u32 gBattleAnimSpriteGfx_RedBrick[]; +extern const u32 gBattleAnimSpriteGfx_Pokeblock[]; extern const u32 gBattleAnimSpriteGfx_WhiteFeather[]; extern const u32 gBattleAnimSpriteGfx_Sparkle6[]; extern const u32 gBattleAnimSpriteGfx_Splash[]; @@ -4968,7 +4998,7 @@ extern const u32 gBattleAnimSpritePal_GlowyGreenOrb[]; extern const u32 gBattleAnimSpritePal_GreenSpike[]; extern const u32 gBattleAnimSpritePal_WhiteCircleOfLight[]; extern const u32 gBattleAnimSpritePal_GlowyBlueOrb[]; -extern const u32 gBattleAnimSpritePal_RedBrick[]; +extern const u32 gBattleAnimSpritePal_Pokeblock[]; extern const u32 gBattleAnimSpritePal_WhiteFeather[]; extern const u32 gBattleAnimSpritePal_Sparkle6[]; extern const u32 gBattleAnimSpritePal_Splash[]; diff --git a/src/battle_anim.c b/src/battle_anim.c index b265bf7bc..3cac9f33e 100644 --- a/src/battle_anim.c +++ b/src/battle_anim.c @@ -1394,7 +1394,7 @@ const struct CompressedSpriteSheet gBattleAnimPicTable[] = {gBattleAnimSpriteGfx_GreenSpike, 0x0080, ANIM_TAG_GREEN_SPIKE}, {gBattleAnimSpriteGfx_CircleOfLight, 0x0800, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT}, {gBattleAnimSpriteGfx_GlowyRedOrb, 0x0020, ANIM_TAG_GLOWY_BLUE_ORB}, - {gBattleAnimSpriteGfx_RedBrick, 0x0080, ANIM_TAG_RED_BRICK}, + {gBattleAnimSpriteGfx_Pokeblock, 0x0080, ANIM_TAG_POKEBLOCK}, {gBattleAnimSpriteGfx_WhiteFeather, 0x0400, ANIM_TAG_WHITE_FEATHER}, {gBattleAnimSpriteGfx_Sparkle6, 0x0080, ANIM_TAG_SPARKLE_6}, {gBattleAnimSpriteGfx_Splash, 0x0800, ANIM_TAG_SPLASH}, @@ -1687,7 +1687,7 @@ const struct CompressedSpritePalette gBattleAnimPaletteTable[] = {gBattleAnimSpritePal_GreenSpike, ANIM_TAG_GREEN_SPIKE}, {gBattleAnimSpritePal_WhiteCircleOfLight, ANIM_TAG_WHITE_CIRCLE_OF_LIGHT}, {gBattleAnimSpritePal_GlowyBlueOrb, ANIM_TAG_GLOWY_BLUE_ORB}, - {gBattleAnimSpritePal_RedBrick, ANIM_TAG_RED_BRICK}, + {gBattleAnimSpritePal_Pokeblock, ANIM_TAG_POKEBLOCK}, {gBattleAnimSpritePal_WhiteFeather, ANIM_TAG_WHITE_FEATHER}, {gBattleAnimSpritePal_Sparkle6, ANIM_TAG_SPARKLE_6}, {gBattleAnimSpritePal_Splash, ANIM_TAG_SPLASH}, diff --git a/src/battle_anim_special.c b/src/battle_anim_special.c index ee37d199f..702c8582f 100755 --- a/src/battle_anim_special.c +++ b/src/battle_anim_special.c @@ -16,9 +16,10 @@ #include "task.h" #include "trig.h" #include "util.h" -#include "constants/rgb.h" #include "constants/items.h" +#include "constants/moves.h" #include "constants/songs.h" +#include "constants/rgb.h" // iwram int gUnknown_030062DC; @@ -103,39 +104,100 @@ static const struct BallCaptureSuccessStarData sBallCaptureSuccessStarData[] = }, }; -const struct CompressedSpriteSheet gBallOpenParticleSpritesheets[] = +#define TAG_PARTICLES_POKEBALL 65030 +#define TAG_PARTICLES_GREATBALL 65031 +#define TAG_PARTICLES_SAFARIBALL 65032 +#define TAG_PARTICLES_ULTRABALL 65033 +#define TAG_PARTICLES_MASTERBALL 65034 +#define TAG_PARTICLES_NETBALL 65035 +#define TAG_PARTICLES_DIVEBALL 65036 +#define TAG_PARTICLES_NESTBALL 65037 +#define TAG_PARTICLES_REPEATBALL 65038 +#define TAG_PARTICLES_TIMERBALL 65039 +#define TAG_PARTICLES_LUXURYBALL 65040 +#define TAG_PARTICLES_PREMIERBALL 65041 +#define TAG_PARTICLES_LEVELBALL 65042 +#define TAG_PARTICLES_LUREBALL 65043 +#define TAG_PARTICLES_MOONBALL 65044 +#define TAG_PARTICLES_FRIENDBALL 65045 +#define TAG_PARTICLES_LOVEBALL 65046 +#define TAG_PARTICLES_HEAVYBALL 65047 +#define TAG_PARTICLES_FASTBALL 65048 +#define TAG_PARTICLES_SPORTBALL 65049 +#define TAG_PARTICLES_DUSKBALL 65050 +#define TAG_PARTICLES_QUICKBALL 65051 +#define TAG_PARTICLES_HEALBALL 65052 +#define TAG_PARTICLES_CHERISHBALL 65053 +#define TAG_PARTICLES_PARKBALL 65054 +#define TAG_PARTICLES_DREAMBALL 65065 +#define TAG_PARTICLES_BEASTBALL 65056 + +static const u32 sNewParticlesGfx[] = INCBIN_U32("graphics/interface/ball/particles2.4bpp.lz"); +static const u32 sNewParticlesPal[] = INCBIN_U32("graphics/interface/ball/particles2.gbapal.lz"); + +const struct CompressedSpriteSheet gBallParticleSpritesheets[] = { - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6EC}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6ED}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6EE}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6EF}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F0}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F1}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F2}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F3}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F4}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F5}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F6}, - {gBattleAnimSpriteGfx_Particles, 0x100, 0xD6F7}, + [BALL_POKE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_POKEBALL}, + [BALL_GREAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_GREATBALL}, + [BALL_SAFARI] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SAFARIBALL}, + [BALL_ULTRA] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_ULTRABALL}, + [BALL_MASTER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_MASTERBALL}, + [BALL_NET] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NETBALL}, + [BALL_DIVE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DIVEBALL}, + [BALL_NEST] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_NESTBALL}, + [BALL_REPEAT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_REPEATBALL}, + [BALL_TIMER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_TIMERBALL}, + [BALL_LUXURY] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUXURYBALL}, + [BALL_PREMIER] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PREMIERBALL}, + [BALL_LEVEL] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_LEVELBALL}, + [BALL_LURE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LUREBALL}, + [BALL_MOON] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_MOONBALL}, + [BALL_FRIEND] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_FRIENDBALL}, + [BALL_LOVE] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_LOVEBALL}, + [BALL_HEAVY] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_HEAVYBALL}, + [BALL_FAST] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_FASTBALL}, + [BALL_SPORT] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_SPORTBALL}, + [BALL_DUSK] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_DUSKBALL}, + [BALL_QUICK] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_QUICKBALL}, + [BALL_HEAL] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_HEALBALL}, + [BALL_CHERISH] = {sNewParticlesGfx, 0x100, TAG_PARTICLES_CHERISHBALL}, + [BALL_PARK] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_PARKBALL}, + [BALL_DREAM] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_DREAMBALL}, + [BALL_BEAST] = {gBattleAnimSpriteGfx_Particles, 0x100, TAG_PARTICLES_BEASTBALL}, }; -const struct CompressedSpritePalette gBallOpenParticlePalettes[] = +const struct CompressedSpritePalette gBallParticlePalettes[] = { - {gBattleAnimSpritePal_CircleImpact, 0xD6EC}, - {gBattleAnimSpritePal_CircleImpact, 0xD6ED}, - {gBattleAnimSpritePal_CircleImpact, 0xD6EE}, - {gBattleAnimSpritePal_CircleImpact, 0xD6EF}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F0}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F1}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F2}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F3}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F4}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F5}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F6}, - {gBattleAnimSpritePal_CircleImpact, 0xD6F7}, + [BALL_POKE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_POKEBALL}, + [BALL_GREAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_GREATBALL}, + [BALL_SAFARI] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SAFARIBALL}, + [BALL_ULTRA] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_ULTRABALL}, + [BALL_MASTER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_MASTERBALL}, + [BALL_NET] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NETBALL}, + [BALL_DIVE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DIVEBALL}, + [BALL_NEST] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_NESTBALL}, + [BALL_REPEAT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_REPEATBALL}, + [BALL_TIMER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_TIMERBALL}, + [BALL_LUXURY] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUXURYBALL}, + [BALL_PREMIER] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PREMIERBALL}, + [BALL_LEVEL] = {sNewParticlesPal, TAG_PARTICLES_LEVELBALL}, + [BALL_LURE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LUREBALL}, + [BALL_MOON] = {sNewParticlesPal, TAG_PARTICLES_MOONBALL}, + [BALL_FRIEND] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_FRIENDBALL}, + [BALL_LOVE] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_LOVEBALL}, + [BALL_HEAVY] = {sNewParticlesPal, TAG_PARTICLES_HEAVYBALL}, + [BALL_FAST] = {sNewParticlesPal, TAG_PARTICLES_FASTBALL}, + [BALL_SPORT] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_SPORTBALL}, + [BALL_DUSK] = {sNewParticlesPal, TAG_PARTICLES_DUSKBALL}, + [BALL_QUICK] = {sNewParticlesPal, TAG_PARTICLES_QUICKBALL}, + [BALL_HEAL] = {sNewParticlesPal, TAG_PARTICLES_HEALBALL}, + [BALL_CHERISH] = {sNewParticlesPal, TAG_PARTICLES_CHERISHBALL}, + [BALL_PARK] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_PARKBALL}, + [BALL_DREAM] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_DREAMBALL}, + [BALL_BEAST] = {gBattleAnimSpritePal_CircleImpact, TAG_PARTICLES_BEASTBALL}, }; -const union AnimCmd gUnknown_085E5154[] = +const union AnimCmd gAnim_RegularBall[] = { ANIMCMD_FRAME(0, 1), ANIMCMD_FRAME(1, 1), @@ -146,219 +208,396 @@ const union AnimCmd gUnknown_085E5154[] = ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_085E5170[] = +const union AnimCmd gAnim_MasterBall[] = { ANIMCMD_FRAME(3, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_085E5178[] = +const union AnimCmd gAnim_NetDiveBall[] = { ANIMCMD_FRAME(4, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_085E5180[] = +const union AnimCmd gAnim_NestBall[] = { ANIMCMD_FRAME(5, 1), ANIMCMD_END, }; -const union AnimCmd gUnknown_085E5188[] = +const union AnimCmd gAnim_LuxuryPremierBall[] = { ANIMCMD_FRAME(6, 4), ANIMCMD_FRAME(7, 4), ANIMCMD_JUMP(0), }; -const union AnimCmd gUnknown_085E5194[] = +const union AnimCmd gAnim_UltraRepeatTimerBall[] = { ANIMCMD_FRAME(7, 4), ANIMCMD_END, }; -const union AnimCmd *const gUnknown_085E519C[] = +const union AnimCmd *const gAnims_BallParticles[] = { - gUnknown_085E5154, - gUnknown_085E5170, - gUnknown_085E5178, - gUnknown_085E5180, - gUnknown_085E5188, - gUnknown_085E5194, + gAnim_RegularBall, + gAnim_MasterBall, + gAnim_NetDiveBall, + gAnim_NestBall, + gAnim_LuxuryPremierBall, + gAnim_UltraRepeatTimerBall, }; -const u8 gBallOpenParticleAnimNums[] = +const u8 gBallParticleAnimNums[] = { - 0, - 0, - 0, - 5, - 1, - 2, - 2, - 3, - 5, - 5, - 4, - 4, + [BALL_POKE] = 0, + [BALL_GREAT] = 0, + [BALL_SAFARI] = 0, + [BALL_ULTRA] = 5, + [BALL_MASTER] = 1, + [BALL_NET] = 2, + [BALL_DIVE] = 2, + [BALL_NEST] = 3, + [BALL_REPEAT] = 5, + [BALL_TIMER] = 5, + [BALL_LUXURY] = 4, + [BALL_PREMIER] = 4, + + [BALL_LEVEL] = 5, + [BALL_LURE] = 2, + [BALL_MOON] = 4, + [BALL_FRIEND] = 3, + [BALL_LOVE] = 3, + [BALL_HEAVY] = 0, + [BALL_FAST] = 4, + [BALL_SPORT] = 0, + [BALL_DUSK] = 2, + [BALL_QUICK] = 4, + [BALL_HEAL] = 0, + [BALL_CHERISH] = 0, + [BALL_PARK] = 5, + [BALL_DREAM] = 5, + [BALL_BEAST] = 5, }; -const TaskFunc gBallOpenParticleAnimationFuncs[] = +const TaskFunc gBallParticleAnimationFuncs[] = { - PokeBallOpenParticleAnimation, - GreatBallOpenParticleAnimation, - SafariBallOpenParticleAnimation, - UltraBallOpenParticleAnimation, - MasterBallOpenParticleAnimation, - SafariBallOpenParticleAnimation, - DiveBallOpenParticleAnimation, - UltraBallOpenParticleAnimation, - RepeatBallOpenParticleAnimation, - TimerBallOpenParticleAnimation, - GreatBallOpenParticleAnimation, - PremierBallOpenParticleAnimation, + [BALL_POKE] = PokeBallOpenParticleAnimation, + [BALL_GREAT] = GreatBallOpenParticleAnimation, + [BALL_SAFARI] = SafariBallOpenParticleAnimation, + [BALL_ULTRA] = UltraBallOpenParticleAnimation, + [BALL_MASTER] = MasterBallOpenParticleAnimation, + [BALL_NET] = SafariBallOpenParticleAnimation, + [BALL_DIVE] = DiveBallOpenParticleAnimation, + [BALL_NEST] = UltraBallOpenParticleAnimation, + [BALL_REPEAT] = RepeatBallOpenParticleAnimation, + [BALL_TIMER] = TimerBallOpenParticleAnimation, + [BALL_LUXURY] = GreatBallOpenParticleAnimation, + [BALL_PREMIER] = PremierBallOpenParticleAnimation, + + // Todo: assign and possibly create different particles + [BALL_LEVEL] = SafariBallOpenParticleAnimation, + [BALL_LURE] = GreatBallOpenParticleAnimation, + [BALL_MOON] = UltraBallOpenParticleAnimation, + [BALL_FRIEND] = UltraBallOpenParticleAnimation, + [BALL_LOVE] = GreatBallOpenParticleAnimation, + [BALL_HEAVY] = GreatBallOpenParticleAnimation, + [BALL_FAST] = GreatBallOpenParticleAnimation, + [BALL_SPORT] = UltraBallOpenParticleAnimation, + [BALL_DUSK] = UltraBallOpenParticleAnimation, + [BALL_QUICK] = UltraBallOpenParticleAnimation, + [BALL_HEAL] = PokeBallOpenParticleAnimation, + [BALL_CHERISH] = MasterBallOpenParticleAnimation, + [BALL_PARK] = UltraBallOpenParticleAnimation, + [BALL_DREAM] = UltraBallOpenParticleAnimation, + [BALL_BEAST] = UltraBallOpenParticleAnimation }; -const struct SpriteTemplate gUnknown_085E51F0[] = +const struct SpriteTemplate gBallParticlesSpriteTemplates[] = { { - .tileTag = 55020, - .paletteTag = 55020, + .tileTag = TAG_PARTICLES_POKEBALL, + .paletteTag = TAG_PARTICLES_POKEBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55021, - .paletteTag = 55021, + .tileTag = TAG_PARTICLES_GREATBALL, + .paletteTag = TAG_PARTICLES_GREATBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55022, - .paletteTag = 55022, + .tileTag = TAG_PARTICLES_SAFARIBALL, + .paletteTag = TAG_PARTICLES_SAFARIBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55023, - .paletteTag = 55023, + .tileTag = TAG_PARTICLES_ULTRABALL, + .paletteTag = TAG_PARTICLES_ULTRABALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55024, - .paletteTag = 55024, + .tileTag = TAG_PARTICLES_MASTERBALL, + .paletteTag = TAG_PARTICLES_MASTERBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55025, - .paletteTag = 55025, + .tileTag = TAG_PARTICLES_NETBALL, + .paletteTag = TAG_PARTICLES_NETBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55026, - .paletteTag = 55026, + .tileTag = TAG_PARTICLES_DIVEBALL, + .paletteTag = TAG_PARTICLES_DIVEBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55027, - .paletteTag = 55027, + .tileTag = TAG_PARTICLES_NESTBALL, + .paletteTag = TAG_PARTICLES_NESTBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55028, - .paletteTag = 55028, + .tileTag = TAG_PARTICLES_REPEATBALL, + .paletteTag = TAG_PARTICLES_REPEATBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55029, - .paletteTag = 55029, + .tileTag = TAG_PARTICLES_TIMERBALL, + .paletteTag = TAG_PARTICLES_TIMERBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55030, - .paletteTag = 55030, + .tileTag = TAG_PARTICLES_LUXURYBALL, + .paletteTag = TAG_PARTICLES_LUXURYBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, { - .tileTag = 55031, - .paletteTag = 55031, + .tileTag = TAG_PARTICLES_PREMIERBALL, + .paletteTag = TAG_PARTICLES_PREMIERBALL, .oam = &gUnknown_08524904, - .anims = gUnknown_085E519C, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_LEVELBALL, + .paletteTag = TAG_PARTICLES_LEVELBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_LUREBALL, + .paletteTag = TAG_PARTICLES_LUREBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_MOONBALL, + .paletteTag = TAG_PARTICLES_MOONBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_FRIENDBALL, + .paletteTag = TAG_PARTICLES_FRIENDBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_LOVEBALL, + .paletteTag = TAG_PARTICLES_LOVEBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_HEAVYBALL, + .paletteTag = TAG_PARTICLES_HEAVYBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_FASTBALL, + .paletteTag = TAG_PARTICLES_FASTBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_SPORTBALL, + .paletteTag = TAG_PARTICLES_SPORTBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_DUSKBALL, + .paletteTag = TAG_PARTICLES_DUSKBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_QUICKBALL, + .paletteTag = TAG_PARTICLES_QUICKBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_HEALBALL, + .paletteTag = TAG_PARTICLES_HEALBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_CHERISHBALL, + .paletteTag = TAG_PARTICLES_CHERISHBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_PARKBALL, + .paletteTag = TAG_PARTICLES_PARKBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_DREAMBALL, + .paletteTag = TAG_PARTICLES_DREAMBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, + .images = NULL, + .affineAnims = gDummySpriteAffineAnimTable, + .callback = SpriteCallbackDummy, + }, + { + .tileTag = TAG_PARTICLES_BEASTBALL, + .paletteTag = TAG_PARTICLES_BEASTBALL, + .oam = &gUnknown_08524904, + .anims = gAnims_BallParticles, .images = NULL, .affineAnims = gDummySpriteAffineAnimTable, .callback = SpriteCallbackDummy, }, }; -const u16 gUnknown_085E5310[] = +const u16 gBallOpenFadeColors[] = { - RGB(31, 22, 30), - RGB(16, 23, 30), - RGB(23, 30, 20), - RGB(31, 31, 15), - RGB(23, 20, 28), - RGB(21, 31, 25), - RGB(12, 25, 30), - RGB(30, 27, 10), - RGB(31, 24, 16), - RGB(29, 30, 30), - RGB(31, 17, 10), - RGB(31, 9, 10), - RGB(0, 0, 0), - RGB(1, 16, 0), - RGB(3, 0, 1), - RGB(1, 8, 0), - RGB(0, 8, 0), - RGB(3, 8, 1), - RGB(6, 8, 1), - RGB(4, 0, 0), + [BALL_POKE] = RGB(31, 22, 30), + [BALL_GREAT] = RGB(16, 23, 30), + [BALL_SAFARI] = RGB(23, 30, 20), + [BALL_ULTRA] = RGB(31, 31, 15), + [BALL_MASTER] = RGB(23, 20, 28), + [BALL_NET] = RGB(21, 31, 25), + [BALL_DIVE] = RGB(12, 25, 30), + [BALL_NEST] = RGB(30, 27, 10), + [BALL_REPEAT] = RGB(31, 24, 16), + [BALL_TIMER] = RGB(29, 30, 30), + [BALL_LUXURY] = RGB(31, 17, 10), + [BALL_PREMIER] = RGB(31, 9, 10), + + // Todo, assign different colors + [BALL_LEVEL] = RGB(24, 4, 4), + [BALL_LURE] = RGB(9, 22, 27), + [BALL_MOON] = RGB(30, 25, 8), + [BALL_FRIEND] = RGB(17, 24, 7), + [BALL_LOVE] = RGB(31, 19, 26), + [BALL_HEAVY] = RGB(7, 11, 20), + [BALL_FAST] = RGB(29, 17, 8), + [BALL_SPORT] = RGB(31, 31, 15), + [BALL_DUSK] = RGB(7, 1, 13), + [BALL_QUICK] = RGB(16, 25, 30), + [BALL_HEAL] = RGB(31, 23, 27), + [BALL_CHERISH] = RGB(25, 4, 3), + [BALL_PARK] = RGB(31, 31, 15), + [BALL_DREAM] = RGB(31, 31, 15), + [BALL_BEAST] = RGB(31, 31, 15), }; -const struct SpriteTemplate gBattleAnimSpriteTemplate_85E5338 = +const struct SpriteTemplate gPokeblockSpriteTemplate = { - .tileTag = ANIM_TAG_RED_BRICK, - .paletteTag = ANIM_TAG_RED_BRICK, + .tileTag = ANIM_TAG_POKEBLOCK, + .paletteTag = ANIM_TAG_POKEBLOCK, .oam = &gUnknown_0852490C, .anims = gDummySpriteAnimTable, .images = NULL, @@ -675,9 +914,9 @@ void sub_8170D24(u8 taskId) void AnimTask_IsBallBlockedByTrainer(u8 taskId) { if (gBattleSpritesDataPtr->animationData->ballThrowCaseId == BALL_TRAINER_BLOCK) - gBattleAnimArgs[7] = -1; + gBattleAnimArgs[ARG_RET_ID] = -1; else - gBattleAnimArgs[7] = 0; + gBattleAnimArgs[ARG_RET_ID] = 0; DestroyAnimVisualTask(taskId); } @@ -687,30 +926,61 @@ u8 ItemIdToBallId(u16 ballItem) switch (ballItem) { case ITEM_MASTER_BALL: - return 4; + return BALL_MASTER; case ITEM_ULTRA_BALL: - return 3; + return BALL_ULTRA; case ITEM_GREAT_BALL: - return 1; + return BALL_GREAT; case ITEM_SAFARI_BALL: - return 2; + return BALL_SAFARI; case ITEM_NET_BALL: - return 5; + return BALL_NET; case ITEM_DIVE_BALL: - return 6; + return BALL_DIVE; case ITEM_NEST_BALL: - return 7; + return BALL_NEST; case ITEM_REPEAT_BALL: - return 8; + return BALL_REPEAT; case ITEM_TIMER_BALL: - return 9; + return BALL_TIMER; case ITEM_LUXURY_BALL: - return 10; + return BALL_LUXURY; case ITEM_PREMIER_BALL: - return 11; + return BALL_PREMIER; case ITEM_POKE_BALL: + return BALL_POKE; + case ITEM_LEVEL_BALL: + return BALL_LEVEL; + case ITEM_LURE_BALL: + return BALL_LURE; + case ITEM_MOON_BALL: + return BALL_MOON; + case ITEM_FRIEND_BALL: + return BALL_FRIEND; + case ITEM_LOVE_BALL: + return BALL_LOVE; + case ITEM_HEAVY_BALL: + return BALL_HEAVY; + case ITEM_FAST_BALL: + return BALL_FAST; + case ITEM_SPORT_BALL: + return BALL_SPORT; + case ITEM_DUSK_BALL: + return BALL_DUSK; + case ITEM_QUICK_BALL: + return BALL_QUICK; + case ITEM_HEAL_BALL: + return BALL_HEAL; + case ITEM_CHERISH_BALL: + return BALL_CHERISH; + case ITEM_PARK_BALL: + return BALL_PARK; + case ITEM_DREAM_BALL: + return BALL_DREAM; + case ITEM_BEAST_BALL: + return BALL_BEAST; default: - return 0; + return BALL_POKE; } } @@ -804,7 +1074,6 @@ static void sub_8171134(struct Sprite *sprite) { int i; u8 ballId; - int ballId2; // extra var needed to match if (TranslateAnimHorizontalArc(sprite)) { @@ -825,15 +1094,15 @@ static void sub_8171134(struct Sprite *sprite) sprite->data[5] = 0; sprite->callback = sub_81711E8; - ballId = ItemIdToBallId(gLastUsedItem); - ballId2 = ballId; - if (ballId2 > 11) - return; - if (ballId2 < 0) - return; - AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); - LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId); + ballId = ItemIdToBallId(gLastUsedItem); + switch (ballId) + { + case 0 ... POKEBALL_COUNT - 1: + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); + LaunchBallFadeMonTask(0, gBattleAnimTarget, 14, ballId); + break; + } } } } @@ -1259,7 +1528,7 @@ static void sub_81719EC(struct Sprite *sprite) sub_8171D60(4); for (i = 0; i < 3; i++) { - u8 spriteId = CreateSprite(&gUnknown_085E51F0[4], sprite->pos1.x, sprite->pos1.y, subpriority); + u8 spriteId = CreateSprite(&gBallParticlesSpriteTemplates[4], sprite->pos1.x, sprite->pos1.y, subpriority); if (spriteId != MAX_SPRITES) { gSprites[spriteId].data[0] = 24; @@ -1268,7 +1537,7 @@ static void sub_81719EC(struct Sprite *sprite) gSprites[spriteId].data[5] = sBallCaptureSuccessStarData[i].unk2; InitAnimArcTranslation(&gSprites[spriteId]); gSprites[spriteId].callback = sub_8171AAC; - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[4]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[4]); } } } @@ -1280,28 +1549,23 @@ static void sub_8171AAC(struct Sprite *sprite) DestroySprite(sprite); } -// fakematching. I think the return type of ItemIdToBallId() -// is wrong because of the weird required casting. static void sub_8171AE4(struct Sprite *sprite) { u8 ballId; - int ballId2; // extra var needed to match StartSpriteAnim(sprite, 1); StartSpriteAffineAnim(sprite, 0); sprite->callback = sub_8171BAC; ballId = ItemIdToBallId(gLastUsedItem); - ballId2 = ballId; - if (ballId2 > 11) - goto LABEL; - if (ballId2 < 0) - goto LABEL; + switch (ballId) + { + case 0 ... POKEBALL_COUNT - 1: + AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); + LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId); + break; + } - AnimateBallOpenParticles(sprite->pos1.x, sprite->pos1.y - 5, 1, 28, ballId); - LaunchBallFadeMonTask(1, gBattleAnimTarget, 14, ballId); - - LABEL: gSprites[gBattlerSpriteIds[gBattleAnimTarget]].invisible = 0; StartSpriteAffineAnim(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]], 1); AnimateSprite(&gSprites[gBattlerSpriteIds[gBattleAnimTarget]]); @@ -1374,10 +1638,10 @@ static void sub_8171D60(u8 ballId) { u8 taskId; - if (GetSpriteTileStartByTag(gBallOpenParticleSpritesheets[ballId].tag) == 0xFFFF) + if (GetSpriteTileStartByTag(gBallParticleSpritesheets[ballId].tag) == 0xFFFF) { - LoadCompressedSpriteSheetUsingHeap(&gBallOpenParticleSpritesheets[ballId]); - LoadCompressedSpritePaletteUsingHeap(&gBallOpenParticlePalettes[ballId]); + LoadCompressedSpriteSheetUsingHeap(&gBallParticleSpritesheets[ballId]); + LoadCompressedSpritePaletteUsingHeap(&gBallParticlePalettes[ballId]); } } @@ -1386,7 +1650,7 @@ u8 AnimateBallOpenParticles(u8 x, u8 y, u8 priority, u8 subpriority, u8 ballId) u8 taskId; sub_8171D60(ballId); - taskId = CreateTask(gBallOpenParticleAnimationFuncs[ballId], 5); + taskId = CreateTask(gBallParticleAnimationFuncs[ballId], 5); gTasks[taskId].data[1] = x; gTasks[taskId].data[2] = y; gTasks[taskId].data[3] = priority; @@ -1419,11 +1683,11 @@ static void PokeBallOpenParticleAnimation(u8 taskId) priority = gTasks[taskId].data[3]; subpriority = gTasks[taskId].data[4]; - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = PokeBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; @@ -1478,11 +1742,11 @@ static void TimerBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1512,11 +1776,11 @@ static void DiveBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1547,11 +1811,11 @@ static void SafariBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1582,11 +1846,11 @@ static void UltraBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 10; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 25; @@ -1623,11 +1887,11 @@ static void GreatBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1671,13 +1935,13 @@ static void RepeatBallOpenParticleAnimation(u8 taskId) priority = gTasks[taskId].data[3]; subpriority = gTasks[taskId].data[4]; - for (i = 0; i < 12; i++) + for (i = 0; i < POKEBALL_COUNT; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = RepeatBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 21; @@ -1717,11 +1981,11 @@ static void MasterBallOpenParticleAnimation(u8 taskId) { for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = FanOutBallOpenParticles_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1761,11 +2025,11 @@ static void PremierBallOpenParticleAnimation(u8 taskId) for (i = 0; i < 8; i++) { - spriteId = CreateSprite(&gUnknown_085E51F0[ballId], x, y, subpriority); + spriteId = CreateSprite(&gBallParticlesSpriteTemplates[ballId], x, y, subpriority); if (spriteId != MAX_SPRITES) { sub_8171E20(); - StartSpriteAnim(&gSprites[spriteId], gBallOpenParticleAnimNums[ballId]); + StartSpriteAnim(&gSprites[spriteId], gBallParticleAnimNums[ballId]); gSprites[spriteId].callback = PremierBallOpenParticleAnimation_Step1; gSprites[spriteId].oam.priority = priority; gSprites[spriteId].data[0] = i * 32; @@ -1792,12 +2056,10 @@ static void PremierBallOpenParticleAnimation_Step1(struct Sprite *sprite) static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) { int i, j; - int temp; if (!gMain.inBattle) { - temp = sprite->data[7]; // temp var needed to match - if (temp == 1) + if (sprite->data[7] == 1) DestroySpriteAndFreeResources(sprite); else DestroySprite(sprite); @@ -1807,18 +2069,18 @@ static void DestroyBallOpenAnimationParticle(struct Sprite *sprite) gBattleSpritesDataPtr->animationData->field_A--; if (gBattleSpritesDataPtr->animationData->field_A == 0) { - for (i = 0; i < 12; i++) + for (i = 0; i < POKEBALL_COUNT; i++) { - if (FuncIsActiveTask(gBallOpenParticleAnimationFuncs[i]) == TRUE) + if (FuncIsActiveTask(gBallParticleAnimationFuncs[i]) == TRUE) break; } - if (i == 12) + if (i == POKEBALL_COUNT) { - for (j = 0; j < 12; j++) + for (j = 0; j < POKEBALL_COUNT; j++) { - FreeSpriteTilesByTag(gBallOpenParticleSpritesheets[j].tag); - FreeSpritePaletteByTag(gBallOpenParticlePalettes[j].tag); + FreeSpriteTilesByTag(gBallParticleSpritesheets[j].tag); + FreeSpritePaletteByTag(gBallParticlePalettes[j].tag); } } @@ -1843,12 +2105,12 @@ u8 LaunchBallFadeMonTask(u8 unfadeLater, u8 battler, u32 selectedPalettes, u8 ba if (!unfadeLater) { - BlendPalette(battler * 16 + 0x100, 16, 0, gUnknown_085E5310[ballId]); + BlendPalette(battler * 16 + 0x100, 16, 0, gBallOpenFadeColors[ballId]); gTasks[taskId].data[1] = 1; } else { - BlendPalette(battler * 16 + 0x100, 16, 16, gUnknown_085E5310[ballId]); + BlendPalette(battler * 16 + 0x100, 16, 16, gBallOpenFadeColors[ballId]); gTasks[taskId].data[0] = 16; gTasks[taskId].data[1] = -1; gTasks[taskId].func = sub_8172B40; @@ -1864,7 +2126,7 @@ static void sub_8172AB0(u8 taskId) if (gTasks[taskId].data[2] <= 16) { - BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_085E5310[ballId]); + BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]); gTasks[taskId].data[0] += gTasks[taskId].data[1]; gTasks[taskId].data[2]++; } @@ -1892,7 +2154,7 @@ static void sub_8172B90(u8 taskId) if (gTasks[taskId].data[2] <= 16) { - BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gUnknown_085E5310[ballId]); + BlendPalette(gTasks[taskId].data[3] * 16 + 0x100, 16, gTasks[taskId].data[0], gBallOpenFadeColors[ballId]); gTasks[taskId].data[0] += gTasks[taskId].data[1]; gTasks[taskId].data[2]++; } @@ -1906,9 +2168,8 @@ void sub_8172BF0(u8 taskId) { u8 spriteId; u32 x; - u32 done; + u32 done = FALSE; - done = FALSE; spriteId = gBattlerSpriteIds[gBattleAnimAttacker]; switch (gTasks[taskId].data[10]) { @@ -1942,8 +2203,7 @@ void sub_8172BF0(u8 taskId) if (gSprites[spriteId].pos2.x <= 0) { gSprites[spriteId].pos2.x = 0; - // done = FALSE; // fakematching--can't get the tail merge correct - goto DONE; + done = TRUE; } } else @@ -1956,10 +2216,8 @@ void sub_8172BF0(u8 taskId) } if (done) - { - DONE: DestroyAnimVisualTask(taskId); - } + break; } } @@ -1998,13 +2256,13 @@ void sub_8172D98(u8 taskId) } } -void sub_8172E9C(u8 taskId) +void AnimTask_IsAttackerBehindSubstitute(u8 taskId) { - gBattleAnimArgs[7] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].behindSubstitute; + gBattleAnimArgs[ARG_RET_ID] = gBattleSpritesDataPtr->battlerData[gBattleAnimAttacker].behindSubstitute; DestroyAnimVisualTask(taskId); } -void sub_8172ED0(u8 taskId) +void AnimTask_TargetToEffectBattler(u8 taskId) { gBattleAnimTarget = gEffectBattler; DestroyAnimVisualTask(taskId); @@ -2030,10 +2288,10 @@ void sub_8172EF0(u8 battler, struct Pokemon *mon) if (isShiny) { - if (GetSpriteTileStartByTag(0x27F9) == 0xFFFF) + if (GetSpriteTileStartByTag(ANIM_TAG_GOLD_STARS) == 0xFFFF) { - LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[233]); - LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[233]); + LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_GOLD_STARS - ANIM_SPRITES_START]); + LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_GOLD_STARS - ANIM_SPRITES_START]); } taskId1 = CreateTask(sub_8172FEC, 10); @@ -2103,7 +2361,7 @@ static void sub_8172FEC(u8 taskId) if (gTasks[taskId].data[11] == 0) { if (GetBattlerSide(battler) == B_SIDE_PLAYER) - pan = 192; + pan = -64; else pan = 63; @@ -2169,20 +2427,20 @@ static void sub_8173250(struct Sprite *sprite) } } -void sub_81732B0(u8 taskId) +void AnimTask_LoadPokeblockGfx(u8 taskId) { u8 paletteIndex; - LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[269]); - LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[269]); - paletteIndex = IndexOfSpritePaletteTag(0x281D); // unused + LoadCompressedSpriteSheetUsingHeap(&gBattleAnimPicTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]); + LoadCompressedSpritePaletteUsingHeap(&gBattleAnimPaletteTable[ANIM_TAG_POKEBLOCK - ANIM_SPRITES_START]); + paletteIndex = IndexOfSpritePaletteTag(ANIM_TAG_POKEBLOCK); // unused DestroyAnimVisualTask(taskId); } -void sub_81732E4(u8 taskId) +void AnimTask_FreePokeblockGfx(u8 taskId) { - FreeSpriteTilesByTag(0x281D); - FreeSpritePaletteByTag(0x281D); + FreeSpriteTilesByTag(ANIM_TAG_POKEBLOCK); + FreeSpritePaletteByTag(ANIM_TAG_POKEBLOCK); DestroyAnimVisualTask(taskId); } @@ -2245,21 +2503,21 @@ void sub_817345C(u8 taskId) void AnimTask_GetTrappedMoveAnimId(u8 taskId) { - if (gBattleSpritesDataPtr->animationData->animArg == 83) - gBattleAnimArgs[0] = 1; - else if (gBattleSpritesDataPtr->animationData->animArg == 250) - gBattleAnimArgs[0] = 2; - else if (gBattleSpritesDataPtr->animationData->animArg == 128) - gBattleAnimArgs[0] = 3; - else if (gBattleSpritesDataPtr->animationData->animArg == 328) - gBattleAnimArgs[0] = 4; + if (gBattleSpritesDataPtr->animationData->animArg == MOVE_FIRE_SPIN) + gBattleAnimArgs[0] = TRAP_ANIM_FIRE_SPIN; + else if (gBattleSpritesDataPtr->animationData->animArg == MOVE_WHIRLPOOL) + gBattleAnimArgs[0] = TRAP_ANIM_WHIRLPOOL; + else if (gBattleSpritesDataPtr->animationData->animArg == MOVE_CLAMP) + gBattleAnimArgs[0] = TRAP_ANIM_CLAMP; + else if (gBattleSpritesDataPtr->animationData->animArg == MOVE_SAND_TOMB) + gBattleAnimArgs[0] = TRAP_ANIM_SAND_TOMB; else - gBattleAnimArgs[0] = 0; + gBattleAnimArgs[0] = TRAP_ANIM_BIND; DestroyAnimVisualTask(taskId); } -void sub_817351C(u8 taskId) +void AnimTask_GetBattlersFromArg(u8 taskId) { gBattleAnimAttacker = gBattleSpritesDataPtr->animationData->animArg; gBattleAnimTarget = gBattleSpritesDataPtr->animationData->animArg >> 8; diff --git a/src/berry.c b/src/berry.c index cbac06a3d..49acb7d10 100644 --- a/src/berry.c +++ b/src/berry.c @@ -1,6 +1,8 @@ #include "global.h" #include "berry.h" #include "event_data.h" +#include "event_object_movement.h" +#include "event_scripts.h" #include "field_control_avatar.h" #include "fieldmap.h" #include "item.h" @@ -11,11 +13,6 @@ #include "text.h" #include "constants/event_object_movement_constants.h" #include "constants/items.h" -#include "event_object_movement.h" - - - -extern const u8 BerryTreeScript[]; static u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry); static bool32 BerryTreeGrow(struct BerryTree *tree); @@ -117,6 +114,7 @@ static const u8 sBerryDescriptionPart2_Enigma[] = _("Appears to have the power o const struct Berry gBerries[] = { + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = { .name = _("CHERI"), .firmness = BERRY_FIRMNESS_SOFT, @@ -133,6 +131,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = { .name = _("CHESTO"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -149,6 +149,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = { .name = _("PECHA"), .firmness = BERRY_FIRMNESS_VERY_SOFT, @@ -165,6 +167,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = { .name = _("RAWST"), .firmness = BERRY_FIRMNESS_HARD, @@ -181,6 +185,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = { .name = _("ASPEAR"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -197,6 +203,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 25, }, + + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = { .name = _("LEPPA"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -213,6 +221,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = { .name = _("ORAN"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -229,6 +239,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = { .name = _("PERSIM"), .firmness = BERRY_FIRMNESS_HARD, @@ -245,6 +257,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = { .name = _("LUM"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -261,6 +275,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = { .name = _("SITRUS"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -277,6 +293,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = { .name = _("FIGY"), .firmness = BERRY_FIRMNESS_SOFT, @@ -293,6 +311,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = { .name = _("WIKI"), .firmness = BERRY_FIRMNESS_HARD, @@ -309,6 +329,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = { .name = _("MAGO"), .firmness = BERRY_FIRMNESS_HARD, @@ -325,6 +347,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = { .name = _("AGUAV"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -341,6 +365,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 25, }, + + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = { .name = _("IAPAPA"), .firmness = BERRY_FIRMNESS_SOFT, @@ -357,6 +383,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 25, }, + + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = { .name = _("RAZZ"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -373,6 +401,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, }, + + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = { .name = _("BLUK"), .firmness = BERRY_FIRMNESS_SOFT, @@ -389,6 +419,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, }, + + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = { .name = _("NANAB"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -405,6 +437,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, }, + + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = { .name = _("WEPEAR"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -421,6 +455,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = { .name = _("PINAP"), .firmness = BERRY_FIRMNESS_HARD, @@ -437,6 +473,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = { .name = _("POMEG"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -453,6 +491,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, }, + + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = { .name = _("KELPSY"), .firmness = BERRY_FIRMNESS_HARD, @@ -469,6 +509,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = { .name = _("QUALOT"), .firmness = BERRY_FIRMNESS_HARD, @@ -485,6 +527,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = { .name = _("HONDEW"), .firmness = BERRY_FIRMNESS_HARD, @@ -501,6 +545,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 20, }, + + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = { .name = _("GREPA"), .firmness = BERRY_FIRMNESS_SOFT, @@ -517,6 +563,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 20, }, + + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = { .name = _("TAMATO"), .firmness = BERRY_FIRMNESS_SOFT, @@ -533,6 +581,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, }, + + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = { .name = _("CORNN"), .firmness = BERRY_FIRMNESS_HARD, @@ -549,6 +599,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, }, + + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = { .name = _("MAGOST"), .firmness = BERRY_FIRMNESS_HARD, @@ -565,6 +617,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 30, }, + + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = { .name = _("RABUTA"), .firmness = BERRY_FIRMNESS_SOFT, @@ -581,6 +635,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, }, + + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = { .name = _("NOMEL"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -597,6 +653,8 @@ const struct Berry gBerries[] = .sour = 20, .smoothness = 30, }, + + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = { .name = _("SPELON"), .firmness = BERRY_FIRMNESS_SOFT, @@ -613,6 +671,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 70, }, + + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = { .name = _("PAMTRE"), .firmness = BERRY_FIRMNESS_VERY_SOFT, @@ -629,6 +689,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 70, }, + + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = { .name = _("WATMEL"), .firmness = BERRY_FIRMNESS_SOFT, @@ -645,6 +707,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 70, }, + + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = { .name = _("DURIN"), .firmness = BERRY_FIRMNESS_HARD, @@ -661,6 +725,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 70, }, + + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = { .name = _("BELUE"), .firmness = BERRY_FIRMNESS_VERY_SOFT, @@ -677,6 +743,8 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 70, }, + + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = { .name = _("LIECHI"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -693,6 +761,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 80, }, + + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = { .name = _("GANLON"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -709,6 +779,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 80, }, + + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = { .name = _("SALAC"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -725,6 +797,8 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 80, }, + + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = { .name = _("PETAYA"), .firmness = BERRY_FIRMNESS_VERY_HARD, @@ -741,6 +815,8 @@ const struct Berry gBerries[] = .sour = 0, .smoothness = 80, }, + + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = { .name = _("APICOT"), .firmness = BERRY_FIRMNESS_HARD, @@ -757,6 +833,8 @@ const struct Berry gBerries[] = .sour = 40, .smoothness = 80, }, + + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = { .name = _("LANSAT"), .firmness = BERRY_FIRMNESS_SOFT, @@ -773,6 +851,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, }, + + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = { .name = _("STARF"), .firmness = BERRY_FIRMNESS_SUPER_HARD, @@ -789,6 +869,8 @@ const struct Berry gBerries[] = .sour = 10, .smoothness = 30, }, + + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = { .name = _("ENIGMA"), .firmness = BERRY_FIRMNESS_UNKNOWN, diff --git a/src/data/field_event_obj/berry_tree_graphics_tables.h b/src/data/field_event_obj/berry_tree_graphics_tables.h index f5ef15af9..d437fa356 100755 --- a/src/data/field_event_obj/berry_tree_graphics_tables.h +++ b/src/data/field_event_obj/berry_tree_graphics_tables.h @@ -423,142 +423,139 @@ const u8 gDeadBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_ const u8 gBerryTreeEventObjectGraphicsIdTable[] = {EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_EARLY_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES, EVENT_OBJ_GFX_BERRY_TREE_LATE_STAGES}; const struct SpriteFrameImage *const gBerryTreePicTablePointers[] = { - gEventObjectPicTable_CheriBerryTree, - gEventObjectPicTable_ChestoBerryTree, - gEventObjectPicTable_PechaBerryTree, - gEventObjectPicTable_RawstBerryTree, - gEventObjectPicTable_AspearBerryTree, - gEventObjectPicTable_LeppaBerryTree, - gEventObjectPicTable_OranBerryTree, - gEventObjectPicTable_PersimBerryTree, - gEventObjectPicTable_LumBerryTree, - gEventObjectPicTable_SitrusBerryTree, - gEventObjectPicTable_FigyBerryTree, - gEventObjectPicTable_WikiBerryTree, - gEventObjectPicTable_MagoBerryTree, - gEventObjectPicTable_AguavBerryTree, - gEventObjectPicTable_IapapaBerryTree, - gEventObjectPicTable_RazzBerryTree, - gEventObjectPicTable_RazzBerryTree, - gEventObjectPicTable_MagoBerryTree, - gEventObjectPicTable_WepearBerryTree, - gEventObjectPicTable_IapapaBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_KelpsyBerryTree, - gEventObjectPicTable_WepearBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_GrepaBerryTree, - gEventObjectPicTable_TamatoBerryTree, - gEventObjectPicTable_CornnBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_RabutaBerryTree, - gEventObjectPicTable_NomelBerryTree, - gEventObjectPicTable_SpelonBerryTree, - gEventObjectPicTable_PamtreBerryTree, - gEventObjectPicTable_RabutaBerryTree, - gEventObjectPicTable_DurinBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_LiechiBerryTree, - gEventObjectPicTable_HondewBerryTree, - gEventObjectPicTable_AguavBerryTree, - gEventObjectPicTable_PomegBerryTree, - gEventObjectPicTable_GrepaBerryTree, - gEventObjectPicTable_LansatBerryTree, - gEventObjectPicTable_CornnBerryTree, - gEventObjectPicTable_DurinBerryTree, + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CheriBerryTree, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_ChestoBerryTree, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PechaBerryTree, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RawstBerryTree, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AspearBerryTree, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LeppaBerryTree, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_OranBerryTree, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PersimBerryTree, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LumBerryTree, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SitrusBerryTree, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_FigyBerryTree, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WikiBerryTree, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RazzBerryTree, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_MagoBerryTree, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_IapapaBerryTree, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_KelpsyBerryTree, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_WepearBerryTree, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_TamatoBerryTree, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_NomelBerryTree, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_SpelonBerryTree, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PamtreBerryTree, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_RabutaBerryTree, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LiechiBerryTree, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_HondewBerryTree, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_AguavBerryTree, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_PomegBerryTree, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_GrepaBerryTree, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_LansatBerryTree, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_CornnBerryTree, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gEventObjectPicTable_DurinBerryTree, }; const u8 *const gBerryTreePaletteSlotTablePointers[] = { - gBerryTreePaletteSlotTable_Cheri, - gBerryTreePaletteSlotTable_Chesto, - gBerryTreePaletteSlotTable_Pecha, - gBerryTreePaletteSlotTable_Rawst, - gBerryTreePaletteSlotTable_Aspear, - gBerryTreePaletteSlotTable_Leppa, - gBerryTreePaletteSlotTable_Oran, - gBerryTreePaletteSlotTable_Persim, - gBerryTreePaletteSlotTable_Lum, - gBerryTreePaletteSlotTable_Sitrus, - gBerryTreePaletteSlotTable_Figy, - gBerryTreePaletteSlotTable_Wiki, - gBerryTreePaletteSlotTable_Mago, - gBerryTreePaletteSlotTable_Aguav, - gBerryTreePaletteSlotTable_Iapapa, - gBerryTreePaletteSlotTable_Razz, - gBerryTreePaletteSlotTable_Razz, - gBerryTreePaletteSlotTable_Mago, - gBerryTreePaletteSlotTable_Wepear, - gBerryTreePaletteSlotTable_Iapapa, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Kelpsy, - gBerryTreePaletteSlotTable_Wepear, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Grepa, - gBerryTreePaletteSlotTable_Tamato, - gBerryTreePaletteSlotTable_Cornn, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Rabuta, - gBerryTreePaletteSlotTable_Nomel, - gBerryTreePaletteSlotTable_Spelon, - gBerryTreePaletteSlotTable_Pamtre, - gBerryTreePaletteSlotTable_Rabuta, - gBerryTreePaletteSlotTable_Durin, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Liechi, - gBerryTreePaletteSlotTable_Hondew, - gBerryTreePaletteSlotTable_Aguav, - gBerryTreePaletteSlotTable_Pomeg, - gBerryTreePaletteSlotTable_Grepa, - gBerryTreePaletteSlotTable_Lansat, - gBerryTreePaletteSlotTable_Cornn, - gBerryTreePaletteSlotTable_Durin, + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cheri, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Chesto, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pecha, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rawst, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aspear, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Leppa, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Oran, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Persim, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lum, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Sitrus, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Figy, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wiki, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Razz, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Mago, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Iapapa, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Kelpsy, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Wepear, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Tamato, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Nomel, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Spelon, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pamtre, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Rabuta, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Liechi, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Hondew, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Aguav, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Pomeg, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Grepa, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Lansat, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Cornn, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreePaletteSlotTable_Durin, }; const u8 *const gBerryTreeEventObjectGraphicsIdTablePointers[] = { - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, - gBerryTreeEventObjectGraphicsIdTable, + [ITEM_CHERI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_CHESTO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_PECHA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_RAWST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_ASPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_LEPPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_ORAN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_PERSIM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_LUM_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_SITRUS_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_FIGY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_WIKI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_MAGO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_AGUAV_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_IAPAPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_RAZZ_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_BLUK_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_NANAB_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_WEPEAR_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_PINAP_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_POMEG_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_KELPSY_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_QUALOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_HONDEW_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_GREPA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_TAMATO_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_CORNN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_MAGOST_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_RABUTA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_NOMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_SPELON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_PAMTRE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_WATMEL_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_DURIN_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_BELUE_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_LIECHI_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_GANLON_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_SALAC_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_PETAYA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_APICOT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_LANSAT_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_STARF_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, + [ITEM_ENIGMA_BERRY - FIRST_BERRY_INDEX] = gBerryTreeEventObjectGraphicsIdTable, }; diff --git a/src/data/graphics/items.h b/src/data/graphics/items.h index b00a5b854..4285fcf36 100644 --- a/src/data/graphics/items.h +++ b/src/data/graphics/items.h @@ -40,6 +40,51 @@ const u32 gItemIconPalette_LuxuryBall[] = INCBIN_U32("graphics/items/icon_palett const u32 gItemIcon_PremierBall[] = INCBIN_U32("graphics/items/icons/premier_ball.4bpp.lz"); +const u32 gItemIcon_LevelBall[] = INCBIN_U32("graphics/items/icons/level_ball.4bpp.lz"); +const u32 gItemIconPalette_LevelBall[] = INCBIN_U32("graphics/items/icon_palettes/level_ball.gbapal.lz"); + +const u32 gItemIcon_LureBall[] = INCBIN_U32("graphics/items/icons/lure_ball.4bpp.lz"); +const u32 gItemIconPalette_LureBall[] = INCBIN_U32("graphics/items/icon_palettes/lure_ball.gbapal.lz"); + +const u32 gItemIcon_MoonBall[] = INCBIN_U32("graphics/items/icons/moon_ball.4bpp.lz"); +const u32 gItemIconPalette_MoonBall[] = INCBIN_U32("graphics/items/icon_palettes/moon_ball.gbapal.lz"); + +const u32 gItemIcon_FriendBall[] = INCBIN_U32("graphics/items/icons/friend_ball.4bpp.lz"); +const u32 gItemIconPalette_FriendBall[] = INCBIN_U32("graphics/items/icon_palettes/friend_ball.gbapal.lz"); + +const u32 gItemIcon_LoveBall[] = INCBIN_U32("graphics/items/icons/love_ball.4bpp.lz"); +const u32 gItemIconPalette_LoveBall[] = INCBIN_U32("graphics/items/icon_palettes/love_ball.gbapal.lz"); + +const u32 gItemIcon_HeavyBall[] = INCBIN_U32("graphics/items/icons/heavy_ball.4bpp.lz"); +const u32 gItemIconPalette_HeavyBall[] = INCBIN_U32("graphics/items/icon_palettes/heavy_ball.gbapal.lz"); + +const u32 gItemIcon_FastBall[] = INCBIN_U32("graphics/items/icons/fast_ball.4bpp.lz"); +const u32 gItemIconPalette_FastBall[] = INCBIN_U32("graphics/items/icon_palettes/fast_ball.gbapal.lz"); + +const u32 gItemIcon_SportBall[] = INCBIN_U32("graphics/items/icons/sport_ball.4bpp.lz"); +const u32 gItemIconPalette_SportBall[] = INCBIN_U32("graphics/items/icon_palettes/sport_ball.gbapal.lz"); + +const u32 gItemIcon_DuskBall[] = INCBIN_U32("graphics/items/icons/dusk_ball.4bpp.lz"); +const u32 gItemIconPalette_DuskBall[] = INCBIN_U32("graphics/items/icon_palettes/dusk_ball.gbapal.lz"); + +const u32 gItemIcon_QuickBall[] = INCBIN_U32("graphics/items/icons/quick_ball.4bpp.lz"); +const u32 gItemIconPalette_QuickBall[] = INCBIN_U32("graphics/items/icon_palettes/quick_ball.gbapal.lz"); + +const u32 gItemIcon_HealBall[] = INCBIN_U32("graphics/items/icons/heal_ball.4bpp.lz"); +const u32 gItemIconPalette_HealBall[] = INCBIN_U32("graphics/items/icon_palettes/heal_ball.gbapal.lz"); + +const u32 gItemIcon_CherishBall[] = INCBIN_U32("graphics/items/icons/cherish_ball.4bpp.lz"); +const u32 gItemIconPalette_CherishBall[] = INCBIN_U32("graphics/items/icon_palettes/cherish_ball.gbapal.lz"); + +const u32 gItemIcon_ParkBall[] = INCBIN_U32("graphics/items/icons/park_ball.4bpp.lz"); +const u32 gItemIconPalette_ParkBall[] = INCBIN_U32("graphics/items/icon_palettes/park_ball.gbapal.lz"); + +const u32 gItemIcon_DreamBall[] = INCBIN_U32("graphics/items/icons/dream_ball.4bpp.lz"); +const u32 gItemIconPalette_DreamBall[] = INCBIN_U32("graphics/items/icon_palettes/dream_ball.gbapal.lz"); + +const u32 gItemIcon_BeastBall[] = INCBIN_U32("graphics/items/icons/beast_ball.4bpp.lz"); +const u32 gItemIconPalette_BeastBall[] = INCBIN_U32("graphics/items/icon_palettes/beast_ball.gbapal.lz"); + // Medicine const u32 gItemIcon_Potion[] = INCBIN_U32("graphics/items/icons/potion.4bpp.lz"); diff --git a/src/data/item_icon_table.h b/src/data/item_icon_table.h index 226662deb..18e94518e 100644 --- a/src/data/item_icon_table.h +++ b/src/data/item_icon_table.h @@ -14,6 +14,21 @@ const u32 *const gItemIconTable[][2] = [ITEM_TIMER_BALL] = {gItemIcon_TimerBall, gItemIconPalette_RepeatBall}, [ITEM_LUXURY_BALL] = {gItemIcon_LuxuryBall, gItemIconPalette_LuxuryBall}, [ITEM_PREMIER_BALL] = {gItemIcon_PremierBall, gItemIconPalette_LuxuryBall}, + [ITEM_LEVEL_BALL] = {gItemIcon_LevelBall, gItemIconPalette_LevelBall}, + [ITEM_LURE_BALL] = {gItemIcon_LureBall, gItemIconPalette_LureBall}, + [ITEM_MOON_BALL] = {gItemIcon_MoonBall, gItemIconPalette_MoonBall}, + [ITEM_FRIEND_BALL] = {gItemIcon_FriendBall, gItemIconPalette_FriendBall}, + [ITEM_LOVE_BALL] = {gItemIcon_LoveBall, gItemIconPalette_LoveBall}, + [ITEM_HEAVY_BALL] = {gItemIcon_HeavyBall, gItemIconPalette_HeavyBall}, + [ITEM_FAST_BALL] = {gItemIcon_FastBall, gItemIconPalette_FastBall}, + [ITEM_SPORT_BALL] = {gItemIcon_SportBall, gItemIconPalette_SportBall}, + [ITEM_DUSK_BALL] = {gItemIcon_DuskBall, gItemIconPalette_DuskBall}, + [ITEM_QUICK_BALL] = {gItemIcon_QuickBall, gItemIconPalette_QuickBall}, + [ITEM_HEAL_BALL] = {gItemIcon_HealBall, gItemIconPalette_HealBall}, + [ITEM_CHERISH_BALL] = {gItemIcon_CherishBall, gItemIconPalette_CherishBall}, + [ITEM_PARK_BALL] = {gItemIcon_ParkBall, gItemIconPalette_ParkBall}, + [ITEM_DREAM_BALL] = {gItemIcon_DreamBall, gItemIconPalette_DreamBall}, + [ITEM_BEAST_BALL] = {gItemIcon_BeastBall, gItemIconPalette_BeastBall}, // Medicine [ITEM_POTION] = {gItemIcon_Potion, gItemIconPalette_Potion}, [ITEM_ANTIDOTE] = {gItemIcon_Antidote, gItemIconPalette_Antidote}, diff --git a/src/data/items.h b/src/data/items.h index af22cb489..9d45db8f5 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -5,16 +5,10 @@ const struct Item gItems[] = .name = _("????????"), .itemId = ITEM_NONE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDummyItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -25,11 +19,7 @@ const struct Item gItems[] = .name = _("MASTER BALL"), .itemId = ITEM_MASTER_BALL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMasterBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 0, .fieldUseFunc = NULL, @@ -43,11 +33,7 @@ const struct Item gItems[] = .name = _("ULTRA BALL"), .itemId = ITEM_ULTRA_BALL, .price = 1200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gUltraBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 1, .fieldUseFunc = NULL, @@ -61,11 +47,7 @@ const struct Item gItems[] = .name = _("GREAT BALL"), .itemId = ITEM_GREAT_BALL, .price = 600, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGreatBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 2, .fieldUseFunc = NULL, @@ -79,11 +61,7 @@ const struct Item gItems[] = .name = _("POKé BALL"), .itemId = ITEM_POKE_BALL, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPokeBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 3, .fieldUseFunc = NULL, @@ -97,11 +75,7 @@ const struct Item gItems[] = .name = _("SAFARI BALL"), .itemId = ITEM_SAFARI_BALL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSafariBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 4, .fieldUseFunc = NULL, @@ -115,11 +89,7 @@ const struct Item gItems[] = .name = _("NET BALL"), .itemId = ITEM_NET_BALL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gNetBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 5, .fieldUseFunc = NULL, @@ -133,11 +103,7 @@ const struct Item gItems[] = .name = _("DIVE BALL"), .itemId = ITEM_DIVE_BALL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDiveBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 6, .fieldUseFunc = NULL, @@ -151,11 +117,7 @@ const struct Item gItems[] = .name = _("NEST BALL"), .itemId = ITEM_NEST_BALL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gNestBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 7, .fieldUseFunc = NULL, @@ -169,11 +131,7 @@ const struct Item gItems[] = .name = _("REPEAT BALL"), .itemId = ITEM_REPEAT_BALL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRepeatBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 8, .fieldUseFunc = NULL, @@ -187,11 +145,7 @@ const struct Item gItems[] = .name = _("TIMER BALL"), .itemId = ITEM_TIMER_BALL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTimerBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 9, .fieldUseFunc = NULL, @@ -205,11 +159,7 @@ const struct Item gItems[] = .name = _("LUXURY BALL"), .itemId = ITEM_LUXURY_BALL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gLuxuryBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 10, .fieldUseFunc = NULL, @@ -223,11 +173,7 @@ const struct Item gItems[] = .name = _("PREMIER BALL"), .itemId = ITEM_PREMIER_BALL, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPremierBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_POKE_BALLS, .type = 11, .fieldUseFunc = NULL, @@ -236,6 +182,160 @@ const struct Item gItems[] = .secondaryId = 11, }, + [ITEM_LEVEL_BALL] = + { + .name = _("Level Ball"), + .itemId = ITEM_LEVEL_BALL, + .price = 2000, + .description = gItemDescription_LevelBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 12, + }, + + [ITEM_LURE_BALL] = + { + .name = _("Lure Ball"), + .itemId = ITEM_LURE_BALL, + .price = 2000, + .description = gItemDescription_LureBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 13, + }, + + [ITEM_MOON_BALL] = + { + .name = _("Moon Ball"), + .itemId = ITEM_MOON_BALL, + .price = 2000, + .description = gItemDescription_MoonBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 14, + }, + + [ITEM_FRIEND_BALL] = + { + .name = _("Friend Ball"), + .itemId = ITEM_FRIEND_BALL, + .price = 2000, + .description = gItemDescription_FriendBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 15, + }, + + [ITEM_LOVE_BALL] = + { + .name = _("Love Ball"), + .itemId = ITEM_LOVE_BALL, + .price = 2000, + .description = gItemDescription_LoveBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 16, + }, + + [ITEM_HEAVY_BALL] = + { + .name = _("Heavy Ball"), + .itemId = ITEM_HEAVY_BALL, + .price = 2000, + .description = gItemDescription_HeavyBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 17, + }, + + [ITEM_FAST_BALL] = + { + .name = _("Fast Ball"), + .itemId = ITEM_FAST_BALL, + .price = 2000, + .description = gItemDescription_FastBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 18, + }, + + [ITEM_HEAL_BALL] = + { + .name = _("Heal Ball"), + .itemId = ITEM_HEAL_BALL, + .price = 300, + .description = gItemDescription_HealBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 19, + }, + + [ITEM_QUICK_BALL] = + { + .name = _("Quick Ball"), + .itemId = ITEM_QUICK_BALL, + .price = 3000, + .description = gItemDescription_QuickBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 20, + }, + + [ITEM_DUSK_BALL] = + { + .name = _("Dusk Ball"), + .itemId = ITEM_DUSK_BALL, + .price = 3000, + .description = gItemDescription_DuskBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 21, + }, + + [ITEM_CHERISH_BALL] = + { + .name = _("Cherish Ball"), + .itemId = ITEM_CHERISH_BALL, + .price = 10, + .description = gItemDescription_CherishBall, + .pocket = POCKET_POKE_BALLS, + .type = 11, + .fieldUseFunc = NULL, + .battleUsage = 2, + .battleUseFunc = ItemUseInBattle_PokeBall, + .secondaryId = 22, + }, + // Medicine [ITEM_POTION] = @@ -243,11 +343,8 @@ const struct Item gItems[] = .name = _("POTION"), .itemId = ITEM_POTION, .price = 300, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 20, .description = gPotionItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -261,11 +358,7 @@ const struct Item gItems[] = .name = _("ANTIDOTE"), .itemId = ITEM_ANTIDOTE, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gAntidoteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -279,11 +372,7 @@ const struct Item gItems[] = .name = _("BURN HEAL"), .itemId = ITEM_BURN_HEAL, .price = 250, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBurnHealItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -297,11 +386,7 @@ const struct Item gItems[] = .name = _("ICE HEAL"), .itemId = ITEM_ICE_HEAL, .price = 250, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gIceHealItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -315,11 +400,7 @@ const struct Item gItems[] = .name = _("AWAKENING"), .itemId = ITEM_AWAKENING, .price = 250, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gAwakeningItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -333,11 +414,7 @@ const struct Item gItems[] = .name = _("PARLYZ HEAL"), .itemId = ITEM_PARALYZE_HEAL, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gParalyzeHealItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -351,11 +428,8 @@ const struct Item gItems[] = .name = _("FULL RESTORE"), .itemId = ITEM_FULL_RESTORE, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 255, .description = gFullRestoreItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -369,11 +443,8 @@ const struct Item gItems[] = .name = _("MAX POTION"), .itemId = ITEM_MAX_POTION, .price = 2500, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 255, .description = gMaxPotionItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -387,11 +458,8 @@ const struct Item gItems[] = .name = _("HYPER POTION"), .itemId = ITEM_HYPER_POTION, .price = 1200, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 200, .description = gHyperPotionItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -405,11 +473,8 @@ const struct Item gItems[] = .name = _("SUPER POTION"), .itemId = ITEM_SUPER_POTION, .price = 700, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 50, .description = gSuperPotionItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -423,11 +488,7 @@ const struct Item gItems[] = .name = _("FULL HEAL"), .itemId = ITEM_FULL_HEAL, .price = 600, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gFullHealItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -441,11 +502,7 @@ const struct Item gItems[] = .name = _("REVIVE"), .itemId = ITEM_REVIVE, .price = 1500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gReviveItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -459,11 +516,7 @@ const struct Item gItems[] = .name = _("MAX REVIVE"), .itemId = ITEM_MAX_REVIVE, .price = 4000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMaxReviveItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -477,11 +530,8 @@ const struct Item gItems[] = .name = _("FRESH WATER"), .itemId = ITEM_FRESH_WATER, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 50, .description = gFreshWaterItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -495,11 +545,8 @@ const struct Item gItems[] = .name = _("SODA POP"), .itemId = ITEM_SODA_POP, .price = 300, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 60, .description = gSodaPopItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -513,11 +560,8 @@ const struct Item gItems[] = .name = _("LEMONADE"), .itemId = ITEM_LEMONADE, .price = 350, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 80, .description = gLemonadeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -531,11 +575,8 @@ const struct Item gItems[] = .name = _("MOOMOO MILK"), .itemId = ITEM_MOOMOO_MILK, .price = 500, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 100, .description = gMoomooMilkItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -549,11 +590,7 @@ const struct Item gItems[] = .name = _("ENERGYPOWDER"), .itemId = ITEM_ENERGY_POWDER, .price = 500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gEnergyPowderItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -567,11 +604,7 @@ const struct Item gItems[] = .name = _("ENERGY ROOT"), .itemId = ITEM_ENERGY_ROOT, .price = 800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gEnergyRootItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -585,11 +618,7 @@ const struct Item gItems[] = .name = _("HEAL POWDER"), .itemId = ITEM_HEAL_POWDER, .price = 450, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHealPowderItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -603,11 +632,7 @@ const struct Item gItems[] = .name = _("REVIVAL HERB"), .itemId = ITEM_REVIVAL_HERB, .price = 2800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRevivalHerbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -621,11 +646,8 @@ const struct Item gItems[] = .name = _("ETHER"), .itemId = ITEM_ETHER, .price = 1200, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 10, .description = gEtherItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, @@ -639,11 +661,8 @@ const struct Item gItems[] = .name = _("MAX ETHER"), .itemId = ITEM_MAX_ETHER, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 255, .description = gMaxEtherItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, @@ -657,11 +676,8 @@ const struct Item gItems[] = .name = _("ELIXIR"), .itemId = ITEM_ELIXIR, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 10, .description = gElixirItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, @@ -675,11 +691,8 @@ const struct Item gItems[] = .name = _("MAX ELIXIR"), .itemId = ITEM_MAX_ELIXIR, .price = 4500, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 255, .description = gMaxElixirItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, @@ -693,11 +706,7 @@ const struct Item gItems[] = .name = _("LAVA COOKIE"), .itemId = ITEM_LAVA_COOKIE, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gLavaCookieItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -711,11 +720,7 @@ const struct Item gItems[] = .name = _("BLUE FLUTE"), .itemId = ITEM_BLUE_FLUTE, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBlueFluteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -729,11 +734,7 @@ const struct Item gItems[] = .name = _("YELLOW FLUTE"), .itemId = ITEM_YELLOW_FLUTE, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gYellowFluteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -747,11 +748,7 @@ const struct Item gItems[] = .name = _("RED FLUTE"), .itemId = ITEM_RED_FLUTE, .price = 300, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRedFluteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -765,16 +762,11 @@ const struct Item gItems[] = .name = _("BLACK FLUTE"), .itemId = ITEM_BLACK_FLUTE, .price = 400, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 50, .description = gBlackFluteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -783,16 +775,11 @@ const struct Item gItems[] = .name = _("WHITE FLUTE"), .itemId = ITEM_WHITE_FLUTE, .price = 500, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 150, .description = gWhiteFluteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_BlackWhiteFlute, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -804,8 +791,6 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_RESTORE_HP, .holdEffectParam = 20, .description = gBerryJuiceItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -819,16 +804,10 @@ const struct Item gItems[] = .name = _("SACRED ASH"), .itemId = ITEM_SACRED_ASH, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSacredAshItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_SacredAsh, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -839,16 +818,10 @@ const struct Item gItems[] = .name = _("SHOAL SALT"), .itemId = ITEM_SHOAL_SALT, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gShoalSaltItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -857,16 +830,10 @@ const struct Item gItems[] = .name = _("SHOAL SHELL"), .itemId = ITEM_SHOAL_SHELL, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gShoalShellItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -875,16 +842,10 @@ const struct Item gItems[] = .name = _("RED SHARD"), .itemId = ITEM_RED_SHARD, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRedShardItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -893,16 +854,10 @@ const struct Item gItems[] = .name = _("BLUE SHARD"), .itemId = ITEM_BLUE_SHARD, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBlueShardItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -911,16 +866,10 @@ const struct Item gItems[] = .name = _("YELLOW SHARD"), .itemId = ITEM_YELLOW_SHARD, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gYellowShardItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -929,16 +878,10 @@ const struct Item gItems[] = .name = _("GREEN SHARD"), .itemId = ITEM_GREEN_SHARD, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGreenShardItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -949,16 +892,10 @@ const struct Item gItems[] = .name = _("HP UP"), .itemId = ITEM_HP_UP, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHPUpItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -967,16 +904,10 @@ const struct Item gItems[] = .name = _("PROTEIN"), .itemId = ITEM_PROTEIN, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gProteinItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -985,16 +916,10 @@ const struct Item gItems[] = .name = _("IRON"), .itemId = ITEM_IRON, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gIronItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1003,16 +928,10 @@ const struct Item gItems[] = .name = _("CARBOS"), .itemId = ITEM_CARBOS, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gCarbosItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1021,16 +940,10 @@ const struct Item gItems[] = .name = _("CALCIUM"), .itemId = ITEM_CALCIUM, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gCalciumItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1039,16 +952,10 @@ const struct Item gItems[] = .name = _("RARE CANDY"), .itemId = ITEM_RARE_CANDY, .price = 4800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRareCandyItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_RareCandy, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1057,16 +964,10 @@ const struct Item gItems[] = .name = _("PP UP"), .itemId = ITEM_PP_UP, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPPUpItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_PPUp, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1075,16 +976,10 @@ const struct Item gItems[] = .name = _("ZINC"), .itemId = ITEM_ZINC, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gZincItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1093,16 +988,10 @@ const struct Item gItems[] = .name = _("PP MAX"), .itemId = ITEM_PP_MAX, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPPMaxItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_PPUp, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1113,11 +1002,7 @@ const struct Item gItems[] = .name = _("GUARD SPEC."), .itemId = ITEM_GUARD_SPEC, .price = 700, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGuardSpecItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1131,11 +1016,7 @@ const struct Item gItems[] = .name = _("DIRE HIT"), .itemId = ITEM_DIRE_HIT, .price = 650, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDireHitItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1149,11 +1030,7 @@ const struct Item gItems[] = .name = _("X ATTACK"), .itemId = ITEM_X_ATTACK, .price = 500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gXAttackItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1167,11 +1044,7 @@ const struct Item gItems[] = .name = _("X DEFEND"), .itemId = ITEM_X_DEFENSE, .price = 550, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gXDefendItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1185,11 +1058,7 @@ const struct Item gItems[] = .name = _("X SPEED"), .itemId = ITEM_X_SPEED, .price = 350, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gXSpeedItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1203,11 +1072,7 @@ const struct Item gItems[] = .name = _("X ACCURACY"), .itemId = ITEM_X_ACCURACY, .price = 950, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gXAccuracyItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1221,11 +1086,7 @@ const struct Item gItems[] = .name = _("X SPECIAL"), .itemId = ITEM_X_SP_ATK, .price = 350, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gXSpecialItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1239,11 +1100,7 @@ const struct Item gItems[] = .name = _("POKé DOLL"), .itemId = ITEM_POKE_DOLL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPokeDollItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1257,11 +1114,7 @@ const struct Item gItems[] = .name = _("FLUFFY TAIL"), .itemId = ITEM_FLUFFY_TAIL, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gFluffyTailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1277,16 +1130,11 @@ const struct Item gItems[] = .name = _("SUPER REPEL"), .itemId = ITEM_SUPER_REPEL, .price = 500, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 200, .description = gSuperRepelItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_Repel, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1295,16 +1143,11 @@ const struct Item gItems[] = .name = _("MAX REPEL"), .itemId = ITEM_MAX_REPEL, .price = 700, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 250, .description = gMaxRepelItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_Repel, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1313,16 +1156,10 @@ const struct Item gItems[] = .name = _("ESCAPE ROPE"), .itemId = ITEM_ESCAPE_ROPE, .price = 550, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gEscapeRopeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_EscapeRope, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1331,16 +1168,11 @@ const struct Item gItems[] = .name = _("REPEL"), .itemId = ITEM_REPEL, .price = 350, - .holdEffect = HOLD_EFFECT_NONE, .holdEffectParam = 100, .description = gRepelItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_Repel, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1351,16 +1183,10 @@ const struct Item gItems[] = .name = _("SUN STONE"), .itemId = ITEM_SUN_STONE, .price = 2100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSunStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1369,16 +1195,10 @@ const struct Item gItems[] = .name = _("MOON STONE"), .itemId = ITEM_MOON_STONE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMoonStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1387,16 +1207,10 @@ const struct Item gItems[] = .name = _("FIRE STONE"), .itemId = ITEM_FIRE_STONE, .price = 2100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gFireStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1405,16 +1219,10 @@ const struct Item gItems[] = .name = _("THUNDERSTONE"), .itemId = ITEM_THUNDER_STONE, .price = 2100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gThunderStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1423,16 +1231,10 @@ const struct Item gItems[] = .name = _("WATER STONE"), .itemId = ITEM_WATER_STONE, .price = 2100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gWaterStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1441,16 +1243,10 @@ const struct Item gItems[] = .name = _("LEAF STONE"), .itemId = ITEM_LEAF_STONE, .price = 2100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gLeafStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_EvolutionStone, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1461,16 +1257,10 @@ const struct Item gItems[] = .name = _("TINYMUSHROOM"), .itemId = ITEM_TINY_MUSHROOM, .price = 500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTinyMushroomItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1479,16 +1269,10 @@ const struct Item gItems[] = .name = _("BIG MUSHROOM"), .itemId = ITEM_BIG_MUSHROOM, .price = 5000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBigMushroomItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1497,16 +1281,10 @@ const struct Item gItems[] = .name = _("PEARL"), .itemId = ITEM_PEARL, .price = 1400, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPearlItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1515,16 +1293,10 @@ const struct Item gItems[] = .name = _("BIG PEARL"), .itemId = ITEM_BIG_PEARL, .price = 7500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBigPearlItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1533,16 +1305,10 @@ const struct Item gItems[] = .name = _("STARDUST"), .itemId = ITEM_STARDUST, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gStardustItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1551,16 +1317,10 @@ const struct Item gItems[] = .name = _("STAR PIECE"), .itemId = ITEM_STAR_PIECE, .price = 9800, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gStarPieceItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1569,16 +1329,10 @@ const struct Item gItems[] = .name = _("NUGGET"), .itemId = ITEM_NUGGET, .price = 10000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gNuggetItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1587,16 +1341,10 @@ const struct Item gItems[] = .name = _("HEART SCALE"), .itemId = ITEM_HEART_SCALE, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHeartScaleItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1606,16 +1354,10 @@ const struct Item gItems[] = .name = _("ORANGE MAIL"), .itemId = ITEM_ORANGE_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gOrangeMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -1624,16 +1366,10 @@ const struct Item gItems[] = .name = _("HARBOR MAIL"), .itemId = ITEM_HARBOR_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHarborMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 1, }, @@ -1642,16 +1378,10 @@ const struct Item gItems[] = .name = _("GLITTER MAIL"), .itemId = ITEM_GLITTER_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGlitterMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 2, }, @@ -1660,16 +1390,10 @@ const struct Item gItems[] = .name = _("MECH MAIL"), .itemId = ITEM_MECH_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMechMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 3, }, @@ -1678,16 +1402,10 @@ const struct Item gItems[] = .name = _("WOOD MAIL"), .itemId = ITEM_WOOD_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gWoodMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 4, }, @@ -1696,16 +1414,10 @@ const struct Item gItems[] = .name = _("WAVE MAIL"), .itemId = ITEM_WAVE_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gWaveMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 5, }, @@ -1714,16 +1426,10 @@ const struct Item gItems[] = .name = _("BEAD MAIL"), .itemId = ITEM_BEAD_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBeadMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 6, }, @@ -1732,16 +1438,10 @@ const struct Item gItems[] = .name = _("SHADOW MAIL"), .itemId = ITEM_SHADOW_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gShadowMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 7, }, @@ -1750,16 +1450,10 @@ const struct Item gItems[] = .name = _("TROPIC MAIL"), .itemId = ITEM_TROPIC_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTropicMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 8, }, @@ -1768,16 +1462,10 @@ const struct Item gItems[] = .name = _("DREAM MAIL"), .itemId = ITEM_DREAM_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDreamMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 9, }, @@ -1786,16 +1474,10 @@ const struct Item gItems[] = .name = _("FAB MAIL"), .itemId = ITEM_FAB_MAIL, .price = 50, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gFabMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 10, }, @@ -1804,16 +1486,10 @@ const struct Item gItems[] = .name = _("RETRO MAIL"), .itemId = ITEM_RETRO_MAIL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRetroMailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 0, .fieldUseFunc = ItemUseOutOfBattle_Mail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 11, }, @@ -1825,10 +1501,7 @@ const struct Item gItems[] = .itemId = ITEM_CHERI_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_PAR, - .holdEffectParam = 0, .description = gCheriBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -1843,10 +1516,7 @@ const struct Item gItems[] = .itemId = ITEM_CHESTO_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_SLP, - .holdEffectParam = 0, .description = gChestoBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -1861,10 +1531,7 @@ const struct Item gItems[] = .itemId = ITEM_PECHA_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_PSN, - .holdEffectParam = 0, .description = gPechaBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -1879,10 +1546,7 @@ const struct Item gItems[] = .itemId = ITEM_RAWST_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_BRN, - .holdEffectParam = 0, .description = gRawstBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -1897,10 +1561,7 @@ const struct Item gItems[] = .itemId = ITEM_ASPEAR_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_FRZ, - .holdEffectParam = 0, .description = gAspearBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -1917,8 +1578,6 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_RESTORE_PP, .holdEffectParam = 10, .description = gLeppaBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_PPRecovery, @@ -1935,8 +1594,6 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_RESTORE_HP, .holdEffectParam = 10, .description = gOranBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -1951,10 +1608,7 @@ const struct Item gItems[] = .itemId = ITEM_PERSIM_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_CONFUSION, - .holdEffectParam = 0, .description = gPersimBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, @@ -1969,10 +1623,7 @@ const struct Item gItems[] = .itemId = ITEM_LUM_BERRY, .price = 20, .holdEffect = HOLD_EFFECT_CURE_STATUS, - .holdEffectParam = 0, .description = gLumBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -1989,8 +1640,6 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_RESTORE_HP, .holdEffectParam = 30, .description = gSitrusBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_Medicine, @@ -2007,13 +1656,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CONFUSE_SPICY, .holdEffectParam = 8, .description = gFigyBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2025,13 +1670,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CONFUSE_DRY, .holdEffectParam = 8, .description = gWikiBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2043,13 +1684,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CONFUSE_SWEET, .holdEffectParam = 8, .description = gMagoBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2061,13 +1698,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CONFUSE_BITTER, .holdEffectParam = 8, .description = gAguavBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2079,13 +1712,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CONFUSE_SOUR, .holdEffectParam = 8, .description = gIapapaBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2094,16 +1723,10 @@ const struct Item gItems[] = .name = _("RAZZ BERRY"), .itemId = ITEM_RAZZ_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRazzBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2112,16 +1735,10 @@ const struct Item gItems[] = .name = _("BLUK BERRY"), .itemId = ITEM_BLUK_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBlukBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2130,16 +1747,10 @@ const struct Item gItems[] = .name = _("NANAB BERRY"), .itemId = ITEM_NANAB_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gNanabBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2148,16 +1759,10 @@ const struct Item gItems[] = .name = _("WEPEAR BERRY"), .itemId = ITEM_WEPEAR_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gWepearBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2166,16 +1771,10 @@ const struct Item gItems[] = .name = _("PINAP BERRY"), .itemId = ITEM_PINAP_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPinapBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2184,16 +1783,10 @@ const struct Item gItems[] = .name = _("POMEG BERRY"), .itemId = ITEM_POMEG_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPomegBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2202,16 +1795,10 @@ const struct Item gItems[] = .name = _("KELPSY BERRY"), .itemId = ITEM_KELPSY_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gKelpsyBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2220,16 +1807,10 @@ const struct Item gItems[] = .name = _("QUALOT BERRY"), .itemId = ITEM_QUALOT_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gQualotBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2238,16 +1819,10 @@ const struct Item gItems[] = .name = _("HONDEW BERRY"), .itemId = ITEM_HONDEW_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHondewBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2256,16 +1831,10 @@ const struct Item gItems[] = .name = _("GREPA BERRY"), .itemId = ITEM_GREPA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGrepaBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2274,16 +1843,10 @@ const struct Item gItems[] = .name = _("TAMATO BERRY"), .itemId = ITEM_TAMATO_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTamatoBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_ReduceEV, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2292,16 +1855,10 @@ const struct Item gItems[] = .name = _("CORNN BERRY"), .itemId = ITEM_CORNN_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gCornnBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2310,16 +1867,10 @@ const struct Item gItems[] = .name = _("MAGOST BERRY"), .itemId = ITEM_MAGOST_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMagostBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2328,16 +1879,10 @@ const struct Item gItems[] = .name = _("RABUTA BERRY"), .itemId = ITEM_RABUTA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRabutaBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2346,16 +1891,10 @@ const struct Item gItems[] = .name = _("NOMEL BERRY"), .itemId = ITEM_NOMEL_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gNomelBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2364,16 +1903,10 @@ const struct Item gItems[] = .name = _("SPELON BERRY"), .itemId = ITEM_SPELON_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSpelonBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2382,16 +1915,10 @@ const struct Item gItems[] = .name = _("PAMTRE BERRY"), .itemId = ITEM_PAMTRE_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPamtreBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2400,16 +1927,10 @@ const struct Item gItems[] = .name = _("WATMEL BERRY"), .itemId = ITEM_WATMEL_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gWatmelBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2418,16 +1939,10 @@ const struct Item gItems[] = .name = _("DURIN BERRY"), .itemId = ITEM_DURIN_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDurinBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2436,16 +1951,10 @@ const struct Item gItems[] = .name = _("BELUE BERRY"), .itemId = ITEM_BELUE_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBelueBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2457,13 +1966,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ATTACK_UP, .holdEffectParam = 4, .description = gLiechiBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2475,13 +1980,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DEFENSE_UP, .holdEffectParam = 4, .description = gGanlonBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2493,13 +1994,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_SPEED_UP, .holdEffectParam = 4, .description = gSalacBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2511,13 +2008,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_SP_ATTACK_UP, .holdEffectParam = 4, .description = gPetayaBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2529,13 +2022,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_SP_DEFENSE_UP, .holdEffectParam = 4, .description = gApicotBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2547,13 +2036,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_CRITICAL_UP, .holdEffectParam = 4, .description = gLansatBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2565,13 +2050,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_RANDOM_STAT_UP, .holdEffectParam = 4, .description = gStarfBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2580,11 +2061,7 @@ const struct Item gItems[] = .name = _("ENIGMA BERRY"), .itemId = ITEM_ENIGMA_BERRY, .price = 20, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gEnigmaBerryItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_BERRIES, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_EnigmaBerry, @@ -2603,13 +2080,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_EVASION_UP, .holdEffectParam = 10, .description = gBrightPowderItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2619,15 +2092,10 @@ const struct Item gItems[] = .itemId = ITEM_WHITE_HERB, .price = 100, .holdEffect = HOLD_EFFECT_RESTORE_STATS, - .holdEffectParam = 0, .description = gWhiteHerbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2637,15 +2105,10 @@ const struct Item gItems[] = .itemId = ITEM_MACHO_BRACE, .price = 3000, .holdEffect = HOLD_EFFECT_MACHO_BRACE, - .holdEffectParam = 0, .description = gMachoBraceItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2655,15 +2118,10 @@ const struct Item gItems[] = .itemId = ITEM_EXP_SHARE, .price = 3000, .holdEffect = HOLD_EFFECT_EXP_SHARE, - .holdEffectParam = 0, .description = gExpShareItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2675,13 +2133,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_QUICK_CLAW, .holdEffectParam = 20, .description = gQuickClawItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2691,15 +2145,10 @@ const struct Item gItems[] = .itemId = ITEM_SOOTHE_BELL, .price = 100, .holdEffect = HOLD_EFFECT_HAPPINESS_UP, - .holdEffectParam = 0, .description = gSootheBellItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2709,15 +2158,10 @@ const struct Item gItems[] = .itemId = ITEM_MENTAL_HERB, .price = 100, .holdEffect = HOLD_EFFECT_CURE_ATTRACT, - .holdEffectParam = 0, .description = gMentalHerbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2727,15 +2171,10 @@ const struct Item gItems[] = .itemId = ITEM_CHOICE_BAND, .price = 100, .holdEffect = HOLD_EFFECT_CHOICE_BAND, - .holdEffectParam = 0, .description = gChoiceBandItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2747,13 +2186,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FLINCH, .holdEffectParam = 10, .description = gKingsRockItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2765,13 +2200,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_BUG_POWER, .holdEffectParam = 10, .description = gSilverPowderItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2783,13 +2214,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DOUBLE_PRIZE, .holdEffectParam = 10, .description = gAmuletCoinItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2799,15 +2226,10 @@ const struct Item gItems[] = .itemId = ITEM_CLEANSE_TAG, .price = 200, .holdEffect = HOLD_EFFECT_REPEL, - .holdEffectParam = 0, .description = gCleanseTagItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2817,15 +2239,10 @@ const struct Item gItems[] = .itemId = ITEM_SOUL_DEW, .price = 200, .holdEffect = HOLD_EFFECT_SOUL_DEW, - .holdEffectParam = 0, .description = gSoulDewItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2835,15 +2252,10 @@ const struct Item gItems[] = .itemId = ITEM_DEEP_SEA_TOOTH, .price = 200, .holdEffect = HOLD_EFFECT_DEEP_SEA_TOOTH, - .holdEffectParam = 0, .description = gDeepSeaToothItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2853,15 +2265,10 @@ const struct Item gItems[] = .itemId = ITEM_DEEP_SEA_SCALE, .price = 200, .holdEffect = HOLD_EFFECT_DEEP_SEA_SCALE, - .holdEffectParam = 0, .description = gDeepSeaScaleItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2871,15 +2278,10 @@ const struct Item gItems[] = .itemId = ITEM_SMOKE_BALL, .price = 200, .holdEffect = HOLD_EFFECT_CAN_ALWAYS_RUN, - .holdEffectParam = 0, .description = gSmokeBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2889,15 +2291,10 @@ const struct Item gItems[] = .itemId = ITEM_EVERSTONE, .price = 200, .holdEffect = HOLD_EFFECT_PREVENT_EVOLVE, - .holdEffectParam = 0, .description = gEverstoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2909,13 +2306,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FOCUS_BAND, .holdEffectParam = 10, .description = gFocusBandItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2925,15 +2318,10 @@ const struct Item gItems[] = .itemId = ITEM_LUCKY_EGG, .price = 200, .holdEffect = HOLD_EFFECT_LUCKY_EGG, - .holdEffectParam = 0, .description = gLuckyEggItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2943,15 +2331,10 @@ const struct Item gItems[] = .itemId = ITEM_SCOPE_LENS, .price = 200, .holdEffect = HOLD_EFFECT_SCOPE_LENS, - .holdEffectParam = 0, .description = gScopeLensItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2963,13 +2346,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_STEEL_POWER, .holdEffectParam = 10, .description = gMetalCoatItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2981,13 +2360,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_LEFTOVERS, .holdEffectParam = 10, .description = gLeftoversItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -2999,13 +2374,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DRAGON_SCALE, .holdEffectParam = 10, .description = gDragonScaleItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3015,15 +2386,10 @@ const struct Item gItems[] = .itemId = ITEM_LIGHT_BALL, .price = 100, .holdEffect = HOLD_EFFECT_LIGHT_BALL, - .holdEffectParam = 0, .description = gLightBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3035,13 +2401,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_GROUND_POWER, .holdEffectParam = 10, .description = gSoftSandItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3053,13 +2415,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ROCK_POWER, .holdEffectParam = 10, .description = gHardStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3071,13 +2429,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_GRASS_POWER, .holdEffectParam = 10, .description = gMiracleSeedItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3089,13 +2443,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DARK_POWER, .holdEffectParam = 10, .description = gBlackGlassesItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3107,13 +2457,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FIGHTING_POWER, .holdEffectParam = 10, .description = gBlackBeltItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3125,13 +2471,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, .holdEffectParam = 10, .description = gMagnetItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3143,13 +2485,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 10, .description = gMysticWaterItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3161,13 +2499,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FLYING_POWER, .holdEffectParam = 10, .description = gSharpBeakItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3179,13 +2513,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_POISON_POWER, .holdEffectParam = 10, .description = gPoisonBarbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3197,13 +2527,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ICE_POWER, .holdEffectParam = 10, .description = gNeverMeltIceItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3215,13 +2541,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_GHOST_POWER, .holdEffectParam = 10, .description = gSpellTagItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3233,13 +2555,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, .holdEffectParam = 10, .description = gTwistedSpoonItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3251,13 +2569,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FIRE_POWER, .holdEffectParam = 10, .description = gCharcoalItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3269,13 +2583,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DRAGON_POWER, .holdEffectParam = 10, .description = gDragonFangItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3287,13 +2597,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_NORMAL_POWER, .holdEffectParam = 10, .description = gSilkScarfItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3303,15 +2609,10 @@ const struct Item gItems[] = .itemId = ITEM_UP_GRADE, .price = 2100, .holdEffect = HOLD_EFFECT_UP_GRADE, - .holdEffectParam = 0, .description = gUpGradeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3323,13 +2624,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_SHELL_BELL, .holdEffectParam = 8, .description = gShellBellItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3341,13 +2638,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 5, .description = gSeaIncenseItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3359,13 +2652,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_EVASION_UP, .holdEffectParam = 5, .description = gLaxIncenseItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3375,15 +2664,10 @@ const struct Item gItems[] = .itemId = ITEM_LUCKY_PUNCH, .price = 10, .holdEffect = HOLD_EFFECT_LUCKY_PUNCH, - .holdEffectParam = 0, .description = gLuckyPunchItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3393,15 +2677,10 @@ const struct Item gItems[] = .itemId = ITEM_METAL_POWDER, .price = 10, .holdEffect = HOLD_EFFECT_METAL_POWDER, - .holdEffectParam = 0, .description = gMetalPowderItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3411,15 +2690,10 @@ const struct Item gItems[] = .itemId = ITEM_THICK_CLUB, .price = 500, .holdEffect = HOLD_EFFECT_THICK_CLUB, - .holdEffectParam = 0, .description = gThickClubItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3429,15 +2703,10 @@ const struct Item gItems[] = .itemId = ITEM_STICK, .price = 200, .holdEffect = HOLD_EFFECT_STICK, - .holdEffectParam = 0, .description = gStickItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3446,16 +2715,10 @@ const struct Item gItems[] = .name = _("RED SCARF"), .itemId = ITEM_RED_SCARF, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRedScarfItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3464,16 +2727,10 @@ const struct Item gItems[] = .name = _("BLUE SCARF"), .itemId = ITEM_BLUE_SCARF, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBlueScarfItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3482,16 +2739,10 @@ const struct Item gItems[] = .name = _("PINK SCARF"), .itemId = ITEM_PINK_SCARF, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPinkScarfItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3500,16 +2751,10 @@ const struct Item gItems[] = .name = _("GREEN SCARF"), .itemId = ITEM_GREEN_SCARF, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGreenScarfItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3518,16 +2763,10 @@ const struct Item gItems[] = .name = _("YELLOW SCARF"), .itemId = ITEM_YELLOW_SCARF, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gYellowScarfItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3538,16 +2777,12 @@ const struct Item gItems[] = .name = _("MACH BIKE"), .itemId = ITEM_MACH_BIKE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMachBikeItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Bike, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3556,16 +2791,11 @@ const struct Item gItems[] = .name = _("COIN CASE"), .itemId = ITEM_COIN_CASE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gCoinCaseItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CoinCase, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3574,16 +2804,12 @@ const struct Item gItems[] = .name = _("ITEMFINDER"), .itemId = ITEM_ITEMFINDER, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gItemfinderItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Itemfinder, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3592,16 +2818,12 @@ const struct Item gItems[] = .name = _("OLD ROD"), .itemId = ITEM_OLD_ROD, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gOldRodItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3610,16 +2832,12 @@ const struct Item gItems[] = .name = _("GOOD ROD"), .itemId = ITEM_GOOD_ROD, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGoodRodItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 1, }, @@ -3628,16 +2846,12 @@ const struct Item gItems[] = .name = _("SUPER ROD"), .itemId = ITEM_SUPER_ROD, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSuperRodItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Rod, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 2, }, @@ -3646,16 +2860,11 @@ const struct Item gItems[] = .name = _("S.S. TICKET"), .itemId = ITEM_SS_TICKET, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSSTicketItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3664,16 +2873,11 @@ const struct Item gItems[] = .name = _("CONTEST PASS"), .itemId = ITEM_CONTEST_PASS, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gContestPassItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3682,16 +2886,11 @@ const struct Item gItems[] = .name = _("WAILMER PAIL"), .itemId = ITEM_WAILMER_PAIL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gWailmerPailItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_WailmerPail, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3700,16 +2899,11 @@ const struct Item gItems[] = .name = _("DEVON GOODS"), .itemId = ITEM_DEVON_GOODS, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDevonGoodsItemDescription, .importance = 2, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3718,16 +2912,11 @@ const struct Item gItems[] = .name = _("SOOT SACK"), .itemId = ITEM_SOOT_SACK, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSootSackItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3736,16 +2925,11 @@ const struct Item gItems[] = .name = _("BASEMENT KEY"), .itemId = ITEM_BASEMENT_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBasementKeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3754,16 +2938,12 @@ const struct Item gItems[] = .name = _("ACRO BIKE"), .itemId = ITEM_ACRO_BIKE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gAcroBikeItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_Bike, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 1, }, @@ -3772,16 +2952,12 @@ const struct Item gItems[] = .name = _("{POKEBLOCK} CASE"), .itemId = ITEM_POKEBLOCK_CASE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPokeblockCaseItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 3, .fieldUseFunc = ItemUseOutOfBattle_PokeblockCase, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3790,16 +2966,11 @@ const struct Item gItems[] = .name = _("LETTER"), .itemId = ITEM_LETTER, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gLetterItemDescription, .importance = 2, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3808,16 +2979,11 @@ const struct Item gItems[] = .name = _("EON TICKET"), .itemId = ITEM_EON_TICKET, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gEonTicketItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 1, }, @@ -3826,16 +2992,11 @@ const struct Item gItems[] = .name = _("RED ORB"), .itemId = ITEM_RED_ORB, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRedOrbItemDescription, .importance = 2, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3844,16 +3005,11 @@ const struct Item gItems[] = .name = _("BLUE ORB"), .itemId = ITEM_BLUE_ORB, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBlueOrbItemDescription, .importance = 2, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3862,16 +3018,11 @@ const struct Item gItems[] = .name = _("SCANNER"), .itemId = ITEM_SCANNER, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gScannerItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3880,16 +3031,11 @@ const struct Item gItems[] = .name = _("GO-GOGGLES"), .itemId = ITEM_GO_GOGGLES, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGoGogglesItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3898,16 +3044,11 @@ const struct Item gItems[] = .name = _("METEORITE"), .itemId = ITEM_METEORITE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMeteoriteItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3916,16 +3057,11 @@ const struct Item gItems[] = .name = _("RM. 1 KEY"), .itemId = ITEM_ROOM_1_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRoom1KeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3934,16 +3070,11 @@ const struct Item gItems[] = .name = _("RM. 2 KEY"), .itemId = ITEM_ROOM_2_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRoom2KeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3952,16 +3083,11 @@ const struct Item gItems[] = .name = _("RM. 4 KEY"), .itemId = ITEM_ROOM_4_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRoom4KeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3970,16 +3096,11 @@ const struct Item gItems[] = .name = _("RM. 6 KEY"), .itemId = ITEM_ROOM_6_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRoom6KeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -3988,16 +3109,11 @@ const struct Item gItems[] = .name = _("STORAGE KEY"), .itemId = ITEM_STORAGE_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gStorageKeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4006,16 +3122,11 @@ const struct Item gItems[] = .name = _("ROOT FOSSIL"), .itemId = ITEM_ROOT_FOSSIL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRootFossilItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4024,16 +3135,11 @@ const struct Item gItems[] = .name = _("CLAW FOSSIL"), .itemId = ITEM_CLAW_FOSSIL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gClawFossilItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4042,16 +3148,11 @@ const struct Item gItems[] = .name = _("DEVON SCOPE"), .itemId = ITEM_DEVON_SCOPE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDevonScopeItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4062,16 +3163,10 @@ const struct Item gItems[] = .name = _("TM01"), .itemId = ITEM_TM01_FOCUS_PUNCH, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM01ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4080,16 +3175,10 @@ const struct Item gItems[] = .name = _("TM02"), .itemId = ITEM_TM02_DRAGON_CLAW, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM02ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4098,16 +3187,10 @@ const struct Item gItems[] = .name = _("TM03"), .itemId = ITEM_TM03_WATER_PULSE, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM03ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4116,16 +3199,10 @@ const struct Item gItems[] = .name = _("TM04"), .itemId = ITEM_TM04_CALM_MIND, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM04ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4134,16 +3211,10 @@ const struct Item gItems[] = .name = _("TM05"), .itemId = ITEM_TM05_ROAR, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM05ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4152,16 +3223,10 @@ const struct Item gItems[] = .name = _("TM06"), .itemId = ITEM_TM06_TOXIC, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM06ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4170,16 +3235,10 @@ const struct Item gItems[] = .name = _("TM07"), .itemId = ITEM_TM07_HAIL, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM07ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4188,16 +3247,10 @@ const struct Item gItems[] = .name = _("TM08"), .itemId = ITEM_TM08_BULK_UP, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM08ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4206,16 +3259,10 @@ const struct Item gItems[] = .name = _("TM09"), .itemId = ITEM_TM09_BULLET_SEED, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM09ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4224,16 +3271,10 @@ const struct Item gItems[] = .name = _("TM10"), .itemId = ITEM_TM10_HIDDEN_POWER, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM10ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4242,16 +3283,10 @@ const struct Item gItems[] = .name = _("TM11"), .itemId = ITEM_TM11_SUNNY_DAY, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM11ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4260,16 +3295,10 @@ const struct Item gItems[] = .name = _("TM12"), .itemId = ITEM_TM12_TAUNT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM12ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4278,16 +3307,10 @@ const struct Item gItems[] = .name = _("TM13"), .itemId = ITEM_TM13_ICE_BEAM, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM13ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4296,16 +3319,10 @@ const struct Item gItems[] = .name = _("TM14"), .itemId = ITEM_TM14_BLIZZARD, .price = 5500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM14ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4314,16 +3331,10 @@ const struct Item gItems[] = .name = _("TM15"), .itemId = ITEM_TM15_HYPER_BEAM, .price = 7500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM15ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4332,16 +3343,10 @@ const struct Item gItems[] = .name = _("TM16"), .itemId = ITEM_TM16_LIGHT_SCREEN, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM16ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4350,16 +3355,10 @@ const struct Item gItems[] = .name = _("TM17"), .itemId = ITEM_TM17_PROTECT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM17ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4368,16 +3367,10 @@ const struct Item gItems[] = .name = _("TM18"), .itemId = ITEM_TM18_RAIN_DANCE, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM18ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4386,16 +3379,10 @@ const struct Item gItems[] = .name = _("TM19"), .itemId = ITEM_TM19_GIGA_DRAIN, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM19ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4404,16 +3391,10 @@ const struct Item gItems[] = .name = _("TM20"), .itemId = ITEM_TM20_SAFEGUARD, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM20ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4422,16 +3403,10 @@ const struct Item gItems[] = .name = _("TM21"), .itemId = ITEM_TM21_FRUSTRATION, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM21ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4440,16 +3415,10 @@ const struct Item gItems[] = .name = _("TM22"), .itemId = ITEM_TM22_SOLARBEAM, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM22ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4458,16 +3427,10 @@ const struct Item gItems[] = .name = _("TM23"), .itemId = ITEM_TM23_IRON_TAIL, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM23ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4476,16 +3439,10 @@ const struct Item gItems[] = .name = _("TM24"), .itemId = ITEM_TM24_THUNDERBOLT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM24ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4494,16 +3451,10 @@ const struct Item gItems[] = .name = _("TM25"), .itemId = ITEM_TM25_THUNDER, .price = 5500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM25ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4512,16 +3463,10 @@ const struct Item gItems[] = .name = _("TM26"), .itemId = ITEM_TM26_EARTHQUAKE, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM26ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4530,16 +3475,10 @@ const struct Item gItems[] = .name = _("TM27"), .itemId = ITEM_TM27_RETURN, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM27ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4548,16 +3487,10 @@ const struct Item gItems[] = .name = _("TM28"), .itemId = ITEM_TM28_DIG, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM28ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4566,16 +3499,10 @@ const struct Item gItems[] = .name = _("TM29"), .itemId = ITEM_TM29_PSYCHIC, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM29ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4584,16 +3511,10 @@ const struct Item gItems[] = .name = _("TM30"), .itemId = ITEM_TM30_SHADOW_BALL, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM30ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4602,16 +3523,10 @@ const struct Item gItems[] = .name = _("TM31"), .itemId = ITEM_TM31_BRICK_BREAK, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM31ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4620,16 +3535,10 @@ const struct Item gItems[] = .name = _("TM32"), .itemId = ITEM_TM32_DOUBLE_TEAM, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM32ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4638,16 +3547,10 @@ const struct Item gItems[] = .name = _("TM33"), .itemId = ITEM_TM33_REFLECT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM33ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4656,16 +3559,10 @@ const struct Item gItems[] = .name = _("TM34"), .itemId = ITEM_TM34_SHOCK_WAVE, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM34ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4674,16 +3571,10 @@ const struct Item gItems[] = .name = _("TM35"), .itemId = ITEM_TM35_FLAMETHROWER, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM35ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4692,16 +3583,10 @@ const struct Item gItems[] = .name = _("TM36"), .itemId = ITEM_TM36_SLUDGE_BOMB, .price = 1000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM36ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4710,16 +3595,10 @@ const struct Item gItems[] = .name = _("TM37"), .itemId = ITEM_TM37_SANDSTORM, .price = 2000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM37ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4728,16 +3607,10 @@ const struct Item gItems[] = .name = _("TM38"), .itemId = ITEM_TM38_FIRE_BLAST, .price = 5500, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM38ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4746,16 +3619,10 @@ const struct Item gItems[] = .name = _("TM39"), .itemId = ITEM_TM39_ROCK_TOMB, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM39ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4764,16 +3631,10 @@ const struct Item gItems[] = .name = _("TM40"), .itemId = ITEM_TM40_AERIAL_ACE, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM40ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4782,16 +3643,10 @@ const struct Item gItems[] = .name = _("TM41"), .itemId = ITEM_TM41_TORMENT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM41ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4800,16 +3655,10 @@ const struct Item gItems[] = .name = _("TM42"), .itemId = ITEM_TM42_FACADE, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM42ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4818,16 +3667,10 @@ const struct Item gItems[] = .name = _("TM43"), .itemId = ITEM_TM43_SECRET_POWER, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM43ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4836,16 +3679,10 @@ const struct Item gItems[] = .name = _("TM44"), .itemId = ITEM_TM44_REST, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM44ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4854,16 +3691,10 @@ const struct Item gItems[] = .name = _("TM45"), .itemId = ITEM_TM45_ATTRACT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM45ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4872,16 +3703,10 @@ const struct Item gItems[] = .name = _("TM46"), .itemId = ITEM_TM46_THIEF, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM46ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4890,16 +3715,10 @@ const struct Item gItems[] = .name = _("TM47"), .itemId = ITEM_TM47_STEEL_WING, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM47ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4908,16 +3727,10 @@ const struct Item gItems[] = .name = _("TM48"), .itemId = ITEM_TM48_SKILL_SWAP, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM48ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4926,16 +3739,10 @@ const struct Item gItems[] = .name = _("TM49"), .itemId = ITEM_TM49_SNATCH, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM49ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4944,16 +3751,10 @@ const struct Item gItems[] = .name = _("TM50"), .itemId = ITEM_TM50_OVERHEAT, .price = 3000, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTM50ItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4962,16 +3763,11 @@ const struct Item gItems[] = .name = _("HM01"), .itemId = ITEM_HM01_CUT, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM01ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4980,16 +3776,11 @@ const struct Item gItems[] = .name = _("HM02"), .itemId = ITEM_HM02_FLY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM02ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -4998,16 +3789,11 @@ const struct Item gItems[] = .name = _("HM03"), .itemId = ITEM_HM03_SURF, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM03ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5016,16 +3802,11 @@ const struct Item gItems[] = .name = _("HM04"), .itemId = ITEM_HM04_STRENGTH, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM04ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5034,16 +3815,11 @@ const struct Item gItems[] = .name = _("HM05"), .itemId = ITEM_HM05_FLASH, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM05ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5052,16 +3828,11 @@ const struct Item gItems[] = .name = _("HM06"), .itemId = ITEM_HM06_ROCK_SMASH, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM06ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5070,16 +3841,11 @@ const struct Item gItems[] = .name = _("HM07"), .itemId = ITEM_HM07_WATERFALL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM07ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5088,16 +3854,11 @@ const struct Item gItems[] = .name = _("HM08"), .itemId = ITEM_HM08_DIVE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHM08ItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_TM_HM, .type = 1, .fieldUseFunc = ItemUseOutOfBattle_TMHM, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5108,16 +3869,11 @@ const struct Item gItems[] = .name = _("OAK'S PARCEL"), .itemId = ITEM_OAKS_PARCEL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gOaksParcelItemDescription, .importance = 2, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5126,16 +3882,11 @@ const struct Item gItems[] = .name = _("POKé FLUTE"), .itemId = ITEM_POKE_FLUTE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPokeFluteItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5144,16 +3895,11 @@ const struct Item gItems[] = .name = _("SECRET KEY"), .itemId = ITEM_SECRET_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSecretKeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5162,16 +3908,11 @@ const struct Item gItems[] = .name = _("BIKE VOUCHER"), .itemId = ITEM_BIKE_VOUCHER, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBikeVoucherItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5180,16 +3921,11 @@ const struct Item gItems[] = .name = _("GOLD TEETH"), .itemId = ITEM_GOLD_TEETH, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gGoldTeethItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5198,16 +3934,11 @@ const struct Item gItems[] = .name = _("OLD AMBER"), .itemId = ITEM_OLD_AMBER, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gOldAmberItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5216,16 +3947,11 @@ const struct Item gItems[] = .name = _("CARD KEY"), .itemId = ITEM_CARD_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gCardKeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5234,16 +3960,11 @@ const struct Item gItems[] = .name = _("LIFT KEY"), .itemId = ITEM_LIFT_KEY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gLiftKeyItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5252,16 +3973,11 @@ const struct Item gItems[] = .name = _("HELIX FOSSIL"), .itemId = ITEM_HELIX_FOSSIL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHelixFossilItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5270,16 +3986,11 @@ const struct Item gItems[] = .name = _("DOME FOSSIL"), .itemId = ITEM_DOME_FOSSIL, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gDomeFossilItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5288,16 +3999,11 @@ const struct Item gItems[] = .name = _("SILPH SCOPE"), .itemId = ITEM_SILPH_SCOPE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSilphScopeItemDescription, .importance = 1, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5306,16 +4012,12 @@ const struct Item gItems[] = .name = _("BICYCLE"), .itemId = ITEM_BICYCLE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBicycleItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5324,16 +4026,12 @@ const struct Item gItems[] = .name = _("TOWN MAP"), .itemId = ITEM_TOWN_MAP, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTownMapItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5342,16 +4040,12 @@ const struct Item gItems[] = .name = _("VS SEEKER"), .itemId = ITEM_VS_SEEKER, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gVSSeekerItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5360,16 +4054,12 @@ const struct Item gItems[] = .name = _("FAME CHECKER"), .itemId = ITEM_FAME_CHECKER, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gFameCheckerItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5378,16 +4068,12 @@ const struct Item gItems[] = .name = _("TM CASE"), .itemId = ITEM_TM_CASE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTMCaseItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5396,16 +4082,12 @@ const struct Item gItems[] = .name = _("BERRY POUCH"), .itemId = ITEM_BERRY_POUCH, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gBerryPouchItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5414,16 +4096,12 @@ const struct Item gItems[] = .name = _("TEACHY TV"), .itemId = ITEM_TEACHY_TV, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTeachyTVItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 2, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5432,16 +4110,12 @@ const struct Item gItems[] = .name = _("TRI-PASS"), .itemId = ITEM_TRI_PASS, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTriPassItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5450,16 +4124,12 @@ const struct Item gItems[] = .name = _("RAINBOW PASS"), .itemId = ITEM_RAINBOW_PASS, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRainbowPassItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5468,16 +4138,12 @@ const struct Item gItems[] = .name = _("TEA"), .itemId = ITEM_TEA, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gTeaItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5486,16 +4152,12 @@ const struct Item gItems[] = .name = _("MYSTICTICKET"), .itemId = ITEM_MYSTIC_TICKET, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMysticTicketItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5504,16 +4166,12 @@ const struct Item gItems[] = .name = _("AURORATICKET"), .itemId = ITEM_AURORA_TICKET, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gAuroraTicketItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5522,16 +4180,12 @@ const struct Item gItems[] = .name = _("POWDER JAR"), .itemId = ITEM_POWDER_JAR, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gPowderJarItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_PowderJar, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5540,16 +4194,12 @@ const struct Item gItems[] = .name = _("RUBY"), .itemId = ITEM_RUBY, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gRubyItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5558,16 +4208,12 @@ const struct Item gItems[] = .name = _("SAPPHIRE"), .itemId = ITEM_SAPPHIRE, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gSapphireItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5578,16 +4224,12 @@ const struct Item gItems[] = .name = _("MAGMA EMBLEM"), .itemId = ITEM_MAGMA_EMBLEM, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMagmaEmblemItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5596,16 +4238,12 @@ const struct Item gItems[] = .name = _("OLD SEA MAP"), .itemId = ITEM_OLD_SEA_MAP, .price = 0, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gOldSeaMapItemDescription, .importance = 1, .unk19 = 1, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5619,13 +4257,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_WIDE_LENS, .holdEffectParam = 10, .description = gWideLensItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5637,13 +4271,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_MUSCLE_BAND, .holdEffectParam = 10, .description = gMuscleBandItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5655,13 +4285,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_WISE_GLASSES, .holdEffectParam = 10, .description = gWiseGlassesItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5673,13 +4299,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_EXPERT_BELT, .holdEffectParam = 20, .description = gExpertBeltItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5689,15 +4311,10 @@ const struct Item gItems[] = .itemId = ITEM_LIGHT_CLAY, .price = 200, .holdEffect = HOLD_EFFECT_LIGHT_CLAY, - .holdEffectParam = 0, .description = gLightClayItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5707,15 +4324,10 @@ const struct Item gItems[] = .itemId = ITEM_LIFE_ORB, .price = 200, .holdEffect = HOLD_EFFECT_LIFE_ORB, - .holdEffectParam = 0, .description = gLifeOrbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5725,15 +4337,10 @@ const struct Item gItems[] = .itemId = ITEM_POWER_HERB, .price = 200, .holdEffect = HOLD_EFFECT_POWER_HERB, - .holdEffectParam = 0, .description = gPowerHerbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5743,15 +4350,10 @@ const struct Item gItems[] = .itemId = ITEM_TOXIC_ORB, .price = 200, .holdEffect = HOLD_EFFECT_TOXIC_ORB, - .holdEffectParam = 0, .description = gToxicOrbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5761,15 +4363,10 @@ const struct Item gItems[] = .itemId = ITEM_FLAME_ORB, .price = 200, .holdEffect = HOLD_EFFECT_FLAME_ORB, - .holdEffectParam = 0, .description = gFlameOrbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5779,15 +4376,10 @@ const struct Item gItems[] = .itemId = ITEM_QUICK_POWDER, .price = 200, .holdEffect = HOLD_EFFECT_QUICK_POWDER, - .holdEffectParam = 0, .description = gQuickPowderItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5797,15 +4389,10 @@ const struct Item gItems[] = .itemId = ITEM_FOCUS_SASH, .price = 200, .holdEffect = HOLD_EFFECT_FOCUS_SASH, - .holdEffectParam = 0, .description = gFocusSashItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5817,13 +4404,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ZOOM_LENS, .holdEffectParam = 20, .description = gZoomLensItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5835,13 +4418,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_METRONOME, .holdEffectParam = 20, .description = gMetronomeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5851,15 +4430,10 @@ const struct Item gItems[] = .itemId = ITEM_IRON_BALL, .price = 200, .holdEffect = HOLD_EFFECT_IRON_BALL, - .holdEffectParam = 0, .description = gIronBallItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5869,15 +4443,10 @@ const struct Item gItems[] = .itemId = ITEM_LAGGING_TAIL, .price = 200, .holdEffect = HOLD_EFFECT_LAGGING_TAIL, - .holdEffectParam = 0, .description = gLaggingTailItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5887,15 +4456,10 @@ const struct Item gItems[] = .itemId = ITEM_DESTINY_KNOT, .price = 200, .holdEffect = HOLD_EFFECT_DESTINY_KNOT, - .holdEffectParam = 0, .description = gDestinyKnotItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5905,15 +4469,10 @@ const struct Item gItems[] = .itemId = ITEM_BLACK_SLUDGE, .price = 200, .holdEffect = HOLD_EFFECT_BLACK_SLUDGE, - .holdEffectParam = 0, .description = gBlackSludgeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5923,15 +4482,10 @@ const struct Item gItems[] = .itemId = ITEM_ICY_ROCK, .price = 200, .holdEffect = HOLD_EFFECT_ICY_ROCK, - .holdEffectParam = 0, .description = gIcyRockItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5941,15 +4495,10 @@ const struct Item gItems[] = .itemId = ITEM_SMOOTH_ROCK, .price = 200, .holdEffect = HOLD_EFFECT_SMOOTH_ROCK, - .holdEffectParam = 0, .description = gSmoothRockItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5959,15 +4508,10 @@ const struct Item gItems[] = .itemId = ITEM_HEAT_ROCK, .price = 200, .holdEffect = HOLD_EFFECT_HEAT_ROCK, - .holdEffectParam = 0, .description = gHeatRockItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5977,15 +4521,10 @@ const struct Item gItems[] = .itemId = ITEM_DAMP_ROCK, .price = 200, .holdEffect = HOLD_EFFECT_DAMP_ROCK, - .holdEffectParam = 0, .description = gDampRockItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -5995,15 +4534,10 @@ const struct Item gItems[] = .itemId = ITEM_GRIP_CLAW, .price = 200, .holdEffect = HOLD_EFFECT_GRIP_CLAW, - .holdEffectParam = 0, .description = gGripClawItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6013,15 +4547,10 @@ const struct Item gItems[] = .itemId = ITEM_CHOICE_SCARF, .price = 200, .holdEffect = HOLD_EFFECT_CHOICE_SCARF, - .holdEffectParam = 0, .description = gChoiceScarfItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6031,15 +4560,10 @@ const struct Item gItems[] = .itemId = ITEM_STICKY_BARB, .price = 200, .holdEffect = HOLD_EFFECT_STICKY_BARB, - .holdEffectParam = 0, .description = gStickyBarbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6049,15 +4573,10 @@ const struct Item gItems[] = .itemId = ITEM_SHED_SHELL, .price = 200, .holdEffect = HOLD_EFFECT_SHED_SHELL, - .holdEffectParam = 0, .description = gShedShellItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6069,13 +4588,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_BIG_ROOT, .holdEffectParam = 30, .description = gBigRootItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6085,15 +4600,10 @@ const struct Item gItems[] = .itemId = ITEM_CHOICE_SPECS, .price = 200, .holdEffect = HOLD_EFFECT_CHOICE_SPECS, - .holdEffectParam = 0, .description = gChoiceSpecsItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6103,15 +4613,10 @@ const struct Item gItems[] = .itemId = ITEM_ADAMANT_ORB, .price = 200, .holdEffect = HOLD_EFFECT_ADAMANT_ORB, - .holdEffectParam = 0, .description = gAdamantOrbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6121,15 +4626,10 @@ const struct Item gItems[] = .itemId = ITEM_LUSTROUS_ORB, .price = 200, .holdEffect = HOLD_EFFECT_LUSTROUS_ORB, - .holdEffectParam = 0, .description = gLustrousOrbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6139,15 +4639,10 @@ const struct Item gItems[] = .itemId = ITEM_GRISEOUS_ORB, .price = 200, .holdEffect = HOLD_EFFECT_GRISEOUS_ORB, - .holdEffectParam = 0, .description = gGriseousOrbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6159,13 +4654,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FIRE_POWER, .holdEffectParam = 20, .description = gFlamePlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6177,13 +4668,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_WATER_POWER, .holdEffectParam = 20, .description = gSplashPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6195,13 +4682,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ELECTRIC_POWER, .holdEffectParam = 20, .description = gZapPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6213,13 +4696,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_GRASS_POWER, .holdEffectParam = 20, .description = gMeadowPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6231,13 +4710,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ICE_POWER, .holdEffectParam = 20, .description = gIciclePlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6249,13 +4724,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FIGHTING_POWER, .holdEffectParam = 20, .description = gFistPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6267,13 +4738,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_POISON_POWER, .holdEffectParam = 20, .description = gToxicPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6285,13 +4752,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_GROUND_POWER, .holdEffectParam = 20, .description = gEarthPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6303,13 +4766,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FLYING_POWER, .holdEffectParam = 20, .description = gSkyPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6321,13 +4780,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_PSYCHIC_POWER, .holdEffectParam = 20, .description = gMindPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6339,13 +4794,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_BUG_POWER, .holdEffectParam = 20, .description = gInsectPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6357,13 +4808,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ROCK_POWER, .holdEffectParam = 20, .description = gStonePlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6375,13 +4822,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_GHOST_POWER, .holdEffectParam = 20, .description = gSpookyPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6393,13 +4836,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DRAGON_POWER, .holdEffectParam = 20, .description = gDracoPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6411,13 +4850,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_DARK_POWER, .holdEffectParam = 20, .description = gDreadPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6429,13 +4864,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_STEEL_POWER, .holdEffectParam = 20, .description = gIronPlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6447,13 +4878,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_EVIOLITE, .holdEffectParam = 50, .description = gEvioliteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6463,15 +4890,10 @@ const struct Item gItems[] = .itemId = ITEM_FLOAT_STONE, .price = 200, .holdEffect = HOLD_EFFECT_FLOAT_STONE, - .holdEffectParam = 0, .description = gFloatStoneItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6481,15 +4903,10 @@ const struct Item gItems[] = .itemId = ITEM_BINDING_BAND, .price = 200, .holdEffect = HOLD_EFFECT_BINDING_BAND, - .holdEffectParam = 0, .description = gBindingBandItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6499,15 +4916,10 @@ const struct Item gItems[] = .itemId = ITEM_DOUSE_DRIVE, .price = 200, .holdEffect = HOLD_EFFECT_DRIVE, - .holdEffectParam = 0, .description = gDouseDriveItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6517,15 +4929,10 @@ const struct Item gItems[] = .itemId = ITEM_SHOCK_DRIVE, .price = 200, .holdEffect = HOLD_EFFECT_DRIVE, - .holdEffectParam = 0, .description = gShockDriveItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6535,15 +4942,10 @@ const struct Item gItems[] = .itemId = ITEM_BURN_DRIVE, .price = 200, .holdEffect = HOLD_EFFECT_DRIVE, - .holdEffectParam = 0, .description = gBurnDriveItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6553,15 +4955,10 @@ const struct Item gItems[] = .itemId = ITEM_CHILL_DRIVE, .price = 200, .holdEffect = HOLD_EFFECT_DRIVE, - .holdEffectParam = 0, .description = gChillDriveItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6571,15 +4968,10 @@ const struct Item gItems[] = .itemId = ITEM_FIRE_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gFireGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6589,15 +4981,10 @@ const struct Item gItems[] = .itemId = ITEM_WATER_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gWaterGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6607,15 +4994,10 @@ const struct Item gItems[] = .itemId = ITEM_ELECTRIC_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gElectricGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6625,15 +5007,10 @@ const struct Item gItems[] = .itemId = ITEM_GRASS_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gGrassGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6643,15 +5020,10 @@ const struct Item gItems[] = .itemId = ITEM_ICE_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gIceGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6661,15 +5033,10 @@ const struct Item gItems[] = .itemId = ITEM_FIGHTING_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gFightingGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6679,15 +5046,10 @@ const struct Item gItems[] = .itemId = ITEM_POISON_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gPoisonGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6697,15 +5059,10 @@ const struct Item gItems[] = .itemId = ITEM_GROUND_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gGroundGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6715,15 +5072,10 @@ const struct Item gItems[] = .itemId = ITEM_FLYING_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gFlyingGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6733,15 +5085,10 @@ const struct Item gItems[] = .itemId = ITEM_PSYCHIC_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gPsychicGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6751,15 +5098,10 @@ const struct Item gItems[] = .itemId = ITEM_BUG_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gBugGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6769,15 +5111,10 @@ const struct Item gItems[] = .itemId = ITEM_ROCK_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gRockGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6787,15 +5124,10 @@ const struct Item gItems[] = .itemId = ITEM_GHOST_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gGhostGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6805,15 +5137,10 @@ const struct Item gItems[] = .itemId = ITEM_DRAGON_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gDragonGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6823,15 +5150,10 @@ const struct Item gItems[] = .itemId = ITEM_DARK_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gDarkGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6841,15 +5163,10 @@ const struct Item gItems[] = .itemId = ITEM_STEEL_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gSteelGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6859,15 +5176,10 @@ const struct Item gItems[] = .itemId = ITEM_NORMAL_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gNormalGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6877,15 +5189,10 @@ const struct Item gItems[] = .itemId = ITEM_FAIRY_GEM, .price = 200, .holdEffect = HOLD_EFFECT_GEMS, - .holdEffectParam = 0, .description = gFairyGemItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6897,13 +5204,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_ASSAULT_VEST, .holdEffectParam = 50, .description = gAssaultVestItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6915,13 +5218,9 @@ const struct Item gItems[] = .holdEffect = HOLD_EFFECT_FAIRY_POWER, .holdEffectParam = 20, .description = gPixiePlateItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6931,15 +5230,10 @@ const struct Item gItems[] = .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, }, @@ -6949,15 +5243,10 @@ const struct Item gItems[] = .itemId = ITEM_GENGARITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gGengariteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6967,15 +5256,10 @@ const struct Item gItems[] = .itemId = ITEM_GARDEVOIRITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gGardevoiriteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -6985,15 +5269,10 @@ const struct Item gItems[] = .itemId = ITEM_AMPHAROSITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAmpharositeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7003,15 +5282,10 @@ const struct Item gItems[] = .itemId = ITEM_VENUSAURITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gVenusauriteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7021,15 +5295,10 @@ const struct Item gItems[] = .itemId = ITEM_CHARIZARDITE_X, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gCharizarditeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7039,15 +5308,10 @@ const struct Item gItems[] = .itemId = ITEM_BLASTOISINITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gBlastoisiniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7057,15 +5321,10 @@ const struct Item gItems[] = .itemId = ITEM_MEWTWONITE_X, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gMewtwoniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7075,15 +5334,10 @@ const struct Item gItems[] = .itemId = ITEM_MEWTWONITE_Y, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gMewtwoniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7093,15 +5347,10 @@ const struct Item gItems[] = .itemId = ITEM_BLAZIKENITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gBlazikeniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7111,15 +5360,10 @@ const struct Item gItems[] = .itemId = ITEM_MEDICHAMITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gMedichamiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7129,15 +5373,10 @@ const struct Item gItems[] = .itemId = ITEM_HOUNDOOMINITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gHoundoominiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7147,15 +5386,10 @@ const struct Item gItems[] = .itemId = ITEM_AGGRONITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAggroniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7165,15 +5399,10 @@ const struct Item gItems[] = .itemId = ITEM_BANETTITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gBanettiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7183,15 +5412,10 @@ const struct Item gItems[] = .itemId = ITEM_TYRANITARITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gTyranitariteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7201,15 +5425,10 @@ const struct Item gItems[] = .itemId = ITEM_SCIZORITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gScizoriteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7219,15 +5438,10 @@ const struct Item gItems[] = .itemId = ITEM_PINSIRITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gPinsiriteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7237,15 +5451,10 @@ const struct Item gItems[] = .itemId = ITEM_AERODACTYLITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAerodactyliteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7255,15 +5464,10 @@ const struct Item gItems[] = .itemId = ITEM_LUCARIONITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gLucarioniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7273,15 +5477,10 @@ const struct Item gItems[] = .itemId = ITEM_ABOMASITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAbomasiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7291,15 +5490,10 @@ const struct Item gItems[] = .itemId = ITEM_KANGASKHANITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gKangaskhaniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7309,15 +5503,10 @@ const struct Item gItems[] = .itemId = ITEM_GYARADOSITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gGyaradositeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7327,15 +5516,10 @@ const struct Item gItems[] = .itemId = ITEM_ABSOLITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAbsoliteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7345,15 +5529,10 @@ const struct Item gItems[] = .itemId = ITEM_CHARIZARDITE_Y, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gCharizarditeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7363,15 +5542,10 @@ const struct Item gItems[] = .itemId = ITEM_ALAKAZITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAlakaziteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7381,15 +5555,10 @@ const struct Item gItems[] = .itemId = ITEM_HERACRONITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gHeracroniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7399,15 +5568,10 @@ const struct Item gItems[] = .itemId = ITEM_MAWILITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gMawiliteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7417,15 +5581,10 @@ const struct Item gItems[] = .itemId = ITEM_MANECTITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gManectiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7435,15 +5594,10 @@ const struct Item gItems[] = .itemId = ITEM_GARCHOMPITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gGarchompiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7453,15 +5607,10 @@ const struct Item gItems[] = .itemId = ITEM_LATIASITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gLatiasiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7471,15 +5620,10 @@ const struct Item gItems[] = .itemId = ITEM_LATIOSITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gLatiositeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7489,15 +5633,10 @@ const struct Item gItems[] = .itemId = ITEM_SWAMPERTITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gSwampertiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7507,15 +5646,10 @@ const struct Item gItems[] = .itemId = ITEM_SCEPTILITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gSceptiliteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7525,15 +5659,10 @@ const struct Item gItems[] = .itemId = ITEM_SABLENITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gSableniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7543,15 +5672,10 @@ const struct Item gItems[] = .itemId = ITEM_ALTARIANITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAltarianiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7561,15 +5685,10 @@ const struct Item gItems[] = .itemId = ITEM_GALLADITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gGalladiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7579,15 +5698,10 @@ const struct Item gItems[] = .itemId = ITEM_AUDINITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gAudiniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7597,15 +5711,10 @@ const struct Item gItems[] = .itemId = ITEM_METAGROSSITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gMetagrossiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7615,15 +5724,10 @@ const struct Item gItems[] = .itemId = ITEM_SHARPEDONITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gSharpedoniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7633,15 +5737,10 @@ const struct Item gItems[] = .itemId = ITEM_SLOWBRONITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gSlowbroniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7651,15 +5750,10 @@ const struct Item gItems[] = .itemId = ITEM_STEELIXITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gSteelixiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7669,15 +5763,10 @@ const struct Item gItems[] = .itemId = ITEM_PIDGEOTITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gPidgeotiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7687,15 +5776,10 @@ const struct Item gItems[] = .itemId = ITEM_GLALITITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gGlalititeItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7705,15 +5789,10 @@ const struct Item gItems[] = .itemId = ITEM_DIANCITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gDianciteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7723,15 +5802,10 @@ const struct Item gItems[] = .itemId = ITEM_CAMERUPTITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gCameruptiteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7741,15 +5815,10 @@ const struct Item gItems[] = .itemId = ITEM_LOPUNNITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gLopunniteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7759,15 +5828,10 @@ const struct Item gItems[] = .itemId = ITEM_SALAMENCITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gSalamenciteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7777,15 +5841,10 @@ const struct Item gItems[] = .itemId = ITEM_BEEDRILLITE, .price = 200, .holdEffect = HOLD_EFFECT_MEGA_STONE, - .holdEffectParam = 0, .description = gBeedrilliteItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7794,16 +5853,10 @@ const struct Item gItems[] = .name = _("Mega Bracelet"), .itemId = ITEM_MEGA_BRACELET, .price = 200, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gMegaBraceletItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_KEY_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7813,15 +5866,10 @@ const struct Item gItems[] = .itemId = ITEM_PROTECTIVE_PADS, .price = 4000, .holdEffect = HOLD_EFFECT_PROTECTIVE_PADS, - .holdEffectParam = 0, .description = gProtectPadsItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7831,15 +5879,10 @@ const struct Item gItems[] = .itemId = ITEM_TERRAIN_EXTENDER, .price = 4000, .holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER, - .holdEffectParam = 0, .description = gTerrainExtenderItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7849,15 +5892,10 @@ const struct Item gItems[] = .itemId = ITEM_ELECTRIC_SEED, .price = 4000, .holdEffect = HOLD_EFFECT_SEEDS, - .holdEffectParam = 0, .description = gElectricSeedItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7867,15 +5905,10 @@ const struct Item gItems[] = .itemId = ITEM_GRASSY_SEED, .price = 4000, .holdEffect = HOLD_EFFECT_SEEDS, - .holdEffectParam = 0, .description = gGrassySeedItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7885,15 +5918,10 @@ const struct Item gItems[] = .itemId = ITEM_MISTY_SEED, .price = 4000, .holdEffect = HOLD_EFFECT_SEEDS, - .holdEffectParam = 0, .description = gMistySeedItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7903,15 +5931,10 @@ const struct Item gItems[] = .itemId = ITEM_PSYCHIC_SEED, .price = 4000, .holdEffect = HOLD_EFFECT_SEEDS, - .holdEffectParam = 0, .description = gPsychicSeedItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7921,15 +5944,10 @@ const struct Item gItems[] = .itemId = ITEM_ADRENALINE_ORB, .price = 300, .holdEffect = HOLD_EFFECT_ADRENALINE_ORB, - .holdEffectParam = 0, .description = gAdrenalineOrbItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, }, @@ -7938,16 +5956,10 @@ const struct Item gItems[] = .name = _("Honey"), .itemId = ITEM_HONEY, .price = 100, - .holdEffect = HOLD_EFFECT_NONE, - .holdEffectParam = 0, .description = gHoneyItemDescription, - .importance = 0, - .unk19 = 0, .pocket = POCKET_ITEMS, .type = 4, .fieldUseFunc = ItemUseOutOfBattle_CannotUse, - .battleUsage = 0, - .battleUseFunc = NULL, .secondaryId = 0, } }; diff --git a/src/data/text/item_descriptions.h b/src/data/text/item_descriptions.h index 4558b0fa8..72e3bf6ae 100644 --- a/src/data/text/item_descriptions.h +++ b/src/data/text/item_descriptions.h @@ -12,6 +12,62 @@ const u8 gRepeatBallItemDescription[] = _("A BALL that works\nbetter on POKéMON const u8 gTimerBallItemDescription[] = _("A BALL that gains\npower in battles\ntaking many turns."); const u8 gLuxuryBallItemDescription[] = _("A cozy BALL that\nmakes POKéMON\nmore friendly."); const u8 gPremierBallItemDescription[] = _("A rare BALL made\nin commemoration\nof some event."); + +static const u8 gItemDescription_LevelBall[] = _( + "A Ball that works\n" + "well on lower\n" + "level POKéMON."); + +static const u8 gItemDescription_LureBall[] = _( + "A Ball that works\n" + "well on fished\n" + "up POKéMON."); + +static const u8 gItemDescription_MoonBall[] = _( + "A Ball that works\n" + "well on Moon\n" + "Stone users."); + +static const u8 gItemDescription_FriendBall[] = _( + "A Ball that makes\n" + "a POKéMON friendly\n" + "when caught."); + +static const u8 gItemDescription_LoveBall[] = _( + "Works well on\n" + "POKéMON of the\n" + "opposite gender."); + +static const u8 gItemDescription_HeavyBall[] = _( + "Works well on\n" + "very heavy\n" + "POKéMON."); + +static const u8 gItemDescription_FastBall[] = _( + "Works well on\n" + "very fast\n" + "POKéMON."); + +static const u8 gItemDescription_HealBall[] = _( + "A remedial Ball\n" + "that restores\n" + "caught POKéMON."); + +static const u8 gItemDescription_QuickBall[] = _( + "Works well if\n" + "used on the\n" + "first turn."); + +static const u8 gItemDescription_DuskBall[] = _( + "Works well if\n" + "used in a\n" + "dark place."); + +static const u8 gItemDescription_CherishBall[] = _( + "A rare Ball made\n" + "in commemoration\n" + "of some event."); + // Medicine const u8 gPotionItemDescription[] = _("Restores the HP of\na POKéMON by\n20 points."); const u8 gAntidoteItemDescription[] = _("Heals a poisoned\nPOKéMON."); diff --git a/src/event_object_movement.c b/src/event_object_movement.c index 3e5362de4..75f758a12 100644 --- a/src/event_object_movement.c +++ b/src/event_object_movement.c @@ -25,6 +25,7 @@ #include "constants/event_object_movement_constants.h" #include "constants/event_objects.h" #include "constants/field_effects.h" +#include "constants/items.h" // this file was known as evobjmv.c in Game Freak's original source @@ -2005,10 +2006,9 @@ static void get_berry_tree_graphics(struct EventObject *eventObject, struct Spri sprite->invisible = FALSE; berryId = GetBerryTypeByBerryTreeId(eventObject->trainerRange_berryTreeId) - 1; berryStage--; - if (berryId >= NUM_BERRIES) - { + if (berryId > ITEM_TO_BERRY(LAST_BERRY_INDEX)) berryId = 0; - } + EventObjectSetGraphicsId(eventObject, gBerryTreeEventObjectGraphicsIdTablePointers[berryId][berryStage]); sprite->images = gBerryTreePicTablePointers[berryId]; sprite->oam.paletteNum = gBerryTreePaletteSlotTablePointers[berryId][berryStage]; diff --git a/src/graphics.c b/src/graphics.c index 163cecf5b..0832101d8 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -1042,8 +1042,8 @@ const u32 gBattleAnimSpritePal_Splash[] = INCBIN_U32("graphics/battle_anims/spri const u32 gBattleAnimSpriteGfx_SweatBead[] = INCBIN_U32("graphics/battle_anims/sprites/sweat_bead.4bpp.lz"); -const u32 gBattleAnimSpriteGfx_RedBrick[] = INCBIN_U32("graphics/battle_anims/sprites/red_brick.4bpp.lz"); -const u32 gBattleAnimSpritePal_RedBrick[] = INCBIN_U32("graphics/battle_anims/sprites/red_brick.gbapal.lz"); +const u32 gBattleAnimSpriteGfx_Pokeblock[] = INCBIN_U32("graphics/battle_anims/sprites/pokeblock.4bpp.lz"); +const u32 gBattleAnimSpritePal_Pokeblock[] = INCBIN_U32("graphics/battle_anims/sprites/pokeblock.gbapal.lz"); const u32 gBattleAnimSpriteGfx_Gem1[] = INCBIN_U32("graphics/battle_anims/sprites/gem_1.4bpp.lz"); const u32 gBattleAnimSpriteGfx_Gem2[] = INCBIN_U32("graphics/battle_anims/sprites/gem_2.4bpp.lz"); diff --git a/src/pokeball.c b/src/pokeball.c index 033ae7b6a..5020ea60f 100644 --- a/src/pokeball.c +++ b/src/pokeball.c @@ -89,21 +89,21 @@ const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] = {gInterfaceGfx_TimerBall, 384, GFX_TAG_TIMERBALL}, {gInterfaceGfx_LuxuryBall, 384, GFX_TAG_LUXURYBALL}, {gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIERBALL}, - {gInterfaceGfx_LevelBall, 384, GFX_TAG_LEVELBALL}, - {gInterfaceGfx_LureBall, 384, GFX_TAG_LUREBALL}, - {gInterfaceGfx_MoonBall, 384, GFX_TAG_MOONBALL}, - {gInterfaceGfx_FriendBall, 384, GFX_TAG_FRIENDBALL}, - {gInterfaceGfx_LoveBall, 384, GFX_TAG_LOVEBALL}, - {gInterfaceGfx_HeavyBall, 384, GFX_TAG_HEAVYBALL}, - {gInterfaceGfx_FastBall, 384, GFX_TAG_FASTBALL}, - {gInterfaceGfx_SportBall, 384, GFX_TAG_SPORTBALL}, - {gInterfaceGfx_DuskBall, 384, GFX_TAG_DUSKBALL}, - {gInterfaceGfx_QuickBall, 384, GFX_TAG_QUICKBALL}, - {gInterfaceGfx_HealBall, 384, GFX_TAG_HEALBALL}, - {gInterfaceGfx_CherishBall, 384, GFX_TAG_CHERISHBALL}, - {gInterfaceGfx_ParkBall, 384, GFX_TAG_PARKBALL}, - {gInterfaceGfx_DreamBall, 384, GFX_TAG_DREAMBALL}, - {gInterfaceGfx_BeastBall, 384, GFX_TAG_BEASTBALL}, + {gInterfaceGfx_LevelBall, 384, GFX_TAG_LEVELBALL}, + {gInterfaceGfx_LureBall, 384, GFX_TAG_LUREBALL}, + {gInterfaceGfx_MoonBall, 384, GFX_TAG_MOONBALL}, + {gInterfaceGfx_FriendBall, 384, GFX_TAG_FRIENDBALL}, + {gInterfaceGfx_LoveBall, 384, GFX_TAG_LOVEBALL}, + {gInterfaceGfx_HeavyBall, 384, GFX_TAG_HEAVYBALL}, + {gInterfaceGfx_FastBall, 384, GFX_TAG_FASTBALL}, + {gInterfaceGfx_SportBall, 384, GFX_TAG_SPORTBALL}, + {gInterfaceGfx_DuskBall, 384, GFX_TAG_DUSKBALL}, + {gInterfaceGfx_QuickBall, 384, GFX_TAG_QUICKBALL}, + {gInterfaceGfx_HealBall, 384, GFX_TAG_HEALBALL}, + {gInterfaceGfx_CherishBall, 384, GFX_TAG_CHERISHBALL}, + {gInterfaceGfx_ParkBall, 384, GFX_TAG_PARKBALL}, + {gInterfaceGfx_DreamBall, 384, GFX_TAG_DREAMBALL}, + {gInterfaceGfx_BeastBall, 384, GFX_TAG_BEASTBALL}, }; const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =