Merge pull request #232 from notyourav/save_ld

strip fake linker symbols

6 files changed, 22 insertions, 13 deletions

diff --git a/include/entity.h b/include/entity.h
index 9afeafe1..4f163a72 100644
--- a/include/entity.h
+++ b/include/entity.h
@@ -155,9 +155,6 @@ typedef struct LinkedList {
 } LinkedList;
 
 extern LinkedList gEntityLists[9];
-extern LinkedList gUnk_03003D90;
-
-extern LinkedList gUnk_03003DA0;
 
 enum {
     ENT_DID_INIT = 0x1,
diff --git a/include/fileScreen.h b/include/fileScreen.h
index 78a36f90..86f4e8d0 100644
--- a/include/fileScreen.h
+++ b/include/fileScreen.h
@@ -78,7 +78,6 @@ extern const u8 gGlobalGfxAndPalettes[];
 extern void (*const gUnk_080FC93C[])();
 extern u32 gUsedPalettes;
 extern u8 gTextGfxBuffer[];
-extern u8 gUnk_02001B40;
 extern u8 gUnk_02022030;
 
 #endif
\ No newline at end of file
diff --git a/include/player.h b/include/player.h
index 76350008..be58a279 100644
--- a/include/player.h
+++ b/include/player.h
@@ -274,7 +274,6 @@ extern u8 gQuiverSizes[];
 extern u16 gWalletSizes[];
 
 extern PlayerState gPlayerState;
-extern Stats gStats;
 extern Entity gPlayerEntity;
 
 void SetPlayerControl(PlayerControlMode mode);
diff --git a/include/room.h b/include/room.h
index 08742d2d..59c6e094 100644
--- a/include/room.h
+++ b/include/room.h
@@ -72,7 +72,7 @@ typedef struct {
     s16 lightLevel;
     u8 filler3[2];
     u8 unk_10[4];
-    u32 roomFlags;
+    u32 flags;
     u32 unk3;
     u8 filler4[48];
     u8 filler5[28];
@@ -95,13 +95,29 @@ typedef struct {
     u32 spritePtr;
 } EntityData;
 
+typedef struct {
+    u16 field_0x0;
+    u16 field_0x2;
+    u8 field_0x4;
+    u8 field_0x5;
+    u8 field_0x6;
+    u8 field_0x7;
+} struct_030010EC;
+
+typedef struct {
+    u16 data[32];
+    u16 field_0xac;
+    u16 field_0xae;
+} struct_0300110C;
+
 // Status of the player's positioning within the scene.
 typedef struct {
     u8 area_next;
     u8 room_next;
     u8 start_anim;
     u8 spawn_type;
-    Coords start_pos;
+    s16 start_pos_x;
+    s16 start_pos_y;
     u8 layer;
     u8 field_0x15;
     u8 dungeon_area;
@@ -140,10 +156,8 @@ typedef struct {
     u16 field_0x46;
     u16 field_0x48;
     u16 field_0x4a;
-    u8 minecart_data[0x20];
-    u8 field_0x6c[0x40];
-    u16 field_0xac;
-    u16 field_0xae;
+    struct_030010EC minecart_data[4];
+    struct_0300110C armos_data;
 } ScreenTransition;
 extern ScreenTransition gScreenTransition;
 
diff --git a/include/save.h b/include/save.h
index 90e00e60..5df71806 100644
--- a/include/save.h
+++ b/include/save.h
@@ -43,7 +43,8 @@ typedef struct {
     /*0x0A8*/ Stats stats;
     /*0x0D0*/ u8 fillerD0[0x71];
     /*0x141*/ u8 unk141[128];
-    /*0x1C1*/ u8 unk1C1[667];
+    /*0x1C1*/ u8 unk1C1[155];
+    /*0x25C*/ u8 flags[0x200];
     /*0x45C*/ u8 unk45C[0x10];
     /*0x46C*/ u8 unk46C[0x20];
     /*0x48C*/ u32 unk48C[8];
diff --git a/include/screen.h b/include/screen.h
index e057442a..f308f19d 100644
--- a/include/screen.h
+++ b/include/screen.h
@@ -78,7 +78,6 @@ typedef struct {
     u16 _8;
 } OAMCommand;
 
-extern BgControls gBgControls;
 extern Screen gScreen;
 extern OAMCommand gOamCmd;