cec1c7dc07
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-19 20:06:39 -04:00
a67c6b9e67
Fixes vanilla ice traps and randomized ice smoke
2022-08-19 19:36:44 -04:00
4e2707aefc
Merge branch 'develop-zhora' of github.com:HarbourMasters/Shipwright into get-item-rework
2022-08-19 18:51:00 -04:00
3db2ce7085
Updates Zora's Sapphire Cutscene to use GetItemEntry
2022-08-18 22:06:28 -04:00
35c2781efb
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
2022-08-18 21:49:45 -04:00
7ee281182a
Replaces Zora's Sapphire with JabuJabu's Dungeon Reward.
...
Repalces the model for Zora's Sapphire with the Dungeon Reward for JabuJabu's Belly when you find it in the miniboss room.
2022-08-17 21:43:52 -04:00
a51b844a23
Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next
2022-08-17 15:43:42 -04:00
525dcca499
Fixes some Sheik checks I had accidentally set the wrong flag for.
2022-08-17 01:07:28 -04:00
03151647b1
Merge pull request #1227 from HarbourMasters/develop-zhora
...
zhora -> rando-next
2022-08-16 23:59:11 -04:00
72981221ad
Merge pull request #1226 from HarbourMasters/develop-rachael
...
rachael -> zhora
2022-08-16 23:40:06 -04:00
6b0338a37d
[zret] Port some documentation changes ( #1164 )
...
* zret: Documentation pass on scene/room commands #1226
* Update OTR scene
* zret: Document the lens system #1079
* zret: Misc. doc/cleanup 4 #1093
* zret: Fix misc 8 #1150
* zret: Document Distortions from z_camera and z_view #1102
2022-08-16 21:53:28 -04:00
6206cd7db0
add ActorResetFunc for courtyard guards ( #1213 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:52 -04:00
01b7fedc35
clean up a few epochs that were missed ( #1204 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:37 -04:00
71b1db1fb6
volvagia interpolation fix ( #1203 )
...
Co-authored-by: briaguya <briaguya@alice>
2022-08-16 21:50:12 -04:00
1184a35480
Fixes OoT rendering and Ice Trap checks.
2022-08-16 21:22:14 -04:00
269a66656a
Fixes Zora's River Frog checks.
2022-08-16 20:58:11 -04:00
3bc67ef1eb
Fixes chests by allowing for negative getItemIds
2022-08-16 20:28:24 -04:00
cd37a56161
Rando: Fix being able to get Sun's Song check multiple times ( #1185 )
2022-08-16 22:16:44 +02:00
eb632ccb50
Adjustable push speed ( #1190 )
2022-08-16 22:09:11 +02:00
0f2e7db8e0
Fix Ice Traps on Windows and Mac ( #1216 )
2022-08-16 21:49:52 +02:00
46a421f933
Add window to customize specific controls ( #1122 )
2022-08-16 09:43:09 +02:00
1ef08a7325
Merge get-item-rework and update new checks.
2022-08-16 01:11:51 -04:00
cc31479772
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-16 00:43:17 -04:00
9916d3cc01
Additional fix for Skull Kid
2022-08-16 00:32:02 -04:00
38363fb015
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-16 00:12:44 -04:00
f874d83432
Add a few missing cases
2022-08-15 22:59:42 -05:00
5d01a71797
Fixes Anju to set player->getItemEntry.
2022-08-15 23:28:08 -04:00
d06b17f871
Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2
2022-08-15 23:10:58 -04:00
d0d567697b
Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor
2022-08-15 22:10:31 -05:00
881529c7bf
Sets `z_en_box.c` to set `player->getItemEntry`
2022-08-15 23:08:31 -04:00
f8b55ea78c
Fixes ocarina game skull kids to set player->getItemEntry
2022-08-15 22:46:52 -04:00
170b297a7a
Introduce some new methods and migrate most actors to them
2022-08-15 14:33:29 -05:00
06b1074e2a
Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck
2022-08-15 12:10:35 -05:00
bff5406e69
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-15 02:36:29 -04:00
9c59624d64
Makes freestanding items set player->getItemEntry.
...
This prevents freestanding items from setting the global modIndex.
This is part of a larger transition that needs to happen to switch
to setting getItemEntries for all of the rando items. This prevents
some things that set getItemId of GI_MAX from granting a Fire Medallion
when the global modIndex is MOD_RANDOMIZER.
2022-08-15 02:08:32 -04:00
42bce9d33e
don't abuse epochs ( #1179 )
...
* don't abuse epochs
* update bongo hand trails
Co-authored-by: briaguya <briaguya@alice>
2022-08-14 23:18:12 -04:00
fabe051d3d
Fix lost woods leading music in rando ( #1155 )
2022-08-14 23:04:40 -04:00
37dd045bd2
Rando: Fix bomb/bombchu shops ( #1134 )
...
* Fix bomb shops in rando
* Addressed review comments
2022-08-14 23:01:00 -04:00
a57d935996
Fixes a few more freestanding items that weren't covered.
2022-08-14 22:10:40 -04:00
c7388c39d8
Prevents Skulltulas from affecting other nearby checks.
2022-08-14 21:56:12 -04:00
5d293ff4d1
Merge branch 'get-item-rework' into get-item-rework-rando-next
2022-08-14 21:30:12 -04:00
f4a051fb90
Should re-fix freestanding ice traps
2022-08-14 21:28:54 -04:00
7e0e8c63af
Fixes issues with approaching bottleable items.
2022-08-14 20:43:45 -04:00
202805531f
Fixes issues with approaching bottleable items.
2022-08-14 18:40:48 -04:00
d541ea3b39
Another Skulltula Ice Trap fix.
2022-08-14 18:25:09 -04:00
8842d1ec0d
Fixed newline end of file
2022-08-14 23:12:00 +02:00
5f1c365a0c
Eliminated copy pasta
2022-08-14 23:11:11 +02:00
3f55409bee
Should fix Skulltula Ice Traps.
2022-08-14 14:57:00 -04:00
e451d13e2b
Some more changes to account for Skulltulas in new system.
2022-08-14 14:17:55 -04:00
3bf92a348c
Fixes crashes with `Audio_PlayFanfare_Rando`.
2022-08-14 13:19:41 -04:00
Christopher Leggett