From c2fdde3a498b6b6bbf8a57784e3208be74bf59f7 Mon Sep 17 00:00:00 2001
From: DizzyEggg <jajkodizzy@wp.pl>
Date: Sat, 2 Dec 2017 20:38:26 +0100
Subject: pokeball file is decompiled

---
 include/battle_anim.h |  3 ++-
 include/pokeball.h    | 17 ++++++++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

(limited to 'include')

diff --git a/include/battle_anim.h b/include/battle_anim.h
index 1bb85d023..9fb7ccd53 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -80,6 +80,7 @@ void HandleIntroSlide(u8 terrainId);
 // battle_anim_80A5C6C.s
 void sub_80A6EEC(struct Sprite *sprite);
 void sub_80A68D4(struct Sprite *sprite);
+void sub_80A6F3C(struct Sprite *sprite);
 void sub_80A8278(void);
 void sub_80A6B30(struct UnknownAnimStruct2*);
 void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
@@ -112,6 +113,6 @@ void LaunchStatusAnimation(u8 bank, u8 statusAnimId);
 // battle_anim_8170478.s
 u8 ItemIdToBallId(u16 itemId);
 u8 LaunchBallStarsTask(u8 x, u8 y, u8 kindOfStars, u8 arg3, u8 ballId);
-u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u8 arg2, u8 ballId);
+u8 LaunchBallFadeMonTask(bool8 unFadeLater, u8 bank, u32 arg2, u8 ballId);
 
 #endif // GUARD_BATTLE_ANIM_H
diff --git a/include/pokeball.h b/include/pokeball.h
index 863abe5c9..57e305ffd 100644
--- a/include/pokeball.h
+++ b/include/pokeball.h
@@ -1,7 +1,22 @@
 #ifndef GUARD_POKEBALL_H
 #define GUARD_POKEBALL_H
 
-#define POKEBALL_COUNT 12
+enum
+{
+    BALL_POKE,
+    BALL_GREAT,
+    BALL_SAFARI,
+    BALL_ULTRA,
+    BALL_MASTER,
+    BALL_NET,
+    BALL_DIVE,
+    BALL_NEST,
+    BALL_REPEAT,
+    BALL_TIMER,
+    BALL_LUXURY,
+    BALL_PREMIER,
+    POKEBALL_COUNT
+};
 
 #define POKEBALL_PLAYER_SENDOUT     0xFF
 #define POKEBALL_OPPONENT_SENDOUT   0xFE
-- 
cgit v1.2.3