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

Merge remote-tracking branch 'upstream/master' into use_pokeblock

Browse Source 
# Conflicts:
#	include/menu_specialized.h
This commit is contained in:
Marcus Huderle
2019-03-23 10:14:31 -05:00
parent 91fa5faf4a e8add87bf3
commit a5ee2c14fd
24 changed files with 725 additions and 1742 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/use_pokeblock.c
View File

@@ -272,14 +272,14 @@ void sub_8166380(void)
gUnknown_0203BC90->field_50++;
break;
case 11:
sub_81D2754(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0]);
sub_81D2754(gUnknown_0203BCAC->field_7C58.unk0[0], gUnknown_0203BCAC->field_7C58.unk14[0]);
sub_81D20AC(&gUnknown_0203BCAC->field_7C58);
gUnknown_0203BC90->field_50++;
break;
case 12:
if (!sub_81D20BC(&gUnknown_0203BCAC->field_7C58))
{
sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14, gUnknown_0203BCAC->field_7C58.unk14);
sub_81D1F84(&gUnknown_0203BCAC->field_7C58, gUnknown_0203BCAC->field_7C58.unk14[0], gUnknown_0203BCAC->field_7C58.unk14[0]);
gUnknown_0203BC90->field_50++;
}
break;