From 68386569492a88fc9fbe8364cd0427998f2e6806 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Wed, 11 Aug 2021 23:06:00 +0000 Subject: [PATCH] Merge pull request #1489 from GriffinRichards/doc-playerpc --- pokeemerald.sym | 129 ++++++++++++++++++++++++------------------------ 1 file changed, 64 insertions(+), 65 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index dcae424859..21c7b596a3 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -570,10 +570,10 @@ 0203bca4 l 00000004 sGraph_Gfx 0203bca8 l 00000004 sMonFrame_TilemapPtr 0203bcac l 00000004 sMenu -0203bcb0 l 00000004 gPcItemMenuOptionOrder -0203bcb4 l 00000001 gPcItemMenuOptionsNum -0203bcb8 g 0000000c playerPCItemPageInfo -0203bcc4 l 00000004 gUnknown_0203BCC4 +0203bcb0 l 00000004 sTopMenuOptionOrder +0203bcb4 l 00000001 sTopMenuNumOptions +0203bcb8 g 0000000c gPlayerPCItemPageInfo +0203bcc4 l 00000004 sItemStorageMenu 0203bcc8 l 00000002 sIntroCharacterGender 0203bcca l 00000002 sUnusedVar 0203bccc l 00000002 sFlygonYOffset @@ -702,8 +702,8 @@ 0203cf3c g 00000001 gNextLoopedTaskId 0203cf40 g 00000004 gPokenavResources 0203cf44 g 00000004 gUnknown_0203CF44 -0203cf48 l 00000003 sUnknown_0203CF48 -0203cf4c l 00000004 sUnknown_0203CF4C +0203cf48 l 00000003 sMailboxWindowIds +0203cf4c l 00000004 sMailboxList 0203cf50 l 00000001 sGrassSpriteId 0203cf54 l 00000004 sHillData 0203cf58 l 00000004 sRoomTrainers @@ -10794,8 +10794,8 @@ 081221ac g 00000022 MenuHelpers_LinkSomething 081221d0 l 0000001c sub_81221D0 081221ec g 00000020 MenuHelpers_CallLinkSomething -0812220c g 0000004e sub_812220C -0812225c g 0000003a sub_812225C +0812220c g 0000004e SetItemListPerPageCount +0812225c g 0000003a SetCursorWithinListBounds 08122298 g 00000090 sub_8122298 08122328 g 0000001c LoadListMenuSwapLineGfx 08122344 g 0000006c CreateSwapLineSprites @@ -13216,17 +13216,17 @@ 0816b248 l 0000007e ItemStorageMenuProcessInput 0816b2c8 l 00000028 ItemStorage_Deposit 0816b2f0 l 0000002c Task_ItemStorage_Deposit -0816b31c g 00000020 sub_816B31C -0816b33c l 0000002c Mailbox_DoRedrawMailboxMenuAfterReturn +0816b31c g 00000020 CB2_PlayerPCExitBagMenu +0816b33c l 0000002c ItemStorage_ReshowAfterBagMenu 0816b368 l 00000030 ItemStorage_HandleReturnToProcessInput 0816b398 l 0000004c ItemStorage_Withdraw 0816b3e4 l 0000004c ItemStorage_Toss -0816b430 l 00000074 ItemStorage_WithdrawToss_Helper +0816b430 l 00000074 ItemStorage_Enter 0816b4a4 l 0000001a ItemStorage_Exit -0816b4c0 l 0000001c ItemStorage_SetItemAndMailCount -0816b4dc l 00000034 sub_816B4DC +0816b4c0 l 0000001c SetPlayerPCListCount +0816b4dc l 00000034 ItemStorage_EraseMainMenu 0816b510 l 0000003c GetMailboxMailCount -0816b54c l 000000ac Mailbox_UpdateMailList +0816b54c l 000000ac Mailbox_CompactMailList 0816b5f8 l 0000007c Mailbox_DrawMailboxMenu 0816b674 l 000000bc Mailbox_ProcessInput 0816b730 l 00000068 Mailbox_PrintWhatToDoWithPlayerMailText @@ -13236,11 +13236,11 @@ 0816b878 l 0000002c Mailbox_DoMailRead 0816b8a4 l 0000005c Mailbox_FadeAndReadMail 0816b900 l 00000020 Mailbox_ReturnToFieldFromReadMail -0816b920 l 00000044 pal_fill_for_maplights_or_black +0816b920 l 00000044 Mailbox_ReshowAfterMail 0816b964 l 00000030 Mailbox_HandleReturnToProcessInput 0816b994 l 0000001c Mailbox_MoveToBag -0816b9b0 l 00000028 Mailbox_DrawYesNoBeforeMove -0816b9d8 l 0000003e Mailbox_MoveToBagYesNoPrompt +0816b9b0 l 00000028 Mailbox_AskConfirmMoveToBag +0816b9d8 l 0000003e Mailbox_HandleConfirmMoveToBag 0816ba18 l 00000094 Mailbox_DoMailMoveToBag 0816baac l 0000000e Mailbox_CancelMoveToBag 0816babc l 0000003c Mailbox_Give @@ -13249,43 +13249,43 @@ 0816bb48 l 00000070 Mailbox_UpdateMailListAfterDeposit 0816bbb8 l 0000001c Mailbox_NoPokemonForMail 0816bbd4 l 00000040 Mailbox_Cancel -0816bc14 l 00000044 sub_816BC14 -0816bc58 l 00000024 sub_816BC58 -0816bc7c l 00000048 sub_816BC7C -0816bcc4 l 00000040 sub_816BCC4 +0816bc14 l 00000044 ItemStorage_Init +0816bc58 l 00000024 ItemStorage_Free +0816bc7c l 00000048 ItemStorage_AddWindow +0816bcc4 l 00000040 ItemStorage_RemoveWindow 0816bd04 g 000000c4 ItemStorage_RefreshListMenu 0816bdc8 l 00000012 CopyItemName_PlayerPC 0816bddc l 00000068 ItemStorage_MoveCursor -0816be44 l 000000ac fish4_goto_x5_or_x6 -0816bef0 l 00000070 sub_816BEF0 -0816bf60 l 0000003c ItemStorage_StartScrollIndicator +0816be44 l 000000ac ItemStorage_PrintMenuItem +0816bef0 l 00000070 ItemStorage_PrintDescription +0816bf60 l 0000003c ItemStorage_AddScrollIndicator 0816bf9c l 0000001c ItemStorage_RemoveScrollIndicator -0816bfb8 l 00000028 sub_816BFB8 -0816bfe0 l 00000080 sub_816BFE0 -0816c060 l 00000068 sub_816C060 -0816c0c8 l 00000048 sub_816C0C8 -0816c110 l 00000030 sub_816C110 -0816c140 l 00000018 sub_816C140 -0816c158 l 000000d0 ItemStorage_ProcessWithdrawTossInput -0816c228 l 00000096 ItemStorage_GetItemPcResponse -0816c2c0 l 0000004c ItemStorage_PrintItemPcResponse +0816bfb8 l 00000028 ItemStorage_SetSwapArrow +0816bfe0 l 00000080 ItemStorage_DrawSwapArrow +0816c060 l 00000068 ItemStorage_DrawItemIcon +0816c0c8 l 00000048 ItemStorage_EraseItemIcon +0816c110 l 00000030 ItemStorage_CompactList +0816c140 l 00000018 ItemStorage_CompactCursor +0816c158 l 000000d0 ItemStorage_CreateListMenu +0816c228 l 00000096 ItemStorage_GetMessage +0816c2c0 l 0000004c ItemStorage_PrintMessage 0816c30c l 00000098 ItemStorage_ProcessInput -0816c3a4 l 0000005c ItemStorage_GoBackToPlayerPCMenu_InitStorage -0816c400 l 00000050 ItemStorage_GoBackToPlayerPCMenu -0816c450 l 000000ac ItemStorage_ItemSwapChoosePrompt -0816c4fc l 000000a4 sub_816C4FC -0816c5a0 l 000000f0 ItemStorage_DoItemSwap -0816c690 l 0000002c UpdateSwapLinePos -0816c6bc l 00000060 sub_816C6BC +0816c3a4 l 0000005c ItemStorage_ReturnToMenuSelect +0816c400 l 00000050 ItemStorage_ExitItemList +0816c450 l 000000ac ItemStorage_StartItemSwap +0816c4fc l 000000a4 ItemStorage_ProcessItemSwapInput +0816c5a0 l 000000f0 ItemStorage_FinishItemSwap +0816c690 l 0000002c ItemStorage_UpdateSwapLinePos +0816c6bc l 00000060 ItemStorage_PrintItemQuantity 0816c71c l 000000fc ItemStorage_DoItemAction 0816c818 l 000000e2 ItemStorage_HandleQuantityRolling 0816c8fc l 000000bc ItemStorage_DoItemWithdraw 0816c9b8 l 000000dc ItemStorage_DoItemToss -0816ca94 l 00000034 ItemStorage_ResumeInputFromYesToss -0816cac8 l 0000003c ItemStorage_ResumeInputFromNoToss +0816ca94 l 00000034 ItemStorage_TossItemYes +0816cac8 l 0000003c ItemStorage_TossItemNo 0816cb04 l 00000070 ItemStorage_HandleRemoveItem -0816cb74 l 0000004c ItemStorage_WaitPressHandleResumeProcessInput -0816cbc0 l 00000028 ItemStorage_StartScrollIndicatorAndProcessInput +0816cb74 l 0000004c ItemStorage_HandleErrorMessageInput +0816cbc0 l 00000028 ItemStorage_ReturnToListInput 0816cbe8 l 00000000 .gcc2_compiled. 0816cbe8 l 00000016 VBlankCB_Intro 0816cc00 l 00000054 MainCB2_Intro @@ -16521,16 +16521,16 @@ 081d1bd0 g 00000028 MatchCall_GetOverrideFacilityClass 081d1bf8 g 00000026 MatchCall_HasRematchId 081d1c20 g 00000024 SetMatchCallRegisteredFlag -081d1c44 g 00000040 sub_81D1C44 +081d1c44 g 00000040 MailboxMenu_Alloc 081d1c44 l 00000000 .gcc2_compiled. -081d1c84 g 00000080 sub_81D1C84 -081d1d04 g 00000030 sub_81D1D04 -081d1d34 l 00000010 sub_81D1D34 -081d1d44 l 0000007c sub_81D1D44 -081d1dc0 g 000000bc sub_81D1DC0 -081d1e7c l 00000014 sub_81D1E7C -081d1e90 g 00000030 sub_81D1E90 -081d1ec0 g 00000014 sub_81D1EC0 +081d1c84 g 00000080 MailboxMenu_AddWindow +081d1d04 g 00000030 MailboxMenu_RemoveWindow +081d1d34 l 00000010 MailboxMenu_GetWindowId +081d1d44 l 0000007c MailboxMenu_ItemPrintFunc +081d1dc0 g 000000bc MailboxMenu_CreateList +081d1e7c l 00000014 MailboxMenu_MoveCursorFunc +081d1e90 g 00000030 MailboxMenu_AddScrollArrows +081d1ec0 g 00000014 MailboxMenu_Free 081d1ed4 g 000000b0 InitConditionGraphData 081d1f84 g 000000f0 sub_81D1F84 081d2074 g 00000038 TransitionConditionGraph @@ -54465,19 +54465,18 @@ 085dfda0 l 00000018 sSpriteTemplate_Condition 085dfdb8 l 00000008 sSpritePalette_Condition 085dfdc0 l 000000e4 sWallyBufferCommands -085dfea4 l 00000010 gPCText_OptionDescList +085dfea4 l 00000010 sItemStorage_OptionDescriptions 085dfeb4 l 00000020 sPlayerPCMenuActions -085dfed4 l 00000004 gBedroomPC_OptionOrder -085dfed8 l 00000003 gPlayerPC_OptionOrder -085dfedc l 00000020 gPCText_ItemPCOptionsText -085dfefc l 00000008 gNewGamePCItems +085dfed4 l 00000004 sBedroomPC_OptionOrder +085dfed8 l 00000003 sPlayerPC_OptionOrder +085dfedc l 00000020 sItemStorage_MenuActions +085dfefc l 00000008 sNewGamePCItems 085dff04 g 00000020 gMailboxMailOptions -085dff24 l 00000018 gUnknown_085DFF24 -085dff3c l 00000008 ResumeFromWithdrawYesNoFuncList -085dff44 l 00000018 gUnknown_085DFF44 -085dff5c l 00000028 gUnknown_085DFF5C -085dff84 l 00000008 gUnknown_085DFF84 -085dff8c l 00000004 gUnknown_085DFF8C +085dff24 l 00000018 sWindowTemplates_MainMenus +085dff3c l 00000008 ItemTossYesNoFuncs +085dff44 l 00000018 sListMenuTemplate_ItemStorage +085dff5c l 00000030 sWindowTemplates_ItemStorage +085dff8c l 00000003 sSwapArrowTextColors 085dff90 l 00000020 sIntroDrops_Pal 085dffb0 l 00000020 sIntroLogo_Pal 085dffd0 l 000005f4 sIntroDropsLogo_Gfx @@ -58792,7 +58791,7 @@ 08625360 l 00000014 sMatchCall_GetMessageFunctions 08625374 l 00000014 sMatchCall_GetNameAndDescFunctions 08625388 l 00000060 sCheckPageOverrides -086253e8 l 00000018 sUnknown_086253E8 +086253e8 l 00000018 sWindowTemplates_MailboxMenu 08625400 l 00000003 sPlayerNameTextColors 08625403 l 00000001 sEmptyItemName 08625404 l 0000000c sConditionGraphScanline