Commit Graph

126 Commits

Author SHA1 Message Date
4817fa2013 Fix up labels
still WIP

still do not use
2022-09-18 18:11:21 -07:00
6f138825d9 Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
WIP, Broken, Do Not Use
2022-09-18 17:36:49 -07:00
cassidoxa
9c41ffb55b Merge branch 'sram_rework' into dr_sram 2022-04-20 00:30:35 -04:00
7da5e6257a Merge branch 'OWMain' of github.com:codemann8/z3randomizer into overworld_kara 2022-02-11 13:36:00 -08:00
cassidoxa
3c6c45ddb4 Fix some mangled labels 2022-02-03 22:01:34 -05:00
cassidoxa
3e2362b7ca Implement initial SRAM table
Data in initialsramtable.asm gets copied to SRAM on save file init
Frontend will be responsible for setting this, requires frontend changes
Changed some label names to disambiguate WRAM and SRAM labels
Deleted open mode
2022-02-03 20:25:32 -05:00
codemann8
98949be9bc Changed GT/AT swap in Mixed OW to prioritize leaving AT vanilla unless GT is the only one in the starting world 2022-02-03 06:13:13 -06:00
cassidoxa
c048589c02 Add static file name feature by special request
Move compass count ram init to compasses.asm
Rename WRAMEquipment and SRAMEquipment to EquipmentWRAM/SRAM
2022-02-02 16:51:50 -05:00
cassidoxa
6c4acb1e5b Check new value in SRAM to determine if Aga 2 duck comes
Added pushpc/pullpc to sram.asm
2022-01-19 20:17:02 -05:00
codemann8
fdea61fbf3 Added Starting OW Flag Table 2022-01-13 22:09:01 -06:00
codemann8
b5e313d709 Added Starting OW Flag Table 2022-01-13 21:56:03 -06:00
aerinon
c88a301708 Merge branch 'master' into DRMain
# Conflicts:
#	tables.asm
2022-01-05 14:26:48 -07:00
cassidy
c8ea2c6dce Move compass counts to ROM and trackable RAM
Add flag if compass HUD count has been displayed in SRAM
Move low hearts fix from tables.asm to bugfixes.asm
Rearrange dungeon stats in SRAM to match door rando ROM
2021-12-16 17:19:55 -05:00
cassidy
6c9b33ed93 Write macro for SRAM assertions
Change some label names to be clearer
Fix some of the progress flags and dungeon bitfields
2021-12-16 17:19:55 -05:00
cassidy
9e2382cbb2 Add absorbed keys
Adjust service request stuff
Change chest keys to "collected" keys
2021-12-16 17:19:55 -05:00
cassidy
fa76b61df0 Change addresses to labels and remove SRAM trace calls 2021-12-16 17:19:54 -05: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
69a669e16e Merge branch 'OWMain' into overworld_kara 2021-11-08 00:09:02 -08:00
2fd459d8ca Show bomb level on file select screen in bomb-only mode 2021-11-07 19:32:27 -08:00
918eefc3bd Minor fixes 2021-11-07 19:31:53 -08:00
codemann8
ff6a553a0d Fake flipper autokill reversal 2021-11-01 10:59:37 -05:00
spannerisms
2b1a3566d8 flibber 2021-10-31 10:38:38 -04:00
82c5190f63 Merge branch 'OWMain' into overworld_kara 2021-10-30 11:55:08 -07:00
aerinon
415e2cae41 Merge pull request #15 from spannerisms/master
Quadrant glitch fix
2021-10-21 16:09:45 -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
spannerisms
501699e401 oops 2021-09-18 08:07:45 -04:00
0816bb7cab Merge branch 'fix_ohko' into overworld_kara 2021-08-09 15:33:03 -07:00
230b15a294 Fix OHKO mode 2021-08-09 15:30:16 -07:00
f14fea3699 Merge branch 'main' into overworld_kara 2021-08-02 19:00:13 -07:00
spannerisms
187c2aa4a2 always fix 2021-07-29 09:44:21 -04:00
spannerisms
df66369f17 hopefully fix that text bug 2021-07-29 09:43:08 -04:00
2c931527e9 Merge branch 'DRMain' into overworld_kara 2021-07-08 19:39:10 -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
01abf889d7 Merge branch 'main' into overworld_kara 2021-07-01 23:02:23 -07:00
b3d649a0fb Add bomb-only mode 2021-06-29 16:43:01 -07:00
KatDevsGames
69ec104027 Merge pull request #131 from Bonta0/chestturns
Credits: Add chest turns counter
2021-06-28 11:47:01 -05:00
KatDevsGames
49f1f49ccb Merge pull request #127 from Bonta0/escapeassist
Events: Fix unusable infinite bombs with empty inventory
2021-06-28 11:06:51 -05:00
Bonta
d3db31b05e Events: Fix unusable infinite bombs with empty inventory 2021-06-24 23:12:58 +02:00
aerinon
e9aec2ba86 Merge branch 'master' into DRMain
# Conflicts:
#	LTTP_RND_GeneralBugfixes.asm
#	hooks.asm
2021-06-22 13:12:07 -06:00
Bonta
cc12372627 Stats: Track chest turns 2021-06-22 02:31:52 +02:00
cassidy
77f742b25c Rewrite to handle electro palette, leave bunny alone
Should fix bunny issues
Big thank to kara for report, assistance, and testing
2021-06-14 13:14:38 -04:00
aerinon
5672e2f090 Merge branch 'master' into DRMain 2021-05-24 14:52:26 -06:00
Kat
47e52d3fb2 cucco storm 2021-05-14 14:17:11 -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
b95923fb9a Merge branch 'master' into master 2021-04-03 00:31:23 -04:00
spannerisms
33dbe3003c Update events.asm
just JMLs here
2021-03-24 08:20:08 -04:00
aerinon
8b622dd841 Multiclient flags
Multi Sprite Player set to skip progressive limits
2021-02-18 13:37:33 -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
Catobat
0c608c1380 Fix starting equipment on file select 2020-12-16 19:58:33 +01:00