From cf22c7bc55d72a98bb82113b1f3a935425a45abe Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Wed, 29 Dec 2021 06:03:34 +0000 Subject: [PATCH] Merge pull request #1583 from GriffinRichards/renametilemaps --- pokeemerald.sym | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index cdbd89bb7d..e6da99751d 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -48569,7 +48569,7 @@ 08570d00 l 00000100 sMapCursor_Gfx 08570e00 l 00000260 sMapScreen_Tilemap 08571060 l 00000238 sMapAndCard_ZoomedOut_Tilemap -08571298 l 00000028 sUnusedData +08571298 l 00000028 sCardBall_Filled_Tilemap 085712c0 l 00000038 sBattleRecord_Tilemap 085712f8 l 000000e8 sMapAndCard_Zooming_Tilemap 085713e0 l 00000008 sBgAffineCoords @@ -52569,7 +52569,7 @@ 085a82cc l 00000068 sSubspriteTables_DigitalDisplay 085a8334 l 000000b0 sSlotMachineSpriteSheets 085a83e4 l 00000004 sReelBackground_Tilemap -085a83e8 l 00000014 sUnused +085a83e8 l 00000014 sUnusedColors 085a83fc l 00000002 sMiddleRowLit_Pal 085a83fe l 00000002 sTopRowLit_Pal 085a8400 l 00000002 sBottomRowt_Pal @@ -68946,14 +68946,14 @@ 08c14f50 g 000000d4 gBattleAnimSpriteGfx_BlueFlames2 08c15024 g 00000914 gJPContestGfx1 08c15938 g 00000104 gJPContestPal -08c15a3c g 00000184 gJPContestTilemap1 -08c15bc0 g 000002c0 gJPContestTilemap2 +08c15a3c g 00000184 gJPContestBgTilemap +08c15bc0 g 000002c0 gJPContestWindowsTilemap 08c15e80 g 00001010 gJPContestGfx2 08c16e90 g 00000118 gContestInterfaceAudiencePalette 08c16fa8 g 000001c8 gContestAudienceTilemap 08c17170 g 000002a0 gContestInterfaceTilemap -08c17410 g 0000010c gContestUnusedTilemap1 -08c1751c g 00000464 gContestUnusedTilemap2 +08c17410 g 0000010c gJPContestInterfaceTilemap +08c1751c g 00000464 gJPContestAudienceTilemap 08c17980 g 00000130 gContestCurtainTilemap 08c17ab0 g 00000a5c gContestInterfaceGfx 08c1850c g 00000c5c gContestAudienceGfx