fixing conflicts

sym_ewram.txt

@@ -209,22 +209,10 @@ gUnknown_020322D5: @ 20322D5
 	.space 0x3
 
 	.include "src/overworld.o"
+	.include "src/fieldmap.o"
+	.include "src/field_camera.o"
 
-gUnknown_02032318: @ 2032318
-	.space 0x5000
-
-gMapHeader: @ 2037318
-	.space 0x1C
-
-gCamera: @ 2037334
-	.space 0xC
-
-gUnknown_02037340: @ 2037340
-	.space 0x8
-
-gUnusedBikeCameraAheadPanback: @ 2037348
-	.space 0x4
-
+	.align 2
 gUnknown_0203734C: @ 203734C
 	.space 0x4
 
@@ -308,7 +296,7 @@ gFieldEffectArguments: @ 2038C08
 
     .include "src/pokedex.o"
 
-gUnknown_02039B58: @ 2039B58
+gTrainerCards: @ 2039B58
 	.space 0x14
 
 gUnknown_02039B6C: @ 2039B6C
@@ -404,10 +392,7 @@ gUnknown_02039DD0: @ 2039DD0
 	.space 0x4
 
 	.include "src/map_name_popup.o"
-	.space 0x3
-
-gBagPockets: @ 2039DD8
-	.space 0x28
+	.include "src/item.o"
 
 gUnknown_02039E00: @ 2039E00
 	.space 0x100
@@ -539,16 +524,7 @@ gUnknown_0203A11C: @ 203A11C
 gUnknown_0203A120: @ 203A120
 	.space 0x4
 	.include "src/mon_markings.o"
-
-gUnknown_0203A128: @ 203A128
-	.space 0x4
-
-gUnknown_0203A12C: @ 203A12C
-	.space 0x4
-
-gUnknown_0203A130: @ 203A130
-	.space 0x4
-
+	.include "src/mauville_old_man.o"
     .include "src/mail.o"
 
 gUnknown_0203A138: @ 203A138
@@ -703,11 +679,7 @@ gUnknown_0203AB6F: @ 203AB6F
 gUnknown_0203AB70: @ 203AB70
 	.space 0x4
 
-gResultsWindowId: @ 203AB74
-	.space 0x4
-
-gUnknown_0203AB78: @ 203AB78
-	.space 0x4
+    .include "src/battle_records.o"
 
 gUnknown_0203AB7C: @ 203AB7C
 	.space 0x4