begin using common symbols

1 files changed, 9 insertions, 263 deletions

diff --git a/sym_common.txt b/sym_common.txt
index bca9f958b..9c16648e2 100644
--- a/sym_common.txt
+++ b/sym_common.txt
@@ -1,213 +1,10 @@
-gKeyRepeatStartDelay: @ 3001760
-	.space 0x4
-
-gUnknown_3001764: @ 3001764
-	.space 0xC
-
-gMain: @ 3001770
-	.space 0x3C
-
-gUnknown_030017AC: @ 30017AC
-	.space 0x400
-
-gUnknown_03001BAC: @ 3001BAC
-	.space 0x4
-
-gKeyRepeatContinueDelay: @ 3001BB0
-	.space 0x4
-
-gUnknown_3001BB4: @ 3001BB4
-	.space 0xC
-
-gIntrTable: @ 3001BC0
-	.space 0x38
-
-gLinkVSyncDisabled: @ 3001BF8
-	.space 0x8
-
-IntrMain_Buffer: @ 3001C00
-	.space 0x800
-
-gPcmDmaCounter: @ 3002400
-	.space 0x10
-
-gSpriteOrder: @ 3002410
-	.space 0x40
-
-gSpriteTileAllocBitmap: @ 3002450
-	.space 0x80
-
-gSpriteCoordOffsetX: @ 30024D0
-	.space 0x4
-
-gOamLimit: @ 30024D4
-	.space 0x4
-
-gReservedSpriteTileCount: @ 30024D8
-	.space 0x4
-
-gSpriteCopyRequestCount: @ 30024DC
-	.space 0x4
-
-gSpriteCopyRequests: @ 30024E0
-	.space 0x300
-
-gSpriteCoordOffsetY: @ 30027E0
-	.space 0x10
-
-gOamMatrices: @ 30027F0
-	.space 0x100
-
-gShouldProcessSpriteCopyRequests: @ 30028F0
-	.space 0x4
-
-gOamMatrixAllocBitmap: @ 30028F4
-	.space 0x4
-
-gReservedSpritePaletteCount: @ 30028F8
-	.space 0x8
-
-gUnknownStringVar: @ 3002900
-	.space 0x10
-
-word_3002910: @ 3002910
-	.space 0x8
-
-gLinkDebugValue1: @ 3002918
-	.space 0x8
-
-localLinkPlayerBlock: @ 3002920
-	.space 0x3C
-
-gLinkErrorOccurred: @ 300295C
-	.space 0x4
-
-gFiller_3002960: @ 3002960
-	.space 0x4
-
-gLinkDebugValue2: @ 3002964
-	.space 0x4
-
-gFiller_3002968: @ 3002968
-	.space 0x4
-
-gLinkPlayerPending: @ 300296C
-	.space 0x4
-
-gLinkPlayers: @ 3002970
-	.space 0x4
-
-gUnknown_03002974: @ 3002974
-	.space 0x4
-
-gUnknown_03002978: @ 3002978
-	.space 0x68
-
-gBlockReceived: @ 30029E0
-	.space 0x4
-
-gFiller_30029E4: @ 30029E4
-	.space 0x4
-
-gLinkHeldKeys: @ 30029E8
-	.space 0x4
-
-gLinkTimeOutCounter: @ 30029EC
-	.space 0x4
-
-gFiller_30029F0: @ 30029F0
-	.space 0x10
-
-localLinkPlayer: @ 3002A00
-	.space 0x20
-
-gRecvCmds: @ 3002A20
-	.space 0x40
-
-gLinkStatus: @ 3002A60
-	.space 0x4
-
-gLinkDummyBool: @ 3002A64
-	.space 0x4
-
-byte_3002A68: @ 3002A68
-	.space 0x8
-
-gBlockSendBuffer: @ 3002A70
-	.space 0x100
-
-u8_array_3002B70: @ 3002B70
-	.space 0x4
-
-gLinkType: @ 3002B74
-	.space 0x4
-
-u8_array_3002B78: @ 3002B78
-	.space 0x8
-
-gBlockRecvBuffer: @ 3002B80
-	.space 0x4
-
-gUnknown_03002B84: @ 3002B84
-	.space 0x3FC
-
-gSuppressLinkErrorMessage: @ 3002F80
-	.space 0x4
-
-gSavedLinkPlayerCount: @ 3002F84
-	.space 0xC
-
-gSendCmd: @ 3002F90
-	.space 0x10
-
-gSavedMultiplayerId: @ 3002FA0
-	.space 0x4
-
-gReceivedRemoteLinkPlayers: @ 3002FA4
-	.space 0xC
-
-gLinkTestBGInfo: @ 3002FB0
-	.space 0x10
-
-gLinkCallback: @ 3002FC0
-	.space 0x10
-
-gSavedLinkPlayers: @ 3002FD0
-	.space 0x70
-
-gShouldAdvanceLinkState: @ 3003040
-	.space 0x8
-
-gLinkTestBlockChecksums: @ 3003048
-	.space 0x8
-
-gFiller_3003050: @ 3003050
-	.space 0x4
-
-gBlockRequestType: @ 3003054
-	.space 0x4
-
-gFiller_3003058: @ 3003058
-	.space 0x4
-
-gFiller_300305C: @ 300305C
-	.space 0x4
-
-gLastSendQueueCount: @ 3003060
-	.space 0x10
-
-gLink: @ 3003070
-	.space 0xFC0
-
-gLastRecvQueueCount: @ 3004030
-	.space 0x4
-
-gLinkSavedIme: @ 3004034
-	.space 0x4
-
-gLocalTime: @ 3004038
-	.space 0x8
+	.include "main.o"
+	.include "sprite.o"
+	.include "string_util.o"
+	.include "link.o"
+	.include "rtc.o"
 
+	.align 4
 gUnknown_03004040: @ 3004040
 	.space 0x170
 
@@ -619,30 +416,9 @@ gUnknown_03005F94: @ 3005F94
 gUnknown_03005FA0: @ 3005FA0
 	.space 0x30
 
-gSoundInfo: @ 3005FD0
-	.space 0x350
-
-gUnknown_03006320: @ 3006320
-	.space 0xC60
-
-gPokemonCrySongs: @ 3006F80
-	.space 0x70
-
-gPokemonCryMusicPlayers: @ 3006FF0
-	.space 0x80
-
-gMPlayJumpTable: @ 3007070
-	.space 0x90
-
-gCgbChans: @ 3007100
-	.space 0x100
-
-gPokemonCryTracks: @ 3007200
-	.space 0x140
-
-gPokemonCrySong: @ 3007340
-	.space 0x40
+	.include "m4a_2.o"
 
+	.align 4
 gUnknown_03007380: @ 3007380
 	.space 0x40
 
@@ -658,34 +434,4 @@ gMPlayMemAccArea: @ 3007440
 gUnknown_03007450: @ 3007450
 	.space 0x40
 
-gFlashTimeoutFlag: @ 3007490
-	.space 0x4
-
-PollFlashStatus: @ 3007494
-	.space 0x4
-
-WaitForFlashWrite: @ 3007498
-	.space 0x4
-
-ProgramFlashSector: @ 300749C
-	.space 0x4
-
-gFlash: @ 30074A0
-	.space 0x4
-
-ProgramFlashByte: @ 30074A4
-	.space 0x4
-
-gFlashNumRemainingBytes: @ 30074A8
-	.space 0x4
-
-EraseFlashChip: @ 30074AC
-	.space 0x4
-
-EraseFlashSector: @ 30074B0
-	.space 0x4
-
-gFlashMaxTime: @ 30074B4
-	.space 0xB44
-
-gUnknown_03007FF8: @ 3007FF8
+	.include "agb_flash.o"