Merge branch 'master' into document-gyms2

2019-10-16 04:22:34 -04:00
parent 20fa13616f 60a592a2c3
commit b4a9298205
361 changed files with 10599 additions and 11080 deletions
--- a/include/field_screen_effect.h
+++ b/include/field_screen_effect.h
@@ -33,7 +33,7 @@ void sub_80AF8B8(void);
 void sub_80AF948(void);
 void sub_80AF9F8(void);
 void sub_80AFC60(void);
-void sub_80B009C(u8 flashLevel);
+void AnimateFlash(u8 flashLevel);
 void WriteBattlePyramidViewScanlineEffectBuffer(void);
 void sub_80B0244(void);
 void sub_80B0268(void);