f6f6383913
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
2021-09-21 14:10:23 -07:00
fb4068a3e1
Merge branch 'main' into overworld_kara
2021-09-21 11:55:33 -07:00
codemann8
a30e459dbb
Merge branch 'DRMain' into OWMain
2021-09-17 10:54:00 -05:00
aerinon
cc502c7524
Removed stonewall pre-opens
2021-09-16 16:01:51 -06:00
KatDevsGames
1ef55470d5
Merge pull request #147 from cassidoxa/shield_overflow
...
Shield and Progressive Bow overflow
2021-09-14 13:37:48 -05:00
cassidy
aca809862d
utilities: Rewrite prog bow narrow sprite overflow to check sram
...
This uses Bonta's method which is more efficient and reliable when it
comes to bow state and potential mixture of progressive,
none-progressive, and silver arrows upgrade.
2021-09-08 01:00:55 -04:00
aerinon
f9e3bec5cb
Removed rails using a dynamic flag
2021-09-07 16:24:18 -06:00
cassidy
c37dcec6ea
utilities: refactor some JSL X : RTL into JMP X
2021-09-06 20:20:12 -04:00
cassidy
9f1933d8c0
utilities: Progressive Bow overflow narrow sprites
2021-09-06 20:16:41 -04:00
cassidy
bbc8228175
utilities: Fix shields overflowing with narrow sprites
2021-09-06 17:21:48 -04:00
Thomas Prescott
0a93c3fa00
Merge pull request #146 from Catobat/PrizeIndicator
...
Fix check for wild maps
2021-09-04 16:09:27 -05:00
codemann8
200c1ff334
Merge branch 'DRMain' into OWMain
2021-08-31 19:21:19 -05:00
aerinon
07a3a9ad03
Catobat map fix
...
Cutoff table updated
Mutliworld mem location added for item ids
2021-08-31 15:35:19 -06:00
Catobat
086230bb8c
Fix check for wild maps
2021-08-28 04:01:28 +02:00
42002ae839
Merge branch 'main' into overworld_kara
2021-08-26 08:44:15 -07:00
codemann8
53dd7ba820
Fix for TR Pegs issue when fluting direct to TR from a screen with hammerpegs
2021-08-26 00:53:02 -05:00
codemann8
5d6d509bd9
Update Crossed OW to only perform Link/Bunny state changes when world changes
2021-08-26 00:51:41 -05:00
codemann8
fe24f6f865
Play SFX on crossworld transition in Crossed OW
2021-08-25 02:21:56 -05:00
qwertymodo
48d9a7d4bc
Fix SPC un/mute race condition
...
Should fix mothula hardlock, for real this time
2021-08-23 11:24:24 -07:00
KatDevsGames
af8a47e743
Merge pull request #144 from spannerisms/master
...
Fix jingle glitch
2021-08-21 23:46:53 -05:00
Salvatore
9ebde3e5b7
Merge pull request #145 from KatDevsGames/tcprescott-patch-1
...
Add Pleasure to credits
2021-08-21 20:59:46 -04:00
codemann8
9b48a88df6
Retain Link state on transition unless bunny in Crossed OW
2021-08-21 18:02:59 -05:00
codemann8
aed1506114
Fixed issue with waterwalking in Crossed
2021-08-21 15:16:21 -05:00
Thomas Prescott
bd16b9ff92
Add Pleasure to credits
...
Credit the creator of the website logo
2021-08-21 07:43:23 -05:00
codemann8
11be05c65a
Fix Bunny/Lonk issues in Crossed OW
2021-08-20 22:47:17 -05:00
codemann8
f7525866c7
Fixed Flute crash
2021-08-20 20:43:48 -05:00
codemann8
a8e119285e
Actually fixed Mixed flag problems
2021-08-19 21:53:26 -05:00
codemann8
58bf92ba04
Moved OW flag checks to global variable
2021-08-19 20:01:48 -05:00
codemann8
94a987f23f
Fixed missing OW flag check changes
2021-08-19 18:47:29 -05:00
codemann8
ad8c4e8e70
ROM changes to support Crossed OW changes
2021-08-16 22:52:04 -05:00
codemann8
1210264294
Changed LW2 track in MSU-1 to play after Aga1 kill instead of ped pull
2021-08-11 06:04:09 -05:00
codemann8
c399f8c77b
Separated ambient SFX from music track selection
...
Fixes issue with ambient SFX stopping and starting
2021-08-11 05:53:27 -05:00
spannerisms
03c287a988
jingle jangle
2021-08-11 06:30:52 -04:00
KatDevsGames
910d63e886
Merge pull request #143 from spannerisms/master
...
fix quadrant glitch hopefully
2021-08-10 15:13:32 -05:00
KatDevsGames
9067790b20
Merge pull request #141 from compiling/master
...
Fix clearing frog/smith in inverted mode
2021-08-10 15:13:23 -05:00
KatDevsGames
f69a33aed0
Merge pull request #142 from ardnaxelarak/fix_ohko
...
Fix OHKO mode
2021-08-10 15:13:13 -05:00
KatDevsGames
f18eac796c
Merge pull request #140 from cassidoxa/escape_drop_rng
...
rngfixes: make enemy drop rng static during the standard escape sequence
2021-08-10 15:13:04 -05:00
spannerisms
7057d984e2
fix quadrant glitch hopefully
2021-08-10 09:56:57 -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
compiling
e2e4db8237
Fix clearing frog/smith in inverted mode
2021-08-08 14:13:40 +10:00
a12b5a9188
Merge branch 'OWMain' into overworld_kara
2021-08-02 19:00:33 -07:00
f14fea3699
Merge branch 'main' into overworld_kara
2021-08-02 19:00:13 -07:00
cassidy
fd490cab9a
rngfixes: make enemy drop rng static during the standard escape sequence
...
This only applies between picking up the Uncle item and dropping off
zelda, not rain state in general
2021-08-02 21:06:13 -04:00
codemann8
06a7b7bead
Fixed SW MSU track to play regardless of world
2021-08-02 04:20:02 -05:00
codemann8
677ad64419
Rewrote music calculation
2021-08-01 23:41:24 -05:00
KatDevsGames
39441eb0a6
Merge pull request #139 from spannerisms/master
...
Bug fix
2021-07-30 20:47:55 -05: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
codemann8
634764d4fc
Merge branch 'DRMain' into OWMain
2021-07-28 16:24:02 -05:00