Reordered the Item IDs a little bit, in order to include battle items like the Gen. 5 Gems and the Gen. 7 Seeds.

This commit is contained in:
LOuroboros 2019-03-06 15:07:25 -03:00
parent fddb5159b4
commit 36421d81eb

View file

@ -519,64 +519,87 @@
#define ITEM_SHOCK_DRIVE 427
#define ITEM_BURN_DRIVE 428
#define ITEM_CHILL_DRIVE 429
#define ITEM_FIRE_GEM 430
#define ITEM_WATER_GEM 431
#define ITEM_ELECTRIC_GEM 432
#define ITEM_GRASS_GEM 433
#define ITEM_ICE_GEM 434
#define ITEM_FIGHTING_GEM 435
#define ITEM_POISON_GEM 436
#define ITEM_GROUND_GEM 437
#define ITEM_FLYING_GEM 438
#define ITEM_PSYCHIC_GEM 439
#define ITEM_BUG_GEM 440
#define ITEM_ROCK_GEM 441
#define ITEM_GHOST_GEM 442
#define ITEM_DRAGON_GEM 443
#define ITEM_DARK_GEM 444
#define ITEM_STEEL_GEM 445
#define ITEM_NORMAL_GEM 446
#define ITEM_FAIRY_GEM 447
// Gen6 Items
#define ITEM_ASSAULT_VEST 430
#define ITEM_PIXIE_PLATE 431
#define ITEM_GENGARITE 432
#define ITEM_GARDEVOIRITE 433
#define ITEM_AMPHAROSITE 434
#define ITEM_VENUSAURITE 435
#define ITEM_CHARIZARDITE_X 436
#define ITEM_BLASTOISINITE 437
#define ITEM_MEWTWONITE_X 438
#define ITEM_MEWTWONITE_Y 439
#define ITEM_BLAZIKENITE 440
#define ITEM_MEDICHAMITE 441
#define ITEM_HOUNDOOMINITE 442
#define ITEM_AGGRONITE 443
#define ITEM_BANETTITE 444
#define ITEM_TYRANITARITE 445
#define ITEM_SCIZORITE 446
#define ITEM_PINSIRITE 447
#define ITEM_AERODACTYLITE 448
#define ITEM_LUCARIONITE 449
#define ITEM_ABOMASITE 450
#define ITEM_KANGASKHANITE 451
#define ITEM_GYARADOSITE 452
#define ITEM_ABSOLITE 453
#define ITEM_CHARIZARDITE_Y 454
#define ITEM_ALAKAZITE 455
#define ITEM_HERACRONITE 456
#define ITEM_MAWILITE 457
#define ITEM_MANECTITE 458
#define ITEM_GARCHOMPITE 459
#define ITEM_LATIASITE 460
#define ITEM_LATIOSITE 461
#define ITEM_SWAMPERTITE 462
#define ITEM_SCEPTILITE 463
#define ITEM_SABLENITE 464
#define ITEM_ALTARIANITE 465
#define ITEM_GALLADITE 466
#define ITEM_AUDINITE 467
#define ITEM_METAGROSSITE 468
#define ITEM_SHARPEDONITE 469
#define ITEM_SLOWBRONITE 470
#define ITEM_STEELIXITE 471
#define ITEM_PIDGEOTITE 472
#define ITEM_GLALITITE 473
#define ITEM_DIANCITE 474
#define ITEM_CAMERUPTITE 475
#define ITEM_LOPUNNITE 476
#define ITEM_SALAMENCITE 477
#define ITEM_BEEDRILLITE 478
#define ITEM_MEGA_BRACELET 479
#define ITEM_ASSAULT_VEST 448
#define ITEM_PIXIE_PLATE 449
#define ITEM_GENGARITE 450
#define ITEM_GARDEVOIRITE 451
#define ITEM_AMPHAROSITE 452
#define ITEM_VENUSAURITE 453
#define ITEM_CHARIZARDITE_X 454
#define ITEM_BLASTOISINITE 455
#define ITEM_MEWTWONITE_X 456
#define ITEM_MEWTWONITE_Y 457
#define ITEM_BLAZIKENITE 458
#define ITEM_MEDICHAMITE 459
#define ITEM_HOUNDOOMINITE 460
#define ITEM_AGGRONITE 461
#define ITEM_BANETTITE 462
#define ITEM_TYRANITARITE 463
#define ITEM_SCIZORITE 464
#define ITEM_PINSIRITE 465
#define ITEM_AERODACTYLITE 466
#define ITEM_LUCARIONITE 467
#define ITEM_ABOMASITE 468
#define ITEM_KANGASKHANITE 469
#define ITEM_GYARADOSITE 470
#define ITEM_ABSOLITE 471
#define ITEM_CHARIZARDITE_Y 472
#define ITEM_ALAKAZITE 473
#define ITEM_HERACRONITE 474
#define ITEM_MAWILITE 475
#define ITEM_MANECTITE 476
#define ITEM_GARCHOMPITE 477
#define ITEM_LATIASITE 478
#define ITEM_LATIOSITE 479
#define ITEM_SWAMPERTITE 480
#define ITEM_SCEPTILITE 481
#define ITEM_SABLENITE 482
#define ITEM_ALTARIANITE 483
#define ITEM_GALLADITE 484
#define ITEM_AUDINITE 485
#define ITEM_METAGROSSITE 486
#define ITEM_SHARPEDONITE 487
#define ITEM_SLOWBRONITE 488
#define ITEM_STEELIXITE 489
#define ITEM_PIDGEOTITE 490
#define ITEM_GLALITITE 491
#define ITEM_DIANCITE 492
#define ITEM_CAMERUPTITE 493
#define ITEM_LOPUNNITE 494
#define ITEM_SALAMENCITE 495
#define ITEM_BEEDRILLITE 496
#define ITEM_MEGA_BRACELET 497
// Gen7 hold effects
#define ITEM_PROTECTIVE_PADS 480
#define ITEM_PROTECTIVE_PADS 498
#define ITEM_TERRAIN_EXTENDER 499
#define ITEM_ELECTRIC_SEED 500
#define ITEM_GRASSY_SEED 501
#define ITEM_MISTY_SEED 502
#define ITEM_PSYCHIC_SEED 503
#define ITEM_ADRENALINE_ORB 504
#define ITEMS_COUNT 481
#define ITEMS_COUNT 505
#define ITEM_FIELD_ARROW ITEMS_COUNT
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY