Sync Makefile and common syms (pret#676)

Author: GriffinRichards

pokefirered.sym

@@ -740,69 +740,69 @@
 0300283c l 00000004 monitor_stderr
 03002840 l 000000a0 openfiles
 030028e0 g 00000800 SoundMainRAM_Buffer
-030030e0 g 00000004 gKeyRepeatStartDelay
-030030e4 g 00000004 gLinkTransferringData
+030030e0 g 00000002 gKeyRepeatStartDelay
+030030e4 g 00000001 gLinkTransferringData
 030030f0 g 0000043c gMain
-0300352c g 00000004 gKeyRepeatContinueDelay
-03003530 g 00000004 gSoftResetDisabled
+0300352c g 00000002 gKeyRepeatContinueDelay
+03003530 g 00000001 gSoftResetDisabled
 03003540 g 00000038 gIntrTable
-03003578 g 00000004 sVcountAfterSound
-0300357c g 00000004 gLinkVSyncDisabled
+03003578 g 00000001 sVcountAfterSound
+0300357c g 00000001 gLinkVSyncDisabled
 03003580 g 00000800 IntrMain_Buffer
-03003d80 g 00000004 sVcountAtIntr
-03003d84 g 00000004 sVcountBeforeSound
-03003d88 g 00000004 gPcmDmaCounter
+03003d80 g 00000001 sVcountAtIntr
+03003d84 g 00000001 sVcountBeforeSound
+03003d88 g 00000001 gPcmDmaCounter
 03003d8c g 00000004 gWindowTileAutoAllocEnabled
 03003d90 g 00000004 gFonts
 03003da0 g 00000084 gGlyphInfo
-03003e30 g 00000004 gWindowClearTile
+03003e30 g 00000001 gWindowClearTile
 03003e40 g 00000010 gWindowBgTilemapBuffers
 03003e50 g 00000004 gTextFlags
 03003e54 g 00000004 gOamMatrixAllocBitmap
-03003e58 g 00000004 gReservedSpritePaletteCount
+03003e58 g 00000001 gReservedSpritePaletteCount
 03003e60 g 0000000c gLinkPartnersHeldKeys
 03003e6c g 00000004 gLinkDebugSeed
 03003e70 g 0000003c gLocalLinkPlayerBlock
-03003eac g 00000004 gLinkErrorOccurred
+03003eac g 00000001 gLinkErrorOccurred
 03003eb0 g 00000004 gLinkDebugFlags
 03003eb4 g 00000004 gLinkFiller1
 03003eb8 g 00000004 gRemoteLinkPlayersNotReceived
 03003ebc g 00000004 gBlockReceivedStatus
 03003ec0 g 00000004 gLinkFiller2
-03003ec4 g 00000004 gLinkHeldKeys
+03003ec4 g 00000002 gLinkHeldKeys
 03003ed0 g 00000050 gRecvCmds
 03003f20 g 00000004 gLinkStatus
-03003f24 g 00000004 gLinkDummy1
-03003f28 g 00000004 gLinkDummy2
+03003f24 g 00000001 gLinkDummy1
+03003f28 g 00000001 gLinkDummy2
 03003f2c g 00000004 gReadyToExitStandby
 03003f30 g 00000004 gReadyToCloseLink
-03003f34 g 00000004 gReadyCloseLinkType
-03003f38 g 00000004 gSuppressLinkErrorMessage
-03003f3c g 00000004 gWirelessCommType
-03003f40 g 00000004 gSavedLinkPlayerCount
+03003f34 g 00000002 gReadyCloseLinkType
+03003f38 g 00000001 gSuppressLinkErrorMessage
+03003f3c g 00000001 gWirelessCommType
+03003f40 g 00000001 gSavedLinkPlayerCount
 03003f50 g 00000010 gSendCmd
-03003f60 g 00000004 gSavedMultiplayerId
-03003f64 g 00000004 gReceivedRemoteLinkPlayers
+03003f60 g 00000001 gSavedMultiplayerId
+03003f64 g 00000001 gReceivedRemoteLinkPlayers
 03003f70 g 00000010 gLinkTestBGInfo
 03003f80 g 00000004 gLinkCallback
-03003f84 g 00000004 gShouldAdvanceLinkState
+03003f84 g 00000001 gShouldAdvanceLinkState
 03003f88 g 00000008 gLinkTestBlockChecksums
-03003f90 g 00000004 gBlockRequestType
+03003f90 g 00000001 gBlockRequestType
 03003f94 g 00000004 gLinkFiller3
 03003f98 g 00000004 gLinkFiller4
 03003f9c g 00000004 gLinkFiller5
-03003fa0 g 00000004 gLastSendQueueCount
+03003fa0 g 00000001 gLastSendQueueCount
 03003fb0 g 00000fc0 gLink
-03004f70 g 00000004 gLastRecvQueueCount
-03004f74 g 00000004 gLinkSavedIme
+03004f70 g 00000001 gLastRecvQueueCount
+03004f74 g 00000002 gLinkSavedIme
 03004f80 g 00000004 gPreBattleCallback1
 03004f84 g 00000004 gBattleMainFunc
 03004f90 g 00000044 gBattleResults
-03004fd4 g 00000004 gLeveledUpInBattle
+03004fd4 g 00000001 gLeveledUpInBattle
 03004fe0 g 00000010 gBattlerControllerFuncs
 03004ff0 g 00000004 gHealthboxSpriteIds
-03004ff4 g 00000004 gMultiUsePlayerCursor
-03004ff8 g 00000004 gNumberOfMovesToChoose
+03004ff4 g 00000001 gMultiUsePlayerCursor
+03004ff8 g 00000001 gNumberOfMovesToChoose
 03004ffc g 00000004 gBattleControllerData
 03005000 g 00000004 gRngValue
 03005004 g 00000004 gFlashMemoryPresent
@@ -814,65 +814,65 @@
 0300501c g 00000004 gBGTilemapBuffers3
 03005020 g 00000004 gFieldCallback
 03005024 g 00000004 gFieldCallback2
-03005028 g 00000004 gHeldKeyCodeToSend
-0300502c g 00000004 gLocalLinkPlayerId
-03005030 g 00000004 gFieldLinkPlayerCount
+03005028 g 00000002 gHeldKeyCodeToSend
+0300502c g 00000001 gLocalLinkPlayerId
+03005030 g 00000001 gFieldLinkPlayerCount
 03005040 g 0000000c VMap
 03005050 g 00000018 gFieldCamera
-03005068 g 00000004 gTotalCameraPixelOffsetY
-0300506c g 00000004 gTotalCameraPixelOffsetX
+03005068 g 00000002 gTotalCameraPixelOffsetY
+0300506c g 00000002 gTotalCameraPixelOffsetX
 03005070 g 00000004 sQuestLogScriptContextPtr
-03005074 g 00000004 gSelectedObjectEvent
+03005074 g 00000001 gSelectedObjectEvent
 03005078 g 00000004 gFieldInputRecord
-0300507c g 00000004 gLastQuestLogStoredFlagOrVarIdx
-03005080 g 00000004 gDisableMusic
+0300507c g 00000002 gLastQuestLogStoredFlagOrVarIdx
+03005080 g 00000001 gDisableMusic
 03005090 g 00000280 gTasks
 03005310 g 00000020 UnusedVarNeededToMatch
-03005330 g 00000004 gCanvasColumnStart
+03005330 g 00000001 gCanvasColumnStart
 03005334 g 00000004 gCanvasPixels
-03005338 g 00000004 gCanvasRowEnd
-0300533c g 00000004 gCanvasHeight
-03005340 g 00000004 gCanvasColumnEnd
-03005344 g 00000004 gCanvasRowStart
-03005348 g 00000004 gCanvasMonPersonality
-0300534c g 00000004 gCanvasWidth
+03005338 g 00000001 gCanvasRowEnd
+0300533c g 00000001 gCanvasHeight
+03005340 g 00000001 gCanvasColumnEnd
+03005344 g 00000001 gCanvasRowStart
+03005348 g 00000001 gCanvasMonPersonality
+0300534c g 00000001 gCanvasWidth
 03005350 g 00000004 gCanvasPalette
-03005354 g 00000004 gCanvasPaletteStart
+03005354 g 00000002 gCanvasPaletteStart
 03005360 g 00000018 sFieldSpecialsListMenuTemplate
-03005378 g 00000004 sFieldSpecialsListMenuScrollBuffer
+03005378 g 00000002 sFieldSpecialsListMenuScrollBuffer
 0300537c g 00000004 gCB2_AfterEvolution
-03005380 g 00000004 gLastWrittenSector
+03005380 g 00000002 gLastWrittenSector
 03005384 g 00000004 gLastSaveCounter
-03005388 g 00000004 gLastKnownGoodSector
+03005388 g 00000002 gLastKnownGoodSector
 0300538c g 00000004 gDamagedSaveSectors
 03005390 g 00000004 gSaveCounter
 03005394 g 00000004 gSaveDataBufferPtr
-03005398 g 00000004 gIncrementalSectorId
-0300539c g 00000004 gSaveUnusedVar
-030053a0 g 00000004 gSaveFileStatus
+03005398 g 00000002 gIncrementalSectorId
+0300539c g 00000002 gSaveUnusedVar
+030053a0 g 00000002 gSaveFileStatus
 030053a4 g 00000004 gGameContinueCallback
 030053b0 g 00000070 gRamSaveSectorLocations
-03005420 g 00000004 gSaveAttemptStatus
+03005420 g 00000002 gSaveAttemptStatus
 03005424 g 00000004 gMonShrinkDuration
-03005428 g 00000004 gMonShrinkDelta
-0300542c g 00000004 gMonShrinkDistance
+03005428 g 00000002 gMonShrinkDelta
+0300542c g 00000002 gMonShrinkDistance
 03005430 g 00000004 sIsInSaveFailedScreen
-03005440 g 00000010 gHostRfuGameData
+03005440 g 0000000e gHostRfuGameData
 03005450 g 000009ac gRfu
 03005e00 g 00000008 gHostRfuUsername
 03005e10 g 00000048 lman
 03005e60 g 00000004 gListMenuOverride
 03005e70 g 00000018 gMultiuseListMenuTemplate
-03005e88 g 00000004 gQuestLogPlaybackState
-03005e8c g 00000004 sMaxActionsInScene
+03005e88 g 00000001 gQuestLogPlaybackState
+03005e8c g 00000002 sMaxActionsInScene
 03005e90 g 00000004 gQuestLogFieldInput
 03005e94 g 00000004 sCurSceneActions
 03005e98 g 00000004 gItemUseCB
 03005e9c g 00000004 gHelpSystemState
-03005ea0 g 00000004 gHelpContextIdBackup
+03005ea0 g 00000002 gHelpContextIdBackup
 03005eb0 g 00000018 gFameChecker_ListMenuTemplate
-03005ec8 g 00000004 gIconDescriptionBoxIsOpen
-03005ecc g 00000004 gHelpSystemEnabled
+03005ec8 g 00000001 gIconDescriptionBoxIsOpen
+03005ecc g 00000001 gHelpSystemEnabled
 03005ed0 g 0000000c gEReaderData
 03005ee0 g 00000010 gPokedudeBattlerStates
 03005ef0 g 00000004 gMultibootStart
@@ -891,13 +891,13 @@
 03007380 g 00000040 gMPlayInfo_SE2
 030073c0 g 00000010 gMPlayMemAccArea
 030073d0 g 00000040 gMPlayInfo_SE3
-03007410 g 00000004 gFlashTimeoutFlag
+03007410 g 00000001 gFlashTimeoutFlag
 03007414 g 00000004 PollFlashStatus
 03007418 g 00000004 WaitForFlashWrite
 0300741c g 00000004 ProgramFlashSector
 03007420 g 00000004 gFlash
 03007424 g 00000004 ProgramFlashByte
-03007428 g 00000004 gFlashNumRemainingBytes
+03007428 g 00000002 gFlashNumRemainingBytes
 0300742c g 00000004 EraseFlashChip
 03007430 g 00000004 EraseFlashSector
 03007434 g 00000004 gFlashMaxTime