revert to pre-stair patch

nstbayless · Jul 22, 2024 · c23199a · c23199a
1 parent d7263ad
commit c23199a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 336 deletions.
diff --git a/out.ips b/out.ips
diff --git a/patch.asm b/patch.asm
@@ -4,251 +4,6 @@ include "pre.asm"
 
 include "ram.asm"
 
-; --------------------------------------------------------------------
-BANK $5
-BASE $8000
-
-FROM $BF07
-staircheck:
-    LDY #$00
-    STY hspfra
-    LDA vspint
-    BPL LBF12
-LBF11:
-    RTS
-LBF12:
-    LDA control_held
-    AND #$04
-    BNE LBF11
-    LDX #$10
-    LDA #$00
-    JSR $FCDE
-    BNE LBF11
-    NOP
-    NOP
-    NOP
-    NOP
-    NOP
-    NOP
-    NOP
-    LDX #$00
-stair_loop_start:
-    TXA
-    PHA
-    JSR disp_check_diagonals
-    PLA
-    BCC +
-    CMP #$02
-    BPL LBF9A
-    BMI land
-+
-    NOP
-    TAX
-    INX
-    CPX #$04
-    BMI stair_loop_start
-    RTS
-
-Table_BF40:
-    DB $00,$80,$C0,$40
-Table_BF44:
-    DB $80,$00,$40,$C0
-
-disp_check_diagonals:
-    LDA Table_BF40,X
-    STA $11
-    LDA Table_BF44,X
-    STA $12
-    STX $06
-    LDX #$BF
-    LDY #$58
-    LDA #$07
-    JMP $FFCA
-land:
-    LDA #$12
-    STA simon_state
-    LDX #$0A
-    LDA facing
-    BNE LBF6B
-    INX
-    INX
-LBF6B:
-    STX imgsin
-    LDA #$00
-    STA stair_direction
-    SEC
-    SBC xint
-    SEC
-    SBC view_pix
-    AND #$0F
-    BNE LBF81
-    CLC
-    ADC #$10
-LBF81:
-    STA tmp_x
-    LDA yint
-    TAX
-    AND #$0F
-    BNE LBF90
-    TXA
-    SEC
-    SBC #$10
-    TAX
-LBF90:
-    TXA
-    AND #$F0
-    CLC
-    ADC tmp_x
-    STA yint
-    RTS
-LBF9A:
-    LDA #$12
-    STA simon_state
-    LDX #$0A
-    LDA facing
-    BEQ LBFA8
-    INX
-    INX
-LBFA8:
-    STX imgsin
-    LDA #$01
-    STA stair_direction
-    LDA #$00
-    SEC
-    SBC xint
-    SEC
-    SBC view_pix
-    CLC
-    AND #$0F
-    STA tmp_x
-    TAX
-    LDA yint
-    AND #$F0
-    CPX #$00
-    CLC
-    BEQ LBFCB
-    ADC #$10
-LBFCB:
-    SEC
-    SBC tmp_x
-    STA yint
-    RTS
-
-; --------------------------------------------------------------------
-BANK $7
-BASE $8000
-
-FROM $BF55
-__return_false:
-    CLC
-    RTS
-__return_true:
-    SEC
-    RTS
-    LDX $06
-    LDA yint
-    CPX #$02
-    CLC
-    BMI LBF65
-    SBC #$10
-LBF65:
-    ADC #$0F
-    LSR A
-    LSR A
-    LSR A
-    LSR A
-    NOP
-    NOP
-    CLC
-    STA tmp_y
-    LDA xint
-    ADC view_pix
-    AND #$F0
-    STA tmp_x
-    LDA view_subroom
-    ADC #$00
-    STA tmp_xscreen
-    LDA $06
-    AND #$01
-    BEQ LBFB7
-LBF85:
-    LDY #$00
-LBF87:
-    LDA (stairs),Y
-    CMP #$FF
-    BEQ LBFB7
-    SEC
-    AND #$0F
-    CMP tmp_y
-    BNE LBFB2
-    SEC
-    INY
-    LDA (stairs),Y
-    SBC tmp_x
-    BNE LBFB3
-    INY
-    LDA (stairs),Y
-    SEC
-    SBC tmp_xscreen
-    BNE LBFB4
-    DEY
-    DEY
-    LDA (stairs),Y
-    AND #$F0
-    CMP $11
-    BEQ $BF55
-    CMP $12
-    BEQ $BF57
-LBFB2:
-    INY
-LBFB3:
-    INY
-LBFB4:
-    INY
-    BPL LBF87
-LBFB7:
-    LDX $12
-    LDA tmp_y
-    CPX #$40
-    BEQ LBFCA
-    CPX #$00
-    BEQ LBFCA
-    SEC
-    SBC #$01
-    BCC $BF55
-    BCS LBFD2
-LBFCA:
-    CLC
-    ADC #$01
-    NOP
-    CMP #$0F
-    BPL $BF55
-LBFD2:
-    STA tmp_y
-    LDA tmp_x
-    CPX #$C0
-    BEQ LBFED
-    CPX #$00
-    BEQ LBFED
-    CLC
-    ADC #$10
-    STA tmp_x
-    BCC LBFEA
-    LDY tmp_xscreen
-    INY
-LBFE8:
-    STY tmp_xscreen
-LBFEA:
-    JMP LBF85
-LBFED:
-    SEC
-    SBC #$10
-    STA tmp_x
-    BCS LBFEA
-    LDY tmp_xscreen
-    DEY
-    JMP LBFE8
-
 ; --------------------------------------------------------------------
 BANK $E
 BASE $8000
@@ -266,55 +21,21 @@ FROM $9430
 
 FROM $94CA
     DW $BFC6
-    
-FROM $95F1
-    DB $D0,$04
-    NOP
-    NOP
-__walk_to_stair_right
-    
-FROM $9629
-    LDA #$FF
-    STA vspint
-    NOP
-    LDA #$16
-    STA imgsin
-    LDA #$00
-    STA $05C1
-    LDA #$09
-    DB $8D
-    
-FROM $9645
-    DB $2A
-
-FROM $964D
-    DB $8D
-    
-FROM $9658
-    DB $8D
 
 FROM $9750
     DB $08
 
 FROM $9757
     DB $1C
     STA vsp_control,X
-    LDA #$16
-    STA imgsin
     LDA #$00
-    STA $05C1,X
-    STA hspfra
-    RTS
-    LDA control_held
-    AND #$03
-    RTS
-    DB $FF,$FF,$FF,$FF,$FF
-    RTS
-    LDA control_pressed
-    RTS
-
-FROM $97A7
-    DB $CE
+    STA $5C1,X
+    lda #$16
+    sta imgsin
+    lda #$00
+    sta hspfra
+    rts
+    DB $FF,$FF,$FF,$FF,$FF,$60,$FF,$FF,$FF,$FF,$FF,$FF
     
 FROM $9921
     DB $E9,$BF
@@ -341,25 +62,23 @@ custom_jump:
     LDA #$76
     PHA
 LBF44:
-    JSR $FFDE
-    LDY #$00
-    LDA control_held
+    JSR $9765
+    LDA $2A
     AND #$03
-    BEQ hstall
-    JSR $9769
-    BEQ check_vstall
+    BEQ $BFC0
     LSR A
-    BCC __turn_left
-__turn_right:
-    INY
-    STY hspint
-    DEY
-__turn_left:
-    BEQ __jumping_contd
-    DEY
-    STY hspint
+    BCC LBF5C
+    LDY #$00
+    LDX #$01
+    STX hspint
+    BPL $BF99
+    LSR A
+    BCC $BFAA
+LBF5C
     LDY #$01
-    BPL __jumping_contd
+    LDX #$FF
+    STX hspint
+    JMP $BF99
 custom_knockback:
     LDA $4A
     BEQ __return_to_knockback
@@ -442,37 +161,4 @@ LBFF3:
     LDX #$01
     STX facing
 LBFFB:
-    JMP $840C
-
-; --------------------------------------------------------------------
-BANK $F
-BASE $C000
-
-FROM $FFC4
-LFFC4:    
-    LDA #$05
-    LDX #$BF
-    LDY #$06
-    STA $05
-    LDA $23
-    PHA
-    LDA #$FF
-    PHA
-    LDA #$A5
-    PHA
-    TXA
-    PHA
-    TYA
-    PHA
-    LDA $05
-    JMP $E2D0
-    JSR LFFC4
-    LDA simon_state
-    CMP #$12
-    BNE LFFEC
-    PLA
-    PLA
-    PLA
-    PLA
-LFFEC:
-    RTS
+    JMP $840C