diff --git a/games/riven_hgr/NOTES b/games/riven_hgr/NOTES index 139fee3e..af9b8349 100644 --- a/games/riven_hgr/NOTES +++ b/games/riven_hgr/NOTES @@ -93,7 +93,7 @@ final movie roto procedure: Disk00 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~$~~~~~~~ T 0 = Qboot -T 0.5 = TITLE 1618 bytes 8S = 0T8S (2048) 400B free +T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free T 1 = QLOAD 2346 bytes 16S = 1T00S (4096) 2k free T 2 = CYAN 32459 bytes = 7T15S (32512) 0k free T 10 = ATRUS 32493 bytes = 7T15S (32512) 0k free @@ -105,30 +105,37 @@ T 31 = START 4107 bytes = 4T (16384) 12k free Disk01 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot -T 0.5 = TITLE 1618 bytes 8S = 0T8S (2048) 400B free -T 1 = QLOAD 1762 bytes 16S= 1T0S (4096) 2k free +T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free +T 1 = QLOAD 2393 bytes 16S= 1T0S (4096) 2k free T 2 = ARRIVAL 25512 bytes = 7T0S (28672) 3k free T 9 = ARRIVAL2 ? bytes = 7T0S (28672) ?k free T 16 = TELESCOPE 19484 bytes = 7T0S (28672) 9k free +Disk38 Map (disk has 35 tracks, each 4k in size) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +T 0 = Qboot +T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free +T 1 = QLOAD 2393 bytes 16S = 1T0S (4096) 2k free +T 2 = PROJECTOR 12057 bytes = 7T0S (28672) 16k free + Disk39 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot -T 0.5 = TITLE 1618 bytes 8S = 0T8S (2048) 400B free -T 1 = QLOAD 1762 bytes 8S = 0T8S (2048) 300B free -T 2 = PROJECTOR 26736 bytes 112S = 7T0S (28672) 2k free +T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free +T 1 = QLOAD 2393 bytes 16S = 1T0S (4096) 2k free +T 2 = PROJECTOR 15895 bytes 112S = 7T0S (28672) 13k free T 9 = OUTSIDE 29349 bytes 127S = 7T15S (32512) 3k free T 17 = MAGSTEPS 11537 bytes 64S = 4T0S (16384) 5k free T 21 = MAGLEV 13881 bytes 64S = 4T0S (16384) 3k free -T 25 = MOVIE_FLIP 7783 bytes 32S = 2T0S (8192) 500B free -T 27 = MOVIE_MAG 32177 bytes 128S = 7T15S (32512)300B free +T 25 = MOVIE_FLIP 7790 bytes 32S = 2T0S (8192) 500B free +T 27 = MOVIE_MAG 32184 bytes 128S = 7T15S (32512)300B free Disk40 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot -T 0.5 = TITLE 1618 bytes 8S = 0T8S (2048) 400B free -T 1 = QLOAD 1762 bytes 8S = 0T8S (2048) 300B free +T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free +T 1 = QLOAD 2393 bytes 8S = 0T8S (2048) 300B free T 2 = MAGLEV 30502 bytes = 8T11S (32768) 2k free T 10 = OUTSIDE 18917 bytes = 5T (20480) 2k free T 15 = TUNNEL 20983 bytes = 6T (24576) 4k free @@ -139,8 +146,8 @@ T 27 = MOVIE_MAG 32275 bytes 127S = 7T15S (32512)300B free Disk41 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot -T 0.5 = TITLE 1618 bytes 8S = 0T8S (2048) 400B free -T 1 = QLOAD 1762 bytes 8S = 0T8S (2048) 300B free +T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free +T 1 = QLOAD 2393 bytes 8S = 0T8S (2048) 300B free T 2 = TUNNEL 30669 bytes 127S= 8T (32512) 2k free T 10 = STAIRS 25624 = 7T (28672) 3k free T 17 = COVE 26422 = 7T (28672) 2k free @@ -150,8 +157,8 @@ T 31 = MOVIE_COVE 8299 = 3T (12288) 4k free Disk43 Map (disk has 35 tracks, each 4k in size) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ T 0 = Qboot -T 0.5 = TITLE 1618 bytes 8S = 0T8S (2048) 400B free -T 1 = QLOAD 1762 bytes 8S = 0T8S (2048) 300B free +T 0.5 = TITLE 1823 bytes 8S = 0T8S (2048) 400B free +T 1 = QLOAD 2393 bytes 8S = 0T8S (2048) 300B free T 2 = CART 23280 bytes = 7T0S (28672) 5k free T 9 = BRIDGE 18609 bytes = 7T0S (28672) 10k free T 16 = LOGGED 17570 bytes = 6T0S (24576) 7k free diff --git a/games/riven_hgr/disk40_files/disk40.s b/games/riven_hgr/disk40_files/disk40.s index a7f89660..91644a61 100644 --- a/games/riven_hgr/disk40_files/disk40.s +++ b/games/riven_hgr/disk40_files/disk40.s @@ -1,4 +1,6 @@ .include "../zp.inc" +.include "../disk39_files/disk39_defines.inc" +.include "../disk41_files/disk41_defines.inc" which_disk_bcd: .byte $40 ; BCD @@ -46,16 +48,16 @@ disk_exit_dni_l: .byte $00 .byte $00 - ; load_tunnel / tunnel5 / s + ; load_tunnel2 / tunnel5 / s disk_exit_load: - .byte 1 ; LOAD_TUNNEL - .byte 4 ; LOAD_MAGLEV + .byte LOAD_TUNNEL2 ; LOAD_TUNNEL2 + .byte LOAD_MAGLEV ; LOAD_MAGLEV .byte 0 .byte 0 disk_exit_level: - .byte $00 ; Tunnel 5 - .byte 1 ; RIVEN_INSEAT + .byte RIVEN_TUNNEL5 ; Tunnel 5 + .byte RIVEN_INSEAT ; RIVEN_INSEAT .byte $00 .byte $00 diff --git a/games/riven_hgr/disk41_files/disk41.s b/games/riven_hgr/disk41_files/disk41.s index 6a106d85..82777dfe 100644 --- a/games/riven_hgr/disk41_files/disk41.s +++ b/games/riven_hgr/disk41_files/disk41.s @@ -1,4 +1,6 @@ .include "../zp.inc" +.include "../disk40_files/disk40_defines.inc" +.include "../disk43_files/disk43_defines.inc" which_disk_bcd: .byte $41 ; BCD @@ -49,14 +51,14 @@ disk_exit_dni_l: ; load_tunnel / tunnel_4 / n ; load bridge / mid_bridge / w disk_exit_load: - .byte 3 ; LOAD_TUNNEL - .byte 2 ; LOAD_BRIDGE + .byte LOAD_TUNNEL ; LOAD_TUNNEL + .byte LOAD_BRIDGE ; LOAD_BRIDGE .byte 0 .byte 0 disk_exit_level: - .byte $03 ; TUNNEL_4 - .byte $00 ; MID_BRIDGE + .byte RIVEN_TUNNEL4 ; TUNNEL_4 + .byte RIVEN_MID_BRIDGE ; MID_BRIDGE .byte $00 .byte $00 diff --git a/games/riven_hgr/disk41_files/disk41_defines.inc b/games/riven_hgr/disk41_files/disk41_defines.inc index 6c71550a..336a67e2 100644 --- a/games/riven_hgr/disk41_files/disk41_defines.inc +++ b/games/riven_hgr/disk41_files/disk41_defines.inc @@ -1,4 +1,4 @@ -LOAD_TITLE = 0 +LOAD_TITLE_41 = 0 LOAD_TUNNEL2 = 1 LOAD_STAIRS = 2 LOAD_COVE = 3 diff --git a/games/riven_hgr/disk43_files/disk43.s b/games/riven_hgr/disk43_files/disk43.s index d3f0dd5d..a66be165 100644 --- a/games/riven_hgr/disk43_files/disk43.s +++ b/games/riven_hgr/disk43_files/disk43.s @@ -1,4 +1,5 @@ .include "../zp.inc" +.include "../disk41_files/disk41_defines.inc" which_disk_bcd: .byte $43 ; BCD @@ -38,12 +39,29 @@ disk_exit_disk_bcd: ; note: not BCD anymore disk_exit_dni_h: - .byte $01,0,0,0 ; 41 = 1*25 + 3*5 + 1 + .byte $01 ; 41 = 1*25 + 3*5 + 1 + .byte 0 + .byte 0 + .byte 0 disk_exit_dni_l: - .byte $31,0,0,0 + .byte $31 + .byte 0 + .byte 0 + .byte 0 + + ; STAIRS2, RIVEN_UP4, E disk_exit_load: - .byte 4,0,0,0 ; STAIRS2, RIVEN_UP4, E + .byte LOAD_STAIRS2 + .byte 0 + .byte 0 + .byte 0 disk_exit_level: - .byte 2,0,0,0 + .byte RIVEN_UP4 + .byte 0 + .byte 0 + .byte 0 disk_exit_direction: - .byte DIRECTION_E,0,0,0 + .byte DIRECTION_E + .byte 0 + .byte 0 + .byte 0 diff --git a/games/riven_hgr/disk43_files/disk43_defines.inc b/games/riven_hgr/disk43_files/disk43_defines.inc index 71943db0..872647f8 100644 --- a/games/riven_hgr/disk43_files/disk43_defines.inc +++ b/games/riven_hgr/disk43_files/disk43_defines.inc @@ -1,4 +1,4 @@ -LOAD_TITLE = 0 +LOAD_TITLE_43 = 0 LOAD_CART = 1 LOAD_BRIDGE = 2 LOAD_LOGGED = 3