Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 21:19:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

name some more funcs and cleanup

Browse Source
This commit is contained in:
Seth Barberee 2024-06-03 13:52:17 -07:00
parent 6aeb342553
commit 6df964fcc9
6 changed files with 42 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/code_80958E8.h
View File

@ -44,6 +44,7 @@ s32 CountFilledMailboxSlots(void);
WonderMail *GetMailboxSlotInfo(u8 index);
bool8 IsMailSlotEmpty(u8 index);
void ResetMailboxSlot(u8 index);
void ShiftMailboxSlotsDown(void);
bool8 AcceptJob(WonderMail *mail);
s32 CountJobsinDungeon(u8 dungeon);
WonderMail *GetJobSlotInfo(u8 index);
@ -57,8 +58,8 @@ bool8 sub_8096C08(u8 *jobIndex);
WonderMail *GetPelipperBoardSlotInfo(u8);
bool8 IsPelipperBoardSlotEmpty(u8);
void ResetPelipperBoardSlot(u8);
void sub_80965F4(void);
void sub_8096C80(void);
void ShiftPelipperJobsDown(void);
void ShiftJobSlotsDown(void);
void ReceivePKMNNews(u8 index);
bool8 CheckPKMNNewsSlot(u8 index);
void SortJobSlots(void);

46
src/code_80958E8.c
View File

@ -29,7 +29,7 @@ bool8 GenerateMailJobDungeonInfo(WonderMail *mail);
bool8 GenerateMailJobInfo(WonderMail *);
bool8 sub_8096E80(u8);
u8 sub_8095E78(void);
void sub_8096078(void);
void ShiftMailboxSlotsDown(void);
bool8 sub_80963B4(void);
void SaveWonderMail(struct unkStruct_8094924 *a, WonderMail *b);
void RestoreWonderMail(struct unkStruct_8094924 *a, WonderMail *b);
@ -539,21 +539,21 @@ bool8 GenerateMailJobDungeonInfo(WonderMail *mail)
if(sub_809017C(&dungeonLoc))
flag = FALSE;
for(index = 0; index < 4; index++)
for(index = 0; index < NUM_MAILBOX_SLOTS; index++)
{
if (sub_8095E38(&gUnknown_203B490->mailboxSlots[index],dungeon,floor,1)) {
flag = FALSE;
}
}
for(index = 0; index < 8; index++)
for(index = 0; index < MAX_ACCEPTED_JOBS; index++)
{
if (sub_8095E38(&gUnknown_203B490->pelipperBoardJobs[index],dungeon,floor,1)) {
flag = FALSE;
}
}
for(index = 0; index < 8; index++)
for(index = 0; index < MAX_ACCEPTED_JOBS; index++)
{
if (sub_8095E38(&gUnknown_203B490->jobSlots[index],dungeon,floor,1)) {
flag = FALSE;
@ -613,14 +613,14 @@ u8 sub_8095E78(void)
flag = FALSE;
for(index = 0; index < 4; index++)
for(index = 0; index < NUM_MAILBOX_SLOTS; index++)
{
if((gUnknown_203B490->mailboxSlots[index].mailType != MAIL_TYPE_NONE) && (gUnknown_203B490->mailboxSlots[index].rewardType == FRIEND_AREA))
flag = TRUE;
}
for(index = 0; index < 8; index++)
for(index = 0; index < MAX_ACCEPTED_JOBS; index++)
{
if((gUnknown_203B490->jobSlots[index].mailType != MAIL_TYPE_NONE) && (gUnknown_203B490->jobSlots[index].rewardType == FRIEND_AREA))
flag = TRUE;
@ -724,7 +724,7 @@ void ResetMailboxSlot(u8 index)
gUnknown_203B490->mailboxSlots[index].rewardType = MONEY1;
}
void sub_8096078(void)
void ShiftMailboxSlotsDown(void)
{
int counter1; // r5
int counter2;
@ -734,13 +734,13 @@ void sub_8096078(void)
counter2 = 0;
do {
for( ; counter1 < 4; counter1++)
for( ; counter1 < NUM_MAILBOX_SLOTS; counter1++)
{
if (gUnknown_203B490->mailboxSlots[counter1].mailType != 0)
break;
}
if (counter1 == 4) {
if (counter1 == NUM_MAILBOX_SLOTS) {
break;
}
@ -751,7 +751,7 @@ void sub_8096078(void)
counter2++;
} while( 1 );
for(; counter2 < 4; counter2++)
for(; counter2 < NUM_MAILBOX_SLOTS; counter2++)
{
gUnknown_203B490->mailboxSlots[counter2].mailType = 0;
}
@ -877,7 +877,7 @@ _flag:
_08096392:
if(sub_80963B4())
flag = TRUE;
sub_8096078();
ShiftMailboxSlotsDown();
SortMailboxSlots();
return flag;
}
@ -919,7 +919,7 @@ void sub_80963FC(void)
ResetMailboxSlot(index);
}
}
sub_8096078();
ShiftMailboxSlotsDown();
slot = GetMailboxSlotInfo(CountFilledMailboxSlots());
slot->mailType = 5;
slot->missionType = 0;
@ -936,7 +936,7 @@ void sub_80963FC(void)
sub_803C37C(&slot->unk4.dungeon, slot->missionType, &slot->itemReward);
} while (slot->targetItem == slot->itemReward);
slot->friendAreaReward = FRIEND_AREA_NONE;
sub_8096078();
ShiftMailboxSlotsDown();
SortMailboxSlots();
}
@ -1024,7 +1024,7 @@ void ResetPelipperBoardSlot(u8 index)
gUnknown_203B490->pelipperBoardJobs[index].rewardType = 0;
}
void sub_80965F4(void)
void ShiftPelipperJobsDown(void)
{
int counter1; // r5
int counter2;
@ -1034,13 +1034,13 @@ void sub_80965F4(void)
counter2 = 0;
do {
for( ; counter1 < 8; counter1++)
for( ; counter1 < MAX_ACCEPTED_JOBS; counter1++)
{
if (gUnknown_203B490->pelipperBoardJobs[counter1].mailType != 0)
break;
}
if (counter1 == 8) {
if (counter1 == MAX_ACCEPTED_JOBS) {
break;
}
@ -1051,7 +1051,7 @@ void sub_80965F4(void)
counter2++;
} while( 1 );
for(; counter2 < 8; counter2++)
for(; counter2 < MAX_ACCEPTED_JOBS; counter2++)
{
gUnknown_203B490->pelipperBoardJobs[counter2].mailType = 0;
}
@ -1151,7 +1151,7 @@ void GeneratePelipperJobs(void)
if (!GenerateMailJobInfo(&gUnknown_203B490->pelipperBoardJobs[index])) break;
gUnknown_203B490->pelipperBoardJobs[index].rewardType = RandRange(MONEY, BLANK_4);
}
sub_80965F4();
ShiftPelipperJobsDown();
SortPelipperJobs();
}
@ -1373,7 +1373,7 @@ void sub_8096BD0(void)
break;
}
}
sub_8096C80();
ShiftJobSlotsDown();
SortJobSlots();
}
@ -1402,7 +1402,7 @@ void ResetJobSlot(u8 index)
gUnknown_203B490->jobSlots[index].rewardType = MONEY1;
}
void sub_8096C80(void)
void ShiftJobSlotsDown(void)
{
int counter1; // r5
int counter2;
@ -1412,13 +1412,13 @@ void sub_8096C80(void)
counter2 = 0;
do {
for( ; counter1 < 8; counter1++)
for( ; counter1 < MAX_ACCEPTED_JOBS; counter1++)
{
if (gUnknown_203B490->jobSlots[counter1].mailType != 0)
break;
}
if (counter1 == 8) {
if (counter1 == MAX_ACCEPTED_JOBS) {
break;
}
@ -1429,7 +1429,7 @@ void sub_8096C80(void)
counter2++;
} while( 1 );
for(; counter2 < 8; counter2++)
for(; counter2 < MAX_ACCEPTED_JOBS; counter2++)
{
gUnknown_203B490->jobSlots[counter2].mailType = 0;
}

14
src/mailbox.c
View File

@ -79,11 +79,9 @@ void sub_802E73C(void);
void sub_802E758(void);
void sub_802E774(void);
void sub_802E7D0(void);
extern void sub_802E088(u32);
extern void CreateMailboxMenu(void);
extern void CreateMailActionMenu(void);
extern void CreateMailAcceptedStatusBox(u32);
extern void sub_8096078(void);
void CreateMailboxMenu(void);
void CreateMailActionMenu(void);
void CreateMailAcceptedStatusBox(u32);
u32 sub_802DFB0(void)
{
@ -417,10 +415,10 @@ void HandleMailActionMenu(void)
case 5:
PlaySound(0x133);
AcceptJob(GetMailboxSlotInfo(gUnknown_203B304->mailboxIndex));
sub_8096C80();
ShiftJobSlotsDown();
SortJobSlots();
ResetMailboxSlot(gUnknown_203B304->mailboxIndex);
sub_8096078();
ShiftMailboxSlotsDown();
if(HasNoMailinMailbox())
{
sub_802BEDC();
@ -441,7 +439,7 @@ void HandleMailActionMenu(void)
mail = GetMailboxSlotInfo(gUnknown_203B304->mailboxIndex);
ReceivePKMNNews(mail->unk4.dungeon.floor);
ResetMailboxSlot(gUnknown_203B304->mailboxIndex);
sub_8096078();
ShiftMailboxSlotsDown();
if(HasNoMailinMailbox())
{
sub_802BEDC();

8
src/pelipper_board.c
View File

@ -362,27 +362,27 @@ void sub_802EDBC(void)
case MAIL_TYPE_UNK2:
gPelipperBoard->unk4 = 1;
ResetPelipperBoardSlot(gPelipperBoard->jobIndex);
sub_80965F4();
ShiftPelipperJobsDown();
sub_802C2D4();
SetPelipperBoardState(PELIPPER_BOARD_EXIT);
break;
case MAIL_TYPE_UNK3:
gPelipperBoard->unk4 = 2;
ResetPelipperBoardSlot(gPelipperBoard->jobIndex);
sub_80965F4();
ShiftPelipperJobsDown();
sub_802C2D4();
SetPelipperBoardState(PELIPPER_BOARD_EXIT);
break;
case MAIL_TYPE_UNK4:
gPelipperBoard->unk4 = 3;
ResetPelipperBoardSlot(gPelipperBoard->jobIndex);
sub_80965F4();
ShiftPelipperJobsDown();
sub_802C2D4();
SetPelipperBoardState(PELIPPER_BOARD_EXIT);
break;
default:
AcceptJob(mail);
sub_8096C80();
ShiftJobSlotsDown();
SortJobSlots();
if(HasNoPelipperBoardJobs())
{

2
src/wonder_mail_802C860.c
View File

@ -283,7 +283,7 @@ static void sub_802CD38(void)
break;
case 5:
ResetJobSlot(sUnknown_203B2F0->unkC);
sub_8096C80();
ShiftJobSlotsDown();
if (HasNoAcceptedJobs()) {
sub_802C688();

10
src/wonder_mail_802D098.c
View File

@ -207,12 +207,12 @@ static void sub_802D2A8(void)
case RECEIVE_WONDER_MAIL:
sUnknown_203B2F8->wonderMailAccepted = TRUE;
AcceptJob(&sUnknown_203B2F8->mail->wonderMail);
sub_8096C80();
ShiftJobSlotsDown();
SortJobSlots();
if (sUnknown_203B2F8->mail->wonderMail.unk2 == 4) {
MemoryCopy8(sub_8096DD8(), sUnknown_203B2F8->mail->unk14, 40);
MemoryCopy8(sub_8096DE8(), sUnknown_203B2F8->mail->unk18, 120);
MemoryCopy8(sub_8096DD8(), sUnknown_203B2F8->mail->unk14, sizeof(gUnknown_203B490->unk190));
MemoryCopy8(sub_8096DE8(), sUnknown_203B2F8->mail->unk18, sizeof(gUnknown_203B490->unk1B8));
}
switch (sUnknown_203B2F8->mail->wonderMail.unk4.dungeon.id) {
@ -417,7 +417,7 @@ static void sub_802D82C(void)
switch (menuAction) {
case 3: // Yes
ResetJobSlot(sUnknown_203B2F8->jobSlotIndex);
sub_8096C80();
ShiftJobSlotsDown();
sub_802D1A0(RECEIVE_WONDER_MAIL);
break;
case 6: // New Mail
@ -514,7 +514,7 @@ static void sub_802D9F0(void)
case 3: // Yes
sub_802C688();
ResetJobSlot(sUnknown_203B2F8->jobSlotIndex);
sub_8096C80();
ShiftJobSlotsDown();
sub_802D1A0(RECEIVE_WONDER_MAIL);
break;
}