codemann8
2e541a8778
GitHub sucks, so heres a merge commit
2024-03-01 14:03:23 -06:00
codemann8
a008406fde
Implmented New Item GFX System
2024-03-01 14:00:10 -06:00
codemann8
59eb254116
Merged in DR v1.4.1.6
2024-03-01 13:55:23 -06:00
codemann8
8135e9085f
Merged in DR v1.4.1.6
2024-02-23 11:42:02 -06:00
codemann8
75fd81ab57
Merged in DR v1.4.1.6
2024-02-23 11:11:59 -06:00
aerinon
16d249859f
fix: issues around item substitution for harder difficulties
2024-02-07 15:15:22 -07:00
aerinon
ed8cefe0c6
fix: bad branch, bad org, dead code, bad args flags
2024-02-07 12:36:54 -07:00
codemann8
de5e83c172
Moving credits files to new location
2024-01-28 04:57:42 -06:00
aerinon
23f839cced
fix: swamola issue with cached sprites
...
refactor: move some hooks
2024-01-26 11:33:32 -07:00
aerinon
50dec603e2
fix: duplicate code
2024-01-25 11:04:16 -07:00
aerinon
fc08fa33c8
Merge branch 'DRVolatile' into DRUnstable
2024-01-22 11:00:36 -07:00
aerinon
8d87e70e18
fix: shifted enemizer flag table defaults correctly
2024-01-17 13:11:01 -07:00
Randall Rupper
8654719572
feat: text speed up
...
refactor: code clean up
typo
2024-01-16 16:20:33 -07: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
codemann8
3b3a153ebe
Adding sparkles to Bonk Drop locations
2023-12-31 03:11:25 -06:00
codemann8
81f0270ca4
Consolidated Bonk Drop to use shared codebase
2023-12-31 03:07:33 -06:00
Randall Rupper
55f18eb108
fix: potential fix for Trinexx
2023-12-14 10:13:07 -07:00
Randall Rupper
9ac2156945
fix: MW item substitution
2023-11-22 13:13:44 -07:00
codemann8
00352cc52a
Merge branch 'DRUnstable' into OWMain
2023-11-18 14:44:10 -06: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
codemann8
3cbc1ab42e
Marking OW screens as visited
2023-11-08 13:50:03 -06:00
codemann8
3dfae76275
Play GT2 track in DR if GTBK is collected
2023-11-05 08:44:19 -06:00
codemann8
6de8dc606c
Fix issue with incorrect track playing on DDM
2023-11-05 08:39:54 -06:00
codemann8
84992d010f
Fix for playing correct track after Agas and GT cutscene
2023-11-05 08:39:13 -06:00
codemann8
43552d1a64
Fix Hera music to play correct dungeon track following a floor change
2023-10-24 07:38:06 -05:00
codemann8
a6507eea6d
Fix for Hera boss music fadeout when falling
2023-10-22 16:23:43 -05: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
codemann8
68af5f735e
Minor formatting and bug prevention
2023-10-10 01:29:50 -05:00
codemann8
766cc67dcd
Fix heart piece dupe respawn issue
2023-10-10 01:28:20 -05:00
codemann8
70badade72
Fix for Hera boss music fadeout when falling
2023-10-10 01:26:30 -05:00
aerinon
8c384ff123
Be more proactive about which sprites to move
2023-10-06 10:40:05 -06:00
codemann8
edad66a5a8
New solution for mirror portal disabling in Crossed OWR
2023-10-01 06:12:18 -05:00
codemann8
47ce48a31a
Fixed mirror sprite shown on map check in Crossed OWR
2023-10-01 06:11:27 -05:00
codemann8
f3b2719a5b
Merge branch 'DRUnstable' into OWMain
2023-09-29 15:00:36 -05:00
codemann8
fdd8fedaef
New solution for mirror portal disabling in Crossed OWR
2023-09-28 22:01:18 -05:00
Catobat
4c1433464e
Fix issue with rooms $0124-$0127 at Tavern Back
2023-09-27 16:15:20 -05:00
codemann8
8e9b4c234b
Fix Old Man death putting you on Pyramid
2023-09-27 16:09:45 -05: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
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
aerinon
c0dff8e7c9
Bugfixes for duping/disappearing item and mutliworld crash
2023-09-13 14:28:18 -06:00
