aerinon
|
c88a301708
|
Merge branch 'master' into DRMain
# Conflicts:
# tables.asm
|
2022-01-05 14:26:48 -07:00 |
|
Thomas Prescott
|
c416bfa917
|
update credits
|
2022-01-03 12:29:04 -08:00 |
|
|
|
b2043ef15e
|
Adjust credits to match layout of base randomizer fork
|
2022-01-03 12:26:15 -08:00 |
|
Thomas Prescott
|
2a3d6fae58
|
update credits
|
2022-01-03 13:55:03 -06:00 |
|
|
|
74c55cf048
|
Merge remote-tracking branch 'codemann/OWMain' into overworld_kara
|
2022-01-01 15:30:19 -08:00 |
|
spannerisms
|
e78c41ef38
|
match expected usage
|
2021-12-29 18:58:15 -08:00 |
|
|
|
6db6733d80
|
Add permanent ice physics bit
|
2021-12-29 18:51:42 -08:00 |
|
|
|
8ffef89fb8
|
Fix bee damage
|
2021-12-27 14:04:20 -08:00 |
|
|
|
8c6d2ac26d
|
Fix moldorm/somaria issue and add both-canes mode
|
2021-12-23 22:13:30 -08:00 |
|
|
|
0f26e5aaa5
|
Fix width of special cane freestanding sprites
|
2021-12-23 22:13:30 -08:00 |
|
|
|
8a25dc9d52
|
Prevent hitting stunned ganon in cane-mode with default vulnerability
|
2021-12-23 22:13:30 -08:00 |
|
|
|
d2ad452170
|
Fix mothula/ganon breaking things (hopefully)
|
2021-12-23 22:13:30 -08:00 |
|
|
|
b1e3a7999c
|
Remove bomb damage in cane modes
|
2021-12-23 22:13:30 -08:00 |
|
|
|
53792aea25
|
Add cane-only modes
|
2021-12-23 22:13:26 -08:00 |
|
codemann8
|
d75325e1c5
|
Move mirror portal off screen during mirror bonk in Crossed OW
|
2021-12-22 10:51:26 -06:00 |
|
codemann8
|
0a4c624f2f
|
Move mirror portal off screen during mirror bonk in Crossed OW
|
2021-12-22 10:49:12 -06:00 |
|
Lexi Rose
|
4eafefb501
|
Merge pull request #153 from spannerisms/master
Fix EG
|
2021-12-21 23:19:16 -06:00 |
|
spannerisms
|
04fa0fc1a1
|
match expected usage
|
2021-12-20 16:42:56 -05:00 |
|
Lexi Rose
|
7dda06cf11
|
Merge pull request #152 from spannerisms/master
Bug Fix and MSU
|
2021-12-16 04:40:15 -06:00 |
|
spannerisms
|
42bc1d743a
|
Merge branch 'KatDevsGames:master' into master
|
2021-12-15 01:12:07 -05:00 |
|
spannerisms
|
aa6aaffd2f
|
prevent crashes
|
2021-12-15 01:11:26 -05:00 |
|
codemann8
|
9c3d85e360
|
Improvement to FF damage fix to insta-warp Link to destination once Link has exceeded the bounds of the current screen
|
2021-12-13 23:16:29 -06:00 |
|
Lexi Rose
|
df2bca00ee
|
Merge pull request #151 from cassidoxa/rom_version
Add ROM version to unused hw vector and before filename in SRAM
|
2021-12-07 15:18:24 -06:00 |
|
cassidy
|
c82edadadd
|
Change version defines to use ?= operator
Now these defines can be set via CLI, otherwise will be what they are in the file
|
2021-12-07 15:45:22 -05:00 |
|
cassidy
|
5fc5dc13b2
|
Add ROM version to unused hw vector and before filename in SRAM
Two 16 bit ints located at $FFE0 (0x7FE0 PC) in ROM and burned into SRAM
starting at $701FFC, just before the ROM name
|
2021-12-07 15:29:30 -05:00 |
|
codemann8
|
c3df5f6cb1
|
Fixed mirror portals showing in DW
|
2021-12-06 07:43:04 -06:00 |
|
|
|
0ab9095222
|
Merge branch 'OWMain' into overworld_kara
|
2021-11-29 00:04:13 -08:00 |
|
codemann8
|
a1fff4ff76
|
Fix mirror portals getting erased when changing worlds
|
2021-11-24 15:58:39 -06:00 |
|
codemann8
|
10ad8ab834
|
Fix mirror portals getting erased when changing worlds
|
2021-11-22 09:07:38 -06:00 |
|
codemann8
|
3262c6ff1a
|
Fix mirror portals getting erased when changing worlds
|
2021-11-20 00:34:57 -06:00 |
|
codemann8
|
9094d118df
|
Fixed Inverted Double-Swap issue
|
2021-11-14 17:08:06 -06:00 |
|
spannerisms
|
580bbb7c67
|
Merge branch 'KatDevsGames:master' into master
|
2021-11-12 09:26:40 -05:00 |
|
spannerisms
|
24f6a4d8a8
|
abcd
|
2021-11-12 09:25:43 -05:00 |
|
Lexi Rose
|
2fe5f0c126
|
Merge pull request #150 from spannerisms/master
Fake flippers softlock improvement
|
2021-11-10 16:38:49 -06:00 |
|
|
|
e96d802ed1
|
Shorten duration of boomerang stun
|
2021-11-10 00:08:35 -08:00 |
|
|
|
b515b59a38
|
Make boomerang in bomb-only mode stun enemies it would normally damage
|
2021-11-08 16:38:03 -08:00 |
|
|
|
69a669e16e
|
Merge branch 'OWMain' into overworld_kara
|
2021-11-08 00:09:02 -08:00 |
|
|
|
4896985493
|
Fix bomb icons on file select/endgame screens
|
2021-11-07 23:58:40 -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
|
7d80b8087a
|
Allow normal Link speed with Old Man if not in his cave or on WDM
|
2021-11-07 16:24:45 -06:00 |
|
|
|
2b241b2340
|
Unify handling of bomb colors in bomb-only mode
|
2021-11-07 12:47:13 -08:00 |
|
codemann8
|
2c6db075a9
|
Fixed boss music
|
2021-11-06 16:19:48 -05:00 |
|
codemann8
|
ad5b78b3d1
|
Preserve Sanc music change in Standard
|
2021-11-06 16:18:09 -05:00 |
|
codemann8
|
e8d5a9635d
|
Play Sanc music on arrival in Sanc in Standard
|
2021-11-06 16:17:37 -05:00 |
|
codemann8
|
15a381769c
|
Merge branch 'DRMain' into OWMain
|
2021-11-02 17:20:03 -05:00 |
|
codemann8
|
582abf3d32
|
Fixed boss music
|
2021-11-02 17:17:37 -05:00 |
|
aerinon
|
6757e35dca
|
Straight Stair fixes
|
2021-11-02 15:24:21 -06:00 |
|
codemann8
|
ff6a553a0d
|
Fake flipper autokill reversal
|
2021-11-01 10:59:37 -05:00 |
|
spannerisms
|
553821885f
|
prevent transition
|
2021-11-01 06:58:30 -04:00 |
|
