alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity
1,431 Commits 7 Branches 1 Tag
23ef62522bc3d4909610052745eab7af4ab607d8
Commit Graph
1431 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
aerinon cd67d27798 Hud update flag added for standing items 
Ram addresses updated
Minor multiworld fix
 2023-08-30 10:25:20 -06:00
cassidoxa 90c8e95f9b Fix overworld item duping 
Fix setting dungeon completed when Aga 1 and 2 are defeated (prize drops)
 2023-08-30 01:25:43 -04:00
S c6e586fbb8 Merge pull request #196 from spannerisms/decompressed 
Even more v31.2.0
 2023-08-29 16:40:31 -04:00
cassidoxa 4c98268d81 Various fixes 2023-08-29 16:03:22 -04: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 b688149dfa Fix for shops and powder 
Fix for dungeon indicator
 2023-08-28 11:32:46 -06:00
Lexi Rose e3a35ef5fc Merge pull request #195 from spannerisms/decompressed 
More v31.2.0
 2023-08-26 23:39:21 -05:00
cassidoxa 52d2616537 RomSpeed option 2023-08-26 23:24:34 -04:00
cassidoxa 05a79ad2d9 Fix Ped/GT open modes 
Fix key colors
 2023-08-26 20:29:38 -04:00
cassidoxa 7e513c4696 More sprite fixes 2023-08-26 14:30:39 -04:00