From 02e66ba9e3159acc86d3d8aebbda382bde4638af Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Thu, 8 Jul 2021 18:34:39 -0700 Subject: [PATCH 1/2] Fix drawing C/P indicator - no longer show icon for sewer, HC, AT, or GT - no longer show junk in map shuffle for dungeons without the map --- newhud.asm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/newhud.asm b/newhud.asm index 35c562f..884d967 100644 --- a/newhud.asm +++ b/newhud.asm @@ -145,9 +145,10 @@ SEP #$30 SEP #$20 LDA.b $1B : BEQ .noprize - - - LDX.w $040C : BMI .noprize + LDX.w $040C + CPX #$1A : !BGE .noprize + CPX #$04 : !BLT .noprize + CPX #$08 : BEQ .noprize REP #$20 @@ -156,9 +157,10 @@ SEP #$30 LDA.l $7EF368 AND.l DungeonItemMasks,X - BEQ .doneprize + BEQ .noprize .drawprize + TXA : LSR : TAX LDA.l CrystalPendantFlags_2, X AND.w #$0040 : BNE .is_crystal From 0054be1e4b54e190ad71e6ab6dfed7aaedc1ffae Mon Sep 17 00:00:00 2001 From: Kara Alexandra Date: Thu, 8 Jul 2021 19:47:37 -0700 Subject: [PATCH 2/2] Fix some stat tracking - move chest turn counter to not overlap locations before mirror - correctly print from correct memory in credits for damage/magic counter --- stats.asm | 10 ++++++---- stats/statConfig.asm | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/stats.asm b/stats.asm index 46f6c2d..d793f20 100644 --- a/stats.asm +++ b/stats.asm @@ -1,7 +1,7 @@ ;================================================================================ ; Stat Tracking ;================================================================================ -; $7EF420 - $7EF468 - Stat Tracking +; $7EF420 - $7EF46D - Stat Tracking ;-------------------------------------------------------------------------------- ; $7EF420 - bonk counter ;-------------------------------------------------------------------------------- @@ -108,7 +108,7 @@ ;-------------------------------------------------------------------------------- ; $7EF466w[2] - mirror timestamp (high) ;-------------------------------------------------------------------------------- -; $7EF468 - chest turn counter +; $7EF468w[2] - locations before mirror ;-------------------------------------------------------------------------------- ; $7EF46A mmkkkkkk ; m - mail counter @@ -116,7 +116,9 @@ ;-------------------------------------------------------------------------------- ; $7EF46Bw[2] - Dungeon prizes collected by dungeon location. ;-------------------------------------------------------------------------------- -; $7EF46D - 7EF49F - Free space +; $7EF46D - chest turns counter +;-------------------------------------------------------------------------------- +; $7EF46E - 7EF49F - Free space ;-------------------------------------------------------------------------------- ; $7EF4A0 - 7EF4A7 - Service Request ;-------------------------------------------------------------------------------- @@ -318,7 +320,7 @@ IncrementFairyRevivalCounter: PLA RTL ;-------------------------------------------------------------------------------- -!CHESTTURN_COUNTER = "$7EF468" +!CHESTTURN_COUNTER = "$7EF46D" IncrementChestTurnCounter: PHA LDA !LOCK_STATS : BNE + diff --git a/stats/statConfig.asm b/stats/statConfig.asm index 82219a5..f12d717 100755 --- a/stats/statConfig.asm +++ b/stats/statConfig.asm @@ -9,8 +9,8 @@ %AddStat($7EF425, 0, 0, 04, 2, !MASTER_SWORD_X, !MASTER_SWORD_Y) %AddStat($7EF426, 0, 4, 04, 2, !TEMPERED_SWORD_X, !TEMPERED_SWORD_Y) %AddStat($7EF426, 0, 0, 04, 2, !GOLD_SWORD_X, !GOLD_SWORD_Y) -%AddStat($7EF46A, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y) -%AddStat($7EF46C, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_Y) +%AddStat($7EF4AA, 0, 0, 16, 5, !DAMAGETAKEN_X, !DAMAGETAKEN_Y) +%AddStat($7EF4AC, 0, 0, 16, 5, !MAGICUSED_X, !MAGICUSED_Y) %AddStat($7EF420, 0, 0, 08, 3, !BONKS_X, !BONKS_Y) %AddStat($7EF42D, 0, 0, 08, 2, !SAVE_AND_QUITS_X, !SAVE_AND_QUITS_Y) %AddStat($7EF449, 0, 0, 08, 2, !DEATHS_X, !DEATHS_Y)