alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,435 Commits 19 Branches 2 Tags
a8a1eaa1b9f5b749d70a903fdf70576d2a8c23e7
Commit Graph

54 Commits

Author SHA1 Message Date
aerinon
a8a1eaa1b9 Fix for counter rolling over 
Fix for Lamp for another player being substituted with standing items
Fix for received keys not being counted correctly
Fix for pendants counting as items
 2023-09-20 12:54:44 -06:00
aerinon
c0dff8e7c9 Bugfixes for duping/disappearing item and mutliworld crash 2023-09-13 14:28:18 -06:00
aerinon
5ad0e7781e Pikit override fix 
Minor drops from enemies persist
 2023-09-12 08:38:18 -06:00
aerinon
23ef62522b Fix potion refills counting in shops 
Bee traps - graphics upgrade
 2023-09-09 16:41:44 -06:00
aerinon
2561737236 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	inventory.asm
#	newhud.asm
 2023-09-08 13:49:16 -06:00
aerinon
e772b4a931 Progressive Shields fix 
Fix for collection rate overflow
Fix for progressive shield standing item (narrow version)
Fix for double key counts
Multiworld item substitution
Made map key coutner not depend on new flag for now
 2023-09-08 13:42:22 -06:00
aerinon
9fc85218ae Fixed ExtendedSRAM not saving 
Fix enemy drops and pots with Fairies/Chickens/Big Magic
Fixed Big Magic refill when in chests/standing items
Changed shop code to respect ShopEnableCount flag
 2023-09-01 14:13:01 -06:00
aerinon
5ccdebe09d Fixing crashes 2023-08-31 14:22:46 -06:00
aerinon
e21067f0a2 Initial work on new items 2023-08-30 14:35:30 -06:00
aerinon
d09aea3ff9 2 byte compass counts 2023-08-30 12:33:27 -06:00
aerinon
cd67d27798 Hud update flag added for standing items 
Ram addresses updated
Minor multiworld fix
 2023-08-30 10:25:20 -06:00
aerinon
51011dcada Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	events.asm
#	newitems.asm
#	shopkeeper.asm
#	tables.asm

Plus attempt to update standing items
 2023-08-28 12:01:57 -06:00
aerinon
09702e659d Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	goalitem.asm
#	inventory.asm
#	invertedmaps.asm
#	newhud.asm
#	pendantcrystalhud.asm

Also some bugfixes here and there
 2023-08-24 16:16:31 -06:00
aerinon
f1dda4a8c0 Attempt to re-write standing items using the new decompressed gfx. 
Fix a few bus left over from merge
 2023-08-23 16:06:31 -06:00
aerinon
2a789b04e4 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	bookofmudora.asm
#	build.bat
#	catfish.asm
#	compasses.asm
#	contrib.asm
#	darkworldspawn.asm
#	entrances.asm
#	events.asm
#	floodgatesoftlock.asm
#	flute.asm
#	framehook.asm
#	goalitem.asm
#	halfmagicbat.asm
#	heartpieces.asm
#	hooks.asm
#	inventory.asm
#	invertedmaps.asm
#	itemtext_lower.asm
#	lampmantlecone.asm
#	mantle.asm
#	msu.asm
#	music.asm
#	newhud.asm
#	newitems.asm
#	pendantcrystalhud.asm
#	ram.asm
#	rngfixes.asm
#	roomloading.asm
#	shopkeeper.asm
#	stats.asm
#	stats/credits.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	tables.asm
#	tablets.asm
#	utilities.asm
#	zoraking.asm
 2023-08-23 13:02:39 -06:00
aerinon
78b5695e30 Prevent cross dungeon drops 
Enemy drop indicator prototype
 2023-08-17 13:39:18 -06:00
aerinon
459dacd582 Sewer fix 
Multiworld absorbable fix
Thoughts on design for cross dungeon issues
 2023-08-09 15:16:13 -06:00
aerinon
05409f1875 Multiworld support for enemy drops. More logic for hera basement counting. 2023-07-10 10:25:37 -06:00
aerinon
4f09d30fe5 Merge branch 'DRUnstable' into Enemizer 
# Conflicts:
#	keydrop/standing_items.asm
 2023-04-05 16:03:17 -06:00
aerinon
b10dff8a30 Minor clean up 2023-03-14 16:33:02 -06:00
aerinon
04aabc8bd8 Clear standing item data on transition to overworld 
Standard+retro no arrow filler unless you have the bow
 2023-03-13 15:54:19 -06:00
aerinon
7e96db4ba6 Merge branch 'DRUnstable' into Enemizer 
# Conflicts:
#	enemizer/hooks/blindboss_hooks.asm
 2023-03-10 14:10:07 -07:00
aerinon
096157e981 Changes graphical status of standard exits when blocking exits in rain 
Fixes graphical issues with sanctuary and swamp hub lobbies
Major fix for decoupled doors landing area
Fix for multiworld absorbables
 2023-02-24 14:22:42 -07:00
aerinon
8957b8db7b Fast ROM updates 2023-01-06 15:02:22 -07:00
aerinon
955766dc2a Door state fix attempt2 2022-12-05 08:19:59 -07:00
aerinon
3af9e75dbd Possible fix for standing items after Aga transition 2022-12-01 10:01:37 -07:00
aerinon
895074a4cb Support for new items 
Support for static enemy drops
Bug fix for wrong sprites dead
 2022-09-30 15:28:38 -06:00
aerinon
3fdf95a364 UW Sprites new home 
Enemizer asm refinement
 2022-09-27 14:38:28 -06:00
aerinon
2309b88545 Standing items fix for reloading pot items 2022-08-11 15:27:38 -06:00
aerinon
3b5ccc7dfa Enemizer fix for pot substitution. 2022-06-30 11:52:02 -06:00
aerinon
3e6da34c71 Pot substitution for certain ammo and rupee items. 2022-06-29 11:32:51 -06:00
aerinon
4cdd41dbf5 Fix for standing item, all enemy drops and pot item converted to new system 2022-05-03 13:51:11 -06:00
aerinon
3685d8194e SRAM fix for MultiClient. Only set SRAM flag on locations that count toward collection rate. 
Shifted uppercase font.
 2022-04-28 16:06:31 -06:00
aerinon
eb0bc2b7f6 Moved doorrando code. Fixed a multiclient issue with pot switches. 2022-04-27 13:47:12 -06:00
aerinon
e088a040f8 Merge branch 'dr_sram' of https://github.com/cassidoxa/z3randomizer into cassidoxa-dr_sram 
# Conflicts:
#	hooks.asm
#	menu/overworldmap.asm
#	music.asm
 2022-04-26 11:57:51 -06:00
cassidoxa
352d1e8a22 Re-add accidentally deleted HUD stuff 
Fix some processor flags
 2022-04-20 20:33:40 -04:00
aerinon
e8f06f2da6 Pottery fix for vanilla hera key 2022-04-20 08:52:01 -06:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
aerinon
f6015a8569 New colorized pot and bitfields 2022-04-19 14:04:12 -06:00
aerinon
281beeeb58 Switch standing item gfx to a different slot 
Rain state fix
 2022-03-29 14:29:04 -06:00
aerinon
93fe175cab Don't delete hammer when hammer dashing through pots and the sprite limit is reached 
Hook for frozen enemies killed with hammer (if there's an item they won't automatically drop the freeze prize now)
 2022-03-23 14:24:36 -06:00
aerinon
c687157882 Fix the Y index for ShouldCountNormalPot 2022-03-08 08:53:23 -07:00
aerinon
60026bea50 Pottery refinements 2022-03-07 10:44:53 -07:00
aerinon
a0ebf72d59 Lifting normal pots increases location count 
Pot despawn protection
Hud updates
 2022-03-04 15:24:22 -07:00
aerinon
2c8299bac3 Standing item key for hera basement cage 2022-02-15 12:13:29 -07:00
aerinon
a80171ba9b Revert SRAM changes (not yet ready) 2022-02-10 08:37:05 -07:00
aerinon
5bd4d36cd9 Fix for standing item palette 2022-02-09 14:17:42 -07:00
aerinon
7db582d894 Moved SRAM to reserved locations 2022-02-09 09:02:17 -07:00
aerinon
725f6c110a Couple of fixes for Standing Items counts and generic keys in caves 2022-01-24 16:06:04 -07:00
aerinon
3c9b04f30a Fixed up the anti-soft lock in swamp 
Combined flags and fixed a couple of bugs
 2022-01-21 16:07:03 -07:00