Commit Graph

259 Commits

Author SHA1 Message Date
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
20ce4fe0e2 let's dev 1/20/18 2018-01-20 00:15:04 -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
d6de5ebcf7 flute timestamp update 2018-01-08 21:14:13 -05:00
Karkat
924459596c date 2018-01-06 22:48:41 -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
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
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
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
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
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
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
e74e1ed665 dirty fix for small keys with text boxes 2017-10-02 19:12:29 -04:00
Karkat
402cdabef7 stuff 2017-09-29 15:17:24 -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
0bbf69ad22 fixing stuff 2017-09-25 21:41:04 -04:00
Karkat
5239476d13 tournament event 2017-09-23 22:01:44 -04:00
Karkat
963b1fbf77 Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2017-09-19 23:32:11 -04:00
Karkat
b08e936057 let's dev sep 19th 2017
event draw stuff
2017-09-19 23:30:54 -04:00
sporchia
4c8f5c9960 updated translations 2017-09-19 19:46:58 -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
Karkat
58e646756e let's dev sep 10 2017
fix for tablet text when opening with hammer
fixed progression graphics for 1/2 magic
fixed mothula damage for enemizer (works regardless of room now)
2017-09-10 22:04:21 -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
Karkat
c631415465 let's dev aug 9 2017
fixed tablet text not displaying in swordless
fixed goal item transition to triforce scene bugs
fixed map carryover for hyrule castle and sewers
fixed item graphics for bottle overflow
fixed item graphics for armor overflow
2017-08-09 23:13:28 -04:00
Karkat
4a17e97a2e let's dev aug 8 2017
fixed pyramid spawn issue (again)
fixed freedstanding display for progressive swords and progressive shields
2017-08-08 23:27:37 -04:00
Karkat
18531a3977 Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2017-08-08 21:35:22 -04:00
Karkat
4e0992934e comment updates 2017-08-08 21:35:18 -04:00
sporchia
a5f9d715a4 fix to include MM spike room for OHKO
* dl is 3 bytes so split out date to 4 separate bytes.
2017-08-06 00:17:50 -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
sporchia
5a4afc775e fix regression in digging game 2017-07-31 19:48:19 -04:00
Karkat
3fef7c61b4 updated build date 2017-07-26 23:50:40 -04:00
Karkat
d1d847e9ef let's dev 7/14/17
ganon alternate invincible dialog
added all crystals ganon condition
changed "SEED" on title screen to "HASH"
fixed bug in progressive armor limit code
2017-07-14 23:32:19 -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
sporchia
0ecc1fb9c3 move text tables to a included binary file 2017-07-04 09:17:35 -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
sporchia
4d89eac92b fixed vulture dig 2017-06-26 22:40:10 -04: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
Karkat
22bf43e81f let's dev 6/17/17
updated invincible ganon check to allow requiring all dungeons
added extra guard to rain sequence to block misuse of link's house glove upgrade
fixed stat tracking for swordless boss victories
2017-06-17 21:18:58 -04:00