Merge pull request #1661 from GriffinRichards/fix-inconsistent-static

pokeemerald.sym

@@ -2,7 +2,7 @@
 02000000 l 00000000 EWRAM_START
 02000000 l 00000000 ewram
 0201c000 g 00004000 gDecompressionBuffer
-02020000 l 00000002 gTrainerId
+02020000 l 00000002 sTrainerId
 02020004 g 00000180 gWindows
 02020184 l 00000004 sWindowPtr
 02020188 l 00000002 sWindowSize
@@ -237,10 +237,10 @@
 02032304 l 00000002 sAmbientCrySpecies
 02032306 l 00000001 sIsAmbientCryWaterMon
 02032308 g 00000010 gLinkPlayerObjectEvents
-02032318 l 00005000 gBackupMapData
+02032318 l 00005000 sBackupMapData
 02037318 g 0000001c gMapHeader
 02037334 g 0000000c gCamera
-02037340 l 00000004 gMapConnectionFlags
+02037340 l 00000004 sMapConnectionFlags
 02037344 l 00000004 sFiller
 02037348 g 00000001 gUnusedBikeCameraAheadPanback
 0203734c l 00000001 sSpinStartFacingDir
@@ -277,7 +277,7 @@
 020375f6 g 00000002 gSpecialVar_MonBoxId
 020375f8 g 00000002 gSpecialVar_MonBoxPos
 020375fa g 00000002 gSpecialVar_Unused_0x8014
-020375fc l 00000010 gSpecialFlags
+020375fc l 00000010 sSpecialFlags
 0203760c l 00000001 sSafariBallsWindowId
 0203760d l 00000001 sBattlePyramidFloorWindowId
 0203760e l 00000001 sStartMenuCursorPos
@@ -291,7 +291,7 @@
 02037624 l 000000f0 sTilesetDMA3TransferBuffer
 02037714 g 00000400 gPlttBufferUnfaded
 02037b14 g 00000400 gPlttBufferFaded
-02037f14 g 000000c0 sPaletteStructs
+02037f14 l 000000c0 sPaletteStructs
 02037fd4 g 0000000c gPaletteFade
 02037fe0 l 00000004 sFiller
 02037fe4 l 00000004 sPlttBufferTransferPending
@@ -324,8 +324,8 @@
 02038444 l 00000004 sAnimTaskAffineAnim
 02038454 g 00000750 gWeather
 02038ba4 l 00000020 sFieldEffectPaletteGammaTypes
-02038bc4 l 00000001 gCurrentAbnormalWeather
-02038bc6 l 00000002 gUnusedWeatherRelated
+02038bc4 l 00000001 sCurrentAbnormalWeather
+02038bc6 l 00000002 sUnusedWeatherRelated
 02038bc8 l 00000002 sTrainerBattleMode
 02038bca g 00000002 gTrainerBattleOpponent_A
 02038bcc g 00000002 gTrainerBattleOpponent_B
@@ -381,7 +381,7 @@
 02039d84 l 00000004 sTilemapUtil
 02039d88 l 00000002 sNumTilemapUtilIds
 02039d8c l 00000004 sUnkUtil
-02039d90 l 00000040 gMovementScripts
+02039d90 l 00000040 sMovementScripts
 02039dd0 l 00000004 sCutGrassSpriteArrayPtr
 02039dd4 l 00000001 sPopupTaskId
 02039dd8 g 00000028 gBagPockets
@@ -401,7 +401,7 @@
 02039f30 g 00000001 gNumLinkContestPlayers
 02039f31 g 00000001 gHighestRibbonRank
 02039f34 g 00000004 gContestResources
-02039f38 g 00000001 sContestBgCopyFlags
+02039f38 l 00000001 sContestBgCopyFlags
 02039f3c g 00000020 gCurContestWinner
 02039f5c g 00000001 gCurContestWinnerIsForArtist
 02039f5d g 00000001 gCurContestWinnerSaveIdx
@@ -430,9 +430,9 @@
 0203a030 l 00000001 sTVShowState
 0203a031 l 00000003 sTVSecretBaseSecretsRandomValues
 0203a034 l 00000004 sContestResults
-0203a038 l 0000000c gRotatingGate_GateSpriteIds
-0203a044 l 00000004 gRotatingGate_PuzzleConfig
-0203a048 l 00000001 gRotatingGate_PuzzleCount
+0203a038 l 0000000c sRotatingGate_GateSpriteIds
+0203a044 l 00000004 sRotatingGate_PuzzleConfig
+0203a048 l 00000001 sRotatingGate_PuzzleCount
 0203a04c g 00000001 gNumSafariBalls
 0203a04e l 00000002 sSafariZoneStepCounter
 0203a050 l 00000001 sSafariZoneCaughtMons
@@ -440,7 +440,7 @@
 0203a054 l 000000a0 sPokeblockFeeders
 0203a0f4 l 00000004 sItemUseOnFieldCB
 0203a0f8 l 00000008 sFrenzyPlantRootData
-0203a100 l 0000000e gUnusedOverheatData
+0203a100 l 0000000e sUnusedOverheatData
 0203a110 l 00000004 sAnimStatsChangeData
 0203a114 l 00000002 sBgCnt
 0203a118 l 00000004 sEasyChatScreen
@@ -453,7 +453,7 @@
 0203a134 l 00000004 sMailRead
 0203a138 l 00000008 sYesNo
 0203a140 l 00000001 sMessageWindowId
-0203a144 l 00000004 gRegionMap
+0203a144 l 00000004 sRegionMap
 0203a148 l 00000004 sFlyMap
 0203a14c g 00000004 gCurDecorationItems
 0203a150 l 00000001 sDecorationActionsCursorPos
@@ -536,7 +536,7 @@
 0203ab90 l 00000004 sDexCryScreen
 0203ab94 l 00000004 sCryWaveformWindowTiledata
 0203ab98 l 00000004 sCryMeterNeedle
-0203ab9c g 00000001 sCoinsWindowId
+0203ab9c l 00000001 sCoinsWindowId
 0203aba0 l 00000004 sTransitionData
 0203aba4 l 00000004 sBattlerAbilities
 0203aba8 g 00000004 gBattleMsgDataPtr
@@ -875,7 +875,7 @@
 030012f8 l 00000002 sPlayerToMewDeltaX
 030012fa l 00000002 sPlayerToMewDeltaY
 030012fc l 00000004 sMewDirectionCandidates
-03001300 l 00000040 gDecodingBuffer
+03001300 l 00000040 sDecodingBuffer
 03001340 g 00000320 gMPlayTrack_BGM
 03001660 g 000000f0 gMPlayTrack_SE1
 03001750 g 000002d0 gMPlayTrack_SE2
@@ -32883,7 +32883,7 @@
 082a5c45 g 00000000 Roulette_Text_YouDontHaveACoinCase
 082a5c61 g 00000000 Roulette_Text_CoinCaseIsFull
 082a5c9c g 00000000 gBirchDexRatingText_AreYouCurious
-082a5ceb l 00000000 gBirchDexRatingText_Cancel
+082a5ceb g 00000000 gBirchDexRatingText_Cancel
 082a5d2c g 00000000 gBirchDexRatingText_SoYouveSeenAndCaught
 082a5d6c g 00000000 gBirchDexRatingText_LessThan10
 082a5dab g 00000000 gBirchDexRatingText_LessThan20
@@ -37650,7 +37650,7 @@
 082fb3f0 l 00000008 sResultsXCoords
 082fb3f8 l 0000000a sResultsYCoords
 082fb402 l 0000000a sRankingYCoords
-082fb40c g 00000050 sGfxFuncs
+082fb40c l 00000050 sGfxFuncs
 082fb464 l 00000190 sPokeJumpMons
 082fb5f4 l 00000024 sPokeJumpLeaderFuncs
 082fb618 l 00000024 sPokeJumpMemberFuncs
@@ -37766,7 +37766,7 @@
 082ff018 l 00000010 sBirchSpeechBgGradientPal
 082ff028 l 00000010 sBirchSpeechPlatformBlackPal
 082ff038 l 00000048 sWindowTemplates_MainMenu
-082ff080 l 00000020 gNewGameBirchSpeechTextWindows
+082ff080 l 00000020 sNewGameBirchSpeechTextWindows
 082ff0a0 l 00000020 sMainMenuBgPal
 082ff0c0 l 00000020 sMainMenuTextPal
 082ff0e0 l 00000003 sTextColor_Headers
@@ -37777,8 +37777,8 @@
 082ff104 l 00000010 sSpriteAffineAnim_PlayerShrink
 082ff114 l 00000004 sSpriteAffineAnimTable_PlayerShrink
 082ff118 l 00000010 sMenuActions_Gender
-082ff128 l 00000050 gMalePresetNames
-082ff178 l 00000050 gFemalePresetNames
+082ff128 l 00000050 sMalePresetNames
+082ff178 l 00000050 sFemalePresetNames
 082ff1c8 l 00000010 sTilesPerImage
 082ff1d8 g 00000020 gMinigameDigits_Pal
 082ff1f8 g 000000c0 gMinigameDigits_Gfx
@@ -38472,13 +38472,13 @@
 083054e0 g 00000174 gTrainerFrontPicCoords
 08305654 g 000002e8 gTrainerFrontPicTable
 0830593c g 000002e8 gTrainerFrontPicPaletteTable
-08305c24 l 00000018 gAnimCmd_Brendan_1
-08305c3c l 00000018 gAnimCmd_May_Steven_1
-08305c54 l 00000018 gAnimCmd_Wally_1
-08305c6c l 00000018 gAnimCmd_Red_1
-08305c84 l 00000018 gAnimCmd_Leaf_1
-08305c9c l 00000018 gAnimCmd_RubySapphireBrendan_1
-08305cb4 l 00000018 gAnimCmd_RubySapphireMay_1
+08305c24 l 00000018 sAnimCmd_Brendan_1
+08305c3c l 00000018 sAnimCmd_May_Steven_1
+08305c54 l 00000018 sAnimCmd_Wally_1
+08305c6c l 00000018 sAnimCmd_Red_1
+08305c84 l 00000018 sAnimCmd_Leaf_1
+08305c9c l 00000018 sAnimCmd_RubySapphireBrendan_1
+08305cb4 l 00000018 sAnimCmd_RubySapphireMay_1
 08305ccc l 00000008 sBackAnims_Brendan
 08305cd4 l 00000008 sBackAnims_May
 08305cdc l 00000008 sBackAnims_Red
@@ -40256,8 +40256,8 @@
 0831a9e8 l 00000018 sVsLetter_S_SpriteTemplate
 0831aa00 l 00000008 sVsLettersSpriteSheet
 0831aa08 g 00000010 gBattleBgTemplates
-0831aa18 l 000000c8 gStandardBattleWindowTemplates
-0831aae0 l 000000c0 gBattleArenaWindowTemplates
+0831aa18 l 000000c8 sStandardBattleWindowTemplates
+0831aae0 l 000000c0 sBattleArenaWindowTemplates
 0831aba0 g 00000008 gBattleWindowTemplates
 0831aba8 l 000000c8 sBattleTerrainTable
 0831ac70 l 0000000c sIntroScanlineParams16Bit
@@ -41065,8 +41065,8 @@
 0832dc7c l 00000018 sAnims_MenuText
 0832dc94 l 00000018 sSpriteTemplate_Cursor
 0832dcac l 00000018 sSpriteTemplate_MenuText
-0832dcc4 l 00000020 TradeScreenTextPalette
-0832dce4 l 00000008 gSpritePalette_TradeScreenText
+0832dcc4 l 00000020 sTradeScreenTextPalette
+0832dce4 l 00000008 sSpritePalette_TradeScreenText
 0832dcec l 00000138 sTradeNextSelectedMonTable
 0832de24 l 0000001a sTradeMonSpriteCoords
 0832de3e l 00000018 sTradeMonLevelCoords
@@ -41270,9 +41270,9 @@
 08339d64 g 00000048 gDirectionToVectors
 08339dac l 00000010 sOverworldBgTemplates
 08339dbc l 0000000c sFlashEffectParams
-08339dc8 l 0000000c gLinkPlayerMovementModes
-08339dd4 l 0000002c gLinkPlayerFacingHandlers
-08339e00 l 00000008 gMovementStatusHandler
+08339dc8 l 0000000c sLinkPlayerMovementModes
+08339dd4 l 0000002c sLinkPlayerFacingHandlers
+08339e00 l 00000008 sMovementStatusHandler
 08339e08 g 00000000 gTilesetTiles_Petalburg
 0833a704 g 00000000 gTilesetPalettes_Petalburg
 0833a904 g 00000000 gTilesetTiles_Rustboro
@@ -45081,7 +45081,7 @@
 0850d6a0 g 00000008 gSpritePalette_SmallSparkle
 0850d6a8 l 00000008 sAnim_RayquazaSpotlightEffect
 0850d6b0 l 00000004 sAnimTable_RayquazaSpotlightEffect
-0850d6b4 g 00000008 sPicTable_RayquazaSpotlightEffect
+0850d6b4 l 00000008 sPicTable_RayquazaSpotlightEffect
 0850d6bc g 00000018 gFieldEffectObjectTemplate_Rayquaza
 0850d6d4 l 00000008 sSpritePalette_Unused
 0850d6dc l 00000008 sMovementDelaysMedium
@@ -45670,8 +45670,8 @@
 08524804 g 00000060 gTilesetAnims_Unused2_Frame1
 08524864 g 0000000c gTilesetAnims_BattlePyramid_Torch
 08524870 g 0000000c gTilesetAnims_BattlePyramid_StatueShadow
-0852487c l 00000010 gTilesetAnims_BattleDomeFloorLightPals
-0852488c l 00000010 gDummyPaletteStructTemplate
+0852487c l 00000010 sTilesetAnims_BattleDomeFloorLightPals
+0852488c l 00000010 sDummyPaletteStructTemplate
 0852489c l 00000020 sRoundedDownGrayscaleMap
 085248bc l 00000048 sFanfares
 08524904 g 00000008 gOamData_AffineOff_ObjNormal_8x8
@@ -47358,7 +47358,7 @@
 0853ef18 l 00000018 sFlickeringShrinkOrbSpriteTemplate
 0853ef30 l 00000010 sFrozenIceCubeSubsprites
 0853ef40 l 00000008 sFrozenIceCubeSubspriteTable
-0853ef48 l 00000018 gFrozenIceCubeSpriteTemplate
+0853ef48 l 00000018 sFrozenIceCubeSpriteTemplate
 0853ef60 l 00000018 sFlashingCircleImpactSpriteTemplate
 0853ef78 l 000000e0 sUnusedUnknownPal
 0853f058 l 000007e4 sTitleScreenRayquazaGfx
@@ -47395,7 +47395,7 @@
 08540120 l 00000004 sPokemonLogoShineAnimTable
 08540124 l 00000018 sPokemonLogoShineSpriteTemplate
 0854013c l 00000010 sPokemonLogoShineSpriteSheet
-0854014c g 0000c000 sDroughtWeatherColors
+0854014c l 0000c000 sDroughtWeatherColors
 0854c14c g 00000004 gWeatherPtr
 0854c150 l 000000f0 sWeatherFuncs
 0854c240 g 00000010 gWeatherPalStateFuncs
@@ -47451,7 +47451,7 @@
 0854fd48 l 0000000c sAshSpriteAnimCmd0
 0854fd54 l 00000004 sAshSpriteAnimCmds
 0854fd58 l 00000018 sAshSpriteTemplate
-0854fd70 l 00000008 gFogDiagonalSpriteSheet
+0854fd70 l 00000008 sFogDiagonalSpriteSheet
 0854fd78 l 00000008 sFogDiagonalSpriteOamData
 0854fd80 l 00000008 sFogDiagonalSpriteAnimCmd0
 0854fd88 l 00000004 sFogDiagonalSpriteAnimCmds
@@ -47473,7 +47473,7 @@
 0854fe60 l 00000004 sWeatherCycleRoute123
 0854fe64 l 00000012 sFlashLevelToRadius
 0854fe78 g 00000004 gMaxFlashLevel
-0854fe7c g 0000000c sFlashEffectParams
+0854fe7c l 0000000c sFlashEffectParams
 0854fe88 l 00000008 sBattleTransitionTable_Wild
 0854fe90 l 00000008 sBattleTransitionTable_Trainer
 0854fe98 l 0000000c sBattleTransitionTable_BattleFrontier
@@ -47991,42 +47991,42 @@
 0855c2ac l 00000008 sSubspriteTable_PokecenterMonitor
 0855c2b4 l 00000010 sSubsprites_HofMonitorBig
 0855c2c4 l 00000008 sSubspriteTable_HofMonitorBig
-0855c2cc g 00000008 sAnim_Static
-0855c2d4 g 00000024 sAnim_Flicker
-0855c2f8 g 00000008 sAnims_Flicker
+0855c2cc l 00000008 sAnim_Static
+0855c2d4 l 00000024 sAnim_Flicker
+0855c2f8 l 00000008 sAnims_Flicker
 0855c300 l 00000004 sAnims_HofMonitor
 0855c304 l 00000018 sSpriteTemplate_PokeballGlow
 0855c31c l 00000018 sSpriteTemplate_PokecenterMonitor
 0855c334 l 00000018 sSpriteTemplate_HofMonitorBig
 0855c34c l 00000018 sSpriteTemplate_HofMonitorSmall
-0855c364 g 00000010 sPokecenterHealEffectFuncs
-0855c374 g 00000010 sHallOfFameRecordEffectFuncs
-0855c384 g 00000020 sPokeballGlowEffectFuncs
+0855c364 l 00000010 sPokecenterHealEffectFuncs
+0855c374 l 00000010 sHallOfFameRecordEffectFuncs
+0855c384 l 00000020 sPokeballGlowEffectFuncs
 0855c3a4 l 00000018 sPokeballCoordOffsets
 0855c3bc l 00000004 sPokeballGlowReds
 0855c3c0 l 00000004 sPokeballGlowGreens
 0855c3c4 l 00000004 sPokeballGlowBlues
-0855c3c8 g 0000001c sFallWarpFieldEffectFuncs
-0855c3e4 g 00000018 sEscalatorWarpOutFieldEffectFuncs
-0855c3fc g 0000001c sEscalatorWarpInFieldEffectFuncs
-0855c418 g 00000014 sWaterfallFieldEffectFuncs
-0855c42c g 0000000c sDiveFieldEffectFuncs
-0855c438 g 00000018 sLavaridgeGymB1FWarpEffectFuncs
-0855c450 g 00000010 sLavaridgeGymB1FWarpExitEffectFuncs
-0855c460 g 00000014 sLavaridgeGym1FWarpEffectFuncs
-0855c474 g 00000008 sEscapeRopeWarpOutEffectFuncs
-0855c484 g 00000008 sEscapeRopeWarpInEffectFuncs
+0855c3c8 l 0000001c sFallWarpFieldEffectFuncs
+0855c3e4 l 00000018 sEscalatorWarpOutFieldEffectFuncs
+0855c3fc l 0000001c sEscalatorWarpInFieldEffectFuncs
+0855c418 l 00000014 sWaterfallFieldEffectFuncs
+0855c42c l 0000000c sDiveFieldEffectFuncs
+0855c438 l 00000018 sLavaridgeGymB1FWarpEffectFuncs
+0855c450 l 00000010 sLavaridgeGymB1FWarpExitEffectFuncs
+0855c460 l 00000014 sLavaridgeGym1FWarpEffectFuncs
+0855c474 l 00000008 sEscapeRopeWarpOutEffectFuncs
+0855c484 l 00000008 sEscapeRopeWarpInEffectFuncs
 0855c48c l 00000010 sTeleportWarpOutFieldEffectFuncs
-0855c49c g 0000000c sTeleportWarpInFieldEffectFuncs
-0855c4a8 g 0000001c sFieldMoveShowMonOutdoorsEffectFuncs
-0855c4c4 g 0000001c sFieldMoveShowMonIndoorsEffectFuncs
-0855c4e0 g 00000014 sSurfFieldEffectFuncs
-0855c4f4 g 00000024 sFlyOutFieldEffectFuncs
+0855c49c l 0000000c sTeleportWarpInFieldEffectFuncs
+0855c4a8 l 0000001c sFieldMoveShowMonOutdoorsEffectFuncs
+0855c4c4 l 0000001c sFieldMoveShowMonIndoorsEffectFuncs
+0855c4e0 l 00000014 sSurfFieldEffectFuncs
+0855c4f4 l 00000024 sFlyOutFieldEffectFuncs
 0855c518 l 00000018 sAffineAnim_FlyBirdLeaveBall
 0855c530 l 00000018 sAffineAnim_FlyBirdReturnToBall
 0855c548 l 00000008 sAffineAnims_FlyBird
-0855c550 g 0000001c sFlyInFieldEffectFuncs
-0855c590 g 0000000c sDestroyDeoxysRockEffectFuncs
+0855c550 l 0000001c sFlyInFieldEffectFuncs
+0855c590 l 0000000c sDestroyDeoxysRockEffectFuncs
 0855c59c l 00000020 sImages_DeoxysRockFragment
 0855c5bc l 00000008 sAnim_RockFragment_TopLeft
 0855c5c4 l 00000008 sAnim_RockFragment_TopRight
@@ -48108,7 +48108,7 @@
 0855d2b8 l 00000006 sText_No000
 0855d2be l 00000040 sCaughtBall_Gfx
 0855d2fe l 0000000b sText_TenDashes
-0855d30c l 00000001 gExpandedPlaceholder_PokedexDescription
+0855d30c l 00000001 sExpandedPlaceholder_PokedexDescription
 0855d30d g 0000007c gDummyPokedexText
 0855d389 g 00000092 gBulbasaurPokedexText
 0855d41b g 0000008c gIvysaurPokedexText
@@ -48634,7 +48634,7 @@
 085726f4 l 00000020 sTextWindows_Pal
 08572714 l 00000020 sWindowTemplates
 08572734 l 00000010 sBgTemplates
-08572744 l 00000008 gWaveformSpritePalette
+08572744 l 00000008 sWaveformSpritePalette
 0857274c l 00000008 sSpriteSheet_Waveform
 08572754 l 00000018 sSpriteTemplate_DisplayMon
 0857276c l 000000f8 sMessages
@@ -48842,19 +48842,19 @@
 0857f384 l 000000c0 sMapPopUp_PaletteTable
 0857f444 l 00000020 sMapPopUp_Palette_Underwater
 0857f464 l 00000068 sRegionMapSectionId_To_PopUpThemeIdMapping
-0857f4cc l 00000010 gText_PyramidFloor1
-0857f4dc l 00000010 gText_PyramidFloor2
-0857f4ec l 00000010 gText_PyramidFloor3
-0857f4fc l 00000010 gText_PyramidFloor4
-0857f50c l 00000010 gText_PyramidFloor5
-0857f51c l 00000010 gText_PyramidFloor6
-0857f52c l 00000010 gText_PyramidFloor7
-0857f53c l 00000008 gText_Pyramid
-0857f544 l 00000020 gBattlePyramid_MapHeaderStrings
+0857f4cc l 00000010 sText_PyramidFloor1
+0857f4dc l 00000010 sText_PyramidFloor2
+0857f4ec l 00000010 sText_PyramidFloor3
+0857f4fc l 00000010 sText_PyramidFloor4
+0857f50c l 00000010 sText_PyramidFloor5
+0857f51c l 00000010 sText_PyramidFloor6
+0857f52c l 00000010 sText_PyramidFloor7
+0857f53c l 00000008 sText_Pyramid
+0857f544 l 00000020 sBattlePyramid_MapHeaderStrings
 0857f564 l 00000020 sRotatingBall_Pal
 0857f584 l 00000080 sRotatingBall_Gfx
-0857f604 l 00000480 gCherryUnused
-0857fa84 l 00000020 gCherryUnused_Pal
+0857f604 l 00000480 sCherryUnused
+0857fa84 l 00000020 sCherryUnused_Pal
 0857faa4 l 00000008 sBagOamData
 0857faac l 00000008 sSpriteAnim_Bag_Closed
 0857fab4 l 00000008 sSpriteAnim_Bag_Items
@@ -48885,18 +48885,18 @@
 0857fbd8 l 00000008 sAnim_BerryPic
 0857fbe0 l 00000004 sBerryPicSpriteAnimTable
 0857fbe4 l 00000008 sBerryPicSpriteImageTable
-0857fbec l 00000018 gBerryPicSpriteTemplate
+0857fbec l 00000018 sBerryPicSpriteTemplate
 0857fc04 l 00000038 sSpriteAffineAnim_BerryPicRotation1
 0857fc3c l 00000038 sSpriteAffineAnim_BerryPicRotation2
 0857fc74 l 00000008 sBerryPicRotatingAnimCmds
-0857fc7c l 00000018 gBerryPicRotatingSpriteTemplate
+0857fc7c l 00000018 sBerryPicRotatingSpriteTemplate
 0857fc94 l 00000158 sBerryPicTable
 0857fdec g 00000008 gBerryCheckCircleSpriteSheet
 0857fdf4 g 00000008 gBerryCheckCirclePaletteTable
 0857fdfc l 00000008 sBerryCheckCircleOamData
 0857fe04 l 00000008 sSpriteAnim_BerryCheckCircle
 0857fe0c l 00000004 sBerryCheckCircleSpriteAnimTable
-0857fe10 l 00000018 gBerryCheckCircleSpriteTemplate
+0857fe10 l 00000018 sBerryCheckCircleSpriteTemplate
 0857fe28 g 00000018 gHorizontalLungeSpriteTemplate
 0857fe40 g 00000018 gVerticalDipSpriteTemplate
 0857fe58 g 00000018 gSlideMonToOriginalPosSpriteTemplate
@@ -49235,12 +49235,12 @@
 08587bb8 l 00000008 sSpritePalette_ApplauseMeter
 08587bc0 l 00000008 sOam_ApplauseMeter
 08587bc8 l 00000018 sSpriteTemplate_ApplauseMeter
-08587be0 g 00000008 sOam_Judge
-08587be8 g 00000018 sSpriteTemplate_Judge
-08587c00 g 00000008 sSpriteSheet_Judge
+08587be0 l 00000008 sOam_Judge
+08587be8 l 00000018 sSpriteTemplate_Judge
+08587c00 l 00000008 sSpriteSheet_Judge
 08587c08 l 00000008 sSpriteSheet_JudgeSymbols
-08587c10 g 00000008 sSpritePalette_JudgeSymbols
-08587c18 g 00000018 sSpriteTemplate_JudgeSpeechBubble
+08587c10 l 00000008 sSpritePalette_JudgeSymbols
+08587c18 l 00000018 sSpriteTemplate_JudgeSpeechBubble
 08587c30 l 00000020 sText_Pal
 08587c50 g 000000c0 gContestEffectDescriptionPointers
 08587d10 l 00000038 sUnusedComboMoveNameTexts
@@ -49257,12 +49257,12 @@
 085898a4 g 00000060 gPostgameContestOpponentFilter
 08589904 l 00000020 sSpriteSheets_ContestantsTurnBlinkEffect
 08589924 l 00000020 sSpritePalettes_ContestantsTurnBlinkEffect
-08589944 g 00000008 sOam_ContestantsTurnBlinkEffect
-0858994c g 00000010 sAffineAnim_ContestantsTurnBlinkEffect_0
-0858995c g 00000028 sAffineAnim_ContestantsTurnBlinkEffect_1
-08589984 g 00000008 sAffineAnims_ContestantsTurnBlinkEffect
-0858998c g 00000060 sSpriteTemplates_ContestantsTurnBlinkEffect
-085899ec l 00000019 gContestExcitementTable
+08589944 l 00000008 sOam_ContestantsTurnBlinkEffect
+0858994c l 00000010 sAffineAnim_ContestantsTurnBlinkEffect_0
+0858995c l 00000028 sAffineAnim_ContestantsTurnBlinkEffect_1
+08589984 l 00000008 sAffineAnims_ContestantsTurnBlinkEffect
+0858998c l 00000060 sSpriteTemplates_ContestantsTurnBlinkEffect
+085899ec l 00000019 sContestExcitementTable
 08589a08 l 00000008 sShopPurchaseYesNoFuncs
 08589a10 l 00000018 sShopMenuActions_BuySellQuit
 08589a28 l 00000010 sShopMenuActions_BuyQuit
@@ -49607,7 +49607,7 @@
 0858d594 l 000000ac sTVSecretBaseSecretsTextGroup
 0858d640 l 0000002c sTVSafariFanClubTextGroup
 0858d66c l 00000024 sTVInSearchOfTrainersTextGroup
-0858d690 g 00000020 sTVSecretBaseSecretsActions
+0858d690 l 00000020 sTVSecretBaseSecretsActions
 0858d6b0 l 00000020 sResultsTextWindow_Pal
 0858d6d0 l 00000100 sResultsTextWindow_Gfx
 0858d7d0 l 00000020 sMiscBlank_Pal
@@ -49668,7 +49668,7 @@
 0858e86c l 00000010 sAnim_RecordMixLights
 0858e87c l 00000004 sAnimTable_RecordMixLights
 0858e880 l 00000018 sSpriteTemplate_RecordMixLights
-0858e898 l 00000013 gTruckCamera_HorizontalTable
+0858e898 l 00000013 sTruckCamera_HorizontalTable
 0858e8ab l 00000002 sSSTidalSailEastMovementScript
 0858e8ad l 00000002 sSSTidalSailWestMovementScript
 0858e8b0 l 00000040 sRotatingGate_FortreePuzzleConfig
@@ -53070,7 +53070,7 @@
 085b9198 l 00000008 Landmarks_OceanCurrent
 085b91a0 l 0000000c Landmarks_Route134_2
 085b91ac l 0000000c Landmarks_MtChimney_2
-085b91b8 l 00000178 gLandmarkLists
+085b91b8 l 00000178 sLandmarkLists
 085b9330 l 00000580 sBigPokeball_Tileset
 085b98b0 l 00000040 sPokeballTrail_Tileset
 085b98f0 l 00000200 sPokeball_Gfx
@@ -54330,9 +54330,9 @@
 085dd4c4 l 00000014 sPartnerTextsSwimmingTriathleteM
 085dd4d8 l 00000014 sPartnerTextsSwimmingTriathleteF
 085dd4ec l 00000014 sPartnerTextsSwimmerM
-085dd500 g 00000190 sPartnerTrainerTextTables
+085dd500 l 00000190 sPartnerTrainerTextTables
 085dd690 l 00000040 sPartnerApprenticeTextTables
-085dd6d0 g 0000003c sStevenMons
+085dd6d0 l 0000003c sStevenMons
 085dd70c g 00000018 gSlateportBattleTentTrainerMons_Jolie
 085dd724 g 00000018 gSlateportBattleTentTrainerMons_Malachi
 085dd73c g 00000018 gSlateportBattleTentTrainerMons_Kelsie
@@ -58183,8 +58183,8 @@
 0861fa08 l 00000010 sHelpBarWindowTemplate
 0861fa18 l 00000030 sHelpBarTexts
 0861fa48 l 00000003 sHelpBarTextColors
-0861fa4c l 00000008 gSpinningPokenavSpriteSheet
-0861fa54 l 00000010 gSpinningNavgearPalettes
+0861fa4c l 00000008 sSpinningPokenavSpriteSheet
+0861fa54 l 00000010 sSpinningNavgearPalettes
 0861fa64 l 00000008 sMenuLeftHeaderSpriteSheet
 0861fa6c l 00000030 sMenuLeftHeaderSpriteSheets
 0861fa9c l 00000038 sPokenavSubMenuLeftHeaderSpriteSheets
@@ -58612,7 +58612,7 @@
 08623100 l 00000010 sCityZoomTilesSpritePalette
 08623110 l 00000008 sMapSecInfoWindowTemplate
 08623118 l 000000b0 sPokenavCityMaps
-086231c8 g 00000008 sCityZoomTextSprite_OamData
+086231c8 l 00000008 sCityZoomTextSprite_OamData
 086231d0 l 00000018 sCityZoomTextSpriteTemplate
 086231e8 g 00000020 gConditionGraphData_Pal
 08623208 g 00000020 gConditionText_Pal
@@ -58756,7 +58756,7 @@
 08624f0c l 00000080 sBrendanTextScripts
 08624f8c l 00000010 sBrendanMatchCallHeader
 08624f9c l 00000040 sWallyTextScripts
-08624fdc g 00000010 sWallyLocationData
+08624fdc l 00000010 sWallyLocationData
 08624fec l 00000014 sWallyMatchCallHeader
 08625000 l 00000040 sScottTextScripts
 08625040 l 00000010 sScottMatchCallHeader
@@ -59132,7 +59132,7 @@
 0867566f l 00000000 sText_MysticTicketBagFull
 086756e3 g 00000000 MysteryGiftScript_AlteringCave
 086756fd l 00000000 MysteryGiftScript_AlteringCave_
-08675708 g 00000000 sText_MysteryGiftAlteringCave
+08675708 l 00000000 sText_MysteryGiftAlteringCave
 086757f4 g 00000000 MysteryGiftScript_OldSeaMap
 0867584f l 00000000 OldSeaMap_NoBagSpace
 08675858 l 00000000 OldSeaMap_Obtained
@@ -68195,7 +68195,7 @@
 089a3044 g 00000000 ph_nurse_solo
 089a3050 l 00000000 lib_rodata
 089a30c0 l 0000000d AgbLibFlashVersion
-089a30d0 g 0000000c sSetupInfos
+089a30d0 l 0000000c sSetupInfos
 089a3104 g 00000018 mxMaxTime
 089a311c g 00000030 MX29L010
 089a314c g 00000030 DefaultFlash