fixes for x86 build

.vscode/settings.json

@@ -336,7 +336,8 @@
     "execution": "cpp",
     "iomanip": "cpp",
     "packed.h": "c",
-    "endings.h": "c"
+    "endings.h": "c",
+    "team_play.h": "c"
   },
   "asm-code-lens.donated": true,
   "editor.formatOnSave": true,

Makefile

@@ -376,6 +376,8 @@ ifeq ($(PLATFORM),gba)
 	@echo "$(LD) -T $(LDSCRIPT) -Map $(MAP) <objects> <lib>"
 	@cd $(OBJ_DIR) && $(LD) -A CPU_ARCH -T $(LDSCRIPT) -Map "$(ROOT_DIR)/$(MAP)" $(OBJS_REL) "$(ROOT_DIR)/tools/agbcc/lib/libgcc.a" "$(ROOT_DIR)/tools/agbcc/lib/libc.a" -L$(ROOT_DIR)/libagbsyscall -lagbsyscall -o $(ROOT_DIR)/$@
 else
+	@echo "$(CC1) -Xlinker -Map "$(ROOT_DIR)/$(MAP)" -mwin32 -o <objects> <lib>"
+	@touch $(ROOT_DIR)/$(MAP)
 	@cd $(OBJ_DIR) && $(CC1) -mwin32 $(OBJS_REL) -L$(ROOT_DIR)/libagbsyscall -lagbsyscall -lkernel32 -o $(ROOT_DIR)/$@ -Xlinker -Map "$(ROOT_DIR)/$(MAP)"
 endif
 

include/core.h

@@ -274,7 +274,7 @@ extern u16 gUnknown_03001944;
 extern u8 gUnknown_03001948;
 extern u16 gUnknown_0300194C;
 
-struct MapHeader **gTilemapsRef; // TODO: make this an array and add size
+extern struct MapHeader **gTilemapsRef; // TODO: make this an array and add size
 extern u8 gUnknown_03002280[4][4];
 extern u8 gUnknown_03004D80[16]; // TODO: Is this 4 (# backgrounds), instead of 16?