diff --git a/pokeemerald.sym b/pokeemerald.sym
index 6c988b07d6..058a732b22 100644
--- a/pokeemerald.sym
+++ b/pokeemerald.sym
@@ -202,7 +202,7 @@
 020244ec g 00000258 gPlayerParty
 02024744 g 00000258 gEnemyParty
 0202499c g 00000018 gMultiuseSpriteTemplate
-020249b4 g 00000008 gUnknown_020249B4
+020249b4 l 00000008 sMonSpritesGfxManagers
 020249bc l 00000001 sUnknown
 020249c0 l 00000004 sRandCount
 020249c4 l 00000064 sHatchedEggLevelUpMoves
@@ -3746,7 +3746,7 @@
 080680a0 g 00000072 CreateMonWithIVsOTID
 08068114 g 00000088 CreateMonWithEVSpread
 0806819c g 0000019a CreateBattleTowerMon
-08068338 g 000001ee CreateBattleTowerMon2
+08068338 g 000001ee CreateBattleTowerMon_HandleLevel
 08068528 g 0000010c CreateApprenticeMon
 08068634 g 000000c6 CreateMonWithEVSpreadNatureOTID
 080686fc g 000001ac ConvertPokemonToBattleTowerPokemon
@@ -3791,7 +3791,7 @@
 0806ad9c g 0000066c SetBoxMonData
 0806b408 g 0000000a CopyMon
 0806b414 g 0000007c GiveMonToPlayer
-0806b490 g 000000aa SendMonToPC
+0806b490 l 000000aa SendMonToPC
 0806b53c g 00000044 CalculatePlayerPartyCount
 0806b580 g 00000044 CalculateEnemyPartyCount
 0806b5c4 g 00000074 GetMonsStateToDoubles
@@ -3879,8 +3879,8 @@
 0806ee0c g 0000008c PokemonSummaryDoMonAnimation
 0806ee98 g 0000001c StopPokemonAnimationDelayTask
 0806eeb4 g 00000054 BattleAnimateBackSprite
-0806ef08 g 0000007c sub_806EF08
-0806ef84 g 0000006c sub_806EF84
+0806ef08 l 0000007c GetOwnOpposingLinkMultiBattlerId
+0806ef84 g 0000006c GetOpposingLinkMultiBattlerId
 0806eff0 g 00000010 FacilityClassToPicIndex
 0806f000 g 0000001a PlayerGenderToFrontTrainerPicId
 0806f01c g 00000060 HandleSetPokedexFlag
@@ -3888,11 +3888,11 @@
 0806f0b0 g 00000024 GetTrainerNameFromId
 0806f0d4 g 00000030 HasTwoFramesAnimation
 0806f104 l 0000005a ShouldSkipFriendshipChange
-0806f160 l 0000009c sub_806F160
-0806f1fc l 000000b0 sub_806F1FC
-0806f2ac g 000001d0 sub_806F2AC
-0806f47c g 0000007a sub_806F47C
-0806f4f8 g 0000003c sub_806F4F8
+0806f160 l 0000009c InitMonSpritesGfx_Battle
+0806f1fc l 000000b0 InitMonSpritesGfx_FullParty
+0806f2ac g 000001d0 CreateMonSpritesGfxManager
+0806f47c g 0000007a DestroyMonSpritesGfxManager
+0806f4f8 g 0000003c MonSpritesGfxManager_GetSpritePtr
 0806f534 g 0000001c Sin
 0806f534 l 00000000 .gcc2_compiled.
 0806f550 g 00000020 Cos
@@ -40411,9 +40411,9 @@
 0831c7b4 l 000000e4 sLinkOpponentBufferCommands
 0831c898 g 000010a4 gBattleMoves
 0831d93c l 00000010 sCombinedMoves
-0831d94c g 00000336 gSpeciesToHoennPokedexNum
-0831dc82 g 00000336 gSpeciesToNationalPokedexNum
-0831dfb8 g 00000336 gHoennToNationalOrder
+0831d94c l 00000336 sSpeciesToHoennPokedexNum
+0831dc82 l 00000336 sSpeciesToNationalPokedexNum
+0831dfb8 l 00000336 sHoennToNationalOrder
 0831e2f0 g 00000090 gSpindaSpotGraphics
 0831e380 g 00000007 gItemEffect_Potion
 0831e387 g 00000006 gItemEffect_Antidote
@@ -40908,8 +40908,8 @@
 083299ec l 0000019b sMonFrontAnimIdsTable
 08329b87 l 0000019b sMonAnimationDelayTable
 08329d22 g 00000004 gPPUpGetMask
-08329d26 g 00000004 gPPUpSetMask
-08329d2a g 00000004 gPPUpAddMask
+08329d26 g 00000004 gPPUpClearMask
+08329d2a g 00000004 gPPUpAddValues
 08329d2e g 0000001a gStatStageRatios
 08329d48 l 0000000c sDeoxysBaseStats
 08329d54 g 00000020 gLinkPlayerFacilityClasses
@@ -40922,8 +40922,8 @@
 08329ece l 0000001b sFriendshipEventModifiers
 08329eea l 00000012 sHMMoves
 08329efc l 00000024 sAlteringCaveWildMonHeldItems
-08329f20 l 00000008 sOamData_8329F20
-08329f28 l 00000018 gUnknown_08329F28
+08329f20 l 00000008 sOamData_64x64
+08329f28 l 00000018 sSpriteTemplate_64x64
 08329f40 g 00000280 gSineTable
 0832a1c0 g 00000168 gSineDegreeTable
 0832a328 g 00000080 gBitTable