Merge pull request #1599 from GriffinRichards/fix-tilemaps

pokeemerald.sym

@@ -48851,8 +48851,8 @@
 0857f52c l 00000010 gText_PyramidFloor7
 0857f53c l 00000008 gText_Pyramid
 0857f544 l 00000020 gBattlePyramid_MapHeaderStrings
-0857f564 l 00000020 gRotatingBall_Pal
-0857f584 l 00000080 gRotatingBall
+0857f564 l 00000020 sRotatingBall_Pal
+0857f584 l 00000080 sRotatingBall_Gfx
 0857f604 l 00000480 gCherryUnused
 0857fa84 l 00000020 gCherryUnused_Pal
 0857faa4 l 00000008 sBagOamData
@@ -58086,8 +58086,8 @@
 0861ccec l 00000028 sPageSkillsTemplate
 0861cd14 l 00000018 sPageMovesTemplate
 0861cd2c l 00000027 sTextColors
-0861cd53 l 00000080 sSummaryAButtonBitmap
-0861cdd3 l 00000080 sSummaryBButtonBitmap
+0861cd53 l 00000080 sAButton_Gfx
+0861cdd3 l 00000080 sBButton_Gfx
 0861ce54 l 00000010 sTextPrinterFunctions
 0861ce64 l 00000010 sTextPrinterTasks
 0861ce74 l 00000007 sMemoNatureTextColor
@@ -58150,7 +58150,7 @@
 0861d0f8 l 00000008 sStatusIconsSpriteSheet
 0861d100 l 00000008 sStatusIconsSpritePalette
 0861d108 l 00000018 sSpriteTemplate_StatusCondition
-0861d120 l 00000020 sSummaryMarkingsPalette
+0861d120 l 00000020 sMarkings_Pal
 0861d140 l 00000060 sPokedexAreaMap_Pal
 0861d1a0 l 00000d54 sPokedexAreaMap_Gfx
 0861def4 l 00000314 sPokedexAreaMap_Tilemap
@@ -68648,30 +68648,30 @@
 08c0161c g 00000028 gUnusedPal_OldCharmap
 08c01644 g 000000e0 gSmokescreenImpactTiles
 08c01724 g 00000018 gSmokescreenImpactPalette
-08c0173c g 000000bc gInterfaceGfx_PokeBall
-08c017f8 g 00000020 gInterfacePal_PokeBall
-08c01818 g 000000bc gInterfaceGfx_GreatBall
-08c018d4 g 00000024 gInterfacePal_GreatBall
-08c018f8 g 000000c4 gInterfaceGfx_SafariBall
-08c019bc g 00000024 gInterfacePal_SafariBall
-08c019e0 g 000000b4 gInterfaceGfx_UltraBall
-08c01a94 g 00000020 gInterfacePal_UltraBall
-08c01ab4 g 000000c0 gInterfaceGfx_MasterBall
-08c01b74 g 00000024 gInterfacePal_MasterBall
-08c01b98 g 000000c0 gInterfaceGfx_NetBall
-08c01c58 g 00000020 gInterfacePal_NetBall
-08c01c78 g 00000114 gInterfaceGfx_DiveBall
-08c01d8c g 00000028 gInterfacePal_DiveBall
-08c01db4 g 000000c4 gInterfaceGfx_NestBall
-08c01e78 g 00000024 gInterfacePal_NestBall
-08c01e9c g 000000c0 gInterfaceGfx_RepeatBall
-08c01f5c g 00000024 gInterfacePal_RepeatBall
-08c01f80 g 000000f8 gInterfaceGfx_TimerBall
-08c02078 g 00000024 gInterfacePal_TimerBall
-08c0209c g 0000012c gInterfaceGfx_LuxuryBall
-08c021c8 g 00000028 gInterfacePal_LuxuryBall
-08c021f0 g 000000f0 gInterfaceGfx_PremierBall
-08c022e0 g 00000020 gInterfacePal_PremierBall
+08c0173c g 000000bc gBallGfx_Poke
+08c017f8 g 00000020 gBallPal_Poke
+08c01818 g 000000bc gBallGfx_Great
+08c018d4 g 00000024 gBallPal_Great
+08c018f8 g 000000c4 gBallGfx_Safari
+08c019bc g 00000024 gBallPal_Safari
+08c019e0 g 000000b4 gBallGfx_Ultra
+08c01a94 g 00000020 gBallPal_Ultra
+08c01ab4 g 000000c0 gBallGfx_Master
+08c01b74 g 00000024 gBallPal_Master
+08c01b98 g 000000c0 gBallGfx_Net
+08c01c58 g 00000020 gBallPal_Net
+08c01c78 g 00000114 gBallGfx_Dive
+08c01d8c g 00000028 gBallPal_Dive
+08c01db4 g 000000c4 gBallGfx_Nest
+08c01e78 g 00000024 gBallPal_Nest
+08c01e9c g 000000c0 gBallGfx_Repeat
+08c01f5c g 00000024 gBallPal_Repeat
+08c01f80 g 000000f8 gBallGfx_Timer
+08c02078 g 00000024 gBallPal_Timer
+08c0209c g 0000012c gBallGfx_Luxury
+08c021c8 g 00000028 gBallPal_Luxury
+08c021f0 g 000000f0 gBallGfx_Premier
+08c022e0 g 00000020 gBallPal_Premier
 08c02300 g 0000007c gOpenPokeballGfx
 08c0237c g 000000fc gBlankGfxCompressed
 08c02478 g 000000c0 gBattleAnimSpriteGfx_Bubble
@@ -68761,7 +68761,7 @@
 08c07b88 g 000002fc gBattleAnimSpriteGfx_ClawSlash
 08c07e84 g 0000020c gBattleAnimSpriteGfx_Scratch3
 08c08090 g 000001a0 gBattleAnimSpriteGfx_Scratch2
-08c08230 g 00000094 gPartyMenuHpBar_Gfx
+08c08230 g 00000094 gUnusedHpBar_Gfx
 08c082c4 g 000002d0 gBattleAnimSpriteGfx_BubbleBurst2
 08c08594 g 00000028 gBattleAnimSpritePal_BubbleBurst2
 08c085bc g 00000400 gBattleAnimSpriteGfx_IceChunk
@@ -71957,9 +71957,9 @@
 08d824e4 g 00000124 gBattleTerrainAnimTilemap_Building
 08d82608 g 00000668 gBattleTerrainAnimTiles_Rayquaza
 08d82c70 g 000002a0 gBattleTerrainAnimTilemap_Rayquaza
-08d82f10 g 000005ec gDomeTourneyBg_Gfx
+08d82f10 g 000005ec gDomeTourneyTree_Gfx
 08d834fc g 00000404 gDomeTourneyLine_Gfx
-08d83900 g 0000022c gDomeTourneyLineMask_Tilemap
+08d83900 g 0000022c gDomeTourneyTree_Tilemap
 08d83b2c g 00000110 gDomeTourneyLineDown_Tilemap
 08d83c3c g 00000114 gDomeTourneyLineUp_Tilemap
 08d83d50 g 00000c20 gDomeTourneyInfoCard_Gfx
@@ -72122,7 +72122,7 @@
 08d987fc g 00000190 gSummaryPage_Skills_Tilemap
 08d9898c g 0000019c gSummaryPage_BattleMoves_Tilemap
 08d98b28 g 000001a0 gSummaryPage_ContestMoves_Tilemap
-08d98cc8 g 000001bc gSummaryPage_InfoCopy_Tilemap
+08d98cc8 g 000001bc gSummaryPage_InfoEgg_Tilemap
 08d98e84 g 00000b7c gBagMaleTiles
 08d99a00 g 00000b60 gBagFemaleTiles
 08d9a560 g 00000028 gBagPalette
@@ -72134,12 +72134,12 @@
 08d9add0 g 00000034 gBattlePyramidBag_Pal
 08d9ae04 g 00000140 gBattlePyramidBagTilemap
 08d9af44 g 00000028 gBattlePyramidBagInterface_Pal
-08d9af6c g 00000040 gBagSwapLineGfx
-08d9afac g 00000010 gBagSwapLinePal
-08d9afbc g 0000010c gBuyMenuFrame_Gfx
-08d9b0c8 g 00000028 gMenuMoneyPal
-08d9b0f0 g 00000140 gBuyMenuFrame_Tilemap
-08d9b230 g 00000084 gMenuMoneyGfx
+08d9af6c g 00000040 gSwapLineGfx
+08d9afac g 00000010 gSwapLinePal
+08d9afbc g 0000010c gShopMenu_Gfx
+08d9b0c8 g 00000028 gShopMenu_Pal
+08d9b0f0 g 00000140 gShopMenu_Tilemap
+08d9b230 g 00000084 gShopMenuMoney_Gfx
 08d9b2b4 g 000001bc gMenuPokeblock_Gfx
 08d9b470 g 00000070 gMenuPokeblock_Pal
 08d9b4e0 g 000002c0 gMenuPokeblockDevice_Gfx
@@ -72943,9 +72943,9 @@
 08dc3304 g 0000056c gPokedexSearchMenu_Gfx
 08dc3870 g 0000019c gPokedexSearchMenuNational_Tilemap
 08dc3a0c g 00000188 gPokedexSearchMenuHoenn_Tilemap
-08dc3b94 g 000000a0 gSummaryScreenPowAcc_Tilemap
-08dc3c34 g 000000a0 gSummaryScreenAppealJam_Tilemap
-08dc3cd4 g 00000080 gSummaryScreenWindow_Tilemap
+08dc3b94 g 000000a0 gSummaryScreen_MoveEffect_Battle_Tilemap
+08dc3c34 g 000000a0 gSummaryScreen_MoveEffect_Contest_Tilemap
+08dc3cd4 g 00000080 gSummaryScreen_MoveEffect_Cancel_Tilemap
 08dc3d54 g 00000020 gIntroCopyright_Pal
 08dc3d74 g 00000260 gIntroCopyright_Gfx
 08dc3fd4 g 0000014c gIntroCopyright_Tilemap
@@ -73173,7 +73173,7 @@
 08de3374 g 00000024 gFrontierPassCancelButtonHighlighted_Tilemap
 08de3398 g 00000120 gBerryCrush_Crusher_Pal
 08de34b8 g 00000b1c gBerryCrush_Crusher_Gfx
-08de3fd4 g 00000044 gBerryCrush_Crusher_Tilemap
+08de3fd4 g 00000044 gBerryCrush_TextWindows_Tilemap
 08de4018 l 00054bac sEmpty3
 08e38bc4 l 00000004 sUnused1
 08e38bc8 l 00001145 sEmpty4