ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed the sTMHMMoves array and made TMs/HMs read moves from their secondaryId item field (#3243)

Browse Source 
* Deleted sTMHMMoves array, TMs/HMs read moves from their secondaryId item field now
The unused "registrability" variable has been removed in order to preserve the size of the gItems array after turning the secondaryId variable into a u16.
* Made ItemIdToBattleMoveId return ITEM_NONE if an item that is not a TM/HM is passed through it
* Renamed IsMoveHm to IsMoveHM
This commit is contained in:
LOuroboros 2023-08-21 08:49:17 -03:00 committed by GitHub
parent 5b885a4ddb
commit 9d6953cc63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 118 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/item.h
View File

@ -14,12 +14,11 @@ struct Item
u8 holdEffectParam;
const u8 *description;
u8 importance;
bool8 registrability; // unused
u8 pocket;
u8 type;
ItemUseFunc fieldUseFunc;
u8 battleUsage;
u8 secondaryId;
u16 secondaryId;
u8 flingPower;
};

1
include/party_menu.h
View File

@ -57,7 +57,6 @@ void ItemUseCB_ReduceEV(u8 taskId, TaskFunc task);
void ItemUseCB_PPRecovery(u8 taskId, TaskFunc task);
void ItemUseCB_PPUp(u8 taskId, TaskFunc task);
u16 ItemIdToBattleMoveId(u16 item);
bool8 IsMoveHm(u16 move);
bool8 MonKnowsMove(struct Pokemon *mon, u16 move);
bool8 BoxMonKnowsMove(struct BoxPokemon *boxMon, u16 move);
void ItemUseCB_TMHM(u8 taskId, TaskFunc task);

2
include/pokemon.h
View File

@ -579,7 +579,7 @@ const u32 *GetMonFrontSpritePal(struct Pokemon *mon);
const u32 *GetMonSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32 personality);
const struct CompressedSpritePalette *GetMonSpritePalStruct(struct Pokemon *mon);
const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u16 species, u32 otId , u32 personality);
bool32 IsHMMove2(u16 move);
bool8 IsMoveHM(u16 move);
bool8 IsMonSpriteNotFlipped(u16 species);
s8 GetMonFlavorRelation(struct Pokemon *mon, u8 flavor);
s8 GetFlavorRelationByPersonality(u32 personality, u8 flavor);

2
src/battle_script_commands.c
View File

@ -7250,7 +7250,7 @@ static void Cmd_yesnoboxlearnmove(void)
else
{
u16 moveId = GetMonData(&gPlayerParty[gBattleStruct->expGetterMonId], MON_DATA_MOVE1 + movePosition);
if (IsHMMove2(moveId))
if (IsMoveHM(moveId))
{
PrepareStringBattle(STRINGID_HMMOVESCANTBEFORGOTTEN, gActiveBattler);
gBattleScripting.learnMoveState = 6;

134
src/data/items.h
View File

@ -1,3 +1,5 @@
#include "constants/moves.h"
#if I_USE_EVO_HELD_ITEMS_FROM_BAG == TRUE
#define EVO_HELD_ITEM_TYPE ITEM_USE_PARTY_MENU
#define EVO_HELD_ITEM_FIELD_FUNC ItemUseOutOfBattle_EvolutionStone
@ -7742,6 +7744,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FOCUS_PUNCH,
},
[ITEM_TM02_DRAGON_CLAW] =
@ -7754,6 +7757,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DRAGON_CLAW,
},
[ITEM_TM03_WATER_PULSE] =
@ -7766,6 +7770,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_WATER_PULSE,
},
[ITEM_TM04_CALM_MIND] =
@ -7778,6 +7783,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_CALM_MIND,
},
[ITEM_TM05_ROAR] =
@ -7790,6 +7796,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ROAR,
},
[ITEM_TM06_TOXIC] =
@ -7802,6 +7809,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_TOXIC,
},
[ITEM_TM07_HAIL] =
@ -7814,6 +7822,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_HAIL,
},
[ITEM_TM08_BULK_UP] =
@ -7826,6 +7835,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BULK_UP,
},
[ITEM_TM09_BULLET_SEED] =
@ -7838,6 +7848,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BULLET_SEED,
},
[ITEM_TM10_HIDDEN_POWER] =
@ -7850,6 +7861,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_HIDDEN_POWER,
},
[ITEM_TM11_SUNNY_DAY] =
@ -7862,6 +7874,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SUNNY_DAY,
},
[ITEM_TM12_TAUNT] =
@ -7874,6 +7887,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_TAUNT,
},
[ITEM_TM13_ICE_BEAM] =
@ -7886,6 +7900,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ICE_BEAM,
},
[ITEM_TM14_BLIZZARD] =
@ -7898,6 +7913,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BLIZZARD,
},
[ITEM_TM15_HYPER_BEAM] =
@ -7910,6 +7926,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_HYPER_BEAM,
},
[ITEM_TM16_LIGHT_SCREEN] =
@ -7922,6 +7939,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_LIGHT_SCREEN,
},
[ITEM_TM17_PROTECT] =
@ -7934,6 +7952,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_PROTECT,
},
[ITEM_TM18_RAIN_DANCE] =
@ -7946,6 +7965,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_RAIN_DANCE,
},
[ITEM_TM19_GIGA_DRAIN] =
@ -7958,6 +7978,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_GIGA_DRAIN,
},
[ITEM_TM20_SAFEGUARD] =
@ -7970,6 +7991,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SAFEGUARD,
},
[ITEM_TM21_FRUSTRATION] =
@ -7982,6 +8004,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FRUSTRATION,
},
[ITEM_TM22_SOLAR_BEAM] =
@ -7994,6 +8017,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SOLAR_BEAM,
},
[ITEM_TM23_IRON_TAIL] =
@ -8006,6 +8030,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_IRON_TAIL,
},
[ITEM_TM24_THUNDERBOLT] =
@ -8018,6 +8043,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_THUNDERBOLT,
},
[ITEM_TM25_THUNDER] =
@ -8030,6 +8056,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_THUNDER,
},
[ITEM_TM26_EARTHQUAKE] =
@ -8042,6 +8069,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_EARTHQUAKE,
},
[ITEM_TM27_RETURN] =
@ -8054,6 +8082,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_RETURN,
},
[ITEM_TM28_DIG] =
@ -8066,6 +8095,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DIG,
},
[ITEM_TM29_PSYCHIC] =
@ -8078,6 +8108,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_PSYCHIC,
},
[ITEM_TM30_SHADOW_BALL] =
@ -8090,6 +8121,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SHADOW_BALL,
},
[ITEM_TM31_BRICK_BREAK] =
@ -8102,6 +8134,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_BRICK_BREAK,
},
[ITEM_TM32_DOUBLE_TEAM] =
@ -8114,6 +8147,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DOUBLE_TEAM,
},
[ITEM_TM33_REFLECT] =
@ -8126,6 +8160,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_REFLECT,
},
[ITEM_TM34_SHOCK_WAVE] =
@ -8138,6 +8173,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SHOCK_WAVE,
},
[ITEM_TM35_FLAMETHROWER] =
@ -8150,6 +8186,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FLAMETHROWER,
},
[ITEM_TM36_SLUDGE_BOMB] =
@ -8162,6 +8199,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SLUDGE_BOMB,
},
[ITEM_TM37_SANDSTORM] =
@ -8174,6 +8212,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SANDSTORM,
},
[ITEM_TM38_FIRE_BLAST] =
@ -8186,6 +8225,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FIRE_BLAST,
},
[ITEM_TM39_ROCK_TOMB] =
@ -8198,6 +8238,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ROCK_TOMB,
},
[ITEM_TM40_AERIAL_ACE] =
@ -8210,6 +8251,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_AERIAL_ACE,
},
[ITEM_TM41_TORMENT] =
@ -8222,6 +8264,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_TORMENT,
},
[ITEM_TM42_FACADE] =
@ -8234,6 +8277,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FACADE,
},
[ITEM_TM43_SECRET_POWER] =
@ -8246,6 +8290,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SECRET_POWER,
},
[ITEM_TM44_REST] =
@ -8258,6 +8303,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_REST,
},
[ITEM_TM45_ATTRACT] =
@ -8270,6 +8316,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ATTRACT,
},
[ITEM_TM46_THIEF] =
@ -8282,6 +8329,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_THIEF,
},
[ITEM_TM47_STEEL_WING] =
@ -8294,6 +8342,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_STEEL_WING,
},
[ITEM_TM48_SKILL_SWAP] =
@ -8306,6 +8355,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SKILL_SWAP,
},
[ITEM_TM49_SNATCH] =
@ -8318,6 +8368,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SNATCH,
},
[ITEM_TM50_OVERHEAT] =
@ -8330,6 +8381,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_OVERHEAT,
},
[ITEM_TM51] =
@ -8342,6 +8394,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM52] =
@ -8354,6 +8407,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM53] =
@ -8366,6 +8420,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM54] =
@ -8378,6 +8433,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM55] =
@ -8390,6 +8446,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM56] =
@ -8402,6 +8459,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM57] =
@ -8414,6 +8472,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM58] =
@ -8426,6 +8485,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM59] =
@ -8438,6 +8498,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM60] =
@ -8450,6 +8511,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM61] =
@ -8462,6 +8524,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM62] =
@ -8474,6 +8537,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM63] =
@ -8486,6 +8550,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM64] =
@ -8498,6 +8563,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM65] =
@ -8510,6 +8576,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM66] =
@ -8522,6 +8589,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM67] =
@ -8534,6 +8602,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM68] =
@ -8546,6 +8615,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM69] =
@ -8558,6 +8628,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM70] =
@ -8570,6 +8641,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM71] =
@ -8582,6 +8654,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM72] =
@ -8594,6 +8667,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM73] =
@ -8606,6 +8680,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM74] =
@ -8618,6 +8693,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM75] =
@ -8630,6 +8706,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM76] =
@ -8642,6 +8719,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM77] =
@ -8654,6 +8732,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM78] =
@ -8666,6 +8745,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM79] =
@ -8678,6 +8758,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM80] =
@ -8690,6 +8771,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM81] =
@ -8702,6 +8784,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM82] =
@ -8714,6 +8797,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM83] =
@ -8726,6 +8810,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM84] =
@ -8738,6 +8823,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM85] =
@ -8750,6 +8836,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM86] =
@ -8762,6 +8849,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM87] =
@ -8774,6 +8862,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM88] =
@ -8786,6 +8875,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM89] =
@ -8798,6 +8888,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM90] =
@ -8810,6 +8901,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM91] =
@ -8822,6 +8914,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM92] =
@ -8834,6 +8927,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM93] =
@ -8846,6 +8940,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM94] =
@ -8858,6 +8953,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM95] =
@ -8870,6 +8966,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM96] =
@ -8882,6 +8979,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM97] =
@ -8894,6 +8992,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM98] =
@ -8906,6 +9005,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM99] =
@ -8918,6 +9018,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_TM100] =
@ -8930,6 +9031,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_NONE, // Todo
},
[ITEM_HM01_CUT] =
@ -8942,6 +9044,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_CUT,
},
[ITEM_HM02_FLY] =
@ -8954,6 +9057,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FLY,
},
[ITEM_HM03_SURF] =
@ -8966,6 +9070,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_SURF,
},
[ITEM_HM04_STRENGTH] =
@ -8978,6 +9083,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_STRENGTH,
},
[ITEM_HM05_FLASH] =
@ -8990,6 +9096,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_FLASH,
},
[ITEM_HM06_ROCK_SMASH] =
@ -9002,6 +9109,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_ROCK_SMASH,
},
[ITEM_HM07_WATERFALL] =
@ -9014,6 +9122,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_WATERFALL,
},
[ITEM_HM08_DIVE] =
@ -9026,6 +9135,7 @@ const struct Item gItems[] =
.pocket = POCKET_TM_HM,
.type = ITEM_USE_PARTY_MENU,
.fieldUseFunc = ItemUseOutOfBattle_TMHM,
.secondaryId = MOVE_DIVE,
},
@ -9228,7 +9338,6 @@ const struct Item gItems[] =
.price = 0,
.description = sBicycleDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9241,7 +9350,6 @@ const struct Item gItems[] =
.price = 0,
.description = sMachBikeDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_Bike,
@ -9255,7 +9363,6 @@ const struct Item gItems[] =
.price = 0,
.description = sAcroBikeDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_Bike,
@ -9269,7 +9376,6 @@ const struct Item gItems[] =
.price = 0,
.description = sOldRodDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_Rod,
@ -9283,7 +9389,6 @@ const struct Item gItems[] =
.price = 0,
.description = sGoodRodDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_Rod,
@ -9297,7 +9402,6 @@ const struct Item gItems[] =
.price = 0,
.description = sSuperRodDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_Rod,
@ -9311,7 +9415,6 @@ const struct Item gItems[] =
.price = 0,
.description = sDowsingMachineDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_Itemfinder,
@ -9324,7 +9427,6 @@ const struct Item gItems[] =
.price = 0,
.description = sTownMapDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9337,7 +9439,6 @@ const struct Item gItems[] =
.price = 0,
.description = sVsSeekerDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9350,7 +9451,6 @@ const struct Item gItems[] =
.price = 0,
.description = sTMCaseDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9363,7 +9463,6 @@ const struct Item gItems[] =
.price = 0,
.description = sBerryPouchDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9400,7 +9499,6 @@ const struct Item gItems[] =
.price = 0,
.description = sPowderJarDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_PowderJar,
@ -9437,7 +9535,6 @@ const struct Item gItems[] =
.price = 0,
.description = sPokeblockCaseDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_PBLOCK_CASE,
.fieldUseFunc = ItemUseOutOfBattle_PokeblockCase,
@ -9474,7 +9571,6 @@ const struct Item gItems[] =
.price = 0,
.description = sFameCheckerDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9487,7 +9583,6 @@ const struct Item gItems[] =
.price = 0,
.description = sTeachyTVDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_FIELD,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9527,7 +9622,6 @@ const struct Item gItems[] =
.price = 0,
.description = sMysticTicketDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9540,7 +9634,6 @@ const struct Item gItems[] =
.price = 0,
.description = sAuroraTicketDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9553,7 +9646,6 @@ const struct Item gItems[] =
.price = 0,
.description = sOldSeaMapDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9710,7 +9802,6 @@ const struct Item gItems[] =
.price = 0,
.description = sMagmaEmblemDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9819,7 +9910,6 @@ const struct Item gItems[] =
.price = 0,
.description = sTriPassDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9832,7 +9922,6 @@ const struct Item gItems[] =
.price = 0,
.description = sRainbowPassDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9845,7 +9934,6 @@ const struct Item gItems[] =
.price = 0,
.description = sTeaDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9858,7 +9946,6 @@ const struct Item gItems[] =
.price = 0,
.description = sRubyDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
@ -9871,7 +9958,6 @@ const struct Item gItems[] =
.price = 0,
.description = sSapphireDesc,
.importance = 1,
.registrability = TRUE,
.pocket = POCKET_KEY_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,

112
src/data/party_menu.h
View File

@ -1102,115 +1102,3 @@ static const u8 *const sUnused_StatStrings[] =
gText_SpDef4,
gText_Speed2
};
static const u16 sTMHMMoves[] =
{
[ITEM_TM01 - ITEM_TM01] = MOVE_FOCUS_PUNCH,
[ITEM_TM02 - ITEM_TM01] = MOVE_DRAGON_CLAW,
[ITEM_TM03 - ITEM_TM01] = MOVE_WATER_PULSE,
[ITEM_TM04 - ITEM_TM01] = MOVE_CALM_MIND,
[ITEM_TM05 - ITEM_TM01] = MOVE_ROAR,
[ITEM_TM06 - ITEM_TM01] = MOVE_TOXIC,
[ITEM_TM07 - ITEM_TM01] = MOVE_HAIL,
[ITEM_TM08 - ITEM_TM01] = MOVE_BULK_UP,
[ITEM_TM09 - ITEM_TM01] = MOVE_BULLET_SEED,
[ITEM_TM10 - ITEM_TM01] = MOVE_HIDDEN_POWER,
[ITEM_TM11 - ITEM_TM01] = MOVE_SUNNY_DAY,
[ITEM_TM12 - ITEM_TM01] = MOVE_TAUNT,
[ITEM_TM13 - ITEM_TM01] = MOVE_ICE_BEAM,
[ITEM_TM14 - ITEM_TM01] = MOVE_BLIZZARD,
[ITEM_TM15 - ITEM_TM01] = MOVE_HYPER_BEAM,
[ITEM_TM16 - ITEM_TM01] = MOVE_LIGHT_SCREEN,
[ITEM_TM17 - ITEM_TM01] = MOVE_PROTECT,
[ITEM_TM18 - ITEM_TM01] = MOVE_RAIN_DANCE,
[ITEM_TM19 - ITEM_TM01] = MOVE_GIGA_DRAIN,
[ITEM_TM20 - ITEM_TM01] = MOVE_SAFEGUARD,
[ITEM_TM21 - ITEM_TM01] = MOVE_FRUSTRATION,
[ITEM_TM22 - ITEM_TM01] = MOVE_SOLAR_BEAM,
[ITEM_TM23 - ITEM_TM01] = MOVE_IRON_TAIL,
[ITEM_TM24 - ITEM_TM01] = MOVE_THUNDERBOLT,
[ITEM_TM25 - ITEM_TM01] = MOVE_THUNDER,
[ITEM_TM26 - ITEM_TM01] = MOVE_EARTHQUAKE,
[ITEM_TM27 - ITEM_TM01] = MOVE_RETURN,
[ITEM_TM28 - ITEM_TM01] = MOVE_DIG,
[ITEM_TM29 - ITEM_TM01] = MOVE_PSYCHIC,
[ITEM_TM30 - ITEM_TM01] = MOVE_SHADOW_BALL,
[ITEM_TM31 - ITEM_TM01] = MOVE_BRICK_BREAK,
[ITEM_TM32 - ITEM_TM01] = MOVE_DOUBLE_TEAM,
[ITEM_TM33 - ITEM_TM01] = MOVE_REFLECT,
[ITEM_TM34 - ITEM_TM01] = MOVE_SHOCK_WAVE,
[ITEM_TM35 - ITEM_TM01] = MOVE_FLAMETHROWER,
[ITEM_TM36 - ITEM_TM01] = MOVE_SLUDGE_BOMB,
[ITEM_TM37 - ITEM_TM01] = MOVE_SANDSTORM,
[ITEM_TM38 - ITEM_TM01] = MOVE_FIRE_BLAST,
[ITEM_TM39 - ITEM_TM01] = MOVE_ROCK_TOMB,
[ITEM_TM40 - ITEM_TM01] = MOVE_AERIAL_ACE,
[ITEM_TM41 - ITEM_TM01] = MOVE_TORMENT,
[ITEM_TM42 - ITEM_TM01] = MOVE_FACADE,
[ITEM_TM43 - ITEM_TM01] = MOVE_SECRET_POWER,
[ITEM_TM44 - ITEM_TM01] = MOVE_REST,
[ITEM_TM45 - ITEM_TM01] = MOVE_ATTRACT,
[ITEM_TM46 - ITEM_TM01] = MOVE_THIEF,
[ITEM_TM47 - ITEM_TM01] = MOVE_STEEL_WING,
[ITEM_TM48 - ITEM_TM01] = MOVE_SKILL_SWAP,
[ITEM_TM49 - ITEM_TM01] = MOVE_SNATCH,
[ITEM_TM50 - ITEM_TM01] = MOVE_OVERHEAT,
[ITEM_TM51 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM52 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM53 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM54 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM55 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM56 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM57 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM58 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM59 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM60 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM61 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM62 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM63 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM64 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM65 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM66 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM67 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM68 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM69 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM70 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM71 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM72 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM73 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM74 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM75 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM76 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM77 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM78 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM79 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM80 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM81 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM82 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM83 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM84 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM85 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM86 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM87 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM88 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM89 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM90 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM91 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM92 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM93 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM94 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM95 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM96 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM97 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM98 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM99 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_TM100 - ITEM_TM01] = MOVE_NONE, // Todo
[ITEM_HM01 - ITEM_TM01] = MOVE_CUT,
[ITEM_HM02 - ITEM_TM01] = MOVE_FLY,
[ITEM_HM03 - ITEM_TM01] = MOVE_SURF,
[ITEM_HM04 - ITEM_TM01] = MOVE_STRENGTH,
[ITEM_HM05 - ITEM_TM01] = MOVE_FLASH,
[ITEM_HM06 - ITEM_TM01] = MOVE_ROCK_SMASH,
[ITEM_HM07 - ITEM_TM01] = MOVE_WATERFALL,
[ITEM_HM08 - ITEM_TM01] = MOVE_DIVE,
};

4
src/evolution_scene.c
View File

@ -986,7 +986,7 @@ static void Task_EvolutionScene(u8 taskId)
{
// Selected move to forget
u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
if (IsHMMove2(move))
if (IsMoveHM(move))
{
// Can't forget HMs
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START]);
@ -1369,7 +1369,7 @@ static void Task_TradeEvolutionScene(u8 taskId)
{
// Selected move to forget
u16 move = GetMonData(mon, var + MON_DATA_MOVE1);
if (IsHMMove2(move))
if (IsMoveHM(move))
{
// Can't forget HMs
BattleStringExpandPlaceholdersToDisplayedString(gBattleStringsTable[STRINGID_HMMOVESCANTBEFORGOTTEN - BATTLESTRINGS_TABLE_START]);

6
src/item.c
View File

@ -904,12 +904,6 @@ u8 ItemId_GetImportance(u16 itemId)
return gItems[SanitizeItemId(itemId)].importance;
}
// Unused
u8 ItemId_GetRegistrability(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].registrability;
}
u8 ItemId_GetPocket(u16 itemId)
{
return gItems[SanitizeItemId(itemId)].pocket;

15
src/party_menu.c
View File

@ -4993,20 +4993,7 @@ void ItemUseCB_PPUp(u8 taskId, TaskFunc task)
u16 ItemIdToBattleMoveId(u16 item)
{
u16 tmNumber = item - ITEM_TM01;
return sTMHMMoves[tmNumber];
}
bool8 IsMoveHm(u16 move)
{
u8 i;
for (i = 0; i < NUM_HIDDEN_MACHINES; i++)
{
if (sTMHMMoves[i + NUM_TECHNICAL_MACHINES] == move)
return TRUE;
}
return FALSE;
return (ItemId_GetPocket(item) == POCKET_TM_HM) ? gItems[item].secondaryId : MOVE_NONE;
}
bool8 MonKnowsMove(struct Pokemon *mon, u16 move)

2
src/pokemon.c
View File

@ -7736,7 +7736,7 @@ const struct CompressedSpritePalette *GetMonSpritePalStructFromOtIdPersonality(u
}
}
bool32 IsHMMove2(u16 move)
bool8 IsMoveHM(u16 move)
{
int i = 0;
while (sHMMoves[i] != HM_MOVES_END)

2
src/pokemon_summary_screen.c
View File

@ -2331,7 +2331,7 @@ static bool8 CanReplaceMove(void)
{
if (sMonSummaryScreen->firstMoveIndex == MAX_MON_MOVES
|| sMonSummaryScreen->newMove == MOVE_NONE
|| IsMoveHm(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]) != TRUE)
|| IsMoveHM(sMonSummaryScreen->summary.moves[sMonSummaryScreen->firstMoveIndex]) != TRUE)
return TRUE;
else
return FALSE;