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

1445 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aerinon
f7f558cd59 Don't double count torch item. (AddInventory/Link_ReceiveItem now count properly.) Update the hud when a key is absorbed off the torch. Link_ReceiveItem already does this. 2023-10-11 12:21:06 -06:00
aerinon
8c384ff123 Be more proactive about which sprites to move 2023-10-06 10:40:05 -06:00
aerinon
f3768ea0ad Fix problems with mystery hidden item total 
Upgrade blue enemy drop indicator to work with caves
 2023-09-26 13:31:34 -06:00
aerinon
3f0082a771 Fix merge error on hera boss music 2023-09-20 13:39:19 -06:00
aerinon
4eaa214626 Merge branch 'DRUnstable' into DRVolatile 
# Conflicts:
#	hooks.asm
#	music.asm
#	newhud.asm
 2023-09-20 13:34:52 -06:00
aerinon
1290751307 Merge branch 'Catobat-TavernFix' into DRUnstable 2023-09-20 13:31:03 -06:00
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
b831dd29a5 Turn off enemy drop indicator based on flag 2023-09-12 10:10:42 -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
b67e5c8433 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	npcitems.asm
 2023-09-09 13:13:18 -06:00
aerinon
a723fe2865 VRAM standing items 2023-09-09 13:12:05 -06: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
aerinon
f916346747 Stumpy bugfix 2023-09-08 14:55:25 -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
cassidoxa
70758bf5c0 Set silvers bit with silvers restriction 2023-09-08 15:43:31 -04: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
cassidoxa
f6842204d0 Fix BowTracking docs 2023-09-08 15:30:37 -04:00
cassidoxa
8af9c17cfe Fix stumpy double item 2023-09-08 13:57:26 -04:00
cassidoxa
57e537f12d Fix HUD rebuild when releasing fairy 2023-09-08 08:56:23 -04: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
cassidoxa
71e86f7c1a Set our hud update flag on quickswap 2023-09-08 00:35:06 -04:00
cassidoxa
0f72e6fcec Better solution 2023-09-08 00:21:24 -04:00
cassidoxa
790f3f0ba3 Fix HUD item icon not refreshing after last bomb spent 
Rename UpdateHUD to UpdateHUDFlag, replace with UpdateHUD vanilla JSR
label
 2023-09-07 16:29:45 -04:00
aerinon
134651e4fb Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	inventory.asm
#	itemdatatables.asm
#	newitems.asm
 2023-09-07 12:21:22 -06: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
cassidoxa
7dc71cf1ac Fix some stats counting 2023-09-07 11:53:24 -04: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
cassidoxa
f778674b83 Rework bow tracking to assign tracking bits to non-chest sprites 
Fix small key palettes to be consistent with vanilla colors
 2023-09-04 22:29:50 -04: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
cassidoxa
4ec523c8b3 Fix HUD heart colors on credits end screen 
Small fix for counting menu HUD keys for "this dungeon"
 2023-09-04 13:28:51 -04: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
cassidoxa
9800a86189 Palette fix for GT Torch/Hera cage items that load new palette 2023-09-03 15:39:53 -04: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
cassidoxa
73b2a180ba Fix AddInventory/stats tracking with 16 bit item properties 2023-09-02 22:57:50 -04:00
cassidoxa
2cead7ae92 Fix Active flute standing item gfx 
Move setting dungeon completed to prize pickup (or after aga1/aga2)
Fix some inverted tiles
Remove text-related conditional assembly
Make InventoryTable_properties 16 bits wide
Fix expanded save slot writing to cart SRAM
Fix HUD resetting with red potion
 2023-09-02 15:55:37 -04: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
aecc65595e Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	bookofmudora.asm
 2023-09-01 11:37:46 -06: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
cassidoxa
3a5974b456 Only check if we're getting a chest item if boss heart flag is set 2023-08-31 16:38:53 -04:00
aerinon
5ccdebe09d Fixing crashes 2023-08-31 14:22:46 -06:00
cassidoxa
71e6d54276 Fix for item receipt after GT boss heart container collected 2023-08-31 15:17:07 -04: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
cassidoxa
29176fa194 Absorb torch keys if they belong to the dungeon they're in. 2023-08-30 20:47:06 -04:00
aerinon
b635126e81 Copmass count fix for 2 bytes 2023-08-30 16:16:05 -06:00
aerinon
150adec969 Sewers count fix 2023-08-30 15:25:29 -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
Lexi Rose
d6ac9feae4 Merge pull request #197 from spannerisms/decompressed 
Glitch fixes
 2023-08-30 11:45:05 -05:00