Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-08-26 10:44:40 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clean up do/while/if to simple for loops

Browse Source
This commit is contained in:
Seth Barberee
2023-05-01 11:49:18 -07:00
parent ba9f894149
commit 458c2f3b96
6 changed files with 101 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/code_801C620.c
View File

@@ -747,40 +747,36 @@ void sub_801C440(void)
void sub_801C4C8(void)
{
u32 y;
s32 x;
s32 x2;
u32 skillIndex;
s32 counter;
sub_8008C54(gUnknown_203B23C->unk58);
sub_80073B8(gUnknown_203B23C->unk58);
x = gUnknown_203B23C->unk42 * 8;
x2 = x;
x2 += 10;
xxx_call_draw_string(x2,0,gUnknown_80DBE08,gUnknown_203B23C->unk58,0);
x += 4;
x2 = x + gUnknown_203B23C->unkC2 * 8;
sub_8012BC4(x2,0,gUnknown_203B23C->unk42 + 1,1,7,
gUnknown_203B23C->unk58);
counter = 0;
if (counter < gUnknown_203B23C->unk3E) {
do {
skillIndex = gUnknown_203B23C->iqSkills
[gUnknown_203B23C->unk42 * gUnknown_203B23C->unk40 + counter];
y = sub_8013800(&gUnknown_203B23C->unk24,counter);
strncpy(gUnknown_202DEA8,GetIQSkillName(skillIndex),0x50);
if (IsIQSkillSet((u8 *)&gUnknown_203B23C->pokeStruct->IQSkills,1 << skillIndex)) {
strcpy(gUnknown_202DEA8 - 0x50,gUnknown_80DBE14);
}
else {
strcpy(gUnknown_202DEA8 - 0x50,gUnknown_80DBE18);
}
xxx_format_and_draw(0xc,y,gUnknown_80DBE1C,gUnknown_203B23C->unk58,0);
counter++;
} while (counter < gUnknown_203B23C->unk3E);
}
sub_80073E0(gUnknown_203B23C->unk58);
u32 y;
s32 x;
s32 x2;
u32 skillIndex;
s32 counter;
sub_8008C54(gUnknown_203B23C->unk58);
sub_80073B8(gUnknown_203B23C->unk58);
x = gUnknown_203B23C->unk42 * 8;
x2 = x;
x2 += 10;
xxx_call_draw_string(x2,0,gUnknown_80DBE08,gUnknown_203B23C->unk58,0);
x += 4;
x2 = x + gUnknown_203B23C->unkC2 * 8;
sub_8012BC4(x2,0,gUnknown_203B23C->unk42 + 1,1,7,
gUnknown_203B23C->unk58);
for (counter = 0; counter < gUnknown_203B23C->unk3E; counter++) {
skillIndex = gUnknown_203B23C->iqSkills
[gUnknown_203B23C->unk42 * gUnknown_203B23C->unk40 + counter];
y = sub_8013800(&gUnknown_203B23C->unk24,counter);
strncpy(gUnknown_202DEA8,GetIQSkillName(skillIndex),0x50);
if (IsIQSkillSet((u8 *)&gUnknown_203B23C->pokeStruct->IQSkills,1 << skillIndex)) {
strcpy(gUnknown_202DEA8 - 0x50,gUnknown_80DBE14);
}
else {
strcpy(gUnknown_202DEA8 - 0x50,gUnknown_80DBE18);
}
xxx_format_and_draw(0xc,y,gUnknown_80DBE1C,gUnknown_203B23C->unk58,0);
}
sub_80073E0(gUnknown_203B23C->unk58);
}
bool8 HasNoAvailIQSkills(s16 species)

9
src/makuhita_dojo_1.c
View File

@@ -331,9 +331,8 @@ void DrawDojoCourseList(void)
xxx_call_draw_string(10,0,gMakuhitaDojoHeader,gUnknown_203B31C->unk64,0); // Courses
sub_8012BC4(gUnknown_203B31C->unkCC[2] * 8 + 4,0,
gUnknown_203B31C->unk4E + 1,2,7,gUnknown_203B31C->unk64);
index = 0;
if (index < gUnknown_203B31C->unk4A) {
do {
for (index = 0; index < gUnknown_203B31C->unk4A; index++)
{
iVar6 = gUnknown_203B31C->unk0[gUnknown_203B31C->unk4E * gUnknown_203B31C->unk4C + index];
dungeonIndex = sub_80A2740(iVar6);
@@ -347,9 +346,7 @@ void DrawDojoCourseList(void)
}
sprintfStatic(buffer,gMakuhitaCoursePlaceholder,color,GetDungeonName1(dungeonIndex)); // "#c%c%s#r"
xxx_call_draw_string(0x10,y,buffer,gUnknown_203B31C->unk64,0);
index++;
} while (index < gUnknown_203B31C->unk4A);
}
}
sub_80073E0(gUnknown_203B31C->unk64);
}

39
src/wonder_mail_2_1.c
View File

@@ -346,34 +346,31 @@ void sub_802C6DC(void)
void DrawJobListMenu(void)
{
struct WonderMail *mail;
int index;
s32 r4;
s32 r5;
struct unkStruct_802C39C local;
sub_8008C54(gUnknown_203B2E8->unk3C);
sub_80073B8(gUnknown_203B2E8->unk3C);
r4 = gUnknown_203B2E8->unk26 * 8;
r5 = r4;
r5 += 10;
xxx_call_draw_string(r5,0,gUnknown_80DFD14,gUnknown_203B2E8->unk3C,0); // "Job List"
r4 += 4;
r5 = r4 + gUnknown_203B2E8->unkA4[2] * 8;
sub_8012BC4(r5,0,gUnknown_203B2E8->unk26 + 1,2,7,gUnknown_203B2E8->unk3C);
index = 0;
struct WonderMail *mail;
int index;
s32 r4;
s32 r5;
struct unkStruct_802C39C local;
if(( index < gUnknown_203B2E8->unk22))
do
sub_8008C54(gUnknown_203B2E8->unk3C);
sub_80073B8(gUnknown_203B2E8->unk3C);
r4 = gUnknown_203B2E8->unk26 * 8;
r5 = r4;
r5 += 10;
xxx_call_draw_string(r5,0,gUnknown_80DFD14,gUnknown_203B2E8->unk3C,0); // "Job List"
r4 += 4;
r5 = r4 + gUnknown_203B2E8->unkA4[2] * 8;
sub_8012BC4(r5,0,gUnknown_203B2E8->unk26 + 1,2,7,gUnknown_203B2E8->unk3C);
for(index = 0; index < gUnknown_203B2E8->unk22; index++)
{
mail = GetJobSlotInfo(gUnknown_203B2E8->pelipperBoardSlots[gUnknown_203B2E8->unk26 * gUnknown_203B2E8->unk24 + index]);
local.unk0[0] = gUnknown_203B2E8->unk3C;
local.y = sub_8013800(&gUnknown_203B2E8->unk8,index);
sub_803B35C(mail,local.unk0);
CreateRescueTitle(&local);
index++;
} while( index < gUnknown_203B2E8->unk22);
sub_80073E0(gUnknown_203B2E8->unk3C);
}
sub_80073E0(gUnknown_203B2E8->unk3C);
}
s32 CountAcceptedJobs(void)

101
src/wonder_mail_2_mid.c
View File

@@ -91,39 +91,35 @@ extern void sub_803B6B0(u32, u32, u32, u32);
void CreateMailMenu(void)
{
struct WonderMail *mail;
s32 y;
s32 index;
struct unkStruct_802C39C local;
u8 buffer [128];
sub_8008C54(gUnknown_203B2D8->unk38);
sub_80073B8(gUnknown_203B2D8->unk38);
xxx_call_draw_string(gUnknown_203B2D8->unk22 * 8 + 10,0,gMailboxText,gUnknown_203B2D8->unk38,0);
index = 0;
if (index < gUnknown_203B2D8->unk1E) {
do {
mail = GetMailboxSlotInfo(gUnknown_203B2D8->unk0[(gUnknown_203B2D8->unk22 * gUnknown_203B2D8->unk20) + index]);
local.unk0[0] = gUnknown_203B2D8->unk38;
local.y = sub_8013800(&gUnknown_203B2D8->unk4, index);
if (mail->mailType == 1) {
y = sub_8013800(&gUnknown_203B2D8->unk4, index);
sub_803B6B0(10,y,6,gUnknown_203B2D8->unk38);
PrintPokeNameToBuffer(gAvailablePokemonNames, GetPlayerPokemonStruct());
sprintfStatic(buffer, GetPokemonMailHeadline(mail->dungeon.floor), gAvailablePokemonNames);
xxx_call_draw_string(0x15,y,buffer,gUnknown_203B2D8->unk38,0);
}
else {
sub_803B35C(mail,local.unk0);
if (IsMailinJobSlot(mail)) {
local.unk43 = 2;
struct WonderMail *mail;
s32 y;
s32 index;
struct unkStruct_802C39C local;
u8 buffer [128];
sub_8008C54(gUnknown_203B2D8->unk38);
sub_80073B8(gUnknown_203B2D8->unk38);
xxx_call_draw_string(gUnknown_203B2D8->unk22 * 8 + 10,0,gMailboxText,gUnknown_203B2D8->unk38,0);
for (index = 0; index < gUnknown_203B2D8->unk1E; index++) {
mail = GetMailboxSlotInfo(gUnknown_203B2D8->unk0[(gUnknown_203B2D8->unk22 * gUnknown_203B2D8->unk20) + index]);
local.unk0[0] = gUnknown_203B2D8->unk38;
local.y = sub_8013800(&gUnknown_203B2D8->unk4, index);
if (mail->mailType == 1) {
y = sub_8013800(&gUnknown_203B2D8->unk4, index);
sub_803B6B0(10,y,6,gUnknown_203B2D8->unk38);
PrintPokeNameToBuffer(gAvailablePokemonNames, GetPlayerPokemonStruct());
sprintfStatic(buffer, GetPokemonMailHeadline(mail->dungeon.floor), gAvailablePokemonNames);
xxx_call_draw_string(0x15,y,buffer,gUnknown_203B2D8->unk38,0);
}
CreateRescueTitle(&local);
}
index++;
} while (index < gUnknown_203B2D8->unk1E);
}
sub_80073E0(gUnknown_203B2D8->unk38);
else {
sub_803B35C(mail,local.unk0);
if (IsMailinJobSlot(mail)) {
local.unk43 = 2;
}
CreateRescueTitle(&local);
}
}
sub_80073E0(gUnknown_203B2D8->unk38);
}
s32 CountEmptyMailSlots(void)
@@ -309,26 +305,24 @@ void sub_802C328(void)
void DrawPelipperBoardJobMenu(void)
{
u32 slotIndex;
struct WonderMail *mail;
s32 iVar4;
s32 x;
s32 index;
struct unkStruct_802C39C local;
sub_8008C54(gUnknown_203B2E0->unk3C);
sub_80073B8(gUnknown_203B2E0->unk3C);
iVar4 = gUnknown_203B2E0->unk26 * 8;
x = iVar4;
x += 10;
xxx_call_draw_string(x,0,gBulletinBoardText,gUnknown_203B2E0->unk3C,0);
iVar4 += 4;
x = iVar4 + gUnknown_203B2E0->unkA4[2] * 8;
sub_8012BC4(x,0,gUnknown_203B2E0->unk26 + 1,2,7,gUnknown_203B2E0->unk3C);
u32 slotIndex;
struct WonderMail *mail;
s32 iVar4;
s32 x;
s32 index;
struct unkStruct_802C39C local;
index = 0;
if(index < gUnknown_203B2E0->unk22)
do
sub_8008C54(gUnknown_203B2E0->unk3C);
sub_80073B8(gUnknown_203B2E0->unk3C);
iVar4 = gUnknown_203B2E0->unk26 * 8;
x = iVar4;
x += 10;
xxx_call_draw_string(x,0,gBulletinBoardText,gUnknown_203B2E0->unk3C,0);
iVar4 += 4;
x = iVar4 + gUnknown_203B2E0->unkA4[2] * 8;
sub_8012BC4(x,0,gUnknown_203B2E0->unk26 + 1,2,7,gUnknown_203B2E0->unk3C);
for(index = 0; index < gUnknown_203B2E0->unk22; index++)
{
slotIndex = (gUnknown_203B2E0->unk0[gUnknown_203B2E0->unk26 * gUnknown_203B2E0->unk24 + index]);
mail = GetPelipperBoardSlotInfo(slotIndex);
@@ -339,7 +333,6 @@ void DrawPelipperBoardJobMenu(void)
local.unk43 = 2;
}
CreateRescueTitle(&local);
index++;
} while (index < gUnknown_203B2E0->unk22);
sub_80073E0(gUnknown_203B2E0->unk3C);
}
sub_80073E0(gUnknown_203B2E0->unk3C);
}

9
src/wonder_mail_3.c
View File

@@ -170,20 +170,15 @@ void sub_802CFD0(void)
r5 = r4 + (gUnknown_203B2F4->unk9C[2] * 8);
sub_8012BC4(r5,0,gUnknown_203B2F4->unk1E + 1,2,7,gUnknown_203B2F4->unk34);
r5 = 0;
if(r5 < gUnknown_203B2F4->unk1A)
for(r5 = 0; r5 < gUnknown_203B2F4->unk1A; r5++)
{
while(r5 < gUnknown_203B2F4->unk1A) {
iVar1 = sub_803B344(gUnknown_203B2F4->unk1E * gUnknown_203B2F4->unk1C + r5);
local.unk0[0] = gUnknown_203B2F4->unk34;
local.y = sub_8013800(gUnknown_203B2F4,r5);
local.y = sub_8013800(gUnknown_203B2F4, r5);
sub_803B35C(iVar1,local.unk0);
local.unk43 = 1;
local.unk4C = iVar1->unk14;
CreateRescueTitle(&local);
r5++;
}
}
sub_80073E0(gUnknown_203B2F4->unk34);
}

6
src/wonder_mail_4.c
View File

@@ -283,9 +283,7 @@ void sub_803092C(void)
r5 = r4 + gUnknown_203B320->unkC0[2] * 8;
sub_8012BC4(r5,0,gUnknown_203B320->unk42 + 1,1,7,gUnknown_203B320->unk58);
index = 0;
if (index < gUnknown_203B320->unk3E) {
do {
for (index = 0; index < gUnknown_203B320->unk3E; index++) {
mail = sub_8095228(gUnknown_203B320->unk0[(gUnknown_203B320->unk42 * gUnknown_203B320->unk40) + index]);
local.unk0[0] = gUnknown_203B320->unk58;
local.y = sub_8013800(&gUnknown_203B320->unk24,index);
@@ -318,8 +316,6 @@ void sub_803092C(void)
break;
}
CreateRescueTitle(&local);
index++;
} while (index < gUnknown_203B320->unk3E);
}
sub_80073E0(gUnknown_203B320->unk58);
}