Commit Graph
220 Commits
Author SHA1 Message Date
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
Karkat a39377b448 Merge pull request #27 from KevinCathcart/update_arrow_hud
Update HUD arrow drawing code
2018-02-21 21:39:39 -05:00
Kevin Cathcart 711866d9b3 Update HUD arrow drawing code
Draw arrows (in normal spot) in retro hud only if you have arrows and draw the specific
type you have
2018-02-21 20:22:19 -05:00
Karkat 9135b34e52 let's dev 2/17/18
continued shop dev
2018-02-18 00:05:08 -05:00
Karkat d80295f5ea Merge pull request #26 from KevinCathcart/sram_shops
Pack more shops into SRAM
2018-02-16 13:42:53 -05:00
sporchia 92ebe6b533 switch to ++ for this 2018-02-16 11:19:00 -05:00
Kevin Cathcart 77db3a90da Pack more shops into SRAM 2018-02-15 23:50:07 -05:00
sporchia bb99f138de Fix the bank when we do this adjustment 2018-02-15 18:12:49 -05:00
sporchia fe19774d7e Revert "Revert "moved hud redraw to static area""
This reverts commit c1ec9d4844.
2018-02-15 18:10:58 -05:00
sporchia c1ec9d4844 Revert "moved hud redraw to static area"
This reverts commit 3492aee446.
2018-02-15 18:06:51 -05:00
sporchia 3492aee446 moved hud redraw to static area 2018-02-15 17:47:30 -05:00
Karkat 37b930e9da formatting 2018-02-15 12:00:51 -05:00
Karkat 9de48ecc10 fixes 2018-02-15 12:00:33 -05:00
Karkat 43e4f4c973 bugfix 2018-02-15 01:07:34 -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 c0a088dffa fix for getting arrow item 2018-02-14 18:02:48 -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 b563d8d6d0 dist ready 2018-02-11 13:46:18 -05:00
Karkat 8fe2ebb90d shops fixes 2018-02-11 13:45:49 -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
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