Leahnaya/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-07-01 00:41:13 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Split+data wonder_mail_3 and wonder_mail_2_1

Browse Source
This commit is contained in:
Kermalis 2023-09-29 23:46:27 -04:00 committed by Roshan Padaki
parent 3695335707
commit ccbc0ea647
No known key found for this signature in database
GPG Key ID: F359650FB0B5FB90
138 changed files with 1900 additions and 1883 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/adventure_log.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_ADVENTURE_LOG_H
#define GUARD_ADVENTURE_LOG_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA0

2
include/code_801B3C0.h
View File

@ -1,8 +1,8 @@
#ifndef GUARD_CODE_801B3C0_H
#define GUARD_CODE_801B3C0_H
#include "input.h"
#include "items.h"
#include "structs/menu.h"
#include "structs/subStruct_203B240.h"
#include "structs/str_text.h"

3
include/code_801EE10.h
View File

@ -2,9 +2,8 @@
#define CODE_801EE10_H
#include "constants/move.h"
#include "input.h"
#include "pokemon.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size 0xBC

2
include/code_8023144.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CODE_8023144_H
#define GUARD_CODE_8023144_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0x3FC

2
include/code_8024458.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CODE_8024458_H
#define GUARD_CODE_8024458_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
struct unkStruct_203B2AC

2
include/code_802DB28.h
View File

@ -2,8 +2,8 @@
#define GUARD_CODE_802DB28_H
#include "file_system.h"
#include "wonder_mail.h"
#include "structs/str_text.h"
#include "structs/str_wonder_mail.h"
// size: 0xA8
struct unkStruct_203B2FC

4
include/code_802DE84.h
View File

@ -1,8 +1,8 @@
#ifndef GUARD_CODE_802DE84_H
#define GUARD_CODE_802DE84_H
#include "code_802C39C.h"
#include "input.h"
#include "structs/str_802C39C.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0x7C

2
include/code_802F204.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CODE_802F204_H
#define GUARD_CODE_802F204_H
#include "wonder_mail.h"
#include "structs/str_wonder_mail.h"
u32 sub_802F204(unkStruct_802F204 *, bool8 displayClientSprite);
u32 sub_802F298(void);

3
include/code_803B050.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CODE_803B050_H
#define GUARD_CODE_803B050_H
#include "code_802C39C.h"
#include "structs/str_802C39C.h"
// size: 0x8
typedef struct unkStruct_80E9920
@ -26,6 +26,7 @@ void CreateRescueTitle(unkStruct_802C39C *);
void sub_803B6B0(s32 x, s32 y, u8 index, u32);
// code_803B050.s
extern unkStruct_803B344 *sub_803B344(u8);
extern void sub_803B35C(WonderMail *, unkStruct_802C39C *);
#endif // GUARD_CODE_803B050_H

4
include/code_803C1D0.h
View File

@ -1,9 +1,9 @@
#ifndef GUARD_CODE_803C1D0_H
#define GUARD_CODE_803C1D0_H
#include "wonder_mail.h"
#include "structs/str_wonder_mail.h"
// code_803C1D0.s
extern void sub_803C21C(WonderMail *, unkStruct_802F204*);
extern void sub_803C21C(WonderMail *, unkStruct_802F204 *);
#endif // GUARD_CODE_803C1D0_H

29
include/code_8094F88.h
View File

@ -5,34 +5,7 @@
#include "structs/str_dungeon.h"
#include "items.h"
#include "pokemon.h"
// size: 0x8
typedef struct WonderMailSub
{
/* 0x0 */ DungeonLocation dungeon;
/* 0x4 */ u32 seed;
} WonderMailSub;
// size: 0x30
typedef struct unkStruct_203B480
{
/* 0x0 */ u8 mailType;
/* 0x1 */ u8 missionType;
WonderMailSub unk4;
/* 0xC */ s16 clientSpecies;
/* 0xE */ s16 targetSpecies;
union unk10_temp
{
u32 unk10;
u16 unk10_u16;
} unk10;
/* 0x14 */ u8 playerName[0x20 - 0x14];
Item item;
u32 unk24;
u32 unk28;
/* 0x2C */ s8 rescuesAllowed;
u8 unk2D;
} unkStruct_203B480;
#include "structs/str_wonder_mail.h"
// size: 0x5C
typedef struct unkStruct_203B484

6
include/code_80958E8.h
View File

@ -1,8 +1,8 @@
#ifndef GUARD_CODE_80958E8_H
#define GUARD_CODE_80958E8_H
#include "wonder_mail.h"
#include "constants/mailbox.h"
#include "structs/str_wonder_mail.h"
// size: 0xC
typedef struct subStruct_203B490
@ -18,8 +18,8 @@ typedef struct unkStruct_203B490
/* 0x0 */ WonderMail mailboxSlots[NUM_MAILBOX_SLOTS];
/* 0x50 */ WonderMail pelipperBoardJobs[MAX_ACCEPTED_JOBS];
/* 0xF0 */ WonderMail jobSlots[MAX_ACCEPTED_JOBS];
u8 unk190[0x28];
u8 unk1B8[0x78];
u8 unk190[40];
u8 unk1B8[120];
subStruct_203B490 unk230[16];
/* 0x2F0 */ u8 PKMNNewsReceived[NUM_POKEMON_NEWS];
bool8 unk328;

8
include/code_80958E8_1.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_CODE_80958E8_1_H
#define GUARD_CODE_80958E8_1_H
#include "wonder_mail.h"
#include "structs/str_wonder_mail.h"
// size: 0x8
struct unkStruct_8096AF8
@ -11,11 +11,17 @@ struct unkStruct_8096AF8
/* 0x4 */ u16 targetSpecies;
};
bool8 AcceptJob(WonderMail *mail);
s32 CountJobsinDungeon(u8 dungeon);
WonderMail *GetJobSlotInfo(u8 index);
s32 GetNumAcceptedJobs(void);
bool8 IsJobSlotEmpty(u8 index);
bool8 IsMailinJobSlot(WonderMail *mail);
void ResetJobSlot(u8 index);
bool8 sub_809693C(WonderMail *mail);
void sub_8096AF8(struct unkStruct_8096AF8 *, u8 slotIndex, u8 dungeon);
bool8 sub_8096C08(u8 *jobIndex);
// code_80958E8_1.s
extern WonderMail *GetPelipperBoardSlotInfo(u8);

4
include/code_8096AF8.h
View File

@ -3,6 +3,10 @@
// code_8096AF8.s
extern u8 CheckPKMNNewsSlot(u8);
extern void sub_8096C80(void);
extern void sub_8096D24(void);
extern u8 *sub_8096DD8(void);
extern u8 *sub_8096DE8(void);
extern bool8 sub_8096E2C(void);
extern void sub_8096EEC(void);

4
include/code_80972F4.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_CODE_80972F4_H
#define GUARD_CODE_80972F4_H
#include "structs/str_wonder_mail.h"
// size: 0x8
typedef struct MissionText
{
@ -15,6 +17,8 @@ const u8 *GetCurrentMissionText(s16 index);
// TODO: this should probably be bool8 but can't get a match just yet
bool32 IsMazeCompleted(s16 mazeIndex);
bool8 sub_8096F50(WonderMail *mail);
void sub_8097418(s16 index, bool32);
bool8 sub_8097504(s16 mazeIndex);
const u8 *sub_80975DC(u32);

1
include/code_8098BDC.h
View File

@ -3,6 +3,7 @@
// code_8098DBC.s
extern void nullsub_104(void);
extern u8 sub_8099328(u8 *);
extern void sub_80993D8(void);
extern void sub_80993E4(void);
extern void sub_8099690(u32);

4
include/friend_rescue.h
View File

@ -4,8 +4,8 @@
#include "code_8094F88.h"
#include "items.h"
#include "pokemon.h"
#include "wonder_mail.h"
#include "structs/menu.h"
#include "structs/str_wonder_mail.h"
// size: 0x568
typedef struct WonderMailStruct_203B33C
@ -53,4 +53,4 @@ enum FriendRescueMenuStates {
FRIEND_RESCUE_MENU_DEFAULT_FALLBACK = 0x7e,
};
#endif
#endif

2
include/hints_menu1.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_HINTS_MENU1_H
#define GUARD_HINTS_MENU1_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0x9C

2
include/hints_menu2.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_HINTS_MENU2_H
#define GUARD_HINTS_MENU2_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA0

37
include/input.h
View File

@ -47,43 +47,6 @@ typedef struct UnusedInputStruct
u8 unk29;
} UnusedInputStruct;
// size: 0xC
typedef struct MenuInputStructSub
{
u8 unk0;
/* 0x1 */ u8 a_button;
/* 0x2 */ u8 b_button;
/* 0x3 */ u8 dpad_right;
/* 0x4 */ u8 dpad_left;
u8 fill5[3];
u16 unk8;
s16 unkA;
} MenuInputStructSub;
// size: 0x34
typedef struct MenuInputStruct
{
s32 unk0;
u16 unk4;
s16 unk6;
s16 unk8; // Maybe Position
s16 unkA;
s16 unkC; // Maybe Position
s16 unkE;
u32 unk10;
s16 unk14; // Maybe Position
s16 unk16;
/* 0x18 */ s16 menuIndex;
s16 unk1A;
s16 unk1C;
s16 unk1E;
s16 unk20;
s16 unk22;
u16 unk24;
u16 unk26;
MenuInputStructSub unk28;
} MenuInputStruct;
extern Inputs gRealInputs;
void InitInput(void);

2
include/kangaskhan_storage1.h
View File

@ -2,8 +2,8 @@
#define GUARD_KANGASKHAN_STORAGE1_H
#include "file_system.h"
#include "items.h"
#include "structs/menu.h"
#include "structs/str_items.h"
#include "structs/str_text.h"
enum KangaskhanStorageStates

2
include/kecleon_bros2.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_KECLEON_BROS2_H
#define GUARD_KECLEON_BROS2_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA0

2
include/kecleon_bros3.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_KECLEON_BROS3_H
#define GUARD_KECLEON_BROS3_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA0

2
include/kecleon_bros4.h
View File

@ -2,7 +2,7 @@
#define GUARD_KECLEON_BROS4_H
#include "constants/item.h"
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xF4

3
include/mailbox.h
View File

@ -4,7 +4,7 @@
#include "structs/menu.h"
#include "structs/str_text.h"
#include "constants/mailbox.h"
#include "code_802C39C.h"
#include "structs/str_802C39C.h"
struct unkStruct_203B304
{
@ -23,7 +23,6 @@ struct unkStruct_203B304
};
extern void SetMailboxState(u32);
extern s32 GetNumAcceptedJobs(void);
enum MailBoxStates
{

2
include/mailbox_8095F8C.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_MAILBOX_8095F8C_H
#define GUARD_MAILBOX_8095F8C_H
#include "wonder_mail.h"
#include "structs/str_wonder_mail.h"
WonderMail *GetMailboxSlotInfo(u8 index);
bool8 IsMailSlotEmpty(u8 index);

2
include/makuhita_dojo2.h
View File

@ -2,7 +2,7 @@
#define GUARD_MAKUHITA_DOJO2_H
#include "constants/dungeon.h"
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xD0

0
src/math.h → include/math.h
View File

2
include/personality_test.h
View File

@ -2,7 +2,7 @@
#define GUARD_PERSONALITY_TEST_H
#include "constants/personality_test.h"
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// Definitely wrong but need to figure out better structure later

2
include/pokemon_news1.h
View File

@ -2,7 +2,7 @@
#define GUARD_POKEMON_NEWS1_H
#include "constants/wonder_mail.h"
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xD4;

2
include/pokemon_news2.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_POKEMON_NEWS2_H
#define GUARD_POKEMON_NEWS2_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0x94

2
include/pokemon_news3.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_POKEMON_NEWS3_H
#define GUARD_POKEMON_NEWS3_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA4

2
include/post_office_guide2.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_POST_OFFICE_GUIDE2_H
#define GUARD_POST_OFFICE_GUIDE2_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0x78

1
include/save.h
View File

@ -7,6 +7,7 @@
#include "rescue_team_info.h"
#include "pokemon.h"
#include "items.h"
#include "code_8094F88.h"
#include "code_80958E8.h"
enum

38
include/structs/menu.h
View File

@ -1,10 +1,46 @@
#ifndef GUARD_MENU_H
#define GUARD_MENU_H
#include "input.h"
#include "sprite_oam.h"
#include "structs/str_text.h"
// size: 0xC
typedef struct MenuInputStructSub
{
u8 unk0;
/* 0x1 */ u8 a_button;
/* 0x2 */ u8 b_button;
/* 0x3 */ u8 dpad_right;
/* 0x4 */ u8 dpad_left;
u8 fill5[3];
u16 unk8;
s16 unkA;
} MenuInputStructSub;
// size: 0x34
typedef struct MenuInputStruct
{
s32 unk0;
u16 unk4;
s16 unk6;
s16 unk8; // Maybe Position
s16 unkA;
s16 unkC; // Maybe Position
s16 unkE;
u32 unk10;
s16 unk14; // Maybe Position
s16 unk16;
/* 0x18 */ s16 menuIndex;
s16 unk1A;
s16 unk1C;
s16 unk1E;
s16 unk20;
s16 unk22;
u16 unk24;
u16 unk26;
MenuInputStructSub unk28;
} MenuInputStruct;
// size: 0x8
typedef struct MenuItem
{

9
include/code_802C39C.h → include/structs/str_802C39C.h
View File

@ -1,8 +1,7 @@
#ifndef GUARD_CODE_802C39C_H
#define GUARD_CODE_802C39C_H
#ifndef GUARD_CODE_STR_802C39C_H
#define GUARD_CODE_STR_802C39C_H
#include "code_8094F88.h"
#include "wonder_mail.h"
#include "structs/str_wonder_mail.h"
// size: 0x58
typedef struct unkStruct_802C39C
@ -30,4 +29,4 @@ typedef struct unkStruct_802C39C
/* 0x54 */ WonderMail *mail;
} unkStruct_802C39C;
#endif // GUARD_CODE_802C39C_H
#endif // GUARD_CODE_STR_802C39C_H

82
include/structs/str_wonder_mail.h Normal file
View File

@ -0,0 +1,82 @@
#ifndef GUARD_STR_WONDER_MAIL_H
#define GUARD_STR_WONDER_MAIL_H
#include "constants/wonder_mail.h"
#include "structs/str_dungeon.h"
#include "structs/str_pokemon.h"
// size: 0x8
typedef struct WonderMailSub
{
/* 0x0 */ DungeonLocation dungeon;
/* 0x4 */ u32 seed;
} WonderMailSub;
// size: 0x14
typedef struct WonderMail
{
/* 0x0 */ u8 mailType;
/* 0x1 */ u8 missionType;
u8 unk2;
/* 0x4 */ WonderMailSub unk4;
/* 0xC */ s16 clientSpecies;
/* 0xE */ s16 targetSpecies;
/* 0x10 */ u8 targetItem;
/* 0x11 */ u8 rewardType;
/* 0x12 */ u8 itemReward;
/* 0x13 */ u8 friendAreaReward;
} WonderMail;
// size: 0x28
typedef struct unkStruct_802F204
{
/* 0x0 */ u8 clientName[POKEMON_NAME_LENGTH];
/* 0xA */ u8 name2[POKEMON_NAME_LENGTH]; // target name?
/* 0x14 */ s16 clientSpecies;
u8 unk16;
/* 0x18 */ s32 moneyReward;
/* 0x1C */ u8 itemRewards[MAX_ITEM_REWARDS];
/* 0x1F */ u8 quantity;
/* 0x20 */ u8 friendAreaReward;
/* 0x24 */ u32 teamRankPtsReward;
} unkStruct_802F204;
// size: 0xB4
typedef struct unkStruct_803B344
{
/* 0x0 */ WonderMail mail;
u8 *unk14;
u8 *unk18;
u8 fill1C[0x3C - 0x1C];
u8 unk3C[0xB4 - 0x3C];
} unkStruct_803B344;
// size: 0x30
typedef struct unkStruct_203B480
{
/* 0x0 */ u8 mailType;
/* 0x1 */ u8 missionType;
WonderMailSub unk4;
/* 0xC */ s16 clientSpecies;
/* 0xE */ s16 targetSpecies;
union unk10_temp
{
u32 unk10;
u16 unk10_u16;
} unk10;
/* 0x14 */ u8 playerName[0x20 - 0x14];
Item item;
u32 unk24;
u32 unk28;
/* 0x2C */ s8 rescuesAllowed;
u8 unk2D;
} unkStruct_203B480;
// size: 0x88
typedef struct WonderMailStruct_203B2C0_sub
{
/* 0x0 */ unkStruct_203B480 mail;
/* 0x30 */ PokemonStruct1 pokemon;
} WonderMailStruct_203B2C0_sub;
#endif // GUARD_STR_WONDER_MAIL_H

42
include/thank_you_wonder_mail.h Normal file
View File

@ -0,0 +1,42 @@
#ifndef GUARD_THANK_YOU_WONDER_MAIL_H
#define GUARD_THANK_YOU_WONDER_MAIL_H
#include "constants/wonder_mail.h"
#include "file_system.h"
#include "structs/menu.h"
#include "structs/str_items.h"
#include "structs/str_text.h"
#include "structs/str_wonder_mail.h"
// size: 0x564
typedef struct WonderMailStruct_203B2C4
{
/* 0x0 */ u8 state;
/* 0x4 */ u32 fallbackState; // wonder mail link status??
/* 0x8 */ u8 passwordBuffer[PASSWORD_BUFFER_SIZE]; // Probably a buffer for entry
u8 unk3E;
u32 unk40;
/* 0x44 */ u32 linkError; // another link status
u8 filler48[0x1B8 - 0x48];
unkStruct_203B480 unk1B8;
unkStruct_203B480 unk1E8;
/* 0x218 */ s8 mailIndex;
MenuStruct unk21C[4];
UnkTextStruct2 unk35C[4];
UnkTextStruct2 unk3BC[4];
Item unk41C;
/* 0x420 */ OpenedFile *faceFile;
/* 0x424 */ u8 *faceData;
u16 unk428;
u16 unk42A;
u8 unk42C;
u8 unk42D;
u8 unk42E;
u32 unk430;
/* 0x434 */ u8 formattedString[0x100];
/* 0x534 */ s32 wonderMailMethod;
/* 0x538 */ u32 wonderMailMode;
unkStruct_802F204 unk53C;
} WonderMailStruct_203B2C4;
#endif // GUARD_THANK_YOU_WONDER_MAIL_H

2
include/wigglytuff_shop2.h
View File

@ -1,7 +1,7 @@
#ifndef GUARD_WIGGLYTUFF_SHOP2_H
#define GUARD_WIGGLYTUFF_SHOP2_H
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
typedef struct WigglytuffShop2Work

74
include/wonder_mail.h
View File

@ -1,49 +1,10 @@
#ifndef GUARD_WONDER_MAIL_H
#define GUARD_WONDER_MAIL_H
#include "code_8094F88.h"
#include "constants/wonder_mail.h"
#include "file_system.h"
#include "items.h"
#include "structs/menu.h"
#include "pokemon.h"
#include "structs/str_text.h"
// size: 0x28
typedef struct unkStruct_802F204
{
/* 0x0 */ u8 clientName[POKEMON_NAME_LENGTH];
/* 0xA */ u8 name2[POKEMON_NAME_LENGTH]; // target name?
/* 0x14 */ s16 clientSpecies;
u8 unk16;
/* 0x18 */ s32 moneyReward;
/* 0x1C */ u8 itemRewards[MAX_ITEM_REWARDS];
/* 0x1F */ u8 quantity;
/* 0x20 */ u8 friendAreaReward;
/* 0x24 */ u32 teamRankPtsReward;
} unkStruct_802F204;
// size: 0x14
typedef struct WonderMail
{
/* 0x0 */ u8 mailType; // mail type
/* 0x1 */ u8 missionType; // mission type
u8 unk2;
/* 0x4 */ WonderMailSub unk4;
/* 0xC */ s16 clientSpecies; // client pokemon
/* 0xE */ s16 targetSpecies; // target
/* 0x10 */ u8 targetItem; // item to find/deliver
/* 0x11 */ u8 rewardType; // reward type
/* 0x12 */ u8 itemReward; // item reward
/* 0x13 */ u8 friendAreaReward; // friend area
} WonderMail;
// size: 0x88
typedef struct WonderMailStruct_203B2C0_sub
{
/* 0x0 */ unkStruct_203B480 mail;
/* 0x30 */ PokemonStruct1 pokemon;
} WonderMailStruct_203B2C0_sub;
#include "structs/str_wonder_mail.h"
// size: 0x548
typedef struct WonderMailStruct_203B2C0
@ -79,37 +40,4 @@ typedef struct WonderMailStruct_203B2C0
/* 0x544 */ s16 speciesNum;
} WonderMailStruct_203B2C0;
// size: 0x564
typedef struct WonderMailStruct_203B2C4
{
/* 0x0 */ u8 state;
/* 0x4 */ u32 fallbackState; // wonder mail link status??
/* 0x8 */ u8 passwordBuffer[PASSWORD_BUFFER_SIZE]; // Probably a buffer for entry
u8 unk3E;
u32 unk40;
/* 0x44 */ u32 linkError; // another link status
u8 filler48[0x1B8 - 0x48];
unkStruct_203B480 unk1B8;
unkStruct_203B480 unk1E8;
/* 0x218 */ s8 mailIndex;
MenuStruct unk21C[4];
UnkTextStruct2 unk35C[4];
UnkTextStruct2 unk3BC[4];
Item unk41C;
/* 0x420 */ OpenedFile *faceFile;
/* 0x424 */ u8 *faceData;
u16 unk428;
u16 unk42A;
u8 unk42C;
u8 unk42D;
u8 unk42E;
u32 unk430;
/* 0x434 */ u8 formattedString[0x100];
/* 0x534 */ s32 wonderMailMethod;
/* 0x538 */ u32 wonderMailMode;
unkStruct_802F204 unk53C;
} WonderMailStruct_203B2C4;
void SetFriendRescueCounterState(u32 r0);
#endif // GUARD_WONDER_MAIL_H

44
include/wonder_mail_2_1.h
View File

@ -1,44 +0,0 @@
#ifndef GUARD_WONDER_MAIL_2_1_H
#define GUARD_WONDER_MAIL_2_1_H
#include "code_802C39C.h"
#include "constants/mailbox.h"
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA8
struct unkStruct_203B2E8
{
u8 pelipperBoardSlots[MAX_ACCEPTED_JOBS];
MenuInputStruct input;
u32 unk3C;
UnkTextStruct2 *unk40;
UnkTextStruct2 unk44[4];
u8 unkA4[4];
};
// size: 0x1FC
struct unkStruct_203B2F0
{
u32 unk0;
u32 state;
u8 unk8[0xC - 0x8];
u8 unkC;
unkStruct_802C39C unk10;
u32 menuAction;
MenuStruct unk6C;
MenuStruct unkBC;
MenuItem unk10C[8];
MenuItem unk14C[8];
u8 fill18C[0x19C - 0x18C];
UnkTextStruct2 unk19C[4];
};
bool8 HasNoAcceptedJobs(void);
bool8 InitializeJobListMenu(u32);
u32 sub_802C898(void);
void sub_802C8F4(void);
#endif // GUARD_WONDER_MAIL_2_1_H

79
include/wonder_mail_3.h
View File

@ -1,79 +0,0 @@
#ifndef GUARD_WONDER_MAIL_3_H
#define GUARD_WONDER_MAIL_3_H
#include "code_802C39C.h"
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
#include "wonder_mail.h"
// size: 0xB4
typedef struct unkStruct_803B344
{
/* 0x0 */ WonderMail mail;
u8 *unk14;
u8 *unk18;
u8 fill1C[0x3C - 0x1C];
u8 unk3C[0xB4 - 0x3C];
} unkStruct_803B344;
// size: 0xA0
typedef struct unkStruct_203B2F4
{
MenuInputStruct input;
u32 unk34;
UnkTextStruct2 *unk38;
UnkTextStruct2 unk3C[4];
u8 unk9C[4];
} unkStruct_203B2F4;
// size: 0x1C
typedef struct unkSubStruct_203B2F8
{
/* 0x0 */ WonderMail wonderMail;
/* 0x14 */ u8 *unk14;
/* 0x18 */ u8 *unk18;
} unkSubStruct_203B2F8;
// size: 0x208
typedef struct unkStruct_203B2F8
{
/* 0x0 */ s32 state;
/* 0x4 */ s32 fallbackState;
/* 0x8 */ u8 wonderMailAccepted;
/* 0x9 */ bool8 unk9;
/* 0xA */ u8 dungeonID;
u8 unkB;
/* 0xC */ unkSubStruct_203B2F8 *mail;
/* 0x10 */ u8 jobSlotIndex;
unkStruct_802C39C unk14;
/* 0x6C */ u32 menuAction1;
/* 0x70 */ u32 menuAction2;
/* 0x74 */ u32 menuAction3;
/* 0x78 */ MenuStruct unk78;
/* 0xC8 */ MenuStruct unkC8;
MenuItem unk118[8];
MenuItem unk158[8];
u16 unk198[8];
UnkTextStruct2 unk1A8[4];
} unkStruct_203B2F8;
enum WonderMailRescueStates
{
INITIAL_WONDER_MAIL_CHECK = 0,
// 1
WONDER_MAIL_EXIT = 2,
DUPLICATE_WONDER_MAIL,
DUPLICATE_WONDER_MAIL_1,
// 5 - 7
RECEIVE_WONDER_MAIL = 8,
// 9
JOB_LIST_FULL = 10,
DRAW_JOB_LIST,
DRAW_JOB_LIST_1,
// 13 - 16
};
u32 sub_802D098(unkSubStruct_203B2F8 *mail);
#endif // GUARD_WONDER_MAIL_3_H

2
include/wonder_mail_802C10C.h
View File

@ -2,7 +2,7 @@
#define GUARD_WONDER_MAIL_802C10C_H
#include "constants/mailbox.h"
#include "input.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA8

28
include/wonder_mail_802C4C8.h Normal file
View File

@ -0,0 +1,28 @@
#ifndef GUARD_WONDER_MAIL_802C4C8_H
#define GUARD_WONDER_MAIL_802C4C8_H
#include "constants/mailbox.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA8
struct unkStruct_203B2E8
{
/* 0x0 */ u8 pelipperBoardSlots[MAX_ACCEPTED_JOBS];
/* 0x8 */ MenuInputStruct input;
u32 unk3C;
UnkTextStruct2 *unk40;
UnkTextStruct2 unk44[4];
u8 unkA4[4];
};
void DrawJobListMenu(void);
bool8 HasNoAcceptedJobs(void);
u8 GetPelipperBoardSlotIndex(void);
bool8 sub_802C4C8(s32, UnkTextStruct2_sub *, u32);
u32 sub_802C598(bool8);
void sub_802C640(bool8 cursorSprite);
void sub_802C688(void);
#endif // GUARD_WONDER_MAIL_802C4C8_H

30
include/wonder_mail_802C860.h Normal file
View File

@ -0,0 +1,30 @@
#ifndef GUARD_WONDER_MAIL_802C860_H
#define GUARD_WONDER_MAIL_802C860_H
#include "structs/str_802C39C.h"
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0x1FC
struct unkStruct_203B2F0
{
u32 unk0;
/* 0x4 */ u32 state;
u8 unk8[0xC - 0x8];
u8 unkC;
unkStruct_802C39C unk10;
/* 0x68 */ u32 menuAction;
MenuStruct unk6C;
MenuStruct unkBC;
MenuItem unk10C[8];
MenuItem unk14C[8];
u8 fill18C[0x19C - 0x18C];
UnkTextStruct2 unk19C[4];
};
bool8 InitializeJobListMenu(u32);
u32 sub_802C898(void);
void sub_802C8F4(void);
#endif // GUARD_WONDER_MAIL_802C860_H

24
include/wonder_mail_802CDD4.h Normal file
View File

@ -0,0 +1,24 @@
#ifndef GUARD_WONDER_MAIL_802CDD4_H
#define GUARD_WONDER_MAIL_802CDD4_H
#include "structs/menu.h"
#include "structs/str_text.h"
// size: 0xA0
typedef struct unkStruct_203B2F4
{
MenuInputStruct input;
u32 unk34;
UnkTextStruct2 *unk38;
UnkTextStruct2 unk3C[4];
u8 unk9C[4];
} unkStruct_203B2F4;
bool8 sub_802CDD4(u32);
u32 sub_802CE5C(bool8);
u8 sub_802CEBC(void);
void sub_802CED8(bool8 cursorSprite);
void sub_802CF14(void);
void sub_802CFD0(void);
#endif // GUARD_WONDER_MAIL_802CDD4_H

46
include/wonder_mail_802D098.h Normal file
View File

@ -0,0 +1,46 @@
#ifndef GUARD_WONDER_MAIL_802D098_H
#define GUARD_WONDER_MAIL_802D098_H
#include "structs/str_802C39C.h"
#include "structs/menu.h"
#include "structs/str_text.h"
#include "structs/str_wonder_mail.h"
// size: 0x1C
typedef struct unkSubStruct_203B2F8
{
/* 0x0 */ WonderMail wonderMail;
u8 *unk14;
u8 *unk18;
} unkSubStruct_203B2F8;
// size: 0x208
typedef struct unkStruct_203B2F8
{
/* 0x0 */ s32 state;
/* 0x4 */ s32 fallbackState;
/* 0x8 */ u8 wonderMailAccepted;
bool8 unk9;
/* 0xA */ u8 dungeonID;
u8 unkB;
/* 0xC */ unkSubStruct_203B2F8 *mail;
/* 0x10 */ u8 jobSlotIndex;
unkStruct_802C39C unk14;
/* 0x6C */ u32 menuAction1;
/* 0x70 */ u32 menuAction2;
/* 0x74 */ u32 menuAction3;
MenuStruct unk78;
MenuStruct unkC8;
MenuItem unk118[8];
MenuItem unk158[8];
u16 unk198[8];
UnkTextStruct2 unk1A8[4];
} unkStruct_203B2F8;
bool8 GetWonderMailAccepted(void);
bool8 sub_802D098(unkSubStruct_203B2F8 *mail);
u32 sub_802D0E0(void);
void sub_802D184(void);
#endif // GUARD_WONDER_MAIL_802D098_H

12
ld_script.txt
View File

@ -141,8 +141,10 @@ SECTIONS {
src/pokemon_news2.o(.text);
src/pokemon_news3.o(.text);
src/wonder_mail_802C10C.o(.text);
src/wonder_mail_2_1.o(.text);
src/wonder_mail_3.o(.text);
src/wonder_mail_802C4C8.o(.text);
src/wonder_mail_802C860.o(.text);
src/wonder_mail_802CDD4.o(.text);
src/wonder_mail_802D098.o(.text);
src/code_802DB28.o(.text);
src/code_802DE84.o(.text);
src/mailbox.o(.text);
@ -461,8 +463,10 @@ SECTIONS {
src/pokemon_news2.o(.rodata);
src/pokemon_news3.o(.rodata);
src/wonder_mail_802C10C.o(.rodata);
src/wonder_mail_2_1.o(.rodata);
src/wonder_mail_3.o(.rodata);
src/wonder_mail_802C4C8.o(.rodata);
src/wonder_mail_802C860.o(.rodata);
src/wonder_mail_802CDD4.o(.rodata);
src/wonder_mail_802D098.o(.rodata);
src/code_802DB28.o(.rodata);
src/code_802DE84.o(.rodata);
src/mailbox.o(.rodata);

1
src/adventure_log.c
View File

@ -4,6 +4,7 @@
#include "code_80130A8.h"
#include "code_8097670.h"
#include "constants/input.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"

1
src/bg_control.c
View File

@ -1,6 +1,5 @@
#include "global.h"
#include "bg_control.h"
#include "input.h"
EWRAM_DATA BGControlStruct gBG0Control = {0};
EWRAM_DATA BGControlStruct gBG1Control = {0};

1
src/code_2.c
View File

@ -17,7 +17,6 @@
#include "file_system.h"
#include "friend_area.h"
#include "game_options.h"
#include "input.h"
#include "main_menu1.h"
#include "main_menu2.h"
#include "memory.h"

1
src/code_800C9CC.c
View File

@ -1,6 +1,5 @@
#include "global.h"
#include "code_800C9CC.h"
#include "input.h"
#include "random.h"
#include "reg_control.h"

1
src/code_80118A4.c
View File

@ -11,7 +11,6 @@
#include "constants/bg_music.h"
#include "play_time.h"
#include "bg_control.h"
#include "input.h"
#include "config.h"
#include "game_options.h"
#include "sprite.h"

1
src/code_8012A18.c
View File

@ -6,7 +6,6 @@
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "game_options.h"
#include "input.h"
#include "sprite.h"
extern void nullsub_8(u8);

1
src/code_801602C.c
View File

@ -3,6 +3,7 @@
#include "code_80130A8.h"
#include "code_801602C.h"
#include "common_strings.h"
#include "input.h"
#include "memory.h"
#include "text_util.h"
#include "text1.h"

1
src/code_801B3C0.c
View File

@ -2,6 +2,7 @@
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "input.h"
#include "items.h"
#include "memory.h"
#include "menu_input.h"

1
src/code_801B60C.c
View File

@ -6,6 +6,7 @@
#include "code_8098BDC.h"
#include "common_strings.h"
#include "constants/colors.h"
#include "input.h"
#include "items.h"
#include "kecleon_bros4.h"
#include "memory.h"

1
src/code_801BEEC.c
View File

@ -4,6 +4,7 @@
#include "code_801C244.h"
#include "code_801C620.h"
#include "common_strings.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"

1
src/code_801C244.c
View File

@ -2,6 +2,7 @@
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "code_801C244.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"

1
src/code_801C620.c
View File

@ -3,6 +3,7 @@
#include "code_80130A8.h"
#include "code_801C620.h"
#include "code_8097DD0.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"

1
src/code_801C8C4.c
View File

@ -1,6 +1,7 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_801C8C4.h"
#include "input.h"
#include "items.h"
#include "memory.h"
#include "menu_input.h"

4
src/code_801D014.c
View File

@ -17,6 +17,7 @@
#include "ground_lives.h"
#include "ground_main.h"
#include "ground_map_1.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "options_menu1.h"
@ -25,7 +26,8 @@
#include "text1.h"
#include "text2.h"
#include "wigglytuff_shop2.h"
#include "wonder_mail_2_1.h"
#include "wonder_mail_802C4C8.h"
#include "wonder_mail_802C860.h"
extern u8 gAvailablePokemonNames[]; // 202DF98

1
src/code_801D9E4.c
View File

@ -3,6 +3,7 @@
#include "code_801D9E4.h"
#include "constants/input.h"
#include "ground_main.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"

1
src/code_801EE10.c
View File

@ -1,4 +1,5 @@
#include "global.h"
#include "input.h"
#include "text1.h"
#include "text2.h"
#include "memory.h"

1
src/code_801EE10_mid.c
View File

@ -12,6 +12,7 @@
#include "code_80130A8.h"
#include "code_801EE10_mid.h"
#include "code_80118A4.h"
#include "input.h"
extern unkStruct_203B270 *gUnknown_203B270;

1
src/code_80227B8.c
View File

@ -6,6 +6,7 @@
#include "code_8098BDC.h"
#include "common_strings.h"
#include "constants/colors.h"
#include "input.h"
#include "kecleon_bros4.h"
#include "memory.h"
#include "menu_input.h"

1
src/code_8023144.c
View File

@ -6,6 +6,7 @@
#include "constants/input.h"
#include "exclusive_pokemon.h"
#include "friend_area.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon_3.h"

1
src/code_8024458.c
View File

@ -3,6 +3,7 @@
#include "code_8024458.h"
#include "constants/input.h"
#include "event_flag.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"

2
src/code_802DB28.c
View File

@ -6,8 +6,10 @@
#include "code_80958E8_1.h"
#include "code_8096AF8.h"
#include "exclusive_pokemon.h"
#include "input.h"
#include "items.h"
#include "memory.h"
#include "pokemon.h"
#include "text1.h"
#include "text2.h"

1
src/code_802DE84.c
View File

@ -2,6 +2,7 @@
#include "code_80118A4.h"
#include "code_802DE84.h"
#include "code_803B050.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"

1
src/code_803B050.c
View File

@ -12,7 +12,6 @@
#include "text2.h"
#include "code_800D090.h"
#include "menu_input.h"
#include "wonder_mail.h"
#include "dungeon.h"
// This file was originally 7 files. Check data_80E7D40.s

1
src/code_8040094.c
View File

@ -8,7 +8,6 @@
#include "dungeon_map_access.h"
#include "dungeon_music.h"
#include "file_system.h"
#include "input.h"
#include "play_time.h"
extern s32 gUnknown_80F6568[];

3
src/code_80958E8.c
View File

@ -3,10 +3,10 @@
#include "items.h"
#include "friend_area.h"
#include "constants/friend_area.h"
#include "wonder_mail.h"
#include "constants/wonder_mail.h"
#include "dungeon.h"
#include "code_80958E8.h"
#include "code_80958E8_1.h"
#include "pokemon.h"
#include "pokemon_3.h"
#include "code_8094F88.h"
@ -16,7 +16,6 @@ extern bool8 sub_809017C(DungeonLocation *);
extern u8 sub_803C1D0(DungeonLocation *, u8);
extern bool8 sub_803C0DC(s16);
extern void ResetPelipperBoardSlot(u8);
extern void ResetJobSlot(u8);
extern bool8 ValidateWonderMail(WonderMail *);
static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = {0};

5
src/code_80958E8_1.c
View File

@ -8,13 +8,10 @@
#include "code_80958E8_1.h"
#include "random.h"
#include "pokemon.h"
#include "code_8096AF8.h"
extern u8 IsJobSlotEmpty(u8);
extern bool8 IsValidWonderMail(WonderMail *WonderMailData);
extern u8 sub_8095E38(WonderMail *, u8, u8, bool8);
extern void ResetJobSlot(u8);
extern void sub_8096C80(void);
extern void sub_8096D24(void);
extern void sub_80965F4();
extern void SortPelipperJobs();
u8 sub_8097318(s16 param_1);

7
src/code_80972F4.c
View File

@ -1,7 +1,6 @@
#include "global.h"
#include "constants/dungeon.h"
#include "pokemon.h"
#include "wonder_mail.h"
#include "code_80958E8.h"
#include "dungeon.h"
#include "exclusive_pokemon.h"
@ -269,12 +268,12 @@ bool32 sub_80973F4(s16 param_1)
return val;
}
void sub_8097418(s16 index,u32 param_2)
void sub_8097418(s16 index,bool32 param_2)
{
int index_s32 = index;
u8 param_2_u8 = param_2;
bool8 param_2_u8 = param_2;
if (index_s32 != 0xd) {
if ((param_2_u8 != 0) && (sub_800199C(0,0x2c,index_s32,0), index_s32 < 0x1f)) {
if ((param_2_u8) && (sub_800199C(0,0x2c,index_s32,0), index_s32 < 0x1f)) {
MissionText *mt = &gStoryMissionText[index_s32];
if (mt->unk4 != 0xFF) {
sub_8097FA8(mt->unk4);

21
src/data/wonder_mail_802C4C8.h Normal file
View File

@ -0,0 +1,21 @@
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80DFCE4 = {
0, 0, 0, 0,
3,
0, 0,
0, 0,
0, 0,
NULL
};
static const UnkTextStruct2 sUnknown_80DFCFC = {
0, 0, 0, 0,
6,
2, 2,
24, 14,
14, 0,
NULL
};
ALIGNED(4) static const u8 sJobList[] = _("Job List");

31
src/data/wonder_mail_802C860.h Normal file
View File

@ -0,0 +1,31 @@
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80DFD28 = {
0, 0, 0, 0,
3,
0, 0,
0, 0,
0, 0,
NULL
};
static const UnkTextStruct2 sUnknown_80DFD40 = {
0, 0, 0, 0,
4,
21, 6,
7, 3,
3, 0,
NULL
};
static const UnkTextStruct2 sUnknown_80DFD58 = {
0, 0, 0, 0,
4,
21, 15,
6, 3,
3, 0,
NULL
};
ALIGNED(4) static const u8 sTakeJob[] = _("Take Job");
ALIGNED(4) static const u8 sSuspend[] = _("Suspend");

21
src/data/wonder_mail_802CDD4.h Normal file
View File

@ -0,0 +1,21 @@
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80DFD8C = {
0, 0, 0, 0,
3,
0, 0,
0, 0,
0, 0,
NULL
};
static const UnkTextStruct2 sUnknown_80DFDA4 = {
0, 0, 0, 0,
6,
2, 2,
24, 14,
14, 0,
NULL
};
ALIGNED(4) static const u8 sRescueEvent[] = _("RESCUE EVENT");

88
src/data/wonder_mail_802D098.h Normal file
View File

@ -0,0 +1,88 @@
ALIGNED(4) static const u8 sFill[] = _("pksdir0");
static const UnkTextStruct2 sUnknown_80DFDD4 = {
0, 0, 0, 0,
3,
0, 0,
0, 0,
0, 0,
NULL
};
UNUSED static const UnkTextStruct2 sUnknown_80DFDEC = {
0, 0, 0, 0,
3,
3, 3,
7, 3,
3, 0,
NULL
};
static const UnkTextStruct2 sUnknown_80DFE04 = {
0, 0, 0, 0,
3,
21, 6,
7, 3,
3, 0,
NULL
};
static const UnkTextStruct2 sUnknown_80DFE1C = {
0, 0, 0, 0,
3,
21, 15,
7, 3,
3, 0,
NULL
};
UNUSED static const UnkTextStruct2 sUnknown_80DFE34 = {
0, 0, 0, 0,
3,
21, 15,
6, 3,
3, 0,
NULL
};
ALIGNED(4) static const u8 sReplaceOldMailPrompt[] = _(
"Are you sure you want to replace the\n"
"old {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} with the new one?");
ALIGNED(4) static const u8 sMailAlreadyReceived[] = _(
"This {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} has already been\n"
"received.");
ALIGNED(4) static const u8 sMailAlreadyReceivedMayNotReceiveAgain[] = _(
"This {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} has already been\n"
"received.\n"
"You may not receive the same one again.");
ALIGNED(4) static const u8 sOnlyOneMailCanBeHeldPleaseCompleteFirst[] = _(
"Only {COLOR_1 LIGHT_BLUE}one piece{END_COLOR_TEXT_1} of {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} can be held.\n"
"Please receive it after completing any\n"
"rescue mission in progress.");
ALIGNED(4) static const u8 sTeamQuicksavedCompleteFirst[] = _(
"The rescue team has quicksaved in\n"
"a dungeon with a mission in progress.\n"
"Please complete the mission first.");
ALIGNED(4) static const u8 sTeamQuicksavedCannotDelete[] = _(
"The rescue team has quicksaved in\n"
"a dungeon with a mission in progress.\n"
"Mail cannot be deleted now.");
ALIGNED(4) static const u8 sReceivedWonderMail[] = _("Received the {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1}!");
ALIGNED(4) static const u8 sOnlyOneMailCanBeHeldSoReplacePrompt[] = _(
"Only {COLOR_1 LIGHT_BLUE}one piece{END_COLOR_TEXT_1} of {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1} can be held.\n"
"Is it OK to replace the old {COLOR_1 LIGHT_BLUE}Wonder Mail{END_COLOR_TEXT_1}\n"
"with the new one?");
ALIGNED(4) static const u8 sJobListFullPleaseDelete[] = _(
"Your {COLOR_1 LIGHT_BLUE}Job List{END_COLOR_TEXT_1} is full.\n"
"Please select and delete unwanted mail.");
ALIGNED(4) static const u8 sNewMail[] = _("New Mail");
ALIGNED(4) static const u8 sOldMail[] = _("Old Mail");

1
src/debug_menu1.c
View File

@ -4,6 +4,7 @@
#include "constants/main_menu.h"
#include "debug_menu1.h"
#include "friend_area.h"
#include "input.h"
#include "main_menu1.h"
#include "memory.h"
#include "menu_input.h"

1
src/debug_menu2.c
View File

@ -4,6 +4,7 @@
#include "code_801C8C4.h"
#include "common_strings.h"
#include "debug_menu2.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"

1
src/debug_menu3.c
View File

@ -3,6 +3,7 @@
#include "common_strings.h"
#include "debug_menu3.h"
#include "friend_area.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"

1
src/debug_menu4.c
View File

@ -3,6 +3,7 @@
#include "code_801602C.h"
#include "code_8023868.h"
#include "debug_menu4.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"

1
src/event_flag.c
View File

@ -45,7 +45,6 @@ extern u8 gUnknown_80B7388[];
void FatalError(DebugLocation *, const char *, ...) __attribute__((noreturn));
extern bool8 HasCompletedAllMazes(void);
extern void sub_8097418(u32, u32);
extern void sub_800160C(struct UnkEventStruct *r0, u32 r1, u32 r2);
extern u8 sub_8002658(s16);
extern void sub_80018D8(u32, u32, u32);

1
src/felicity_bank.c
View File

@ -3,6 +3,7 @@
#include "code_80130A8.h"
#include "common_strings.h"
#include "felicity_bank.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"

1
src/friend_area_action_menu.c
View File

@ -11,6 +11,7 @@
#include "constants/dungeon.h"
#include "event_flag.h"
#include "friend_area_action_menu.h"
#include "input.h"
#include "items.h"
#include "kecleon_bros4.h"
#include "memory.h"

1
src/friend_list_menu.c
View File

@ -13,6 +13,7 @@
#include "constants/dungeon.h"
#include "event_flag.h"
#include "ground_map_1.h"
#include "input.h"
#include "items.h"
#include "kecleon_bros4.h"
#include "memory.h"

1
src/ground_main.c
View File

@ -7,7 +7,6 @@
#include "event_flag.h"
#include "ground_main.h"
#include "ground_map_2.h"
#include "input.h"
#include "play_time.h"
EWRAM_DATA u32 gUnknown_20398A8 = {0};

1
src/gulpin_shop.c
View File

@ -5,6 +5,7 @@
#include "code_80130A8.h"
#include "common_strings.h"
#include "gulpin_shop.h"
#include "input.h"
#include "pokemon.h"
#include "memory.h"
#include "menu_input.h"

1
src/gulpin_shop_801FB50.c
View File

@ -10,6 +10,7 @@
#include "felicity_bank.h"
#include "gulpin_shop.h"
#include "gulpin_shop_801FB50.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "moves.h"

1
src/hints_menu1.c
View File

@ -2,6 +2,7 @@
#include "code_80118A4.h"
#include "common_strings.h"
#include "hints_menu1.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"

1
src/hints_menu2.c
View File

@ -2,6 +2,7 @@
#include "code_80118A4.h"
#include "common_strings.h"
#include "hints_menu2.h"
#include "input.h"
#include "memory.h"
#include "menu_input.h"
#include "text1.h"

1
src/kangaskhan_storage1.c
View File

@ -4,6 +4,7 @@
#include "code_801C8C4.h"
#include "code_8098BDC.h"
#include "common_strings.h"
#include "input.h"
#include "kangaskhan_storage1.h"
#include "kecleon_bros4.h"
#include "memory.h"

1
src/kangaskhan_storage2.c
View File

@ -4,6 +4,7 @@
#include "code_801C8C4.h"
#include "code_8098BDC.h"
#include "common_strings.h"
#include "input.h"
#include "kangaskhan_storage2.h"
#include "kecleon_bros4.h"
#include "memory.h"

1
src/kecleon_bros1.c
View File

@ -5,6 +5,7 @@
#include "code_8098BDC.h"
#include "common_strings.h"
#include "felicity_bank.h"
#include "input.h"
#include "items.h"
#include "kecleon_bros1.h"
#include "kecleon_bros2.h"

1
src/kecleon_bros2.c
View File

@ -2,6 +2,7 @@
#include "code_800D090.h"
#include "code_80118A4.h"
#include "constants/input.h"
#include "input.h"
#include "items.h"
#include "kecleon_bros2.h"
#include "memory.h"

1
src/kecleon_bros3.c
View File

@ -2,6 +2,7 @@
#include "code_800D090.h"
#include "code_80118A4.h"
#include "constants/input.h"
#include "input.h"
#include "items.h"
#include "kecleon_bros3.h"
#include "memory.h"

1
src/kecleon_bros4.c
View File

@ -4,6 +4,7 @@
#include "code_80130A8.h"
#include "code_8098BDC.h"
#include "constants/input.h"
#include "input.h"
#include "items.h"
#include "kecleon_bros4.h"
#include "memory.h"

8
src/mailbox.c
View File

@ -7,16 +7,17 @@
#include "structs/menu.h"
#include "input.h"
#include "mailbox.h"
#include "wonder_mail.h"
#include "menu_input.h"
#include "code_80118A4.h"
#include "wonder_mail_2_1.h"
#include "pokemon_news1.h"
#include "pokemon_news2.h"
#include "pokemon_news3.h"
#include "mailbox_8095F8C.h"
#include "code_803B050.h"
#include "code_80958E8_1.h"
#include "wonder_mail_802C4C8.h"
#include "wonder_mail_802C860.h"
#include "code_8096AF8.h"
EWRAM_DATA_2 struct unkStruct_203B304 *gUnknown_203B304 = {0};
@ -85,9 +86,6 @@ extern void sub_802E088(u32);
extern void CreateMailboxMenu(void);
extern void CreateMailActionMenu(void);
extern void CreateMailAcceptedStatusBox(u32);
extern void AcceptJob(WonderMail *);
extern void sub_8096C80(void);
extern void sub_8096D24(void);
extern void ReceivePKMNNews(u8);
extern void sub_8096078(void);

1
src/main_menu1.c
View File

@ -7,6 +7,7 @@
#include "ds_menus.h"
#include "friend_rescue.h"
#include "game_options.h"
#include "input.h"
#include "load_screen.h"
#include "main_menu1.h"
#include "main_menu2.h"

Some files were not shown because too many files have changed in this diff Show More