Christopher Leggett
|
d58968d196
|
Merge branch 'develop' into merge-develop
# Conflicts:
# soh/soh/Enhancements/custom-message/CustomMessageTypes.h
# soh/soh/Enhancements/debugger/debugSaveEditor.h
# soh/soh/Enhancements/item-tables/ItemTableTypes.h
# soh/soh/Enhancements/mods.cpp
# soh/soh/Enhancements/randomizer/3drando/entrance.cpp
# soh/soh/Enhancements/randomizer/3drando/item_location.cpp
# soh/soh/Enhancements/randomizer/3drando/keys.hpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_castle_town.cpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ganons_castle.cpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_gerudo_training_grounds.cpp
# soh/soh/Enhancements/randomizer/3drando/location_access/locacc_ice_cavern.cpp
# soh/soh/Enhancements/randomizer/3drando/menu.cpp
# soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
# soh/soh/Enhancements/randomizer/3drando/settings.cpp
# soh/soh/Enhancements/randomizer/3drando/settings.hpp
# soh/soh/Enhancements/randomizer/randomizer.cpp
# soh/soh/Enhancements/randomizer/randomizerTypes.h
# soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
# soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
# soh/soh/Enhancements/randomizer/randomizer_entrance.c
# soh/soh/OTRGlobals.cpp
# soh/src/code/z_sram.c
# soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
|
2023-12-10 12:49:15 -05:00 |
|