summaryrefslogtreecommitdiff
path: root/include/overworld.h
diff options
context:
space:
mode:
authorDizzyEggg <jajkodizzy@wp.pl>2017-10-23 13:36:55 +0200
committerDizzyEggg <jajkodizzy@wp.pl>2017-10-23 13:36:55 +0200
commit5b703079627cf11a123e3f1a7e7f0e5e0fbeb9ed (patch)
treecdd424af6aa370aa8af7dcf2bb0f5a2ce48965ad /include/overworld.h
parent7d1373e3fa239d74d69b5b3a7cb78b2272a6f54d (diff)
revert merge coz its bugged
Diffstat (limited to 'include/overworld.h')
-rw-r--r--include/overworld.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/overworld.h b/include/overworld.h
index 5ac4cad29..1869222b0 100644
--- a/include/overworld.h
+++ b/include/overworld.h
@@ -1,8 +1,6 @@
#ifndef GUARD_ROM4_H
#define GUARD_ROM4_H
-#include "main.h"
-
struct UnkPlayerStruct
{
u8 player_field_0;
@@ -23,7 +21,6 @@ struct UCoords32
};
extern struct LinkPlayerMapObject gLinkPlayerMapObjects[4];
-extern MainCallback gFieldCallback;
void IncrementGameStat(u8 index);
@@ -58,6 +55,5 @@ void sub_8086230(void);
void c2_exit_to_overworld_2_switch(void);
bool32 sub_8087598(void);
void c2_exit_to_overworld_1_continue_scripts_restart_music(void);
-void warp_in(void);
#endif //GUARD_ROM4_H