revert merge coz its bugged

2017-10-23 13:36:55 +02:00
parent 7d1373e3fa
commit 5b70307962
137 changed files with 15649 additions and 11131 deletions
@@ -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