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
@@ -406,7 +406,7 @@ void StartPokemonJump(u16 partyIndex, MainCallback callback)
|
||||
|
||||
if (gReceivedRemoteLinkPlayers)
|
||||
{
|
||||
gUnknown_02022CFC = Alloc(sizeof(struct PokemonJump1));
|
||||
gUnknown_02022CFC = Alloc(sizeof(*gUnknown_02022CFC));
|
||||
if (gUnknown_02022CFC)
|
||||
{
|
||||
ResetTasks();
|
||||
@@ -1245,7 +1245,7 @@ static bool32 sub_802B8CC(void)
|
||||
break;
|
||||
// fall through
|
||||
case 1:
|
||||
if (JOY_NEW(A_BUTTON))
|
||||
if (gMain.newKeys & A_BUTTON)
|
||||
{
|
||||
sub_802C164();
|
||||
sub_802AE14(3);
|
||||
@@ -1336,7 +1336,7 @@ static bool32 sub_802BA58(void)
|
||||
case 2:
|
||||
case 5:
|
||||
gUnknown_02022CFC->unk3C++;
|
||||
if (JOY_NEW(A_BUTTON | B_BUTTON) || gUnknown_02022CFC->unk3C > 180)
|
||||
if (gMain.newKeys & (A_BUTTON | B_BUTTON) || gUnknown_02022CFC->unk3C > 180)
|
||||
{
|
||||
sub_802DA14();
|
||||
gUnknown_02022CFC->unkA++;
|
||||
@@ -3922,7 +3922,7 @@ static void Task_ShowPokemonJumpRecords(u8 taskId)
|
||||
data[0]++;
|
||||
break;
|
||||
case 2:
|
||||
if (JOY_NEW(A_BUTTON | B_BUTTON))
|
||||
if (gMain.newKeys & (A_BUTTON | B_BUTTON))
|
||||
{
|
||||
rbox_fill_rectangle(data[1]);
|
||||
CopyWindowToVram(data[1], 1);
|
||||
|
||||
Reference in New Issue
Block a user