Merge branch 'master' into mauville_old_man

This commit is contained in:
PikalaxALT
2018-05-07 18:18:00 -04:00
99 changed files with 9526 additions and 12474 deletions

View File

@@ -7,7 +7,7 @@
void sub_8133DA0(u8 taskId);
void sub_8133E1C(u8 taskId);
void sub_81339F8(void);
void TraderSetup(void);
void Trader_ResetFlag(void);
#endif //GUARD_TRADER_H