Merge branch 'master' into link

2018-02-11 19:22:06 -05:00
parent f39053ee30 14a76793e5
commit ea347199a2
429 changed files with 56348 additions and 62508 deletions
@@ -7,5 +7,8 @@

 // Exported ROM declarations
 void c2_copyright_1(void);
+void CB2_InitCopyrightScreenAfterBootup(void);
+void CB2_InitCopyrightScreenAfterTitleScreen(void);
+void sub_816F2A8(u16, u16, u16, u16);

-#endif //GUARD_INTRO_H
+#endif // GUARD_INTRO_H