diff --git a/pokeemerald.sym b/pokeemerald.sym index 21c7b596a3..9e819d3705 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -454,8 +454,8 @@ 0203a12c l 00000004 sStorytellerPtr 0203a130 l 00000001 sStorytellerWindowId 0203a134 l 00000004 sMailRead -0203a138 l 00000008 gUnknown_0203A138 -0203a140 l 00000001 gUnknown_0203A140 +0203a138 l 00000008 sYesNo +0203a140 l 00000001 sMessageWindowId 0203a144 l 00000004 gRegionMap 0203a148 l 00000004 sFlyMap 0203a14c g 00000004 gCurDecorationItems @@ -662,7 +662,7 @@ 0203ce4c l 00000004 sSwapMonPicBgTilemapBuffer 0203ce50 l 00000004 sRotatingTilePuzzle 0203ce54 g 00000004 gBagMenu -0203ce58 g 0000001c gBagPositionStruct +0203ce58 g 0000001c gBagPosition 0203ce74 l 00000004 sListBuffer1 0203ce78 l 00000004 sListBuffer2 0203ce7c g 00000002 gSpecialVar_ItemId @@ -826,7 +826,7 @@ 03001175 l 00000001 sTVShowNewsMixingNumPlayers 03001176 l 00000001 sTVShowMixingCurSlot 03001178 l 00000001 sSelectedStory -0300117c l 00000004 gUnknown_0300117C +0300117c l 00000004 sMessageNextTask 03001180 l 00000004 sDrawFlyDestTextWindow 03001188 l 00000068 sImageTables_DigitalDisplay 030011f0 l 00000001 sHoldState @@ -10789,14 +10789,14 @@ 08122034 g 0000009a AdjustQuantityAccordingToDPadInput 081220d0 g 0000003c GetLRKeysPressed 0812210c g 0000003c GetLRKeysPressedAndHeld -08122148 g 00000032 sub_8122148 +08122148 g 00000032 IsHoldingItemAllowed 0812217c g 00000030 IsWritingMailAllowed 081221ac g 00000022 MenuHelpers_LinkSomething 081221d0 l 0000001c sub_81221D0 081221ec g 00000020 MenuHelpers_CallLinkSomething 0812220c g 0000004e SetItemListPerPageCount 0812225c g 0000003a SetCursorWithinListBounds -08122298 g 00000090 sub_8122298 +08122298 g 00000090 SetCursorScrollWithinListBounds 08122328 g 0000001c LoadListMenuSwapLineGfx 08122344 g 0000006c CreateSwapLineSprites 081223b0 g 0000004c DestroySwapLineSprites @@ -14995,115 +14995,115 @@ 081aac90 g 000000cc GoToBagMenu 081aad5c g 0000001a CB2_BagMenuRun 081aad78 g 00000012 VBlankCB_BagMenuRun -081aad8c g 0000002a CB2_Bag -081aadb8 g 00000296 SetupBagMenu -081ab050 g 0000006c BagMenu_InitBGs -081ab0bc g 00000132 LoadBagMenu_Graphics -081ab1f0 g 00000028 CreateBagInputHandlerTask -081ab218 g 00000028 AllocateBagItemListBuffers -081ab240 g 0000015c LoadBagItemListBuffers -081ab39c g 000000b4 GetItemName -081ab450 g 000000d0 BagMenu_MoveCursorCallback -081ab520 g 00000190 BagMenu_ItemPrintCallback -081ab6b0 g 0000008c BagMenu_PrintDescription -081ab73c g 00000020 BagMenu_PrintCursor_ -081ab75c g 00000060 BagMenu_PrintCursor -081ab7bc g 00000068 CreatePocketScrollArrowPair +081aad8c l 0000002a CB2_Bag +081aadb8 l 00000296 SetupBagMenu +081ab050 l 0000006c BagMenu_InitBGs +081ab0bc l 00000132 LoadBagMenu_Graphics +081ab1f0 l 00000028 CreateBagInputHandlerTask +081ab218 l 00000028 AllocateBagItemListBuffers +081ab240 l 0000015c LoadBagItemListBuffers +081ab39c l 000000b4 GetItemName +081ab450 l 000000d0 BagMenu_MoveCursorCallback +081ab520 l 00000190 BagMenu_ItemPrintCallback +081ab6b0 l 0000008c PrintItemDescription +081ab73c l 00000020 BagMenu_PrintCursor +081ab75c l 00000060 BagMenu_PrintCursorAtPos +081ab7bc l 00000068 CreatePocketScrollArrowPair 081ab824 g 00000030 BagDestroyPocketScrollArrowPair -081ab854 g 00000048 CreatePocketSwitchArrowPair -081ab89c g 0000002c BagDestroyPocketSwitchArrowPair -081ab8c8 g 00000030 FreeBagItemListBuffers +081ab854 l 00000048 CreatePocketSwitchArrowPair +081ab89c l 0000002c DestroyPocketSwitchArrowPair +081ab8c8 l 00000030 FreeBagMenu 081ab8f8 g 00000038 Task_FadeAndCloseBagMenu -081ab930 g 00000076 TaskCloseBagMenu_2 +081ab930 l 00000076 Task_CloseBagMenu 081ab9a8 g 000000c4 UpdatePocketItemList -081aba6c g 0000001a All_CalculateNItemsAndMaxShowed -081aba88 g 0000003c SetInitialScrollAndCursorPositions -081abac4 l 0000001a SetPocketListPositions -081abae0 g 0000004c UpdatePocketScrollPositions +081aba6c l 0000001a UpdatePocketItemLists +081aba88 g 0000003c UpdatePocketListPosition +081abac4 l 0000001a InitPocketListPositions +081abae0 l 0000004c InitPocketScrollPositions 081abb2c g 00000020 GetItemListPosition 081abb4c g 00000070 DisplayItemMessage -081abbbc g 00000080 BagMenu_InitListsMenu -081abc3c g 00000018 sub_81ABC3C -081abc54 g 0000006c PrintItemDepositAmount -081abcc0 g 00000068 PrintItemSoldAmount -081abd28 g 000001a4 Task_BagMenu_HandleInput -081abecc g 00000044 set_callback3_to_bag +081abbbc g 00000080 CloseItemMessage +081abc3c l 00000018 AddItemQuantityWindow +081abc54 l 0000006c PrintItemQuantity +081abcc0 l 00000068 PrintItemSoldAmount +081abd28 l 000001a4 Task_BagMenu_HandleInput +081abecc l 00000044 ReturnToItemList 081abf10 l 00000060 GetSwitchBagPocketDirection 081abf70 l 00000038 ChangeBagPocketId 081abfa8 l 00000164 SwitchBagPocket -081ac10c l 00000130 sub_81AC10C -081ac23c g 0000002e sub_81AC23C +081ac10c l 00000130 Task_SwitchBagPocket +081ac23c l 0000002e DrawItemListBgRow 081ac26c l 00000054 DrawPocketIndicatorSquare 081ac2c0 l 00000026 CanSwapItems -081ac2e8 l 000000d8 BagMenu_SwapItems +081ac2e8 l 000000d8 StartItemSwap 081ac3c0 l 000000d8 Task_HandleSwappingItemsInput -081ac498 g 000000f8 sub_81AC498 -081ac590 g 000000b4 sub_81AC590 +081ac498 l 000000f8 DoItemSwap +081ac590 l 000000b4 CancelItemSwap 081ac644 l 000004b2 OpenContextMenu -081acaf8 g 0000005c sub_81ACAF8 -081acb54 g 0000005c sub_81ACB54 -081acbb0 g 00000054 Task_ItemContext_FieldOrBattle -081acc04 g 00000074 Task_HandleInBattleItemMenuInput -081acc78 g 00000184 Task_HandleOutOfBattleItemMenuInput -081acdfc g 0000003a sub_81ACDFC -081ace38 g 00000042 BagMenu_RemoveSomeWindow -081ace7c g 00000078 ItemMenu_UseOutOfBattle -081acef4 g 00000094 ItemMenu_Toss -081acf88 g 00000088 BagMenu_TossItems -081ad010 g 00000034 BagMenu_CancelToss -081ad044 g 00000088 Task_ChooseHowManyToToss -081ad0cc g 00000084 BagMenu_ConfirmToss -081ad150 g 0000009c Task_ActuallyToss -081ad1ec g 0000008c ItemMenu_Register -081ad278 g 00000078 ItemMenu_Give -081ad2f0 g 0000001c BagMenu_PrintThereIsNoPokemon -081ad30c l 00000044 BagMenu_PrintItemCantBeHeld -081ad350 g 00000028 sub_81AD350 -081ad378 g 00000020 ItemMenu_CheckTag -081ad398 g 00000044 ItemMenu_Cancel -081ad3dc g 00000030 ItemMenu_UseInBattle +081acaf8 l 0000005c PrintContextMenuItems +081acb54 l 0000005c PrintContextMenuItemGrid +081acbb0 l 00000054 Task_ItemContext_Normal +081acc04 l 00000074 Task_ItemContext_SingleRow +081acc78 l 00000184 Task_ItemContext_MultipleRows +081acdfc l 0000003a IsValidContextMenuPos +081ace38 l 00000042 RemoveContextWindow +081ace7c l 00000078 ItemMenu_UseOutOfBattle +081acef4 l 00000094 ItemMenu_Toss +081acf88 l 00000088 AskTossItems +081ad010 l 00000034 CancelToss +081ad044 l 00000088 Task_ChooseHowManyToToss +081ad0cc l 00000084 ConfirmToss +081ad150 l 0000009c Task_RemoveItemFromBag +081ad1ec l 0000008c ItemMenu_Register +081ad278 l 00000078 ItemMenu_Give +081ad2f0 l 0000001c PrintThereIsNoPokemon +081ad30c l 00000044 PrintItemCantBeHeld +081ad350 l 00000028 HandleErrorMessage +081ad378 l 00000020 ItemMenu_CheckTag +081ad398 l 00000044 ItemMenu_Cancel +081ad3dc l 00000030 ItemMenu_UseInBattle 081ad40c g 00000010 CB2_ReturnToBagMenuPocket -081ad41c g 00000098 Task_ItemContext_FieldGive -081ad4b4 g 0000006c Task_ItemContext_ItemPC_2 +081ad41c l 00000098 Task_ItemContext_GiveToParty +081ad4b4 l 0000006c Task_ItemContext_GiveToPC 081ad520 g 000000bc UseRegisteredKeyItemOnField -081ad5dc g 000000a4 Task_ItemContext_Sell +081ad5dc l 000000a4 Task_ItemContext_Sell 081ad680 l 00000064 DisplaySellItemPriceAndConfirm -081ad6e4 g 00000018 sub_81AD6E4 -081ad6fc g 00000034 BagMenu_CancelSell -081ad730 g 00000064 sub_81AD730 -081ad794 l 000000b6 Task_SellHowManyDialogueHandleInput -081ad84c g 0000007c BagMenu_ConfirmSell -081ad8c8 l 000000f8 BagMenu_Sell_UpdateItemListAndMoney -081ad9c0 l 0000002c BagMenu_Sell_WaitForABPress -081ad9ec g 00000090 Task_ItemContext_Deposit +081ad6e4 l 00000018 AskSellItems +081ad6fc l 00000034 CancelSell +081ad730 l 00000064 InitSellHowManyInput +081ad794 l 000000b6 Task_ChooseHowManyToSell +081ad84c l 0000007c ConfirmSell +081ad8c8 l 000000f8 SellItem +081ad9c0 l 0000002c WaitAfterItemSell +081ad9ec l 00000090 Task_ItemContext_Deposit 081ada7c l 00000098 Task_ChooseHowManyToDeposit -081adb14 l 000000f8 BagMenu_TryDepositItem -081adc0c l 00000048 BagMenu_Deposit_WaitForABPress -081adc54 g 0000001a IsWallysBag -081adc70 g 00000090 PrepareBagForWallyTutorial -081add00 g 00000070 RestoreBagAfterWallyTutorial +081adb14 l 000000f8 TryDepositItem +081adc0c l 00000048 WaitDepositErrorMessage +081adc54 l 0000001a IsWallysBag +081adc70 l 00000090 PrepareBagForWallyTutorial +081add00 l 00000070 RestoreBagAfterWallyTutorial 081add70 g 00000028 DoWallyTutorialBagMenu -081add98 g 000000a0 Task_WallyTutorialBagMenu -081ade38 g 00000034 unknown_ItemMenu_Show -081ade6c g 00000020 CB2_ApprenticeExitBagMenu -081ade8c g 00000030 unknown_ItemMenu_Give2 -081adebc g 00000020 CB2_FavorLadyExitBagMenu -081adedc g 00000024 unknown_ItemMenu_Confirm2 -081adf00 g 00000020 CB2_QuizLadyExitBagMenu -081adf20 g 000000d8 BagMenu_PrintPocketNames -081adff8 g 0000005c BagMenu_CopyPocketNameToWindow -081ae054 g 00000068 SetupBagMenu_Textboxes -081ae0bc g 00000068 BagMenu_Print -081ae124 g 00000018 sub_81AE124 +081add98 l 000000a0 Task_WallyTutorialBagMenu +081ade38 l 00000034 ItemMenu_Show +081ade6c l 00000020 CB2_ApprenticeExitBagMenu +081ade8c l 00000030 ItemMenu_GiveFavorLady +081adebc l 00000020 CB2_FavorLadyExitBagMenu +081adedc l 00000024 ItemMenu_ConfirmQuizLady +081adf00 l 00000020 CB2_QuizLadyExitBagMenu +081adf20 l 000000d8 PrintPocketNames +081adff8 l 0000005c CopyPocketNameToWindow +081ae054 l 00000068 LoadBagMenuTextWindows +081ae0bc l 00000068 BagMenu_Print +081ae124 l 00000018 BagMenu_GetWindowId 081ae13c l 00000048 BagMenu_AddWindow -081ae184 g 00000040 BagMenu_RemoveWindow -081ae1c4 g 00000034 AddItemMessageWindow -081ae1f8 g 00000040 BagMenu_RemoveBagItemMessageWindow +081ae184 l 00000040 BagMenu_RemoveWindow +081ae1c4 l 00000034 AddItemMessageWindow +081ae1f8 l 00000040 RemoveItemMessageWindow 081ae238 g 00000030 BagMenu_YesNo 081ae268 l 0000003c DisplayCurrentMoneyWindow 081ae2a4 l 00000010 RemoveMoneyWindow -081ae2b4 g 00000046 BagMenu_PrepareTMHMMoveWindow -081ae2fc g 0000015c PrintTMHMMoveData +081ae2b4 l 00000046 PrepareTMHMMoveWindow +081ae2fc l 0000015c PrintTMHMMoveData 081ae458 l 00000000 .gcc2_compiled. 081ae458 l 00000002 ListMenuDummyTask 081ae45c g 00000128 DoMysteryGiftListMenu @@ -48868,7 +48868,7 @@ 0857fb34 g 00000008 gBagMaleSpriteSheet 0857fb3c g 00000008 gBagFemaleSpriteSheet 0857fb44 g 00000008 gBagPaletteTable -0857fb4c l 00000018 gBagSpriteTemplate +0857fb4c l 00000018 sBagSpriteTemplate 0857fb64 l 00000008 sRotatingBallOamData 0857fb6c l 00000008 sSpriteAffineAnim_RotatingBallStationary 0857fb74 l 00000004 sRotatingBallSpriteAnimTable @@ -48876,9 +48876,9 @@ 0857fb88 l 00000010 sSpriteAffineAnim_RotatingBallRotation2 0857fb98 l 00000004 sRotatingBallAnimCmds 0857fb9c l 00000004 sRotatingBallAnimCmds_FullRotation -0857fba0 l 00000008 gRotatingBallTable -0857fba8 l 00000008 gRotatingBallPaletteTable -0857fbb0 l 00000018 gRotatingBallSpriteTemplate +0857fba0 l 00000008 sRotatingBallTable +0857fba8 l 00000008 sRotatingBallPaletteTable +0857fbb0 l 00000018 sRotatingBallSpriteTemplate 0857fbc8 l 00000008 sBerryPicOamData 0857fbd0 l 00000008 sBerryPicRotatingOamData 0857fbd8 l 00000008 sAnim_BerryPic @@ -55257,8 +55257,8 @@ 085e91e9 g 00000008 gText_BerriesPocket 085e91f1 g 0000000a gText_KeyItemsPocket 085e91fc g 00000014 gPocketNamesStringsTable -085e9210 g 0000000a gText_NumberVar1Clear7Var2 -085e921a g 0000000b gText_ClearTo11Var1Clear5Var2 +085e9210 g 0000000a gText_NumberItem_TMBerry +085e921a g 0000000b gText_NumberItem_HM 085e9225 g 00000007 gText_SizeSlash 085e922c g 00000007 gText_FirmSlash 085e9233 g 00000007 gText_Var1DotVar2 @@ -57480,14 +57480,14 @@ 0861404b l 00000002 sContextMenuItems_Apprentice 0861404d l 00000002 sContextMenuItems_FavorLady 0861404f l 00000002 sContextMenuItems_QuizLady -08614054 l 00000030 gUnknown_08614054 +08614054 l 00000030 sContextMenuFuncs 08614084 l 00000008 sYesNoTossFunctions 0861408c l 00000008 sYesNoSellItemFunctions 08614094 l 00000010 sBagScrollArrowsTemplate 086140a4 l 000000c0 sRegisteredSelect_Gfx 08614164 l 0000000f sFontColorTable -08614174 g 00000038 sDefaultBagWindows -086141ac g 00000050 sContextMenuWindowTemplates +08614174 l 00000038 sDefaultBagWindows +086141ac l 00000050 sContextMenuWindowTemplates 086141fc l 00000010 sScrollIndicatorTemplates 0861420c l 00000008 sOamData_ScrollArrowIndicator 08614214 l 00000008 sSpriteAnim_ScrollArrowIndicator0