Commit Graph

  • 4eaa214626 Merge branch 'DRUnstable' into DRVolatile aerinon 2023-09-20 13:34:52 -06:00
  • 1290751307 Merge branch 'Catobat-TavernFix' into DRUnstable aerinon 2023-09-20 13:31:03 -06:00
  • 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 aerinon 2023-09-20 12:54:44 -06:00
  • 507ba379cf Merge pull request #208 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-17 13:30:02 -05:00
  • 334f721a29 Don't increment highest mail on final stats prep cassidoxa 2023-09-17 12:02:54 -04:00
  • c0dff8e7c9 Bugfixes for duping/disappearing item and mutliworld crash aerinon 2023-09-13 14:28:18 -06:00
  • b831dd29a5 Turn off enemy drop indicator based on flag aerinon 2023-09-12 10:10:42 -06:00
  • 5ad0e7781e Pikit override fix Minor drops from enemies persist aerinon 2023-09-12 08:38:18 -06:00
  • 0fdb6ed133 Merge pull request #207 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-10 01:31:32 -05:00
  • cc36ccc0b1 Add time stamp for tossed fighter sword item cassidoxa 2023-09-10 00:55:03 -04:00
  • 23ef62522b Fix potion refills counting in shops Bee traps - graphics upgrade aerinon 2023-09-09 16:41:44 -06:00
  • b67e5c8433 Merge remote-tracking branch 'baserom/master' into MergeDecompression aerinon 2023-09-09 13:13:18 -06:00
  • a723fe2865 VRAM standing items aerinon 2023-09-09 13:12:05 -06:00
  • fcbde59a1e Merge pull request #206 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-09 04:21:01 -05:00
  • f916346747 Stumpy bugfix aerinon 2023-09-08 14:55:25 -06:00
  • 2561737236 Merge remote-tracking branch 'baserom/master' into MergeDecompression aerinon 2023-09-08 13:49:16 -06:00
  • 70758bf5c0 Set silvers bit with silvers restriction cassidoxa 2023-09-08 15:43:31 -04:00
  • 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 aerinon 2023-09-08 13:42:22 -06:00
  • f6842204d0 Fix BowTracking docs cassidoxa 2023-09-08 15:30:37 -04:00
  • 8af9c17cfe Fix stumpy double item cassidoxa 2023-09-08 13:57:26 -04:00
  • 57e537f12d Fix HUD rebuild when releasing fairy cassidoxa 2023-09-08 08:56:23 -04:00
  • bc3dd5c186 Merge pull request #205 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-08 02:30:29 -05:00
  • 71e86f7c1a Set our hud update flag on quickswap cassidoxa 2023-09-08 00:35:06 -04:00
  • 0f72e6fcec Better solution cassidoxa 2023-09-08 00:21:24 -04:00
  • 790f3f0ba3 Fix HUD item icon not refreshing after last bomb spent Rename UpdateHUD to UpdateHUDFlag, replace with UpdateHUD vanilla JSR label cassidoxa 2023-09-07 16:29:45 -04:00
  • 134651e4fb Merge remote-tracking branch 'baserom/master' into MergeDecompression aerinon 2023-09-07 12:21:22 -06:00
  • 6a55fc2b12 Merge pull request #204 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-07 11:50:36 -05:00
  • 7dc71cf1ac Fix some stats counting cassidoxa 2023-09-07 11:53:24 -04:00
  • 5a0bd6dbe0 Merge pull request #203 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-05 03:23:35 -05:00
  • f778674b83 Rework bow tracking to assign tracking bits to non-chest sprites Fix small key palettes to be consistent with vanilla colors cassidoxa 2023-09-04 22:29:50 -04:00
  • 2e433732f8 Merge pull request #202 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-04 15:15:37 -05:00
  • 4ec523c8b3 Fix HUD heart colors on credits end screen Small fix for counting menu HUD keys for "this dungeon" cassidoxa 2023-09-04 13:28:51 -04:00
  • 23b6e1ae6b Merge pull request #201 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-03 16:11:15 -05:00
  • 9800a86189 Palette fix for GT Torch/Hera cage items that load new palette cassidoxa 2023-09-03 15:39:53 -04:00
  • 74a31f5f11 Merge pull request #200 from cassidoxa/v31.2.0-fixes Lexi Rose 2023-09-02 23:23:42 -05:00
  • 73b2a180ba Fix AddInventory/stats tracking with 16 bit item properties cassidoxa 2023-09-02 22:57:50 -04:00
  • 2cead7ae92 Fix Active flute standing item gfx Move setting dungeon completed to prize pickup (or after aga1/aga2) Fix some inverted tiles Remove text-related conditional assembly Make InventoryTable_properties 16 bits wide Fix expanded save slot writing to cart SRAM Fix HUD resetting with red potion cassidoxa 2023-09-02 15:55:37 -04:00
  • 9fc85218ae Fixed ExtendedSRAM not saving Fix enemy drops and pots with Fairies/Chickens/Big Magic Fixed Big Magic refill when in chests/standing items Changed shop code to respect ShopEnableCount flag aerinon 2023-09-01 14:13:01 -06:00
  • aecc65595e Merge remote-tracking branch 'baserom/master' into MergeDecompression aerinon 2023-09-01 11:37:46 -06:00
  • 6fbce240b8 Merge pull request #199 from cassidoxa/decompressed Lexi Rose 2023-08-31 17:39:17 -05:00
  • 3a5974b456 Only check if we're getting a chest item if boss heart flag is set cassidoxa 2023-08-31 16:38:53 -04:00
  • 5ccdebe09d Fixing crashes aerinon 2023-08-31 14:22:46 -06:00
  • 71e6d54276 Fix for item receipt after GT boss heart container collected cassidoxa 2023-08-31 15:17:07 -04:00
  • 139c963e6a Merge pull request #198 from spannerisms/decompressed Lexi Rose 2023-08-31 03:07:31 -05:00
  • 29176fa194 Absorb torch keys if they belong to the dungeon they're in. cassidoxa 2023-08-30 20:47:06 -04:00
  • b635126e81 Copmass count fix for 2 bytes aerinon 2023-08-30 16:16:05 -06:00
  • 150adec969 Sewers count fix aerinon 2023-08-30 15:25:29 -06:00
  • e21067f0a2 Initial work on new items aerinon 2023-08-30 14:35:30 -06:00
  • d09aea3ff9 2 byte compass counts aerinon 2023-08-30 12:33:27 -06:00
  • d6ac9feae4 Merge pull request #197 from spannerisms/decompressed Lexi Rose 2023-08-30 11:45:05 -05:00
  • cd67d27798 Hud update flag added for standing items Ram addresses updated Minor multiworld fix aerinon 2023-08-30 10:25:20 -06:00
  • 90c8e95f9b Fix overworld item duping Fix setting dungeon completed when Aga 1 and 2 are defeated (prize drops) cassidoxa 2023-08-30 01:25:43 -04:00
  • c6e586fbb8 Merge pull request #196 from spannerisms/decompressed S 2023-08-29 16:40:31 -04:00
  • 4c98268d81 Various fixes cassidoxa 2023-08-29 16:03:22 -04:00
  • 51011dcada Merge remote-tracking branch 'baserom/master' into MergeDecompression aerinon 2023-08-28 12:01:57 -06:00
  • b688149dfa Fix for shops and powder Fix for dungeon indicator aerinon 2023-08-28 11:32:46 -06:00
  • e3a35ef5fc Merge pull request #195 from spannerisms/decompressed Lexi Rose 2023-08-26 23:39:21 -05:00
  • 52d2616537 RomSpeed option cassidoxa 2023-08-26 23:24:34 -04:00
  • 05a79ad2d9 Fix Ped/GT open modes Fix key colors cassidoxa 2023-08-26 20:29:38 -04:00
  • 7e513c4696 More sprite fixes cassidoxa 2023-08-26 14:30:39 -04:00
  • 77e269ff31 Ridiculous game cassidoxa 2023-08-26 01:42:31 -04:00
  • 90ffa8bd23 Fix cave state item cutscene flag with boss hearts Add item substitutions cassidoxa 2023-08-25 21:11:48 -04:00
  • 6980d36d27 Fix issue with rooms $0124-$0127 at Tavern Back Catobat 2023-08-26 00:52:13 +02:00
  • 5ac2f8c537 Fix GFX transfer, use stack Fix HUD arrow icon after buying shop arrow cassidoxa 2023-08-25 12:29:52 -04:00
  • 3f5455b647 Fix key palettes Fix HUD item counter when releasing bee cassidoxa 2023-08-25 09:48:29 -04:00
  • 1cbcd1d5ff Sprite fixes cassidoxa 2023-08-25 01:38:32 -04:00
  • 09702e659d Merge remote-tracking branch 'baserom/master' into MergeDecompression aerinon 2023-08-24 16:16:31 -06:00
  • 188c965fbc Merge pull request #194 from spannerisms/decompressed Lexi Rose 2023-08-23 21:10:13 -05:00
  • f1dda4a8c0 Attempt to re-write standing items using the new decompressed gfx. Fix a few bus left over from merge aerinon 2023-08-23 16:06:31 -06:00
  • 2a789b04e4 Merge remote-tracking branch 'baserom/master' into MergeDecompression aerinon 2023-08-23 13:02:39 -06:00
  • 247128b9f6 Move setting DungeonsCompleted bitfield to post-boss/prize transition cassidoxa 2023-08-23 13:24:46 -04:00
  • 9bde734ca3 Fix current dungeon items in menu cassidoxa 2023-08-22 16:22:39 -04:00
  • 80f94824f4 Small fixes cassidoxa 2023-08-22 10:18:02 -04:00
  • e2525ebdb1 Rework menu dungeon item + select behavior Fix colored heart animations cassidoxa 2023-08-22 01:40:53 -04:00
  • 66540f2819 Replace GT, Ganon vuln crystal checks, ped check with new system InvincibleGanon 0x18003E -> GanonVulnerableMode 0x1801A8-0x1801A9 NumberOfCrystalsRequiredForTower 0x18005E -> GanonsTowerOpenTarget 0x18019A-0x18019B NumberOfCrystalsRequiredForGanon 0x18005F -> GanonVulnerableTarget 0x1801A6-0x1801A7 Various fixes Moved CrystalCounter to word length space $7EF471 -> $7EF476 cassidoxa 2023-08-21 20:43:27 -04:00
  • 59b16eeb05 optimize/fix inverted maps spannerisms 2023-08-21 07:10:26 -04:00
  • 63ba27e93d Update item gfx/receipt documentation in itemdatatables.asm cassidoxa 2023-08-20 19:59:55 -04:00
  • ca917404e5 Inverted maps cassidoxa 2023-08-20 11:51:12 -04:00
  • ba080ef556 Fix HC/Sewers keys and inverted castle hole cassidoxa 2023-08-19 21:41:58 -04:00
  • 8a63b7ca91 v31.2.0 fixes cassidoxa 2023-08-19 14:33:24 -04:00
  • 78b5695e30 Prevent cross dungeon drops Enemy drop indicator prototype aerinon 2023-08-17 13:39:18 -06:00
  • 71d3f6cefe Merge pull request #193 from spannerisms/decompressed Lexi Rose 2023-08-16 01:56:09 -05:00
  • e206d6f368 Small fixes cassidoxa 2023-08-15 23:55:53 -04:00
  • 1b115ebb50 Fix pyramid map cassidoxa 2023-08-14 12:49:30 -04:00
  • 491e033ff0 Fix heart piece item resolution when mirroring Fix HC big key incrementing total item count Fix key tracking Fix misc stat incrementing cassidoxa 2023-08-14 00:25:59 -04:00
  • a3bc24c383 Quick fixes for shop fighter shield and retro shop arrow cassidoxa 2023-08-13 19:51:29 -04:00
  • cc83fef9b0 Shops VRAM transfer cassidoxa 2023-08-13 18:55:52 -04:00
  • aaf970b837 Heart colors cassidoxa 2023-08-13 13:46:21 -04:00
  • ad17c8e88d More small fixes cassidoxa 2023-08-12 15:34:33 -04:00
  • ed1a8f1bdb Update ROM version cassidoxa 2023-08-12 10:21:34 -04:00
  • 858057d9c0 Lower case item text cassidoxa 2023-08-12 01:58:50 -04:00
  • a2671e7ed5 A few font fixes cassidoxa 2023-08-11 20:11:50 -04:00
  • 103f072cf3 Add back some JP characters and re-arrange player name screen Re-arrange a bunch of text-related stuff Fix post-credits game counter Fix bows cassidoxa 2023-08-11 02:10:54 -04:00
  • 459dacd582 Sewer fix Multiworld absorbable fix Thoughts on design for cross dungeon issues aerinon 2023-08-09 15:16:13 -06:00
  • 56cb17a0a3 Small fixes cassidoxa 2023-08-08 01:00:49 -04:00
  • 173b474b9d Merge branch 'DRUnstable' into OWMain codemann8 2023-08-07 15:10:13 -05:00
  • 8d0585ec33 Fixed Hera boss music playing after boss defeated codemann8 2023-05-12 20:37:33 -05:00
  • 39ac6c301a Fix mushroom gfx loading cassidoxa 2023-08-07 13:50:33 -04:00
  • 1c0b7b5320 Merge branch 'DRMain' into DRUnstable aerinon 2023-08-07 10:41:12 -06:00
  • bdf8c7bd6e Ignore more of the bitfield nibble of the CompassMode aerinon 2023-08-07 10:26:47 -06:00