diff --git a/drhooks.asm b/drhooks.asm index 2824771..86ae1ff 100644 --- a/drhooks.asm +++ b/drhooks.asm @@ -179,6 +179,17 @@ JSL BlindsAtticHint : NOP #2 org $1cfd69 Main_ShowTextMessage: +; Conditionally disable UW music changes in Door Rando +org $028ADB ; <- Bank02.asm:2088-2095 (LDX.b #$14 : LDA $A0 ...) +JSL.l Underworld_DoorDown_Entry : CPX #$10 +db $B0, $21 ; BCS $028B04 +BRA + : NOP #6 : + + +org $02C3F2 ; <- Bank02.asm:10521 Unused call +Underworld_DoorDown_Call: +org $02C3F3 +dw $8AD9 ; address of Bank02.asm:2085 + ; These two, if enabled together, have implications for vanilla BK doors in IP/Hera/Mire ; IPBJ is common enough to consider not doing this. Mire is not a concern for vanilla - maybe glitched modes ; Hera BK door back can be seen with Pot clipping - likely useful for no logic seeds diff --git a/hooks.asm b/hooks.asm index a180750..8abb934 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1671,17 +1671,6 @@ dw !REG_MUSIC_CONTROL org $0CF05F dw !REG_MUSIC_CONTROL - -; Conditionally disable UW music changes in Door Rando -org $028ADB ; <- Bank02.asm:2088-2095 (LDX.b #$14 : LDA $A0 ...) -JSL.l Underworld_DoorDown_Entry : CPX #$10 -db $B0, $21 ; BCS $028B04 -BRA + : NOP #6 : + - -org $02C3F2 ; <- Bank02.asm:10521 Unused call -Underworld_DoorDown_Call: -org $02C3F3 -dw $8AD9 ; address of Bank02.asm:2085 ;-------------------------------------------------------------------------------- ;================================================================================ diff --git a/stats.asm b/stats.asm index d793f20..846355d 100644 --- a/stats.asm +++ b/stats.asm @@ -122,7 +122,13 @@ ;-------------------------------------------------------------------------------- ; $7EF4A0 - 7EF4A7 - Service Request ;-------------------------------------------------------------------------------- -; $7EF4A8 - 7EF4AF - Free space +; $7EF4A8 - 7EF4A9 - Free space +;-------------------------------------------------------------------------------- +; $7EF4AAw[2] - damage taken +;-------------------------------------------------------------------------------- +; $7EF4ACw[2] - magic used +;-------------------------------------------------------------------------------- +; $7EF4AE - 7EF4AF - Free space ;-------------------------------------------------------------------------------- ; $7EF4B0 - 7EF4BF - Absorbed keys, indexed by 040C >> 1 ;-------------------------------------------------------------------------------- @@ -368,8 +374,8 @@ IncrementBigChestCounter: PLA RTL ;-------------------------------------------------------------------------------- -!DAMAGE_COUNTER = $7EF46A -!MAGIC_COUNTER = $7EF46C +!DAMAGE_COUNTER = $7EF4AA +!MAGIC_COUNTER = $7EF4AC IncrementDamageTakenCounter_Eight: STA.l $7EF36D PHA : PHP diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index c653ed4..8706645 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -11,6 +11,20 @@ db 2 db 55 db " " ; $238020 +CollectionRateHi: +db 2, 55 +db $5F, $6B, $68, $68, $61, $5F, $70, $65, $6B, $6A, $9F, $6E, $5D, $70, $61 ; "Collection Rate" +db $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $A2 ; " /" +print "Collection Rate High Start: ", pc +db $55, $54, $59 ; 216 + +CollectionRateLo: +db 2, 55 +db $85, $91, $8E, $8E, $87, $85, $96, $8B, $91, $90, $9F, $94, $83, $96, $87 ; "Collection Rate" +db $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $9F, $C2 ; " /" +print "Collection Rate Low Start: ", pc +db $7B, $7A, $7F ; 216 + ;=================================================================================================== CreditsLineTable: @@ -690,8 +704,8 @@ endif %emptyline() %emptyline() -print "Collection Rate Credit Start: ", pc -%bigcreditsleft("COLLECTION RATE /216") +%addarbline(CollectionRateHi) +%addarbline(CollectionRateLo) %blankline()