Skip to content

PlaythroughSpheresFix #167

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Tacoman369 merged 10 commits into from
Jun 16, 2026
+5 −5
Merged

PlaythroughSpheresFix #167

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c4f5bc1
Menu Update 1
Tacoman369 May 31, 2026
756da57
Update settings.cpp
Tacoman369 May 31, 2026
6f6cb85
Update settings.cpp
Tacoman369 Jun 4, 2026
0a154c0
LogicFixes
Tacoman369 Jun 7, 2026
067ff38
Update Z3DR
Tacoman369 Jun 7, 2026
b6d5b74
Merge branch 'main' of https://github.com/Z3DR/MM3D_Randomizer into M…
Tacoman369 Jun 7, 2026
0bf67a5
ChestAnims
Tacoman369 Jun 13, 2026
54fd53d
update z3dr
Tacoman369 Jun 13, 2026
50b88ab
Merge branch 'main' into MenuAndLogicFixes
Tacoman369 Jun 13, 2026
b6cfcf0
Update item_location.cpp
Tacoman369 Jun 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[submodule "Z3DR"]
path = Z3DR
url = https://github.com/Z3DR/mm3dr.git
branch = dev
branch = dev
2 changes: 1 addition & 1 deletion Z3DR
Open in desktop
Submodule Z3DR updated 56 files
+37 −9 code/include/game/actor.h
+2 −1 code/include/game/actorresource.h
+0 −0 code/include/game/actors/en_box.h
+1 −1 code/include/game/as.h
+507 −0 code/include/game/cmb.h
+1 −0 code/include/game/context.h
+2 −1 code/include/game/objectbankarchive.h
+2 −2 code/include/game/player.h
+103 −2 code/include/game/resarchiveheader.h
+1 −1 code/include/rnd/actors/dm_char03.h
+1 −0 code/include/rnd/actors/dm_char05.h
+8 −6 code/include/rnd/actors/en_box.h
+1 −1 code/include/rnd/actors/en_elforg.h
+5 −7 code/include/rnd/actors/en_mag.h
+53 −0 code/include/rnd/actors/en_pm.h
+2 −2 code/include/rnd/actors/fish_heart.h
+4 −4 code/include/rnd/actors/obj_moon_stone.h
+1 −1 code/include/rnd/actors/obj_warpstone.h
+6 −2 code/include/rnd/custom_models.h
+4 −0 code/include/rnd/item_override.h
+2 −1 code/include/rnd/item_table.h
+5 −0 code/include/rnd/link.h
+5 −5 code/include/rnd/models.h
+9 −2 code/include/rnd/objects.h
+6 −0 code/include/rnd/settings.h
+3 −0 code/include/rnd/shared_defs.h
+40 −0 code/mm.ld
+52 −0 code/source/asm/actors/en_box_hooks.s
+28 −0 code/source/asm/actors/en_box_patches.s
+13 −0 code/source/asm/actors/en_pm_hooks.s
+6 −0 code/source/asm/actors/en_pm_patches.s
+0 −32 code/source/asm/hooks.s
+17 −0 code/source/asm/item_override_hooks.s
+10 −0 code/source/asm/item_override_patches.s
+18 −0 code/source/asm/object_hooks.s
+9 −0 code/source/asm/object_patches.s
+0 −11 code/source/asm/patches.s
+11 −0 code/source/asm/player_patches.s
+4 −0 code/source/game/context.cpp
+5 −1 code/source/game/objectbankarchive.cpp
+4 −1 code/source/main.cpp
+1 −1 code/source/rnd/actors/dm_char03.cpp
+1 −1 code/source/rnd/actors/dm_hina.cpp
+24 −3 code/source/rnd/actors/en_box.cpp
+1 −1 code/source/rnd/actors/en_elforg.cpp
+3 −2 code/source/rnd/actors/en_giant.cpp
+0 −36 code/source/rnd/actors/en_mag.cpp
+22 −0 code/source/rnd/actors/en_pm.cpp
+1 −1 code/source/rnd/actors/fish_heart.cpp
+1 −1 code/source/rnd/actors/obj_moon_stone.cpp
+107 −88 code/source/rnd/custom_models.cpp
+61 −32 code/source/rnd/item_override.cpp
+17 −17 code/source/rnd/item_table.cpp
+11 −0 code/source/rnd/link.cpp
+23 −21 code/source/rnd/models.cpp
+63 −21 code/source/rnd/objects.cpp
4 changes: 2 additions & 2 deletions source/item_location.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,7 @@ void LocationTable_Init() {

//Woodfall Temple
locationTable[WOODFALL_TEMPLE_HEROS_BOW_CHEST] = ItemLocation::Chest (0x1B, 0x1B, true, "Woodfall Temple Hero's Bow Chest", WOODFALL_TEMPLE_HEROS_BOW_CHEST, PROGRESSIVE_BOW, {Category::cWoodfall, Category::cWoodfallTemple,Category::cChest ,Category::cDayOne, Category::cMainInventory}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_MAP_CHEST] = ItemLocation::Chest (0x1B, 0x1D, true, "Woodfall Temple Map Chest", WOODFALL_TEMPLE_MAP_CHEST, WOODFALL_MAP, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaMap,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_MAP_CHEST] = ItemLocation::Chest (0x1B, 0x1D, true, "Woodfall Temple Map Chest", WOODFALL_TEMPLE_MAP_CHEST, WOODFALL_TEMPLE_MAP, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaMap,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_COMPASS_CHEST] = ItemLocation::Chest (0x1B, 0x1C, true, "Woodfall Temple Compass Chest", WOODFALL_TEMPLE_COMPASS_CHEST, WOODFALL_TEMPLE_COMPASS, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaCompass,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_BOSS_KEY_CHEST] = ItemLocation::Chest (0x1B, 0x1E, true, "Woodfall Temple Boss Key Chest", WOODFALL_TEMPLE_BOSS_KEY_CHEST, WOODFALL_TEMPLE_BOSS_KEY, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaBossKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
locationTable[WOODFALL_TEMPLE_SMALL_KEY_CHEST] = ItemLocation::Chest (0x1B, 0x01, true, "Woodfall Temple Small Key Chest", WOODFALL_TEMPLE_SMALL_KEY_CHEST, WOODFALL_TEMPLE_SMALL_KEY, {Category::cWoodfall, Category::cWoodfallTemple,Category::cVanillaSmallKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_WOODFALL_TEMPLE );
Expand Down Expand Up @@ -302,7 +302,7 @@ void LocationTable_Init() {
locationTable[STONE_TOWER_TEMPLE_BRIDGE_SWITCH_CHEST] = ItemLocation::Chest (0x16, 0x01, true, "Stone Tower Temple Bridge Switch Chest", STONE_TOWER_TEMPLE_BRIDGE_SWITCH_CHEST, STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
locationTable[STONE_TOWER_TEMPLE_UPDRAFT_ROOM_CHEST] = ItemLocation::Chest (0x18, 0x04, true, "Stone Tower Temple Updraft Room Chest", STONE_TOWER_TEMPLE_UPDRAFT_ROOM_CHEST, STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
locationTable[STONE_TOWER_TEMPLE_DEATH_ARMOS_ROOM_CHEST] = ItemLocation::Chest (0x18, 0x05, true, "Stone Tower Temple Death Armos Room Chest", STONE_TOWER_TEMPLE_DEATH_ARMOS_ROOM_CHEST, STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
locationTable[STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST] = ItemLocation::Chest (0x16, 0x05, true, "Stone Tower Temple Upright Death Armos Room Chest", STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST, STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cNull}, SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
locationTable[STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST] = ItemLocation::Chest (0x16, 0x05, true, "Stone Tower Temple Upright Death Armos Room Chest", STONE_TOWER_TEMPLE_UPRIGHT_DEATH_ARMOS_ROOM_CHEST, STONE_TOWER_TEMPLE_SMALL_KEY, {Category::cStoneTowerTemple, Category::cVanillaSmallKey,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_NO_GROUP);
locationTable[STONE_TOWER_TEMPLE_LIGHT_ARROW_CHEST] = ItemLocation::Chest (0x16, 0x1B, true, "Stone Tower Temple Light Arrow Chest", STONE_TOWER_TEMPLE_LIGHT_ARROW_CHEST, LIGHT_ARROWS, {Category::cStoneTowerTemple,Category::cChest ,Category::cDayOne, Category::cMainInventory}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );
locationTable[STONE_TOWER_TEMPLE_GIANTS_MASK_CHEST] = ItemLocation::Chest (0x36, 0x00, false, "Stone Tower Temple Giant's Mask Chest", STONE_TOWER_TEMPLE_GIANTS_MASK_CHEST, GIANTS_MASK, {Category::cStoneTowerTemple,Category::cChest, Category::cVanillaMask ,Category::cDayOne}, SpoilerCollectionCheckGroup::GROUP_DUNGEON_STONE_TOWER );

Expand Down
2 changes: 1 addition & 1 deletion source/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ namespace Settings {
&HintDistribution,
&CompassShowWoTH,
&DamageMultiplier,
//&ChestAnimations,
&ChestAnimations,
&ChestSize,
//&ChangeOverworldItems,
//&MenuOpeningButton,
Expand Down