Commit Graph

66 Commits

Author SHA1 Message Date
3cec56c5d8 Revert "Fix mixing progressive/non-progressive swords and shields"
This reverts commit d05169d5e2.
2022-10-12 15:55:48 -07:00
d05169d5e2 Fix mixing progressive/non-progressive swords and shields 2022-10-08 15:43:28 -07:00
4817fa2013 Fix up labels
still WIP

still do not use
2022-09-18 18:11:21 -07:00
6f138825d9 Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
WIP, Broken, Do Not Use
2022-09-18 17:36:49 -07:00
codemann8
6696f4bc24 Add new items from Bonk/Pot pool 2022-07-24 11:23:48 -05:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
0f26e5aaa5 Fix width of special cane freestanding sprites 2021-12-23 22:13:30 -08:00
53792aea25 Add cane-only modes 2021-12-23 22:13:26 -08:00
cassidy
ae82caca45 Replace more labels
Removed mask from rupeelimit.asm as total item counter is now a 16-bit
value
Commented out CountBits in utilities.asm in previous commit as I've
allocated a counter byte in SRAM
2021-12-16 17:19:54 -05:00
cassidy
640e94153d Refactor inventory code and add more labels
Refactored highest sword, shield, and mail counting
Refactored how heart pieces, heart containers, and crystals are counted
Moved quickswap lock bit to high byte of InventoryTracking
Fixed sword and shield item downgrade
Added PreFluteLocations counter
2021-12-16 17:19:54 -05:00
cassidy
e4d917c47c First pass-through adding labels
Added items, equipment, and tracking/indicators
Added playername changes
Removed some defines
2021-12-16 17:19:54 -05:00
2b241b2340 Unify handling of bomb colors in bomb-only mode 2021-11-07 12:47:13 -08:00
aerinon
27654b9ac9 Merge remote-tracking branch 'baserom/master' into DRMain
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
2021-10-21 14:15:54 -06:00
fb4068a3e1 Merge branch 'main' into overworld_kara 2021-09-21 11:55:33 -07:00
cassidy
aca809862d utilities: Rewrite prog bow narrow sprite overflow to check sram
This uses Bonta's method which is more efficient and reliable when it
comes to bow state and potential mixture of progressive,
none-progressive, and silver arrows upgrade.
2021-09-08 01:00:55 -04:00
cassidy
c37dcec6ea utilities: refactor some JSL X : RTL into JMP X 2021-09-06 20:20:12 -04:00
cassidy
9f1933d8c0 utilities: Progressive Bow overflow narrow sprites 2021-09-06 20:16:41 -04:00
cassidy
bbc8228175 utilities: Fix shields overflowing with narrow sprites 2021-09-06 17:21:48 -04:00
da14e440c7 Add L-1 bombs as separate from no bombs in bomb-only mode 2021-07-12 02:34:57 -07: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
01abf889d7 Merge branch 'main' into overworld_kara 2021-07-01 23:02:23 -07:00
b3d649a0fb Add bomb-only mode 2021-06-29 16:43:01 -07:00
Bonta
c60cbbc869 Utilities: Fix progressive bow sprite replacement 2021-06-20 12:41:31 +02:00
aerinon
842bb043e6 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	catfish.asm
#	compasses.asm
#	darkworldspawn.asm
#	hooks.asm
#	inventory.asm
#	newitems.asm
#	shopkeeper.asm
#	stats.asm
#	tables.asm

Adn some updates from DR
2021-05-13 12:11:40 -06:00
spannerisms
ed9c6681e8 new goals
make goals a jump table
add light speed
add crystals and bosses
add crystals only
move XY preservation to CountBits and utilize stack instead of Y for temp storage
2021-04-06 02:00:25 -04:00
spannerisms
6be396543e some obvious optimizations 2021-02-14 01:44:05 -05:00
spannerisms
c97475f422 BRL -> JMP 2020-12-27 08:04:32 -05:00
Bonta-kun
2a5e305fc6 implement remote item checks 2020-06-08 09:25:25 -07:00
Bonta-kun
f843ef9eb8 bee trap 2020-06-08 09:24:07 -07:00
Bonta-kun
49ba8e064d Make sword upgrade appear as fighter sword for swordless players 2020-06-08 09:20:42 -07:00
Bonta-kun
94218b048b Dont replace multiworld items 2020-06-08 09:20:17 -07:00
Bonta-kun
ddd456c04e multiworld 2020-06-08 09:19:18 -07: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
e8cb7eca80 mw updates 2020-04-17 21:18:46 -04: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
qwertymodo
768fbad245 Make existing code compatible with asar 2019-11-17 15:20:57 -08:00
sporchia
3fe95e2f1f preopen GT flag
also "corrected" some build errors
2019-08-24 08:50:25 -04:00
Kat
0bfec6da7d vram convenience functions that are probably wrong 2019-08-22 19:22:37 -04:00
Kat
7e45c3265e bow stuff 2019-08-21 14:26:55 -04:00
Kevin Cathcart
3806c98cff Fully fix bow standing item graphics 2019-08-17 10:01:43 -04:00
Kevin Cathcart
c2d5f9d846 Fix graphical issues from progressive bow 2019-08-11 13:41:25 -04:00
Kat
f06a43dc59 progressive bow 2019-06-17 21:29:52 -04:00
Kat
d182c3343e Update utilities.asm 2019-05-25 21:02:45 -04:00
sporchia
1a6478aa27 initial commit
* the cut scene for 1 and 0 crystals is wrong, it always shows minimum
of 2 right now
* pretty sure the AGA door check will blow up
2018-10-06 10:00:17 -04:00
Myramong
3bb17f4540 Optimize HexToDec and hopefully not break anything. I haven't done a full run with this change, but I haven't noticed any problems while testing. 2018-09-09 06:44:08 -03:00