alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity
2,082 Commits 7 Branches 1 Tag
beta
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
aerinon 9779f91ce9 Fix dungeon completion bitfield (16-bit) 2022-05-19 10:36:20 -06:00
aerinon 003278f7e0 Fix dungeon completion bitfield 2022-05-18 14:52:47 -06:00
aerinon 15cc72c1e0 Correct the width on the AND for MaybeFlagCompassTotalPickup 2022-05-18 14:52:34 -06:00
aerinon db2fe4cf39 Fix compass compare 2022-05-17 13:05:34 -06:00
aerinon 4cdd41dbf5 Fix for standing item, all enemy drops and pot item converted to new system 2022-05-03 13:51:11 -06:00
aerinon 5863f9783f Minor fix up on CrystalPendantFlags_3 2022-04-30 15:20:53 -06:00
aerinon 675d68175c Delete test file 2022-04-28 16:39:06 -06:00
aerinon 55970bdff9 Delete test file 2022-04-28 16:38:50 -06:00
aerinon 326b8f294e Shifted uppercase font. 
Used FEATURE_NEW_TEXT flag
 2022-04-28 16:09:12 -06:00
aerinon 3685d8194e SRAM fix for MultiClient. Only set SRAM flag on locations that count toward collection rate. 
Shifted uppercase font.
 2022-04-28 16:06:31 -06:00
aerinon 6def39ff58 Add lowercase letters to credits end screen 2022-04-27 14:16:24 -06:00
aerinon 71d26eb109 Lowercase font 2022-04-27 14:14:54 -06:00
aerinon 0960dcaac9 Merge branch 'master' into DRVolatile 2022-04-27 13:50:42 -06:00
aerinon eb0bc2b7f6 Moved doorrando code. Fixed a multiclient issue with pot switches. 2022-04-27 13:47:12 -06:00
aerinon f0b767885c Fix bug with .checkAga2 in overworld map with new SRAM constants 2022-04-26 12:16:07 -06:00
aerinon e088a040f8 Merge branch 'dr_sram' of https://github.com/cassidoxa/z3randomizer into cassidoxa-dr_sram 
# Conflicts:
#	hooks.asm
#	menu/overworldmap.asm
#	music.asm
 2022-04-26 11:57:51 -06:00
aerinon 53f723a196 Letters/Crystal numbers 2022-04-21 15:42:32 -06:00
aerinon 4b68406be0 Merge branch 'DRUnstable' into DRVolatile 2022-04-20 13:56:31 -06:00
aerinon a017c98c4e Map bug with prizes 2022-04-20 09:07:59 -06:00
aerinon e8f06f2da6 Pottery fix for vanilla hera key 2022-04-20 08:52:01 -06:00
aerinon 3114223a04 Can force the drawing algorithm to skip 2022-04-19 14:35:16 -06:00
aerinon f6015a8569 New colorized pot and bitfields 2022-04-19 14:04:12 -06:00
aerinon d116249412 Merge branch 'DRUnstable' into DRVolatile 2022-04-13 13:32:31 -06:00
aerinon 4239e7204e Check Aga2's boss defeat flag instead of pyramid hole 
New flag on compass mode to indicate maps should be used instead for showing the location
 2022-04-13 13:30:15 -06:00
aerinon 281beeeb58 Switch standing item gfx to a different slot 
Rain state fix
 2022-03-29 14:29:04 -06:00
aerinon 93fe175cab Don't delete hammer when hammer dashing through pots and the sprite limit is reached 
Hook for frozen enemies killed with hammer (if there's an item they won't automatically drop the freeze prize now)
 2022-03-23 14:24:36 -06:00
aerinon c687157882 Fix the Y index for ShouldCountNormalPot 2022-03-08 08:53:23 -07:00
aerinon 60026bea50 Pottery refinements 2022-03-07 10:44:53 -07:00
aerinon 66657eb956 Missed a line 2022-03-04 17:56:07 -07:00
aerinon a0ebf72d59 Lifting normal pots increases location count 
Pot despawn protection
Hud updates
 2022-03-04 15:24:22 -07:00
aerinon c83185c1b2 Minor bug fix 2022-02-24 14:04:33 -07:00
aerinon 2c8299bac3 Standing item key for hera basement cage 2022-02-15 12:13:29 -07:00
aerinon fe66c67d07 Fixing up the hud to indicate Pendant/Crystal etc 2022-02-15 12:12:42 -07:00
aerinon a80171ba9b Revert SRAM changes (not yet ready) 2022-02-10 08:37:05 -07:00
aerinon 57dec5651f Merge branch 'DRMain' into DRUnstable 2022-02-09 14:34:58 -07:00
aerinon 5bd4d36cd9 Fix for standing item palette 2022-02-09 14:17:42 -07:00
aerinon e8b85e4815 Lowercase item text 2022-02-09 10:06:16 -07:00
aerinon 93fe72466d Merge branch 'master' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
#	music.asm
 2022-02-09 09:59:56 -07:00
aerinon 7db582d894 Moved SRAM to reserved locations 2022-02-09 09:02:17 -07:00
aerinon 725f6c110a Couple of fixes for Standing Items counts and generic keys in caves 2022-01-24 16:06:04 -07:00
aerinon 3c9b04f30a Fixed up the anti-soft lock in swamp 
Combined flags and fixed a couple of bugs
 2022-01-21 16:07:03 -07:00
aerinon 50dd0c7be4 Fixing bugs with pottery lottery 2022-01-13 15:03:20 -07:00
aerinon 149f19df83 Merge branch 'DRVolatile' into Potsanity 2022-01-06 16:08:02 -07:00
aerinon 8698c3e109 Merge branch 'DRMain' into DRVolatile 2022-01-06 16:04:08 -07:00
aerinon 7bf2a259a4 Merge remote-tracking branch 'origin/DRMain' into DRMain 2022-01-05 14:32:48 -07:00
aerinon fc5e6191eb Merge remote-tracking branch 'origin/DRMain' into DRMain 2022-01-05 14:29:03 -07:00
aerinon c88a301708 Merge branch 'master' into DRMain 
# Conflicts:
#	tables.asm
 2022-01-05 14:26:48 -07:00
aerinon e5d3ebf3cd Minor potsanity refinements 2022-01-04 15:49:00 -07:00
aerinon 7cf57a7a37 Merge branch 'DRVolatile' into Potsanity 2021-12-16 16:03:23 -07:00
aerinon 6821648443 potsanity advancement 2021-12-16 16:03:10 -07:00
aerinon f19b65b86c Merge branch 'DRMain' into DRVolatile 2021-11-02 15:29:20 -06:00
aerinon 6757e35dca Straight Stair fixes 2021-11-02 15:24:21 -06:00
aerinon 85d799ba67 Merge branch 'DRMain' into DRVolatile 2021-10-21 16:35:09 -06:00
aerinon 620c672fe1 Turn off Terrorpin AI fix by default - can be a post-gen option 2021-10-21 16:18:51 -06:00
aerinon f95bce282b Removed some comment cruft 2021-10-21 16:15:34 -06:00
aerinon 9bf662642b Merge branch 'DRMain' into OverworldMapRefactor 2021-10-21 14:53:55 -06: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
aerinon aee5fe506a Standing items start 2021-10-21 14:11:57 -06:00
aerinon c503e3eb61 Overworld Map Refactor 2021-10-21 14:05:59 -06:00
aerinon 319aba5e4d EG disarmament on mirror 2021-10-05 14:15:38 -06:00
aerinon cc502c7524 Removed stonewall pre-opens 2021-09-16 16:01:51 -06:00
aerinon f9e3bec5cb Removed rails using a dynamic flag 2021-09-07 16:24:18 -06:00
aerinon 07a3a9ad03 Catobat map fix 
Cutoff table updated
Mutliworld mem location added for item ids
 2021-08-31 15:35:19 -06:00
aerinon 15337a1382 Collection Rate moved to arbline marco 2021-07-23 09:14:43 -07:00
aerinon 9861c76d23 Minor refactor to keep dr hooks in DR 2021-07-23 09:13:35 -07:00
aerinon bfbe3fbcc0 Addition to Cutoff room table 2021-07-15 10:33:47 -07:00
aerinon 641ec0ffa0 Minor fix to credits 
Default to AgaDoor to Std/Open state
 2021-07-13 10:51:01 -07:00
aerinon aee82fa319 Merge branch 'master' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	events.asm
#	hooks.asm
#	stats.asm
#	stats/creditsnew.asm
#	stats/statConfig.asm
#	swordswap.asm
#	utilities.asm
 2021-07-07 11:15:11 -07:00
aerinon e9aec2ba86 Merge branch 'master' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
 2021-06-22 13:12:07 -06:00
aerinon 717434bd88 Bank notes added 2021-06-22 13:05:40 -06:00
aerinon 050ce5e20e Changes from DR 0.4.0.6 2021-06-04 17:02:23 -06:00
aerinon c7a4d817c0 Changes from DR 2021-05-24 15:12:09 -06:00
aerinon 5672e2f090 Merge branch 'master' into DRMain 2021-05-24 14:52:26 -06:00
aerinon ce58e22496 Fix a minor typo that makes Ganon invincible 2021-05-14 16:50:35 -06:00
aerinon e9a376d92a Bugfixes 2021-05-14 16:49:49 -06: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
aerinon d015310e4d Blind boss checks for maiden sequence 2021-02-27 15:30:28 -07:00
aerinon f6cc3607df Refactored Potion shop hooks to allow old behaviors 2021-02-22 14:48:10 -07:00
aerinon 8b622dd841 Multiclient flags 
Multi Sprite Player set to skip progressive limits
 2021-02-18 13:37:33 -07:00
aerinon ddf56a9ed1 Merge branch 'DRMain2' into DRMain 2021-02-18 13:13:44 -07:00
aerinon 5f1ea34646 Final fix for counting hera key 2021-02-17 11:52:10 -07:00
aerinon 4ae59ad1e6 Double count hera basement cage in keydropshuffle 2021-02-17 11:50:51 -07:00
aerinon 9d607b7caa Inverted fix - no longer a bunny in DW sanc 
Standard fix - can't kill Aga1 before rescuing Zelda
Total locations to check set on file load, and displayed in HUD
 2021-02-16 13:36:44 -07:00
aerinon d15dc91db4 Fix for BallnChain guard when keydropshuffle is off 2021-02-13 20:48:51 -07:00
aerinon 9b33530dba Merge branch 'DRStairFix' into DRMain2 2021-02-13 20:45:24 -07:00
aerinon c9d42587a4 Merge branch '16_bit_collection_rate' of https://github.com/CaitSith2/z3randomizer into InvCountMerge 2021-02-13 20:44:25 -07:00
aerinon 7fee6ce440 Merge branch '16_bit_collection_rate' of https://github.com/CaitSith2/z3randomizer into InventoryCountMerge 2021-02-12 20:45:59 -07:00
aerinon 2f5b555e0e Merge branch 'DRMain' into ShopBranch 2021-02-02 14:42:03 -07:00
aerinon 96d7a6a9ae Merge branch 'InventoryCount' into DRMain 2021-02-02 10:12:44 -07:00
aerinon a63aa6f5fe Shop fixes 2021-02-01 16:29:09 -07:00
aerinon 2a08959229 Shop counting items 2021-02-01 10:11:38 -07:00
aerinon b1d4ef3252 Merge branch 'InventoryCount' into ShopBranch 2021-01-29 15:13:14 -07:00
aerinon 05e7f8eb96 Ported over pepper's shop code 2021-01-29 13:55:13 -07:00
aerinon a9bddea1b4 Change how hera basement key is counted to not count Byrna 2020-12-09 14:28:12 -07:00
aerinon b3fcd2192e Some DR changes (outdoor check for hub and keydrop correct KeyTable address) 
Shop VRAM issue investigated but not solved
 2020-12-08 10:57:37 -07:00
aerinon 443070fe2c Merge branch 'ChestKeyCounter' into DRMain 
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	build.sh
#	darkworldspawn.asm
#	events.asm
#	itemdowngrade.asm
#	shopkeeper.asm
#	stats.asm
 2020-11-30 09:34:18 -07:00
aerinon be3960bedb Hera basement key fix 
Combine HC/Sewer chest key count into one variable
 2020-11-30 09:27:47 -07:00
aerinon 264e9f337d Keysanity menu bug fix 2020-11-20 13:57:49 -07:00
aerinon 6c7f5e46a3 Support for GT Big Key Credit 
Support for Rain state prevention without rails
 2020-11-19 16:27:47 -07:00
aerinon 94561e01c2 Bugfixes for lobby stuff 2020-11-12 12:18:23 -07:00