Leahnaya/pokeemerald
1
0
Fork 0
mirror of https://github.com/pret/pokeemerald.git synced 2026-09-27 20:37:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Untangled TMs and HMs from item ids (#7173)

Browse Source
This commit is contained in:
Nephrite
2025-07-04 18:07:53 +01:00
committed by GitHub
parent b3f52166df
commit e8abfbce49
21 changed files with 201 additions and 209 deletions
Download Patch File Download Diff File Expand all files Collapse all files

108
src/data/items.h
View File

@@ -10454,7 +10454,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FOCUS_PUNCH,
},
[ITEM_TM_DRAGON_CLAW] =
@@ -10469,7 +10468,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DRAGON_CLAW,
},
[ITEM_TM_WATER_PULSE] =
@@ -10484,7 +10482,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_WATER_PULSE,
},
[ITEM_TM_CALM_MIND] =
@@ -10499,7 +10496,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_CALM_MIND,
},
[ITEM_TM_ROAR] =
@@ -10514,7 +10510,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ROAR,
},
[ITEM_TM_TOXIC] =
@@ -10529,7 +10524,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_TOXIC,
},
[ITEM_TM_HAIL] =
@@ -10551,7 +10545,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_HAIL,
},
[ITEM_TM_BULK_UP] =
@@ -10566,7 +10559,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BULK_UP,
},
[ITEM_TM_BULLET_SEED] =
@@ -10581,7 +10573,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BULLET_SEED,
},
[ITEM_TM_HIDDEN_POWER] =
@@ -10596,7 +10587,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_HIDDEN_POWER,
},
[ITEM_TM_SUNNY_DAY] =
@@ -10611,7 +10601,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SUNNY_DAY,
},
[ITEM_TM_TAUNT] =
@@ -10626,7 +10615,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_TAUNT,
},
[ITEM_TM_ICE_BEAM] =
@@ -10645,7 +10633,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ICE_BEAM,
},
[ITEM_TM_BLIZZARD] =
@@ -10666,7 +10653,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BLIZZARD,
},
[ITEM_TM_HYPER_BEAM] =
@@ -10681,7 +10667,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_HYPER_BEAM,
},
[ITEM_TM_LIGHT_SCREEN] =
@@ -10696,7 +10681,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_LIGHT_SCREEN,
},
[ITEM_TM_PROTECT] =
@@ -10711,7 +10695,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_PROTECT,
},
[ITEM_TM_RAIN_DANCE] =
@@ -10726,7 +10709,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_RAIN_DANCE,
},
[ITEM_TM_GIGA_DRAIN] =
@@ -10741,7 +10723,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_GIGA_DRAIN,
},
[ITEM_TM_SAFEGUARD] =
@@ -10756,7 +10737,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SAFEGUARD,
},
[ITEM_TM_FRUSTRATION] =
@@ -10771,7 +10751,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FRUSTRATION,
},
[ITEM_TM_SOLAR_BEAM] =
@@ -10786,7 +10765,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SOLAR_BEAM,
},
[ITEM_TM_IRON_TAIL] =
@@ -10801,7 +10779,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_IRON_TAIL,
},
[ITEM_TM_THUNDERBOLT] =
@@ -10816,7 +10793,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_THUNDERBOLT,
},
[ITEM_TM_THUNDER] =
@@ -10831,7 +10807,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_THUNDER,
},
[ITEM_TM_EARTHQUAKE] =
@@ -10846,7 +10821,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_EARTHQUAKE,
},
[ITEM_TM_RETURN] =
@@ -10861,7 +10835,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_RETURN,
},
[ITEM_TM_DIG] =
@@ -10876,7 +10849,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DIG,
},
[ITEM_TM_PSYCHIC] =
@@ -10891,7 +10863,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_PSYCHIC,
},
[ITEM_TM_SHADOW_BALL] =
@@ -10906,7 +10877,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SHADOW_BALL,
},
[ITEM_TM_BRICK_BREAK] =
@@ -10921,7 +10891,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BRICK_BREAK,
},
[ITEM_TM_DOUBLE_TEAM] =
@@ -10936,7 +10905,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DOUBLE_TEAM,
},
[ITEM_TM_REFLECT] =
@@ -10951,7 +10919,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_REFLECT,
},
[ITEM_TM_SHOCK_WAVE] =
@@ -10966,7 +10933,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SHOCK_WAVE,
},
[ITEM_TM_FLAMETHROWER] =
@@ -10981,7 +10947,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FLAMETHROWER,
},
[ITEM_TM_SLUDGE_BOMB] =
@@ -10996,7 +10961,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SLUDGE_BOMB,
},
[ITEM_TM_SANDSTORM] =
@@ -11011,7 +10975,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SANDSTORM,
},
[ITEM_TM_FIRE_BLAST] =
@@ -11026,7 +10989,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FIRE_BLAST,
},
[ITEM_TM_ROCK_TOMB] =
@@ -11041,7 +11003,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ROCK_TOMB,
},
[ITEM_TM_AERIAL_ACE] =
@@ -11056,7 +11017,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_AERIAL_ACE,
},
[ITEM_TM_TORMENT] =
@@ -11071,7 +11031,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_TORMENT,
},
[ITEM_TM_FACADE] =
@@ -11086,7 +11045,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FACADE,
},
[ITEM_TM_SECRET_POWER] =
@@ -11101,7 +11059,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SECRET_POWER,
},
[ITEM_TM_REST] =
@@ -11116,7 +11073,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_REST,
},
[ITEM_TM_ATTRACT] =
@@ -11131,7 +11087,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ATTRACT,
},
[ITEM_TM_THIEF] =
@@ -11146,7 +11101,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_THIEF,
},
[ITEM_TM_STEEL_WING] =
@@ -11161,7 +11115,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_STEEL_WING,
},
[ITEM_TM_SKILL_SWAP] =
@@ -11176,7 +11129,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SKILL_SWAP,
},
[ITEM_TM_SNATCH] =
@@ -11191,7 +11143,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SNATCH,
},
[ITEM_TM_OVERHEAT] =
@@ -11206,7 +11157,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_OVERHEAT,
},
[ITEM_TM51] =
@@ -11218,7 +11168,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM52] =
@@ -11230,7 +11179,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM53] =
@@ -11242,7 +11190,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM54] =
@@ -11254,7 +11201,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM55] =
@@ -11266,7 +11212,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM56] =
@@ -11278,7 +11223,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM57] =
@@ -11290,7 +11234,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM58] =
@@ -11302,7 +11245,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM59] =
@@ -11314,7 +11256,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM60] =
@@ -11326,7 +11267,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM61] =
@@ -11338,7 +11278,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM62] =
@@ -11350,7 +11289,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM63] =
@@ -11362,7 +11300,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM64] =
@@ -11374,7 +11311,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM65] =
@@ -11386,7 +11322,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM66] =
@@ -11398,7 +11333,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM67] =
@@ -11410,7 +11344,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM68] =
@@ -11422,7 +11355,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM69] =
@@ -11434,7 +11366,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM70] =
@@ -11446,7 +11377,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM71] =
@@ -11458,7 +11388,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM72] =
@@ -11470,7 +11399,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM73] =
@@ -11482,7 +11410,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM74] =
@@ -11494,7 +11421,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM75] =
@@ -11506,7 +11432,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM76] =
@@ -11518,7 +11443,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM77] =
@@ -11530,7 +11454,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM78] =
@@ -11542,7 +11465,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM79] =
@@ -11554,7 +11476,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM80] =
@@ -11566,7 +11487,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM81] =
@@ -11578,7 +11498,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM82] =
@@ -11590,7 +11509,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM83] =
@@ -11602,7 +11520,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM84] =
@@ -11614,7 +11531,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM85] =
@@ -11626,7 +11542,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM86] =
@@ -11638,7 +11553,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM87] =
@@ -11650,7 +11564,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM88] =
@@ -11662,7 +11575,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM89] =
@@ -11674,7 +11586,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM90] =
@@ -11686,7 +11597,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM91] =
@@ -11698,7 +11608,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM92] =
@@ -11710,7 +11619,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM93] =
@@ -11722,7 +11630,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM94] =
@@ -11734,7 +11641,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM95] =
@@ -11746,7 +11652,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM96] =
@@ -11758,7 +11663,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM97] =
@@ -11770,7 +11674,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM98] =
@@ -11782,7 +11685,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM99] =
@@ -11794,7 +11696,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM100] =
@@ -11806,7 +11707,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_HM_CUT] =
@@ -11821,7 +11721,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_CUT,
},
[ITEM_HM_FLY] =
@@ -11836,7 +11735,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FLY,
},
[ITEM_HM_SURF] =
@@ -11851,7 +11749,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SURF,
},
[ITEM_HM_STRENGTH] =
@@ -11866,7 +11763,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_STRENGTH,
},
[ITEM_HM_FLASH] =
@@ -11881,7 +11777,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FLASH,
},
[ITEM_HM_ROCK_SMASH] =
@@ -11896,7 +11791,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ROCK_SMASH,
},
[ITEM_HM_WATERFALL] =
@@ -11911,7 +11805,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_WATERFALL,
},
[ITEM_HM_DIVE] =
@@ -11926,7 +11819,6 @@ const struct Item gItemsInfo[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DIVE,
},