label and do more work at player controller

1 files changed, 72 insertions, 19 deletions

diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 1c076b3e0..0b8fb0c0e 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -1,16 +1,69 @@
 #ifndef GUARD_BATTLE_CONTROLLERS_H
 #define GUARD_BATTLE_CONTROLLERS_H
 
-#define REQUEST_ALL_BATTLE      0x0
-#define REQUEST_SPECIES_BATTLE  0x1
-#define REQUEST_HELDITEM_BATTLE 0x2
-#define REQUEST_MOVES_PP_BATTLE 0x3
-#define REQUEST_PPMOVE1_BATTLE  0x9
-#define REQUEST_PPMOVE2_BATTLE  0xA
-#define REQUEST_PPMOVE3_BATTLE  0xB
-#define REQUEST_PPMOVE4_BATTLE  0xC
-#define REQUEST_STATUS_BATTLE   0x28
-#define REQUEST_HP_BATTLE       0x2A
+enum
+{
+    REQUEST_ALL_BATTLE,
+    REQUEST_SPECIES_BATTLE,
+    REQUEST_HELDITEM_BATTLE,
+    REQUEST_MOVES_PP_BATTLE,
+    REQUEST_MOVE1_BATTLE,
+    REQUEST_MOVE2_BATTLE,
+    REQUEST_MOVE3_BATTLE,
+    REQUEST_MOVE4_BATTLE,
+    REQUEST_PP_DATA_BATTLE,
+    REQUEST_PPMOVE1_BATTLE,
+    REQUEST_PPMOVE2_BATTLE,
+    REQUEST_PPMOVE3_BATTLE,
+    REQUEST_PPMOVE4_BATTLE,
+    REQUEST_UNUSED_13_BATTLE,
+    REQUEST_UNUSED_14_BATTLE,
+    REQUEST_UNUSED_15_BATTLE,
+    REQUEST_UNUSED_16_BATTLE,
+    REQUEST_OTID_BATTLE,
+    REQUEST_EXP_BATTLE,
+    REQUEST_HP_EV_BATTLE,
+    REQUEST_ATK_EV_BATTLE,
+    REQUEST_DEF_EV_BATTLE,
+    REQUEST_SPEED_EV_BATTLE,
+    REQUEST_SPATK_EV_BATTLE,
+    REQUEST_SPDEF_EV_BATTLE,
+    REQUEST_FRIENDSHIP_BATTLE,
+    REQUEST_POKERUS_BATTLE,
+    REQUEST_MET_LOCATION_BATTLE,
+    REQUEST_MET_LEVEL_BATTLE,
+    REQUEST_MET_GAME_BATTLE,
+    REQUEST_POKEBALL_BATTLE,
+    REQUEST_ALL_IVS_BATTLE,
+    REQUEST_HP_IV_BATTLE,
+    REQUEST_ATK_IV_BATTLE,
+    REQUEST_DEF_IV_BATTLE,
+    REQUEST_SPEED_IV_BATTLE,
+    REQUEST_SPATK_IV_BATTLE,
+    REQUEST_SPDEF_IV_BATTLE,
+    REQUEST_PERSONALITY_BATTLE,
+    REQUEST_CHECKSUM_BATTLE,
+    REQUEST_STATUS_BATTLE,
+    REQUEST_LEVEL_BATTLE,
+    REQUEST_HP_BATTLE,
+    REQUEST_MAX_HP_BATTLE,
+    REQUEST_ATK_BATTLE,
+    REQUEST_DEF_BATTLE,
+    REQUEST_SPEED_BATTLE,
+    REQUEST_SPATK_BATTLE,
+    REQUEST_SPDEF_BATTLE,
+    REQUEST_COOL_BATTLE,
+    REQUEST_BEAUTY_BATTLE,
+    REQUEST_CUTE_BATTLE,
+    REQUEST_SMART_BATTLE,
+    REQUEST_TOUGH_BATTLE,
+    REQUEST_SHEEN_BATTLE,
+    REQUEST_COOL_RIBBON_BATTLE,
+    REQUEST_BEAUTY_RIBBON_BATTLE,
+    REQUEST_CUTE_RIBBON_BATTLE,
+    REQUEST_SMART_RIBBON_BATTLE,
+    REQUEST_TOUGH_RIBBON_BATTLE,
+};
 
 #define RESET_ACTION_MOVE_SELECTION     0
 #define RESET_ACTION_SELECTION          1
@@ -31,7 +84,7 @@ struct HpAndStatus
 
 struct MovePpInfo
 {
-    u16 move[4];
+    u16 moves[4];
     u8 pp[4];
     u8 ppBonuses;
 };
@@ -59,7 +112,7 @@ enum
     CONTROLLER_TRAINERSLIDE,
     CONTROLLER_TRAINERSLIDEBACK,
     CONTROLLER_FAINTANIMATION,
-    CONTROLLER_11,
+    CONTROLLER_PALETTEFADE,
     CONTROLLER_12,
     CONTROLLER_BALLTHROW,
     CONTROLLER_PAUSE,
@@ -67,7 +120,7 @@ enum
     CONTROLLER_PRINTSTRING,
     CONTROLLER_PRINTSTRINGPLAYERONLY,
     CONTROLLER_CHOOSEACTION,
-    CONTROLLER_19,
+    CONTROLLER_YESNOBOX,
     CONTROLLER_CHOOSEMOVE,
     CONTROLLER_OPENBAG,
     CONTROLLER_CHOOSEPOKEMON,
@@ -81,7 +134,7 @@ enum
     CONTROLLER_DMA3TRANSFER,
     CONTROLLER_31,
     CONTROLLER_32,
-    CONTROLLER_33,
+    CONTROLLER_CHOICERETURNVALUE,
     CONTROLLER_34,
     CONTROLLER_35,
     CONTROLLER_36,
@@ -117,9 +170,9 @@ void sub_8033648(void);
 void PrepareBufferDataTransferLink(u8 bufferId, u16 size, u8 *data);
 
 // emitters
-void EmitGetMonData(u8 bufferId, u8 arg1, u8 arg2);
+void EmitGetMonData(u8 bufferId, u8 requestId, u8 monsToCheck);
 void EmitGetRawMonData(u8 bufferId, u8 monId, u8 bytes); // unused
-void EmitSetMonData(u8 bufferId, u8 request, u8 c, u8 bytes, void *data);
+void EmitSetMonData(u8 bufferId, u8 requestId, u8 monsToCheck, 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);
@@ -128,7 +181,7 @@ void EmitDrawTrainerPic(u8 bufferId);
 void EmitTrainerSlide(u8 bufferId);
 void EmitTrainerSlideBack(u8 bufferId);
 void EmitFaintAnimation(u8 bufferId);
-void EmitCmd11(u8 bufferId); // unused
+void EmitPaletteFade(u8 bufferId); // unused
 void EmitCmd12(u8 bufferId); // unused
 void EmitBallThrow(u8 bufferId, u8 caseId);
 void EmitPause(u8 bufferId, u8 toWait, void *data); // unused
@@ -136,7 +189,7 @@ 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 EmitYesNoBox(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);
@@ -150,7 +203,7 @@ 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 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);