Commit Graph

38 Commits

Author SHA1 Message Date
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
Kevin Cathcart
29b44e4167 Create a flag to toggle off Fake Worlds
Add a new rom flag to disable fake Light/Dark worlds from occurring as a
result of underworld travel. (Other methods of fake worlds like YBA Fake
Flute are not changed).

Entrance Randomizer intends to use this flag to fix the Fake Light world
from traveling though sewers when Hyrule Castle is in the dark world, as
well as to implement new shuffle modes that involve deliberate
cross-world caves without needing to grant pearl and mirror like the
current insanity mode does.
2018-01-20 13:42:10 -05:00
sporchia
232828b9cb move this to a safer spot
fixes #12
also remove merge conflict resolution code
2017-11-13 09:27:43 -05:00
Karkat
1e00f59580 let's dev oct 8 2017
Fix map icons for keysanity map mode
Pyramid spawn fixes
Quick item menu option
2017-10-08 23:08:12 -04:00
Karkat
c2e5fca01c let's dev sep 15th 2017
added logic to synchronize dungeon key stats
moved keysanity table init to menu init so it comes in pre-rendered
2017-09-15 23:59:52 -04:00
Karkat
056a07bc4d Merge branch 'master' into crystalsgoalganonrespawn 2017-09-07 13:28:39 -04:00
Karkat
4a17e97a2e let's dev aug 8 2017
fixed pyramid spawn issue (again)
fixed freedstanding display for progressive swords and progressive shields
2017-08-08 23:27:37 -04:00
LLCoolDave
dfc22ffa8f Add GanonPyramidRespawn flag at 0x180170 to enable/disable respawning on Pyramid after Death to Ganon. Useful for Entrance Randomizer with shuffled Ganon or Plandomizer. 2017-08-03 18:49:17 +02:00
Karkat
178454205d pyramid fix? 2017-07-26 23:50:20 -04:00
Karkat
b97435d4a1 bugfix
clear pyramid flag
2017-07-01 01:55:16 -04:00
Karkat
c2af675e47 let's dev 7/1/17
asterisk pendant
flipperkill ignore fairies
added secret sfx to digging game prize reveal
updated pyramid spawn logic
2017-07-01 00:10:57 -04:00
Karkat
5feaf1b122 let's dev 6/20/17
(probably) fixed glitched pyramid spawn issue
fixed sanctuary purple chest spawn
added switch to allow tablets to be opened with hammer (graphics not ready but looks ok)
2017-06-20 21:55:41 -04:00
Karkat
aeb329d28e let's dev 5/26/2017
dwarf s&q spawn
invincible ganon switch
2017-05-26 00:08:29 -04:00
Karkat
f755a63925 initial checkin 2017-05-17 13:00:32 -04:00