diff --git a/games/ootw/ootw_c14/graphics/l14_arena/Makefile b/games/ootw/ootw_c14/graphics/l14_arena/Makefile index 328eccf3..04855657 100644 --- a/games/ootw/ootw_c14/graphics/l14_arena/Makefile +++ b/games/ootw/ootw_c14/graphics/l14_arena/Makefile @@ -26,7 +26,16 @@ ootw_c14_arena.inc: \ lidclose09.lzsa lidclose10.lzsa lidclose11.lzsa lidclose12.lzsa \ lidclose13.lzsa lidclose14.lzsa lidclose15.lzsa lidclose16.lzsa \ lidclose17.lzsa \ - door_open_bg.lzsa + door_open_bg.lzsa \ + door_open01.lzsa door_open02.lzsa door_open03.lzsa door_open04.lzsa \ + door_open05.lzsa door_open06.lzsa door_open07.lzsa door_open08.lzsa \ + door_open09.lzsa door_open10.lzsa door_open11.lzsa door_open12.lzsa \ + door_open13.lzsa \ + entrance_bg.lzsa \ + entering01.lzsa entering02.lzsa entering03.lzsa entering04.lzsa \ + entering05.lzsa entering06.lzsa entering07.lzsa entering08.lzsa \ + entering09.lzsa entering10.lzsa entering11.lzsa entering12.lzsa \ + entering13.lzsa echo "arena_lzsa: .incbin \"arena.lzsa\"" > ootw_c14_arena.inc echo "inside_bg_lzsa: .incbin \"inside_bg.lzsa\"" >> ootw_c14_arena.inc echo "inside03_lzsa: .incbin \"inside03.lzsa\"" >> ootw_c14_arena.inc @@ -91,6 +100,33 @@ ootw_c14_arena.inc: \ echo "lidclose16_lzsa: .incbin \"lidclose16.lzsa\"" >> ootw_c14_arena.inc echo "lidclose17_lzsa: .incbin \"lidclose17.lzsa\"" >> ootw_c14_arena.inc echo "door_open_bg_lzsa: .incbin \"door_open_bg.lzsa\"" >> ootw_c14_arena.inc + echo "door_open01_lzsa: .incbin \"door_open01.lzsa\"" >> ootw_c14_arena.inc + echo "door_open02_lzsa: .incbin \"door_open02.lzsa\"" >> ootw_c14_arena.inc + echo "door_open03_lzsa: .incbin \"door_open03.lzsa\"" >> ootw_c14_arena.inc + echo "door_open04_lzsa: .incbin \"door_open04.lzsa\"" >> ootw_c14_arena.inc + echo "door_open05_lzsa: .incbin \"door_open05.lzsa\"" >> ootw_c14_arena.inc + echo "door_open06_lzsa: .incbin \"door_open06.lzsa\"" >> ootw_c14_arena.inc + echo "door_open07_lzsa: .incbin \"door_open07.lzsa\"" >> ootw_c14_arena.inc + echo "door_open08_lzsa: .incbin \"door_open08.lzsa\"" >> ootw_c14_arena.inc + echo "door_open09_lzsa: .incbin \"door_open09.lzsa\"" >> ootw_c14_arena.inc + echo "door_open10_lzsa: .incbin \"door_open10.lzsa\"" >> ootw_c14_arena.inc + echo "door_open11_lzsa: .incbin \"door_open11.lzsa\"" >> ootw_c14_arena.inc + echo "door_open12_lzsa: .incbin \"door_open12.lzsa\"" >> ootw_c14_arena.inc + echo "door_open13_lzsa: .incbin \"door_open13.lzsa\"" >> ootw_c14_arena.inc + echo "entrance_bg_lzsa: .incbin \"entrance_bg.lzsa\"" >> ootw_c14_arena.inc + echo "entering01_lzsa: .incbin \"entering01.lzsa\"" >> ootw_c14_arena.inc + echo "entering02_lzsa: .incbin \"entering02.lzsa\"" >> ootw_c14_arena.inc + echo "entering03_lzsa: .incbin \"entering03.lzsa\"" >> ootw_c14_arena.inc + echo "entering04_lzsa: .incbin \"entering04.lzsa\"" >> ootw_c14_arena.inc + echo "entering05_lzsa: .incbin \"entering05.lzsa\"" >> ootw_c14_arena.inc + echo "entering06_lzsa: .incbin \"entering06.lzsa\"" >> ootw_c14_arena.inc + echo "entering07_lzsa: .incbin \"entering07.lzsa\"" >> ootw_c14_arena.inc + echo "entering08_lzsa: .incbin \"entering08.lzsa\"" >> ootw_c14_arena.inc + echo "entering09_lzsa: .incbin \"entering09.lzsa\"" >> ootw_c14_arena.inc + echo "entering10_lzsa: .incbin \"entering10.lzsa\"" >> ootw_c14_arena.inc + echo "entering11_lzsa: .incbin \"entering11.lzsa\"" >> ootw_c14_arena.inc + echo "entering12_lzsa: .incbin \"entering12.lzsa\"" >> ootw_c14_arena.inc + echo "entering13_lzsa: .incbin \"entering13.lzsa\"" >> ootw_c14_arena.inc ##### diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open01.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open01.png new file mode 100644 index 00000000..ca79392c Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open01.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open02.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open02.png new file mode 100644 index 00000000..a99b639d Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open02.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open03.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open03.png new file mode 100644 index 00000000..05d38f5c Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open03.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open04.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open04.png new file mode 100644 index 00000000..b25f1910 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open04.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open05.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open05.png new file mode 100644 index 00000000..dcaa2219 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open05.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open06.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open06.png new file mode 100644 index 00000000..8820a87d Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open06.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open07.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open07.png new file mode 100644 index 00000000..a5ea03a1 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open07.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open08.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open08.png new file mode 100644 index 00000000..202fdb0f Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open08.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open09.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open09.png new file mode 100644 index 00000000..4c16c7a0 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open09.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open10.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open10.png new file mode 100644 index 00000000..f0f53159 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open10.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open11.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open11.png new file mode 100644 index 00000000..d47aa0b0 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open11.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open12.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open12.png new file mode 100644 index 00000000..1527194b Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open12.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open13.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open13.png new file mode 100644 index 00000000..96056ea4 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/door_open13.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/door_open_bg.png b/games/ootw/ootw_c14/graphics/l14_arena/door_open_bg.png index 438e1dd2..0ce955cb 100644 Binary files a/games/ootw/ootw_c14/graphics/l14_arena/door_open_bg.png and b/games/ootw/ootw_c14/graphics/l14_arena/door_open_bg.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering01.png b/games/ootw/ootw_c14/graphics/l14_arena/entering01.png new file mode 100644 index 00000000..c65c0fb6 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering01.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering02.png b/games/ootw/ootw_c14/graphics/l14_arena/entering02.png new file mode 100644 index 00000000..ab0e9ced Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering02.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering03.png b/games/ootw/ootw_c14/graphics/l14_arena/entering03.png new file mode 100644 index 00000000..865549b1 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering03.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering04.png b/games/ootw/ootw_c14/graphics/l14_arena/entering04.png new file mode 100644 index 00000000..b7735024 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering04.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering05.png b/games/ootw/ootw_c14/graphics/l14_arena/entering05.png new file mode 100644 index 00000000..d9ece7c2 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering05.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering06.png b/games/ootw/ootw_c14/graphics/l14_arena/entering06.png new file mode 100644 index 00000000..ef2336b9 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering06.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering07.png b/games/ootw/ootw_c14/graphics/l14_arena/entering07.png new file mode 100644 index 00000000..ed34435c Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering07.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering08.png b/games/ootw/ootw_c14/graphics/l14_arena/entering08.png new file mode 100644 index 00000000..deb2037e Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering08.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering09.png b/games/ootw/ootw_c14/graphics/l14_arena/entering09.png new file mode 100644 index 00000000..a9a94c72 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering09.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering10.png b/games/ootw/ootw_c14/graphics/l14_arena/entering10.png new file mode 100644 index 00000000..1b060a41 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering10.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering11.png b/games/ootw/ootw_c14/graphics/l14_arena/entering11.png new file mode 100644 index 00000000..c22d7f69 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering11.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering12.png b/games/ootw/ootw_c14/graphics/l14_arena/entering12.png new file mode 100644 index 00000000..1eada10d Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering12.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entering13.png b/games/ootw/ootw_c14/graphics/l14_arena/entering13.png new file mode 100644 index 00000000..9518208c Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entering13.png differ diff --git a/games/ootw/ootw_c14/graphics/l14_arena/entrance_bg.png b/games/ootw/ootw_c14/graphics/l14_arena/entrance_bg.png new file mode 100644 index 00000000..fdaea402 Binary files /dev/null and b/games/ootw/ootw_c14/graphics/l14_arena/entrance_bg.png differ diff --git a/games/ootw/ootw_c14/ootw_c14.s b/games/ootw/ootw_c14/ootw_c14.s index e80a864c..dd859c5c 100644 --- a/games/ootw/ootw_c14/ootw_c14.s +++ b/games/ootw/ootw_c14/ootw_c14.s @@ -622,8 +622,35 @@ tank_intro_sequence: .byte 128+2 ; .word lidclose14_lzsa ; (3) .byte 128+2 ; .word lidclose15_lzsa ; (3) .byte 128+2 ; .word lidclose16_lzsa ; (3) - .byte 128+2 ; .word lidclose17_lzsa ; (3) + .byte 128+10 ; .word lidclose17_lzsa ; (3) .byte 255 ; load to bg .word door_open_bg_lzsa ; this + .byte 128+3 ; .word door_open01_lzsa ; (3) + .byte 128+3 ; .word door_open02_lzsa ; (3) + .byte 128+3 ; .word door_open03_lzsa ; (3) + .byte 128+3 ; .word door_open04_lzsa ; (3) + .byte 128+3 ; .word door_open05_lzsa ; (3) + .byte 128+3 ; .word door_open06_lzsa ; (3) + .byte 128+3 ; .word door_open07_lzsa ; (3) + .byte 128+3 ; .word door_open08_lzsa ; (3) + .byte 128+3 ; .word door_open09_lzsa ; (3) + .byte 128+3 ; .word door_open10_lzsa ; (3) + .byte 128+3 ; .word door_open11_lzsa ; (3) + .byte 128+3 ; .word door_open12_lzsa ; (3) + .byte 128+3 ; .word door_open13_lzsa ; (3) + .byte 255 ; load to bg + .word entrance_bg_lzsa ; this + .byte 128+2 ; .word entering01_lzsa ; (3) + .byte 128+2 ; .word entering02_lzsa ; (3) + .byte 128+2 ; .word entering03_lzsa ; (3) + .byte 128+2 ; .word entering04_lzsa ; (3) + .byte 128+2 ; .word entering05_lzsa ; (3) + .byte 128+2 ; .word entering06_lzsa ; (3) + .byte 128+2 ; .word entering07_lzsa ; (3) + .byte 128+2 ; .word entering08_lzsa ; (3) + .byte 128+2 ; .word entering09_lzsa ; (3) + .byte 128+2 ; .word entering10_lzsa ; (3) + .byte 128+2 ; .word entering11_lzsa ; (3) + .byte 128+2 ; .word entering12_lzsa ; (3) + .byte 128+2 ; .word entering13_lzsa ; (3) .byte 0 ; ending - diff --git a/games/ootw/qboot/qload.s b/games/ootw/qboot/qload.s index 50b51b6d..c7e38de1 100644 --- a/games/ootw/qboot/qload.s +++ b/games/ootw/qboot/qload.s @@ -214,7 +214,7 @@ length_array: .byte 137, 95,125, 14 ; INTRO,C1,C2,C3 .byte 62, 41, 38, 38 ; C4,C5,C6,C7 .byte 39, 38, 38, 38 ; C8,C9,C10,C11 - .byte 38, 39, 75, 97 ; C12,C13,C14,C15 + .byte 38, 39, 86, 97 ; C12,C13,C14,C15 .byte 90 ; ENDING .byte 1, 1 ; TITLE,FIRST_SECTOR