From 31f4edbe503134eba4f7fee8ca9ecc85099c51bd Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 14 Mar 2021 20:10:19 -0400 Subject: Document more symbols in battle --- src/battle_controllers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 583a64eaa..dbcc0594c 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -62,7 +62,7 @@ void SetUpBattleVars(void) gUnknown_2023DDC = 0; } -void sub_800D30C(void) +void InitBtlControllers(void) { s32 i; -- cgit v1.2.3 From 2f4f63afdb6a7b77a8161f0cd42ae64cc5f1515c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Mon, 15 Mar 2021 14:27:50 -0400 Subject: Document old man batttle controller --- src/battle_controllers.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index dbcc0594c..117805d13 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -748,7 +748,7 @@ void BtlController_EmitPrintString(u8 bufferId, u16 stringID) stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = gBattleScripting.battler; - stringInfo->unk1605E = gBattleStruct->field_52; + stringInfo->bakScriptPartyIdx = gBattleStruct->scriptPartyIdx; stringInfo->hpScale = gBattleStruct->hpScale; stringInfo->itemEffectBattler = gPotentialItemEffectBattler; stringInfo->moveType = gBattleMoves[gCurrentMove].type; @@ -778,7 +778,7 @@ void BtlController_EmitPrintSelectionString(u8 bufferId, u16 stringID) stringInfo->lastItem = gLastUsedItem; stringInfo->lastAbility = gLastUsedAbility; stringInfo->scrActive = gBattleScripting.battler; - stringInfo->unk1605E = gBattleStruct->field_52; + stringInfo->bakScriptPartyIdx = gBattleStruct->scriptPartyIdx; for (i = 0; i < MAX_BATTLERS_COUNT; ++i) stringInfo->abilities[i] = gBattleMons[i].ability; for (i = 0; i < TEXT_BUFF_ARRAY_COUNT; ++i) -- cgit v1.2.3 From 6fc2bdf84011a7d68ed76762b50cc84fbf9ff5a7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 09:46:17 -0400 Subject: battle_controller_link_partner sync labels from emerald --- src/battle_controllers.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 117805d13..9796cdd3c 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -1097,13 +1097,13 @@ void BtlController_EmitIntroTrainerBallThrow(u8 bufferId) PrepareBufferDataTransfer(bufferId, sBattleBuffersTransferData, 4); } -void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 arg2) +void BtlController_EmitDrawPartyStatusSummary(u8 bufferId, struct HpAndStatus* hpAndStatus, u8 param) { s32 i; sBattleBuffersTransferData[0] = CONTROLLER_DRAWPARTYSTATUSSUMMARY; - sBattleBuffersTransferData[1] = arg2 & 0x7F; - sBattleBuffersTransferData[2] = (arg2 & 0x80) >> 7; + sBattleBuffersTransferData[1] = param & 0x7F; + sBattleBuffersTransferData[2] = (param & 0x80) >> 7; sBattleBuffersTransferData[3] = CONTROLLER_DRAWPARTYSTATUSSUMMARY; for (i = 0; i < (s32)(sizeof(struct HpAndStatus) * PARTY_SIZE); ++i) sBattleBuffersTransferData[4 + i] = *(i + (u8 *)(hpAndStatus)); -- cgit v1.2.3 From 783488aae5a4421bdca249a18458831704afbab0 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 16:41:28 -0400 Subject: Name nullsubs in battle ctlrs --- src/battle_controllers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 9796cdd3c..80b415824 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -48,7 +48,7 @@ void SetUpBattleVars(void) gBattleMainFunc = nullsub_12; for (i = 0; i < MAX_BATTLERS_COUNT; ++i) { - gBattlerControllerFuncs[i] = nullsub_13; + gBattlerControllerFuncs[i] = PlayerDummy; gBattlerPositions[i] = 0xFF; gActionSelectionCursor[i] = 0; gMoveSelectionCursor[i] = 0; -- cgit v1.2.3 From c4b61cc0ed966a194942256ce6c2936f8183d414 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 16:57:52 -0400 Subject: Document FRLG-unique vars in main.c --- src/battle_controllers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 80b415824..9b8ed77e8 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -481,7 +481,7 @@ static void Task_HandleSendLinkBuffersData(u8 taskId) } } -void sub_800DD28(void) +void TryReceiveLinkBattleData(void) { u8 i; s32 j; -- cgit v1.2.3 From a172f0064c1936fbac56a02ccb386ce16a4edfb2 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 17 Mar 2021 08:34:03 -0400 Subject: Fix accidental ++ deletion --- src/battle_controllers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_controllers.c') diff --git a/src/battle_controllers.c b/src/battle_controllers.c index 9b8ed77e8..a0495ac15 100644 --- a/src/battle_controllers.c +++ b/src/battle_controllers.c @@ -45,7 +45,7 @@ void SetUpBattleVars(void) { s32 i; - gBattleMainFunc = nullsub_12; + gBattleMainFunc = BattleDummy; for (i = 0; i < MAX_BATTLERS_COUNT; ++i) { gBattlerControllerFuncs[i] = PlayerDummy; -- cgit v1.2.3