Commit Graph

957 Commits

Author SHA1 Message Date
f629bcb15a Merge branch 'main' into kara 2021-12-29 18:56:36 -08:00
02ea894a40 Add permanent ice physics bit 2021-12-29 18:52:38 -08:00
ac81fcbf0f Fix bee damage 2021-12-27 14:05:28 -08:00
265089cedb Fix moldorm/somaria issue and add both-canes mode 2021-12-22 00:29:56 -08:00
Lexi Rose
4eafefb501 Merge pull request #153 from spannerisms/master
Fix EG
2021-12-21 23:19:16 -06:00
6279f32fe3 Fix width of special cane freestanding sprites 2021-12-21 02:10:16 -08:00
843f1cad6f Prevent hitting stunned ganon in cane-mode with default vulnerability 2021-12-21 01:40:23 -08:00
c23b4ad5b2 Fix mothula/ganon breaking things (hopefully) 2021-12-20 19:02:02 -08:00
22b9c17f09 Remove bomb damage in cane modes 2021-12-20 17:37:49 -08:00
e210c85710 Add cane-only modes 2021-12-20 16:10:11 -08:00
spannerisms
04fa0fc1a1 match expected usage 2021-12-20 16:42:56 -05:00
e50641db11 Merge branch 'main' into kara 2021-12-20 01:35:56 -08: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
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
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
1ec9f22cea Shorten duration of boomerang stun 2021-11-10 00:08:57 -08:00
18a2214b23 Make boomerang in bomb-only mode stun enemies it would normally damage 2021-11-08 16:37:22 -08:00
f2a0cfc098 Fix bomb icons on file select/endgame screens 2021-11-07 23:58:06 -08:00
6565fbfd65 Show bomb level on file select screen in bomb-only mode 2021-11-07 19:32:57 -08:00
ae0a5c685a Unify handling of bomb colors in bomb-only mode 2021-11-07 00:28:28 -07:00
spannerisms
553821885f prevent transition 2021-11-01 06:58:30 -04:00
spannerisms
2b1a3566d8 flibber 2021-10-31 10:38:38 -04:00
c323a71340 Merge branch 'main' into kara 2021-10-30 16:37:59 -07:00
Thomas Prescott
7f749e9578 Merge pull request #148 from spannerisms/master
Major Glitches
2021-10-30 17:20:00 -05:00
Thomas Prescott
71ae648137 Merge pull request #149 from KatDevsGames/tcprescott-remove-zsnes-graphic
Remove ZSNES graphic
2021-10-30 17:19:52 -05:00
f3e0def5a2 Allow early detonation of bombs and add build flag to remove static RNG 2021-10-30 09:02:57 -07:00
1fcde00d09 Merge remote-tracking branch 'kara/pseudoswords' into kara 2021-10-12 13:31:37 -07:00
Thomas Prescott
798af49215 Update LTTP_RND_GeneralBugfixes.asm 2021-10-05 17:02:24 -05:00
Thomas Prescott
4ec6acfae7 Remove ZSNES graphic
This graphic takes up too much space.  Instead if the check fails just do a STP and don't include any of the ZSNES graphics.  If we want to add some other message here later we can, but it's more of a nice to have than a necessity.
2021-10-05 14:11:55 -05:00
123dcddc94 Merge branch 'main' into kara 2021-09-21 11:50:40 -07:00
spannerisms
501699e401 oops 2021-09-18 08:07:45 -04: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
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
Catobat
086230bb8c Fix check for wild maps 2021-08-28 04:01:28 +02:00
7c8ef3afce Merge branch 'main' into kara 2021-08-26 08:39:23 -07: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
Thomas Prescott
bd16b9ff92 Add Pleasure to credits
Credit the creator of the website logo
2021-08-21 07:43:23 -05:00
spannerisms
03c287a988 jingle jangle 2021-08-11 06:30:52 -04:00