main sym_common

2017-12-17 13:31:05 -08:00
parent b849ce93db
commit a3ea99b297
2 changed files with 13 additions and 47 deletions
@@ -81,18 +81,18 @@ const IntrFunc gIntrTableTemplate[] =

 #define INTR_COUNT ((int)(sizeof(gIntrTableTemplate)/sizeof(IntrFunc)))

-extern u16 gKeyRepeatStartDelay;
-extern u8 gLinkTransferringData;
-extern struct Main gMain;
-extern u16 gKeyRepeatContinueDelay;
-extern u8 gSoftResetDisabled;
-extern IntrFunc gIntrTable[INTR_COUNT];
-extern bool8 gLinkVSyncDisabled;
-extern u32 IntrMain_Buffer[0x200];
-extern u8 gPcmDmaCounter;
-extern u8 gUnknown_3003578;
-extern u8 gUnknown_3003D80;
-extern u8 gUnknown_3003D84;
+u16 gKeyRepeatStartDelay;
+u8 gLinkTransferringData;
+struct Main gMain;
+u16 gKeyRepeatContinueDelay;
+u8 gSoftResetDisabled;
+IntrFunc gIntrTable[INTR_COUNT];
+bool8 gLinkVSyncDisabled;
+u32 IntrMain_Buffer[0x200];
+u8 gPcmDmaCounter;
+u8 gUnknown_3003578;
+u8 gUnknown_3003D80;
+u8 gUnknown_3003D84;

 static IntrFunc * const sTimerIntrFunc = gIntrTable + 0x7;

@@ -1,38 +1,4 @@
-gKeyRepeatStartDelay: @ 30030E0
-	.space 0x4
-
-gLinkTransferringData: @ 30030E4
-	.space 0xC
-
-gMain: @ 30030F0
-	.space 0x43C
-
-gKeyRepeatContinueDelay: @ 300352C
-	.space 0x4
-
-gSoftResetDisabled: @ 3003530
-	.space 0x10
-
-gIntrTable: @ 3003540
-	.space 0x38
-
-gUnknown_3003578: @ 3003578
-	.space 0x4
-
-gLinkVSyncDisabled: @ 300357C
-	.space 0x4
-
-IntrMain_Buffer: @ 3003580
-	.space 0x800
-
-gUnknown_3003D80: @ 3003D80
-	.space 0x4
-
-gUnknown_3003D84: @ 3003D84
-	.space 0x4
-
-gPcmDmaCounter: @ 3003D88
-	.space 0x4
+	.include "main.o"

 gUnknown_3003D8C: @ 3003D8C
 	.space 0x4