diff --git a/events.asm b/events.asm index a7a05b0..056ec02 100644 --- a/events.asm +++ b/events.asm @@ -57,7 +57,6 @@ RTL ;-------------------------------------------------------------------------------- OnUncleItemGet: PHA - LDA.l EscapeAssist BIT.b #$04 : BEQ + : STA !INFINITE_MAGIC : + BIT.b #$02 : BEQ + : STA !INFINITE_BOMBS : + 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 diff --git a/stats.asm b/stats.asm index fe3a25d..ec6d027 100644 --- a/stats.asm +++ b/stats.asm @@ -147,7 +147,6 @@ ; $7EF4FEw[2] - Save Checksum ;-------------------------------------------------------------------------------- - ;-------------------------------------------------------------------------------- !LOCK_STATS = "$7EF443" ;-------------------------------------------------------------------------------- diff --git a/stats/statConfig.asm b/stats/statConfig.asm index 7624f47..412c143 100755 --- a/stats/statConfig.asm +++ b/stats/statConfig.asm @@ -1,22 +1,22 @@ -;(address, type, shiftRight, bits, digits, xPos, lineNumber) - -%AddStat($7EF458, 1, 0, 32, 4, !FIRST_SWORD_X, !FIRST_SWORD_Y) -%AddStat($7EF45C, 1, 0, 32, 4, !PEGASUS_BOOTS_X, !PEGASUS_BOOTS_Y) -%AddStat($7EF460, 1, 0, 32, 4, !FLUTE_X, !FLUTE_Y) -%AddStat($7EF464, 1, 0, 32, 4, !MIRROR_X, !MIRROR_Y) -%AddStat($7EF452, 0, 4, 04, 2, !SWORDLESS_X, !SWORDLESS_Y) -%AddStat($7EF425, 0, 4, 04, 2, !FIGHTERS_SWORD_X, !FIGHTERS_SWORD_Y) -%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($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($7EF46E, 0, 0, 16, 4, !BOMBS_X, !BOMBS_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) -%AddStat($7EF453, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y) -%AddStat($7EF444, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y) -%AddStat($7F5038, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y) -%AddStat($7EF423, 0, 0, 10, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y) -%AddStat($7EF43E, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y) +;(address, type, shiftRight, bits, digits, xPos, lineNumber) + +%AddStat($7EF458, 1, 0, 32, 4, !FIRST_SWORD_X, !FIRST_SWORD_Y) +%AddStat($7EF45C, 1, 0, 32, 4, !PEGASUS_BOOTS_X, !PEGASUS_BOOTS_Y) +%AddStat($7EF460, 1, 0, 32, 4, !FLUTE_X, !FLUTE_Y) +%AddStat($7EF464, 1, 0, 32, 4, !MIRROR_X, !MIRROR_Y) +%AddStat($7EF452, 0, 4, 04, 2, !SWORDLESS_X, !SWORDLESS_Y) +%AddStat($7EF425, 0, 4, 04, 2, !FIGHTERS_SWORD_X, !FIGHTERS_SWORD_Y) +%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($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($7EF46E, 0, 0, 16, 4, !BOMBS_X, !BOMBS_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) +%AddStat($7EF453, 0, 0, 08, 3, !FAERIE_REVIVALS_X, !FAERIE_REVIVALS_Y) +%AddStat($7EF444, 1, 8, 32, 4, !TOTAL_MENU_TIME_X, !TOTAL_MENU_TIME_Y) +%AddStat($7F5038, 1, 0, 32, 4, !TOTAL_LAG_TIME_X, !TOTAL_LAG_TIME_Y) +%AddStat($7EF423, 0, 0, 10, 3, !COLLECTION_RATE_X, !COLLECTION_RATE_Y) +%AddStat($7EF43E, 1, 0, 32, 4, !TOTAL_TIME_X, !TOTAL_TIME_Y)