Merge branch 'master' into multiplayer-stuff
This commit is contained in:
@@ -91,7 +91,7 @@ void SetContinueGameWarpToDynamicWarp(int unused);
|
||||
const struct MapConnection *GetMapConnection(u8 dir);
|
||||
bool8 SetDiveWarpEmerge(u16 x, u16 y);
|
||||
bool8 SetDiveWarpDive(u16 x, u16 y);
|
||||
void mliX_load_map(u8 mapGroup, u8 mapNum);
|
||||
void LoadMapFromCameraTransition(u8 mapGroup, u8 mapNum);
|
||||
void ResetInitialPlayerAvatarState(void);
|
||||
void StoreInitialPlayerAvatarState(void);
|
||||
bool32 Overworld_IsBikingAllowed(void);
|
||||
|
||||
Reference in New Issue
Block a user