Index sTMHMMoves
This commit is contained in:
GriffinR
parent
7dc52f6a5e
commit
f63bc6e27a
2 changed files with 61 additions and 61 deletions
|
|
@ -1194,62 +1194,62 @@ static const u8 *const sUnused_StatStrings[] =
|
|||
|
||||
static const u16 sTMHMMoves[] =
|
||||
{
|
||||
MOVE_FOCUS_PUNCH,
|
||||
MOVE_DRAGON_CLAW,
|
||||
MOVE_WATER_PULSE,
|
||||
MOVE_CALM_MIND,
|
||||
MOVE_ROAR,
|
||||
MOVE_TOXIC,
|
||||
MOVE_HAIL,
|
||||
MOVE_BULK_UP,
|
||||
MOVE_BULLET_SEED,
|
||||
MOVE_HIDDEN_POWER,
|
||||
MOVE_SUNNY_DAY,
|
||||
MOVE_TAUNT,
|
||||
MOVE_ICE_BEAM,
|
||||
MOVE_BLIZZARD,
|
||||
MOVE_HYPER_BEAM,
|
||||
MOVE_LIGHT_SCREEN,
|
||||
MOVE_PROTECT,
|
||||
MOVE_RAIN_DANCE,
|
||||
MOVE_GIGA_DRAIN,
|
||||
MOVE_SAFEGUARD,
|
||||
MOVE_FRUSTRATION,
|
||||
MOVE_SOLAR_BEAM,
|
||||
MOVE_IRON_TAIL,
|
||||
MOVE_THUNDERBOLT,
|
||||
MOVE_THUNDER,
|
||||
MOVE_EARTHQUAKE,
|
||||
MOVE_RETURN,
|
||||
MOVE_DIG,
|
||||
MOVE_PSYCHIC,
|
||||
MOVE_SHADOW_BALL,
|
||||
MOVE_BRICK_BREAK,
|
||||
MOVE_DOUBLE_TEAM,
|
||||
MOVE_REFLECT,
|
||||
MOVE_SHOCK_WAVE,
|
||||
MOVE_FLAMETHROWER,
|
||||
MOVE_SLUDGE_BOMB,
|
||||
MOVE_SANDSTORM,
|
||||
MOVE_FIRE_BLAST,
|
||||
MOVE_ROCK_TOMB,
|
||||
MOVE_AERIAL_ACE,
|
||||
MOVE_TORMENT,
|
||||
MOVE_FACADE,
|
||||
MOVE_SECRET_POWER,
|
||||
MOVE_REST,
|
||||
MOVE_ATTRACT,
|
||||
MOVE_THIEF,
|
||||
MOVE_STEEL_WING,
|
||||
MOVE_SKILL_SWAP,
|
||||
MOVE_SNATCH,
|
||||
MOVE_OVERHEAT,
|
||||
MOVE_CUT,
|
||||
MOVE_FLY,
|
||||
MOVE_SURF,
|
||||
MOVE_STRENGTH,
|
||||
MOVE_FLASH,
|
||||
MOVE_ROCK_SMASH,
|
||||
MOVE_WATERFALL,
|
||||
MOVE_DIVE,
|
||||
[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_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,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1961,9 +1961,9 @@ static u8 CanMonLearnTMTutor(struct Pokemon *mon, u16 item, u8 tutor)
|
|||
if (GetMonData(mon, MON_DATA_IS_EGG))
|
||||
return CANNOT_LEARN_MOVE_IS_EGG;
|
||||
|
||||
if (item >= ITEM_TM01_FOCUS_PUNCH)
|
||||
if (item >= ITEM_TM01)
|
||||
{
|
||||
if (!CanMonLearnTMHM(mon, item - ITEM_TM01_FOCUS_PUNCH))
|
||||
if (!CanMonLearnTMHM(mon, item - ITEM_TM01))
|
||||
return CANNOT_LEARN_MOVE;
|
||||
else
|
||||
move = ItemIdToBattleMoveId(item);
|
||||
|
|
@ -4612,7 +4612,7 @@ void ItemUseCB_PPUp(u8 taskId, TaskFunc task)
|
|||
|
||||
u16 ItemIdToBattleMoveId(u16 item)
|
||||
{
|
||||
u16 tmNumber = item - ITEM_TM01_FOCUS_PUNCH;
|
||||
u16 tmNumber = item - ITEM_TM01;
|
||||
return sTMHMMoves[tmNumber];
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue