diff --git a/include/constants/hold_effects.h b/include/constants/hold_effects.h index 0562bc469..9d4089101 100644 --- a/include/constants/hold_effects.h +++ b/include/constants/hold_effects.h @@ -134,9 +134,6 @@ #define HOLD_EFFECT_ADRENALINE_ORB 152 #define HOLD_EFFECT_MEMORY 153 -// Unordered -#define HOLD_EFFECT_RAISE_EV 154 - #define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS)) #endif // GUARD_HOLD_EFFECTS_H diff --git a/include/constants/items.h b/include/constants/items.h index 71e7bf995..0b3e29b53 100644 --- a/include/constants/items.h +++ b/include/constants/items.h @@ -97,608 +97,608 @@ #define ITEM_SUPER_REPEL 91 #define ITEM_MAX_REPEL 92 #define ITEM_ABILITY_CAPSULE 93 -// Evolution stones -#define ITEM_SUN_STONE 94 -#define ITEM_MOON_STONE 95 -#define ITEM_FIRE_STONE 96 -#define ITEM_THUNDER_STONE 97 -#define ITEM_WATER_STONE 98 -#define ITEM_LEAF_STONE 99 -#define ITEM_DAWN_STONE 100 -#define ITEM_DUSK_STONE 101 -#define ITEM_SHINY_STONE 102 -#define ITEM_ICE_STONE 103 -// Unusable -#define ITEM_RED_APRICORN 104 -#define ITEM_BLUE_APRICORN 105 -#define ITEM_YELLOW_APRICORN 106 -#define ITEM_GREEN_APRICORN 107 -#define ITEM_PINK_APRICORN 108 -#define ITEM_WHITE_APRICORN 109 -#define ITEM_BLACK_APRICORN 110 -#define ITEM_TINY_MUSHROOM 111 -#define ITEM_BIG_MUSHROOM 112 -#define ITEM_PEARL 113 -#define ITEM_BIG_PEARL 114 -#define ITEM_STARDUST 115 -#define ITEM_STAR_PIECE 116 -#define ITEM_NUGGET 117 -#define ITEM_HEART_SCALE 118 -#define ITEM_RED_NECTAR 119 -#define ITEM_YELLOW_NECTAR 120 -#define ITEM_PINK_NECTAR 121 -#define ITEM_PURPLE_NECTAR 122 -#define ITEM_HONEY 123 -#define ITEM_RARE_BONE 124 -// Mails -#define ITEM_ORANGE_MAIL 125 -#define ITEM_HARBOR_MAIL 126 -#define ITEM_GLITTER_MAIL 127 -#define ITEM_MECH_MAIL 128 -#define ITEM_WOOD_MAIL 129 -#define ITEM_WAVE_MAIL 130 -#define ITEM_BEAD_MAIL 131 -#define ITEM_SHADOW_MAIL 132 -#define ITEM_TROPIC_MAIL 133 -#define ITEM_DREAM_MAIL 134 -#define ITEM_FAB_MAIL 135 -#define ITEM_RETRO_MAIL 136 -// Berries -#define ITEM_CHERI_BERRY 137 -#define ITEM_CHESTO_BERRY 138 -#define ITEM_PECHA_BERRY 139 -#define ITEM_RAWST_BERRY 140 -#define ITEM_ASPEAR_BERRY 141 -#define ITEM_LEPPA_BERRY 142 -#define ITEM_ORAN_BERRY 143 -#define ITEM_PERSIM_BERRY 144 -#define ITEM_LUM_BERRY 145 -#define ITEM_SITRUS_BERRY 146 -#define ITEM_FIGY_BERRY 147 -#define ITEM_WIKI_BERRY 148 -#define ITEM_MAGO_BERRY 149 -#define ITEM_AGUAV_BERRY 150 -#define ITEM_IAPAPA_BERRY 151 -#define ITEM_RAZZ_BERRY 152 -#define ITEM_BLUK_BERRY 153 -#define ITEM_NANAB_BERRY 154 -#define ITEM_WEPEAR_BERRY 155 -#define ITEM_PINAP_BERRY 156 -#define ITEM_POMEG_BERRY 157 -#define ITEM_KELPSY_BERRY 158 -#define ITEM_QUALOT_BERRY 159 -#define ITEM_HONDEW_BERRY 160 -#define ITEM_GREPA_BERRY 161 -#define ITEM_TAMATO_BERRY 162 -#define ITEM_CORNN_BERRY 163 -#define ITEM_MAGOST_BERRY 164 -#define ITEM_RABUTA_BERRY 165 -#define ITEM_NOMEL_BERRY 166 -#define ITEM_SPELON_BERRY 167 -#define ITEM_PAMTRE_BERRY 168 -#define ITEM_WATMEL_BERRY 169 -#define ITEM_DURIN_BERRY 170 -#define ITEM_BELUE_BERRY 171 -#define ITEM_OCCA_BERRY 172 -#define ITEM_PASSHO_BERRY 173 -#define ITEM_WACAN_BERRY 174 -#define ITEM_RINDO_BERRY 175 -#define ITEM_YACHE_BERRY 176 -#define ITEM_CHOPLE_BERRY 177 -#define ITEM_KEBIA_BERRY 178 -#define ITEM_SHUCA_BERRY 179 -#define ITEM_COBA_BERRY 180 -#define ITEM_PAYAPA_BERRY 181 -#define ITEM_TANGA_BERRY 182 -#define ITEM_CHARTI_BERRY 183 -#define ITEM_KASIB_BERRY 184 -#define ITEM_HABAN_BERRY 185 -#define ITEM_COLBUR_BERRY 186 -#define ITEM_BABIRI_BERRY 187 -#define ITEM_CHILAN_BERRY 188 -#define ITEM_ROSELI_BERRY 189 -#define ITEM_LIECHI_BERRY 190 -#define ITEM_GANLON_BERRY 191 -#define ITEM_SALAC_BERRY 192 -#define ITEM_PETAYA_BERRY 193 -#define ITEM_APICOT_BERRY 194 -#define ITEM_LANSAT_BERRY 195 -#define ITEM_STARF_BERRY 196 -#define ITEM_MICLE_BERRY 197 -#define ITEM_ENIGMA_BERRY 198 -#define ITEM_CUSTAP_BERRY 199 -#define ITEM_JABOCA_BERRY 200 -#define ITEM_ROWAP_BERRY 201 -#define ITEM_KEE_BERRY 202 -#define ITEM_MARANGA_BERRY 203 -// Battle Held items -#define ITEM_BRIGHT_POWDER 204 -#define ITEM_WHITE_HERB 205 -#define ITEM_MACHO_BRACE 206 -#define ITEM_EXP_SHARE 207 -#define ITEM_QUICK_CLAW 208 -#define ITEM_SOOTHE_BELL 209 -#define ITEM_MENTAL_HERB 210 -#define ITEM_CHOICE_BAND 211 -#define ITEM_KINGS_ROCK 212 -#define ITEM_SILVER_POWDER 213 -#define ITEM_AMULET_COIN 214 -#define ITEM_CLEANSE_TAG 215 -#define ITEM_SMOKE_BALL 216 -#define ITEM_EVERSTONE 217 -#define ITEM_FOCUS_BAND 218 -#define ITEM_LUCKY_EGG 219 -#define ITEM_SCOPE_LENS 220 -#define ITEM_METAL_COAT 221 -#define ITEM_LEFTOVERS 222 -#define ITEM_DRAGON_SCALE 223 -#define ITEM_OVAL_STONE 224 -#define ITEM_PROTECTOR 225 -#define ITEM_ELECTIRIZER 226 -#define ITEM_MAGMARIZER 227 -#define ITEM_DUBIOUS_DISC 228 -#define ITEM_REAPER_CLOTH 229 -#define ITEM_RAZOR_CLAW 230 -#define ITEM_RAZOR_FANG 231 -#define ITEM_PRISM_SCALE 232 -#define ITEM_WHIPPED_DREAM 233 -#define ITEM_SACHET 234 -#define ITEM_SOFT_SAND 235 -#define ITEM_HARD_STONE 236 -#define ITEM_MIRACLE_SEED 237 -#define ITEM_BLACK_GLASSES 238 -#define ITEM_BLACK_BELT 239 -#define ITEM_MAGNET 240 -#define ITEM_MYSTIC_WATER 241 -#define ITEM_SHARP_BEAK 242 -#define ITEM_POISON_BARB 243 -#define ITEM_NEVER_MELT_ICE 244 -#define ITEM_SPELL_TAG 245 -#define ITEM_TWISTED_SPOON 246 -#define ITEM_CHARCOAL 247 -#define ITEM_DRAGON_FANG 248 -#define ITEM_SILK_SCARF 249 -#define ITEM_UP_GRADE 250 -#define ITEM_SHELL_BELL 251 -#define ITEM_POWER_BRACER 252 -#define ITEM_POWER_BELT 253 -#define ITEM_POWER_LENS 254 -#define ITEM_POWER_BAND 255 -#define ITEM_POWER_ANKLET 256 -#define ITEM_POWER_WEIGHT 257 -#define ITEM_POWER_HERB 258 -#define ITEM_CHOICE_SCARF 259 -#define ITEM_CHOICE_SPECS 260 -#define ITEM_FOCUS_SASH 261 -#define ITEM_WIDE_LENS 262 -#define ITEM_ZOOM_LENS 263 -#define ITEM_METRONOME 264 -#define ITEM_MUSCLE_BAND 265 -#define ITEM_WISE_GLASSES 266 -#define ITEM_EXPERT_BELT 267 -#define ITEM_LIGHT_CLAY 268 -#define ITEM_ICY_ROCK 269 -#define ITEM_SMOOTH_ROCK 270 -#define ITEM_HEAT_ROCK 271 -#define ITEM_DAMP_ROCK 272 -#define ITEM_DESTINY_KNOT 273 -#define ITEM_GRIP_CLAW 274 -#define ITEM_LIFE_ORB 275 -#define ITEM_TOXIC_ORB 276 -#define ITEM_FLAME_ORB 277 -#define ITEM_STICKY_BARB 278 -#define ITEM_BLACK_SLUDGE 279 -#define ITEM_IRON_BALL 280 -#define ITEM_LAGGING_TAIL 281 -#define ITEM_SHED_SHELL 282 -#define ITEM_BIG_ROOT 283 -#define ITEM_EVIOLITE 284 -#define ITEM_FLOAT_STONE 285 -#define ITEM_ROCKY_HELMET 286 -#define ITEM_AIR_BALLOON 287 -#define ITEM_RED_CARD 288 -#define ITEM_RING_TARGET 289 -#define ITEM_BINDING_BAND 290 -#define ITEM_EJECT_BUTTON 291 -#define ITEM_ABSORB_BULB 292 -#define ITEM_CELL_BATTERY 293 -#define ITEM_LUMINOUS_MOSS 294 -#define ITEM_SNOWBALL 295 -#define ITEM_WEAKNESS_POLICY 296 -#define ITEM_ASSAULT_VEST 297 -#define ITEM_SAFETY_GOGGLES 298 -#define ITEM_ADRENALINE_ORB 299 -#define ITEM_TERRAIN_EXTENDER 300 -#define ITEM_PROTECTIVE_PADS 301 -#define ITEM_ELECTRIC_SEED 302 -#define ITEM_PSYCHIC_SEED 303 -#define ITEM_MISTY_SEED 304 -#define ITEM_GRASSY_SEED 305 -// Incenses -#define ITEM_SEA_INCENSE 306 -#define ITEM_LAX_INCENSE 307 -#define ITEM_ODD_INCENSE 308 -#define ITEM_ROCK_INCENSE 309 -#define ITEM_FULL_INCENSE 310 -#define ITEM_WAVE_INCENSE 311 -#define ITEM_ROSE_INCENSE 312 -#define ITEM_LUCK_INCENSE 313 -#define ITEM_PURE_INCENSE 314 -// Plates -#define ITEM_INSECT_PLATE 315 -#define ITEM_DREAD_PLATE 316 -#define ITEM_DRACO_PLATE 317 -#define ITEM_ZAP_PLATE 318 -#define ITEM_PIXIE_PLATE 319 -#define ITEM_FIST_PLATE 320 -#define ITEM_FLAME_PLATE 321 -#define ITEM_SKY_PLATE 322 -#define ITEM_SPOOKY_PLATE 323 -#define ITEM_MEADOW_PLATE 324 -#define ITEM_EARTH_PLATE 325 -#define ITEM_ICICLE_PLATE 326 -#define ITEM_TOXIC_PLATE 327 -#define ITEM_MIND_PLATE 328 -#define ITEM_STONE_PLATE 329 -#define ITEM_IRON_PLATE 330 -#define ITEM_SPLASH_PLATE 331 -// Gems -#define ITEM_BUG_GEM 332 -#define ITEM_DARK_GEM 333 -#define ITEM_DRAGON_GEM 334 -#define ITEM_ELECTRIC_GEM 335 -#define ITEM_FAIRY_GEM 336 -#define ITEM_FIGHTING_GEM 337 -#define ITEM_FIRE_GEM 338 -#define ITEM_FLYING_GEM 339 -#define ITEM_GHOST_GEM 340 -#define ITEM_GRASS_GEM 341 -#define ITEM_GROUND_GEM 342 -#define ITEM_ICE_GEM 343 -#define ITEM_NORMAL_GEM 344 -#define ITEM_POISON_GEM 345 -#define ITEM_PSYCHIC_GEM 346 -#define ITEM_ROCK_GEM 347 -#define ITEM_STEEL_GEM 348 -#define ITEM_WATER_GEM 349 -// Mon specific -#define ITEM_SOUL_DEW 350 -#define ITEM_DEEP_SEA_TOOTH 351 -#define ITEM_DEEP_SEA_SCALE 352 -#define ITEM_LUCKY_PUNCH 353 -#define ITEM_METAL_POWDER 354 -#define ITEM_THICK_CLUB 355 -#define ITEM_STICK 356 -#define ITEM_LIGHT_BALL 357 -#define ITEM_QUICK_POWDER 358 -#define ITEM_ODD_KEYSTONE 359 -#define ITEM_ADAMANT_ORB 360 -#define ITEM_LUSTROUS_ORB 361 -#define ITEM_GRISEOUS_ORB 362 -#define ITEM_GRACIDEA 363 -// Memories -#define ITEM_BUG_MEMORY 364 -#define ITEM_DARK_MEMORY 365 -#define ITEM_DRAGON_MEMORY 366 -#define ITEM_ELECTRIC_MEMORY 367 -#define ITEM_FAIRY_MEMORY 368 -#define ITEM_FIGHTING_MEMORY 369 -#define ITEM_FIRE_MEMORY 370 -#define ITEM_FLYING_MEMORY 371 -#define ITEM_GHOST_MEMORY 372 -#define ITEM_GRASS_MEMORY 373 -#define ITEM_GROUND_MEMORY 374 -#define ITEM_ICE_MEMORY 375 -#define ITEM_POISON_MEMORY 376 -#define ITEM_PSYCHIC_MEMORY 377 -#define ITEM_ROCK_MEMORY 378 -#define ITEM_STEEL_MEMORY 379 -#define ITEM_WATER_MEMORY 380 -// Drives -#define ITEM_DOUSE_DRIVE 381 -#define ITEM_SHOCK_DRIVE 382 -#define ITEM_BURN_DRIVE 383 -#define ITEM_CHILL_DRIVE 384 -// Contest held items -#define ITEM_RED_SCARF 385 -#define ITEM_BLUE_SCARF 386 -#define ITEM_PINK_SCARF 387 -#define ITEM_GREEN_SCARF 388 -#define ITEM_YELLOW_SCARF 389 -// Mega stones -#define ITEM_ABOMASITE 390 -#define ITEM_ABSOLITE 391 -#define ITEM_AERODACTYLITE 392 -#define ITEM_AGGRONITE 393 -#define ITEM_ALAKAZITE 394 -#define ITEM_ALTARIANITE 395 -#define ITEM_AMPHAROSITE 396 -#define ITEM_AUDINITE 397 -#define ITEM_BANETTITE 398 -#define ITEM_BEEDRILLITE 399 -#define ITEM_BLASTOISINITE 400 -#define ITEM_BLAZIKENITE 401 -#define ITEM_CAMERUPTITE 402 -#define ITEM_CHARIZARDITE_X 403 -#define ITEM_CHARIZARDITE_Y 404 -#define ITEM_DIANCITE 405 -#define ITEM_GALLADITE 406 -#define ITEM_GARCHOMPITE 407 -#define ITEM_GARDEVOIRITE 408 -#define ITEM_GENGARITE 409 -#define ITEM_GLALITITE 410 -#define ITEM_GYARADOSITE 411 -#define ITEM_HERACRONITE 412 -#define ITEM_HOUNDOOMINITE 413 -#define ITEM_KANGASKHANITE 414 -#define ITEM_LATIASITE 415 -#define ITEM_LATIOSITE 416 -#define ITEM_LOPUNNITE 417 -#define ITEM_LUCARIONITE 418 -#define ITEM_MANECTITE 419 -#define ITEM_MAWILITE 420 -#define ITEM_MEDICHAMITE 421 -#define ITEM_METAGROSSITE 422 -#define ITEM_MEWTWONITE_X 423 -#define ITEM_MEWTWONITE_Y 424 -#define ITEM_PIDGEOTITE 425 -#define ITEM_PINSIRITE 426 -#define ITEM_SABLENITE 427 -#define ITEM_SALAMENCITE 428 -#define ITEM_SCEPTILITE 429 -#define ITEM_SCIZORITE 430 -#define ITEM_SHARPEDONITE 431 -#define ITEM_SLOWBRONITE 432 -#define ITEM_STEELIXITE 433 -#define ITEM_SWAMPERTITE 434 -#define ITEM_TYRANITARITE 435 -#define ITEM_VENUSAURITE 436 -#define ITEM_MEGA_BRACELET 437 -// Fossils -#define ITEM_ARMOR_FOSSIL 438 -#define ITEM_SKULL_FOSSIL 439 -#define ITEM_HELIX_FOSSIL 440 -#define ITEM_DOME_FOSSIL 441 -#define ITEM_COVER_FOSSIL 442 -#define ITEM_PLUME_FOSSIL 443 -#define ITEM_JAW_FOSSIL 444 -#define ITEM_SAIL_FOSSIL 445 -#define ITEM_ROOT_FOSSIL 446 -#define ITEM_CLAW_FOSSIL 447 -// Key Items -#define ITEM_MACH_BIKE 448 -#define ITEM_COIN_CASE 449 -#define ITEM_ITEMFINDER 450 -#define ITEM_OLD_ROD 451 -#define ITEM_GOOD_ROD 452 -#define ITEM_SUPER_ROD 453 -#define ITEM_SS_TICKET 454 -#define ITEM_CONTEST_PASS 455 -#define ITEM_WAILMER_PAIL 456 -#define ITEM_DEVON_GOODS 457 -#define ITEM_SOOT_SACK 458 -#define ITEM_BASEMENT_KEY 459 -#define ITEM_ACRO_BIKE 460 -#define ITEM_POKEBLOCK_CASE 461 -#define ITEM_LETTER 462 -#define ITEM_EON_TICKET 463 -#define ITEM_RED_ORB 464 -#define ITEM_BLUE_ORB 465 -#define ITEM_SCANNER 466 -#define ITEM_GO_GOGGLES 467 -#define ITEM_METEORITE 468 -#define ITEM_ROOM_1_KEY 469 -#define ITEM_ROOM_2_KEY 470 -#define ITEM_ROOM_4_KEY 471 -#define ITEM_ROOM_6_KEY 472 -#define ITEM_STORAGE_KEY 473 -#define ITEM_DEVON_SCOPE 474 -// TMs/HMs -#define ITEM_TM01 475 -#define ITEM_TM02 476 -#define ITEM_TM03 477 -#define ITEM_TM04 478 -#define ITEM_TM05 479 -#define ITEM_TM06 480 -#define ITEM_TM07 481 -#define ITEM_TM08 482 -#define ITEM_TM09 483 -#define ITEM_TM10 484 -#define ITEM_TM11 485 -#define ITEM_TM12 486 -#define ITEM_TM13 487 -#define ITEM_TM14 488 -#define ITEM_TM15 489 -#define ITEM_TM16 490 -#define ITEM_TM17 491 -#define ITEM_TM18 492 -#define ITEM_TM19 493 -#define ITEM_TM20 494 -#define ITEM_TM21 495 -#define ITEM_TM22 496 -#define ITEM_TM23 497 -#define ITEM_TM24 498 -#define ITEM_TM25 499 -#define ITEM_TM26 500 -#define ITEM_TM27 501 -#define ITEM_TM28 502 -#define ITEM_TM29 503 -#define ITEM_TM30 504 -#define ITEM_TM31 505 -#define ITEM_TM32 506 -#define ITEM_TM33 507 -#define ITEM_TM34 508 -#define ITEM_TM35 509 -#define ITEM_TM36 510 -#define ITEM_TM37 511 -#define ITEM_TM38 512 -#define ITEM_TM39 513 -#define ITEM_TM40 514 -#define ITEM_TM41 515 -#define ITEM_TM42 516 -#define ITEM_TM43 517 -#define ITEM_TM44 518 -#define ITEM_TM45 519 -#define ITEM_TM46 520 -#define ITEM_TM47 521 -#define ITEM_TM48 522 -#define ITEM_TM49 523 -#define ITEM_TM50 524 -#define ITEM_TM51 525 -#define ITEM_TM52 526 -#define ITEM_TM53 527 -#define ITEM_TM54 528 -#define ITEM_TM55 529 -#define ITEM_TM56 530 -#define ITEM_TM57 531 -#define ITEM_TM58 532 -#define ITEM_TM59 533 -#define ITEM_TM60 534 -#define ITEM_TM61 535 -#define ITEM_TM62 536 -#define ITEM_TM63 537 -#define ITEM_TM64 538 -#define ITEM_TM65 539 -#define ITEM_TM66 540 -#define ITEM_TM67 541 -#define ITEM_TM68 542 -#define ITEM_TM69 543 -#define ITEM_TM70 544 -#define ITEM_TM71 545 -#define ITEM_TM72 546 -#define ITEM_TM73 547 -#define ITEM_TM74 548 -#define ITEM_TM75 549 -#define ITEM_TM76 550 -#define ITEM_TM77 551 -#define ITEM_TM78 552 -#define ITEM_TM79 553 -#define ITEM_TM80 554 -#define ITEM_TM81 555 -#define ITEM_TM82 556 -#define ITEM_TM83 557 -#define ITEM_TM84 558 -#define ITEM_TM85 559 -#define ITEM_TM86 560 -#define ITEM_TM87 561 -#define ITEM_TM88 562 -#define ITEM_TM89 563 -#define ITEM_TM90 564 -#define ITEM_TM91 565 -#define ITEM_TM92 566 -#define ITEM_TM93 567 -#define ITEM_TM94 568 -#define ITEM_TM95 569 -#define ITEM_TM96 570 -#define ITEM_TM97 571 -#define ITEM_TM98 572 -#define ITEM_TM99 573 -#define ITEM_TM100 574 - -#define ITEM_HM01 525 -#define ITEM_HM02 526 -#define ITEM_HM03 527 -#define ITEM_HM04 528 -#define ITEM_HM05 529 -#define ITEM_HM06 530 -#define ITEM_HM07 531 -#define ITEM_HM08 532 - -#define ITEM_TM01_FOCUS_PUNCH 475 -#define ITEM_TM02_DRAGON_CLAW 476 -#define ITEM_TM03_WATER_PULSE 477 -#define ITEM_TM04_CALM_MIND 478 -#define ITEM_TM05_ROAR 479 -#define ITEM_TM06_TOXIC 480 -#define ITEM_TM07_HAIL 481 -#define ITEM_TM08_BULK_UP 482 -#define ITEM_TM09_BULLET_SEED 483 -#define ITEM_TM10_HIDDEN_POWER 484 -#define ITEM_TM11_SUNNY_DAY 485 -#define ITEM_TM12_TAUNT 486 -#define ITEM_TM13_ICE_BEAM 487 -#define ITEM_TM14_BLIZZARD 488 -#define ITEM_TM15_HYPER_BEAM 489 -#define ITEM_TM16_LIGHT_SCREEN 490 -#define ITEM_TM17_PROTECT 491 -#define ITEM_TM18_RAIN_DANCE 492 -#define ITEM_TM19_GIGA_DRAIN 493 -#define ITEM_TM20_SAFEGUARD 494 -#define ITEM_TM21_FRUSTRATION 495 -#define ITEM_TM22_SOLARBEAM 496 -#define ITEM_TM23_IRON_TAIL 497 -#define ITEM_TM24_THUNDERBOLT 498 -#define ITEM_TM25_THUNDER 499 -#define ITEM_TM26_EARTHQUAKE 500 -#define ITEM_TM27_RETURN 501 -#define ITEM_TM28_DIG 502 -#define ITEM_TM29_PSYCHIC 503 -#define ITEM_TM30_SHADOW_BALL 504 -#define ITEM_TM31_BRICK_BREAK 505 -#define ITEM_TM32_DOUBLE_TEAM 506 -#define ITEM_TM33_REFLECT 507 -#define ITEM_TM34_SHOCK_WAVE 508 -#define ITEM_TM35_FLAMETHROWER 509 -#define ITEM_TM36_SLUDGE_BOMB 510 -#define ITEM_TM37_SANDSTORM 511 -#define ITEM_TM38_FIRE_BLAST 512 -#define ITEM_TM39_ROCK_TOMB 513 -#define ITEM_TM40_AERIAL_ACE 514 -#define ITEM_TM41_TORMENT 515 -#define ITEM_TM42_FACADE 516 -#define ITEM_TM43_SECRET_POWER 517 -#define ITEM_TM44_REST 518 -#define ITEM_TM45_ATTRACT 519 -#define ITEM_TM46_THIEF 520 -#define ITEM_TM47_STEEL_WING 521 -#define ITEM_TM48_SKILL_SWAP 522 -#define ITEM_TM49_SNATCH 523 -#define ITEM_TM50_OVERHEAT 524 - -#define ITEM_HM01_CUT 525 -#define ITEM_HM02_FLY 526 -#define ITEM_HM03_SURF 527 -#define ITEM_HM04_STRENGTH 528 -#define ITEM_HM05_FLASH 529 -#define ITEM_HM06_ROCK_SMASH 530 -#define ITEM_HM07_WATERFALL 531 -#define ITEM_HM08_DIVE 532 -// FireRed/LeafGreen -#define ITEM_OAKS_PARCEL 583 -#define ITEM_POKE_FLUTE 584 -#define ITEM_SECRET_KEY 585 -#define ITEM_BIKE_VOUCHER 586 -#define ITEM_GOLD_TEETH 587 -#define ITEM_OLD_AMBER 588 -#define ITEM_CARD_KEY 589 -#define ITEM_LIFT_KEY 590 -#define ITEM_SILPH_SCOPE 591 -#define ITEM_BICYCLE 592 -#define ITEM_TOWN_MAP 593 -#define ITEM_VS_SEEKER 594 -#define ITEM_FAME_CHECKER 595 -#define ITEM_TM_CASE 596 -#define ITEM_BERRY_POUCH 597 -#define ITEM_TEACHY_TV 598 -#define ITEM_TRI_PASS 599 -#define ITEM_RAINBOW_PASS 600 -#define ITEM_TEA 601 -#define ITEM_MYSTIC_TICKET 602 -#define ITEM_AURORA_TICKET 603 -#define ITEM_POWDER_JAR 604 -#define ITEM_RUBY 605 -#define ITEM_SAPPHIRE 606 -// Emerald -#define ITEM_MAGMA_EMBLEM 607 -#define ITEM_OLD_SEA_MAP 608 // Wings -#define ITEM_HEALTH_WING 609 -#define ITEM_MUSCLE_WING 610 -#define ITEM_RESIST_WING 611 -#define ITEM_GENIUS_WING 612 -#define ITEM_CLEVER_WING 613 -#define ITEM_SWIFT_WING 614 -#define ITEM_PRETTY_WING 615 +#define ITEM_HEALTH_WING 94 +#define ITEM_MUSCLE_WING 95 +#define ITEM_RESIST_WING 96 +#define ITEM_GENIUS_WING 97 +#define ITEM_CLEVER_WING 98 +#define ITEM_SWIFT_WING 99 +#define ITEM_PRETTY_WING 100 +// Evolution stones +#define ITEM_SUN_STONE 101 +#define ITEM_MOON_STONE 102 +#define ITEM_FIRE_STONE 103 +#define ITEM_THUNDER_STONE 104 +#define ITEM_WATER_STONE 105 +#define ITEM_LEAF_STONE 106 +#define ITEM_DAWN_STONE 107 +#define ITEM_DUSK_STONE 108 +#define ITEM_SHINY_STONE 109 +#define ITEM_ICE_STONE 110 +// Unusable +#define ITEM_RED_APRICORN 111 +#define ITEM_BLUE_APRICORN 112 +#define ITEM_YELLOW_APRICORN 113 +#define ITEM_GREEN_APRICORN 114 +#define ITEM_PINK_APRICORN 115 +#define ITEM_WHITE_APRICORN 116 +#define ITEM_BLACK_APRICORN 117 +#define ITEM_TINY_MUSHROOM 118 +#define ITEM_BIG_MUSHROOM 119 +#define ITEM_PEARL 120 +#define ITEM_BIG_PEARL 121 +#define ITEM_STARDUST 122 +#define ITEM_STAR_PIECE 123 +#define ITEM_NUGGET 124 +#define ITEM_HEART_SCALE 125 +#define ITEM_RED_NECTAR 126 +#define ITEM_YELLOW_NECTAR 127 +#define ITEM_PINK_NECTAR 128 +#define ITEM_PURPLE_NECTAR 129 +#define ITEM_HONEY 130 +#define ITEM_RARE_BONE 131 +// Mails +#define ITEM_ORANGE_MAIL 132 +#define ITEM_HARBOR_MAIL 133 +#define ITEM_GLITTER_MAIL 134 +#define ITEM_MECH_MAIL 135 +#define ITEM_WOOD_MAIL 136 +#define ITEM_WAVE_MAIL 137 +#define ITEM_BEAD_MAIL 138 +#define ITEM_SHADOW_MAIL 139 +#define ITEM_TROPIC_MAIL 140 +#define ITEM_DREAM_MAIL 141 +#define ITEM_FAB_MAIL 142 +#define ITEM_RETRO_MAIL 143 +// Berries +#define ITEM_CHERI_BERRY 144 +#define ITEM_CHESTO_BERRY 145 +#define ITEM_PECHA_BERRY 146 +#define ITEM_RAWST_BERRY 147 +#define ITEM_ASPEAR_BERRY 148 +#define ITEM_LEPPA_BERRY 149 +#define ITEM_ORAN_BERRY 150 +#define ITEM_PERSIM_BERRY 151 +#define ITEM_LUM_BERRY 152 +#define ITEM_SITRUS_BERRY 153 +#define ITEM_FIGY_BERRY 154 +#define ITEM_WIKI_BERRY 155 +#define ITEM_MAGO_BERRY 156 +#define ITEM_AGUAV_BERRY 157 +#define ITEM_IAPAPA_BERRY 158 +#define ITEM_RAZZ_BERRY 159 +#define ITEM_BLUK_BERRY 160 +#define ITEM_NANAB_BERRY 161 +#define ITEM_WEPEAR_BERRY 162 +#define ITEM_PINAP_BERRY 163 +#define ITEM_POMEG_BERRY 164 +#define ITEM_KELPSY_BERRY 165 +#define ITEM_QUALOT_BERRY 166 +#define ITEM_HONDEW_BERRY 167 +#define ITEM_GREPA_BERRY 168 +#define ITEM_TAMATO_BERRY 169 +#define ITEM_CORNN_BERRY 170 +#define ITEM_MAGOST_BERRY 171 +#define ITEM_RABUTA_BERRY 172 +#define ITEM_NOMEL_BERRY 173 +#define ITEM_SPELON_BERRY 174 +#define ITEM_PAMTRE_BERRY 175 +#define ITEM_WATMEL_BERRY 176 +#define ITEM_DURIN_BERRY 177 +#define ITEM_BELUE_BERRY 178 +#define ITEM_OCCA_BERRY 179 +#define ITEM_PASSHO_BERRY 180 +#define ITEM_WACAN_BERRY 181 +#define ITEM_RINDO_BERRY 182 +#define ITEM_YACHE_BERRY 183 +#define ITEM_CHOPLE_BERRY 184 +#define ITEM_KEBIA_BERRY 185 +#define ITEM_SHUCA_BERRY 186 +#define ITEM_COBA_BERRY 187 +#define ITEM_PAYAPA_BERRY 188 +#define ITEM_TANGA_BERRY 189 +#define ITEM_CHARTI_BERRY 190 +#define ITEM_KASIB_BERRY 191 +#define ITEM_HABAN_BERRY 192 +#define ITEM_COLBUR_BERRY 193 +#define ITEM_BABIRI_BERRY 194 +#define ITEM_CHILAN_BERRY 195 +#define ITEM_ROSELI_BERRY 196 +#define ITEM_LIECHI_BERRY 197 +#define ITEM_GANLON_BERRY 198 +#define ITEM_SALAC_BERRY 199 +#define ITEM_PETAYA_BERRY 200 +#define ITEM_APICOT_BERRY 201 +#define ITEM_LANSAT_BERRY 202 +#define ITEM_STARF_BERRY 203 +#define ITEM_MICLE_BERRY 204 +#define ITEM_ENIGMA_BERRY 205 +#define ITEM_CUSTAP_BERRY 206 +#define ITEM_JABOCA_BERRY 207 +#define ITEM_ROWAP_BERRY 208 +#define ITEM_KEE_BERRY 209 +#define ITEM_MARANGA_BERRY 210 +// Battle Held items +#define ITEM_BRIGHT_POWDER 211 +#define ITEM_WHITE_HERB 212 +#define ITEM_MACHO_BRACE 213 +#define ITEM_EXP_SHARE 214 +#define ITEM_QUICK_CLAW 215 +#define ITEM_SOOTHE_BELL 216 +#define ITEM_MENTAL_HERB 217 +#define ITEM_CHOICE_BAND 218 +#define ITEM_KINGS_ROCK 219 +#define ITEM_SILVER_POWDER 220 +#define ITEM_AMULET_COIN 221 +#define ITEM_CLEANSE_TAG 222 +#define ITEM_SMOKE_BALL 223 +#define ITEM_EVERSTONE 224 +#define ITEM_FOCUS_BAND 225 +#define ITEM_LUCKY_EGG 226 +#define ITEM_SCOPE_LENS 227 +#define ITEM_METAL_COAT 228 +#define ITEM_LEFTOVERS 229 +#define ITEM_DRAGON_SCALE 230 +#define ITEM_OVAL_STONE 231 +#define ITEM_PROTECTOR 232 +#define ITEM_ELECTIRIZER 233 +#define ITEM_MAGMARIZER 234 +#define ITEM_DUBIOUS_DISC 235 +#define ITEM_REAPER_CLOTH 236 +#define ITEM_RAZOR_CLAW 237 +#define ITEM_RAZOR_FANG 238 +#define ITEM_PRISM_SCALE 239 +#define ITEM_WHIPPED_DREAM 240 +#define ITEM_SACHET 241 +#define ITEM_SOFT_SAND 242 +#define ITEM_HARD_STONE 243 +#define ITEM_MIRACLE_SEED 244 +#define ITEM_BLACK_GLASSES 245 +#define ITEM_BLACK_BELT 246 +#define ITEM_MAGNET 247 +#define ITEM_MYSTIC_WATER 248 +#define ITEM_SHARP_BEAK 249 +#define ITEM_POISON_BARB 250 +#define ITEM_NEVER_MELT_ICE 251 +#define ITEM_SPELL_TAG 252 +#define ITEM_TWISTED_SPOON 253 +#define ITEM_CHARCOAL 254 +#define ITEM_DRAGON_FANG 255 +#define ITEM_SILK_SCARF 256 +#define ITEM_UP_GRADE 257 +#define ITEM_SHELL_BELL 258 +#define ITEM_POWER_BRACER 259 +#define ITEM_POWER_BELT 260 +#define ITEM_POWER_LENS 261 +#define ITEM_POWER_BAND 262 +#define ITEM_POWER_ANKLET 263 +#define ITEM_POWER_WEIGHT 264 +#define ITEM_POWER_HERB 265 +#define ITEM_CHOICE_SCARF 266 +#define ITEM_CHOICE_SPECS 267 +#define ITEM_FOCUS_SASH 268 +#define ITEM_WIDE_LENS 269 +#define ITEM_ZOOM_LENS 270 +#define ITEM_METRONOME 271 +#define ITEM_MUSCLE_BAND 272 +#define ITEM_WISE_GLASSES 273 +#define ITEM_EXPERT_BELT 274 +#define ITEM_LIGHT_CLAY 275 +#define ITEM_ICY_ROCK 276 +#define ITEM_SMOOTH_ROCK 277 +#define ITEM_HEAT_ROCK 278 +#define ITEM_DAMP_ROCK 279 +#define ITEM_DESTINY_KNOT 280 +#define ITEM_GRIP_CLAW 281 +#define ITEM_LIFE_ORB 282 +#define ITEM_TOXIC_ORB 283 +#define ITEM_FLAME_ORB 284 +#define ITEM_STICKY_BARB 285 +#define ITEM_BLACK_SLUDGE 286 +#define ITEM_IRON_BALL 287 +#define ITEM_LAGGING_TAIL 288 +#define ITEM_SHED_SHELL 289 +#define ITEM_BIG_ROOT 290 +#define ITEM_EVIOLITE 291 +#define ITEM_FLOAT_STONE 292 +#define ITEM_ROCKY_HELMET 293 +#define ITEM_AIR_BALLOON 294 +#define ITEM_RED_CARD 295 +#define ITEM_RING_TARGET 296 +#define ITEM_BINDING_BAND 297 +#define ITEM_EJECT_BUTTON 298 +#define ITEM_ABSORB_BULB 299 +#define ITEM_CELL_BATTERY 300 +#define ITEM_LUMINOUS_MOSS 301 +#define ITEM_SNOWBALL 302 +#define ITEM_WEAKNESS_POLICY 303 +#define ITEM_ASSAULT_VEST 304 +#define ITEM_SAFETY_GOGGLES 305 +#define ITEM_ADRENALINE_ORB 306 +#define ITEM_TERRAIN_EXTENDER 307 +#define ITEM_PROTECTIVE_PADS 308 +#define ITEM_ELECTRIC_SEED 309 +#define ITEM_PSYCHIC_SEED 310 +#define ITEM_MISTY_SEED 311 +#define ITEM_GRASSY_SEED 312 +// Incenses +#define ITEM_SEA_INCENSE 313 +#define ITEM_LAX_INCENSE 314 +#define ITEM_ODD_INCENSE 315 +#define ITEM_ROCK_INCENSE 316 +#define ITEM_FULL_INCENSE 317 +#define ITEM_WAVE_INCENSE 318 +#define ITEM_ROSE_INCENSE 319 +#define ITEM_LUCK_INCENSE 320 +#define ITEM_PURE_INCENSE 321 +// Plates +#define ITEM_INSECT_PLATE 322 +#define ITEM_DREAD_PLATE 323 +#define ITEM_DRACO_PLATE 324 +#define ITEM_ZAP_PLATE 325 +#define ITEM_PIXIE_PLATE 326 +#define ITEM_FIST_PLATE 327 +#define ITEM_FLAME_PLATE 328 +#define ITEM_SKY_PLATE 329 +#define ITEM_SPOOKY_PLATE 330 +#define ITEM_MEADOW_PLATE 331 +#define ITEM_EARTH_PLATE 332 +#define ITEM_ICICLE_PLATE 333 +#define ITEM_TOXIC_PLATE 334 +#define ITEM_MIND_PLATE 335 +#define ITEM_STONE_PLATE 336 +#define ITEM_IRON_PLATE 337 +#define ITEM_SPLASH_PLATE 338 +// Gems +#define ITEM_BUG_GEM 339 +#define ITEM_DARK_GEM 340 +#define ITEM_DRAGON_GEM 341 +#define ITEM_ELECTRIC_GEM 342 +#define ITEM_FAIRY_GEM 343 +#define ITEM_FIGHTING_GEM 344 +#define ITEM_FIRE_GEM 345 +#define ITEM_FLYING_GEM 346 +#define ITEM_GHOST_GEM 347 +#define ITEM_GRASS_GEM 348 +#define ITEM_GROUND_GEM 349 +#define ITEM_ICE_GEM 350 +#define ITEM_NORMAL_GEM 351 +#define ITEM_POISON_GEM 352 +#define ITEM_PSYCHIC_GEM 353 +#define ITEM_ROCK_GEM 354 +#define ITEM_STEEL_GEM 355 +#define ITEM_WATER_GEM 356 +// Mon specific +#define ITEM_SOUL_DEW 357 +#define ITEM_DEEP_SEA_TOOTH 358 +#define ITEM_DEEP_SEA_SCALE 359 +#define ITEM_LUCKY_PUNCH 360 +#define ITEM_METAL_POWDER 361 +#define ITEM_THICK_CLUB 362 +#define ITEM_STICK 363 +#define ITEM_LIGHT_BALL 364 +#define ITEM_QUICK_POWDER 365 +#define ITEM_ODD_KEYSTONE 366 +#define ITEM_ADAMANT_ORB 367 +#define ITEM_LUSTROUS_ORB 368 +#define ITEM_GRISEOUS_ORB 369 +#define ITEM_GRACIDEA 370 +// Memories +#define ITEM_BUG_MEMORY 371 +#define ITEM_DARK_MEMORY 372 +#define ITEM_DRAGON_MEMORY 373 +#define ITEM_ELECTRIC_MEMORY 374 +#define ITEM_FAIRY_MEMORY 375 +#define ITEM_FIGHTING_MEMORY 376 +#define ITEM_FIRE_MEMORY 377 +#define ITEM_FLYING_MEMORY 378 +#define ITEM_GHOST_MEMORY 379 +#define ITEM_GRASS_MEMORY 380 +#define ITEM_GROUND_MEMORY 381 +#define ITEM_ICE_MEMORY 382 +#define ITEM_POISON_MEMORY 383 +#define ITEM_PSYCHIC_MEMORY 384 +#define ITEM_ROCK_MEMORY 385 +#define ITEM_STEEL_MEMORY 386 +#define ITEM_WATER_MEMORY 387 +// Drives +#define ITEM_DOUSE_DRIVE 388 +#define ITEM_SHOCK_DRIVE 389 +#define ITEM_BURN_DRIVE 390 +#define ITEM_CHILL_DRIVE 391 +// Contest held items +#define ITEM_RED_SCARF 392 +#define ITEM_BLUE_SCARF 393 +#define ITEM_PINK_SCARF 394 +#define ITEM_GREEN_SCARF 395 +#define ITEM_YELLOW_SCARF 396 +// Mega stones +#define ITEM_ABOMASITE 397 +#define ITEM_ABSOLITE 398 +#define ITEM_AERODACTYLITE 399 +#define ITEM_AGGRONITE 400 +#define ITEM_ALAKAZITE 401 +#define ITEM_ALTARIANITE 402 +#define ITEM_AMPHAROSITE 403 +#define ITEM_AUDINITE 404 +#define ITEM_BANETTITE 405 +#define ITEM_BEEDRILLITE 406 +#define ITEM_BLASTOISINITE 407 +#define ITEM_BLAZIKENITE 408 +#define ITEM_CAMERUPTITE 409 +#define ITEM_CHARIZARDITE_X 410 +#define ITEM_CHARIZARDITE_Y 411 +#define ITEM_DIANCITE 412 +#define ITEM_GALLADITE 413 +#define ITEM_GARCHOMPITE 414 +#define ITEM_GARDEVOIRITE 415 +#define ITEM_GENGARITE 416 +#define ITEM_GLALITITE 417 +#define ITEM_GYARADOSITE 418 +#define ITEM_HERACRONITE 419 +#define ITEM_HOUNDOOMINITE 420 +#define ITEM_KANGASKHANITE 421 +#define ITEM_LATIASITE 422 +#define ITEM_LATIOSITE 423 +#define ITEM_LOPUNNITE 424 +#define ITEM_LUCARIONITE 425 +#define ITEM_MANECTITE 426 +#define ITEM_MAWILITE 427 +#define ITEM_MEDICHAMITE 428 +#define ITEM_METAGROSSITE 429 +#define ITEM_MEWTWONITE_X 430 +#define ITEM_MEWTWONITE_Y 431 +#define ITEM_PIDGEOTITE 432 +#define ITEM_PINSIRITE 433 +#define ITEM_SABLENITE 434 +#define ITEM_SALAMENCITE 435 +#define ITEM_SCEPTILITE 436 +#define ITEM_SCIZORITE 437 +#define ITEM_SHARPEDONITE 438 +#define ITEM_SLOWBRONITE 439 +#define ITEM_STEELIXITE 440 +#define ITEM_SWAMPERTITE 441 +#define ITEM_TYRANITARITE 442 +#define ITEM_VENUSAURITE 443 +#define ITEM_MEGA_BRACELET 444 +// Fossils +#define ITEM_ARMOR_FOSSIL 445 +#define ITEM_SKULL_FOSSIL 446 +#define ITEM_HELIX_FOSSIL 447 +#define ITEM_DOME_FOSSIL 448 +#define ITEM_COVER_FOSSIL 449 +#define ITEM_PLUME_FOSSIL 450 +#define ITEM_JAW_FOSSIL 451 +#define ITEM_SAIL_FOSSIL 452 +#define ITEM_ROOT_FOSSIL 453 +#define ITEM_CLAW_FOSSIL 454 +// Key Items +#define ITEM_MACH_BIKE 455 +#define ITEM_COIN_CASE 456 +#define ITEM_ITEMFINDER 457 +#define ITEM_OLD_ROD 458 +#define ITEM_GOOD_ROD 459 +#define ITEM_SUPER_ROD 460 +#define ITEM_SS_TICKET 461 +#define ITEM_CONTEST_PASS 462 +#define ITEM_WAILMER_PAIL 463 +#define ITEM_DEVON_GOODS 464 +#define ITEM_SOOT_SACK 465 +#define ITEM_BASEMENT_KEY 466 +#define ITEM_ACRO_BIKE 467 +#define ITEM_POKEBLOCK_CASE 468 +#define ITEM_LETTER 469 +#define ITEM_EON_TICKET 470 +#define ITEM_RED_ORB 471 +#define ITEM_BLUE_ORB 472 +#define ITEM_SCANNER 473 +#define ITEM_GO_GOGGLES 474 +#define ITEM_METEORITE 475 +#define ITEM_ROOM_1_KEY 476 +#define ITEM_ROOM_2_KEY 477 +#define ITEM_ROOM_4_KEY 478 +#define ITEM_ROOM_6_KEY 479 +#define ITEM_STORAGE_KEY 480 +#define ITEM_DEVON_SCOPE 481 +// TMs/HMs +#define ITEM_TM01 482 +#define ITEM_TM02 483 +#define ITEM_TM03 484 +#define ITEM_TM04 485 +#define ITEM_TM05 486 +#define ITEM_TM06 487 +#define ITEM_TM07 488 +#define ITEM_TM08 489 +#define ITEM_TM09 490 +#define ITEM_TM10 491 +#define ITEM_TM11 492 +#define ITEM_TM12 493 +#define ITEM_TM13 494 +#define ITEM_TM14 495 +#define ITEM_TM15 496 +#define ITEM_TM16 497 +#define ITEM_TM17 498 +#define ITEM_TM18 499 +#define ITEM_TM19 500 +#define ITEM_TM20 501 +#define ITEM_TM21 502 +#define ITEM_TM22 503 +#define ITEM_TM23 504 +#define ITEM_TM24 505 +#define ITEM_TM25 506 +#define ITEM_TM26 507 +#define ITEM_TM27 508 +#define ITEM_TM28 509 +#define ITEM_TM29 510 +#define ITEM_TM30 511 +#define ITEM_TM31 512 +#define ITEM_TM32 513 +#define ITEM_TM33 514 +#define ITEM_TM34 515 +#define ITEM_TM35 516 +#define ITEM_TM36 517 +#define ITEM_TM37 518 +#define ITEM_TM38 519 +#define ITEM_TM39 520 +#define ITEM_TM40 521 +#define ITEM_TM41 522 +#define ITEM_TM42 523 +#define ITEM_TM43 524 +#define ITEM_TM44 525 +#define ITEM_TM45 526 +#define ITEM_TM46 527 +#define ITEM_TM47 528 +#define ITEM_TM48 529 +#define ITEM_TM49 530 +#define ITEM_TM50 531 +#define ITEM_TM51 532 +#define ITEM_TM52 533 +#define ITEM_TM53 534 +#define ITEM_TM54 535 +#define ITEM_TM55 536 +#define ITEM_TM56 537 +#define ITEM_TM57 538 +#define ITEM_TM58 539 +#define ITEM_TM59 540 +#define ITEM_TM60 541 +#define ITEM_TM61 542 +#define ITEM_TM62 543 +#define ITEM_TM63 544 +#define ITEM_TM64 545 +#define ITEM_TM65 546 +#define ITEM_TM66 547 +#define ITEM_TM67 548 +#define ITEM_TM68 549 +#define ITEM_TM69 550 +#define ITEM_TM70 551 +#define ITEM_TM71 552 +#define ITEM_TM72 553 +#define ITEM_TM73 554 +#define ITEM_TM74 555 +#define ITEM_TM75 556 +#define ITEM_TM76 557 +#define ITEM_TM77 558 +#define ITEM_TM78 559 +#define ITEM_TM79 560 +#define ITEM_TM80 561 +#define ITEM_TM81 562 +#define ITEM_TM82 563 +#define ITEM_TM83 564 +#define ITEM_TM84 565 +#define ITEM_TM85 566 +#define ITEM_TM86 567 +#define ITEM_TM87 568 +#define ITEM_TM88 569 +#define ITEM_TM89 570 +#define ITEM_TM90 571 +#define ITEM_TM91 572 +#define ITEM_TM92 573 +#define ITEM_TM93 574 +#define ITEM_TM94 575 +#define ITEM_TM95 576 +#define ITEM_TM96 577 +#define ITEM_TM97 578 +#define ITEM_TM98 579 +#define ITEM_TM99 580 +#define ITEM_TM100 581 + +#define ITEM_HM01 532 +#define ITEM_HM02 533 +#define ITEM_HM03 534 +#define ITEM_HM04 535 +#define ITEM_HM05 536 +#define ITEM_HM06 537 +#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_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 +// FireRed/LeafGreen +#define ITEM_OAKS_PARCEL 590 +#define ITEM_POKE_FLUTE 591 +#define ITEM_SECRET_KEY 592 +#define ITEM_BIKE_VOUCHER 593 +#define ITEM_GOLD_TEETH 594 +#define ITEM_OLD_AMBER 595 +#define ITEM_CARD_KEY 596 +#define ITEM_LIFT_KEY 597 +#define ITEM_SILPH_SCOPE 598 +#define ITEM_BICYCLE 599 +#define ITEM_TOWN_MAP 600 +#define ITEM_VS_SEEKER 601 +#define ITEM_FAME_CHECKER 602 +#define ITEM_TM_CASE 603 +#define ITEM_BERRY_POUCH 604 +#define ITEM_TEACHY_TV 605 +#define ITEM_TRI_PASS 606 +#define ITEM_RAINBOW_PASS 607 +#define ITEM_TEA 608 +#define ITEM_MYSTIC_TICKET 609 +#define ITEM_AURORA_TICKET 610 +#define ITEM_POWDER_JAR 611 +#define ITEM_RUBY 612 +#define ITEM_SAPPHIRE 613 +// Emerald +#define ITEM_MAGMA_EMBLEM 614 +#define ITEM_OLD_SEA_MAP 615 #define ITEMS_COUNT 616 #define ITEM_FIELD_ARROW ITEMS_COUNT @@ -707,8 +707,8 @@ #define LAST_BERRY_INDEX ITEM_MARANGA_BERRY #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1)) -#define NUM_TECHNICAL_MACHINES 50 -#define NUM_HIDDEN_MACHINES 8 +#define NUM_TECHNICAL_MACHINES 617 +#define NUM_HIDDEN_MACHINES 618 // Check if the item is one that can be used on a Pokemon. #define ITEM_HAS_EFFECT(item) ((item) >= ITEM_POTION && (item) <= LAST_BERRY_INDEX) diff --git a/src/data/items.h b/src/data/items.h index 8460fd9d0..18615ae21 100644 --- a/src/data/items.h +++ b/src/data/items.h @@ -7289,7 +7289,7 @@ const struct Item gItems[] = .name = _("Health Wing"), .itemId = ITEM_HEALTH_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sHealthWingDesc, .pocket = POCKET_ITEMS, @@ -7303,7 +7303,7 @@ const struct Item gItems[] = .name = _("Muscle Wing"), .itemId = ITEM_MUSCLE_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sMuscleWingDesc, .pocket = POCKET_ITEMS, @@ -7317,7 +7317,7 @@ const struct Item gItems[] = .name = _("Resist Wing"), .itemId = ITEM_RESIST_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sResistWingDesc, .pocket = POCKET_ITEMS, @@ -7331,7 +7331,7 @@ const struct Item gItems[] = .name = _("Genius Wing"), .itemId = ITEM_GENIUS_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sGeniusWingDesc, .pocket = POCKET_ITEMS, @@ -7345,7 +7345,7 @@ const struct Item gItems[] = .name = _("Clever Wing"), .itemId = ITEM_CLEVER_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sCleverWingDesc, .pocket = POCKET_ITEMS, @@ -7359,7 +7359,7 @@ const struct Item gItems[] = .name = _("Swift Wing"), .itemId = ITEM_SWIFT_WING, .price = 300, - .holdEffect = HOLD_EFFECT_RAISE_EV, + .holdEffect = 0, .holdEffectParam = 4, .description = sSwiftWingDesc, .pocket = POCKET_ITEMS, diff --git a/src/data/pokemon/item_effects.h b/src/data/pokemon/item_effects.h index c2a11d782..d231c4d20 100644 --- a/src/data/pokemon/item_effects.h +++ b/src/data/pokemon/item_effects.h @@ -173,46 +173,116 @@ const u8 gItemEffect_SacredAsh[7] = { [6] = -1, }; -const u8 gItemEffect_HPUp[10] = { +const u8 gItemEffect_HPUp[11] = { [4] = ITEM4_EV_HP, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Protein[10] = { +const u8 gItemEffect_Protein[11] = { [4] = ITEM4_EV_ATK, [5] = ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Iron[10] = { +const u8 gItemEffect_Iron[11] = { [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Carbos[10] = { +const u8 gItemEffect_Carbos[11] = { [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, }; -const u8 gItemEffect_Calcium[10] = { +const u8 gItemEffect_Calcium[11] = { [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, [6] = 10, [7] = 5, [8] = 3, [9] = 2, + [10] = 1, +}; + +const u8 gItemEffect_Zinc[11] = { + [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, + [6] = 10, + [7] = 5, + [8] = 3, + [9] = 2, + [10] = 1, +}; + +const u8 gItemEffect_HpWing[11] = { + [4] = ITEM4_EV_HP, + [5] = ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_AtkWing[11] = { + [4] = ITEM4_EV_ATK, + [5] = ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_DefWing[11] = { + [5] = ITEM5_EV_DEF | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_SpeedWing[11] = { + [5] = ITEM5_EV_SPEED | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_SpatkWing[11] = { + [5] = ITEM5_EV_SPATK | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, +}; + +const u8 gItemEffect_SpdefWing[11] = { + [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, + [6] = 1, + [7] = 3, + [8] = 2, + [9] = 1, + [10] = 0, }; const u8 gItemEffect_RareCandy[10] = { @@ -233,14 +303,6 @@ const u8 gItemEffect_PPUp[9] = { [8] = 2, }; -const u8 gItemEffect_Zinc[10] = { - [5] = ITEM5_EV_SPDEF | ITEM5_FRIENDSHIP_ALL, - [6] = 10, - [7] = 5, - [8] = 3, - [9] = 2, -}; - const u8 gItemEffect_PPMax[9] = { [5] = ITEM5_PP_MAX | ITEM5_FRIENDSHIP_ALL, [6] = 5, @@ -445,6 +507,12 @@ const u8 *const gItemEffectTable[] = [ITEM_RARE_CANDY - ITEM_POTION] = gItemEffect_RareCandy, [ITEM_PP_UP - ITEM_POTION] = gItemEffect_PPUp, [ITEM_ZINC - ITEM_POTION] = gItemEffect_Zinc, + [ITEM_HEALTH_WING - ITEM_POTION] = gItemEffect_HpWing, + [ITEM_MUSCLE_WING - ITEM_POTION] = gItemEffect_AtkWing, + [ITEM_RESIST_WING - ITEM_POTION] = gItemEffect_DefWing, + [ITEM_GENIUS_WING - ITEM_POTION] = gItemEffect_SpatkWing, + [ITEM_CLEVER_WING - ITEM_POTION] = gItemEffect_SpdefWing, + [ITEM_SWIFT_WING - ITEM_POTION] = gItemEffect_SpeedWing, [ITEM_PP_MAX - ITEM_POTION] = gItemEffect_PPMax, [ITEM_GUARD_SPEC - ITEM_POTION] = gItemEffect_GuardSpec, [ITEM_DIRE_HIT - ITEM_POTION] = gItemEffect_DireHit, diff --git a/src/pokemon.c b/src/pokemon.c index c54e8ad2c..17f7331d9 100644 --- a/src/pokemon.c +++ b/src/pokemon.c @@ -4614,7 +4614,7 @@ bool8 ExecuteTableBasedItemEffect(struct Pokemon *mon, u16 item, u8 partyIndex, bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 moveIndex, u8 e) { u32 dataUnsigned; - s32 dataSigned; + s32 dataSigned, evCap; s32 friendship; s32 cmdIndex; bool8 retVal = TRUE; @@ -4822,11 +4822,17 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= 100) + + if (itemEffect[10]) + evCap = 100; + else + evCap = 252; + + if (dataSigned >= evCap) break; - if (dataSigned + r2 > 100) - r5 = 100 - (dataSigned + r2) + r2; + if (dataSigned + r2 > evCap) + r5 = evCap - (dataSigned + r2) + r2; else r5 = r2; @@ -5026,11 +5032,17 @@ bool8 PokemonUseItemEffects(struct Pokemon *mon, u16 item, u8 partyIndex, u8 mov { if (evCount >= MAX_TOTAL_EVS) return TRUE; - if (dataSigned >= 100) + + if (itemEffect[10]) + evCap = 100; + else + evCap = 252; + + if (dataSigned >= evCap) break; - if (dataSigned + r2 > 100) - r5 = 100 - (dataSigned + r2) + r2; + if (dataSigned + r2 > evCap) + r5 = evCap - (dataSigned + r2) + r2; else r5 = r2;