diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-03-24 23:19:48 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-24 23:19:48 -0400 |
| commit | 35b68c68ee565b9b232252e4f37ea082e9310560 (patch) | |
| tree | aeacb544f27db8f63b17b7e808b28f4a1e12acde /src/battle_main.c | |
| parent | d8b76e6fb545efd69bfb18322a67243520e4d11d (diff) | |
| parent | 7f70b570dd2e18a34a2c0ee558f404c15c77371c (diff) | |
Merge pull request #404 from PikalaxALT/misc_doc
[PARTIALLY LEAK INFORMED] Miscellaneous cleanup and documentation
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/battle_main.c b/src/battle_main.c index d7f43ce75..021a0ca81 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; } @@ -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: |