others_menu h files

This commit is contained in:
Kermalis 2023-09-10 06:44:50 -04:00
parent 7883e435a6
commit 7076a22ea4
12 changed files with 165 additions and 164 deletions

View File

@ -4,6 +4,15 @@
#include "menu.h"
#include "text.h"
struct unkStruct_203B34C
{
// size: 0x1A8
u32 unk0;
MenuStruct unk4[4];
UnkTextStruct2 unk144[4];
/* 0x1A4 */ u32 currMenuChoice;
};
u32 sub_8012A64(MenuInputStructSub *r0, s32 r1);
s32 GetKeyPress(MenuInputStruct *r0);
s32 sub_8012AE8(void);

View File

@ -32,4 +32,8 @@ typedef struct unkStruct_203B35C
u8 unk450[180];
} unkStruct_203B35C;
void sub_8036FDC(s32);
void sub_80370D4(void);
void sub_80373C4(void);
#endif // GUARD_OTHER_MENUS1_H

View File

@ -1,4 +1,8 @@
#ifndef GUARD_OTHER_MENUS2_H
#define GUARD_OTHER_MENUS2_H
u32 sub_8037C10(bool8);
s32 sub_8037D64(u32 mode, void *, void *);
s32 sub_80381F4(u32 mode, void *, void *);
#endif // GUARD_OTHER_MENUS2_H

View File

@ -14,11 +14,11 @@ static const MenuItem sUnknown_80E60D4[3] = {
static const UnkTextStruct2 sUnknown_80E60EC =
{
0x00, 0x00, 0x00, 0x00,
0x03,
0x15, 0x04,
0x06, 0x05,
0x05, 0x00,
0, 0, 0, 0,
3,
21, 4,
6, 5,
5, 0,
NULL
};
@ -31,11 +31,11 @@ static const MenuItem sUnknown_80E6104[4] = {
static const UnkTextStruct2 unused =
{
0x00, 0x00, 0x00, 0x00,
0x03,
0x16, 0x09,
0x05, 0x03,
0x03, 0x00,
0, 0, 0, 0,
3,
22, 9,
5, 3,
3, 0,
NULL
};
@ -47,11 +47,11 @@ static const MenuItem sUnknown_80E6154[3] = {
static const UnkTextStruct2 sUnknown_80E6174 =
{
0x00, 0x00, 0x00, 0x00,
0x03,
0x15, 0x0D,
0x06, 0x04,
0x04, 0x00,
0, 0, 0, 0,
3,
21, 13,
6, 4,
4, 0,
NULL
};
@ -61,52 +61,52 @@ static const MenuItem sUnknown_80E618C[3] = {
{NULL, 0},
};
ALIGNED(4) static const u8 sUnknown_80E61A4[] = "What would you like to do? ";
ALIGNED(4) static const u8 sUnknown_80E61C0[] = "Please choose the item to be sent.";
ALIGNED(4) static const u8 sUnknown_80E61E4[] = _(
ALIGNED(4) static const u8 sWhatDoPrompt[] = "What would you like to do? ";
ALIGNED(4) static const u8 sPleaseChooseItem[] = "Please choose the item to be sent.";
ALIGNED(4) static const u8 sFmtWillBeSentPrompt[] = _(
"{COLOR_1 LIGHT_BLUE}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}\n"
"will be sent.\n"
"Is that OK?");
ALIGNED(4) static const u8 sUnknown_80E6214[] = _(
ALIGNED(4) static const u8 sFriendWillSendAnItem[] = _(
"Your friend will send you an item.\n"
"When you are both ready{COMMA} you\n"
"may communicate.");
ALIGNED(4) static const u8 sUnknown_80E6268[] = _(
ALIGNED(4) static const u8 sPreparingToSendItem[] = _(
"Preparing to send an item to your\n"
"friend. When you are both ready{COMMA}\n"
"you may communicate.");
ALIGNED(4) static const u8 sUnknown_80E62C4[] = _(
ALIGNED(4) static const u8 sInCommunication[] = _(
"{CENTER_ALIGN}In communication...\n"
"{CENTER_ALIGN}Please wait with the power on.\n"
"{CENTER_ALIGN}To cancel{COMMA} press {B_BUTTON}.");
ALIGNED(4) static const u8 sUnknown_80E6314[] = _(
ALIGNED(4) static const u8 sFmtYouReceived[] = _(
"You received\n"
"{COLOR_1 LIGHT_BLUE}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.\n"
"Your adventure will be saved.");
ALIGNED(4) static const u8 sUnknown_80E6358[] = _("You sent {COLOR_1 LIGHT_BLUE}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.");
ALIGNED(4) static const u8 sFmtYouSent[] = _("You sent {COLOR_1 LIGHT_BLUE}$d0{END_COLOR_TEXT_1} {COLOR_1 GREEN_2}{ARG_MOVE_ITEM_0}(s){END_COLOR_TEXT_1}.");
// Trade Items Menu Link Error Messages
ALIGNED(4) static const u8 sTradeItemsCommunicationError[] = "There was a communication error.";
ALIGNED(4) static const u8 sUnknown_80E639C[] =
ALIGNED(4) static const u8 sCommunicationError[] = "There was a communication error.";
ALIGNED(4) static const u8 sInvalidGBACount[] =
"An incorrect number of GBA systems are\n"
"connected.\n"
"Please redo this process from the start.";
ALIGNED(4) static const u8 sUnknown_80E63F8[] =
ALIGNED(4) static const u8 sNoResponseSoRedo[] =
"There is no response from your friend.\n"
"Please redo this process from the start.";
ALIGNED(4) static const u8 sUnknown_80E6448[] =
ALIGNED(4) static const u8 sUnequalModes[] =
"The sender and receiver appear to be\n"
"in different modes.\n"
"Please redo the process from the start.";
ALIGNED(4) static const u8 sUnknown_80E64AC[] = _(
ALIGNED(4) static const u8 sNoResponseCheckSenderReceiver[] = _(
"There is no response from your friend.\n"
"Please make sure the sender and receiver\n"
"are ready{COMMA} then redo this from the start.");

View File

@ -1,25 +1,26 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "code_801EE10_1.h"
#include "code_801C620.h"
#include "code_8094F88.h"
#include "constants/communication_error_codes.h"
#include "constants/monster.h"
#include "constants/wonder_mail.h"
#include "text1.h"
#include "text2.h"
#include "text_util.h"
#include "items.h"
#include "code_801B3C0.h"
#include "pokemon.h"
#include "cpu.h"
#include "friend_rescue.h"
#include "items.h"
#include "main_menu.h"
#include "memory.h"
#include "menu_input.h"
#include "other_menus2.h"
#include "pokemon.h"
#include "save_write.h"
#include "rescue_password_menu.h"
#include "menu_input.h"
#include "code_8094F88.h"
#include "code_80130A8.h"
#include "main_menu.h"
#include "code_801EE10_1.h"
#include "code_801C620.h"
#include "cpu.h"
#include "code_80118A4.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
extern void SetFriendRescueMenuState(u32);
extern void sub_802F2C0();
@ -286,8 +287,6 @@ extern u32 sub_8030894(void);
extern void sub_803092C(void);
extern bool8 sub_8031D70(u32 mailIndex, s32);
extern s32 sub_8037B28(u32);
extern s32 sub_8037D64(u32, void *, void *);
extern s32 sub_80381F4(u32, void *, void *);
extern s32 CountMailType(u8 mailType);
extern u32 GetDungeonTeamRankPts(DungeonLocation *, u32);

View File

@ -1,21 +1,22 @@
#include "global.h"
#include "code_803D0D8.h"
#include "text1.h"
#include "text2.h"
#include "menu_input.h"
#include "adventure_log_menu.h"
#include "code_803D0D8.h"
#include "code_8098BDC.h"
#include "constants/wonder_mail.h"
#include "debug_menu1.h"
#include "ds_menus.h"
#include "pokemon.h"
#include "friend_rescue.h"
#include "load_screen.h"
#include "main_menu.h"
#include "memory.h"
#include "menu_input.h"
#include "other_menus1.h"
#include "pokemon.h"
#include "rescue_password_menu.h"
#include "save.h"
#include "text1.h"
#include "text2.h"
#include "trade_items_menu.h"
#include "constants/wonder_mail.h"
#include "code_8098BDC.h"
// NOTE: 0x13 and 0x14
// Communication Screen?
@ -30,30 +31,18 @@
// NOTE: 0x2E
// Deletes the Save
struct unkStruct_203B34C
{
// size: 0x1A8
u32 unk0;
MenuStruct unk4[4];
UnkTextStruct2 unk144[4];
/* 0x1A4 */ u32 currMenuChoice;
};
EWRAM_DATA_2 MainMenu *gMainMenu = {0};
EWRAM_DATA_2 struct unkStruct_203B34C *gUnknown_203B34C = {0};
EWRAM_DATA_2 u32 gUnknown_203B350 = {0};
EWRAM_DATA_2 u32 gUnknown_203B354 = {0}; // unused everywhere else except here..
extern void SetWindowBGColor(void);
extern void sub_8036FDC(s32);
extern void CreateWonderMailMenu(void);
extern void CreateSaveMenu(u32);
extern u32 UpdateMainMenu(void);
extern s32 UpdateWonderMailMenu(void);
extern s32 sub_80383D4(void);
extern s32 UpdateSaveMenu(void);
extern void sub_80370D4(void);
extern void CleanWonderMailMenu(void);
extern void sub_80383A8(void);
extern void CleanSaveMenu(void);

View File

@ -11,6 +11,7 @@
#include "memory.h"
#include "menu_input.h"
#include "other_menus1.h"
#include "other_menus2.h"
#include "sprite.h"
#include "text1.h"
@ -19,24 +20,21 @@ EWRAM_DATA_2 unkStruct_203B35C *sUnknown_203B35C = {0};
#include "data/other_menus1.h"
extern void sub_8037400(void);
extern void sub_80376CC();
extern u32 sub_8037C10(u32);
extern void sub_8037748(void);
extern void sub_80371B8(void);
extern void sub_8037900(void);
extern u32 sub_8037798(void);
extern void xxx_call_update_bg_vram();
extern void xxx_call_update_bg_sound_input();
extern s32 sub_8037D64(u32 mode, void *, void *);
extern s32 sub_80381F4(u32 mode, void *, void *);
extern void sub_8037810(void);
extern s32 sub_8037B28(u32);
s32 sub_8035D3C(void);
extern s32 sub_8035D74(void);
extern void xxx_draw_string_80144C4(void);
static void sub_80371B8(void);
static void sub_8037400(void);
static void sub_80376CC(void);
static void sub_8037748(void);
static u32 sub_8037798(void);
void sub_8036FDC(s32 param_1)
{
s32 index1;
@ -104,7 +102,7 @@ UNUSED static u32 sub_80370F0(void)
sub_80371B8();
break;
case 2:
if (sUnknown_203B35C->unk0 < 2 && sUnknown_203B35C->linkStatus == COMMS_GOOD && !sub_8037C10(0))
if (sUnknown_203B35C->unk0 < 2 && sUnknown_203B35C->linkStatus == COMMS_GOOD && !sub_8037C10(FALSE))
return 41; // TODO: what screen is this?
if (!sub_80130A8(&sUnknown_203B35C->unk1C[0]))
@ -122,7 +120,7 @@ UNUSED static u32 sub_80370F0(void)
return nextMenu;
}
void sub_80371B8(void)
static void sub_80371B8(void)
{
unkStruct_8035D94 *item;
const MenuItem *MenuItems;
@ -133,7 +131,7 @@ void sub_80371B8(void)
sub_8037400();
if (sUnknown_203B35C->unk0 < 2 && sUnknown_203B35C->linkStatus == COMMS_GOOD) {
if (sub_8037C10(0)) {
if (sub_8037C10(FALSE)) {
sub_80376CC();
sub_8035CC0(sUnknown_203B35C->unk15C, 0);
// Success!
@ -230,7 +228,7 @@ UNUSED static unkStruct_203B35C *sub_80373F4(void)
return sUnknown_203B35C;
}
void sub_8037400(void)
static void sub_8037400(void)
{
u8 mailIndex;
void *r5;
@ -349,7 +347,7 @@ void sub_8037400(void)
xxx_call_start_bg_music();
}
void sub_80376CC(void)
static void sub_80376CC(void)
{
#ifdef NONMATCHING
u32 r0;
@ -405,7 +403,7 @@ void sub_80376CC(void)
sUnknown_203B35C->unkC.unk6 = r2;
}
void sub_8037748(void)
static void sub_8037748(void)
{
u16 temp2;
@ -423,7 +421,7 @@ void sub_8037748(void)
sUnknown_203B35C->unk14++;
}
u32 sub_8037798(void)
static u32 sub_8037798(void)
{
u32 nextMenu = MENU_NO_SCREEN_CHANGE;
switch (sUnknown_203B35C->unk0) {

View File

@ -5,6 +5,8 @@
#include "dungeon_global_data.h"
#include "main_menu.h"
#include "memory.h"
#include "other_menus1.h"
#include "other_menus2.h"
#include "pokemon.h"
#include "save.h"
@ -22,7 +24,6 @@ extern void sub_800D494(void);
extern s32 sub_800D33C(void);
extern void sub_800D520(void);
extern u8 sub_800D600(void);
extern void sub_80373C4(void);
extern void sub_800D59C(s32 *, u32);
extern void sub_800D570(void);
extern void sub_800D510(void);
@ -30,11 +31,11 @@ extern u8 sub_800D588(void);
extern void sub_800D670(u32, s32 *, u32);
extern void sub_800D68C(u32);
u32 sub_8037C10(u8 param_1)
u32 sub_8037C10(bool8 a0)
{
u32 ret;
if (param_1 != 0)
if (a0)
{
if (sub_800D588())
{
@ -56,7 +57,7 @@ u32 sub_8037C10(u8 param_1)
return ret;
}
void sub_8037C44(s32 mode, void *data)
static void sub_8037C44(s32 mode, void *data)
{
s32 index;
@ -86,7 +87,7 @@ void sub_8037C44(s32 mode, void *data)
}
}
void sub_8037CC4(s32 mode, void *param_2, void *param_3)
static void sub_8037CC4(s32 mode, void *param_2, void *param_3)
{
switch(mode)
{
@ -116,7 +117,7 @@ void sub_8037CC4(s32 mode, void *param_2, void *param_3)
}
// TODO: same as sub_80381F4
s32 sub_8037D64(u32 mode, void * param_2, void * param_3)
s32 sub_8037D64(u32 mode, void *param_2, void *param_3)
{
u32 iVar2;
s32 linkStatus;
@ -161,7 +162,7 @@ _end:
return linkStatus;
}
s32 sub_8037DF0(void)
static s32 sub_8037DF0(void)
{
s32 linkStatus;
s32 iStack_10;
@ -179,7 +180,7 @@ s32 sub_8037DF0(void)
return linkStatus;
}
void sub_8037E38(unkStruct_8035D94 *param_1,unkStruct_8035D94 *param_2)
static void sub_8037E38(unkStruct_8035D94 *param_1,unkStruct_8035D94 *param_2)
{
unkStruct_8035D94 *r3;
unkStruct_8035D94 *r4;
@ -200,7 +201,7 @@ void sub_8037E38(unkStruct_8035D94 *param_1,unkStruct_8035D94 *param_2)
}
}
void sub_8037E90(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
static void sub_8037E90(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
{
if(sub_800D588() == 0)
{
@ -211,11 +212,12 @@ void sub_8037E90(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
sub_8095274(param_2->unk10.unk10);
}
void nullsub_53(void *param_1, void *param_2)
static void nullsub_53(void *param_1, void *param_2)
{
}
void sub_8037EBC(WonderMailStruct_203B2C0_sub *param_1, WonderMailStruct_203B2C0_sub *param_2) {
static void sub_8037EBC(WonderMailStruct_203B2C0_sub *param_1, WonderMailStruct_203B2C0_sub *param_2)
{
unkStruct_203B480 *mail;
WonderMailStruct_203B2C0_sub *puVar2;
@ -247,7 +249,7 @@ void sub_8037EBC(WonderMailStruct_203B2C0_sub *param_1, WonderMailStruct_203B2C
}
}
void sub_8037F4C(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
static void sub_8037F4C(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
{
unkStruct_203B480 *mail;
MainMenu *mainMenu;
@ -266,7 +268,7 @@ void sub_8037F4C(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
}
}
void sub_8037F9C(u32 mode, void *param_2, void *param_3)
static void sub_8037F9C(u32 mode, void *param_2, void *param_3)
{
switch(mode)
{
@ -289,7 +291,7 @@ void sub_8037F9C(u32 mode, void *param_2, void *param_3)
}
}
s32 sub_8038014(unkStruct_8035D94 *param_1,unkStruct_8035D94 *param_2)
static s32 sub_8038014(unkStruct_8035D94 *param_1,unkStruct_8035D94 *param_2)
{
s32 linkStatus;
s32 r2;
@ -321,7 +323,7 @@ s32 sub_8038014(unkStruct_8035D94 *param_1,unkStruct_8035D94 *param_2)
return linkStatus;
}
s32 sub_8038078(unkStruct_203B480 *param_1,unkStruct_203B480 *param_2)
static s32 sub_8038078(unkStruct_203B480 *param_1,unkStruct_203B480 *param_2)
{
u32 uVar2;
u32 uVar3;
@ -344,7 +346,7 @@ s32 sub_8038078(unkStruct_203B480 *param_1,unkStruct_203B480 *param_2)
}
}
s32 sub_80380C4(unkStruct_203B480 *param_1,unkStruct_203B480 *param_2)
static s32 sub_80380C4(unkStruct_203B480 *param_1,unkStruct_203B480 *param_2)
{
u32 uVar2;
unkStruct_203B480 *mail;
@ -374,7 +376,7 @@ s32 sub_80380C4(unkStruct_203B480 *param_1,unkStruct_203B480 *param_2)
}
}
s32 sub_803812C(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
static s32 sub_803812C(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
{
if (sub_800D588() == 0) {
param_2 = param_1;
@ -387,12 +389,12 @@ s32 sub_803812C(unkStruct_203B480 *param_1, unkStruct_203B480 *param_2)
}
}
s32 sub_8038158(void *param_1, void *param_2)
static s32 sub_8038158(void *param_1, void *param_2)
{
return COMMS_GOOD;
}
s32 sub_803815C(u32 mode, void *param_2, void *param_3)
static s32 sub_803815C(u32 mode, void *param_2, void *param_3)
{
s32 linkStatus;
@ -418,18 +420,18 @@ s32 sub_803815C(u32 mode, void *param_2, void *param_3)
return linkStatus;
}
void sub_80381DC(u32 mode, void * param_2, void * param_3)
UNUSED static void sub_80381DC(u32 mode, void * param_2, void * param_3)
{
sub_8037F9C(mode, param_2, param_3);
}
s32 sub_80381E8(u32 mode, void * param_2, void * param_3)
UNUSED static s32 sub_80381E8(u32 mode, void * param_2, void * param_3)
{
return sub_803815C(mode, param_2, param_3);
}
// TODO: clean this up
s32 sub_80381F4(u32 mode, void * param_2, void * param_3)
s32 sub_80381F4(u32 mode, void *param_2, void *param_3)
{
u32 iVar2;
s32 linkStatus;

View File

@ -1,24 +1,25 @@
#include "global.h"
#include "code_800D090.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "code_801C620.h"
#include "code_8094F88.h"
#include "constants/communication_error_codes.h"
#include "cpu.h"
#include "items.h"
#include "main_menu.h"
#include "memory.h"
#include "menu_input.h"
#include "other_menus2.h"
#include "pokemon.h"
#include "rescue_password_menu.h"
#include "save.h"
#include "save_write.h"
#include "pokemon.h"
#include "items.h"
#include "code_8094F88.h"
#include "wonder_mail.h"
#include "memory.h"
#include "rescue_password_menu.h"
#include "text_util.h"
#include "text1.h"
#include "text2.h"
#include "text_util.h"
#include "code_801B3C0.h"
#include "code_800D090.h"
#include "menu_input.h"
#include "code_80130A8.h"
#include "main_menu.h"
#include "code_801C620.h"
#include "cpu.h"
#include "code_80118A4.h"
#include "wonder_mail.h"
extern WonderMailStruct_203B2C4 *gUnknown_203B2C4;
@ -221,8 +222,6 @@ extern s32 sub_8037B28(u32);
extern u32 sub_8030894(void);
extern u32 sub_801D008(void);
extern void sub_80306A8(u32, u32, u32, u32);
extern s32 sub_8037D64(u32, void *, void *);
extern s32 sub_80381F4(u32, void *, void *);
extern u8 sub_800D588(void);
extern u32 GetDungeonTeamRankPts(DungeonLocation *, u32);
extern void sub_8031D70(u8, u32);

View File

@ -9,6 +9,7 @@
#include "main_menu.h"
#include "memory.h"
#include "menu_input.h"
#include "other_menus2.h"
#include "save_write.h"
#include "text1.h"
#include "text2.h"
@ -25,8 +26,6 @@ extern void sub_8035C1C();
extern u32 sub_801D008();
extern s32 sub_8037B28(u32);
extern s32 sub_80381F4(u32, void *, void *);
extern s32 sub_8037D64(u32, void *, void *);
void sub_8036F74(void);
void sub_8036F30();
@ -501,14 +500,14 @@ void sub_8036B28(void)
switch(sTradeItemsMenu->currMenu) {
case TRADE_ITEMS_MAIN_MENU:
if (sub_801CF14(0)) {
sub_8014248(sUnknown_80E61A4,0,1,sUnknown_80E60D4,0,4,0,0,0x101);
sub_8014248(sWhatDoPrompt,0,1,sUnknown_80E60D4,0,4,0,0,0x101);
}
else {
sub_8014248(sUnknown_80E61A4,0,1,sUnknown_80E60A0,0,4,0,0,0x101);
sub_8014248(sWhatDoPrompt,0,1,sUnknown_80E60A0,0,4,0,0,0x101);
}
break;
case TRADE_ITEMS_SEND_ITEM:
sub_80141B4(sUnknown_80E61C0,0,0,0x101);
sub_80141B4(sPleaseChooseItem,0,0,0x101);
break;
case TRADE_ITEMS_SEND_ITEM_SELECTION:
if (sub_801D008() == 0) {
@ -533,17 +532,17 @@ void sub_8036B28(void)
case TRADE_ITEMS_SEND_ITEM_CONFIRM:
gUnknown_202DE30 = sTradeItemsMenu->quantityToSend;
BufferItemName(gUnknown_202DE58,sTradeItemsMenu->itemToSend.id,NULL);
sub_8014248(sUnknown_80E61E4,0,5, sUnknown_80E6154,0,4,0,0,0x101);
sub_8014248(sFmtWillBeSentPrompt,0,5, sUnknown_80E6154,0,4,0,0,0x101);
break;
case TRADE_ITEMS_RECEIVE_ITEM:
sub_8014248(sUnknown_80E6214,0,5,sUnknown_80E618C,0,4,0,0,0x101);
sub_8014248(sFriendWillSendAnItem,0,5,sUnknown_80E618C,0,4,0,0,0x101);
break;
case 8:
sub_8014248(sUnknown_80E6268,0,5,sUnknown_80E618C,0,4,0,0,0x101);
sub_8014248(sPreparingToSendItem,0,5,sUnknown_80E618C,0,4,0,0,0x101);
break;
case TRADE_ITEMS_IN_COMMUNICATION:
nullsub_23(FALSE);
sub_80141B4(sUnknown_80E62C4,0,0,0);
sub_80141B4(sInCommunication,0,0,0);
break;
case 10:
sTradeItemsMenu->linkStatus = COMMS_GOOD;
@ -597,12 +596,12 @@ void sub_8036B28(void)
gUnknown_202DE30 = sTradeItemsMenu->unk24C.quantity;
BufferItemName(gUnknown_202DE58,sTradeItemsMenu->unk24C.itemIdx.id,NULL);
}
sub_80141B4(sUnknown_80E6314,0,0,0x101);
sub_80141B4(sFmtYouReceived,0,0,0x101);
break;
case 0xd:
gUnknown_202DE30 = sTradeItemsMenu->quantityToSend;
BufferItemName(gUnknown_202DE58,sTradeItemsMenu->itemToSend.id,NULL);
sub_80141B4(sUnknown_80E6358,0,0,0x101);
sub_80141B4(sFmtYouSent,0,0,0x101);
break;
case 0xB:
case 0xC:
@ -621,28 +620,28 @@ void PrintTradeItemsLinkError(u32 errorNum)
case COMMS_GOOD:
break;
case 1:
sub_80141B4(sTradeItemsCommunicationError, 0, 0, 0x101);
sub_80141B4(sCommunicationError, 0, 0, 0x101);
break;
case COMMS_INCORRECT_NUM_SYSTEMS:
sub_80141B4(sUnknown_80E639C, 0, 0, 0x101);
sub_80141B4(sInvalidGBACount, 0, 0, 0x101);
break;
case COMMS_NO_RESPONSE:
sub_80141B4(sUnknown_80E63F8, 0, 0, 0x101);
sub_80141B4(sNoResponseSoRedo, 0, 0, 0x101);
break;
case COMMS_DIFFERENT_MODES:
sub_80141B4(sUnknown_80E6448, 0, 0, 0x101);
sub_80141B4(sUnequalModes, 0, 0, 0x101);
break;
case 5:
sub_80141B4(sTradeItemsCommunicationError, 0, 0, 0x101);
sub_80141B4(sCommunicationError, 0, 0, 0x101);
break;
case 0xe:
sub_80141B4(sTradeItemsCommunicationError, 0, 0, 0x101);
sub_80141B4(sCommunicationError, 0, 0, 0x101);
break;
case COMMS_NOT_READY:
sub_80141B4(sUnknown_80E64AC, 0, 0, 0x101);
sub_80141B4(sNoResponseCheckSenderReceiver, 0, 0, 0x101);
break;
default:
sub_80141B4(sTradeItemsCommunicationError, 0, 0, 0x101);
sub_80141B4(sCommunicationError, 0, 0, 0x101);
break;
}
}

View File

@ -1,22 +1,23 @@
#include "global.h"
#include "code_80118A4.h"
#include "code_801EE10_1.h"
#include "code_80130A8.h"
#include "code_8094F88.h"
#include "code_80A26CC.h"
#include "constants/communication_error_codes.h"
#include "save_write.h"
#include "pokemon.h"
#include "cpu.h"
#include "items.h"
#include "wonder_mail.h"
#include "main_menu.h"
#include "memory.h"
#include "menu_input.h"
#include "other_menus2.h"
#include "pokemon.h"
#include "rescue_password_menu.h"
#include "save.h"
#include "save_write.h"
#include "text1.h"
#include "text2.h"
#include "code_80A26CC.h"
#include "rescue_password_menu.h"
#include "menu_input.h"
#include "code_8094F88.h"
#include "code_80130A8.h"
#include "main_menu.h"
#include "code_801EE10_1.h"
#include "cpu.h"
#include "code_80118A4.h"
#include "save.h"
#include "wonder_mail.h"
extern WonderMailStruct_203B2C0 *gUnknown_203B2C0;
@ -54,8 +55,6 @@ extern void sub_8031E00();
extern void sub_8031E10(void);
extern void sub_803084C(void);
extern void sub_8030DE4();
extern s32 sub_8037D64(u32, void *, void *);
extern s32 sub_80381F4(u32, void *, void *);
extern void sub_80306A8(u32, u32, u32, u32);
extern s32 sub_8037B28(u32);
extern void sub_8031D70(u8, u32);

View File

@ -1,18 +1,19 @@
#include "global.h"
#include "constants/wonder_mail.h"
#include "code_80118A4.h"
#include "code_80130A8.h"
#include "code_801B3C0.h"
#include "code_801C620.h"
#include "code_8094F88.h"
#include "constants/communication_error_codes.h"
#include "save_write.h"
#include "constants/wonder_mail.h"
#include "cpu.h"
#include "input.h"
#include "memory.h"
#include "other_menus2.h"
#include "save_write.h"
#include "text1.h"
#include "text2.h"
#include "input.h"
#include "wonder_mail.h"
#include "code_8094F88.h"
#include "code_80130A8.h"
#include "code_801C620.h"
#include "code_801B3C0.h"
#include "cpu.h"
#include "code_80118A4.h"
#include "wonder_mail_3.h"
#define SELECT_WONDER_MAIL_MODE_MAIN_SCREEN 0
@ -123,8 +124,6 @@ extern void sub_80155F0(void);
extern void sub_8031E10(void);
extern u8 sub_800D588(void);
extern s32 sub_8037D64(u32, void *, void *);
extern s32 sub_80381F4(u32, void *, void *);
extern void sub_80151C0(u32, u8 *);
extern void sub_802EF48(void);