summaryrefslogtreecommitdiff
path: root/src/battle_bg.c
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2018-07-22 12:49:49 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2018-07-22 12:49:49 +0200
commitc9d486a5d3ea6bf7d256c2d7ca7f10339e498427 (patch)
tree2113f75d105acb6bc3c13fb4d1069d6510ff0b85 /src/battle_bg.c
parent377280ac3beb96cef5f0842650a6c80dc46d470c (diff)
make union room compile i guess
Diffstat (limited to 'src/battle_bg.c')
-rw-r--r--src/battle_bg.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/battle_bg.c b/src/battle_bg.c
index d4bfd297a..6520438a0 100644
--- a/src/battle_bg.c
+++ b/src/battle_bg.c
@@ -278,7 +278,7 @@ static void sub_8035C4C(void)
{
if (gBattleOutcome == B_OUTCOME_WON)
{
- switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
+ switch (gLinkPlayers[gBattleScripting.multiplayerId].id)
{
case 0:
BattleHandleAddTextPrinter(gText_Win, 0x16);
@@ -300,7 +300,7 @@ static void sub_8035C4C(void)
}
else
{
- switch (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18)
+ switch (gLinkPlayers[gBattleScripting.multiplayerId].id)
{
case 0:
BattleHandleAddTextPrinter(gText_Win, 0x17);
@@ -323,7 +323,7 @@ static void sub_8035C4C(void)
}
else if (gBattleOutcome == B_OUTCOME_WON)
{
- if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
+ if (gLinkPlayers[gBattleScripting.multiplayerId].id != 0)
{
BattleHandleAddTextPrinter(gText_Win, 0x17);
BattleHandleAddTextPrinter(gText_Loss, 0x16);
@@ -336,7 +336,7 @@ static void sub_8035C4C(void)
}
else
{
- if (gLinkPlayers[gBattleScripting.multiplayerId].lp_field_18 != 0)
+ if (gLinkPlayers[gBattleScripting.multiplayerId].id != 0)
{
BattleHandleAddTextPrinter(gText_Win, 0x16);
BattleHandleAddTextPrinter(gText_Loss, 0x17);
@@ -365,23 +365,23 @@ void sub_8035D74(u8 taskId)
name = gLinkPlayers[i].name;
linkPlayer = &gLinkPlayers[i];
- switch (linkPlayer->lp_field_18)
+ switch (linkPlayer->id)
{
case 0:
BattleHandleAddTextPrinter(name, 0x11);
- sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 4);
+ sub_8035AE4(taskId, linkPlayer->id, 1, 2, 4);
break;
case 1:
BattleHandleAddTextPrinter(name, 0x12);
- sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 4);
+ sub_8035AE4(taskId, linkPlayer->id, 2, 2, 4);
break;
case 2:
BattleHandleAddTextPrinter(name, 0x13);
- sub_8035AE4(taskId, linkPlayer->lp_field_18, 1, 2, 8);
+ sub_8035AE4(taskId, linkPlayer->id, 1, 2, 8);
break;
case 3:
BattleHandleAddTextPrinter(name, 0x14);
- sub_8035AE4(taskId, linkPlayer->lp_field_18, 2, 2, 8);
+ sub_8035AE4(taskId, linkPlayer->id, 2, 2, 8);
break;
}
}
@@ -392,7 +392,7 @@ void sub_8035D74(u8 taskId)
u8 opponentId = playerId ^ BIT_SIDE;
u8 opponentId_copy = opponentId;
- if (gLinkPlayers[playerId].lp_field_18 != 0)
+ if (gLinkPlayers[playerId].id != 0)
opponentId = playerId, playerId = opponentId_copy;
name = gLinkPlayers[playerId].name;