From 27a8920fc02999bdc2314ccf9b6f8a8f60a9db37 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Sat, 26 Nov 2022 23:22:38 +0000 Subject: [PATCH] Merge pull request #587 from GriffinRichards/sync-text --- pokefirered.sym | 102 ++++++++++++++++++++--------------------- pokefirered_rev1.sym | 102 ++++++++++++++++++++--------------------- pokeleafgreen.sym | 102 ++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 102 ++++++++++++++++++++--------------------- 4 files changed, 204 insertions(+), 204 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index 10143ef26..c65a48bf4 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -1102,13 +1102,13 @@ 0800520c g 000000cc BlitBitmapRectToWindow4BitTo8Bit 080052d8 g 00000076 CopyWindowToVram8Bit 08005350 l 0000002c GetNumActiveWindowsOnBg8Bit -0800537c g 00000032 Font0Func +0800537c g 00000032 FontFunc_Small 0800537c l 00000000 .gcc2_compiled. -080053b0 g 00000036 Font1Func -080053e8 g 00000036 Font2Func -08005420 g 00000036 Font3Func -08005458 g 00000036 Font4Func -08005490 g 00000036 Font5Func +080053b0 g 00000036 FontFunc_NormalCopy1 +080053e8 g 00000036 FontFunc_Normal +08005420 g 00000036 FontFunc_NormalCopy2 +08005458 g 00000036 FontFunc_Male +08005490 g 00000036 FontFunc_Female 080054c8 g 00000030 TextPrinterInitDownArrowCounters 080054f8 g 000000dc TextPrinterDrawDownArrow 080055d4 g 00000032 TextPrinterClearDownArrow @@ -1120,27 +1120,27 @@ 08005d70 l 00000132 GetStringWidthFixedWidthFont 08005ea4 g 0000002e GetFontWidthFunc 08005ed4 g 0000024e GetStringWidth -08006124 g 0000018c RenderTextFont9 -080062b0 g 0000004e sub_80062B0 -08006300 g 00000098 CreateTextCursorSpriteForOakSpeech +08006124 g 0000018c RenderTextHandleBold +080062b0 l 0000004e SpriteCB_TextCursor +08006300 g 00000098 CreateTextCursorSprite 08006398 g 00000030 DestroyTextCursorSprite 080063c8 g 00000050 DrawKeypadIcon 08006418 g 00000010 GetKeypadIconTileOffset 08006428 g 00000010 GetKeypadIconWidth 08006438 g 00000010 GetKeypadIconHeight -08006448 g 00000088 DecompressGlyphFont0 -080064d0 g 0000001e GetGlyphWidthFont0 -080064f0 g 000000a8 DecompressGlyphFont1 -08006598 g 0000001e GetGlyphWidthFont1 -080065b8 g 00000140 DecompressGlyphFont2 -080066f8 g 0000002c GetGlyphWidthFont2 -08006724 l 000000a8 DecompressGlyphFont3 -080067cc g 0000001e GetGlyphWidthFont3 -080067ec l 00000140 DecompressGlyphFont4 -0800692c g 0000002c GetGlyphWidthFont4 -08006958 g 00000140 DecompressGlyphFont5 -08006a98 g 0000002c GetGlyphWidthFont5 -08006ac4 g 0000004c DecompressGlyphFont9 +08006448 g 00000088 DecompressGlyph_Small +080064d0 l 0000001e GetGlyphWidth_Small +080064f0 l 000000a8 DecompressGlyph_NormalCopy1 +08006598 l 0000001e GetGlyphWidth_NormalCopy1 +080065b8 g 00000140 DecompressGlyph_Normal +080066f8 l 0000002c GetGlyphWidth_Normal +08006724 l 000000a8 DecompressGlyph_NormalCopy2 +080067cc l 0000001e GetGlyphWidth_NormalCopy2 +080067ec l 00000140 DecompressGlyph_Male +0800692c l 0000002c GetGlyphWidth_Male +08006958 g 00000140 DecompressGlyph_Female +08006a98 l 0000002c GetGlyphWidth_Female +08006ac4 l 0000004c DecompressGlyph_Bold 08006b10 g 0000004c ResetSpriteData 08006b10 l 00000000 .gcc2_compiled. 08006b5c g 0000004c AnimateSprites @@ -12616,10 +12616,10 @@ 0814f714 l 000000a6 CountPlayersInGroupAndGetActivity 0814f7bc l 00000026 HaveCountsChanged 0814f7e4 l 000000a0 UpdateCommunicationCounts -0814f884 g 00000418 Font6Func +0814f884 g 00000418 FontFunc_Braille 0814f884 l 00000000 .gcc2_compiled. -0814fc9c l 00000064 DecompressGlyphFont6 -0814fd00 g 00000004 GetGlyphWidthFont6 +0814fc9c l 00000064 DecompressGlyph_Braille +0814fd00 g 00000004 GetGlyphWidth_Braille 0814fd04 l 00000000 .gcc2_compiled. 0814fd04 l 00000034 LoadHelpMessageWindowGfxOnBg 0814fd38 l 00000034 LoadMenuMessageWindowGfxOnBg @@ -25660,32 +25660,32 @@ 081ea54c l 00000080 sDoubleArrowTiles1 081ea5cc l 00000080 sDoubleArrowTiles2 081ea64c l 00000004 sDownArrowYCoords -081ea650 l 00000004 sWindowVerticalScrollSpeeds +081ea650 l 00000003 sWindowVerticalScrollSpeeds 081ea654 l 00000038 sGlyphWidthFuncs -081ea68c l 00000018 sUnknown_81EA68C -081ea6a4 l 00000010 sUnknown_81EA6A4 -081ea6b4 l 00000018 sUnknown_81EA6B4 +081ea68c l 00000018 sSpriteSheets_TextCursor +081ea6a4 l 00000010 sSpritePalettes_TextCursor +081ea6b4 l 00000018 sSpriteTemplate_TextCursor 081ea6cc l 00000034 sKeypadIcons 081ea700 g 00000800 gKeypadIconTiles -081eaf00 l 00004000 sFont0LatinGlyphs -081eef00 l 00000200 sFont0LatinGlyphWidths -081ef100 l 00004000 sFont0JapaneseGlyphs -081f3100 l 00008000 sFont1LatinGlyphs -081fb100 l 00000200 sFont1LatinGlyphWidths -081fb300 l 00004000 sFont1JapaneseGlyphs -081ff300 l 00008000 sFont2LatinGlyphs -08207300 l 00000200 sFont2LatinGlyphWidths -08207500 l 00008000 sFont2JapaneseGlyphs -0820f500 l 00000118 sFont2JapaneseGlyphWidths -0820f618 l 00008000 sFont4LatinGlyphs -08217618 l 00000200 sFont4LatinGlyphWidths -08217818 l 00008000 sFont4JapaneseGlyphs -0821f818 l 00000118 sFont4JapaneseGlyphWidths -0821f930 l 00008000 sFont5LatinGlyphs -08227930 l 00000200 sFont5LatinGlyphWidths -08227b30 l 00008000 sFont5JapaneseGlyphs -0822fb30 l 00000118 sFont5JapaneseGlyphWidths -0822fc48 l 00002000 sFont9JapaneseGlyphs +081eaf00 l 00004000 sFontSmallLatinGlyphs +081eef00 l 00000200 sFontSmallLatinGlyphWidths +081ef100 l 00004000 sFontSmallJapaneseGlyphs +081f3100 l 00008000 sFontNormalCopy1LatinGlyphs +081fb100 l 00000200 sFontNormalCopy1LatinGlyphWidths +081fb300 l 00004000 sFontTallJapaneseGlyphs +081ff300 l 00008000 sFontNormalLatinGlyphs +08207300 l 00000200 sFontNormalLatinGlyphWidths +08207500 l 00008000 sFontNormalJapaneseGlyphs +0820f500 l 00000118 sFontNormalJapaneseGlyphWidths +0820f618 l 00008000 sFontMaleLatinGlyphs +08217618 l 00000200 sFontMaleLatinGlyphWidths +08217818 l 00008000 sFontMaleJapaneseGlyphs +0821f818 l 00000118 sFontMaleJapaneseGlyphWidths +0821f930 l 00008000 sFontFemaleLatinGlyphs +08227930 l 00000200 sFontFemaleLatinGlyphWidths +08227b30 l 00008000 sFontFemaleJapaneseGlyphs +0822fb30 l 00000118 sFontFemaleJapaneseGlyphWidths +0822fc48 l 00002000 sFontBoldJapaneseGlyphs 08231c48 l 00000025 sDmaOverErrorMsg 08231c6d l 00000018 sUnknownData 08231c85 l 00000018 sCenterToCornerVecTable @@ -37721,8 +37721,8 @@ 084166d3 g 00000008 gText_TMCase 084166db g 00000006 gText_Close 084166e1 g 0000001e gText_TMCaseWillBePutAway -084166ff g 00000004 gText_Font0 -08416703 g 00000004 gText_Font2 +084166ff g 00000004 gText_FontSmall +08416703 g 00000004 gText_FontNormal 08416707 g 00000003 gText_EmptySpace 0841670a g 0000000c gText_BerryPouch 08416716 g 00000022 gText_TheBerryPouchWillBePutAway @@ -41774,7 +41774,7 @@ 0846faac l 00000014 sHeaderTexts 0846fac0 l 00000045 sActivityGroupInfo 0846fb08 l 00000003 sScrollDistances -0846fb0c l 00001000 sFont6BrailleGlyphs +0846fb0c l 00001000 sBrailleGlyphs 08470b0c g 00000260 gSignpostWindow_Gfx 08470d6c l 00000120 sUserFrame_Type1_Gfx 08470e8c l 00000120 sUserFrame_Type2_Gfx diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 53cabacd5..326404007 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -1102,13 +1102,13 @@ 08005220 g 000000cc BlitBitmapRectToWindow4BitTo8Bit 080052ec g 00000076 CopyWindowToVram8Bit 08005364 l 0000002c GetNumActiveWindowsOnBg8Bit -08005390 g 00000032 Font0Func +08005390 g 00000032 FontFunc_Small 08005390 l 00000000 .gcc2_compiled. -080053c4 g 00000036 Font1Func -080053fc g 00000036 Font2Func -08005434 g 00000036 Font3Func -0800546c g 00000036 Font4Func -080054a4 g 00000036 Font5Func +080053c4 g 00000036 FontFunc_NormalCopy1 +080053fc g 00000036 FontFunc_Normal +08005434 g 00000036 FontFunc_NormalCopy2 +0800546c g 00000036 FontFunc_Male +080054a4 g 00000036 FontFunc_Female 080054dc g 00000030 TextPrinterInitDownArrowCounters 0800550c g 000000dc TextPrinterDrawDownArrow 080055e8 g 00000032 TextPrinterClearDownArrow @@ -1120,27 +1120,27 @@ 08005d84 l 00000132 GetStringWidthFixedWidthFont 08005eb8 g 0000002e GetFontWidthFunc 08005ee8 g 0000024e GetStringWidth -08006138 g 0000018c RenderTextFont9 -080062c4 g 0000004e sub_80062B0 -08006314 g 00000098 CreateTextCursorSpriteForOakSpeech +08006138 g 0000018c RenderTextHandleBold +080062c4 l 0000004e SpriteCB_TextCursor +08006314 g 00000098 CreateTextCursorSprite 080063ac g 00000030 DestroyTextCursorSprite 080063dc g 00000050 DrawKeypadIcon 0800642c g 00000010 GetKeypadIconTileOffset 0800643c g 00000010 GetKeypadIconWidth 0800644c g 00000010 GetKeypadIconHeight -0800645c g 00000088 DecompressGlyphFont0 -080064e4 g 0000001e GetGlyphWidthFont0 -08006504 g 000000a8 DecompressGlyphFont1 -080065ac g 0000001e GetGlyphWidthFont1 -080065cc g 00000140 DecompressGlyphFont2 -0800670c g 0000002c GetGlyphWidthFont2 -08006738 l 000000a8 DecompressGlyphFont3 -080067e0 g 0000001e GetGlyphWidthFont3 -08006800 l 00000140 DecompressGlyphFont4 -08006940 g 0000002c GetGlyphWidthFont4 -0800696c g 00000140 DecompressGlyphFont5 -08006aac g 0000002c GetGlyphWidthFont5 -08006ad8 g 0000004c DecompressGlyphFont9 +0800645c g 00000088 DecompressGlyph_Small +080064e4 l 0000001e GetGlyphWidth_Small +08006504 l 000000a8 DecompressGlyph_NormalCopy1 +080065ac l 0000001e GetGlyphWidth_NormalCopy1 +080065cc g 00000140 DecompressGlyph_Normal +0800670c l 0000002c GetGlyphWidth_Normal +08006738 l 000000a8 DecompressGlyph_NormalCopy2 +080067e0 l 0000001e GetGlyphWidth_NormalCopy2 +08006800 l 00000140 DecompressGlyph_Male +08006940 l 0000002c GetGlyphWidth_Male +0800696c g 00000140 DecompressGlyph_Female +08006aac l 0000002c GetGlyphWidth_Female +08006ad8 l 0000004c DecompressGlyph_Bold 08006b24 g 0000004c ResetSpriteData 08006b24 l 00000000 .gcc2_compiled. 08006b70 g 0000004c AnimateSprites @@ -12617,10 +12617,10 @@ 0814f78c l 000000a6 CountPlayersInGroupAndGetActivity 0814f834 l 00000026 HaveCountsChanged 0814f85c l 000000a0 UpdateCommunicationCounts -0814f8fc g 00000418 Font6Func +0814f8fc g 00000418 FontFunc_Braille 0814f8fc l 00000000 .gcc2_compiled. -0814fd14 l 00000064 DecompressGlyphFont6 -0814fd78 g 00000004 GetGlyphWidthFont6 +0814fd14 l 00000064 DecompressGlyph_Braille +0814fd78 g 00000004 GetGlyphWidth_Braille 0814fd7c l 00000000 .gcc2_compiled. 0814fd7c l 00000034 LoadHelpMessageWindowGfxOnBg 0814fdb0 l 00000034 LoadMenuMessageWindowGfxOnBg @@ -25661,32 +25661,32 @@ 081ea5bc l 00000080 sDoubleArrowTiles1 081ea63c l 00000080 sDoubleArrowTiles2 081ea6bc l 00000004 sDownArrowYCoords -081ea6c0 l 00000004 sWindowVerticalScrollSpeeds +081ea6c0 l 00000003 sWindowVerticalScrollSpeeds 081ea6c4 l 00000038 sGlyphWidthFuncs -081ea6fc l 00000018 sUnknown_81EA68C -081ea714 l 00000010 sUnknown_81EA6A4 -081ea724 l 00000018 sUnknown_81EA6B4 +081ea6fc l 00000018 sSpriteSheets_TextCursor +081ea714 l 00000010 sSpritePalettes_TextCursor +081ea724 l 00000018 sSpriteTemplate_TextCursor 081ea73c l 00000034 sKeypadIcons 081ea770 g 00000800 gKeypadIconTiles -081eaf70 l 00004000 sFont0LatinGlyphs -081eef70 l 00000200 sFont0LatinGlyphWidths -081ef170 l 00004000 sFont0JapaneseGlyphs -081f3170 l 00008000 sFont1LatinGlyphs -081fb170 l 00000200 sFont1LatinGlyphWidths -081fb370 l 00004000 sFont1JapaneseGlyphs -081ff370 l 00008000 sFont2LatinGlyphs -08207370 l 00000200 sFont2LatinGlyphWidths -08207570 l 00008000 sFont2JapaneseGlyphs -0820f570 l 00000118 sFont2JapaneseGlyphWidths -0820f688 l 00008000 sFont4LatinGlyphs -08217688 l 00000200 sFont4LatinGlyphWidths -08217888 l 00008000 sFont4JapaneseGlyphs -0821f888 l 00000118 sFont4JapaneseGlyphWidths -0821f9a0 l 00008000 sFont5LatinGlyphs -082279a0 l 00000200 sFont5LatinGlyphWidths -08227ba0 l 00008000 sFont5JapaneseGlyphs -0822fba0 l 00000118 sFont5JapaneseGlyphWidths -0822fcb8 l 00002000 sFont9JapaneseGlyphs +081eaf70 l 00004000 sFontSmallLatinGlyphs +081eef70 l 00000200 sFontSmallLatinGlyphWidths +081ef170 l 00004000 sFontSmallJapaneseGlyphs +081f3170 l 00008000 sFontNormalCopy1LatinGlyphs +081fb170 l 00000200 sFontNormalCopy1LatinGlyphWidths +081fb370 l 00004000 sFontTallJapaneseGlyphs +081ff370 l 00008000 sFontNormalLatinGlyphs +08207370 l 00000200 sFontNormalLatinGlyphWidths +08207570 l 00008000 sFontNormalJapaneseGlyphs +0820f570 l 00000118 sFontNormalJapaneseGlyphWidths +0820f688 l 00008000 sFontMaleLatinGlyphs +08217688 l 00000200 sFontMaleLatinGlyphWidths +08217888 l 00008000 sFontMaleJapaneseGlyphs +0821f888 l 00000118 sFontMaleJapaneseGlyphWidths +0821f9a0 l 00008000 sFontFemaleLatinGlyphs +082279a0 l 00000200 sFontFemaleLatinGlyphWidths +08227ba0 l 00008000 sFontFemaleJapaneseGlyphs +0822fba0 l 00000118 sFontFemaleJapaneseGlyphWidths +0822fcb8 l 00002000 sFontBoldJapaneseGlyphs 08231cb8 l 00000025 sDmaOverErrorMsg 08231cdd l 00000018 sUnknownData 08231cf5 l 00000018 sCenterToCornerVecTable @@ -37722,8 +37722,8 @@ 08416743 g 00000008 gText_TMCase 0841674b g 00000006 gText_Close 08416751 g 0000001e gText_TMCaseWillBePutAway -0841676f g 00000004 gText_Font0 -08416773 g 00000004 gText_Font2 +0841676f g 00000004 gText_FontSmall +08416773 g 00000004 gText_FontNormal 08416777 g 00000003 gText_EmptySpace 0841677a g 0000000c gText_BerryPouch 08416786 g 00000022 gText_TheBerryPouchWillBePutAway @@ -41775,7 +41775,7 @@ 0846fb0c l 00000014 sHeaderTexts 0846fb20 l 00000045 sActivityGroupInfo 0846fb68 l 00000003 sScrollDistances -0846fb6c l 00001000 sFont6BrailleGlyphs +0846fb6c l 00001000 sBrailleGlyphs 08470b6c g 00000260 gSignpostWindow_Gfx 08470dcc l 00000120 sUserFrame_Type1_Gfx 08470eec l 00000120 sUserFrame_Type2_Gfx diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 29fc3dee3..1bbb33987 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -1102,13 +1102,13 @@ 0800520c g 000000cc BlitBitmapRectToWindow4BitTo8Bit 080052d8 g 00000076 CopyWindowToVram8Bit 08005350 l 0000002c GetNumActiveWindowsOnBg8Bit -0800537c g 00000032 Font0Func +0800537c g 00000032 FontFunc_Small 0800537c l 00000000 .gcc2_compiled. -080053b0 g 00000036 Font1Func -080053e8 g 00000036 Font2Func -08005420 g 00000036 Font3Func -08005458 g 00000036 Font4Func -08005490 g 00000036 Font5Func +080053b0 g 00000036 FontFunc_NormalCopy1 +080053e8 g 00000036 FontFunc_Normal +08005420 g 00000036 FontFunc_NormalCopy2 +08005458 g 00000036 FontFunc_Male +08005490 g 00000036 FontFunc_Female 080054c8 g 00000030 TextPrinterInitDownArrowCounters 080054f8 g 000000dc TextPrinterDrawDownArrow 080055d4 g 00000032 TextPrinterClearDownArrow @@ -1120,27 +1120,27 @@ 08005d70 l 00000132 GetStringWidthFixedWidthFont 08005ea4 g 0000002e GetFontWidthFunc 08005ed4 g 0000024e GetStringWidth -08006124 g 0000018c RenderTextFont9 -080062b0 g 0000004e sub_80062B0 -08006300 g 00000098 CreateTextCursorSpriteForOakSpeech +08006124 g 0000018c RenderTextHandleBold +080062b0 l 0000004e SpriteCB_TextCursor +08006300 g 00000098 CreateTextCursorSprite 08006398 g 00000030 DestroyTextCursorSprite 080063c8 g 00000050 DrawKeypadIcon 08006418 g 00000010 GetKeypadIconTileOffset 08006428 g 00000010 GetKeypadIconWidth 08006438 g 00000010 GetKeypadIconHeight -08006448 g 00000088 DecompressGlyphFont0 -080064d0 g 0000001e GetGlyphWidthFont0 -080064f0 g 000000a8 DecompressGlyphFont1 -08006598 g 0000001e GetGlyphWidthFont1 -080065b8 g 00000140 DecompressGlyphFont2 -080066f8 g 0000002c GetGlyphWidthFont2 -08006724 l 000000a8 DecompressGlyphFont3 -080067cc g 0000001e GetGlyphWidthFont3 -080067ec l 00000140 DecompressGlyphFont4 -0800692c g 0000002c GetGlyphWidthFont4 -08006958 g 00000140 DecompressGlyphFont5 -08006a98 g 0000002c GetGlyphWidthFont5 -08006ac4 g 0000004c DecompressGlyphFont9 +08006448 g 00000088 DecompressGlyph_Small +080064d0 l 0000001e GetGlyphWidth_Small +080064f0 l 000000a8 DecompressGlyph_NormalCopy1 +08006598 l 0000001e GetGlyphWidth_NormalCopy1 +080065b8 g 00000140 DecompressGlyph_Normal +080066f8 l 0000002c GetGlyphWidth_Normal +08006724 l 000000a8 DecompressGlyph_NormalCopy2 +080067cc l 0000001e GetGlyphWidth_NormalCopy2 +080067ec l 00000140 DecompressGlyph_Male +0800692c l 0000002c GetGlyphWidth_Male +08006958 g 00000140 DecompressGlyph_Female +08006a98 l 0000002c GetGlyphWidth_Female +08006ac4 l 0000004c DecompressGlyph_Bold 08006b10 g 0000004c ResetSpriteData 08006b10 l 00000000 .gcc2_compiled. 08006b5c g 0000004c AnimateSprites @@ -12618,10 +12618,10 @@ 0814f6f0 l 000000a6 CountPlayersInGroupAndGetActivity 0814f798 l 00000026 HaveCountsChanged 0814f7c0 l 000000a0 UpdateCommunicationCounts -0814f860 g 00000418 Font6Func +0814f860 g 00000418 FontFunc_Braille 0814f860 l 00000000 .gcc2_compiled. -0814fc78 l 00000064 DecompressGlyphFont6 -0814fcdc g 00000004 GetGlyphWidthFont6 +0814fc78 l 00000064 DecompressGlyph_Braille +0814fcdc g 00000004 GetGlyphWidth_Braille 0814fce0 l 00000000 .gcc2_compiled. 0814fce0 l 00000034 LoadHelpMessageWindowGfxOnBg 0814fd14 l 00000034 LoadMenuMessageWindowGfxOnBg @@ -25662,32 +25662,32 @@ 081ea528 l 00000080 sDoubleArrowTiles1 081ea5a8 l 00000080 sDoubleArrowTiles2 081ea628 l 00000004 sDownArrowYCoords -081ea62c l 00000004 sWindowVerticalScrollSpeeds +081ea62c l 00000003 sWindowVerticalScrollSpeeds 081ea630 l 00000038 sGlyphWidthFuncs -081ea668 l 00000018 sUnknown_81EA68C -081ea680 l 00000010 sUnknown_81EA6A4 -081ea690 l 00000018 sUnknown_81EA6B4 +081ea668 l 00000018 sSpriteSheets_TextCursor +081ea680 l 00000010 sSpritePalettes_TextCursor +081ea690 l 00000018 sSpriteTemplate_TextCursor 081ea6a8 l 00000034 sKeypadIcons 081ea6dc g 00000800 gKeypadIconTiles -081eaedc l 00004000 sFont0LatinGlyphs -081eeedc l 00000200 sFont0LatinGlyphWidths -081ef0dc l 00004000 sFont0JapaneseGlyphs -081f30dc l 00008000 sFont1LatinGlyphs -081fb0dc l 00000200 sFont1LatinGlyphWidths -081fb2dc l 00004000 sFont1JapaneseGlyphs -081ff2dc l 00008000 sFont2LatinGlyphs -082072dc l 00000200 sFont2LatinGlyphWidths -082074dc l 00008000 sFont2JapaneseGlyphs -0820f4dc l 00000118 sFont2JapaneseGlyphWidths -0820f5f4 l 00008000 sFont4LatinGlyphs -082175f4 l 00000200 sFont4LatinGlyphWidths -082177f4 l 00008000 sFont4JapaneseGlyphs -0821f7f4 l 00000118 sFont4JapaneseGlyphWidths -0821f90c l 00008000 sFont5LatinGlyphs -0822790c l 00000200 sFont5LatinGlyphWidths -08227b0c l 00008000 sFont5JapaneseGlyphs -0822fb0c l 00000118 sFont5JapaneseGlyphWidths -0822fc24 l 00002000 sFont9JapaneseGlyphs +081eaedc l 00004000 sFontSmallLatinGlyphs +081eeedc l 00000200 sFontSmallLatinGlyphWidths +081ef0dc l 00004000 sFontSmallJapaneseGlyphs +081f30dc l 00008000 sFontNormalCopy1LatinGlyphs +081fb0dc l 00000200 sFontNormalCopy1LatinGlyphWidths +081fb2dc l 00004000 sFontTallJapaneseGlyphs +081ff2dc l 00008000 sFontNormalLatinGlyphs +082072dc l 00000200 sFontNormalLatinGlyphWidths +082074dc l 00008000 sFontNormalJapaneseGlyphs +0820f4dc l 00000118 sFontNormalJapaneseGlyphWidths +0820f5f4 l 00008000 sFontMaleLatinGlyphs +082175f4 l 00000200 sFontMaleLatinGlyphWidths +082177f4 l 00008000 sFontMaleJapaneseGlyphs +0821f7f4 l 00000118 sFontMaleJapaneseGlyphWidths +0821f90c l 00008000 sFontFemaleLatinGlyphs +0822790c l 00000200 sFontFemaleLatinGlyphWidths +08227b0c l 00008000 sFontFemaleJapaneseGlyphs +0822fb0c l 00000118 sFontFemaleJapaneseGlyphWidths +0822fc24 l 00002000 sFontBoldJapaneseGlyphs 08231c24 l 00000025 sDmaOverErrorMsg 08231c49 l 00000018 sUnknownData 08231c61 l 00000018 sCenterToCornerVecTable @@ -37723,8 +37723,8 @@ 0841650f g 00000008 gText_TMCase 08416517 g 00000006 gText_Close 0841651d g 0000001e gText_TMCaseWillBePutAway -0841653b g 00000004 gText_Font0 -0841653f g 00000004 gText_Font2 +0841653b g 00000004 gText_FontSmall +0841653f g 00000004 gText_FontNormal 08416543 g 00000003 gText_EmptySpace 08416546 g 0000000c gText_BerryPouch 08416552 g 00000022 gText_TheBerryPouchWillBePutAway @@ -41776,7 +41776,7 @@ 0846f388 l 00000014 sHeaderTexts 0846f39c l 00000045 sActivityGroupInfo 0846f3e4 l 00000003 sScrollDistances -0846f3e8 l 00001000 sFont6BrailleGlyphs +0846f3e8 l 00001000 sBrailleGlyphs 084703e8 g 00000260 gSignpostWindow_Gfx 08470648 l 00000120 sUserFrame_Type1_Gfx 08470768 l 00000120 sUserFrame_Type2_Gfx diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index e29e0652c..a492bd860 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -1102,13 +1102,13 @@ 08005220 g 000000cc BlitBitmapRectToWindow4BitTo8Bit 080052ec g 00000076 CopyWindowToVram8Bit 08005364 l 0000002c GetNumActiveWindowsOnBg8Bit -08005390 g 00000032 Font0Func +08005390 g 00000032 FontFunc_Small 08005390 l 00000000 .gcc2_compiled. -080053c4 g 00000036 Font1Func -080053fc g 00000036 Font2Func -08005434 g 00000036 Font3Func -0800546c g 00000036 Font4Func -080054a4 g 00000036 Font5Func +080053c4 g 00000036 FontFunc_NormalCopy1 +080053fc g 00000036 FontFunc_Normal +08005434 g 00000036 FontFunc_NormalCopy2 +0800546c g 00000036 FontFunc_Male +080054a4 g 00000036 FontFunc_Female 080054dc g 00000030 TextPrinterInitDownArrowCounters 0800550c g 000000dc TextPrinterDrawDownArrow 080055e8 g 00000032 TextPrinterClearDownArrow @@ -1120,27 +1120,27 @@ 08005d84 l 00000132 GetStringWidthFixedWidthFont 08005eb8 g 0000002e GetFontWidthFunc 08005ee8 g 0000024e GetStringWidth -08006138 g 0000018c RenderTextFont9 -080062c4 g 0000004e sub_80062B0 -08006314 g 00000098 CreateTextCursorSpriteForOakSpeech +08006138 g 0000018c RenderTextHandleBold +080062c4 l 0000004e SpriteCB_TextCursor +08006314 g 00000098 CreateTextCursorSprite 080063ac g 00000030 DestroyTextCursorSprite 080063dc g 00000050 DrawKeypadIcon 0800642c g 00000010 GetKeypadIconTileOffset 0800643c g 00000010 GetKeypadIconWidth 0800644c g 00000010 GetKeypadIconHeight -0800645c g 00000088 DecompressGlyphFont0 -080064e4 g 0000001e GetGlyphWidthFont0 -08006504 g 000000a8 DecompressGlyphFont1 -080065ac g 0000001e GetGlyphWidthFont1 -080065cc g 00000140 DecompressGlyphFont2 -0800670c g 0000002c GetGlyphWidthFont2 -08006738 l 000000a8 DecompressGlyphFont3 -080067e0 g 0000001e GetGlyphWidthFont3 -08006800 l 00000140 DecompressGlyphFont4 -08006940 g 0000002c GetGlyphWidthFont4 -0800696c g 00000140 DecompressGlyphFont5 -08006aac g 0000002c GetGlyphWidthFont5 -08006ad8 g 0000004c DecompressGlyphFont9 +0800645c g 00000088 DecompressGlyph_Small +080064e4 l 0000001e GetGlyphWidth_Small +08006504 l 000000a8 DecompressGlyph_NormalCopy1 +080065ac l 0000001e GetGlyphWidth_NormalCopy1 +080065cc g 00000140 DecompressGlyph_Normal +0800670c l 0000002c GetGlyphWidth_Normal +08006738 l 000000a8 DecompressGlyph_NormalCopy2 +080067e0 l 0000001e GetGlyphWidth_NormalCopy2 +08006800 l 00000140 DecompressGlyph_Male +08006940 l 0000002c GetGlyphWidth_Male +0800696c g 00000140 DecompressGlyph_Female +08006aac l 0000002c GetGlyphWidth_Female +08006ad8 l 0000004c DecompressGlyph_Bold 08006b24 g 0000004c ResetSpriteData 08006b24 l 00000000 .gcc2_compiled. 08006b70 g 0000004c AnimateSprites @@ -12619,10 +12619,10 @@ 0814f768 l 000000a6 CountPlayersInGroupAndGetActivity 0814f810 l 00000026 HaveCountsChanged 0814f838 l 000000a0 UpdateCommunicationCounts -0814f8d8 g 00000418 Font6Func +0814f8d8 g 00000418 FontFunc_Braille 0814f8d8 l 00000000 .gcc2_compiled. -0814fcf0 l 00000064 DecompressGlyphFont6 -0814fd54 g 00000004 GetGlyphWidthFont6 +0814fcf0 l 00000064 DecompressGlyph_Braille +0814fd54 g 00000004 GetGlyphWidth_Braille 0814fd58 l 00000000 .gcc2_compiled. 0814fd58 l 00000034 LoadHelpMessageWindowGfxOnBg 0814fd8c l 00000034 LoadMenuMessageWindowGfxOnBg @@ -25663,32 +25663,32 @@ 081ea598 l 00000080 sDoubleArrowTiles1 081ea618 l 00000080 sDoubleArrowTiles2 081ea698 l 00000004 sDownArrowYCoords -081ea69c l 00000004 sWindowVerticalScrollSpeeds +081ea69c l 00000003 sWindowVerticalScrollSpeeds 081ea6a0 l 00000038 sGlyphWidthFuncs -081ea6d8 l 00000018 sUnknown_81EA68C -081ea6f0 l 00000010 sUnknown_81EA6A4 -081ea700 l 00000018 sUnknown_81EA6B4 +081ea6d8 l 00000018 sSpriteSheets_TextCursor +081ea6f0 l 00000010 sSpritePalettes_TextCursor +081ea700 l 00000018 sSpriteTemplate_TextCursor 081ea718 l 00000034 sKeypadIcons 081ea74c g 00000800 gKeypadIconTiles -081eaf4c l 00004000 sFont0LatinGlyphs -081eef4c l 00000200 sFont0LatinGlyphWidths -081ef14c l 00004000 sFont0JapaneseGlyphs -081f314c l 00008000 sFont1LatinGlyphs -081fb14c l 00000200 sFont1LatinGlyphWidths -081fb34c l 00004000 sFont1JapaneseGlyphs -081ff34c l 00008000 sFont2LatinGlyphs -0820734c l 00000200 sFont2LatinGlyphWidths -0820754c l 00008000 sFont2JapaneseGlyphs -0820f54c l 00000118 sFont2JapaneseGlyphWidths -0820f664 l 00008000 sFont4LatinGlyphs -08217664 l 00000200 sFont4LatinGlyphWidths -08217864 l 00008000 sFont4JapaneseGlyphs -0821f864 l 00000118 sFont4JapaneseGlyphWidths -0821f97c l 00008000 sFont5LatinGlyphs -0822797c l 00000200 sFont5LatinGlyphWidths -08227b7c l 00008000 sFont5JapaneseGlyphs -0822fb7c l 00000118 sFont5JapaneseGlyphWidths -0822fc94 l 00002000 sFont9JapaneseGlyphs +081eaf4c l 00004000 sFontSmallLatinGlyphs +081eef4c l 00000200 sFontSmallLatinGlyphWidths +081ef14c l 00004000 sFontSmallJapaneseGlyphs +081f314c l 00008000 sFontNormalCopy1LatinGlyphs +081fb14c l 00000200 sFontNormalCopy1LatinGlyphWidths +081fb34c l 00004000 sFontTallJapaneseGlyphs +081ff34c l 00008000 sFontNormalLatinGlyphs +0820734c l 00000200 sFontNormalLatinGlyphWidths +0820754c l 00008000 sFontNormalJapaneseGlyphs +0820f54c l 00000118 sFontNormalJapaneseGlyphWidths +0820f664 l 00008000 sFontMaleLatinGlyphs +08217664 l 00000200 sFontMaleLatinGlyphWidths +08217864 l 00008000 sFontMaleJapaneseGlyphs +0821f864 l 00000118 sFontMaleJapaneseGlyphWidths +0821f97c l 00008000 sFontFemaleLatinGlyphs +0822797c l 00000200 sFontFemaleLatinGlyphWidths +08227b7c l 00008000 sFontFemaleJapaneseGlyphs +0822fb7c l 00000118 sFontFemaleJapaneseGlyphWidths +0822fc94 l 00002000 sFontBoldJapaneseGlyphs 08231c94 l 00000025 sDmaOverErrorMsg 08231cb9 l 00000018 sUnknownData 08231cd1 l 00000018 sCenterToCornerVecTable @@ -37724,8 +37724,8 @@ 0841657f g 00000008 gText_TMCase 08416587 g 00000006 gText_Close 0841658d g 0000001e gText_TMCaseWillBePutAway -084165ab g 00000004 gText_Font0 -084165af g 00000004 gText_Font2 +084165ab g 00000004 gText_FontSmall +084165af g 00000004 gText_FontNormal 084165b3 g 00000003 gText_EmptySpace 084165b6 g 0000000c gText_BerryPouch 084165c2 g 00000022 gText_TheBerryPouchWillBePutAway @@ -41777,7 +41777,7 @@ 0846f3f8 l 00000014 sHeaderTexts 0846f40c l 00000045 sActivityGroupInfo 0846f454 l 00000003 sScrollDistances -0846f458 l 00001000 sFont6BrailleGlyphs +0846f458 l 00001000 sBrailleGlyphs 08470458 g 00000260 gSignpostWindow_Gfx 084706b8 l 00000120 sUserFrame_Type1_Gfx 084707d8 l 00000120 sUserFrame_Type2_Gfx