Merge branch 'OWMain' into overworld_kara

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

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
 ;--------------------------------------------------------------------------------
 
 ;================================================================================

stats.asm

@@ -124,11 +124,13 @@
 ;--------------------------------------------------------------------------------
 ; $7EF4A8 - Progressive Bomb Level
 ;--------------------------------------------------------------------------------
+; $7EF4A9 - Free space
+;--------------------------------------------------------------------------------
 ; $7EF4AAw[2] - Damage Counter
 ;--------------------------------------------------------------------------------
 ; $7EF4ACw[2] - Magic Counter
 ;--------------------------------------------------------------------------------
-; $7EF4AC - 7EF4AF - Free space
+; $7EF4AE - 7EF4AF - Free space
 ;--------------------------------------------------------------------------------
 ; $7EF4B0 - 7EF4BF - Absorbed keys, indexed by 040C >> 1
 ;--------------------------------------------------------------------------------

stats/creditsnew.asm

@@ -9,53 +9,61 @@ table "creditscharmapbiglo.txt"
 YourSpriteCreditsLo:
 db 2, 55, "                            " ; $238020
 
+table "creditscharmapbighi.txt"
+CollectionRateHi:
+db 2, 55, "COLLECTION RATE         /216" ; $23803E, "216" at $238057
+
+table "creditscharmapbiglo.txt"
+CollectionRateLo:
+db 2, 55, "COLLECTION RATE         /216" ; $23805C, "216" at $238075
+
 table "creditscharmapbighi.txt"
 FirstSwordStatsHi:
-db 2, 55, "FIRST SWORD                 " ; $23803E
+db 2, 55, "FIRST SWORD                 " ; $23807A
 
 table "creditscharmapbiglo.txt"
 FirstSwordStatsLo:
-db 2, 55, "FIRST SWORD                 " ; $23805C
+db 2, 55, "FIRST SWORD                 " ; $238098
 
 table "creditscharmapbighi.txt"
 SwordlessKillsHi:
-db 2, 55, "SWORDLESS                /13" ; $23807A
+db 2, 55, "SWORDLESS                /13" ; $2380B6
 
 table "creditscharmapbiglo.txt"
 SwordlessKillsLo:
-db 2, 55, "SWORDLESS                /13" ; $238098
+db 2, 55, "SWORDLESS                /13" ; $2380D4
 
 table "creditscharmapbighi.txt"
 FighterSwordKillsHi:
-db 2, 55, "FIGHTER'S SWORD          /13" ; $2380B6
+db 2, 55, "FIGHTER'S SWORD          /13" ; $2380F2
 
 table "creditscharmapbiglo.txt"
 FighterSwordKillsLo:
-db 2, 55, "FIGHTER'S SWORD          /13" ; $2380D4
+db 2, 55, "FIGHTER'S SWORD          /13" ; $238110
 
 table "creditscharmapbighi.txt"
 MasterSwordKillsHi:
-db 2, 55, "MASTER SWORD             /13" ; $2380F2
+db 2, 55, "MASTER SWORD             /13" ; $23812E
 
 table "creditscharmapbiglo.txt"
 MasterSwordKillsLo:
-db 2, 55, "MASTER SWORD             /13" ; $238110
+db 2, 55, "MASTER SWORD             /13" ; $23814C
 
 table "creditscharmapbighi.txt"
 TemperedSwordKillsHi:
-db 2, 55, "TEMPERED SWORD           /13" ; $23812E
+db 2, 55, "TEMPERED SWORD           /13" ; $23816A
 
 table "creditscharmapbiglo.txt"
 TemperedSwordKillsLo:
-db 2, 55, "TEMPERED SWORD           /13" ; $23814C
+db 2, 55, "TEMPERED SWORD           /13" ; $238188
 
 table "creditscharmapbighi.txt"
 GoldSwordKillsHi:
-db 2, 55, "GOLD SWORD               /13" ; $23816A
+db 2, 55, "GOLD SWORD               /13" ; $2381A6
 
 table "creditscharmapbiglo.txt"
 GoldSwordKillsLo:
-db 2, 55, "GOLD SWORD               /13" ; $238188
+db 2, 55, "GOLD SWORD               /13" ; $2381C4
 
 ;===================================================================================================
 
@@ -741,8 +749,8 @@ endif
 
 %emptyline()
 %emptyline()
-print "Collection Rate Credit Start: ", pc
+%addarbline(CollectionRateHi)
-%bigcreditsleft("COLLECTION RATE         /216")
+%addarbline(CollectionRateLo)
 
 %blankline()