z_sram_NES with 2 NON_MATCHINGs and 1 NON_EQUIVALENTs (#531)

* Rename Sram_InitDebugSave

* Sram_InitDebugSave

* err

* Sram_IncrementDay

* non_matchings

* func_80146F5C and protos

* func_80146EE8

* func_80145698

* func_80143A54

* Split SaveContext

* problems with bss

* Fix bss

* more

* a small bunch

* Fix warnings

* almost everything

* two attempts

* at least compiles

* import data

* bss

* format

* stuff?

* Progress?

* More progress

* clean up data a little

* More progress

* disaster

* re split data

* A bit less of a disaster

* Fix renamed stuff

* data stuff

* fix conflicts

* format

* CycleSceneFlags

* some enums

* cleanup

* Fix merge issues

* format

* some changes

* format

* Lots of progress on z_sram_NES, but no matches yet

* SaveContent Documentation

* Oops

* Oops2

* Document more SaveContext

* Oops, don't need that anymore

* add small comment

* Another comment

* dekuPlaygroundPlayerName

* Fix merge issues

* format

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* remove magic number

* format

* fix merge issues

* bss

* format

* macro cleanup

* review

* merge issues

* review

* cleanup

* UNK_TYPE1

* Fix

* Remove comment

* small change

* conflicts

* review

* fix

* fixes

* format

* Update actorCtx renames part

* Match func_80143B0C thanks to Petrie and Anon

* minor cleaning pass

* format

* cleanup

* more minor cleanups

* Macros for accessing gSaveContext.save.stolenItems

* Introduce STOLEN_ITEM_NONE and remove CLEAR_STOLEN_ITEM_

* format

* Update include/macros.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/code/z_sram_NES.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* @hensldm review

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Rename QUEST_SONG_NEW_WAVE

* Add scene name comments to D_801C5FC0

* rename horseData.yaw

* Update include/functions.h

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* Update src/code/z_sram_NES.c

Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>

* // = CUR_UPG_VALUE(UPG_WALLET);

* run actorfixer and format

* fix bss

* Fix merge problems and run format

* Some improvements to func_801457CC by anon

* bss

* format

* run actorfixer

* actorfixer, bss and format

* Use original names for the RESPAWN_MODE enum because the current ones are bad

* QUEST_SONG_BOSSA_NOVA

* some minor fixes on the SaveContext struct according to the debug rom

* Merge Inventory.items and Inventory.masks

* a

* simplify saveBuf accesses

* A few func renames

* actorfixer

* bss

* fixes

* bss

* actorfixer

* actorfixer and format

* actorfixer

* whoops

* whops

* bss

Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
Co-authored-by: engineer124 <47598039+engineer124@users.noreply.github.com>
Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
This commit is contained in:
Anghelo Carvajal
2022-03-27 12:37:02 -03:00
committed by GitHub
parent 95c6ddbcc8
commit b08880f7a7
201 changed files with 4584 additions and 2880 deletions
+10 -10
View File
@@ -2301,30 +2301,30 @@ asm/non_matchings/code/z_vr_box_draw/func_801435A0.s,func_801435A0,0x801435A0,0x
asm/non_matchings/code/z_vr_box_draw/func_80143624.s,func_80143624,0x80143624,0x11
asm/non_matchings/code/z_vr_box_draw/func_80143668.s,func_80143668,0x80143668,0xE7
asm/non_matchings/code/z_vr_box_draw/func_80143A04.s,func_80143A04,0x80143A04,0x3
asm/non_matchings/code/z_sram_NES/func_80143A10.s,func_80143A10,0x80143A10,0x11
asm/non_matchings/code/z_sram_NES/func_80143A54.s,func_80143A54,0x80143A54,0x1C
asm/non_matchings/code/z_sram_NES/func_80143AC4.s,func_80143AC4,0x80143AC4,0x12
asm/non_matchings/code/z_sram_NES/func_80143B0C.s,func_80143B0C,0x80143B0C,0x29A
asm/non_matchings/code/z_sram_NES/Sram_ActivateOwl.s,Sram_ActivateOwl,0x80143A10,0x11
asm/non_matchings/code/z_sram_NES/Sram_ClearHighscores.s,Sram_ClearHighscores,0x80143A54,0x1C
asm/non_matchings/code/z_sram_NES/Sram_ClearFlagsAtDawnOfTheFirstDay.s,Sram_ClearFlagsAtDawnOfTheFirstDay,0x80143AC4,0x12
asm/non_matchings/code/z_sram_NES/Sram_SaveEndOfCycle.s,Sram_SaveEndOfCycle,0x80143B0C,0x29A
asm/non_matchings/code/z_sram_NES/Sram_IncrementDay.s,Sram_IncrementDay,0x80144574,0x1C
asm/non_matchings/code/z_sram_NES/Sram_CalcChecksum.s,Sram_CalcChecksum,0x801445E4,0x11
asm/non_matchings/code/z_sram_NES/func_80144628.s,func_80144628,0x80144628,0x17
asm/non_matchings/code/z_sram_NES/Sram_ResetSave.s,Sram_ResetSave,0x80144628,0x17
asm/non_matchings/code/z_sram_NES/Sram_GenerateRandomSaveFields.s,Sram_GenerateRandomSaveFields,0x80144684,0x83
asm/non_matchings/code/z_sram_NES/func_80144890.s,func_80144890,0x80144890,0x36
asm/non_matchings/code/z_sram_NES/Sram_InitDebugSave.s,Sram_InitDebugSave,0x80144968,0x4B
asm/non_matchings/code/z_sram_NES/func_80144A94.s,func_80144A94,0x80144A94,0xF9
asm/non_matchings/code/z_sram_NES/func_80144E78.s,func_80144E78,0x80144E78,0x17D
asm/non_matchings/code/z_sram_NES/Sram_OpenSave.s,Sram_OpenSave,0x80144E78,0x17D
asm/non_matchings/code/z_sram_NES/func_8014546C.s,func_8014546C,0x8014546C,0x8B
asm/non_matchings/code/z_sram_NES/func_80145698.s,func_80145698,0x80145698,0x4D
asm/non_matchings/code/z_sram_NES/func_801457CC.s,func_801457CC,0x801457CC,0x36D
asm/non_matchings/code/z_sram_NES/func_80146580.s,func_80146580,0x80146580,0x2A
asm/non_matchings/code/z_sram_NES/func_80146628.s,func_80146628,0x80146628,0x11E
asm/non_matchings/code/z_sram_NES/func_80146AA0.s,func_80146AA0,0x80146AA0,0xD6
asm/non_matchings/code/z_sram_NES/Sram_InitSave.s,Sram_InitSave,0x80146AA0,0xD6
asm/non_matchings/code/z_sram_NES/func_80146DF8.s,func_80146DF8,0x80146DF8,0x12
asm/non_matchings/code/z_sram_NES/func_80146E40.s,func_80146E40,0x80146E40,0xC
asm/non_matchings/code/z_sram_NES/Sram_InitSram.s,Sram_InitSram,0x80146E40,0xC
asm/non_matchings/code/z_sram_NES/Sram_Alloc.s,Sram_Alloc,0x80146E70,0x13
asm/non_matchings/code/z_sram_NES/func_80146EBC.s,func_80146EBC,0x80146EBC,0xB
asm/non_matchings/code/z_sram_NES/func_80146EE8.s,func_80146EE8,0x80146EE8,0x1D
asm/non_matchings/code/z_sram_NES/func_80146F5C.s,func_80146F5C,0x80146F5C,0x2B
asm/non_matchings/code/z_sram_NES/Sram_SaveSpecialEnterClockTown.s,Sram_SaveSpecialEnterClockTown,0x80146EE8,0x1D
asm/non_matchings/code/z_sram_NES/Sram_SaveSpecialNewDay.s,Sram_SaveSpecialNewDay,0x80146F5C,0x2B
asm/non_matchings/code/z_sram_NES/func_80147008.s,func_80147008,0x80147008,0x6
asm/non_matchings/code/z_sram_NES/func_80147020.s,func_80147020,0x80147020,0x12
asm/non_matchings/code/z_sram_NES/func_80147068.s,func_80147068,0x80147068,0x34
1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
2301 asm/non_matchings/code/z_vr_box_draw/func_80143624.s func_80143624 0x80143624 0x11
2302 asm/non_matchings/code/z_vr_box_draw/func_80143668.s func_80143668 0x80143668 0xE7
2303 asm/non_matchings/code/z_vr_box_draw/func_80143A04.s func_80143A04 0x80143A04 0x3
2304 asm/non_matchings/code/z_sram_NES/func_80143A10.s asm/non_matchings/code/z_sram_NES/Sram_ActivateOwl.s func_80143A10 Sram_ActivateOwl 0x80143A10 0x11
2305 asm/non_matchings/code/z_sram_NES/func_80143A54.s asm/non_matchings/code/z_sram_NES/Sram_ClearHighscores.s func_80143A54 Sram_ClearHighscores 0x80143A54 0x1C
2306 asm/non_matchings/code/z_sram_NES/func_80143AC4.s asm/non_matchings/code/z_sram_NES/Sram_ClearFlagsAtDawnOfTheFirstDay.s func_80143AC4 Sram_ClearFlagsAtDawnOfTheFirstDay 0x80143AC4 0x12
2307 asm/non_matchings/code/z_sram_NES/func_80143B0C.s asm/non_matchings/code/z_sram_NES/Sram_SaveEndOfCycle.s func_80143B0C Sram_SaveEndOfCycle 0x80143B0C 0x29A
2308 asm/non_matchings/code/z_sram_NES/Sram_IncrementDay.s Sram_IncrementDay 0x80144574 0x1C
2309 asm/non_matchings/code/z_sram_NES/Sram_CalcChecksum.s Sram_CalcChecksum 0x801445E4 0x11
2310 asm/non_matchings/code/z_sram_NES/func_80144628.s asm/non_matchings/code/z_sram_NES/Sram_ResetSave.s func_80144628 Sram_ResetSave 0x80144628 0x17
2311 asm/non_matchings/code/z_sram_NES/Sram_GenerateRandomSaveFields.s Sram_GenerateRandomSaveFields 0x80144684 0x83
2312 asm/non_matchings/code/z_sram_NES/func_80144890.s func_80144890 0x80144890 0x36
2313 asm/non_matchings/code/z_sram_NES/Sram_InitDebugSave.s Sram_InitDebugSave 0x80144968 0x4B
2314 asm/non_matchings/code/z_sram_NES/func_80144A94.s func_80144A94 0x80144A94 0xF9
2315 asm/non_matchings/code/z_sram_NES/func_80144E78.s asm/non_matchings/code/z_sram_NES/Sram_OpenSave.s func_80144E78 Sram_OpenSave 0x80144E78 0x17D
2316 asm/non_matchings/code/z_sram_NES/func_8014546C.s func_8014546C 0x8014546C 0x8B
2317 asm/non_matchings/code/z_sram_NES/func_80145698.s func_80145698 0x80145698 0x4D
2318 asm/non_matchings/code/z_sram_NES/func_801457CC.s func_801457CC 0x801457CC 0x36D
2319 asm/non_matchings/code/z_sram_NES/func_80146580.s func_80146580 0x80146580 0x2A
2320 asm/non_matchings/code/z_sram_NES/func_80146628.s func_80146628 0x80146628 0x11E
2321 asm/non_matchings/code/z_sram_NES/func_80146AA0.s asm/non_matchings/code/z_sram_NES/Sram_InitSave.s func_80146AA0 Sram_InitSave 0x80146AA0 0xD6
2322 asm/non_matchings/code/z_sram_NES/func_80146DF8.s func_80146DF8 0x80146DF8 0x12
2323 asm/non_matchings/code/z_sram_NES/func_80146E40.s asm/non_matchings/code/z_sram_NES/Sram_InitSram.s func_80146E40 Sram_InitSram 0x80146E40 0xC
2324 asm/non_matchings/code/z_sram_NES/Sram_Alloc.s Sram_Alloc 0x80146E70 0x13
2325 asm/non_matchings/code/z_sram_NES/func_80146EBC.s func_80146EBC 0x80146EBC 0xB
2326 asm/non_matchings/code/z_sram_NES/func_80146EE8.s asm/non_matchings/code/z_sram_NES/Sram_SaveSpecialEnterClockTown.s func_80146EE8 Sram_SaveSpecialEnterClockTown 0x80146EE8 0x1D
2327 asm/non_matchings/code/z_sram_NES/func_80146F5C.s asm/non_matchings/code/z_sram_NES/Sram_SaveSpecialNewDay.s func_80146F5C Sram_SaveSpecialNewDay 0x80146F5C 0x2B
2328 asm/non_matchings/code/z_sram_NES/func_80147008.s func_80147008 0x80147008 0x6
2329 asm/non_matchings/code/z_sram_NES/func_80147020.s func_80147020 0x80147020 0x12
2330 asm/non_matchings/code/z_sram_NES/func_80147068.s func_80147068 0x80147068 0x34