fieldmap: Common and EWRAM syms

common_syms/fieldmap.txt

@@ -0,0 +1 @@
+VMap

include/fieldmap.h

@@ -11,10 +11,7 @@
 #define NUM_PALS_TOTAL 13
 #define VIRTUAL_MAP_SIZE 0x2800
 
-extern struct MapCoords {
-    int width;
-    int height;
-} gUnknown_03005DC0;
+extern struct BackupMapData VMap;
 
 u32 MapGridGetMetatileIdAt(int, int);
 u32 MapGridGetMetatileBehaviorAt(int, int);

src/fieldmap.c

@@ -31,6 +31,7 @@ bool8 sub_80596BC(s32 x, s32 src_width, s32 dest_width, s32 offset);
 struct BackupMapData VMap;
 EWRAM_DATA u16 gBackupMapData[VIRTUAL_MAP_SIZE] = {};
 EWRAM_DATA struct MapHeader gMapHeader = {};
+EWRAM_DATA struct Camera gCamera = {};
 EWRAM_DATA struct ConnectionFlags gMapConnectionFlags = {};
 
 const struct ConnectionFlags sDummyConnectionFlags = {};

sym_common.txt

@@ -160,9 +160,9 @@ gUnknown_300502C: @ 300502C
 gUnknown_3005030: @ 3005030
 	.space 0x10
 
-VMap: @ 3005040
-	.space 0x10
+	.include "fieldmap.o"
 
+	.align 4
 gUnknown_3005050: @ 3005050
 	.space 0x18
 

sym_ewram.txt

@@ -593,17 +593,7 @@ gUnknown_2031DEA: @ 2031DEA
 gUnknown_2031DEC: @ 2031DEC
 	.space 0x10
 
-gBackupMapData: @ 2031DFC
-	.space 0x5000
-
-gMapHeader: @ 2036DFC
-	.space 0x1C
-
-gCamera: @ 2036E18
-	.space 0xC
-
-gMapConnectionFlags: @ 2036E24
-	.space 0x4
+	.include "src/fieldmap.o"
 
 gUnknown_2036E28: @ 2036E28
 	.space 0x4