Skip to content

Commit

Permalink
Change capitalization
Browse files Browse the repository at this point in the history
  • Loading branch information
@drgoku282
drgoku282 committed Mar 25, 2017
1 parent 0097cd4 commit f3d3832
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 25 deletions.
8 changes: 4 additions & 4 deletions PKMN-NTR/Bot/Bot.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public static void Report(string message)
Program.gCmdWindow.addtoLog(message);
}

public static bool isLegal(PKM poke)
public static bool IsLegal(PKM poke)
{
if (poke.GenNumber >= 6)
{
Expand All @@ -27,12 +27,12 @@ public static bool isLegal(PKM poke)
}
}

public static uint getBoxOff(uint startOff, NumericUpDown boxSource, NumericUpDown slotSource)
public static uint GetBoxOff(uint startOff, NumericUpDown boxSource, NumericUpDown slotSource)
{
return startOff + (uint)(boxSource.Value - 1) * 30 * 232 + (uint)(slotSource.Value - 1) * 232;
}

public static int getIndex(NumericUpDown ctrl)
public static int GetIndex(NumericUpDown ctrl)
{
return (int)ctrl.Value - 1;
}
Expand Down Expand Up @@ -251,7 +251,7 @@ private static bool IVCheck(int refiv, int actualiv, int logic)
}
}

public static void showResult(string source, ErrorMessage message, int[] info = null)
public static void ShowResult(string source, ErrorMessage message, int[] info = null)
{
switch (message)
{
Expand Down
6 changes: 3 additions & 3 deletions PKMN-NTR/Bot/Bot_Breeding6.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -795,7 +795,7 @@ public async void RunBot()
case breedbotstates.touchnewbox:
Report("Bot: Touch New Box");
await Task.Delay(commanddelay);
waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[getIndex(Box)], LookupTable.boxposY6[getIndex(Box)]);
waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[GetIndex(Box)], LookupTable.boxposY6[GetIndex(Box)]);
if (await waitTaskbool)
{
attempts = 0;
Expand Down Expand Up @@ -861,7 +861,7 @@ public async void RunBot()
case breedbotstates.moveegg:
Report("Move Egg");
await Task.Delay(commanddelay);
waitTaskbool = Program.helper.waitholdtouch(LookupTable.pokeposX6[getIndex(Slot)], LookupTable.pokeposY6[getIndex(Slot)]);
waitTaskbool = Program.helper.waitholdtouch(LookupTable.pokeposX6[GetIndex(Slot)], LookupTable.pokeposY6[GetIndex(Slot)]);
if (await waitTaskbool)
{
botState = breedbotstates.releaseegg;
Expand Down Expand Up @@ -1257,7 +1257,7 @@ public async void RunBot()
{
botresult = ErrorMessage.Disconnect;
}
showResult("Breeding bot", botresult, finishmessage);
ShowResult("Breeding bot", botresult, finishmessage);
Delg.SetText(RunStop, "Start Bot");
Program.gCmdWindow.botMode(false);
EnableControls();
Expand Down
4 changes: 2 additions & 2 deletions PKMN-NTR/Bot/Bot_Breeding7.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ public async void RunBot()

case breedbotstates.selectbox:
Report("Bot: Set start box");
waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)getIndex(Box), Program.gCmdWindow.pid);
waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)GetIndex(Box), Program.gCmdWindow.pid);
if (await waitTaskbool)
{
attempts = 0;
Expand Down Expand Up @@ -536,7 +536,7 @@ public async void RunBot()
{
botresult = ErrorMessage.Disconnect;
}
showResult("Breeding bot", botresult, finishmessage);
ShowResult("Breeding bot", botresult, finishmessage);
Delg.SetText(RunStop, "Start Bot");
Program.gCmdWindow.botMode(false);
EnableControls();
Expand Down
2 changes: 1 addition & 1 deletion PKMN-NTR/Bot/Bot_SoftReset6.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -977,7 +977,7 @@ public async void RunBot()
{
botresult = ErrorMessage.Disconnect;
}
showResult("Soft-reset bot", botresult, finishmessage);
ShowResult("Soft-reset bot", botresult, finishmessage);
Delg.SetText(RunStop, "Start Bot");
Program.gCmdWindow.botMode(false);
EnableControls();
Expand Down
2 changes: 1 addition & 1 deletion PKMN-NTR/Bot/Bot_SoftReset7.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -900,7 +900,7 @@ public async void RunBot()
{
botresult = ErrorMessage.Disconnect;
}
showResult("Soft-reset bot", botresult, finishmessage);
ShowResult("Soft-reset bot", botresult, finishmessage);
Delg.SetText(RunStop, "Start Bot");
Program.gCmdWindow.botMode(false);
EnableControls();
Expand Down
14 changes: 7 additions & 7 deletions PKMN-NTR/Bot/Bot_WonderTrade6.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ public async void RunBot()
else
{ // Valid pkm, check legality
attempts = 0;
if (isLegal(WTpoke) || Program.gCmdWindow.enableillegal)
if (IsLegal(WTpoke) || Program.gCmdWindow.enableillegal)
{
if (Program.gCmdWindow.enableillegal)
{
Expand Down Expand Up @@ -279,7 +279,7 @@ public async void RunBot()
if (temp.Length == 232)
{
PK6 pkmn = new PK6(temp);
if (isLegal(pkmn) || Program.gCmdWindow.enableillegal)
if (IsLegal(pkmn) || Program.gCmdWindow.enableillegal)
{ // Legal pkm
Report("Bot: Illegal pokémon, will write it anyways");
pklist.Add(pkmn);
Expand Down Expand Up @@ -313,7 +313,7 @@ public async void RunBot()
{ // Select a random file
currentfile = RNG.Next() % pklist.Count;
}
waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid);
waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid);
if (await waitTaskbool)
{
Program.gCmdWindow.updateDumpBoxes(Box, Slot);
Expand Down Expand Up @@ -479,7 +479,7 @@ public async void RunBot()
case botstates.touchnewbox:
Report("Bot: Touch New Box");
await Task.Delay(delaytime);
waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[getIndex(Box)], LookupTable.boxposY6[getIndex(Box)]);
waitTaskbool = Program.helper.waittouch(LookupTable.boxposX6[GetIndex(Box)], LookupTable.boxposY6[GetIndex(Box)]);
if (await waitTaskbool)
{
attempts = 0;
Expand Down Expand Up @@ -528,7 +528,7 @@ public async void RunBot()
case botstates.touchpoke:
Report("Bot: Touch Pokémon");
await Task.Delay(delaytime);
waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX6[getIndex(Slot)], LookupTable.pokeposY6[getIndex(Slot)]);
waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX6[GetIndex(Slot)], LookupTable.pokeposY6[GetIndex(Slot)]);
if (await waitTaskbool)
{
attempts = 0;
Expand Down Expand Up @@ -738,7 +738,7 @@ public async void RunBot()
{
Program.gCmdWindow.SAV.BlankPKM.EncryptedBoxData.CopyTo(deletearray, i * 232);
}
waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid);
waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid);
if (await waitTaskbool)
{
attempts = 0;
Expand Down Expand Up @@ -809,7 +809,7 @@ public async void RunBot()
{
botresult = ErrorMessage.Disconnect;
}
showResult("Wonder Trade bot", botresult);
ShowResult("Wonder Trade bot", botresult);
Delg.SetText(RunStop, "Start Bot");
Program.gCmdWindow.botMode(false);
EnableControls();
Expand Down
14 changes: 7 additions & 7 deletions PKMN-NTR/Bot/Bot_WonderTrade7.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ public async void RunBot()
else
{ // Valid pkm, check legality
attempts = 0;
if (isLegal(WTpoke) || Program.gCmdWindow.enableillegal)
if (IsLegal(WTpoke) || Program.gCmdWindow.enableillegal)
{
if (Program.gCmdWindow.enableillegal)
{
Expand Down Expand Up @@ -295,7 +295,7 @@ public async void RunBot()
if (temp.Length == 232)
{
PK7 pkmn = new PK7(temp);
if (isLegal(pkmn))
if (IsLegal(pkmn))
{ // Legal pkm
Report("Bot: Illegal pokémon, will write it anyways");
pklist.Add(pkmn);
Expand Down Expand Up @@ -329,7 +329,7 @@ public async void RunBot()
{ // Select a random file
currentfile = RNG.Next() % pklist.Count;
}
waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid);
waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), pklist[currentfile].EncryptedBoxData, Program.gCmdWindow.pid);
if (await waitTaskbool)
{
Program.gCmdWindow.updateDumpBoxes(Box, Slot);
Expand Down Expand Up @@ -358,7 +358,7 @@ public async void RunBot()
if (boxchange)
{
Report("Bot: Set current box");
waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)getIndex(Box), Program.gCmdWindow.pid);
waitTaskbool = Program.helper.waitNTRwrite(currentboxOff, (uint)GetIndex(Box), Program.gCmdWindow.pid);
if (await waitTaskbool)
{
attempts = 0;
Expand Down Expand Up @@ -465,7 +465,7 @@ public async void RunBot()
case botstates.touchpoke:
Report("Bot: Touch pokémon");
await Task.Delay(4 * delaytime);
waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX7[getIndex(Slot)], LookupTable.pokeposY7[getIndex(Slot)]);
waitTaskbool = Program.helper.waittouch(LookupTable.pokeposX7[GetIndex(Slot)], LookupTable.pokeposY7[GetIndex(Slot)]);
if (await waitTaskbool)
{
botstate = botstates.testpoke;
Expand Down Expand Up @@ -824,7 +824,7 @@ public async void RunBot()
{
Program.gCmdWindow.SAV.BlankPKM.EncryptedBoxData.CopyTo(deletearray, i * 232);
}
waitTaskbool = Program.helper.waitNTRwrite(getBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid);
waitTaskbool = Program.helper.waitNTRwrite(GetBoxOff(pcpkmOff, Box, Slot), deletearray, Program.gCmdWindow.pid);
if (await waitTaskbool)
{
attempts = 0;
Expand Down Expand Up @@ -897,7 +897,7 @@ public async void RunBot()
{
botresult = ErrorMessage.Disconnect;
}
showResult("Wonder Trade bot", botresult);
ShowResult("Wonder Trade bot", botresult);
Delg.SetText(RunStop, "Start Bot");
Program.gCmdWindow.botMode(false);
EnableControls();
Expand Down

0 comments on commit f3d3832

Please sign in to comment.