From 2c1bf600e72d1714dcb1abb32941de45d06bb0a6 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Fri, 12 Aug 2022 15:10:31 +0000 Subject: [PATCH] Merge pull request #1730 from GriffinRichards/sync-naming-screen --- pokeemerald.sym | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 597b631356..93a71c9979 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -49484,7 +49484,7 @@ 0858bbf8 l 000000c0 sPCIconOff_Gfx 0858bcb8 l 000000c0 sPCIconOn_Gfx 0858bd78 l 00000020 sKeyboard_Pal -0858bd98 l 00000020 sUnused_Pal +0858bd98 l 00000020 sRival_Pal 0858bdb8 l 00000010 sTransferredToPCMessages 0858bdc8 l 00000036 sText_AlphabetUpperLower 0858be00 l 00000010 sBgTemplates @@ -73094,10 +73094,16 @@ 08dd36c8 g 000000b0 gStorageSystemPartyMenu_Tilemap 08dd3778 g 000000c0 gNamingScreenMenu_Pal 08dd3838 g 000001cc gNamingScreenMenu_Gfx -08dd3a04 g 00000640 gNamingScreenRWindow_Gfx -08dd4044 g 000001e0 gNamingScreenROptions_Gfx -08dd4224 g 000001c0 gNamingScreenCursor_Gfx -08dd43e4 g 00000120 gNamingScreenPageButton_Gfx +08dd3a04 g 00000280 gNamingScreenPageSwapFrame_Gfx +08dd3c84 g 000001e0 gNamingScreenBackButton_Gfx +08dd3e64 g 000001e0 gNamingScreenOKButton_Gfx +08dd4044 g 000000a0 gNamingScreenPageSwapUpper_Gfx +08dd40e4 g 000000a0 gNamingScreenPageSwapLower_Gfx +08dd4184 g 000000a0 gNamingScreenPageSwapOthers_Gfx +08dd4224 g 000000a0 gNamingScreenCursor_Gfx +08dd42c4 g 000000a0 gNamingScreenCursorSquished_Gfx +08dd4364 g 000000a0 gNamingScreenCursorFilled_Gfx +08dd4404 g 00000100 gNamingScreenPageSwapButton_Gfx 08dd4504 g 00000020 gNamingScreenInputArrow_Gfx 08dd4524 g 00000020 gNamingScreenUnderscore_Gfx 08dd4544 g 000000dc gNamingScreenBackground_Tilemap