Undo PokeCodec's PRs
This commit undoes most of PokeCodec's PRs after the debate in chat. Some harmless or completely superseded PRs have been left alone, as there is not much benefit in attempting to undo them. Reverts #1104, #1108, #1115, #1118, #1119, #1124, #1126, #1127, #1132, #1136, #1137, #1139, #1140, #1144, #1148, #1149, #1150, #1153, #1155, #1177, #1179, #1180, #1181, #1182 and #1183.
This commit is contained in:
+4
-4
@@ -1253,7 +1253,7 @@ static bool32 sub_81962D8(u8 taskId)
|
||||
static bool32 sub_8196330(u8 taskId)
|
||||
{
|
||||
s16 *taskData = gTasks[taskId].data;
|
||||
if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && JOY_NEW(A_BUTTON | B_BUTTON))
|
||||
if (!ExecuteMatchCallTextPrinter(taskData[2]) && !IsSEPlaying() && gMain.newKeys & (A_BUTTON | B_BUTTON))
|
||||
{
|
||||
FillWindowPixelBuffer(taskData[2], PIXEL_FILL(8));
|
||||
CopyWindowToVram(taskData[2], 2);
|
||||
@@ -1335,7 +1335,7 @@ static void InitMatchCallTextPrinter(int windowId, const u8 *str)
|
||||
printerTemplate.currentY = 1;
|
||||
printerTemplate.letterSpacing = 0;
|
||||
printerTemplate.lineSpacing = 0;
|
||||
printerTemplate.style = 0;
|
||||
printerTemplate.unk = 0;
|
||||
printerTemplate.fgColor = 10;
|
||||
printerTemplate.bgColor = 8;
|
||||
printerTemplate.shadowColor = 14;
|
||||
@@ -1346,7 +1346,7 @@ static void InitMatchCallTextPrinter(int windowId, const u8 *str)
|
||||
|
||||
static bool32 ExecuteMatchCallTextPrinter(int windowId)
|
||||
{
|
||||
if (JOY_HELD(A_BUTTON))
|
||||
if (gMain.heldKeys & A_BUTTON)
|
||||
gTextFlags.canABSpeedUpPrint = 1;
|
||||
else
|
||||
gTextFlags.canABSpeedUpPrint = 0;
|
||||
@@ -1774,7 +1774,7 @@ static int GetNumOwnedBadges(void)
|
||||
static bool32 sub_8196D74(int matchCallId)
|
||||
{
|
||||
int dayCount;
|
||||
u32 otId;
|
||||
int otId;
|
||||
u16 easyChatWord;
|
||||
int numRematchTrainersFought;
|
||||
int var0, var1, var2;
|
||||
|
||||
Reference in New Issue
Block a user