From 3f452207360d64d6684715e2eb8fb63d6c4d7490 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Wed, 29 Sep 2021 04:14:52 +0000 Subject: [PATCH] Merge pull request #1506 from GriffinRichards/single-doc --- pokeemerald.sym | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index d6c2be830f..79a47e2adc 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -78,7 +78,7 @@ 02022cf8 l 00000004 sGfx 02022cfc l 00000004 sPokemonJump 02022d00 l 00000004 sPokemonJumpGfx -02022d04 l 00000001 gUnknown_02022D04 +02022d04 l 00000001 sStartedPokeBallTask 02022d06 l 00000002 sCurrItemAndOptionMenuCheck 02022d08 l 00000001 sLinkSendTaskId 02022d09 l 00000001 sLinkReceiveTaskId @@ -711,7 +711,7 @@ 0203cf60 l 00000004 sRayScene 02040000 l 00000000 EWRAM_END 03000000 l 00000000 IWRAM_START -03000000 l 00000002 gUnknown_03000000 +03000000 l 00000002 sUnusedVar 03000000 l 00000000 iwram 03000004 l 00000004 sHeapStart 03000008 l 00000004 sHeapSize @@ -902,7 +902,7 @@ 03002748 g 00000004 gLinkVSyncDisabled 03002750 g 00000800 IntrMain_Buffer 03002f50 g 00000004 gPcmDmaCounter -03002f54 g 00000004 gUnneededFireRedVariable +03002f54 g 00000004 gWindowTileAutoAllocEnabled 03002f60 g 00000004 gTransparentTileNumber 03002f70 g 00000010 gWindowBgTilemapBuffers 03002f80 g 00000004 gFonts @@ -1172,7 +1172,7 @@ 080016bc g 0000001c SetTextModeAndHideBgs 080016d8 l 000000ca SetBgAffineInternal 080017a4 g 00000014 IsInvalidBg -080017b8 g 00000004 DummiedOutFireRedLeafGreenTileAllocFunc +080017b8 g 00000004 BgTileAllocOp 080017bc g 0000002c ResetBgsAndClearDma3BusyFlags 080017e8 g 000000c8 InitBgsFromTemplates 080018b0 g 00000084 InitBgFromTemplate @@ -1207,7 +1207,7 @@ 08002a5c g 00000058 GetBgMetricAffineMode 08002ab4 g 00000036 GetTileMapIndexFromCoords 08002aec g 0000005c CopyTileMapEntry -08002b48 g 00000054 GetBgType +08002b48 l 00000054 GetBgType 08002b9c g 00000014 IsInvalidBg32 08002bb0 g 0000002a IsTileMapOutsideWram 08002bdc g 00000044 BlitBitmapRect4BitWithoutColorKey @@ -1442,7 +1442,7 @@ 080091cc g 00000020 StringLength_Multibyte 080091ec g 0000003a WriteColorChangeControlCode 08009228 g 00000024 IsStringJapanese -0800924c g 00000030 sub_800924C +0800924c g 00000030 IsStringNJapanese 0800927c g 0000001c GetExtCtrlCodeLength 08009298 l 00000022 SkipExtCtrlCode 080092bc g 0000004a StringCompareWithoutExtCtrlCodes @@ -2790,7 +2790,7 @@ 08032298 l 00000048 NewGameBirchSpeech_ClearGenderWindowTilemap 080322e0 l 00000038 NewGameBirchSpeech_ClearGenderWindow 08032318 l 00000088 NewGameBirchSpeech_ClearWindow -080323a0 l 0000002c NewGameBirchSpeech_ShowPokeBallPrinterCallback +080323a0 l 0000002c NewGameBirchSpeech_WaitForThisIsPokemonText 080323cc g 0000006e CreateYesNoMenuParameterized 0803243c l 00000038 NewGameBirchSpeech_ShowDialogueWindow 08032474 l 000001a8 NewGameBirchSpeech_CreateDialogueWindowBorder @@ -3363,7 +3363,7 @@ 08057028 g 000000cc FreeBattleResources 080570f4 g 000000e8 AdjustFriendshipOnBattleFaint 080571dc g 00000080 SwitchPartyOrderInGameMulti -0805725c g 000001fc sub_805725C +0805725c g 000001fc BattlePalace_TryEscapeStatus 08057458 g 00000002 BattleControllerDummy 08057458 l 00000000 .gcc2_compiled. 0805745c g 00000030 SetControllerToPlayer @@ -3537,7 +3537,7 @@ 0805ee48 g 0000000c SpriteCB_SetInvisible 0805ee54 g 0000008c SetBattlerShadowSpriteCallback 0805eee0 g 00000034 HideBattlerShadowSprite -0805ef14 g 00000070 sub_805EF14 +0805ef14 g 00000070 FillAroundBattleWindows 0805ef84 g 00000038 ClearTemporarySpeciesSpriteData 0805efbc g 000000d8 AllocateMonSpritesGfx 0805f094 g 0000007c FreeMonSpritesGfx @@ -8298,7 +8298,7 @@ 080d4fac g 0000001c CreateItemMenuSwapLine 080d4fc8 g 00000024 SetItemMenuSwapLineInvisibility 080d4fec g 0000002c UpdateItemMenuSwapLinePos -080d5018 l 00000058 sub_80D5018 +080d5018 l 00000058 ArrangeBerryGfx 080d5070 l 00000064 LoadBerryGfx 080d50d4 g 00000038 CreateBerryTagSprite 080d510c g 00000010 FreeBerryTagSpritePalette @@ -8434,7 +8434,7 @@ 080da25c l 00000030 Task_ReadyUpdateHeartSliders 080da28c l 00000090 Task_UpdateHeartSliders 080da31c l 0000002c Task_WaitForHeartSliders -080da348 l 00000044 sub_80DA348 +080da348 l 00000044 Task_RestorePlttBufferUnfaded 080da38c l 00000040 Task_WaitPrintRoundResult 080da3cc l 00000098 Task_PrintRoundResultText 080da464 l 00000038 Task_ReUpdateHeartSliders @@ -10263,7 +10263,7 @@ 08114244 l 00000130 DoMementoShadowEffect 08114374 l 0000004c SetAllBattlersSpritePriority 081143c0 g 000000b0 AnimTask_InitMementoShadow -08114470 g 0000004c sub_8114470 +08114470 g 0000004c AnimTask_MementoHandleBg 081144bc l 0000003c AnimClawSlash 081144f8 g 00000250 AnimTask_MetallicShine 08114748 l 00000154 AnimTask_MetallicShine_Step @@ -10318,7 +10318,7 @@ 08115e00 l 000000b8 AnimTask_FlashAnimTagWithColor_Step1 08115eb8 l 00000058 AnimTask_FlashAnimTagWithColor_Step2 08115f10 g 00000084 AnimTask_InvertScreenColor -08115f94 g 00000110 UnusedAnimTask_8115F94 +08115f94 g 00000110 AnimTask_TintPalettes 081160a4 l 000000a4 AnimShakeMonOrBattleTerrain 08116148 l 000000ac AnimShakeMonOrBattleTerrain_Step 081161f4 l 000000ae AnimShakeMonOrBattleTerrain_UpdateCoordOffsetEnabled @@ -11865,7 +11865,7 @@ 0813d3d8 g 00000054 ShowPokedexAreaScreen 0813d42c l 00000174 Task_ShowPokedexAreaScreen 0813d5a0 l 00000114 Task_HandlePokedexAreaScreenInput -0813d6b4 l 0000001a sub_813D6B4 +0813d6b4 l 0000001a ResetPokedexAreaMapBg 0813d6d0 l 00000154 CreateAreaMarkerSprites 0813d824 l 00000084 DestroyAreaMarkerSprites 0813d8a8 l 00000040 LoadAreaUnknownGraphics @@ -14839,7 +14839,7 @@ 081a5b88 l 00000058 GiveArenaPrize 081a5be0 l 00000018 BufferArenaOpponentName 081a5bf8 g 0000014c DrawArenaRefereeTextBox -081a5d44 g 00000130 RemoveArenaRefereeTextBox +081a5d44 g 00000130 EraseArenaRefereeTextBox 081a5e74 g 00000020 CallBattleFactoryFunction 081a5e74 l 00000000 .gcc2_compiled. 081a5e94 l 00000114 InitFactoryChallenge @@ -15848,7 +15848,7 @@ 081c4d18 l 00000058 KeepMoveSelectorVisible 081c4d70 g 00000120 LoadPokedexAreaMapGfx 081c4d70 l 00000000 .gcc2_compiled. -081c4e90 g 00000024 sub_81C4E90 +081c4e90 g 00000024 TryShowPokedexAreaMap 081c4eb4 g 0000001c FreePokedexAreaMapBgNum 081c4ed0 g 0000001c PokedexAreaMapChangeBgY 081c4eec g 00000010 InitBattlePyramidBagCursorPosition