From 626b5beb9e835b5869290319f412e7249d4e8fff Mon Sep 17 00:00:00 2001 From: GriffinRichards Date: Fri, 5 Aug 2022 12:24:23 +0000 Subject: [PATCH] Merge pull request #526 from cbt6/save --- pokefirered.sym | 72 +++++++++++++++++++++--------------------- pokefirered_rev1.sym | 72 +++++++++++++++++++++--------------------- pokeleafgreen.sym | 72 +++++++++++++++++++++--------------------- pokeleafgreen_rev1.sym | 72 +++++++++++++++++++++--------------------- 4 files changed, 144 insertions(+), 144 deletions(-) diff --git a/pokefirered.sym b/pokefirered.sym index e7403c95c..49149f214 100644 --- a/pokefirered.sym +++ b/pokefirered.sym @@ -841,18 +841,18 @@ 03005360 g 00000018 sFieldSpecialsListMenuTemplate 03005378 g 00000004 sFieldSpecialsListMenuScrollBuffer 0300537c g 00000004 gCB2_AfterEvolution -03005380 g 00000004 gFirstSaveSector -03005384 g 00000004 gPrevSaveCounter +03005380 g 00000004 gLastWrittenSector +03005384 g 00000004 gLastSaveCounter 03005388 g 00000004 gLastKnownGoodSector 0300538c g 00000004 gDamagedSaveSectors 03005390 g 00000004 gSaveCounter -03005394 g 00000004 gFastSaveSection -03005398 g 00000004 gUnknown_3005398 +03005394 g 00000004 gSaveDataBufferPtr +03005398 g 00000004 gIncrementalSectorId 0300539c g 00000004 gSaveUnusedVar 030053a0 g 00000004 gSaveFileStatus 030053a4 g 00000004 gGameContinueCallback -030053b0 g 00000070 gRamSaveSectionLocations -03005420 g 00000004 gSaveSucceeded +030053b0 g 00000070 gRamSaveSectorLocations +03005420 g 00000004 gSaveAttemptStatus 03005424 g 00000004 gMonShrinkDuration 03005428 g 00000004 gMonShrinkDelta 0300542c g 00000004 gMonShrinkDistance @@ -8694,37 +8694,37 @@ 080d972c g 00000024 ClearSaveData 080d972c l 00000000 .gcc2_compiled. 080d9750 g 0000001c Save_ResetSaveCounters -080d976c g 00000064 SetSectorDamagedStatus -080d97d0 g 000000a0 save_write_to_flash -080d9870 g 000000f0 HandleWriteSector -080d9960 g 00000078 HandleWriteSectorNBytes -080d99d8 g 0000002c TryWriteSector -080d9a04 g 0000005c RestoreSaveBackupVarsAndIncrement -080d9a60 g 00000044 RestoreSaveBackupVars -080d9aa4 g 0000005e sub_80D9AA4 -080d9b04 g 0000004c sub_80D9B04 -080d9b50 g 0000019e ClearSaveData_2 -080d9cf0 g 00000098 sav12_xor_get -080d9d88 g 0000008c sub_80D9D88 -080d9e14 g 0000003e sub_80D9E14 -080d9e54 g 000000b8 sub_80D9E54 -080d9f0c g 00000214 GetSaveValidStatus -080da120 g 00000070 sub_80DA120 -080da190 g 00000018 DoReadFlashWholeSection -080da1a8 g 0000002c CalculateChecksum -080da1d4 g 00000074 UpdateSaveAddresses +080d976c l 00000064 SetDamagedSectorBits +080d97d0 l 000000a0 WriteSaveSectorOrSlot +080d9870 l 000000f0 HandleWriteSector +080d9960 l 00000078 HandleWriteSectorNBytes +080d99d8 l 0000002c TryWriteSector +080d9a04 l 0000005c RestoreSaveBackupVarsAndIncrement +080d9a60 l 00000044 RestoreSaveBackupVars +080d9aa4 l 0000005e HandleWriteIncrementalSector +080d9b04 l 0000004c HandleReplaceSectorAndVerify +080d9b50 l 0000019e HandleReplaceSector +080d9cf0 l 00000098 CopySectorSignatureByte +080d9d88 l 0000008c WriteSectorSignatureByte +080d9e14 l 0000003e TryLoadSaveSlot +080d9e54 l 000000b8 CopySaveSlotData +080d9f0c l 00000214 GetSaveValidStatus +080da120 l 00000070 TryLoadSaveSector +080da190 l 00000018 ReadFlashSector +080da1a8 l 0000002c CalculateChecksum +080da1d4 l 00000074 UpdateSaveAddresses 080da248 g 0000011c HandleSavingData 080da364 g 00000048 TrySavingData -080da3ac g 0000002a SaveGame_AfterLinkTrade -080da3d8 g 00000034 AfterLinkTradeSaveFailed -080da40c g 00000028 ClearSaveAfterLinkTradeSaveFailure -080da434 g 00000028 sub_80DA434 -080da45c g 00000044 sub_80DA45C -080da4a0 g 0000005c sub_80DA4A0 -080da4fc g 0000008c Save_LoadGameData -080da588 g 00000058 TryCopySpecialSaveSection -080da5e0 g 00000054 TryWriteSpecialSaveSection -080da634 g 000001cc Task_LinkSave +080da3ac g 0000002a LinkFullSave_Init +080da3d8 g 00000034 LinkFullSave_WriteSector +080da40c g 00000028 LinkFullSave_ReplaceLastSector +080da434 g 00000028 LinkFullSave_SetLastSectorSignature +080da45c g 00000044 WriteSaveBlock2 +080da4a0 g 0000005c WriteSaveBlock1Sector +080da4fc g 0000008c LoadGameSave +080da588 g 00000058 TryReadSpecialSaveSector +080da5e0 g 00000054 TryWriteSpecialSaveSector +080da634 g 000001cc Task_LinkFullSave 080da800 l 00000000 .gcc2_compiled. 080da800 l 00000030 CheckCompatibility 080da830 l 0000001c SetIncompatible @@ -37105,7 +37105,7 @@ 083fea70 l 000000ec sGrammarMoveUsedTable 083feb64 l 0000012c sTextOnWindowsInfo_Normal 083fec90 g 00000004 gUnknown_83FEC90 -083fec94 g 00000038 gSaveSectionOffsets +083fec94 l 00000038 sSaveSlotLayout 083fecd2 g 00000004 gShadowEffectTemplateIds 083fecd6 g 00000008 gShadowVerticalOffsets 083fece0 g 00000008 gFadeFootprintsTireTracksFuncs diff --git a/pokefirered_rev1.sym b/pokefirered_rev1.sym index 8cfa8ba4c..12c9ec62d 100644 --- a/pokefirered_rev1.sym +++ b/pokefirered_rev1.sym @@ -841,18 +841,18 @@ 03005360 g 00000018 sFieldSpecialsListMenuTemplate 03005378 g 00000004 sFieldSpecialsListMenuScrollBuffer 0300537c g 00000004 gCB2_AfterEvolution -03005380 g 00000004 gFirstSaveSector -03005384 g 00000004 gPrevSaveCounter +03005380 g 00000004 gLastWrittenSector +03005384 g 00000004 gLastSaveCounter 03005388 g 00000004 gLastKnownGoodSector 0300538c g 00000004 gDamagedSaveSectors 03005390 g 00000004 gSaveCounter -03005394 g 00000004 gFastSaveSection -03005398 g 00000004 gUnknown_3005398 +03005394 g 00000004 gSaveDataBufferPtr +03005398 g 00000004 gIncrementalSectorId 0300539c g 00000004 gSaveUnusedVar 030053a0 g 00000004 gSaveFileStatus 030053a4 g 00000004 gGameContinueCallback -030053b0 g 00000070 gRamSaveSectionLocations -03005420 g 00000004 gSaveSucceeded +030053b0 g 00000070 gRamSaveSectorLocations +03005420 g 00000004 gSaveAttemptStatus 03005424 g 00000004 gMonShrinkDuration 03005428 g 00000004 gMonShrinkDelta 0300542c g 00000004 gMonShrinkDistance @@ -8694,37 +8694,37 @@ 080d9740 g 00000024 ClearSaveData 080d9740 l 00000000 .gcc2_compiled. 080d9764 g 0000001c Save_ResetSaveCounters -080d9780 g 00000064 SetSectorDamagedStatus -080d97e4 g 000000a0 save_write_to_flash -080d9884 g 000000f0 HandleWriteSector -080d9974 g 00000078 HandleWriteSectorNBytes -080d99ec g 0000002c TryWriteSector -080d9a18 g 0000005c RestoreSaveBackupVarsAndIncrement -080d9a74 g 00000044 RestoreSaveBackupVars -080d9ab8 g 0000005e sub_80D9AA4 -080d9b18 g 0000004c sub_80D9B04 -080d9b64 g 0000019e ClearSaveData_2 -080d9d04 g 00000098 sav12_xor_get -080d9d9c g 0000008c sub_80D9D88 -080d9e28 g 0000003e sub_80D9E14 -080d9e68 g 000000b8 sub_80D9E54 -080d9f20 g 00000214 GetSaveValidStatus -080da134 g 00000070 sub_80DA120 -080da1a4 g 00000018 DoReadFlashWholeSection -080da1bc g 0000002c CalculateChecksum -080da1e8 g 00000074 UpdateSaveAddresses +080d9780 l 00000064 SetDamagedSectorBits +080d97e4 l 000000a0 WriteSaveSectorOrSlot +080d9884 l 000000f0 HandleWriteSector +080d9974 l 00000078 HandleWriteSectorNBytes +080d99ec l 0000002c TryWriteSector +080d9a18 l 0000005c RestoreSaveBackupVarsAndIncrement +080d9a74 l 00000044 RestoreSaveBackupVars +080d9ab8 l 0000005e HandleWriteIncrementalSector +080d9b18 l 0000004c HandleReplaceSectorAndVerify +080d9b64 l 0000019e HandleReplaceSector +080d9d04 l 00000098 CopySectorSignatureByte +080d9d9c l 0000008c WriteSectorSignatureByte +080d9e28 l 0000003e TryLoadSaveSlot +080d9e68 l 000000b8 CopySaveSlotData +080d9f20 l 00000214 GetSaveValidStatus +080da134 l 00000070 TryLoadSaveSector +080da1a4 l 00000018 ReadFlashSector +080da1bc l 0000002c CalculateChecksum +080da1e8 l 00000074 UpdateSaveAddresses 080da25c g 0000011c HandleSavingData 080da378 g 00000048 TrySavingData -080da3c0 g 0000002a SaveGame_AfterLinkTrade -080da3ec g 00000034 AfterLinkTradeSaveFailed -080da420 g 00000028 ClearSaveAfterLinkTradeSaveFailure -080da448 g 00000028 sub_80DA434 -080da470 g 00000044 sub_80DA45C -080da4b4 g 0000005c sub_80DA4A0 -080da510 g 0000008c Save_LoadGameData -080da59c g 00000058 TryCopySpecialSaveSection -080da5f4 g 00000054 TryWriteSpecialSaveSection -080da648 g 000001cc Task_LinkSave +080da3c0 g 0000002a LinkFullSave_Init +080da3ec g 00000034 LinkFullSave_WriteSector +080da420 g 00000028 LinkFullSave_ReplaceLastSector +080da448 g 00000028 LinkFullSave_SetLastSectorSignature +080da470 g 00000044 WriteSaveBlock2 +080da4b4 g 0000005c WriteSaveBlock1Sector +080da510 g 0000008c LoadGameSave +080da59c g 00000058 TryReadSpecialSaveSector +080da5f4 g 00000054 TryWriteSpecialSaveSector +080da648 g 000001cc Task_LinkFullSave 080da814 l 00000000 .gcc2_compiled. 080da814 l 00000030 CheckCompatibility 080da844 l 0000001c SetIncompatible @@ -37106,7 +37106,7 @@ 083feae0 l 000000ec sGrammarMoveUsedTable 083febd4 l 0000012c sTextOnWindowsInfo_Normal 083fed00 g 00000004 gUnknown_83FEC90 -083fed04 g 00000038 gSaveSectionOffsets +083fed04 l 00000038 sSaveSlotLayout 083fed42 g 00000004 gShadowEffectTemplateIds 083fed46 g 00000008 gShadowVerticalOffsets 083fed50 g 00000008 gFadeFootprintsTireTracksFuncs diff --git a/pokeleafgreen.sym b/pokeleafgreen.sym index 712fb786d..f4a81ae97 100644 --- a/pokeleafgreen.sym +++ b/pokeleafgreen.sym @@ -841,18 +841,18 @@ 03005360 g 00000018 sFieldSpecialsListMenuTemplate 03005378 g 00000004 sFieldSpecialsListMenuScrollBuffer 0300537c g 00000004 gCB2_AfterEvolution -03005380 g 00000004 gFirstSaveSector -03005384 g 00000004 gPrevSaveCounter +03005380 g 00000004 gLastWrittenSector +03005384 g 00000004 gLastSaveCounter 03005388 g 00000004 gLastKnownGoodSector 0300538c g 00000004 gDamagedSaveSectors 03005390 g 00000004 gSaveCounter -03005394 g 00000004 gFastSaveSection -03005398 g 00000004 gUnknown_3005398 +03005394 g 00000004 gSaveDataBufferPtr +03005398 g 00000004 gIncrementalSectorId 0300539c g 00000004 gSaveUnusedVar 030053a0 g 00000004 gSaveFileStatus 030053a4 g 00000004 gGameContinueCallback -030053b0 g 00000070 gRamSaveSectionLocations -03005420 g 00000004 gSaveSucceeded +030053b0 g 00000070 gRamSaveSectorLocations +03005420 g 00000004 gSaveAttemptStatus 03005424 g 00000004 gMonShrinkDuration 03005428 g 00000004 gMonShrinkDelta 0300542c g 00000004 gMonShrinkDistance @@ -8696,37 +8696,37 @@ 080d9700 g 00000024 ClearSaveData 080d9700 l 00000000 .gcc2_compiled. 080d9724 g 0000001c Save_ResetSaveCounters -080d9740 g 00000064 SetSectorDamagedStatus -080d97a4 g 000000a0 save_write_to_flash -080d9844 g 000000f0 HandleWriteSector -080d9934 g 00000078 HandleWriteSectorNBytes -080d99ac g 0000002c TryWriteSector -080d99d8 g 0000005c RestoreSaveBackupVarsAndIncrement -080d9a34 g 00000044 RestoreSaveBackupVars -080d9a78 g 0000005e sub_80D9AA4 -080d9ad8 g 0000004c sub_80D9B04 -080d9b24 g 0000019e ClearSaveData_2 -080d9cc4 g 00000098 sav12_xor_get -080d9d5c g 0000008c sub_80D9D88 -080d9de8 g 0000003e sub_80D9E14 -080d9e28 g 000000b8 sub_80D9E54 -080d9ee0 g 00000214 GetSaveValidStatus -080da0f4 g 00000070 sub_80DA120 -080da164 g 00000018 DoReadFlashWholeSection -080da17c g 0000002c CalculateChecksum -080da1a8 g 00000074 UpdateSaveAddresses +080d9740 l 00000064 SetDamagedSectorBits +080d97a4 l 000000a0 WriteSaveSectorOrSlot +080d9844 l 000000f0 HandleWriteSector +080d9934 l 00000078 HandleWriteSectorNBytes +080d99ac l 0000002c TryWriteSector +080d99d8 l 0000005c RestoreSaveBackupVarsAndIncrement +080d9a34 l 00000044 RestoreSaveBackupVars +080d9a78 l 0000005e HandleWriteIncrementalSector +080d9ad8 l 0000004c HandleReplaceSectorAndVerify +080d9b24 l 0000019e HandleReplaceSector +080d9cc4 l 00000098 CopySectorSignatureByte +080d9d5c l 0000008c WriteSectorSignatureByte +080d9de8 l 0000003e TryLoadSaveSlot +080d9e28 l 000000b8 CopySaveSlotData +080d9ee0 l 00000214 GetSaveValidStatus +080da0f4 l 00000070 TryLoadSaveSector +080da164 l 00000018 ReadFlashSector +080da17c l 0000002c CalculateChecksum +080da1a8 l 00000074 UpdateSaveAddresses 080da21c g 0000011c HandleSavingData 080da338 g 00000048 TrySavingData -080da380 g 0000002a SaveGame_AfterLinkTrade -080da3ac g 00000034 AfterLinkTradeSaveFailed -080da3e0 g 00000028 ClearSaveAfterLinkTradeSaveFailure -080da408 g 00000028 sub_80DA434 -080da430 g 00000044 sub_80DA45C -080da474 g 0000005c sub_80DA4A0 -080da4d0 g 0000008c Save_LoadGameData -080da55c g 00000058 TryCopySpecialSaveSection -080da5b4 g 00000054 TryWriteSpecialSaveSection -080da608 g 000001cc Task_LinkSave +080da380 g 0000002a LinkFullSave_Init +080da3ac g 00000034 LinkFullSave_WriteSector +080da3e0 g 00000028 LinkFullSave_ReplaceLastSector +080da408 g 00000028 LinkFullSave_SetLastSectorSignature +080da430 g 00000044 WriteSaveBlock2 +080da474 g 0000005c WriteSaveBlock1Sector +080da4d0 g 0000008c LoadGameSave +080da55c g 00000058 TryReadSpecialSaveSector +080da5b4 g 00000054 TryWriteSpecialSaveSector +080da608 g 000001cc Task_LinkFullSave 080da7d4 l 00000000 .gcc2_compiled. 080da7d4 l 00000034 CheckCompatibility 080da808 l 0000001c SetIncompatible @@ -37107,7 +37107,7 @@ 083fe8ac l 000000ec sGrammarMoveUsedTable 083fe9a0 l 0000012c sTextOnWindowsInfo_Normal 083feacc g 00000004 gUnknown_83FEC90 -083fead0 g 00000038 gSaveSectionOffsets +083fead0 l 00000038 sSaveSlotLayout 083feb0e g 00000004 gShadowEffectTemplateIds 083feb12 g 00000008 gShadowVerticalOffsets 083feb1c g 00000008 gFadeFootprintsTireTracksFuncs diff --git a/pokeleafgreen_rev1.sym b/pokeleafgreen_rev1.sym index 3fa81396f..97b46ae86 100644 --- a/pokeleafgreen_rev1.sym +++ b/pokeleafgreen_rev1.sym @@ -841,18 +841,18 @@ 03005360 g 00000018 sFieldSpecialsListMenuTemplate 03005378 g 00000004 sFieldSpecialsListMenuScrollBuffer 0300537c g 00000004 gCB2_AfterEvolution -03005380 g 00000004 gFirstSaveSector -03005384 g 00000004 gPrevSaveCounter +03005380 g 00000004 gLastWrittenSector +03005384 g 00000004 gLastSaveCounter 03005388 g 00000004 gLastKnownGoodSector 0300538c g 00000004 gDamagedSaveSectors 03005390 g 00000004 gSaveCounter -03005394 g 00000004 gFastSaveSection -03005398 g 00000004 gUnknown_3005398 +03005394 g 00000004 gSaveDataBufferPtr +03005398 g 00000004 gIncrementalSectorId 0300539c g 00000004 gSaveUnusedVar 030053a0 g 00000004 gSaveFileStatus 030053a4 g 00000004 gGameContinueCallback -030053b0 g 00000070 gRamSaveSectionLocations -03005420 g 00000004 gSaveSucceeded +030053b0 g 00000070 gRamSaveSectorLocations +03005420 g 00000004 gSaveAttemptStatus 03005424 g 00000004 gMonShrinkDuration 03005428 g 00000004 gMonShrinkDelta 0300542c g 00000004 gMonShrinkDistance @@ -8696,37 +8696,37 @@ 080d9714 g 00000024 ClearSaveData 080d9714 l 00000000 .gcc2_compiled. 080d9738 g 0000001c Save_ResetSaveCounters -080d9754 g 00000064 SetSectorDamagedStatus -080d97b8 g 000000a0 save_write_to_flash -080d9858 g 000000f0 HandleWriteSector -080d9948 g 00000078 HandleWriteSectorNBytes -080d99c0 g 0000002c TryWriteSector -080d99ec g 0000005c RestoreSaveBackupVarsAndIncrement -080d9a48 g 00000044 RestoreSaveBackupVars -080d9a8c g 0000005e sub_80D9AA4 -080d9aec g 0000004c sub_80D9B04 -080d9b38 g 0000019e ClearSaveData_2 -080d9cd8 g 00000098 sav12_xor_get -080d9d70 g 0000008c sub_80D9D88 -080d9dfc g 0000003e sub_80D9E14 -080d9e3c g 000000b8 sub_80D9E54 -080d9ef4 g 00000214 GetSaveValidStatus -080da108 g 00000070 sub_80DA120 -080da178 g 00000018 DoReadFlashWholeSection -080da190 g 0000002c CalculateChecksum -080da1bc g 00000074 UpdateSaveAddresses +080d9754 l 00000064 SetDamagedSectorBits +080d97b8 l 000000a0 WriteSaveSectorOrSlot +080d9858 l 000000f0 HandleWriteSector +080d9948 l 00000078 HandleWriteSectorNBytes +080d99c0 l 0000002c TryWriteSector +080d99ec l 0000005c RestoreSaveBackupVarsAndIncrement +080d9a48 l 00000044 RestoreSaveBackupVars +080d9a8c l 0000005e HandleWriteIncrementalSector +080d9aec l 0000004c HandleReplaceSectorAndVerify +080d9b38 l 0000019e HandleReplaceSector +080d9cd8 l 00000098 CopySectorSignatureByte +080d9d70 l 0000008c WriteSectorSignatureByte +080d9dfc l 0000003e TryLoadSaveSlot +080d9e3c l 000000b8 CopySaveSlotData +080d9ef4 l 00000214 GetSaveValidStatus +080da108 l 00000070 TryLoadSaveSector +080da178 l 00000018 ReadFlashSector +080da190 l 0000002c CalculateChecksum +080da1bc l 00000074 UpdateSaveAddresses 080da230 g 0000011c HandleSavingData 080da34c g 00000048 TrySavingData -080da394 g 0000002a SaveGame_AfterLinkTrade -080da3c0 g 00000034 AfterLinkTradeSaveFailed -080da3f4 g 00000028 ClearSaveAfterLinkTradeSaveFailure -080da41c g 00000028 sub_80DA434 -080da444 g 00000044 sub_80DA45C -080da488 g 0000005c sub_80DA4A0 -080da4e4 g 0000008c Save_LoadGameData -080da570 g 00000058 TryCopySpecialSaveSection -080da5c8 g 00000054 TryWriteSpecialSaveSection -080da61c g 000001cc Task_LinkSave +080da394 g 0000002a LinkFullSave_Init +080da3c0 g 00000034 LinkFullSave_WriteSector +080da3f4 g 00000028 LinkFullSave_ReplaceLastSector +080da41c g 00000028 LinkFullSave_SetLastSectorSignature +080da444 g 00000044 WriteSaveBlock2 +080da488 g 0000005c WriteSaveBlock1Sector +080da4e4 g 0000008c LoadGameSave +080da570 g 00000058 TryReadSpecialSaveSector +080da5c8 g 00000054 TryWriteSpecialSaveSector +080da61c g 000001cc Task_LinkFullSave 080da7e8 l 00000000 .gcc2_compiled. 080da7e8 l 00000034 CheckCompatibility 080da81c l 0000001c SetIncompatible @@ -37108,7 +37108,7 @@ 083fe91c l 000000ec sGrammarMoveUsedTable 083fea10 l 0000012c sTextOnWindowsInfo_Normal 083feb3c g 00000004 gUnknown_83FEC90 -083feb40 g 00000038 gSaveSectionOffsets +083feb40 l 00000038 sSaveSlotLayout 083feb7e g 00000004 gShadowEffectTemplateIds 083feb82 g 00000008 gShadowVerticalOffsets 083feb8c g 00000008 gFadeFootprintsTireTracksFuncs