diff --git a/pokeemerald.sym b/pokeemerald.sym
index 350519a1bc..c098be3a80 100644
--- a/pokeemerald.sym
+++ b/pokeemerald.sym
@@ -48532,19 +48532,19 @@
 0856f008 l 00000010 sSearchMenu_WindowTemplate
 0856f018 l 00000174 sTrainerCardStickers_Gfx
 0856f18c l 00000020 sUnused_Pal
-0856f1ac l 00000060 sHoennTrainerCard1Star_Pal
-0856f20c l 00000060 sKantoTrainerCard1Star_Pal
-0856f26c l 00000060 sHoennTrainerCard2Star_Pal
-0856f2cc l 00000060 sKantoTrainerCard2Star_Pal
-0856f32c l 00000060 sHoennTrainerCard3Star_Pal
-0856f38c l 00000060 sKantoTrainerCard3Star_Pal
-0856f3ec l 00000060 sHoennTrainerCard4Star_Pal
-0856f44c l 00000060 sKantoTrainerCard4Star_Pal
+0856f1ac l 00000060 sHoennTrainerCardBronze_Pal
+0856f20c l 00000060 sKantoTrainerCardGreen_Pal
+0856f26c l 00000060 sHoennTrainerCardCopper_Pal
+0856f2cc l 00000060 sKantoTrainerCardBronze_Pal
+0856f32c l 00000060 sHoennTrainerCardSilver_Pal
+0856f38c l 00000060 sKantoTrainerCardSilver_Pal
+0856f3ec l 00000060 sHoennTrainerCardGold_Pal
+0856f44c l 00000060 sKantoTrainerCardGold_Pal
 0856f4ac l 00000020 sHoennTrainerCardFemaleBg_Pal
 0856f4cc l 00000020 sKantoTrainerCardFemaleBg_Pal
 0856f4ec l 00000020 sHoennTrainerCardBadges_Pal
 0856f50c l 00000020 sKantoTrainerCardBadges_Pal
-0856f52c l 00000020 sTrainerCardGold_Pal
+0856f52c l 00000020 sTrainerCardStar_Pal
 0856f54c l 00000020 sTrainerCardSticker1_Pal
 0856f56c l 00000020 sTrainerCardSticker2_Pal
 0856f58c l 00000020 sTrainerCardSticker3_Pal
@@ -48553,8 +48553,8 @@
 0856f814 l 000002a0 sKantoTrainerCardBadges_Gfx
 0856fab4 l 00000010 sTrainerCardBgTemplates
 0856fac4 l 00000020 sTrainerCardWindowTemplates
-0856fae4 l 00000014 sHoennTrainerCardStarPals
-0856faf8 l 00000014 sKantoTrainerCardStarPals
+0856fae4 l 00000014 sHoennTrainerCardPals
+0856faf8 l 00000014 sKantoTrainerCardPals
 0856fb0c l 00000003 sTrainerCardTextColors
 0856fb0f l 00000003 sTrainerCardStatColors
 0856fb12 l 00000006 sTimeColonInvisibleTextColors
@@ -48631,8 +48631,8 @@
 0857239c l 00000040 sPkmnData_Tilemap
 085723dc l 00000020 sInterface_Pal
 085723fc l 00000020 sPkmnDataGray_Pal
-0857241c l 00000020 sBg_Pal
-0857243c l 00000020 sBgMoveItems_Pal
+0857241c l 00000020 sScrollingBg_Pal
+0857243c l 00000020 sScrollingBgMoveItems_Pal
 0857245c l 00000048 sCloseBoxButton_Tilemap
 085724a4 l 00000018 sPartySlotFilled_Tilemap
 085724bc l 00000018 sPartySlotEmpty_Tilemap
@@ -52627,12 +52627,12 @@
 085b09c8 l 0000001a sIgnoredPowerfulMoveEffects
 085b09e4 l 00000010 sDefaultTraderNames
 085b09f4 l 00000004 sDefaultTraderDecorations
-085b0a00 g 00000040 gBirchBagGrassPal
+085b0a00 g 00000040 gBirchBagGrass_Pal
 085b0a40 l 00000020 sPokeballSelection_Pal
 085b0a60 l 00000020 sStarterCircle_Pal
 085b0a80 g 0000018c gBirchBagTilemap
 085b0c0c g 000001f8 gBirchGrassTilemap
-085b0e04 g 00000aa8 gBirchHelpGfx
+085b0e04 g 00000aa8 gBirchBagGrass_Gfx
 085b18ac g 00000320 gPokeballSelection_Gfx
 085b1bcc l 00000200 sStarterCircle_Gfx
 085b1dcc l 00000010 sWindowTemplates
@@ -73085,13 +73085,13 @@
 08dd15f8 g 00000400 gSlotMachineReelTimePikaAura
 08dd19f8 g 00000020 gSlotMachineReelBackground_Tilemap
 08dd1a18 g 00000040 gSlotMachineReelTimeNumberGap_Gfx
-08dd1a58 g 00000060 gHoennTrainerCard0Star_Pal
+08dd1a58 g 00000060 gHoennTrainerCardGreen_Pal
 08dd1ab8 g 000004c0 gHoennTrainerCard_Gfx
 08dd1f78 g 00000098 gHoennTrainerCardBg_Tilemap
 08dd2010 g 000001a0 gHoennTrainerCardFront_Tilemap
 08dd21b0 g 000000dc gHoennTrainerCardBack_Tilemap
 08dd228c g 00000180 gHoennTrainerCardFrontLink_Tilemap
-08dd240c g 00000060 gKantoTrainerCard0Star_Pal
+08dd240c g 00000060 gKantoTrainerCardBlue_Pal
 08dd246c g 00000674 gKantoTrainerCard_Gfx
 08dd2ae0 g 00000098 gKantoTrainerCardBg_Tilemap
 08dd2b78 g 000001b8 gKantoTrainerCardFront_Tilemap