1217 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Christopher Leggett	d06b17f871	Merge branch 'get-item-rework-help1' of github.com:garrettjoecox/Shipwright into pr/garrettjoecox/2	2022-08-15 23:10:58 -04:00
Garrett Cox	d0d567697b	Fix logical errors and migrate most of the rest of the rando checks to GiveItemEntryFromActor	2022-08-15 22:10:31 -05:00
Christopher Leggett	881529c7bf	Sets z_en_box.c to set player->getItemEntry	2022-08-15 23:08:31 -04:00
Christopher Leggett	f8b55ea78c	Fixes ocarina game skull kids to set player->getItemEntry	2022-08-15 22:46:52 -04:00
briaguya	ee9ea3f2bd	add 3drando license (#1206) ... Co-authored-by: briaguya <briaguya@alice>	2022-08-15 21:17:58 -04:00
Christopher Leggett	eccdab292d	Merge pull request #3 from garrettjoecox/get-item-rework-rando-next-fanfare-fix ... Move check for gRandoQuestItemFanfares into MOD_NONE block within Audio_PlayFanfare_Rando	2022-08-15 18:36:23 -04:00
briaguya	a31256d956	controller menu cleanup (#1166)	2022-08-15 23:02:45 +02:00
Garrett Cox	170b297a7a	Introduce some new methods and migrate most actors to them	2022-08-15 14:33:29 -05:00
Garrett Cox	806019d0cb	Move check for gRandoQuestItemFanfares into MOD_NONE block within Audio_PlayFanfare_Rando	2022-08-15 12:48:57 -05:00
Garrett Cox	06b1074e2a	Replace Randomizer_GetRandomizedItemId with Randomizer_GetRandomizedItem and Randomizer_GetItemIdFromKnownCheck with Randomizer_GetItemFromKnownCheck	2022-08-15 12:10:35 -05:00
Christopher Leggett	bff5406e69	Merge branch 'get-item-rework' into get-item-rework-rando-next	2022-08-15 02:36:29 -04:00
Christopher Leggett	6b4f300eda	Makes sure we aren't using getItemEntry when not randoed.	2022-08-15 02:17:06 -04:00
Christopher Leggett	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
Jeff Manian	7a9160ed78	Clarify how to build and run on Mac (#1195)	2022-08-14 23:21:16 -04:00
briaguya	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
aMannus	fabe051d3d	Fix lost woods leading music in rando (#1155)	2022-08-14 23:04:40 -04:00
Julien Lemay	8945b2ed48	Fix Save Editor Event Check Inf "A" Row flags (#1138) ... Fix Save Editor Event Check Inf Flags "A" Row flags not working. It was set to "eci1" instead of "eci10".	2022-08-14 23:02:14 -04:00
aMannus	d575a3dda6	Fixed rotation of freestanding key checks in rando (#1135)	2022-08-14 23:01:30 -04:00
aMannus	37dd045bd2	Rando: Fix bomb/bombchu shops (#1134) ... * Fix bomb shops in rando * Addressed review comments	2022-08-14 23:01:00 -04:00
aMannus	651e0ddad4	Fixed 2 incorrect needs_save instances (#1115)	2022-08-14 22:59:12 -04:00
GaryOderNichts	68e7f2e6c1	Wii U support (#1097) ... * Wii U support * [WiiU] Combined Dockerfile * [WiiU] Combined Dockerfile * [WiiU] Combined Dockerfile * Add Jenkins support * wiiu: fix scissor clamp * wiiu: improve button remapping * wiiu: fix scaling issues * Update Dockerfile after merge * Pull assets before build * Only stop container once * Adjust logging sinks * wiiu: Change button mapping to match PC version * wiiu: Implement controller changes * wiiu: Update BUILDING.md Co-authored-by: qurious-pixel <62252937+qurious-pixel@users.noreply.github.com> Co-authored-by: David Chavez <david@dcvz.io>	2022-08-14 22:57:24 -04:00
Christopher Leggett	a57d935996	Fixes a few more freestanding items that weren't covered.	2022-08-14 22:10:40 -04:00
Christopher Leggett	c7388c39d8	Prevents Skulltulas from affecting other nearby checks.	2022-08-14 21:56:12 -04:00
Christopher Leggett	5d293ff4d1	Merge branch 'get-item-rework' into get-item-rework-rando-next	2022-08-14 21:30:12 -04:00
Christopher Leggett	f4a051fb90	Should re-fix freestanding ice traps	2022-08-14 21:28:54 -04:00
Christopher Leggett	0e2530cd49	Fixes Ruto's Letter. ... It was accidentally getting classified as a rando item.	2022-08-14 20:43:59 -04:00
Christopher Leggett	7e0e8c63af	Fixes issues with approaching bottleable items.	2022-08-14 20:43:45 -04:00
Christopher Leggett	76f25c18c0	Fixes Ruto's Letter. ... It was accidentally getting classified as a rando item.	2022-08-14 20:15:33 -04:00
Christopher Leggett	202805531f	Fixes issues with approaching bottleable items.	2022-08-14 18:40:48 -04:00
Christopher Leggett	d541ea3b39	Another Skulltula Ice Trap fix.	2022-08-14 18:25:09 -04:00
Christopher Leggett	ca54853f11	Merge pull request #1 from aMannus/tokensanity-code-cleanup ... Tokensanity code cleanup	2022-08-14 17:35:07 -04:00
aMannus	8842d1ec0d	Fixed newline end of file	2022-08-14 23:12:00 +02:00
aMannus	5f1c365a0c	Eliminated copy pasta	2022-08-14 23:11:11 +02:00
Christopher Leggett	3f55409bee	Should fix Skulltula Ice Traps.	2022-08-14 14:57:00 -04:00
Christopher Leggett	e451d13e2b	Some more changes to account for Skulltulas in new system.	2022-08-14 14:17:55 -04:00
Christopher Leggett	3bf92a348c	Fixes crashes with Audio_PlayFanfare_Rando.	2022-08-14 13:19:41 -04:00
KiritoDev	b989ef4f7f	Fixed error screen (#1184)	2022-08-14 12:41:15 -04:00
Christopher Leggett	203785f76a	Fixes Link's Pocket being a Dungeon Reward from Impa.	2022-08-14 12:22:24 -04:00
Christopher Leggett	6d7498829d	Wraps up a few missed type changes.	2022-08-14 11:54:43 -04:00
Christopher Leggett	0604dbfef8	Cleans up and updates item fanfares.	2022-08-14 11:43:25 -04:00
Christopher Leggett	1ab4b23011	Should fix some Skulltula oddities.	2022-08-14 11:26:00 -04:00
Christopher Leggett	baa17dda27	Fixes build error for Windows and Mac	2022-08-14 01:32:31 -04:00
Christopher Leggett	f7707a3890	Merge branch 'get-item-rework' into get-item-rework-rando-next	2022-08-14 01:02:12 -04:00
Christopher Leggett	5998dcff7a	Simplifies sram init for rando-specific items	2022-08-13 23:27:03 -04:00
Christopher Leggett	6c3fff7412	Fixes Link's Pocket items.	2022-08-13 22:56:46 -04:00
Christopher Leggett	c8d085cb49	Merge branch 'rando-next' of https://github.com/HarbourMasters/Shipwright into get-item-rework-rando-next ... Hopefully everything works here. Need to do some testing.	2022-08-13 22:43:19 -04:00
Christopher Leggett	9940c9ed28	Fixes too many arguments error. ... Not sure why this didn't fail to build on Windows before.	2022-08-13 16:38:33 -04:00
Christopher Leggett	76282830d3	Fixes LACS/Prelude situation... again.	2022-08-13 15:30:18 -04:00
Christopher Leggett	7cef38a70a	Fixes "static drops" (i.e. sticks from withered babas)	2022-08-13 13:05:50 -04:00
Christopher Leggett	9ed7feb30a	Realized I had the bgm conditions wrong.	2022-08-13 12:13:46 -04:00