Commit Graph

424 Commits

Author SHA1 Message Date
pepperpow
66c36ade04 Adjust offsets for new rom 2021-02-22 22:45:52 -06:00
pepperpow
222784dbb6 Merge branch 'main' of https://github.com/Berserker66/MultiWorld-Utilities into triforce_changes 2021-02-22 22:44:43 -06:00
pepperpow
fca64f1177 Removes Flashing instances in game (#168)
* Added reduced flashing, triforce hud and cutscene options

* Corrected parameters and replacement order

* Mixed up rom byte

* Removed triforce hud, smoothed cutscene speed and reset tables

* Removed triforcehud line and added bird cutscene speedup

* Added options to yaml

* Added check for race rom generation (is not internal asm)

* Added options to GUI (check sprite adjust crash)

* Fixed inconsistency in setting weight

* A "slow" setting for the cutscenespeed (#1)

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Slow wall setting

* Update playerSettings.yaml

* Remove instances of cutscene speed modification

* Changed command to remove to mitigate frame advantage

* Antiepilepsy enabled for default/race roms, param change, RTL byte

* Found a frame independent antiflashing patch for real

* Further ASM patching style

* Reduce these changes to just two bytes

* Added patches for Dark Mountain and Ether Flashing palette reveal

Co-authored-by: StructuralMike <66819228+StructuralMike@users.noreply.github.com>
2021-02-19 17:45:54 +01:00
CaitSith2
b1cf1a80e6 Fix non-activated flute. 2021-02-15 14:46:31 -08:00
Fabian Dill
d8366fbac7 Add Activated Flute as a proper item 2021-02-15 22:33:44 +01:00
Fabian Dill
2fd0c96369 update hint writing a bit 2021-02-13 06:53:27 +01:00
CaitSith2
26d69032e9 Base rom changes
* Stop resuing the memory region that was used formerly for compass stats.
* Add flags for dungeon prize collected. 7EF46B-7EF46C, same bit ordering as maps/compass/big key.   Something useful for auto-tracking, so that it can know that you actually collected the Swamp Palace prize, even if duped out of another dungeon.
2021-02-10 09:31:53 -08:00
Fabian Dill
0af77421fc remove fairy and big magic from bonk prizes in hard/expert
remove arrow prizes in retro when "g" is not toggled
rename "difficulty_adjustments" to "item_functionality"
2021-02-10 07:01:03 +01:00
Fabian Dill
6bc1ed5584 remove no longer needed code 2021-02-09 00:40:52 +01:00
Fabian Dill
35eb2067f2 add Botte Merchant hint 2021-02-09 00:34:25 +01:00
Fabian Dill
28e2c62884 add Zora hint
(probably add and condition for shop_slot_shuffle, testing things)
2021-02-07 10:42:20 +01:00
pepperpow
d0d5ad4fe0 Remove debug statement 2021-02-06 17:35:44 -06:00
pepperpow
1d1abb7d22 Removed remnants of team stuff, make hide_goal default 2021-02-05 20:37:27 -06:00
pepperpow
3d9085e98a put that sign back where i found it 2021-02-02 21:48:08 -06:00
pepperpow
36de78dddd Moved inverted goal sign to castle lawn 2021-02-01 20:26:07 -06:00
pepperpow
99468e6d46 Fixed flute working in both worlds instead of just dark 2021-01-31 21:42:44 -06:00
pepperpow
6b737775a2 Added hash/inverted sign message 2021-01-31 20:57:18 -06:00
pepperpow
4aedf3a8ed inverted_flute 2021-01-31 18:26:49 -06:00
CaitSith2
77a0e6f9cf Triforce at pedestal / Trinexx now correctly counts towards final total. 2021-01-31 00:54:31 -08:00
CaitSith2
ad8427c15a Fix shop tracking. 2021-01-29 22:52:10 -08:00
pepperpow
5c074c2c4f Replace localtriforcehunt with teamtriforcehunt 2021-01-29 19:07:19 -06:00
CaitSith2
90c3fe9df3 Count take-any caves into final total. 2021-01-29 15:42:28 -08:00
pepperpow
82fc2aba20 Added triforce hud options, expanded triforce requirement 2021-01-29 15:42:00 -06:00
CaitSith2
fda32578fa Modify end credits count. 2021-01-29 04:51:58 -08:00
CaitSith2
96e12088d7 Shop-sanity shops now marked as counting towards end-game credits.
Retro single arrow now marks itself as purchased from every single shop location on initial purchase.  (Nothing prevents you from buying your 'first' quiver if you already have one, however, its 6 hint points for the price of one in shop sanity.)
2021-01-29 00:25:13 -08:00
Fabian Dill
8ddb1ab614 create per-team enemizer calls 2021-01-27 02:39:12 +01:00
Fabian Dill
7531bb9d11 improve enemizer logging 2021-01-27 02:32:38 +01:00
Fabian Dill
1275e49073 also fix typo in rom.py 2021-01-26 01:46:13 +01:00
CaitSith2
2a5115bc91 Good Bee shop item now fills bottles. 2021-01-23 11:59:32 -08:00
CaitSith2
5b223c3d9f Update base rom. 2021-01-22 15:33:58 -08:00
CaitSith2
a2eb666ae9 Shop location sram offsets now fully static. 2021-01-22 07:08:50 -08:00
CaitSith2
ecf05dc29e Base rom update 2021-01-21 23:05:34 -08:00
Fabian Dill
1d2f7efe46 sort shops explicitly 2021-01-22 07:51:09 +01:00
CaitSith2
60afd0112c Update basepatch 2021-01-21 12:41:14 -08:00
pepperpow
62435c8349 Added overworld bee trap disguises, shop indicators and new shop items 2021-01-20 04:22:26 -06:00
Fabian Dill
478e1f3a82 General coding pass on Shops 2021-01-18 04:48:20 +01:00
Fabian Dill
f3e686ba9a Move Shop related stuff to a Shops module 2021-01-16 02:23:23 +01:00
Fabian Dill
67731d9e53 Merge branch 'main' into multishop 2021-01-13 15:00:19 +01:00
Fabian Dill
85bef9d15e Remove a missed instance of Skull Woods - Pinball Room special handling 2021-01-13 15:00:00 +01:00
CaitSith2
6ab2caf37b Take Any cave locations now known by MultiClient. 2021-01-10 17:42:58 -08:00
Fabian Dill
f12259dd7d Simplify ShopSlot Shuffling 2021-01-10 19:23:57 +01:00
Fabian Dill
03552ecf12 remove duplicate Shop name in location names 2021-01-09 22:48:03 +01:00
Fabian Dill
e36c6e97c1 Merge remote-tracking branch 'pepper/multishop-all' into multishop
# Conflicts:
#	EntranceRandomizer.py
#	Rom.py
#	WebHostLib/static/static/playerSettings.json
#	data/basepatch.bmbp
2021-01-09 16:03:59 +01:00
CaitSith2
8116407b88 Add Ice Rod Hunt goal 2021-01-07 12:49:34 -08:00
CaitSith2
113efa8f02 Fix bugs that prevent seed rolling from continuing if too many plando items are placed. 2021-01-06 11:13:22 -08:00
Fabian Dill
07df9b9e80 Text Plando Support 2021-01-02 16:44:58 +01:00
Fabian Dill
44eb5eebdc update Enemizer 2020-12-29 20:01:27 +01:00
Fabian Dill
b9457f3da2 apply sprite to rom last, to overwrite palette shuffler changes 2020-12-29 08:03:56 +01:00
pepperpow
0debc3289b Merge branch 'shop-fill' into multishop-all 2020-12-23 16:36:45 -06:00
pepperpow
6f0511c047 Move shop table adjustments outside of Rom.py 2020-12-23 16:36:06 -06:00