Merge pull request #53 from ultima-soul/battle_engine

Added new battle items.

include/constants/hold_effects.h

@@ -85,7 +85,7 @@
 #define HOLD_EFFECT_METRONOME      79
 #define HOLD_EFFECT_MUSCLE_BAND    80
 #define HOLD_EFFECT_WIDE_LENS      81
-#define HOLD_EFFECT_WIDE_GLASSES   82
+#define HOLD_EFFECT_WISE_GLASSES   82
 #define HOLD_EFFECT_ZOOM_LENS      83
 #define HOLD_EFFECT_LAGGING_TAIL   84
 #define HOLD_EFFECT_FOCUS_SASH     85
@@ -103,18 +103,17 @@
 
 // Gen5 hold effects
 #define HOLD_EFFECT_FLOAT_STONE    115
-#define HOLD_EFFECT_WISE_GLASSES   116
+#define HOLD_EFFECT_EVIOLITE       116
-#define HOLD_EFFECT_EVIOLITE       117
+#define HOLD_EFFECT_ASSAULT_VEST   117
-#define HOLD_EFFECT_ASSAULT_VEST   118
+#define HOLD_EFFECT_BINDING_BAND   118
-#define HOLD_EFFECT_BINDING_BAND   119
+#define HOLD_EFFECT_DRIVE          119
-#define HOLD_EFFECT_DRIVE          120
 
 // Gen6 hold effects
-#define HOLD_EFFECT_FAIRY_POWER    130
+#define HOLD_EFFECT_FAIRY_POWER    129
-#define HOLD_EFFECT_MEGA_STONE     131
+#define HOLD_EFFECT_MEGA_STONE     130
 
 // Gen7 hold effects
-#define HOLD_EFFECT_PROTECTIVE_PADS 150
+#define HOLD_EFFECT_PROTECTIVE_PADS 149
 
 #define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))
 

include/constants/items.h

@@ -462,7 +462,121 @@
 #define ITEM_MAGMA_EMBLEM 375
 #define ITEM_OLD_SEA_MAP 376
 
-#define ITEMS_COUNT 377
+// Gen 4 Items
+#define ITEM_WIDE_LENS 377
+#define ITEM_MUSCLE_BAND 378
+#define ITEM_WISE_GLASSES 379
+#define ITEM_EXPERT_BELT 380
+#define ITEM_LIGHT_CLAY 381
+#define ITEM_LIFE_ORB 382
+#define ITEM_POWER_HERB 383
+#define ITEM_TOXIC_ORB 384
+#define ITEM_FLAME_ORB 385
+#define ITEM_QUICK_POWDER 386
+#define ITEM_FOCUS_SASH 387
+#define ITEM_ZOOM_LENS 388
+#define ITEM_METRONOME 389
+#define ITEM_IRON_BALL 390
+#define ITEM_LAGGING_TAIL 391
+#define ITEM_DESTINY_KNOT 392
+#define ITEM_BLACK_SLUDGE 393
+#define ITEM_ICY_ROCK 394
+#define ITEM_SMOOTH_ROCK 395
+#define ITEM_HEAT_ROCK 396
+#define ITEM_DAMP_ROCK 397
+#define ITEM_GRIP_CLAW 398
+#define ITEM_CHOICE_SCARF 399
+#define ITEM_STICKY_BARB 400
+#define ITEM_SHED_SHELL 401
+#define ITEM_BIG_ROOT 402
+#define ITEM_CHOICE_SPECS 403
+#define ITEM_ADAMANT_ORB 404
+#define ITEM_LUSTROUS_ORB 405
+#define ITEM_GRISEOUS_ORB 406
+#define ITEM_FLAME_PLATE 407
+#define ITEM_SPLASH_PLATE 408
+#define ITEM_ZAP_PLATE 409
+#define ITEM_MEADOW_PLATE 410
+#define ITEM_ICICLE_PLATE 411
+#define ITEM_FIST_PLATE 412
+#define ITEM_TOXIC_PLATE 413
+#define ITEM_EARTH_PLATE 414
+#define ITEM_SKY_PLATE 415
+#define ITEM_MIND_PLATE 416
+#define ITEM_INSECT_PLATE 417
+#define ITEM_STONE_PLATE 418
+#define ITEM_SPOOKY_PLATE 419
+#define ITEM_DRACO_PLATE 420
+#define ITEM_DREAD_PLATE 421
+#define ITEM_IRON_PLATE 422
+
+
+// Gen 5 Items
+#define ITEM_EVIOLITE 423
+#define ITEM_FLOAT_STONE 424
+#define ITEM_BINDING_BAND 425
+#define ITEM_DOUSE_DRIVE 426
+#define ITEM_SHOCK_DRIVE 427
+#define ITEM_BURN_DRIVE 428
+#define ITEM_CHILL_DRIVE 429
+
+
+// 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_LOPPUNITE 476
+#define ITEM_SALAMENCITE 477
+#define ITEM_BEEDRILLITE 478
+#define ITEM_KEY_STONE 479
+
+// Gen7 hold effects
+#define ITEM_PROTECTIVE_PADS 480
+
+#define ITEMS_COUNT 481
 #define ITEM_FIELD_ARROW ITEMS_COUNT
 
 #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
@@ -470,9 +584,9 @@
 #define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
 
 #define NUM_TECHNICAL_MACHINES 50
-#define NUM_HIDDEN_MACHINES     8
+#define NUM_HIDDEN_MACHINES 8
 
 // Check if the item is one that can be used on a Pokemon.
 #define IS_POKEMON_ITEM(item) ((item) >= ITEM_POTION && (item) <= ITEM_0B2)
 
-#endif  // GUARD_CONSTANTS_ITEMS_H
+#endif // GUARD_CONSTANTS_ITEMS_H