From fd490cab9a98532b33b40b61f88ae6849c706dae Mon Sep 17 00:00:00 2001 From: cassidy Date: Mon, 2 Aug 2021 21:06:13 -0400 Subject: [PATCH 1/6] rngfixes: make enemy drop rng static during the standard escape sequence This only applies between picking up the Uncle item and dropping off zelda, not rain state in general --- hooks.asm | 3 +++ rngfixes.asm | 16 ++++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/hooks.asm b/hooks.asm index e85afc1..9084c93 100755 --- a/hooks.asm +++ b/hooks.asm @@ -1491,6 +1491,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 ;-------------------------------------------------------------------------------- diff --git a/rngfixes.asm b/rngfixes.asm index cf2b7b9..33cddff 100644 --- a/rngfixes.asm +++ b/rngfixes.asm @@ -4,8 +4,7 @@ RigDigRNG: LDA $7FFE01 : CMP.l DiggingGameRNG : !BGE .forceHeart .normalItem - JSL $0DBA71 ; GetRandomInt -RTL + JML GetRandomInt .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 @@ -29,7 +28,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 @@ -97,6 +96,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 @@ -142,5 +146,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 -;-------------------------------------------------------------------------------- \ No newline at end of file +dw #$03C0 ; 15 = Standard Escape Enemy Drops +;-------------------------------------------------------------------------------- From e2e4db82370695c63d877cc20d0c07f18c4dbe02 Mon Sep 17 00:00:00 2001 From: compiling <8335770+compiling@users.noreply.github.com> Date: Sun, 8 Aug 2021 14:13:40 +1000 Subject: [PATCH 2/6] Fix clearing frog/smith in inverted mode --- darkworldspawn.asm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/darkworldspawn.asm b/darkworldspawn.asm index e86344f..2b3696b 100644 --- a/darkworldspawn.asm +++ b/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 #$08 : BNE .done ; clear dwarf - consider flute implications + CMP #$07 : BEQ .clear ; clear frog + CMP #$08 : BEQ .clear ; clear dwarf - consider flute implications + BRA .done .clear LDA.b #$00 : STA $7EF3CC ; clear follower .done From 7057d984e2d2abbb10e80c4990e13737d4ee77e7 Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Tue, 10 Aug 2021 09:56:57 -0400 Subject: [PATCH 3/6] fix quadrant glitch hopefully --- hooks.asm | 13 +++++++++++++ tables.asm | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/hooks.asm b/hooks.asm index e85afc1..dc21117 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2724,3 +2724,16 @@ org $0AEEF2 org $008BE5 ; hijack stripes for boss GFX transfer JSL DoDungeonMapBossIcon + +;================================================================================ +; Fix quadrant glitch +org $07A879 + JSR SwordSpinQuadrantFix + +org $07F877 ; free rom +SwordSpinQuadrantFix: + LDA.l AllowQuadrantGlitch + BEQ ++ + JMP.w $07E8D9 ; HandleIndoorCameraAndDoors + +++ RTS diff --git a/tables.asm b/tables.asm index d5a6a32..a7f04b4 100644 --- a/tables.asm +++ b/tables.asm @@ -1082,8 +1082,15 @@ db $00, $00, $00, $00, $00, $00, $00, $00 org $308350 ; PC 0x180350 ShouldStartatExit: db $00, $00, $00 +;-------------------------------------------------------------------------------- +; $308358 (0x180358) fixes quadrant glitch +; 0x00 - fix +; otherwise dont fix quadrant glitch +org $308358 +AllowQuadrantGlitch: +db $00 ;================================================================================ -; 0x180350 - 0x1814FF (unused) +; 0x180359 - 0x1814FF (unused) ;================================================================================ ; $309500 (0x181500) - $309FFF (0x181FFF) original 0x39C bytes ; Replacement Ending Sequence Text Data From 03c287a98886189501369c79d9106b3580a5c0c2 Mon Sep 17 00:00:00 2001 From: spannerisms <32842036+spannerisms@users.noreply.github.com> Date: Wed, 11 Aug 2021 06:30:52 -0400 Subject: [PATCH 4/6] jingle jangle --- bugfixes.asm | 15 +++++++++++++++ hooks.asm | 9 ++++++++- tables.asm | 6 +++--- 3 files changed, 26 insertions(+), 4 deletions(-) diff --git a/bugfixes.asm b/bugfixes.asm index 0d5117f..b5ee34b 100644 --- a/bugfixes.asm +++ b/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 diff --git a/hooks.asm b/hooks.asm index 4ff7432..aed4914 100755 --- a/hooks.asm +++ b/hooks.asm @@ -2733,8 +2733,15 @@ org $07A879 org $07F877 ; free rom SwordSpinQuadrantFix: - LDA.l AllowQuadrantGlitch + 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 diff --git a/tables.asm b/tables.asm index a7f04b4..d1eb4ec 100644 --- a/tables.asm +++ b/tables.asm @@ -1083,11 +1083,11 @@ org $308350 ; PC 0x180350 ShouldStartatExit: db $00, $00, $00 ;-------------------------------------------------------------------------------- -; $308358 (0x180358) fixes quadrant glitch +; $308358 (0x180358) fixes major glitches ; 0x00 - fix -; otherwise dont fix quadrant glitch +; otherwise dont fix various major glitches org $308358 -AllowQuadrantGlitch: +AllowAccidentalMajorGlitch: db $00 ;================================================================================ ; 0x180359 - 0x1814FF (unused) From bd16b9ff927ac6dce3b59b18b84574482b4898fc Mon Sep 17 00:00:00 2001 From: Thomas Prescott Date: Sat, 21 Aug 2021 07:43:23 -0500 Subject: [PATCH 5/6] Add Pleasure to credits Credit the creator of the website logo --- stats/creditsnew.asm | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/stats/creditsnew.asm b/stats/creditsnew.asm index f4b2522..923c687 100644 --- a/stats/creditsnew.asm +++ b/stats/creditsnew.asm @@ -489,6 +489,15 @@ CreditsLineBlank: %blankline() %blankline() +%smallcredits("WEBSITE LOGO", "green") + +%blankline() + +%bigcredits("PLEASURE") + +%blankline() +%blankline() + %smallcredits("SPECIAL THANKS", "red") %blankline() @@ -556,12 +565,6 @@ CreditsLineBlank: %emptyline() %emptyline() %emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() -%emptyline() ;=================================================================================================== From 48d9a7d4bcbd2a4ae3e9ff6800f590deda2a5aac Mon Sep 17 00:00:00 2001 From: qwertymodo Date: Mon, 23 Aug 2021 11:24:24 -0700 Subject: [PATCH 6/6] Fix SPC un/mute race condition Should fix mothula hardlock, for real this time --- msu.asm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/msu.asm b/msu.asm index 76fb53c..49b5904 100644 --- a/msu.asm +++ b/msu.asm @@ -323,10 +323,8 @@ CheckMusicLoadRequest: .load REP #$10 STZ $4200 - STA !REG_SPC_CONTROL - - : 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 + - : STA !REG_SPC_CONTROL : 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 LDA.b #$81 : STA $4200 LDA !REG_MUSIC_CONTROL_REQUEST : CMP.b #08 : BEQ .done+3 ; No SFX during warp track