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

Begin pokeball expansion

Browse Source
This commit is contained in:
DizzyEggg 2019-04-14 10:53:47 +02:00
parent d9fc6d36be
commit 8e19a552ae
1 changed files with 180 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
src/pokeball.c
View File

@ -59,6 +59,21 @@ static u16 GetBattlerPokeballItemId(u8 battlerId);
#define GFX_TAG_TIMERBALL 55009 #define GFX_TAG_TIMERBALL 55009
#define GFX_TAG_LUXURYBALL 55010 #define GFX_TAG_LUXURYBALL 55010
#define GFX_TAG_PREMIERBALL 55011 #define GFX_TAG_PREMIERBALL 55011
#define GFX_TAG_LEVELBALL 55012
#define GFX_TAG_LUREBALL 55013
#define GFX_TAG_MOONBALL 55014
#define GFX_TAG_FRIENDBALL 55015
#define GFX_TAG_LOVEBALL 55016
#define GFX_TAG_HEAVYBALL 55017
#define GFX_TAG_FASTBALL 55018
#define GFX_TAG_SPORTBALL 55019
#define GFX_TAG_DUSKBALL 55020
#define GFX_TAG_QUICKBALL 55021
#define GFX_TAG_HEALBALL 55022
#define GFX_TAG_CHERISHBALL 55023
#define GFX_TAG_PARKBALL 55024
#define GFX_TAG_DREAMBALL 55025
#define GFX_TAG_BEASTBALL 55026
const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] = const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] =
{ {
@ -74,6 +89,21 @@ const struct CompressedSpriteSheet gBallSpriteSheets[POKEBALL_COUNT] =
{gInterfaceGfx_TimerBall, 384, GFX_TAG_TIMERBALL}, {gInterfaceGfx_TimerBall, 384, GFX_TAG_TIMERBALL},
{gInterfaceGfx_LuxuryBall, 384, GFX_TAG_LUXURYBALL}, {gInterfaceGfx_LuxuryBall, 384, GFX_TAG_LUXURYBALL},
{gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIERBALL}, {gInterfaceGfx_PremierBall, 384, GFX_TAG_PREMIERBALL},
{gInterfaceGfx_LevelBall, 384, GFX_TAG_LEVELBALL},
{gInterfaceGfx_LureBall, 384, GFX_TAG_LUREBALL},
{gInterfaceGfx_MoonBall, 384, GFX_TAG_MOONBALL},
{gInterfaceGfx_FriendBall, 384, GFX_TAG_FRIENDBALL},
{gInterfaceGfx_LoveBall, 384, GFX_TAG_LOVEBALL},
{gInterfaceGfx_HeavyBall, 384, GFX_TAG_HEAVYBALL},
{gInterfaceGfx_FastBall, 384, GFX_TAG_FASTBALL},
{gInterfaceGfx_SportBall, 384, GFX_TAG_SPORTBALL},
{gInterfaceGfx_DuskBall, 384, GFX_TAG_DUSKBALL},
{gInterfaceGfx_QuickBall, 384, GFX_TAG_QUICKBALL},
{gInterfaceGfx_HealBall, 384, GFX_TAG_HEALBALL},
{gInterfaceGfx_CherishBall, 384, GFX_TAG_CHERISHBALL},
{gInterfaceGfx_ParkBall, 384, GFX_TAG_PARKBALL},
{gInterfaceGfx_DreamBall, 384, GFX_TAG_DREAMBALL},
{gInterfaceGfx_BeastBall, 384, GFX_TAG_BEASTBALL},
}; };
const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] = const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =
@ -90,6 +120,21 @@ const struct CompressedSpritePalette gBallSpritePalettes[POKEBALL_COUNT] =
{gInterfacePal_TimerBall, GFX_TAG_TIMERBALL}, {gInterfacePal_TimerBall, GFX_TAG_TIMERBALL},
{gInterfacePal_LuxuryBall, GFX_TAG_LUXURYBALL}, {gInterfacePal_LuxuryBall, GFX_TAG_LUXURYBALL},
{gInterfacePal_PremierBall, GFX_TAG_PREMIERBALL}, {gInterfacePal_PremierBall, GFX_TAG_PREMIERBALL},
{gInterfacePal_LevelBall, GFX_TAG_LEVELBALL},
{gInterfacePal_LureBall, GFX_TAG_LUREBALL},
{gInterfacePal_MoonBall, GFX_TAG_MOONBALL},
{gInterfacePal_FriendBall, GFX_TAG_FRIENDBALL},
{gInterfacePal_LoveBall, GFX_TAG_LOVEBALL},
{gInterfacePal_HeavyBall, GFX_TAG_HEAVYBALL},
{gInterfacePal_FastBall, GFX_TAG_FASTBALL},
{gInterfacePal_SportBall, GFX_TAG_SPORTBALL},
{gInterfacePal_DuskBall, GFX_TAG_DUSKBALL},
{gInterfacePal_QuickBall, GFX_TAG_QUICKBALL},
{gInterfacePal_HealBall, GFX_TAG_HEALBALL},
{gInterfacePal_CherishBall, GFX_TAG_CHERISHBALL},
{gInterfacePal_ParkBall, GFX_TAG_PARKBALL},
{gInterfacePal_DreamBall, GFX_TAG_DREAMBALL},
{gInterfacePal_BeastBall, GFX_TAG_BEASTBALL},
}; };
static const struct OamData sBallOamData = static const struct OamData sBallOamData =
@ -315,6 +360,141 @@ const struct SpriteTemplate gBallSpriteTemplates[POKEBALL_COUNT] =
.affineAnims = sBallAffineAnimSequences, .affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow, .callback = SpriteCB_TestBallThrow,
}, },
{
.tileTag = GFX_TAG_LEVELBALL,
.paletteTag = GFX_TAG_LEVELBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_LUREBALL,
.paletteTag = GFX_TAG_LUREBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_MOONBALL,
.paletteTag = GFX_TAG_MOONBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_FRIENDBALL,
.paletteTag = GFX_TAG_FRIENDBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_LOVEBALL,
.paletteTag = GFX_TAG_LOVEBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_HEAVYBALL,
.paletteTag = GFX_TAG_HEAVYBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_FASTBALL,
.paletteTag = GFX_TAG_FASTBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_SPORTBALL,
.paletteTag = GFX_TAG_SPORTBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_DUSKBALL,
.paletteTag = GFX_TAG_DUSKBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_QUICKBALL,
.paletteTag = GFX_TAG_QUICKBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_HEALBALL,
.paletteTag = GFX_TAG_HEALBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_CHERISHBALL,
.paletteTag = GFX_TAG_CHERISHBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_PARKBALL,
.paletteTag = GFX_TAG_PARKBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_DREAMBALL,
.paletteTag = GFX_TAG_DREAMBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
{
.tileTag = GFX_TAG_BEASTBALL,
.paletteTag = GFX_TAG_BEASTBALL,
.oam = &sBallOamData,
.anims = sBallAnimSequences,
.images = NULL,
.affineAnims = sBallAffineAnimSequences,
.callback = SpriteCB_TestBallThrow,
},
}; };
#define tFrames data[0] #define tFrames data[0]