Merge branch 'main' into overworld_kara

bugfixes.asm

@@ -199,3 +199,18 @@ LDA $1B : BNE +
 		LDA $8C : CMP.b #$97
 +
 RTL
+
+;--------------------------------------------------------------------------------
+FixJingleGlitch:
+	LDA.b $11
+	BEQ .set_doors
+
+	LDA.l AllowAccidentalMajorGlitch
+	BEQ .exit
+
+.set_doors
+	LDA.b #$05
+	STA.b $11
+
+.exit
+	RTL

darkworldspawn.asm

@@ -53,8 +53,9 @@ DoWorldFix_Inverted:
 	.aga1Alive
 	LDA #$40 : STA $7EF3CA ; set flag to dark world
 	LDA $7EF3CC
-	CMP #$07 : BNE .done ; clear frog
+	CMP #$07 : BEQ .clear ; clear frog
-	CMP #$08 : BNE .done ; clear dwarf - consider flute implications
+	CMP #$08 : BEQ .clear ; clear dwarf - consider flute implications
+	BRA .done
 	.clear
 	LDA.b #$00 : STA $7EF3CC ; clear follower
 	.done

hooks.asm

@@ -1526,6 +1526,9 @@ org $1DBAB1 ; <- EBAB1 - sprite_sidenexx.asm : 314 (JSL GetRandomInt : AND.b #$0
 JSL.l RNG_Trinexx
 org $1DBAC3 ; <- EBAC3 - sprite_sidenexx.asm : 323 (JSL GetRandomInt : AND.b #$0F : ADD.b #$0C : STA $02 : STZ $03)
 JSL.l RNG_Trinexx
+;--------------------------------------------------------------------------------
+org $6F9B8 ; <- 379B8 - bank06.asm : 6693 (JSL GetRandomInt : PLY  : AND $FA5C, Y : BNE BRANCH_MU)
+JSL.l RNG_Enemy_Drops
 ;================================================================================
 ; HUD Changes
 ;--------------------------------------------------------------------------------
@@ -2868,3 +2871,22 @@ JSL Ganon_CheckBeeVulnerability
 ;--------------------------------------------------------------------------------
 org $06ED70 ; Bank06.asm@4842 (LDA $06ED39, X : STA $0CF2)
 JSL StoreSwordDamage
+;================================================================================
+; Fix quadrant glitch
+org $07A879
+	JSR SwordSpinQuadrantFix
+
+org $07F877 ; free rom
+SwordSpinQuadrantFix:
+	LDA.l AllowAccidentalMajorGlitch
+	BEQ ++
+	JMP.w $07E8D9 ; HandleIndoorCameraAndDoors
+
+++	RTS
+
+;================================================================================
+
+org $01C4B8 : JSL FixJingleGlitch
+org $01C536 : JSL FixJingleGlitch
+org $01C592 : JSL FixJingleGlitch
+org $01C65F : JSL FixJingleGlitch

msu.asm

@@ -323,10 +323,8 @@ CheckMusicLoadRequest:
 .load
         REP #$10
         STZ $4200
-        STA !REG_SPC_CONTROL
+        - : STA !REG_SPC_CONTROL : CMP !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is ACK'ed
-        - : CMP !REG_SPC_CONTROL : BNE -    ; Wait until mute/unmute command is ACK'ed
+        - : STZ !REG_SPC_CONTROL : LDA !REG_SPC_CONTROL : BNE - ; Wait until mute/unmute command is completed
-        STZ !REG_SPC_CONTROL
-        - : LDA !REG_SPC_CONTROL : BNE -    ; Wait until mute/unmute command is completed
         LDA.b #$81 : STA $4200
 
         LDA !REG_MUSIC_CONTROL_REQUEST : CMP.b #08 : BEQ .done+3    ; No SFX during warp track

rngfixes.asm

@@ -4,8 +4,7 @@
 RigDigRNG:
 	LDA $7FFE01 : CMP.l DiggingGameRNG : !BGE .forceHeart
 	.normalItem
-	JSL $0DBA71 ; GetRandomInt
+	JML GetRandomInt
-RTL
 	.forceHeart
 	LDA $7FFE00 : BNE .normalItem
 	LDA #$04
@@ -15,7 +14,7 @@ RigChestRNG:
 	JSL.l DecrementChestCounter
 	LDA $04C4 : CMP.l ChestGameRNG : BEQ .forceHeart
 	.normalItem
-	JSL $0DBA71 ; GetRandomInt
+	JSL GetRandomInt
 	AND.b #$07 ; restrict values to 0-7
 	CMP #$07 : BEQ .notHeart
 	JSL.l DecrementItemCounter
@@ -30,7 +29,7 @@ RTL
 	JSL.l DecrementItemCounter
 	;LDA #$00 ; bullshit rupee farming in chest game
 	
-	JSL $0DBA71 ; GetRandomInt ; spam RNG until we stop getting the prize item
+	JSL GetRandomInt ; spam RNG until we stop getting the prize item
 	AND.b #$07 ; restrict values to 0-7
 	CMP #$07 : BNE + ; player got prize item AGAIN
 		LDA.b #$00 ; give them money instead
@@ -98,6 +97,11 @@ RNG_Ganon_Extra_Warp:
 	+
 	PLA
 	RTL
+RNG_Enemy_Drops:
+        LDA.l $7EF3C5 : CMP #$01 : BEQ + ; drops are static after uncle pickup & before rescuing zelda
+            JML GetRandomInt
+        +
+            LDA.b #$0F
 	_rng_done:
 	JSL.l GetStaticRNG
 RTL
@@ -143,5 +147,5 @@ dw #$02C0 ; 11 = Agahnim 2
 dw #$0300 ; 12 = Agahnim 2 Phantoms
 dw #$0340 ; 13 = Ganon
 dw #$0380 ; 14 = Ganon Extra Warp
-dw #$03C0 ; 15 = Unused
+dw #$03C0 ; 15 = Standard Escape Enemy Drops
-;--------------------------------------------------------------------------------
+;--------------------------------------------------------------------------------

stats/creditsnew.asm

@@ -546,6 +546,15 @@ CreditsLineBlank:
 %blankline()
 %blankline()
 
+%smallcredits("WEBSITE LOGO", "green")
+
+%blankline()
+
+%bigcredits("PLEASURE")
+
+%blankline()
+%blankline()
+
 %smallcredits("SPECIAL THANKS", "red")
 
 %blankline()
@@ -609,12 +618,6 @@ CreditsLineBlank:
 %emptyline()
 %emptyline()
 %emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
-%emptyline()
 
 ;===================================================================================================
 

tables.asm

@@ -1093,8 +1093,15 @@ db $00, $00, $00, $00, $00, $00, $00, $00
 org $308350 ; PC 0x180350
 ShouldStartatExit:
 db $00, $00, $00
+;--------------------------------------------------------------------------------
+; $308358 (0x180358) fixes major glitches
+; 0x00 - fix
+; otherwise dont fix various major glitches
+org $308358
+AllowAccidentalMajorGlitch:
+db $00
 ;================================================================================
-; 0x180350 - 0x1814FF (unused)
+; 0x180359 - 0x1814FF (unused)
 ;================================================================================
 ; $309500 (0x181500) - $309FFF (0x181FFF) original 0x39C bytes
 ; Replacement Ending Sequence Text Data