add z crystal and z ring

This commit is contained in:
Evan 2020-11-29 10:00:03 -05:00
parent 6f29abbe0e
commit 539a88207e
79 changed files with 1675 additions and 1 deletions

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
255 189 65
205 131 65
255 255 222
255 222 106
255 255 197
180 131 49
139 90 49
246 172 65
180 156 74
180 172 156
164 90 65
180 172 139
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
57 157 49
173 181 165
99 197 57
149 173 115
49 123 33
91 189 57
213 247 165
65 173 49
247 255 239
49 49 49
149 223 83
65 139 41
99 157 57
57 131 33
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
74 57 90
98 74 98
115 90 106
213 197 189
180 156 156
65 49 65
90 74 98
82 65 74
148 139 131
65 49 82
49 41 57
90 65 90
123 106 106
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
57 164 24
49 131 49
74 205 0
238 255 213
131 255 24
41 115 16
32 90 32
49 148 0
57 156 32
164 180 148
49 106 57
90 180 16
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
0 148 172
8 115 156
246 246 246
164 213 222
32 164 180
0 106 115
24 115 131
41 82 131
0 139 164
8 115 148
172 172 172
8 82 106
115 148 148
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
148 90 49
180 123 49
222 156 74
255 255 246
131 82 32
246 222 205
106 65 32
180 172 172
139 74 57
172 106 49
156 106 49
172 156 139
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
246 172 0
213 131 8
255 213 8
255 255 246
255 246 139
197 106 16
238 164 0
172 123 0
180 180 172
180 172 98
180 148 8
148 90 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
180 74 98
255 123 156
255 246 255
255 238 246
255 156 189
255 115 156
180 106 131
172 82 106
123 57 65
230 106 131
123 49 65
180 172 172
180 164 172
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
255 139 49
230 98 32
255 246 213
255 148 49
255 205 131
180 98 32
180 106 32
156 74 24
255 131 41
189 65 24
180 172 148
180 139 90
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
255 65 65
197 32 32
255 246 213
255 106 98
255 189 172
139 24 24
172 49 41
180 74 65
238 57 57
164 16 16
172 41 41
180 131 123
180 172 148
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
0 131 222
8 90 197
16 172 238
213 255 255
115 222 255
0 90 148
0 123 213
8 123 164
24 74 180
148 172 180
8 65 131
82 156 180
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
139 90 148
172 106 164
197 139 180
255 246 246
230 197 213
164 106 164
115 74 115
131 90 123
172 172 172
156 98 156
123 74 131
98 57 98
156 131 148
82 49 90

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
57 164 24
49 131 49
74 205 0
238 255 213
131 255 24
41 115 16
49 148 0
164 180 148
49 106 57
57 156 32
32 90 32
90 180 16
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
222 98 41
180 74 49
246 139 65
255 222 180
255 246 222
156 57 57
156 65 24
213 90 41
172 98 49
180 172 156
123 49 32
180 156 123
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
98 172 246
41 123 205
139 213 255
255 255 255
172 246 238
65 115 172
32 82 148
16 98 189
82 148 230
98 148 180
180 180 180
123 172 164
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
255 65 65
197 32 32
255 106 98
255 246 213
139 24 24
172 49 41
255 189 172
180 74 65
180 172 148
164 16 16
238 57 57
172 41 41
180 131 123
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
32 32 32
246 238 222
205 197 139
180 164 82
156 131 24
230 222 180
131 123 74
172 172 156
115 106 32
156 148 106
148 123 8
189 172 106
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
32 32 32
222 213 213
156 139 180
98 65 139
131 98 156
189 172 197
98 82 123
156 156 156
115 106 131
82 57 106
139 115 164
82 49 123
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
32 32 32
238 222 205
189 156 139
156 115 98
131 82 65
213 189 172
172 156 156
98 74 57
115 90 82
139 115 106
115 65 49
164 131 115
123 98 90
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
57 172 139
49 131 123
82 230 180
222 255 238
255 255 255
172 180 172
57 156 123
32 90 82
41 123 98
57 156 131
41 98 115
41 115 98
156 180 164
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
255 180 197
180 123 164
255 205 213
255 255 246
255 230 230
238 164 189
131 82 139
156 90 131
213 139 148
197 189 180
205 156 164
197 172 172
213 131 148
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
32 32 32
255 255 238
246 238 189
205 189 123
164 156 74
255 255 222
123 115 65
180 180 172
148 139 98
172 172 139
213 205 148
156 139 57
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
131 157 157
189 223 231
157 197 197
83 115 123
161 179 181
115 139 149
157 165 165
255 255 255
75 99 107
49 49 49
223 231 239
173 205 213
123 165 173
107 123 131
107 149 149

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
213 131 8
246 172 0
255 255 246
255 246 139
255 213 8
180 148 8
172 123 0
197 106 16
238 164 0
148 90 0
180 180 172
180 172 98
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
255 230 49
148 106 0
255 205 8
189 148 24
230 180 8
255 246 139
255 246 189
180 148 0
180 156 24
213 172 24
180 172 106
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
164 98 213
131 74 180
205 131 246
246 222 246
255 255 238
115 65 148
106 57 164
148 82 197
90 49 123
148 90 172
180 172 164
172 156 172
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
41 156 230
8 115 213
230 255 255
156 255 246
98 197 255
0 82 148
65 139 180
164 180 180
0 90 197
24 139 222
32 106 164
106 180 172
24 106 164
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
255 98 164
238 65 139
255 148 189
255 246 246
255 197 255
180 65 115
164 41 98
255 82 156
180 41 131
172 98 131
180 172 172
180 131 180
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
156 123 98
131 90 65
255 246 222
189 156 131
238 222 197
106 82 65
90 57 49
131 106 90
148 106 90
115 74 49
164 156 131
180 172 156
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
82 139 172
65 106 148
98 164 205
246 255 246
57 98 123
213 230 238
41 74 106
65 115 139
172 172 172
57 90 139
74 131 164
148 164 164
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
32 32 32
255 172 65
255 246 205
222 82 32
255 131 16
255 205 131
180 172 148
180 98 24
255 148 16
197 65 41
156 65 32
180 131 57
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
131 131 172
106 106 156
156 156 189
255 255 238
238 230 230
74 74 106
90 90 115
98 98 148
123 123 164
180 180 164
106 106 131
164 164 156
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
222 205 57
205 172 41
255 255 156
238 230 90
255 255 230
156 139 41
164 156 65
180 180 156
139 123 24
189 139 32
222 197 49
180 180 106
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
32 32 32
255 246 205
255 255 238
180 156 98
222 205 156
255 255 230
180 180 172
156 148 115
131 115 82
230 222 172
164 131 65
180 180 148
0 0 0
0 0 0
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
49 49 49
41 156 230
8 115 213
98 197 255
230 255 255
156 255 246
24 139 222
0 90 197
0 82 148
32 106 164
65 139 180
164 180 180
24 106 164
106 180 172
0 0 0

View File

@ -0,0 +1,19 @@
JASC-PAL
0100
16
200 191 231
90 74 90
131 131 139
139 172 189
49 49 49
222 255 255
197 222 213
139 156 180
255 255 255
238 246 246
106 98 106
0 0 0
0 0 0
0 0 0
0 0 0
0 0 0

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 216 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 205 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 209 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 221 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 219 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 250 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.7 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 215 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 218 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 212 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 9.0 KiB

View File

@ -135,6 +135,7 @@
#define HOLD_EFFECT_ADRENALINE_ORB 152
#define HOLD_EFFECT_MEMORY 153
#define HOLD_EFFECT_PLATE 154
#define HOLD_EFFECT_Z_CRYSTAL 155
#define HOLD_EFFECT_CHOICE(holdEffect)((holdEffect == HOLD_EFFECT_CHOICE_BAND || holdEffect == HOLD_EFFECT_CHOICE_SCARF || holdEffect == HOLD_EFFECT_CHOICE_SPECS))

View File

@ -656,7 +656,44 @@
#define ITEM_SHINY_CHARM 566
#define ITEM_OVAL_CHARM 567
#define ITEMS_COUNT 568
// Z Crystals
#define ITEM_Z_RING 568
#define ITEM_NORMALIUM_Z 569
#define ITEM_FIGHTINIUM_Z 570
#define ITEM_FLYINIUM_Z 571
#define ITEM_POISONIUM_Z 572
#define ITEM_GROUNDIUM_Z 573
#define ITEM_ROCKIUM_Z 574
#define ITEM_BUGINIUM_Z 575
#define ITEM_GHOSTIUM_Z 576
#define ITEM_STEELIUM_Z 577
#define ITEM_FIRIUM_Z 578
#define ITEM_WATERIUM_Z 579
#define ITEM_GRASSIUM_Z 580
#define ITEM_ELECTRIUM_Z 581
#define ITEM_PSYCHIUM_Z 582
#define ITEM_ICIUM_Z 583
#define ITEM_DRAGONIUM_Z 584
#define ITEM_DARKINIUM_Z 585
#define ITEM_FAIRIUM_Z 586
#define ITEM_ALORAICHIUM_Z 587
#define ITEM_DECIDIUM_Z 588
#define ITEM_EEVIUM_Z 589
#define ITEM_INCINIUM_Z 590
#define ITEM_KOMMONIUM_Z 591
#define ITEM_LUNALIUM_Z 592
#define ITEM_LYCANIUM_Z 593
#define ITEM_MARSHADIUM_Z 594
#define ITEM_MEWNIUM_Z 595
#define ITEM_MIMIKIUM_Z 596
#define ITEM_PIKANIUM_Z 597
#define ITEM_PIKASHUNIUM_Z 598
#define ITEM_PRIMARIUM_Z 599
#define ITEM_SNORLIUM_Z 600
#define ITEM_SOLGANIUM_Z 601
#define ITEM_TAPUNIUM_Z 602
#define ITEMS_COUNT 603
#define ITEM_FIELD_ARROW ITEMS_COUNT
#define FIRST_BERRY_INDEX ITEM_CHERI_BERRY

View File

@ -4402,6 +4402,77 @@ extern const u32 gItemIcon_WaterMemory[];
extern const u32 gItemIconPalette_WaterMemory[];
extern const u32 gItemIconPalette_BugTMHM[];
extern const u32 gItemIconPalette_FairyTMHM[];
//Z Crystals
extern const u32 gItemIcon_ZRing[];
extern const u32 gItemIconPalette_ZRing[];
extern const u32 gItemIcon_NormaliumZ[];
extern const u32 gItemIconPalette_NormaliumZ[];
extern const u32 gItemIcon_FightiniumZ[];
extern const u32 gItemIconPalette_FightiniumZ[];
extern const u32 gItemIcon_FlyiniumZ[];
extern const u32 gItemIconPalette_FlyiniumZ[];
extern const u32 gItemIcon_PoisoniumZ[];
extern const u32 gItemIconPalette_PoisoniumZ[];
extern const u32 gItemIcon_GroundiumZ[];
extern const u32 gItemIconPalette_GroundiumZ[];
extern const u32 gItemIcon_RockiumZ[];
extern const u32 gItemIconPalette_RockiumZ[];
extern const u32 gItemIcon_BuginiumZ[];
extern const u32 gItemIconPalette_BuginiumZ[];
extern const u32 gItemIcon_GhostiumZ[];
extern const u32 gItemIconPalette_GhostiumZ[];
extern const u32 gItemIcon_SteeliumZ[];
extern const u32 gItemIconPalette_SteeliumZ[];
extern const u32 gItemIcon_FiriumZ[];
extern const u32 gItemIconPalette_FiriumZ[];
extern const u32 gItemIcon_WateriumZ[];
extern const u32 gItemIconPalette_WateriumZ[];
extern const u32 gItemIcon_GrassiumZ[];
extern const u32 gItemIconPalette_GrassiumZ[];
extern const u32 gItemIcon_ElectriumZ[];
extern const u32 gItemIconPalette_ElectriumZ[];
extern const u32 gItemIcon_PsychiumZ[];
extern const u32 gItemIconPalette_PsychiumZ[];
extern const u32 gItemIcon_IciumZ[];
extern const u32 gItemIconPalette_IciumZ[];
extern const u32 gItemIcon_DragoniumZ[];
extern const u32 gItemIconPalette_DragoniumZ[];
extern const u32 gItemIcon_DarkiniumZ[];
extern const u32 gItemIconPalette_DarkiniumZ[];
extern const u32 gItemIcon_FairiumZ[];
extern const u32 gItemIconPalette_FairiumZ[];
extern const u32 gItemIcon_AloraichiumZ[];
extern const u32 gItemIconPalette_AloraichiumZ[];
extern const u32 gItemIcon_DecidiumZ[];
extern const u32 gItemIconPalette_DecidiumZ[];
extern const u32 gItemIcon_EeviumZ[];
extern const u32 gItemIconPalette_EeviumZ[];
extern const u32 gItemIcon_InciniumZ[];
extern const u32 gItemIconPalette_InciniumZ[];
extern const u32 gItemIcon_KommoniumZ[];
extern const u32 gItemIconPalette_KommoniumZ[];
extern const u32 gItemIcon_LunaliumZ[];
extern const u32 gItemIconPalette_LunaliumZ[];
extern const u32 gItemIcon_LycaniumZ[];
extern const u32 gItemIconPalette_LycaniumZ[];
extern const u32 gItemIcon_MarshadiumZ[];
extern const u32 gItemIconPalette_MarshadiumZ[];
extern const u32 gItemIcon_MewniumZ[];
extern const u32 gItemIconPalette_MewniumZ[];
extern const u32 gItemIcon_MimikiumZ[];
extern const u32 gItemIconPalette_MimikiumZ[];
extern const u32 gItemIcon_PikaniumZ[];
extern const u32 gItemIconPalette_PikaniumZ[];
extern const u32 gItemIcon_PikashuniumZ[];
extern const u32 gItemIconPalette_PikashuniumZ[];
extern const u32 gItemIcon_PrimariumZ[];
extern const u32 gItemIconPalette_PrimariumZ[];
extern const u32 gItemIcon_SnorliumZ[];
extern const u32 gItemIconPalette_SnorliumZ[];
extern const u32 gItemIcon_SolganiumZ[];
extern const u32 gItemIconPalette_SolganiumZ[];
extern const u32 gItemIcon_TapuniumZ[];
extern const u32 gItemIconPalette_TapuniumZ[];
extern const u32 gItemIcon_ReturnToFieldArrow[];
extern const u32 gItemIconPalette_ReturnToFieldArrow[];

View File

@ -1520,3 +1520,110 @@ const u32 gItemIconPalette_WaterMemory[] = INCBIN_U32("graphics/items/icon_palet
const u32 gItemIconPalette_BugTMHM[] = INCBIN_U32("graphics/items/icon_palettes/bug_tm_hm.gbapal.lz");
const u32 gItemIconPalette_FairyTMHM[] = INCBIN_U32("graphics/items/icon_palettes/fairy_tm_hm.gbapal.lz");
//// Z Crystals
const u32 gItemIcon_ZRing[] = INCBIN_U32("graphics/items/icons/z_ring.4bpp.lz");
const u32 gItemIconPalette_ZRing[] = INCBIN_U32("graphics/items/icon_palettes/z_ring.gbapal.lz");
const u32 gItemIcon_NormaliumZ[] = INCBIN_U32("graphics/items/icons/normalium_z.4bpp.lz");
const u32 gItemIconPalette_NormaliumZ[] = INCBIN_U32("graphics/items/icon_palettes/normalium_z.gbapal.lz");
const u32 gItemIcon_FightiniumZ[] = INCBIN_U32("graphics/items/icons/fightinium_z.4bpp.lz");
const u32 gItemIconPalette_FightiniumZ[] = INCBIN_U32("graphics/items/icon_palettes/fightinium_z.gbapal.lz");
const u32 gItemIcon_FlyiniumZ[] = INCBIN_U32("graphics/items/icons/flyinium_z.4bpp.lz");
const u32 gItemIconPalette_FlyiniumZ[] = INCBIN_U32("graphics/items/icon_palettes/flyinium_z.gbapal.lz");
const u32 gItemIcon_PoisoniumZ[] = INCBIN_U32("graphics/items/icons/poisonium_z.4bpp.lz");
const u32 gItemIconPalette_PoisoniumZ[] = INCBIN_U32("graphics/items/icon_palettes/poisonium_z.gbapal.lz");
const u32 gItemIcon_GroundiumZ[] = INCBIN_U32("graphics/items/icons/groundium_z.4bpp.lz");
const u32 gItemIconPalette_GroundiumZ[] = INCBIN_U32("graphics/items/icon_palettes/groundium_z.gbapal.lz");
const u32 gItemIcon_RockiumZ[] = INCBIN_U32("graphics/items/icons/rockium_z.4bpp.lz");
const u32 gItemIconPalette_RockiumZ[] = INCBIN_U32("graphics/items/icon_palettes/rockium_z.gbapal.lz");
const u32 gItemIcon_BuginiumZ[] = INCBIN_U32("graphics/items/icons/buginium_z.4bpp.lz");
const u32 gItemIconPalette_BuginiumZ[] = INCBIN_U32("graphics/items/icon_palettes/buginium_z.gbapal.lz");
const u32 gItemIcon_GhostiumZ[] = INCBIN_U32("graphics/items/icons/ghostium_z.4bpp.lz");
const u32 gItemIconPalette_GhostiumZ[] = INCBIN_U32("graphics/items/icon_palettes/ghostium_z.gbapal.lz");
const u32 gItemIcon_SteeliumZ[] = INCBIN_U32("graphics/items/icons/steelium_z.4bpp.lz");
const u32 gItemIconPalette_SteeliumZ[] = INCBIN_U32("graphics/items/icon_palettes/steelium_z.gbapal.lz");
const u32 gItemIcon_FiriumZ[] = INCBIN_U32("graphics/items/icons/firium_z.4bpp.lz");
const u32 gItemIconPalette_FiriumZ[] = INCBIN_U32("graphics/items/icon_palettes/firium_z.gbapal.lz");
const u32 gItemIcon_WateriumZ[] = INCBIN_U32("graphics/items/icons/waterium_z.4bpp.lz");
const u32 gItemIconPalette_WateriumZ[] = INCBIN_U32("graphics/items/icon_palettes/waterium_z.gbapal.lz");
const u32 gItemIcon_GrassiumZ[] = INCBIN_U32("graphics/items/icons/grassium_z.4bpp.lz");
const u32 gItemIconPalette_GrassiumZ[] = INCBIN_U32("graphics/items/icon_palettes/grassium_z.gbapal.lz");
const u32 gItemIcon_ElectriumZ[] = INCBIN_U32("graphics/items/icons/electrium_z.4bpp.lz");
const u32 gItemIconPalette_ElectriumZ[] = INCBIN_U32("graphics/items/icon_palettes/electrium_z.gbapal.lz");
const u32 gItemIcon_PsychiumZ[] = INCBIN_U32("graphics/items/icons/psychium_z.4bpp.lz");
const u32 gItemIconPalette_PsychiumZ[] = INCBIN_U32("graphics/items/icon_palettes/psychium_z.gbapal.lz");
const u32 gItemIcon_IciumZ[] = INCBIN_U32("graphics/items/icons/icium_z.4bpp.lz");
const u32 gItemIconPalette_IciumZ[] = INCBIN_U32("graphics/items/icon_palettes/icium_z.gbapal.lz");
const u32 gItemIcon_DragoniumZ[] = INCBIN_U32("graphics/items/icons/dragonium_z.4bpp.lz");
const u32 gItemIconPalette_DragoniumZ[] = INCBIN_U32("graphics/items/icon_palettes/dragonium_z.gbapal.lz");
const u32 gItemIcon_DarkiniumZ[] = INCBIN_U32("graphics/items/icons/darkinium_z.4bpp.lz");
const u32 gItemIconPalette_DarkiniumZ[] = INCBIN_U32("graphics/items/icon_palettes/darkinium_z.gbapal.lz");
const u32 gItemIcon_FairiumZ[] = INCBIN_U32("graphics/items/icons/fairium_z.4bpp.lz");
const u32 gItemIconPalette_FairiumZ[] = INCBIN_U32("graphics/items/icon_palettes/fairium_z.gbapal.lz");
const u32 gItemIcon_AloraichiumZ[] = INCBIN_U32("graphics/items/icons/aloraichium_z.4bpp.lz");
const u32 gItemIconPalette_AloraichiumZ[] = INCBIN_U32("graphics/items/icon_palettes/aloraichium_z.gbapal.lz");
const u32 gItemIcon_DecidiumZ[] = INCBIN_U32("graphics/items/icons/decidium_z.4bpp.lz");
const u32 gItemIconPalette_DecidiumZ[] = INCBIN_U32("graphics/items/icon_palettes/decidium_z.gbapal.lz");
const u32 gItemIcon_EeviumZ[] = INCBIN_U32("graphics/items/icons/eevium_z.4bpp.lz");
const u32 gItemIconPalette_EeviumZ[] = INCBIN_U32("graphics/items/icon_palettes/eevium_z.gbapal.lz");
const u32 gItemIcon_InciniumZ[] = INCBIN_U32("graphics/items/icons/incinium_z.4bpp.lz");
const u32 gItemIconPalette_InciniumZ[] = INCBIN_U32("graphics/items/icon_palettes/incinium_z.gbapal.lz");
const u32 gItemIcon_KommoniumZ[] = INCBIN_U32("graphics/items/icons/kommonium_z.4bpp.lz");
const u32 gItemIconPalette_KommoniumZ[] = INCBIN_U32("graphics/items/icon_palettes/kommonium_z.gbapal.lz");
const u32 gItemIcon_LunaliumZ[] = INCBIN_U32("graphics/items/icons/lunalium_z.4bpp.lz");
const u32 gItemIconPalette_LunaliumZ[] = INCBIN_U32("graphics/items/icon_palettes/lunalium_z.gbapal.lz");
const u32 gItemIcon_LycaniumZ[] = INCBIN_U32("graphics/items/icons/lycanium_z.4bpp.lz");
const u32 gItemIconPalette_LycaniumZ[] = INCBIN_U32("graphics/items/icon_palettes/lycanium_z.gbapal.lz");
const u32 gItemIcon_MarshadiumZ[] = INCBIN_U32("graphics/items/icons/marshadium_z.4bpp.lz");
const u32 gItemIconPalette_MarshadiumZ[] = INCBIN_U32("graphics/items/icon_palettes/marshadium_z.gbapal.lz");
const u32 gItemIcon_MewniumZ[] = INCBIN_U32("graphics/items/icons/mewnium_z.4bpp.lz");
const u32 gItemIconPalette_MewniumZ[] = INCBIN_U32("graphics/items/icon_palettes/mewnium_z.gbapal.lz");
const u32 gItemIcon_MimikiumZ[] = INCBIN_U32("graphics/items/icons/mimikium_z.4bpp.lz");
const u32 gItemIconPalette_MimikiumZ[] = INCBIN_U32("graphics/items/icon_palettes/mimikium_z.gbapal.lz");
const u32 gItemIcon_PikaniumZ[] = INCBIN_U32("graphics/items/icons/pikanium_z.4bpp.lz");
const u32 gItemIconPalette_PikaniumZ[] = INCBIN_U32("graphics/items/icon_palettes/pikanium_z.gbapal.lz");
const u32 gItemIcon_PikashuniumZ[] = INCBIN_U32("graphics/items/icons/pikashunium_z.4bpp.lz");
const u32 gItemIconPalette_PikashuniumZ[] = INCBIN_U32("graphics/items/icon_palettes/pikashunium_z.gbapal.lz");
const u32 gItemIcon_PrimariumZ[] = INCBIN_U32("graphics/items/icons/primarium_z.4bpp.lz");
const u32 gItemIconPalette_PrimariumZ[] = INCBIN_U32("graphics/items/icon_palettes/primarium_z.gbapal.lz");
const u32 gItemIcon_SnorliumZ[] = INCBIN_U32("graphics/items/icons/snorlium_z.4bpp.lz");
const u32 gItemIconPalette_SnorliumZ[] = INCBIN_U32("graphics/items/icon_palettes/snorlium_z.gbapal.lz");
const u32 gItemIcon_SolganiumZ[] = INCBIN_U32("graphics/items/icons/solganium_z.4bpp.lz");
const u32 gItemIconPalette_SolganiumZ[] = INCBIN_U32("graphics/items/icon_palettes/solganium_z.gbapal.lz");
const u32 gItemIcon_TapuniumZ[] = INCBIN_U32("graphics/items/icons/tapunium_z.4bpp.lz");
const u32 gItemIconPalette_TapuniumZ[] = INCBIN_U32("graphics/items/icon_palettes/tapunium_z.gbapal.lz");

View File

@ -590,4 +590,40 @@ const u32 *const gItemIconTable[][2] =
[ITEM_ROCK_MEMORY] = {gItemIcon_RockMemory, gItemIconPalette_RockMemory},
[ITEM_STEEL_MEMORY] = {gItemIcon_SteelMemory, gItemIconPalette_SteelMemory},
[ITEM_WATER_MEMORY] = {gItemIcon_WaterMemory, gItemIconPalette_WaterMemory},
// Z crystals
[ITEM_Z_RING] = {gItemIcon_ZRing, gItemIconPalette_ZRing},
[ITEM_NORMALIUM_Z] = {gItemIcon_NormaliumZ, gItemIconPalette_NormaliumZ},
[ITEM_FIGHTINIUM_Z] = {gItemIcon_FightiniumZ, gItemIconPalette_FightiniumZ},
[ITEM_FLYINIUM_Z] = {gItemIcon_FlyiniumZ, gItemIconPalette_FlyiniumZ},
[ITEM_POISONIUM_Z] = {gItemIcon_PoisoniumZ, gItemIconPalette_PoisoniumZ},
[ITEM_GROUNDIUM_Z] = {gItemIcon_GroundiumZ, gItemIconPalette_GroundiumZ},
[ITEM_ROCKIUM_Z] = {gItemIcon_RockiumZ, gItemIconPalette_RockiumZ},
[ITEM_BUGINIUM_Z] = {gItemIcon_BuginiumZ, gItemIconPalette_BuginiumZ},
[ITEM_GHOSTIUM_Z] = {gItemIcon_GhostiumZ, gItemIconPalette_GhostiumZ},
[ITEM_STEELIUM_Z] = {gItemIcon_SteeliumZ, gItemIconPalette_SteeliumZ},
[ITEM_FIRIUM_Z] = {gItemIcon_FiriumZ, gItemIconPalette_FiriumZ},
[ITEM_WATERIUM_Z] = {gItemIcon_WateriumZ, gItemIconPalette_WateriumZ},
[ITEM_GRASSIUM_Z] = {gItemIcon_GrassiumZ, gItemIconPalette_GrassiumZ},
[ITEM_ELECTRIUM_Z] = {gItemIcon_ElectriumZ, gItemIconPalette_ElectriumZ},
[ITEM_PSYCHIUM_Z] = {gItemIcon_PsychiumZ, gItemIconPalette_PsychiumZ},
[ITEM_ICIUM_Z] = {gItemIcon_IciumZ, gItemIconPalette_IciumZ},
[ITEM_DRAGONIUM_Z] = {gItemIcon_DragoniumZ, gItemIconPalette_DragoniumZ},
[ITEM_DARKINIUM_Z] = {gItemIcon_DarkiniumZ, gItemIconPalette_DarkiniumZ},
[ITEM_FAIRIUM_Z] = {gItemIcon_FairiumZ, gItemIconPalette_FairiumZ},
[ITEM_ALORAICHIUM_Z] = {gItemIcon_AloraichiumZ, gItemIconPalette_AloraichiumZ},
[ITEM_DECIDIUM_Z] = {gItemIcon_DecidiumZ, gItemIconPalette_DecidiumZ},
[ITEM_EEVIUM_Z] = {gItemIcon_EeviumZ, gItemIconPalette_EeviumZ},
[ITEM_INCINIUM_Z] = {gItemIcon_InciniumZ, gItemIconPalette_InciniumZ},
[ITEM_KOMMONIUM_Z] = {gItemIcon_KommoniumZ, gItemIconPalette_KommoniumZ},
[ITEM_LUNALIUM_Z] = {gItemIcon_LunaliumZ, gItemIconPalette_LunaliumZ},
[ITEM_LYCANIUM_Z] = {gItemIcon_LycaniumZ, gItemIconPalette_LycaniumZ},
[ITEM_MARSHADIUM_Z] = {gItemIcon_MarshadiumZ, gItemIconPalette_MarshadiumZ},
[ITEM_MEWNIUM_Z] = {gItemIcon_MewniumZ, gItemIconPalette_MewniumZ},
[ITEM_MIMIKIUM_Z] = {gItemIcon_MimikiumZ, gItemIconPalette_MimikiumZ},
[ITEM_PIKANIUM_Z] = {gItemIcon_PikaniumZ, gItemIconPalette_PikaniumZ},
[ITEM_PIKASHUNIUM_Z] = {gItemIcon_PikashuniumZ, gItemIconPalette_PikashuniumZ},
[ITEM_PRIMARIUM_Z] = {gItemIcon_PrimariumZ, gItemIconPalette_PrimariumZ},
[ITEM_SNORLIUM_Z] = {gItemIcon_SnorliumZ, gItemIconPalette_SnorliumZ},
[ITEM_SOLGANIUM_Z] = {gItemIcon_SolganiumZ, gItemIconPalette_SolganiumZ},
[ITEM_TAPUNIUM_Z] = {gItemIcon_TapuniumZ, gItemIconPalette_TapuniumZ},
};

View File

@ -7588,4 +7588,567 @@ const struct Item gItems[] =
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.secondaryId = 0,
},
[ITEM_Z_RING] =
{
.name = _("Z-Ring"),
.itemId = ITEM_Z_RING,
.price = 0,
.holdEffect = HOLD_EFFECT_NONE,
.holdEffectParam = 0,
.description = sZRingDesc,
.importance = 1,
.pocket = POCKET_KEY_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 0
},
[ITEM_NORMALIUM_Z] =
{
.name = _("Normalium Z"),
.itemId = ITEM_NORMALIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sNormaliumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_NORMAL
},
[ITEM_FIGHTINIUM_Z] =
{
.name = _("Fightinium Z"),
.itemId = ITEM_FIGHTINIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sFightiniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_FIGHTING
},
[ITEM_FLYINIUM_Z] =
{
.name = _("Flyinium Z"),
.itemId = ITEM_FLYINIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sFlyiniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_FLYING
},
[ITEM_POISONIUM_Z] =
{
.name = _("Poisinium Z"),
.itemId = ITEM_POISONIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sPoisoniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_POISON
},
[ITEM_GROUNDIUM_Z] =
{
.name = _("Groundium Z"),
.itemId = ITEM_GROUNDIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sGroundiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_GROUND
},
[ITEM_ROCKIUM_Z] =
{
.name = _("Rockium Z"),
.itemId = ITEM_ROCKIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sRockiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_ROCK
},
[ITEM_BUGINIUM_Z] =
{
.name = _("Buginium Z"),
.itemId = ITEM_BUGINIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sBuginiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_BUG
},
[ITEM_GHOSTIUM_Z] =
{
.name = _("Ghostium Z"),
.itemId = ITEM_GHOSTIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sGhostiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_GHOST
},
[ITEM_STEELIUM_Z] =
{
.name = _("Steelium Z"),
.itemId = ITEM_STEELIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sSteeliumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_STEEL
},
[ITEM_FIRIUM_Z] =
{
.name = _("Firium Z"),
.itemId = ITEM_FIRIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sFiriumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_FIRE
},
[ITEM_WATERIUM_Z] =
{
.name = _("Waterium Z"),
.itemId = ITEM_WATERIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sWateriumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_WATER
},
[ITEM_GRASSIUM_Z] =
{
.name = _("Grassium Z"),
.itemId = ITEM_GRASSIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sGrassiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_GRASS
},
[ITEM_ELECTRIUM_Z] =
{
.name = _("Electrium Z"),
.itemId = ITEM_ELECTRIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sElectriumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_ELECTRIC
},
[ITEM_PSYCHIUM_Z] =
{
.name = _("Psychium Z"),
.itemId = ITEM_PSYCHIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sPsychiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_PSYCHIC
},
[ITEM_ICIUM_Z] =
{
.name = _("Icium Z"),
.itemId = ITEM_ICIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sIciumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_ICE
},
[ITEM_DRAGONIUM_Z] =
{
.name = _("Dragonium Z"),
.itemId = ITEM_DRAGONIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sDragoniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_DRAGON
},
[ITEM_DARKINIUM_Z] =
{
.name = _("Darkinium Z"),
.itemId = ITEM_DARKINIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sDarkiniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_DARK
},
[ITEM_FAIRIUM_Z] =
{
.name = _("Fairium Z"),
.itemId = ITEM_FAIRIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sFairiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = TYPE_FAIRY
},
[ITEM_ALORAICHIUM_Z] =
{
.name = _("Aloraichium Z"),
.itemId = ITEM_ALORAICHIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sAloraichiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_DECIDIUM_Z] =
{
.name = _("Decidium Z"),
.itemId = ITEM_DECIDIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sDecidiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_EEVIUM_Z] =
{
.name = _("Eevium Z"),
.itemId = ITEM_EEVIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sEeviumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_INCINIUM_Z] =
{
.name = _("Incinium Z"),
.itemId = ITEM_INCINIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sInciniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_KOMMONIUM_Z] =
{
.name = _("Kommonium Z"),
.itemId = ITEM_KOMMONIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sKommoniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_LUNALIUM_Z] =
{
.name = _("Lunalium Z"),
.itemId = ITEM_LUNALIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sLunaliumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_LYCANIUM_Z] =
{
.name = _("Lycanium Z"),
.itemId = ITEM_LYCANIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sLycaniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_MARSHADIUM_Z] =
{
.name = _("Marshadium Z"),
.itemId = ITEM_MARSHADIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sMarshadiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_MEWNIUM_Z] =
{
.name = _("Mewnium Z"),
.itemId = ITEM_MEWNIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sMewniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_MIMIKIUM_Z] =
{
.name = _("Mimikium Z"),
.itemId = ITEM_MIMIKIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sMimikiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_PIKANIUM_Z] =
{
.name = _("Pikanium Z"),
.itemId = ITEM_PIKANIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sPikaniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_PIKASHUNIUM_Z] =
{
.name = _("Pikashunium Z"),
.itemId = ITEM_PIKASHUNIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sPikashuniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_PRIMARIUM_Z] =
{
.name = _("Primarium Z"),
.itemId = ITEM_PRIMARIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sPrimariumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_SNORLIUM_Z] =
{
.name = _("Snorlium Z"),
.itemId = ITEM_SNORLIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sSnorliumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_SOLGANIUM_Z] =
{
.name = _("Solganium Z"),
.itemId = ITEM_SOLGANIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sSolganiumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 // signature z move
},
[ITEM_TAPUNIUM_Z] =
{
.name = _("Tapunium Z"),
.itemId = ITEM_TAPUNIUM_Z,
.price = 0,
.holdEffect = HOLD_EFFECT_Z_CRYSTAL,
.holdEffectParam = 0,
.description = sTapuniumZDesc,
.importance = 0,
.pocket = POCKET_ITEMS,
.type = 4,
.fieldUseFunc = ItemUseOutOfBattle_CannotUse,
.battleUsage = 0,
.battleUseFunc = NULL,
.secondaryId = 255 //signature z move
},
};

View File

@ -2829,3 +2829,178 @@ static const u8 sOvalCharmDesc[] = _(
"of finding eggs\n"
"at the daycare.");
static const u8 sZRingDesc[] = _(
"A strange ring\n"
"that enables"
"Z-Move usage.");
static const u8 sNormaliumZDesc[] = _(
"Upgrade Normal-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sFightiniumZDesc[] = _(
"Upgrade Fighting-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sFlyiniumZDesc[] = _(
"Upgrade Flying-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sPoisoniumZDesc[] = _(
"Upgrade Poison-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sGroundiumZDesc[] = _(
"Upgrade Ground-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sRockiumZDesc[] = _(
"Upgrade Rock-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sBuginiumZDesc[] = _(
"Upgrade Bug-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sGhostiumZDesc[] = _(
"Upgrade Ghost-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sSteeliumZDesc[] = _(
"Upgrade Steel-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sFiriumZDesc[] = _(
"Upgrade Fire-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sWateriumZDesc[] = _(
"Upgrade Water-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sGrassiumZDesc[] = _(
"Upgrade Grass-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sElectriumZDesc[] = _(
"Upgrade Electric-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sPsychiumZDesc[] = _(
"Upgrade Psychic-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sIciumZDesc[] = _(
"Upgrade Ice-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sDragoniumZDesc[] = _(
"Upgrade Dragon-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sDarkiniumZDesc[] = _(
"Upgrade Dark-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sFairiumZDesc[] = _(
"Upgrade Fairy-\n"
"type moves into\n"
"Z-Moves.");
static const u8 sAloraichiumZDesc[] = _(
"Upgrade Alolan\n"
"Raichu's Thunderbolt\n"
"into a Z-Move.");
static const u8 sDecidiumZDesc[] = _(
"Upgrade Decidueye's\n"
"Spirit Shackle\n"
"into a Z-Move.");
static const u8 sEeviumZDesc[] = _(
"Upgrade Eevee's\n"
"Last Resort\n"
"into a Z-Move.");
static const u8 sInciniumZDesc[] = _(
"Upgrade Incineroar's\n"
"Darkest Lariat\n"
"into a Z-Move.");
static const u8 sKommoniumZDesc[] = _(
"Upgrade Kommo-o's\n"
"Clanging Scales\n"
"into a Z-Move.");
static const u8 sLunaliumZDesc[] = _(
"Upgrade Lunala's\n"
"Moongeist Beam\n"
"into a Z-Move.");
static const u8 sLycaniumZDesc[] = _(
"Upgrade Lycanroc's\n"
"Stone Edge\n"
"into a Z-Move.");
static const u8 sMarshadiumZDesc[] = _(
"Upgrade Marshadow's\n"
"Spectral Thief\n"
"into a Z-Move.");
static const u8 sMewniumZDesc[] = _(
"Upgrade Mew's\n"
"Psychic into\n"
"a Z-Move.");
static const u8 sMimikiumZDesc[] = _(
"Upgrade Mimikyu's\n"
"Play Rough\n"
"into a Z-Move.");
static const u8 sPikaniumZDesc[] = _(
"Upgrade Pikachu's\n"
"Volt Tackle\n"
"into a Z-Move.");
static const u8 sPikashuniumZDesc[] = _(
"Upgrade Pikachu w/\n"
"a cap's Thunderbolt\n"
"into a Z-Move.");
static const u8 sPrimariumZDesc[] = _(
"Upgrade Primarina's\n"
"Sparkling Aria\n"
"into a Z-Move.");
static const u8 sSnorliumZDesc[] = _(
"Upgrade Snorlax's\n"
"Giga Impact\n"
"into a Z-Move.");
static const u8 sSolganiumZDesc[] = _(
"Upgrade Solgaleo's\n"
"Sunsteel Strike\n"
"into a Z-Move.");
static const u8 sTapuniumZDesc[] = _(
"Upgrade the Tapu's\n"
"Nature's Madness\n"
"into a Z-Move.");