1 files changed, 42 insertions, 31 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 475dcd348..4bc6b7b84 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -54,7 +54,7 @@ enum
     CONTROLLER_SETRAWMONDATA,
     CONTROLLER_LOADMONSPRITE,
     CONTROLLER_SWITCHINANIM,
-    CONTROLLER_RETURNPOKETOBALL,
+    CONTROLLER_RETURNMONTOBALL,
     CONTROLLER_DRAWTRAINERPIC,
     CONTROLLER_TRAINERSLIDE,
     CONTROLLER_TRAINERSLIDEBACK,
@@ -68,17 +68,17 @@ enum
     CONTROLLER_PRINTSTRINGPLAYERONLY,
     CONTROLLER_CHOOSEACTION,
     CONTROLLER_19,
-    CONTROLLER_20,
+    CONTROLLER_CHOOSEMOVE,
     CONTROLLER_OPENBAG,
-    CONTROLLER_22,
+    CONTROLLER_CHOOSEPOKEMON,
     CONTROLLER_23,
     CONTROLLER_HEALTHBARUPDATE,
-    CONTROLLER_EXPBARUPDATE,
+    CONTROLLER_EXPUPDATE,
     CONTROLLER_STATUSICONUPDATE,
     CONTROLLER_STATUSANIMATION,
     CONTROLLER_STATUSXOR,
-    CONTROLLER_29,
-    CONTROLLER_DMATRANSFER,
+    CONTROLLER_DATATRANSFER,
+    CONTROLLER_DMA3TRANSFER,
     CONTROLLER_31,
     CONTROLLER_32,
     CONTROLLER_33,
@@ -92,11 +92,11 @@ enum
     CONTROLLER_HITANIMATION,
     CONTROLLER_42,
     CONTROLLER_EFFECTIVENESSSOUND,
-    CONTROLLER_44,
+    CONTROLLER_PLAYFANFAREORBGM,
     CONTROLLER_FAINTINGCRY,
     CONTROLLER_INTROSLIDE,
-    CONTROLLER_TRAINERBALLTHROW,
-    CONTROLLER_48,
+    CONTROLLER_INTROTRAINERBALLTHROW,
+    CONTROLLER_DRAWPARTYSTATUSSUMMARY,
     CONTROLLER_49,
     CONTROLLER_50,
     CONTROLLER_SPRITEINVISIBILITY,
@@ -114,6 +114,7 @@ void HandleLinkBattleSetup(void);
 void SetUpBattleVarsAndBirchZigzagoon(void);
 void sub_8032768(void);
 void sub_8033648(void);
+void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
 
 // emitters
 void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2);
@@ -122,7 +123,7 @@ void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data);
 void EmitSetRawMonData(u8 bufferId, u8 monId, u8 bytes, void *data); // unused
 void EmitLoadMonSprite(u8 bufferId);
 void EmitSwitchInAnim(u8 bufferId, u8 partyId, bool8 dontClearSubstituteBit);
-void EmitReturnPokeToBall(u8 bufferId, u8 arg1);
+void EmitReturnMonToBall(u8 bufferId, u8 arg1);
 void EmitDrawTrainerPic(u8 bufferId);
 void EmitTrainerSlide(u8 bufferId);
 void EmitTrainerSlideBack(u8 bufferId);
@@ -135,33 +136,43 @@ void EmitMoveAnimation(u8 bufferId, u16 move, u8 turnOfMove, u16 movePower, s32
 void EmitPrintString(u8 bufferId, u16 stringId);
 void EmitPrintStringPlayerOnly(u8 bufferId, u16 stringId);
 void EmitChooseAction(u8 bufferId, u8 arg1, u16 arg2);
-
-
+void EmitCmd19(u8 bufferId);
+void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct *movePpData);
+void EmitOpenBag(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);
-void EmitEffectivenessSound(u8 bufferId, u16 songId);
-void EmitPlaySound(u8 bufferId, u16 songId, u8 arg2);
-void Emit_x2A(u8 bufferId);
 void EmitExpUpdate(u8 bufferId, u8 partyId, u16 expPoints);
-void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
-void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
-void EmitChoosePokemon(u8 bufferId, u8 caseId, u8 arg2, u8 abilityId, u8* arg4);
-void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2);
-void EmitFaintingCry(u8 bufferId);
-void Emit_x37(u8 bufferId, u8 arg1);
-void EmitHitAnimation(u8 bufferId);
-void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
-void EmitCmd49(u8 bufferId);
-void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
-void EmitCmd13(u8 bufferId);
 void EmitStatusIconUpdate(u8 bufferId, u32 status1, u32 status2);
+void EmitStatusAnimation(u8 bufferId, bool8 status2, u32 status);
+void EmitStatusXor(u8 bufferId, u8 b); // unused
+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 EmitCmd33(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 EmitHitAnimation(u8 bufferId);
+void EmitCmd42(u8 bufferId);
+void EmitEffectivenessSound(u8 bufferId, u16 songId);
+void EmitPlayFanfareOrBGM(u8 bufferId, u16 songId, bool8 playBGM);
+void EmitFaintingCry(u8 bufferId);
 void EmitIntroSlide(u8 bufferId, u8 terrainId);
 void EmitIntroTrainerBallThrow(u8 bufferId);
-void EmitChooseMove(u8 bufferId, bool8 isDoubleBattle, bool8 NoPpNumber, struct ChooseMoveStruct* movePpData);
-void EmitOpenBag(u8 bufferId, u8* arg1);
-void Emit_x32(u8 bufferId);
-
+void EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2);
+void EmitCmd49(u8 bufferId);
+void EmitCmd50(u8 bufferId);
+void EmitSpriteInvisibility(u8 bufferId, bool8 isInvisible);
+void EmitBattleAnimation(u8 bufferId, u8 animationId, u16 argument);
+void EmitLinkStandbyMsg(u8 bufferId, u8 arg1, bool32 arg2);
 void EmitResetActionMoveSelection(u8 bufferId, u8 caseId);
-void EmitCmd_x21(u8 bufferId, u8 arg1, u16 arg2);
+void EmitCmd55(u8 bufferId, u8 arg1);
 
 // player controller
 void SetBankFuncToPlayerBufferRunCommand(void);