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

63 Commits

Author SHA1 Message Date
codemann8
021ba9d8a6 Actual fix for issue with no music in LH after S+Q from Kakariko 2025-06-12 01:50:21 -05:00
codemann8
aabb649578 Initial Follower Shuffle Implementation 2025-04-30 06:18:08 -05:00
codemann8
4b98d44820 Merge branch 'DRUnstable' into OWMain 2024-10-15 18:45:40 -05:00
aerinon
a1044baf41 fix: sanc & quit fix 2024-10-10 08:27:18 -06: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
75fd81ab57 Merged in DR v1.4.1.6 2024-02-23 11:11:59 -06:00
codemann8
8e9b4c234b Fix Old Man death putting you on Pyramid 2023-09-27 16:09:45 -05: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
codemann8
25dc4217c6 Fixed Old Man Death causing fake world in glitched 2023-04-02 07:39:02 -05:00
codemann8
726b9441b7 Merge branch 'DRUnstable' into OWMain 2023-03-14 17:18:06 -05: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
cassidoxa
09d15f3294 Another WRAM label pass 
Deleted compression.asm
 2022-11-22 00:36:39 -05:00
cassidoxa
788cceaab9 Continue labeling and documentation in ram.asm, main rando block 
Deleted several unused modules and some commented code
Reorganized some routines to clean up modules
Moved some memory into mirrored WRAM
Refactored NMI hook aux routine
Removed old fake flipper fix
 2022-11-16 21:38:28 -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
cafb0908a0 Introduce bound to QS loop to prevent infinite loop on last bomb loss 
Move !INFINITE_BOMB define to ram.asm, replace with labels
 2022-10-23 22:02:36 -04:00
cassidoxa
dbf674c9fd darkworldspawn: Add check for old man to fix post-aga spawn bug 2022-10-20 14:47:04 -04:00
codemann8
7c7664224e Merged DR v1.0.1.0 2022-07-08 05:32:08 -05:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
codemann8
bfbc7f16b1 Fixed issue with spawning on Pyramid/HC Ledge with old man 2022-01-19 00:23:24 -06: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
codemann8
4e67ebd959 Make Smith deletion on S+Q dependent of a new flag 2021-10-22 00:21:22 -05:00
codemann8
2215b16240 Merge branch 'DRMain' into OWMain 2021-10-21 21:26:38 -05:00
aerinon
27654b9ac9 Merge remote-tracking branch 'baserom/master' into DRMain 
# Conflicts:
#	hooks.asm
#	newhud.asm
#	utilities.asm
 2021-10-21 14:15:54 -06:00
compiling
e2e4db8237 Fix clearing frog/smith in inverted mode 2021-08-08 14:13:40 +10:00
codemann8
6c616a20b2 Made world checks table-based rather than based on OW ID 2021-06-03 00:50:25 -05:00
aerinon
842bb043e6 Merge branch 'master' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	catfish.asm
#	compasses.asm
#	darkworldspawn.asm
#	hooks.asm
#	inventory.asm
#	newitems.asm
#	shopkeeper.asm
#	stats.asm
#	tables.asm

Adn some updates from DR
 2021-05-13 12:11:40 -06:00
spannerisms
70933b01f8 WOW 2021-04-05 12:48:32 -04:00
spannerisms
8b9ea182d8 refactor darkworldspawn 
reversed some labels
moved nomirror because 0 is already loaded
INC from 7 to 8
ORA instead of multiple branchings
SBC without SEC when carry is guaranteed
 2021-03-24 07:55:51 -04:00
aerinon
0dba58c194 Support for Mirror Scroll 
DR Hud Additions
 2020-10-30 16:26:28 -06:00
CaitSith2
94722d452e Fix glitch where you can bomb yourself at high stakes chest game to get on top of pyramid/castle. 
Since this is not a vanilla glitch, it has to be fixed, as it wasn't intended.
 2020-09-18 11:04:48 -06:00
Catobat
e82f01ae2f Fix Lost Woods chest game respawn 2020-09-18 00:54:30 +02:00
caitsith2
65bd0df346 Labels added for Door rando hook points. 2020-07-15 01:27:33 -07:00
caitsith2
6b6bce9b78 Print hook address helpers for doors 2020-06-24 07:07:38 -07:00
sporchia
bf8a80a5e1 strip dwarf on death/S&Q in inverted 2018-09-15 10:38:48 -04:00
Kevin Cathcart
ef2f73bcad Inverted mode spawn logic 2018-09-11 21:46:00 -04:00
Kevin Cathcart
4669f7fbf8 Remove useless indirection of the OnFileLoad event 2018-06-30 13:05:33 -04:00
Kevin Cathcart
f573796244 Simplify dark world spawning logic 
We now only change spoint points on death and on load, and not on save,
since the only save-and continue option is only available on death, and
in a save-and-quit we can handle everything on load.
 2018-06-30 13:05:33 -04:00
Kevin Cathcart
89e6034c68 Fix backwards check 2018-04-03 09:53:26 -04:00
Kevin Cathcart
b1dd967864 Include missing "!" (Metal gear solid sound) 2018-03-29 21:23:41 -04:00
Kevin Cathcart
ec92f7b6dc Prevent overfilling on escape death 2018-03-29 21:13:20 -04:00
Kevin Cathcart
398a6535d8 Fix broken build 2018-03-29 20:41:38 -04:00
Karkat
0c3cce7399 Merge branch 'master' of https://github.com/mmxbass/z3randomizer 2018-03-28 21:10:13 -04:00
Karkat
2b6dbf05fa easy mode fixes and stuff 2018-03-28 21:10:10 -04:00
Kevin Cathcart
63226e6610 Clean up whitespace 2018-03-28 20:45:53 -04:00
Kevin Cathcart
0565c472ea Death respawn without mirror in light world 2018-03-28 20:37:25 -04:00
Karkat
a2818e479e ganon spawn fix 453/∞ 2018-03-16 14:44:56 -04:00
Karkat
641973b24c more silver bow restriction checks 2018-03-16 14:16:11 -04:00
Kevin Cathcart
6c6dac11ff Fully fix dark world spawn 
Fix a backwards check
 2018-03-14 00:32:43 -04:00
Kevin Cathcart
d20fcc08a8 Pyramid spawn updates 
Move the pyramid spawn forcing code to run before the Aga1 check. The whole point of the code is to force a pyramid spawn even if you are fighting Ganon in the fake world. (Otherwise a branch to `.done` would have been good enough). It only makes sense to also do the same thing if Aga1 is dead.

The `FORCE_PYRAMID` SRAM flag was only ever set in `SetDeathWorldChecked`, which then branches immediately to the code that clears it so I removed that flag entirely.

Move the spawn on pyramid code from DarkWorldFlagSet to SetDeathWorldChecked, because it never actually ran in the first function, due to the previous observation.
 2018-03-13 16:57:43 -04:00