Commit Graph

1056 Commits

Author SHA1 Message Date
9d079dbd0f Revert "Fix mixing progressive/non-progressive swords and shields"
This reverts commit 9bcb72f7bc.
2022-10-12 15:55:18 -07:00
9bcb72f7bc Fix mixing progressive/non-progressive swords and shields 2022-10-08 15:38:20 -07:00
bfc361ad3e Remove non-progressive bomb/cane upgrades 2022-09-18 15:02:37 -07:00
f7070dd30f Merge branch 'main' into kara 2022-07-23 17:33:34 -07:00
9d485e86cd Merge branch 'main' into kara 2022-07-23 16:47:01 -07:00
Lexi Rose
0e6e5d5b45 Merge pull request #167 from cassidoxa/elder_submodule
Check submodule during goal NPC interaction to prevent it from firing when menu is open
2022-07-14 22:40:37 -05:00
cassidoxa
9e5e9a17ed Check submodule during goal NPC interaction to prevent it from firing
when menu is open (via kan)
2022-07-05 12:49:00 -04:00
Lexi Rose
04906b5f87 Merge pull request #164 from aerinon/DungeonsCompletedReverse
Dungeons completed reverse
2022-06-11 10:32:21 -05:00
Lexi Rose
2297a8f0a2 Merge pull request #163 from cassidoxa/cavestate_dungeonitems
Add data after dungeon item masks to maintain expected glitch behavior
2022-06-11 10:31:14 -05:00
cassidoxa
da8ce3c6b1 Fix OW event data bit labels 2022-05-30 19:33:27 -04:00
aerinon
1ccc24f72f Fix dungeon completion bitfield (16-bit) 2022-05-26 09:14:08 -06:00
aerinon
bea2d24d4d Fix dungeon completion bitfield 2022-05-26 09:14:05 -06:00
cassidoxa
e1258eba06 Add data after dungeon item masks to maintain expected glitch behavior 2022-05-22 15:13:01 -04:00
ba660409bf Bees in beemode only target enemies they can actually affect 2022-05-21 17:50:20 -07:00
3d93b0160f Golden Bee fix 2022-05-21 15:34:44 -07:00
Lexi Rose
6ff400776a Merge pull request #162 from cassidoxa/compasses
Fix checking compass mode for compass count display bitfield
2022-05-19 23:59:16 -05:00
cassidoxa
cc1d97466c Fix compass count stuff 2022-05-19 13:23:55 -04:00
cassidoxa
b095a0c337 Mask out high bits of CompassMode when maybe setting compass counts
displayed flag
2022-05-17 17:23:15 -04:00
bb35409bc8 Fix checking tablets in bee mode 2022-05-14 11:45:38 -07:00
ffdb5e837a Fix Trinexx 2022-05-12 12:53:29 -07:00
4d4ae6b894 Fix Arrghus 2022-04-30 21:21:21 -07:00
4f4f46352d More improvement to bee mode? 2022-04-30 14:04:22 -07:00
103c41ae94 Bee Mode WIP 2022-04-29 15:23:47 -07:00
Lexi Rose
6d39ea5872 Merge pull request #161 from aerinon/FontFix
Add lowercase letters to credits end screen
2022-04-29 10:17:45 -05:00
aerinon
55970bdff9 Delete test file 2022-04-28 16:38:50 -06:00
aerinon
326b8f294e Shifted uppercase font.
Used FEATURE_NEW_TEXT flag
2022-04-28 16:09:12 -06:00
aerinon
6def39ff58 Add lowercase letters to credits end screen 2022-04-27 14:16:24 -06:00
Lexi Rose
5861f546ad Merge pull request #160 from ardnaxelarak/main
Unscramble lowercase letters for new font
2022-04-17 03:17:31 -05:00
638967ee9c unscramble lowercase letters for new font 2022-04-17 00:42:10 -07:00
Lexi Rose
c6adf11a0d Merge pull request #159 from cassidoxa/sram_rework
SRAM Re-work
2022-04-05 09:38:27 -05:00
Lexi Rose
a754a6f22b Merge pull request #158 from spannerisms/master
Failures
2022-04-05 09:37:57 -05:00
90a4c50a01 unscramble lowercase letters for new font 2022-04-02 10:07:03 -07:00
cassidoxa
5d943d9a6d Add dungeons completed bitfield from door rando 2022-02-23 12:42:21 -05:00
cassidoxa
838d4e9bf8 Refactor dungeon locations checked incrementing
Fix BowTracking documentation
2022-02-18 17:45:33 -05:00
cassidoxa
905e897b52 Handle 16-bit GoalCounter and TotalItemCounter
Fix vanilla sword + shield item
Fix how progressive items handled
Clean up compasses.asm
2022-02-08 19:25:59 -05:00
cassidoxa
02932a2a9d Add comments to initsramtables.asm 2022-02-07 20:05:52 -05:00
cassidoxa
959aa40f58 Increment ROM version 2022-02-03 22:48:20 -05:00
cassidoxa
3c6c45ddb4 Fix some mangled labels 2022-02-03 22:01:34 -05:00
cassidoxa
dfc4284a70 Merge branch 'master' into sram_rework 2022-02-03 21:20:16 -05:00
cassidoxa
3e2362b7ca Implement initial SRAM table
Data in initialsramtable.asm gets copied to SRAM on save file init
Frontend will be responsible for setting this, requires frontend changes
Changed some label names to disambiguate WRAM and SRAM labels
Deleted open mode
2022-02-03 20:25:32 -05:00
cassidoxa
c048589c02 Add static file name feature by special request
Move compass count ram init to compasses.asm
Rename WRAMEquipment and SRAMEquipment to EquipmentWRAM/SRAM
2022-02-02 16:51:50 -05:00
spannerisms
8f74ddab05 fix
forgot to account for the stack pointer being screwed up when we start using the stack again

might as well add in better VWF control and move hex to BG2 for more space
2022-01-27 01:24:28 -05:00
spannerisms
a247a0ae01 tinker tinker 2022-01-26 08:22:44 -05:00
spannerisms
7ca4fd6467 Merge branch 'master' of https://github.com/spannerisms/z3randomizer 2022-01-26 06:41:56 -05:00
spannerisms
32d619c9e7 BSOD 2022-01-26 06:41:34 -05:00
3acc2a3f45 Merge branch 'main' into kara 2022-01-24 13:58:12 -08:00
5fd285c767 Make non-seeded rng a rom flag instead of compile flag 2022-01-24 13:53:03 -08:00
7f551ad1a4 Fix boomerang instakilling Armos Knights 2022-01-24 13:50:44 -08:00
Lexi Rose
c515beb853 Merge pull request #155 from tewtal/new-text-renderer
Improved dialog text rendering
2022-01-20 16:00:20 -06:00
Thomas Backmark
b46269b662 Moved the new text renderer behind a feature flag 2022-01-20 22:24:52 +01:00