Commit Graph
100 Commits
Author SHA1 Message Date
Lexi Rose 7dda06cf11 Merge pull request #152 from spannerisms/master
Bug Fix and MSU
2021-12-16 04:40:15 -06:00
Lexi Rose df2bca00ee Merge pull request #151 from cassidoxa/rom_version
Add ROM version to unused hw vector and before filename in SRAM
2021-12-07 15:18:24 -06:00
Lexi Rose 2fe5f0c126 Merge pull request #150 from spannerisms/master
Fake flippers softlock improvement
2021-11-10 16:38:49 -06:00
KatDevsGames 1ef55470d5 Merge pull request #147 from cassidoxa/shield_overflow
Shield and Progressive Bow overflow
2021-09-14 13:37:48 -05:00
KatDevsGames af8a47e743 Merge pull request #144 from spannerisms/master
Fix jingle glitch
2021-08-21 23:46:53 -05:00
KatDevsGames 910d63e886 Merge pull request #143 from spannerisms/master
fix quadrant glitch hopefully
2021-08-10 15:13:32 -05:00
KatDevsGames 9067790b20 Merge pull request #141 from compiling/master
Fix clearing frog/smith in inverted mode
2021-08-10 15:13:23 -05:00
KatDevsGames f69a33aed0 Merge pull request #142 from ardnaxelarak/fix_ohko
Fix OHKO mode
2021-08-10 15:13:13 -05:00
KatDevsGames f18eac796c Merge pull request #140 from cassidoxa/escape_drop_rng
rngfixes: make enemy drop rng static during the standard escape sequence
2021-08-10 15:13:04 -05:00
KatDevsGames 39441eb0a6 Merge pull request #139 from spannerisms/master
Bug fix
2021-07-30 20:47:55 -05:00
KatDevsGames 8da0dcf3e0 Merge pull request #138 from spannerisms/master
Fix Aga door bug
2021-07-18 13:25:46 -05:00
KatDevsGames df7ce30bbe Merge pull request #137 from ardnaxelarak/main
Fix drawing C/P indicator
2021-07-18 13:25:36 -05:00
KatDevsGames a5d66bc5a8 Merge pull request #136 from ardnaxelarak/fix_aga_default
Minor Low-Priority Fixes
2021-07-18 13:25:27 -05:00
KatDevsGames 264f7b26bc Merge pull request #134 from Bonta0/fakeboots
Fake boots
2021-07-06 22:25:42 -05:00
KatDevsGames 6f2383fafe Merge pull request #135 from ardnaxelarak/medallion
Implement always-allowed medallions
2021-07-06 17:44:41 -05:00
KatDevsGames 5d7bfde194 Merge pull request #133 from spannerisms/master
boss icons
2021-07-06 17:44:24 -05:00
KatDevsGames 04a07025ef Merge pull request #132 from ardnaxelarak/main
Temporary fix for broken missing defines
2021-06-28 20:47:15 -05:00
KatDevsGames 69ec104027 Merge pull request #131 from Bonta0/chestturns
Credits: Add chest turns counter
2021-06-28 11:47:01 -05:00
KatDevsGames ae0a712bdd Merge pull request #129 from spannerisms/master
OneMind
2021-06-28 11:08:44 -05:00
KatDevsGames aa4dbde9d7 Merge pull request #125 from Bonta0/bowsprite
Utilities: Fix progressive bow sprite replacement
2021-06-28 11:07:49 -05:00
KatDevsGames 5e152e18ed Merge pull request #126 from Bonta0/quickswapfix
Quickswap: Fix consecutive special swaps
2021-06-28 11:07:23 -05:00
KatDevsGames 49f1f49ccb Merge pull request #127 from Bonta0/escapeassist
Events: Fix unusable infinite bombs with empty inventory
2021-06-28 11:06:51 -05:00
KatDevsGames 38fdf5442a Merge pull request #128 from Bonta0/bonkcounter
Stats: Fix bonk counter
2021-06-28 11:06:27 -05:00
KatDevsGames 72f2a875ca Merge pull request #130 from Bonta0/keycount
Stats: amend incorrect comment in CountChestKey
2021-06-28 11:06:08 -05:00
KatDevsGames d0fbd11d0f Merge pull request #124 from cassidoxa/electroflashing
Rewrite electro palette flashing
2021-06-14 19:25:22 -05:00
KatDevsGames 2276b5782a Merge pull request #122 from Bonta0/msuresume
MSU: Enable track resuming
2021-06-13 12:59:48 -05:00
KatDevsGames 55c5208652 Merge pull request #121 from tcprescott/patch-4
Update creditsnew.asm
2021-06-13 12:59:04 -05:00
KatDevsGames dca1bfbab2 Merge pull request #120 from spannerisms/master
Fast credits
2021-06-12 13:39:49 -05:00
KatDevsGames 1bbf359198 Merge pull request #119 from cassidoxa/entrances
Revert "Update entrances.asm"
2021-05-22 13:11:59 -05:00
KatDevsGames b09b214ac0 Merge pull request #118 from cassidoxa/bombfix
Fix bombs count
2021-05-21 14:19:04 -05:00
KatDevsGames feb3105c5a Merge pull request #116 from spannerisms/master
Fix
2021-05-18 20:29:58 -05:00
KatDevsGames abd3dbe1fc Merge pull request #115 from aerinon/FixDefeatGanon
Fix a minor typo that makes Ganon invincible
2021-05-14 19:47:26 -05:00
Kat 47e52d3fb2 cucco storm 2021-05-14 14:17:11 -05:00
Kat a7f8bc8d91 Update tables.asm 2021-05-14 13:33:56 -05:00
KatDevsGames b76efe6df4 Merge pull request #113 from cassidoxa/flashing
Fix S&Q bug on DDM with flashing disabled
2021-05-09 17:23:26 -05:00
KatDevsGames 086721d035 Merge pull request #112 from cassidoxa/flashing
Remove flashing ancilla near pedestal item during cutscene
2021-05-09 14:20:56 -05:00
KatDevsGames 2048f75185 Merge pull request #111 from tcprescott/patch-3
Fix msu1 in credits
2021-05-09 14:19:04 -05:00
KatDevsGames 02ec4ded4b Merge pull request #110 from spannerisms/master
Share sewers and castle items
2021-05-04 04:45:15 -05:00
KatDevsGames 8db9b67654 Merge pull request #109 from tcprescott/patch-2
Credits updates
2021-04-28 13:33:34 -05:00
KatDevsGames d52e5f2037 Merge pull request #108 from cassidoxa/flashing
Flash toggle
2021-04-28 13:33:21 -05:00
KatDevsGames c04ff98269 Merge pull request #107 from spannerisms/master
Agahnim Light Speed message
2021-04-20 14:26:58 -05:00
KatDevsGames 2da2d16896 Merge pull request #106 from spannerisms/master
new goals
2021-04-06 03:39:23 -05:00
KatDevsGames 182b23d4de Merge pull request #105 from spannerisms/master
WOW
2021-04-05 12:58:02 -05:00
KatDevsGames b0dda07ce1 Merge pull request #104 from tcprescott/patch-1
Remove Quickswap enforcement and fix firebars
2021-04-04 21:44:26 -05:00
KatDevsGames 4614c4e0a9 Merge pull request #103 from spannerisms/master
General branch fixes
2021-04-03 13:59:59 -05:00
KatDevsGames b188024daa Merge pull request #99 from Catobat/Aga
Add Instant Post-Aga World State option
2021-04-02 13:18:28 -05:00
KatDevsGames fab1c22d43 Merge pull request #101 from StructuralMike/nostartingbombs
Now possible to start with 0 bomb capacity
2021-04-02 13:18:15 -05:00
KatDevsGames 362e9d3b14 Merge pull request #102 from kedNalatacId/quickswap_bottle_y_pressed
Quickswap bottle y pressed
2021-04-02 13:17:57 -05:00
KatDevsGames b84921e255 Merge pull request #100 from spannerisms/master
HUD Updates
2021-04-02 05:10:35 -05:00
KatDevsGames 37f7125198 Merge pull request #95 from CaitSith2/fix_aga_tower_compass
Fix Agahnim Tower compass counter
2021-02-18 17:31:12 -06:00
KatDevsGames 4ff4fde49b Merge pull request #96 from aerinon/ChestKeyCounter
Hera basement key fix
2021-02-18 17:30:52 -06:00
KatDevsGames 265f9f3dfa Merge pull request #98 from Catobat/RNG
Reset prize packs and other things on certain occasions
2020-12-16 15:58:36 -06:00
KatDevsGames 76f35b8786 Merge pull request #94 from tcprescott/patch-1
Re-order includes so the ROM will build correctly
2020-09-25 21:29:13 -04:00
KatDevsGames 9c9925fdda Merge pull request #75 from JonHanon/starting-menu-fix
Starting File Menu Fix
2020-09-21 02:14:47 -04:00
KatDevsGames 6e657f00db Merge pull request #78 from JonHanon/FreeItemText
Conditions for showing item text
2020-09-21 02:14:24 -04:00
KatDevsGames f26a10a526 Merge pull request #82 from aerinon/CountBottleFix
Prevent CountBottles from overwriting what is in register X.
2020-09-20 02:00:27 -04:00
KatDevsGames ba8c7c735b Merge pull request #86 from compiling/master
Triforce Hunt + Kill Ganon goal.
2020-09-20 01:59:56 -04:00
KatDevsGames 01dec8aef8 Merge pull request #87 from compiling/aga2_fw
Fix fake world when fluting to pyramid twice
2020-09-20 01:59:10 -04:00
KatDevsGames c79f4b19b7 Merge pull request #83 from CaitSith2/patch-1
Reset inner floodgates if and only if the...
2020-09-20 01:58:58 -04:00
KatDevsGames fab7c67909 Merge pull request #89 from Zarby89/patch-24
ganon room fix for multiworld
2020-09-20 01:58:43 -04:00
KatDevsGames 0e9e5d034c Merge pull request #90 from aerinon/ChestKeyCounter
Chest key counters
2020-09-20 01:58:02 -04:00
KatDevsGames 8814f8764a Merge pull request #88 from tcprescott/patch-1
Fix the shop fix and potentially fix a rare S&Q issue
2020-09-20 01:57:39 -04:00
KatDevsGames a3c4fed33f Merge pull request #91 from CaitSith2/rupee-chest-game-fix
Low stakes and high stakes chest game no longer increments item counter.
2020-09-20 01:57:15 -04:00
KatDevsGames af20beb472 Merge pull request #92 from Catobat/master
Fix Lost Woods chest game respawn
2020-09-20 01:56:50 -04:00
Kat af7cce9ae5 shop maybe fix 2020-07-09 02:04:00 -04:00
Kat 7955a37cd9 asar 2020-07-08 23:43:10 -04:00
KatDevsGames a3a35ad4ba Merge pull request #81 from KatDevsGames/asar
Make existing code compatible with asar
2020-04-21 22:56:27 -04:00
Kat 5c2726c3a8 Update utilities.asm 2020-04-20 23:02:52 -04:00
Kat bf6ecd979f various 2020-04-17 22:04:19 -04:00
Kat 5b19a65ae6 Update build.sh 2020-04-17 21:39:09 -04:00
Kat e8cb7eca80 mw updates 2020-04-17 21:18:46 -04:00
Kat f1eec27c3e Update newitems.asm 2020-03-30 02:44:34 -04:00
Kat 3b37d8b00f Update servicerequest.asm 2020-03-01 01:50:13 -05:00
Kat e846487300 Update utilities.asm 2020-03-01 01:50:11 -05:00
Kat 263da7f07f Update utilities.asm 2020-02-13 22:14:49 -05:00
Kat 65676d7e76 Update utilities.asm 2020-02-13 21:39:13 -05:00
Kat 6e53634905 Update utilities.asm 2020-02-13 21:38:07 -05:00
Kat f14657ae05 various 2020-02-13 21:35:58 -05:00
Kat b9e2bb3e23 various 2020-02-07 15:06:25 -05:00
Kat c1628dcb0e various 2020-02-04 19:40:33 -05:00
Kat f95512e089 Update servicerequest.asm 2020-01-31 16:34:17 -05:00
Kat 9d9d958f49 test 2020-01-31 16:22:32 -05:00
KatDevsGames e3e54b7fcb win build 2020-01-31 15:53:55 -05:00
Kat 8bc6b294cc various 2019-09-01 20:14:21 -04:00
Kat 6eab68f92e various 2019-09-01 20:11:51 -04:00
Kat a2dbc57810 Update LTTP_RND_GeneralBugfixes.asm 2019-09-01 18:27:36 -04:00
Kat 9fb9296067 Create toast.asm 2019-09-01 18:27:03 -04:00
Kat 00abc77be4 Update LTTP_RND_GeneralBugfixes.asm 2019-08-28 00:02:26 -04:00
Kat 5af7d13cb0 added limits for progressive bows 2019-08-25 13:46:10 -04:00
Kat 0bfec6da7d vram convenience functions that are probably wrong 2019-08-22 19:22:37 -04:00
Kat 6ec8d5b552 various 2019-08-21 21:32:47 -04:00
Kat becc909912 Update tables.asm 2019-08-21 21:24:37 -04:00
Kat 7e45c3265e bow stuff 2019-08-21 14:26:55 -04:00
Kat 81807861ce Update servicerequest.asm 2019-08-19 18:44:04 -04:00
KatDevsGames 79bb2728f3 Merge pull request #70 from JonHanon/bow-and-silvers-fix
Fixed Bow and Silvers item (#636 in /alttp_vt_randomizer)
2019-06-17 22:48:07 -04:00
KatDevsGames 246bbf2560 Merge pull request #69 from JonHanon/low-heart-fix
Fix for customizer with less than 3 hearts (#637 in /alttp_vt_randomizer)
2019-06-17 22:47:25 -04:00
KatDevsGames a099ef5c73 Merge pull request #68 from JonHanon/mushroom-in-save-hud
Mushroom in save hud (#652 in /alttp_vt_randomizer)
2019-06-17 22:46:20 -04:00
KatDevsGames 7ca12758db Merge pull request #67 from JonHanon/rupee-bow-starting-equipment
Moving a starting item fix to the randomizer (#636 in /alttp_vt_randomizer)
2019-06-17 22:44:05 -04:00
Kat a1c79a6658 Update LTTP_RND_GeneralBugfixes.asm 2019-06-17 21:34:52 -04:00
Kat f06a43dc59 progressive bow 2019-06-17 21:29:52 -04:00