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
2019-03-17 17:20:40 -05:00
parent c3feb9871f 4ae8a52473
commit e9a3cc6d51
3041 changed files with 6917 additions and 6419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/field_screen_effect.c
+3 -17
View File
@@ -10,7 +10,6 @@
#include "field_screen_effect.h"
#include "field_special_scene.h"
#include "field_weather.h"
// #include "fldeff_flash.h"
#include "gpu_regs.h"
#include "link.h"
#include "link_rfu.h"
@@ -31,22 +30,9 @@
#include "constants/event_object_movement_constants.h"
#include "constants/songs.h"
#include "constants/rgb.h"
extern bool32 sub_81D6534(void);
extern bool8 walkrun_is_standing_still(void);
extern void ScriptUnfreezeEventObjects(void);
extern void sub_80FB768(void);
extern void sub_808D194(void);
extern void sub_808D1C8(void);
extern bool32 sub_808D1B4(void);
extern bool32 sub_808D1E8(void);
extern void sub_80B6B68(void);
extern void sub_80B6E4C(u8, u8);
extern void sub_80B75D8(u8);
extern void sub_80B7A74(u8);
extern void sub_808C0A8(u8);
extern u8 GetMapPairFadeToType(u8, u8);
extern u8 GetMapPairFadeFromType(u8, u8);
#include "trainer_hill.h"
#include "event_obj_lock.h"
#include "fldeff.h"
extern const u16 gUnknown_82EC7CC[];