player battle controller is done

8 files changed, 161 insertions, 72 deletions

diff --git a/include/battle.h b/include/battle.h
index 7d97f7777..6079d019e 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -750,38 +750,39 @@ extern struct BattleStruct* gBattleStruct;
 #define MOVE_EFFECT_AFFECTS_USER        0x40
 #define MOVE_EFFECT_CERTAIN             0x80
 
-// battle animations ids
-
-#define B_ANIM_CASTFORM_CHANGE      0x0
-#define B_ANIM_STATS_CHANGE         0x1
-#define B_ANIM_SUBSTITUTE_FADE      0x2
-#define B_ANIM_SUBSTITUTE_APPEAR    0x3
-#define B_ANIM_x4                   0x4
-#define B_ANIM_ITEM_KNOCKOFF        0x5
-#define B_ANIM_TURN_TRAP            0x6
-#define B_ANIM_ITEM_EFFECT          0x7
-#define B_ANIM_SMOKEBALL_ESCAPE     0x8
-#define B_ANIM_HANGED_ON            0x9
-#define B_ANIM_RAIN_CONTINUES       0xA
-#define B_ANIM_SUN_CONTINUES        0xB
-#define B_ANIM_SANDSTORM_CONTINUES  0xC
-#define B_ANIM_HAIL_CONTINUES       0xD
-#define B_ANIM_LEECH_SEED_DRAIN     0xE
-#define B_ANIM_MON_HIT              0xF
-#define B_ANIM_ITEM_STEAL           0x10
-#define B_ANIM_SNATCH_MOVE          0x11
-#define B_ANIM_FUTURE_SIGHT_HIT     0x12
-#define B_ANIM_x13                  0x13
-#define B_ANIM_x14                  0x14
-#define B_ANIM_INGRAIN_HEAL         0x15
-#define B_ANIM_WISH_HEAL            0x16
-#define B_ANIM_x17                  0x17
-#define B_ANIM_x18                  0x18
-#define B_ANIM_x19                  0x19
-#define B_ANIM_x1A                  0x1A
-#define B_ANIM_x1B                  0x1B
-#define B_ANIM_x1C                  0x1C
-#define B_ANIM_x1D                  0x1D
+// table ids for general animations
+#define B_ANIM_CASTFORM_CHANGE          0x0
+#define B_ANIM_STATS_CHANGE             0x1
+#define B_ANIM_SUBSTITUTE_FADE          0x2
+#define B_ANIM_SUBSTITUTE_APPEAR        0x3
+#define B_ANIM_x4                       0x4
+#define B_ANIM_ITEM_KNOCKOFF            0x5
+#define B_ANIM_TURN_TRAP                0x6
+#define B_ANIM_ITEM_EFFECT              0x7
+#define B_ANIM_SMOKEBALL_ESCAPE         0x8
+#define B_ANIM_HANGED_ON                0x9
+#define B_ANIM_RAIN_CONTINUES           0xA
+#define B_ANIM_SUN_CONTINUES            0xB
+#define B_ANIM_SANDSTORM_CONTINUES      0xC
+#define B_ANIM_HAIL_CONTINUES           0xD
+#define B_ANIM_LEECH_SEED_DRAIN         0xE
+#define B_ANIM_MON_HIT                  0xF
+#define B_ANIM_ITEM_STEAL               0x10
+#define B_ANIM_SNATCH_MOVE              0x11
+#define B_ANIM_FUTURE_SIGHT_HIT         0x12
+#define B_ANIM_x13                      0x13
+#define B_ANIM_x14                      0x14
+#define B_ANIM_INGRAIN_HEAL             0x15
+#define B_ANIM_WISH_HEAL                0x16
+
+// special animations table
+#define B_ANIM_LVL_UP                   0x0
+#define B_ANIM_SWITCH_OUT_MON           0x1
+#define B_ANIM_SPECIAL_2                0x2
+#define B_ANIM_BALL_THROW               0x3
+#define B_ANIM_SPECIAL_4                0x4
+#define B_ANIM_SUBSTITUTE_TO_MON        0x5
+#define B_ANIM_MON_TO_SUBSTITUTE        0x6
 
 #define GET_STAT_BUFF_ID(n)((n & 0xF))              // first four bits 0x1, 0x2, 0x4, 0x8
 #define GET_STAT_BUFF_VALUE(n)(((n >> 4) & 7))      // 0x10, 0x20, 0x40
@@ -868,6 +869,13 @@ bool8 IsMoveWithoutAnimation(u16 moveId, u8 animationTurn);
 void sub_805EB9C(u8 arg0);
 void sub_805E394(void);
 void TrySetBehindSubstituteSpriteBit(u8 bank, u16 move);
+void DoStatusAnimation(bool8 isStatus2, u32 status);
+void DoSpecialBattleAnimation(u8 activeBank, u8 atkBank, u8 defBank, u8 tableId);
+bool8 DoBattleAnimationFromTable(u8 active, u8 atkBank, u8 defBank, u8 tableId, u16 argument);
+void SetBattleSpriteInvisibilityBitToSpriteInvisibility(u8 bank);
+u16 ChooseMoveAndTargetInBattlePalace(void);
+void LoadBattleBarGfx(u8 arg0);
+bool8 mplay_80342A4(u8 bank);
 
 enum
 {
@@ -905,7 +913,7 @@ struct BattleAnimationInfo
     u8 field_5;
     u8 field_6;
     u8 field_7;
-    u8 field_8;
+    u8 ballThrowCaseId;
     u8 field_9_x1 : 1;
     u8 field_9_x2 : 1;
     u8 field_9_x1C : 3;
@@ -920,9 +928,9 @@ struct BattleHealthboxInfo
     u8 flag_x2 : 1;
     u8 flag_x4 : 1;
     u8 flag_x8 : 1;
-    u8 flag_x10 : 1;
-    u8 flag_x20 : 1;
-    u8 flag_x40 : 1;
+    u8 statusAnimActive : 1; // x10
+    u8 animFromTableActive : 1; // x20
+    u8 specialAnimActive : 1; //x40
     u8 flag_x80 : 1;
     u8 field_1_x1 : 1;
     u8 field_1_x2 : 1;
@@ -934,7 +942,7 @@ struct BattleHealthboxInfo
     u8 field_1_x80 : 1;
     u8 field_2;
     u8 field_3;
-    u8 field_4;
+    u8 animationState;
     u8 field_5;
     u8 field_6;
     u8 field_7;
@@ -949,7 +957,7 @@ struct BattleBarInfo
     u8 healthboxSpriteId;
     s32 maxValue;
     s32 currentValue;
-    s32 field_C;
+    s32 receivedValue;
     s32 field_10;
 };
 
diff --git a/include/battle_2.h b/include/battle_2.h
index 0d4bcbc67..ee61efd9b 100644
--- a/include/battle_2.h
+++ b/include/battle_2.h
@@ -2,26 +2,45 @@
 #define GUARD_BATTLE_2_H
 
 void CB2_InitBattle(void);
-void CB2_QuitRecordedBattle(void);
-void FaintClearSetData(void);
-void SwitchInClearSetData(void);
-void sub_803BDA0(u8 bank);
 void BattleMainCB2(void);
+void CB2_QuitRecordedBattle(void);
+void sub_8038528(struct Sprite* sprite);
+void sub_8038A04(void); // unused
 void VBlankCB_Battle(void);
-bool8 TryRunFromBattle(u8 bank);
-u8 IsRunningFromBattleImpossible(void);
-u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
-void SwapTurnOrder(u8 id1, u8 id2);
-void BattleTurnPassed(void);
+void nullsub_17(void);
+void sub_8038B74(struct Sprite *sprite);
 void sub_8038D64(void);
-void RunBattleScriptCommands_PopCallbacksStack(void);
-void RunBattleScriptCommands(void);
+u32 sub_80391E0(u8 arrayId, u8 caseId);
 u32 sub_80397C4(u32 setId, u32 tableId);
-void sub_8039E9C(struct Sprite *sprite);
-void sub_8039B2C(struct Sprite *sprite);
+void oac_poke_opponent(struct Sprite *sprite);
+void SpriteCallbackDummy_2(struct Sprite *sprite);
+void sub_8039934(struct Sprite *sprite);
 void sub_8039AD8(struct Sprite *sprite);
+void sub_8039B2C(struct Sprite *sprite);
+void sub_8039B58(struct Sprite *sprite);
+void sub_8039BB4(struct Sprite *sprite);
+void sub_80105DC(struct Sprite *sprite);
+void sub_8039C00(struct Sprite *sprite);
+void dp11b_obj_instanciate(u8 bank, u8 b, s8 c, s8 d);
+void dp11b_obj_free(u8 bank, bool8 b);
+void sub_8039E44(struct Sprite *sprite);
+void sub_8039E60(struct Sprite *sprite);
+void sub_8039E84(struct Sprite *sprite);
+void sub_8039E9C(struct Sprite *sprite);
 void nullsub_20(void);
 void BeginBattleIntro(void);
+void SwitchInClearSetData(void);
+void FaintClearSetData(void);
+void sub_803B3AC(void); // unused
+void sub_803B598(void); // unused
+void BattleTurnPassed(void);
+u8 IsRunningFromBattleImpossible(void);
+void sub_803BDA0(u8 bank);
+void SwapTurnOrder(u8 id1, u8 id2);
+u8 GetWhoStrikesFirst(u8 bank1, u8 bank2, bool8 ignoreChosenMoves);
+void RunBattleScriptCommands_PopCallbacksStack(void);
+void RunBattleScriptCommands(void);
+bool8 TryRunFromBattle(u8 bank);
 
 extern const u8 gStatusConditionString_PoisonJpn[8];
 extern const u8 gStatusConditionString_SleepJpn[8];
diff --git a/include/battle_anim.h b/include/battle_anim.h
index 5282916c0..67f0813bc 100644
--- a/include/battle_anim.h
+++ b/include/battle_anim.h
@@ -60,7 +60,7 @@ extern u8 gUnknown_02038440;
 
 void ClearBattleAnimationVars(void);
 void DoMoveAnim(u16 move);
-void DoBattleAnim(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim);
+void LaunchBattleAnimation(const u8 *const animsTable[], u16 tableId, bool8 isMoveAnim);
 void DestroyAnimSprite(struct Sprite *sprite);
 void DestroyAnimVisualTask(u8 taskId);
 void DestroyAnimSoundTask(u8 taskId);
@@ -75,5 +75,24 @@ s16 CalculatePanIncrement(s16 sourcePan, s16 targetPan, s16 incrementPan);
 // battle_anim_80FE840.s
 void SetAnimBgAttribute(u8 bgId, u8 attributeId, u8 value);
 void sub_8118FBC(u8 arg0, u8 arg1, u8 arg2, u8 bankIdentity, u8 arg4, void *arg5, u16 *arg6, u16 arg7);
+void HandleIntroSlide(u8 terrainId);
+
+// battle_anim_80A5C6C.s
+void sub_80A6EEC(struct Sprite *sprite);
+void sub_80A8278(void);
+void sub_80A6B30(struct UnknownAnimStruct2*);
+void sub_80A6B90(struct UnknownAnimStruct2*, u32 arg1);
+u8 sub_80A82E4(u8 bank);
+u8 sub_80A5C6C(u8 bank, u8 attributeId);
+bool8 AnimBankSpriteExists(u8 bank);
+void sub_80A6C68(u8 arg0);
+u8 GetAnimBankSpriteId(u8 wantedBank);
+bool8 IsDoubleBattle(void);
+u8 sub_80A6D94(void);
+u8 sub_80A8364(u8);
+void StoreSpriteCallbackInData6(struct Sprite *sprite, void (*spriteCallback)(struct Sprite*));
+void oamt_add_pos2_onto_pos1(struct Sprite *sprite);
+u8 sub_80A6138(u8 bank);
+u8 sub_80A82E4(u8 bank);
 
 #endif // GUARD_BATTLE_ANIM_H
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 0b8fb0c0e..8affb1406 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -76,6 +76,16 @@ enum
 #define BALL_3_SHAKES_SUCCESS   4
 #define BALL_TRAINER_BLOCK      5
 
+#define RET_VALUE_LEVELLED_UP   11
+
+#define INSTANT_HP_BAR_DROP     32767
+
+struct UnusedControllerStruct
+{
+    u8 field_0 : 7;
+    u8 flag_x80 : 1;
+};
+
 struct HpAndStatus
 {
     u16 hp;
@@ -113,14 +123,14 @@ enum
     CONTROLLER_TRAINERSLIDEBACK,
     CONTROLLER_FAINTANIMATION,
     CONTROLLER_PALETTEFADE,
-    CONTROLLER_12,
-    CONTROLLER_BALLTHROW,
+    CONTROLLER_SUCCESSBALLTHROWANIM,
+    CONTROLLER_BALLTHROWANIM,
     CONTROLLER_PAUSE,
     CONTROLLER_MOVEANIMATION,
     CONTROLLER_PRINTSTRING,
     CONTROLLER_PRINTSTRINGPLAYERONLY,
     CONTROLLER_CHOOSEACTION,
-    CONTROLLER_YESNOBOX,
+    CONTROLLER_UNKNOWNYESNOBOX,
     CONTROLLER_CHOOSEMOVE,
     CONTROLLER_OPENBAG,
     CONTROLLER_CHOOSEPOKEMON,
@@ -134,10 +144,10 @@ enum
     CONTROLLER_DMA3TRANSFER,
     CONTROLLER_31,
     CONTROLLER_32,
-    CONTROLLER_CHOICERETURNVALUE,
-    CONTROLLER_34,
-    CONTROLLER_35,
-    CONTROLLER_36,
+    CONTROLLER_TWORETURNVALUES,
+    CONTROLLER_CHOSENMONRETURNVALUE,
+    CONTROLLER_ONERETURNVALUE,
+    CONTROLLER_ONERETURNVALUE_DUPLICATE,
     CONTROLLER_37,
     CONTROLLER_38,
     CONTROLLER_39,
@@ -182,16 +192,16 @@ void EmitTrainerSlide(u8 bufferId);
 void EmitTrainerSlideBack(u8 bufferId);
 void EmitFaintAnimation(u8 bufferId);
 void EmitPaletteFade(u8 bufferId); // unused
-void EmitCmd12(u8 bufferId); // unused
-void EmitBallThrow(u8 bufferId, u8 caseId);
+void EmitSuccessBallThrowAnim(u8 bufferId); // unused
+void EmitBallThrowAnim(u8 bufferId, u8 caseId);
 void EmitPause(u8 bufferId, u8 toWait, void *data); // unused
 void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32 dmg, u8 friendship, struct DisableStruct *disableStructPtr, u8 multihit);
 void EmitPrintString(u8 bufferId, u16 stringId);
 void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringId);
 void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
-void EmitYesNoBox(u8 bufferId);
+void EmitUnknownYesNoBox(u8 bufferId);
 void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
-void EmitOpenBag(u8 bufferId, u8* arg1);
+void EmitChooseItem(u8 bufferId, u8* arg1);
 void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
 void EmitCmd23(u8 bufferId); // unused
 void EmitHealthBarUpdate(u8 bufferId, u16 hpValue);
@@ -203,14 +213,14 @@ void EmitDataTransfer(u8 bufferId, u16 size, void *data);
 void EmitDMA3Transfer(u8 bufferId, void *dst, u16 size, void *data); // unused
 void EmitPlayBGM(u8 bufferId, u16 songId, void *unusedDumbDataParameter); // unused
 void EmitCmd32(u8 bufferId, u16 size, void *c); // unused
-void EmitChoiceReturnValue(u8 bufferId, u8 arg1, u16 arg2);
-void EmitCmd34(u8 bufferId, u8 b, u8 *c);
-void EmitCmd35(u8 bufferId, u16 b);
-void EmitCmd36(u8 bufferId, u16 b);
-void EmitCmd37(u8 bufferId);
-void EmitCmd38(u8 bufferId, u8 b);
-void EmitCmd39(u8 bufferId);
-void EmitCmd40(u8 bufferId);
+void EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2);
+void EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c);
+void EmitOneReturnValue(u8 bufferId, u16 arg1);
+void EmitOneReturnValue_Duplicate(u8 bufferId, u16 b);
+void EmitCmd37(u8 bufferId); // unused
+void EmitCmd38(u8 bufferId, u8 b); // unused
+void EmitCmd39(u8 bufferId); // unused
+void EmitCmd40(u8 bufferId); // unused
 void EmitHitAnimation(u8 bufferId);
 void EmitCmd42(u8 bufferId);
 void EmitEffectivenessSound(u8 bufferId, u16 songId);
@@ -230,8 +240,15 @@ void EmitCmd55(u8 bufferId, u8 arg1);
 // player controller
 void SetBankFuncToPlayerBufferRunCommand(void);
 void nullsub_21(void);
+void PlayerHandleGetRawMonData(void);
+void sub_80587B0(void);
+void sub_805CC00(struct Sprite *sprite);
+void SetCB2ToReshowScreenAfterMenu(void);
+void SetCB2ToReshowScreenAfterMenu2(void);
+void c3_0802FDF4(u8 taskId);
 void ActionSelectionCreateCursorAt(u8 cursorPos, u8 unused);
 void ActionSelectionDestroyCursorAt(u8 cursorPos);
+void InitMoveSelectionsVarsAndStrings(void);
 
 // recorded player controller
 void SetBankFuncToRecordedPlayerBufferRunCommand(void);
diff --git a/include/battle_interface.h b/include/battle_interface.h
index 0980b0002..aad30f7b3 100644
--- a/include/battle_interface.h
+++ b/include/battle_interface.h
@@ -9,6 +9,12 @@ enum
     HP_MAX
 };
 
+enum
+{
+    HEALTH_BAR,
+    EXP_BAR
+};
+
 #define TAG_HEALTHBOX_PLAYER1_TILE      0xD6FF
 #define TAG_HEALTHBOX_PLAYER2_TILE      0xD700
 #define TAG_HEALTHBOX_OPPONENT1_TILE    0xD701
@@ -41,7 +47,7 @@ enum
 
 u8 CreateBankHealthboxSprites(u8 bank);
 u8 CreateSafariPlayerHealthboxSprites(void);
-void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 field_C);
+void SetBattleBarStruct(u8 bank, u8 healthboxSpriteId, s32 maxVal, s32 currVal, s32 receivedValue);
 void SetHealthboxSpriteInvisible(u8 healthboxSpriteId);
 void SetHealthboxSpriteVisible(u8 healthboxSpriteId);
 void DestoryHealthboxSprite(u8 healthboxSpriteId);
diff --git a/include/battle_link_817C95C.h b/include/battle_link_817C95C.h
new file mode 100644
index 000000000..815c1f058
--- /dev/null
+++ b/include/battle_link_817C95C.h
@@ -0,0 +1,11 @@
+#ifndef GUARD_BATTLE_LINK_817C95C_H
+#define GUARD_BATTLE_LINK_817C95C_H
+
+void sub_817C95C(u16 stringId);
+void sub_817E0FC(u16 move, u16 weatherFlags, struct DisableStruct *disableStructPtr);
+void sub_817E32C(u8 animationId);
+void sub_817E3F4(void);
+void sub_817F2A8(void);
+u8 GetBankMoveSlotId(u8 bank, u16 move);
+
+#endif // GUARD_BATTLE_LINK_817C95C_H
diff --git a/include/link.h b/include/link.h
index b8835ce04..7a6563144 100644
--- a/include/link.h
+++ b/include/link.h
@@ -191,5 +191,6 @@ void sub_800A620(void);
 void sub_8011BD0(void);
 u8 sub_800ABAC(void);
 u8 sub_800ABBC(void);
+void sub_800AC34(void);
 
 #endif // GUARD_LINK_H
diff --git a/include/pokeball.h b/include/pokeball.h
new file mode 100644
index 000000000..76f084465
--- /dev/null
+++ b/include/pokeball.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_POKEBALL_H
+#define GUARD_POKEBALL_H
+
+u8 sub_80753E8(u16, u8);
+void sub_8076918(u8 bank);
+void DoHitAnimHealthboxEffect(u8 bank);
+
+#endif // GUARD_POKEBALL_H