summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-12-29 16:51:44 -0500
committerGriffinR <griffin.g.richards@gmail.com>2020-12-29 17:21:58 -0500
commit2f426e0e7d70217d50f281484a6772c25e2e39b0 (patch)
tree389f5b20c499c32e507484bf2f44485ffdbcf3d5 /include
parentd74f739e05c4ed9646a9e42b4400243474dd9fa8 (diff)
Index battle controller cmd tables
Diffstat (limited to 'include')
-rw-r--r--include/battle_controllers.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/include/battle_controllers.h b/include/battle_controllers.h
index 32918fefb..5b1ada11a 100644
--- a/include/battle_controllers.h
+++ b/include/battle_controllers.h
@@ -85,8 +85,8 @@ enum
struct UnusedControllerStruct
{
- u8 field_0:7;
- u8 flag_x80:1;
+ u8 unk:7;
+ u8 flag:1;
};
struct HpAndStatus
@@ -145,19 +145,19 @@ enum
CONTROLLER_STATUSXOR,
CONTROLLER_DATATRANSFER,
CONTROLLER_DMA3TRANSFER,
- CONTROLLER_31,
+ CONTROLLER_PLAYBGM,
CONTROLLER_32,
CONTROLLER_TWORETURNVALUES,
CONTROLLER_CHOSENMONRETURNVALUE,
CONTROLLER_ONERETURNVALUE,
CONTROLLER_ONERETURNVALUE_DUPLICATE,
- CONTROLLER_37,
- CONTROLLER_38,
- CONTROLLER_39,
- CONTROLLER_40,
+ CONTROLLER_CLEARUNKVAR,
+ CONTROLLER_SETUNKVAR,
+ CONTROLLER_CLEARUNKFLAG,
+ CONTROLLER_TOGGLEUNKFLAG,
CONTROLLER_HITANIMATION,
CONTROLLER_42,
- CONTROLLER_EFFECTIVENESSSOUND,
+ CONTROLLER_PLAYSE,
CONTROLLER_PLAYFANFAREORBGM,
CONTROLLER_FAINTINGCRY,
CONTROLLER_INTROSLIDE,
@@ -175,7 +175,7 @@ enum
CONTROLLER_CMDS_COUNT
};
-extern struct UnusedControllerStruct gUnknown_02022D0C;
+extern struct UnusedControllerStruct gUnusedControllerStruct;
// general functions
void HandleLinkBattleSetup(void);
@@ -222,10 +222,10 @@ void BtlController_EmitTwoReturnValues(u8 bufferId, u8 arg1, u16 arg2);
void BtlController_EmitChosenMonReturnValue(u8 bufferId, u8 b, u8 *c);
void BtlController_EmitOneReturnValue(u8 bufferId, u16 arg1);
void BtlController_EmitOneReturnValue_Duplicate(u8 bufferId, u16 b);
-void BtlController_EmitCmd37(u8 bufferId); // unused
-void BtlController_EmitCmd38(u8 bufferId, u8 b); // unused
-void BtlController_EmitCmd39(u8 bufferId); // unused
-void BtlController_EmitCmd40(u8 bufferId); // unused
+void BtlController_EmitClearUnkVar(u8 bufferId); // unused
+void BtlController_EmitSetUnkVar(u8 bufferId, u8 b); // unused
+void BtlController_EmitClearUnkFlag(u8 bufferId); // unused
+void BtlController_EmitToggleUnkFlag(u8 bufferId); // unused
void BtlController_EmitHitAnimation(u8 bufferId);
void BtlController_EmitCmd42(u8 bufferId);
void BtlController_EmitPlaySE(u8 bufferId, u16 songId);