diff --git a/include/battle_controllers.h b/include/battle_controllers.h index b39db340c..1acd317ac 100644 --- a/include/battle_controllers.h +++ b/include/battle_controllers.h @@ -108,8 +108,8 @@ enum { struct UnusedControllerStruct { - u8 field_0 : 7; - u8 flag_x80 : 1; + u8 unk:7; + u8 flag:1; }; struct HpAndStatus diff --git a/src/battle_controller_link_opponent.c b/src/battle_controller_link_opponent.c index 3c570ad57..741202552 100644 --- a/src/battle_controller_link_opponent.c +++ b/src/battle_controller_link_opponent.c @@ -1450,25 +1450,25 @@ static void LinkOpponentHandleOneReturnValue_Duplicate(void) static void LinkOpponentHandleCmd37(void) { - gUnusedControllerStruct.field_0 = 0; + gUnusedControllerStruct.unk = 0; LinkOpponentBufferExecCompleted(); } static void LinkOpponentHandleCmd38(void) { - gUnusedControllerStruct.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; LinkOpponentBufferExecCompleted(); } static void LinkOpponentHandleCmd39(void) { - gUnusedControllerStruct.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; LinkOpponentBufferExecCompleted(); } static void LinkOpponentHandleCmd40(void) { - gUnusedControllerStruct.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; LinkOpponentBufferExecCompleted(); } diff --git a/src/battle_controller_link_partner.c b/src/battle_controller_link_partner.c index f00a4fc75..3387395de 100644 --- a/src/battle_controller_link_partner.c +++ b/src/battle_controller_link_partner.c @@ -1362,25 +1362,25 @@ static void LinkPartnerHandleOneReturnValue_Duplicate(void) static void LinkPartnerHandleCmd37(void) { - gUnusedControllerStruct.field_0 = 0; + gUnusedControllerStruct.unk = 0; LinkPartnerBufferExecCompleted(); } static void LinkPartnerHandleCmd38(void) { - gUnusedControllerStruct.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; LinkPartnerBufferExecCompleted(); } static void LinkPartnerHandleCmd39(void) { - gUnusedControllerStruct.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; LinkPartnerBufferExecCompleted(); } static void LinkPartnerHandleCmd40(void) { - gUnusedControllerStruct.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; LinkPartnerBufferExecCompleted(); } diff --git a/src/battle_controller_opponent.c b/src/battle_controller_opponent.c index 6913dfbc2..ed88ed9e2 100644 --- a/src/battle_controller_opponent.c +++ b/src/battle_controller_opponent.c @@ -1548,25 +1548,25 @@ static void OpponentHandleOneReturnValue_Duplicate(void) static void OpponentHandleCmd37(void) { - gUnusedControllerStruct.field_0 = 0; + gUnusedControllerStruct.unk = 0; OpponentBufferExecCompleted(); } static void OpponentHandleCmd38(void) { - gUnusedControllerStruct.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; OpponentBufferExecCompleted(); } static void OpponentHandleCmd39(void) { - gUnusedControllerStruct.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; OpponentBufferExecCompleted(); } static void OpponentHandleCmd40(void) { - gUnusedControllerStruct.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; OpponentBufferExecCompleted(); } diff --git a/src/battle_controller_player.c b/src/battle_controller_player.c index 394e72093..8b4914261 100644 --- a/src/battle_controller_player.c +++ b/src/battle_controller_player.c @@ -2626,25 +2626,25 @@ static void PlayerHandleOneReturnValue_Duplicate(void) static void PlayerHandleCmd37(void) { - gUnusedControllerStruct.field_0 = 0; + gUnusedControllerStruct.unk = 0; PlayerBufferExecCompleted(); } static void PlayerHandleCmd38(void) { - gUnusedControllerStruct.field_0 = gBattleBufferA[gActiveBattler][1]; + gUnusedControllerStruct.unk = gBattleBufferA[gActiveBattler][1]; PlayerBufferExecCompleted(); } static void PlayerHandleCmd39(void) { - gUnusedControllerStruct.flag_x80 = 0; + gUnusedControllerStruct.flag = 0; PlayerBufferExecCompleted(); } static void PlayerHandleCmd40(void) { - gUnusedControllerStruct.flag_x80 ^= 1; + gUnusedControllerStruct.flag ^= 1; PlayerBufferExecCompleted(); }