Commit Graph

167 Commits

Author SHA1 Message Date
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
Karkat
0931f08676 small key dungeon count fix 2018-01-06 22:49:54 -05:00
Karkat
f500950e51 fairy revival counter 2018-01-06 22:48:26 -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
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
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
c04b230721 pre v27 fixes
added dungeon exit hook
added 2nd option for compass mode (always on)
fixed compass mode to stop drawing outside dungeons
2017-11-03 20:40:45 -04:00
sporchia
168b5a6132 prep for full ending sequence credit control 2017-10-30 14:23:12 -04:00
Karkat
d88fb81574 let's dev oct 22 2017
fixed triforce text border
added colorblind accessability for potions in HUD graphics
added indicator for gold bee
2017-10-22 20:09:29 -04:00
Karkat
1e00f59580 let's dev oct 8 2017
Fix map icons for keysanity map mode
Pyramid spawn fixes
Quick item menu option
2017-10-08 23:08:12 -04:00
sporchia
51c926a063 default back to regular menu mode
also hooked links starting rupees for later use
2017-09-30 04:15:41 -04:00
Karkat
f1f59c865a let's dev sep 28th 2017
fix for catfish/zora item spawn problem for items with IDs over 0x80
2017-09-28 23:03:51 -04:00
Karkat
1d8e4f6cb8 bugfixes
textbox fixes
2017-09-22 21:08:34 -04:00
Karkat
c2e5fca01c let's dev sep 15th 2017
added logic to synchronize dungeon key stats
moved keysanity table init to menu init so it comes in pre-rendered
2017-09-15 23:59:52 -04:00
sporchia
122dd9e02e adding new dungeon items view to menu 2017-09-05 20:16:49 -04:00
Karkat
f5bb17f771 let's dev aug 11 2017
pre-moved mantle to the side when zelda already rescued
fixed bombos tablet item drop problem common to glitched mode (extra bombos drop)
2017-08-11 23:17:13 -04:00
sporchia
e845e41378 added ability to set magic usage in spike cave
* byrna cane
* magic cape
2017-08-01 23:58:53 -04:00
Karkat
178454205d pyramid fix? 2017-07-26 23:50:20 -04:00
Karkat
54ab41b68f Merge pull request #3 from LLCoolDave/doorframefixes
Fix for door frame code for entrance shuffling.
2017-07-11 19:04:44 -04:00
Karkat
a15ae1dc94 let's dev 7/7/17
fixed (probably) bonk key stats
added book dialog for ether and bombos tablets
prepped progressive items for easy mode (progressives have progression caps with filler items replacing those above the cap)
2017-07-07 23:51:48 -04:00
LLCoolDave
db537fe4d6 Add hooks to store door frame overlay information based on entrance used, not cave entered, for simple cave entrances. Also use entrance info, not destination cave, to determine if link should walk up or down after triggering screen transition. 2017-07-01 19:06:31 +02:00
Karkat
c2af675e47 let's dev 7/1/17
asterisk pendant
flipperkill ignore fairies
added secret sfx to digging game prize reveal
updated pyramid spawn logic
2017-07-01 00:10:57 -04:00
Karkat
ebc0791cc4 let's dev 6/28/17
fixed fake flipper kill (again except on the screen you entered)
fixed stats bonk key
fixed stats progressive sword probably
fixed several byrna bugs
added OnEnterWater event hook
2017-06-28 01:08:03 -04:00
Myramong
32708553a5 Vitreous & Trinexx rng hook fixes 2017-06-21 13:36:29 -03:00
Karkat
5feaf1b122 let's dev 6/20/17
(probably) fixed glitched pyramid spawn issue
fixed sanctuary purple chest spawn
added switch to allow tablets to be opened with hammer (graphics not ready but looks ok)
2017-06-20 21:55:41 -04:00
Myramong
9035a9a15d Fixed a Trinexx RNG hook. 2017-06-20 01:30:06 -03:00