From 403216064171bcdaf599805f9ff1e12229788ae8 Mon Sep 17 00:00:00 2001 From: Eduardo Alvaro Quezada D'Ottone Date: Sat, 14 Mar 2020 08:16:59 -0300 Subject: [PATCH] Restored the definitions of named TM ID to how it is in pokeemerald. (#309) --- include/constants/items.h | 116 +++++++++++++++++++------------------- 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/include/constants/items.h b/include/constants/items.h index 0dfcdd3e4..c8c0bbfdc 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -612,65 +612,65 @@ #define ITEM_HM07 538 #define ITEM_HM08 539 -#define ITEM_TM01_FOCUS_PUNCH 482 -#define ITEM_TM02_DRAGON_CLAW 483 -#define ITEM_TM03_WATER_PULSE 484 -#define ITEM_TM04_CALM_MIND 485 -#define ITEM_TM05_ROAR 486 -#define ITEM_TM06_TOXIC 487 -#define ITEM_TM07_HAIL 488 -#define ITEM_TM08_BULK_UP 489 -#define ITEM_TM09_BULLET_SEED 490 -#define ITEM_TM10_HIDDEN_POWER 491 -#define ITEM_TM11_SUNNY_DAY 492 -#define ITEM_TM12_TAUNT 493 -#define ITEM_TM13_ICE_BEAM 494 -#define ITEM_TM14_BLIZZARD 495 -#define ITEM_TM15_HYPER_BEAM 496 -#define ITEM_TM16_LIGHT_SCREEN 497 -#define ITEM_TM17_PROTECT 498 -#define ITEM_TM18_RAIN_DANCE 499 -#define ITEM_TM19_GIGA_DRAIN 500 -#define ITEM_TM20_SAFEGUARD 501 -#define ITEM_TM21_FRUSTRATION 502 -#define ITEM_TM22_SOLARBEAM 503 -#define ITEM_TM23_IRON_TAIL 504 -#define ITEM_TM24_THUNDERBOLT 505 -#define ITEM_TM25_THUNDER 506 -#define ITEM_TM26_EARTHQUAKE 507 -#define ITEM_TM27_RETURN 508 -#define ITEM_TM28_DIG 509 -#define ITEM_TM29_PSYCHIC 510 -#define ITEM_TM30_SHADOW_BALL 511 -#define ITEM_TM31_BRICK_BREAK 512 -#define ITEM_TM32_DOUBLE_TEAM 513 -#define ITEM_TM33_REFLECT 514 -#define ITEM_TM34_SHOCK_WAVE 515 -#define ITEM_TM35_FLAMETHROWER 516 -#define ITEM_TM36_SLUDGE_BOMB 517 -#define ITEM_TM37_SANDSTORM 518 -#define ITEM_TM38_FIRE_BLAST 519 -#define ITEM_TM39_ROCK_TOMB 520 -#define ITEM_TM40_AERIAL_ACE 521 -#define ITEM_TM41_TORMENT 522 -#define ITEM_TM42_FACADE 523 -#define ITEM_TM43_SECRET_POWER 524 -#define ITEM_TM44_REST 525 -#define ITEM_TM45_ATTRACT 526 -#define ITEM_TM46_THIEF 527 -#define ITEM_TM47_STEEL_WING 528 -#define ITEM_TM48_SKILL_SWAP 529 -#define ITEM_TM49_SNATCH 530 -#define ITEM_TM50_OVERHEAT 531 +#define ITEM_TM01_FOCUS_PUNCH ITEM_TM01 +#define ITEM_TM02_DRAGON_CLAW ITEM_TM02 +#define ITEM_TM03_WATER_PULSE ITEM_TM03 +#define ITEM_TM04_CALM_MIND ITEM_TM04 +#define ITEM_TM05_ROAR ITEM_TM05 +#define ITEM_TM06_TOXIC ITEM_TM06 +#define ITEM_TM07_HAIL ITEM_TM07 +#define ITEM_TM08_BULK_UP ITEM_TM08 +#define ITEM_TM09_BULLET_SEED ITEM_TM09 +#define ITEM_TM10_HIDDEN_POWER ITEM_TM10 +#define ITEM_TM11_SUNNY_DAY ITEM_TM11 +#define ITEM_TM12_TAUNT ITEM_TM12 +#define ITEM_TM13_ICE_BEAM ITEM_TM13 +#define ITEM_TM14_BLIZZARD ITEM_TM14 +#define ITEM_TM15_HYPER_BEAM ITEM_TM15 +#define ITEM_TM16_LIGHT_SCREEN ITEM_TM16 +#define ITEM_TM17_PROTECT ITEM_TM17 +#define ITEM_TM18_RAIN_DANCE ITEM_TM18 +#define ITEM_TM19_GIGA_DRAIN ITEM_TM19 +#define ITEM_TM20_SAFEGUARD ITEM_TM20 +#define ITEM_TM21_FRUSTRATION ITEM_TM21 +#define ITEM_TM22_SOLARBEAM ITEM_TM22 +#define ITEM_TM23_IRON_TAIL ITEM_TM23 +#define ITEM_TM24_THUNDERBOLT ITEM_TM24 +#define ITEM_TM25_THUNDER ITEM_TM25 +#define ITEM_TM26_EARTHQUAKE ITEM_TM26 +#define ITEM_TM27_RETURN ITEM_TM27 +#define ITEM_TM28_DIG ITEM_TM28 +#define ITEM_TM29_PSYCHIC ITEM_TM29 +#define ITEM_TM30_SHADOW_BALL ITEM_TM30 +#define ITEM_TM31_BRICK_BREAK ITEM_TM31 +#define ITEM_TM32_DOUBLE_TEAM ITEM_TM32 +#define ITEM_TM33_REFLECT ITEM_TM33 +#define ITEM_TM34_SHOCK_WAVE ITEM_TM34 +#define ITEM_TM35_FLAMETHROWER ITEM_TM35 +#define ITEM_TM36_SLUDGE_BOMB ITEM_TM36 +#define ITEM_TM37_SANDSTORM ITEM_TM37 +#define ITEM_TM38_FIRE_BLAST ITEM_TM38 +#define ITEM_TM39_ROCK_TOMB ITEM_TM39 +#define ITEM_TM40_AERIAL_ACE ITEM_TM40 +#define ITEM_TM41_TORMENT ITEM_TM41 +#define ITEM_TM42_FACADE ITEM_TM42 +#define ITEM_TM43_SECRET_POWER ITEM_TM43 +#define ITEM_TM44_REST ITEM_TM44 +#define ITEM_TM45_ATTRACT ITEM_TM45 +#define ITEM_TM46_THIEF ITEM_TM46 +#define ITEM_TM47_STEEL_WING ITEM_TM47 +#define ITEM_TM48_SKILL_SWAP ITEM_TM48 +#define ITEM_TM49_SNATCH ITEM_TM49 +#define ITEM_TM50_OVERHEAT ITEM_TM50 -#define ITEM_HM01_CUT 532 -#define ITEM_HM02_FLY 533 -#define ITEM_HM03_SURF 534 -#define ITEM_HM04_STRENGTH 535 -#define ITEM_HM05_FLASH 536 -#define ITEM_HM06_ROCK_SMASH 537 -#define ITEM_HM07_WATERFALL 538 -#define ITEM_HM08_DIVE 539 +#define ITEM_HM01_CUT ITEM_HM01 +#define ITEM_HM02_FLY ITEM_HM02 +#define ITEM_HM03_SURF ITEM_HM03 +#define ITEM_HM04_STRENGTH ITEM_HM04 +#define ITEM_HM05_FLASH ITEM_HM05 +#define ITEM_HM06_ROCK_SMASH ITEM_HM06 +#define ITEM_HM07_WATERFALL ITEM_HM07 +#define ITEM_HM08_DIVE ITEM_HM08 // FireRed/LeafGreen #define ITEM_OAKS_PARCEL 590 #define ITEM_POKE_FLUTE 591