atiran/sovereignx
3
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed Jade Orb, since it has no use besides being a key-lock item.

Browse source
This commit is contained in:
Eduardo Quezada D'Ottone 2021-12-31 17:44:03 -03:00
parent 7839750d7e
commit 313df31e7e
6 changed files with 468 additions and 489 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

937
include/constants/items.h
View file

@ -355,441 +355,440 @@
// Colored Orbs // Colored Orbs
#define ITEM_RED_ORB 290 #define ITEM_RED_ORB 290
#define ITEM_BLUE_ORB 291 #define ITEM_BLUE_ORB 291
#define ITEM_JADE_ORB 292
// Mega Stones // Mega Stones
#define ITEM_VENUSAURITE 293 #define ITEM_VENUSAURITE 292
#define ITEM_CHARIZARDITE_X 294 #define ITEM_CHARIZARDITE_X 293
#define ITEM_CHARIZARDITE_Y 295 #define ITEM_CHARIZARDITE_Y 294
#define ITEM_BLASTOISINITE 296 #define ITEM_BLASTOISINITE 295
#define ITEM_BEEDRILLITE 297 #define ITEM_BEEDRILLITE 296
#define ITEM_PIDGEOTITE 298 #define ITEM_PIDGEOTITE 297
#define ITEM_ALAKAZITE 299 #define ITEM_ALAKAZITE 298
#define ITEM_SLOWBRONITE 300 #define ITEM_SLOWBRONITE 299
#define ITEM_GENGARITE 301 #define ITEM_GENGARITE 300
#define ITEM_KANGASKHANITE 302 #define ITEM_KANGASKHANITE 301
#define ITEM_PINSIRITE 303 #define ITEM_PINSIRITE 302
#define ITEM_GYARADOSITE 304 #define ITEM_GYARADOSITE 303
#define ITEM_AERODACTYLITE 305 #define ITEM_AERODACTYLITE 304
#define ITEM_MEWTWONITE_X 306 #define ITEM_MEWTWONITE_X 305
#define ITEM_MEWTWONITE_Y 307 #define ITEM_MEWTWONITE_Y 306
#define ITEM_AMPHAROSITE 308 #define ITEM_AMPHAROSITE 307
#define ITEM_STEELIXITE 309 #define ITEM_STEELIXITE 308
#define ITEM_SCIZORITE 310 #define ITEM_SCIZORITE 309
#define ITEM_HERACRONITE 311 #define ITEM_HERACRONITE 310
#define ITEM_HOUNDOOMINITE 312 #define ITEM_HOUNDOOMINITE 311
#define ITEM_TYRANITARITE 313 #define ITEM_TYRANITARITE 312
#define ITEM_SCEPTILITE 314 #define ITEM_SCEPTILITE 313
#define ITEM_BLAZIKENITE 315 #define ITEM_BLAZIKENITE 314
#define ITEM_SWAMPERTITE 316 #define ITEM_SWAMPERTITE 315
#define ITEM_GARDEVOIRITE 317 #define ITEM_GARDEVOIRITE 316
#define ITEM_SABLENITE 318 #define ITEM_SABLENITE 317
#define ITEM_MAWILITE 319 #define ITEM_MAWILITE 318
#define ITEM_AGGRONITE 320 #define ITEM_AGGRONITE 319
#define ITEM_MEDICHAMITE 321 #define ITEM_MEDICHAMITE 320
#define ITEM_MANECTITE 322 #define ITEM_MANECTITE 321
#define ITEM_SHARPEDONITE 323 #define ITEM_SHARPEDONITE 322
#define ITEM_CAMERUPTITE 324 #define ITEM_CAMERUPTITE 323
#define ITEM_ALTARIANITE 325 #define ITEM_ALTARIANITE 324
#define ITEM_BANETTITE 326 #define ITEM_BANETTITE 325
#define ITEM_ABSOLITE 327 #define ITEM_ABSOLITE 326
#define ITEM_GLALITITE 328 #define ITEM_GLALITITE 327
#define ITEM_SALAMENCITE 329 #define ITEM_SALAMENCITE 328
#define ITEM_METAGROSSITE 330 #define ITEM_METAGROSSITE 329
#define ITEM_LATIASITE 331 #define ITEM_LATIASITE 330
#define ITEM_LATIOSITE 332 #define ITEM_LATIOSITE 331
#define ITEM_LOPUNNITE 333 #define ITEM_LOPUNNITE 332
#define ITEM_GARCHOMPITE 334 #define ITEM_GARCHOMPITE 333
#define ITEM_LUCARIONITE 335 #define ITEM_LUCARIONITE 334
#define ITEM_ABOMASITE 336 #define ITEM_ABOMASITE 335
#define ITEM_GALLADITE 337 #define ITEM_GALLADITE 336
#define ITEM_AUDINITE 338 #define ITEM_AUDINITE 337
#define ITEM_DIANCITE 339 #define ITEM_DIANCITE 338
// Gems // Gems
#define ITEM_NORMAL_GEM 340 #define ITEM_NORMAL_GEM 339
#define ITEM_FIRE_GEM 341 #define ITEM_FIRE_GEM 340
#define ITEM_WATER_GEM 342 #define ITEM_WATER_GEM 341
#define ITEM_ELECTRIC_GEM 343 #define ITEM_ELECTRIC_GEM 342
#define ITEM_GRASS_GEM 344 #define ITEM_GRASS_GEM 343
#define ITEM_ICE_GEM 345 #define ITEM_ICE_GEM 344
#define ITEM_FIGHTING_GEM 346 #define ITEM_FIGHTING_GEM 345
#define ITEM_POISON_GEM 347 #define ITEM_POISON_GEM 346
#define ITEM_GROUND_GEM 348 #define ITEM_GROUND_GEM 347
#define ITEM_FLYING_GEM 349 #define ITEM_FLYING_GEM 348
#define ITEM_PSYCHIC_GEM 350 #define ITEM_PSYCHIC_GEM 349
#define ITEM_BUG_GEM 351 #define ITEM_BUG_GEM 350
#define ITEM_ROCK_GEM 352 #define ITEM_ROCK_GEM 351
#define ITEM_GHOST_GEM 353 #define ITEM_GHOST_GEM 352
#define ITEM_DRAGON_GEM 354 #define ITEM_DRAGON_GEM 353
#define ITEM_DARK_GEM 355 #define ITEM_DARK_GEM 354
#define ITEM_STEEL_GEM 356 #define ITEM_STEEL_GEM 355
#define ITEM_FAIRY_GEM 357 #define ITEM_FAIRY_GEM 356
// Z-Crystals // Z-Crystals
#define ITEM_NORMALIUM_Z 358 #define ITEM_NORMALIUM_Z 357
#define ITEM_FIRIUM_Z 359 #define ITEM_FIRIUM_Z 358
#define ITEM_WATERIUM_Z 360 #define ITEM_WATERIUM_Z 359
#define ITEM_ELECTRIUM_Z 361 #define ITEM_ELECTRIUM_Z 360
#define ITEM_GRASSIUM_Z 362 #define ITEM_GRASSIUM_Z 361
#define ITEM_ICIUM_Z 363 #define ITEM_ICIUM_Z 362
#define ITEM_FIGHTINIUM_Z 364 #define ITEM_FIGHTINIUM_Z 363
#define ITEM_POISONIUM_Z 365 #define ITEM_POISONIUM_Z 364
#define ITEM_GROUNDIUM_Z 366 #define ITEM_GROUNDIUM_Z 365
#define ITEM_FLYINIUM_Z 367 #define ITEM_FLYINIUM_Z 366
#define ITEM_PSYCHIUM_Z 368 #define ITEM_PSYCHIUM_Z 367
#define ITEM_BUGINIUM_Z 369 #define ITEM_BUGINIUM_Z 368
#define ITEM_ROCKIUM_Z 370 #define ITEM_ROCKIUM_Z 369
#define ITEM_GHOSTIUM_Z 371 #define ITEM_GHOSTIUM_Z 370
#define ITEM_DRAGONIUM_Z 372 #define ITEM_DRAGONIUM_Z 371
#define ITEM_DARKINIUM_Z 373 #define ITEM_DARKINIUM_Z 372
#define ITEM_STEELIUM_Z 374 #define ITEM_STEELIUM_Z 373
#define ITEM_FAIRIUM_Z 375 #define ITEM_FAIRIUM_Z 374
#define ITEM_PIKANIUM_Z 376 #define ITEM_PIKANIUM_Z 375
#define ITEM_EEVIUM_Z 377 #define ITEM_EEVIUM_Z 376
#define ITEM_SNORLIUM_Z 378 #define ITEM_SNORLIUM_Z 377
#define ITEM_MEWNIUM_Z 379 #define ITEM_MEWNIUM_Z 378
#define ITEM_DECIDIUM_Z 380 #define ITEM_DECIDIUM_Z 379
#define ITEM_INCINIUM_Z 381 #define ITEM_INCINIUM_Z 380
#define ITEM_PRIMARIUM_Z 382 #define ITEM_PRIMARIUM_Z 381
#define ITEM_LYCANIUM_Z 383 #define ITEM_LYCANIUM_Z 382
#define ITEM_MIMIKIUM_Z 384 #define ITEM_MIMIKIUM_Z 383
#define ITEM_KOMMONIUM_Z 385 #define ITEM_KOMMONIUM_Z 384
#define ITEM_TAPUNIUM_Z 386 #define ITEM_TAPUNIUM_Z 385
#define ITEM_SOLGANIUM_Z 387 #define ITEM_SOLGANIUM_Z 386
#define ITEM_LUNALIUM_Z 388 #define ITEM_LUNALIUM_Z 387
#define ITEM_MARSHADIUM_Z 389 #define ITEM_MARSHADIUM_Z 388
#define ITEM_ALORAICHIUM_Z 390 #define ITEM_ALORAICHIUM_Z 389
#define ITEM_PIKASHUNIUM_Z 391 #define ITEM_PIKASHUNIUM_Z 390
#define ITEM_ULTRANECROZIUM_Z 392 #define ITEM_ULTRANECROZIUM_Z 391
// Species-specific Held Items // Species-specific Held Items
#define ITEM_LIGHT_BALL 393 #define ITEM_LIGHT_BALL 392
#define ITEM_LEEK 394 #define ITEM_LEEK 393
#define ITEM_THICK_CLUB 395 #define ITEM_THICK_CLUB 394
#define ITEM_LUCKY_PUNCH 396 #define ITEM_LUCKY_PUNCH 395
#define ITEM_METAL_POWDER 397 #define ITEM_METAL_POWDER 396
#define ITEM_QUICK_POWDER 398 #define ITEM_QUICK_POWDER 397
#define ITEM_DEEP_SEA_SCALE 399 #define ITEM_DEEP_SEA_SCALE 398
#define ITEM_DEEP_SEA_TOOTH 400 #define ITEM_DEEP_SEA_TOOTH 399
#define ITEM_SOUL_DEW 401 #define ITEM_SOUL_DEW 400
#define ITEM_ADAMANT_ORB 402 #define ITEM_ADAMANT_ORB 401
#define ITEM_LUSTROUS_ORB 403 #define ITEM_LUSTROUS_ORB 402
#define ITEM_GRISEOUS_ORB 404 #define ITEM_GRISEOUS_ORB 403
// Incenses // Incenses
#define ITEM_SEA_INCENSE 405 #define ITEM_SEA_INCENSE 404
#define ITEM_LAX_INCENSE 406 #define ITEM_LAX_INCENSE 405
#define ITEM_ODD_INCENSE 407 #define ITEM_ODD_INCENSE 406
#define ITEM_ROCK_INCENSE 408 #define ITEM_ROCK_INCENSE 407
#define ITEM_FULL_INCENSE 409 #define ITEM_FULL_INCENSE 408
#define ITEM_WAVE_INCENSE 410 #define ITEM_WAVE_INCENSE 409
#define ITEM_ROSE_INCENSE 411 #define ITEM_ROSE_INCENSE 410
#define ITEM_LUCK_INCENSE 412 #define ITEM_LUCK_INCENSE 411
#define ITEM_PURE_INCENSE 413 #define ITEM_PURE_INCENSE 412
// Contest Scarves // Contest Scarves
#define ITEM_RED_SCARF 414 #define ITEM_RED_SCARF 413
#define ITEM_BLUE_SCARF 415 #define ITEM_BLUE_SCARF 414
#define ITEM_PINK_SCARF 416 #define ITEM_PINK_SCARF 415
#define ITEM_GREEN_SCARF 417 #define ITEM_GREEN_SCARF 416
#define ITEM_YELLOW_SCARF 418 #define ITEM_YELLOW_SCARF 417
// EV Gain Modifiers // EV Gain Modifiers
#define ITEM_MACHO_BRACE 419 #define ITEM_MACHO_BRACE 418
#define ITEM_POWER_WEIGHT 420 #define ITEM_POWER_WEIGHT 419
#define ITEM_POWER_BRACER 421 #define ITEM_POWER_BRACER 420
#define ITEM_POWER_BELT 422 #define ITEM_POWER_BELT 421
#define ITEM_POWER_LENS 423 #define ITEM_POWER_LENS 422
#define ITEM_POWER_BAND 424 #define ITEM_POWER_BAND 423
#define ITEM_POWER_ANKLET 425 #define ITEM_POWER_ANKLET 424
// Type-boosting Held Items // Type-boosting Held Items
#define ITEM_SILK_SCARF 426 #define ITEM_SILK_SCARF 425
#define ITEM_CHARCOAL 427 #define ITEM_CHARCOAL 426
#define ITEM_MYSTIC_WATER 428 #define ITEM_MYSTIC_WATER 427
#define ITEM_MAGNET 429 #define ITEM_MAGNET 428
#define ITEM_MIRACLE_SEED 430 #define ITEM_MIRACLE_SEED 429
#define ITEM_NEVER_MELT_ICE 431 #define ITEM_NEVER_MELT_ICE 430
#define ITEM_BLACK_BELT 432 #define ITEM_BLACK_BELT 431
#define ITEM_POISON_BARB 433 #define ITEM_POISON_BARB 432
#define ITEM_SOFT_SAND 434 #define ITEM_SOFT_SAND 433
#define ITEM_SHARP_BEAK 435 #define ITEM_SHARP_BEAK 434
#define ITEM_TWISTED_SPOON 436 #define ITEM_TWISTED_SPOON 435
#define ITEM_SILVER_POWDER 437 #define ITEM_SILVER_POWDER 436
#define ITEM_HARD_STONE 438 #define ITEM_HARD_STONE 437
#define ITEM_SPELL_TAG 439 #define ITEM_SPELL_TAG 438
#define ITEM_DRAGON_FANG 440 #define ITEM_DRAGON_FANG 439
#define ITEM_BLACK_GLASSES 441 #define ITEM_BLACK_GLASSES 440
#define ITEM_METAL_COAT 442 #define ITEM_METAL_COAT 441
// Choice Items // Choice Items
#define ITEM_CHOICE_BAND 443 #define ITEM_CHOICE_BAND 442
#define ITEM_CHOICE_SPECS 444 #define ITEM_CHOICE_SPECS 443
#define ITEM_CHOICE_SCARF 445 #define ITEM_CHOICE_SCARF 444
// Status Orbs // Status Orbs
#define ITEM_FLAME_ORB 446 #define ITEM_FLAME_ORB 445
#define ITEM_TOXIC_ORB 447 #define ITEM_TOXIC_ORB 446
// Weather Rocks // Weather Rocks
#define ITEM_DAMP_ROCK 448 #define ITEM_DAMP_ROCK 447
#define ITEM_HEAT_ROCK 449 #define ITEM_HEAT_ROCK 448
#define ITEM_SMOOTH_ROCK 450 #define ITEM_SMOOTH_ROCK 449
#define ITEM_ICY_ROCK 451 #define ITEM_ICY_ROCK 450
// Terrain Seeds // Terrain Seeds
#define ITEM_ELECTRIC_SEED 452 #define ITEM_ELECTRIC_SEED 451
#define ITEM_PSYCHIC_SEED 453 #define ITEM_PSYCHIC_SEED 452
#define ITEM_MISTY_SEED 454 #define ITEM_MISTY_SEED 453
#define ITEM_GRASSY_SEED 455 #define ITEM_GRASSY_SEED 454
// Type-activated Stat Modifiers // Type-activated Stat Modifiers
#define ITEM_ABSORB_BULB 456 #define ITEM_ABSORB_BULB 455
#define ITEM_CELL_BATTERY 457 #define ITEM_CELL_BATTERY 456
#define ITEM_LUMINOUS_MOSS 458 #define ITEM_LUMINOUS_MOSS 457
#define ITEM_SNOWBALL 459 #define ITEM_SNOWBALL 458
// Misc. Held Items // Misc. Held Items
#define ITEM_BRIGHT_POWDER 460 #define ITEM_BRIGHT_POWDER 459
#define ITEM_WHITE_HERB 461 #define ITEM_WHITE_HERB 460
#define ITEM_EXP_SHARE 462 #define ITEM_EXP_SHARE 461
#define ITEM_QUICK_CLAW 463 #define ITEM_QUICK_CLAW 462
#define ITEM_SOOTHE_BELL 464 #define ITEM_SOOTHE_BELL 463
#define ITEM_MENTAL_HERB 465 #define ITEM_MENTAL_HERB 464
#define ITEM_KINGS_ROCK 466 #define ITEM_KINGS_ROCK 465
#define ITEM_AMULET_COIN 467 #define ITEM_AMULET_COIN 466
#define ITEM_CLEANSE_TAG 468 #define ITEM_CLEANSE_TAG 467
#define ITEM_SMOKE_BALL 469 #define ITEM_SMOKE_BALL 468
#define ITEM_FOCUS_BAND 470 #define ITEM_FOCUS_BAND 469
#define ITEM_LUCKY_EGG 471 #define ITEM_LUCKY_EGG 470
#define ITEM_SCOPE_LENS 472 #define ITEM_SCOPE_LENS 471
#define ITEM_LEFTOVERS 473 #define ITEM_LEFTOVERS 472
#define ITEM_SHELL_BELL 474 #define ITEM_SHELL_BELL 473
#define ITEM_WIDE_LENS 475 #define ITEM_WIDE_LENS 474
#define ITEM_MUSCLE_BAND 476 #define ITEM_MUSCLE_BAND 475
#define ITEM_WISE_GLASSES 477 #define ITEM_WISE_GLASSES 476
#define ITEM_EXPERT_BELT 478 #define ITEM_EXPERT_BELT 477
#define ITEM_LIGHT_CLAY 479 #define ITEM_LIGHT_CLAY 478
#define ITEM_LIFE_ORB 480 #define ITEM_LIFE_ORB 479
#define ITEM_POWER_HERB 481 #define ITEM_POWER_HERB 480
#define ITEM_FOCUS_SASH 482 #define ITEM_FOCUS_SASH 481
#define ITEM_ZOOM_LENS 483 #define ITEM_ZOOM_LENS 482
#define ITEM_METRONOME 484 #define ITEM_METRONOME 483
#define ITEM_IRON_BALL 485 #define ITEM_IRON_BALL 484
#define ITEM_LAGGING_TAIL 486 #define ITEM_LAGGING_TAIL 485
#define ITEM_DESTINY_KNOT 487 #define ITEM_DESTINY_KNOT 486
#define ITEM_BLACK_SLUDGE 488 #define ITEM_BLACK_SLUDGE 487
#define ITEM_GRIP_CLAW 489 #define ITEM_GRIP_CLAW 488
#define ITEM_STICKY_BARB 490 #define ITEM_STICKY_BARB 489
#define ITEM_SHED_SHELL 491 #define ITEM_SHED_SHELL 490
#define ITEM_BIG_ROOT 492 #define ITEM_BIG_ROOT 491
#define ITEM_RAZOR_CLAW 493 #define ITEM_RAZOR_CLAW 492
#define ITEM_RAZOR_FANG 494 #define ITEM_RAZOR_FANG 493
#define ITEM_EVIOLITE 495 #define ITEM_EVIOLITE 494
#define ITEM_FLOAT_STONE 496 #define ITEM_FLOAT_STONE 495
#define ITEM_ROCKY_HELMET 497 #define ITEM_ROCKY_HELMET 496
#define ITEM_AIR_BALLOON 498 #define ITEM_AIR_BALLOON 497
#define ITEM_RED_CARD 499 #define ITEM_RED_CARD 498
#define ITEM_RING_TARGET 500 #define ITEM_RING_TARGET 499
#define ITEM_BINDING_BAND 501 #define ITEM_BINDING_BAND 500
#define ITEM_EJECT_BUTTON 502 #define ITEM_EJECT_BUTTON 501
#define ITEM_WEAKNESS_POLICY 503 #define ITEM_WEAKNESS_POLICY 502
#define ITEM_ASSAULT_VEST 504 #define ITEM_ASSAULT_VEST 503
#define ITEM_SAFETY_GOGGLES 505 #define ITEM_SAFETY_GOGGLES 504
#define ITEM_ADRENALINE_ORB 506 #define ITEM_ADRENALINE_ORB 505
#define ITEM_TERRAIN_EXTENDER 507 #define ITEM_TERRAIN_EXTENDER 506
#define ITEM_PROTECTIVE_PADS 508 #define ITEM_PROTECTIVE_PADS 507
#define ITEM_THROAT_SPRAY 509 #define ITEM_THROAT_SPRAY 508
#define ITEM_EJECT_PACK 510 #define ITEM_EJECT_PACK 509
#define ITEM_HEAVY_DUTY_BOOTS 511 #define ITEM_HEAVY_DUTY_BOOTS 510
#define ITEM_BLUNDER_POLICY 512 #define ITEM_BLUNDER_POLICY 511
#define ITEM_ROOM_SERVICE 513 #define ITEM_ROOM_SERVICE 512
#define ITEM_UTILITY_UMBRELLA 514 #define ITEM_UTILITY_UMBRELLA 513
// Berries // Berries
#define ITEM_CHERI_BERRY 515 #define ITEM_CHERI_BERRY 514
#define ITEM_CHESTO_BERRY 516 #define ITEM_CHESTO_BERRY 515
#define ITEM_PECHA_BERRY 517 #define ITEM_PECHA_BERRY 516
#define ITEM_RAWST_BERRY 518 #define ITEM_RAWST_BERRY 517
#define ITEM_ASPEAR_BERRY 519 #define ITEM_ASPEAR_BERRY 518
#define ITEM_LEPPA_BERRY 520 #define ITEM_LEPPA_BERRY 519
#define ITEM_ORAN_BERRY 521 #define ITEM_ORAN_BERRY 520
#define ITEM_PERSIM_BERRY 522 #define ITEM_PERSIM_BERRY 521
#define ITEM_LUM_BERRY 523 #define ITEM_LUM_BERRY 522
#define ITEM_SITRUS_BERRY 524 #define ITEM_SITRUS_BERRY 523
#define ITEM_FIGY_BERRY 525 #define ITEM_FIGY_BERRY 524
#define ITEM_WIKI_BERRY 526 #define ITEM_WIKI_BERRY 525
#define ITEM_MAGO_BERRY 527 #define ITEM_MAGO_BERRY 526
#define ITEM_AGUAV_BERRY 528 #define ITEM_AGUAV_BERRY 527
#define ITEM_IAPAPA_BERRY 529 #define ITEM_IAPAPA_BERRY 528
#define ITEM_RAZZ_BERRY 530 #define ITEM_RAZZ_BERRY 529
#define ITEM_BLUK_BERRY 531 #define ITEM_BLUK_BERRY 530
#define ITEM_NANAB_BERRY 532 #define ITEM_NANAB_BERRY 531
#define ITEM_WEPEAR_BERRY 533 #define ITEM_WEPEAR_BERRY 532
#define ITEM_PINAP_BERRY 534 #define ITEM_PINAP_BERRY 533
#define ITEM_POMEG_BERRY 535 #define ITEM_POMEG_BERRY 534
#define ITEM_KELPSY_BERRY 536 #define ITEM_KELPSY_BERRY 535
#define ITEM_QUALOT_BERRY 537 #define ITEM_QUALOT_BERRY 536
#define ITEM_HONDEW_BERRY 538 #define ITEM_HONDEW_BERRY 537
#define ITEM_GREPA_BERRY 539 #define ITEM_GREPA_BERRY 538
#define ITEM_TAMATO_BERRY 540 #define ITEM_TAMATO_BERRY 539
#define ITEM_CORNN_BERRY 541 #define ITEM_CORNN_BERRY 540
#define ITEM_MAGOST_BERRY 542 #define ITEM_MAGOST_BERRY 541
#define ITEM_RABUTA_BERRY 543 #define ITEM_RABUTA_BERRY 542
#define ITEM_NOMEL_BERRY 544 #define ITEM_NOMEL_BERRY 543
#define ITEM_SPELON_BERRY 545 #define ITEM_SPELON_BERRY 544
#define ITEM_PAMTRE_BERRY 546 #define ITEM_PAMTRE_BERRY 545
#define ITEM_WATMEL_BERRY 547 #define ITEM_WATMEL_BERRY 546
#define ITEM_DURIN_BERRY 548 #define ITEM_DURIN_BERRY 547
#define ITEM_BELUE_BERRY 549 #define ITEM_BELUE_BERRY 548
#define ITEM_CHILAN_BERRY 550 #define ITEM_CHILAN_BERRY 549
#define ITEM_OCCA_BERRY 551 #define ITEM_OCCA_BERRY 550
#define ITEM_PASSHO_BERRY 552 #define ITEM_PASSHO_BERRY 551
#define ITEM_WACAN_BERRY 553 #define ITEM_WACAN_BERRY 552
#define ITEM_RINDO_BERRY 554 #define ITEM_RINDO_BERRY 553
#define ITEM_YACHE_BERRY 555 #define ITEM_YACHE_BERRY 554
#define ITEM_CHOPLE_BERRY 556 #define ITEM_CHOPLE_BERRY 555
#define ITEM_KEBIA_BERRY 557 #define ITEM_KEBIA_BERRY 556
#define ITEM_SHUCA_BERRY 558 #define ITEM_SHUCA_BERRY 557
#define ITEM_COBA_BERRY 559 #define ITEM_COBA_BERRY 558
#define ITEM_PAYAPA_BERRY 560 #define ITEM_PAYAPA_BERRY 559
#define ITEM_TANGA_BERRY 561 #define ITEM_TANGA_BERRY 560
#define ITEM_CHARTI_BERRY 562 #define ITEM_CHARTI_BERRY 561
#define ITEM_KASIB_BERRY 563 #define ITEM_KASIB_BERRY 562
#define ITEM_HABAN_BERRY 564 #define ITEM_HABAN_BERRY 563
#define ITEM_COLBUR_BERRY 565 #define ITEM_COLBUR_BERRY 564
#define ITEM_BABIRI_BERRY 566 #define ITEM_BABIRI_BERRY 565
#define ITEM_ROSELI_BERRY 567 #define ITEM_ROSELI_BERRY 566
#define ITEM_LIECHI_BERRY 568 #define ITEM_LIECHI_BERRY 567
#define ITEM_GANLON_BERRY 569 #define ITEM_GANLON_BERRY 568
#define ITEM_SALAC_BERRY 570 #define ITEM_SALAC_BERRY 569
#define ITEM_PETAYA_BERRY 571 #define ITEM_PETAYA_BERRY 570
#define ITEM_APICOT_BERRY 572 #define ITEM_APICOT_BERRY 571
#define ITEM_LANSAT_BERRY 573 #define ITEM_LANSAT_BERRY 572
#define ITEM_STARF_BERRY 574 #define ITEM_STARF_BERRY 573
#define ITEM_ENIGMA_BERRY 575 #define ITEM_ENIGMA_BERRY 574
#define ITEM_MICLE_BERRY 576 #define ITEM_MICLE_BERRY 575
#define ITEM_CUSTAP_BERRY 577 #define ITEM_CUSTAP_BERRY 576
#define ITEM_JABOCA_BERRY 578 #define ITEM_JABOCA_BERRY 577
#define ITEM_ROWAP_BERRY 579 #define ITEM_ROWAP_BERRY 578
#define ITEM_KEE_BERRY 580 #define ITEM_KEE_BERRY 579
#define ITEM_MARANGA_BERRY 581 #define ITEM_MARANGA_BERRY 580
#define ITEM_ENIGMA_BERRY_E_READER 582 #define ITEM_ENIGMA_BERRY_E_READER 581
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY #define FIRST_BERRY_INDEX ITEM_CHERI_BERRY
#define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY_E_READER #define LAST_BERRY_INDEX ITEM_ENIGMA_BERRY_E_READER
// TMs/HMs // TMs/HMs
#define ITEM_TM01 583 #define ITEM_TM01 582
#define ITEM_TM02 584 #define ITEM_TM02 583
#define ITEM_TM03 585 #define ITEM_TM03 584
#define ITEM_TM04 586 #define ITEM_TM04 585
#define ITEM_TM05 587 #define ITEM_TM05 586
#define ITEM_TM06 588 #define ITEM_TM06 587
#define ITEM_TM07 589 #define ITEM_TM07 588
#define ITEM_TM08 590 #define ITEM_TM08 589
#define ITEM_TM09 591 #define ITEM_TM09 590
#define ITEM_TM10 592 #define ITEM_TM10 591
#define ITEM_TM11 593 #define ITEM_TM11 592
#define ITEM_TM12 594 #define ITEM_TM12 593
#define ITEM_TM13 595 #define ITEM_TM13 594
#define ITEM_TM14 596 #define ITEM_TM14 595
#define ITEM_TM15 597 #define ITEM_TM15 596
#define ITEM_TM16 598 #define ITEM_TM16 597
#define ITEM_TM17 599 #define ITEM_TM17 598
#define ITEM_TM18 600 #define ITEM_TM18 599
#define ITEM_TM19 601 #define ITEM_TM19 600
#define ITEM_TM20 602 #define ITEM_TM20 601
#define ITEM_TM21 603 #define ITEM_TM21 602
#define ITEM_TM22 604 #define ITEM_TM22 603
#define ITEM_TM23 605 #define ITEM_TM23 604
#define ITEM_TM24 606 #define ITEM_TM24 605
#define ITEM_TM25 607 #define ITEM_TM25 606
#define ITEM_TM26 608 #define ITEM_TM26 607
#define ITEM_TM27 609 #define ITEM_TM27 608
#define ITEM_TM28 610 #define ITEM_TM28 609
#define ITEM_TM29 611 #define ITEM_TM29 610
#define ITEM_TM30 612 #define ITEM_TM30 611
#define ITEM_TM31 613 #define ITEM_TM31 612
#define ITEM_TM32 614 #define ITEM_TM32 613
#define ITEM_TM33 615 #define ITEM_TM33 614
#define ITEM_TM34 616 #define ITEM_TM34 615
#define ITEM_TM35 617 #define ITEM_TM35 616
#define ITEM_TM36 618 #define ITEM_TM36 617
#define ITEM_TM37 619 #define ITEM_TM37 618
#define ITEM_TM38 620 #define ITEM_TM38 619
#define ITEM_TM39 621 #define ITEM_TM39 620
#define ITEM_TM40 622 #define ITEM_TM40 621
#define ITEM_TM41 623 #define ITEM_TM41 622
#define ITEM_TM42 624 #define ITEM_TM42 623
#define ITEM_TM43 625 #define ITEM_TM43 624
#define ITEM_TM44 626 #define ITEM_TM44 625
#define ITEM_TM45 627 #define ITEM_TM45 626
#define ITEM_TM46 628 #define ITEM_TM46 627
#define ITEM_TM47 629 #define ITEM_TM47 628
#define ITEM_TM48 630 #define ITEM_TM48 629
#define ITEM_TM49 631 #define ITEM_TM49 630
#define ITEM_TM50 632 #define ITEM_TM50 631
#define ITEM_TM51 633 #define ITEM_TM51 632
#define ITEM_TM52 634 #define ITEM_TM52 633
#define ITEM_TM53 635 #define ITEM_TM53 634
#define ITEM_TM54 636 #define ITEM_TM54 635
#define ITEM_TM55 637 #define ITEM_TM55 636
#define ITEM_TM56 638 #define ITEM_TM56 637
#define ITEM_TM57 639 #define ITEM_TM57 638
#define ITEM_TM58 640 #define ITEM_TM58 639
#define ITEM_TM59 641 #define ITEM_TM59 640
#define ITEM_TM60 642 #define ITEM_TM60 641
#define ITEM_TM61 643 #define ITEM_TM61 642
#define ITEM_TM62 644 #define ITEM_TM62 643
#define ITEM_TM63 645 #define ITEM_TM63 644
#define ITEM_TM64 646 #define ITEM_TM64 645
#define ITEM_TM65 647 #define ITEM_TM65 646
#define ITEM_TM66 648 #define ITEM_TM66 647
#define ITEM_TM67 649 #define ITEM_TM67 648
#define ITEM_TM68 650 #define ITEM_TM68 649
#define ITEM_TM69 651 #define ITEM_TM69 650
#define ITEM_TM70 652 #define ITEM_TM70 651
#define ITEM_TM71 653 #define ITEM_TM71 652
#define ITEM_TM72 654 #define ITEM_TM72 653
#define ITEM_TM73 655 #define ITEM_TM73 654
#define ITEM_TM74 656 #define ITEM_TM74 655
#define ITEM_TM75 657 #define ITEM_TM75 656
#define ITEM_TM76 658 #define ITEM_TM76 657
#define ITEM_TM77 659 #define ITEM_TM77 658
#define ITEM_TM78 660 #define ITEM_TM78 659
#define ITEM_TM79 661 #define ITEM_TM79 660
#define ITEM_TM80 662 #define ITEM_TM80 661
#define ITEM_TM81 663 #define ITEM_TM81 662
#define ITEM_TM82 664 #define ITEM_TM82 663
#define ITEM_TM83 665 #define ITEM_TM83 664
#define ITEM_TM84 666 #define ITEM_TM84 665
#define ITEM_TM85 667 #define ITEM_TM85 666
#define ITEM_TM86 668 #define ITEM_TM86 667
#define ITEM_TM87 669 #define ITEM_TM87 668
#define ITEM_TM88 670 #define ITEM_TM88 669
#define ITEM_TM89 671 #define ITEM_TM89 670
#define ITEM_TM90 672 #define ITEM_TM90 671
#define ITEM_TM91 673 #define ITEM_TM91 672
#define ITEM_TM92 674 #define ITEM_TM92 673
#define ITEM_TM93 675 #define ITEM_TM93 674
#define ITEM_TM94 676 #define ITEM_TM94 675
#define ITEM_TM95 677 #define ITEM_TM95 676
#define ITEM_TM96 678 #define ITEM_TM96 677
#define ITEM_TM97 679 #define ITEM_TM97 678
#define ITEM_TM98 680 #define ITEM_TM98 679
#define ITEM_TM99 681 #define ITEM_TM99 680
#define ITEM_TM100 682 #define ITEM_TM100 681
#define ITEM_HM01 683 #define ITEM_HM01 682
#define ITEM_HM02 684 #define ITEM_HM02 683
#define ITEM_HM03 685 #define ITEM_HM03 684
#define ITEM_HM04 686 #define ITEM_HM04 685
#define ITEM_HM05 687 #define ITEM_HM05 686
#define ITEM_HM06 688 #define ITEM_HM06 687
#define ITEM_HM07 689 #define ITEM_HM07 688
#define ITEM_HM08 690 #define ITEM_HM08 689
#define ITEM_TM01_FOCUS_PUNCH ITEM_TM01 #define ITEM_TM01_FOCUS_PUNCH ITEM_TM01
#define ITEM_TM02_DRAGON_CLAW ITEM_TM02 #define ITEM_TM02_DRAGON_CLAW ITEM_TM02
@ -852,85 +851,85 @@
#define ITEM_HM08_DIVE ITEM_HM08 #define ITEM_HM08_DIVE ITEM_HM08
// Charms // Charms
#define ITEM_OVAL_CHARM 691 #define ITEM_OVAL_CHARM 690
#define ITEM_SHINY_CHARM 692 #define ITEM_SHINY_CHARM 691
#define ITEM_CATCHING_CHARM 693 #define ITEM_CATCHING_CHARM 692
#define ITEM_EXP_CHARM 694 #define ITEM_EXP_CHARM 693
// Form-changing Key Items // Form-changing Key Items
#define ITEM_ROTOM_CATALOG 695 #define ITEM_ROTOM_CATALOG 694
#define ITEM_GRACIDEA 696 #define ITEM_GRACIDEA 695
#define ITEM_REVEAL_GLASS 697 #define ITEM_REVEAL_GLASS 696
#define ITEM_DNA_SPLICERS 698 #define ITEM_DNA_SPLICERS 697
#define ITEM_ZYGARDE_CUBE 699 #define ITEM_ZYGARDE_CUBE 698
#define ITEM_PRISON_BOTTLE 700 #define ITEM_PRISON_BOTTLE 699
#define ITEM_N_SOLARIZER 701 #define ITEM_N_SOLARIZER 700
#define ITEM_N_LUNARIZER 702 #define ITEM_N_LUNARIZER 701
#define ITEM_REINS_OF_UNITY 703 #define ITEM_REINS_OF_UNITY 702
// Battle Mechanic Key Items // Battle Mechanic Key Items
#define ITEM_KEY_STONE 704 #define ITEM_KEY_STONE 703
#define ITEM_MEGA_RING 705 #define ITEM_MEGA_RING 704
#define ITEM_Z_POWER_RING 706 #define ITEM_Z_POWER_RING 705
#define ITEM_DYNAMAX_BAND 707 #define ITEM_DYNAMAX_BAND 706
// Misc. Key Items // Misc. Key Items
#define ITEM_BICYCLE 708 #define ITEM_BICYCLE 707
#define ITEM_MACH_BIKE 709 #define ITEM_MACH_BIKE 708
#define ITEM_ACRO_BIKE 710 #define ITEM_ACRO_BIKE 709
#define ITEM_OLD_ROD 711 #define ITEM_OLD_ROD 710
#define ITEM_GOOD_ROD 712 #define ITEM_GOOD_ROD 711
#define ITEM_SUPER_ROD 713 #define ITEM_SUPER_ROD 712
#define ITEM_DOWSING_MACHINE 714 #define ITEM_DOWSING_MACHINE 713
#define ITEM_TOWN_MAP 715 #define ITEM_TOWN_MAP 714
#define ITEM_VS_SEEKER 716 #define ITEM_VS_SEEKER 715
#define ITEM_TM_CASE 717 #define ITEM_TM_CASE 716
#define ITEM_BERRY_POUCH 718 #define ITEM_BERRY_POUCH 717
#define ITEM_POKEMON_BOX_LINK 719 #define ITEM_POKEMON_BOX_LINK 718
#define ITEM_COIN_CASE 720 #define ITEM_COIN_CASE 719
#define ITEM_POWDER_JAR 721 #define ITEM_POWDER_JAR 720
#define ITEM_WAILMER_PAIL 722 #define ITEM_WAILMER_PAIL 721
#define ITEM_POKE_RADAR 723 #define ITEM_POKE_RADAR 722
#define ITEM_POKEBLOCK_CASE 724 #define ITEM_POKEBLOCK_CASE 723
#define ITEM_SOOT_SACK 725 #define ITEM_SOOT_SACK 724
#define ITEM_POKE_FLUTE 726 #define ITEM_POKE_FLUTE 725
#define ITEM_FAME_CHECKER 727 #define ITEM_FAME_CHECKER 726
#define ITEM_TEACHY_TV 728 #define ITEM_TEACHY_TV 727
// Story Key Items // Story Key Items
#define ITEM_SS_TICKET 729 #define ITEM_SS_TICKET 728
#define ITEM_EON_TICKET 730 #define ITEM_EON_TICKET 729
#define ITEM_MYSTIC_TICKET 731 #define ITEM_MYSTIC_TICKET 730
#define ITEM_AURORA_TICKET 732 #define ITEM_AURORA_TICKET 731
#define ITEM_OLD_SEA_MAP 733 #define ITEM_OLD_SEA_MAP 732
#define ITEM_LETTER 734 #define ITEM_LETTER 733
#define ITEM_DEVON_PARTS 735 #define ITEM_DEVON_PARTS 734
#define ITEM_GO_GOGGLES 736 #define ITEM_GO_GOGGLES 735
#define ITEM_DEVON_SCOPE 737 #define ITEM_DEVON_SCOPE 736
#define ITEM_BASEMENT_KEY 738 #define ITEM_BASEMENT_KEY 737
#define ITEM_SCANNER 739 #define ITEM_SCANNER 738
#define ITEM_STORAGE_KEY 740 #define ITEM_STORAGE_KEY 739
#define ITEM_KEY_TO_ROOM_1 741 #define ITEM_KEY_TO_ROOM_1 740
#define ITEM_KEY_TO_ROOM_2 742 #define ITEM_KEY_TO_ROOM_2 741
#define ITEM_KEY_TO_ROOM_4 743 #define ITEM_KEY_TO_ROOM_4 742
#define ITEM_KEY_TO_ROOM_6 744 #define ITEM_KEY_TO_ROOM_6 743
#define ITEM_METEORITE 745 #define ITEM_METEORITE 744
#define ITEM_MAGMA_EMBLEM 746 #define ITEM_MAGMA_EMBLEM 745
#define ITEM_CONTEST_PASS 747 #define ITEM_CONTEST_PASS 746
#define ITEM_OAKS_PARCEL 748 #define ITEM_OAKS_PARCEL 747
#define ITEM_SECRET_KEY 749 #define ITEM_SECRET_KEY 748
#define ITEM_BIKE_VOUCHER 750 #define ITEM_BIKE_VOUCHER 749
#define ITEM_GOLD_TEETH 751 #define ITEM_GOLD_TEETH 750
#define ITEM_CARD_KEY 752 #define ITEM_CARD_KEY 751
#define ITEM_LIFT_KEY 753 #define ITEM_LIFT_KEY 752
#define ITEM_SILPH_SCOPE 754 #define ITEM_SILPH_SCOPE 753
#define ITEM_TRI_PASS 755 #define ITEM_TRI_PASS 754
#define ITEM_RAINBOW_PASS 756 #define ITEM_RAINBOW_PASS 755
#define ITEM_TEA 757 #define ITEM_TEA 756
#define ITEM_RUBY 758 #define ITEM_RUBY 757
#define ITEM_SAPPHIRE 759 #define ITEM_SAPPHIRE 758
#define ITEMS_COUNT 760 #define ITEMS_COUNT 759
#define ITEM_FIELD_ARROW ITEMS_COUNT #define ITEM_FIELD_ARROW ITEMS_COUNT
// Range of berries given out by various NPCS // Range of berries given out by various NPCS

2
include/graphics.h
View file

@ -3962,8 +3962,6 @@ extern const u32 gItemIcon_RedOrb[];
extern const u32 gItemIconPalette_RedOrb[]; extern const u32 gItemIconPalette_RedOrb[];
extern const u32 gItemIcon_BlueOrb[]; extern const u32 gItemIcon_BlueOrb[];
extern const u32 gItemIconPalette_BlueOrb[]; extern const u32 gItemIconPalette_BlueOrb[];
//extern const u32 gItemIcon_JadeOrb[];
//extern const u32 gItemIconPalette_JadeOrb[];
// Mega Stones // Mega Stones
extern const u32 gItemIcon_Venusaurite[]; extern const u32 gItemIcon_Venusaurite[];
extern const u32 gItemIconPalette_Venusaurite[]; extern const u32 gItemIconPalette_Venusaurite[];

3
src/data/graphics/items.h
View file

@ -890,9 +890,6 @@ const u32 gItemIconPalette_RedOrb[] = INCBIN_U32("graphics/items/icon_palettes/r
const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz"); const u32 gItemIcon_BlueOrb[] = INCBIN_U32("graphics/items/icons/blue_orb.4bpp.lz");
const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz"); const u32 gItemIconPalette_BlueOrb[] = INCBIN_U32("graphics/items/icon_palettes/blue_orb.gbapal.lz");
//const u32 gItemIcon_JadeOrb[] = INCBIN_U32("graphics/items/icons/question_mark.4bpp.lz");
//const u32 gItemIconPalette_JadeOrb[] = INCBIN_U32("graphics/items/icon_palettes/question_mark.gbapal.lz");
// Mega Stones // Mega Stones
const u32 gItemIcon_Venusaurite[] = INCBIN_U32("graphics/items/icons/venusaurite.4bpp.lz"); const u32 gItemIcon_Venusaurite[] = INCBIN_U32("graphics/items/icons/venusaurite.4bpp.lz");

1
src/data/item_icon_table.h
View file

@ -316,7 +316,6 @@ const u32 *const gItemIconTable[][2] =
// Colored Orbs // Colored Orbs
[ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb}, [ITEM_RED_ORB] = {gItemIcon_RedOrb, gItemIconPalette_RedOrb},
[ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb}, [ITEM_BLUE_ORB] = {gItemIcon_BlueOrb, gItemIconPalette_BlueOrb},
[ITEM_JADE_ORB] = {gItemIcon_QuestionMark, gItemIconPalette_QuestionMark}, // Todo
// Mega Stones // Mega Stones
[ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite}, [ITEM_VENUSAURITE] = {gItemIcon_Venusaurite, gItemIconPalette_Venusaurite},
[ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX}, [ITEM_CHARIZARDITE_X] = {gItemIcon_CharizarditeX, gItemIconPalette_CharizarditeX},

11
src/data/items.h
View file

@ -3612,17 +3612,6 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse, .fieldUseFunc = ItemUseOutOfBattle_CannotUse,
}, },
[ITEM_JADE_ORB] = // Todo
{
.name = _("????????"),
.itemId = ITEM_NONE,
.price = 0,
.description = sDummyDesc,
.pocket = POCKET_ITEMS,
.type = ITEM_USE_BAG_MENU,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
},
// Mega Stones // Mega Stones
[ITEM_VENUSAURITE] = [ITEM_VENUSAURITE] =

3
src/data/text/item_descriptions.h
View file

@ -1366,9 +1366,6 @@ static const u8 sBlueOrbDesc[] = _(
"said to contain an\n" "said to contain an\n"
"ancient power."); "ancient power.");
static const u8 sJadeOrbDesc[] = _( // Todo
"?????");
// Mega Stones // Mega Stones
static const u8 sVenusauriteDesc[] = _( static const u8 sVenusauriteDesc[] = _(
"This stone enables\n" "This stone enables\n"