alttpr-gwaa-kiwi/alttpr-python
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Merge branch 'DoorDev' into EdgeWork

Browse Source
This commit is contained in:
aerinon
2020-03-11 15:09:51 -06:00
parent d3696a2752 f87a2e8a85
commit 9d75561dc3
58 changed files with 4313 additions and 2043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asm/doorrando.asm
View File

@@ -19,8 +19,8 @@ incsrc spiral.asm
incsrc gfx.asm
incsrc keydoors.asm
incsrc overrides.asm
incsrc edges.asm
incsrc math.asm
;incsrc edges.asm
;incsrc math.asm
warnpc $279000
; Data Section

6
asm/normal.asm
View File

@@ -76,7 +76,8 @@ LoadRoomHorz:
sty $06 : sta $07 : lda $a0 : pha ; Store normal room on stack
lda $07 : jsr LookupNewRoom ; New room is in A, Room Data is in $00
lda $01 : and.b #$80 : cmp #$80 : bne .gtg
jsr HorzEdge : pla : bcs .end
; jsr HorzEdge : pla : bcs .end
pla
sta $a0 : bra .end ; Restore normal room, abort (straight staircases and open edges can get in this routine)
.gtg ;Good to Go!
@@ -106,7 +107,8 @@ LoadRoomVert:
sty $06 : sta $07 : lda $a0 : pha ; Store normal room on stack
lda $07 : jsr LookupNewRoom ; New room is in A, Room Data is in $00
lda $01 : and.b #$80 : cmp #$80 : bne .gtg
jsr VertEdge : pla : bcs .end
; jsr VertEdge : pla : bcs .end
pla
sta $a0 : bra .end ; Restore normal room, abort (straight staircases and open edges can get in this routine)
.gtg ;Good to Go!
pla ; Throw away normal room (don't fill up the stack)