From cba5ebbd5af599736f84a8ef0142382f5a96f4af Mon Sep 17 00:00:00 2001 From: Evan Date: Wed, 27 Nov 2019 07:14:33 -0700 Subject: remove pokeball.s --- include/pokeball.h | 4 ++++ include/task.h | 14 +++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) (limited to 'include') diff --git a/include/pokeball.h b/include/pokeball.h index 884ded22e..263dc8742 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -24,6 +24,7 @@ enum #define POKEBALL_OPPONENT_SENDOUT 0xFE u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); +//void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 battlerId, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species) void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h); @@ -33,4 +34,7 @@ void LoadBallGfx(u8 ballId); void FreeBallGfx(u8 ballId); void sub_804BD94(u8 battler); +//temp +void SpriteCB_TestBallThrow(struct Sprite *sprite); + #endif // GUARD_POKEBALL_H diff --git a/include/task.h b/include/task.h index 834bb5655..785dbe6d4 100644 --- a/include/task.h +++ b/include/task.h @@ -10,13 +10,13 @@ typedef void (*TaskFunc)(u8 taskId); struct Task { - TaskFunc func; - bool8 isActive; - u8 prev; - u8 next; - u8 priority; - s16 data[16]; -}; + /*0x00*/ TaskFunc func; + /*0x04*/ bool8 isActive; + /*0x05*/ u8 prev; + /*0x06*/ u8 next; + /*0x07*/ u8 priority; + /*0x08*/ s16 data[16]; //8, a, c, e, 10, 12, 14, 16, 18, 1a, 1c, 1e, 20, 22, 24, 26 +}; /*size = 0x28*/ extern struct Task gTasks[]; -- cgit v1.2.3 From 52013cf052e9398987f76cf115ca08091e16288d Mon Sep 17 00:00:00 2001 From: Evan Date: Thu, 28 Nov 2019 11:13:26 -0500 Subject: remove errors --- include/pokeball.h | 3 --- 1 file changed, 3 deletions(-) (limited to 'include') diff --git a/include/pokeball.h b/include/pokeball.h index 263dc8742..9a4299531 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -34,7 +34,4 @@ void LoadBallGfx(u8 ballId); void FreeBallGfx(u8 ballId); void sub_804BD94(u8 battler); -//temp -void SpriteCB_TestBallThrow(struct Sprite *sprite); - #endif // GUARD_POKEBALL_H -- cgit v1.2.3 From b62688270824fc245ce99822ac3b8c46732a71b8 Mon Sep 17 00:00:00 2001 From: Evan Date: Sat, 30 Nov 2019 10:50:58 -0500 Subject: all matching except Task_DoPokeballSendOutAnim --- include/graphics.h | 50 +++++++++++++++++++++++++------------------------- include/pokeball.h | 2 +- include/task.h | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) (limited to 'include') diff --git a/include/graphics.h b/include/graphics.h index 93efbd135..fb9bb29ac 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -7,31 +7,31 @@ #include "global.h" -extern const u8 gInterfaceGfx_PokeBall[]; -extern const u8 gInterfacePal_PokeBall[]; -extern const u8 gInterfaceGfx_GreatBall[]; -extern const u8 gInterfacePal_GreatBall[]; -extern const u8 gInterfaceGfx_SafariBall[]; -extern const u8 gInterfacePal_SafariBall[]; -extern const u8 gInterfaceGfx_UltraBall[]; -extern const u8 gInterfacePal_UltraBall[]; -extern const u8 gInterfaceGfx_MasterBall[]; -extern const u8 gInterfacePal_MasterBall[]; -extern const u8 gInterfaceGfx_NetBall[]; -extern const u8 gInterfacePal_NetBall[]; -extern const u8 gInterfaceGfx_DiveBall[]; -extern const u8 gInterfacePal_DiveBall[]; -extern const u8 gInterfaceGfx_NestBall[]; -extern const u8 gInterfacePal_NestBall[]; -extern const u8 gInterfaceGfx_RepeatBall[]; -extern const u8 gInterfacePal_RepeatBall[]; -extern const u8 gInterfaceGfx_TimerBall[]; -extern const u8 gInterfacePal_TimerBall[]; -extern const u8 gInterfaceGfx_LuxuryBall[]; -extern const u8 gInterfacePal_LuxuryBall[]; -extern const u8 gInterfaceGfx_PremierBall[]; -extern const u8 gInterfacePal_PremierBall[]; -extern const u8 gOpenPokeballGfx[]; +extern const u32 gInterfaceGfx_PokeBall[]; +extern const u32 gInterfacePal_PokeBall[]; +extern const u32 gInterfaceGfx_GreatBall[]; +extern const u32 gInterfacePal_GreatBall[]; +extern const u32 gInterfaceGfx_SafariBall[]; +extern const u32 gInterfacePal_SafariBall[]; +extern const u32 gInterfaceGfx_UltraBall[]; +extern const u32 gInterfacePal_UltraBall[]; +extern const u32 gInterfaceGfx_MasterBall[]; +extern const u32 gInterfacePal_MasterBall[]; +extern const u32 gInterfaceGfx_NetBall[]; +extern const u32 gInterfacePal_NetBall[]; +extern const u32 gInterfaceGfx_DiveBall[]; +extern const u32 gInterfacePal_DiveBall[]; +extern const u32 gInterfaceGfx_NestBall[]; +extern const u32 gInterfacePal_NestBall[]; +extern const u32 gInterfaceGfx_RepeatBall[]; +extern const u32 gInterfacePal_RepeatBall[]; +extern const u32 gInterfaceGfx_TimerBall[]; +extern const u32 gInterfacePal_TimerBall[]; +extern const u32 gInterfaceGfx_LuxuryBall[]; +extern const u32 gInterfacePal_LuxuryBall[]; +extern const u32 gInterfaceGfx_PremierBall[]; +extern const u32 gInterfacePal_PremierBall[]; +extern const u32 gOpenPokeballGfx[]; // pokemon gfx extern const u32 gMonFrontPic_Bulbasaur[]; diff --git a/include/pokeball.h b/include/pokeball.h index 9a4299531..0e941f9ed 100644 --- a/include/pokeball.h +++ b/include/pokeball.h @@ -24,7 +24,6 @@ enum #define POKEBALL_OPPONENT_SENDOUT 0xFE u8 DoPokeballSendOutAnimation(s16 pan, u8 kindOfThrow); -//void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 battlerId, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h, u16 species) void CreatePokeballSpriteToReleaseMon(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); u8 CreateTradePokeballSprite(u8 monSpriteId, u8 bank, u8 x, u8 y, u8 oamPriority, u8 subpriortiy, u8 g, u32 h); u8 sub_807671C(u8 a, u8 b, u8 x, u8 y, u8 oamPriority, u8 subPriority, u8 g, u32 h); @@ -33,5 +32,6 @@ void DoHitAnimHealthboxEffect(u8 bank); void LoadBallGfx(u8 ballId); void FreeBallGfx(u8 ballId); void sub_804BD94(u8 battler); +void DestroySpriteAndFreeResources2(struct Sprite *sprite); #endif // GUARD_POKEBALL_H diff --git a/include/task.h b/include/task.h index 785dbe6d4..7a7a2ff22 100644 --- a/include/task.h +++ b/include/task.h @@ -15,7 +15,7 @@ struct Task /*0x05*/ u8 prev; /*0x06*/ u8 next; /*0x07*/ u8 priority; - /*0x08*/ s16 data[16]; //8, a, c, e, 10, 12, 14, 16, 18, 1a, 1c, 1e, 20, 22, 24, 26 + /*0x08*/ s16 data[16]; }; /*size = 0x28*/ extern struct Task gTasks[]; -- cgit v1.2.3