Fix Base Stats - Z-nogyroP

include/items.h

@@ -1,5 +1,3 @@
-#pragma once
-
 #define ITEM_NONE 0
 #define ITEM_MASTER_BALL 1
 #define ITEM_ULTRA_BALL 2
@@ -175,7 +173,8 @@
 #define ITEM_APICOT_BERRY 172
 #define ITEM_LANSAT_BERRY 173
 #define ITEM_STARF_BERRY 174
-#define ITEM_ENIGMA_BERRY 175
+#define ITEM_ENIGMA_BERRY_OLD 175
+#define ITEM_ENIGMA_BERRY ITEM_ENIGMA_BERRY_OLD
 #define ITEM_0B0 176
 #define ITEM_0B1 177
 #define ITEM_0B2 178
@@ -191,7 +190,7 @@
 #define ITEM_CHOICE_BAND 0xB0 //For Unbound
 #else
 #define ITEM_CHOICE_BAND 186
-#endif 
+#endif
 
 #define ITEM_KINGS_ROCK 187
 #define ITEM_SILVER_POWDER 188
@@ -356,6 +355,78 @@
 #define ITEM_15B 347
 #define ITEM_15C 348
 
+//New TMs
+#define ITEM_TM51 339
+#define ITEM_TM52 340
+#define ITEM_TM53 341
+#define ITEM_TM54 342
+#define ITEM_TM55 343
+#define ITEM_TM56 344
+#define ITEM_TM57 345
+#define ITEM_TM58 346
+#define ITEM_TM59 375
+#define ITEM_TM60 376
+#define ITEM_TM61 377
+#define ITEM_TM62 378
+#define ITEM_TM63 379
+#define ITEM_TM64 380
+#define ITEM_TM65 381
+#define ITEM_TM66 382
+#define ITEM_TM67 383
+#define ITEM_TM68 384
+#define ITEM_TM69 385
+#define ITEM_TM70 386
+#define ITEM_TM71 387
+#define ITEM_TM72 388
+#define ITEM_TM73 389
+#define ITEM_TM74 390
+#define ITEM_TM75 391
+#define ITEM_TM76 392
+#define ITEM_TM77 393
+#define ITEM_TM78 394
+#define ITEM_TM79 395
+#define ITEM_TM80 396
+#define ITEM_TM81 397
+#define ITEM_TM82 398
+#define ITEM_TM83 399
+#define ITEM_TM84 400
+#define ITEM_TM85 401
+#define ITEM_TM86 402
+#define ITEM_TM87 403
+#define ITEM_TM88 404
+#define ITEM_TM89 405
+#define ITEM_TM90 406
+#define ITEM_TM91 407
+#define ITEM_TM92 408
+#define ITEM_TM93 409
+#define ITEM_TM94 410
+#define ITEM_TM95 411
+#define ITEM_TM96 412
+#define ITEM_TM97 413
+#define ITEM_TM98 414
+#define ITEM_TM99 415
+#define ITEM_TM100 416
+#define ITEM_TM101 417
+#define ITEM_TM102 418
+#define ITEM_TM103 419
+#define ITEM_TM104 420
+#define ITEM_TM105 421
+#define ITEM_TM106 422
+#define ITEM_TM107 423
+#define ITEM_TM108 424
+#define ITEM_TM109 425
+#define ITEM_TM110 426
+#define ITEM_TM111 427
+#define ITEM_TM112 428
+#define ITEM_TM113 429
+#define ITEM_TM114 430
+#define ITEM_TM115 431
+#define ITEM_TM116 432
+#define ITEM_TM117 433
+#define ITEM_TM118 434
+#define ITEM_TM119 435
+#define ITEM_TM120 436
+
 // FireRed/LeafGreen
 #define ITEM_OAKS_PARCEL 349
 #define ITEM_POKE_FLUTE 350
@@ -449,6 +520,7 @@
 #define ITEM_IRON_BALL 0x23C
 #define ITEM_LAGGING_TAIL 0x23D
 #define ITEM_LUMINOUS_MOSS 0x23E
+#define ITEM_QUICK_POWDER 0x23F
 #define ITEM_METRONOME 0x240
 #define ITEM_MUSCLE_BAND 0x241
 #define ITEM_PROTECTIVE_PADS 0x242
@@ -497,7 +569,7 @@
 #define ITEM_ELECTRIC_GEM 0x25A
 #define ITEM_PSYCHIC_GEM 0x25B
 #define ITEM_ICE_GEM 0x25C
-#define ITEM_DRAGONG_EM 0x25D
+#define ITEM_DRAGON_GEM 0x25D
 #define ITEM_DARK_GEM 0x25E
 #define ITEM_FAIRY_GEM 0x25F
 
@@ -572,7 +644,7 @@
 #define ITEM_AUDINITE 0x1EB
 #define ITEM_DIANCITE 0x1EC
 
-//Type-Resist Berries
+//Type-Resist + New Berries
 #define ITEM_OCCA_BERRY 0x21B
 #define ITEM_PASSHO_BERRY 0x21C
 #define ITEM_WACAN_BERRY 0x21D
@@ -684,12 +756,13 @@
 #define ITEM_GRACIDEA 0x217
 #define ITEM_DNA_SPLICERS 0x218
 #define ITEM_REVEAL_GLASS 0x219
-#define ITEM_PRISON_BOTTLE 0x220
+#define ITEM_PRISON_BOTTLE 0x21A
 
 #define ITEM_OVAL_CHARM 0x278
 #define ITEM_SHINY_CHARM 0x279
 #define ITEM_RAINBOW_WING 0x28F
 #define ITEM_SILVER_WING 0x290
+#define ITEM_MAGMA_STONE 0x5C
 #define ITEM_N_SOLARIZER 0x291
 #define ITEM_N_LUNARIZER 0x292
 #define ITEM_SUN_FLUTE 0x293
@@ -697,6 +770,8 @@
 #define ITEM_LIGHT_STONE 0x295
 #define ITEM_DARK_STONE 0x296
 
+#define ITEM_DYNAMAX_BAND 0x10C
+
 //Relic Items
 #define ITEM_RELIC_COPPER 0x297
 #define ITEM_RELIC_SILVER 0x298
@@ -707,44 +782,50 @@
 #define ITEM_RELIC_CROWN 0x29D
 
 //Z-Crystals
-enum 
+enum
 {
-	ITEM_NORMALIUM_Z = 0x29E, //All items after this will be 0x29E + 1, 0x29E + 2...
-	ITEM_FIGHTINIUM_Z,		  //Put the Z-Crystals in order
-	ITEM_FLYINIUM_Z,
-	ITEM_POISONIUM_Z,
-	ITEM_GROUNDIUM_Z,
-	ITEM_ROCKIUM_Z,
-	ITEM_BUGINIUM_Z,
-	ITEM_GHOSTIUM_Z,
-	ITEM_STEELIUM_Z,
-	ITEM_FIRIUM_Z,
-	ITEM_WATERIUM_Z,
-	ITEM_GRASSIUM_Z,
-	ITEM_ELECTRIUM_Z,
-	ITEM_PSYCHIUM_Z,
-	ITEM_ICIUM_Z,
-	ITEM_DRAGONIUM_Z,
-	ITEM_DARKINIUM_Z,
-	ITEM_FAIRIUM,
-	ITEM_ALORAICHIUM_Z,
-	ITEM_DECIDIUM_Z,
-	ITEM_EEVIUM_Z,
-	ITEM_INCINIUM_Z,
-	ITEM_KOMMONIUM_Z,
-	ITEM_LUNALIUM_Z,
-	ITEM_LYCANIUM_Z,
-	ITEM_MARSHADIUM_Z,
-	ITEM_MEWNIUM_Z,
-	ITEM_MIMIKIUM_Z,
-	ITEM_PIKANIUM_Z,
-	ITEM_PIKASHUNIUM_Z,
-	ITEM_PRIMARIUM_Z,
-	ITEM_SNORLIUM_Z,
-	ITEM_SOLGANIUM_Z,
-	ITEM_TAPUNIUM_Z,
+	ITEM_NORMALIUM_Z = 0x29E, 		//All items after this will be 0x29E + 1, 0x29E + 2...
+	ITEM_FIGHTINIUM_Z, 		//0x29F //Put the Z-Crystals in order
+	ITEM_FLYINIUM_Z,		//0x2A0
+	ITEM_POISONIUM_Z,		//0x2A1
+	ITEM_GROUNDIUM_Z,		//0x2A2
+	ITEM_ROCKIUM_Z,			//0x2A3
+	ITEM_BUGINIUM_Z,		//0x2A4
+	ITEM_GHOSTIUM_Z,		//0x2A5
+	ITEM_STEELIUM_Z,		//0x2A6
+	ITEM_FIRIUM_Z,			//0x2A7
+	ITEM_WATERIUM_Z,		//0x2A8
+	ITEM_GRASSIUM_Z,		//0x2A9
+	ITEM_ELECTRIUM_Z,		//0x2AA
+	ITEM_PSYCHIUM_Z,		//0x2AB
+	ITEM_ICIUM_Z,			//0x2AC
+	ITEM_DRAGONIUM_Z,		//0x2AD
+	ITEM_DARKINIUM_Z,		//0x2AE
+	ITEM_FAIRIUM_Z,			//0x2AF
+	ITEM_ALORAICHIUM_Z,	//0x2B0
+	ITEM_DECIDIUM_Z,		//0x2B1
+	ITEM_EEVIUM_Z,			//0x2B2
+	ITEM_INCINIUM_Z,		//0x2B3
+	ITEM_KOMMONIUM_Z,		//0x2B4
+	ITEM_LUNALIUM_Z,		//0x2B5
+	ITEM_LYCANIUM_Z,		//0x2B6
+	ITEM_MARSHADIUM_Z,		//0x2B7
+	ITEM_MEWNIUM_Z,			//0x2B8
+	ITEM_MIMIKIUM_Z,		//0x2B9
+	ITEM_PIKANIUM_Z,		//0x2BA
+	ITEM_PIKASHUNIUM_Z,		//0x2BB
+	ITEM_PRIMARIUM_Z,		//0x2BC
+	ITEM_SNORLIUM_Z,		//0x2BD
+	ITEM_SOLGANIUM_Z,		//0x2BE
+	ITEM_TAPUNIUM_Z,		//0x2BF
 };
 
+//Sword & Shield Hold Items
+#define ITEM_EJECT_PACK 0x2C0
+#define ITEM_ROOM_SERVICE 0x2C1
+
+#define ITEMS_COUNT (ITEM_ROOM_SERVICE + 1)
+
 //For Pokemon Unbound
 #ifdef UNBOUND
 
@@ -763,21 +844,3 @@ enum
 #define ITEM_SMELLY_SOCKS 0x15F
 
 #endif
-
-// Emerald
-#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
-#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY
-#define ITEM_TO_BERRY(itemId)(((itemId - FIRST_BERRY_INDEX) + 1))
-
-#define NUM_TECHNICAL_MACHINES 50
-#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)
-
-// POCKETS
-#define POCKET_ITEMS       1
-#define POCKET_KEY_ITEMS   2
-#define POCKET_POKE_BALLS  3
-#define POCKET_TM_CASE     4
-#define POCKET_BERRY_POUCH 5