diff --git a/pokefirered.sym b/pokefirered.sym
index 8727eba95..ea737b3d1 100644
--- a/pokefirered.sym
+++ b/pokefirered.sym
@@ -340,7 +340,7 @@
 0203996c g 00000018 gShopMenuHistory
 02039984 l 00000001 sEscalatorTaskId
 02039988 l 00000001 sDelay
-0203998c l 00000004 sNamingScreenData
+0203998c l 00000004 sNamingScreen
 02039990 l 00000001 sMoneyBoxWindowId
 02039994 g 00000001 gNumSafariBalls
 02039996 g 00000002 gSafariZoneStepCounter
@@ -6741,24 +6741,24 @@
 0809d8c0 g 00000092 GetSelectedSeagallopDestination
 0809d954 g 0000008c DoNamingScreen
 0809d954 l 00000000 .gcc2_compiled.
-0809d9e0 l 000000a4 CB2_NamingScreen
+0809d9e0 l 000000a4 CB2_LoadNamingScreen
 0809da84 l 000000ec NamingScreen_Init
-0809db70 l 00000040 sub_809DB70
+0809db70 l 00000040 SetSpritesVisible
 0809dbb0 l 000001b0 NamingScreen_InitBGs
-0809dd60 l 00000028 sub_809DD60
-0809dd88 l 00000096 sub_809DD88
-0809de20 l 00000010 sub_809DE20
-0809de30 l 00000020 sub_809DE30
-0809de50 l 00000020 sub_809DE50
-0809de70 l 000000b8 MainState_BeginFadeIn
+0809dd60 l 00000028 CreateNamingScreenTask
+0809dd88 l 00000096 Task_NamingScreen
+0809de20 l 00000010 PageToNextGfxId
+0809de30 l 00000020 CurrentPageToNextKeyboardId
+0809de50 l 00000020 CurrentPageToKeyboardId
+0809de70 l 000000b8 MainState_FadeIn
 0809df28 l 0000003c MainState_WaitFadeIn
 0809df64 l 0000000e MainState_HandleInput
 0809df74 l 00000030 MainState_MoveToOKButton
-0809dfa4 l 00000070 pokemon_store
-0809e014 l 00000034 MainState_BeginFadeInOut
-0809e048 l 0000006c MainState_WaitFadeOutAndExit
-0809e0b4 l 00000120 pokemon_transfer_to_pc_with_message
-0809e1d4 l 0000003c sub_809E1D4
+0809dfa4 l 00000070 MainState_PressedOKButton
+0809e014 l 00000034 MainState_FadeOut
+0809e048 l 0000006c MainState_Exit
+0809e0b4 l 00000120 DisplaySentToPCMessage
+0809e1d4 l 0000003c MainState_WaitSentToPCMessage
 0809e210 l 00000040 MainState_StartPageSwap
 0809e250 l 000000bc MainState_WaitPageSwap
 0809e30c l 00000020 StartPageSwapAnim
@@ -6768,38 +6768,38 @@
 0809e3ac l 00000094 PageSwapAnimState_1
 0809e440 l 00000094 PageSwapAnimState_2
 0809e4d4 l 0000001c PageSwapAnimState_Done
-0809e4f0 l 00000028 sub_809E4F0
-0809e518 l 00000072 sub_809E518
-0809e58c l 000000b8 Task_809E58C
-0809e644 l 00000074 sub_809E644
-0809e6b8 l 00000028 sub_809E6B8
-0809e6e0 l 00000020 sub_809E6E0
-0809e700 l 000000f0 sub_809E700
-0809e7f0 l 0000004c sub_809E7F0
-0809e83c l 0000005c sub_809E83C
-0809e898 l 0000001a sub_809E898
-0809e8b4 l 00000094 CursorInit
+0809e4f0 l 00000028 CreateButtonFlashTask
+0809e518 l 00000072 TryStartButtonFlash
+0809e58c l 000000b8 Task_UpdateButtonFlash
+0809e644 l 00000074 GetButtonPalOffset
+0809e6b8 l 00000028 RestoreButtonColor
+0809e6e0 l 00000020 StartButtonFlash
+0809e700 l 000000f0 SpriteCB_Cursor
+0809e7f0 l 0000004c SpriteCB_InputArrow
+0809e83c l 0000005c SpriteCB_Underscore
+0809e898 l 0000001a CreateSprites
+0809e8b4 l 00000094 CreateCursorSprite
 0809e948 l 00000084 SetCursorPos
 0809e9cc l 0000002c GetCursorPos
 0809e9f8 l 00000014 MoveCursorToOKButton
-0809ea0c l 00000058 sub_809EA0C
-0809ea64 l 00000044 sub_809EA64
-0809eaa8 l 0000002c sub_809EAA8
+0809ea0c l 00000058 SetCursorInvisibility
+0809ea64 l 00000044 SetCursorFlashing
+0809eaa8 l 0000002c SquishCursor
 0809ead4 l 0000002c IsCursorAnimFinished
 0809eb00 l 0000003e GetKeyRoleAtCursorPos
 0809eb40 l 0000001c GetCurrentPageColumnCount
-0809eb5c l 000000c4 CreatePageSwitcherSprites
-0809ec20 l 00000034 sub_809EC20
+0809eb5c l 000000c4 CreatePageSwapButtonSprites
+0809ec20 l 00000034 StartPageSwapButtonAnim
 0809ec54 l 00000028 SpriteCB_PageSwap
-0809ec7c l 00000054 PageSwapSpritesCB_Init
-0809ecd0 l 00000004 PageSwapSpritesCB_Idle
-0809ecd4 l 00000074 PageSwapSpritesCB_SwapHide
-0809ed48 l 00000040 PageSwapSpritesCB_SwapShow
-0809ed88 l 00000060 sub_809ED88
+0809ec7c l 00000054 PageSwapSprite_Init
+0809ecd0 l 00000004 PageSwapSprite_Idle
+0809ecd4 l 00000074 PageSwapSprite_SlideOff
+0809ed48 l 00000040 PageSwapSprite_SlideOn
+0809ed88 l 00000060 SetPageSwapButtonGfx
 0809ede8 l 00000078 CreateBackOkSprites
-0809ee60 l 000000c4 CreateUnderscoreSprites
+0809ee60 l 000000c4 CreateTextEntrySprites
 0809ef24 l 0000002c CreateInputTargetIcon
-0809ef50 l 00000002 NamingScreen_NoCreateIcon
+0809ef50 l 00000002 NamingScreen_NoIcon
 0809ef54 l 0000005c NamingScreen_CreatePlayerIcon
 0809efb0 l 00000040 NamingScreen_CreatePCIcon
 0809eff0 l 0000005c NamingScreen_CreateMonIcon
@@ -6809,46 +6809,46 @@
 0809f168 l 00000028 KeyboardKeyHandler_Page
 0809f190 l 00000022 KeyboardKeyHandler_Backspace
 0809f1b4 l 0000003c KeyboardKeyHandler_OK
-0809f1f0 l 00000018 TriggerKeyboardChange
-0809f208 l 00000014 InputInit
+0809f1f0 l 00000018 SwapKeyboardPage
+0809f208 l 00000014 CreateInputHandlerTask
 0809f21c l 00000024 GetInputEvent
 0809f240 l 0000002c SetInputState
 0809f26c l 00000030 Task_HandleInput
-0809f29c l 00000006 InputState_Disabled
-0809f2a4 l 00000054 InputState_Enabled
+0809f29c l 00000006 Input_Disabled
+0809f2a4 l 00000054 Input_Enabled
 0809f2f8 l 000001a4 HandleDpadMovement
-0809f49c l 00000054 PrintTitleFunction_NoMon
-0809f4f0 l 0000007c PrintTitleFunction_WithMon
-0809f56c l 00000028 PrintTitle
-0809f594 l 0000002c CallAddGenderIconFunc
-0809f5c0 l 00000002 AddGenderIconFunc_No
-0809f5c4 l 00000070 AddGenderIconFunc_Yes
+0809f49c l 00000054 DrawNormalTextEntryBox
+0809f4f0 l 0000007c DrawMonTextEntryBox
+0809f56c l 00000028 DrawTextEntryBox
+0809f594 l 0000002c TryDrawGenderIcon
+0809f5c0 l 00000002 DummyGenderIcon
+0809f5c4 l 00000070 DrawGenderIcon
 0809f634 l 00000034 GetCharAtKeyboardPos
-0809f668 l 00000054 GetTextCaretPosition
+0809f668 l 00000054 GetTextEntryPosition
 0809f6bc l 00000042 GetPreviousTextCaretPosition
 0809f700 l 0000005c DeleteTextCharacter
-0809f75c l 00000066 AppendCharToBuffer_CheckBufferFull
-0809f7c4 l 00000028 AddTextCharacter
-0809f7ec l 00000070 CopyStringToDestBuffer
-0809f85c l 00000064 choose_name_or_words_screen_load_bg_tile_patterns
-0809f8c0 l 0000000e sub_809F8C0
-0809f8d0 l 00000030 choose_name_or_words_screen_apply_bg_pals
+0809f75c l 00000066 AddTextCharacter
+0809f7c4 l 00000028 BufferCharacter
+0809f7ec l 00000070 SaveInputText
+0809f85c l 00000064 LoadGfx
+0809f8c0 l 0000000e CreateHelperTasks
+0809f8d0 l 00000030 LoadPalettes
 0809f900 l 00000012 DecompressToBgTilemapBuffer
-0809f914 l 000000d4 PrintBufferCharactersOnScreen
-0809f9e8 l 00000078 sub_809F9E8
-0809fa60 l 00000084 sub_809FA60
-0809fae4 l 0000008c sub_809FAE4
-0809fb70 l 00000016 sub_809FB70
-0809fb88 l 00000012 NamingScreen_TurnOffScreen
-0809fb9c l 00000010 NamingScreen_InitDisplayMode
+0809f914 l 000000d4 DrawTextEntry
+0809f9e8 l 00000078 PrintKeyboardKeys
+0809fa60 l 00000084 DrawKeyboardPageOnDeck
+0809fae4 l 0000008c PrintControls
+0809fb70 l 00000016 CB2_NamingScreen
+0809fb88 l 00000012 ResetVHBlank
+0809fb9c l 00000010 SetVBlank
 0809fbac l 00000088 VBlankCB_NamingScreen
-0809fc34 l 0000001e ShowAllBgs
-0809fc54 l 0000003a IsLetter
-0809fc90 l 00000028 Debug_DoNamingScreen_Player
-0809fcb8 l 00000028 Debug_DoNamingScreen_Box
-0809fce0 l 00000028 Debug_DoNamingScreen_CaughtMon
-0809fd08 l 00000028 Debug_DoNamingScreen_NameRater
-0809fd30 l 00000028 Debug_DoNamingScreen_Rival
+0809fc34 l 0000001e NamingScreen_ShowBgs
+0809fc54 l 0000003a IsWideLetter
+0809fc90 l 00000028 Debug_NamingScreenPlayer
+0809fcb8 l 00000028 Debug_NamingScreenBox
+0809fce0 l 00000028 Debug_NamingScreenCaughtMon
+0809fd08 l 00000028 Debug_NamingScreenNickname
+0809fd30 l 00000028 Debug_NamingScreenRival
 0809fd58 g 00000018 GetMoney
 0809fd58 l 00000000 .gcc2_compiled.
 0809fd70 g 00000018 SetMoney
@@ -34135,70 +34135,70 @@
 083e17c0 l 00000010 sMuseumKabutopsSprSheets
 083e17d0 l 00000010 sMuseumAerodactylSprSheets
 083e17e0 l 00000020 sSeagallopDestStrings
-083e1800 l 000000c0 gUnknown_83E1800
-083e18c0 l 000000c0 gUnknown_83E18C0
-083e1980 l 00000900 gUnknown_83E1980
+083e1800 l 000000c0 sPCIconOff_Gfx
+083e18c0 l 000000c0 sPCIconOn_Gfx
+083e1980 l 00000900 sRival_Gfx
 083e2280 l 00000010 sTransferredToPCMessages
-083e2290 l 00000010 gUnknown_83E2290
-083e22a0 l 00000030 gUnknown_83E22A0
-083e22d0 l 00000060 gUnknown_83E22D0
-083e2330 l 00000003 gUnknown_83E2330
-083e2333 l 00000018 gUnknown_83E2333
-083e234b l 00000003 sPageOrderLowerFirst
-083e234e l 00000003 sPageOrderUpperFirst
-083e2351 l 00000003 sPageOrderSymbolsFirst
+083e2290 l 00000010 sBgTemplates
+083e22a0 l 00000030 sWindowTemplates
+083e22d0 l 00000060 sKeyboardChars
+083e2330 l 00000003 sPageColumnCounts
+083e2333 l 00000018 sPageColumnXPos
+083e234b l 00000003 sPageToNextGfxId
+083e234e l 00000003 sPageToNextKeyboardId
+083e2351 l 00000003 sPageToKeyboardId
 083e2354 l 00000010 sPageSwapAnimStateFuncs
-083e2374 l 00000003 sKeyRoles
-083e2378 l 00000010 sPageSwapSpritesCBs
-083e2388 l 00000006 gUnknown_83E2388
-083e238e l 00000006 gUnknown_83E238E
+083e2374 l 00000003 sButtonKeyRoles
+083e2378 l 00000010 sPageSwapSpriteFuncs
+083e2388 l 00000006 sPageSwapPalTags
+083e238e l 00000006 sPageSwapGfxTags
 083e2394 l 00000014 sIconFunctions
-083e23a8 l 00000014 gUnknown_83E23A8
-083e23bc l 00000004 gUnknown_83E23BC
+083e23a8 l 00000014 sAnim_Rival
+083e23bc l 00000004 sAnims_Rival
 083e23d0 l 00000010 sKeyboardKeyHandlers
-083e23e0 l 00000008 sInputStateFuncs
-083e240c l 00000014 sPrintTitleFuncs
-083e2420 l 00000008 sAddGenderIconFuncs
+083e23e0 l 00000008 sInputFuncs
+083e240c l 00000014 sDrawTextEntryBoxFuncs
+083e2420 l 00000008 sDrawGenderIconFuncs
 083e2428 l 00000006 sGenderColors
 083e2430 l 0000000c sTextColorStruct
 083e243c l 00000003 sFillValues
 083e2440 l 0000000c sKeyboardTextColors
-083e244c l 0000000c gUnknown_83E244C
+083e244c l 0000000c sNextKeyboardPageTilemaps
 083e245c l 0000000c sPlayerNamingScreenTemplate
 083e2468 l 0000000c sPcBoxNamingScreenTemplate
 083e2474 l 0000000c sMonNamingScreenTemplate
 083e2480 l 0000000c sRivalNamingScreenTemplate
 083e248c l 00000014 sNamingScreenTemplates
-083e24a0 l 00000008 gOamData_858BFEC
-083e24a8 l 00000008 gOamData_858BFF4
-083e24b0 l 00000008 gOamData_858BFFC
-083e24b8 l 00000020 gUnknown_83E24B8
-083e24d8 l 00000008 gUnknown_83E24D8
-083e24e0 l 00000018 gUnknown_83E24E0
-083e24f8 l 0000000c gUnknown_83E24F8
-083e2504 l 00000008 gUnknown_83E2504
-083e250c l 00000018 gUnknown_83E250C
-083e2524 l 00000008 gUnknown_83E2524
-083e252c l 00000008 gUnknown_83E252C
-083e2534 l 00000010 gUnknown_0858C080
-083e2544 l 00000008 gSpriteAnim_858C090
-083e254c l 0000000c gSpriteAnim_858C098
-083e2558 l 0000000c gSpriteAnim_858C0A4
-083e2564 l 00000004 gSpriteAnimTable_858C0B0
-083e2568 l 00000008 gSpriteAnimTable_858C0B4
-083e2570 l 00000004 gSpriteAnimTable_858C0BC
-083e2574 l 00000018 gUnknown_83E2574
-083e258c l 00000018 gUnknown_83E258C
-083e25a4 l 00000018 gUnknown_83E25A4
-083e25bc l 00000018 gUnknown_83E25BC
-083e25d4 l 00000018 gUnknown_83E25D4
-083e25ec l 00000018 gUnknown_83E25EC
+083e24a0 l 00000008 sOam_8x8
+083e24a8 l 00000008 sOam_16x16
+083e24b0 l 00000008 sOam_32x16
+083e24b8 l 00000020 sSubsprites_PageSwapFrame
+083e24d8 l 00000008 sSubsprites_PageSwapText
+083e24e0 l 00000018 sSubsprites_Button
+083e24f8 l 0000000c sSubsprites_PCIcon
+083e2504 l 00000008 sSubspriteTable_PageSwapFrame
+083e250c l 00000018 sSubspriteTable_PageSwapText
+083e2524 l 00000008 sSubspriteTable_Button
+083e252c l 00000008 sSubspriteTable_PCIcon
+083e2534 l 00000010 sImageTable_PCIcon
+083e2544 l 00000008 sAnim_Loop
+083e254c l 0000000c sAnim_CursorSquish
+083e2558 l 0000000c sAnim_PCIcon
+083e2564 l 00000004 sAnims_Loop
+083e2568 l 00000008 sAnims_Cursor
+083e2570 l 00000004 sAnims_PCIcon
+083e2574 l 00000018 sSpriteTemplate_PageSwapFrame
+083e258c l 00000018 sSpriteTemplate_PageSwapButton
+083e25a4 l 00000018 sSpriteTemplate_PageSwapText
+083e25bc l 00000018 sSpriteTemplate_BackButton
+083e25d4 l 00000018 sSpriteTemplate_OkButton
+083e25ec l 00000018 sSpriteTemplate_Cursor
 083e2604 l 00000018 sSpriteTemplate_InputArrow
 083e261c l 00000018 sSpriteTemplate_Underscore
-083e2634 l 00000018 gUnknown_83E2634
+083e2634 l 00000018 sSpriteTemplate_PCIcon
 083e264c l 00000030 sNamingScreenKeyboardText
-083e267c l 00000068 gUnknown_83E267C
-083e26e4 l 00000048 gUnknown_83E26E4
+083e267c l 00000068 sSpriteSheets
+083e26e4 l 00000048 sSpritePalettes
 083e272c l 00000080 sBigMonSizeTable
 083e27ac l 00000007 sGiftRibbonsMonDataIds
 083e27b4 l 000001a0 sUnref_83E27B4
@@ -50703,31 +50703,26 @@
 08e97ddc g 00000020 gUnknown_8E97DDC
 08e97dfc g 000000c8 gUnknown_8E97DFC
 08e97ec4 g 00000120 gUnknown_8E97EC4
-08e97fe4 g 00000020 gUnknown_8E97FE4
-08e98004 g 00000020 gUnknown_8E98004
-08e98024 g 00000020 gNamingScreenMenu_Pal
-08e98044 g 00000020 gUnknown_8E98044
-08e98064 g 00000020 gUnknown_8E98064
-08e98084 g 00000020 gUnknown_8E98084
-08e980a4 g 00000020 gUnknown_8E980A4
-08e980c4 g 00000020 gUnknown_8E980C4
+08e97fe4 g 00000020 gNamingScreenKeyboard_Pal
+08e98004 g 00000020 gNamingScreenRival_Pal
+08e98024 g 000000c0 gNamingScreenMenu_Pal
 08e980e4 g 000001d8 gNamingScreenMenu_Gfx
-08e982bc g 000000dc gUnknown_8E982BC
-08e98398 g 000000c0 gUnknown_8E98398
-08e98458 g 000000c0 gUnknown_8E98458
-08e98518 g 000000c0 gUnknown_8E98518
-08e985d8 g 00000280 gUnknown_8E985D8
-08e98858 g 000001e0 gUnknown_8E98858
-08e98a38 g 000001e0 gUnknown_8E98A38
-08e98c18 g 000000a0 gUnknown_8E98C18
-08e98cb8 g 000000a0 gUnknown_8E98CB8
-08e98d58 g 000000a0 gUnknown_8E98D58
-08e98df8 g 000000a0 gUnknown_8E98DF8
-08e98e98 g 000000a0 gUnknown_8E98E98
-08e98f38 g 000000a0 gUnknown_8E98F38
-08e98fd8 g 00000100 gUnknown_8E98FD8
-08e990d8 g 00000020 gUnknown_8E990D8
-08e990f8 g 00000020 gUnknown_8E990F8
+08e982bc g 000000dc gNamingScreenBackground_Tilemap
+08e98398 g 000000c0 gNamingScreenKeyboardUpper_Tilemap
+08e98458 g 000000c0 gNamingScreenKeyboardLower_Tilemap
+08e98518 g 000000c0 gNamingScreenKeyboardSymbols_Tilemap
+08e985d8 g 00000280 gNamingScreenPageSwapFrame_Gfx
+08e98858 g 000001e0 gNamingScreenBackButton_Gfx
+08e98a38 g 000001e0 gNamingScreenOKButton_Gfx
+08e98c18 g 000000a0 gNamingScreenPageSwapUpper_Gfx
+08e98cb8 g 000000a0 gNamingScreenPageSwapLower_Gfx
+08e98d58 g 000000a0 gNamingScreenPageSwapOthers_Gfx
+08e98df8 g 000000a0 gNamingScreenCursor_Gfx
+08e98e98 g 000000a0 gNamingScreenCursorSquished_Gfx
+08e98f38 g 000000a0 gNamingScreenCursorFilled_Gfx
+08e98fd8 g 00000100 gNamingScreenPageSwapButton_Gfx
+08e990d8 g 00000020 gNamingScreenInputArrow_Gfx
+08e990f8 g 00000020 gNamingScreenUnderscore_Gfx
 08e99118 g 00000080 gUnknown_8E99118
 08e99198 g 00000060 gKantoTrainerCard_Pal
 08e991f8 g 00000674 gKantoTrainerCard_Gfx
diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym
index 728bba089..8d2e72e55 100644
--- a/pokefirered_rev1.sym
+++ b/pokefirered_rev1.sym
@@ -340,7 +340,7 @@
 0203996c g 00000018 gShopMenuHistory
 02039984 l 00000001 sEscalatorTaskId
 02039988 l 00000001 sDelay
-0203998c l 00000004 sNamingScreenData
+0203998c l 00000004 sNamingScreen
 02039990 l 00000001 sMoneyBoxWindowId
 02039994 g 00000001 gNumSafariBalls
 02039996 g 00000002 gSafariZoneStepCounter
@@ -6741,24 +6741,24 @@
 0809d8d4 g 00000092 GetSelectedSeagallopDestination
 0809d968 g 0000008c DoNamingScreen
 0809d968 l 00000000 .gcc2_compiled.
-0809d9f4 l 000000a4 CB2_NamingScreen
+0809d9f4 l 000000a4 CB2_LoadNamingScreen
 0809da98 l 000000ec NamingScreen_Init
-0809db84 l 00000040 sub_809DB70
+0809db84 l 00000040 SetSpritesVisible
 0809dbc4 l 000001b0 NamingScreen_InitBGs
-0809dd74 l 00000028 sub_809DD60
-0809dd9c l 00000096 sub_809DD88
-0809de34 l 00000010 sub_809DE20
-0809de44 l 00000020 sub_809DE30
-0809de64 l 00000020 sub_809DE50
-0809de84 l 000000b8 MainState_BeginFadeIn
+0809dd74 l 00000028 CreateNamingScreenTask
+0809dd9c l 00000096 Task_NamingScreen
+0809de34 l 00000010 PageToNextGfxId
+0809de44 l 00000020 CurrentPageToNextKeyboardId
+0809de64 l 00000020 CurrentPageToKeyboardId
+0809de84 l 000000b8 MainState_FadeIn
 0809df3c l 0000003c MainState_WaitFadeIn
 0809df78 l 0000000e MainState_HandleInput
 0809df88 l 00000030 MainState_MoveToOKButton
-0809dfb8 l 00000070 pokemon_store
-0809e028 l 00000034 MainState_BeginFadeInOut
-0809e05c l 0000006c MainState_WaitFadeOutAndExit
-0809e0c8 l 00000120 pokemon_transfer_to_pc_with_message
-0809e1e8 l 0000003c sub_809E1D4
+0809dfb8 l 00000070 MainState_PressedOKButton
+0809e028 l 00000034 MainState_FadeOut
+0809e05c l 0000006c MainState_Exit
+0809e0c8 l 00000120 DisplaySentToPCMessage
+0809e1e8 l 0000003c MainState_WaitSentToPCMessage
 0809e224 l 00000040 MainState_StartPageSwap
 0809e264 l 000000bc MainState_WaitPageSwap
 0809e320 l 00000020 StartPageSwapAnim
@@ -6768,38 +6768,38 @@
 0809e3c0 l 00000094 PageSwapAnimState_1
 0809e454 l 00000094 PageSwapAnimState_2
 0809e4e8 l 0000001c PageSwapAnimState_Done
-0809e504 l 00000028 sub_809E4F0
-0809e52c l 00000072 sub_809E518
-0809e5a0 l 000000b8 Task_809E58C
-0809e658 l 00000074 sub_809E644
-0809e6cc l 00000028 sub_809E6B8
-0809e6f4 l 00000020 sub_809E6E0
-0809e714 l 000000f0 sub_809E700
-0809e804 l 0000004c sub_809E7F0
-0809e850 l 0000005c sub_809E83C
-0809e8ac l 0000001a sub_809E898
-0809e8c8 l 00000094 CursorInit
+0809e504 l 00000028 CreateButtonFlashTask
+0809e52c l 00000072 TryStartButtonFlash
+0809e5a0 l 000000b8 Task_UpdateButtonFlash
+0809e658 l 00000074 GetButtonPalOffset
+0809e6cc l 00000028 RestoreButtonColor
+0809e6f4 l 00000020 StartButtonFlash
+0809e714 l 000000f0 SpriteCB_Cursor
+0809e804 l 0000004c SpriteCB_InputArrow
+0809e850 l 0000005c SpriteCB_Underscore
+0809e8ac l 0000001a CreateSprites
+0809e8c8 l 00000094 CreateCursorSprite
 0809e95c l 00000084 SetCursorPos
 0809e9e0 l 0000002c GetCursorPos
 0809ea0c l 00000014 MoveCursorToOKButton
-0809ea20 l 00000058 sub_809EA0C
-0809ea78 l 00000044 sub_809EA64
-0809eabc l 0000002c sub_809EAA8
+0809ea20 l 00000058 SetCursorInvisibility
+0809ea78 l 00000044 SetCursorFlashing
+0809eabc l 0000002c SquishCursor
 0809eae8 l 0000002c IsCursorAnimFinished
 0809eb14 l 0000003e GetKeyRoleAtCursorPos
 0809eb54 l 0000001c GetCurrentPageColumnCount
-0809eb70 l 000000c4 CreatePageSwitcherSprites
-0809ec34 l 00000034 sub_809EC20
+0809eb70 l 000000c4 CreatePageSwapButtonSprites
+0809ec34 l 00000034 StartPageSwapButtonAnim
 0809ec68 l 00000028 SpriteCB_PageSwap
-0809ec90 l 00000054 PageSwapSpritesCB_Init
-0809ece4 l 00000004 PageSwapSpritesCB_Idle
-0809ece8 l 00000074 PageSwapSpritesCB_SwapHide
-0809ed5c l 00000040 PageSwapSpritesCB_SwapShow
-0809ed9c l 00000060 sub_809ED88
+0809ec90 l 00000054 PageSwapSprite_Init
+0809ece4 l 00000004 PageSwapSprite_Idle
+0809ece8 l 00000074 PageSwapSprite_SlideOff
+0809ed5c l 00000040 PageSwapSprite_SlideOn
+0809ed9c l 00000060 SetPageSwapButtonGfx
 0809edfc l 00000078 CreateBackOkSprites
-0809ee74 l 000000c4 CreateUnderscoreSprites
+0809ee74 l 000000c4 CreateTextEntrySprites
 0809ef38 l 0000002c CreateInputTargetIcon
-0809ef64 l 00000002 NamingScreen_NoCreateIcon
+0809ef64 l 00000002 NamingScreen_NoIcon
 0809ef68 l 0000005c NamingScreen_CreatePlayerIcon
 0809efc4 l 00000040 NamingScreen_CreatePCIcon
 0809f004 l 0000005c NamingScreen_CreateMonIcon
@@ -6809,46 +6809,46 @@
 0809f17c l 00000028 KeyboardKeyHandler_Page
 0809f1a4 l 00000022 KeyboardKeyHandler_Backspace
 0809f1c8 l 0000003c KeyboardKeyHandler_OK
-0809f204 l 00000018 TriggerKeyboardChange
-0809f21c l 00000014 InputInit
+0809f204 l 00000018 SwapKeyboardPage
+0809f21c l 00000014 CreateInputHandlerTask
 0809f230 l 00000024 GetInputEvent
 0809f254 l 0000002c SetInputState
 0809f280 l 00000030 Task_HandleInput
-0809f2b0 l 00000006 InputState_Disabled
-0809f2b8 l 00000054 InputState_Enabled
+0809f2b0 l 00000006 Input_Disabled
+0809f2b8 l 00000054 Input_Enabled
 0809f30c l 000001a4 HandleDpadMovement
-0809f4b0 l 00000054 PrintTitleFunction_NoMon
-0809f504 l 0000007c PrintTitleFunction_WithMon
-0809f580 l 00000028 PrintTitle
-0809f5a8 l 0000002c CallAddGenderIconFunc
-0809f5d4 l 00000002 AddGenderIconFunc_No
-0809f5d8 l 00000070 AddGenderIconFunc_Yes
+0809f4b0 l 00000054 DrawNormalTextEntryBox
+0809f504 l 0000007c DrawMonTextEntryBox
+0809f580 l 00000028 DrawTextEntryBox
+0809f5a8 l 0000002c TryDrawGenderIcon
+0809f5d4 l 00000002 DummyGenderIcon
+0809f5d8 l 00000070 DrawGenderIcon
 0809f648 l 00000034 GetCharAtKeyboardPos
-0809f67c l 00000054 GetTextCaretPosition
+0809f67c l 00000054 GetTextEntryPosition
 0809f6d0 l 00000042 GetPreviousTextCaretPosition
 0809f714 l 0000005c DeleteTextCharacter
-0809f770 l 00000066 AppendCharToBuffer_CheckBufferFull
-0809f7d8 l 00000028 AddTextCharacter
-0809f800 l 00000070 CopyStringToDestBuffer
-0809f870 l 00000064 choose_name_or_words_screen_load_bg_tile_patterns
-0809f8d4 l 0000000e sub_809F8C0
-0809f8e4 l 00000030 choose_name_or_words_screen_apply_bg_pals
+0809f770 l 00000066 AddTextCharacter
+0809f7d8 l 00000028 BufferCharacter
+0809f800 l 00000070 SaveInputText
+0809f870 l 00000064 LoadGfx
+0809f8d4 l 0000000e CreateHelperTasks
+0809f8e4 l 00000030 LoadPalettes
 0809f914 l 00000012 DecompressToBgTilemapBuffer
-0809f928 l 000000d4 PrintBufferCharactersOnScreen
-0809f9fc l 00000078 sub_809F9E8
-0809fa74 l 00000084 sub_809FA60
-0809faf8 l 0000008c sub_809FAE4
-0809fb84 l 00000016 sub_809FB70
-0809fb9c l 00000012 NamingScreen_TurnOffScreen
-0809fbb0 l 00000010 NamingScreen_InitDisplayMode
+0809f928 l 000000d4 DrawTextEntry
+0809f9fc l 00000078 PrintKeyboardKeys
+0809fa74 l 00000084 DrawKeyboardPageOnDeck
+0809faf8 l 0000008c PrintControls
+0809fb84 l 00000016 CB2_NamingScreen
+0809fb9c l 00000012 ResetVHBlank
+0809fbb0 l 00000010 SetVBlank
 0809fbc0 l 00000088 VBlankCB_NamingScreen
-0809fc48 l 0000001e ShowAllBgs
-0809fc68 l 0000003a IsLetter
-0809fca4 l 00000028 Debug_DoNamingScreen_Player
-0809fccc l 00000028 Debug_DoNamingScreen_Box
-0809fcf4 l 00000028 Debug_DoNamingScreen_CaughtMon
-0809fd1c l 00000028 Debug_DoNamingScreen_NameRater
-0809fd44 l 00000028 Debug_DoNamingScreen_Rival
+0809fc48 l 0000001e NamingScreen_ShowBgs
+0809fc68 l 0000003a IsWideLetter
+0809fca4 l 00000028 Debug_NamingScreenPlayer
+0809fccc l 00000028 Debug_NamingScreenBox
+0809fcf4 l 00000028 Debug_NamingScreenCaughtMon
+0809fd1c l 00000028 Debug_NamingScreenNickname
+0809fd44 l 00000028 Debug_NamingScreenRival
 0809fd6c g 00000018 GetMoney
 0809fd6c l 00000000 .gcc2_compiled.
 0809fd84 g 00000018 SetMoney
@@ -34136,70 +34136,70 @@
 083e1830 l 00000010 sMuseumKabutopsSprSheets
 083e1840 l 00000010 sMuseumAerodactylSprSheets
 083e1850 l 00000020 sSeagallopDestStrings
-083e1870 l 000000c0 gUnknown_83E1800
-083e1930 l 000000c0 gUnknown_83E18C0
-083e19f0 l 00000900 gUnknown_83E1980
+083e1870 l 000000c0 sPCIconOff_Gfx
+083e1930 l 000000c0 sPCIconOn_Gfx
+083e19f0 l 00000900 sRival_Gfx
 083e22f0 l 00000010 sTransferredToPCMessages
-083e2300 l 00000010 gUnknown_83E2290
-083e2310 l 00000030 gUnknown_83E22A0
-083e2340 l 00000060 gUnknown_83E22D0
-083e23a0 l 00000003 gUnknown_83E2330
-083e23a3 l 00000018 gUnknown_83E2333
-083e23bb l 00000003 sPageOrderLowerFirst
-083e23be l 00000003 sPageOrderUpperFirst
-083e23c1 l 00000003 sPageOrderSymbolsFirst
+083e2300 l 00000010 sBgTemplates
+083e2310 l 00000030 sWindowTemplates
+083e2340 l 00000060 sKeyboardChars
+083e23a0 l 00000003 sPageColumnCounts
+083e23a3 l 00000018 sPageColumnXPos
+083e23bb l 00000003 sPageToNextGfxId
+083e23be l 00000003 sPageToNextKeyboardId
+083e23c1 l 00000003 sPageToKeyboardId
 083e23c4 l 00000010 sPageSwapAnimStateFuncs
-083e23e4 l 00000003 sKeyRoles
-083e23e8 l 00000010 sPageSwapSpritesCBs
-083e23f8 l 00000006 gUnknown_83E2388
-083e23fe l 00000006 gUnknown_83E238E
+083e23e4 l 00000003 sButtonKeyRoles
+083e23e8 l 00000010 sPageSwapSpriteFuncs
+083e23f8 l 00000006 sPageSwapPalTags
+083e23fe l 00000006 sPageSwapGfxTags
 083e2404 l 00000014 sIconFunctions
-083e2418 l 00000014 gUnknown_83E23A8
-083e242c l 00000004 gUnknown_83E23BC
+083e2418 l 00000014 sAnim_Rival
+083e242c l 00000004 sAnims_Rival
 083e2440 l 00000010 sKeyboardKeyHandlers
-083e2450 l 00000008 sInputStateFuncs
-083e247c l 00000014 sPrintTitleFuncs
-083e2490 l 00000008 sAddGenderIconFuncs
+083e2450 l 00000008 sInputFuncs
+083e247c l 00000014 sDrawTextEntryBoxFuncs
+083e2490 l 00000008 sDrawGenderIconFuncs
 083e2498 l 00000006 sGenderColors
 083e24a0 l 0000000c sTextColorStruct
 083e24ac l 00000003 sFillValues
 083e24b0 l 0000000c sKeyboardTextColors
-083e24bc l 0000000c gUnknown_83E244C
+083e24bc l 0000000c sNextKeyboardPageTilemaps
 083e24cc l 0000000c sPlayerNamingScreenTemplate
 083e24d8 l 0000000c sPcBoxNamingScreenTemplate
 083e24e4 l 0000000c sMonNamingScreenTemplate
 083e24f0 l 0000000c sRivalNamingScreenTemplate
 083e24fc l 00000014 sNamingScreenTemplates
-083e2510 l 00000008 gOamData_858BFEC
-083e2518 l 00000008 gOamData_858BFF4
-083e2520 l 00000008 gOamData_858BFFC
-083e2528 l 00000020 gUnknown_83E24B8
-083e2548 l 00000008 gUnknown_83E24D8
-083e2550 l 00000018 gUnknown_83E24E0
-083e2568 l 0000000c gUnknown_83E24F8
-083e2574 l 00000008 gUnknown_83E2504
-083e257c l 00000018 gUnknown_83E250C
-083e2594 l 00000008 gUnknown_83E2524
-083e259c l 00000008 gUnknown_83E252C
-083e25a4 l 00000010 gUnknown_0858C080
-083e25b4 l 00000008 gSpriteAnim_858C090
-083e25bc l 0000000c gSpriteAnim_858C098
-083e25c8 l 0000000c gSpriteAnim_858C0A4
-083e25d4 l 00000004 gSpriteAnimTable_858C0B0
-083e25d8 l 00000008 gSpriteAnimTable_858C0B4
-083e25e0 l 00000004 gSpriteAnimTable_858C0BC
-083e25e4 l 00000018 gUnknown_83E2574
-083e25fc l 00000018 gUnknown_83E258C
-083e2614 l 00000018 gUnknown_83E25A4
-083e262c l 00000018 gUnknown_83E25BC
-083e2644 l 00000018 gUnknown_83E25D4
-083e265c l 00000018 gUnknown_83E25EC
+083e2510 l 00000008 sOam_8x8
+083e2518 l 00000008 sOam_16x16
+083e2520 l 00000008 sOam_32x16
+083e2528 l 00000020 sSubsprites_PageSwapFrame
+083e2548 l 00000008 sSubsprites_PageSwapText
+083e2550 l 00000018 sSubsprites_Button
+083e2568 l 0000000c sSubsprites_PCIcon
+083e2574 l 00000008 sSubspriteTable_PageSwapFrame
+083e257c l 00000018 sSubspriteTable_PageSwapText
+083e2594 l 00000008 sSubspriteTable_Button
+083e259c l 00000008 sSubspriteTable_PCIcon
+083e25a4 l 00000010 sImageTable_PCIcon
+083e25b4 l 00000008 sAnim_Loop
+083e25bc l 0000000c sAnim_CursorSquish
+083e25c8 l 0000000c sAnim_PCIcon
+083e25d4 l 00000004 sAnims_Loop
+083e25d8 l 00000008 sAnims_Cursor
+083e25e0 l 00000004 sAnims_PCIcon
+083e25e4 l 00000018 sSpriteTemplate_PageSwapFrame
+083e25fc l 00000018 sSpriteTemplate_PageSwapButton
+083e2614 l 00000018 sSpriteTemplate_PageSwapText
+083e262c l 00000018 sSpriteTemplate_BackButton
+083e2644 l 00000018 sSpriteTemplate_OkButton
+083e265c l 00000018 sSpriteTemplate_Cursor
 083e2674 l 00000018 sSpriteTemplate_InputArrow
 083e268c l 00000018 sSpriteTemplate_Underscore
-083e26a4 l 00000018 gUnknown_83E2634
+083e26a4 l 00000018 sSpriteTemplate_PCIcon
 083e26bc l 00000030 sNamingScreenKeyboardText
-083e26ec l 00000068 gUnknown_83E267C
-083e2754 l 00000048 gUnknown_83E26E4
+083e26ec l 00000068 sSpriteSheets
+083e2754 l 00000048 sSpritePalettes
 083e279c l 00000080 sBigMonSizeTable
 083e281c l 00000007 sGiftRibbonsMonDataIds
 083e2824 l 000001a0 sUnref_83E27B4
@@ -50704,31 +50704,26 @@
 08e97ddc g 00000020 gUnknown_8E97DDC
 08e97dfc g 000000c8 gUnknown_8E97DFC
 08e97ec4 g 00000120 gUnknown_8E97EC4
-08e97fe4 g 00000020 gUnknown_8E97FE4
-08e98004 g 00000020 gUnknown_8E98004
-08e98024 g 00000020 gNamingScreenMenu_Pal
-08e98044 g 00000020 gUnknown_8E98044
-08e98064 g 00000020 gUnknown_8E98064
-08e98084 g 00000020 gUnknown_8E98084
-08e980a4 g 00000020 gUnknown_8E980A4
-08e980c4 g 00000020 gUnknown_8E980C4
+08e97fe4 g 00000020 gNamingScreenKeyboard_Pal
+08e98004 g 00000020 gNamingScreenRival_Pal
+08e98024 g 000000c0 gNamingScreenMenu_Pal
 08e980e4 g 000001d8 gNamingScreenMenu_Gfx
-08e982bc g 000000dc gUnknown_8E982BC
-08e98398 g 000000c0 gUnknown_8E98398
-08e98458 g 000000c0 gUnknown_8E98458
-08e98518 g 000000c0 gUnknown_8E98518
-08e985d8 g 00000280 gUnknown_8E985D8
-08e98858 g 000001e0 gUnknown_8E98858
-08e98a38 g 000001e0 gUnknown_8E98A38
-08e98c18 g 000000a0 gUnknown_8E98C18
-08e98cb8 g 000000a0 gUnknown_8E98CB8
-08e98d58 g 000000a0 gUnknown_8E98D58
-08e98df8 g 000000a0 gUnknown_8E98DF8
-08e98e98 g 000000a0 gUnknown_8E98E98
-08e98f38 g 000000a0 gUnknown_8E98F38
-08e98fd8 g 00000100 gUnknown_8E98FD8
-08e990d8 g 00000020 gUnknown_8E990D8
-08e990f8 g 00000020 gUnknown_8E990F8
+08e982bc g 000000dc gNamingScreenBackground_Tilemap
+08e98398 g 000000c0 gNamingScreenKeyboardUpper_Tilemap
+08e98458 g 000000c0 gNamingScreenKeyboardLower_Tilemap
+08e98518 g 000000c0 gNamingScreenKeyboardSymbols_Tilemap
+08e985d8 g 00000280 gNamingScreenPageSwapFrame_Gfx
+08e98858 g 000001e0 gNamingScreenBackButton_Gfx
+08e98a38 g 000001e0 gNamingScreenOKButton_Gfx
+08e98c18 g 000000a0 gNamingScreenPageSwapUpper_Gfx
+08e98cb8 g 000000a0 gNamingScreenPageSwapLower_Gfx
+08e98d58 g 000000a0 gNamingScreenPageSwapOthers_Gfx
+08e98df8 g 000000a0 gNamingScreenCursor_Gfx
+08e98e98 g 000000a0 gNamingScreenCursorSquished_Gfx
+08e98f38 g 000000a0 gNamingScreenCursorFilled_Gfx
+08e98fd8 g 00000100 gNamingScreenPageSwapButton_Gfx
+08e990d8 g 00000020 gNamingScreenInputArrow_Gfx
+08e990f8 g 00000020 gNamingScreenUnderscore_Gfx
 08e99118 g 00000080 gUnknown_8E99118
 08e99198 g 00000060 gKantoTrainerCard_Pal
 08e991f8 g 00000674 gKantoTrainerCard_Gfx
diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym
index 2333bf64d..d1029ddb8 100644
--- a/pokeleafgreen.sym
+++ b/pokeleafgreen.sym
@@ -340,7 +340,7 @@
 0203996c g 00000018 gShopMenuHistory
 02039984 l 00000001 sEscalatorTaskId
 02039988 l 00000001 sDelay
-0203998c l 00000004 sNamingScreenData
+0203998c l 00000004 sNamingScreen
 02039990 l 00000001 sMoneyBoxWindowId
 02039994 g 00000001 gNumSafariBalls
 02039996 g 00000002 gSafariZoneStepCounter
@@ -6743,24 +6743,24 @@
 0809d894 g 00000092 GetSelectedSeagallopDestination
 0809d928 g 0000008c DoNamingScreen
 0809d928 l 00000000 .gcc2_compiled.
-0809d9b4 l 000000a4 CB2_NamingScreen
+0809d9b4 l 000000a4 CB2_LoadNamingScreen
 0809da58 l 000000ec NamingScreen_Init
-0809db44 l 00000040 sub_809DB70
+0809db44 l 00000040 SetSpritesVisible
 0809db84 l 000001b0 NamingScreen_InitBGs
-0809dd34 l 00000028 sub_809DD60
-0809dd5c l 00000096 sub_809DD88
-0809ddf4 l 00000010 sub_809DE20
-0809de04 l 00000020 sub_809DE30
-0809de24 l 00000020 sub_809DE50
-0809de44 l 000000b8 MainState_BeginFadeIn
+0809dd34 l 00000028 CreateNamingScreenTask
+0809dd5c l 00000096 Task_NamingScreen
+0809ddf4 l 00000010 PageToNextGfxId
+0809de04 l 00000020 CurrentPageToNextKeyboardId
+0809de24 l 00000020 CurrentPageToKeyboardId
+0809de44 l 000000b8 MainState_FadeIn
 0809defc l 0000003c MainState_WaitFadeIn
 0809df38 l 0000000e MainState_HandleInput
 0809df48 l 00000030 MainState_MoveToOKButton
-0809df78 l 00000070 pokemon_store
-0809dfe8 l 00000034 MainState_BeginFadeInOut
-0809e01c l 0000006c MainState_WaitFadeOutAndExit
-0809e088 l 00000120 pokemon_transfer_to_pc_with_message
-0809e1a8 l 0000003c sub_809E1D4
+0809df78 l 00000070 MainState_PressedOKButton
+0809dfe8 l 00000034 MainState_FadeOut
+0809e01c l 0000006c MainState_Exit
+0809e088 l 00000120 DisplaySentToPCMessage
+0809e1a8 l 0000003c MainState_WaitSentToPCMessage
 0809e1e4 l 00000040 MainState_StartPageSwap
 0809e224 l 000000bc MainState_WaitPageSwap
 0809e2e0 l 00000020 StartPageSwapAnim
@@ -6770,38 +6770,38 @@
 0809e380 l 00000094 PageSwapAnimState_1
 0809e414 l 00000094 PageSwapAnimState_2
 0809e4a8 l 0000001c PageSwapAnimState_Done
-0809e4c4 l 00000028 sub_809E4F0
-0809e4ec l 00000072 sub_809E518
-0809e560 l 000000b8 Task_809E58C
-0809e618 l 00000074 sub_809E644
-0809e68c l 00000028 sub_809E6B8
-0809e6b4 l 00000020 sub_809E6E0
-0809e6d4 l 000000f0 sub_809E700
-0809e7c4 l 0000004c sub_809E7F0
-0809e810 l 0000005c sub_809E83C
-0809e86c l 0000001a sub_809E898
-0809e888 l 00000094 CursorInit
+0809e4c4 l 00000028 CreateButtonFlashTask
+0809e4ec l 00000072 TryStartButtonFlash
+0809e560 l 000000b8 Task_UpdateButtonFlash
+0809e618 l 00000074 GetButtonPalOffset
+0809e68c l 00000028 RestoreButtonColor
+0809e6b4 l 00000020 StartButtonFlash
+0809e6d4 l 000000f0 SpriteCB_Cursor
+0809e7c4 l 0000004c SpriteCB_InputArrow
+0809e810 l 0000005c SpriteCB_Underscore
+0809e86c l 0000001a CreateSprites
+0809e888 l 00000094 CreateCursorSprite
 0809e91c l 00000084 SetCursorPos
 0809e9a0 l 0000002c GetCursorPos
 0809e9cc l 00000014 MoveCursorToOKButton
-0809e9e0 l 00000058 sub_809EA0C
-0809ea38 l 00000044 sub_809EA64
-0809ea7c l 0000002c sub_809EAA8
+0809e9e0 l 00000058 SetCursorInvisibility
+0809ea38 l 00000044 SetCursorFlashing
+0809ea7c l 0000002c SquishCursor
 0809eaa8 l 0000002c IsCursorAnimFinished
 0809ead4 l 0000003e GetKeyRoleAtCursorPos
 0809eb14 l 0000001c GetCurrentPageColumnCount
-0809eb30 l 000000c4 CreatePageSwitcherSprites
-0809ebf4 l 00000034 sub_809EC20
+0809eb30 l 000000c4 CreatePageSwapButtonSprites
+0809ebf4 l 00000034 StartPageSwapButtonAnim
 0809ec28 l 00000028 SpriteCB_PageSwap
-0809ec50 l 00000054 PageSwapSpritesCB_Init
-0809eca4 l 00000004 PageSwapSpritesCB_Idle
-0809eca8 l 00000074 PageSwapSpritesCB_SwapHide
-0809ed1c l 00000040 PageSwapSpritesCB_SwapShow
-0809ed5c l 00000060 sub_809ED88
+0809ec50 l 00000054 PageSwapSprite_Init
+0809eca4 l 00000004 PageSwapSprite_Idle
+0809eca8 l 00000074 PageSwapSprite_SlideOff
+0809ed1c l 00000040 PageSwapSprite_SlideOn
+0809ed5c l 00000060 SetPageSwapButtonGfx
 0809edbc l 00000078 CreateBackOkSprites
-0809ee34 l 000000c4 CreateUnderscoreSprites
+0809ee34 l 000000c4 CreateTextEntrySprites
 0809eef8 l 0000002c CreateInputTargetIcon
-0809ef24 l 00000002 NamingScreen_NoCreateIcon
+0809ef24 l 00000002 NamingScreen_NoIcon
 0809ef28 l 0000005c NamingScreen_CreatePlayerIcon
 0809ef84 l 00000040 NamingScreen_CreatePCIcon
 0809efc4 l 0000005c NamingScreen_CreateMonIcon
@@ -6811,46 +6811,46 @@
 0809f13c l 00000028 KeyboardKeyHandler_Page
 0809f164 l 00000022 KeyboardKeyHandler_Backspace
 0809f188 l 0000003c KeyboardKeyHandler_OK
-0809f1c4 l 00000018 TriggerKeyboardChange
-0809f1dc l 00000014 InputInit
+0809f1c4 l 00000018 SwapKeyboardPage
+0809f1dc l 00000014 CreateInputHandlerTask
 0809f1f0 l 00000024 GetInputEvent
 0809f214 l 0000002c SetInputState
 0809f240 l 00000030 Task_HandleInput
-0809f270 l 00000006 InputState_Disabled
-0809f278 l 00000054 InputState_Enabled
+0809f270 l 00000006 Input_Disabled
+0809f278 l 00000054 Input_Enabled
 0809f2cc l 000001a4 HandleDpadMovement
-0809f470 l 00000054 PrintTitleFunction_NoMon
-0809f4c4 l 0000007c PrintTitleFunction_WithMon
-0809f540 l 00000028 PrintTitle
-0809f568 l 0000002c CallAddGenderIconFunc
-0809f594 l 00000002 AddGenderIconFunc_No
-0809f598 l 00000070 AddGenderIconFunc_Yes
+0809f470 l 00000054 DrawNormalTextEntryBox
+0809f4c4 l 0000007c DrawMonTextEntryBox
+0809f540 l 00000028 DrawTextEntryBox
+0809f568 l 0000002c TryDrawGenderIcon
+0809f594 l 00000002 DummyGenderIcon
+0809f598 l 00000070 DrawGenderIcon
 0809f608 l 00000034 GetCharAtKeyboardPos
-0809f63c l 00000054 GetTextCaretPosition
+0809f63c l 00000054 GetTextEntryPosition
 0809f690 l 00000042 GetPreviousTextCaretPosition
 0809f6d4 l 0000005c DeleteTextCharacter
-0809f730 l 00000066 AppendCharToBuffer_CheckBufferFull
-0809f798 l 00000028 AddTextCharacter
-0809f7c0 l 00000070 CopyStringToDestBuffer
-0809f830 l 00000064 choose_name_or_words_screen_load_bg_tile_patterns
-0809f894 l 0000000e sub_809F8C0
-0809f8a4 l 00000030 choose_name_or_words_screen_apply_bg_pals
+0809f730 l 00000066 AddTextCharacter
+0809f798 l 00000028 BufferCharacter
+0809f7c0 l 00000070 SaveInputText
+0809f830 l 00000064 LoadGfx
+0809f894 l 0000000e CreateHelperTasks
+0809f8a4 l 00000030 LoadPalettes
 0809f8d4 l 00000012 DecompressToBgTilemapBuffer
-0809f8e8 l 000000d4 PrintBufferCharactersOnScreen
-0809f9bc l 00000078 sub_809F9E8
-0809fa34 l 00000084 sub_809FA60
-0809fab8 l 0000008c sub_809FAE4
-0809fb44 l 00000016 sub_809FB70
-0809fb5c l 00000012 NamingScreen_TurnOffScreen
-0809fb70 l 00000010 NamingScreen_InitDisplayMode
+0809f8e8 l 000000d4 DrawTextEntry
+0809f9bc l 00000078 PrintKeyboardKeys
+0809fa34 l 00000084 DrawKeyboardPageOnDeck
+0809fab8 l 0000008c PrintControls
+0809fb44 l 00000016 CB2_NamingScreen
+0809fb5c l 00000012 ResetVHBlank
+0809fb70 l 00000010 SetVBlank
 0809fb80 l 00000088 VBlankCB_NamingScreen
-0809fc08 l 0000001e ShowAllBgs
-0809fc28 l 0000003a IsLetter
-0809fc64 l 00000028 Debug_DoNamingScreen_Player
-0809fc8c l 00000028 Debug_DoNamingScreen_Box
-0809fcb4 l 00000028 Debug_DoNamingScreen_CaughtMon
-0809fcdc l 00000028 Debug_DoNamingScreen_NameRater
-0809fd04 l 00000028 Debug_DoNamingScreen_Rival
+0809fc08 l 0000001e NamingScreen_ShowBgs
+0809fc28 l 0000003a IsWideLetter
+0809fc64 l 00000028 Debug_NamingScreenPlayer
+0809fc8c l 00000028 Debug_NamingScreenBox
+0809fcb4 l 00000028 Debug_NamingScreenCaughtMon
+0809fcdc l 00000028 Debug_NamingScreenNickname
+0809fd04 l 00000028 Debug_NamingScreenRival
 0809fd2c g 00000018 GetMoney
 0809fd2c l 00000000 .gcc2_compiled.
 0809fd44 g 00000018 SetMoney
@@ -34137,70 +34137,70 @@
 083e15fc l 00000010 sMuseumKabutopsSprSheets
 083e160c l 00000010 sMuseumAerodactylSprSheets
 083e161c l 00000020 sSeagallopDestStrings
-083e163c l 000000c0 gUnknown_83E1800
-083e16fc l 000000c0 gUnknown_83E18C0
-083e17bc l 00000900 gUnknown_83E1980
+083e163c l 000000c0 sPCIconOff_Gfx
+083e16fc l 000000c0 sPCIconOn_Gfx
+083e17bc l 00000900 sRival_Gfx
 083e20bc l 00000010 sTransferredToPCMessages
-083e20cc l 00000010 gUnknown_83E2290
-083e20dc l 00000030 gUnknown_83E22A0
-083e210c l 00000060 gUnknown_83E22D0
-083e216c l 00000003 gUnknown_83E2330
-083e216f l 00000018 gUnknown_83E2333
-083e2187 l 00000003 sPageOrderLowerFirst
-083e218a l 00000003 sPageOrderUpperFirst
-083e218d l 00000003 sPageOrderSymbolsFirst
+083e20cc l 00000010 sBgTemplates
+083e20dc l 00000030 sWindowTemplates
+083e210c l 00000060 sKeyboardChars
+083e216c l 00000003 sPageColumnCounts
+083e216f l 00000018 sPageColumnXPos
+083e2187 l 00000003 sPageToNextGfxId
+083e218a l 00000003 sPageToNextKeyboardId
+083e218d l 00000003 sPageToKeyboardId
 083e2190 l 00000010 sPageSwapAnimStateFuncs
-083e21b0 l 00000003 sKeyRoles
-083e21b4 l 00000010 sPageSwapSpritesCBs
-083e21c4 l 00000006 gUnknown_83E2388
-083e21ca l 00000006 gUnknown_83E238E
+083e21b0 l 00000003 sButtonKeyRoles
+083e21b4 l 00000010 sPageSwapSpriteFuncs
+083e21c4 l 00000006 sPageSwapPalTags
+083e21ca l 00000006 sPageSwapGfxTags
 083e21d0 l 00000014 sIconFunctions
-083e21e4 l 00000014 gUnknown_83E23A8
-083e21f8 l 00000004 gUnknown_83E23BC
+083e21e4 l 00000014 sAnim_Rival
+083e21f8 l 00000004 sAnims_Rival
 083e220c l 00000010 sKeyboardKeyHandlers
-083e221c l 00000008 sInputStateFuncs
-083e2248 l 00000014 sPrintTitleFuncs
-083e225c l 00000008 sAddGenderIconFuncs
+083e221c l 00000008 sInputFuncs
+083e2248 l 00000014 sDrawTextEntryBoxFuncs
+083e225c l 00000008 sDrawGenderIconFuncs
 083e2264 l 00000006 sGenderColors
 083e226c l 0000000c sTextColorStruct
 083e2278 l 00000003 sFillValues
 083e227c l 0000000c sKeyboardTextColors
-083e2288 l 0000000c gUnknown_83E244C
+083e2288 l 0000000c sNextKeyboardPageTilemaps
 083e2298 l 0000000c sPlayerNamingScreenTemplate
 083e22a4 l 0000000c sPcBoxNamingScreenTemplate
 083e22b0 l 0000000c sMonNamingScreenTemplate
 083e22bc l 0000000c sRivalNamingScreenTemplate
 083e22c8 l 00000014 sNamingScreenTemplates
-083e22dc l 00000008 gOamData_858BFEC
-083e22e4 l 00000008 gOamData_858BFF4
-083e22ec l 00000008 gOamData_858BFFC
-083e22f4 l 00000020 gUnknown_83E24B8
-083e2314 l 00000008 gUnknown_83E24D8
-083e231c l 00000018 gUnknown_83E24E0
-083e2334 l 0000000c gUnknown_83E24F8
-083e2340 l 00000008 gUnknown_83E2504
-083e2348 l 00000018 gUnknown_83E250C
-083e2360 l 00000008 gUnknown_83E2524
-083e2368 l 00000008 gUnknown_83E252C
-083e2370 l 00000010 gUnknown_0858C080
-083e2380 l 00000008 gSpriteAnim_858C090
-083e2388 l 0000000c gSpriteAnim_858C098
-083e2394 l 0000000c gSpriteAnim_858C0A4
-083e23a0 l 00000004 gSpriteAnimTable_858C0B0
-083e23a4 l 00000008 gSpriteAnimTable_858C0B4
-083e23ac l 00000004 gSpriteAnimTable_858C0BC
-083e23b0 l 00000018 gUnknown_83E2574
-083e23c8 l 00000018 gUnknown_83E258C
-083e23e0 l 00000018 gUnknown_83E25A4
-083e23f8 l 00000018 gUnknown_83E25BC
-083e2410 l 00000018 gUnknown_83E25D4
-083e2428 l 00000018 gUnknown_83E25EC
+083e22dc l 00000008 sOam_8x8
+083e22e4 l 00000008 sOam_16x16
+083e22ec l 00000008 sOam_32x16
+083e22f4 l 00000020 sSubsprites_PageSwapFrame
+083e2314 l 00000008 sSubsprites_PageSwapText
+083e231c l 00000018 sSubsprites_Button
+083e2334 l 0000000c sSubsprites_PCIcon
+083e2340 l 00000008 sSubspriteTable_PageSwapFrame
+083e2348 l 00000018 sSubspriteTable_PageSwapText
+083e2360 l 00000008 sSubspriteTable_Button
+083e2368 l 00000008 sSubspriteTable_PCIcon
+083e2370 l 00000010 sImageTable_PCIcon
+083e2380 l 00000008 sAnim_Loop
+083e2388 l 0000000c sAnim_CursorSquish
+083e2394 l 0000000c sAnim_PCIcon
+083e23a0 l 00000004 sAnims_Loop
+083e23a4 l 00000008 sAnims_Cursor
+083e23ac l 00000004 sAnims_PCIcon
+083e23b0 l 00000018 sSpriteTemplate_PageSwapFrame
+083e23c8 l 00000018 sSpriteTemplate_PageSwapButton
+083e23e0 l 00000018 sSpriteTemplate_PageSwapText
+083e23f8 l 00000018 sSpriteTemplate_BackButton
+083e2410 l 00000018 sSpriteTemplate_OkButton
+083e2428 l 00000018 sSpriteTemplate_Cursor
 083e2440 l 00000018 sSpriteTemplate_InputArrow
 083e2458 l 00000018 sSpriteTemplate_Underscore
-083e2470 l 00000018 gUnknown_83E2634
+083e2470 l 00000018 sSpriteTemplate_PCIcon
 083e2488 l 00000030 sNamingScreenKeyboardText
-083e24b8 l 00000068 gUnknown_83E267C
-083e2520 l 00000048 gUnknown_83E26E4
+083e24b8 l 00000068 sSpriteSheets
+083e2520 l 00000048 sSpritePalettes
 083e2568 l 00000080 sBigMonSizeTable
 083e25e8 l 00000007 sGiftRibbonsMonDataIds
 083e25f0 l 000001a0 sUnref_83E27B4
@@ -50705,31 +50705,26 @@
 08e97e5c g 00000020 gUnknown_8E97DDC
 08e97e7c g 000000c8 gUnknown_8E97DFC
 08e97f44 g 00000120 gUnknown_8E97EC4
-08e98064 g 00000020 gUnknown_8E97FE4
-08e98084 g 00000020 gUnknown_8E98004
-08e980a4 g 00000020 gNamingScreenMenu_Pal
-08e980c4 g 00000020 gUnknown_8E98044
-08e980e4 g 00000020 gUnknown_8E98064
-08e98104 g 00000020 gUnknown_8E98084
-08e98124 g 00000020 gUnknown_8E980A4
-08e98144 g 00000020 gUnknown_8E980C4
+08e98064 g 00000020 gNamingScreenKeyboard_Pal
+08e98084 g 00000020 gNamingScreenRival_Pal
+08e980a4 g 000000c0 gNamingScreenMenu_Pal
 08e98164 g 000001d8 gNamingScreenMenu_Gfx
-08e9833c g 000000dc gUnknown_8E982BC
-08e98418 g 000000c0 gUnknown_8E98398
-08e984d8 g 000000c0 gUnknown_8E98458
-08e98598 g 000000c0 gUnknown_8E98518
-08e98658 g 00000280 gUnknown_8E985D8
-08e988d8 g 000001e0 gUnknown_8E98858
-08e98ab8 g 000001e0 gUnknown_8E98A38
-08e98c98 g 000000a0 gUnknown_8E98C18
-08e98d38 g 000000a0 gUnknown_8E98CB8
-08e98dd8 g 000000a0 gUnknown_8E98D58
-08e98e78 g 000000a0 gUnknown_8E98DF8
-08e98f18 g 000000a0 gUnknown_8E98E98
-08e98fb8 g 000000a0 gUnknown_8E98F38
-08e99058 g 00000100 gUnknown_8E98FD8
-08e99158 g 00000020 gUnknown_8E990D8
-08e99178 g 00000020 gUnknown_8E990F8
+08e9833c g 000000dc gNamingScreenBackground_Tilemap
+08e98418 g 000000c0 gNamingScreenKeyboardUpper_Tilemap
+08e984d8 g 000000c0 gNamingScreenKeyboardLower_Tilemap
+08e98598 g 000000c0 gNamingScreenKeyboardSymbols_Tilemap
+08e98658 g 00000280 gNamingScreenPageSwapFrame_Gfx
+08e988d8 g 000001e0 gNamingScreenBackButton_Gfx
+08e98ab8 g 000001e0 gNamingScreenOKButton_Gfx
+08e98c98 g 000000a0 gNamingScreenPageSwapUpper_Gfx
+08e98d38 g 000000a0 gNamingScreenPageSwapLower_Gfx
+08e98dd8 g 000000a0 gNamingScreenPageSwapOthers_Gfx
+08e98e78 g 000000a0 gNamingScreenCursor_Gfx
+08e98f18 g 000000a0 gNamingScreenCursorSquished_Gfx
+08e98fb8 g 000000a0 gNamingScreenCursorFilled_Gfx
+08e99058 g 00000100 gNamingScreenPageSwapButton_Gfx
+08e99158 g 00000020 gNamingScreenInputArrow_Gfx
+08e99178 g 00000020 gNamingScreenUnderscore_Gfx
 08e99198 g 00000080 gUnknown_8E99118
 08e99218 g 00000060 gKantoTrainerCard_Pal
 08e99278 g 00000674 gKantoTrainerCard_Gfx
diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym
index 9a71da483..cfc9fb48e 100644
--- a/pokeleafgreen_rev1.sym
+++ b/pokeleafgreen_rev1.sym
@@ -340,7 +340,7 @@
 0203996c g 00000018 gShopMenuHistory
 02039984 l 00000001 sEscalatorTaskId
 02039988 l 00000001 sDelay
-0203998c l 00000004 sNamingScreenData
+0203998c l 00000004 sNamingScreen
 02039990 l 00000001 sMoneyBoxWindowId
 02039994 g 00000001 gNumSafariBalls
 02039996 g 00000002 gSafariZoneStepCounter
@@ -6743,24 +6743,24 @@
 0809d8a8 g 00000092 GetSelectedSeagallopDestination
 0809d93c g 0000008c DoNamingScreen
 0809d93c l 00000000 .gcc2_compiled.
-0809d9c8 l 000000a4 CB2_NamingScreen
+0809d9c8 l 000000a4 CB2_LoadNamingScreen
 0809da6c l 000000ec NamingScreen_Init
-0809db58 l 00000040 sub_809DB70
+0809db58 l 00000040 SetSpritesVisible
 0809db98 l 000001b0 NamingScreen_InitBGs
-0809dd48 l 00000028 sub_809DD60
-0809dd70 l 00000096 sub_809DD88
-0809de08 l 00000010 sub_809DE20
-0809de18 l 00000020 sub_809DE30
-0809de38 l 00000020 sub_809DE50
-0809de58 l 000000b8 MainState_BeginFadeIn
+0809dd48 l 00000028 CreateNamingScreenTask
+0809dd70 l 00000096 Task_NamingScreen
+0809de08 l 00000010 PageToNextGfxId
+0809de18 l 00000020 CurrentPageToNextKeyboardId
+0809de38 l 00000020 CurrentPageToKeyboardId
+0809de58 l 000000b8 MainState_FadeIn
 0809df10 l 0000003c MainState_WaitFadeIn
 0809df4c l 0000000e MainState_HandleInput
 0809df5c l 00000030 MainState_MoveToOKButton
-0809df8c l 00000070 pokemon_store
-0809dffc l 00000034 MainState_BeginFadeInOut
-0809e030 l 0000006c MainState_WaitFadeOutAndExit
-0809e09c l 00000120 pokemon_transfer_to_pc_with_message
-0809e1bc l 0000003c sub_809E1D4
+0809df8c l 00000070 MainState_PressedOKButton
+0809dffc l 00000034 MainState_FadeOut
+0809e030 l 0000006c MainState_Exit
+0809e09c l 00000120 DisplaySentToPCMessage
+0809e1bc l 0000003c MainState_WaitSentToPCMessage
 0809e1f8 l 00000040 MainState_StartPageSwap
 0809e238 l 000000bc MainState_WaitPageSwap
 0809e2f4 l 00000020 StartPageSwapAnim
@@ -6770,38 +6770,38 @@
 0809e394 l 00000094 PageSwapAnimState_1
 0809e428 l 00000094 PageSwapAnimState_2
 0809e4bc l 0000001c PageSwapAnimState_Done
-0809e4d8 l 00000028 sub_809E4F0
-0809e500 l 00000072 sub_809E518
-0809e574 l 000000b8 Task_809E58C
-0809e62c l 00000074 sub_809E644
-0809e6a0 l 00000028 sub_809E6B8
-0809e6c8 l 00000020 sub_809E6E0
-0809e6e8 l 000000f0 sub_809E700
-0809e7d8 l 0000004c sub_809E7F0
-0809e824 l 0000005c sub_809E83C
-0809e880 l 0000001a sub_809E898
-0809e89c l 00000094 CursorInit
+0809e4d8 l 00000028 CreateButtonFlashTask
+0809e500 l 00000072 TryStartButtonFlash
+0809e574 l 000000b8 Task_UpdateButtonFlash
+0809e62c l 00000074 GetButtonPalOffset
+0809e6a0 l 00000028 RestoreButtonColor
+0809e6c8 l 00000020 StartButtonFlash
+0809e6e8 l 000000f0 SpriteCB_Cursor
+0809e7d8 l 0000004c SpriteCB_InputArrow
+0809e824 l 0000005c SpriteCB_Underscore
+0809e880 l 0000001a CreateSprites
+0809e89c l 00000094 CreateCursorSprite
 0809e930 l 00000084 SetCursorPos
 0809e9b4 l 0000002c GetCursorPos
 0809e9e0 l 00000014 MoveCursorToOKButton
-0809e9f4 l 00000058 sub_809EA0C
-0809ea4c l 00000044 sub_809EA64
-0809ea90 l 0000002c sub_809EAA8
+0809e9f4 l 00000058 SetCursorInvisibility
+0809ea4c l 00000044 SetCursorFlashing
+0809ea90 l 0000002c SquishCursor
 0809eabc l 0000002c IsCursorAnimFinished
 0809eae8 l 0000003e GetKeyRoleAtCursorPos
 0809eb28 l 0000001c GetCurrentPageColumnCount
-0809eb44 l 000000c4 CreatePageSwitcherSprites
-0809ec08 l 00000034 sub_809EC20
+0809eb44 l 000000c4 CreatePageSwapButtonSprites
+0809ec08 l 00000034 StartPageSwapButtonAnim
 0809ec3c l 00000028 SpriteCB_PageSwap
-0809ec64 l 00000054 PageSwapSpritesCB_Init
-0809ecb8 l 00000004 PageSwapSpritesCB_Idle
-0809ecbc l 00000074 PageSwapSpritesCB_SwapHide
-0809ed30 l 00000040 PageSwapSpritesCB_SwapShow
-0809ed70 l 00000060 sub_809ED88
+0809ec64 l 00000054 PageSwapSprite_Init
+0809ecb8 l 00000004 PageSwapSprite_Idle
+0809ecbc l 00000074 PageSwapSprite_SlideOff
+0809ed30 l 00000040 PageSwapSprite_SlideOn
+0809ed70 l 00000060 SetPageSwapButtonGfx
 0809edd0 l 00000078 CreateBackOkSprites
-0809ee48 l 000000c4 CreateUnderscoreSprites
+0809ee48 l 000000c4 CreateTextEntrySprites
 0809ef0c l 0000002c CreateInputTargetIcon
-0809ef38 l 00000002 NamingScreen_NoCreateIcon
+0809ef38 l 00000002 NamingScreen_NoIcon
 0809ef3c l 0000005c NamingScreen_CreatePlayerIcon
 0809ef98 l 00000040 NamingScreen_CreatePCIcon
 0809efd8 l 0000005c NamingScreen_CreateMonIcon
@@ -6811,46 +6811,46 @@
 0809f150 l 00000028 KeyboardKeyHandler_Page
 0809f178 l 00000022 KeyboardKeyHandler_Backspace
 0809f19c l 0000003c KeyboardKeyHandler_OK
-0809f1d8 l 00000018 TriggerKeyboardChange
-0809f1f0 l 00000014 InputInit
+0809f1d8 l 00000018 SwapKeyboardPage
+0809f1f0 l 00000014 CreateInputHandlerTask
 0809f204 l 00000024 GetInputEvent
 0809f228 l 0000002c SetInputState
 0809f254 l 00000030 Task_HandleInput
-0809f284 l 00000006 InputState_Disabled
-0809f28c l 00000054 InputState_Enabled
+0809f284 l 00000006 Input_Disabled
+0809f28c l 00000054 Input_Enabled
 0809f2e0 l 000001a4 HandleDpadMovement
-0809f484 l 00000054 PrintTitleFunction_NoMon
-0809f4d8 l 0000007c PrintTitleFunction_WithMon
-0809f554 l 00000028 PrintTitle
-0809f57c l 0000002c CallAddGenderIconFunc
-0809f5a8 l 00000002 AddGenderIconFunc_No
-0809f5ac l 00000070 AddGenderIconFunc_Yes
+0809f484 l 00000054 DrawNormalTextEntryBox
+0809f4d8 l 0000007c DrawMonTextEntryBox
+0809f554 l 00000028 DrawTextEntryBox
+0809f57c l 0000002c TryDrawGenderIcon
+0809f5a8 l 00000002 DummyGenderIcon
+0809f5ac l 00000070 DrawGenderIcon
 0809f61c l 00000034 GetCharAtKeyboardPos
-0809f650 l 00000054 GetTextCaretPosition
+0809f650 l 00000054 GetTextEntryPosition
 0809f6a4 l 00000042 GetPreviousTextCaretPosition
 0809f6e8 l 0000005c DeleteTextCharacter
-0809f744 l 00000066 AppendCharToBuffer_CheckBufferFull
-0809f7ac l 00000028 AddTextCharacter
-0809f7d4 l 00000070 CopyStringToDestBuffer
-0809f844 l 00000064 choose_name_or_words_screen_load_bg_tile_patterns
-0809f8a8 l 0000000e sub_809F8C0
-0809f8b8 l 00000030 choose_name_or_words_screen_apply_bg_pals
+0809f744 l 00000066 AddTextCharacter
+0809f7ac l 00000028 BufferCharacter
+0809f7d4 l 00000070 SaveInputText
+0809f844 l 00000064 LoadGfx
+0809f8a8 l 0000000e CreateHelperTasks
+0809f8b8 l 00000030 LoadPalettes
 0809f8e8 l 00000012 DecompressToBgTilemapBuffer
-0809f8fc l 000000d4 PrintBufferCharactersOnScreen
-0809f9d0 l 00000078 sub_809F9E8
-0809fa48 l 00000084 sub_809FA60
-0809facc l 0000008c sub_809FAE4
-0809fb58 l 00000016 sub_809FB70
-0809fb70 l 00000012 NamingScreen_TurnOffScreen
-0809fb84 l 00000010 NamingScreen_InitDisplayMode
+0809f8fc l 000000d4 DrawTextEntry
+0809f9d0 l 00000078 PrintKeyboardKeys
+0809fa48 l 00000084 DrawKeyboardPageOnDeck
+0809facc l 0000008c PrintControls
+0809fb58 l 00000016 CB2_NamingScreen
+0809fb70 l 00000012 ResetVHBlank
+0809fb84 l 00000010 SetVBlank
 0809fb94 l 00000088 VBlankCB_NamingScreen
-0809fc1c l 0000001e ShowAllBgs
-0809fc3c l 0000003a IsLetter
-0809fc78 l 00000028 Debug_DoNamingScreen_Player
-0809fca0 l 00000028 Debug_DoNamingScreen_Box
-0809fcc8 l 00000028 Debug_DoNamingScreen_CaughtMon
-0809fcf0 l 00000028 Debug_DoNamingScreen_NameRater
-0809fd18 l 00000028 Debug_DoNamingScreen_Rival
+0809fc1c l 0000001e NamingScreen_ShowBgs
+0809fc3c l 0000003a IsWideLetter
+0809fc78 l 00000028 Debug_NamingScreenPlayer
+0809fca0 l 00000028 Debug_NamingScreenBox
+0809fcc8 l 00000028 Debug_NamingScreenCaughtMon
+0809fcf0 l 00000028 Debug_NamingScreenNickname
+0809fd18 l 00000028 Debug_NamingScreenRival
 0809fd40 g 00000018 GetMoney
 0809fd40 l 00000000 .gcc2_compiled.
 0809fd58 g 00000018 SetMoney
@@ -34138,70 +34138,70 @@
 083e166c l 00000010 sMuseumKabutopsSprSheets
 083e167c l 00000010 sMuseumAerodactylSprSheets
 083e168c l 00000020 sSeagallopDestStrings
-083e16ac l 000000c0 gUnknown_83E1800
-083e176c l 000000c0 gUnknown_83E18C0
-083e182c l 00000900 gUnknown_83E1980
+083e16ac l 000000c0 sPCIconOff_Gfx
+083e176c l 000000c0 sPCIconOn_Gfx
+083e182c l 00000900 sRival_Gfx
 083e212c l 00000010 sTransferredToPCMessages
-083e213c l 00000010 gUnknown_83E2290
-083e214c l 00000030 gUnknown_83E22A0
-083e217c l 00000060 gUnknown_83E22D0
-083e21dc l 00000003 gUnknown_83E2330
-083e21df l 00000018 gUnknown_83E2333
-083e21f7 l 00000003 sPageOrderLowerFirst
-083e21fa l 00000003 sPageOrderUpperFirst
-083e21fd l 00000003 sPageOrderSymbolsFirst
+083e213c l 00000010 sBgTemplates
+083e214c l 00000030 sWindowTemplates
+083e217c l 00000060 sKeyboardChars
+083e21dc l 00000003 sPageColumnCounts
+083e21df l 00000018 sPageColumnXPos
+083e21f7 l 00000003 sPageToNextGfxId
+083e21fa l 00000003 sPageToNextKeyboardId
+083e21fd l 00000003 sPageToKeyboardId
 083e2200 l 00000010 sPageSwapAnimStateFuncs
-083e2220 l 00000003 sKeyRoles
-083e2224 l 00000010 sPageSwapSpritesCBs
-083e2234 l 00000006 gUnknown_83E2388
-083e223a l 00000006 gUnknown_83E238E
+083e2220 l 00000003 sButtonKeyRoles
+083e2224 l 00000010 sPageSwapSpriteFuncs
+083e2234 l 00000006 sPageSwapPalTags
+083e223a l 00000006 sPageSwapGfxTags
 083e2240 l 00000014 sIconFunctions
-083e2254 l 00000014 gUnknown_83E23A8
-083e2268 l 00000004 gUnknown_83E23BC
+083e2254 l 00000014 sAnim_Rival
+083e2268 l 00000004 sAnims_Rival
 083e227c l 00000010 sKeyboardKeyHandlers
-083e228c l 00000008 sInputStateFuncs
-083e22b8 l 00000014 sPrintTitleFuncs
-083e22cc l 00000008 sAddGenderIconFuncs
+083e228c l 00000008 sInputFuncs
+083e22b8 l 00000014 sDrawTextEntryBoxFuncs
+083e22cc l 00000008 sDrawGenderIconFuncs
 083e22d4 l 00000006 sGenderColors
 083e22dc l 0000000c sTextColorStruct
 083e22e8 l 00000003 sFillValues
 083e22ec l 0000000c sKeyboardTextColors
-083e22f8 l 0000000c gUnknown_83E244C
+083e22f8 l 0000000c sNextKeyboardPageTilemaps
 083e2308 l 0000000c sPlayerNamingScreenTemplate
 083e2314 l 0000000c sPcBoxNamingScreenTemplate
 083e2320 l 0000000c sMonNamingScreenTemplate
 083e232c l 0000000c sRivalNamingScreenTemplate
 083e2338 l 00000014 sNamingScreenTemplates
-083e234c l 00000008 gOamData_858BFEC
-083e2354 l 00000008 gOamData_858BFF4
-083e235c l 00000008 gOamData_858BFFC
-083e2364 l 00000020 gUnknown_83E24B8
-083e2384 l 00000008 gUnknown_83E24D8
-083e238c l 00000018 gUnknown_83E24E0
-083e23a4 l 0000000c gUnknown_83E24F8
-083e23b0 l 00000008 gUnknown_83E2504
-083e23b8 l 00000018 gUnknown_83E250C
-083e23d0 l 00000008 gUnknown_83E2524
-083e23d8 l 00000008 gUnknown_83E252C
-083e23e0 l 00000010 gUnknown_0858C080
-083e23f0 l 00000008 gSpriteAnim_858C090
-083e23f8 l 0000000c gSpriteAnim_858C098
-083e2404 l 0000000c gSpriteAnim_858C0A4
-083e2410 l 00000004 gSpriteAnimTable_858C0B0
-083e2414 l 00000008 gSpriteAnimTable_858C0B4
-083e241c l 00000004 gSpriteAnimTable_858C0BC
-083e2420 l 00000018 gUnknown_83E2574
-083e2438 l 00000018 gUnknown_83E258C
-083e2450 l 00000018 gUnknown_83E25A4
-083e2468 l 00000018 gUnknown_83E25BC
-083e2480 l 00000018 gUnknown_83E25D4
-083e2498 l 00000018 gUnknown_83E25EC
+083e234c l 00000008 sOam_8x8
+083e2354 l 00000008 sOam_16x16
+083e235c l 00000008 sOam_32x16
+083e2364 l 00000020 sSubsprites_PageSwapFrame
+083e2384 l 00000008 sSubsprites_PageSwapText
+083e238c l 00000018 sSubsprites_Button
+083e23a4 l 0000000c sSubsprites_PCIcon
+083e23b0 l 00000008 sSubspriteTable_PageSwapFrame
+083e23b8 l 00000018 sSubspriteTable_PageSwapText
+083e23d0 l 00000008 sSubspriteTable_Button
+083e23d8 l 00000008 sSubspriteTable_PCIcon
+083e23e0 l 00000010 sImageTable_PCIcon
+083e23f0 l 00000008 sAnim_Loop
+083e23f8 l 0000000c sAnim_CursorSquish
+083e2404 l 0000000c sAnim_PCIcon
+083e2410 l 00000004 sAnims_Loop
+083e2414 l 00000008 sAnims_Cursor
+083e241c l 00000004 sAnims_PCIcon
+083e2420 l 00000018 sSpriteTemplate_PageSwapFrame
+083e2438 l 00000018 sSpriteTemplate_PageSwapButton
+083e2450 l 00000018 sSpriteTemplate_PageSwapText
+083e2468 l 00000018 sSpriteTemplate_BackButton
+083e2480 l 00000018 sSpriteTemplate_OkButton
+083e2498 l 00000018 sSpriteTemplate_Cursor
 083e24b0 l 00000018 sSpriteTemplate_InputArrow
 083e24c8 l 00000018 sSpriteTemplate_Underscore
-083e24e0 l 00000018 gUnknown_83E2634
+083e24e0 l 00000018 sSpriteTemplate_PCIcon
 083e24f8 l 00000030 sNamingScreenKeyboardText
-083e2528 l 00000068 gUnknown_83E267C
-083e2590 l 00000048 gUnknown_83E26E4
+083e2528 l 00000068 sSpriteSheets
+083e2590 l 00000048 sSpritePalettes
 083e25d8 l 00000080 sBigMonSizeTable
 083e2658 l 00000007 sGiftRibbonsMonDataIds
 083e2660 l 000001a0 sUnref_83E27B4
@@ -50706,31 +50706,26 @@
 08e97e5c g 00000020 gUnknown_8E97DDC
 08e97e7c g 000000c8 gUnknown_8E97DFC
 08e97f44 g 00000120 gUnknown_8E97EC4
-08e98064 g 00000020 gUnknown_8E97FE4
-08e98084 g 00000020 gUnknown_8E98004
-08e980a4 g 00000020 gNamingScreenMenu_Pal
-08e980c4 g 00000020 gUnknown_8E98044
-08e980e4 g 00000020 gUnknown_8E98064
-08e98104 g 00000020 gUnknown_8E98084
-08e98124 g 00000020 gUnknown_8E980A4
-08e98144 g 00000020 gUnknown_8E980C4
+08e98064 g 00000020 gNamingScreenKeyboard_Pal
+08e98084 g 00000020 gNamingScreenRival_Pal
+08e980a4 g 000000c0 gNamingScreenMenu_Pal
 08e98164 g 000001d8 gNamingScreenMenu_Gfx
-08e9833c g 000000dc gUnknown_8E982BC
-08e98418 g 000000c0 gUnknown_8E98398
-08e984d8 g 000000c0 gUnknown_8E98458
-08e98598 g 000000c0 gUnknown_8E98518
-08e98658 g 00000280 gUnknown_8E985D8
-08e988d8 g 000001e0 gUnknown_8E98858
-08e98ab8 g 000001e0 gUnknown_8E98A38
-08e98c98 g 000000a0 gUnknown_8E98C18
-08e98d38 g 000000a0 gUnknown_8E98CB8
-08e98dd8 g 000000a0 gUnknown_8E98D58
-08e98e78 g 000000a0 gUnknown_8E98DF8
-08e98f18 g 000000a0 gUnknown_8E98E98
-08e98fb8 g 000000a0 gUnknown_8E98F38
-08e99058 g 00000100 gUnknown_8E98FD8
-08e99158 g 00000020 gUnknown_8E990D8
-08e99178 g 00000020 gUnknown_8E990F8
+08e9833c g 000000dc gNamingScreenBackground_Tilemap
+08e98418 g 000000c0 gNamingScreenKeyboardUpper_Tilemap
+08e984d8 g 000000c0 gNamingScreenKeyboardLower_Tilemap
+08e98598 g 000000c0 gNamingScreenKeyboardSymbols_Tilemap
+08e98658 g 00000280 gNamingScreenPageSwapFrame_Gfx
+08e988d8 g 000001e0 gNamingScreenBackButton_Gfx
+08e98ab8 g 000001e0 gNamingScreenOKButton_Gfx
+08e98c98 g 000000a0 gNamingScreenPageSwapUpper_Gfx
+08e98d38 g 000000a0 gNamingScreenPageSwapLower_Gfx
+08e98dd8 g 000000a0 gNamingScreenPageSwapOthers_Gfx
+08e98e78 g 000000a0 gNamingScreenCursor_Gfx
+08e98f18 g 000000a0 gNamingScreenCursorSquished_Gfx
+08e98fb8 g 000000a0 gNamingScreenCursorFilled_Gfx
+08e99058 g 00000100 gNamingScreenPageSwapButton_Gfx
+08e99158 g 00000020 gNamingScreenInputArrow_Gfx
+08e99178 g 00000020 gNamingScreenUnderscore_Gfx
 08e99198 g 00000080 gUnknown_8E99118
 08e99218 g 00000060 gKantoTrainerCard_Pal
 08e99278 g 00000674 gKantoTrainerCard_Gfx