From 34deceb13695e7b13a27ecb94666fc95d2ced550 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Mon, 3 Feb 2020 12:07:02 -0500 Subject: Remove old references to battle pyramid --- src/battle_main.c | 1 - 1 file changed, 1 deletion(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index fd8aeffbc..17fbb58b4 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -4163,7 +4163,6 @@ bool8 TryRunFromBattle(u8 battler) { bool8 effect = FALSE; u8 holdEffect; - u8 pyramidMultiplier; u8 speedVar; if (gBattleMons[battler].item == ITEM_ENIGMA_BERRY) -- cgit v1.2.3 From 4770fac9eb9696236fa998554a353f1f140a1ed4 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Tue, 4 Feb 2020 14:16:45 -0500 Subject: More mevent documentation --- 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 76f373f8f..80a0cd588 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1154,7 +1154,7 @@ static void CB2_PreInitMultiBattle(void) if (gWirelessCommType) sub_800AB9C(); else - sub_800AAC0(); + Link_TryStartSend5FFF(); } break; case 3: -- cgit v1.2.3 From aa4a979334036eb647cef5cd6a4ecd0bcad4b235 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 12 Feb 2020 15:32:14 -0500 Subject: More function documentation in union_room, link, link_rfu_2 --- 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 80a0cd588..3f20399f6 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -1152,7 +1152,7 @@ static void CB2_PreInitMultiBattle(void) { ++gBattleCommunication[MULTIUSE_STATE]; if (gWirelessCommType) - sub_800AB9C(); + PrepareSendLinkCmd2FFE_or_RfuCmd6600(); else Link_TryStartSend5FFF(); } -- cgit v1.2.3 From b7c28c4be76f19d3515ede426ae874390523457f Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Fri, 21 Feb 2020 15:00:56 -0500 Subject: Remove redundant include lines --- src/battle_main.c | 4 ---- 1 file changed, 4 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index faad8bafb..d160436ff 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -8,13 +8,11 @@ #include "battle_message.h" #include "battle_scripts.h" #include "battle_setup.h" -#include "battle_tower.h" #include "battle_string_ids.h" #include "berry.h" #include "bg.h" #include "data.h" #include "decompress.h" -#include "dma3.h" #include "event_data.h" #include "evolution_scene.h" #include "graphics.h" @@ -40,14 +38,12 @@ #include "sound.h" #include "sprite.h" #include "string_util.h" -#include "strings.h" #include "task.h" #include "text.h" #include "trig.h" #include "vs_seeker.h" #include "util.h" #include "window.h" -#include "cable_club.h" #include "constants/abilities.h" #include "constants/battle_move_effects.h" #include "constants/battle_setup.h" -- cgit v1.2.3 From 890d85ff029feb6509bca88ba913580c5c0cd56c Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Sun, 23 Feb 2020 16:26:33 -0500 Subject: battle_bg --- 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 d160436ff..e7d02c673 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -975,7 +975,7 @@ static void CB2_HandleStartBattle(void) ResetBlockReceivedFlags(); sub_8010414(2, playerMultiplayerId); SetAllPlayersBerryData(); - taskId = CreateTask(sub_800F6FC, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 270; gTasks[taskId].data[2] = 90; gTasks[taskId].data[5] = 0; @@ -1223,7 +1223,7 @@ static void CB2_HandleStartMultiBattle(void) SetAllPlayersBerryData(); SetDeoxysStats(); memcpy(gDecompressionBuffer, gPlayerParty, sizeof(struct Pokemon) * 3); - taskId = CreateTask(sub_800F6FC, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 270; gTasks[taskId].data[2] = 90; gTasks[taskId].data[5] = 0; @@ -1781,7 +1781,7 @@ void sub_8011A1C(void) FreeAllSpritePalettes(); gReservedSpritePaletteCount = 4; SetVBlankCallback(VBlankCB_Battle); - taskId = CreateTask(sub_800F6FC, 0); + taskId = CreateTask(InitLinkBattleVsScreen, 0); gTasks[taskId].data[1] = 270; gTasks[taskId].data[2] = 90; gTasks[taskId].data[5] = 1; -- cgit v1.2.3 From 1aa1f189721ba9c21597bae047282c4a785ab400 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Tue, 3 Mar 2020 14:42:15 -0500 Subject: Sync trainer_battle.inc --- 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 e7d02c673..9c573dcba 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -3713,7 +3713,7 @@ static void HandleEndTurn_BattleLost(void) } else { - if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && ScrSpecial_GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL) + if (gBattleTypeFlags & BATTLE_TYPE_TRAINER && GetTrainerBattleMode() == TRAINER_BATTLE_EARLY_RIVAL) { if (GetRivalBattleFlags() & RIVAL_BATTLE_HEAL_AFTER) gBattleCommunication[MULTISTRING_CHOOSER] = 1; // Dont do white out text -- cgit v1.2.3 From 4df660dc76b5f35d2a89e0cb627180b79e9caa12 Mon Sep 17 00:00:00 2001 From: GriffinR Date: Wed, 4 Mar 2020 10:42:40 -0500 Subject: Add enums for help system text, label help context --- src/battle_main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index 9c573dcba..bbfcf5cf9 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -641,17 +641,17 @@ void CB2_InitBattle(void) if (gBattleTypeFlags & BATTLE_TYPE_TRAINER) { if (gBattleTypeFlags & BATTLE_TYPE_DOUBLE) - HelpSystem_SetSomeVariable2(0x19); + SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_DOUBLE); else - HelpSystem_SetSomeVariable2(0x18); + SetHelpContext(HELPCONTEXT_TRAINER_BATTLE_SINGLE); } else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI) { - HelpSystem_SetSomeVariable2(0x1A); + SetHelpContext(HELPCONTEXT_SAFARI_BATTLE); } else { - HelpSystem_SetSomeVariable2(0x17); + SetHelpContext(HELPCONTEXT_WILD_BATTLE); } } } -- cgit v1.2.3