alttpr-gwaa-kiwi/alttpr-baserom
1
0
Fork 0
Code Pull Requests 1 Releases Activity

Renamed/used some labels

Browse Source
This commit is contained in:
codemann8
2022-10-20 10:25:08 -05:00
parent 3ed0ec0835
commit 33cfd010a0
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
owrando.asm
View File

@@ -107,7 +107,7 @@ org $0ABA99
WorldMap_LoadDarkWorldMap: WorldMap_LoadDarkWorldMap:
LDA.b $10 : CMP.b #$14 ; attract module LDA.b $10 : CMP.b #$14 ; attract module
BEQ .vanilla_light BEQ .vanilla_light
LDA.l OWMode+1 : AND.b #$04 : BNE .mixed LDA.l OWMode+1 : AND.b #!FLAG_OW_MIXED : BNE .mixed
LDA.b $8A : AND.b #$40 LDA.b $8A : AND.b #$40
BEQ .vanilla_light BEQ .vanilla_light
.mixed .mixed
@@ -343,7 +343,7 @@ OWOldManSpeed:
LoadMapDarkOrMixed: LoadMapDarkOrMixed:
{ {
CMP.b #$04 : REP #$30 : BEQ .mixed CMP.b #!FLAG_OW_MIXED : REP #$30 : BEQ .mixed
LDX.w #$03FE ; draw vanilla Dark World (what we wrote over) LDX.w #$03FE ; draw vanilla Dark World (what we wrote over)
.copy_next .copy_next
LDA.w $D739,X : STA.w $1000,X ; DB is $0A LDA.w $D739,X : STA.w $1000,X ; DB is $0A
@@ -400,7 +400,7 @@ OWBonkDrops:
{ {
CMP.b #$D8 : BEQ + CMP.b #$D8 : BEQ +
RTL RTL
+ LDA.l OWFlags+1 : AND.b #$02 : BNE + + LDA.l OWFlags+1 : AND.b #!FLAG_OW_CROSSED : BNE +
JSL.l Sprite_TransmuteToBomb : RTL JSL.l Sprite_TransmuteToBomb : RTL
+ +
@@ -529,10 +529,10 @@ org $aa9000
OWDetectEdgeTransition: OWDetectEdgeTransition:
{ {
STZ.w $06FC STZ.w $06FC
LDA.l OWMode : ORA.l OWMode+1 : BEQ .normal LDA.l OWMode : ORA.l OWMode+1 : BEQ .vanilla
JSR OWShuffle JSR OWShuffle
LDA.w $06FA : BMI .special LDA.w $06FA : BMI .special
.normal .vanilla
REP #$31 : LDX.b $02 : LDA.b $84 ; what we wrote over REP #$31 : LDX.b $02 : LDA.b $84 ; what we wrote over
RTL RTL
.special .special
@@ -586,9 +586,9 @@ OWDetectSpecialTransition:
} }
OWEdgeTransition: OWEdgeTransition:
{ {
LDA.l OWMode : ORA.l OWMode+1 : BEQ .normal LDA.l OWMode : ORA.l OWMode+1 : BEQ .vanilla
LDY.w $06FA : CPY.b #$7F LDY.w $06FA : CPY.b #$7F
BEQ .normal BEQ .vanilla
REP #$10 REP #$10
LDX.w $06F8 LDX.w $06F8
PHB : PHK : PLB PHB : PHK : PLB
@@ -596,7 +596,7 @@ OWEdgeTransition:
PLB PLB
SEP #$30 SEP #$30
RTL RTL
.normal .vanilla
LDA.l Overworld_ActualScreenID,X : ORA.l CurrentWorld ; what we wrote over LDA.l Overworld_ActualScreenID,X : ORA.l CurrentWorld ; what we wrote over
RTL RTL
} }