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

Merge remote-tracking branch 'pret/master' into trade

Browse Source
This commit is contained in:
Diegoisawesome
2018-12-25 15:03:13 -06:00
parent dea41e1a7e a54aa03d20
commit d8948a5cda
517 changed files with 41317 additions and 67419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/trade.c
+3 -3
View File
@@ -425,7 +425,7 @@ void sub_80773D0(void)
gMain.state++;
break;
case 8:
sub_81B5D30();
LoadHeldItemIcons();
sub_81B5D4C(&gUnknown_0203229C->unk_36[0], gUnknown_0203229C->unk_28[0], 0);
gMain.state++;
break;
@@ -611,7 +611,7 @@ void sub_8077B74(void)
gMain.state++;
break;
case 8:
sub_81B5D30();
LoadHeldItemIcons();
sub_81B5D4C(&gUnknown_0203229C->unk_36[0], gUnknown_0203229C->unk_28[0], 0);
gMain.state++;
break;
@@ -3333,7 +3333,7 @@ bool32 sub_807A7BC(u16 a0, u8 a1)
return FALSE;
}
u32 sub_807A7E0(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6)
int sub_807A7E0(struct UnkLinkRfuStruct_02022B14Substruct a0, struct UnkLinkRfuStruct_02022B14Substruct a1, u16 a2, u16 a3, u8 a4, u16 a5, u8 a6)
{
u8 r9 = a0.unk_01_0;
u8 r2 = a0.unk_00_7;