diff --git a/pokefirered.sym b/pokefirered.sym index f480523fe..7bfdd57bb 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -174,12 +174,12 @@ 020316e4 g 00000080 gSaveBlock3_DMA 02031764 g 00000528 gLoadedSaveData 02031c8c g 00000004 gLastEncryptionKey -02031c90 l 00000004 sSpriteTextTileBuffer -02031c94 l 00000038 sSpriteTextTilePtrs +02031c90 l 00000004 sMenuTextTileBuffer +02031c94 l 00000038 sMenuTextTileBuffers 02031ccc g 000000d8 gLinkPartnerMail 02031da4 g 00000002 gSelectedTradeMonPositions -02031da8 l 00000004 sTradeMenuResourcesPtr -02031dac l 00000004 sTradeData +02031da8 l 00000004 sTradeMenu +02031dac l 00000004 sTradeAnim 02031db0 g 00000001 gDifferentSaveFile 02031db4 g 00000008 gLastUsedWarp 02031dbc l 00000008 sWarpDestination @@ -2457,7 +2457,7 @@ 08044148 g 00000038 GetMonSpritePalStruct 08044180 g 00000038 GetMonSpritePalStructFromOtIdPersonality 080441b8 g 0000003a IsHMMove2 -080441f4 g 00000018 IsPokeSpriteNotFlipped +080441f4 g 00000018 IsMonSpriteNotFlipped 0804420c l 00000028 GetMonFlavorRelation 08044234 g 00000028 GetFlavorRelationByPersonality 0804425c g 0000002a IsTradedMon @@ -2718,120 +2718,120 @@ 0804c588 g 0000001c ApplyNewEncryptionKeyToWord 0804c5a4 g 0000005c ApplyNewEncryptionKeyToAllEncryptedData 0804c600 l 00000000 .gcc2_compiled. -0804c600 l 00000118 InitTradeMenuResources +0804c600 l 00000118 InitTradeMenu 0804c718 g 00000010 CB2_StartCreateTradeMenu -0804c728 l 000007ec CB2_ReturnFromLinkTrade2 +0804c728 l 000007ec CB2_CreateTradeMenu 0804cf14 g 000005e4 CB2_ReturnToTradeMenuFromSummary -0804d4f8 l 00000012 VblankCB_Trade -0804d50c l 0000003c TradeMenuCB_9 -0804d548 l 0000005c TradeMenuCB_10 -0804d5a4 l 00000094 TradeMenuCB_13 +0804d4f8 l 00000012 VBlankCB_TradeMenu +0804d50c l 0000003c CB_FadeToStartTrade +0804d548 l 0000005c CB_WaitToStartTrade +0804d5a4 l 00000094 CB_StartLinkTrade 0804d638 l 0000005c CB2_TradeMenu -0804d694 l 000000ce LoadTradeBackgroundGfxAndPals -0804d764 l 000000b0 SetTradeMenuOptionActiveFlags +0804d694 l 000000ce LoadTradeBgGfx +0804d764 l 000000b0 SetActiveMenuOptions 0804d814 l 00000020 Trade_Memcpy -0804d834 l 00000378 shedinja_maker_maybe +0804d834 l 00000378 BufferTradeParties 0804dbac l 00000028 PrintIsThisTradeOkay -0804dbd4 l 00000120 Master_HandleBlockReceivedStatus -0804dcf4 l 000000fc Slave_HandleBlockReceivedStatus -0804ddf0 l 00000200 Master_HandleCommunication -0804dff0 l 00000036 CB1_HandleBlockReceive -0804e028 l 0000004c TradeMenuGetNewCursorLocation +0804dbd4 l 00000120 Leader_ReadLinkBuffer +0804dcf4 l 000000fc Follower_ReadLinkBuffer +0804ddf0 l 00000200 Leader_HandleCommunication +0804dff0 l 00000036 CB1_UpdateLink +0804e028 l 0000004c GetNewCursorPosition 0804e074 l 000000c0 TradeMenuMoveCursor -0804e134 l 0000005e CommunicatePlayerSelectedMonForTrade -0804e194 l 0000019c TradeMenuCB_0 +0804e134 l 0000005e SetReadyToTrade +0804e194 l 0000019c CB_ProcessMenuInput 0804e330 l 00000058 RedrawChooseAPokemonWindow -0804e388 l 000000e4 TradeMenuCB_1 -0804e46c l 00000028 TradeMenuCB_15 -0804e494 l 00000078 TradeMenuCB_2 -0804e50c l 00000092 PlayerHasEnoughPokemonToTrade_HandleMewDeoxys +0804e388 l 000000e4 CB_ProcessSelectedMonInput +0804e46c l 00000028 CB_ChooseMonAfterButtonPress +0804e494 l 00000078 CB_ShowTradeMonSummaryScreen +0804e50c l 00000092 CheckValidityOfTradeMons 0804e5a0 l 000000d4 CommunicateWhetherMonCanBeTraded -0804e674 l 00000088 TradeMenuCB_3 -0804e6fc l 00000048 CommitWindows -0804e744 l 00000084 TradeMenuCB_4 -0804e7c8 l 0000003c TradeMenuCB_6 -0804e804 l 0000002c TradeMenuCB_7 -0804e830 l 00000050 TradeMenuCB_14 -0804e880 l 00000088 TradeMenuCB_8 -0804e908 l 0000003c TradeMenuCB_11 -0804e944 l 0000007c TradeMenuCB_12 -0804e9c0 l 00000024 TradeMenuCB_16 +0804e674 l 00000088 CB_ProcessConfirmTradeInput +0804e6fc l 00000048 RestoreNicknamesCoveredByYesNo +0804e744 l 00000084 CB_ProcessCancelTradeInput +0804e7c8 l 0000003c CB_SetSelectedMons +0804e804 l 0000002c CB_PrintIsThisTradeOkay +0804e830 l 00000050 CB_InitConfirmTradePrompt +0804e880 l 00000088 CB_HandleTradeCanceled +0804e908 l 0000003c CB_InitExitCanceledTrade +0804e944 l 0000007c CB_ExitCanceledTrade +0804e9c0 l 00000024 CB_WaitToStartRfuTrade 0804e9e4 l 000000c6 RunTradeMenuCallback -0804eaac l 00000038 SignalRedrawTradeMenus -0804eae4 l 00000388 HandleRedrawTradeMenuOnSide -0804ee6c l 00000068 GetNicknameStringWidthByPartyAndMonIdx -0804eed4 l 000000e0 BuildMovesString +0804eaac l 00000038 SetSelectedMon +0804eae4 l 00000388 DrawSelectedMonScreen +0804ee6c l 00000068 GetMonNicknameWidth +0804eed4 l 000000e0 BufferMovesString 0804efb4 l 0000006c PrintPartyMonNickname 0804f020 l 0000006c PrintPartyNicknames -0804f08c l 000001f8 PrintLevelAndGenderDirectlyOnVram -0804f284 l 00000064 PrintPartyLevelsAndGendersDirectlyOnVram +0804f08c l 000001f8 PrintLevelAndGender +0804f284 l 00000064 PrintPartyLevelsAndGenders 0804f2e8 l 000000cc ShowTradePartyMonIcons 0804f3b4 l 00000012 PrintTradePartnerPartyNicknames 0804f3c8 l 00000078 RedrawPartyWindow -0804f440 l 00000024 TradeMenuAction_Summary -0804f464 l 00000024 TradeMenuAction_Trade -0804f488 l 00000054 ScheduleLinkTaskWithDelay -0804f4dc l 000000e0 RunScheduledLinkTasks -0804f5bc l 00000054 PrintTradeErrorOrStatusMessage -0804f610 l 00000116 LoadUISprites -0804f728 l 00000020 RenderTextToVramViaBuffer +0804f440 l 00000024 Task_DrawSelectionSummary +0804f464 l 00000024 Task_DrawSelectionTrade +0804f488 l 00000054 QueueAction +0804f4dc l 000000e0 DoQueuedActions +0804f5bc l 00000054 PrintTradeMessage +0804f610 l 00000116 LoadUISpriteGfx +0804f728 l 00000020 DrawBottomRowText 0804f748 l 00000148 ComputePartyTradeableFlags 0804f890 l 000000d4 ComputePartyHPBarLevels -0804f964 l 00000074 SetMonIconsAnimByHPBarLevel -0804f9d8 l 0000003c CopyGiftRibbonsToSav1 -0804fa14 l 0000011e TestWhetherSelectedMonCanBeTraded -0804fb34 g 00000094 Trade_CalcLinkPlayerCompatibilityParam +0804f964 l 00000074 SetTradePartyHPBarSprites +0804f9d8 l 0000003c SaveTradeGiftRibbons +0804fa14 l 0000011e CanTradeSelectedMon +0804fb34 g 00000094 GetGameProgressForLinkTrade 0804fbc8 l 00000024 IsDeoxysOrMewUntradable 0804fbec g 000000f2 GetUnionRoomTradeMessageId 0804fce0 g 00000044 CanRegisterMonForTradingBoard 0804fd24 l 00000000 .gcc2_compiled. -0804fd24 l 00000022 SpriteCB_TradeGlowCable -0804fd48 l 00000030 SpriteCB_TradeGlowWireless -0804fd78 l 00000040 SpriteCB_TradeGlowCore -0804fdb8 l 00000022 SpriteCB_GameLinkCableEnd_Outbound -0804fddc l 00000022 SpriteCB_GameLinkCableEnd_Inbound -0804fe00 l 00000022 SpriteCB_TradeGBAScreen +0804fd24 l 00000022 SpriteCB_LinkMonGlow +0804fd48 l 00000030 SpriteCB_LinkMonGlowWireless +0804fd78 l 00000040 SpriteCB_LinkMonShadow +0804fdb8 l 00000022 SpriteCB_CableEndSending +0804fddc l 00000022 SpriteCB_CableEndReceiving +0804fe00 l 00000022 SpriteCB_GbaScreen 0804fe24 l 00000090 SetTradeBGAffine -0804feb4 l 00000056 TradeAnim_UpdateBgRegs +0804feb4 l 00000056 SetTradeGpuRegs 0804ff0c l 00000016 VBlankCB_TradeAnim -0804ff24 l 00000028 InitLinkTimeoutTracker +0804ff24 l 00000028 ClearLinkTimeoutTimer 0804ff4c l 00000078 CheckLinkTimeout -0804ffc4 l 00000020 GetMultiplayerIdOfLinkTrade +0804ffc4 l 00000020 TradeGetMultiplayerId 0804ffe4 l 00000154 LoadTradeMonPic 08050138 g 00000364 CB2_LinkTrade 0805049c g 00000012 InitTradeSequenceBgGpuRegs 080504b0 g 0000001c LinkTradeDrawWindow 080504cc l 00000100 TradeAnimInit_LoadGfx -080505cc l 000001d4 CB2_InitTradeAnim_InGameTrade -080507a0 l 00000060 ReceivedMonSetPokedexFlags -08050800 l 0000000a RS_TryEnableNationalPokedex +080505cc l 000001d4 CB2_InitInGameTrade +080507a0 l 00000060 UpdatePokedexForReceivedMon +08050800 l 0000000a TryEnableNationalDexFromLinkPartner 0805080c l 000000e8 TradeMons 080508f4 l 00000054 HandleLinkDataSend -08050948 l 0000001e CB2_RunTradeAnim_InGameTrade +08050948 l 0000001e CB2_InGameTrade 08050968 l 00000478 SetTradeSequenceBgGpuRegs 08050de0 l 00000044 LoadTradeGbaSpriteGfx 08050e24 l 000000f0 TradeBufferOTnameAndNicknames 08050f14 l 00000028 DoTradeAnim 08050f3c l 000013f0 DoTradeAnim_Cable 0805232c l 0000145c DoTradeAnim_Wireless -08053788 l 000000b4 CB2_TryEvolveAfterTrade +08053788 l 000000b4 CB2_TryLinkTradeEvolution 0805383c l 00000080 HandleLinkDataReceive -080538bc l 0000007c SpriteCB_TradePokeball_Default -08053938 l 00000074 SpriteCB_TradePokeball_Outbound -080539ac l 00000060 SpriteCB_TradePokeball_Outbound2 -08053a0c l 00000090 SpriteCB_TradePokeball_Inbound +080538bc l 0000007c SpriteCB_BouncingPokeball +08053938 l 00000074 SpriteCB_BouncingPokeballDepart +080539ac l 00000060 SpriteCB_BouncingPokeballDepartEnd +08053a0c l 00000090 SpriteCB_BouncingPokeballArrive 08053a9c g 00000048 GetInGameTradeSpeciesInfo 08053ae4 l 00000064 BufferInGameTradeMonName 08053b48 l 0000018c CreateInGameTradePokemonInternal 08053cd4 l 00000058 GetInGameTradeMail 08053d2c g 0000003c GetTradeSpecies 08053d68 g 0000001c CreateInGameTradePokemon -08053d84 l 00000098 CB2_RunTradeAnim_LinkTrade -08053e1c l 00000070 CB2_WaitAndAckTradeComplete -08053e8c l 00000538 CB2_HandleTradeEnded -080543c4 l 0000007c LinkTrade_TearDownAssets +08053d84 l 00000098 CB2_UpdateLinkTrade +08053e1c l 00000070 CB2_WaitTradeComplete +08053e8c l 00000538 CB2_SaveAndEndTrade +080543c4 l 0000007c CB2_FreeTradeAnim 08054440 g 00000030 DoInGameTradeScene -08054470 l 0000003c Task_WaitFadeAndStartInGameTradeAnim +08054470 l 0000003c Task_InGameTrade 080544ac l 00000050 CheckPartnersMonForRibbons 080544fc g 0000000a LoadTradeAnimGfx 08054508 g 00000080 DrawTextOnTradeWindow @@ -5158,7 +5158,7 @@ 0807543c g 00000018 AnimLoadCompressedBgTilemap 08075454 g 00000004 GetBattleBgPaletteNum 08075458 g 00000036 ToggleBg3Mode -08075490 g 00000028 TradeMenuBouncePartySprites +08075490 g 00000028 Trade_MoveSelectedMonToTarget 080754b8 g 0000003e InitSpriteDataForLinearTranslation 080754f8 g 00000098 InitAnimLinearTranslation 08075590 g 00000028 StartAnimLinearTranslation @@ -10468,7 +10468,7 @@ 0810faf0 g 0000007c Menu_ProcessInputNoWrapAround_other 0810fb6c g 0000007c PrintTextArray 0810fbe8 g 00000098 MultichoiceList_PrintItems -0810fc80 g 0000004e UnionRoomAndTradeMenuPrintOptions +0810fc80 g 0000004e PrintMenuTable 0810fcd0 g 00000112 AddItemMenuActionTextPrinters 0810fde4 l 0000006c PrintMenuActionTextsAtTopById 0810fe50 g 000000b4 SetWindowTemplateFields @@ -27510,119 +27510,118 @@ 08260a32 l 000001fe sTradePartyBoxTilemap 08260c30 l 00000800 sTradeStripesBG2Tilemap 08261430 l 00000800 sTradeStripesBG3Tilemap -08261c30 l 00000008 gOamData_8261C30 -08261c38 l 00000008 gOamData_8261C38 -08261c40 l 00000008 gSpriteAnim_8261C40 -08261c48 l 00000008 gSpriteAnim_8261C48 -08261c50 l 00000008 gSpriteAnimTable_8261C50 -08261c58 l 00000008 sTradeButtons_SpriteSheet -08261c60 l 00000008 sTradeButtons_SpritePal -08261c68 l 00000008 gSpriteAnim_8261C68 -08261c70 l 00000008 gSpriteAnim_8261C70 -08261c78 l 00000008 gSpriteAnim_8261C78 -08261c80 l 00000008 gSpriteAnim_8261C80 -08261c88 l 00000008 gSpriteAnim_8261C88 -08261c90 l 00000008 gSpriteAnim_8261C90 -08261c98 l 00000018 gSpriteAnimTable_8261C98 -08261cb0 l 00000018 sSpriteTemplate_TradeButtons -08261cc8 l 00000018 sSpriteTemplate_Text -08261ce0 l 00000020 sTradeTextPal -08261d00 l 00000008 sSpritePalette_Text +08261c30 l 00000008 sOamData_MenuText +08261c38 l 00000008 sOamData_Cursor +08261c40 l 00000008 sAnim_Cursor_Normal +08261c48 l 00000008 sAnim_Cursor_OnCancel +08261c50 l 00000008 sAnims_Cursor +08261c58 l 00000008 sCursor_SpriteSheet +08261c60 l 00000008 sCursor_SpritePalette +08261c68 l 00000008 sAnim_MenuText_0 +08261c70 l 00000008 sAnim_MenuText_1 +08261c78 l 00000008 sAnim_MenuText_2 +08261c80 l 00000008 sAnim_MenuText_3 +08261c88 l 00000008 sAnim_MenuText_4 +08261c90 l 00000008 sAnim_MenuText_5 +08261c98 l 00000018 sAnims_MenuText +08261cb0 l 00000018 sSpriteTemplate_Cursor +08261cc8 l 00000018 sSpriteTemplate_MenuText +08261ce0 l 00000020 sMenuText_Pal +08261d00 l 00000008 sSpritePalette_MenuText 08261d08 l 00000138 sCursorMoveDestinations 08261e40 l 0000001a sTradeMonSpriteCoords -08261e5a l 00000018 sTradeMenuGenderLevelPrintCoords -08261e72 l 00000018 sTradeMenuGenderLevelWindowCoords -08261e8a l 00000008 sTradeUnknownSpriteCoords -08261e92 l 00000024 gUnknown_8261E92 -08261eb6 g 00000001 sText_Dummy -08261eb7 g 0000000a sText_ClrWhtHltTranspShdwDrkGry +08261e5a l 00000018 sTradeMonLevelCoords +08261e72 l 00000018 sTradeMonBoxCoords +08261e8a l 00000008 sPlayerNameCoords +08261e92 l 00000024 sUnusedCoords +08261eb6 l 00000001 sText_Dummy +08261eb7 l 0000000a sText_ClrWhtHltTranspShdwDrkGry 08261ec1 g 00000002 gText_MaleSymbol4 08261ec3 g 00000002 gText_FemaleSymbol4 08261ec5 g 00000001 gText_GenderlessSymbol -08261ec6 g 00000001 sText_Dummy2 -08261ec7 g 00000002 sText_Newline -08261ec9 g 00000002 sText_Slash -08261ecc l 00000018 sTradeUITextPtrs +08261ec6 l 00000001 sText_Dummy2 +08261ec7 l 00000002 sText_Newline +08261ec9 l 00000002 sText_Slash +08261ecc l 00000018 sActionTexts 08261ee4 l 00000010 sMenuAction_SummaryTrade -08261ef4 l 00000024 sTradeErrorOrStatusMessagePtrs +08261ef4 l 00000024 sMessages 08261f18 l 00000003 sTextColor_PartyMonNickname 08261f1c l 00000010 sBgTemplates 08261f2c l 00000098 sWindowTemplates 08261fc4 l 00000008 sWindowTemplate_YesNo -08261fcc l 00000068 gUnknown_8261FCC -08262034 l 00000005 gJPText_Shedinja -08262039 l 0000000e gUnknown_8262039 -08262047 l 0000000e gUnknown_8262047 -08262055 l 00000004 gUnknown_8262055 -0826205c l 00000020 sTradeBallPalette -0826207c l 00000600 sTradeBallTiles -0826267c l 00001a00 sPokeballSymbolTiles -0826407c l 00000800 sCableCloseupMap -0826487c l 00000100 sPokeballSymbolMap -0826497c l 00000020 sUnref_083308C0 -0826499c l 00000020 sTradeGbaPal +08261fcc l 00000068 sDebug_Messages +08262034 l 00000005 sText_ShedinjaJP +08262039 l 0000001c sDebug_TradeResultTexts +08262055 l 00000004 sSelectedMonLevelGenderCoords +0826205c l 00000020 sPokeball_Pal +0826207c l 00000600 sPokeball_Gfx +0826267c l 00001a00 sPokeballSymbol_Gfx +0826407c l 00000800 sCableCloseup_Map +0826487c l 00000100 sPokeballSymbol_Map +0826497c l 00000020 sUnusedPal1 +0826499c l 00000020 sGba_Pal 082649bc l 00000020 sShadowPalette 082649dc l 00000020 sBlackPalette -082649fc l 00000020 sTradeGlowPal -08264a1c l 00000200 sTradeGlow1Tiles -08264c1c l 00000200 sTradeGlow2Tiles -08264e1c l 00000200 sTradeCableEndTiles -0826501c l 00001000 sTradeGBAScreenTiles +082649fc l 00000020 sLinkMon_Pal +08264a1c l 00000200 sLinkMonGlow_Gfx +08264c1c l 00000200 sLinkMonShadow_Gfx +08264e1c l 00000200 sCableEnd_Gfx +0826501c l 00001000 sGbaScreen_Gfx 0826601c g 00001000 gTradeOrHatchMonShadowTilemap -0826701c l 00002800 sGbaAffineTiles -0826981c l 00000040 sFiller_08335760 +0826701c l 00002800 sGbaAffine_Gfx +0826981c l 00000040 sEmptyGfx 0826985c l 00000100 sGbaAffineMapCable 0826995c l 00000100 sGbaAffineMapWireless 08269a5c l 00001000 sGbaMapWireless 0826aa5c l 00001000 sGbaMapCable -0826ba5c l 00000100 sWirelessCloseupMap +0826ba5c l 00000100 sWirelessCloseup_Map 0826bb5c l 00000200 sWirelessSignalAnimPals_Outbound 0826bd5c l 00000200 sWirelessSignalAnimPals_Inbound 0826bf5c l 00000020 sWirelessSignalAnimPals_Off 0826bf7c l 00000690 sWirelessSignal4bpp 0826c60c l 000006f4 sWirelessSignalTilemap -0826cd00 l 00000008 gOamData_826CD00 -0826cd08 l 0000003c gAnimCmd_826CD08 -0826cd44 l 0000003c gAnimCmd_826CD44 -0826cd80 l 00000008 gSpriteAnimTable_826CD80 -0826cd88 l 00000010 gAffineAnimCmd_826CD88 -0826cd98 l 00000010 gAffineAnimCmd_826CD98 -0826cda8 l 00000020 gAffineAnimCmd_826CDA8 -0826cdc8 l 0000000c gSpriteAffineAnimTable_826CDC8 -0826cdd4 l 00000008 sTradeBallSpriteSheet +0826cd00 l 00000008 sOamData_Pokeball +0826cd08 l 0000003c sAnim_Pokeball_SpinOnce +0826cd44 l 0000003c sAnim_Pokeball_SpinTwice +0826cd80 l 00000008 sAnims_Pokeball +0826cd88 l 00000010 sAffineAnim_Pokeball_Normal +0826cd98 l 00000010 sAffineAnim_Pokeball_Squish +0826cda8 l 00000020 sAffineAnim_Pokeball_Unsquish +0826cdc8 l 0000000c sAffineAnims_Pokeball +0826cdd4 l 00000008 sPokeBallSpriteSheet 0826cddc l 00000008 sTradeBallSpritePal -0826cde4 l 00000018 sTradePokeballSpriteTemplate -0826cdfc l 00000008 gOamData_826CDFC -0826ce04 l 00000008 gAnimCmd_826CE04 -0826ce0c l 00000004 gSpriteAnimTable_826CE0C -0826ce10 l 00000018 gAffineAnimCmd_826CE10 -0826ce28 l 00000004 gSpriteAffineAnimTable_826CE28 -0826ce2c l 00000008 sTradeGlow1SpriteSheet -0826ce34 l 00000008 sTradeGlowSpritePal -0826ce3c l 00000008 sTradeGbaSpritePal -0826ce44 l 00000018 sTradeGlow1SpriteTemplate -0826ce5c l 00000008 gOamData_826CE5C -0826ce64 l 00000008 gAnimCmd_826CE64 -0826ce6c l 00000008 gAnimCmd_826CE6C -0826ce74 l 00000008 gSpriteAnimTable_826CE74 -0826ce7c l 00000008 sTradeGlow2SpriteSheet -0826ce84 l 00000018 sGlowBallSpriteTemplate -0826ce9c l 00000008 gOamData_826CE9C -0826cea4 l 00000008 gAnimCmd_826CEA4 -0826ceac l 00000004 gSpriteAnimTable_826CEAC -0826ceb0 l 00000008 sTradeCableEndSpriteSheet -0826ceb8 l 00000018 sGameLinkCableEndSpriteTemplate -0826ced0 l 00000008 gOamData_826CED0 -0826ced8 l 00000024 gAnimCmd_826CED8 -0826cefc l 00000024 gAnimCmd_826CEFC -0826cf20 l 00000004 gSpriteAnimTable_826CF20 -0826cf24 l 00000004 gSpriteAnimTable_826CF24 +0826cde4 l 00000018 sSpriteTemplate_Pokeball +0826cdfc l 00000008 sOamData_LinkMonGlow +0826ce04 l 00000008 sAnim_LinkMonGlow +0826ce0c l 00000004 sAnims_LinkMonGlow +0826ce10 l 00000018 sAffineAnim_LinkMonGlow +0826ce28 l 00000004 sAffineAnims_LinkMonGlow +0826ce2c l 00000008 sSpriteSheet_LinkMonGlow +0826ce34 l 00000008 sSpritePalette_LinkMon +0826ce3c l 00000008 sSpritePalette_Gba +0826ce44 l 00000018 sSpriteTemplate_LinkMonGlow +0826ce5c l 00000008 sOamData_LinkMonShadow +0826ce64 l 00000008 sAnim_LinkMonShadow_Big +0826ce6c l 00000008 sAnim_LinkMonShadow_Small +0826ce74 l 00000008 sAnims_LinkMonShadow +0826ce7c l 00000008 sSpriteSheet_LinkMonShadow +0826ce84 l 00000018 sSpriteTemplate_LinkMonShadow +0826ce9c l 00000008 sOamData_CableEnd +0826cea4 l 00000008 sAnim_CableEnd +0826ceac l 00000004 sAnims_CableEnd +0826ceb0 l 00000008 sSpriteSheet_CableEnd +0826ceb8 l 00000018 sSpriteTemplate_CableEnd +0826ced0 l 00000008 sOamData_GbaScreen +0826ced8 l 00000024 sAnim_GbaScreen_Long +0826cefc l 00000024 sAnim_GbaScreen_Short +0826cf20 l 00000004 sAnims_GbaScreen_Long +0826cf24 l 00000004 sAnims_GbaScreen_Short 0826cf28 l 00000008 sTradeGBAScreenSpriteSheet -0826cf30 l 00000018 sTradeGBAScreenSpriteTemplate1 -0826cf48 l 00000018 sTradeGBAScreenSpriteTemplate2 -0826cf60 l 00000018 sTradeGlow2PaletteAnimTable -0826cf78 l 00000010 gAffineAnimCmd_826CF78 -0826cf88 l 00000004 sSpriteAffineAnimTable_PlayerPokePicAlt +0826cf30 l 00000018 sSpriteTemplate_GbaScreenFlash_Long +0826cf48 l 00000018 sSpriteTemplate_GbaScreenFlash_Short +0826cf60 l 00000018 sLinkMonShadow_Pal +0826cf78 l 00000010 sAffineAnim_CrossingMonPic +0826cf88 l 00000004 sAffineAnims_CrossingMonPics 0826cf8c l 0000021c sInGameTrades 0826d1a8 l 00000014 sInGameTradeMailMessages 0826d1bc l 00000010 sTradeMessageWindowTemplates @@ -50752,11 +50751,11 @@ 08e9cb9c g 00000020 gMonMarkingsMenu_Pal 08e9cbbc g 00000320 gMonMarkingsMenu_Gfx 08e9cedc g 00000060 gTradeMenu_Pal -08e9cf3c g 00000020 gTradeButtons_Pal +08e9cf3c g 00000020 gTradeCursor_Pal 08e9cf5c g 00001280 gTradeMenu_Gfx -08e9e1dc g 00000800 gTradeButtons_Gfx -08e9e9dc g 00000020 gUnknown_8E9E9DC -08e9e9fc g 00000800 gUnknown_8E9E9FC +08e9e1dc g 00000800 gTradeCursor_Gfx +08e9e9dc g 00000020 gTradeUnused_Tilemap +08e9e9fc g 00000800 gTradeMenu_Tilemap 08e9f1fc g 00000024 gTradeMenuMonBox_Tilemap 08e9f220 g 00000040 gFameCheckerBgPals 08e9f260 g 000014a0 gFameCheckerBgTiles diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index a9868003b..0ae01ee3e 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -174,12 +174,12 @@ 020316e4 g 00000080 gSaveBlock3_DMA 02031764 g 00000528 gLoadedSaveData 02031c8c g 00000004 gLastEncryptionKey -02031c90 l 00000004 sSpriteTextTileBuffer -02031c94 l 00000038 sSpriteTextTilePtrs +02031c90 l 00000004 sMenuTextTileBuffer +02031c94 l 00000038 sMenuTextTileBuffers 02031ccc g 000000d8 gLinkPartnerMail 02031da4 g 00000002 gSelectedTradeMonPositions -02031da8 l 00000004 sTradeMenuResourcesPtr -02031dac l 00000004 sTradeData +02031da8 l 00000004 sTradeMenu +02031dac l 00000004 sTradeAnim 02031db0 g 00000001 gDifferentSaveFile 02031db4 g 00000008 gLastUsedWarp 02031dbc l 00000008 sWarpDestination @@ -2457,7 +2457,7 @@ 0804415c g 00000038 GetMonSpritePalStruct 08044194 g 00000038 GetMonSpritePalStructFromOtIdPersonality 080441cc g 0000003a IsHMMove2 -08044208 g 00000018 IsPokeSpriteNotFlipped +08044208 g 00000018 IsMonSpriteNotFlipped 08044220 l 00000028 GetMonFlavorRelation 08044248 g 00000028 GetFlavorRelationByPersonality 08044270 g 0000002a IsTradedMon @@ -2718,120 +2718,120 @@ 0804c59c g 0000001c ApplyNewEncryptionKeyToWord 0804c5b8 g 0000005c ApplyNewEncryptionKeyToAllEncryptedData 0804c614 l 00000000 .gcc2_compiled. -0804c614 l 00000118 InitTradeMenuResources +0804c614 l 00000118 InitTradeMenu 0804c72c g 00000010 CB2_StartCreateTradeMenu -0804c73c l 000007ec CB2_ReturnFromLinkTrade2 +0804c73c l 000007ec CB2_CreateTradeMenu 0804cf28 g 000005e4 CB2_ReturnToTradeMenuFromSummary -0804d50c l 00000012 VblankCB_Trade -0804d520 l 0000003c TradeMenuCB_9 -0804d55c l 0000005c TradeMenuCB_10 -0804d5b8 l 00000094 TradeMenuCB_13 +0804d50c l 00000012 VBlankCB_TradeMenu +0804d520 l 0000003c CB_FadeToStartTrade +0804d55c l 0000005c CB_WaitToStartTrade +0804d5b8 l 00000094 CB_StartLinkTrade 0804d64c l 0000005c CB2_TradeMenu -0804d6a8 l 000000ce LoadTradeBackgroundGfxAndPals -0804d778 l 000000b0 SetTradeMenuOptionActiveFlags +0804d6a8 l 000000ce LoadTradeBgGfx +0804d778 l 000000b0 SetActiveMenuOptions 0804d828 l 00000020 Trade_Memcpy -0804d848 l 00000378 shedinja_maker_maybe +0804d848 l 00000378 BufferTradeParties 0804dbc0 l 00000028 PrintIsThisTradeOkay -0804dbe8 l 00000120 Master_HandleBlockReceivedStatus -0804dd08 l 000000fc Slave_HandleBlockReceivedStatus -0804de04 l 00000200 Master_HandleCommunication -0804e004 l 00000036 CB1_HandleBlockReceive -0804e03c l 0000004c TradeMenuGetNewCursorLocation +0804dbe8 l 00000120 Leader_ReadLinkBuffer +0804dd08 l 000000fc Follower_ReadLinkBuffer +0804de04 l 00000200 Leader_HandleCommunication +0804e004 l 00000036 CB1_UpdateLink +0804e03c l 0000004c GetNewCursorPosition 0804e088 l 000000c0 TradeMenuMoveCursor -0804e148 l 0000005e CommunicatePlayerSelectedMonForTrade -0804e1a8 l 0000019c TradeMenuCB_0 +0804e148 l 0000005e SetReadyToTrade +0804e1a8 l 0000019c CB_ProcessMenuInput 0804e344 l 00000058 RedrawChooseAPokemonWindow -0804e39c l 000000e4 TradeMenuCB_1 -0804e480 l 00000028 TradeMenuCB_15 -0804e4a8 l 00000078 TradeMenuCB_2 -0804e520 l 00000092 PlayerHasEnoughPokemonToTrade_HandleMewDeoxys +0804e39c l 000000e4 CB_ProcessSelectedMonInput +0804e480 l 00000028 CB_ChooseMonAfterButtonPress +0804e4a8 l 00000078 CB_ShowTradeMonSummaryScreen +0804e520 l 00000092 CheckValidityOfTradeMons 0804e5b4 l 000000d4 CommunicateWhetherMonCanBeTraded -0804e688 l 00000088 TradeMenuCB_3 -0804e710 l 00000048 CommitWindows -0804e758 l 00000084 TradeMenuCB_4 -0804e7dc l 0000003c TradeMenuCB_6 -0804e818 l 0000002c TradeMenuCB_7 -0804e844 l 00000050 TradeMenuCB_14 -0804e894 l 00000088 TradeMenuCB_8 -0804e91c l 0000003c TradeMenuCB_11 -0804e958 l 0000007c TradeMenuCB_12 -0804e9d4 l 00000024 TradeMenuCB_16 +0804e688 l 00000088 CB_ProcessConfirmTradeInput +0804e710 l 00000048 RestoreNicknamesCoveredByYesNo +0804e758 l 00000084 CB_ProcessCancelTradeInput +0804e7dc l 0000003c CB_SetSelectedMons +0804e818 l 0000002c CB_PrintIsThisTradeOkay +0804e844 l 00000050 CB_InitConfirmTradePrompt +0804e894 l 00000088 CB_HandleTradeCanceled +0804e91c l 0000003c CB_InitExitCanceledTrade +0804e958 l 0000007c CB_ExitCanceledTrade +0804e9d4 l 00000024 CB_WaitToStartRfuTrade 0804e9f8 l 000000c6 RunTradeMenuCallback -0804eac0 l 00000038 SignalRedrawTradeMenus -0804eaf8 l 00000388 HandleRedrawTradeMenuOnSide -0804ee80 l 00000068 GetNicknameStringWidthByPartyAndMonIdx -0804eee8 l 000000e0 BuildMovesString +0804eac0 l 00000038 SetSelectedMon +0804eaf8 l 00000388 DrawSelectedMonScreen +0804ee80 l 00000068 GetMonNicknameWidth +0804eee8 l 000000e0 BufferMovesString 0804efc8 l 0000006c PrintPartyMonNickname 0804f034 l 0000006c PrintPartyNicknames -0804f0a0 l 000001f8 PrintLevelAndGenderDirectlyOnVram -0804f298 l 00000064 PrintPartyLevelsAndGendersDirectlyOnVram +0804f0a0 l 000001f8 PrintLevelAndGender +0804f298 l 00000064 PrintPartyLevelsAndGenders 0804f2fc l 000000cc ShowTradePartyMonIcons 0804f3c8 l 00000012 PrintTradePartnerPartyNicknames 0804f3dc l 00000078 RedrawPartyWindow -0804f454 l 00000024 TradeMenuAction_Summary -0804f478 l 00000024 TradeMenuAction_Trade -0804f49c l 00000054 ScheduleLinkTaskWithDelay -0804f4f0 l 000000e0 RunScheduledLinkTasks -0804f5d0 l 00000054 PrintTradeErrorOrStatusMessage -0804f624 l 00000116 LoadUISprites -0804f73c l 00000020 RenderTextToVramViaBuffer +0804f454 l 00000024 Task_DrawSelectionSummary +0804f478 l 00000024 Task_DrawSelectionTrade +0804f49c l 00000054 QueueAction +0804f4f0 l 000000e0 DoQueuedActions +0804f5d0 l 00000054 PrintTradeMessage +0804f624 l 00000116 LoadUISpriteGfx +0804f73c l 00000020 DrawBottomRowText 0804f75c l 00000148 ComputePartyTradeableFlags 0804f8a4 l 000000d4 ComputePartyHPBarLevels -0804f978 l 00000074 SetMonIconsAnimByHPBarLevel -0804f9ec l 0000003c CopyGiftRibbonsToSav1 -0804fa28 l 0000011e TestWhetherSelectedMonCanBeTraded -0804fb48 g 00000094 Trade_CalcLinkPlayerCompatibilityParam +0804f978 l 00000074 SetTradePartyHPBarSprites +0804f9ec l 0000003c SaveTradeGiftRibbons +0804fa28 l 0000011e CanTradeSelectedMon +0804fb48 g 00000094 GetGameProgressForLinkTrade 0804fbdc l 00000024 IsDeoxysOrMewUntradable 0804fc00 g 000000f2 GetUnionRoomTradeMessageId 0804fcf4 g 00000044 CanRegisterMonForTradingBoard 0804fd38 l 00000000 .gcc2_compiled. -0804fd38 l 00000022 SpriteCB_TradeGlowCable -0804fd5c l 00000030 SpriteCB_TradeGlowWireless -0804fd8c l 00000040 SpriteCB_TradeGlowCore -0804fdcc l 00000022 SpriteCB_GameLinkCableEnd_Outbound -0804fdf0 l 00000022 SpriteCB_GameLinkCableEnd_Inbound -0804fe14 l 00000022 SpriteCB_TradeGBAScreen +0804fd38 l 00000022 SpriteCB_LinkMonGlow +0804fd5c l 00000030 SpriteCB_LinkMonGlowWireless +0804fd8c l 00000040 SpriteCB_LinkMonShadow +0804fdcc l 00000022 SpriteCB_CableEndSending +0804fdf0 l 00000022 SpriteCB_CableEndReceiving +0804fe14 l 00000022 SpriteCB_GbaScreen 0804fe38 l 00000090 SetTradeBGAffine -0804fec8 l 00000056 TradeAnim_UpdateBgRegs +0804fec8 l 00000056 SetTradeGpuRegs 0804ff20 l 00000016 VBlankCB_TradeAnim -0804ff38 l 00000028 InitLinkTimeoutTracker +0804ff38 l 00000028 ClearLinkTimeoutTimer 0804ff60 l 00000078 CheckLinkTimeout -0804ffd8 l 00000020 GetMultiplayerIdOfLinkTrade +0804ffd8 l 00000020 TradeGetMultiplayerId 0804fff8 l 00000154 LoadTradeMonPic 0805014c g 00000364 CB2_LinkTrade 080504b0 g 00000012 InitTradeSequenceBgGpuRegs 080504c4 g 0000001c LinkTradeDrawWindow 080504e0 l 00000100 TradeAnimInit_LoadGfx -080505e0 l 000001d4 CB2_InitTradeAnim_InGameTrade -080507b4 l 00000060 ReceivedMonSetPokedexFlags -08050814 l 0000000a RS_TryEnableNationalPokedex +080505e0 l 000001d4 CB2_InitInGameTrade +080507b4 l 00000060 UpdatePokedexForReceivedMon +08050814 l 0000000a TryEnableNationalDexFromLinkPartner 08050820 l 000000e8 TradeMons 08050908 l 00000054 HandleLinkDataSend -0805095c l 0000001e CB2_RunTradeAnim_InGameTrade +0805095c l 0000001e CB2_InGameTrade 0805097c l 00000478 SetTradeSequenceBgGpuRegs 08050df4 l 00000044 LoadTradeGbaSpriteGfx 08050e38 l 000000f0 TradeBufferOTnameAndNicknames 08050f28 l 00000028 DoTradeAnim 08050f50 l 000013f0 DoTradeAnim_Cable 08052340 l 0000145c DoTradeAnim_Wireless -0805379c l 000000b4 CB2_TryEvolveAfterTrade +0805379c l 000000b4 CB2_TryLinkTradeEvolution 08053850 l 00000080 HandleLinkDataReceive -080538d0 l 0000007c SpriteCB_TradePokeball_Default -0805394c l 00000074 SpriteCB_TradePokeball_Outbound -080539c0 l 00000060 SpriteCB_TradePokeball_Outbound2 -08053a20 l 00000090 SpriteCB_TradePokeball_Inbound +080538d0 l 0000007c SpriteCB_BouncingPokeball +0805394c l 00000074 SpriteCB_BouncingPokeballDepart +080539c0 l 00000060 SpriteCB_BouncingPokeballDepartEnd +08053a20 l 00000090 SpriteCB_BouncingPokeballArrive 08053ab0 g 00000048 GetInGameTradeSpeciesInfo 08053af8 l 00000064 BufferInGameTradeMonName 08053b5c l 0000018c CreateInGameTradePokemonInternal 08053ce8 l 00000058 GetInGameTradeMail 08053d40 g 0000003c GetTradeSpecies 08053d7c g 0000001c CreateInGameTradePokemon -08053d98 l 00000098 CB2_RunTradeAnim_LinkTrade -08053e30 l 00000070 CB2_WaitAndAckTradeComplete -08053ea0 l 00000538 CB2_HandleTradeEnded -080543d8 l 0000007c LinkTrade_TearDownAssets +08053d98 l 00000098 CB2_UpdateLinkTrade +08053e30 l 00000070 CB2_WaitTradeComplete +08053ea0 l 00000538 CB2_SaveAndEndTrade +080543d8 l 0000007c CB2_FreeTradeAnim 08054454 g 00000030 DoInGameTradeScene -08054484 l 0000003c Task_WaitFadeAndStartInGameTradeAnim +08054484 l 0000003c Task_InGameTrade 080544c0 l 00000050 CheckPartnersMonForRibbons 08054510 g 0000000a LoadTradeAnimGfx 0805451c g 00000080 DrawTextOnTradeWindow @@ -5158,7 +5158,7 @@ 08075450 g 00000018 AnimLoadCompressedBgTilemap 08075468 g 00000004 GetBattleBgPaletteNum 0807546c g 00000036 ToggleBg3Mode -080754a4 g 00000028 TradeMenuBouncePartySprites +080754a4 g 00000028 Trade_MoveSelectedMonToTarget 080754cc g 0000003e InitSpriteDataForLinearTranslation 0807550c g 00000098 InitAnimLinearTranslation 080755a4 g 00000028 StartAnimLinearTranslation @@ -10469,7 +10469,7 @@ 0810fb68 g 0000007c Menu_ProcessInputNoWrapAround_other 0810fbe4 g 0000007c PrintTextArray 0810fc60 g 00000098 MultichoiceList_PrintItems -0810fcf8 g 0000004e UnionRoomAndTradeMenuPrintOptions +0810fcf8 g 0000004e PrintMenuTable 0810fd48 g 00000112 AddItemMenuActionTextPrinters 0810fe5c l 0000006c PrintMenuActionTextsAtTopById 0810fec8 g 000000b4 SetWindowTemplateFields @@ -27511,119 +27511,118 @@ 08260aa2 l 000001fe sTradePartyBoxTilemap 08260ca0 l 00000800 sTradeStripesBG2Tilemap 082614a0 l 00000800 sTradeStripesBG3Tilemap -08261ca0 l 00000008 gOamData_8261C30 -08261ca8 l 00000008 gOamData_8261C38 -08261cb0 l 00000008 gSpriteAnim_8261C40 -08261cb8 l 00000008 gSpriteAnim_8261C48 -08261cc0 l 00000008 gSpriteAnimTable_8261C50 -08261cc8 l 00000008 sTradeButtons_SpriteSheet -08261cd0 l 00000008 sTradeButtons_SpritePal -08261cd8 l 00000008 gSpriteAnim_8261C68 -08261ce0 l 00000008 gSpriteAnim_8261C70 -08261ce8 l 00000008 gSpriteAnim_8261C78 -08261cf0 l 00000008 gSpriteAnim_8261C80 -08261cf8 l 00000008 gSpriteAnim_8261C88 -08261d00 l 00000008 gSpriteAnim_8261C90 -08261d08 l 00000018 gSpriteAnimTable_8261C98 -08261d20 l 00000018 sSpriteTemplate_TradeButtons -08261d38 l 00000018 sSpriteTemplate_Text -08261d50 l 00000020 sTradeTextPal -08261d70 l 00000008 sSpritePalette_Text +08261ca0 l 00000008 sOamData_MenuText +08261ca8 l 00000008 sOamData_Cursor +08261cb0 l 00000008 sAnim_Cursor_Normal +08261cb8 l 00000008 sAnim_Cursor_OnCancel +08261cc0 l 00000008 sAnims_Cursor +08261cc8 l 00000008 sCursor_SpriteSheet +08261cd0 l 00000008 sCursor_SpritePalette +08261cd8 l 00000008 sAnim_MenuText_0 +08261ce0 l 00000008 sAnim_MenuText_1 +08261ce8 l 00000008 sAnim_MenuText_2 +08261cf0 l 00000008 sAnim_MenuText_3 +08261cf8 l 00000008 sAnim_MenuText_4 +08261d00 l 00000008 sAnim_MenuText_5 +08261d08 l 00000018 sAnims_MenuText +08261d20 l 00000018 sSpriteTemplate_Cursor +08261d38 l 00000018 sSpriteTemplate_MenuText +08261d50 l 00000020 sMenuText_Pal +08261d70 l 00000008 sSpritePalette_MenuText 08261d78 l 00000138 sCursorMoveDestinations 08261eb0 l 0000001a sTradeMonSpriteCoords -08261eca l 00000018 sTradeMenuGenderLevelPrintCoords -08261ee2 l 00000018 sTradeMenuGenderLevelWindowCoords -08261efa l 00000008 sTradeUnknownSpriteCoords -08261f02 l 00000024 gUnknown_8261E92 -08261f26 g 00000001 sText_Dummy -08261f27 g 0000000a sText_ClrWhtHltTranspShdwDrkGry +08261eca l 00000018 sTradeMonLevelCoords +08261ee2 l 00000018 sTradeMonBoxCoords +08261efa l 00000008 sPlayerNameCoords +08261f02 l 00000024 sUnusedCoords +08261f26 l 00000001 sText_Dummy +08261f27 l 0000000a sText_ClrWhtHltTranspShdwDrkGry 08261f31 g 00000002 gText_MaleSymbol4 08261f33 g 00000002 gText_FemaleSymbol4 08261f35 g 00000001 gText_GenderlessSymbol -08261f36 g 00000001 sText_Dummy2 -08261f37 g 00000002 sText_Newline -08261f39 g 00000002 sText_Slash -08261f3c l 00000018 sTradeUITextPtrs +08261f36 l 00000001 sText_Dummy2 +08261f37 l 00000002 sText_Newline +08261f39 l 00000002 sText_Slash +08261f3c l 00000018 sActionTexts 08261f54 l 00000010 sMenuAction_SummaryTrade -08261f64 l 00000024 sTradeErrorOrStatusMessagePtrs +08261f64 l 00000024 sMessages 08261f88 l 00000003 sTextColor_PartyMonNickname 08261f8c l 00000010 sBgTemplates 08261f9c l 00000098 sWindowTemplates 08262034 l 00000008 sWindowTemplate_YesNo -0826203c l 00000068 gUnknown_8261FCC -082620a4 l 00000005 gJPText_Shedinja -082620a9 l 0000000e gUnknown_8262039 -082620b7 l 0000000e gUnknown_8262047 -082620c5 l 00000004 gUnknown_8262055 -082620cc l 00000020 sTradeBallPalette -082620ec l 00000600 sTradeBallTiles -082626ec l 00001a00 sPokeballSymbolTiles -082640ec l 00000800 sCableCloseupMap -082648ec l 00000100 sPokeballSymbolMap -082649ec l 00000020 sUnref_083308C0 -08264a0c l 00000020 sTradeGbaPal +0826203c l 00000068 sDebug_Messages +082620a4 l 00000005 sText_ShedinjaJP +082620a9 l 0000001c sDebug_TradeResultTexts +082620c5 l 00000004 sSelectedMonLevelGenderCoords +082620cc l 00000020 sPokeball_Pal +082620ec l 00000600 sPokeball_Gfx +082626ec l 00001a00 sPokeballSymbol_Gfx +082640ec l 00000800 sCableCloseup_Map +082648ec l 00000100 sPokeballSymbol_Map +082649ec l 00000020 sUnusedPal1 +08264a0c l 00000020 sGba_Pal 08264a2c l 00000020 sShadowPalette 08264a4c l 00000020 sBlackPalette -08264a6c l 00000020 sTradeGlowPal -08264a8c l 00000200 sTradeGlow1Tiles -08264c8c l 00000200 sTradeGlow2Tiles -08264e8c l 00000200 sTradeCableEndTiles -0826508c l 00001000 sTradeGBAScreenTiles +08264a6c l 00000020 sLinkMon_Pal +08264a8c l 00000200 sLinkMonGlow_Gfx +08264c8c l 00000200 sLinkMonShadow_Gfx +08264e8c l 00000200 sCableEnd_Gfx +0826508c l 00001000 sGbaScreen_Gfx 0826608c g 00001000 gTradeOrHatchMonShadowTilemap -0826708c l 00002800 sGbaAffineTiles -0826988c l 00000040 sFiller_08335760 +0826708c l 00002800 sGbaAffine_Gfx +0826988c l 00000040 sEmptyGfx 082698cc l 00000100 sGbaAffineMapCable 082699cc l 00000100 sGbaAffineMapWireless 08269acc l 00001000 sGbaMapWireless 0826aacc l 00001000 sGbaMapCable -0826bacc l 00000100 sWirelessCloseupMap +0826bacc l 00000100 sWirelessCloseup_Map 0826bbcc l 00000200 sWirelessSignalAnimPals_Outbound 0826bdcc l 00000200 sWirelessSignalAnimPals_Inbound 0826bfcc l 00000020 sWirelessSignalAnimPals_Off 0826bfec l 00000690 sWirelessSignal4bpp 0826c67c l 000006f4 sWirelessSignalTilemap -0826cd70 l 00000008 gOamData_826CD00 -0826cd78 l 0000003c gAnimCmd_826CD08 -0826cdb4 l 0000003c gAnimCmd_826CD44 -0826cdf0 l 00000008 gSpriteAnimTable_826CD80 -0826cdf8 l 00000010 gAffineAnimCmd_826CD88 -0826ce08 l 00000010 gAffineAnimCmd_826CD98 -0826ce18 l 00000020 gAffineAnimCmd_826CDA8 -0826ce38 l 0000000c gSpriteAffineAnimTable_826CDC8 -0826ce44 l 00000008 sTradeBallSpriteSheet +0826cd70 l 00000008 sOamData_Pokeball +0826cd78 l 0000003c sAnim_Pokeball_SpinOnce +0826cdb4 l 0000003c sAnim_Pokeball_SpinTwice +0826cdf0 l 00000008 sAnims_Pokeball +0826cdf8 l 00000010 sAffineAnim_Pokeball_Normal +0826ce08 l 00000010 sAffineAnim_Pokeball_Squish +0826ce18 l 00000020 sAffineAnim_Pokeball_Unsquish +0826ce38 l 0000000c sAffineAnims_Pokeball +0826ce44 l 00000008 sPokeBallSpriteSheet 0826ce4c l 00000008 sTradeBallSpritePal -0826ce54 l 00000018 sTradePokeballSpriteTemplate -0826ce6c l 00000008 gOamData_826CDFC -0826ce74 l 00000008 gAnimCmd_826CE04 -0826ce7c l 00000004 gSpriteAnimTable_826CE0C -0826ce80 l 00000018 gAffineAnimCmd_826CE10 -0826ce98 l 00000004 gSpriteAffineAnimTable_826CE28 -0826ce9c l 00000008 sTradeGlow1SpriteSheet -0826cea4 l 00000008 sTradeGlowSpritePal -0826ceac l 00000008 sTradeGbaSpritePal -0826ceb4 l 00000018 sTradeGlow1SpriteTemplate -0826cecc l 00000008 gOamData_826CE5C -0826ced4 l 00000008 gAnimCmd_826CE64 -0826cedc l 00000008 gAnimCmd_826CE6C -0826cee4 l 00000008 gSpriteAnimTable_826CE74 -0826ceec l 00000008 sTradeGlow2SpriteSheet -0826cef4 l 00000018 sGlowBallSpriteTemplate -0826cf0c l 00000008 gOamData_826CE9C -0826cf14 l 00000008 gAnimCmd_826CEA4 -0826cf1c l 00000004 gSpriteAnimTable_826CEAC -0826cf20 l 00000008 sTradeCableEndSpriteSheet -0826cf28 l 00000018 sGameLinkCableEndSpriteTemplate -0826cf40 l 00000008 gOamData_826CED0 -0826cf48 l 00000024 gAnimCmd_826CED8 -0826cf6c l 00000024 gAnimCmd_826CEFC -0826cf90 l 00000004 gSpriteAnimTable_826CF20 -0826cf94 l 00000004 gSpriteAnimTable_826CF24 +0826ce54 l 00000018 sSpriteTemplate_Pokeball +0826ce6c l 00000008 sOamData_LinkMonGlow +0826ce74 l 00000008 sAnim_LinkMonGlow +0826ce7c l 00000004 sAnims_LinkMonGlow +0826ce80 l 00000018 sAffineAnim_LinkMonGlow +0826ce98 l 00000004 sAffineAnims_LinkMonGlow +0826ce9c l 00000008 sSpriteSheet_LinkMonGlow +0826cea4 l 00000008 sSpritePalette_LinkMon +0826ceac l 00000008 sSpritePalette_Gba +0826ceb4 l 00000018 sSpriteTemplate_LinkMonGlow +0826cecc l 00000008 sOamData_LinkMonShadow +0826ced4 l 00000008 sAnim_LinkMonShadow_Big +0826cedc l 00000008 sAnim_LinkMonShadow_Small +0826cee4 l 00000008 sAnims_LinkMonShadow +0826ceec l 00000008 sSpriteSheet_LinkMonShadow +0826cef4 l 00000018 sSpriteTemplate_LinkMonShadow +0826cf0c l 00000008 sOamData_CableEnd +0826cf14 l 00000008 sAnim_CableEnd +0826cf1c l 00000004 sAnims_CableEnd +0826cf20 l 00000008 sSpriteSheet_CableEnd +0826cf28 l 00000018 sSpriteTemplate_CableEnd +0826cf40 l 00000008 sOamData_GbaScreen +0826cf48 l 00000024 sAnim_GbaScreen_Long +0826cf6c l 00000024 sAnim_GbaScreen_Short +0826cf90 l 00000004 sAnims_GbaScreen_Long +0826cf94 l 00000004 sAnims_GbaScreen_Short 0826cf98 l 00000008 sTradeGBAScreenSpriteSheet -0826cfa0 l 00000018 sTradeGBAScreenSpriteTemplate1 -0826cfb8 l 00000018 sTradeGBAScreenSpriteTemplate2 -0826cfd0 l 00000018 sTradeGlow2PaletteAnimTable -0826cfe8 l 00000010 gAffineAnimCmd_826CF78 -0826cff8 l 00000004 sSpriteAffineAnimTable_PlayerPokePicAlt +0826cfa0 l 00000018 sSpriteTemplate_GbaScreenFlash_Long +0826cfb8 l 00000018 sSpriteTemplate_GbaScreenFlash_Short +0826cfd0 l 00000018 sLinkMonShadow_Pal +0826cfe8 l 00000010 sAffineAnim_CrossingMonPic +0826cff8 l 00000004 sAffineAnims_CrossingMonPics 0826cffc l 0000021c sInGameTrades 0826d218 l 00000014 sInGameTradeMailMessages 0826d22c l 00000010 sTradeMessageWindowTemplates @@ -50753,11 +50752,11 @@ 08e9cb9c g 00000020 gMonMarkingsMenu_Pal 08e9cbbc g 00000320 gMonMarkingsMenu_Gfx 08e9cedc g 00000060 gTradeMenu_Pal -08e9cf3c g 00000020 gTradeButtons_Pal +08e9cf3c g 00000020 gTradeCursor_Pal 08e9cf5c g 00001280 gTradeMenu_Gfx -08e9e1dc g 00000800 gTradeButtons_Gfx -08e9e9dc g 00000020 gUnknown_8E9E9DC -08e9e9fc g 00000800 gUnknown_8E9E9FC +08e9e1dc g 00000800 gTradeCursor_Gfx +08e9e9dc g 00000020 gTradeUnused_Tilemap +08e9e9fc g 00000800 gTradeMenu_Tilemap 08e9f1fc g 00000024 gTradeMenuMonBox_Tilemap 08e9f220 g 00000040 gFameCheckerBgPals 08e9f260 g 000014a0 gFameCheckerBgTiles diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index d33d0a2a2..4c2c8807a 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -174,12 +174,12 @@ 020316e4 g 00000080 gSaveBlock3_DMA 02031764 g 00000528 gLoadedSaveData 02031c8c g 00000004 gLastEncryptionKey -02031c90 l 00000004 sSpriteTextTileBuffer -02031c94 l 00000038 sSpriteTextTilePtrs +02031c90 l 00000004 sMenuTextTileBuffer +02031c94 l 00000038 sMenuTextTileBuffers 02031ccc g 000000d8 gLinkPartnerMail 02031da4 g 00000002 gSelectedTradeMonPositions -02031da8 l 00000004 sTradeMenuResourcesPtr -02031dac l 00000004 sTradeData +02031da8 l 00000004 sTradeMenu +02031dac l 00000004 sTradeAnim 02031db0 g 00000001 gDifferentSaveFile 02031db4 g 00000008 gLastUsedWarp 02031dbc l 00000008 sWarpDestination @@ -2457,7 +2457,7 @@ 08044148 g 00000038 GetMonSpritePalStruct 08044180 g 00000038 GetMonSpritePalStructFromOtIdPersonality 080441b8 g 0000003a IsHMMove2 -080441f4 g 00000018 IsPokeSpriteNotFlipped +080441f4 g 00000018 IsMonSpriteNotFlipped 0804420c l 00000028 GetMonFlavorRelation 08044234 g 00000028 GetFlavorRelationByPersonality 0804425c g 0000002a IsTradedMon @@ -2718,120 +2718,120 @@ 0804c588 g 0000001c ApplyNewEncryptionKeyToWord 0804c5a4 g 0000005c ApplyNewEncryptionKeyToAllEncryptedData 0804c600 l 00000000 .gcc2_compiled. -0804c600 l 00000118 InitTradeMenuResources +0804c600 l 00000118 InitTradeMenu 0804c718 g 00000010 CB2_StartCreateTradeMenu -0804c728 l 000007ec CB2_ReturnFromLinkTrade2 +0804c728 l 000007ec CB2_CreateTradeMenu 0804cf14 g 000005e4 CB2_ReturnToTradeMenuFromSummary -0804d4f8 l 00000012 VblankCB_Trade -0804d50c l 0000003c TradeMenuCB_9 -0804d548 l 0000005c TradeMenuCB_10 -0804d5a4 l 00000094 TradeMenuCB_13 +0804d4f8 l 00000012 VBlankCB_TradeMenu +0804d50c l 0000003c CB_FadeToStartTrade +0804d548 l 0000005c CB_WaitToStartTrade +0804d5a4 l 00000094 CB_StartLinkTrade 0804d638 l 0000005c CB2_TradeMenu -0804d694 l 000000ce LoadTradeBackgroundGfxAndPals -0804d764 l 000000b0 SetTradeMenuOptionActiveFlags +0804d694 l 000000ce LoadTradeBgGfx +0804d764 l 000000b0 SetActiveMenuOptions 0804d814 l 00000020 Trade_Memcpy -0804d834 l 00000378 shedinja_maker_maybe +0804d834 l 00000378 BufferTradeParties 0804dbac l 00000028 PrintIsThisTradeOkay -0804dbd4 l 00000120 Master_HandleBlockReceivedStatus -0804dcf4 l 000000fc Slave_HandleBlockReceivedStatus -0804ddf0 l 00000200 Master_HandleCommunication -0804dff0 l 00000036 CB1_HandleBlockReceive -0804e028 l 0000004c TradeMenuGetNewCursorLocation +0804dbd4 l 00000120 Leader_ReadLinkBuffer +0804dcf4 l 000000fc Follower_ReadLinkBuffer +0804ddf0 l 00000200 Leader_HandleCommunication +0804dff0 l 00000036 CB1_UpdateLink +0804e028 l 0000004c GetNewCursorPosition 0804e074 l 000000c0 TradeMenuMoveCursor -0804e134 l 0000005e CommunicatePlayerSelectedMonForTrade -0804e194 l 0000019c TradeMenuCB_0 +0804e134 l 0000005e SetReadyToTrade +0804e194 l 0000019c CB_ProcessMenuInput 0804e330 l 00000058 RedrawChooseAPokemonWindow -0804e388 l 000000e4 TradeMenuCB_1 -0804e46c l 00000028 TradeMenuCB_15 -0804e494 l 00000078 TradeMenuCB_2 -0804e50c l 00000092 PlayerHasEnoughPokemonToTrade_HandleMewDeoxys +0804e388 l 000000e4 CB_ProcessSelectedMonInput +0804e46c l 00000028 CB_ChooseMonAfterButtonPress +0804e494 l 00000078 CB_ShowTradeMonSummaryScreen +0804e50c l 00000092 CheckValidityOfTradeMons 0804e5a0 l 000000d4 CommunicateWhetherMonCanBeTraded -0804e674 l 00000088 TradeMenuCB_3 -0804e6fc l 00000048 CommitWindows -0804e744 l 00000084 TradeMenuCB_4 -0804e7c8 l 0000003c TradeMenuCB_6 -0804e804 l 0000002c TradeMenuCB_7 -0804e830 l 00000050 TradeMenuCB_14 -0804e880 l 00000088 TradeMenuCB_8 -0804e908 l 0000003c TradeMenuCB_11 -0804e944 l 0000007c TradeMenuCB_12 -0804e9c0 l 00000024 TradeMenuCB_16 +0804e674 l 00000088 CB_ProcessConfirmTradeInput +0804e6fc l 00000048 RestoreNicknamesCoveredByYesNo +0804e744 l 00000084 CB_ProcessCancelTradeInput +0804e7c8 l 0000003c CB_SetSelectedMons +0804e804 l 0000002c CB_PrintIsThisTradeOkay +0804e830 l 00000050 CB_InitConfirmTradePrompt +0804e880 l 00000088 CB_HandleTradeCanceled +0804e908 l 0000003c CB_InitExitCanceledTrade +0804e944 l 0000007c CB_ExitCanceledTrade +0804e9c0 l 00000024 CB_WaitToStartRfuTrade 0804e9e4 l 000000c6 RunTradeMenuCallback -0804eaac l 00000038 SignalRedrawTradeMenus -0804eae4 l 00000388 HandleRedrawTradeMenuOnSide -0804ee6c l 00000068 GetNicknameStringWidthByPartyAndMonIdx -0804eed4 l 000000e0 BuildMovesString +0804eaac l 00000038 SetSelectedMon +0804eae4 l 00000388 DrawSelectedMonScreen +0804ee6c l 00000068 GetMonNicknameWidth +0804eed4 l 000000e0 BufferMovesString 0804efb4 l 0000006c PrintPartyMonNickname 0804f020 l 0000006c PrintPartyNicknames -0804f08c l 000001f8 PrintLevelAndGenderDirectlyOnVram -0804f284 l 00000064 PrintPartyLevelsAndGendersDirectlyOnVram +0804f08c l 000001f8 PrintLevelAndGender +0804f284 l 00000064 PrintPartyLevelsAndGenders 0804f2e8 l 000000cc ShowTradePartyMonIcons 0804f3b4 l 00000012 PrintTradePartnerPartyNicknames 0804f3c8 l 00000078 RedrawPartyWindow -0804f440 l 00000024 TradeMenuAction_Summary -0804f464 l 00000024 TradeMenuAction_Trade -0804f488 l 00000054 ScheduleLinkTaskWithDelay -0804f4dc l 000000e0 RunScheduledLinkTasks -0804f5bc l 00000054 PrintTradeErrorOrStatusMessage -0804f610 l 00000116 LoadUISprites -0804f728 l 00000020 RenderTextToVramViaBuffer +0804f440 l 00000024 Task_DrawSelectionSummary +0804f464 l 00000024 Task_DrawSelectionTrade +0804f488 l 00000054 QueueAction +0804f4dc l 000000e0 DoQueuedActions +0804f5bc l 00000054 PrintTradeMessage +0804f610 l 00000116 LoadUISpriteGfx +0804f728 l 00000020 DrawBottomRowText 0804f748 l 00000148 ComputePartyTradeableFlags 0804f890 l 000000d4 ComputePartyHPBarLevels -0804f964 l 00000074 SetMonIconsAnimByHPBarLevel -0804f9d8 l 0000003c CopyGiftRibbonsToSav1 -0804fa14 l 0000011e TestWhetherSelectedMonCanBeTraded -0804fb34 g 00000094 Trade_CalcLinkPlayerCompatibilityParam +0804f964 l 00000074 SetTradePartyHPBarSprites +0804f9d8 l 0000003c SaveTradeGiftRibbons +0804fa14 l 0000011e CanTradeSelectedMon +0804fb34 g 00000094 GetGameProgressForLinkTrade 0804fbc8 l 00000024 IsDeoxysOrMewUntradable 0804fbec g 000000f2 GetUnionRoomTradeMessageId 0804fce0 g 00000044 CanRegisterMonForTradingBoard 0804fd24 l 00000000 .gcc2_compiled. -0804fd24 l 00000022 SpriteCB_TradeGlowCable -0804fd48 l 00000030 SpriteCB_TradeGlowWireless -0804fd78 l 00000040 SpriteCB_TradeGlowCore -0804fdb8 l 00000022 SpriteCB_GameLinkCableEnd_Outbound -0804fddc l 00000022 SpriteCB_GameLinkCableEnd_Inbound -0804fe00 l 00000022 SpriteCB_TradeGBAScreen +0804fd24 l 00000022 SpriteCB_LinkMonGlow +0804fd48 l 00000030 SpriteCB_LinkMonGlowWireless +0804fd78 l 00000040 SpriteCB_LinkMonShadow +0804fdb8 l 00000022 SpriteCB_CableEndSending +0804fddc l 00000022 SpriteCB_CableEndReceiving +0804fe00 l 00000022 SpriteCB_GbaScreen 0804fe24 l 00000090 SetTradeBGAffine -0804feb4 l 00000056 TradeAnim_UpdateBgRegs +0804feb4 l 00000056 SetTradeGpuRegs 0804ff0c l 00000016 VBlankCB_TradeAnim -0804ff24 l 00000028 InitLinkTimeoutTracker +0804ff24 l 00000028 ClearLinkTimeoutTimer 0804ff4c l 00000078 CheckLinkTimeout -0804ffc4 l 00000020 GetMultiplayerIdOfLinkTrade +0804ffc4 l 00000020 TradeGetMultiplayerId 0804ffe4 l 00000154 LoadTradeMonPic 08050138 g 00000364 CB2_LinkTrade 0805049c g 00000012 InitTradeSequenceBgGpuRegs 080504b0 g 0000001c LinkTradeDrawWindow 080504cc l 00000100 TradeAnimInit_LoadGfx -080505cc l 000001d4 CB2_InitTradeAnim_InGameTrade -080507a0 l 00000060 ReceivedMonSetPokedexFlags -08050800 l 0000000a RS_TryEnableNationalPokedex +080505cc l 000001d4 CB2_InitInGameTrade +080507a0 l 00000060 UpdatePokedexForReceivedMon +08050800 l 0000000a TryEnableNationalDexFromLinkPartner 0805080c l 000000e8 TradeMons 080508f4 l 00000054 HandleLinkDataSend -08050948 l 0000001e CB2_RunTradeAnim_InGameTrade +08050948 l 0000001e CB2_InGameTrade 08050968 l 00000478 SetTradeSequenceBgGpuRegs 08050de0 l 00000044 LoadTradeGbaSpriteGfx 08050e24 l 000000f0 TradeBufferOTnameAndNicknames 08050f14 l 00000028 DoTradeAnim 08050f3c l 000013f0 DoTradeAnim_Cable 0805232c l 0000145c DoTradeAnim_Wireless -08053788 l 000000b4 CB2_TryEvolveAfterTrade +08053788 l 000000b4 CB2_TryLinkTradeEvolution 0805383c l 00000080 HandleLinkDataReceive -080538bc l 0000007c SpriteCB_TradePokeball_Default -08053938 l 00000074 SpriteCB_TradePokeball_Outbound -080539ac l 00000060 SpriteCB_TradePokeball_Outbound2 -08053a0c l 00000090 SpriteCB_TradePokeball_Inbound +080538bc l 0000007c SpriteCB_BouncingPokeball +08053938 l 00000074 SpriteCB_BouncingPokeballDepart +080539ac l 00000060 SpriteCB_BouncingPokeballDepartEnd +08053a0c l 00000090 SpriteCB_BouncingPokeballArrive 08053a9c g 00000048 GetInGameTradeSpeciesInfo 08053ae4 l 00000064 BufferInGameTradeMonName 08053b48 l 0000018c CreateInGameTradePokemonInternal 08053cd4 l 00000058 GetInGameTradeMail 08053d2c g 0000003c GetTradeSpecies 08053d68 g 0000001c CreateInGameTradePokemon -08053d84 l 00000098 CB2_RunTradeAnim_LinkTrade -08053e1c l 00000070 CB2_WaitAndAckTradeComplete -08053e8c l 00000538 CB2_HandleTradeEnded -080543c4 l 0000007c LinkTrade_TearDownAssets +08053d84 l 00000098 CB2_UpdateLinkTrade +08053e1c l 00000070 CB2_WaitTradeComplete +08053e8c l 00000538 CB2_SaveAndEndTrade +080543c4 l 0000007c CB2_FreeTradeAnim 08054440 g 00000030 DoInGameTradeScene -08054470 l 0000003c Task_WaitFadeAndStartInGameTradeAnim +08054470 l 0000003c Task_InGameTrade 080544ac l 00000050 CheckPartnersMonForRibbons 080544fc g 0000000a LoadTradeAnimGfx 08054508 g 00000080 DrawTextOnTradeWindow @@ -5158,7 +5158,7 @@ 0807543c g 00000018 AnimLoadCompressedBgTilemap 08075454 g 00000004 GetBattleBgPaletteNum 08075458 g 00000036 ToggleBg3Mode -08075490 g 00000028 TradeMenuBouncePartySprites +08075490 g 00000028 Trade_MoveSelectedMonToTarget 080754b8 g 0000003e InitSpriteDataForLinearTranslation 080754f8 g 00000098 InitAnimLinearTranslation 08075590 g 00000028 StartAnimLinearTranslation @@ -10470,7 +10470,7 @@ 0810fac8 g 0000007c Menu_ProcessInputNoWrapAround_other 0810fb44 g 0000007c PrintTextArray 0810fbc0 g 00000098 MultichoiceList_PrintItems -0810fc58 g 0000004e UnionRoomAndTradeMenuPrintOptions +0810fc58 g 0000004e PrintMenuTable 0810fca8 g 00000112 AddItemMenuActionTextPrinters 0810fdbc l 0000006c PrintMenuActionTextsAtTopById 0810fe28 g 000000b4 SetWindowTemplateFields @@ -27512,119 +27512,118 @@ 08260a12 l 000001fe sTradePartyBoxTilemap 08260c10 l 00000800 sTradeStripesBG2Tilemap 08261410 l 00000800 sTradeStripesBG3Tilemap -08261c10 l 00000008 gOamData_8261C30 -08261c18 l 00000008 gOamData_8261C38 -08261c20 l 00000008 gSpriteAnim_8261C40 -08261c28 l 00000008 gSpriteAnim_8261C48 -08261c30 l 00000008 gSpriteAnimTable_8261C50 -08261c38 l 00000008 sTradeButtons_SpriteSheet -08261c40 l 00000008 sTradeButtons_SpritePal -08261c48 l 00000008 gSpriteAnim_8261C68 -08261c50 l 00000008 gSpriteAnim_8261C70 -08261c58 l 00000008 gSpriteAnim_8261C78 -08261c60 l 00000008 gSpriteAnim_8261C80 -08261c68 l 00000008 gSpriteAnim_8261C88 -08261c70 l 00000008 gSpriteAnim_8261C90 -08261c78 l 00000018 gSpriteAnimTable_8261C98 -08261c90 l 00000018 sSpriteTemplate_TradeButtons -08261ca8 l 00000018 sSpriteTemplate_Text -08261cc0 l 00000020 sTradeTextPal -08261ce0 l 00000008 sSpritePalette_Text +08261c10 l 00000008 sOamData_MenuText +08261c18 l 00000008 sOamData_Cursor +08261c20 l 00000008 sAnim_Cursor_Normal +08261c28 l 00000008 sAnim_Cursor_OnCancel +08261c30 l 00000008 sAnims_Cursor +08261c38 l 00000008 sCursor_SpriteSheet +08261c40 l 00000008 sCursor_SpritePalette +08261c48 l 00000008 sAnim_MenuText_0 +08261c50 l 00000008 sAnim_MenuText_1 +08261c58 l 00000008 sAnim_MenuText_2 +08261c60 l 00000008 sAnim_MenuText_3 +08261c68 l 00000008 sAnim_MenuText_4 +08261c70 l 00000008 sAnim_MenuText_5 +08261c78 l 00000018 sAnims_MenuText +08261c90 l 00000018 sSpriteTemplate_Cursor +08261ca8 l 00000018 sSpriteTemplate_MenuText +08261cc0 l 00000020 sMenuText_Pal +08261ce0 l 00000008 sSpritePalette_MenuText 08261ce8 l 00000138 sCursorMoveDestinations 08261e20 l 0000001a sTradeMonSpriteCoords -08261e3a l 00000018 sTradeMenuGenderLevelPrintCoords -08261e52 l 00000018 sTradeMenuGenderLevelWindowCoords -08261e6a l 00000008 sTradeUnknownSpriteCoords -08261e72 l 00000024 gUnknown_8261E92 -08261e96 g 00000001 sText_Dummy -08261e97 g 0000000a sText_ClrWhtHltTranspShdwDrkGry +08261e3a l 00000018 sTradeMonLevelCoords +08261e52 l 00000018 sTradeMonBoxCoords +08261e6a l 00000008 sPlayerNameCoords +08261e72 l 00000024 sUnusedCoords +08261e96 l 00000001 sText_Dummy +08261e97 l 0000000a sText_ClrWhtHltTranspShdwDrkGry 08261ea1 g 00000002 gText_MaleSymbol4 08261ea3 g 00000002 gText_FemaleSymbol4 08261ea5 g 00000001 gText_GenderlessSymbol -08261ea6 g 00000001 sText_Dummy2 -08261ea7 g 00000002 sText_Newline -08261ea9 g 00000002 sText_Slash -08261eac l 00000018 sTradeUITextPtrs +08261ea6 l 00000001 sText_Dummy2 +08261ea7 l 00000002 sText_Newline +08261ea9 l 00000002 sText_Slash +08261eac l 00000018 sActionTexts 08261ec4 l 00000010 sMenuAction_SummaryTrade -08261ed4 l 00000024 sTradeErrorOrStatusMessagePtrs +08261ed4 l 00000024 sMessages 08261ef8 l 00000003 sTextColor_PartyMonNickname 08261efc l 00000010 sBgTemplates 08261f0c l 00000098 sWindowTemplates 08261fa4 l 00000008 sWindowTemplate_YesNo -08261fac l 00000068 gUnknown_8261FCC -08262014 l 00000005 gJPText_Shedinja -08262019 l 0000000e gUnknown_8262039 -08262027 l 0000000e gUnknown_8262047 -08262035 l 00000004 gUnknown_8262055 -0826203c l 00000020 sTradeBallPalette -0826205c l 00000600 sTradeBallTiles -0826265c l 00001a00 sPokeballSymbolTiles -0826405c l 00000800 sCableCloseupMap -0826485c l 00000100 sPokeballSymbolMap -0826495c l 00000020 sUnref_083308C0 -0826497c l 00000020 sTradeGbaPal +08261fac l 00000068 sDebug_Messages +08262014 l 00000005 sText_ShedinjaJP +08262019 l 0000001c sDebug_TradeResultTexts +08262035 l 00000004 sSelectedMonLevelGenderCoords +0826203c l 00000020 sPokeball_Pal +0826205c l 00000600 sPokeball_Gfx +0826265c l 00001a00 sPokeballSymbol_Gfx +0826405c l 00000800 sCableCloseup_Map +0826485c l 00000100 sPokeballSymbol_Map +0826495c l 00000020 sUnusedPal1 +0826497c l 00000020 sGba_Pal 0826499c l 00000020 sShadowPalette 082649bc l 00000020 sBlackPalette -082649dc l 00000020 sTradeGlowPal -082649fc l 00000200 sTradeGlow1Tiles -08264bfc l 00000200 sTradeGlow2Tiles -08264dfc l 00000200 sTradeCableEndTiles -08264ffc l 00001000 sTradeGBAScreenTiles +082649dc l 00000020 sLinkMon_Pal +082649fc l 00000200 sLinkMonGlow_Gfx +08264bfc l 00000200 sLinkMonShadow_Gfx +08264dfc l 00000200 sCableEnd_Gfx +08264ffc l 00001000 sGbaScreen_Gfx 08265ffc g 00001000 gTradeOrHatchMonShadowTilemap -08266ffc l 00002800 sGbaAffineTiles -082697fc l 00000040 sFiller_08335760 +08266ffc l 00002800 sGbaAffine_Gfx +082697fc l 00000040 sEmptyGfx 0826983c l 00000100 sGbaAffineMapCable 0826993c l 00000100 sGbaAffineMapWireless 08269a3c l 00001000 sGbaMapWireless 0826aa3c l 00001000 sGbaMapCable -0826ba3c l 00000100 sWirelessCloseupMap +0826ba3c l 00000100 sWirelessCloseup_Map 0826bb3c l 00000200 sWirelessSignalAnimPals_Outbound 0826bd3c l 00000200 sWirelessSignalAnimPals_Inbound 0826bf3c l 00000020 sWirelessSignalAnimPals_Off 0826bf5c l 00000690 sWirelessSignal4bpp 0826c5ec l 000006f4 sWirelessSignalTilemap -0826cce0 l 00000008 gOamData_826CD00 -0826cce8 l 0000003c gAnimCmd_826CD08 -0826cd24 l 0000003c gAnimCmd_826CD44 -0826cd60 l 00000008 gSpriteAnimTable_826CD80 -0826cd68 l 00000010 gAffineAnimCmd_826CD88 -0826cd78 l 00000010 gAffineAnimCmd_826CD98 -0826cd88 l 00000020 gAffineAnimCmd_826CDA8 -0826cda8 l 0000000c gSpriteAffineAnimTable_826CDC8 -0826cdb4 l 00000008 sTradeBallSpriteSheet +0826cce0 l 00000008 sOamData_Pokeball +0826cce8 l 0000003c sAnim_Pokeball_SpinOnce +0826cd24 l 0000003c sAnim_Pokeball_SpinTwice +0826cd60 l 00000008 sAnims_Pokeball +0826cd68 l 00000010 sAffineAnim_Pokeball_Normal +0826cd78 l 00000010 sAffineAnim_Pokeball_Squish +0826cd88 l 00000020 sAffineAnim_Pokeball_Unsquish +0826cda8 l 0000000c sAffineAnims_Pokeball +0826cdb4 l 00000008 sPokeBallSpriteSheet 0826cdbc l 00000008 sTradeBallSpritePal -0826cdc4 l 00000018 sTradePokeballSpriteTemplate -0826cddc l 00000008 gOamData_826CDFC -0826cde4 l 00000008 gAnimCmd_826CE04 -0826cdec l 00000004 gSpriteAnimTable_826CE0C -0826cdf0 l 00000018 gAffineAnimCmd_826CE10 -0826ce08 l 00000004 gSpriteAffineAnimTable_826CE28 -0826ce0c l 00000008 sTradeGlow1SpriteSheet -0826ce14 l 00000008 sTradeGlowSpritePal -0826ce1c l 00000008 sTradeGbaSpritePal -0826ce24 l 00000018 sTradeGlow1SpriteTemplate -0826ce3c l 00000008 gOamData_826CE5C -0826ce44 l 00000008 gAnimCmd_826CE64 -0826ce4c l 00000008 gAnimCmd_826CE6C -0826ce54 l 00000008 gSpriteAnimTable_826CE74 -0826ce5c l 00000008 sTradeGlow2SpriteSheet -0826ce64 l 00000018 sGlowBallSpriteTemplate -0826ce7c l 00000008 gOamData_826CE9C -0826ce84 l 00000008 gAnimCmd_826CEA4 -0826ce8c l 00000004 gSpriteAnimTable_826CEAC -0826ce90 l 00000008 sTradeCableEndSpriteSheet -0826ce98 l 00000018 sGameLinkCableEndSpriteTemplate -0826ceb0 l 00000008 gOamData_826CED0 -0826ceb8 l 00000024 gAnimCmd_826CED8 -0826cedc l 00000024 gAnimCmd_826CEFC -0826cf00 l 00000004 gSpriteAnimTable_826CF20 -0826cf04 l 00000004 gSpriteAnimTable_826CF24 +0826cdc4 l 00000018 sSpriteTemplate_Pokeball +0826cddc l 00000008 sOamData_LinkMonGlow +0826cde4 l 00000008 sAnim_LinkMonGlow +0826cdec l 00000004 sAnims_LinkMonGlow +0826cdf0 l 00000018 sAffineAnim_LinkMonGlow +0826ce08 l 00000004 sAffineAnims_LinkMonGlow +0826ce0c l 00000008 sSpriteSheet_LinkMonGlow +0826ce14 l 00000008 sSpritePalette_LinkMon +0826ce1c l 00000008 sSpritePalette_Gba +0826ce24 l 00000018 sSpriteTemplate_LinkMonGlow +0826ce3c l 00000008 sOamData_LinkMonShadow +0826ce44 l 00000008 sAnim_LinkMonShadow_Big +0826ce4c l 00000008 sAnim_LinkMonShadow_Small +0826ce54 l 00000008 sAnims_LinkMonShadow +0826ce5c l 00000008 sSpriteSheet_LinkMonShadow +0826ce64 l 00000018 sSpriteTemplate_LinkMonShadow +0826ce7c l 00000008 sOamData_CableEnd +0826ce84 l 00000008 sAnim_CableEnd +0826ce8c l 00000004 sAnims_CableEnd +0826ce90 l 00000008 sSpriteSheet_CableEnd +0826ce98 l 00000018 sSpriteTemplate_CableEnd +0826ceb0 l 00000008 sOamData_GbaScreen +0826ceb8 l 00000024 sAnim_GbaScreen_Long +0826cedc l 00000024 sAnim_GbaScreen_Short +0826cf00 l 00000004 sAnims_GbaScreen_Long +0826cf04 l 00000004 sAnims_GbaScreen_Short 0826cf08 l 00000008 sTradeGBAScreenSpriteSheet -0826cf10 l 00000018 sTradeGBAScreenSpriteTemplate1 -0826cf28 l 00000018 sTradeGBAScreenSpriteTemplate2 -0826cf40 l 00000018 sTradeGlow2PaletteAnimTable -0826cf58 l 00000010 gAffineAnimCmd_826CF78 -0826cf68 l 00000004 sSpriteAffineAnimTable_PlayerPokePicAlt +0826cf10 l 00000018 sSpriteTemplate_GbaScreenFlash_Long +0826cf28 l 00000018 sSpriteTemplate_GbaScreenFlash_Short +0826cf40 l 00000018 sLinkMonShadow_Pal +0826cf58 l 00000010 sAffineAnim_CrossingMonPic +0826cf68 l 00000004 sAffineAnims_CrossingMonPics 0826cf6c l 0000021c sInGameTrades 0826d188 l 00000014 sInGameTradeMailMessages 0826d19c l 00000010 sTradeMessageWindowTemplates @@ -50754,11 +50753,11 @@ 08e9cc1c g 00000020 gMonMarkingsMenu_Pal 08e9cc3c g 00000320 gMonMarkingsMenu_Gfx 08e9cf5c g 00000060 gTradeMenu_Pal -08e9cfbc g 00000020 gTradeButtons_Pal +08e9cfbc g 00000020 gTradeCursor_Pal 08e9cfdc g 00001280 gTradeMenu_Gfx -08e9e25c g 00000800 gTradeButtons_Gfx -08e9ea5c g 00000020 gUnknown_8E9E9DC -08e9ea7c g 00000800 gUnknown_8E9E9FC +08e9e25c g 00000800 gTradeCursor_Gfx +08e9ea5c g 00000020 gTradeUnused_Tilemap +08e9ea7c g 00000800 gTradeMenu_Tilemap 08e9f27c g 00000024 gTradeMenuMonBox_Tilemap 08e9f2a0 g 00000040 gFameCheckerBgPals 08e9f2e0 g 000014a0 gFameCheckerBgTiles diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 83aca2bc3..d44f1b74f 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -174,12 +174,12 @@ 020316e4 g 00000080 gSaveBlock3_DMA 02031764 g 00000528 gLoadedSaveData 02031c8c g 00000004 gLastEncryptionKey -02031c90 l 00000004 sSpriteTextTileBuffer -02031c94 l 00000038 sSpriteTextTilePtrs +02031c90 l 00000004 sMenuTextTileBuffer +02031c94 l 00000038 sMenuTextTileBuffers 02031ccc g 000000d8 gLinkPartnerMail 02031da4 g 00000002 gSelectedTradeMonPositions -02031da8 l 00000004 sTradeMenuResourcesPtr -02031dac l 00000004 sTradeData +02031da8 l 00000004 sTradeMenu +02031dac l 00000004 sTradeAnim 02031db0 g 00000001 gDifferentSaveFile 02031db4 g 00000008 gLastUsedWarp 02031dbc l 00000008 sWarpDestination @@ -2457,7 +2457,7 @@ 0804415c g 00000038 GetMonSpritePalStruct 08044194 g 00000038 GetMonSpritePalStructFromOtIdPersonality 080441cc g 0000003a IsHMMove2 -08044208 g 00000018 IsPokeSpriteNotFlipped +08044208 g 00000018 IsMonSpriteNotFlipped 08044220 l 00000028 GetMonFlavorRelation 08044248 g 00000028 GetFlavorRelationByPersonality 08044270 g 0000002a IsTradedMon @@ -2718,120 +2718,120 @@ 0804c59c g 0000001c ApplyNewEncryptionKeyToWord 0804c5b8 g 0000005c ApplyNewEncryptionKeyToAllEncryptedData 0804c614 l 00000000 .gcc2_compiled. -0804c614 l 00000118 InitTradeMenuResources +0804c614 l 00000118 InitTradeMenu 0804c72c g 00000010 CB2_StartCreateTradeMenu -0804c73c l 000007ec CB2_ReturnFromLinkTrade2 +0804c73c l 000007ec CB2_CreateTradeMenu 0804cf28 g 000005e4 CB2_ReturnToTradeMenuFromSummary -0804d50c l 00000012 VblankCB_Trade -0804d520 l 0000003c TradeMenuCB_9 -0804d55c l 0000005c TradeMenuCB_10 -0804d5b8 l 00000094 TradeMenuCB_13 +0804d50c l 00000012 VBlankCB_TradeMenu +0804d520 l 0000003c CB_FadeToStartTrade +0804d55c l 0000005c CB_WaitToStartTrade +0804d5b8 l 00000094 CB_StartLinkTrade 0804d64c l 0000005c CB2_TradeMenu -0804d6a8 l 000000ce LoadTradeBackgroundGfxAndPals -0804d778 l 000000b0 SetTradeMenuOptionActiveFlags +0804d6a8 l 000000ce LoadTradeBgGfx +0804d778 l 000000b0 SetActiveMenuOptions 0804d828 l 00000020 Trade_Memcpy -0804d848 l 00000378 shedinja_maker_maybe +0804d848 l 00000378 BufferTradeParties 0804dbc0 l 00000028 PrintIsThisTradeOkay -0804dbe8 l 00000120 Master_HandleBlockReceivedStatus -0804dd08 l 000000fc Slave_HandleBlockReceivedStatus -0804de04 l 00000200 Master_HandleCommunication -0804e004 l 00000036 CB1_HandleBlockReceive -0804e03c l 0000004c TradeMenuGetNewCursorLocation +0804dbe8 l 00000120 Leader_ReadLinkBuffer +0804dd08 l 000000fc Follower_ReadLinkBuffer +0804de04 l 00000200 Leader_HandleCommunication +0804e004 l 00000036 CB1_UpdateLink +0804e03c l 0000004c GetNewCursorPosition 0804e088 l 000000c0 TradeMenuMoveCursor -0804e148 l 0000005e CommunicatePlayerSelectedMonForTrade -0804e1a8 l 0000019c TradeMenuCB_0 +0804e148 l 0000005e SetReadyToTrade +0804e1a8 l 0000019c CB_ProcessMenuInput 0804e344 l 00000058 RedrawChooseAPokemonWindow -0804e39c l 000000e4 TradeMenuCB_1 -0804e480 l 00000028 TradeMenuCB_15 -0804e4a8 l 00000078 TradeMenuCB_2 -0804e520 l 00000092 PlayerHasEnoughPokemonToTrade_HandleMewDeoxys +0804e39c l 000000e4 CB_ProcessSelectedMonInput +0804e480 l 00000028 CB_ChooseMonAfterButtonPress +0804e4a8 l 00000078 CB_ShowTradeMonSummaryScreen +0804e520 l 00000092 CheckValidityOfTradeMons 0804e5b4 l 000000d4 CommunicateWhetherMonCanBeTraded -0804e688 l 00000088 TradeMenuCB_3 -0804e710 l 00000048 CommitWindows -0804e758 l 00000084 TradeMenuCB_4 -0804e7dc l 0000003c TradeMenuCB_6 -0804e818 l 0000002c TradeMenuCB_7 -0804e844 l 00000050 TradeMenuCB_14 -0804e894 l 00000088 TradeMenuCB_8 -0804e91c l 0000003c TradeMenuCB_11 -0804e958 l 0000007c TradeMenuCB_12 -0804e9d4 l 00000024 TradeMenuCB_16 +0804e688 l 00000088 CB_ProcessConfirmTradeInput +0804e710 l 00000048 RestoreNicknamesCoveredByYesNo +0804e758 l 00000084 CB_ProcessCancelTradeInput +0804e7dc l 0000003c CB_SetSelectedMons +0804e818 l 0000002c CB_PrintIsThisTradeOkay +0804e844 l 00000050 CB_InitConfirmTradePrompt +0804e894 l 00000088 CB_HandleTradeCanceled +0804e91c l 0000003c CB_InitExitCanceledTrade +0804e958 l 0000007c CB_ExitCanceledTrade +0804e9d4 l 00000024 CB_WaitToStartRfuTrade 0804e9f8 l 000000c6 RunTradeMenuCallback -0804eac0 l 00000038 SignalRedrawTradeMenus -0804eaf8 l 00000388 HandleRedrawTradeMenuOnSide -0804ee80 l 00000068 GetNicknameStringWidthByPartyAndMonIdx -0804eee8 l 000000e0 BuildMovesString +0804eac0 l 00000038 SetSelectedMon +0804eaf8 l 00000388 DrawSelectedMonScreen +0804ee80 l 00000068 GetMonNicknameWidth +0804eee8 l 000000e0 BufferMovesString 0804efc8 l 0000006c PrintPartyMonNickname 0804f034 l 0000006c PrintPartyNicknames -0804f0a0 l 000001f8 PrintLevelAndGenderDirectlyOnVram -0804f298 l 00000064 PrintPartyLevelsAndGendersDirectlyOnVram +0804f0a0 l 000001f8 PrintLevelAndGender +0804f298 l 00000064 PrintPartyLevelsAndGenders 0804f2fc l 000000cc ShowTradePartyMonIcons 0804f3c8 l 00000012 PrintTradePartnerPartyNicknames 0804f3dc l 00000078 RedrawPartyWindow -0804f454 l 00000024 TradeMenuAction_Summary -0804f478 l 00000024 TradeMenuAction_Trade -0804f49c l 00000054 ScheduleLinkTaskWithDelay -0804f4f0 l 000000e0 RunScheduledLinkTasks -0804f5d0 l 00000054 PrintTradeErrorOrStatusMessage -0804f624 l 00000116 LoadUISprites -0804f73c l 00000020 RenderTextToVramViaBuffer +0804f454 l 00000024 Task_DrawSelectionSummary +0804f478 l 00000024 Task_DrawSelectionTrade +0804f49c l 00000054 QueueAction +0804f4f0 l 000000e0 DoQueuedActions +0804f5d0 l 00000054 PrintTradeMessage +0804f624 l 00000116 LoadUISpriteGfx +0804f73c l 00000020 DrawBottomRowText 0804f75c l 00000148 ComputePartyTradeableFlags 0804f8a4 l 000000d4 ComputePartyHPBarLevels -0804f978 l 00000074 SetMonIconsAnimByHPBarLevel -0804f9ec l 0000003c CopyGiftRibbonsToSav1 -0804fa28 l 0000011e TestWhetherSelectedMonCanBeTraded -0804fb48 g 00000094 Trade_CalcLinkPlayerCompatibilityParam +0804f978 l 00000074 SetTradePartyHPBarSprites +0804f9ec l 0000003c SaveTradeGiftRibbons +0804fa28 l 0000011e CanTradeSelectedMon +0804fb48 g 00000094 GetGameProgressForLinkTrade 0804fbdc l 00000024 IsDeoxysOrMewUntradable 0804fc00 g 000000f2 GetUnionRoomTradeMessageId 0804fcf4 g 00000044 CanRegisterMonForTradingBoard 0804fd38 l 00000000 .gcc2_compiled. -0804fd38 l 00000022 SpriteCB_TradeGlowCable -0804fd5c l 00000030 SpriteCB_TradeGlowWireless -0804fd8c l 00000040 SpriteCB_TradeGlowCore -0804fdcc l 00000022 SpriteCB_GameLinkCableEnd_Outbound -0804fdf0 l 00000022 SpriteCB_GameLinkCableEnd_Inbound -0804fe14 l 00000022 SpriteCB_TradeGBAScreen +0804fd38 l 00000022 SpriteCB_LinkMonGlow +0804fd5c l 00000030 SpriteCB_LinkMonGlowWireless +0804fd8c l 00000040 SpriteCB_LinkMonShadow +0804fdcc l 00000022 SpriteCB_CableEndSending +0804fdf0 l 00000022 SpriteCB_CableEndReceiving +0804fe14 l 00000022 SpriteCB_GbaScreen 0804fe38 l 00000090 SetTradeBGAffine -0804fec8 l 00000056 TradeAnim_UpdateBgRegs +0804fec8 l 00000056 SetTradeGpuRegs 0804ff20 l 00000016 VBlankCB_TradeAnim -0804ff38 l 00000028 InitLinkTimeoutTracker +0804ff38 l 00000028 ClearLinkTimeoutTimer 0804ff60 l 00000078 CheckLinkTimeout -0804ffd8 l 00000020 GetMultiplayerIdOfLinkTrade +0804ffd8 l 00000020 TradeGetMultiplayerId 0804fff8 l 00000154 LoadTradeMonPic 0805014c g 00000364 CB2_LinkTrade 080504b0 g 00000012 InitTradeSequenceBgGpuRegs 080504c4 g 0000001c LinkTradeDrawWindow 080504e0 l 00000100 TradeAnimInit_LoadGfx -080505e0 l 000001d4 CB2_InitTradeAnim_InGameTrade -080507b4 l 00000060 ReceivedMonSetPokedexFlags -08050814 l 0000000a RS_TryEnableNationalPokedex +080505e0 l 000001d4 CB2_InitInGameTrade +080507b4 l 00000060 UpdatePokedexForReceivedMon +08050814 l 0000000a TryEnableNationalDexFromLinkPartner 08050820 l 000000e8 TradeMons 08050908 l 00000054 HandleLinkDataSend -0805095c l 0000001e CB2_RunTradeAnim_InGameTrade +0805095c l 0000001e CB2_InGameTrade 0805097c l 00000478 SetTradeSequenceBgGpuRegs 08050df4 l 00000044 LoadTradeGbaSpriteGfx 08050e38 l 000000f0 TradeBufferOTnameAndNicknames 08050f28 l 00000028 DoTradeAnim 08050f50 l 000013f0 DoTradeAnim_Cable 08052340 l 0000145c DoTradeAnim_Wireless -0805379c l 000000b4 CB2_TryEvolveAfterTrade +0805379c l 000000b4 CB2_TryLinkTradeEvolution 08053850 l 00000080 HandleLinkDataReceive -080538d0 l 0000007c SpriteCB_TradePokeball_Default -0805394c l 00000074 SpriteCB_TradePokeball_Outbound -080539c0 l 00000060 SpriteCB_TradePokeball_Outbound2 -08053a20 l 00000090 SpriteCB_TradePokeball_Inbound +080538d0 l 0000007c SpriteCB_BouncingPokeball +0805394c l 00000074 SpriteCB_BouncingPokeballDepart +080539c0 l 00000060 SpriteCB_BouncingPokeballDepartEnd +08053a20 l 00000090 SpriteCB_BouncingPokeballArrive 08053ab0 g 00000048 GetInGameTradeSpeciesInfo 08053af8 l 00000064 BufferInGameTradeMonName 08053b5c l 0000018c CreateInGameTradePokemonInternal 08053ce8 l 00000058 GetInGameTradeMail 08053d40 g 0000003c GetTradeSpecies 08053d7c g 0000001c CreateInGameTradePokemon -08053d98 l 00000098 CB2_RunTradeAnim_LinkTrade -08053e30 l 00000070 CB2_WaitAndAckTradeComplete -08053ea0 l 00000538 CB2_HandleTradeEnded -080543d8 l 0000007c LinkTrade_TearDownAssets +08053d98 l 00000098 CB2_UpdateLinkTrade +08053e30 l 00000070 CB2_WaitTradeComplete +08053ea0 l 00000538 CB2_SaveAndEndTrade +080543d8 l 0000007c CB2_FreeTradeAnim 08054454 g 00000030 DoInGameTradeScene -08054484 l 0000003c Task_WaitFadeAndStartInGameTradeAnim +08054484 l 0000003c Task_InGameTrade 080544c0 l 00000050 CheckPartnersMonForRibbons 08054510 g 0000000a LoadTradeAnimGfx 0805451c g 00000080 DrawTextOnTradeWindow @@ -5158,7 +5158,7 @@ 08075450 g 00000018 AnimLoadCompressedBgTilemap 08075468 g 00000004 GetBattleBgPaletteNum 0807546c g 00000036 ToggleBg3Mode -080754a4 g 00000028 TradeMenuBouncePartySprites +080754a4 g 00000028 Trade_MoveSelectedMonToTarget 080754cc g 0000003e InitSpriteDataForLinearTranslation 0807550c g 00000098 InitAnimLinearTranslation 080755a4 g 00000028 StartAnimLinearTranslation @@ -10471,7 +10471,7 @@ 0810fb40 g 0000007c Menu_ProcessInputNoWrapAround_other 0810fbbc g 0000007c PrintTextArray 0810fc38 g 00000098 MultichoiceList_PrintItems -0810fcd0 g 0000004e UnionRoomAndTradeMenuPrintOptions +0810fcd0 g 0000004e PrintMenuTable 0810fd20 g 00000112 AddItemMenuActionTextPrinters 0810fe34 l 0000006c PrintMenuActionTextsAtTopById 0810fea0 g 000000b4 SetWindowTemplateFields @@ -27513,119 +27513,118 @@ 08260a82 l 000001fe sTradePartyBoxTilemap 08260c80 l 00000800 sTradeStripesBG2Tilemap 08261480 l 00000800 sTradeStripesBG3Tilemap -08261c80 l 00000008 gOamData_8261C30 -08261c88 l 00000008 gOamData_8261C38 -08261c90 l 00000008 gSpriteAnim_8261C40 -08261c98 l 00000008 gSpriteAnim_8261C48 -08261ca0 l 00000008 gSpriteAnimTable_8261C50 -08261ca8 l 00000008 sTradeButtons_SpriteSheet -08261cb0 l 00000008 sTradeButtons_SpritePal -08261cb8 l 00000008 gSpriteAnim_8261C68 -08261cc0 l 00000008 gSpriteAnim_8261C70 -08261cc8 l 00000008 gSpriteAnim_8261C78 -08261cd0 l 00000008 gSpriteAnim_8261C80 -08261cd8 l 00000008 gSpriteAnim_8261C88 -08261ce0 l 00000008 gSpriteAnim_8261C90 -08261ce8 l 00000018 gSpriteAnimTable_8261C98 -08261d00 l 00000018 sSpriteTemplate_TradeButtons -08261d18 l 00000018 sSpriteTemplate_Text -08261d30 l 00000020 sTradeTextPal -08261d50 l 00000008 sSpritePalette_Text +08261c80 l 00000008 sOamData_MenuText +08261c88 l 00000008 sOamData_Cursor +08261c90 l 00000008 sAnim_Cursor_Normal +08261c98 l 00000008 sAnim_Cursor_OnCancel +08261ca0 l 00000008 sAnims_Cursor +08261ca8 l 00000008 sCursor_SpriteSheet +08261cb0 l 00000008 sCursor_SpritePalette +08261cb8 l 00000008 sAnim_MenuText_0 +08261cc0 l 00000008 sAnim_MenuText_1 +08261cc8 l 00000008 sAnim_MenuText_2 +08261cd0 l 00000008 sAnim_MenuText_3 +08261cd8 l 00000008 sAnim_MenuText_4 +08261ce0 l 00000008 sAnim_MenuText_5 +08261ce8 l 00000018 sAnims_MenuText +08261d00 l 00000018 sSpriteTemplate_Cursor +08261d18 l 00000018 sSpriteTemplate_MenuText +08261d30 l 00000020 sMenuText_Pal +08261d50 l 00000008 sSpritePalette_MenuText 08261d58 l 00000138 sCursorMoveDestinations 08261e90 l 0000001a sTradeMonSpriteCoords -08261eaa l 00000018 sTradeMenuGenderLevelPrintCoords -08261ec2 l 00000018 sTradeMenuGenderLevelWindowCoords -08261eda l 00000008 sTradeUnknownSpriteCoords -08261ee2 l 00000024 gUnknown_8261E92 -08261f06 g 00000001 sText_Dummy -08261f07 g 0000000a sText_ClrWhtHltTranspShdwDrkGry +08261eaa l 00000018 sTradeMonLevelCoords +08261ec2 l 00000018 sTradeMonBoxCoords +08261eda l 00000008 sPlayerNameCoords +08261ee2 l 00000024 sUnusedCoords +08261f06 l 00000001 sText_Dummy +08261f07 l 0000000a sText_ClrWhtHltTranspShdwDrkGry 08261f11 g 00000002 gText_MaleSymbol4 08261f13 g 00000002 gText_FemaleSymbol4 08261f15 g 00000001 gText_GenderlessSymbol -08261f16 g 00000001 sText_Dummy2 -08261f17 g 00000002 sText_Newline -08261f19 g 00000002 sText_Slash -08261f1c l 00000018 sTradeUITextPtrs +08261f16 l 00000001 sText_Dummy2 +08261f17 l 00000002 sText_Newline +08261f19 l 00000002 sText_Slash +08261f1c l 00000018 sActionTexts 08261f34 l 00000010 sMenuAction_SummaryTrade -08261f44 l 00000024 sTradeErrorOrStatusMessagePtrs +08261f44 l 00000024 sMessages 08261f68 l 00000003 sTextColor_PartyMonNickname 08261f6c l 00000010 sBgTemplates 08261f7c l 00000098 sWindowTemplates 08262014 l 00000008 sWindowTemplate_YesNo -0826201c l 00000068 gUnknown_8261FCC -08262084 l 00000005 gJPText_Shedinja -08262089 l 0000000e gUnknown_8262039 -08262097 l 0000000e gUnknown_8262047 -082620a5 l 00000004 gUnknown_8262055 -082620ac l 00000020 sTradeBallPalette -082620cc l 00000600 sTradeBallTiles -082626cc l 00001a00 sPokeballSymbolTiles -082640cc l 00000800 sCableCloseupMap -082648cc l 00000100 sPokeballSymbolMap -082649cc l 00000020 sUnref_083308C0 -082649ec l 00000020 sTradeGbaPal +0826201c l 00000068 sDebug_Messages +08262084 l 00000005 sText_ShedinjaJP +08262089 l 0000001c sDebug_TradeResultTexts +082620a5 l 00000004 sSelectedMonLevelGenderCoords +082620ac l 00000020 sPokeball_Pal +082620cc l 00000600 sPokeball_Gfx +082626cc l 00001a00 sPokeballSymbol_Gfx +082640cc l 00000800 sCableCloseup_Map +082648cc l 00000100 sPokeballSymbol_Map +082649cc l 00000020 sUnusedPal1 +082649ec l 00000020 sGba_Pal 08264a0c l 00000020 sShadowPalette 08264a2c l 00000020 sBlackPalette -08264a4c l 00000020 sTradeGlowPal -08264a6c l 00000200 sTradeGlow1Tiles -08264c6c l 00000200 sTradeGlow2Tiles -08264e6c l 00000200 sTradeCableEndTiles -0826506c l 00001000 sTradeGBAScreenTiles +08264a4c l 00000020 sLinkMon_Pal +08264a6c l 00000200 sLinkMonGlow_Gfx +08264c6c l 00000200 sLinkMonShadow_Gfx +08264e6c l 00000200 sCableEnd_Gfx +0826506c l 00001000 sGbaScreen_Gfx 0826606c g 00001000 gTradeOrHatchMonShadowTilemap -0826706c l 00002800 sGbaAffineTiles -0826986c l 00000040 sFiller_08335760 +0826706c l 00002800 sGbaAffine_Gfx +0826986c l 00000040 sEmptyGfx 082698ac l 00000100 sGbaAffineMapCable 082699ac l 00000100 sGbaAffineMapWireless 08269aac l 00001000 sGbaMapWireless 0826aaac l 00001000 sGbaMapCable -0826baac l 00000100 sWirelessCloseupMap +0826baac l 00000100 sWirelessCloseup_Map 0826bbac l 00000200 sWirelessSignalAnimPals_Outbound 0826bdac l 00000200 sWirelessSignalAnimPals_Inbound 0826bfac l 00000020 sWirelessSignalAnimPals_Off 0826bfcc l 00000690 sWirelessSignal4bpp 0826c65c l 000006f4 sWirelessSignalTilemap -0826cd50 l 00000008 gOamData_826CD00 -0826cd58 l 0000003c gAnimCmd_826CD08 -0826cd94 l 0000003c gAnimCmd_826CD44 -0826cdd0 l 00000008 gSpriteAnimTable_826CD80 -0826cdd8 l 00000010 gAffineAnimCmd_826CD88 -0826cde8 l 00000010 gAffineAnimCmd_826CD98 -0826cdf8 l 00000020 gAffineAnimCmd_826CDA8 -0826ce18 l 0000000c gSpriteAffineAnimTable_826CDC8 -0826ce24 l 00000008 sTradeBallSpriteSheet +0826cd50 l 00000008 sOamData_Pokeball +0826cd58 l 0000003c sAnim_Pokeball_SpinOnce +0826cd94 l 0000003c sAnim_Pokeball_SpinTwice +0826cdd0 l 00000008 sAnims_Pokeball +0826cdd8 l 00000010 sAffineAnim_Pokeball_Normal +0826cde8 l 00000010 sAffineAnim_Pokeball_Squish +0826cdf8 l 00000020 sAffineAnim_Pokeball_Unsquish +0826ce18 l 0000000c sAffineAnims_Pokeball +0826ce24 l 00000008 sPokeBallSpriteSheet 0826ce2c l 00000008 sTradeBallSpritePal -0826ce34 l 00000018 sTradePokeballSpriteTemplate -0826ce4c l 00000008 gOamData_826CDFC -0826ce54 l 00000008 gAnimCmd_826CE04 -0826ce5c l 00000004 gSpriteAnimTable_826CE0C -0826ce60 l 00000018 gAffineAnimCmd_826CE10 -0826ce78 l 00000004 gSpriteAffineAnimTable_826CE28 -0826ce7c l 00000008 sTradeGlow1SpriteSheet -0826ce84 l 00000008 sTradeGlowSpritePal -0826ce8c l 00000008 sTradeGbaSpritePal -0826ce94 l 00000018 sTradeGlow1SpriteTemplate -0826ceac l 00000008 gOamData_826CE5C -0826ceb4 l 00000008 gAnimCmd_826CE64 -0826cebc l 00000008 gAnimCmd_826CE6C -0826cec4 l 00000008 gSpriteAnimTable_826CE74 -0826cecc l 00000008 sTradeGlow2SpriteSheet -0826ced4 l 00000018 sGlowBallSpriteTemplate -0826ceec l 00000008 gOamData_826CE9C -0826cef4 l 00000008 gAnimCmd_826CEA4 -0826cefc l 00000004 gSpriteAnimTable_826CEAC -0826cf00 l 00000008 sTradeCableEndSpriteSheet -0826cf08 l 00000018 sGameLinkCableEndSpriteTemplate -0826cf20 l 00000008 gOamData_826CED0 -0826cf28 l 00000024 gAnimCmd_826CED8 -0826cf4c l 00000024 gAnimCmd_826CEFC -0826cf70 l 00000004 gSpriteAnimTable_826CF20 -0826cf74 l 00000004 gSpriteAnimTable_826CF24 +0826ce34 l 00000018 sSpriteTemplate_Pokeball +0826ce4c l 00000008 sOamData_LinkMonGlow +0826ce54 l 00000008 sAnim_LinkMonGlow +0826ce5c l 00000004 sAnims_LinkMonGlow +0826ce60 l 00000018 sAffineAnim_LinkMonGlow +0826ce78 l 00000004 sAffineAnims_LinkMonGlow +0826ce7c l 00000008 sSpriteSheet_LinkMonGlow +0826ce84 l 00000008 sSpritePalette_LinkMon +0826ce8c l 00000008 sSpritePalette_Gba +0826ce94 l 00000018 sSpriteTemplate_LinkMonGlow +0826ceac l 00000008 sOamData_LinkMonShadow +0826ceb4 l 00000008 sAnim_LinkMonShadow_Big +0826cebc l 00000008 sAnim_LinkMonShadow_Small +0826cec4 l 00000008 sAnims_LinkMonShadow +0826cecc l 00000008 sSpriteSheet_LinkMonShadow +0826ced4 l 00000018 sSpriteTemplate_LinkMonShadow +0826ceec l 00000008 sOamData_CableEnd +0826cef4 l 00000008 sAnim_CableEnd +0826cefc l 00000004 sAnims_CableEnd +0826cf00 l 00000008 sSpriteSheet_CableEnd +0826cf08 l 00000018 sSpriteTemplate_CableEnd +0826cf20 l 00000008 sOamData_GbaScreen +0826cf28 l 00000024 sAnim_GbaScreen_Long +0826cf4c l 00000024 sAnim_GbaScreen_Short +0826cf70 l 00000004 sAnims_GbaScreen_Long +0826cf74 l 00000004 sAnims_GbaScreen_Short 0826cf78 l 00000008 sTradeGBAScreenSpriteSheet -0826cf80 l 00000018 sTradeGBAScreenSpriteTemplate1 -0826cf98 l 00000018 sTradeGBAScreenSpriteTemplate2 -0826cfb0 l 00000018 sTradeGlow2PaletteAnimTable -0826cfc8 l 00000010 gAffineAnimCmd_826CF78 -0826cfd8 l 00000004 sSpriteAffineAnimTable_PlayerPokePicAlt +0826cf80 l 00000018 sSpriteTemplate_GbaScreenFlash_Long +0826cf98 l 00000018 sSpriteTemplate_GbaScreenFlash_Short +0826cfb0 l 00000018 sLinkMonShadow_Pal +0826cfc8 l 00000010 sAffineAnim_CrossingMonPic +0826cfd8 l 00000004 sAffineAnims_CrossingMonPics 0826cfdc l 0000021c sInGameTrades 0826d1f8 l 00000014 sInGameTradeMailMessages 0826d20c l 00000010 sTradeMessageWindowTemplates @@ -50755,11 +50754,11 @@ 08e9cc1c g 00000020 gMonMarkingsMenu_Pal 08e9cc3c g 00000320 gMonMarkingsMenu_Gfx 08e9cf5c g 00000060 gTradeMenu_Pal -08e9cfbc g 00000020 gTradeButtons_Pal +08e9cfbc g 00000020 gTradeCursor_Pal 08e9cfdc g 00001280 gTradeMenu_Gfx -08e9e25c g 00000800 gTradeButtons_Gfx -08e9ea5c g 00000020 gUnknown_8E9E9DC -08e9ea7c g 00000800 gUnknown_8E9E9FC +08e9e25c g 00000800 gTradeCursor_Gfx +08e9ea5c g 00000020 gTradeUnused_Tilemap +08e9ea7c g 00000800 gTradeMenu_Tilemap 08e9f27c g 00000024 gTradeMenuMonBox_Tilemap 08e9f2a0 g 00000040 gFameCheckerBgPals 08e9f2e0 g 000014a0 gFameCheckerBgTiles