Merge branch 'master' into mauville_old_man

2018-05-07 18:18:00 -04:00
parent 61cc1d5574 f14d2765da
commit fd1d75ce37
99 changed files with 9526 additions and 12474 deletions
@@ -109,7 +109,7 @@ static void SetupGiddy(void)

 static void SetupTrader(void)
 {
-    sub_81339F8();
+    TraderSetup();
 }

 void SetMauvilleOldMan(void)