Commit Graph

1522 Commits

Author SHA1 Message Date
spannerisms
014b3a719a fix things 2024-01-04 06:45:57 -05:00
Randall Rupper
8c080c81a6 refactor: clarify StandardAgaDmg code paths 2024-01-03 11:06:00 -07:00
KrisDavie
660674c051 Add toggle to override aga1 invulnerability in standard 2024-01-03 10:53:22 -07:00
Randall Rupper
553fb272a0 fix: remove terrorpin ai code 2024-01-03 10:32:47 -07:00
Randall Rupper
97f3c527b0 fix: shopsanity repeatable item fix 2024-01-02 17:57:33 -07:00
Lexi Rose
85581b6813 Merge pull request #212 from cassidoxa/bonkkey
Update HUD when picking up bonk key
2024-01-02 11:33:56 -06:00
cassidoxa
cec4e0430b Fix narrow heart piece sprite shadow flickering 2024-01-02 00:26:12 -05:00
cassidoxa
d81a19c367 Update HUD when picking up bonk key 2024-01-01 22:29:14 -05:00
Lexi Rose
88ef1f385d Merge pull request #211 from cassidoxa/prize_ancilla
Fix dungeon prize ancilla spawn regression
2023-12-28 03:36:58 -06:00
cassidoxa
7001767c9b Fix dungeon prize ancilla spawn regression 2023-12-27 11:39:00 -05:00
Randall Rupper
55f18eb108 fix: potential fix for Trinexx 2023-12-14 10:13:07 -07:00
Lexi Rose
7116cb6557 Merge pull request #210 from cassidoxa/bonkkey
Fix bonk key double count
2023-11-30 02:29:03 -06:00
cassidoxa
85e338ad67 Fix bonk key double count 2023-11-30 00:42:55 -05:00
Randall Rupper
9ac2156945 fix: MW item substitution 2023-11-22 13:13:44 -07:00
Randall Rupper
687f6b25bd Build script update 2023-11-15 15:10:25 -07:00
Randall Rupper
81cbc5d2ed Ignore 2023-11-15 15:10:25 -07:00
Randall Rupper
52325979a7 fix: YA Hera Boss music fix 2023-11-15 15:10:19 -07:00
Randall Rupper
79bdace3b3 fix: disable flute in rain state (except glitched modes)
fix(msu): GTBK music in DR
2023-11-15 14:49:29 -07:00
Randall Rupper
62356f0159 fix: disable flute in rain state (except glitched modes)
fix(msu): GTBK music in DR
2023-11-15 14:30:44 -07:00
aerinon
f7f558cd59 Don't double count torch item. (AddInventory/Link_ReceiveItem now count properly.) Update the hud when a key is absorbed off the torch. Link_ReceiveItem already does this. 2023-10-11 12:21:06 -06:00
aerinon
8c384ff123 Be more proactive about which sprites to move 2023-10-06 10:40:05 -06:00
aerinon
f3768ea0ad Fix problems with mystery hidden item total
Upgrade blue enemy drop indicator to work with caves
2023-09-26 13:31:34 -06:00
Lexi Rose
032d15fba6 Merge pull request #209 from tcprescott/patreon
Names for Patreon Supporters
2023-09-22 23:43:22 -05:00
Thomas Prescott
f133ce7159 add some extra space 2023-09-22 23:09:35 -05:00
Thomas Prescott
c5d8c69396 fix PC addresses for patrons 2023-09-22 22:49:57 -05:00
Thomas Prescott
f71759754e patreon fields 2023-09-22 21:49:50 -05:00
aerinon
3f0082a771 Fix merge error on hera boss music 2023-09-20 13:39:19 -06:00
aerinon
4eaa214626 Merge branch 'DRUnstable' into DRVolatile
# Conflicts:
#	hooks.asm
#	music.asm
#	newhud.asm
2023-09-20 13:34:52 -06:00
aerinon
1290751307 Merge branch 'Catobat-TavernFix' into DRUnstable 2023-09-20 13:31:03 -06:00
aerinon
a8a1eaa1b9 Fix for counter rolling over
Fix for Lamp for another player being substituted with standing items
Fix for received keys not being counted correctly
Fix for pendants counting as items
2023-09-20 12:54:44 -06:00
Lexi Rose
507ba379cf Merge pull request #208 from cassidoxa/v31.2.0-fixes
Don't increment highest mail on final stats prep
2023-09-17 13:30:02 -05:00
cassidoxa
334f721a29 Don't increment highest mail on final stats prep 2023-09-17 12:02:54 -04:00
aerinon
c0dff8e7c9 Bugfixes for duping/disappearing item and mutliworld crash 2023-09-13 14:28:18 -06:00
aerinon
b831dd29a5 Turn off enemy drop indicator based on flag 2023-09-12 10:10:42 -06:00
aerinon
5ad0e7781e Pikit override fix
Minor drops from enemies persist
2023-09-12 08:38:18 -06:00
Lexi Rose
0fdb6ed133 Merge pull request #207 from cassidoxa/v31.2.0-fixes
Add time stamp for tossed fighter sword item
2023-09-10 01:31:32 -05:00
cassidoxa
cc36ccc0b1 Add time stamp for tossed fighter sword item 2023-09-10 00:55:03 -04:00
aerinon
23ef62522b Fix potion refills counting in shops
Bee traps - graphics upgrade
2023-09-09 16:41:44 -06:00
aerinon
b67e5c8433 Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	npcitems.asm
2023-09-09 13:13:18 -06:00
aerinon
a723fe2865 VRAM standing items 2023-09-09 13:12:05 -06:00
Lexi Rose
fcbde59a1e Merge pull request #206 from cassidoxa/v31.2.0-fixes
Fix HUD rebuild when releasing fairy
2023-09-09 04:21:01 -05:00
aerinon
f916346747 Stumpy bugfix 2023-09-08 14:55:25 -06:00
aerinon
2561737236 Merge remote-tracking branch 'baserom/master' into MergeDecompression
# Conflicts:
#	inventory.asm
#	newhud.asm
2023-09-08 13:49:16 -06:00
cassidoxa
70758bf5c0 Set silvers bit with silvers restriction 2023-09-08 15:43:31 -04:00
aerinon
e772b4a931 Progressive Shields fix
Fix for collection rate overflow
Fix for progressive shield standing item (narrow version)
Fix for double key counts
Multiworld item substitution
Made map key coutner not depend on new flag for now
2023-09-08 13:42:22 -06:00
cassidoxa
f6842204d0 Fix BowTracking docs 2023-09-08 15:30:37 -04:00
cassidoxa
8af9c17cfe Fix stumpy double item 2023-09-08 13:57:26 -04:00
cassidoxa
57e537f12d Fix HUD rebuild when releasing fairy 2023-09-08 08:56:23 -04:00
Lexi Rose
bc3dd5c186 Merge pull request #205 from cassidoxa/v31.2.0-fixes
Fix HUD item icon not refreshing after last bomb spent
2023-09-08 02:30:29 -05:00
cassidoxa
71e86f7c1a Set our hud update flag on quickswap 2023-09-08 00:35:06 -04:00