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
..
code	Sync asset names with decomp documentation (#3153)	2023-09-10 12:21:56 -05:00
custom	Merge branch 'develop' into merge-develop	2023-12-10 12:49:15 -05:00
extractor	N64 PAL 1.0 support (#3182)	2023-10-04 10:05:02 -05:00
misc/link_animetion	regenerate asset headers with include guards (#3132)	2023-09-01 11:47:51 -05:00
objects	[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)	2023-11-06 16:44:49 -06:00
overlays	[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)	2023-11-06 16:44:49 -06:00
scenes	[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)	2023-11-06 16:44:49 -06:00
textures	[OTR Archive] Move shared scenes out of nonmq/mq folders (#3191)	2023-11-06 16:44:49 -06:00
xml	Change declaration of Morpha tentacle verts to combine them all and avoid overlaps that result in dropped verts	2023-11-28 21:09:34 -08:00
.gitignore	Add asset headers (#2465)	2023-02-14 08:29:46 -05:00
soh_assets.h	move boss soul assets	2023-11-05 13:33:28 -05:00