Merge in door dev unstable

2020-09-17 15:23:06 -06:00
parent 7653c95fd7 357a09d5b7
commit d2ea578df8
18 changed files with 107 additions and 47 deletions
--- a/asm/doorrando.asm
+++ b/asm/doorrando.asm
@@ -14,6 +14,16 @@ incsrc drhooks.asm

 ;Main Code
 org $278000 ;138000
+db $44, $52 ;DR
+DRMode:
+dw 0
+DRFlags:
+dw 0
+DRScroll:
+db 0
+OffsetTable:
+dw -8, 8
+
 incsrc normal.asm
 incsrc scroll.asm
 incsrc spiral.asm
@@ -22,20 +32,6 @@ incsrc keydoors.asm
 incsrc overrides.asm
 incsrc edges.asm
 incsrc math.asm
-warnpc $279000
-
-; Data Section
-org $279000
-OffsetTable:
-dw -8, 8
-DRMode:
-dw 0
-DRFlags:
-dw 0
-DRScroll:
-db 0
-
-org $279030
 incsrc hudadditions.asm
 warnpc $279700