dionmoustos/PokemonEmeraldSafariFrontier
1
0
Fork 0
Code Issues 21 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1850 from GriffinRichards/sync-trade

Browse Source
This commit is contained in:
GriffinRichards
2023-02-04 00:09:13 +00:00
parent 0b04fece90
commit ba5c22adf4
1 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pokeemerald.sym
+80 -80
View File
@@ -215,12 +215,12 @@
02029808 g 00008450 gPokemonStorage 02029808 g 00008450 gPokemonStorage
02031c58 g 00000528 gLoadedSaveData 02031c58 g 00000528 gLoadedSaveData
02032180 g 00000004 gLastEncryptionKey 02032180 g 00000004 gLastEncryptionKey
02032184 l 00000004 sMenuTextAllocBuffer 02032184 l 00000004 sMenuTextTileBuffer
02032188 l 00000038 sMenuTextTileBuffers 02032188 l 00000038 sMenuTextTileBuffers
020321c0 g 000000d8 gTradeMail 020321c0 g 000000d8 gTradeMail
02032298 g 00000002 gSelectedTradeMonPositions 02032298 g 00000002 gSelectedTradeMonPositions
0203229c l 00000004 sTradeMenuData 0203229c l 00000004 sTradeMenu
020322a0 l 00000004 sTradeData 020322a0 l 00000004 sTradeAnim
020322a4 l 00000004 sBerryBlender 020322a4 l 00000004 sBerryBlender
020322a8 l 00000014 sDebug_PokeblockFactorFlavors 020322a8 l 00000014 sDebug_PokeblockFactorFlavors
020322bc l 00000014 sDebug_PokeblockFactorFlavorsAfterRPM 020322bc l 00000014 sDebug_PokeblockFactorFlavorsAfterRPM
@@ -4139,64 +4139,64 @@
080773d0 l 000007a4 CB2_CreateTradeMenu 080773d0 l 000007a4 CB2_CreateTradeMenu
08077b74 l 000005a8 CB2_ReturnToTradeMenu 08077b74 l 000005a8 CB2_ReturnToTradeMenu
0807811c l 00000012 VBlankCB_TradeMenu 0807811c l 00000012 VBlankCB_TradeMenu
08078130 l 0000003c LinkTradeFadeOut 08078130 l 0000003c CB_FadeToStartTrade
0807816c l 0000005c LinkTradeWaitForFade 0807816c l 0000005c CB_WaitToStartTrade
080781c8 l 00000094 SetLinkTradeCallbacks 080781c8 l 00000094 CB_StartLinkTrade
0807825c l 0000005c CB2_TradeMenu 0807825c l 0000005c CB2_TradeMenu
080782b8 l 000000ce LoadTradeBgGfx 080782b8 l 000000ce LoadTradeBgGfx
08078388 l 000000b0 SetTradePartyMonsVisible 08078388 l 000000b0 SetActiveMenuOptions
08078438 l 00000020 Trade_Memcpy 08078438 l 00000020 Trade_Memcpy
08078458 l 00000360 BufferTradeParties 08078458 l 00000360 BufferTradeParties
080787b8 l 00000028 DrawIsThisTradeOkay 080787b8 l 00000028 PrintIsThisTradeOkay
080787e0 l 00000120 UpdateLinkTradeFlags 080787e0 l 00000120 Leader_ReadLinkBuffer
08078900 l 000000fc ReactToLinkTradeData 08078900 l 000000fc Follower_ReadLinkBuffer
080789fc l 00000200 QueueLinkTradeData 080789fc l 00000200 Leader_HandleCommunication
08078bfc l 00000012 _SetLinkData 08078bfc l 00000012 _SetLinkData
08078c10 l 00000024 SetLinkData 08078c10 l 00000024 SetLinkData
08078c34 l 00000036 CB1_SendOrReactToLinkTradeData 08078c34 l 00000036 CB1_UpdateLink
08078c6c l 0000004c GetNewTradeMenuPosition 08078c6c l 0000004c GetNewCursorPosition
08078cb8 l 000000c0 TradeMenuMoveCursor 08078cb8 l 000000c0 TradeMenuMoveCursor
08078d78 l 00000042 SetReadyToTrade 08078d78 l 00000042 SetReadyToTrade
08078dbc l 0000013c TradeMenuProcessInput 08078dbc l 0000013c CB_ProcessMenuInput
08078ef8 l 00000058 TradeMenuChooseMon 08078ef8 l 00000058 RedrawChooseAPokemonWindow
08078f50 l 000000e4 TradeMenuProcessInput_SelectedMon 08078f50 l 000000e4 CB_ProcessSelectedMonInput
08079034 l 00000028 ChooseMonAfterButtonPress 08079034 l 00000028 CB_ChooseMonAfterButtonPress
0807905c l 00000078 TradeMenuShowMonSummaryScreen 0807905c l 00000078 CB_ShowTradeMonSummaryScreen
080790d4 l 0000009e CheckValidityOfTradeMons 080790d4 l 0000009e CheckValidityOfTradeMons
08079174 l 000000a2 CheckMonsBeforeTrade 08079174 l 000000a2 CheckMonsBeforeTrade
08079218 l 00000084 ConfirmOrCancelTrade 08079218 l 00000084 CB_ProcessConfirmTradeInput
0807929c l 00000048 RestoreNicknamesCoveredByYesNo 0807929c l 00000048 RestoreNicknamesCoveredByYesNo
080792e4 l 00000076 CancelTradeYesNo 080792e4 l 00000076 CB_ProcessCancelTradeInput
0807935c l 0000003c SetBothSelectedMons 0807935c l 0000003c CB_SetSelectedMons
08079398 l 0000002c ConfirmTradePrompt 08079398 l 0000002c CB_PrintIsThisTradeOkay
080793c4 l 00000044 DelayTradeConfirmation 080793c4 l 00000044 CB_InitConfirmTradePrompt
08079408 l 00000088 RedrawTradeMenuAfterPressA 08079408 l 00000088 CB_HandleTradeCanceled
08079490 l 0000003c CancelTrade_1 08079490 l 0000003c CB_InitExitCanceledTrade
080794cc l 00000084 CancelTrade_2 080794cc l 00000084 CB_ExitCanceledTrade
08079550 l 0000002c LinkTradeWaitForQueue 08079550 l 0000002c CB_WaitToStartRfuTrade
0807957c l 00000030 PartnersMonWasInvalid 0807957c l 00000030 CB_PartnersMonWasInvalid
080795ac l 000000d0 CallTradeMenuFunc 080795ac l 000000d0 RunTradeMenuCallback
0807967c l 00000038 SetSelectedMon 0807967c l 00000038 SetSelectedMon
080796b4 l 00000388 DrawTradeMenuParty 080796b4 l 00000388 DrawSelectedMonScreen
08079a3c l 00000068 GetMonNicknameWidth 08079a3c l 00000068 GetMonNicknameWidth
08079aa4 l 000000e0 BufferTradeMonMoves 08079aa4 l 000000e0 BufferMovesString
08079b84 l 0000005c PrintMonNicknameForTradeMenu 08079b84 l 0000005c PrintPartyMonNickname
08079be0 l 0000006c PrintPartyNicknamesForTradeMenu 08079be0 l 0000006c PrintPartyNicknames
08079c4c l 000001f8 DrawTradeMenuPartyMonInfo 08079c4c l 000001f8 PrintLevelAndGender
08079e44 l 00000064 DrawTradeMenuPartyInfo 08079e44 l 00000064 PrintPartyLevelsAndGenders
08079ea8 l 000000cc ResetTradeMenuPartyPositions 08079ea8 l 000000cc ShowTradePartyMonIcons
08079f74 l 00000012 PrintNicknamesForTradeMenu 08079f74 l 00000012 PrintTradePartnerPartyNicknames
08079f88 l 00000078 RedrawTradeMenuParty 08079f88 l 00000078 RedrawPartyWindow
0807a000 l 00000024 Task_DrawSelectionSummary 0807a000 l 00000024 Task_DrawSelectionSummary
0807a024 l 00000024 Task_DrawSelectionTrade 0807a024 l 00000024 Task_DrawSelectionTrade
0807a048 l 00000054 QueueAction 0807a048 l 00000054 QueueAction
0807a09c l 00000028 GetNumQueuedActions 0807a09c l 00000028 GetNumQueuedActions
0807a0c4 l 000000d8 DoQueuedActions 0807a0c4 l 000000d8 DoQueuedActions
0807a19c l 00000054 PrintTradeMessage 0807a19c l 00000054 PrintTradeMessage
0807a1f0 l 00000116 LoadTradeMenuSpriteSheetsAndPalettes 0807a1f0 l 00000116 LoadUISpriteGfx
0807a308 l 00000016 DrawBottomRowText 0807a308 l 00000016 DrawBottomRowText
0807a320 l 00000148 SetTradePartyLiveStatuses 0807a320 l 00000148 ComputePartyTradeableFlags
0807a468 l 000000d4 GetTradePartyHPBarLevels 0807a468 l 000000d4 ComputePartyHPBarLevels
0807a53c l 00000074 SetTradePartyHPBarSprites 0807a53c l 00000074 SetTradePartyHPBarSprites
0807a5b0 l 00000044 SaveTradeGiftRibbons 0807a5b0 l 00000044 SaveTradeGiftRibbons
0807a5f4 l 00000132 CanTradeSelectedMon 0807a5f4 l 00000132 CanTradeSelectedMon
@@ -4213,51 +4213,51 @@
0807ab04 l 00000022 SpriteCB_GbaScreen 0807ab04 l 00000022 SpriteCB_GbaScreen
0807ab28 l 000000a4 SetTradeBGAffine 0807ab28 l 000000a4 SetTradeBGAffine
0807abcc l 00000056 SetTradeGpuRegs 0807abcc l 00000056 SetTradeGpuRegs
0807ac24 l 00000016 VBlankCB_Trade 0807ac24 l 00000016 VBlankCB_TradeAnim
0807ac3c l 00000028 ClearLinkTimeoutCounter 0807ac3c l 00000028 ClearLinkTimeoutTimer
0807ac64 l 00000078 CheckForLinkTimeout 0807ac64 l 00000078 CheckForLinkTimeout
0807acdc l 00000020 TradeGetMultiplayerId 0807acdc l 00000020 TradeGetMultiplayerId
0807acfc l 00000154 LoadTradeMonPic 0807acfc l 00000154 LoadTradeMonPic
0807ae50 g 000002f0 CB2_LinkTrade 0807ae50 g 000002f0 CB2_LinkTrade
0807b140 g 00000012 InitTradeSequenceBgGpuRegs 0807b140 g 00000012 InitTradeSequenceBgGpuRegs
0807b154 g 0000001c LinkTradeDrawWindow 0807b154 g 0000001c LinkTradeDrawWindow
0807b170 l 00000100 InitTradeBgInternal 0807b170 l 00000100 TradeAnimInit_LoadGfx
0807b270 l 000001f4 CB2_InGameTrade 0807b270 l 000001f4 CB2_InitInGameTrade
0807b464 l 00000060 UpdatePokedexForReceivedMon 0807b464 l 00000060 UpdatePokedexForReceivedMon
0807b4c4 l 0000000a TryEnableNationalDexFromLinkPartner 0807b4c4 l 0000000a TryEnableNationalDexFromLinkPartner
0807b4d0 l 000000e8 TradeMons 0807b4d0 l 000000e8 TradeMons
0807b5b8 l 00000054 TrySendTradeFinishData 0807b5b8 l 00000054 HandleLinkDataSend
0807b60c l 0000001e CB2_UpdateInGameTrade 0807b60c l 0000001e CB2_InGameTrade
0807b62c l 00000468 SetTradeSequenceBgGpuRegs 0807b62c l 00000468 SetTradeSequenceBgGpuRegs
0807ba94 l 00000044 LoadTradeSequenceSpriteSheetsAndPalettes 0807ba94 l 00000044 LoadTradeSequenceSpriteSheetsAndPalettes
0807bad8 l 000000f0 BufferTradeSceneStrings 0807bad8 l 000000f0 BufferTradeSceneStrings
0807bbc8 l 00000024 AnimateTradeSequence 0807bbc8 l 00000024 DoTradeAnim
0807bbec l 000013dc AnimateTradeSequenceCable 0807bbec l 000013dc DoTradeAnim_Cable
0807cfc8 l 0000144c AnimateTradeSequenceWireless 0807cfc8 l 0000144c DoTradeAnim_Wireless
0807e414 l 000000c8 CB2_TryLinkTradeEvolution 0807e414 l 000000c8 CB2_TryLinkTradeEvolution
0807e4dc l 00000080 UpdateTradeFinishFlags 0807e4dc l 00000080 HandleLinkDataReceive
0807e55c l 0000007c SpriteCB_BouncingPokeball 0807e55c l 0000007c SpriteCB_BouncingPokeball
0807e5d8 l 00000074 SpriteCB_BouncingPokeballDepart 0807e5d8 l 00000074 SpriteCB_BouncingPokeballDepart
0807e64c l 00000060 SpriteCB_BouncingPokeballDepartEnd 0807e64c l 00000060 SpriteCB_BouncingPokeballDepartEnd
0807e6ac l 00000090 SpriteCB_BouncingPokeballArrive 0807e6ac l 00000090 SpriteCB_BouncingPokeballArrive
0807e73c g 00000048 GetInGameTradeSpeciesInfo 0807e73c g 00000048 GetInGameTradeSpeciesInfo
0807e784 l 00000064 BufferInGameTradeMonName 0807e784 l 00000064 BufferInGameTradeMonName
0807e7e8 l 0000018c _CreateInGameTradePokemon 0807e7e8 l 0000018c CreateInGameTradePokemonInternal
0807e974 l 00000060 SetInGameTradeMail 0807e974 l 00000060 GetInGameTradeMail
0807e9d4 g 0000003c GetTradeSpecies 0807e9d4 g 0000003c GetTradeSpecies
0807ea10 g 0000001c CreateInGameTradePokemon 0807ea10 g 0000001c CreateInGameTradePokemon
0807ea2c l 000000a0 CB2_UpdateLinkTrade 0807ea2c l 000000a0 CB2_UpdateLinkTrade
0807eacc l 00000084 CB2_TryFinishTrade 0807eacc l 00000084 CB2_WaitTradeComplete
0807eb50 l 00000518 CB2_SaveAndEndTrade 0807eb50 l 00000518 CB2_SaveAndEndTrade
0807f068 l 0000007c CB2_FreeTradeData 0807f068 l 0000007c CB2_FreeTradeAnim
0807f0e4 g 0000002c DoInGameTradeScene 0807f0e4 g 0000002c DoInGameTradeScene
0807f110 l 0000003c Task_InGameTrade 0807f110 l 0000003c Task_InGameTrade
0807f14c l 00000050 CheckPartnersMonForRibbons 0807f14c l 00000050 CheckPartnersMonForRibbons
0807f19c g 0000000a LoadTradeAnimGfx 0807f19c g 0000000a LoadTradeAnimGfx
0807f1a8 g 00000068 DrawTextOnTradeWindow 0807f1a8 g 00000068 DrawTextOnTradeWindow
0807f210 l 000000d4 Task_AnimateWirelessSignal 0807f210 l 000000d4 Task_AnimateWirelessSignal
0807f2e4 l 000000b8 Task_NarrowWindowForCrossing_Wireless 0807f2e4 l 000000b8 Task_OpenCenterWhiteColumn
0807f39c l 000000c6 Task_NarrowWindowForCrossing_Cable 0807f39c l 000000c6 Task_CloseCenterWhiteColumn
0807f464 l 000002d4 CB2_SaveAndEndWirelessTrade 0807f464 l 000002d4 CB2_SaveAndEndWirelessTrade
0807f738 l 00000000 .gcc2_compiled. 0807f738 l 00000000 .gcc2_compiled.
0807f738 l 0000002c UpdateHitPitch 0807f738 l 0000002c UpdateHitPitch
@@ -6698,7 +6698,7 @@
080a6d60 g 00000032 AnimLoadCompressedBgTilemapHandleContest 080a6d60 g 00000032 AnimLoadCompressedBgTilemapHandleContest
080a6d94 g 00000016 GetBattleBgPaletteNum 080a6d94 g 00000016 GetBattleBgPaletteNum
080a6dac g 00000040 UpdateAnimBg3ScreenSize 080a6dac g 00000040 UpdateAnimBg3ScreenSize
080a6dec g 00000028 TradeMenuBouncePartySprites 080a6dec g 00000028 Trade_MoveSelectedMonToTarget
080a6e14 g 0000003e InitSpriteDataForLinearTranslation 080a6e14 g 0000003e InitSpriteDataForLinearTranslation
080a6e54 g 00000098 InitAnimLinearTranslation 080a6e54 g 00000098 InitAnimLinearTranslation
080a6eec g 00000028 StartAnimLinearTranslation 080a6eec g 00000028 StartAnimLinearTranslation
@@ -40266,10 +40266,10 @@
0831aca0 l 00000005 sText_ShedinjaJpnName 0831aca0 l 00000005 sText_ShedinjaJpnName
0831aca8 g 00000008 gOamData_BattleSpriteOpponentSide 0831aca8 g 00000008 gOamData_BattleSpriteOpponentSide
0831acb0 g 00000008 gOamData_BattleSpritePlayerSide 0831acb0 g 00000008 gOamData_BattleSpritePlayerSide
0831acb8 l 00000008 sUnused1 0831acb8 l 00000008 sAnim_Unused
0831acc0 l 00000004 sUnused1Ptr 0831acc0 l 00000004 sAnims_Unused
0831acc4 l 00000018 sUnused2 0831acc4 l 00000018 sAffineAnim_Unused
0831acdc l 00000004 sUnused2Ptr 0831acdc l 00000004 sAffineAnims_Unused
0831ace0 l 00000008 sCenterToCornerVecXs 0831ace0 l 00000008 sCenterToCornerVecXs
0831ace8 g 00000150 gTypeEffectiveness 0831ace8 g 00000150 gTypeEffectiveness
0831ae38 g 0000007e gTypeNames 0831ae38 g 0000007e gTypeNames
@@ -41049,7 +41049,7 @@
0832db9c l 00000025 sText_OnlyPkmnForBattle 0832db9c l 00000025 sText_OnlyPkmnForBattle
0832dbc1 l 0000002c sText_WaitingForYourFriend 0832dbc1 l 0000002c sText_WaitingForYourFriend
0832dbed l 00000024 sText_YourFriendWantsToTrade 0832dbed l 00000024 sText_YourFriendWantsToTrade
0832dc14 l 00000008 sTradeOamData_32x16 0832dc14 l 00000008 sOamData_MenuText
0832dc1c l 00000008 sOamData_Cursor 0832dc1c l 00000008 sOamData_Cursor
0832dc24 l 00000008 sAnim_Cursor_Normal 0832dc24 l 00000008 sAnim_Cursor_Normal
0832dc2c l 00000008 sAnim_Cursor_OnCancel 0832dc2c l 00000008 sAnim_Cursor_OnCancel
@@ -41065,27 +41065,27 @@
0832dc7c l 00000018 sAnims_MenuText 0832dc7c l 00000018 sAnims_MenuText
0832dc94 l 00000018 sSpriteTemplate_Cursor 0832dc94 l 00000018 sSpriteTemplate_Cursor
0832dcac l 00000018 sSpriteTemplate_MenuText 0832dcac l 00000018 sSpriteTemplate_MenuText
0832dcc4 l 00000020 sTradeScreenTextPalette 0832dcc4 l 00000020 sMenuText_Pal
0832dce4 l 00000008 sSpritePalette_TradeScreenText 0832dce4 l 00000008 sSpritePalette_MenuText
0832dcec l 00000138 sTradeNextSelectedMonTable 0832dcec l 00000138 sCursorMoveDestinations
0832de24 l 0000001a sTradeMonSpriteCoords 0832de24 l 0000001a sTradeMonSpriteCoords
0832de3e l 00000018 sTradeMonLevelCoords 0832de3e l 00000018 sTradeMonLevelCoords
0832de56 l 00000018 sTradeMonBoxCoords 0832de56 l 00000018 sTradeMonBoxCoords
0832de6e l 00000024 sUnusedCoords 0832de6e l 00000024 sUnusedCoords
0832de94 l 00000018 sTradeActionTexts 0832de94 l 00000018 sActionTexts
0832deac l 00000010 sSelectTradeMonActions 0832deac l 00000010 sSelectTradeMonActions
0832debc l 00000024 sTradeMessages 0832debc l 00000024 sMessages
0832dee0 l 00000003 sTradeTextColors 0832dee0 l 00000003 sTradeTextColors
0832dee4 l 00000010 sTradeMenuBgTemplates 0832dee4 l 00000010 sBgTemplates
0832def4 l 00000098 sTradeMenuWindowTemplates 0832def4 l 00000098 sWindowTemplates
0832df8c l 00000008 sTradeYesNoWindowTemplate 0832df8c l 00000008 sTradeYesNoWindowTemplate
0832df94 l 00000005 sJPText_Shedinja 0832df94 l 00000005 sText_ShedinjaJP
0832df99 l 00000006 sTradeMenuPartyMonBoxDimensions 0832df99 l 00000006 sSelectedMonLevelGenderCoords
0832dfa0 l 00000020 sPokeball_Pal 0832dfa0 l 00000020 sPokeball_Pal
0832dfc0 l 00000600 sPokeball_Gfx 0832dfc0 l 00000600 sPokeball_Gfx
0832e5c0 l 00001a00 sPokeballSymbol_Gfx 0832e5c0 l 00001a00 sPokeballSymbol_Gfx
0832ffc0 l 00000800 sCrossingHighlightCable_Tilemap 0832ffc0 l 00000800 sCableCloseup_Map
083307c0 l 00000100 sTradeTilemap_PokeBallSymbol 083307c0 l 00000100 sPokeballSymbol_Map
083308c0 l 00000020 sUnusedPal1 083308c0 l 00000020 sUnusedPal1
083308e0 l 00000020 sGba_Pal 083308e0 l 00000020 sGba_Pal
08330900 l 00000020 sUnusedPal2 08330900 l 00000020 sUnusedPal2
@@ -41098,11 +41098,11 @@
08331f60 g 00001000 gTradePlatform_Tilemap 08331f60 g 00001000 gTradePlatform_Tilemap
08332f60 l 00002800 sGbaAffine_Gfx 08332f60 l 00002800 sGbaAffine_Gfx
08335760 l 00000040 sEmptyGfx 08335760 l 00000040 sEmptyGfx
083357a0 l 00000100 sGbaCable_AffineTilemap 083357a0 l 00000100 sGbaAffineMapCable
083358a0 l 00000100 sGbaWireless_AffineTilemap 083358a0 l 00000100 sGbaAffineMapWireless
083359a0 l 00001000 sGbaWireless_Tilemap 083359a0 l 00001000 sGbaMapWireless
083369a0 l 00001000 sGbaCable_Tilemap 083369a0 l 00001000 sGbaMapCable
083379a0 l 00000100 sCrossingHighlightWireless_Tilemap 083379a0 l 00000100 sWirelessCloseup_Map
08337aa0 l 00000200 sWirelessSignalSend_Pal 08337aa0 l 00000200 sWirelessSignalSend_Pal
08337ca0 l 00000200 sWirelessSignalRecv_Pal 08337ca0 l 00000200 sWirelessSignalRecv_Pal
08337ea0 l 00000020 sWirelessSignalNone_Pal 08337ea0 l 00000020 sWirelessSignalNone_Pal
@@ -41156,7 +41156,7 @@
0833900c g 00000008 gTradeEvolutionSceneYesNoWindowTemplate 0833900c g 00000008 gTradeEvolutionSceneYesNoWindowTemplate
08339014 l 00000010 sTradeSequenceBgTemplates 08339014 l 00000010 sTradeSequenceBgTemplates
08339024 l 0000006c sTradeBallVerticalVelocityTable 08339024 l 0000006c sTradeBallVerticalVelocityTable
08339090 l 00000044 sWirelessSignalTiming 08339090 l 00000044 sWirelessSignalAnimParams
083390d4 l 00000020 sBlenderCenter_Pal 083390d4 l 00000020 sBlenderCenter_Pal
083390f4 l 00000400 sBlenderCenter_Tilemap 083390f4 l 00000400 sBlenderCenter_Tilemap
083394f4 l 00000020 sBlenderOuter_Pal 083394f4 l 00000020 sBlenderOuter_Pal