From 7793949eae3536eb98ec210e70e346736720bef1 Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Tue, 26 Oct 2021 18:24:57 +0000 Subject: [PATCH] Merge pull request #1525 from GriffinRichards/doc-recmix --- pokeemerald.sym | 46 +++++++++++++++++++++++----------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pokeemerald.sym b/pokeemerald.sym index 552990224e..43245ebaa5 100644 --- a/pokeemerald.sym +++ b/pokeemerald.sym @@ -419,7 +419,7 @@ 02039f94 l 00000004 sNamingScreen 02039f98 l 00000001 sMoneyBoxWindowId 02039f99 l 00000001 sMoneyLabelSpriteId -02039f9c l 00000078 sDaycareMail +02039f9c l 00000078 sRecordMixMail 0203a014 l 00000004 sReceivedRecords 0203a018 l 00000004 sSentRecord 0203a01c l 00000001 sCurSecretBaseId @@ -808,20 +808,20 @@ 03001102 l 00000001 sTileCountFromPlayer_Y 03001108 l 00000019 sHyperCutTiles 03001124 l 00000007 sLilycoveSSTidalSelections -03001130 l 00000001 gUnknown_03001130 +03001130 l 00000001 sReadyToReceive 03001134 l 00000004 sSecretBasesSave 03001138 l 00000004 sTvShowsSave 0300113c l 00000004 sPokeNewsSave 03001140 l 00000004 sOldManSave 03001144 l 00000004 sDewfordTrendsSave -03001148 l 00000004 sDaycareMailSave +03001148 l 00000004 sRecordMixMailSave 0300114c l 00000004 sBattleTowerSave 03001150 l 00000004 sLilycoveLadySave 03001154 l 00000004 sApprenticesSave 03001158 l 00000004 sBattleTowerSave_Duplicate 0300115c l 00000004 sRecordStructSize -03001160 l 00000001 gUnknown_03001160 -03001168 l 0000000c gUnknown_03001168 +03001160 l 00000001 sDaycareMailRandSum +03001168 l 0000000c sPartnerHallRecords 03001174 l 00000001 sTVShowMixingNumPlayers 03001175 l 00000001 sTVShowNewsMixingNumPlayers 03001176 l 00000001 sTVShowMixingCurSlot @@ -8261,14 +8261,14 @@ 080d423c g 0000007c FixLongGrassMetatilesWindowTop 080d42b8 g 0000009c FixLongGrassMetatilesWindowBottom 080d4354 l 00000016 StartCutTreeFieldEffect -080d436c g 00000030 ClearMailData +080d436c g 00000030 ClearAllMail 080d436c l 00000000 .gcc2_compiled. -080d439c g 00000054 ClearMailStruct +080d439c g 00000054 ClearMail 080d43f0 g 00000030 MonHasMail -080d4420 g 000001a6 GiveMailToMon +080d4420 g 000001a6 GiveMailToMonByItemId 080d45c8 g 00000020 SpeciesToMailSpecies 080d45e8 g 00000022 MailSpeciesToSpecies -080d460c g 0000006e GiveMailToMon2 +080d460c g 0000006e GiveMailToMon 080d467c l 00000004 DummyMailFunc 080d4680 g 00000060 TakeMailFromMon 080d46e0 g 00000020 ClearMailItemId @@ -8924,7 +8924,7 @@ 080e7324 l 00000248 Task_MixingRecordsRecv 080e756c l 000000c4 Task_SendPacket 080e7630 l 0000013c Task_CopyReceiveBuffer -080e776c l 00000034 sub_80E776C +080e776c l 00000034 Task_WaitReceivePacket 080e77a0 l 00000034 Task_ReceivePacket 080e77d4 l 00000028 Task_SendPacket_SwitchToReceive 080e77fc l 0000000c LoadPtrFromTaskData @@ -8935,10 +8935,10 @@ 080e78c4 l 00000084 ReceiveOldManData 080e7948 l 000000cc ReceiveBattleTowerData 080e7a14 l 00000088 ReceiveLilycoveLadyData -080e7a9c l 00000008 sub_80E7A9C -080e7aa4 l 00000088 sub_80E7AA4 -080e7b2c l 00000028 sub_80E7B2C -080e7b54 l 0000000c sub_80E7B54 +080e7a9c l 00000008 GetDaycareMailItemId +080e7aa4 l 00000088 SwapDaycareMail +080e7b2c l 00000028 CalculateDaycareMailRandSum +080e7b54 l 0000000c GetDaycareMailRandSum 080e7b60 l 00000408 ReceiveDaycareMailData 080e7f68 l 00000090 ReceiveGiftItem 080e7ff8 l 00000118 Task_DoRecordMixing @@ -8946,10 +8946,10 @@ 080e8260 g 000001bc GetPlayerHallRecords 080e841c l 0000004c IsApprenticeAlreadySaved 080e8468 l 00000110 ReceiveApprenticeData -080e8578 l 00000308 sub_80E8578 -080e8880 l 0000004c sub_80E8880 -080e88cc l 00000058 sub_80E88CC -080e8924 l 00000088 sub_80E8924 +080e8578 l 00000308 GetNewHallRecords +080e8880 l 0000004c FillWinStreakRecords1P +080e88cc l 00000058 FillWinStreakRecords2P +080e8924 l 00000088 SaveHighestWinStreakRecords 080e89ac l 0000004a ReceiveRankingHallRecords 080e89f8 l 0000005c GetRecordMixingDaycareMail 080e8a54 l 00000066 SanitizeDaycareMailForRuby @@ -49558,11 +49558,11 @@ 0858cdcc g 000000c0 gContestEffects 0858ce8c g 0000003f gComboStarterLookupTable 0858cecc g 000000c0 gContestEffectFuncs -0858cf8c l 00000002 gUnknown_0858CF8C -0858cf8e l 00000006 gUnknown_0858CF8E -0858cf94 l 00000024 gUnknown_0858CF94 -0858cfb8 l 00000006 gUnknown_0858CFB8 -0858cfbe l 0000000c gUnknown_0858CFBE +0858cf8c l 00000002 sPlayerIdxOrders_2Player +0858cf8e l 00000006 sPlayerIdxOrders_3Player +0858cf94 l 00000024 sPlayerIdxOrders_4Player +0858cfb8 l 00000006 sDaycareMailSwapIds_3Player +0858cfbe l 0000000c sDaycareMailSwapIds_4Player 0858cfcc l 0000001c sSecretBaseEntranceMetatiles 0858cfe8 l 00000060 sSecretBaseEntrancePositions 0858d048 l 00000010 sRegistryMenuActions