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/trade_scene.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/trade_scene.c') diff --git a/src/trade_scene.c b/src/trade_scene.c index f068b17d4..a1b5e2d93 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -2546,7 +2546,7 @@ static void sub_8053E8C(void) DrawTextOnTradeWindow(0, gStringVar4, 0); break; case 1: - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); gMain.state = 100; sTradeData->timer = 0; break; @@ -2631,7 +2631,7 @@ static void sub_8053E8C(void) case 41: if (sTradeData->timer == 0) { - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); gMain.state = 42; } else @@ -2650,7 +2650,7 @@ static void sub_8053E8C(void) if (++sTradeData->timer > 60) { gMain.state++; - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); } break; case 6: @@ -2672,11 +2672,11 @@ static void sub_8053E8C(void) { if (gWirelessCommType && gMain.savedCallback == CB2_ReturnFromLinkTrade) { - PrepareSendLinkCmd2FFE_or_RfuCmd6600(); + SetLinkStandbyCallback(); } else { - Link_TryStartSend5FFF(); + SetCloseLinkCallback(); } gMain.state++; } -- cgit v1.2.3 From 4d86834d12f788d78ec0ae9fc4ba999f7a0e1fc7 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 16 Mar 2021 21:16:31 -0400 Subject: Document item use functions in pokemon.c --- src/trade_scene.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/trade_scene.c') diff --git a/src/trade_scene.c b/src/trade_scene.c index a1b5e2d93..37550dc09 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -1725,7 +1725,7 @@ static bool8 DoTradeAnim_Cable(void) case 72: // Only if in-game trade TradeMons(gSpecialVar_0x8005, 0); gCB2_AfterEvolution = CB2_RunTradeAnim_InGameTrade; - evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], TRUE, ITEM_NONE); + evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVOTRIGGER_TRADE, ITEM_NONE); if (evoTarget != SPECIES_NONE) { TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[0]], evoTarget, sTradeData->pokePicSpriteIdxs[1], gSelectedTradeMonPositions[0]); @@ -2246,7 +2246,7 @@ static bool8 DoTradeAnim_Wireless(void) case 72: // Only if in-game trade TradeMons(gSpecialVar_0x8005, 0); gCB2_AfterEvolution = CB2_RunTradeAnim_InGameTrade; - evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], TRUE, ITEM_NONE); + evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVOTRIGGER_TRADE, ITEM_NONE); if (evoTarget != SPECIES_NONE) { TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[0]], evoTarget, sTradeData->pokePicSpriteIdxs[1], gSelectedTradeMonPositions[0]); @@ -2290,7 +2290,7 @@ static void sub_8053788(void) break; case 4: gCB2_AfterEvolution = sub_8053E8C; - evoSpecies = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], 1, 0); + evoSpecies = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVOTRIGGER_TRADE, 0); if (evoSpecies != SPECIES_NONE) TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[0]], evoSpecies, sTradeData->pokePicSpriteIdxs[1], gSelectedTradeMonPositions[0]); else -- cgit v1.2.3 From c779411957262dc5971813a3f75d157190d9db51 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Mar 2021 13:14:08 -0400 Subject: Sync EVO_MODE consts from emerald --- src/trade_scene.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/trade_scene.c') diff --git a/src/trade_scene.c b/src/trade_scene.c index 37550dc09..b259ba939 100644 --- a/src/trade_scene.c +++ b/src/trade_scene.c @@ -1725,7 +1725,7 @@ static bool8 DoTradeAnim_Cable(void) case 72: // Only if in-game trade TradeMons(gSpecialVar_0x8005, 0); gCB2_AfterEvolution = CB2_RunTradeAnim_InGameTrade; - evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVOTRIGGER_TRADE, ITEM_NONE); + evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVO_MODE_TRADE, ITEM_NONE); if (evoTarget != SPECIES_NONE) { TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[0]], evoTarget, sTradeData->pokePicSpriteIdxs[1], gSelectedTradeMonPositions[0]); @@ -2246,7 +2246,7 @@ static bool8 DoTradeAnim_Wireless(void) case 72: // Only if in-game trade TradeMons(gSpecialVar_0x8005, 0); gCB2_AfterEvolution = CB2_RunTradeAnim_InGameTrade; - evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVOTRIGGER_TRADE, ITEM_NONE); + evoTarget = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVO_MODE_TRADE, ITEM_NONE); if (evoTarget != SPECIES_NONE) { TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[0]], evoTarget, sTradeData->pokePicSpriteIdxs[1], gSelectedTradeMonPositions[0]); @@ -2290,7 +2290,7 @@ static void sub_8053788(void) break; case 4: gCB2_AfterEvolution = sub_8053E8C; - evoSpecies = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVOTRIGGER_TRADE, 0); + evoSpecies = GetEvolutionTargetSpecies(&gPlayerParty[gSelectedTradeMonPositions[0]], EVO_MODE_TRADE, 0); if (evoSpecies != SPECIES_NONE) TradeEvolutionScene(&gPlayerParty[gSelectedTradeMonPositions[0]], evoSpecies, sTradeData->pokePicSpriteIdxs[1], gSelectedTradeMonPositions[0]); else -- cgit v1.2.3