Commit Graph

101 Commits

Author SHA1 Message Date
Karkat
762b9bc3e7 let's dev 4/20/18
fixed keysanity textbox crashes (probably)
fixed bow graphic not getting updated after firing last arrow in non-retro
added fighter sword and progressive sword to shop exemption list
fixed (probably didn't) RNG item single
fixed standing keys from not being counted in hera basement
2018-04-20 22:49:04 -04:00
Karkat
fd52a1c20b prep for other stuff 2018-03-29 23:11:55 -04:00
Karkat
641973b24c more silver bow restriction checks 2018-03-16 14:16:11 -04:00
Karkat
2110bf4fc2 typo 2018-03-16 13:25:18 -04:00
Karkat
a4cc61d67a Merge pull request #32 from mmxbass/remove-pyramid-fairy-code
remove the code related to pyramid fairy sword handling
2018-03-13 20:09:48 -04:00
Kevin Cathcart
cb0d0cd4d0 Fix Graphical Corruption.
Also fix possible latent bug from lack of indoors checking.
2018-03-13 02:47:22 -04:00
Karkat
365cb58f01 dpad invert support 2018-03-13 00:16:23 -04:00
sporchia
fb0f87c19b allow disabling of stuns from boomerang and hookshot 2018-03-12 01:41:20 -04:00
sporchia
7428f1e581 remove the code related to pyramid fairy sword handling 2018-03-12 00:44:46 -04:00
Smallhacker
9225f83608 Stopped some GFX from reloading when moving from Paradox Cave 1F to B1 2018-03-11 02:31:26 +01:00
Karkat
df99b4bda8 let's dev 3/6/18
fixed fairy fountains to only take bottles
fixed light cone bug in standard escape
fixed mid-arrow bow swap bug
started work on seizure-safe mode
2018-03-06 23:03:35 -05:00
Karkat
6be28cfece let's dev 3/2/18
fix for no items at fairy fountains
fix for chest game sfx
fix for digging game shovel swap bug
talking to saha/bomb shop guy now reveals their map items
2018-03-03 00:00:36 -05:00
Karkat
c4452389bb let's dev feb 28 2017
fixed boss swords incrementing the wrong sword when bossed drop swords
quick swap support officially enabled and permitting in non-race modes in all generators
2018-03-01 00:27:39 -05:00
Karkat
e0b55d6e8f let's dev 2/27/18
updates to floodgate softlock protection
nerfed byrna invulnerability for hard modes
add uncle refill switches for standard+random swords
2018-02-27 00:22:59 -05:00
Kevin Cathcart
341f146cad Patch the right spot 2018-02-24 12:47:06 -05:00
Karkat
838c85dc07 let's dev 2/23/18
fixed shops disregarding item counts (extra hitbox, etc)
fixed rupee arrows regarding requiring wooden arrows before being able to fire them
finished escape assist mode for ammo management in new game mode
2018-02-23 22:55:44 -05:00
Kevin Cathcart
6f33acb0e1 Fix 3 digit arrow count in non-retro mode 2018-02-23 19:57:58 -05:00
Kevin Cathcart
e7a58b2ea8 Remove purple chest despawn code
The blind despawn fix makes this unnecessary. Dungeon Entrance event
hook retained for possible future use, but is commented out.
2018-02-23 19:57:58 -05:00
Kevin Cathcart
a94e0e8012 Fixes for Tagalongs for ER
Fixes various tagalong issues that affect Entrance Randomizer, most
involving frog/blacksmith
2018-02-23 19:57:11 -05:00
Kevin Cathcart
8c151e0fc2 Add Quick Swap 2018-02-23 19:20:47 -05:00
Kevin Cathcart
5f25e50551 Fix graphics when throwing items to fairy
This hook will not work without another one that changes the data bank. Which apparently was never checked in due to green mail approach to fixing the freeze did not work out.
2018-02-23 11:50:18 -05:00
Karkat
84b8301fb4 let's dev 2/22/18
fixed problem with arrows sometimes not shooting
updates for infinite ammo switches
finished arrows
finished bombs
started magic
2018-02-22 00:12:45 -05:00
sporchia
bb99f138de Fix the bank when we do this adjustment 2018-02-15 18:12:49 -05:00
Karkat
5c528b269e let's dev 2/15/18
added money arrow mode to classic
fixed generic key mode hud after falling into holes
2018-02-15 00:28:14 -05:00
sporchia
6a6b22c3d5 Zarby's arrow code, will need to be made configurable
probably just based on cost per arrow, or a flag and word for each
cost, silvers/wooden
2018-02-13 08:37:46 -05:00
Karkat
9f8e241538 Merge pull request #24 from KevinCathcart/fix_dark_world
Fix the dark world
2018-02-11 00:03:17 -05:00
Karkat
ac274f444c let's dev 2/11/18
fixes for retro/shops/generic keys
2018-02-11 00:02:49 -05:00
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
Salvatore
8cc84dc35a Merge pull request #21 from KevinCathcart/entrance_fixes
Entrance fixes
2018-02-07 19:58:29 -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
Karkat
5c3bd34472 let's dev 2/4/18
updates to shops
started dev on inverted
2018-02-04 00:28:19 -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
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
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
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
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
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