From 6d38431c330a79d97bfb72fdaaaa65901ce0fa64 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Tue, 6 Nov 2018 10:44:48 -0600 Subject: Begin cleaning text.c --- src/contest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/contest.c') diff --git a/src/contest.c b/src/contest.c index 473f77f9c..20e5619f0 100644 --- a/src/contest.c +++ b/src/contest.c @@ -316,11 +316,11 @@ void sub_80D77E4(void) DeactivateAllTextPrinters(); if (gIsLinkContest & 1) { - gTextFlags.flag_0 = FALSE; + gTextFlags.canABSpeedUpPrint = FALSE; } else { - gTextFlags.flag_0 = TRUE; + gTextFlags.canABSpeedUpPrint = TRUE; } } -- cgit v1.2.3 From 9f50ba1ce38dfad92477acf16e2f159c9f410072 Mon Sep 17 00:00:00 2001 From: Diegoisawesome Date: Wed, 7 Nov 2018 12:35:31 -0600 Subject: Fix incorrect compressed types, part 2 --- src/contest.c | 5 ----- 1 file changed, 5 deletions(-) (limited to 'src/contest.c') diff --git a/src/contest.c b/src/contest.c index 20e5619f0..76e13781c 100644 --- a/src/contest.c +++ b/src/contest.c @@ -206,11 +206,6 @@ extern u16 gBattle_WIN0V; extern u16 gBattle_WIN1H; extern u16 gBattle_WIN1V; -extern const u8 gContestMiscGfx[]; -extern const u8 gContestAudienceGfx[]; -extern const u8 gUnknown_08C16FA8[]; -extern const u8 gUnknown_08C16E90[]; -extern const u8 gUnknown_08C17170[]; extern const u16 gUnknown_08587C30[]; extern const struct BgTemplate gUnknown_08587F34[4]; extern const struct WindowTemplate gUnknown_08587F44[]; -- cgit v1.2.3 From 72f0a079a9221e314e7eecf0e920313bf83d32ac Mon Sep 17 00:00:00 2001 From: Marcus Huderle Date: Mon, 19 Nov 2018 09:28:55 -0600 Subject: Decompile all of battle_anim_utility_funcs --- src/contest.c | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) (limited to 'src/contest.c') diff --git a/src/contest.c b/src/contest.c index 76e13781c..0c3a041b0 100644 --- a/src/contest.c +++ b/src/contest.c @@ -193,19 +193,6 @@ EWRAM_DATA struct ContestWinner gUnknown_02039F3C = {0}; u32 gContestRngValue; -extern u16 gBattle_BG0_X; -extern u16 gBattle_BG0_Y; -extern u16 gBattle_BG1_X; -extern s16 gBattle_BG1_Y; -extern u16 gBattle_BG2_X; -extern u16 gBattle_BG2_Y; -extern u16 gBattle_BG3_X; -extern u16 gBattle_BG3_Y; -extern u16 gBattle_WIN0H; -extern u16 gBattle_WIN0V; -extern u16 gBattle_WIN1H; -extern u16 gBattle_WIN1V; - extern const u16 gUnknown_08587C30[]; extern const struct BgTemplate gUnknown_08587F34[4]; extern const struct WindowTemplate gUnknown_08587F44[]; @@ -638,7 +625,8 @@ void sub_80D8108(u8 taskId) gTasks[taskId].data[0]++; break; case 1: - if ((gBattle_BG1_Y += 7) <= 160) + (s16)gBattle_BG1_Y += 7; + if ((s16)gBattle_BG1_Y <= 160) break; gTasks[taskId].data[0]++; break; @@ -1915,9 +1903,9 @@ void sub_80DA6B4(u8 taskId) void sub_80DA700(u8 taskId) { gBattle_BG1_Y -= 7; - if (gBattle_BG1_Y < 0) + if ((s16)gBattle_BG1_Y < 0) gBattle_BG1_Y = 0; - if (*(u16 *)&gBattle_BG1_Y == 0) // Why cast? + if (gBattle_BG1_Y == 0) // Why cast? { gTasks[taskId].func = sub_80DA740; gTasks[taskId].data[0] = 0; -- cgit v1.2.3