Commit Graph

1202 Commits

Author SHA1 Message Date
Thomas Prescott
9dc35af9d3 re-order include to fix back overrun 2020-09-22 23:25:37 -05:00
KatDevsGames
9c9925fdda Merge pull request #75 from JonHanon/starting-menu-fix
Starting File Menu Fix
2020-09-21 02:14:47 -04:00
KatDevsGames
6e657f00db Merge pull request #78 from JonHanon/FreeItemText
Conditions for showing item text
2020-09-21 02:14:24 -04:00
KatDevsGames
f26a10a526 Merge pull request #82 from aerinon/CountBottleFix
Prevent CountBottles from overwriting what is in register X.
2020-09-20 02:00:27 -04:00
KatDevsGames
ba8c7c735b Merge pull request #86 from compiling/master
Triforce Hunt + Kill Ganon goal.
2020-09-20 01:59:56 -04:00
KatDevsGames
01dec8aef8 Merge pull request #87 from compiling/aga2_fw
Fix fake world when fluting to pyramid twice
2020-09-20 01:59:10 -04:00
KatDevsGames
c79f4b19b7 Merge pull request #83 from CaitSith2/patch-1
Reset inner floodgates if and only if the...
2020-09-20 01:58:58 -04:00
KatDevsGames
fab7c67909 Merge pull request #89 from Zarby89/patch-24
ganon room fix for multiworld
2020-09-20 01:58:43 -04:00
KatDevsGames
0e9e5d034c Merge pull request #90 from aerinon/ChestKeyCounter
Chest key counters
2020-09-20 01:58:02 -04:00
KatDevsGames
8814f8764a Merge pull request #88 from tcprescott/patch-1
Fix the shop fix and potentially fix a rare S&Q issue
2020-09-20 01:57:39 -04:00
KatDevsGames
a3c4fed33f Merge pull request #91 from CaitSith2/rupee-chest-game-fix
Low stakes and high stakes chest game no longer increments item counter.
2020-09-20 01:57:15 -04:00
KatDevsGames
af20beb472 Merge pull request #92 from Catobat/master
Fix Lost Woods chest game respawn
2020-09-20 01:56:50 -04:00
randall.rupper
233afa1e38 Chest Key counters 2020-09-18 11:06:02 -06:00
CaitSith2
94722d452e Fix glitch where you can bomb yourself at high stakes chest game to get on top of pyramid/castle.
Since this is not a vanilla glitch, it has to be fixed, as it wasn't intended.
2020-09-18 11:04:48 -06:00
CaitSith2
820b5d5357 Low stakes and high stakes chest game no longer increments item counter. 2020-09-18 11:04:22 -06:00
Catobat
e82f01ae2f Fix Lost Woods chest game respawn 2020-09-18 00:54:30 +02:00
CaitSith2
acf119d6a1 Low stakes and high stakes chest game no longer increments item counter. 2020-09-04 12:48:39 -07:00
aerinon
397da02e3f Converted file to tabs for consistency 2020-08-28 12:23:27 -06:00
aerinon
d58fa5d5b7 Starting keys accounted for 2020-08-28 12:15:31 -06:00
aerinon
cdd4199cf9 Fixed jumps and return to be proper for the banks the code is in 2020-08-27 10:14:52 -06:00
aerinon
f565fc93be Adds Chest Key counters to $7EF4E0-F 2020-08-27 10:14:33 -06:00
CaitSith2
a892ff39b2 Backport terrorpin ai fix from enemizer. (and fix a bug with it.) 2020-08-05 08:48:25 -07:00
Zarby89
dad73fc883 ganon room fix for multiworld 2020-07-29 21:46:01 -07:00
Zarby89
8d17f61f44 ganon room fix for multiworld 2020-07-29 22:12:21 -04:00
Thomas Prescott
5930406ecb Fix S&Q crash for certain SNES users
This was suggested by Kat, and seemed to work for a player who had been experiencing chronic game crashes during an S&Q.
2020-07-17 06:18:11 -05:00
Thomas Prescott
4a9f86ba85 Uncomment PostNMIHookAction 2020-07-17 06:14:09 -05:00
caitsith2
65bd0df346 Labels added for Door rando hook points. 2020-07-15 01:27:33 -07:00
caitsith2
ff3bdc1326 Check for door rando before doing safety checks to and possibly draining room 55 (the hammer locked room) 2020-07-14 21:07:21 -07:00
caitsith2
715ba87517 Reserve the space for berserkermulti.world seed guid. 2020-07-14 11:12:25 -07:00
Kat
af7cce9ae5 shop maybe fix 2020-07-09 02:04:00 -04:00
Kat
7955a37cd9 asar 2020-07-08 23:43:10 -04:00
compiling
5a10017747 Triforce Hunt + Kill Ganon goal. 2020-06-25 07:40:53 -07:00
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 2020-06-20 18:22:10 -07:00
compiling
c02285306a Fix fake world when fluting to pyramid twice 2020-06-18 21:41:02 +10:00
caitsith2
ffc190e3cf reinstate build.bat 2020-06-13 22:04:59 -07:00
compiling
1d88d7479d Triforce Hunt + Kill Ganon goal. 2020-06-13 19:01:37 +10: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