Commit Graph

2069 Commits

Author SHA1 Message Date
aerinon
4f09d30fe5 Merge branch 'DRUnstable' into Enemizer
# Conflicts:
#	keydrop/standing_items.asm
2023-04-05 16:03:17 -06:00
codemann8
f89802a74e Symmetrical GTCutscene Crystals 2023-04-05 08:31:30 -05:00
codemann8
dd29578c0a Temporary fix for avoiding VRAM issues in non-layout OWR modes 2023-04-03 08:21:16 -05:00
codemann8
25dc4217c6 Fixed Old Man Death causing fake world in glitched 2023-04-02 07:39:02 -05:00
codemann8
bd2432d2ce Moving some hijacked DR code to new location 2023-03-30 16:42:05 -06:00
aerinon
67f22ab602 Fix kodongo ai slightly better.
Introduce a flag for the FixPrizeOnTheEyes bug
2023-03-30 15:00:39 -06:00
spannerisms
21522f29d1 credits 2023-03-30 01:51:12 -04:00
codemann8
d97f5fd23e Set up code structure for future OW palette changes and return to safer changes 2023-03-22 16:06:47 -05:00
codemann8
1bdcbf5b62 Fixed issue with no Woods mosiac on exit in vanilla OW 2023-03-19 12:21:22 -05:00
codemann8
d4e792a71f Fixed issue with MW Player ID on Bonk Locations 2023-03-19 11:00:22 -05:00
codemann8
cb1a4cbb69 Update owrando.asm 2023-03-18 19:14:10 -05:00
codemann8
84b3c1ad50 Correcting OW screen palette on transition 2023-03-18 19:13:04 -05:00
codemann8
8522968c1b Correcting OW screen palette on transition 2023-03-18 05:46:34 -05:00
codemann8
ee4fce4010 Moving some hijacked DR code to new location 2023-03-17 20:06:56 -05:00
codemann8
8d3e084c1d Load correct Link/Bunny palette on transition 2023-03-16 22:21:39 -05:00
Lexi Rose
23ecf41b33 Merge pull request #191 from cassidoxa/keys_hud
Properly mask HUD item flags
2023-03-15 11:50:57 -05:00
cassidoxa
0505cc28e1 Properly mask HUD item flags 2023-03-15 12:42:45 -04:00
codemann8
92e04bde55 Adjusting Bonk Sprite landing position and water ripple 2023-03-15 05:43:39 -05:00
codemann8
1316477771 Reserving space for OWR Version 2023-03-14 17:34:42 -05:00
aerinon
b10dff8a30 Minor clean up 2023-03-14 16:33:02 -06:00
codemann8
49c486a2cc Merged in DR v.1.2.0.13 2023-03-14 17:25:37 -05:00
codemann8
726b9441b7 Merge branch 'DRUnstable' into OWMain 2023-03-14 17:18:06 -05:00
aerinon
69a6e7f918 Version area reservation 2023-03-14 16:06:32 -06:00
codemann8
11e815bd96 Fixed item duping issue on OW 2023-03-14 06:20:04 -05:00
codemann8
fb1f7ad907 Fixed Desert Pass WS edge coordinates 2023-03-13 21:53:36 -05:00
Lexi Rose
c7c5ac23a8 Merge pull request #190 from cassidoxa/keys_hud
Fix file select HUD I broke
2023-03-13 20:49:11 -05:00
aerinon
04aabc8bd8 Clear standing item data on transition to overworld
Standard+retro no arrow filler unless you have the bow
2023-03-13 15:54:19 -06:00
cassidoxa
5ef08d934c Fix file select HUD I broke 2023-03-13 17:49:00 -04:00
Lexi Rose
5a0990638c Merge pull request #189 from cassidoxa/keys_hud
Fix small key stats tracker
2023-03-13 12:28:15 -05:00
cassidoxa
1f8389c446 Fix small key stats tracker 2023-03-13 13:15:30 -04:00
codemann8
eeebe58819 Fixing issue with forced HP on Good Bee Bonk Location 2023-03-12 21:45:16 -05:00
Lexi Rose
95f0e9eed2 Merge pull request #188 from cassidoxa/keys_hud
Compass and map HUD display modes properly skip or draw
2023-03-12 20:42:04 -05:00
codemann8
8e8c195fa9 Minor label reference change for Good Bee Bonk Location 2023-03-12 20:21:16 -05:00
cassidoxa
efa5d288a8 Fix typo 2023-03-12 19:14:14 -04:00
cassidoxa
df60b3641b Draw flute, shovel, powder, mushroom correctly on file select 2023-03-12 18:30:02 -04:00
cassidoxa
7968ddf020 Compass and map HUD display modes properly skip or draw
Minor key count refactor, count HC and Sewers as both in all cases
2023-03-12 17:20:54 -04:00
aerinon
0f541ad069 Assemble fix 2023-03-10 14:13:03 -07:00
aerinon
7e96db4ba6 Merge branch 'DRUnstable' into Enemizer
# Conflicts:
#	enemizer/hooks/blindboss_hooks.asm
2023-03-10 14:10:07 -07:00
codemann8
8102b75b0c Added Cold Fairy Statue to bonkable locations 2023-03-09 20:28:18 -06:00
codemann8
a1fb6ea1af Add new Good Bee item 2023-03-08 21:26:25 -06:00
codemann8
f8602a74cb Remove 5 Arrow Item 2023-03-08 20:38:34 -06:00
codemann8
f703dcaba7 Merged in DR v1.2.0.12 2023-03-08 16:12:42 -06:00
aerinon
380f917e60 Fix for mirror portal in inverted
Yet another fix for blocked doors in Standard ER, minor alteration for the swamp entrance fix to work when blocked as well.
2023-03-08 08:26:34 -07:00
Thomas Prescott
c0986d6bbc Remove file select screen border 2023-03-08 08:20:07 -06:00
codemann8
67f2164caf Merge branch 'DRUnstable' into OWMain 2023-03-07 18:46:25 -06:00
Lexi Rose
d0f9bf6b32 Merge pull request #186 from cassidoxa/init_save
Delete save backup when header name doesn't match SRAM
2023-03-07 02:11:58 -06:00
aerinon
5c213477bc Cave state fixes 2023-03-06 16:10:41 -07:00
codemann8
1453dd12a7 Merged in DR v1.2.0.10 2023-03-02 18:57:26 -06:00
aerinon
72e8d73277 Fix for lower layer blocked doors in standard 2023-03-02 16:21:02 -07:00
aerinon
13879317fe Mirror Portal + Entrance Fix 2023-03-01 15:41:54 -07:00