dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Move trade data, some trade.c clean up documentation

Browse Source
This commit is contained in:
GriffinR
2019-10-03 01:16:22 -04:00
parent 48e54ae387
commit c3c8fb40cf
13 changed files with 1377 additions and 1340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cable_club.c
View File

@@ -1084,8 +1084,8 @@ static void sub_80B37FC(u8 taskId)
task->data[0]++;
break;
case 2:
gUnknown_02032298[0] = 0;
gUnknown_02032298[1] = 0;
gSelectedTradeMonPositions[0] = 0;
gSelectedTradeMonPositions[1] = 0;
m4aMPlayAllStop();
sub_800AC34();
task->data[0]++;
@@ -1117,8 +1117,8 @@ static void sub_80B3894(u8 taskId)
data[0]++;
break;
case 2:
gUnknown_02032298[0] = 0;
gUnknown_02032298[1] = 0;
gSelectedTradeMonPositions[0] = 0;
gSelectedTradeMonPositions[1] = 0;
m4aMPlayAllStop();
sub_800ADF8();
data[0]++;

1186
src/data/trade.h Normal file
View File

File diff suppressed because it is too large Load Diff

9
src/graphics.c
View File

@@ -1518,13 +1518,10 @@ asm(".space 0x20"); //blank palette??
// more trade stuff?
const u16 gUnknown_08DDB3E4[] = INCBIN_U16("graphics/trade/menu.gbapal");
const u16 gTradeMenu_Pal[] = INCBIN_U16("graphics/trade/menu.gbapal");
const u16 gUnknown_08DDB444[] = INCBIN_U16("graphics/unknown/unknown_DDB444.gbapal");
const u8 gUnknown_08DDB464[] = INCBIN_U8("graphics/trade/menu.4bpp");
const u8 gUnknown_08DDC6E4[] = INCBIN_U8("graphics/trade/buttons.4bpp");
const u8 gTradeMenu_Gfx[] = INCBIN_U8("graphics/trade/menu.4bpp");
const u8 gTradeButtons_Gfx[] = INCBIN_U8("graphics/trade/buttons.4bpp");
const u16 gUnused_DDCEE4[] = INCBIN_U16("graphics/unused/unused_DDCEE4.bin");

1480
src/trade.c
View File

File diff suppressed because it is too large Load Diff

4
src/union_room.c
View File

@@ -2347,8 +2347,8 @@ void sub_8013F90(u8 taskId)
{
memcpy(gUnknown_020321C0, gBlockRecvBuffer[GetMultiplayerId() ^ 1], sizeof(struct MailStruct) * PARTY_SIZE);
ResetBlockReceivedFlags();
gUnknown_02032298[0] = monId;
gUnknown_02032298[1] = 6;
gSelectedTradeMonPositions[0] = monId;
gSelectedTradeMonPositions[1] = PARTY_SIZE;
gMain.savedCallback = CB2_ReturnToField;
SetMainCallback2(sub_807AE50);
sub_801807C(&gUnknown_02022C40);