Commit Graph
100 Commits
Author SHA1 Message Date
Lexi Rose 032d15fba6 Merge pull request #209 from tcprescott/patreon
Names for Patreon Supporters
2023-09-22 23:43:22 -05:00
Lexi Rose 507ba379cf Merge pull request #208 from cassidoxa/v31.2.0-fixes
Don't increment highest mail on final stats prep
2023-09-17 13:30:02 -05:00
Lexi Rose 0fdb6ed133 Merge pull request #207 from cassidoxa/v31.2.0-fixes
Add time stamp for tossed fighter sword item
2023-09-10 01:31:32 -05:00
Lexi Rose fcbde59a1e Merge pull request #206 from cassidoxa/v31.2.0-fixes
Fix HUD rebuild when releasing fairy
2023-09-09 04:21:01 -05:00
Lexi Rose bc3dd5c186 Merge pull request #205 from cassidoxa/v31.2.0-fixes
Fix HUD item icon not refreshing after last bomb spent
2023-09-08 02:30:29 -05:00
Lexi Rose 6a55fc2b12 Merge pull request #204 from cassidoxa/v31.2.0-fixes
Fix some stats counting
2023-09-07 11:50:36 -05:00
Lexi Rose 5a0bd6dbe0 Merge pull request #203 from cassidoxa/v31.2.0-fixes
Rework bow tracking to assign tracking bits to non-chest sprites
2023-09-05 03:23:35 -05:00
Lexi Rose 2e433732f8 Merge pull request #202 from cassidoxa/v31.2.0-fixes
Fix HUD heart colors on credits end screen
2023-09-04 15:15:37 -05:00
Lexi Rose 23b6e1ae6b Merge pull request #201 from cassidoxa/v31.2.0-fixes
Palette fix for GT Torch/Hera cage items that load new palette
2023-09-03 16:11:15 -05:00
Lexi Rose 74a31f5f11 Merge pull request #200 from cassidoxa/v31.2.0-fixes
Fix active flute standing item gfx
2023-09-02 23:23:42 -05:00
Lexi Rose 6fbce240b8 Merge pull request #199 from cassidoxa/decompressed
Fix for item receipt after GT boss heart container collected
2023-08-31 17:39:17 -05:00
Lexi Rose 139c963e6a Merge pull request #198 from spannerisms/decompressed
Absorb torch keys if they belong to the dungeon they're in.
2023-08-31 03:07:31 -05:00
Lexi Rose d6ac9feae4 Merge pull request #197 from spannerisms/decompressed
Glitch fixes
2023-08-30 11:45:05 -05:00
Lexi Rose e3a35ef5fc Merge pull request #195 from spannerisms/decompressed
More v31.2.0
2023-08-26 23:39:21 -05:00
Lexi Rose 188c965fbc Merge pull request #194 from spannerisms/decompressed
More v31.2.0 fixes
2023-08-23 21:10:13 -05:00
Lexi Rose 71d3f6cefe Merge pull request #193 from spannerisms/decompressed
Decompressed
2023-08-16 01:56:09 -05:00
Lexi Rose 421740cdae Merge pull request #192 from cassidoxa/hundo_mode
Add "completionist" goals and HUD item counter
2023-06-10 22:26:37 -05:00
Lexi Rose 23ecf41b33 Merge pull request #191 from cassidoxa/keys_hud
Properly mask HUD item flags
2023-03-15 11:50:57 -05:00
Lexi Rose c7c5ac23a8 Merge pull request #190 from cassidoxa/keys_hud
Fix file select HUD I broke
2023-03-13 20:49:11 -05:00
Lexi Rose 5a0990638c Merge pull request #189 from cassidoxa/keys_hud
Fix small key stats tracker
2023-03-13 12:28:15 -05:00
Lexi Rose 95f0e9eed2 Merge pull request #188 from cassidoxa/keys_hud
Compass and map HUD display modes properly skip or draw
2023-03-12 20:42:04 -05:00
Lexi Rose d0f9bf6b32 Merge pull request #186 from cassidoxa/init_save
Delete save backup when header name doesn't match SRAM
2023-03-07 02:11:58 -06:00
Lexi Rose 5e3fce17be Merge pull request #185 from cassidoxa/map_counts
Fix dungeon indexing for compass/map hud coutns
2023-02-24 16:56:53 -06:00
Lexi Rose 23427497b4 Merge pull request #184 from cassidoxa/map_counts
Add HUD map mode flag, "chest key" totals table, and seen-counter flags for tracking
2023-02-24 16:08:37 -06:00
Lexi Rose 66fd23fc61 Merge pull request #183 from cassidoxa/sram_checksum
Compute and write save checksum on new file creation
2023-02-21 15:13:49 -06:00
Lexi Rose aed9166f48 Merge pull request #182 from cassidoxa/fontstuff
Lower case stuff
2023-02-20 18:31:14 -06:00
Lexi Rose c2ea144bfb Merge pull request #180 from cassidoxa/filename_numbers
Add numbers to file name screen
2023-01-25 09:21:53 -06:00
Lexi Rose 35e1b3a659 updated name for contributor MATRETHEWEY 2023-01-09 01:15:27 -06:00
Lexi Rose 85b433fcd4 delete garbage empty file 2023-01-09 00:36:50 -06:00
Lexi Rose c23facd617 Merge pull request #179 from cassidoxa/tablets
Fix tablet flags
2022-12-29 11:29:59 -06:00
Lexi Rose 186cbba855 Merge pull request #177 from cassidoxa/newfont
New font changes
2022-12-09 10:09:22 -06:00
Lexi Rose 1d64ee7926 Merge pull request #176 from cassidoxa/menu_dungeonhud
Allow menu free dungeon item toggle with no menu items
2022-12-09 10:07:46 -06:00
Lexi Rose b2fdeb6b84 Merge pull request #175 from cassidoxa/quickswap
RAM labels, Length Annotations, and Quickswap Fix
2022-11-25 18:58:17 -06:00
Lexi Rose 9cf3cb0601 Merge pull request #174 from cassidoxa/hera_music
Fix check for Tower of Hera boss defeated
2022-10-25 21:47:11 -05:00
Lexi Rose 0e87fb3bc4 Merge pull request #172 from cassidoxa/shields
newitems: Progressive shields, swords, and mail use highest item level to determine upgrade
2022-10-22 16:32:16 -05:00
Lexi Rose 177452c853 Merge pull request #173 from cassidoxa/oldman_entrance
darkworldspawn: Add check for old man to fix post-aga spawn bug
2022-10-22 16:32:03 -05:00
Lexi Rose 48ccf03ac8 Merge pull request #170 from cassidoxa/ammo_capacity
Combine starting max ammo and capacity upgrade in SRAM into single, flat ammo capacity values
2022-10-01 08:08:26 -05:00
Lexi Rose aba3ec930d Merge pull request #169 from cassidoxa/validate_sram
Compute checksum for extended SRAM
2022-08-01 08:40:19 -05:00
Lexi Rose 0e6e5d5b45 Merge pull request #167 from cassidoxa/elder_submodule
Check submodule during goal NPC interaction to prevent it from firing when menu is open
2022-07-14 22:40:37 -05:00
Lexi Rose 04906b5f87 Merge pull request #164 from aerinon/DungeonsCompletedReverse
Dungeons completed reverse
2022-06-11 10:32:21 -05:00
Lexi Rose 2297a8f0a2 Merge pull request #163 from cassidoxa/cavestate_dungeonitems
Add data after dungeon item masks to maintain expected glitch behavior
2022-06-11 10:31:14 -05:00
Lexi Rose 6ff400776a Merge pull request #162 from cassidoxa/compasses
Fix checking compass mode for compass count display bitfield
2022-05-19 23:59:16 -05:00
Lexi Rose 6d39ea5872 Merge pull request #161 from aerinon/FontFix
Add lowercase letters to credits end screen
2022-04-29 10:17:45 -05:00
Lexi Rose 5861f546ad Merge pull request #160 from ardnaxelarak/main
Unscramble lowercase letters for new font
2022-04-17 03:17:31 -05:00
Lexi Rose c6adf11a0d Merge pull request #159 from cassidoxa/sram_rework
SRAM Re-work
2022-04-05 09:38:27 -05:00
Lexi Rose a754a6f22b Merge pull request #158 from spannerisms/master
Failures
2022-04-05 09:37:57 -05:00
Lexi Rose c515beb853 Merge pull request #155 from tewtal/new-text-renderer
Improved dialog text rendering
2022-01-20 16:00:20 -06:00
Lexi Rose 02ed70442d Merge pull request #154 from cassidoxa/starting_area_exit
Fix reading starting area offset to prevent indexing out of bounds
2022-01-20 02:33:52 -06:00
Lexi Rose df27e07221 Merge pull request #156 from Catobat/HeraBoss
Fix Tower of Hera boss music bug and witch item bug
2022-01-20 02:33:27 -06:00
Lexi Rose 4eafefb501 Merge pull request #153 from spannerisms/master
Fix EG
2021-12-21 23:19:16 -06:00
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