merge with master and fix conflicts

sym_ewram.txt

@@ -654,7 +654,7 @@ gUnknown_02032304: @ 2032304
 gUnknown_02032306: @ 2032306
 	.space 0x2
 
-gUnknown_02032308: @ 2032308
+gLinkPlayerMapObjects: @ 2032308
 	.space 0x10
 
 gUnknown_02032318: @ 2032318
@@ -663,7 +663,7 @@ gUnknown_02032318: @ 2032318
 gMapHeader: @ 2037318
 	.space 0x1C
 
-gUnknown_02037334: @ 2037334
+gCamera: @ 2037334
 	.space 0xC
 
 gUnknown_02037340: @ 2037340
@@ -678,7 +678,7 @@ gUnknown_0203734C: @ 203734C
 gMapObjects: @ 2037350
 	.space 0x240
 
-gUnknown_02037590: @ 2037590
+gPlayerAvatar: @ 2037590
 	.space 0x14
 
 gUnknown_020375A4: @ 20375A4
@@ -902,7 +902,7 @@ gUnknown_02038C00: @ 2038C00
 gUnknown_02038C04: @ 2038C04
 	.space 0x4
 
-gUnknown_02038C08: @ 2038C08
+gFieldEffectSpawnParams: @ 2038C08
 	.space 0x20
 
 gUnknown_02038C28: @ 2038C28
@@ -1762,20 +1762,8 @@ gUnknown_0203CCDC: @ 203CCDC
 gUnknown_0203CCE8: @ 203CCE8
 	.space 0x4
 
-gUnknown_0203CCEC: @ 203CCEC
-	.space 0x18
-
-gUnknown_0203CD04: @ 203CD04
-	.space 0x60
-
-gUnknown_0203CD64: @ 203CD64
-	.space 0x4
-
-gUnknown_0203CD68: @ 203CD68
-	.space 0x4
-
-gUnknown_0203CD6C: @ 203CD6C
-	.space 0x4
+    .include "src/battle_dome_cards.o"
+    .include "src/lilycove_lady.o"
 
 gUnknown_0203CD70: @ 203CD70
 	.space 0x4