Merge pull request #102 from LOuroboros/battle_engine_v2
Gen. 5 Gems and Gen. 7 hold items stuff
19
graphics/items/icon_palettes/adrenaline_orb.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
41 65 115
|
||||
90 172 222
|
||||
57 90 148
|
||||
106 197 238
|
||||
123 230 246
|
||||
82 148 189
|
||||
82 115 164
|
||||
57 106 172
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/bug_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
184 216 104
|
||||
224 232 176
|
||||
152 184 32
|
||||
248 248 248
|
||||
136 160 16
|
||||
112 144 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/dark_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
72 72 72
|
||||
120 120 120
|
||||
56 56 56
|
||||
160 160 160
|
||||
40 40 40
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/dragon_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
160 128 200
|
||||
168 184 232
|
||||
128 96 224
|
||||
216 248 216
|
||||
72 64 152
|
||||
96 56 112
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/electric_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
248 224 0
|
||||
248 248 160
|
||||
224 200 0
|
||||
248 248 248
|
||||
192 168 0
|
||||
184 160 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/electric_seed.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
213 148 65
|
||||
246 246 82
|
||||
246 222 74
|
||||
238 246 197
|
||||
156 106 16
|
||||
106 82 65
|
||||
205 139 24
|
||||
238 189 41
|
||||
106 90 74
|
||||
156 90 49
|
||||
246 222 123
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/fairy_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
215 149 192
|
||||
251 230 239
|
||||
210 120 173
|
||||
255 247 255
|
||||
193 77 151
|
||||
183 49 136
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/fighting_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
184 112 120
|
||||
224 152 136
|
||||
144 72 120
|
||||
248 216 208
|
||||
120 56 88
|
||||
96 40 56
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/fire_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
248 144 72
|
||||
248 200 104
|
||||
240 64 48
|
||||
248 248 232
|
||||
224 72 32
|
||||
176 24 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/flying_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
184 200 248
|
||||
216 224 248
|
||||
152 168 240
|
||||
232 248 248
|
||||
104 128 192
|
||||
64 80 144
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/ghost_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
104 80 184
|
||||
104 104 216
|
||||
80 64 152
|
||||
136 136 224
|
||||
56 48 112
|
||||
32 40 80
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/grass_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
96 248 120
|
||||
184 248 176
|
||||
64 200 80
|
||||
232 248 224
|
||||
56 184 88
|
||||
0 144 48
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/grassy_seed.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
139 172 82
|
||||
197 230 90
|
||||
172 197 90
|
||||
238 246 197
|
||||
156 106 16
|
||||
65 74 24
|
||||
205 139 24
|
||||
238 189 41
|
||||
106 90 74
|
||||
106 148 82
|
||||
246 222 123
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/ground_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
184 128 56
|
||||
200 160 80
|
||||
160 104 32
|
||||
224 192 128
|
||||
112 64 16
|
||||
104 56 16
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/ice_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
104 232 232
|
||||
168 248 248
|
||||
48 208 248
|
||||
232 248 248
|
||||
24 176 248
|
||||
0 152 200
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/misty_seed.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
98 123 189
|
||||
205 230 255
|
||||
139 189 255
|
||||
238 246 197
|
||||
156 106 16
|
||||
65 74 115
|
||||
205 139 24
|
||||
238 189 41
|
||||
106 90 74
|
||||
82 82 156
|
||||
246 222 123
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/normal_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
224 184 184
|
||||
240 208 208
|
||||
192 176 176
|
||||
248 248 248
|
||||
168 160 160
|
||||
144 144 144
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/poison_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
152 104 168
|
||||
192 176 200
|
||||
104 96 136
|
||||
232 248 224
|
||||
56 104 104
|
||||
40 72 72
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/protective_pads.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
205 222 238
|
||||
172 189 213
|
||||
131 156 180
|
||||
98 106 164
|
||||
106 123 131
|
||||
148 156 164
|
||||
255 255 255
|
||||
213 213 205
|
||||
172 180 180
|
||||
74 82 90
|
||||
131 148 197
|
||||
74 90 148
|
||||
98 98 123
|
||||
156 172 205
|
19
graphics/items/icon_palettes/psychic_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
248 104 176
|
||||
248 160 192
|
||||
208 56 136
|
||||
248 216 208
|
||||
160 32 136
|
||||
112 0 104
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/psychic_seed.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
172 98 189
|
||||
255 205 255
|
||||
197 139 197
|
||||
238 246 197
|
||||
156 106 16
|
||||
65 74 24
|
||||
205 139 24
|
||||
238 189 41
|
||||
106 90 74
|
||||
115 65 123
|
||||
246 222 123
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/rock_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
184 144 120
|
||||
216 200 176
|
||||
136 112 88
|
||||
232 224 200
|
||||
112 88 72
|
||||
80 64 48
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/steel_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
136 136 152
|
||||
184 184 200
|
||||
96 96 96
|
||||
232 232 248
|
||||
88 88 88
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/terrain_extender.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
49 49 49
|
||||
180 197 197
|
||||
123 139 139
|
||||
74 82 82
|
||||
255 255 255
|
||||
213 230 230
|
||||
49 106 106
|
||||
74 148 164
|
||||
131 213 213
|
||||
222 123 106
|
||||
222 65 41
|
||||
172 57 49
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
19
graphics/items/icon_palettes/water_gem.pal
Executable file
@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
255 0 128
|
||||
32 32 32
|
||||
64 160 248
|
||||
120 200 248
|
||||
48 144 248
|
||||
208 248 248
|
||||
0 120 208
|
||||
0 80 200
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
BIN
graphics/items/icons/adrenaline_orb.png
Executable file
After Width: | Height: | Size: 260 B |
BIN
graphics/items/icons/bug_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/dark_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/dragon_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/electric_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/electric_seed.png
Executable file
After Width: | Height: | Size: 310 B |
BIN
graphics/items/icons/fairy_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/fighting_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/fire_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/flying_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/ghost_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/grass_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/grassy_seed.png
Executable file
After Width: | Height: | Size: 310 B |
BIN
graphics/items/icons/ground_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/ice_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/misty_seed.png
Executable file
After Width: | Height: | Size: 310 B |
BIN
graphics/items/icons/normal_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/poison_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/protective_pads.png
Executable file
After Width: | Height: | Size: 335 B |
BIN
graphics/items/icons/psychic_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/psychic_seed.png
Executable file
After Width: | Height: | Size: 310 B |
BIN
graphics/items/icons/rock_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/steel_gem.png
Executable file
After Width: | Height: | Size: 353 B |
BIN
graphics/items/icons/terrain_extender.png
Executable file
After Width: | Height: | Size: 313 B |
BIN
graphics/items/icons/water_gem.png
Executable file
After Width: | Height: | Size: 353 B |
@ -107,6 +107,7 @@
|
||||
#define HOLD_EFFECT_ASSAULT_VEST 117
|
||||
#define HOLD_EFFECT_BINDING_BAND 118
|
||||
#define HOLD_EFFECT_DRIVE 119
|
||||
#define HOLD_EFFECT_GEMS 120
|
||||
|
||||
// Gen6 hold effects
|
||||
#define HOLD_EFFECT_FAIRY_POWER 129
|
||||
@ -116,6 +117,8 @@
|
||||
// Gen7 hold effects
|
||||
#define HOLD_EFFECT_PROTECTIVE_PADS 149
|
||||
#define HOLD_EFFECT_TERRAIN_EXTENDER 150
|
||||
#define HOLD_EFFECT_SEEDS 151
|
||||
#define HOLD_EFFECT_ADRENALINE_ORB 152
|
||||
|
||||
#define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))
|
||||
|
||||
|
@ -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
|
||||
|
@ -3955,6 +3955,42 @@ extern const u32 gItemIcon_BurnDrive[];
|
||||
extern const u32 gItemIconPalette_BurnDrive[];
|
||||
extern const u32 gItemIcon_ChillDrive[];
|
||||
extern const u32 gItemIconPalette_ChillDrive[];
|
||||
extern const u32 gItemIcon_FireGem[];
|
||||
extern const u32 gItemIconPalette_FireGem[];
|
||||
extern const u32 gItemIcon_WaterGem[];
|
||||
extern const u32 gItemIconPalette_WaterGem[];
|
||||
extern const u32 gItemIcon_ElectricGem[];
|
||||
extern const u32 gItemIconPalette_ElectricGem[];
|
||||
extern const u32 gItemIcon_GrassGem[];
|
||||
extern const u32 gItemIconPalette_GrassGem[];
|
||||
extern const u32 gItemIcon_IceGem[];
|
||||
extern const u32 gItemIconPalette_IceGem[];
|
||||
extern const u32 gItemIcon_FightingGem[];
|
||||
extern const u32 gItemIconPalette_FightingGem[];
|
||||
extern const u32 gItemIcon_PoisonGem[];
|
||||
extern const u32 gItemIconPalette_PoisonGem[];
|
||||
extern const u32 gItemIcon_GroundGem[];
|
||||
extern const u32 gItemIconPalette_GroundGem[];
|
||||
extern const u32 gItemIcon_FlyingGem[];
|
||||
extern const u32 gItemIconPalette_FlyingGem[];
|
||||
extern const u32 gItemIcon_PsychicGem[];
|
||||
extern const u32 gItemIconPalette_PsychicGem[];
|
||||
extern const u32 gItemIcon_BugGem[];
|
||||
extern const u32 gItemIconPalette_BugGem[];
|
||||
extern const u32 gItemIcon_RockGem[];
|
||||
extern const u32 gItemIconPalette_RockGem[];
|
||||
extern const u32 gItemIcon_GhostGem[];
|
||||
extern const u32 gItemIconPalette_GhostGem[];
|
||||
extern const u32 gItemIcon_DragonGem[];
|
||||
extern const u32 gItemIconPalette_DragonGem[];
|
||||
extern const u32 gItemIcon_DarkGem[];
|
||||
extern const u32 gItemIconPalette_DarkGem[];
|
||||
extern const u32 gItemIcon_SteelGem[];
|
||||
extern const u32 gItemIconPalette_SteelGem[];
|
||||
extern const u32 gItemIcon_NormalGem[];
|
||||
extern const u32 gItemIconPalette_NormalGem[];
|
||||
extern const u32 gItemIcon_FairyGem[];
|
||||
extern const u32 gItemIconPalette_FairyGem[];
|
||||
// Gen 6 Items
|
||||
extern const u32 gItemIcon_AssaultVest[];
|
||||
extern const u32 gItemIconPalette_AssaultVest[];
|
||||
@ -4056,6 +4092,21 @@ extern const u32 gItemIcon_Beedrillite[];
|
||||
extern const u32 gItemIconPalette_Beedrillite[];
|
||||
extern const u32 gItemIcon_MegaBracelet[];
|
||||
extern const u32 gItemIconPalette_MegaBracelet[];
|
||||
// Gen 7 Items
|
||||
extern const u32 gItemIcon_ProtectivePads[];
|
||||
extern const u32 gItemIconPalette_ProtectivePads[];
|
||||
extern const u32 gItemIcon_TerrainExtender[];
|
||||
extern const u32 gItemIconPalette_TerrainExtender[];
|
||||
extern const u32 gItemIcon_ElectricSeed[];
|
||||
extern const u32 gItemIconPalette_ElectricSeed[];
|
||||
extern const u32 gItemIcon_GrassySeed[];
|
||||
extern const u32 gItemIconPalette_GrassySeed[];
|
||||
extern const u32 gItemIcon_MistySeed[];
|
||||
extern const u32 gItemIconPalette_MistySeed[];
|
||||
extern const u32 gItemIcon_PsychicSeed[];
|
||||
extern const u32 gItemIconPalette_PsychicSeed[];
|
||||
extern const u32 gItemIcon_AdrenalineOrb[];
|
||||
extern const u32 gItemIconPalette_AdrenalineOrb[];
|
||||
|
||||
extern const u32 gItemIcon_ReturnToFieldArrow[];
|
||||
extern const u32 gItemIconPalette_ReturnToFieldArrow[];
|
||||
|
@ -900,6 +900,60 @@ const u32 gItemIconPalette_BurnDrive[] = INCBIN_U32("graphics/items/icon_palette
|
||||
const u32 gItemIcon_ChillDrive[] = INCBIN_U32("graphics/items/icons/chill_drive.4bpp.lz");
|
||||
const u32 gItemIconPalette_ChillDrive[] = INCBIN_U32("graphics/items/icon_palettes/chill_drive.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_FireGem[] = INCBIN_U32("graphics/items/icons/fire_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_FireGem[] = INCBIN_U32("graphics/items/icon_palettes/fire_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_WaterGem[] = INCBIN_U32("graphics/items/icons/water_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_WaterGem[] = INCBIN_U32("graphics/items/icon_palettes/water_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_ElectricGem[] = INCBIN_U32("graphics/items/icons/electric_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_ElectricGem[] = INCBIN_U32("graphics/items/icon_palettes/electric_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_GrassGem[] = INCBIN_U32("graphics/items/icons/grass_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_GrassGem[] = INCBIN_U32("graphics/items/icon_palettes/grass_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_IceGem[] = INCBIN_U32("graphics/items/icons/ice_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_IceGem[] = INCBIN_U32("graphics/items/icon_palettes/ice_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_FightingGem[] = INCBIN_U32("graphics/items/icons/fighting_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_FightingGem[] = INCBIN_U32("graphics/items/icon_palettes/fighting_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_PoisonGem[] = INCBIN_U32("graphics/items/icons/poison_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_PoisonGem[] = INCBIN_U32("graphics/items/icon_palettes/poison_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_GroundGem[] = INCBIN_U32("graphics/items/icons/ground_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_GroundGem[] = INCBIN_U32("graphics/items/icon_palettes/ground_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_FlyingGem[] = INCBIN_U32("graphics/items/icons/flying_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_FlyingGem[] = INCBIN_U32("graphics/items/icon_palettes/flying_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_PsychicGem[] = INCBIN_U32("graphics/items/icons/psychic_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_PsychicGem[] = INCBIN_U32("graphics/items/icon_palettes/psychic_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_BugGem[] = INCBIN_U32("graphics/items/icons/bug_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_BugGem[] = INCBIN_U32("graphics/items/icon_palettes/bug_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_RockGem[] = INCBIN_U32("graphics/items/icons/rock_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_RockGem[] = INCBIN_U32("graphics/items/icon_palettes/rock_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_GhostGem[] = INCBIN_U32("graphics/items/icons/ghost_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_GhostGem[] = INCBIN_U32("graphics/items/icon_palettes/ghost_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_DragonGem[] = INCBIN_U32("graphics/items/icons/dragon_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_DragonGem[] = INCBIN_U32("graphics/items/icon_palettes/dragon_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_DarkGem[] = INCBIN_U32("graphics/items/icons/dark_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_DarkGem[] = INCBIN_U32("graphics/items/icon_palettes/dark_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_SteelGem[] = INCBIN_U32("graphics/items/icons/steel_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_SteelGem[] = INCBIN_U32("graphics/items/icon_palettes/steel_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_NormalGem[] = INCBIN_U32("graphics/items/icons/normal_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_NormalGem[] = INCBIN_U32("graphics/items/icon_palettes/normal_gem.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_FairyGem[] = INCBIN_U32("graphics/items/icons/fairy_gem.4bpp.lz");
|
||||
const u32 gItemIconPalette_FairyGem[] = INCBIN_U32("graphics/items/icon_palettes/fairy_gem.gbapal.lz");
|
||||
|
||||
// Gen 6 Items
|
||||
|
||||
const u32 gItemIcon_AssaultVest[] = INCBIN_U32("graphics/items/icons/assault_vest.4bpp.lz");
|
||||
@ -1051,3 +1105,26 @@ const u32 gItemIconPalette_Beedrillite[] = INCBIN_U32("graphics/items/icon_palet
|
||||
|
||||
const u32 gItemIcon_MegaBracelet[] = INCBIN_U32("graphics/items/icons/mega_bracelet.4bpp.lz");
|
||||
const u32 gItemIconPalette_MegaBracelet[] = INCBIN_U32("graphics/items/icon_palettes/mega_bracelet.gbapal.lz");
|
||||
|
||||
// Gen 7 Items
|
||||
|
||||
const u32 gItemIcon_ProtectivePads[] = INCBIN_U32("graphics/items/icons/protective_pads.4bpp.lz");
|
||||
const u32 gItemIconPalette_ProtectivePads[] = INCBIN_U32("graphics/items/icon_palettes/protective_pads.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_TerrainExtender[] = INCBIN_U32("graphics/items/icons/terrain_extender.4bpp.lz");
|
||||
const u32 gItemIconPalette_TerrainExtender[] = INCBIN_U32("graphics/items/icon_palettes/terrain_extender.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_ElectricSeed[] = INCBIN_U32("graphics/items/icons/electric_seed.4bpp.lz");
|
||||
const u32 gItemIconPalette_ElectricSeed[] = INCBIN_U32("graphics/items/icon_palettes/electric_seed.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_GrassySeed[] = INCBIN_U32("graphics/items/icons/grassy_seed.4bpp.lz");
|
||||
const u32 gItemIconPalette_GrassySeed[] = INCBIN_U32("graphics/items/icon_palettes/grassy_seed.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_MistySeed[] = INCBIN_U32("graphics/items/icons/misty_seed.4bpp.lz");
|
||||
const u32 gItemIconPalette_MistySeed[] = INCBIN_U32("graphics/items/icon_palettes/misty_seed.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_PsychicSeed[] = INCBIN_U32("graphics/items/icons/psychic_seed.4bpp.lz");
|
||||
const u32 gItemIconPalette_PsychicSeed[] = INCBIN_U32("graphics/items/icon_palettes/psychic_seed.gbapal.lz");
|
||||
|
||||
const u32 gItemIcon_AdrenalineOrb[] = INCBIN_U32("graphics/items/icons/adrenaline_orb.4bpp.lz");
|
||||
const u32 gItemIconPalette_AdrenalineOrb[] = INCBIN_U32("graphics/items/icon_palettes/adrenaline_orb.gbapal.lz");
|
||||
|
@ -457,6 +457,24 @@ const u32 *const gItemIconTable[][2] =
|
||||
[ITEM_SHOCK_DRIVE] = {gItemIcon_ShockDrive, gItemIconPalette_ShockDrive},
|
||||
[ITEM_BURN_DRIVE] = {gItemIcon_BurnDrive, gItemIconPalette_BurnDrive},
|
||||
[ITEM_CHILL_DRIVE] = {gItemIcon_ChillDrive, gItemIconPalette_ChillDrive},
|
||||
[ITEM_FIRE_GEM] = {gItemIcon_FireGem, gItemIconPalette_FireGem},
|
||||
[ITEM_WATER_GEM] = {gItemIcon_WaterGem, gItemIconPalette_WaterGem},
|
||||
[ITEM_ELECTRIC_GEM] = {gItemIcon_ElectricGem, gItemIconPalette_ElectricGem},
|
||||
[ITEM_GRASS_GEM] = {gItemIcon_GrassGem, gItemIconPalette_GrassGem},
|
||||
[ITEM_ICE_GEM] = {gItemIcon_IceGem, gItemIconPalette_IceGem},
|
||||
[ITEM_FIGHTING_GEM] = {gItemIcon_FightingGem, gItemIconPalette_FightingGem},
|
||||
[ITEM_POISON_GEM] = {gItemIcon_PoisonGem, gItemIconPalette_PoisonGem},
|
||||
[ITEM_GROUND_GEM] = {gItemIcon_GroundGem, gItemIconPalette_GroundGem},
|
||||
[ITEM_FLYING_GEM] = {gItemIcon_FlyingGem, gItemIconPalette_FlyingGem},
|
||||
[ITEM_PSYCHIC_GEM] = {gItemIcon_PsychicGem, gItemIconPalette_PsychicGem},
|
||||
[ITEM_BUG_GEM] = {gItemIcon_BugGem, gItemIconPalette_BugGem},
|
||||
[ITEM_ROCK_GEM] = {gItemIcon_RockGem, gItemIconPalette_RockGem},
|
||||
[ITEM_GHOST_GEM] = {gItemIcon_GhostGem, gItemIconPalette_GhostGem},
|
||||
[ITEM_DRAGON_GEM] = {gItemIcon_DragonGem, gItemIconPalette_DragonGem},
|
||||
[ITEM_DARK_GEM] = {gItemIcon_DarkGem, gItemIconPalette_DarkGem},
|
||||
[ITEM_STEEL_GEM] = {gItemIcon_SteelGem, gItemIconPalette_SteelGem},
|
||||
[ITEM_NORMAL_GEM] = {gItemIcon_NormalGem, gItemIconPalette_NormalGem},
|
||||
[ITEM_FAIRY_GEM] = {gItemIcon_FairyGem, gItemIconPalette_FairyGem},
|
||||
// Gen 6 Items
|
||||
[ITEM_ASSAULT_VEST] = {gItemIcon_AssaultVest, gItemIconPalette_AssaultVest},
|
||||
[ITEM_PIXIE_PLATE] = {gItemIcon_PixiePlate, gItemIconPalette_PixiePlate},
|
||||
@ -508,6 +526,14 @@ const u32 *const gItemIconTable[][2] =
|
||||
[ITEM_SALAMENCITE] = {gItemIcon_Salamencite, gItemIconPalette_Salamencite},
|
||||
[ITEM_BEEDRILLITE] = {gItemIcon_Beedrillite, gItemIconPalette_Beedrillite},
|
||||
[ITEM_MEGA_BRACELET] = {gItemIcon_MegaBracelet, gItemIconPalette_MegaBracelet},
|
||||
// Gen 7 Items
|
||||
[ITEM_PROTECTIVE_PADS] = {gItemIcon_ProtectivePads, gItemIconPalette_ProtectivePads},
|
||||
[ITEM_TERRAIN_EXTENDER] = {gItemIcon_TerrainExtender, gItemIconPalette_TerrainExtender},
|
||||
[ITEM_ELECTRIC_SEED] = {gItemIcon_ElectricSeed, gItemIconPalette_ElectricSeed},
|
||||
[ITEM_GRASSY_SEED] = {gItemIcon_GrassySeed, gItemIconPalette_GrassySeed},
|
||||
[ITEM_MISTY_SEED] = {gItemIcon_MistySeed, gItemIconPalette_MistySeed},
|
||||
[ITEM_PSYCHIC_SEED] = {gItemIcon_PsychicSeed, gItemIconPalette_PsychicSeed},
|
||||
[ITEM_ADRENALINE_ORB] = {gItemIcon_AdrenalineOrb, gItemIconPalette_AdrenalineOrb},
|
||||
// Return to field arrow
|
||||
[ITEM_FIELD_ARROW] = {gItemIcon_ReturnToFieldArrow, gItemIconPalette_ReturnToFieldArrow},
|
||||
};
|
||||
|
434
src/data/items.h
@ -7769,6 +7769,330 @@ const struct Item gItems[] =
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_FIRE_GEM] =
|
||||
{
|
||||
.name = _("Fire Gem"),
|
||||
.itemId = ITEM_FIRE_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gFireGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_WATER_GEM] =
|
||||
{
|
||||
.name = _("Water Gem"),
|
||||
.itemId = ITEM_WATER_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gWaterGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_ELECTRIC_GEM] =
|
||||
{
|
||||
.name = _("Electric Gem"),
|
||||
.itemId = ITEM_ELECTRIC_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gElectricGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_GRASS_GEM] =
|
||||
{
|
||||
.name = _("Grass Gem"),
|
||||
.itemId = ITEM_GRASS_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gGrassGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_ICE_GEM] =
|
||||
{
|
||||
.name = _("Ice Gem"),
|
||||
.itemId = ITEM_ICE_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gIceGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_FIGHTING_GEM] =
|
||||
{
|
||||
.name = _("Fighting Gem"),
|
||||
.itemId = ITEM_FIGHTING_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gFightingGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_POISON_GEM] =
|
||||
{
|
||||
.name = _("Poison Gem"),
|
||||
.itemId = ITEM_POISON_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gPoisonGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_GROUND_GEM] =
|
||||
{
|
||||
.name = _("Ground Gem"),
|
||||
.itemId = ITEM_GROUND_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gGroundGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_FLYING_GEM] =
|
||||
{
|
||||
.name = _("Flying Gem"),
|
||||
.itemId = ITEM_FLYING_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gFlyingGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_PSYCHIC_GEM] =
|
||||
{
|
||||
.name = _("Psychic Gem"),
|
||||
.itemId = ITEM_PSYCHIC_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gPsychicGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_BUG_GEM] =
|
||||
{
|
||||
.name = _("Bug Gem"),
|
||||
.itemId = ITEM_BUG_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gBugGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_ROCK_GEM] =
|
||||
{
|
||||
.name = _("Rock Gem"),
|
||||
.itemId = ITEM_ROCK_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gRockGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_GHOST_GEM] =
|
||||
{
|
||||
.name = _("Ghost Gem"),
|
||||
.itemId = ITEM_GHOST_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gGhostGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_DRAGON_GEM] =
|
||||
{
|
||||
.name = _("Dragon Gem"),
|
||||
.itemId = ITEM_DRAGON_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gDragonGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_DARK_GEM] =
|
||||
{
|
||||
.name = _("Dark Gem"),
|
||||
.itemId = ITEM_DARK_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gDarkGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_STEEL_GEM] =
|
||||
{
|
||||
.name = _("Steel Gem"),
|
||||
.itemId = ITEM_STEEL_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gSteelGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_NORMAL_GEM] =
|
||||
{
|
||||
.name = _("Normal Gem"),
|
||||
.itemId = ITEM_NORMAL_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gNormalGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_FAIRY_GEM] =
|
||||
{
|
||||
.name = _("Fairy Gem"),
|
||||
.itemId = ITEM_FAIRY_GEM,
|
||||
.price = 200,
|
||||
.holdEffect = HOLD_EFFECT_GEMS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gFairyGemItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_ASSAULT_VEST] =
|
||||
{
|
||||
.name = _("Assault Vest"),
|
||||
@ -8673,7 +8997,7 @@ const struct Item gItems[] =
|
||||
{
|
||||
.name = _("Protect Pads"), // Shortened name from Protective Pads
|
||||
.itemId = ITEM_PROTECTIVE_PADS,
|
||||
.price = 200,
|
||||
.price = 4000,
|
||||
.holdEffect = HOLD_EFFECT_PROTECTIVE_PADS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gProtectPadsItemDescription,
|
||||
@ -8686,4 +9010,112 @@ const struct Item gItems[] =
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_TERRAIN_EXTENDER] =
|
||||
{
|
||||
.name = _("Terrain Exte."),
|
||||
.itemId = ITEM_TERRAIN_EXTENDER,
|
||||
.price = 4000,
|
||||
.holdEffect = HOLD_EFFECT_TERRAIN_EXTENDER,
|
||||
.holdEffectParam = 0,
|
||||
.description = gTerrainExtenderItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_ELECTRIC_SEED] =
|
||||
{
|
||||
.name = _("Electric Seed"),
|
||||
.itemId = ITEM_ELECTRIC_SEED,
|
||||
.price = 4000,
|
||||
.holdEffect = HOLD_EFFECT_SEEDS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gElectricSeedItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_GRASSY_SEED] =
|
||||
{
|
||||
.name = _("Grassy Seed"),
|
||||
.itemId = ITEM_GRASSY_SEED,
|
||||
.price = 4000,
|
||||
.holdEffect = HOLD_EFFECT_SEEDS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gGrassySeedItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_MISTY_SEED] =
|
||||
{
|
||||
.name = _("Misty Seed"),
|
||||
.itemId = ITEM_MISTY_SEED,
|
||||
.price = 4000,
|
||||
.holdEffect = HOLD_EFFECT_SEEDS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gMistySeedItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_PSYCHIC_SEED] =
|
||||
{
|
||||
.name = _("Psychic Seed"),
|
||||
.itemId = ITEM_PSYCHIC_SEED,
|
||||
.price = 4000,
|
||||
.holdEffect = HOLD_EFFECT_SEEDS,
|
||||
.holdEffectParam = 0,
|
||||
.description = gPsychicSeedItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
|
||||
[ITEM_ADRENALINE_ORB] =
|
||||
{
|
||||
.name = _("AdrenalineOrb"),
|
||||
.itemId = ITEM_ADRENALINE_ORB,
|
||||
.price = 300,
|
||||
.holdEffect = HOLD_EFFECT_ADRENALINE_ORB,
|
||||
.holdEffectParam = 0,
|
||||
.description = gAdrenalineOrbItemDescription,
|
||||
.importance = 0,
|
||||
.unk19 = 0,
|
||||
.pocket = POCKET_ITEMS,
|
||||
.type = 4,
|
||||
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
|
||||
.battleUsage = 0,
|
||||
.battleUseFunc = NULL,
|
||||
.secondaryId = 0,
|
||||
},
|
||||
};
|
||||
|
@ -378,6 +378,24 @@ const u8 gDouseDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so i
|
||||
const u8 gShockDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so it\nbecomes Electric type.");
|
||||
const u8 gBurnDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so it\nbecomes Fire type.");
|
||||
const u8 gChillDriveItemDescription[] = _("Changes Genesect's\nTechno Blast so it\nbecomes Ice type.");
|
||||
const u8 gFireGemItemDescription[] = _("Increases the\npower of Fire\nType moves.");
|
||||
const u8 gWaterGemItemDescription[] = _("Increases the\npower of Water\nType moves.");
|
||||
const u8 gElectricGemItemDescription[] = _("Increases the\npower of Electric\nType moves.");
|
||||
const u8 gGrassGemItemDescription[] = _("Increases the\npower of Grass\nType moves.");
|
||||
const u8 gIceGemItemDescription[] = _("Increases the\npower of Ice\nType moves.");
|
||||
const u8 gFightingGemItemDescription[] = _("Increases the\npower of Fighting\nType moves.");
|
||||
const u8 gPoisonGemItemDescription[] = _("Increases the\npower of Poison\nType moves.");
|
||||
const u8 gGroundGemItemDescription[] = _("Increases the\npower of Ground\nType moves.");
|
||||
const u8 gFlyingGemItemDescription[] = _("Increases the\npower of Flying\nType moves.");
|
||||
const u8 gPsychicGemItemDescription[] = _("Increases the\npower of Psychic\nType moves.");
|
||||
const u8 gBugGemItemDescription[] = _("Increases the\npower of Bug\nType moves.");
|
||||
const u8 gRockGemItemDescription[] = _("Increases the\npower of Rock\nType moves.");
|
||||
const u8 gGhostGemItemDescription[] = _("Increases the\npower of Ghost\nType moves.");
|
||||
const u8 gDragonGemItemDescription[] = _("Increases the\npower of Dragon\nType moves.");
|
||||
const u8 gDarkGemItemDescription[] = _("Increases the\npower of Dark\nType moves.");
|
||||
const u8 gSteelGemItemDescription[] = _("Increases the\npower of Steel\nType moves.");
|
||||
const u8 gNormalGemItemDescription[] = _("Increases the\npower of Normal\nType moves.");
|
||||
const u8 gFairyGemItemDescription[] = _("Increases the\npower of Fairy\nType moves.");
|
||||
const u8 gAssaultVestItemDescription[] = _("Raises Sp. Def but\nprevents the use of\nstatus moves.");
|
||||
const u8 gPixiePlateItemDescription[] = _("A stone tablet that\nboosts the power of\nFairy-type moves.");
|
||||
const u8 gGengariteItemDescription[] = _("This stone enables\nGengar to Mega\nEvolve in battle.");
|
||||
@ -426,4 +444,10 @@ const u8 gLopunniteItemDescription[] = _("This stone enables\nLopunny to Mega\nE
|
||||
const u8 gSalamenciteItemDescription[] = _("This stone enables\nSalamence to Mega\nEvolve in battle.");
|
||||
const u8 gBeedrilliteItemDescription[] = _("This stone enables\nBeedrill to Mega\nEvolve in battle.");
|
||||
const u8 gMegaBraceletItemDescription[] = _("Allows Pokémon holding\na Mega Stone to Mega\nEvolve in battle.");
|
||||
const u8 gProtectPadsItemDescription[] = _("Protects the holder\nfrom effects caused\nby contact moves.");
|
||||
const u8 gProtectPadsItemDescription[] = _("Guards the holder\nfrom effects caused\nby contact moves.");
|
||||
const u8 gTerrainExtenderItemDescription[] = _("Extends the length\nof the active\nbattle terrain.");
|
||||
const u8 gElectricSeedItemDescription[] = _("Boosts Defense on\nElectric Terrain,\nbut only one time.");
|
||||
const u8 gGrassySeedItemDescription[] = _("Boosts Defense on\nGrassy Terrain,\nbut only one time.");
|
||||
const u8 gMistySeedItemDescription[] = _("Boosts Sp. Def. on\nMisty Terrain,\nbut only one time.");
|
||||
const u8 gPsychicSeedItemDescription[] = _("Boosts Sp. Def. on\nPsychic Terrain,\nbut only one time.");
|
||||
const u8 gAdrenalineOrbItemDescription[] = _("Boosts Speed if the\nuser is intimidated,\nbut only one time.");
|
||||
|