dionmoustos/PokemonEmeraldSafariFrontier
1
0 Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into move-tutor

Browse Source 
# Conflicts:
#	include/pokenav.h
#	src/battle_script_commands.c
This commit is contained in:
Marcus Huderle committed 2019-03-17 17:20:40 -05:00
2 parents c3feb9871f 4ae8a52473
commit e9a3cc6d51
3041 files changed
+6917 -6419
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/field_screen_effect.h
+1
View File
@@ -41,5 +41,6 @@ void sub_80B0534(void);
void sub_80B058C(void);
void sub_80B05B4(void);
void WriteFlashScanlineEffectBuffer(u8 flashLevel);
bool8 walkrun_is_standing_still(void);
#endif // GUARD_FIELD_SCREEN_EFFECT_H