alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Support for Mirror Scroll

Browse Source 
DR Hud Additions
This commit is contained in:
aerinon
2020-10-30 16:26:28 -06:00
parent 49dc0f4037
commit 0dba58c194
4 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
darkworldspawn.asm
View File

@@ -12,9 +12,7 @@ DoWorldFix:
JMP DoWorldFix_Inverted JMP DoWorldFix_Inverted
+ +
LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
.doors_mirror_override LDA $7EF353 : AND #$02 : BEQ .noMirror ; check if we have the mirror
print "MirrorCheckOverride2: ", pc
LDA $7EF353 : BEQ .noMirror ; check if we have the mirror
.skip_mirror_check ; alt entrance point .skip_mirror_check ; alt entrance point
LDA $7EF3C5 : CMP.b #$03 : !BLT .aga1Alive ; check if agahnim 1 is alive LDA $7EF3C5 : CMP.b #$03 : !BLT .aga1Alive ; check if agahnim 1 is alive
BRA .done BRA .done
@@ -50,9 +48,7 @@ RTL
;================================================================================ ;================================================================================
DoWorldFix_Inverted: DoWorldFix_Inverted:
LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check LDA.l Bugfix_MirrorlessSQToLW : BEQ .skip_mirror_check
.doors_mirror_override LDA $7EF353 : AND #$02 : BEQ .noMirror ; check if we have the mirror
print "MirrorCheckOverride2: ", pc
LDA $7EF353 : BEQ .noMirror ; check if we have the mirror
.skip_mirror_check ; alt entrance point .skip_mirror_check ; alt entrance point
LDA $7EF3C5 : CMP.b #$03 : !BLT .aga1Alive ; check if agahnim 1 is alive LDA $7EF3C5 : CMP.b #$03 : !BLT .aga1Alive ; check if agahnim 1 is alive
BRA .done BRA .done

12
drhooks.asm
View File

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

3
events.asm
View File

@@ -16,8 +16,7 @@ RTL
;-------------------------------------------------------------------------------- ;--------------------------------------------------------------------------------
OnDrawHud: OnDrawHud:
JSL.l DrawChallengeTimer ; this has to come before NewDrawHud because the timer overwrites the compass counter JSL.l DrawChallengeTimer ; this has to come before NewDrawHud because the timer overwrites the compass counter
.DrHudOverride JSL.l DrHudOverride
print "DrHudOverride: ", pc
JSL.l NewDrawHud JSL.l NewDrawHud
JSL.l SwapSpriteIfNecissary JSL.l SwapSpriteIfNecissary
JSL.l PollService JSL.l PollService

5
overrides.asm
View File

@@ -49,8 +49,9 @@ MirrorCheckOverride:
rtl rtl
+ lda.l DRScroll : rtl + lda.l DRScroll : rtl
MirrorCheckOverride2: ;moved to base rom
lda $7ef353 : and #$02 : rtl ;MirrorCheckOverride2:
; lda $7ef353 : and #$02 : rtl
BlockEraseFix: BlockEraseFix: