1999 Commits

Author SHA1 Message Date
Kevin Cathcart
60eafcaf46 Fix the dark world
Restore fake world fix to previous position

Change how the FixBunnyOnExitToLightworld Code works, and where it is
called from
2018-02-10 22:05:44 -05:00
Karkat
6728d21fd5 let's dev 2/9/18
bugfixes for shops
started implementation for takeany
started implementation for inverted
2018-02-09 00:32:45 -05:00
Karkat
10e638fa70 comment 2018-02-08 13:21:14 -05:00
Karkat
343da4c491 Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2018-02-07 21:48:23 -05:00
Karkat
65be778fb5 flag tweaks 2018-02-07 21:48:22 -05:00
sporchia
b43803f8be date the ROM 2018-02-07 20:12:31 -05:00
sporchia
84b9644ecf set location for ShopContentsTable
fixed msu label update
2018-02-07 20:11:37 -05:00
Salvatore
8cc84dc35a Merge pull request #21 from KevinCathcart/entrance_fixes
Entrance fixes
2018-02-07 19:58:29 -05:00
Salvatore
b62aea3a2b Merge pull request #23 from qwertymodo/master
MSU-1 Fixes
2018-02-07 19:57:49 -05:00
Kevin Cathcart
0c72ca9e0e Fix not being bunny after defeating aga2 w/o moon Pearl 2018-02-07 01:56:51 -05:00
Kevin Cathcart
16259ce158 Add light world check to more unbunny-ing code
This time the code that tries to unbunny you when leaving a dungeon.This
is needed to make ER's new cross world connects work properly.

Move the fake world fix to happen in time for this.
2018-02-07 01:56:50 -05:00
qwertymodo
5b03421e20 MSU-1: Don't stall NMI while audio is busy loading, and wait for ending music to finish. 2018-02-06 22:41:36 -08:00
Kevin Cathcart
3764deb4d3 fix Alt Door frame table
(Apparently trailing commas break things)
2018-02-05 00:11:16 -05:00
Karkat
5c3bd34472 let's dev 2/4/18
updates to shops
started dev on inverted
2018-02-04 00:28:19 -05:00
Karkat
53602a48c5 let's dev 1/30/18
more shop dev
2018-01-30 00:24:24 -05:00
Myramong
1bd2550c2c Witch's assistant text cut 2018-01-28 06:49:04 -04:00
Karkat
2eefbac53f let's dev 1/27/18
added msu music support
additional development on shops
2018-01-27 00:30:04 -05:00
sporchia
4f0ea08367 native dungeon items will now have a text box if mode is enabled 2018-01-25 18:14:20 -05:00
Karkat
49488755fa let's dev 1/24/18
shopkeeper dev & bugfixes
2018-01-24 00:33:53 -05:00
Karkat
88babf9ed0 removed entrance randomizer support due to bad commit 2018-01-23 22:29:14 -05:00
sporchia
85b5a97a53 small fixes
* transition from HC to sewers counts don’t reset to 00/00
* count the proper keys in menu for HC/sewers
2018-01-22 17:49:39 -05:00
Karkat
c894b5e0b2 remove duplicate instruction 2018-01-22 00:19:12 -05:00
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