Merge branch 'master' into mauville_old_man

This commit is contained in:
PikalaxALT committed 2018-05-07 18:18:00 -04:00
commit fd1d75ce37
99 files changed
+9526 -12474

No files matched your search

+1 -1
View File
@@ -109,7 +109,7 @@ static void SetupGiddy(void)
static void SetupTrader(void)
{
sub_81339F8();
TraderSetup();
}
void SetMauvilleOldMan(void)