remove pokeball.s

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

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[];
 

ld_script.txt

@@ -83,7 +83,7 @@ SECTIONS {
         src/daycare.o(.text);
         asm/battle_interface.o(.text);
         asm/smokescreen.o(.text);
-        asm/pokeball.o(.text);
+		src/pokeball.o(.text);
         src/load_save.o(.text);
         src/trade.o(.text);
         src/trade_scene.o(.text);