Commit Graph

41 Commits

Author SHA1 Message Date
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
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
aecc65595e Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	bookofmudora.asm
2023-09-01 11:37:46 -06:00
cassidoxa
4c98268d81 Various fixes 2023-08-29 16:03:22 -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
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
spannerisms
59b16eeb05 optimize/fix inverted maps 2023-08-21 07:10:26 -04:00
cassidoxa
ca917404e5 Inverted maps 2023-08-20 11:51:12 -04:00
cassidoxa
ba080ef556 Fix HC/Sewers keys and inverted castle hole 2023-08-19 21:41:58 -04:00
cassidoxa
1b115ebb50 Fix pyramid map 2023-08-14 12:49:30 -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
0a073df728 Item receipt refactor
Inverted maps
Fix shops
2023-06-30 21:21:59 -04:00
cassidoxa
d5c8de0436 Fix inverted castle hole typo 2023-02-20 17:25:59 -05:00
spannerisms
aae1e2a1f3 fastrom 2023-02-14 01:24:43 -05:00
spannerisms
caac2877fc tiny fixes 2023-02-13 13:00:04 -05:00
spannerisms
830e86f199 inverted maps
untested, unfinished
2023-02-11 05:22:27 -05:00
Thomas Prescott
05fdeaccb0 Pyramid sign fix from Zarby 2022-12-29 11:57:12 -06:00
cassidoxa
69fd6015e6 Some more annotations 2022-11-25 01:08:07 -05:00
cassidoxa
09d15f3294 Another WRAM label pass
Deleted compression.asm
2022-11-22 00:36:39 -05:00
cassidoxa
43f753b517 ram.asm initial commit. Replaced all address defines with labels
Value defines styled without quotes, # moved to load/store/cmp site
Added registers.asm (copied from spannerisms JP disassembly)
Added a bunch of length annotations
Deleted old or trivial commented out code
Deleted: ganonfixes.asm, map.asm, seedtag.asm
Replaced obsolete credits.asm with creditsnew.asm
Moved scratch space at $7F5020-3F to mirrored WRAM (7E1E70-8F)
Moved clock RAM to mirrored WRAM (7E1E90-9F)
dialog.asm: FreeDungeonItemNotice preserves callee-preserved scratch RAM
Toast buffer moved to mirrored WRAM (7E1E0E-0F)
servicerequest.asm: long store to $012E converted to word length store
2022-11-05 00:50:25 -04:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04: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
Salvatore
08277d0f60 Merge pull request #79 from Zarby89/patch-22
moved pyramid sign
2019-11-29 14:04:51 -05:00
Zarby89
3793bd4de6 moved pyramid sign 2019-11-13 15:46:42 -05:00
Zarby89
2c5e1047e5 moved OWG sign 2 tile down 2019-09-21 11:02:42 -04:00
sporchia
19e3bc9a48 added signs for GT entry and Ganon vuln
* fixed OWG sign
2019-07-06 12:15:56 -04:00
Zarby89
32908d9ffa warp tile in LW under link's house 2019-01-25 13:59:02 -05:00
Zarby89
00b4208c18 checkerboard increased size of ledges 2018-09-28 22:56:12 -04:00
Zarby89
05a8f17527 TR and Library landscaping 2018-09-28 21:29:23 -04:00
Zarby89
3a78f5d19b TR Pegs 2018-09-26 20:42:21 -04:00
Zarby89
56d4c8892d Update invertedmaps.asm 2018-09-15 16:55:01 -04:00
Kevin Cathcart
78e3bb48f9 Turtle Rock Light World Inverted updates 2018-09-13 19:10:05 -04:00
Kevin Cathcart
8f8e02e55a Fix Hera warp and add new castle drop 2018-09-13 01:34:22 -04:00
Zarby89
e8f513e2ca pyramid peg, eye fix 2018-09-09 00:09:42 -04:00
Zarby89
e9da7f066d Update invertedmaps.asm 2018-09-08 23:41:29 -04:00
Zarby89
676982035c added exit/entrance 2018-09-08 23:35:22 -04:00
Kevin Cathcart
8321a3c69b Fix pyramid/castle hole (except aga tower eye symbol) 2018-09-08 14:39:30 -04:00
sporchia
f914f8d718 Aga2 check for drawing hole 2018-09-08 08:33:14 -04:00
Zarby89
ec848cf7fe Update invertedmaps.asm
castle hole - Need to add agah2 check
2018-09-02 15:28:31 -04:00
Zarby89
3db236dab4 Update invertedmaps.asm
cave45 grass/flowers
2018-09-02 13:36:15 -04:00
sporchia
411ac051f3 Zarby OW edits 2018-09-02 13:32:14 -04:00