From 6ccd32f67d786e2cfa8dcd9be5b188978e5b3f65 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Mon, 27 Feb 2023 18:29:37 +0000 Subject: [PATCH] Merge pull request #1855 from GriffinRichards/doc-chat --- pokeemerald.sym | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 1f1dee6be7..fb484cb09e 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -2214,11 +2214,11 @@ 08020480 l 000000b8 ResetGpuBgState 08020538 l 0000004c SetBgTilemapBuffers 08020584 l 00000030 ClearBg0 -080205b4 l 00000050 LoadChatWindowBorderGfx +080205b4 l 00000050 LoadKeyboardWindowGfx 08020604 l 0000007c LoadChatWindowGfx 08020680 l 00000024 LoadChatUnkPalette 080206a4 l 0000002c LoadChatMessagesWindow -080206d0 l 00000018 LoadKeyboardWindow +080206d0 l 00000018 DrawKeyboardWindow 080206e8 l 00000058 LoadTextEntryWindow 08020740 l 00000030 LoadKeyboardSwapWindow 08020770 l 00000050 InitScanlineEffect @@ -37467,8 +37467,8 @@ 082f2aa4 l 00000004 sKeyboardPageMaxRow 082f2aa8 l 00000100 sCaseToggleTable 082f2ba8 l 00000078 sUnionRoomKeyboardText -082f2c20 l 00000020 sUnk_Palette1 -082f2c40 l 00000020 sUnk_Palette2 +082f2c20 l 00000020 sUnusedPalette +082f2c40 l 00000020 sChatMessagesWindow_Pal 082f2c60 l 00000010 sBgTemplates 082f2c70 l 00000028 sWinTemplates 082f2c98 l 000000a8 sDisplaySubtasks @@ -73121,10 +73121,10 @@ 08dd4860 g 00000020 gUnionRoomChat_Background_Pal 08dd4880 g 00000238 gUnionRoomChat_Background_Gfx 08dd4ab8 g 000000f8 gUnionRoomChat_Background_Tilemap -08dd4bb0 g 00000020 gUnionRoomChat_Window_Pal1 -08dd4bd0 g 00000020 gUnionRoomChat_Window_Pal2 -08dd4bf0 g 0000005c gUnionRoomChat_Border_Gfx -08dd4c4c g 000000ac gUnionRoomChat_Border_Tilemap +08dd4bb0 g 00000020 gUnionRoomChat_InputText_Pal +08dd4bd0 g 00000020 gUnionRoomChat_Keyboard_Pal +08dd4bf0 g 0000005c gUnionRoomChat_Keyboard_Gfx +08dd4c4c g 000000ac gUnionRoomChat_Keyboard_Tilemap 08dd4cf8 g 00000118 gUnionRoomChat_RButtonLabels 08dd4e10 g 00000200 gTilesetPalettes_General 08dd5010 g 000022d0 gTilesetTiles_General