From 5a4afc775efd7e0edc134ae49b5e3a3687f2c6bc Mon Sep 17 00:00:00 2001 From: sporchia Date: Mon, 31 Jul 2017 19:48:19 -0400 Subject: [PATCH 1/3] fix regression in digging game --- LTTP_RND_GeneralBugfixes.asm | 2 +- inventory.asm | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 5520ce7..f89d446 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF db #$00 ; expand file to 2mb org $1FFFF8 ; timestamp rom -dl #$20170726 +dl #$20170731 ;================================================================================ diff --git a/inventory.asm b/inventory.asm index 8f43822..5689a59 100644 --- a/inventory.asm +++ b/inventory.asm @@ -920,7 +920,9 @@ RTL ;-------------------------------------------------------------------------------- SpawnShovelGamePrizeSFX: STA $7FFE00 ; thing we wrote over - LDA.b #$1B : STA $012F ; play puzzle sound + PHA + LDA.b #$1B : STA $012F ; play puzzle sound + PLA RTL ;-------------------------------------------------------------------------------- @@ -929,7 +931,6 @@ RTL ;-------------------------------------------------------------------------------- SpawnChestGamePrizeSFX: ORA.b #$40 : STA $0403 ; thing we wrote over - STA $FFFFFF PHA LDA.b #$1B : STA $012F ; play puzzle sound PLA From e845e413785e0f11e1594edb003baae44922c4f6 Mon Sep 17 00:00:00 2001 From: sporchia Date: Tue, 1 Aug 2017 23:58:53 -0400 Subject: [PATCH 2/3] added ability to set magic usage in spike cave * byrna cane * magic cape --- LTTP_RND_GeneralBugfixes.asm | 2 +- hardmode.asm | 30 +++++++++++++++++++++++++++++- hooks.asm | 6 ++++++ tables.asm | 6 ++++++ 4 files changed, 42 insertions(+), 2 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index f89d446..55c2b86 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -26,7 +26,7 @@ org $3FFFFF ; <- 1FFFFF db #$00 ; expand file to 2mb org $1FFFF8 ; timestamp rom -dl #$20170731 +dl #$20170801 ;================================================================================ diff --git a/hardmode.asm b/hardmode.asm index 5ec395f..e1235c2 100644 --- a/hardmode.asm +++ b/hardmode.asm @@ -14,4 +14,32 @@ CalculateSpikeFloorDamage: LDA $D055, Y STA $0373 RTL -;-------------------------------------------------------------------------------- \ No newline at end of file +;-------------------------------------------------------------------------------- +CalculateByrnaUsage: + LDA $1B : BEQ + + REP #$20 ; set 16-bit accumulator + LDA $A0 ; these are all decimal because i got them that way + CMP.w #279 + SEP #$20 ; set 8-bit accumulator + BNE + + PHX : TYX + LDA.l ByrnaCaveCaneOfByrnaUsage, X : STA $00 + PLX + + + LDA $7EF36E ; thing we wrote over +RTL +;-------------------------------------------------------------------------------- +CalculateCapeUsage: + LDA $1B : BEQ + + REP #$20 ; set 16-bit accumulator + LDA $A0 ; these are all decimal because i got them that way + CMP.w #279 + SEP #$20 ; set 8-bit accumulator + BNE + + PHX : TYX + LDA.l ByrnaCaveCapeUsage, X : STA $4C + PLX + + + LDA $7EF36E ; thing we wrote over +RTL +;-------------------------------------------------------------------------------- diff --git a/hooks.asm b/hooks.asm index b06ee6d..deb99f4 100644 --- a/hooks.asm +++ b/hooks.asm @@ -202,6 +202,12 @@ NOP #2 org $07D22B ; <- 3D22B - Bank05.asm : 12752 (LDA $D055, Y : STA $0373) JSL.l CalculateSpikeFloorDamage : NOP #2 ;-------------------------------------------------------------------------------- +org $08DCC3 ; <- 45CC3 - ancilla_cane_spark.asm : 272 (LDA $7EF36E) +JSL.l CalculateByrnaUsage +;-------------------------------------------------------------------------------- +org $07AE17 ; <- 3AE17 - Bank07.asm : 7285 (LDA $7EF36E) +JSL.l CalculateCapeUsage +;-------------------------------------------------------------------------------- ;================================================================================ ; Misc Stats diff --git a/tables.asm b/tables.asm index be9200b..9f72b49 100644 --- a/tables.asm +++ b/tables.asm @@ -677,6 +677,12 @@ db #$00 ; #00 = Never Locked - #$01 = Locked During Escape (default) org $30816A ; PC 0x18016A FreeItemText: db #$01 ; #00 = Off - #$01 = On (default) +org $30816B ; PC 0x18016B +ByrnaCaveCaneOfByrnaUsage: +db #$04, #$02, #$01 ; normal, 1/2, 1/4 magic +org $30816E ; PC 0x18016E +ByrnaCaveCapeUsage: +db #$04, #$08, #$10 ; normal, 1/2, 1/4 magic ;================================================================================ org $308190 ; PC 0x180190 TimerStyle: From a5f9d715a4b8a3cabdfd10e3cdcc5cf30da7f73e Mon Sep 17 00:00:00 2001 From: sporchia Date: Sun, 6 Aug 2017 00:17:50 -0400 Subject: [PATCH 3/3] fix to include MM spike room for OHKO * dl is 3 bytes so split out date to 4 separate bytes. --- LTTP_RND_GeneralBugfixes.asm | 4 ++-- hardmode.asm | 22 ++++++++++++++-------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm index 55c2b86..adf7542 100644 --- a/LTTP_RND_GeneralBugfixes.asm +++ b/LTTP_RND_GeneralBugfixes.asm @@ -25,8 +25,8 @@ db #$05 ; mark sram as 32k org $3FFFFF ; <- 1FFFFF db #$00 ; expand file to 2mb -org $1FFFF8 ; timestamp rom -dl #$20170801 +org $1FFFF8 ; <- FFFF8 timestamp rom +db #$20, #$17, #$08, #$06 ; year/month/day ;================================================================================ diff --git a/hardmode.asm b/hardmode.asm index e1235c2..cb3e752 100644 --- a/hardmode.asm +++ b/hardmode.asm @@ -16,30 +16,36 @@ CalculateSpikeFloorDamage: RTL ;-------------------------------------------------------------------------------- CalculateByrnaUsage: - LDA $1B : BEQ + + LDA $1B : BEQ ++ REP #$20 ; set 16-bit accumulator LDA $A0 ; these are all decimal because i got them that way - CMP.w #279 + CMP.w #279 : BEQ + ; Spike Cave + CMP.w #179 : BEQ + ; Room in Misery Mire SEP #$20 ; set 8-bit accumulator - BNE + + BRA ++ + + + SEP #$20 ; set 8-bit accumulator PHX : TYX LDA.l ByrnaCaveCaneOfByrnaUsage, X : STA $00 PLX - + + ++ LDA $7EF36E ; thing we wrote over RTL ;-------------------------------------------------------------------------------- CalculateCapeUsage: - LDA $1B : BEQ + + LDA $1B : BEQ ++ REP #$20 ; set 16-bit accumulator LDA $A0 ; these are all decimal because i got them that way - CMP.w #279 + CMP.w #279 : BEQ + ; Spike Cave + CMP.w #179 : BEQ + ; Room in Misery Mire SEP #$20 ; set 8-bit accumulator - BNE + + BRA ++ + + + SEP #$20 ; set 8-bit accumulator PHX : TYX LDA.l ByrnaCaveCapeUsage, X : STA $4C PLX - + + ++ LDA $7EF36E ; thing we wrote over RTL ;--------------------------------------------------------------------------------