diff --git a/games/riven_hgr/disk02_files/disk02.s b/games/riven_hgr/disk02_files/disk02.s index ad654bd6..1bd6267c 100644 --- a/games/riven_hgr/disk02_files/disk02.s +++ b/games/riven_hgr/disk02_files/disk02.s @@ -2,6 +2,7 @@ .include "../disk01_files/disk01_defines.inc" .include "../disk03_files/disk03_defines.inc" .include "../disk04_files/disk04_defines.inc" +.include "../disk10_files/disk10_defines.inc" .include "../disk00_files/disk00_defines.inc" which_disk_bcd: @@ -32,7 +33,7 @@ disk_exit_disk: ; note: not BCD anymore .byte 1 .byte 3 .byte 4 - .byte 0 + .byte 10 .byte 0 .byte 0 @@ -40,7 +41,7 @@ disk_exit_disk_bcd: .byte $01 .byte $03 .byte $04 - .byte 0 + .byte $10 .byte 0 .byte 0 @@ -56,7 +57,7 @@ disk_exit_dni_l: .byte $01 .byte $03 .byte $04 - .byte 0 + .byte $20 .byte 0 .byte 0 @@ -65,20 +66,20 @@ disk_exit_load: .byte LOAD_PATH .byte LOAD_DSTEPS1 .byte LOAD_BRIDGE1 - .byte 0 + .byte LOAD_INSIDE .byte 0 .byte LOAD_CYAN disk_exit_level: .byte RIVEN_STEPS_BASE .byte RIVEN_DOWN1 .byte RIVEN_BRIDGE1 - .byte 0 + .byte RIVEN_INSIDE .byte 0 .byte 0 disk_exit_direction: .byte DIRECTION_W .byte DIRECTION_N .byte DIRECTION_E - .byte 0 + .byte DIRECTION_W .byte 0 .byte 0 diff --git a/games/riven_hgr/disk02_files/leveldata_top.inc b/games/riven_hgr/disk02_files/leveldata_top.inc index f4b42cfb..fb65a650 100644 --- a/games/riven_hgr/disk02_files/leveldata_top.inc +++ b/games/riven_hgr/disk02_files/leveldata_top.inc @@ -27,7 +27,7 @@ location1: .byte $ff ; north exit .byte $ff ; south exit .byte RIVEN_TOP ; east exit - .byte $ff ; west exit + .byte $E3 ; west exit .byte $FF ; north exit_dir .byte $fF ; south exit_dir .byte DIRECTION_E ; east exit_dir diff --git a/games/riven_hgr/disk10_files/disk10.s b/games/riven_hgr/disk10_files/disk10.s index 2b799b2d..adde8c9c 100644 --- a/games/riven_hgr/disk10_files/disk10.s +++ b/games/riven_hgr/disk10_files/disk10.s @@ -1,44 +1,42 @@ .include "../zp.inc" .include "../disk02_files/disk02_defines.inc" -.include "../disk05_files/disk05_defines.inc" -.include "../disk38_files/disk38_defines.inc" .include "../disk00_files/disk00_defines.inc" which_disk_bcd: - .byte $04 ; BCD + .byte $10 ; BCD which_disk_bin: - .byte 4 + .byte 10 load_address_array: - .byte $40,$40,$40,$40 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1 - .byte $40,$40,$40,$40 ; TUNNEL3 + .byte $40,$40,$40,$40 ; TITLE, INSIDE + .byte $40,$40,$40,$40 ; track_array: - .byte 0, 2, 7,12 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1 - .byte 17,22,27,0 ; TUNNEL3 + .byte 0, 2, 7,12 ; TITLE, INSIDE + .byte 17,22,27,0 ; sector_array: - .byte 8, 0, 0, 0 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1 - .byte 0,0,0,0 ; TUNNEL3 + .byte 8, 0, 0, 0 ; TITLE, INSIDE + .byte 0,0,0,0 ; length_array: - .byte 8, 80,80,80 ; TITLE, BRIDGE1, BRIDGE2, TUNNEL1 - .byte 80,80,80,0 ; TUNNEL3 + .byte 8, 80,80,80 ; TITLE, INSIDE + .byte 80,80,80,0 ; disk_exit_disk: ; note: not BCD anymore .byte 2 - .byte 38 - .byte 5 + .byte 0 + .byte 0 .byte 0 .byte 0 .byte 0 disk_exit_disk_bcd: .byte $02 - .byte $38 - .byte $05 + .byte $00 + .byte $00 .byte 0 .byte 0 .byte 0 @@ -46,38 +44,38 @@ disk_exit_disk_bcd: disk_exit_dni_h: .byte 0 - .byte 1 ; 1*25 + 2*5 + 3*1 + .byte 0 .byte 0 .byte 0 .byte 0 .byte 0 disk_exit_dni_l: .byte $02 - .byte $23 - .byte $10 + .byte 0 + .byte 0 .byte 0 .byte 0 .byte 0 ; disk_exit_load: - .byte LOAD_BRIDGE - .byte LOAD_PROJECTOR - .byte LOAD_CHAIR + .byte LOAD_TOP + .byte 0 + .byte 0 .byte 0 .byte 0 .byte LOAD_CYAN disk_exit_level: - .byte RIVEN_BRIDGE - .byte RIVEN_PROJECTOR - .byte RIVEN_CHAIR + .byte RIVEN_ALCOVE + .byte 0 + .byte 0 .byte 0 .byte 0 .byte 0 disk_exit_direction: - .byte DIRECTION_W - .byte DIRECTION_W - .byte DIRECTION_N + .byte DIRECTION_E + .byte 0 + .byte 0 .byte 0 .byte 0 .byte 0 diff --git a/games/riven_hgr/disk10_files/leveldata_inside.inc b/games/riven_hgr/disk10_files/leveldata_inside.inc index 6d581386..4c584355 100644 --- a/games/riven_hgr/disk10_files/leveldata_inside.inc +++ b/games/riven_hgr/disk10_files/leveldata_inside.inc @@ -10,7 +10,7 @@ locations: location0: .byte $ff ; north exit .byte $ff ; south exit - .byte $ff ; east exit + .byte $E0 ; east exit .byte $ff ; west exit .byte $FF ; north exit_dir .byte $FF ; south exit_dir