Commit Graph

1018 Commits

Author SHA1 Message Date
codemann8
ec04d05c37 Merge branch 'DRMain' into OWMain 2021-07-10 13:46:57 -05:00
aerinon
1c9936d231 Merge pull request #9 from ardnaxelarak/DRMain
Fix drawing C/P indicator and Stat Tracking
2021-07-09 10:38:20 -07:00
0054be1e4b Fix some stat tracking
- move chest turn counter to not overlap locations before mirror
- correctly print from correct memory in credits for damage/magic counter
2021-07-08 19:47:37 -07:00
02e66ba9e3 Fix drawing C/P indicator
- no longer show icon for sewer, HC, AT, or GT
- no longer show junk in map shuffle for dungeons without the map
2021-07-08 18:34:39 -07:00
codemann8
195fd74e0b Reverting Dark Bonk Rocks rain state sprite fix 2021-07-08 20:26:18 -05:00
codemann8
a474212475 Added Rain state guards for Dark Bonk Rocks 2021-07-08 14:08:34 -05:00
codemann8
6cd0d15abf Merge branch 'DRMain' into OWMain 2021-07-07 19:11:36 -05:00
aerinon
aee82fa319 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	events.asm
#	hooks.asm
#	stats.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	swordswap.asm
#	utilities.asm
2021-07-07 11:15:11 -07: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
codemann8
e5ec4f8393 Fixed Stumpy 2021-07-06 14:44:55 -05:00
codemann8
a87ae37eab Minor reformatting comments 2021-07-06 14:29:48 -05:00
codemann8
7f4d783870 Fixed Stumpy sprite loading 2021-07-06 14:29:10 -05:00
3548a0bbf5 Implement always-allowed medallions 2021-07-06 12:24:06 -07:00
codemann8
17b7a23550 Fixed Frogsmith spawning as a bad sprite 2021-07-06 11:57:34 -05:00
Bonta
27cb1b5459 Implement Fakeboots 2021-07-05 21:38:08 +02:00
codemann8
6f7f9d2a39 Adding OW Rando credits 2021-07-04 11:38:24 -05:00
codemann8
f2f53e8999 Adding OW Rando credits 2021-07-04 11:29:21 -05:00
spannerisms
270f0685ff add byrna/cape magic tracking 2021-07-04 05:21:48 -04:00
spannerisms
00c59c791f damage/magic stats 2021-07-03 09:25:33 -04:00
spannerisms
bdd16bc20f dungeon prizes 2021-07-03 09:06:17 -04:00
spannerisms
f403ca10da boss icons 2021-06-30 07:15:37 -04:00
KatDevsGames
04a07025ef Merge pull request #132 from ardnaxelarak/main
Temporary fix for broken missing defines
2021-06-28 20:47:15 -05:00
01537a7f2f Temporary fix for broken missing defines 2021-06-28 15:01:01 -07: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
codemann8
b9193d2fbf Added ability to cancel out of flute menu by pressing X 2021-06-27 19:02:19 -05:00
codemann8
8df468840f Added ability to cancel out of flute menu by pressing X 2021-06-27 14:49:28 -05:00
codemann8
7e615bc033 Fixed Aga portal mirror bonk issue 2021-06-25 13:02:40 -05:00
Bonta
d3db31b05e Events: Fix unusable infinite bombs with empty inventory 2021-06-24 23:12:58 +02:00
codemann8
3bb6f78491 Fixed VRAM issue 2021-06-24 14:47:40 -05:00
codemann8
7ba76d4a5c Partial revert of VRAM adjustment 2021-06-24 14:35:31 -05:00
spannerisms
be0389ffbb stats 2021-06-24 08:36:04 -04:00
codemann8
92c3448ac2 Merge branch 'DRMain' into OWMain 2021-06-23 10:58:18 -05:00
codemann8
04ffd3a00d Fixed horizontal VRAM loading glitch on megatiles 2021-06-23 08:41:43 -05:00
codemann8
5d06322bd3 Whoops 2021-06-23 05:33:43 -05:00
codemann8
17eb8073ab Initial Mixed/Crossed OW shuffle implementation 2021-06-23 03:05:13 -05:00
codemann8
b03283efd2 Various inverted map changes, including adding correct tiles to GT entrance 2021-06-22 23:09:22 -05:00
codemann8
da0b2c62e2 Added default music track to avoid game crash 2021-06-22 22:52:14 -05:00
aerinon
e9aec2ba86 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
2021-06-22 13:12:07 -06:00
aerinon
717434bd88 Bank notes added 2021-06-22 13:05:40 -06:00
codemann8
6f0d52f70e Merge pull request #4 from m0zes/OWMain
Cherry Picked Bank fixes
2021-06-21 20:29:10 -05:00
qwertymodo
b0b65f2131 More robust bank fix
Shouldn't crash on crystal/pendant anymore
2021-06-21 20:25:05 -05:00
qwertymodo
18422922e2 Set DB/DP to 0 in frame hook
Possible fix for hole transition crashes
2021-06-21 20:24:53 -05:00