Added item_expansion pokeball sprites.
This commit is contained in:
W1serV1ser committed
1 parent
8ee84b5843
commit
c87ce46e9c
35 files changed
+540
-5
No files matched your search
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
95 15 1
|
||||
69 65 59
|
||||
193 55 31
|
||||
249 249 249
|
||||
225 87 63
|
||||
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
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
219 133 171
|
||||
247 41 129
|
||||
1 1 1
|
||||
107 83 141
|
||||
55 37 79
|
||||
193 185 209
|
||||
249 103 165
|
||||
249 249 249
|
||||
139 115 173
|
||||
95 31 61
|
||||
233 183 205
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
63 163 63
|
||||
45 115 45
|
||||
185 33 1
|
||||
47 47 47
|
||||
69 65 59
|
||||
105 97 87
|
||||
217 73 1
|
||||
249 249 249
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
241 149 79
|
||||
157 157 189
|
||||
91 69 1
|
||||
249 249 249
|
||||
213 171 43
|
||||
1 1 1
|
||||
75 75 123
|
||||
101 43 1
|
||||
235 113 21
|
||||
205 205 223
|
||||
223 191 97
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
107 149 43
|
||||
157 157 189
|
||||
45 75 1
|
||||
249 249 249
|
||||
75 75 123
|
||||
141 199 57
|
||||
1 1 1
|
||||
195 79 61
|
||||
209 123 109
|
||||
247 223 17
|
||||
205 205 223
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
129 47 107
|
||||
253 237 225
|
||||
87 135 201
|
||||
249 199 167
|
||||
245 41 189
|
||||
249 249 249
|
||||
249 103 209
|
||||
193 185 209
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
95 133 225
|
||||
27 53 115
|
||||
1 1 1
|
||||
69 65 59
|
||||
205 205 223
|
||||
39 93 217
|
||||
249 249 249
|
||||
47 47 47
|
||||
157 157 189
|
||||
105 97 87
|
||||
75 75 123
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
233 131 119
|
||||
69 65 59
|
||||
1 1 1
|
||||
105 97 87
|
||||
205 205 223
|
||||
157 157 189
|
||||
215 119 41
|
||||
249 249 249
|
||||
47 47 47
|
||||
225 79 63
|
||||
75 75 123
|
||||
225 153 95
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
157 157 189
|
||||
1 1 1
|
||||
75 75 123
|
||||
205 205 223
|
||||
255 191 229
|
||||
159 65 129
|
||||
249 249 249
|
||||
93 1 63
|
||||
255 129 201
|
||||
191 97 161
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
43 153 213
|
||||
75 75 123
|
||||
205 205 223
|
||||
207 49 69
|
||||
1 1 1
|
||||
219 101 115
|
||||
249 249 249
|
||||
1 53 81
|
||||
33 115 159
|
||||
157 157 189
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
245 193 11
|
||||
21 181 235
|
||||
93 71 1
|
||||
249 249 249
|
||||
157 157 189
|
||||
1 85 111
|
||||
101 119 155
|
||||
1 1 1
|
||||
41 51 71
|
||||
205 205 223
|
||||
249 209 71
|
||||
75 75 123
|
||||
81 201 239
|
||||
75 89 117
|
||||
255 255 255
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
235 193 21
|
||||
97 77 3
|
||||
75 75 123
|
||||
205 205 223
|
||||
249 249 249
|
||||
249 137 49
|
||||
241 209 79
|
||||
41 105 201
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
191 191 1
|
||||
41 141 215
|
||||
1 1 1
|
||||
157 157 189
|
||||
35 75 107
|
||||
255 255 1
|
||||
95 169 225
|
||||
249 249 249
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
@@ -0,0 +1,19 @@
|
||||
JASC-PAL
|
||||
0100
|
||||
16
|
||||
115 197 165
|
||||
213 171 43
|
||||
157 157 189
|
||||
193 63 31
|
||||
249 249 249
|
||||
1 1 1
|
||||
75 75 123
|
||||
83 21 7
|
||||
223 191 97
|
||||
205 205 223
|
||||
225 95 63
|
||||
255 255 255
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
0 0 0
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 203 B |
Binary file not shown.
|
After Width: | Height: | Size: 210 B |
Binary file not shown.
|
After Width: | Height: | Size: 204 B |
Binary file not shown.
|
After Width: | Height: | Size: 212 B |
Binary file not shown.
|
After Width: | Height: | Size: 210 B |
Binary file not shown.
|
After Width: | Height: | Size: 204 B |
Binary file not shown.
|
After Width: | Height: | Size: 211 B |
Binary file not shown.
|
After Width: | Height: | Size: 211 B |
Binary file not shown.
|
After Width: | Height: | Size: 211 B |
Binary file not shown.
|
After Width: | Height: | Size: 211 B |
Binary file not shown.
|
After Width: | Height: | Size: 212 B |
Binary file not shown.
|
After Width: | Height: | Size: 210 B |
Binary file not shown.
|
After Width: | Height: | Size: 204 B |
Binary file not shown.
|
After Width: | Height: | Size: 211 B |
@@ -505,7 +505,20 @@
|
||||
#define OBJ_EVENT_GFX_TIMER_BALL 498
|
||||
#define OBJ_EVENT_GFX_LUXURY_BALL 499
|
||||
#define OBJ_EVENT_GFX_PREMIER_BALL 500
|
||||
#define OBJ_EVENT_GFX_EXPANDING_SPARKLE 501
|
||||
#define OBJ_EVENT_GFX_HEAL_BALL 501
|
||||
#define OBJ_EVENT_GFX_DUSK_BALL 502
|
||||
#define OBJ_EVENT_GFX_QUICK_BALL 503
|
||||
#define OBJ_EVENT_GFX_LEVEL_BALL 504
|
||||
#define OBJ_EVENT_GFX_LURE_BALL 505
|
||||
#define OBJ_EVENT_GFX_MOON_BALL 506
|
||||
#define OBJ_EVENT_GFX_FRIEND_BALL 507
|
||||
#define OBJ_EVENT_GFX_LOVE_BALL 508
|
||||
#define OBJ_EVENT_GFX_FAST_BALL 509
|
||||
#define OBJ_EVENT_GFX_HEAVY_BALL 510
|
||||
#define OBJ_EVENT_GFX_DREAM_BALL 511
|
||||
#define OBJ_EVENT_GFX_SPORT_BALL 512
|
||||
#define OBJ_EVENT_GFX_PARK_BALL 513
|
||||
#define OBJ_EVENT_GFX_CHERISH_BALL 514
|
||||
|
||||
// Jump in numbers due to SPECIES_OLD_UNOWN constants
|
||||
#define OBJ_EVENT_GFX_TREECKO 515
|
||||
@@ -644,7 +657,7 @@
|
||||
#define OBJ_EVENT_GFX_DEOXYS_NORMAL 648
|
||||
#define OBJ_EVENT_GFX_CHIMECHO 649
|
||||
|
||||
#define NUM_OBJ_EVENT_GFX 650
|
||||
#define OBJ_EVENT_GFX_EXPANDING_SPARKLE 650
|
||||
|
||||
#else
|
||||
// There are no OLD_UNOWN constants in the pokemon_expansion
|
||||
@@ -796,12 +809,26 @@
|
||||
#define OBJ_EVENT_GFX_TIMER_BALL 633
|
||||
#define OBJ_EVENT_GFX_LUXURY_BALL 634
|
||||
#define OBJ_EVENT_GFX_PREMIER_BALL 635
|
||||
#define OBJ_EVENT_GFX_EXPANDING_SPARKLE 636
|
||||
|
||||
#define NUM_OBJ_EVENT_GFX 637
|
||||
#define OBJ_EVENT_GFX_HEAL_BALL 636
|
||||
#define OBJ_EVENT_GFX_DUSK_BALL 637
|
||||
#define OBJ_EVENT_GFX_QUICK_BALL 638
|
||||
#define OBJ_EVENT_GFX_LEVEL_BALL 639
|
||||
#define OBJ_EVENT_GFX_LURE_BALL 640
|
||||
#define OBJ_EVENT_GFX_MOON_BALL 641
|
||||
#define OBJ_EVENT_GFX_FRIEND_BALL 642
|
||||
#define OBJ_EVENT_GFX_LOVE_BALL 643
|
||||
#define OBJ_EVENT_GFX_FAST_BALL 644
|
||||
#define OBJ_EVENT_GFX_HEAVY_BALL 645
|
||||
#define OBJ_EVENT_GFX_DREAM_BALL 646
|
||||
#define OBJ_EVENT_GFX_SPORT_BALL 647
|
||||
#define OBJ_EVENT_GFX_PARK_BALL 648
|
||||
#define OBJ_EVENT_GFX_CHERISH_BALL 649
|
||||
#define OBJ_EVENT_GFX_EXPANDING_SPARKLE 650
|
||||
|
||||
#endif
|
||||
|
||||
#define NUM_OBJ_EVENT_GFX 651
|
||||
|
||||
// These are dynamic object gfx ids.
|
||||
// They correspond with the values of the VAR_OBJ_GFX_ID_X vars.
|
||||
// More info about them in include/constants/vars.h
|
||||
|
||||
@@ -147,6 +147,34 @@ const u32 gObjectEventPic_LuxuryBall[] = INCBIN_U32("graphics/object_events/pics
|
||||
const u16 gObjectEventPal_LuxuryBall[] = INCBIN_U16("graphics/object_events/palettes/luxury_ball.gbapal");
|
||||
const u32 gObjectEventPic_PremierBall[] = INCBIN_U32("graphics/object_events/pics/misc/premier_ball.4bpp");
|
||||
const u16 gObjectEventPal_PremierBall[] = INCBIN_U16("graphics/object_events/palettes/premier_ball.gbapal");
|
||||
const u32 gObjectEventPic_HealBall[] = INCBIN_U32("graphics/object_events/pics/misc/heal_ball.4bpp");
|
||||
const u16 gObjectEventPal_HealBall[] = INCBIN_U16("graphics/object_events/palettes/heal_ball.gbapal");
|
||||
const u32 gObjectEventPic_DuskBall[] = INCBIN_U32("graphics/object_events/pics/misc/dusk_ball.4bpp");
|
||||
const u16 gObjectEventPal_DuskBall[] = INCBIN_U16("graphics/object_events/palettes/dusk_ball.gbapal");
|
||||
const u32 gObjectEventPic_QuickBall[] = INCBIN_U32("graphics/object_events/pics/misc/quick_ball.4bpp");
|
||||
const u16 gObjectEventPal_QuickBall[] = INCBIN_U16("graphics/object_events/palettes/quick_ball.gbapal");
|
||||
const u32 gObjectEventPic_LevelBall[] = INCBIN_U32("graphics/object_events/pics/misc/level_ball.4bpp");
|
||||
const u16 gObjectEventPal_LevelBall[] = INCBIN_U16("graphics/object_events/palettes/level_ball.gbapal");
|
||||
const u32 gObjectEventPic_LureBall[] = INCBIN_U32("graphics/object_events/pics/misc/lure_ball.4bpp");
|
||||
const u16 gObjectEventPal_LureBall[] = INCBIN_U16("graphics/object_events/palettes/lure_ball.gbapal");
|
||||
const u32 gObjectEventPic_MoonBall[] = INCBIN_U32("graphics/object_events/pics/misc/moon_ball.4bpp");
|
||||
const u16 gObjectEventPal_MoonBall[] = INCBIN_U16("graphics/object_events/palettes/moon_ball.gbapal");
|
||||
const u32 gObjectEventPic_FriendBall[] = INCBIN_U32("graphics/object_events/pics/misc/friend_ball.4bpp");
|
||||
const u16 gObjectEventPal_FriendBall[] = INCBIN_U16("graphics/object_events/palettes/friend_ball.gbapal");
|
||||
const u32 gObjectEventPic_LoveBall[] = INCBIN_U32("graphics/object_events/pics/misc/love_ball.4bpp");
|
||||
const u16 gObjectEventPal_LoveBall[] = INCBIN_U16("graphics/object_events/palettes/love_ball.gbapal");
|
||||
const u32 gObjectEventPic_FastBall[] = INCBIN_U32("graphics/object_events/pics/misc/fast_ball.4bpp");
|
||||
const u16 gObjectEventPal_FastBall[] = INCBIN_U16("graphics/object_events/palettes/fast_ball.gbapal");
|
||||
const u32 gObjectEventPic_HeavyBall[] = INCBIN_U32("graphics/object_events/pics/misc/heavy_ball.4bpp");
|
||||
const u16 gObjectEventPal_HeavyBall[] = INCBIN_U16("graphics/object_events/palettes/heavy_ball.gbapal");
|
||||
const u32 gObjectEventPic_DreamBall[] = INCBIN_U32("graphics/object_events/pics/misc/dream_ball.4bpp");
|
||||
const u16 gObjectEventPal_DreamBall[] = INCBIN_U16("graphics/object_events/palettes/dream_ball.gbapal");
|
||||
const u32 gObjectEventPic_SportBall[] = INCBIN_U32("graphics/object_events/pics/misc/sport_ball.4bpp");
|
||||
const u16 gObjectEventPal_SportBall[] = INCBIN_U16("graphics/object_events/palettes/sport_ball.gbapal");
|
||||
const u32 gObjectEventPic_ParkBall[] = INCBIN_U32("graphics/object_events/pics/misc/park_ball.4bpp");
|
||||
const u16 gObjectEventPal_ParkBall[] = INCBIN_U16("graphics/object_events/palettes/park_ball.gbapal");
|
||||
const u32 gObjectEventPic_CherishBall[] = INCBIN_U32("graphics/object_events/pics/misc/cherish_ball.4bpp");
|
||||
const u16 gObjectEventPal_CherishBall[] = INCBIN_U16("graphics/object_events/palettes/cherish_ball.gbapal");
|
||||
const u32 gObjectEventPic_ProfBirch[] = INCBIN_U32("graphics/object_events/pics/people/prof_birch.4bpp");
|
||||
const u32 gObjectEventPic_ReporterM[] = INCBIN_U32("graphics/object_events/pics/people/reporter_m.4bpp");
|
||||
const u32 gObjectEventPic_ReporterF[] = INCBIN_U32("graphics/object_events/pics/people/reporter_f.4bpp");
|
||||
|
||||
@@ -70,6 +70,20 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RepeatBall = {TAG_
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TimerBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_TIMER_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_TimerBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LuxuryBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_LUXURY_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_LuxuryBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PremierBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_PREMIER_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_PremierBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HealBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_HEAL_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_HealBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_DUSK_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DuskBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuickBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_QUICK_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_QuickBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LevelBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_LEVEL_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_LevelBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LureBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_LURE_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_LureBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MoonBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_MOON_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_MoonBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FriendBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_FRIEND_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_FriendBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LoveBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_LOVE_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_LoveBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FastBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_FAST_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_FastBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HeavyBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_HEAVY_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_HeavyBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DreamBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_DREAM_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_DreamBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SportBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_SPORT_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_SportBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ParkBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_PARK_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_ParkBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CherishBall = {TAG_NONE, OBJ_EVENT_PAL_TAG_CHERISH_BALL, OBJ_EVENT_PAL_TAG_NONE, 128, 16, 16, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_Inanimate, sPicTable_CherishBall, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpandingSparkle = {TAG_NONE, FLDEFF_PAL_TAG_SMALL_SPARKLE, OBJ_EVENT_PAL_TAG_NONE, 512, 32, 32, 4, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_32x32, sOamTables_32x32, ExpandingSparkleTable, sPicTable_ExpandingSparkle, ExpandingSparkleAffineTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, NULL, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages = {TAG_NONE, OBJ_EVENT_PAL_TAG_NPC_1, OBJ_EVENT_PAL_TAG_NONE, 256, 16, 16, 2, SHADOW_SIZE_S, TRUE, FALSE, TRACKS_NONE, &gObjectEventBaseOam_16x16, sOamTables_16x16, sAnimTable_BerryTree, sPicTable_PechaBerryTree, gDummySpriteAffineAnimTable};
|
||||
|
||||
@@ -69,6 +69,20 @@ const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_RepeatBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_TimerBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LuxuryBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_PremierBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HealBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DuskBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_QuickBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LevelBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LureBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_MoonBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FriendBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_LoveBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_FastBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_HeavyBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_DreamBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_SportBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ParkBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_CherishBall;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_ExpandingSparkle;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTree;
|
||||
const struct ObjectEventGraphicsInfo gObjectEventGraphicsInfo_BerryTreeEarlyStages;
|
||||
@@ -746,6 +760,20 @@ const struct ObjectEventGraphicsInfo *const gObjectEventGraphicsInfoPointers[NUM
|
||||
[OBJ_EVENT_GFX_TIMER_BALL] = &gObjectEventGraphicsInfo_TimerBall,
|
||||
[OBJ_EVENT_GFX_LUXURY_BALL] = &gObjectEventGraphicsInfo_LuxuryBall,
|
||||
[OBJ_EVENT_GFX_PREMIER_BALL] = &gObjectEventGraphicsInfo_PremierBall,
|
||||
[OBJ_EVENT_GFX_HEAL_BALL] = &gObjectEventGraphicsInfo_HealBall,
|
||||
[OBJ_EVENT_GFX_DUSK_BALL] = &gObjectEventGraphicsInfo_DuskBall,
|
||||
[OBJ_EVENT_GFX_QUICK_BALL] = &gObjectEventGraphicsInfo_QuickBall,
|
||||
[OBJ_EVENT_GFX_LEVEL_BALL] = &gObjectEventGraphicsInfo_LevelBall,
|
||||
[OBJ_EVENT_GFX_LURE_BALL] = &gObjectEventGraphicsInfo_LureBall,
|
||||
[OBJ_EVENT_GFX_MOON_BALL] = &gObjectEventGraphicsInfo_MoonBall,
|
||||
[OBJ_EVENT_GFX_FRIEND_BALL] = &gObjectEventGraphicsInfo_FriendBall,
|
||||
[OBJ_EVENT_GFX_LOVE_BALL] = &gObjectEventGraphicsInfo_LoveBall,
|
||||
[OBJ_EVENT_GFX_FAST_BALL] = &gObjectEventGraphicsInfo_FastBall,
|
||||
[OBJ_EVENT_GFX_HEAVY_BALL] = &gObjectEventGraphicsInfo_HeavyBall,
|
||||
[OBJ_EVENT_GFX_DREAM_BALL] = &gObjectEventGraphicsInfo_DreamBall,
|
||||
[OBJ_EVENT_GFX_SPORT_BALL] = &gObjectEventGraphicsInfo_SportBall,
|
||||
[OBJ_EVENT_GFX_PARK_BALL] = &gObjectEventGraphicsInfo_ParkBall,
|
||||
[OBJ_EVENT_GFX_CHERISH_BALL] = &gObjectEventGraphicsInfo_CherishBall,
|
||||
[OBJ_EVENT_GFX_EXPANDING_SPARKLE] = &gObjectEventGraphicsInfo_ExpandingSparkle,
|
||||
[OBJ_EVENT_GFX_BERRY_TREE] = &gObjectEventGraphicsInfo_BerryTree,
|
||||
[OBJ_EVENT_GFX_BERRY_TREE_EARLY_STAGES] = &gObjectEventGraphicsInfo_BerryTreeEarlyStages,
|
||||
|
||||
@@ -791,6 +791,62 @@ static const struct SpriteFrameImage sPicTable_PremierBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_PremierBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_HealBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_HealBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_DuskBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_DuskBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_QuickBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_QuickBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_LevelBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_LevelBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_LureBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_LureBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_MoonBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_MoonBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_FriendBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_FriendBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_LoveBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_LoveBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_FastBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_FastBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_HeavyBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_HeavyBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_DreamBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_DreamBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_SportBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_SportBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_ParkBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_ParkBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_CherishBall[] = {
|
||||
obj_frame_tiles(gObjectEventPic_CherishBall),
|
||||
};
|
||||
|
||||
static const struct SpriteFrameImage sPicTable_ExpandingSparkle[] = {
|
||||
overworld_frame(gFieldEffectObjectPic_ExpandingSparkle, 4, 4, 0),
|
||||
overworld_frame(gFieldEffectObjectPic_ExpandingSparkle, 4, 4, 1),
|
||||
|
||||
@@ -846,6 +846,20 @@ const u8 gInitialMovementTypeFacingDirections[] = {
|
||||
#define OBJ_EVENT_PAL_TAG_TIMER_BALL 0x1050
|
||||
#define OBJ_EVENT_PAL_TAG_LUXURY_BALL 0x104F
|
||||
#define OBJ_EVENT_PAL_TAG_PREMIER_BALL 0x104E
|
||||
#define OBJ_EVENT_PAL_TAG_HEAL_BALL 0x104D
|
||||
#define OBJ_EVENT_PAL_TAG_DUSK_BALL 0x104C
|
||||
#define OBJ_EVENT_PAL_TAG_QUICK_BALL 0x104B
|
||||
#define OBJ_EVENT_PAL_TAG_LEVEL_BALL 0x104A
|
||||
#define OBJ_EVENT_PAL_TAG_LURE_BALL 0x1049
|
||||
#define OBJ_EVENT_PAL_TAG_MOON_BALL 0x1048
|
||||
#define OBJ_EVENT_PAL_TAG_FRIEND_BALL 0x1047
|
||||
#define OBJ_EVENT_PAL_TAG_LOVE_BALL 0x1046
|
||||
#define OBJ_EVENT_PAL_TAG_FAST_BALL 0x1045
|
||||
#define OBJ_EVENT_PAL_TAG_HEAVY_BALL 0x1044
|
||||
#define OBJ_EVENT_PAL_TAG_DREAM_BALL 0x1043
|
||||
#define OBJ_EVENT_PAL_TAG_SPORT_BALL 0x1042
|
||||
#define OBJ_EVENT_PAL_TAG_PARK_BALL 0x1041
|
||||
#define OBJ_EVENT_PAL_TAG_CHERISH_BALL 0x1040
|
||||
#define OBJ_EVENT_PAL_TAG_NONE 0x11FF
|
||||
|
||||
#include "data/object_events/object_event_graphics_info_pointers.h"
|
||||
@@ -1289,6 +1303,20 @@ static const struct SpritePalette sObjectEventSpritePalettes[] = {
|
||||
{gObjectEventPal_TimerBall, OBJ_EVENT_PAL_TAG_TIMER_BALL},
|
||||
{gObjectEventPal_LuxuryBall, OBJ_EVENT_PAL_TAG_LUXURY_BALL},
|
||||
{gObjectEventPal_PremierBall, OBJ_EVENT_PAL_TAG_PREMIER_BALL},
|
||||
{gObjectEventPal_HealBall, OBJ_EVENT_PAL_TAG_HEAL_BALL},
|
||||
{gObjectEventPal_DuskBall, OBJ_EVENT_PAL_TAG_DUSK_BALL},
|
||||
{gObjectEventPal_QuickBall, OBJ_EVENT_PAL_TAG_QUICK_BALL},
|
||||
{gObjectEventPal_LevelBall, OBJ_EVENT_PAL_TAG_LEVEL_BALL},
|
||||
{gObjectEventPal_LureBall, OBJ_EVENT_PAL_TAG_LURE_BALL},
|
||||
{gObjectEventPal_MoonBall, OBJ_EVENT_PAL_TAG_MOON_BALL},
|
||||
{gObjectEventPal_FriendBall, OBJ_EVENT_PAL_TAG_FRIEND_BALL},
|
||||
{gObjectEventPal_LoveBall, OBJ_EVENT_PAL_TAG_LOVE_BALL},
|
||||
{gObjectEventPal_FastBall, OBJ_EVENT_PAL_TAG_FAST_BALL},
|
||||
{gObjectEventPal_HeavyBall, OBJ_EVENT_PAL_TAG_HEAVY_BALL},
|
||||
{gObjectEventPal_DreamBall, OBJ_EVENT_PAL_TAG_DREAM_BALL},
|
||||
{gObjectEventPal_SportBall, OBJ_EVENT_PAL_TAG_SPORT_BALL},
|
||||
{gObjectEventPal_ParkBall, OBJ_EVENT_PAL_TAG_PARK_BALL},
|
||||
{gObjectEventPal_CherishBall, OBJ_EVENT_PAL_TAG_CHERISH_BALL},
|
||||
{gFieldEffectPal_SmallSparkle, FLDEFF_PAL_TAG_SMALL_SPARKLE},
|
||||
{},
|
||||
};
|
||||
@@ -10169,6 +10197,50 @@ u8 MovementAction_FollowingPokemon_Shrink_Step0(struct ObjectEvent *objectEvent,
|
||||
case ITEM_PREMIER_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_PREMIER_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
#ifdef ITEM_EXPANSION
|
||||
case ITEM_HEAL_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_HEAL_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_DUSK_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_DUSK_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_QUICK_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_QUICK_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_LEVEL_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_LEVEL_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_LURE_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_LURE_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_MOON_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_MOON_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_FRIEND_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_FRIEND_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_LOVE_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_LOVE_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_FAST_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_FAST_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_HEAVY_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_HEAVY_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_DREAM_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_DREAM_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_SPORT_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_SPORT_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_PARK_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_PARK_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_CHERISH_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_CHERISH_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
#endif
|
||||
default: // PokeBall
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_ITEM_BALL, &PokeballCallback, x, y, 2);
|
||||
break;
|
||||
|
||||
@@ -4093,6 +4093,50 @@ void FollowerPokeballSparkle(void)
|
||||
case ITEM_PREMIER_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_PREMIER_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
#ifdef ITEM_EXPANSION
|
||||
case ITEM_HEAL_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_HEAL_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_DUSK_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_DUSK_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_QUICK_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_QUICK_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_LEVEL_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_LEVEL_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_LURE_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_LURE_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_MOON_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_MOON_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_FRIEND_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_FRIEND_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_LOVE_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_LOVE_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_FAST_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_FAST_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_HEAVY_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_HEAVY_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_DREAM_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_DREAM_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_SPORT_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_SPORT_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_PARK_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_PARK_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
case ITEM_CHERISH_BALL:
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_CHERISH_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
#endif
|
||||
default: // PokeBall
|
||||
spriteId = CreateObjectGraphicsSprite(OBJ_EVENT_GFX_ITEM_BALL, &SparklePokeballCallback, x, y, 2);
|
||||
break;
|
||||
|
||||
Reference in new issue
Block a user