Merge pull request #1536 from GriffinRichards/clean-braille

This commit is contained in:
GriffinRichards
2021-11-03 17:22:27 +00:00
parent cd04741d71
commit 0110ebf959
+61 -61
View File
@@ -596,7 +596,7 @@
0203bd02 l 0000000c sUnused1 0203bd02 l 0000000c sUnused1
0203bd0e l 00000002 sWindowIds 0203bd0e l 00000002 sWindowIds
0203bd10 l 00000004 sUnused2 0203bd10 l 00000004 sUnused2
0203bd14 l 00000001 sBraillePuzzleCallbackFlag 0203bd14 l 00000001 sIsRegisteelPuzzle
0203bd18 l 00000004 sPokeblockFeed 0203bd18 l 00000004 sPokeblockFeed
0203bd1c l 00000008 sPokeblockSpritePal 0203bd1c l 00000008 sPokeblockSpritePal
0203bd24 g 00000002 gIntroCredits_MovingSceneryVBase 0203bd24 g 00000002 gIntroCredits_MovingSceneryVBase
@@ -1247,8 +1247,8 @@
08004434 g 000000cc BlitBitmapRectToWindow4BitTo8Bit 08004434 g 000000cc BlitBitmapRectToWindow4BitTo8Bit
08004500 g 00000076 CopyWindowToVram8Bit 08004500 g 00000076 CopyWindowToVram8Bit
08004578 l 0000002c GetNumActiveWindowsOnBg8Bit 08004578 l 0000002c GetNumActiveWindowsOnBg8Bit
080045a4 g 0000000c SetFontsPointer
080045a4 l 00000000 .gcc2_compiled. 080045a4 l 00000000 .gcc2_compiled.
080045a4 l 0000000c SetFontsPointer
080045b0 g 00000020 DeactivateAllTextPrinters 080045b0 g 00000020 DeactivateAllTextPrinters
080045d0 g 000000ac AddTextPrinterParameterized 080045d0 g 000000ac AddTextPrinterParameterized
0800467c g 000000fc AddTextPrinter 0800467c g 000000fc AddTextPrinter
@@ -1262,14 +1262,14 @@
08004d58 g 00000046 GetLastTextColor 08004d58 g 00000046 GetLastTextColor
08004da0 g 00000528 CopyGlyphToWindow 08004da0 g 00000528 CopyGlyphToWindow
080052c8 g 00000074 ClearTextSpan 080052c8 g 00000074 ClearTextSpan
0800533c g 00000032 Font0Func 0800533c l 00000032 FontFunc_Small
08005370 g 00000036 Font1Func 08005370 l 00000036 FontFunc_Normal
080053a8 g 00000036 Font2Func 080053a8 l 00000036 FontFunc_Short
080053e0 g 00000036 Font3Func 080053e0 l 00000036 FontFunc_ShortCopy1
08005418 g 00000036 Font4Func 08005418 l 00000036 FontFunc_ShortCopy2
08005450 g 00000036 Font5Func 08005450 l 00000036 FontFunc_ShortCopy3
08005488 g 00000036 Font7Func 08005488 l 00000036 FontFunc_Narrow
080054c0 g 00000036 Font8Func 080054c0 l 00000036 FontFunc_SmallNarrow
080054f8 g 00000030 TextPrinterInitDownArrowCounters 080054f8 g 00000030 TextPrinterInitDownArrowCounters
08005528 g 000000d8 TextPrinterDrawDownArrow 08005528 g 000000d8 TextPrinterDrawDownArrow
08005600 g 00000032 TextPrinterClearDownArrow 08005600 g 00000032 TextPrinterClearDownArrow
@@ -1278,10 +1278,10 @@
0800569c g 00000044 TextPrinterWait 0800569c g 00000044 TextPrinterWait
080056e0 g 000000d4 DrawDownArrow 080056e0 g 000000d4 DrawDownArrow
080057b4 g 000005c0 RenderText 080057b4 g 000005c0 RenderText
08005d74 g 00000132 GetStringWidthFixedWidthFont 08005d74 l 00000132 GetStringWidthFixedWidthFont
08005ea8 g 0000002e GetFontWidthFunc 08005ea8 l 0000002e GetFontWidthFunc
08005ed8 g 00000266 GetStringWidth 08005ed8 g 00000266 GetStringWidth
08006140 g 000001a8 RenderTextFont9 08006140 g 000001a8 RenderTextHandleBold
080062e8 g 00000050 DrawKeypadIcon 080062e8 g 00000050 DrawKeypadIcon
08006338 g 00000010 GetKeypadIconTileOffset 08006338 g 00000010 GetKeypadIconTileOffset
08006348 g 00000010 GetKeypadIconWidth 08006348 g 00000010 GetKeypadIconWidth
@@ -1289,17 +1289,17 @@
08006368 g 00000010 SetDefaultFontsPointer 08006368 g 00000010 SetDefaultFontsPointer
08006378 g 000000e8 GetFontAttribute 08006378 g 000000e8 GetFontAttribute
08006460 g 00000018 GetMenuCursorDimensionByFont 08006460 g 00000018 GetMenuCursorDimensionByFont
08006478 g 000000c8 DecompressGlyphFont0 08006478 l 000000c8 DecompressGlyph_Small
08006540 g 0000001e GetGlyphWidthFont0 08006540 l 0000001e GetGlyphWidth_Small
08006560 g 000000c8 DecompressGlyphFont7 08006560 l 000000c8 DecompressGlyph_Narrow
08006628 g 0000001e GetGlyphWidthFont7 08006628 l 0000001e GetGlyphWidth_Narrow
08006648 g 000000c8 DecompressGlyphFont8 08006648 l 000000c8 DecompressGlyph_SmallNarrow
08006710 g 0000001e GetGlyphWidthFont8 08006710 l 0000001e GetGlyphWidth_SmallNarrow
08006730 g 000000ec DecompressGlyphFont2 08006730 l 000000ec DecompressGlyph_Short
0800681c g 00000024 GetGlyphWidthFont2 0800681c l 00000024 GetGlyphWidth_Short
08006840 g 000000c8 DecompressGlyphFont1 08006840 l 000000c8 DecompressGlyph_Normal
08006908 g 0000001e GetGlyphWidthFont1 08006908 l 0000001e GetGlyphWidth_Normal
08006928 g 0000004c DecompressGlyphFont9 08006928 l 0000004c DecompressGlyph_Bold
08006974 g 0000004c ResetSpriteData 08006974 g 0000004c ResetSpriteData
08006974 l 00000000 .gcc2_compiled. 08006974 l 00000000 .gcc2_compiled.
080069c0 g 0000004c AnimateSprites 080069c0 g 0000004c AnimateSprites
@@ -13602,18 +13602,18 @@
0817963c g 00000070 DoBrailleDigEffect 0817963c g 00000070 DoBrailleDigEffect
081796ac g 00000050 CheckRelicanthWailord 081796ac g 00000050 CheckRelicanthWailord
081796fc g 00000002 ShouldDoBrailleRegirockEffectOld 081796fc g 00000002 ShouldDoBrailleRegirockEffectOld
08179700 g 0000003c DoSealedChamberShakingEffect1 08179700 g 0000003c DoSealedChamberShakingEffect_Long
0817973c g 0000003c DoSealedChamberShakingEffect2 0817973c g 0000003c DoSealedChamberShakingEffect_Short
08179778 g 00000064 SealedChamberShakingEffect 08179778 l 00000064 Task_SealedChamberShakingEffect
081797dc g 00000056 ShouldDoBrailleRegirockEffect 081797dc g 00000056 ShouldDoBrailleRegirockEffect
08179834 g 0000001c SetUpPuzzleEffectRegirock 08179834 g 0000001c SetUpPuzzleEffectRegirock
08179850 g 00000010 UseRegirockHm_Callback 08179850 g 00000010 UseRegirockHm_Callback
08179860 g 00000070 DoBrailleRegirockEffect 08179860 l 00000070 DoBrailleRegirockEffect
081798d0 g 00000046 ShouldDoBrailleRegisteelEffect 081798d0 g 00000046 ShouldDoBrailleRegisteelEffect
08179918 g 0000001c SetUpPuzzleEffectRegisteel 08179918 g 0000001c SetUpPuzzleEffectRegisteel
08179934 g 00000010 UseRegisteelHm_Callback 08179934 g 00000010 UseRegisteelHm_Callback
08179944 g 00000070 DoBrailleRegisteelEffect 08179944 l 00000070 DoBrailleRegisteelEffect
081799b4 g 00000002 DoBrailleWait 081799b4 l 00000002 DoBrailleWait
081799b8 g 0000004c FldEff_UsePuzzleEffect 081799b8 g 0000004c FldEff_UsePuzzleEffect
08179a04 g 00000164 ShouldDoBrailleRegicePuzzle 08179a04 g 00000164 ShouldDoBrailleRegicePuzzle
08179b68 l 00000000 .gcc2_compiled. 08179b68 l 00000000 .gcc2_compiled.
@@ -15561,10 +15561,10 @@
081b9e94 g 0000002c InSlateportBattleTent 081b9e94 g 0000002c InSlateportBattleTent
081b9ec0 l 00000180 GenerateInitialRentalMons 081b9ec0 l 00000180 GenerateInitialRentalMons
081ba040 l 00000210 GenerateOpponentMons 081ba040 l 00000210 GenerateOpponentMons
081ba250 g 00000418 Font6Func 081ba250 g 00000418 FontFunc_Braille
081ba250 l 00000000 .gcc2_compiled. 081ba250 l 00000000 .gcc2_compiled.
081ba668 l 00000064 DecompressGlyphFont6 081ba668 l 00000064 DecompressGlyph_Braille
081ba6cc g 00000004 GetGlyphWidthFont6 081ba6cc g 00000004 GetGlyphWidth_Braille
081ba6d0 g 0000003c MultiBootInit 081ba6d0 g 0000003c MultiBootInit
081ba6d0 l 00000000 .gcc2_compiled. 081ba6d0 l 00000000 .gcc2_compiled.
081ba70c g 000003ee MultiBootMain 081ba70c g 000003ee MultiBootMain
@@ -15914,8 +15914,8 @@
081c6a14 l 00000080 CancelItemSwap 081c6a14 l 00000080 CancelItemSwap
081c6a94 g 00000144 TryStoreHeldItemsInPyramidBag 081c6a94 g 00000144 TryStoreHeldItemsInPyramidBag
081c6bd8 l 00000064 InitPyramidBagWindows 081c6bd8 l 00000064 InitPyramidBagWindows
081c6c3c l 00000058 PrintOnWindow_Font1 081c6c3c l 00000058 PyramidBagPrint
081c6c94 l 00000058 PrintOnWindow_Font7 081c6c94 l 00000058 PyramidBagPrint_Quantity
081c6cec l 0000001a DrawTossNumberWindow 081c6cec l 0000001a DrawTossNumberWindow
081c6d08 l 0000001c GetMenuActionWindowId 081c6d08 l 0000001c GetMenuActionWindowId
081c6d24 l 00000048 OpenMenuActionWindowById 081c6d24 l 00000048 OpenMenuActionWindowById
@@ -36952,12 +36952,12 @@
082e9c0c g 00000100 gUnusedFRLGDownArrow 082e9c0c g 00000100 gUnusedFRLGDownArrow
082e9d0c g 00000004 gDownArrowYCoords 082e9d0c g 00000004 gDownArrowYCoords
082e9d10 g 00000004 gWindowVerticalScrollSpeeds 082e9d10 g 00000004 gWindowVerticalScrollSpeeds
082e9d14 g 00000048 gGlyphWidthFuncs 082e9d14 l 00000048 sGlyphWidthFuncs
082e9d5c g 00000034 gKeypadIcons 082e9d5c g 00000034 gKeypadIcons
082e9d90 g 00000800 gKeypadIconTiles 082e9d90 g 00000800 gKeypadIconTiles
082ea590 g 00000078 gFontInfos 082ea590 l 00000078 sFontInfos
082ea608 g 00000014 gMenuCursorDimensions 082ea608 l 00000014 sMenuCursorDimensions
082ea61c g 00002000 gFont9JapaneseGlyphs 082ea61c g 00002000 gFontBoldJapaneseGlyphs
082ec61c l 00000018 sUnknownData 082ec61c l 00000018 sUnknownData
082ec634 l 00000018 sCenterToCornerVecTable 082ec634 l 00000018 sCenterToCornerVecTable
082ec64c l 00000044 sDummySprite 082ec64c l 00000044 sDummySprite
@@ -40999,8 +40999,8 @@
0832c35c l 00000008 sOamData_StatusSummaryBalls 0832c35c l 00000008 sOamData_StatusSummaryBalls
0832c364 l 00000030 sStatusSummaryBarSpriteTemplates 0832c364 l 00000030 sStatusSummaryBarSpriteTemplates
0832c394 l 00000030 sStatusSummaryBallsSpriteTemplates 0832c394 l 00000030 sStatusSummaryBallsSpriteTemplates
0832c3c4 l 00000014 sUnknown_0832C3C4 0832c3c4 l 00000014 sEmptyWhiteText_GrayHighlight
0832c3d8 l 00000014 sUnknown_0832C3D8 0832c3d8 l 00000014 sEmptyWhiteText_TransparentHighlight
0832c3ec l 0000000a sStatusIconColors 0832c3ec l 0000000a sStatusIconColors
0832c3f8 l 00000008 sHealthboxWindowTemplate 0832c3f8 l 00000008 sHealthboxWindowTemplate
0832c400 g 00000060 gBallSpriteSheets 0832c400 g 00000060 gBallSpriteSheets
@@ -56785,7 +56785,7 @@
085efdac l 00000018 sClockFrames 085efdac l 00000018 sClockFrames
085efdc4 l 00000020 sSaveFailedClockPal 085efdc4 l 00000020 sSaveFailedClockPal
085efde4 l 00000090 sSaveFailedClockGfx 085efde4 l 00000090 sSaveFailedClockGfx
085efe74 l 00000048 gRegicePathCoords 085efe74 l 00000048 sRegicePathCoords
085efebc l 00000032 sNatureToMonPokeblockAnim 085efebc l 00000032 sNatureToMonPokeblockAnim
085efeee l 0000044c sMonPokeblockAnims 085efeee l 0000044c sMonPokeblockAnims
085f033c l 00000010 sAffineAnim_Mon_None 085f033c l 00000010 sAffineAnim_Mon_None
@@ -57652,7 +57652,7 @@
086160f8 l 00000028 sSlateportTentFuncs 086160f8 l 00000028 sSlateportTentFuncs
08616120 l 00000002 sSlateportTentRewards 08616120 l 00000002 sSlateportTentRewards
08616124 l 00000003 sScrollDistances 08616124 l 00000003 sScrollDistances
08616128 l 00001000 sFont6BrailleGlyphs 08616128 l 00001000 sFont_Braille
08617128 l 00000048 sBerryFixGraphics 08617128 l 00000048 sBerryFixGraphics
08617170 l 000000e4 sPlayerPartnerBufferCommands 08617170 l 000000e4 sPlayerPartnerBufferCommands
08617254 l 00000020 sUnused 08617254 l 00000020 sUnused
@@ -59069,24 +59069,24 @@
0862bac4 g 0000000b gText_UnionRoomChatKeyboard_Emoji8 0862bac4 g 0000000b gText_UnionRoomChatKeyboard_Emoji8
0862bacf g 0000000b gText_UnionRoomChatKeyboard_Emoji9 0862bacf g 0000000b gText_UnionRoomChatKeyboard_Emoji9
0862bada g 00000008 gText_UnionRoomChatKeyboard_Emoji10 0862bada g 00000008 gText_UnionRoomChatKeyboard_Emoji10
0862bae4 g 00000000 gFont8LatinGlyphs 0862bae4 g 00008000 gFontSmallNarrowLatinGlyphs
08633ae4 g 00000000 gFont8LatinGlyphWidths 08633ae4 g 00000200 gFontSmallNarrowLatinGlyphWidths
08633ce4 g 00000000 gFont0LatinGlyphs 08633ce4 g 00008000 gFontSmallLatinGlyphs
0863bce4 g 00000000 gFont0LatinGlyphWidths 0863bce4 g 00000200 gFontSmallLatinGlyphWidths
0863bee4 g 00000000 gFont7LatinGlyphs 0863bee4 g 00008000 gFontNarrowLatinGlyphs
08643ee4 g 00000000 gFont7LatinGlyphWidths 08643ee4 g 00000200 gFontNarrowLatinGlyphWidths
086440e4 g 00000000 gFont2LatinGlyphs 086440e4 g 00008000 gFontShortLatinGlyphs
0864c0e4 g 00000000 gFont2LatinGlyphWidths 0864c0e4 g 00000200 gFontShortLatinGlyphWidths
0864c2e4 g 00000000 gFont1LatinGlyphs 0864c2e4 g 00008000 gFontNormalLatinGlyphs
086542e4 g 00000000 gFont1LatinGlyphWidths 086542e4 g 00000200 gFontNormalLatinGlyphWidths
086544e4 g 00000000 gFont0JapaneseGlyphs 086544e4 g 00004000 gFontSmallJapaneseGlyphs
086584e4 g 00000000 gFont1JapaneseGlyphs 086584e4 g 00004000 gFontNormalJapaneseGlyphs
0865c4e4 g 00000000 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphs 0865c4e4 g 00008000 gFontFRLGMaleJapaneseGlyphs
086644e4 g 00000000 gUnusedJapaneseFireRedLeafGreenMaleFontGlyphWidths 086644e4 g 00000200 gFontFRLGMaleJapaneseGlyphWidths
086646e4 g 00000000 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphs 086646e4 g 00008000 gFontFRLGFemaleJapaneseGlyphs
0866c6e4 g 00000000 gUnusedJapaneseFireRedLeafGreenFemaleFontGlyphWidths 0866c6e4 g 00000200 gFontFRLGFemaleJapaneseGlyphWidths
0866c8e4 g 00000000 gFont2JapaneseGlyphs 0866c8e4 g 00008000 gFontShortJapaneseGlyphs
086748e4 g 00000000 gFont2JapaneseGlyphWidths 086748e4 g 00000200 gFontShortJapaneseGlyphWidths
08674ae4 g 00000032 gText_MysteryEventBerry 08674ae4 g 00000032 gText_MysteryEventBerry
08674b16 g 0000002c gText_MysteryEventBerryTransform 08674b16 g 0000002c gText_MysteryEventBerryTransform
08674b42 g 00000028 gText_MysteryEventBerryObtained 08674b42 g 00000028 gText_MysteryEventBerryObtained