Commit Graph

  • 74f66abf51 Replacing hardcoded jumps and references to labels codemann8 2022-05-21 20:44:38 -05:00
  • c157708769 For moving mirror portals in Crossed OW, changing EOR to ORA codemann8 2022-05-21 17:46:29 -05:00
  • 478d4fc7f3 Fix issue with mirror portals showing up on map checks when they shouldn't codemann8 2022-05-21 14:55:42 -05:00
  • 57bc6a1f59 Fixed crash in Crossed OW when performing mirror superbunny codemann8 2022-05-21 11:04:15 -05:00
  • 6ff400776a Merge pull request #162 from cassidoxa/compasses Lexi Rose 2022-05-19 23:59:16 -05:00
  • cc1d97466c Fix compass count stuff cassidoxa 2022-05-19 13:23:55 -04:00
  • 9779f91ce9 Fix dungeon completion bitfield (16-bit) aerinon 2022-05-19 10:36:20 -06:00
  • 003278f7e0 Fix dungeon completion bitfield aerinon 2022-05-18 14:52:47 -06:00
  • 15cc72c1e0 Correct the width on the AND for MaybeFlagCompassTotalPickup aerinon 2022-05-18 14:52:34 -06:00
  • b095a0c337 Mask out high bits of CompassMode when maybe setting compass counts displayed flag cassidoxa 2022-05-17 17:23:15 -04:00
  • db2fe4cf39 Fix compass compare aerinon 2022-05-17 13:05:34 -06:00
  • ed3ce6af6f Merge pull request #20 from cassidoxa/compasses_dr aerinon 2022-05-17 13:03:06 -06:00
  • 04948c72f6 Adding Catobat to OWR credits codemann8 2022-05-17 08:04:37 -05:00
  • 336931fb02 Fix checking compass mode for compass count display bitfield cassidoxa 2022-05-15 18:54:52 -04:00
  • a62fcff30a Add lowercase letters to credits end screen codemann8 2022-05-05 23:24:32 -05:00
  • 31e98903bc Unscramble lowercase letters for new font codemann8 2022-05-05 18:26:11 -05:00
  • 34f4b72524 Adding labels and rearrange some of the Special Transition code codemann8 2022-05-04 16:31:32 -05:00
  • e1a17fa945 Merge pull request #6 from Catobat/Special codemann8 2022-05-04 15:58:45 -05:00
  • 4cdd41dbf5 Fix for standing item, all enemy drops and pot item converted to new system aerinon 2022-05-03 13:51:11 -06:00
  • c62b69d1a8 Randomize Special Transitions Catobat 2022-05-01 01:25:21 +02:00
  • 5863f9783f Minor fix up on CrystalPendantFlags_3 aerinon 2022-04-30 15:20:53 -06:00
  • 445a91c2aa Merge pull request #19 from cassidoxa/keyfix aerinon 2022-04-30 15:17:59 -06:00
  • e804455743 Fix key door indexing cassidoxa 2022-04-30 13:35:20 -04:00
  • 6d39ea5872 Merge pull request #161 from aerinon/FontFix Lexi Rose 2022-04-29 10:17:45 -05:00
  • 675d68175c Delete test file aerinon 2022-04-28 16:39:06 -06:00
  • 55970bdff9 Delete test file aerinon 2022-04-28 16:38:50 -06:00
  • 326b8f294e Shifted uppercase font. Used FEATURE_NEW_TEXT flag aerinon 2022-04-28 16:09:12 -06:00
  • 3685d8194e SRAM fix for MultiClient. Only set SRAM flag on locations that count toward collection rate. Shifted uppercase font. aerinon 2022-04-28 16:06:31 -06:00
  • 6def39ff58 Add lowercase letters to credits end screen aerinon 2022-04-27 14:16:24 -06:00
  • 71d26eb109 Lowercase font aerinon 2022-04-27 14:14:54 -06:00
  • 0960dcaac9 Merge branch 'master' into DRVolatile aerinon 2022-04-27 13:50:42 -06:00
  • eb0bc2b7f6 Moved doorrando code. Fixed a multiclient issue with pot switches. aerinon 2022-04-27 13:47:12 -06:00
  • f0b767885c Fix bug with .checkAga2 in overworld map with new SRAM constants aerinon 2022-04-26 12:16:07 -06:00
  • e088a040f8 Merge branch 'dr_sram' of https://github.com/cassidoxa/z3randomizer into cassidoxa-dr_sram aerinon 2022-04-26 11:57:51 -06:00
  • 53f723a196 Letters/Crystal numbers aerinon 2022-04-21 15:42:32 -06:00
  • a26b128b52 Merge remote-tracking branch 'upstream/DRUnstable' into OWMain codemann8 2022-04-21 13:11:31 -05:00
  • 352d1e8a22 Re-add accidentally deleted HUD stuff Fix some processor flags cassidoxa 2022-04-20 20:33:40 -04:00
  • 405edc51b5 Merge pull request #5 from Catobat/MixedMap codemann8 2022-04-20 16:51:23 -05:00
  • d1a874cd7f Implement new overworld map draw routine for Mixed Catobat 2022-04-20 23:38:20 +02:00
  • 4b68406be0 Merge branch 'DRUnstable' into DRVolatile aerinon 2022-04-20 13:56:31 -06:00
  • a017c98c4e Map bug with prizes aerinon 2022-04-20 09:07:59 -06:00
  • e8f06f2da6 Pottery fix for vanilla hera key aerinon 2022-04-20 08:52:01 -06:00
  • 9c41ffb55b Merge branch 'sram_rework' into dr_sram cassidoxa 2022-04-20 00:30:35 -04:00
  • 0a7b886978 Merge remote-tracking branch 'upstream/DRUnstable' into OWMain codemann8 2022-04-19 21:32:47 -05:00
  • 3114223a04 Can force the drawing algorithm to skip aerinon 2022-04-19 14:35:16 -06:00
  • f6015a8569 New colorized pot and bitfields aerinon 2022-04-19 14:04:12 -06:00
  • 5861f546ad Merge pull request #160 from ardnaxelarak/main Lexi Rose 2022-04-17 03:17:31 -05:00
  • 638967ee9c unscramble lowercase letters for new font Kara Alexandra 2022-04-02 10:07:03 -07:00
  • 0a57153762 Changed OW map in attract mode to show LW map always codemann8 2022-04-15 10:48:33 -05:00
  • 436ecbb17d Merged DR v1.0.0.3 codemann8 2022-04-15 10:34:10 -05:00
  • d116249412 Merge branch 'DRUnstable' into DRVolatile aerinon 2022-04-13 13:32:31 -06:00
  • 4239e7204e Check Aga2's boss defeat flag instead of pyramid hole New flag on compass mode to indicate maps should be used instead for showing the location aerinon 2022-04-13 13:30:15 -06:00
  • ed03692bef Fix from Aerinon for map/compass dungeon locations on map check codemann8 2022-04-10 19:16:24 -05:00
  • c7f9b5c3a0 Fixed map check for GT skull icon to check if Aga2 defeated rather than pyramid hole opened codemann8 2022-04-05 11:29:46 -05:00
  • c6adf11a0d Merge pull request #159 from cassidoxa/sram_rework Lexi Rose 2022-04-05 09:38:27 -05:00
  • a754a6f22b Merge pull request #158 from spannerisms/master Lexi Rose 2022-04-05 09:37:57 -05:00
  • 281beeeb58 Switch standing item gfx to a different slot Rain state fix aerinon 2022-03-29 14:29:04 -06:00
  • 7dabea9f8b Update events.asm codemann8 2022-03-26 07:03:54 -05:00
  • da788dadcd Merge remote-tracking branch 'upstream/DRUnstable' into OWMain codemann8 2022-03-26 07:00:13 -05:00
  • 93fe175cab Don't delete hammer when hammer dashing through pots and the sprite limit is reached Hook for frozen enemies killed with hammer (if there's an item they won't automatically drop the freeze prize now) aerinon 2022-03-23 14:24:36 -06:00
  • 697a742e09 Minor fix to flute SFX for pre-activated flute codemann8 2022-03-18 23:21:45 -05:00
  • c687157882 Fix the Y index for ShouldCountNormalPot aerinon 2022-03-08 08:53:23 -07:00
  • eb30242920 Fixed mirror bonk issue incorrectly leaving a mirror portal behind codemann8 2022-03-07 20:12:32 -06:00
  • bd8b79ae5c Fixed issue with mirror portal not spawning when entering OW from the DW in Crossed OWR codemann8 2022-03-07 19:03:52 -06:00
  • 60026bea50 Pottery refinements aerinon 2022-03-07 10:44:53 -07:00
  • 66657eb956 Missed a line aerinon 2022-03-04 17:56:07 -07:00
  • a0ebf72d59 Lifting normal pots increases location count Pot despawn protection Hud updates aerinon 2022-03-04 15:24:22 -07:00
  • c83185c1b2 Minor bug fix aerinon 2022-02-24 14:04:33 -07:00
  • 4958d43d71 Some additional changes to lowercase dungeon text codemann8 2022-02-24 06:05:23 -06:00
  • 5d943d9a6d Add dungeons completed bitfield from door rando cassidoxa 2022-02-23 12:42:21 -05:00
  • cb48137fa7 Fixed issue with mirror portal deleting after mirror bonk in Crossed OW codemann8 2022-02-22 19:55:02 -06:00
  • 838d4e9bf8 Refactor dungeon locations checked incrementing Fix BowTracking documentation cassidoxa 2022-02-18 17:45:33 -05:00
  • 2c8299bac3 Standing item key for hera basement cage aerinon 2022-02-15 12:13:29 -07:00
  • fe66c67d07 Fixing up the hud to indicate Pendant/Crystal etc aerinon 2022-02-15 12:12:42 -07:00
  • a80171ba9b Revert SRAM changes (not yet ready) aerinon 2022-02-10 08:37:05 -07:00
  • 57dec5651f Merge branch 'DRMain' into DRUnstable aerinon 2022-02-09 14:34:58 -07:00
  • 5bd4d36cd9 Fix for standing item palette aerinon 2022-02-09 14:17:42 -07:00
  • e8b85e4815 Lowercase item text aerinon 2022-02-09 10:06:16 -07:00
  • 93fe72466d Merge branch 'master' into DRMain aerinon 2022-02-09 09:59:56 -07:00
  • 7db582d894 Moved SRAM to reserved locations aerinon 2022-02-09 09:02:17 -07:00
  • 905e897b52 Handle 16-bit GoalCounter and TotalItemCounter Fix vanilla sword + shield item Fix how progressive items handled Clean up compasses.asm cassidoxa 2022-02-08 19:25:59 -05:00
  • e01e8569d7 Fixed issue with TR Peg Puzzle Portal not working codemann8 2022-02-07 19:20:32 -06:00
  • 02932a2a9d Add comments to initsramtables.asm cassidoxa 2022-02-07 20:05:52 -05:00
  • ea8f4dbc57 Fixed issue with TR Peg Puzzle Portal not working codemann8 2022-02-07 18:00:10 -06:00
  • ece66e38df Added lowercase version of dungeon item text codemann8 2022-02-06 01:00:16 -06:00
  • ba8a9aeb90 Merged in Upstream ER changes codemann8 2022-02-04 06:04:26 -06:00
  • 959aa40f58 Increment ROM version cassidoxa 2022-02-03 22:48:20 -05:00
  • 3c6c45ddb4 Fix some mangled labels cassidoxa 2022-02-03 22:01:34 -05:00
  • dfc4284a70 Merge branch 'master' into sram_rework cassidoxa 2022-02-03 21:20:16 -05:00
  • 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 cassidoxa 2022-02-03 20:25:32 -05:00
  • 98949be9bc Changed GT/AT swap in Mixed OW to prioritize leaving AT vanilla unless GT is the only one in the starting world codemann8 2022-02-03 06:13:13 -06:00
  • ddd86a96cf Minor code improvement codemann8 2022-02-02 20:00:49 -06:00
  • c048589c02 Add static file name feature by special request Move compass count ram init to compasses.asm Rename WRAMEquipment and SRAMEquipment to EquipmentWRAM/SRAM cassidoxa 2022-02-02 16:51:50 -05:00
  • 8f74ddab05 fix spannerisms 2022-01-27 01:24:28 -05:00
  • a247a0ae01 tinker tinker spannerisms 2022-01-26 08:22:44 -05:00
  • 7ca4fd6467 Merge branch 'master' of https://github.com/spannerisms/z3randomizer spannerisms 2022-01-26 06:41:56 -05:00
  • 32d619c9e7 BSOD spannerisms 2022-01-26 06:41:34 -05:00
  • 725f6c110a Couple of fixes for Standing Items counts and generic keys in caves aerinon 2022-01-24 16:06:04 -07:00
  • 3c9b04f30a Fixed up the anti-soft lock in swamp Combined flags and fixed a couple of bugs aerinon 2022-01-21 16:07:03 -07:00
  • c515beb853 Merge pull request #155 from tewtal/new-text-renderer Lexi Rose 2022-01-20 16:00:20 -06:00