From 6d16dba22e9ea2b40bf684f7549b73a583d143f6 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Mon, 8 Jan 2018 23:16:13 -0600 Subject: re-label some window and text code --- src/easy_chat_2.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'src/easy_chat_2.c') diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index fe3aa7cc9..5acdba04e 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1068,13 +1068,13 @@ void sub_80E91D4(u8 a) if (a == 10) { - MenuZeroFillWindowRect(3, 14, 26, 19); + Menu_EraseWindowRect(3, 14, 26, 19); sub_80E9198(10); return; } if (sub_80E91A4() == 10) - MenuDrawTextWindow(3, 14, 26, 19); + Menu_DrawStdWindowFrame(3, 14, 26, 19); sub_80E9198(a); switch (a) @@ -1175,7 +1175,7 @@ void sub_80E9368(u8 a) if (r4 != NULL) { sub_8072C74(gEasyChatStruct->unk9F8E + 3, r4, 240, 2); - MenuPrint(gEasyChatStruct->unk9F8E, 0, 0); + Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0); } else { @@ -1186,8 +1186,8 @@ void sub_80E9368(u8 a) str[2] = 0x10; str[3] = EOS; - MenuPrint(gEasyChatStruct->unk9F8E, 0, 0); - MenuPrint(gEasyChatStruct->unk9F8E, 28, 0); + Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0); + Menu_PrintText(gEasyChatStruct->unk9F8E, 28, 0); } BasicInitMenuWindow(&gWindowConfig_81E6DA8); } @@ -1259,7 +1259,7 @@ void sub_80E9620(u16 a, u16 b) { if (r10 >= gEasyChatStruct->unkA) { - MenuPrint(gUnknown_083DBEA8, r6, r7); + Menu_PrintText(gUnknown_083DBEA8, r6, r7); break; } if (gEasyChatStruct->unkC[r10] == 0xFFFF) @@ -1270,7 +1270,7 @@ void sub_80E9620(u16 a, u16 b) else { sub_80EB218(gEasyChatStruct->unk9E14, gEasyChatStruct->unkC[r10], 11); - MenuPrint(gEasyChatStruct->unk9E14, r6, r7); + Menu_PrintText(gEasyChatStruct->unk9E14, r6, r7); r6 += gEasyChatStruct->unk8C[i][j] + 11; } r10++; @@ -1337,7 +1337,7 @@ void sub_80E97C0(u16 a, u16 b) r2[2] = r1 * 8; r2[3] = EOS; - MenuPrint(gEasyChatStruct->unk9E6E, b, a); + Menu_PrintText(gEasyChatStruct->unk9E6E, b, a); a += 2; } @@ -1378,7 +1378,7 @@ void sub_80E98C4(void) default: return; } - MenuFillWindowRectWithBlankTile(2, r1, 27, r3 * 2 + r1 - 1); + Menu_BlankWindowRect(2, r1, 27, r3 * 2 + r1 - 1); BasicInitMenuWindow(&gWindowConfig_81E6DA8); } @@ -1386,7 +1386,7 @@ void sub_80E9940(u8 *a, u8 b) { u8 r4 = (b & 7); - MenuFillWindowRectWithBlankTile(2, r4 * 2, 31, r4 * 2 + 1); + Menu_BlankWindowRect(2, r4 * 2, 31, r4 * 2 + 1); sub_80E9A7C(a, b); sub_80E9A60(a, 2, r4 * 2); } @@ -1453,7 +1453,7 @@ void sub_80E9A4C(void) void sub_80E9A60(const u8 *a, u16 b, u16 c) { c &= 0xF; - MenuPrint(a, b, c); + Menu_PrintText(a, b, c); } void sub_80E9A7C(u8 *dest, u16 b) @@ -1523,7 +1523,7 @@ void sub_80E9AF8(u16 a) void sub_80E9C74(u16 a) { a &= 7; - MenuFillWindowRectWithBlankTile(0, a * 2, 29, a * 2 + 1); + Menu_BlankWindowRect(0, a * 2, 29, a * 2 + 1); } void sub_80E9C94(void) -- cgit v1.2.3 From 8869cbc98e2f8e761e9ff89182933643992e2bd7 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 00:16:15 -0600 Subject: s/gWindowConfig/gWindowTemplate/g --- src/easy_chat_2.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'src/easy_chat_2.c') diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 5acdba04e..66af7fc04 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -1064,7 +1064,7 @@ void sub_80E91B0(const u8 *a, u8 b, u8 c, u8 d) void sub_80E91D4(u8 a) { - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); if (a == 10) { @@ -1168,7 +1168,7 @@ void sub_80E9368(u8 a) break; } - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); gEasyChatStruct->unk9F8E[0] = EXT_CTRL_CODE_BEGIN; gEasyChatStruct->unk9F8E[1] = 5; gEasyChatStruct->unk9F8E[2] = 1; @@ -1189,7 +1189,7 @@ void sub_80E9368(u8 a) Menu_PrintText(gEasyChatStruct->unk9F8E, 0, 0); Menu_PrintText(gEasyChatStruct->unk9F8E, 28, 0); } - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E948C(void) @@ -1219,7 +1219,7 @@ void sub_80E948C(void) void sub_80E95A4(void) { - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); switch (gEasyChatStruct->unk9) { case 4: @@ -1241,7 +1241,7 @@ void sub_80E95A4(void) sub_80E9620(3, 6); break; } - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E9620(u16 a, u16 b) @@ -1281,7 +1281,7 @@ void sub_80E9620(u16 a, u16 b) void sub_80E9744(void) { - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); switch (gEasyChatStruct->unk9) { case 4: @@ -1303,7 +1303,7 @@ void sub_80E9744(void) sub_80E97C0(3, 6); break; } - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E97C0(u16 a, u16 b) @@ -1348,7 +1348,7 @@ void sub_80E98C4(void) u8 r1; u8 r3; - BasicInitMenuWindow(&gWindowConfig_81E6D8C); + BasicInitMenuWindow(&gWindowTemplate_81E6D8C); switch (gEasyChatStruct->unk9) { case 4: @@ -1379,7 +1379,7 @@ void sub_80E98C4(void) return; } Menu_BlankWindowRect(2, r1, 27, r3 * 2 + r1 - 1); - BasicInitMenuWindow(&gWindowConfig_81E6DA8); + BasicInitMenuWindow(&gWindowTemplate_81E6DA8); } void sub_80E9940(u8 *a, u8 b) @@ -1420,7 +1420,7 @@ const u8 *const gUnknown_083DBEAC[] = void sub_80E9974(void) { - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); if (gEasyChatStruct->unk26 == 0) { u16 i; @@ -1479,7 +1479,7 @@ void sub_80E9AD4(void) { u16 i; - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); for (i = 0; i < 16; i++) sub_80E9C74(i); } @@ -1502,16 +1502,16 @@ void sub_80E9AF8(u16 a) for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++) { if (sub_80EB2D4(gEasyChatStruct->unk9A2A[a][i]) == 7) - BasicInitMenuWindow(&gWindowConfig_81E6D70); + BasicInitMenuWindow(&gWindowTemplate_81E6D70); else - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9); sub_80E9A60(gEasyChatStruct->unk9E14, i * 11 + 4, a * 2); } } else { - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); for (i = 0; i < gEasyChatStruct->unk99A6[a]; i++) { sub_80EB218(r8, gEasyChatStruct->unk9A2A[a][i], 9); @@ -1562,7 +1562,7 @@ void sub_80E9D7C(void) u16 r4; u16 i; - BasicInitMenuWindow(&gWindowConfig_81E6D54); + BasicInitMenuWindow(&gWindowTemplate_81E6D54); if (gEasyChatStruct->unk1C0 < 0) { r6 = -gEasyChatStruct->unk1C0; -- cgit v1.2.3 From cf7ffa568a2a09c761bae6aa4c70b8d8913c3e81 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 23:37:26 -0600 Subject: rename unknown_task to scanline_effect --- src/easy_chat_2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/easy_chat_2.c') diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 66af7fc04..48e005cab 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -17,7 +17,7 @@ #include "strings.h" #include "strings2.h" #include "trig.h" -#include "unknown_task.h" +#include "scanline_effect.h" extern void sub_8095C8C(); extern void sub_809D104(void *, u16, u16, const void *, u16, u16, u16, u16); -- cgit v1.2.3 From f9f0e84b70f1b313200acd6f0d180413e34517da Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Tue, 9 Jan 2018 23:55:03 -0600 Subject: label some scanline_effect functions --- src/easy_chat_2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/easy_chat_2.c') diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 48e005cab..0f12b978d 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -2053,7 +2053,7 @@ void sub_80EAD08(void) u16 r2; u16 i; - r4 = gUnknown_03004DE0[gUnknown_03004DC0.srcBank]; + r4 = gUnknown_03004DE0[gScanlineEffect.srcBank]; r4 += 88; r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF; -- cgit v1.2.3 From beac14a9a0ab072186fa99afcfcc0d844b77a68d Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 Jan 2018 12:12:55 -0600 Subject: label more of scanline_effect.c --- src/easy_chat_2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/easy_chat_2.c') diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index 0f12b978d..e7b65bef0 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -2053,7 +2053,7 @@ void sub_80EAD08(void) u16 r2; u16 i; - r4 = gUnknown_03004DE0[gScanlineEffect.srcBank]; + r4 = gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; r4 += 88; r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF; -- cgit v1.2.3 From bb2c758e8fa730b2bd19b92119a2bd7e37af57f8 Mon Sep 17 00:00:00 2001 From: camthesaxman Date: Wed, 10 Jan 2018 13:18:31 -0600 Subject: finish labeling scanline_effect.c --- src/easy_chat_2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/easy_chat_2.c') diff --git a/src/easy_chat_2.c b/src/easy_chat_2.c index e7b65bef0..dc8bddd5a 100644 --- a/src/easy_chat_2.c +++ b/src/easy_chat_2.c @@ -2053,7 +2053,7 @@ void sub_80EAD08(void) u16 r2; u16 i; - r4 = gScanlineEffectRegBuffers[gScanlineEffect.srcBank]; + r4 = gScanlineEffectRegBuffers[gScanlineEffect.srcBuffer]; r4 += 88; r2 = (gEasyChatStruct->unk1BA - 88) & 0xFF; -- cgit v1.2.3