Commit Graph

108 Commits

Author SHA1 Message Date
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
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
Catobat
99da1d3115 Reset boss RNG and other things on new file 2020-12-16 18:04:37 +01: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
0dba58c194 Support for Mirror Scroll
DR Hud Additions
2020-10-30 16:26:28 -06:00
KatDevsGames
9c9925fdda Merge pull request #75 from JonHanon/starting-menu-fix
Starting File Menu Fix
2020-09-21 02:14:47 -04:00
randall.rupper
233afa1e38 Chest Key counters 2020-09-18 11:06:02 -06:00
aerinon
397da02e3f Converted file to tabs for consistency 2020-08-28 12:23:27 -06:00
aerinon
d58fa5d5b7 Starting keys accounted for 2020-08-28 12:15:31 -06: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
Bonta-kun
af4c84c1aa fix unusable infinite bombs with empty inventory 2020-06-08 09:24:36 -07:00
Bonta-kun
ddd456c04e multiworld 2020-06-08 09:19:18 -07:00
Kat
c1628dcb0e various 2020-02-04 19:40:33 -05:00
qwertymodo
f18d003a2b Change GT2 music to only play upstairs 2019-10-12 13:04:45 -07:00
Jonathan Hanon
a939bfcdbc Starting File Menu Fix
Copy starting equipment swaps to file select screen
2019-09-19 20:52:20 -04:00
qwertymodo
7dbe893eeb Merge branch 'musicstuff' 2019-08-28 12:55:58 -07:00
qwertymodo
fd7d2bba3a MSU-1 fixes and updates 2019-08-28 10:26:00 -07:00
sporchia
3fe95e2f1f preopen GT flag
also "corrected" some build errors
2019-08-24 08:50:25 -04:00
qwertymodo
5a9368fbd5 Typo 2019-08-21 19:02:01 -07:00