diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2018-12-02 14:05:35 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-02 14:05:35 -0600 |
| commit | 2912ec0e37360ede1bae882f0ea2457ec336f16f (patch) | |
| tree | 7a2b5d14e654e6f8171548692dc5f241de8cb748 /include/overworld.h | |
| parent | c123b8d6f1787abce2d1e3920d40192811b5fa39 (diff) | |
| parent | 9828e0e97b8403a7614f4bec127af9233ae923cb (diff) | |
Merge pull request #420 from DizzyEggg/bored
Get rid of static functions in includ and add req macro arguments
Diffstat (limited to 'include/overworld.h')
| -rw-r--r-- | include/overworld.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/include/overworld.h b/include/overworld.h index 6f7801905..60d9d5133 100644 --- a/include/overworld.h +++ b/include/overworld.h @@ -47,13 +47,8 @@ void Overworld_SetEventObjTemplateMovementType(u8 localId, u8 movementType); const struct MapLayout *GetMapLayout(void); void ApplyCurrentWarp(void); void set_warp2_warp3_to_neg_1(void); -static void SetWarpData(struct WarpData *warp, s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -static bool32 IsDummyWarp(struct WarpData *warp); struct MapHeader const *const Overworld_GetMapHeaderByGroupAndId(u16 mapGroup, u16 mapNum); struct MapHeader const *const GetDestinationWarpMapHeader(void); -static void LoadCurrentMapData(void); -static void LoadSaveblockMapHeader(void); -static void SetPlayerCoordsFromWarp(void); void WarpIntoMap(void); void Overworld_SetWarpDestination(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void warp1_set_2(s8 mapGroup, s8 mapNum, s8 warpId); @@ -67,7 +62,6 @@ void sub_8084D5C(s16 a1, s16 a2); void sub_8084DD4(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084E14(void); void SetFixedDiveWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); -static void SetFixedDiveWarpAsDestination(void); void SetFixedHoleWarp(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void SetFixedHoleWarpAsDestination(s16 x, s16 y); void warp1_set_to_sav1w(void); @@ -75,7 +69,6 @@ void sub_8084F2C(s8 mapGroup, s8 mapNum, s8 warpId, s8 x, s8 y); void sub_8084F6C(u8 a1); void sub_8084FAC(int unused); const struct MapConnection *GetMapConnection(u8 dir); -static bool8 SetDiveWarp(u8 dir, u16 x, u16 y); bool8 SetDiveWarpEmerge(u16 x, u16 y); bool8 SetDiveWarpDive(u16 x, u16 y); void mliX_load_map(u8 mapGroup, u8 mapNum); |