ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 15:13:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Used ball constants in gBallSpriteTemplates

Browse Source
This commit is contained in:
LOuroboros 2022-01-26 18:36:21 -03:00
parent 9f2b6ab2f2
commit 6470b0d004
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/pokeball.c
View File

@ -204,6 +204,7 @@ static const union AffineAnimCmd *const sAffineAnim_BallRotate[] =
const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] = const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
{ {
[BALL_POKE] =
{ {
.tileTag = GFX_TAG_POKEBALL, .tileTag = GFX_TAG_POKEBALL,
.paletteTag = GFX_TAG_POKEBALL, .paletteTag = GFX_TAG_POKEBALL,
@ -213,6 +214,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_GREAT] =
{ {
.tileTag = GFX_TAG_GREATBALL, .tileTag = GFX_TAG_GREATBALL,
.paletteTag = GFX_TAG_GREATBALL, .paletteTag = GFX_TAG_GREATBALL,
@ -222,6 +224,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_SAFARI] =
{ {
.tileTag = GFX_TAG_SAFARIBALL, .tileTag = GFX_TAG_SAFARIBALL,
.paletteTag = GFX_TAG_SAFARIBALL, .paletteTag = GFX_TAG_SAFARIBALL,
@ -231,6 +234,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_ULTRA] =
{ {
.tileTag = GFX_TAG_ULTRABALL, .tileTag = GFX_TAG_ULTRABALL,
.paletteTag = GFX_TAG_ULTRABALL, .paletteTag = GFX_TAG_ULTRABALL,
@ -240,6 +244,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_MASTER] =
{ {
.tileTag = GFX_TAG_MASTERBALL, .tileTag = GFX_TAG_MASTERBALL,
.paletteTag = GFX_TAG_MASTERBALL, .paletteTag = GFX_TAG_MASTERBALL,
@ -249,6 +254,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_NET] =
{ {
.tileTag = GFX_TAG_NETBALL, .tileTag = GFX_TAG_NETBALL,
.paletteTag = GFX_TAG_NETBALL, .paletteTag = GFX_TAG_NETBALL,
@ -258,6 +264,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_DIVE] =
{ {
.tileTag = GFX_TAG_DIVEBALL, .tileTag = GFX_TAG_DIVEBALL,
.paletteTag = GFX_TAG_DIVEBALL, .paletteTag = GFX_TAG_DIVEBALL,
@ -267,6 +274,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_NEST] =
{ {
.tileTag = GFX_TAG_NESTBALL, .tileTag = GFX_TAG_NESTBALL,
.paletteTag = GFX_TAG_NESTBALL, .paletteTag = GFX_TAG_NESTBALL,
@ -276,6 +284,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_REPEAT] =
{ {
.tileTag = GFX_TAG_REPEATBALL, .tileTag = GFX_TAG_REPEATBALL,
.paletteTag = GFX_TAG_REPEATBALL, .paletteTag = GFX_TAG_REPEATBALL,
@ -285,6 +294,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_TIMER] =
{ {
.tileTag = GFX_TAG_TIMERBALL, .tileTag = GFX_TAG_TIMERBALL,
.paletteTag = GFX_TAG_TIMERBALL, .paletteTag = GFX_TAG_TIMERBALL,
@ -294,6 +304,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_LUXURY] =
{ {
.tileTag = GFX_TAG_LUXURYBALL, .tileTag = GFX_TAG_LUXURYBALL,
.paletteTag = GFX_TAG_LUXURYBALL, .paletteTag = GFX_TAG_LUXURYBALL,
@ -303,6 +314,7 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sAffineAnim_BallRotate, .affineAnims = sAffineAnim_BallRotate,
.callback = SpriteCB_BallThrow, .callback = SpriteCB_BallThrow,
}, },
[BALL_PREMIER] =
{ {
.tileTag = GFX_TAG_PREMIERBALL, .tileTag = GFX_TAG_PREMIERBALL,
.paletteTag = GFX_TAG_PREMIERBALL, .paletteTag = GFX_TAG_PREMIERBALL,