alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity
2,048 Commits 7 Branches 1 Tag
031a444a4a3e3bf8bbb27959967a8542b7fe66b3
Commit Graph
170 Commits
Author SHA1 Message Date
karafruit 53d2a7606a Merge remote-tracking branch 'codemann/OWMain' into codemann_OWMain 2026-01-25 21:15:13 -06:00
codemann8 343d61a976 Fixing key totals marking MapCountDisplay flag 2026-01-16 14:30:01 -06:00
karafruit 420f2477fc Invert bitfield for pseudoflute 2026-01-15 04:05:30 -06:00
karafruit a6ad4c082b Finish pseudoflute 2025-12-13 22:48:03 -06:00
codemann8 953c115719 Fix HUD to show prize, key count, and compass count if seen by player 2025-07-07 15:03:14 -05:00
codemann8 9cbcd33d70 Fixed issue with MapCountDisplay flags not getting set when entering a dungeon and maps aren't wild 2025-01-05 05:33:39 -06:00
codemann8 a5dfd97687 Merged in DR v1.4.5 2024-08-16 23:00:45 -05:00
aerinon 024746d78f Merge remote-tracking branch 'upstream/master' into DRUnstable 2024-06-18 11:50:26 -06:00
codemann8 b76d440958 Reimplemented part of the TF Cutscene for new item code 2024-04-30 07:50:38 -05:00
codemann8 d75c72f85d Some byte designation corrections + formatting 2024-04-12 15:58:09 -06:00
codemann8 2367f16179 Formatting and notation 2024-04-10 04:26:17 -05:00
codemann8 27685ac77d More merge labeling 2024-04-09 13:24:54 -05:00
codemann8 a70251d2b2 Applied labels and byte designators 2024-04-09 09:26:27 -06:00
codemann8 59eb254116 Merged in DR v1.4.1.6 2024-03-01 13:55:23 -06:00
codemann8 75fd81ab57 Merged in DR v1.4.1.6 2024-02-23 11:11:59 -06:00
aerinon 16d249859f fix: issues around item substitution for harder difficulties 2024-02-07 15:15:22 -07:00
aerinon ed8cefe0c6 fix: bad branch, bad org, dead code, bad args flags 2024-02-07 12:36:54 -07:00
spannerisms 014b3a719a fix things 2024-01-04 06:45:57 -05:00
Randall Rupper 9ac2156945 fix: MW item substitution 2023-11-22 13:13:44 -07:00
cassidoxa 334f721a29 Don't increment highest mail on final stats prep 2023-09-17 12:02:54 -04:00
aerinon b67e5c8433 Merge remote-tracking branch 'baserom/master' into MergeDecompression 
# Conflicts:
#	npcitems.asm
 2023-09-09 13:13:18 -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 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
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
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
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 e21067f0a2 Initial work on new items 2023-08-30 14:35:30 -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 b688149dfa Fix for shops and powder 
Fix for dungeon indicator
 2023-08-28 11:32:46 -06:00
cassidoxa 5ac2f8c537 Fix GFX transfer, use stack 
Fix HUD arrow icon after buying shop arrow
 2023-08-25 12:29:52 -04:00
cassidoxa 1cbcd1d5ff Sprite fixes 2023-08-25 01:38:32 -04: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
cassidoxa 80f94824f4 Small fixes 2023-08-22 10:18:02 -04:00
cassidoxa 66540f2819 Replace GT, Ganon vuln crystal checks, ped check with new system 
InvincibleGanon 0x18003E -> GanonVulnerableMode 0x1801A8-0x1801A9
NumberOfCrystalsRequiredForTower 0x18005E -> GanonsTowerOpenTarget 0x18019A-0x18019B
NumberOfCrystalsRequiredForGanon 0x18005F -> GanonVulnerableTarget 0x1801A6-0x1801A7
Various fixes
Moved CrystalCounter to word length space $7EF471 -> $7EF476
 2023-08-21 20:43:27 -04:00
cassidoxa ba080ef556 Fix HC/Sewers keys and inverted castle hole 2023-08-19 21:41:58 -04:00
cassidoxa a3bc24c383 Quick fixes for shop fighter shield and retro shop arrow 2023-08-13 19:51:29 -04:00
cassidoxa aaf970b837 Heart colors 2023-08-13 13:46:21 -04:00
cassidoxa ad17c8e88d More small fixes 2023-08-12 15:34:33 -04:00
cassidoxa 103f072cf3 Add back some JP characters and re-arrange player name screen 
Re-arrange a bunch of text-related stuff
Fix post-credits game counter
Fix bows
 2023-08-11 02:10:54 -04:00
cassidoxa 56cb17a0a3 Small fixes 2023-08-08 01:00:49 -04:00
cassidoxa 87e665965c Free crystals and ability to shuffle dungeon prizes 
Overworld map code via Aerinon
 2023-08-06 23:07:39 -04:00
cassidoxa cb16ffc20b Merge branch 'master' into decompressed 
Also some pendant receipt and palette fixes
 2023-08-02 17:40:38 -04:00
cassidoxa d446bd3c1b More fixes 2023-08-02 15:39:03 -04:00