From f87a2e8a8504930b0d5a3b233a923455b22e60ac Mon Sep 17 00:00:00 2001 From: aerinon Date: Wed, 11 Mar 2020 14:19:22 -0600 Subject: [PATCH] Clean up some asm that's not ready --- asm/doorrando.asm | 4 ++-- asm/normal.asm | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/asm/doorrando.asm b/asm/doorrando.asm index 646580eb..f14d67c1 100644 --- a/asm/doorrando.asm +++ b/asm/doorrando.asm @@ -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 diff --git a/asm/normal.asm b/asm/normal.asm index fde06011..fda3ed31 100644 --- a/asm/normal.asm +++ b/asm/normal.asm @@ -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)