From 014596dea5e5c0c3e76aa0731d914573597144ef Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Mar 2021 17:50:55 -0400 Subject: Document and refactor AdjustFriendship --- src/battle_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index d7f43ce75..3dd790fb9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -701,7 +701,7 @@ static void CB2_InitBattleInternal(void) } gMain.inBattle = TRUE; for (i = 0; i < PARTY_SIZE; ++i) - AdjustFriendship(&gPlayerParty[i], 3); + AdjustFriendship(&gPlayerParty[i], FRIENDSHIP_EVENT_LEAGUE_BATTLE); gBattleCommunication[MULTIUSE_STATE] = 0; } -- cgit v1.2.3 From 815636f271584b06b778c0d7a3046458e1f42276 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Thu, 18 Mar 2021 18:23:41 -0400 Subject: Document ShouldIgnoreDeoxysForm --- src/battle_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index 3dd790fb9..021a0ca81 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1051,7 +1051,7 @@ static void CB2_HandleStartBattle(void) SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) { - gBattleTypeFlags |= BATTLE_TYPE_20; + gBattleTypeFlags |= BATTLE_TYPE_LINK_ESTABLISHED; } } break; @@ -1409,7 +1409,7 @@ static void CB2_HandleStartMultiBattle(void) gMain.callback1 = BattleMainCB1; SetMainCallback2(BattleMainCB2); if (gBattleTypeFlags & BATTLE_TYPE_LINK) - gBattleTypeFlags |= BATTLE_TYPE_20; + gBattleTypeFlags |= BATTLE_TYPE_LINK_ESTABLISHED; } break; case 5: -- cgit v1.2.3