From 3a2ea401882d9ce47709d048f57a6d18f890b5f4 Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Wed, 3 Apr 2019 17:24:32 -0400 Subject: Rename and document more contest setup functions Also properly label the link contest flags variable, and label the contest window ID's. --- src/battle_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index 19fd01e3c..7a215384e 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -981,7 +981,7 @@ static void CB2_HandleStartBattle(void) gBattleCommunication[MULTIUSE_STATE] = 1; } if (gWirelessCommType) - sub_800E0E8(); + LoadWirelessStatusIndicatorSprite(); break; case 1: if (gBattleTypeFlags & BATTLE_TYPE_LINK) @@ -1176,7 +1176,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) gBattleCommunication[MULTIUSE_STATE] = 1; } if (gWirelessCommType) - sub_800E0E8(); + LoadWirelessStatusIndicatorSprite(); // fall through case 1: if (gBattleTypeFlags & BATTLE_TYPE_LINK) @@ -1576,7 +1576,7 @@ static void CB2_HandleStartMultiBattle(void) gBattleCommunication[MULTIUSE_STATE] = 1; } if (gWirelessCommType) - sub_800E0E8(); + LoadWirelessStatusIndicatorSprite(); break; case 1: if (gBattleTypeFlags & BATTLE_TYPE_LINK) -- cgit v1.2.3 From 1360b3a477f1107785900cd0c4e73ebf018f058c Mon Sep 17 00:00:00 2001 From: Phlosioneer Date: Thu, 4 Apr 2019 17:05:46 -0400 Subject: RGB Constants --- src/battle_main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index 7a215384e..5bcbc6f59 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -981,7 +981,7 @@ static void CB2_HandleStartBattle(void) gBattleCommunication[MULTIUSE_STATE] = 1; } if (gWirelessCommType) - LoadWirelessStatusIndicatorSprite(); + LoadWirelessStatusIndicatorSpriteGfx(); break; case 1: if (gBattleTypeFlags & BATTLE_TYPE_LINK) @@ -1176,7 +1176,7 @@ static void CB2_HandleStartMultiPartnerBattle(void) gBattleCommunication[MULTIUSE_STATE] = 1; } if (gWirelessCommType) - LoadWirelessStatusIndicatorSprite(); + LoadWirelessStatusIndicatorSpriteGfx(); // fall through case 1: if (gBattleTypeFlags & BATTLE_TYPE_LINK) @@ -1576,7 +1576,7 @@ static void CB2_HandleStartMultiBattle(void) gBattleCommunication[MULTIUSE_STATE] = 1; } if (gWirelessCommType) - LoadWirelessStatusIndicatorSprite(); + LoadWirelessStatusIndicatorSpriteGfx(); break; case 1: if (gBattleTypeFlags & BATTLE_TYPE_LINK) -- cgit v1.2.3