diff --git a/include/code_8031D70.h b/include/code_8031D70.h new file mode 100644 index 000000000..e8d7f9631 --- /dev/null +++ b/include/code_8031D70.h @@ -0,0 +1,9 @@ +#ifndef GUARD_CODE_8031D70_H +#define GUARD_CODE_8031D70_H + +bool8 sub_8031D70(u32 mailIndex, s32 param_2); +u32 sub_8031DCC(void); +void sub_8031E00(void); +void sub_8031E10(void); + +#endif // GUARD_CODE_8031D70_H diff --git a/include/code_803C1B4.h b/include/code_803C1B4.h index 62e2295ef..81e21a5b0 100644 --- a/include/code_803C1B4.h +++ b/include/code_803C1B4.h @@ -2,8 +2,15 @@ #define GUARD_CODE_803C1B4_H #include "structs/str_dungeon_location.h" +#include "structs/str_wonder_mail.h" -void sub_803C37C(DungeonLocation *location, u8 r1, u8 *itemReward); u32 GetDungeonTeamRankPts(DungeonLocation *dungeon, u8 r1); +void sub_803C37C(DungeonLocation *location, u8 r1, u8 *itemReward); +bool8 sub_803C4F0(WonderMail *mail); +bool8 sub_803C3E0(WonderMail *mail); +bool8 sub_803C45C(WonderMail *mail); +bool8 sub_803C610(WonderMail *param_1); +bool8 sub_803C580(WonderMail *param_1); + #endif // GUARD_CODE_803C1B4_H diff --git a/include/code_803C1D0.h b/include/code_803C1D0.h index d6d76a016..31965fb9d 100644 --- a/include/code_803C1D0.h +++ b/include/code_803C1D0.h @@ -3,9 +3,8 @@ #include "structs/str_wonder_mail.h" -// code_803C1D0.s -extern u8 sub_803C1D0(DungeonLocation *, u8); -extern u8 *GetMissionRankText(u8); -extern void sub_803C21C(WonderMail *, unkStruct_802F204 *); +u8 sub_803C1D0(DungeonLocation *, u8); +const u8 *GetMissionRankText(u8 index); +void sub_803C21C(WonderMail *, unkStruct_802F204 *); #endif // GUARD_CODE_803C1D0_H diff --git a/include/code_8040094_1.h b/include/code_8040094_1.h new file mode 100644 index 000000000..0b8959592 --- /dev/null +++ b/include/code_8040094_1.h @@ -0,0 +1,6 @@ +#ifndef GUARD_CODE_8040094_1_H +#define GUARD_CODE_8040094_1_H + +void sub_8041168(Entity *entity, Entity *entity2, Move *move, DungeonPos *pos); + +#endif // GUARD_CODE_8040094_1_H diff --git a/include/effect_main.h b/include/effect_main.h index 84135747b..f6bc249c0 100644 --- a/include/effect_main.h +++ b/include/effect_main.h @@ -27,6 +27,8 @@ struct UnkStruct_8040094 s32 unk10; }; +bool8 EffectiveMoveHasSineWobble(s32 moveId); + void sub_800DAC0(u32 fileSelection); void sub_800DB7C(void); void sub_800DBBC(void); diff --git a/include/move_orb_actions_3.h b/include/move_orb_actions_3.h index 97d345459..ab48a6e78 100644 --- a/include/move_orb_actions_3.h +++ b/include/move_orb_actions_3.h @@ -4,6 +4,8 @@ #include "structs/dungeon_entity.h" #include "structs/str_stat_index.h" +extern const s32 gUnknown_8106A8C[]; + bool8 PoisonStingMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId); bool8 TriAttackMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId); bool8 TrickMoveAction(Entity *pokemon, Entity *target, Move *move, s32 itemId); diff --git a/include/rescue_password_menu.h b/include/rescue_password_menu.h index 0a56dd0a9..22606c6e2 100644 --- a/include/rescue_password_menu.h +++ b/include/rescue_password_menu.h @@ -44,4 +44,6 @@ void CreateRescuePasswordMenu(u32 currMenu); s32 UpdateRescuePasswordMenu(void); void CleanRescuePasswordMenu(void); -#endif +u32 sub_8039068(u32 mailMode, u8 *passwordBuffer, unkStruct_203B480 *param_3); + +#endif // GUARD_RESCUE_PASSWORD_MENU_H diff --git a/include/thank_you_wonder_mail.h b/include/thank_you_wonder_mail.h index 4dea1d84f..d94a5d3d3 100644 --- a/include/thank_you_wonder_mail.h +++ b/include/thank_you_wonder_mail.h @@ -20,7 +20,7 @@ typedef struct WonderMailStruct_203B2C4 u8 filler48[0x1B8 - 0x48]; unkStruct_203B480 unk1B8; unkStruct_203B480 unk1E8; - /* 0x218 */ s8 mailIndex; + /* 0x218 */ u8 mailIndex; MenuStruct unk21C[4]; WindowTemplates unk35C; WindowTemplates unk3BC; diff --git a/include/unk_menu_203B360.h b/include/unk_menu_203B360.h index 4821dfe14..bd28f0067 100644 --- a/include/unk_menu_203B360.h +++ b/include/unk_menu_203B360.h @@ -3,5 +3,6 @@ void sub_80383A8(void); u32 sub_80383D4(void); +void sub_8038440(void); -#endif // GUARD_UNK_MENU_203B360_H \ No newline at end of file +#endif // GUARD_UNK_MENU_203B360_H diff --git a/include/wonder_mail_6.h b/include/wonder_mail_6.h new file mode 100644 index 000000000..0d4628eef --- /dev/null +++ b/include/wonder_mail_6.h @@ -0,0 +1,8 @@ +#ifndef GUARD_WONDER_MAIL_6_H +#define GUARD_WONDER_MAIL_6_H + +bool8 sub_8030F58(u32 wonderMailType); +u32 sub_8031050(void); +void sub_80310B4(void); + +#endif // GUARD_WONDER_MAIL_6_H diff --git a/src/code_800D090.c b/src/code_800D090.c index 4d60ddfc1..0ece563d9 100644 --- a/src/code_800D090.c +++ b/src/code_800D090.c @@ -158,6 +158,7 @@ EWRAM_DATA u32 gUnknown_202DBB8[80] = {0}; EWRAM_DATA struct UnkStruct_202DCF8 gUnknown_202DCF8 = {0}; +// arm_funcs.s extern u32 sub_80001E8(void); extern void sub_8000228(void); diff --git a/src/code_801F808.c b/src/code_801F808.c index 771086e33..a5d255bec 100644 --- a/src/code_801F808.c +++ b/src/code_801F808.c @@ -41,13 +41,11 @@ static const WindowTemplate sUnknown_80DC2F8 = { NULL }; -const u8 gUnknown_80DC310[] = _("{POKEMON_0}"); - -extern void sub_801F918(s32); -extern void sub_801FA58(void); -extern void sub_801FAD4(void); -extern void sub_801F930(void); -extern void sub_801F9A4(void); +static void sub_801F918(s32); +static void sub_801FA58(void); +static void sub_801FAD4(void); +static void sub_801F930(void); +static void sub_801F9A4(void); bool8 sub_801F808(u16 *moveIDs) { @@ -102,14 +100,14 @@ void sub_801F8D0(void) } } -void sub_801F918(s32 newState) +static void sub_801F918(s32 newState) { gUnknown_203B278->state = newState; sub_801F930(); sub_801F9A4(); } -void sub_801F930(void) +static void sub_801F930(void) { sub_80140B4(&gUnknown_203B278->windows); switch(gUnknown_203B278->state) @@ -132,7 +130,7 @@ void sub_801F930(void) } } -void sub_801F9A4(void) +static void sub_801F9A4(void) { switch (gUnknown_203B278->state) { case 0: @@ -145,7 +143,7 @@ void sub_801F9A4(void) CallPrepareTextbox_8008C54(gUnknown_203B278->unk5C); sub_80073B8(gUnknown_203B278->unk5C); InlineStrcpy(gFormatBuffer_Monsters[0], gUnknown_203B278->unk14[gUnknown_203B278->unkC]->name); - PrintFormattedStringOnWindow(0x10,0,gUnknown_80DC310,gUnknown_203B278->unk5C,0); // $m0 + PrintFormattedStringOnWindow(0x10,0,_("{POKEMON_0}"),gUnknown_203B278->unk5C,0); PrintFormattedStringOnWindow(4,0x10,gUnknown_203B278->unk14[gUnknown_203B278->unkC]->desc,gUnknown_203B278->unk5C,0); sub_80073E0(gUnknown_203B278->unk5C); break; @@ -154,7 +152,7 @@ void sub_801F9A4(void) } } -void sub_801FA58(void) +static void sub_801FA58(void) { if(gUnknown_203B278->unk10 != 0) { @@ -190,7 +188,7 @@ void sub_801FA58(void) } } -void sub_801FAD4(void) +static void sub_801FAD4(void) { if(gUnknown_203B278->unkC < gUnknown_203B278->unk10 - 1) { diff --git a/src/code_8031D70.c b/src/code_8031D70.c index cfffd0b80..99ea3d279 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -4,6 +4,7 @@ #include "constants/colors.h" #include "structs/str_dungeon.h" #include "music_util.h" +#include "code_8031D70.h" #include "code_803D0D8.h" #include "code_8094F88.h" #include "input.h" @@ -50,7 +51,6 @@ const WindowTemplate gUnknown_80E1FC4 = { ALIGNED(4) const u8 gUnknown_80E1FDC[] = "Password"; -void sub_8031E00(void); void sub_8031E58(void); void DrawSOSPasswordScreen(void); diff --git a/src/code_803C1B4.c b/src/code_803C1B4.c index 476e5d751..bd95f66f6 100644 --- a/src/code_803C1B4.c +++ b/src/code_803C1B4.c @@ -21,7 +21,7 @@ s32 sub_803C1B4(DungeonLocation *dungeon, u8 missionType) return temp; } -u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType) +u8 sub_803C1D0(DungeonLocation *dungeon, u8 missionType) { s32 a = sub_803C1B4(dungeon, missionType); a /= 2; @@ -32,7 +32,7 @@ u8 sub_803C1D0(struct DungeonLocation *dungeon, u8 missionType) return a; } -u8 *GetMissionRankText(u8 index) +const u8 *GetMissionRankText(u8 index) { return gMissionRankText[index]; } diff --git a/src/code_8040094_1.c b/src/code_8040094_1.c index 895b1fc80..fbf61a21e 100644 --- a/src/code_8040094_1.c +++ b/src/code_8040094_1.c @@ -6,35 +6,28 @@ #include "structs/dungeon_entity.h" #include "structs/str_dungeon.h" #include "code_800558C.h" -#include "graphics_memory.h" -#include "effect_data.h" -#include "effect_sub_1.h" -#include "dungeon_vram.h" +#include "code_8040094_1.h" +#include "dungeon_8041AD0.h" #include "dungeon_info.h" +#include "dungeon_logic.h" +#include "dungeon_map_access.h" #include "dungeon_message.h" +#include "dungeon_mon_sprite_render.h" #include "dungeon_move.h" #include "dungeon_move_util.h" #include "dungeon_music.h" #include "dungeon_random.h" +#include "dungeon_strings.h" +#include "dungeon_tilemap.h" #include "dungeon_util.h" -#include "dungeon_logic.h" +#include "dungeon_vram.h" +#include "effect_data.h" +#include "effect_main.h" +#include "effect_sub_1.h" +#include "graphics_memory.h" +#include "move_orb_actions_3.h" #include "sprite.h" #include "weather.h" -#include "dungeon_map_access.h" -#include "dungeon_strings.h" -#include "dungeon_mon_sprite_render.h" -#include "dungeon_8041AD0.h" -#include "effect_main.h" - -extern u8 sub_800EC94(s32 param_1); -extern void sub_800EEC8(u16 r0); -extern bool8 sub_800E9A8(s32 a0); -extern void sub_800EEF8(u16 a0); -extern bool8 sub_803F428(DungeonPos *pos); -extern void sub_800EEE0(u16 a0); -extern bool8 EffectiveMoveHasSineWobble(s32 moveId); - -extern const s32 gUnknown_8106A8C[]; u16 GetEffectiveMoveId(u16 moveId, u8 weather, bool32 hasSpecialEffect); static bool32 MoveHasSpecialEffect(Entity *entity, Move *move); diff --git a/src/code_80958E8.c b/src/code_80958E8.c index 96b7167ee..73c369e5f 100644 --- a/src/code_80958E8.c +++ b/src/code_80958E8.c @@ -1,5 +1,6 @@ #include "global.h" #include "globaldata.h" +#include "code_803C1B4.h" #include "code_803C1D0.h" #include "code_80958E8.h" #include "code_80A26CC.h" @@ -17,28 +18,30 @@ #include "pokemon_mail.h" #include "event_flag.h" #include "rescue_team_info.h" -#include "code_803C1B4.h" -bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4); -u8 sub_8095F28(u8 param_1); -bool8 GenerateMailJobDungeonInfo(WonderMail *mail); -bool8 GenerateMailJobInfo(WonderMail *); -bool8 sub_8096E80(u8); -u8 sub_8095E78(void); -bool8 sub_80963B4(void); -s32 CalculateMailChecksum(WonderMail *mail); +static const u8 sPossibleMissionTypes[8] = { + MISSION_TYPE_FRIEND_RESCUE, + MISSION_TYPE_FIND_ITEM, + MISSION_TYPE_DELIVER_ITEM, + MISSION_TYPE_RESCUE_CLIENT, + MISSION_TYPE_RESCUE_TARGET, + MISSION_TYPE_DELIVER_ITEM, + MISSION_TYPE_FIND_ITEM, + MISSION_TYPE_FRIEND_RESCUE +}; -extern void sub_803C4F0(WonderMail *); -extern void sub_803C3E0(WonderMail *); -extern void sub_803C45C(WonderMail *); -extern void sub_803C610(WonderMail *); -extern void sub_803C580(WonderMail *); +static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = { 0 }; -static const u8 sPossibleMissionTypes[] = {MISSION_TYPE_FRIEND_RESCUE, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_RESCUE_CLIENT, MISSION_TYPE_RESCUE_TARGET, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_FRIEND_RESCUE}; +EWRAM_INIT unkStruct_203B490 *gUnknown_203B490 = { NULL }; -static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = {0}; - -EWRAM_INIT unkStruct_203B490 *gUnknown_203B490 = {0}; +static bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4); +static u8 sub_8095F28(u8 param_1); +static bool8 GenerateMailJobDungeonInfo(WonderMail *mail); +static bool8 GenerateMailJobInfo(WonderMail *); +static bool8 sub_8096E80(u8); +static u8 sub_8095E78(void); +static bool8 sub_80963B4(void); +static s32 CalculateMailChecksum(WonderMail *mail); void LoadMailInfo(void) { @@ -169,7 +172,7 @@ bool8 ValidateWonderMail(WonderMail *data) } } -bool8 GenerateMailJobInfo(struct WonderMail *mail) +static bool8 GenerateMailJobInfo(WonderMail *mail) { s32 missionType; s32 i; @@ -262,7 +265,7 @@ bool8 GenerateMailJobInfo(struct WonderMail *mail) return TRUE; } -bool8 GenerateMailJobDungeonInfo(WonderMail *mail) +static bool8 GenerateMailJobDungeonInfo(WonderMail *mail) { s32 counter; s32 floor; @@ -342,7 +345,7 @@ bool8 GenerateMailJobDungeonInfo(WonderMail *mail) } while( TRUE ); } -bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4) +static bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4) { if (mail->mailType != MAIL_TYPE_NONE) { if ((mail->missionType == WONDER_MAIL_MISSION_TYPE_ESCORT_CLIENT) && (param_4 == 1)) { @@ -357,7 +360,7 @@ bool8 sub_8095E38(WonderMail *mail, u8 dungeon, u32 floor, u8 param_4) return FALSE; } -u8 sub_8095E78(void) +static u8 sub_8095E78(void) { bool8 flag; s32 index; @@ -401,7 +404,7 @@ u8 sub_8095E78(void) } } -u8 sub_8095F28(u8 param_1) +static u8 sub_8095F28(u8 param_1) { s32 itemID; s32 counter; @@ -613,7 +616,8 @@ _0809638E: if(GenerateMailJobInfo(slot)) { friendAreaReward = sub_8095E78(); - if(!sub_803C1D0(&slot->dungeonSeed.location, slot->missionType)) friendAreaReward = FRIEND_AREA_NONE; + if (sub_803C1D0(&slot->dungeonSeed.location, slot->missionType) == 0) + friendAreaReward = FRIEND_AREA_NONE; slot->rewardType = RandRange(MONEY1, END_REWARDS); if(slot->rewardType == FRIEND_AREA) { @@ -643,7 +647,7 @@ _08096392: return flag; } -bool8 sub_80963B4(void) +static bool8 sub_80963B4(void) { u8 floor; s32 num; @@ -1257,12 +1261,13 @@ u8 sub_8096E2C(void) for(index = floor; index < 0x32; index++) { - if(!gUnknown_203B490->PKMNNewsReceived[index]) return index; + if(!gUnknown_203B490->PKMNNewsReceived[index]) + return index; } return 0x38; } -bool8 sub_8096E80(u8 floor) +static bool8 sub_8096E80(u8 floor) { s32 index; for(index = 0; index < NUM_MAILBOX_SLOTS; index++) @@ -1276,7 +1281,7 @@ bool8 sub_8096E80(u8 floor) return FALSE; } -s32 CalculateMailChecksum(WonderMail *mail) +static s32 CalculateMailChecksum(WonderMail *mail) { s32 sum; diff --git a/src/dungeon_8041AD0.c b/src/dungeon_8041AD0.c index ba3166272..a2e2d09b1 100644 --- a/src/dungeon_8041AD0.c +++ b/src/dungeon_8041AD0.c @@ -10,6 +10,7 @@ #include "code_800558C.h" #include "effect_main.h" #include "effect_sub_1.h" +#include "effect_sub_2.h" #include "dungeon_vram.h" #include "dungeon_tilemap.h" #include "dungeon_mon_sprite_render.h" @@ -35,13 +36,6 @@ // Unknown dungeon file. File split is correct. -extern void sub_800DBBC(void); -extern void sub_800EF28(u8); -extern void sub_800F15C(s32); -extern void sub_800EF40(u8 r0, u8 r1); -extern s32 sub_800E6D8(s32); -extern void sub_800EB24(s32 param_1, DungeonPos *param_2, DungeonPos *param_3, s32 param_4, s32 param_5); - struct UnkStruct_80F6624 { s16 unk0; diff --git a/src/dungeon_misc.c b/src/dungeon_misc.c index 477c67f06..39d3f1bf0 100644 --- a/src/dungeon_misc.c +++ b/src/dungeon_misc.c @@ -194,7 +194,7 @@ void SetDungeonMonsFromTeam(void) if (PokemonExists(pokeStruct) && PokemonIsOnTeam(pokeStruct)) { RecruitedPokemonToDungeonMon(&gRecruitedPokemonRef->dungeonTeam[index],recruitedId); if (IsLevelResetDungeon(gDungeon->unk644.dungeonLocation.id)) { - struct DungeonLocation dungeonLoc = {.id = DUNGEON_TINY_WOODS, .floor = 1}; + DungeonLocation dungeonLoc = { .id = DUNGEON_TINY_WOODS, .floor = 1 }; CreateLevel1Pokemon(&lvl1Mon,pokeStruct->speciesNum,0,0,&dungeonLoc,0); gRecruitedPokemonRef->dungeonTeam[index].level = lvl1Mon.level; gRecruitedPokemonRef->dungeonTeam[index].IQ = lvl1Mon.IQ; diff --git a/src/dungeon_move.c b/src/dungeon_move.c index 1e84be40f..054901bee 100644 --- a/src/dungeon_move.c +++ b/src/dungeon_move.c @@ -6,6 +6,7 @@ #include "constants/iq_skill.h" #include "constants/status.h" #include "constants/weather.h" +#include "code_8040094_1.h" #include "dungeon_move_util.h" #include "effect_main.h" #include "effect_data.h" @@ -44,8 +45,6 @@ #include "warp_target.h" #include "dungeon_ai_attack.h" -extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *); - static s32 TryHitTarget_Async(Entity *attacker, Entity *target, Move *move, struct DamageStruct *dmgStruct, s16 unk_); EWRAM_DATA s32 gUnknown_202F208 = 0; diff --git a/src/dungeon_move_util.c b/src/dungeon_move_util.c index dbad1fcaf..5c827658b 100644 --- a/src/dungeon_move_util.c +++ b/src/dungeon_move_util.c @@ -5,6 +5,7 @@ #include "constants/iq_skill.h" #include "constants/status.h" #include "constants/weather.h" +#include "code_8040094_1.h" #include "dungeon_move_util.h" #include "effect_main.h" #include "effect_data.h" @@ -47,7 +48,6 @@ extern bool8 sub_8040BB0(Entity *entity, Move *move, bool8); extern void sub_8040DA0(Entity *entity, Move *move); extern u16 GetEffectiveMoveId(u16 moveId, u8 weather, u8 hasSpecialEffect); -extern void sub_8041168(Entity *entity, Entity *entity2, Move *,DungeonPos *); static u8 ToItemID(u32 itemID); diff --git a/src/friend_rescue.c b/src/friend_rescue.c index 43e757041..2451206f8 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -29,6 +29,7 @@ #include "wonder_mail_5.h" #include "naming_screen.h" #include "code_803C1B4.h" +#include "code_8031D70.h" extern void SetFriendRescueMenuState(u32); @@ -579,13 +580,7 @@ void sub_80353BC(void); void sub_8035424(void); void sub_8035430(void); -extern u32 sub_8031DCC(void); -extern void sub_8031E00(void); -extern u32 sub_8039068(u32, u8 *passwordBuffer, unkStruct_203B480 *r0); - -extern void sub_8031E10(void); extern u8 sub_800D588(void); -extern bool8 sub_8031D70(u32 mailIndex, s32); u32 CreateFriendRescueMenu(void) { diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index bb9a9422d..a2218708b 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -2,6 +2,7 @@ #include "globaldata.h" #include "constants/main_menu.h" #include "code_803D0D8.h" +#include "code_8031D70.h" #include "code_8094F88.h" #include "dungeon_info.h" #include "input.h" @@ -243,15 +244,9 @@ const MenuItem gUnknown_80E75A0[4] = { ALIGNED(4) const u8 sUnknown_80E75C0[] = _("{CENTER_ALIGN}new mail."); ALIGNED(4) const u8 sUnknown_80E75CC[] = _("{CENTER_ALIGN}There is no space for receiving"); -extern void sub_8031D70(u32, u32); -extern void sub_8031E10(void); -extern u32 sub_8031DCC(void); -extern void sub_8031E00(void); - void DisplayRescuePasswordError(u32 error); void sub_8039174(void); void DisplayPasswordAcceptScreen(void); -u32 sub_8039068(u32, u8 *passwordBuffer, unkStruct_203B480 *r0); void sub_80391F8(void); u32 ConvertMenutoRescuePasswordState(u32); diff --git a/src/save_menu.c b/src/save_menu.c index 9b7831922..a599c3d79 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -117,9 +117,6 @@ ALIGNED(4) const u8 gUnknown_80E7178[] = _("{CENTER_ALIGN}The data could not be static void sub_8038830(void); static void sub_80388C4(void); -extern void sub_8038440(void); -extern void sub_80140F8(void); - void CreateSaveMenu(s32 currMenu) { s32 index; diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 9a71bde7b..5051977f4 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -6,6 +6,8 @@ #include "code_801B3C0.h" #include "code_801C8C4.h" #include "code_802F204.h" +#include "code_8031D70.h" +#include "code_803C1B4.h" #include "code_8094F88.h" #include "cpu.h" #include "input.h" @@ -25,7 +27,6 @@ #include "wonder_mail_4.h" #include "wonder_mail_5.h" #include "naming_screen.h" -#include "code_803C1B4.h" static EWRAM_INIT WonderMailStruct_203B2C4 *sUnknown_203B2C4 = {NULL}; @@ -172,8 +173,6 @@ const MenuItem gUnknown_80DEEE4[] = #include "data/thank_you_wonder_mail.h" -extern u32 sub_8031DCC(void); -extern void sub_8031E00(void); extern void HandleThankYouMailPelipperMainMenu(); extern void sub_802AAC8(); extern void ReturnToThankYouMailMainMenu(); @@ -214,13 +213,10 @@ extern void HandleThankYouMailPasswordMenu(); extern void sub_802A9FC(); extern void sub_802A828(); extern void sub_802A850(); -extern void sub_8031E10(); extern void SetThankYouMailMenuState(u32); extern u8 sub_800D588(void); -extern void sub_8031D70(u8, u32); extern void sub_8011C28(u32); -extern u32 sub_8039068(u32, u8 *r1, unkStruct_203B480 *r0); bool8 CreateThankYouMailPelipper(void) diff --git a/src/unk_menu_203B360.c b/src/unk_menu_203B360.c index 0b8e2d2d6..6ab46fc21 100644 --- a/src/unk_menu_203B360.c +++ b/src/unk_menu_203B360.c @@ -56,8 +56,7 @@ ALIGNED(4) const u8 StorageEmpty_80E6EE4[] = _("{CENTER_ALIGN}The storage space ALIGNED(4) const u8 Caution_80E6F04[] = _("{CENTER_ALIGN}{COLOR RED}Caution!{RESET} "); static const u8 fill0[] = "pksdir0"; -extern void sub_8038440(); - +void sub_8038440(void); static void sub_80384D0(void); void sub_80382E4(s32 currMenu) diff --git a/src/wonder_mail.c b/src/wonder_mail.c index 9f2a84130..a2c6228e0 100644 --- a/src/wonder_mail.c +++ b/src/wonder_mail.c @@ -1,17 +1,20 @@ #include "global.h" #include "globaldata.h" #include "constants/communication_error_codes.h" -#include "music_util.h" -#include "friend_list.h" #include "code_8024458.h" +#include "code_8031D70.h" #include "code_8094F88.h" #include "code_80A26CC.h" #include "cpu.h" +#include "friend_list.h" +#include "ground_main.h" #include "input.h" #include "items.h" #include "main_menu1.h" #include "memory.h" #include "menu_input.h" +#include "music_util.h" +#include "naming_screen.h" #include "other_menus2.h" #include "pokemon.h" #include "rescue_password_menu.h" @@ -22,82 +25,7 @@ #include "wonder_mail.h" #include "wonder_mail_4.h" #include "wonder_mail_5.h" -#include "naming_screen.h" -#include "ground_main.h" - -static EWRAM_INIT WonderMailStruct_203B2C0 *sUnknown_203B2C0 = {NULL}; - -extern void sub_8011C28(u32); - -extern u32 sub_8031050(); -extern void sub_80310B4(); -extern void nullsub_130(void); -extern void sub_8028348(void); - -extern u32 sub_8039068(u32, u8 *r1, unkStruct_203B480 *r0); -extern u32 sub_8031DCC(); -extern void sub_8031E10(); -extern void sub_8031E00(); -extern void sub_8031E10(void); -extern void sub_8031D70(u8, u32); -extern void sub_8030F58(u32); -extern void sub_8029B34(void); -extern void sub_8029AD8(void); -extern void sub_8029AF4(void); -extern void sub_8029A88(void); -extern void sub_8029AB0(void); -extern void sub_80297B8(void); -extern void sub_80297D4(void); -extern void sub_8029884(void); -extern void sub_8029944(void); -extern void sub_80299AC(void); -extern void sub_80299D8(void); -extern void sub_8029A6C(void); -extern void ExitFriendRescueCounterMenu(void); -extern void sub_8028BF0(void); -extern void sub_8029A18(void); -extern void sub_80295A8(void); -extern void sub_8029668(void); -extern void sub_8029684(void); -extern void sub_8029740(void); -extern void sub_80295D8(void); -extern void sub_802979C(void); -extern void sub_8029358(void); -extern void sub_8029374(void); -extern void sub_802939C(void); -extern void sub_8028F58(void); -extern void sub_8028F30(void); -extern void sub_8028F04(void); -extern void sub_8028ED4(void); -extern void sub_80293D8(void); -extern void sub_80293F4(void); -extern void sub_8028DE8(u32); -extern void sub_8028EAC(void); -extern void sub_802955C(void); -extern void sub_80292A4(void); -extern void sub_80292EC(void); -extern void sub_802933C(void); -extern void sub_802958C(void); -extern void sub_8029208(void); -extern void sub_8028E84(void); -extern void sub_8028F80(void); -extern void sub_8028FC0(void); -extern void sub_8028FDC(void); -extern void sub_8028E54(void); -extern void sub_8028E24(void); -extern void sub_8028E08(void); -extern void sub_80290D4(void); -extern void sub_80290F0(void); -extern void sub_80291AC(void); -extern void sub_8029044(void); -extern void sub_8028CFC(void); -extern void sub_8028D4C(void); -extern void sub_8031E10(void); -extern void sub_80310B4(void); - -extern const u8 DontSendPokemon_80DDB80[]; -extern const u8 SendPokemon_80DDB98[]; -extern const u8 SendWOPokemon[]; +#include "wonder_mail_6.h" enum FriendRescueStates { @@ -175,217 +103,269 @@ enum MenuActions { SEND_WO_POKEMON_ACTION = 18 }; +static EWRAM_INIT WonderMailStruct_203B2C0 *sUnknown_203B2C0 = { NULL }; + #include "data/wonder_mail_1.h" +static void ExitFriendRescueCounterMenu(void); +static void SetFriendRescueCounterState(u32 state); -void SetFriendRescueCounterState(u32 r0); +static void sub_8028BF0(void); +static void sub_8028CFC(void); +static void sub_8028D4C(void); +static void sub_8028DE8(u32 newState); +static void sub_8028E08(void); +static void sub_8028E24(void); +static void sub_8028E54(void); +static void sub_8028E84(void); +static void sub_8028EAC(void); +static void sub_8028ED4(void); +static void sub_8028F04(void); +static void sub_8028F30(void); +static void sub_8028F58(void); +static void sub_8028F80(void); +static void sub_8028FC0(void); +static void sub_8028FDC(void); +static void sub_8029044(void); +static void sub_80290D4(void); +static void sub_80290F0(void); +static void sub_80291AC(void); +static void sub_8029208(void); +static void sub_80292A4(void); +static void sub_80292EC(void); +static void sub_802933C(void); +static void sub_8029358(void); +static void sub_8029374(void); +static void sub_802939C(void); +static void sub_80293D8(void); +static void sub_80293F4(void); +static void sub_802955C(void); +static void sub_802958C(void); +static void sub_80295A8(void); +static void sub_80295D8(void); +static void sub_8029668(void); +static void sub_8029684(void); +static void sub_8029740(void); +static void sub_802979C(void); +static void sub_80297B8(void); +static void sub_80297D4(void); +static void sub_8029884(void); +static void sub_8029944(void); +static void sub_80299AC(void); +static void sub_80299D8(void); +static void sub_8029A18(void); +static void sub_8029A6C(void); +static void sub_8029A88(void); +static void sub_8029AB0(void); +static void sub_8029AD8(void); +static void sub_8029AF4(void); +static void sub_8029B34(void); u8 sub_8027F88(void) { - char *monName; - OpenedFile *faceFile; - s32 counter; + u8 *monName; + OpenedFile *faceFile; + s32 counter; - ResetUnusedInputStruct(); - ShowWindows(NULL, TRUE, TRUE); - sUnknown_203B2C0 = MemoryAlloc(sizeof(WonderMailStruct_203B2C0), 8); - MemoryFill8(sUnknown_203B2C0, 0, sizeof(WonderMailStruct_203B2C0)); - sUnknown_203B2C0->unk53C = 0; - sUnknown_203B2C0->mailIndex = -1; - sUnknown_203B2C0->speciesNum = -1; - CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); - monName = GetMonSpecies(MONSTER_PELIPPER); - strcpy(gFormatBuffer_Monsters[0], monName); - faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); - sUnknown_203B2C0->monPortrait.faceFile = faceFile; - sUnknown_203B2C0->monPortrait.faceData = (PortraitGfx *) faceFile->data; - sUnknown_203B2C0->monPortrait.spriteId = 0; - sUnknown_203B2C0->monPortrait.flip = FALSE; - sUnknown_203B2C0->monPortrait.unkE = 0; - sUnknown_203B2C0->monPortrait.pos.x = 2; - sUnknown_203B2C0->monPortrait.pos.y = 8; - for(counter = 0; counter < PASSWORD_BUFFER_SIZE; counter++){ - sUnknown_203B2C0->passwordBuffer[counter] = 0; - } - sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE; - SetFriendRescueCounterState(INITIALIZE_FRIEND_RESCUE); - return 1; + ResetUnusedInputStruct(); + ShowWindows(NULL, TRUE, TRUE); + sUnknown_203B2C0 = MemoryAlloc(sizeof(WonderMailStruct_203B2C0), 8); + MemoryFill8(sUnknown_203B2C0, 0, sizeof(WonderMailStruct_203B2C0)); + sUnknown_203B2C0->unk53C = 0; + sUnknown_203B2C0->mailIndex = -1; + sUnknown_203B2C0->speciesNum = -1; + CopyYellowMonsterNametoBuffer(gSpeakerNameBuffer, MONSTER_PELIPPER); + monName = GetMonSpecies(MONSTER_PELIPPER); + strcpy(gFormatBuffer_Monsters[0], monName); + faceFile = GetDialogueSpriteDataPtr(MONSTER_PELIPPER); + sUnknown_203B2C0->monPortrait.faceFile = faceFile; + sUnknown_203B2C0->monPortrait.faceData = (PortraitGfx *) faceFile->data; + sUnknown_203B2C0->monPortrait.spriteId = 0; + sUnknown_203B2C0->monPortrait.flip = FALSE; + sUnknown_203B2C0->monPortrait.unkE = 0; + sUnknown_203B2C0->monPortrait.pos.x = 2; + sUnknown_203B2C0->monPortrait.pos.y = 8; + for(counter = 0; counter < PASSWORD_BUFFER_SIZE; counter++){ + sUnknown_203B2C0->passwordBuffer[counter] = 0; + } + sUnknown_203B2C0->fallbackState = DEFAULT_FALLBACK_STATE; + SetFriendRescueCounterState(INITIALIZE_FRIEND_RESCUE); + return 1; } u32 sub_8028078(void) { - - switch(sUnknown_203B2C0->state) { - case 0x3c: - sub_8029B34(); - break; - case 0x3a: - sub_8029AD8(); - break; - case 0x3b: - sub_8029AF4(); - break; - case SENT_AOK_MAIL_SAVE_PRE: - sub_8029A88(); - break; - case SENT_AOK_MAIL: - sub_8029AB0(); - break; - case PROMPT_SELECT_HELPER_POKEMON: - sub_80297B8(); - break; - case SELECT_HELPER_POKEMON: - sub_80297D4(); - break; - case 0x34: - sub_8029884(); - break; - case 0x35: - sub_8029944(); - break; - case NO_POKEMON_IN_FRIEND_AREA: - sub_80299AC(); - break; - case CONFIRM_SEND_HELPER_POKEMON: - sub_80299D8(); - break; - case 0x30: - sub_8029A6C(); - break; - case 0x2e: - sub_8029A18(); - break; - case 0x2d: - sub_80295A8(); - break; - case PROMPT_CHOOSE_AOK_MAIL: - sub_8029668(); - break; - case 0x2b: - sub_8029684(); - break; - case 0x2c: - sub_8029740(); - break; - case 0x2a: - sub_80295D8(); - break; - case 0x2f: - sub_802979C(); - break; - case NO_MAIL_ROOM: - sub_8029358(); - break; - case RECEIVED_FRIEND_SOS_MAIL: - sub_8029374(); - break; - case RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE: - sub_802939C(); - break; - case PROMPT_SOS_MAIL_PASSWORD: - sub_80293D8(); - break; - case 0x27: - sub_80293F4(); - break; - case 0x28: - sub_802955C(); - break; - case 4: - sub_80292A4(); - break; - case FRIEND_RESCUE_COMMUNICATING: - sub_80292EC(); - break; - case FRIEND_RESCUE_ERROR: - sub_802933C(); - break; - case FRIEND_RESCUE_COMMUNICATING_PRE: - sub_802958C(); - break; - case RECEIVE_SOS_MAIL: - sub_8029208(); - break; - case NO_SOS_MAIL_TO_SEND: - sub_8028DE8(FRIEND_RESCUE_MAIN); - break; - case 0x1b: - sub_8028F80(); - break; - case CANT_GO_TO_DUNGEON: - case FRIEND_RESCUE_FAILED: - sub_8028FC0(); - break; - case 0x22: - sub_8028FDC(); - break; - case PROMPT_CHOOSE_SOS_MAIL: - sub_80290D4(); - break; - case 0x20: - sub_80290F0(); - break; - case 0x21: - sub_80291AC(); - break; - case 0x1f: - sub_8029044(); - break; - case 10: - sub_8028CFC(); - break; - case 0xb: - sub_8028D4C(); - break; - case CHOOSE_DELETE_SOS_MAIL: - case CHOOSE_DELETE_AOK_MAIL: - sub_8028DE8(0xA); - break; - case CHOOSE_DELETE_ALL_MAIL: - sub_8028E08(); - break; - case NO_SOS_MAIL: - case NO_AOK_MAIL: - case NO_MAIL: - sub_8028DE8(PROMPT_DELETE_ANY_OTHER_MAIL); - break; - case PROMPT_DELETE_ALL_MAIL: - sub_8028E24(); - break; - case CONFIRM_DELETE_ALL_MAIL_1: - sub_8028E54(); - break; - case SAVING_ADVENTURE: - sub_8028E84(); - break; - case FINISH_SAVING_ADVENTURE: - sub_8028EAC(); - break; - case PROMPT_DELETE_ANY_OTHER_MAIL: - sub_8028ED4(); - break; - case CONFIRM_DELETE_ALL_MAIL_2: - sub_8028F04(); - break; - case DELETE_ALL_MAIL_SAVE_PRE: - sub_8028F30(); - break; - case 0x16: - sub_8028F58(); - break; - case INITIALIZE_FRIEND_RESCUE: - case FRIEND_RESCUE_MAIN: - sub_8028BF0(); - break; - case FRIEND_RESCUE_EXIT_PRE: - case RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE: - case SENT_AOK_MAIL_SAVE_COMPLETE: - ExitFriendRescueCounterMenu(); - break; - case FRIEND_RESCUE_COUNTER_EXIT: - return 3; - } - return 0; + switch (sUnknown_203B2C0->state) { + case 0x3c: + sub_8029B34(); + break; + case 0x3a: + sub_8029AD8(); + break; + case 0x3b: + sub_8029AF4(); + break; + case SENT_AOK_MAIL_SAVE_PRE: + sub_8029A88(); + break; + case SENT_AOK_MAIL: + sub_8029AB0(); + break; + case PROMPT_SELECT_HELPER_POKEMON: + sub_80297B8(); + break; + case SELECT_HELPER_POKEMON: + sub_80297D4(); + break; + case 0x34: + sub_8029884(); + break; + case 0x35: + sub_8029944(); + break; + case NO_POKEMON_IN_FRIEND_AREA: + sub_80299AC(); + break; + case CONFIRM_SEND_HELPER_POKEMON: + sub_80299D8(); + break; + case 0x30: + sub_8029A6C(); + break; + case 0x2e: + sub_8029A18(); + break; + case 0x2d: + sub_80295A8(); + break; + case PROMPT_CHOOSE_AOK_MAIL: + sub_8029668(); + break; + case 0x2b: + sub_8029684(); + break; + case 0x2c: + sub_8029740(); + break; + case 0x2a: + sub_80295D8(); + break; + case 0x2f: + sub_802979C(); + break; + case NO_MAIL_ROOM: + sub_8029358(); + break; + case RECEIVED_FRIEND_SOS_MAIL: + sub_8029374(); + break; + case RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE: + sub_802939C(); + break; + case PROMPT_SOS_MAIL_PASSWORD: + sub_80293D8(); + break; + case 0x27: + sub_80293F4(); + break; + case 0x28: + sub_802955C(); + break; + case 4: + sub_80292A4(); + break; + case FRIEND_RESCUE_COMMUNICATING: + sub_80292EC(); + break; + case FRIEND_RESCUE_ERROR: + sub_802933C(); + break; + case FRIEND_RESCUE_COMMUNICATING_PRE: + sub_802958C(); + break; + case RECEIVE_SOS_MAIL: + sub_8029208(); + break; + case NO_SOS_MAIL_TO_SEND: + sub_8028DE8(FRIEND_RESCUE_MAIN); + break; + case 0x1b: + sub_8028F80(); + break; + case CANT_GO_TO_DUNGEON: + case FRIEND_RESCUE_FAILED: + sub_8028FC0(); + break; + case 0x22: + sub_8028FDC(); + break; + case PROMPT_CHOOSE_SOS_MAIL: + sub_80290D4(); + break; + case 0x20: + sub_80290F0(); + break; + case 0x21: + sub_80291AC(); + break; + case 0x1f: + sub_8029044(); + break; + case 10: + sub_8028CFC(); + break; + case 0xb: + sub_8028D4C(); + break; + case CHOOSE_DELETE_SOS_MAIL: + case CHOOSE_DELETE_AOK_MAIL: + sub_8028DE8(0xA); + break; + case CHOOSE_DELETE_ALL_MAIL: + sub_8028E08(); + break; + case NO_SOS_MAIL: + case NO_AOK_MAIL: + case NO_MAIL: + sub_8028DE8(PROMPT_DELETE_ANY_OTHER_MAIL); + break; + case PROMPT_DELETE_ALL_MAIL: + sub_8028E24(); + break; + case CONFIRM_DELETE_ALL_MAIL_1: + sub_8028E54(); + break; + case SAVING_ADVENTURE: + sub_8028E84(); + break; + case FINISH_SAVING_ADVENTURE: + sub_8028EAC(); + break; + case PROMPT_DELETE_ANY_OTHER_MAIL: + sub_8028ED4(); + break; + case CONFIRM_DELETE_ALL_MAIL_2: + sub_8028F04(); + break; + case DELETE_ALL_MAIL_SAVE_PRE: + sub_8028F30(); + break; + case 0x16: + sub_8028F58(); + break; + case INITIALIZE_FRIEND_RESCUE: + case FRIEND_RESCUE_MAIN: + sub_8028BF0(); + break; + case FRIEND_RESCUE_EXIT_PRE: + case RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE: + case SENT_AOK_MAIL_SAVE_COMPLETE: + ExitFriendRescueCounterMenu(); + break; + case FRIEND_RESCUE_COUNTER_EXIT: + return 3; + } + return 0; } s32 sub_80282DC(u8 *r0) @@ -396,28 +376,28 @@ s32 sub_80282DC(u8 *r0) void sub_80282FC(void) { - if (sUnknown_203B2C0 != NULL) { - CloseFile(sUnknown_203B2C0->monPortrait.faceFile); - FREE_AND_SET_NULL(sUnknown_203B2C0); - sub_8031E10(); - FriendList_Free(); - sub_803084C(); - NamingScreen_Free(); - sub_80310B4(); - sub_8030DE4(); - sub_802453C(); - } + if (sUnknown_203B2C0 != NULL) { + CloseFile(sUnknown_203B2C0->monPortrait.faceFile); + FREE_AND_SET_NULL(sUnknown_203B2C0); + sub_8031E10(); + FriendList_Free(); + sub_803084C(); + NamingScreen_Free(); + sub_80310B4(); + sub_8030DE4(); + sub_802453C(); + } } -void nullsub_130(void) +static void nullsub_130(void) { } -void sub_8028348(void) +static void sub_8028348(void) { s32 linkError; - switch(sUnknown_203B2C0->state) - { + + switch (sUnknown_203B2C0->state) { case 0x3B: RestoreSavedWindows(&sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); @@ -695,8 +675,7 @@ void sub_8028348(void) } } - -void SetFriendRescueCounterState(u32 state) +static void SetFriendRescueCounterState(u32 state) { sUnknown_203B2C0->state = state; nullsub_130(); @@ -706,8 +685,7 @@ void SetFriendRescueCounterState(u32 state) // Wonder Mail Linking... void PrintFriendRescueCounterError(u32 errorCode) { - switch(errorCode) - { + switch (errorCode) { case COMMS_GOOD: break; case 1: @@ -749,50 +727,38 @@ void PrintFriendRescueCounterError(u32 errorCode) } } -void sub_8028BF0(void) +static void sub_8028BF0(void) { u32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } + sUnknown_203B2C0->unk40 = 8; sUnknown_203B2C0->speciesNum = -1; - switch(menuChoice) - { + + switch (menuChoice) { case RECEIVE_SOS_MAIL_ACTION: sUnknown_203B2C0->unk40 = 3; sUnknown_203B2C0->unk538 = 0; - if(FindOpenMailSlot() != -1) - { + if (FindOpenMailSlot() != -1) SetFriendRescueCounterState(RECEIVE_SOS_MAIL); - } else - { SetFriendRescueCounterState(NO_MAIL_ROOM); - } break; case LEAVE_FOR_RESCUE_ACTION: - if(CountMailType(2) != 0) - { + if (CountMailType(2) != 0) SetFriendRescueCounterState(PROMPT_CHOOSE_SOS_MAIL); - } else - { SetFriendRescueCounterState(NO_SOS_MAIL_TO_SEND); - } break; case SEND_AOK_MAIL_ACTION: sUnknown_203B2C0->unk40 = 4; sUnknown_203B2C0->unk538 = 2; - if(CountMailType(WONDER_MAIL_TYPE_AOK) != 0) - { + if (CountMailType(WONDER_MAIL_TYPE_AOK) != 0) SetFriendRescueCounterState(PROMPT_CHOOSE_AOK_MAIL); - } else - { SetFriendRescueCounterState(NO_AOK_MAIL_TO_SEND); - } break; case DELETE_MAIL_ACTION: SetFriendRescueCounterState(11); @@ -805,72 +771,63 @@ void sub_8028BF0(void) } } - -void ExitFriendRescueCounterMenu() +static void ExitFriendRescueCounterMenu(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_COUNTER_EXIT); } -void sub_8028CFC() +static void sub_8028CFC(void) { s32 temp; u32 newMailCount; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } - switch(sub_8031050()) - { + + switch (sub_8031050()) { case 2: case 3: newMailCount = CountAllMail(); sub_80310B4(); - if(newMailCount != sUnknown_203B2C0->mailCount) - { + if (newMailCount != sUnknown_203B2C0->mailCount) SetFriendRescueCounterState(SAVING_ADVENTURE); - } else - { SetFriendRescueCounterState(PROMPT_DELETE_ANY_OTHER_MAIL); - } break; default: break; } } -void sub_8028D4C() +static void sub_8028D4C(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } + sUnknown_203B2C0->unk538 = menuChoice; - switch(sUnknown_203B2C0->unk538) - { + + switch (sUnknown_203B2C0->unk538) { case DELETE_SOS_MAIL_ACTION: - if(HasNoWonderMailType(2)) + if (HasNoWonderMailType(2)) SetFriendRescueCounterState(NO_SOS_MAIL); else SetFriendRescueCounterState(CHOOSE_DELETE_SOS_MAIL); break; case DELETE_AOK_MAIL_ACTION: - if(HasNoWonderMailType(WONDER_MAIL_TYPE_AOK)) + if (HasNoWonderMailType(WONDER_MAIL_TYPE_AOK)) SetFriendRescueCounterState(NO_AOK_MAIL); else SetFriendRescueCounterState(CHOOSE_DELETE_AOK_MAIL); break; case DELETE_ALL_MAIL_ACTION: - if(HasNoWonderMailType(WONDER_MAIL_TYPE_NONE)) + if (HasNoWonderMailType(WONDER_MAIL_TYPE_NONE)) SetFriendRescueCounterState(NO_MAIL); else SetFriendRescueCounterState(CHOOSE_DELETE_ALL_MAIL); @@ -883,38 +840,34 @@ void sub_8028D4C() } } -void sub_8028DE8(u32 newState) +static void sub_8028DE8(u32 newState) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(newState); } -void sub_8028E08() +static void sub_8028E08(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(PROMPT_DELETE_ALL_MAIL); } -void sub_8028E24() +static void sub_8028E24() { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(CONFIRM_DELETE_ALL_MAIL_1); break; @@ -926,16 +879,14 @@ void sub_8028E24() } } -void sub_8028E54() +static void sub_8028E54() { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(CONFIRM_DELETE_ALL_MAIL_2); break; @@ -947,43 +898,39 @@ void sub_8028E54() } } -void sub_8028E84() +static void sub_8028E84() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FINISH_SAVING_ADVENTURE); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_8028EAC() +static void sub_8028EAC() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { FinishWriteSavePak(); SetFriendRescueCounterState(PROMPT_DELETE_ANY_OTHER_MAIL); } } -void sub_8028ED4() +static void sub_8028ED4() { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice){ + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(0xB); break; @@ -996,153 +943,143 @@ void sub_8028ED4() } } -void sub_8028F04() +static void sub_8028F04() { s32 temp; s32 counter; - if(sub_80144A4(&temp) == 0) - { - for(counter = 0; counter <= 31; counter++) - { + if (sub_80144A4(&temp) == 0) { + for (counter = 0; counter <= 31; counter++) { DeleteMailAtIndex(counter); } + SetFriendRescueCounterState(DELETE_ALL_MAIL_SAVE_PRE); } } -void sub_8028F30() +static void sub_8028F30() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x16); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_8028F58() +static void sub_8028F58() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { FinishWriteSavePak(); SetFriendRescueCounterState(FRIEND_RESCUE_EXIT_PRE); } } -void sub_8028F80() +static void sub_8028F80() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + sub_809927C(sUnknown_203B2C0->mailIndex); sUnknown_203B2C0->unk53C = 1; SetFriendRescueCounterState(FRIEND_RESCUE_COUNTER_EXIT); } -void sub_8028FC0() +static void sub_8028FC0() { s32 temp; - if(sub_80144A4(&temp) != 0) - { + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_8028FDC(void) +static void sub_8028FDC(void) { s32 menuChoice; unkStruct_203B480 *mail; - if(sub_80144A4(&menuChoice) != 0) - { + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { - case YES_ACTION: + + switch (menuChoice) { + case YES_ACTION: { mail = GetMailatIndex(sUnknown_203B2C0->mailIndex); - if(!sub_80A2824(mail->dungeonSeed.location.id)) - { + if (!sub_80A2824(mail->dungeonSeed.location.id)) SetFriendRescueCounterState(CANT_GO_TO_DUNGEON); - } else if(mail->rescuesAllowed <= 0) - { SetFriendRescueCounterState(FRIEND_RESCUE_FAILED); - } else - { SetFriendRescueCounterState(0x1B); - } break; + } case NO_ACTION: - case CANCEL_ACTION: + case CANCEL_ACTION: { SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; - default: + } + default: { break; + } } } -void sub_8029044(void) +static void sub_8029044(void) { - switch(sub_8030768(1)) - { - case 2: + switch (sub_8030768(1)) { + case 2: { sub_803084C(); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; - case 3: + } + case 3: { sUnknown_203B2C0->mailIndex = sub_80307EC(); - SetFriendRescueCounterState(0x20); + SetFriendRescueCounterState(32); break; - case 4: - sUnknown_203B2C0->fallbackState = 0x1F; + } + case 4: { + sUnknown_203B2C0->fallbackState = 31; sUnknown_203B2C0->mailIndex = sub_80307EC(); RestoreSavedWindows(&sUnknown_203B2C0->unk3BC); ResetUnusedInputStruct(); ShowWindows(NULL, TRUE, TRUE); sub_8030D40(sUnknown_203B2C0->mailIndex, 0); - SetFriendRescueCounterState(0x21); + SetFriendRescueCounterState(33); break; + } } } -void sub_80290D4(void) +static void sub_80290D4(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x1F); } -void sub_80290F0(void) +static void sub_80290F0(void) { - s32 menuAction; - menuAction = -1; + s32 menuAction = -1; + sub_8030768(0); - if(sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) - { + + if (sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) sub_8013114(&(sUnknown_203B2C0->unk21C[3]), &menuAction); - } - switch(menuAction) - { + + switch (menuAction) { case CONFIRM_ACTION: sub_803084C(); SetFriendRescueCounterState(0x22); @@ -1166,45 +1103,41 @@ void sub_80290F0(void) } } -void sub_80291AC(void) +static void sub_80291AC(void) { - switch(sub_8030DA0()) - { + switch (sub_8030DA0()) { case 2: case 3: sub_8030DE4(); ResetUnusedInputStruct(); ShowWindows(&sUnknown_203B2C0->unk3BC, TRUE, TRUE); sub_803092C(); - if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) - { + if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) { sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE); SetFriendRescueCounterState(0x20); } - else - { + else { SetFriendRescueCounterState(sUnknown_203B2C0->fallbackState); } + break; default: break; } } -void sub_8029208(void) +static void sub_8029208(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { - return; - } - switch(menuChoice) - { + if (sub_80144A4(&menuChoice) != 0) + return; + + switch (menuChoice) { case GAME_LINK_CABLE_ACTION: case 14: sUnknown_203B2C0->unk534 = 13; - switch(sUnknown_203B2C0->unk538) - { + + switch (sUnknown_203B2C0->unk538) { case 0: SetFriendRescueCounterState(4); break; @@ -1217,8 +1150,8 @@ void sub_8029208(void) break; case PASSWORD_ACTION: sUnknown_203B2C0->unk534 = 15; - switch(sUnknown_203B2C0->unk538) - { + + switch (sUnknown_203B2C0->unk538) { case 0: SetFriendRescueCounterState(PROMPT_SOS_MAIL_PASSWORD); break; @@ -1235,179 +1168,176 @@ void sub_8029208(void) } } -void sub_80292A4(void) +static void sub_80292A4(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { - case YES_ACTION: - switch(sUnknown_203B2C0->unk538) - { + + switch (menuChoice) { + case YES_ACTION: { + switch (sUnknown_203B2C0->unk538) { case 0: - case 2: + case 2: { SetFriendRescueCounterState(FRIEND_RESCUE_COMMUNICATING_PRE); break; + } } break; - case CANCEL_ACTION: + } + case CANCEL_ACTION: { SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; + } } } -void sub_80292EC(void) +static void sub_80292EC(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } - if(sUnknown_203B2C0->linkError == COMMS_GOOD) - { - switch(sUnknown_203B2C0->unk538) - { - case 0: + + if (sUnknown_203B2C0->linkError == COMMS_GOOD) { + switch (sUnknown_203B2C0->unk538) { + case 0: { SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL); break; - case 2: + } + case 2: { SetFriendRescueCounterState(SENT_AOK_MAIL); break; + } } } - else - { + else { PrintFriendRescueCounterError(sUnknown_203B2C0->linkError); SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); } } -void sub_802933C(void) +static void sub_802933C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_8029358(void) +static void sub_8029358(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_8029374(void) +static void sub_8029374(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL_SAVE_PRE); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_802939C(void) +static void sub_802939C(void) { s32 temp; u32 saveStatus; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { saveStatus = GetSavePakStatus(); FinishWriteSavePak(); - if(saveStatus == SAVE_COMPLETED) - { + + if (saveStatus == SAVE_COMPLETED) SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL_SAVE_COMPLETE); - } else - { SetFriendRescueCounterState(FRIEND_RESCUE_EXIT_PRE); - } } } -void sub_80293D8(void) +static void sub_80293D8(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x27); } -void sub_80293F4(void) +static void sub_80293F4(void) { u32 return_var; unkStruct_203B480 mail; return_var = NamingScreen_HandleInput(); MemoryFill8(&mail, 0, sizeof(unkStruct_203B480)); - switch(return_var) - { - case 3: - switch(sub_8039068(PASSWORD_ENTRY_SOS_MAIL_MODE, (sUnknown_203B2C0->passwordBuffer), &mail)) - { - case PASSWORD_ENTRY_INCORRECT_PASSWORD: - CreateMenuDialogueBoxAndPortrait(gWonderMailPasswordIncorrectText, 0, 8, gUnknown_80DDA48, 0, 4, 0, &sUnknown_203B2C0->monPortrait, 0xC); - SetFriendRescueCounterState(0x28); - break; - case PASSWORD_ENTRY_NOT_SOS_MAIL: - CreateDialogueBoxAndPortrait(gWonderMailSOSPasswordIncorrectText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); - SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); - break; - case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL: - CreateDialogueBoxAndPortrait(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); - SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); - break; - case PASSWORD_ENTRY_SOS_MAIL_SUCCESS: - sub_8095274(mail.unk10.unk10); - mail.mailType = 2; - sub_80951BC(&mail); - CreateDialogueBoxAndPortrait(gWonderMailAOKMailReceivedText, 0, &sUnknown_203B2C0->monPortrait, 0x101); - SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL); - break; - case 23: - case 24: - default: - break; - } + + switch (return_var) { + case 3: { + switch (sub_8039068(PASSWORD_ENTRY_SOS_MAIL_MODE, (sUnknown_203B2C0->passwordBuffer), &mail)) { + case PASSWORD_ENTRY_INCORRECT_PASSWORD: + CreateMenuDialogueBoxAndPortrait(gWonderMailPasswordIncorrectText, 0, 8, gUnknown_80DDA48, 0, 4, 0, &sUnknown_203B2C0->monPortrait, 0xC); + SetFriendRescueCounterState(0x28); + break; + case PASSWORD_ENTRY_NOT_SOS_MAIL: + CreateDialogueBoxAndPortrait(gWonderMailSOSPasswordIncorrectText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); + SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); + break; + case PASSWORD_ENTRY_DUPLICATE_SOS_MAIL: + CreateDialogueBoxAndPortrait(gWonderMailDuplicateText, 0, &sUnknown_203B2C0->monPortrait, 0x10d); + SetFriendRescueCounterState(FRIEND_RESCUE_ERROR); + break; + case PASSWORD_ENTRY_SOS_MAIL_SUCCESS: + sub_8095274(mail.unk10.unk10); + mail.mailType = 2; + sub_80951BC(&mail); + CreateDialogueBoxAndPortrait(gWonderMailAOKMailReceivedText, 0, &sUnknown_203B2C0->monPortrait, 0x101); + SetFriendRescueCounterState(RECEIVED_FRIEND_SOS_MAIL); + break; + case 23: + case 24: + default: + break; + } NamingScreen_Free(); break; - case 2: + } + case 2: { NamingScreen_Free(); ResetUnusedInputStruct(); ShowWindows(&sUnknown_203B2C0->unk3BC, TRUE, TRUE); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); break; - default: + } + default: { break; + } } } -void sub_802955C(void) +static void sub_802955C(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(PROMPT_SOS_MAIL_PASSWORD); break; @@ -1417,25 +1347,24 @@ void sub_802955C(void) } } -void sub_802958C(void) +static void sub_802958C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_COMMUNICATING); } -void sub_80295A8(void) +static void sub_80295A8(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(RECEIVE_SOS_MAIL); break; @@ -1447,10 +1376,9 @@ void sub_80295A8(void) } } -void sub_80295D8(void) +static void sub_80295D8(void) { - switch(sub_8030768(1)) - { + switch (sub_8030768(1)) { case 2: sub_803084C(); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); @@ -1471,27 +1399,26 @@ void sub_80295D8(void) } } -void sub_8029668(void) +static void sub_8029668(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x2A); } -void sub_8029684(void) +static void sub_8029684(void) { - s32 menuAction; - menuAction = -1; + s32 menuAction = -1; + sub_8030768(0); - if(sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) - { + + if (sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) sub_8013114(&(sUnknown_203B2C0->unk21C[3]), &menuAction); - } - switch(menuAction) - { + + switch (menuAction) { case CONFIRM_ACTION: sub_803084C(); SetFriendRescueCounterState(0x2D); @@ -1513,10 +1440,9 @@ void sub_8029684(void) } } -void sub_8029740(void) +static void sub_8029740(void) { - switch(sub_8030DA0()) - { + switch (sub_8030DA0()) { case 2: case 3: sub_8030DE4(); @@ -1536,30 +1462,29 @@ void sub_8029740(void) } } -void sub_802979C(void) +static void sub_802979C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); } -void sub_80297B8(void) +static void sub_80297B8(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(SELECT_HELPER_POKEMON); } -void sub_80297D4(void) +static void sub_80297D4(void) { - switch(FriendList_HandleInput(TRUE)) - { + switch (FriendList_HandleInput(TRUE)) { case 2: FriendList_Free(); SetFriendRescueCounterState(FRIEND_RESCUE_MAIN); @@ -1581,17 +1506,16 @@ void sub_80297D4(void) } } -void sub_8029884(void) +static void sub_8029884(void) { - s32 menuAction; - menuAction = -1; + s32 menuAction = -1; + FriendList_HandleInput(FALSE); - if(sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) - { + + if (sub_8012FD8(&(sUnknown_203B2C0->unk21C[3])) == 0) sub_8013114(&(sUnknown_203B2C0->unk21C[3]), &menuAction); - } - switch(menuAction) - { + + switch (menuAction) { case CONFIRM_ACTION: FriendList_Free(); SetFriendRescueCounterState(4); @@ -1613,17 +1537,16 @@ void sub_8029884(void) } } -void sub_8029944(void) +static void sub_8029944(void) { - u32 temp; - temp = sub_80244E4(); - if(temp == 1) - { - sub_802452C(); - return; + u32 temp = sub_80244E4(); + + if (temp == 1) { + sub_802452C(); + return; } - switch(temp) - { + + switch (temp) { case 1: break; case 2: @@ -1632,28 +1555,26 @@ void sub_8029944(void) ResetUnusedInputStruct(); ShowWindows(&sUnknown_203B2C0->unk3BC, TRUE, TRUE); sub_8023B7C(1); - if(sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) - { + + if (sUnknown_203B2C0->fallbackState == DEFAULT_FALLBACK_STATE) { sub_8035CF4(sUnknown_203B2C0->unk21C, 3, TRUE); SetFriendRescueCounterState(0x34); } - else - { + else { SetFriendRescueCounterState(sUnknown_203B2C0->fallbackState); } - + break; } } -void sub_80299AC(void) +static void sub_80299AC(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case SEND_WO_POKEMON_ACTION: SetFriendRescueCounterState(4); break; @@ -1665,16 +1586,14 @@ void sub_80299AC(void) } } -void sub_80299D8(void) +static void sub_80299D8(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { - return; - } - switch(menuChoice) - { + if (sub_80144A4(&menuChoice) != 0) + return; + + switch (menuChoice) { case YES_ACTION: SetFriendRescueCounterState(4); break; @@ -1687,24 +1606,19 @@ void sub_80299D8(void) } } -void sub_8029A18(void) +static void sub_8029A18(void) { s32 menuChoice; - if(sub_80144A4(&menuChoice) != 0) - { + + if (sub_80144A4(&menuChoice) != 0) return; - } - switch(menuChoice) - { + + switch (menuChoice) { case SEND_POKEMON_ACTION: - if(sub_8024108(3) != 0) - { + if (sub_8024108(3) != 0) SetFriendRescueCounterState(NO_POKEMON_IN_FRIEND_AREA); - } else - { SetFriendRescueCounterState(PROMPT_SELECT_HELPER_POKEMON); - } break; case SEND_WO_POKEMON_ACTION: SetFriendRescueCounterState(0x4); @@ -1715,57 +1629,54 @@ void sub_8029A18(void) } } -void sub_8029A6C(void) +static void sub_8029A6C(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x2E); } -void sub_8029A88(void) +static void sub_8029A88(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } - if(!WriteSavePak()) - { + + if (!WriteSavePak()) { FinishWriteSavePak(); SetFriendRescueCounterState(SENT_AOK_MAIL_SAVE_COMPLETE); } } -void sub_8029AB0(void) +static void sub_8029AB0(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(SENT_AOK_MAIL_SAVE_PRE); sub_8011C28(1); PrepareSavePakWrite(MONSTER_NONE); } -void sub_8029AD8(void) +static void sub_8029AD8(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(0x3B); } -void sub_8029AF4(void) +static void sub_8029AF4(void) { - switch(sub_8031DCC()) - { - + switch (sub_8031DCC()) { case 2: case 3: sub_8031E10(); @@ -1779,12 +1690,12 @@ void sub_8029AF4(void) } } -void sub_8029B34(void) +static void sub_8029B34(void) { s32 temp; - if(sub_80144A4(&temp) != 0) - { + + if (sub_80144A4(&temp) != 0) return; - } + SetFriendRescueCounterState(FRIEND_RESCUE_COUNTER_EXIT); } diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index 467e54045..e9ce4c004 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -53,10 +53,9 @@ const WindowTemplate gUnknown_80E091C = { const u8 gUnknown_80E0934[] = "ID:"; const u8 gUnknown_80E0938[] = "%-4d"; -extern void sub_8030DD4(void); - -void sub_8030E2C(void); -void sub_8030E48(void); +static void sub_8030DD4(void); +static void sub_8030E2C(void); +static void sub_8030E48(void); bool8 sub_8030D40(u8 mailIndex, s32 windowID) { @@ -86,7 +85,7 @@ u32 sub_8030DA0(void) } } -void sub_8030DD4(void) +static void sub_8030DD4(void) { sub_8030E2C(); sub_8030E48(); @@ -104,13 +103,13 @@ void sub_8030DE4(void) } } -void sub_8030E2C(void) +static void sub_8030E2C(void) { ResetUnusedInputStruct(); ShowWindows(&gUnknown_203B324->unk18, TRUE, TRUE); } -void sub_8030E48(void) +static void sub_8030E48(void) { u16 uVar2; unkStruct_203B480 *mail; diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index 36d891b81..0d4c7dbe2 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -9,6 +9,7 @@ #include "text_1.h" #include "wonder_mail_4.h" #include "wonder_mail_5.h" +#include "wonder_mail_6.h" struct unkStruct_203B328 { @@ -137,7 +138,7 @@ bool8 sub_8030F58(u32 wonderMailType) return TRUE; } -s32 sub_8031050(void) +u32 sub_8031050(void) { switch(gUnknown_203B328->state) { diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index 08aa6e9e5..e4ac5fd60 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -2,15 +2,17 @@ #include "globaldata.h" #include "constants/communication_error_codes.h" #include "constants/wonder_mail.h" -#include "music_util.h" #include "code_801B3C0.h" #include "code_801C8C4.h" +#include "code_8031D70.h" #include "code_803B050.h" #include "code_803D0D8.h" #include "code_8094F88.h" #include "cpu.h" #include "input.h" #include "memory.h" +#include "music_util.h" +#include "naming_screen.h" #include "other_menus2.h" #include "save.h" #include "save_write.h" @@ -20,7 +22,6 @@ #include "wonder_mail_5.h" #include "wonder_mail_802D098.h" #include "wonder_mail_main_menu.h" -#include "naming_screen.h" #define SELECT_WONDER_MAIL_MODE_MAIN_SCREEN 0 #define SEND_WONDER_MAIL_MAIN_SCREEN 1 @@ -71,7 +72,6 @@ EWRAM_INIT struct unkStruct_203B3E8 *gUnknown_203B3E8 = {NULL}; #include "data/wonder_mail_main_menu.h" extern void SetWonderMailMainMenuState(u8); -extern void sub_8031E10(void); extern u8 sub_800D588(void); extern void sub_802EF48(void);