Commit Graph

715 Commits

Author SHA1 Message Date
caitsith2
6b6bce9b78 Print hook address helpers for doors 2020-06-24 07:07:38 -07:00
caitsith2
c78559ec0f Merge branch 'master' into multiworld 2020-06-23 17:24:24 -07:00
qwertymodo
ae85ec35b9 Fix broken fade-to-half music command (F2) 2020-06-23 14:09:38 -07:00
caitsith2
c4e21be268 Merge branch 'patch-1' into multiworld 2020-06-23 01:31:50 -07:00
caitsith2
c3398b305a Check for flippers in room 55, and if not present, drain it.
(Allows for SW to NW, SW to East, and NW to East without flippers.)
no need to check for flippers on room 53, as getting to the west door is completely blocked, whether or not it is flooded without flippers.
2020-06-23 01:20:31 -07:00
caitsith2
594e4e56c0 Output addresses for doors compass_r_addr and compass_w_addr hooks. 2020-06-22 06:47:33 -07:00
caitsith2
9c8e531d20 Fix asar relative path warning. 2020-06-22 06:46:34 -07:00
caitsith2
7b3e200d22 Output warnings and prints on build. 2020-06-22 06:45:58 -07:00
compiling
3cae3a66a5 Fix fake world when fluting to pyramid twice 2020-06-20 19:43:45 -07:00
caitsith2
59f851395c Merge branch 'master' into multiworld 2020-06-20 18:35:48 -07:00
qwertymodo
6c12e10abf Fix the track 15 pointer in both music banks 31.0.5 v31.0.5 2020-06-20 18:22:10 -07:00
caitsith2
ffc190e3cf reinstate build.bat 2020-06-13 22:04:59 -07:00
caitsith2
ea477878fc Add __pycache__ to .gitignore, rename utils.py to build.py 2020-06-09 09:14:46 -07:00
caitsith2
47091dfd68 Patch and build base2current.json in one go.
Just need to provide a linux asar library when the time comes to build on linux.
2020-06-09 09:11:02 -07:00
randall.rupper
8cf3ccb13e Add PHX/PLX in a better spot to prevent CountBottles from overwritting X 2020-06-08 09:58:46 -07:00
caitsith2
b5c7846c40 Make it a tiny bit easier to build the baserom for inclusion in multiworld and get the updated hash while at it. 2020-06-08 09:30:49 -07:00
caitsith2
4530021fea Revert exetend msu flag as it is no longer needed. 2020-06-08 09:30:49 -07:00
caitsith2
1b3a586a57 Update multiworld to be compatible with save & quit delay fix. 2020-06-08 09:30:49 -07:00
caitsith2
65db6eefb7 update windows build process to asar 2020-06-08 09:29:31 -07:00
caitsith2
e8a384200f Only launch cmd /k if the batch file was doubleclicked. 2020-06-08 09:27:32 -07:00
caitsith2
0bdc88d13a Flag for adjuster to know if extended MSU is present in rom or not. 2020-06-08 09:26:58 -07:00
caitsith2
80bc9c2028 Move player names and max them out at 255. 2020-06-08 09:26:25 -07:00
Bonta-kun
2a5e305fc6 implement remote item checks 2020-06-08 09:25:25 -07:00
Bonta-kun
c3c5ba9d53 move clock.asm from bank A0 to A4 2020-06-08 09:24:56 -07:00
Bonta-kun
af4c84c1aa fix unusable infinite bombs with empty inventory 2020-06-08 09:24:36 -07:00
Bonta-kun
f843ef9eb8 bee trap 2020-06-08 09:24:07 -07:00
Bonta-kun
49ba8e064d Make sword upgrade appear as fighter sword for swordless players 2020-06-08 09:20:42 -07:00
Bonta-kun
94218b048b Dont replace multiworld items 2020-06-08 09:20:17 -07:00
Bonta-kun
6818c3e119 free some space in bank A0 2020-06-08 09:20:00 -07:00
Bonta-kun
ddd456c04e multiworld 2020-06-08 09:19:18 -07:00
Salvatore
ca210ffc05 Merge pull request #84 from tcprescott/darkrooms
Show items in dark rooms
2020-06-07 19:54:14 -04:00
qwertymodo
289102c7fa Merge pull request #85 from compiling/master
Don't auto equip silvers when they are only usable at Ganon
2020-06-07 11:57:05 -07:00
compiling
001107aa3b Don't auto equip silvers when they are only usable at Ganon 2020-06-07 18:33:56 +10:00
Thomas Prescott
257544a671 Merge branch 'darkrooms' of github.com:tcprescott/z3randomizer into darkrooms 2020-06-06 21:32:51 -05:00
Thomas Prescott
b874df7d8b Merge branch 'master' of https://github.com/KatDevsGames/z3randomizer into darkrooms 2020-06-06 21:31:28 -05:00
qwertymodo
114ef57fec Don't send fade commands to the SPC twice 2020-06-06 18:01:27 -07:00
qwertymodo
a87af78d1c Fix MSU-1 fade overshoot 2020-06-06 18:01:27 -07:00
qwertymodo
aa30da01f9 Fix dark woods and mountain music w/7 crystals 2020-06-06 18:01:27 -07:00
qwertymodo
d9481fe346 MSU coding style cleanup 2020-06-06 18:01:27 -07:00
qwertymodo
605a344368 Port SPC engine patches to ASAR 2020-06-06 18:01:27 -07:00
qwertymodo
6259a813b1 Fix title screen delay (bass version) 2020-06-06 18:01:27 -07:00
Thomas Prescott
d97b52a6d1 allow bunny link to read signposts 2020-06-06 09:07:22 -05:00
Thomas Prescott
616748b831 Show items in dark rooms, written by Zarby89 and kan. 2020-06-04 20:23:18 -05:00
CaitSith2
a20c432003 Reset inner floodgates if and only if the...
...small keys are actually flooded.
2020-05-13 10:23:22 -07:00
KatDevsGames
a3a35ad4ba Merge pull request #81 from KatDevsGames/asar
Make existing code compatible with asar
2020-04-21 22:56:27 -04:00
Kat
5c2726c3a8 Update utilities.asm 2020-04-20 23:02:52 -04:00
Kat
bf6ecd979f various 2020-04-17 22:04:19 -04:00
Kat
5b19a65ae6 Update build.sh 2020-04-17 21:39:09 -04:00
Kat
e8cb7eca80 mw updates 2020-04-17 21:18:46 -04:00
Kat
f1eec27c3e Update newitems.asm 2020-03-30 02:44:34 -04:00