From 155d4e9f0d04e1e4f4ab822819704b66470a1a9c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Fri, 31 Mar 2023 09:20:45 -0700 Subject: [PATCH] minor: label a few more funcs --- asm/friend_rescue.s | 2 +- asm/other_menus.s | 14 +++++++------- include/code_8094F88.h | 6 +++--- src/code_2.c | 4 ++-- src/code_8095824.c | 8 +++++--- src/friend_rescue_1.c | 8 ++++---- src/rescue_password_menu.c | 10 +++++----- src/thank_you_wonder_mail.c | 18 +++++++++--------- 8 files changed, 36 insertions(+), 34 deletions(-) diff --git a/asm/friend_rescue.s b/asm/friend_rescue.s index 86e3f714a..bd0ab3acc 100644 --- a/asm/friend_rescue.s +++ b/asm/friend_rescue.s @@ -1417,7 +1417,7 @@ _0803349C: adds r0, r5 ldr r1, [r0] movs r0, 0x6 - bl sub_809539C + bl GetMailIndex lsls r0, 24 lsrs r0, 24 bl sub_8095228 diff --git a/asm/other_menus.s b/asm/other_menus.s index 2f73a6873..0f50504ce 100644 --- a/asm/other_menus.s +++ b/asm/other_menus.s @@ -1360,7 +1360,7 @@ sub_8037EBC: _08037ED0: ldr r1, [r5, 0x10] movs r0, 0x1 - bl sub_809539C + bl GetMailIndex lsls r0, 24 lsrs r0, 24 bl sub_8095228 @@ -1431,7 +1431,7 @@ sub_8037F4C: _08037F5E: ldr r1, [r4, 0x10] movs r0, 0x4 - bl sub_809539C + bl GetMailIndex lsls r0, 24 lsrs r0, 24 bl sub_8095228 @@ -1596,7 +1596,7 @@ _0803809C: _080380A2: movs r0, 0x4 adds r1, r6, 0 - bl sub_80952F0 + bl HasMail lsls r0, 24 cmp r0, 0 beq _080380BA @@ -1628,19 +1628,19 @@ _080380D8: ldr r4, [r5, 0x10] movs r0, 0x2 adds r1, r4, 0 - bl sub_80952F0 + bl HasMail lsls r0, 24 cmp r0, 0 bne _08038110 movs r0, 0x4 adds r1, r4, 0 - bl sub_80952F0 + bl HasMail lsls r0, 24 cmp r0, 0 bne _08038110 movs r0, 0x6 adds r1, r4, 0 - bl sub_80952F0 + bl HasMail lsls r0, 24 cmp r0, 0 bne _08038110 @@ -1681,7 +1681,7 @@ sub_803812C: _0803813E: ldr r1, [r4, 0x10] movs r0, 0x1 - bl sub_80952F0 + bl HasMail lsls r0, 24 cmp r0, 0 bne _08038150 diff --git a/include/code_8094F88.h b/include/code_8094F88.h index e4a4b6e77..744425187 100644 --- a/include/code_8094F88.h +++ b/include/code_8094F88.h @@ -43,12 +43,12 @@ void DeleteMailAtIndex(u8 index); void sub_8095274(u32 param_1); bool8 sub_8095298(s32 param_1); void sub_80952C4(void); -bool8 sub_80952F0(u8 mailType, u32 param_2); +bool8 HasMail(u8 mailType, u32 param_2); s32 CountMailType(u8 mailType); u32 CountAllMail(void); s32 sub_8095374(void); -s32 sub_809539C(u8 mailType, u32 param_2); -s32 sub_80953D4(u8 mailType); +s32 GetMailIndex(u8 mailType, u32 param_2); +s32 GetFirstIndexofMailType(u8 mailType); #endif diff --git a/src/code_2.c b/src/code_2.c index feb41013a..b1c66909b 100644 --- a/src/code_2.c +++ b/src/code_2.c @@ -42,7 +42,7 @@ extern void sub_800CDA8(u32); extern void LoadTitleScreen(void); extern void SetBGPaletteBufferColorRGB(s32, u8 *, s32, u8 *); extern void sub_80095CC(u32, u32); -extern s32 sub_80953D4(u8); +extern s32 GetFirstIndexofMailType(u8); extern void nullsub_33(void); extern u32 sub_80009D0(u32); @@ -174,7 +174,7 @@ void GameLoop(void) CloseFile(gTitlePaletteFile); switch (nextMenu) { case 2: { - s32 mailIndex = sub_80953D4(7); + s32 mailIndex = GetFirstIndexofMailType(7); if (mailIndex != -1) { DeleteMailAtIndex(mailIndex); tmp3 = sub_80009D0(2); diff --git a/src/code_8095824.c b/src/code_8095824.c index b46bb19c8..8f0056a60 100644 --- a/src/code_8095824.c +++ b/src/code_8095824.c @@ -95,7 +95,7 @@ void sub_80952C4(void) } } -bool8 sub_80952F0(u8 mailType, u32 param_2) +bool8 HasMail(u8 mailType, u32 param_2) { struct unkStruct_203B480 *ptr; s32 index; @@ -146,7 +146,8 @@ s32 sub_8095374(void) return retvar; } -s32 sub_809539C(u8 mailType, u32 param_2) +/* With mailType and (additonal data??), search mail and return exact index */ +s32 GetMailIndex(u8 mailType, u32 param_2) { struct unkStruct_203B480 *ptr; s32 index; @@ -158,7 +159,8 @@ s32 sub_809539C(u8 mailType, u32 param_2) return -1; } -s32 sub_80953D4(u8 mailType) +/* Return the index of the first mail of the requested type */ +s32 GetFirstIndexofMailType(u8 mailType) { struct unkStruct_203B480 *ptr; s32 index; diff --git a/src/friend_rescue_1.c b/src/friend_rescue_1.c index 2dc55973f..b26a77de2 100644 --- a/src/friend_rescue_1.c +++ b/src/friend_rescue_1.c @@ -724,7 +724,7 @@ void sub_8033DBC(void) case PASSWORD_ENTRY_AOK_MAIL_SUCCESS: mail.mailType = 5; sub_80951FC(&mail); - mail2 = sub_8095228(sub_809539C(1, mail.unk10.unk10)); + mail2 = sub_8095228(GetMailIndex(1, mail.unk10.unk10)); mail2->mailType = 7; MemoryFill8((u8 *)gUnknown_203B484, 0, sizeof(struct unkStruct_203B484)); SetFriendRescueMenuState(0x40); @@ -1592,7 +1592,7 @@ void sub_8034D74(void) SetFriendRescueMenuState(0x6B); break; case PASSWORD_ENTRY_THANK_YOU_MAIL_SUCCESS: - mail2 = sub_8095228(sub_809539C(4, mail.unk10.unk10)); + mail2 = sub_8095228(GetMailIndex(4, mail.unk10.unk10)); *mail2 = mail; mail2->mailType = 6; gUnknown_203B33C->unk420 = mail.unk10.unk10; @@ -1893,7 +1893,7 @@ void sub_8035210(void) case 0xD: if(gUnknown_203B33C->unk528 == 0x13) { - mail = sub_8095228(sub_80953D4(5)); + mail = sub_8095228(GetFirstIndexofMailType(5)); if(mail->unk20.id != ITEM_NOTHING) SetFriendRescueMenuState(0x53); else @@ -1940,7 +1940,7 @@ void sub_80352A4(void) CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gAvailablePokemonNames, monName); - mailIndex = sub_809539C(6, gUnknown_203B33C->unk420); + mailIndex = GetMailIndex(6, gUnknown_203B33C->unk420); DeleteMailAtIndex(mailIndex); SetFriendRescueMenuState(0x70); } diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index 08da6d89b..75e185188 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -244,7 +244,7 @@ s32 UpdateRescuePasswordMenu(void) nextMenu = MENU_NO_SCREEN_CHANGE; local_44.mailType = 5; sub_80951FC(&local_44); - puVar5 = sub_8095228(sub_809539C(1, local_44.unk10.unk10)); + puVar5 = sub_8095228(GetMailIndex(1, local_44.unk10.unk10)); puVar5->mailType = WONDER_MAIL_TYPE_OKD; MemoryFill8((u8 *)&gUnknown_203B484, 0, sizeof(struct unkStruct_203B484)); break; @@ -264,7 +264,7 @@ s32 UpdateRescuePasswordMenu(void) DisplayPasswordAcceptScreen(); gRescuePasswordMenu->state = 9; nextMenu = MENU_NO_SCREEN_CHANGE; - puVar6 = sub_8095228(sub_809539C(4, local_44.unk10.unk10)); + puVar6 = sub_8095228(GetMailIndex(4, local_44.unk10.unk10)); *puVar6 = local_44; puVar6->mailType = 6; iVar9 = GetMainMenu(); @@ -461,7 +461,7 @@ u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, struct unkStruct_203B480 *para if (param_3->mailType != WONDER_MAIL_TYPE_SOS) { return PASSWORD_ENTRY_NOT_SOS_MAIL; } - else if ( (sub_80952F0(2, param_3->unk10.unk10)) || (sub_80952F0(WONDER_MAIL_TYPE_AOK, param_3->unk10.unk10)) || (sub_80952F0(WONDER_MAIL_TYPE_COMPLETED, param_3->unk10.unk10)) || (sub_8095298(param_3->unk10.unk10))) { + else if ( (HasMail(2, param_3->unk10.unk10)) || (HasMail(WONDER_MAIL_TYPE_AOK, param_3->unk10.unk10)) || (HasMail(WONDER_MAIL_TYPE_COMPLETED, param_3->unk10.unk10)) || (sub_8095298(param_3->unk10.unk10))) { return PASSWORD_ENTRY_DUPLICATE_SOS_MAIL; } else if (FindOpenMailSlot() == -1) { @@ -475,7 +475,7 @@ u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, struct unkStruct_203B480 *para if (param_3->mailType != WONDER_MAIL_TYPE_AOK) { return PASSWORD_ENTRY_NOT_AOK_MAIL; } - else if (!sub_80952F0(1, param_3->unk10.unk10)) { + else if (!HasMail(1, param_3->unk10.unk10)) { return PASSWORD_ENTRY_DUPLICATE_AOK_MAIL; } else { @@ -486,7 +486,7 @@ u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, struct unkStruct_203B480 *para if (param_3->mailType != WONDER_MAIL_TYPE_THANK_YOU) { return PASSWORD_ENTRY_NOT_THANK_YOU_MAIL; } - else if ((!sub_80952F0(4, param_3->unk10.unk10)) || (param_3->unk28 != sub_8011C34())) { + else if ((!HasMail(4, param_3->unk10.unk10)) || (param_3->unk28 != sub_8011C34())) { return PASSWORD_ENTRY_DUPLICATE_THANK_YOU_MAIL; } else { diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 8924503d0..19acf94be 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -285,7 +285,7 @@ u32 CreateThankYouMailPelipper(void) gUnknown_203B2C4->wonderMailMethod = WONDER_MAIL_GAME_LINK; gUnknown_203B2C4->wonderMailMode = WONDER_MAIL_MODE_SEND; - index = sub_80953D4(6); + index = GetFirstIndexofMailType(6); if (index != -1) { mail = sub_8095228(index); gUnknown_203B2C4->unk41C = mail->unk20; @@ -815,7 +815,7 @@ void AdvanceToThankYouPasswordProcessing(void) void HandleThankYouMailPasswordMenu(void) { - u8 uVar1; + u8 mailIndex; struct unkStruct_203B480 *mail; u32 return_var; struct unkStruct_203B480 mail1; @@ -840,8 +840,8 @@ void HandleThankYouMailPasswordMenu(void) SetThankYouMailMenuState(PRINT_THANK_YOU_ERROR); break; case PASSWORD_ENTRY_THANK_YOU_MAIL_SUCCESS: - uVar1 = sub_809539C(4,mail1.unk10.unk10); - mail = sub_8095228(uVar1); + mailIndex = GetMailIndex(4,mail1.unk10.unk10); + mail = sub_8095228(mailIndex); *mail = mail1; mail->mailType = 6; gUnknown_203B2C4->unk430 = mail1.unk10.unk10; @@ -1143,7 +1143,7 @@ void HandleMailCommunicationMenu(void) switch(gUnknown_203B2C4->wonderMailMode) { case WONDER_MAIL_MODE_SEND: - mail = sub_8095228(sub_80953D4(WONDER_MAIL_TYPE_THANK_YOU)); + mail = sub_8095228(GetFirstIndexofMailType(WONDER_MAIL_TYPE_THANK_YOU)); if(mail->unk20.id != ITEM_NOTHING) { SetThankYouMailMenuState(ITEM_EXISTS_ON_THANK_YOU_MAIL); @@ -1250,7 +1250,7 @@ void sub_802AB98(void) CopyYellowMonsterNametoBuffer(gUnknown_202E5D8, MONSTER_PELIPPER); monName = GetMonSpecies(MONSTER_PELIPPER); strcpy(gAvailablePokemonNames, monName); - DeleteMailAtIndex(sub_809539C(6, gUnknown_203B2C4->unk430)); + DeleteMailAtIndex(GetMailIndex(6, gUnknown_203B2C4->unk430)); SetThankYouMailMenuState(0x24); break; default: @@ -1268,7 +1268,7 @@ void UpdateThankYouMailText(void) char *monName; u8 buffer1 [80]; u8 buffer2 [80]; - u8 uVar2; + u8 mailIndex; struct PokemonStruct *pokeStruct; struct PokemonStruct *pokeStruct2; s32 linkStatus; @@ -1407,8 +1407,8 @@ void UpdateThankYouMailText(void) gUnknown_203B2C4->unk53C.unk14 = MONSTER_PELIPPER; // 0x550 gUnknown_203B2C4->unk53C.unk16 = 2; // 0x552 gUnknown_203B2C4->unk53C.moneyReward = 0; // 0x554 - uVar2 = sub_809539C(6,gUnknown_203B2C4->unk430); - mail = sub_8095228(uVar2); + mailIndex = GetMailIndex(6,gUnknown_203B2C4->unk430); + mail = sub_8095228(mailIndex); itemIndex = mail->unk20.id; if (itemIndex != ITEM_NOTHING) gUnknown_203B2C4->unk53C.itemRewards[0] = itemIndex; // unk558