From cba5ebbd5af599736f84a8ef0142382f5a96f4af Mon Sep 17 00:00:00 2001
From: Evan <eroelke@gmail.com>
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