Commit Graph

582 Commits

Author SHA1 Message Date
aerinon
7be5cc1a6b Merge branch 'Customizer' into Synthesis
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-24 14:29:10 -06:00
aerinon
152c383233 Merge branch 'DoorDevUnstable' into Customizer
# Conflicts:
#	Bosses.py
#	ItemList.py
#	Main.py
#	Mystery.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-08-24 13:38:59 -06:00
aerinon
5d419210af Fix a bank conflict with OWR
Release notes and version bump
2022-08-24 13:18:01 -06:00
aerinon
9c612b6c00 Minor edit to when pyramid hole auto pre-opens 2022-08-23 16:43:27 -06:00
aerinon
c3dcd56992 Some fixes sent by Catobat 2022-08-11 16:37:15 -06:00
aerinon
21456b5c90 Merge branch 'Customizer' into Synthesis
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
2022-08-11 16:06:50 -06:00
aerinon
1168273e43 Merge branch 'DoorDevUnstable' into Synthesis
# Conflicts:
#	Bosses.py
#	Main.py
#	Rom.py
#	data/base2current.bps
2022-08-11 15:43:33 -06:00
aerinon
5dd9403afd Correct rom for tavern work 2022-08-11 15:38:15 -06:00
aerinon
b2ae92a451 Merge branch 'Tavern' of github.com:Catobat/ALttPDoorRandomizer into Catobat-Tavern
# Conflicts:
#	BaseClasses.py
#	Rom.py
#	data/base2current.bps
Note: rom is not correct
2022-08-11 15:37:19 -06:00
aerinon
2ed0a80609 Fix for pot items to not reload with the supertile
Key distribution change
Unique boss shuffle make gt bosses also unique
Removed text color in hints due to bug
2022-08-11 15:25:09 -06:00
aerinon
32714b4c6a Fix for colorized pots in "dark desert hint" aka mire storyteller 2022-08-05 16:48:34 -06:00
aerinon
09fbdc46ca Finish bomb/dash doors
Lots of minor fixes
Fixed a few existing bugs
2022-08-05 14:01:19 -06:00
aerinon
f06e7c7fd3 Merged in Volatile work 2022-07-07 14:20:41 -06:00
aerinon
d9f0e2a7b6 Options added for door_type_mode and new partitioned mode 2022-07-06 10:06:29 -06:00
aerinon
04fc0b442d Hotfix for enemizer and pot substitutions 2022-06-30 11:51:34 -06:00
aerinon
d488df6d18 Pot substitutions for certain items 2022-06-29 12:58:10 -06:00
aerinon
1972500e31 Merge branch 'Customizer' into StandardThrone
# Conflicts:
#	DungeonGenerator.py
#	Main.py
#	RELEASENOTES.md
2022-06-22 13:08:38 -06:00
aerinon
c487634d3d Merge branch 'DoorDevVolatile' into StandardThrone
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-06-22 10:55:55 -06:00
aerinon
64048ba58d Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py

Also fixed a bug with lite/lean
2022-06-22 10:53:06 -06:00
aerinon
31bee77c4c Mirror scroll behavior during escape altered. Pray I do not alter it further 2022-06-16 12:35:16 -06:00
aerinon
4397492aca Fix follower despawn when entering maiden's cell and she's not there due to Blind not being the boss 2022-06-16 06:58:41 -06:00
aerinon
8a6b05fe8f Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	Main.py
#	Rom.py
2022-06-15 16:56:57 -06:00
aerinon
32aebb2ad1 Pottery fix for item counting because of shop conflict 2022-06-15 16:55:20 -06:00
aerinon
25905fe3f3 Capitalization fixes
Highlight part of the text in red (experimental)
2022-06-14 13:22:24 -06:00
aerinon
5dce2daa0b Standard throne room changes 2022-06-14 12:29:57 -06:00
Catobat
6e9d949439 Shuffle Back of Tavern 2022-06-13 20:38:24 +02:00
aerinon
e9433e56c0 Missing player 2022-06-07 08:12:13 -06:00
aerinon
8fd010985f Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	DoorShuffle.py
#	ItemList.py
#	Main.py
2022-05-24 10:09:36 -06:00
aerinon
62ec084a98 DungeonCompletion bitfield 2022-05-19 10:36:51 -06:00
aerinon
afdb8ebac8 DungeonCompletion fixed
Minor issue with dungeon counters fixed
2022-05-18 15:04:20 -06:00
aerinon
6ab426b9f3 Fix for keydrops/enemy drops to not be repeatable 2022-05-03 13:55:39 -06:00
aerinon
ea745ff22e Hotfix for paired doors
Also made dashable filter work
2022-04-30 15:28:29 -06:00
aerinon
ecf6a0bd10 Version bump
Generation fix for inverted
2022-04-29 08:10:08 -06:00
aerinon
f93ecf9412 New baserom with various fixes for both font and multiclient issue with pottery
Bump TFH limit to 850. It throws an error if you try to generate with too many pieces.
2022-04-28 16:27:37 -06:00
aerinon
7a35bbfc41 Fixed typing issue.
New baserom for minor multiclient issue with pot switches
2022-04-27 13:48:20 -06:00
aerinon
496e63e13b Merge branch 'DoorDevVolatileSRAM' of https://github.com/cassidoxa/ALttPEntranceRandomizer into cassidoxa-DoorDevVolatileSRAM
# Conflicts:
#	Rom.py
#	data/base2current.bps
2022-04-26 16:24:17 -06:00
aerinon
b514df76c3 Prize letters and numbers
Minor bug with max keys: prevent negative values
2022-04-21 15:44:52 -06:00
aerinon
e0a6f26279 Font work 2022-04-21 13:19:50 -06:00
aerinon
a9797bfd83 Merge branch 'DoorDevUnstable' into DoorDevVolatile
# Conflicts:
#	Main.py
#	RELEASENOTES.md
#	Rom.py
#	data/base2current.bps
2022-04-21 13:18:06 -06:00
aerinon
7dd5cc0e36 Merge branch 'DoorDevVolatile' into Customizer
# Conflicts:
#	BaseClasses.py
#	ItemList.py
#	Main.py
2022-04-21 11:14:40 -06:00
aerinon
31aeb8a776 Pottery fixes for Room0127
Added mystery flag for future use
2022-04-21 11:03:49 -06:00
cassidoxa
163988ca1b New SRAM changes 2022-04-20 22:00:05 -04:00
aerinon
31a279d63d Trinity goal added 2022-04-20 14:06:55 -06:00
aerinon
5cc04ed675 Msu resume bug on patcher
Check for retro arrows in pots
2022-04-20 14:00:16 -06:00
aerinon
abf57e0255 Fix for a map bug (link not shown when eastern prize is) 2022-04-20 09:08:55 -06:00
aerinon
4880f8017a Pottery fix for vanilla hera key 2022-04-20 08:51:32 -06:00
aerinon
940c179e28 Documentation update 2022-04-19 14:40:27 -06:00
aerinon
26e8e23fce Initial work on new pottery modes 2022-04-19 13:56:39 -06:00
aerinon
e1f85efbef Fixes for overworld_map map mode 2022-04-13 13:31:47 -06:00
aerinon
cf227aafc0 Trinity goal 2022-04-04 13:37:07 -06:00