Merge branch 'master' into fldeff

This commit is contained in:
ultima-soul committed 2019-04-28 16:55:43 -07:00
commit e833d37423
523 files changed
+19874 -6922

No files matched your search

+6
View File
@@ -96,11 +96,17 @@ void sub_80563F0(void);
extern u8 gUnknown_2031DD8;
extern u8 gUnknown_2036E28;
extern void (*gUnknown_3005020)(void);
extern bool8 (* gFieldCallback2)(void);
void SetLastHealLocationWarp(u8 healLocaionId);
void sub_8055864(u8 mapGroup, u8 mapNum);
void CB2_NewGame(void);
bool8 Overworld_MapTypeAllowsTeleportAndFly(u8 mapType);
void Overworld_ResetStateAfterTeleport(void);
void Overworld_FadeOutMapMusic(void);
void sub_805671C(void);
bool8 sub_8055FC4(void);
#endif //GUARD_ROM4_H