Baserom re-factor of compass code

Scrolling fix
This commit is contained in:
aerinon
2020-11-03 10:17:46 -07:00
parent 4a4868bb5b
commit f62ba51469
6 changed files with 12 additions and 84 deletions

View File

@@ -104,12 +104,6 @@ nop : stz $0dd0, X : rts
.not_in_ganons_tower
;org $208206
org $20820E
jsl MirrorCheckOverride2
;org $208270
org $20827C
jsl MirrorCheckOverride2
org $07a955 ; <- Bank07.asm : around 6564 (JP is a bit different) (STZ $05FC : STZ $05FD)
jsl BlockEraseFix
nop #2
@@ -131,11 +125,6 @@ nop #2 : jsl BlindAtticFix
org $028409
jsl SuctionOverworldFix
; also rando's hooks.asm line 1360
; 106e4e -> goes to a0ee4e
;org $a0ee8a ; <- 6FC4C - headsup_display.asm : 836 (LDA $7EF36E : AND.w #$00FF : ADD.w #$0007 : AND.w #$FFF8 : TAX)
org $a0eeab
jsl DrHudOverride
org $0ded04 ; <- rando's hooks.asm line 2192 - 6ED04 - equipment.asm : 1963 (REP #$30)
jsl DrHudDungeonItemsAdditions
;org $098638 ; rando's hooks.asm line 2192

View File

@@ -49,10 +49,6 @@ MirrorCheckOverride:
rtl
+ lda.l DRScroll : rtl
MirrorCheckOverride2:
lda $7ef353 : and #$02 : rtl
BlockEraseFix:
lda $7ef353 : and #$02 : beq +
stz $05fc : stz $05fd

View File

@@ -177,20 +177,20 @@ ScrollX: ;change the X offset variables
rts
LimitXCamera:
cmp #$0080 : !bge +
cmp #$0079 : !bge +
lda #$0000 : bra .end
+ cmp #$0181 : !blt +
lda #$0180
+ !sub #$0080
+ cmp #$0178 : !blt +
lda #$0178
+ !sub #$0078
.end rts
CheckRoomLayoutX:
jsr LoadRoomLayout ;switches to 8-bit
cmp #$04 : !blt .lock
cmp #$05 : bne +
lda $04 : cmp #$f8 : beq .lock
lda $06 : cmp #$ff : beq .lock
+ cmp #$06 : bne .free
lda $04 : cmp #$f8 : bne .lock
lda $06 : cmp #$ff : bne .lock
.free rep #$30 : clc : rts
.lock rep #$30 : sec : rts