Commit Graph

177 Commits

Author SHA1 Message Date
Karkat
c94d12d42a Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2018-01-21 23:53:01 -05:00
Karkat
ef5b226c0c let's dev 1/21/18
anti-zsnes fix
more shop dev
2018-01-21 23:53:00 -05:00
Karkat
37fdc21a86 Merge pull request #18 from KevinCathcart/SoundFixes
Fix ER music bugs
2018-01-21 21:11:22 -05:00
Karkat
cecd7635ea Merge pull request #19 from KevinCathcart/FakeWorldFix
Create a flag to toggle off Fake Worlds
2018-01-21 21:09:01 -05:00
Karkat
d3e3a328b6 Merge pull request #20 from KevinCathcart/doorframe_update
Update doorframe fixes (Allows Entrance Rando to mix single and multi entrance caves)
2018-01-21 21:08:23 -05:00
Kevin Cathcart
b3d8c23d89 Add door frame data for the multi-entrance caves. This will support
mixing single and multi-entrance caves.

I also added the alternate door frame table, which is needed for having
single entrance caves at
Sanctuary and Hyrule castle. (Added as a table rather than hard coding
the ids in order to be more friendly to level editors).

Updated the comments and function name to be clear that we are tracking
the overworld door
id, not the entrance id.

Remove the code that attempts to clear the entrance because the code is
broken (it lacked a needed ".w" suffix, so xkas miscompiled it) meaning
the value was never cleared, which has not caused any issues. Also
having the entrance ID around is generally useful.
2018-01-21 15:31:16 -05:00
Karkat
7e8be73077 let's dev 1/20/18
more shop dev
2018-01-21 01:12:25 -05:00
Kevin Cathcart
29b44e4167 Create a flag to toggle off Fake Worlds
Add a new rom flag to disable fake Light/Dark worlds from occurring as a
result of underworld travel. (Other methods of fake worlds like YBA Fake
Flute are not changed).

Entrance Randomizer intends to use this flag to fix the Fake Light world
from traveling though sewers when Hyrule Castle is in the dark world, as
well as to implement new shuffle modes that involve deliberate
cross-world caves without needing to grant pearl and mirror like the
current insanity mode does.
2018-01-20 13:42:10 -05:00
Kevin Cathcart
55473a4d01 GT in Kakariko music fix
This fixes music stopping partway up GT when
the player encounters a "PsychoSoldier" (MathOnNapkin's name). Both types
of this sprite sharethe same audio code. They have code to play special
music if chasing link in Kakariko. That is fine in vanilla or item
rando, but if they try to play this music in a dungeon located in
kakariko, this will cause the music to just stop, because that song is
not avaiulable in the dungeon music bank.

This patch fixes this by adding an extra check to make sure we are in
the overworld before playing this song.
2018-01-20 11:21:00 -05:00
Kevin Cathcart
bf2b119748 Fix music in Entrance Randomizer
This commit fixes the wrong music when leaving certain caves bug in
Entrance Randomizer.

The vanilla games decides what music to play when re-entering the
overworld in code in `PreOverworld_LoadProperties`. One of the main
things the game uses to decide the correct music is the overworld screen
being loaded. Obviously that is ideal. But it also sometimes bases its
decision on the underworld screen you are leaving.

Why would they do that? Well some screens can be re-entered from
houses/etc that play at half volume. Nintendo did not want to have the
music restart from the begining when leaving those locations, so they
explictly coded the non-half-volume locations to set the music for that
screen, and let the half music volume cases fall though, and get handled
by a special case later in the process.

There is a better apporach though. Simply determine what music should be
playing for this overworld screen, looking only at the overwold screen
index. Then see if "half-volume music" is the last played song command.
If so, check what the actual song playing is. If it matches song for the
overworld screen we are entering, then play the full volume command.
Otherwise play the song for the screen we are entering (which by virtue
of being a new song will always play full volume).

This patch implements that better approach. It basically moves the music
selection code from `PreOverworld_LoadProperties` into the custom code
bank, removes the checks for specific underworld locations, and makes
sure the last bit of code run before actually setting the music is the
one to handle half music, as described above.
2018-01-20 11:20:59 -05:00
Karkat
09e0516e1a disable shopkeeper 2018-01-20 00:16:14 -05:00
Karkat
b5fc4ebf66 Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2018-01-20 00:15:07 -05:00
Karkat
20ce4fe0e2 let's dev 1/20/18 2018-01-20 00:15:04 -05:00
sporchia
03c19c8458 fix dash magic usage in spike cave
cause it uses a different call to check how much magic when link is
dashing with cape, of course
2018-01-19 22:39:03 -05:00
sporchia
d0efce2e98 Fix potions to work normally in Spike cave 2018-01-19 22:18:21 -05:00
Karkat
39b20f9a05 let's dev 1/18/18
updated item limits
updated goal item counter
disabled replacement shopkeeper left on
fixed ice cave water walk setup
2018-01-18 00:03:34 -05:00
Karkat
471c14d790 let's dev 1/17/18
added bob toggle
more updates to shops (fixed sprite overload issues)
2018-01-17 00:01:13 -05:00
Karkat
fd8b63200c timestamp lock-in fixes 2018-01-08 21:16:46 -05:00
Karkat
7ea2c3cabf Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2018-01-08 21:14:14 -05:00
Karkat
d6de5ebcf7 flute timestamp update 2018-01-08 21:14:13 -05:00
Smallhacker
799db6e558 Updated credits 2018-01-06 23:12:58 -05:00
Karkat
10b2f9d842 formatting 2018-01-06 23:09:19 -05:00
Karkat
0931f08676 small key dungeon count fix 2018-01-06 22:49:54 -05:00
Karkat
924459596c date 2018-01-06 22:48:41 -05:00
Karkat
f500950e51 fairy revival counter 2018-01-06 22:48:26 -05:00
Karkat
7a77e900bf now with less crashing 2018-01-06 22:16:54 -05:00
Karkat
7044a810bc item timestamps for credits 2018-01-06 22:15:46 -05:00
Karkat
23041f7b09 stuff 2018-01-06 22:07:14 -05:00
Karkat
d233a5d516 let's dev 1/5/18
added condition to only display medallion pads when active
2018-01-05 23:26:15 -05:00
Karkat
4868a003de let's dev 1/5/18
fixed bug with being able to menu during boss explosions in glitched mode
added hotspots for medallions in ice palace
2018-01-05 23:15:59 -05:00
Karkat
5cb4d3dfd2 Merge pull request #16 from mmxbass/IcePalaceMedallions
Ice palace medallions
2018-01-04 23:44:58 -05:00
Smallhacker
c5b97deda1 More platforms, fixed graphics when switching floors 2018-01-04 23:35:28 -05:00
Smallhacker
3dde5bcbbd Added Bombos platform in first Ice Palace room 2018-01-04 01:17:20 -05:00
Smallhacker
f97618da6a Initial, partially unsuccessful version 2018-01-03 23:33:45 -05:00
sporchia
c03229f13e move inventory swap next to rest of inv in sram 2018-01-03 00:53:55 -05:00
Karkat
0097425e1e post aga2 hook 2017-12-22 21:45:10 -05:00
Karkat
3cc2ccf500 let's dev 12/22/17
fixed magic drain issue
fixed dashing through transitions & getting stuck item dashing in ice mode
fixed pot key pickups corrupting room state
fixed bunny mirror in ice mode (by making bunny not subject to ice mode)
2017-12-22 00:14:50 -05:00
sporchia
d6195f4e4a fix arrow upgrades being overwritten incorrectly 2017-12-20 22:56:26 -05:00
Karkat
767df00a3d let's dev 12/19/17
continued dev on shopkeeper
multiple fixes to ice physics switch
2017-12-19 23:38:49 -05:00
Karkat
1d293ee3c0 let's dev 12/15/2017
added ice floor toggle
made silver arrows always default
fixed small key count corruption
maybe fixed bomb capacity corruption?
2017-12-15 22:50:46 -05:00
Karkat
b9a180b8c6 12/14/2017 2017-12-14 15:43:20 -05:00
Karkat
fe2cb8f277 Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2017-12-03 23:45:18 -05:00
Karkat
7583e46504 let's dev 12/2/17
freestanding hera small key pickup stats
capitalism fairy fix
permabunny fix
save file crossover fix
started shopkeeper
2017-12-03 23:45:15 -05:00
sporchia
1ebc1814e3 hook off by a byte 2017-11-24 20:02:29 -05:00
Karkat
c54e8808d5 let's dev 11/18/2017
started generic keys mode
fixed ohko ow pit non-death
2017-11-18 23:15:05 -05:00
Karkat
b1cd5886d2 let's dev 11/14/17
added support for starting equipment
started implementing quickmenu-B (not finished)
fixed item stats problem after the most recently visited location indoors was a shop
fixed problem with big keys giving access to all keys rather than none
fixed ambigious code in recent pull request
added additional fixes to protect against credits corruption
2017-11-14 23:45:36 -05:00
Karkat
d2665d0971 Merge pull request #13 from wulfy83/master
contains errors but easier to fix by far than reimplement
2017-11-14 21:51:00 -05:00
sporchia
232828b9cb move this to a safer spot
fixes #12
also remove merge conflict resolution code
2017-11-13 09:27:43 -05:00
Wulfy
3d423af2a2 Combine MenuSpeed and QuickMenu options 2017-11-13 01:24:10 -05:00
Wulfy
d41c1fbafd Add MenuSpeed option 2017-11-12 23:17:00 -05:00