From 854f1857a0b2827f4cc07db13b74a33fc034f372 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Tue, 30 Jan 2024 01:24:59 -0600 Subject: [PATCH] Fixed ymls and readded intro leveldata --- .gitignore | 1 + assets/ymls/jp/sound/banks.yml | 58 +- assets/ymls/jp/sound/samples/instruments.yml | 22 +- assets/ymls/jp/sound/samples/sfx_4.yml | 18 +- assets/ymls/jp/sound/samples/sfx_5.yml | 56 +- assets/ymls/jp/sound/samples/sfx_6.yml | 26 +- assets/ymls/jp/sound/samples/sfx_7.yml | 24 +- assets/ymls/jp/sound/samples/sfx_9.yml | 8 +- assets/ymls/jp/sound/sequences.yml | 70 +- assets/ymls/us/sound/banks.yml | 58 +- assets/ymls/us/sound/samples/instruments.yml | 22 +- assets/ymls/us/sound/samples/sfx_4.yml | 18 +- assets/ymls/us/sound/samples/sfx_5.yml | 56 +- assets/ymls/us/sound/samples/sfx_6.yml | 26 +- assets/ymls/us/sound/samples/sfx_7.yml | 24 +- assets/ymls/us/sound/samples/sfx_9.yml | 8 +- assets/ymls/us/sound/sequences.yml | 72 +- config.yml | 2 +- levels/intro/geo.c | 2 +- levels/intro/leveldata.c | 754 ++++++++++++++++++- src/game/segment7.h | 2 + src/menu/intro_geo.c | 7 +- 22 files changed, 1041 insertions(+), 293 deletions(-) diff --git a/.gitignore b/.gitignore index 5a09a91c..3f099cc9 100644 --- a/.gitignore +++ b/.gitignore @@ -63,6 +63,7 @@ imgui.ini .DS_Store logs/ debug/ +code/ # Assets. Generally ignored, but ones with "custom" in the name are fine. /levels/**/*.png diff --git a/assets/ymls/jp/sound/banks.yml b/assets/ymls/jp/sound/banks.yml index b702fda5..a76dcadf 100644 --- a/assets/ymls/jp/sound/banks.yml +++ b/assets/ymls/jp/sound/banks.yml @@ -7,79 +7,79 @@ 02_water: type: BANK id: 2 -bnk_03: +03: type: BANK id: 3 -bnk_04: +04: type: BANK id: 4 -bnk_05: +05: type: BANK id: 5 -bnk_06: +06: type: BANK id: 6 -bnk_07: +07: type: BANK id: 7 08_mario: type: BANK id: 8 -bnk_09: +09: type: BANK id: 9 0A_mario_peach: type: BANK id: 10 -bnk_0B: +0B: type: BANK id: 11 -bnk_0C: +0C: type: BANK id: 12 -bnk_0D: +0D: type: BANK id: 13 -bnk_0E: +0E: type: BANK id: 14 -bnk_0F: +0F: type: BANK id: 15 -bnk_10: +10: type: BANK id: 16 -bnk_11: +11: type: BANK id: 17 -bnk_12: +12: type: BANK id: 18 -bnk_13: +13: type: BANK id: 19 14_piranha_music_box: type: BANK id: 20 -bnk_15: +15: type: BANK id: 21 16_course_start: type: BANK id: 22 -bnk_17: +17: type: BANK id: 23 -bnk_18: +18: type: BANK id: 24 -bnk_19: +19: type: BANK id: 25 -bnk_1A: +1A: type: BANK id: 26 -bnk_1B: +1B: type: BANK id: 27 1C_endless_stairs: @@ -88,27 +88,27 @@ bnk_1B: 1D_bowser_organ: type: BANK id: 29 -bnk_1E: +1E: type: BANK id: 30 -bnk_1F: +1F: type: BANK id: 31 -bnk_20: +20: type: BANK id: 32 -bnk_21: +21: type: BANK id: 33 -bnk_22: +22: type: BANK id: 34 -bnk_23: +23: type: BANK id: 35 -bnk_24: +24: type: BANK id: 36 -bnk_25: +25: type: BANK id: 37 diff --git a/assets/ymls/jp/sound/samples/instruments.yml b/assets/ymls/jp/sound/samples/instruments.yml index 97efcdb0..119317e1 100644 --- a/assets/ymls/jp/sound/samples/instruments.yml +++ b/assets/ymls/jp/sound/samples/instruments.yml @@ -4,7 +4,7 @@ 01_banjo_1: type: SAMPLE id: 121 -sfx_02: +02: type: SAMPLE id: 122 03_human_whistle: @@ -22,16 +22,16 @@ sfx_02: 07_rimshot: type: SAMPLE id: 127 -sfx_08: +08: type: SAMPLE id: 128 -sfx_09: +09: type: SAMPLE id: 129 0A_tambourine: type: SAMPLE id: 130 -sfx_0B: +0B: type: SAMPLE id: 131 0C_conga_stick: @@ -82,10 +82,10 @@ sfx_0B: 1B_organ_2: type: SAMPLE id: 147 -sfx_1C: +1C: type: SAMPLE id: 148 -sfx_1D: +1D: type: SAMPLE id: 149 1E_closed_triangle: @@ -124,13 +124,13 @@ sfx_1D: 29_orchestra_hit: type: SAMPLE id: 161 -sfx_2A: +2A: type: SAMPLE id: 162 -sfx_2B: +2B: type: SAMPLE id: 163 -sfx_2C: +2C: type: SAMPLE id: 164 2D_trombone: @@ -181,13 +181,13 @@ sfx_2C: 3C_acoustic_guitar: type: SAMPLE id: 180 -sfx_3D: +3D: type: SAMPLE id: 181 3E_monk_choir: type: SAMPLE id: 182 -sfx_3F: +3F: type: SAMPLE id: 183 40_bell: diff --git a/assets/ymls/jp/sound/samples/sfx_4.yml b/assets/ymls/jp/sound/samples/sfx_4.yml index 2d39b9e1..8bfccfa7 100644 --- a/assets/ymls/jp/sound/samples/sfx_4.yml +++ b/assets/ymls/jp/sound/samples/sfx_4.yml @@ -1,30 +1,30 @@ 00: type: SAMPLE id: 17 -sfx_01: +01: type: SAMPLE id: 18 -sfx_02: +02: type: SAMPLE id: 19 -sfx_03: +03: type: SAMPLE id: 20 -sfx_04: +04: type: SAMPLE id: 21 -sfx_05: +05: type: SAMPLE id: 22 -sfx_06: +06: type: SAMPLE id: 23 -sfx_07: +07: type: SAMPLE id: 24 -sfx_08: +08: type: SAMPLE id: 25 -sfx_09: +09: type: SAMPLE id: 26 diff --git a/assets/ymls/jp/sound/samples/sfx_5.yml b/assets/ymls/jp/sound/samples/sfx_5.yml index 10486f33..75cc5f99 100644 --- a/assets/ymls/jp/sound/samples/sfx_5.yml +++ b/assets/ymls/jp/sound/samples/sfx_5.yml @@ -1,87 +1,87 @@ 00: type: SAMPLE id: 27 -sfx_01: +01: type: SAMPLE id: 28 -sfx_02: +02: type: SAMPLE id: 29 -sfx_03: +03: type: SAMPLE id: 30 -sfx_04: +04: type: SAMPLE id: 31 -sfx_05: +05: type: SAMPLE id: 32 -sfx_06: +06: type: SAMPLE id: 33 -sfx_07: +07: type: SAMPLE id: 34 -sfx_08: +08: type: SAMPLE id: 35 -sfx_09: +09: type: SAMPLE id: 36 -sfx_0A: +0A: type: SAMPLE id: 37 -sfx_0B: +0B: type: SAMPLE id: 38 -sfx_0C: +0C: type: SAMPLE id: 39 -sfx_0D: +0D: type: SAMPLE id: 40 -sfx_0E: +0E: type: SAMPLE id: 41 -sfx_0F: +0F: type: SAMPLE id: 42 -sfx_10: +10: type: SAMPLE id: 43 -sfx_11: +11: type: SAMPLE id: 44 -sfx_12: +12: type: SAMPLE id: 45 -sfx_13: +13: type: SAMPLE id: 46 -sfx_14: +14: type: SAMPLE id: 47 -sfx_15: +15: type: SAMPLE id: 48 -sfx_16: +16: type: SAMPLE id: 49 -sfx_17: +17: type: SAMPLE id: 50 -sfx_18: +18: type: SAMPLE id: 51 -sfx_19: +19: type: SAMPLE id: 52 -sfx_1A: +1A: type: SAMPLE id: 53 -sfx_1B: +1B: type: SAMPLE id: 54 -sfx_1C: +1C: type: SAMPLE id: 55 diff --git a/assets/ymls/jp/sound/samples/sfx_6.yml b/assets/ymls/jp/sound/samples/sfx_6.yml index 698486ac..b7423f1b 100644 --- a/assets/ymls/jp/sound/samples/sfx_6.yml +++ b/assets/ymls/jp/sound/samples/sfx_6.yml @@ -1,42 +1,42 @@ 00: type: SAMPLE id: 56 -sfx_01: +01: type: SAMPLE id: 57 -sfx_02: +02: type: SAMPLE id: 58 -sfx_03: +03: type: SAMPLE id: 59 -sfx_04: +04: type: SAMPLE id: 60 -sfx_05: +05: type: SAMPLE id: 61 -sfx_06: +06: type: SAMPLE id: 62 -sfx_07: +07: type: SAMPLE id: 63 -sfx_08: +08: type: SAMPLE id: 64 -sfx_09: +09: type: SAMPLE id: 65 -sfx_0A: +0A: type: SAMPLE id: 66 -sfx_0B: +0B: type: SAMPLE id: 67 -sfx_0C: +0C: type: SAMPLE id: 68 -sfx_0D: +0D: type: SAMPLE id: 69 diff --git a/assets/ymls/jp/sound/samples/sfx_7.yml b/assets/ymls/jp/sound/samples/sfx_7.yml index e8c24465..6e89fa97 100644 --- a/assets/ymls/jp/sound/samples/sfx_7.yml +++ b/assets/ymls/jp/sound/samples/sfx_7.yml @@ -1,39 +1,39 @@ 00: type: SAMPLE id: 70 -sfx_01: +01: type: SAMPLE id: 71 -sfx_02: +02: type: SAMPLE id: 72 -sfx_03: +03: type: SAMPLE id: 73 -sfx_04: +04: type: SAMPLE id: 74 -sfx_05: +05: type: SAMPLE id: 75 -sfx_06: +06: type: SAMPLE id: 76 -sfx_07: +07: type: SAMPLE id: 77 -sfx_08: +08: type: SAMPLE id: 78 -sfx_09: +09: type: SAMPLE id: 79 -sfx_0A: +0A: type: SAMPLE id: 80 -sfx_0B: +0B: type: SAMPLE id: 81 -sfx_0C: +0C: type: SAMPLE id: 82 diff --git a/assets/ymls/jp/sound/samples/sfx_9.yml b/assets/ymls/jp/sound/samples/sfx_9.yml index 0a858a57..15fca4f7 100644 --- a/assets/ymls/jp/sound/samples/sfx_9.yml +++ b/assets/ymls/jp/sound/samples/sfx_9.yml @@ -1,13 +1,13 @@ 00: type: SAMPLE id: 99 -sfx_01: +01: type: SAMPLE id: 100 -sfx_02: +02: type: SAMPLE id: 101 -sfx_03: +03: type: SAMPLE id: 102 04_camera_buzz: @@ -16,6 +16,6 @@ sfx_03: 05_camera_shutter: type: SAMPLE id: 104 -sfx_06: +06: type: SAMPLE id: 105 diff --git a/assets/ymls/jp/sound/sequences.yml b/assets/ymls/jp/sound/sequences.yml index 20f2b9f4..897a8b43 100644 --- a/assets/ymls/jp/sound/sequences.yml +++ b/assets/ymls/jp/sound/sequences.yml @@ -7,13 +7,13 @@ sound_player: - sound/banks/00 - sound/banks/01_terrain - sound/banks/02_water - - sound/banks/bnk_03 - - sound/banks/bnk_04 - - sound/banks/bnk_05 - - sound/banks/bnk_06 - - sound/banks/bnk_07 + - sound/banks/03 + - sound/banks/04 + - sound/banks/05 + - sound/banks/06 + - sound/banks/07 - sound/banks/08_mario - - sound/banks/bnk_09 + - sound/banks/09 - sound/banks/0A_mario_peach cutscene_collect_star: type: SEQUENCE @@ -21,71 +21,71 @@ cutscene_collect_star: offset: 0x7492A0 size: 633 banks: - - sound/banks/bnk_22 + - sound/banks/22 menu_title_screen: type: SEQUENCE id: 2 offset: 0x749520 size: 8276 banks: - - sound/banks/bnk_11 + - sound/banks/11 level_grass: type: SEQUENCE id: 3 offset: 0x74B580 size: 5134 banks: - - sound/banks/bnk_22 + - sound/banks/22 level_inside_castle: type: SEQUENCE id: 4 offset: 0x74C990 size: 2504 banks: - - sound/banks/bnk_0E + - sound/banks/0E level_water: type: SEQUENCE id: 5 offset: 0x74D360 size: 4816 banks: - - sound/banks/bnk_13 + - sound/banks/13 level_hot: type: SEQUENCE id: 6 offset: 0x74E630 size: 2459 banks: - - sound/banks/bnk_0F + - sound/banks/0F level_boss_koopa: type: SEQUENCE id: 7 offset: 0x74EFD0 size: 3430 banks: - - sound/banks/bnk_12 + - sound/banks/12 level_snow: type: SEQUENCE id: 8 offset: 0x74FD40 size: 8157 banks: - - sound/banks/bnk_0B + - sound/banks/0B level_slide: type: SEQUENCE id: 9 offset: 0x751D20 size: 7452 banks: - - sound/banks/bnk_0D + - sound/banks/0D level_spooky: type: SEQUENCE id: 10 offset: 0x753A40 size: 5686 banks: - - sound/banks/bnk_21 - - sound/banks/bnk_10 + - sound/banks/21 + - sound/banks/10 event_piranha_plant: type: SEQUENCE id: 11 @@ -99,7 +99,7 @@ level_underground: offset: 0x755600 size: 4905 banks: - - sound/banks/bnk_15 + - sound/banks/15 menu_star_select: type: SEQUENCE id: 13 @@ -113,70 +113,70 @@ event_powerup: offset: 0x7569C0 size: 3143 banks: - - sound/banks/bnk_17 + - sound/banks/17 event_metal_cap: type: SEQUENCE id: 15 offset: 0x757610 size: 2786 banks: - - sound/banks/bnk_18 + - sound/banks/18 event_koopa_message: type: SEQUENCE id: 16 offset: 0x758100 size: 564 banks: - - sound/banks/bnk_12 + - sound/banks/12 level_koopa_road: type: SEQUENCE id: 17 offset: 0x758340 size: 4763 banks: - - sound/banks/bnk_19 + - sound/banks/19 event_high_score: type: SEQUENCE id: 18 offset: 0x7595E0 size: 279 banks: - - sound/banks/bnk_1F + - sound/banks/1F event_merry_go_round: type: SEQUENCE id: 19 offset: 0x759700 size: 1663 banks: - - sound/banks/bnk_21 + - sound/banks/21 event_race: type: SEQUENCE id: 20 offset: 0x759D80 size: 203 banks: - - sound/banks/bnk_1A + - sound/banks/1A cutscene_star_spawn: type: SEQUENCE id: 21 offset: 0x759E50 size: 654 banks: - - sound/banks/bnk_0E + - sound/banks/0E event_boss: type: SEQUENCE id: 22 offset: 0x75A0E0 size: 3451 banks: - - sound/banks/bnk_1B + - sound/banks/1B cutscene_collect_key: type: SEQUENCE id: 23 offset: 0x75AE60 size: 683 banks: - - sound/banks/bnk_1A + - sound/banks/1A event_endless_stairs: type: SEQUENCE id: 24 @@ -197,7 +197,7 @@ cutscene_credits: offset: 0x75C5E0 size: 14341 banks: - - sound/banks/bnk_25 + - sound/banks/25 event_solve_puzzle: type: SEQUENCE id: 27 @@ -211,39 +211,39 @@ event_toad_message: offset: 0x75FED0 size: 214 banks: - - sound/banks/bnk_20 + - sound/banks/20 event_peach_message: type: SEQUENCE id: 29 offset: 0x75FFB0 size: 440 banks: - - sound/banks/bnk_1E + - sound/banks/1E cutscene_intro: type: SEQUENCE id: 30 offset: 0x760170 size: 1774 banks: - - sound/banks/bnk_1B + - sound/banks/1B cutscene_victory: type: SEQUENCE id: 31 offset: 0x760860 size: 2074 banks: - - sound/banks/bnk_1A + - sound/banks/1A cutscene_ending: type: SEQUENCE id: 32 offset: 0x761080 size: 1892 banks: - - sound/banks/bnk_23 + - sound/banks/23 menu_file_select: type: SEQUENCE id: 33 offset: 0x7617F0 size: 789 banks: - - sound/banks/bnk_24 + - sound/banks/24 diff --git a/assets/ymls/us/sound/banks.yml b/assets/ymls/us/sound/banks.yml index b702fda5..a76dcadf 100644 --- a/assets/ymls/us/sound/banks.yml +++ b/assets/ymls/us/sound/banks.yml @@ -7,79 +7,79 @@ 02_water: type: BANK id: 2 -bnk_03: +03: type: BANK id: 3 -bnk_04: +04: type: BANK id: 4 -bnk_05: +05: type: BANK id: 5 -bnk_06: +06: type: BANK id: 6 -bnk_07: +07: type: BANK id: 7 08_mario: type: BANK id: 8 -bnk_09: +09: type: BANK id: 9 0A_mario_peach: type: BANK id: 10 -bnk_0B: +0B: type: BANK id: 11 -bnk_0C: +0C: type: BANK id: 12 -bnk_0D: +0D: type: BANK id: 13 -bnk_0E: +0E: type: BANK id: 14 -bnk_0F: +0F: type: BANK id: 15 -bnk_10: +10: type: BANK id: 16 -bnk_11: +11: type: BANK id: 17 -bnk_12: +12: type: BANK id: 18 -bnk_13: +13: type: BANK id: 19 14_piranha_music_box: type: BANK id: 20 -bnk_15: +15: type: BANK id: 21 16_course_start: type: BANK id: 22 -bnk_17: +17: type: BANK id: 23 -bnk_18: +18: type: BANK id: 24 -bnk_19: +19: type: BANK id: 25 -bnk_1A: +1A: type: BANK id: 26 -bnk_1B: +1B: type: BANK id: 27 1C_endless_stairs: @@ -88,27 +88,27 @@ bnk_1B: 1D_bowser_organ: type: BANK id: 29 -bnk_1E: +1E: type: BANK id: 30 -bnk_1F: +1F: type: BANK id: 31 -bnk_20: +20: type: BANK id: 32 -bnk_21: +21: type: BANK id: 33 -bnk_22: +22: type: BANK id: 34 -bnk_23: +23: type: BANK id: 35 -bnk_24: +24: type: BANK id: 36 -bnk_25: +25: type: BANK id: 37 diff --git a/assets/ymls/us/sound/samples/instruments.yml b/assets/ymls/us/sound/samples/instruments.yml index cb8749ee..e604abac 100644 --- a/assets/ymls/us/sound/samples/instruments.yml +++ b/assets/ymls/us/sound/samples/instruments.yml @@ -4,7 +4,7 @@ 01_banjo_1: type: SAMPLE id: 142 -sfx_02: +02: type: SAMPLE id: 143 03_human_whistle: @@ -22,16 +22,16 @@ sfx_02: 07_rimshot: type: SAMPLE id: 148 -sfx_08: +08: type: SAMPLE id: 149 -sfx_09: +09: type: SAMPLE id: 150 0A_tambourine: type: SAMPLE id: 151 -sfx_0B: +0B: type: SAMPLE id: 152 0C_conga_stick: @@ -82,10 +82,10 @@ sfx_0B: 1B_organ_2: type: SAMPLE id: 168 -sfx_1C: +1C: type: SAMPLE id: 169 -sfx_1D: +1D: type: SAMPLE id: 170 1E_closed_triangle: @@ -124,13 +124,13 @@ sfx_1D: 29_orchestra_hit: type: SAMPLE id: 182 -sfx_2A: +2A: type: SAMPLE id: 183 -sfx_2B: +2B: type: SAMPLE id: 184 -sfx_2C: +2C: type: SAMPLE id: 185 2D_trombone: @@ -181,13 +181,13 @@ sfx_2C: 3C_acoustic_guitar: type: SAMPLE id: 201 -sfx_3D: +3D: type: SAMPLE id: 202 3E_monk_choir: type: SAMPLE id: 203 -sfx_3F: +3F: type: SAMPLE id: 204 40_bell: diff --git a/assets/ymls/us/sound/samples/sfx_4.yml b/assets/ymls/us/sound/samples/sfx_4.yml index 2d39b9e1..8bfccfa7 100644 --- a/assets/ymls/us/sound/samples/sfx_4.yml +++ b/assets/ymls/us/sound/samples/sfx_4.yml @@ -1,30 +1,30 @@ 00: type: SAMPLE id: 17 -sfx_01: +01: type: SAMPLE id: 18 -sfx_02: +02: type: SAMPLE id: 19 -sfx_03: +03: type: SAMPLE id: 20 -sfx_04: +04: type: SAMPLE id: 21 -sfx_05: +05: type: SAMPLE id: 22 -sfx_06: +06: type: SAMPLE id: 23 -sfx_07: +07: type: SAMPLE id: 24 -sfx_08: +08: type: SAMPLE id: 25 -sfx_09: +09: type: SAMPLE id: 26 diff --git a/assets/ymls/us/sound/samples/sfx_5.yml b/assets/ymls/us/sound/samples/sfx_5.yml index 10486f33..75cc5f99 100644 --- a/assets/ymls/us/sound/samples/sfx_5.yml +++ b/assets/ymls/us/sound/samples/sfx_5.yml @@ -1,87 +1,87 @@ 00: type: SAMPLE id: 27 -sfx_01: +01: type: SAMPLE id: 28 -sfx_02: +02: type: SAMPLE id: 29 -sfx_03: +03: type: SAMPLE id: 30 -sfx_04: +04: type: SAMPLE id: 31 -sfx_05: +05: type: SAMPLE id: 32 -sfx_06: +06: type: SAMPLE id: 33 -sfx_07: +07: type: SAMPLE id: 34 -sfx_08: +08: type: SAMPLE id: 35 -sfx_09: +09: type: SAMPLE id: 36 -sfx_0A: +0A: type: SAMPLE id: 37 -sfx_0B: +0B: type: SAMPLE id: 38 -sfx_0C: +0C: type: SAMPLE id: 39 -sfx_0D: +0D: type: SAMPLE id: 40 -sfx_0E: +0E: type: SAMPLE id: 41 -sfx_0F: +0F: type: SAMPLE id: 42 -sfx_10: +10: type: SAMPLE id: 43 -sfx_11: +11: type: SAMPLE id: 44 -sfx_12: +12: type: SAMPLE id: 45 -sfx_13: +13: type: SAMPLE id: 46 -sfx_14: +14: type: SAMPLE id: 47 -sfx_15: +15: type: SAMPLE id: 48 -sfx_16: +16: type: SAMPLE id: 49 -sfx_17: +17: type: SAMPLE id: 50 -sfx_18: +18: type: SAMPLE id: 51 -sfx_19: +19: type: SAMPLE id: 52 -sfx_1A: +1A: type: SAMPLE id: 53 -sfx_1B: +1B: type: SAMPLE id: 54 -sfx_1C: +1C: type: SAMPLE id: 55 diff --git a/assets/ymls/us/sound/samples/sfx_6.yml b/assets/ymls/us/sound/samples/sfx_6.yml index 698486ac..b7423f1b 100644 --- a/assets/ymls/us/sound/samples/sfx_6.yml +++ b/assets/ymls/us/sound/samples/sfx_6.yml @@ -1,42 +1,42 @@ 00: type: SAMPLE id: 56 -sfx_01: +01: type: SAMPLE id: 57 -sfx_02: +02: type: SAMPLE id: 58 -sfx_03: +03: type: SAMPLE id: 59 -sfx_04: +04: type: SAMPLE id: 60 -sfx_05: +05: type: SAMPLE id: 61 -sfx_06: +06: type: SAMPLE id: 62 -sfx_07: +07: type: SAMPLE id: 63 -sfx_08: +08: type: SAMPLE id: 64 -sfx_09: +09: type: SAMPLE id: 65 -sfx_0A: +0A: type: SAMPLE id: 66 -sfx_0B: +0B: type: SAMPLE id: 67 -sfx_0C: +0C: type: SAMPLE id: 68 -sfx_0D: +0D: type: SAMPLE id: 69 diff --git a/assets/ymls/us/sound/samples/sfx_7.yml b/assets/ymls/us/sound/samples/sfx_7.yml index 5eaca4fc..19e4e97f 100644 --- a/assets/ymls/us/sound/samples/sfx_7.yml +++ b/assets/ymls/us/sound/samples/sfx_7.yml @@ -1,40 +1,40 @@ 00: type: SAMPLE id: 70 -sfx_01: +01: type: SAMPLE id: 71 -sfx_02: +02: type: SAMPLE id: 72 -sfx_03: +03: type: SAMPLE id: 73 -sfx_04: +04: type: SAMPLE id: 74 -sfx_05: +05: type: SAMPLE id: 75 -sfx_06: +06: type: SAMPLE id: 76 -sfx_07: +07: type: SAMPLE id: 77 -sfx_08: +08: type: SAMPLE id: 78 -sfx_09: +09: type: SAMPLE id: 79 -sfx_0A: +0A: type: SAMPLE id: 80 -sfx_0B: +0B: type: SAMPLE id: 81 -sfx_0C: +0C: type: SAMPLE id: 82 0D_chain_chomp_bark: diff --git a/assets/ymls/us/sound/samples/sfx_9.yml b/assets/ymls/us/sound/samples/sfx_9.yml index 392b57f5..31c63333 100644 --- a/assets/ymls/us/sound/samples/sfx_9.yml +++ b/assets/ymls/us/sound/samples/sfx_9.yml @@ -1,13 +1,13 @@ 00: type: SAMPLE id: 111 -sfx_01: +01: type: SAMPLE id: 112 -sfx_02: +02: type: SAMPLE id: 113 -sfx_03: +03: type: SAMPLE id: 114 04_camera_buzz: @@ -16,6 +16,6 @@ sfx_03: 05_camera_shutter: type: SAMPLE id: 116 -sfx_06: +06: type: SAMPLE id: 117 diff --git a/assets/ymls/us/sound/sequences.yml b/assets/ymls/us/sound/sequences.yml index 204321ac..4ca9c441 100644 --- a/assets/ymls/us/sound/sequences.yml +++ b/assets/ymls/us/sound/sequences.yml @@ -7,13 +7,13 @@ sound_player: - sound/banks/00 - sound/banks/01_terrain - sound/banks/02_water - - sound/banks/bnk_03 - - sound/banks/bnk_04 - - sound/banks/bnk_05 - - sound/banks/bnk_06 - - sound/banks/bnk_07 + - sound/banks/03 + - sound/banks/04 + - sound/banks/05 + - sound/banks/06 + - sound/banks/07 - sound/banks/08_mario - - sound/banks/bnk_09 + - sound/banks/09 - sound/banks/0A_mario_peach cutscene_collect_star: type: SEQUENCE @@ -21,71 +21,71 @@ cutscene_collect_star: offset: 0x7B3E10 size: 619 banks: - - sound/banks/bnk_22 + - sound/banks/22 menu_title_screen: type: SEQUENCE id: 2 offset: 0x7B4080 size: 8254 banks: - - sound/banks/bnk_11 + - sound/banks/11 level_grass: type: SEQUENCE id: 3 offset: 0x7B60C0 size: 5122 banks: - - sound/banks/bnk_22 + - sound/banks/22 level_inside_castle: type: SEQUENCE id: 4 offset: 0x7B74D0 size: 2494 banks: - - sound/banks/bnk_0E + - sound/banks/0E level_water: type: SEQUENCE id: 5 offset: 0x7B7E90 size: 4780 banks: - - sound/banks/bnk_13 + - sound/banks/13 level_hot: type: SEQUENCE id: 6 offset: 0x7B9140 size: 2451 banks: - - sound/banks/bnk_0F + - sound/banks/0F level_boss_koopa: type: SEQUENCE id: 7 offset: 0x7B9AE0 size: 3418 banks: - - sound/banks/bnk_12 + - sound/banks/12 level_snow: type: SEQUENCE id: 8 offset: 0x7BA840 size: 8143 banks: - - sound/banks/bnk_0B + - sound/banks/0B level_slide: type: SEQUENCE id: 9 offset: 0x7BC810 size: 7432 banks: - - sound/banks/bnk_0D + - sound/banks/0D level_spooky: type: SEQUENCE id: 10 offset: 0x7BE520 size: 5674 banks: - - sound/banks/bnk_21 - - sound/banks/bnk_10 + - sound/banks/21 + - sound/banks/10 event_piranha_plant: type: SEQUENCE id: 11 @@ -99,7 +99,7 @@ level_underground: offset: 0x7C00D0 size: 4887 banks: - - sound/banks/bnk_15 + - sound/banks/15 menu_star_select: type: SEQUENCE id: 13 @@ -113,70 +113,70 @@ event_powerup: offset: 0x7C1480 size: 3129 banks: - - sound/banks/bnk_17 + - sound/banks/17 event_metal_cap: type: SEQUENCE id: 15 offset: 0x7C20C0 size: 2770 banks: - - sound/banks/bnk_18 + - sound/banks/18 event_koopa_message: type: SEQUENCE id: 16 offset: 0x7C2BA0 size: 552 banks: - - sound/banks/bnk_12 + - sound/banks/12 level_koopa_road: type: SEQUENCE id: 17 offset: 0x7C2DD0 size: 4741 banks: - - sound/banks/bnk_19 + - sound/banks/19 event_high_score: type: SEQUENCE id: 18 offset: 0x7C4060 size: 271 banks: - - sound/banks/bnk_1F + - sound/banks/1F event_merry_go_round: type: SEQUENCE id: 19 offset: 0x7C4170 size: 1657 banks: - - sound/banks/bnk_21 + - sound/banks/21 event_race: type: SEQUENCE id: 20 offset: 0x7C47F0 size: 197 banks: - - sound/banks/bnk_1A + - sound/banks/1A cutscene_star_spawn: type: SEQUENCE id: 21 offset: 0x7C48C0 size: 644 banks: - - sound/banks/bnk_0E + - sound/banks/0E event_boss: type: SEQUENCE id: 22 offset: 0x7C4B50 size: 3435 banks: - - sound/banks/bnk_1B + - sound/banks/1B cutscene_collect_key: type: SEQUENCE id: 23 offset: 0x7C58C0 size: 671 banks: - - sound/banks/bnk_1A + - sound/banks/1A event_endless_stairs: type: SEQUENCE id: 24 @@ -197,7 +197,7 @@ cutscene_credits: offset: 0x7C7020 size: 14313 banks: - - sound/banks/bnk_25 + - sound/banks/25 event_solve_puzzle: type: SEQUENCE id: 27 @@ -211,46 +211,46 @@ event_toad_message: offset: 0x7CA8F0 size: 208 banks: - - sound/banks/bnk_20 + - sound/banks/20 event_peach_message: type: SEQUENCE id: 29 offset: 0x7CA9C0 size: 432 banks: - - sound/banks/bnk_1E + - sound/banks/1E cutscene_intro: type: SEQUENCE id: 30 offset: 0x7CAB70 size: 1764 banks: - - sound/banks/bnk_1B + - sound/banks/1B cutscene_victory: type: SEQUENCE id: 31 offset: 0x7CB260 size: 2058 banks: - - sound/banks/bnk_1A + - sound/banks/1A cutscene_ending: type: SEQUENCE id: 32 offset: 0x7CBA70 size: 1882 banks: - - sound/banks/bnk_23 + - sound/banks/23 menu_file_select: type: SEQUENCE id: 33 offset: 0x7CC1D0 size: 781 banks: - - sound/banks/bnk_24 + - sound/banks/24 cutscene_lakitu: type: SEQUENCE id: 34 offset: 0x7CC4E0 size: 313 banks: - - sound/banks/bnk_1B + - sound/banks/1B diff --git a/config.yml b/config.yml index da81330a..655de08c 100644 --- a/config.yml +++ b/config.yml @@ -3,7 +3,7 @@ 8a20a5c83d6ceb0f0506cfc9fa20d8f438cafe51: name: Super Mario 64 [JP] - path: assets/ymls/us + path: assets/ymls/jp config: gbi: F3D sort: OFFSET diff --git a/levels/intro/geo.c b/levels/intro/geo.c index d64e15bb..4d487c8a 100644 --- a/levels/intro/geo.c +++ b/levels/intro/geo.c @@ -38,7 +38,7 @@ const GeoLayout intro_geo_0002D0[] = { GEO_CLOSE_NODE(), GEO_ZBUFFER(0), GEO_OPEN_NODE(), -// GEO_ASM(0, geo_intro_tm_copyright), + GEO_ASM(0, geo_intro_tm_copyright), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_END(), diff --git a/levels/intro/leveldata.c b/levels/intro/leveldata.c index 26b70315..64f20aab 100644 --- a/levels/intro/leveldata.c +++ b/levels/intro/leveldata.c @@ -2582,11 +2582,736 @@ ALIGNED8 static const Texture intro_seg7_texture_07007EA0[] = "__OTR__levels/int // 0x070086A0 - 0x070086A2 ALIGNED8 static const Texture intro_seg7_texture_070086A0[] = "__OTR__levels/intro/1"; -static const u8 intro_seg7_dl_07008EA0[] = "__OTR__levels/intro/intro_seg7_dl_07008EA0"; +// 0x07008EA0 - 0x07009E38 +static const Gfx intro_seg7_dl_07008EA0[] = { + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, intro_seg7_texture_070086A0), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsSPVertex(intro_seg7_vertex_07000000, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 7, 0x0, 5, 2, 3, 0x0), + gsSP2Triangles( 3, 7, 4, 0x0, 2, 1, 3, 0x0), + gsSP2Triangles( 7, 8, 4, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles( 9, 12, 10, 0x0, 13, 14, 0, 0x0), + gsSP2Triangles(15, 13, 0, 0x0, 0, 2, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07000100, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 7, 4, 6, 0x0), + gsSP2Triangles( 8, 9, 4, 0x0, 4, 10, 5, 0x0), + gsSP2Triangles( 7, 8, 4, 0x0, 11, 8, 12, 0x0), + gsSP2Triangles( 8, 11, 13, 0x0, 8, 13, 9, 0x0), + gsSP2Triangles( 8, 14, 12, 0x0, 6, 14, 7, 0x0), + gsSP1Triangle( 6, 12, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070001F0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 3, 5, 0x0, 3, 7, 4, 0x0), + gsSP2Triangles( 3, 8, 7, 0x0, 0, 2, 6, 0x0), + gsSP2Triangles( 2, 9, 6, 0x0, 6, 5, 0, 0x0), + gsSP2Triangles( 2, 10, 11, 0x0, 2, 12, 10, 0x0), + gsSP2Triangles( 2, 11, 9, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070002F0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 0, 0x0), + gsSP2Triangles( 0, 2, 3, 0x0, 0, 5, 1, 0x0), + gsSP2Triangles( 3, 6, 7, 0x0, 3, 8, 6, 0x0), + gsSP2Triangles( 3, 7, 4, 0x0, 3, 9, 8, 0x0), + gsSP2Triangles( 7, 10, 11, 0x0, 7, 11, 4, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070003E0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 2, 5, 0x0, 2, 6, 5, 0x0), + gsSP2Triangles( 5, 7, 4, 0x0, 5, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 10, 12, 0x0), + gsSP2Triangles(12, 11, 14, 0x0, 12, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070004E0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070005D0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 1, 0, 0x0, 5, 6, 7, 0x0), + gsSP2Triangles( 5, 8, 6, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070006D0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070007B0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 4, 0x0), + gsSP2Triangles( 8, 5, 4, 0x0, 9, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070008A0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), + gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 7, 0x0), + gsSP2Triangles( 5, 8, 6, 0x0, 9, 8, 5, 0x0), + gsSP2Triangles( 9, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07000980, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07000A70, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 5, 4, 6, 0x0, 3, 7, 4, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 8, 10, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07000B60, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07000C40, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), + gsSP2Triangles( 2, 1, 4, 0x0, 2, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 9, 6, 8, 0x0), + gsSP2Triangles( 8, 10, 11, 0x0, 8, 7, 10, 0x0), + gsSP2Triangles(12, 13, 6, 0x0, 12, 6, 9, 0x0), + gsSPVertex(intro_seg7_vertex_07000D20, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 7, 9, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07000E10, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), + gsSP1Triangle( 1, 14, 2, 0x0), + gsSPVertex(intro_seg7_vertex_07000F00, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07000FF0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 7, 9, 8, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 11, 13, 12, 0x0), + gsSP1Triangle(14, 0, 2, 0x0), + gsSPVertex(intro_seg7_vertex_070010E0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070011D0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), + gsSP1Triangle( 0, 14, 1, 0x0), + gsSPVertex(intro_seg7_vertex_070012C0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSP2Triangles(14, 11, 13, 0x0, 1, 15, 2, 0x0), + gsSPVertex(intro_seg7_vertex_070013C0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070014A0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07001590, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07001670, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 10, 11, 8, 0x0), + gsSP2Triangles(12, 13, 9, 0x0, 12, 14, 13, 0x0), + gsSP1Triangle(15, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07001770, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 0, 2, 4, 0x0, 5, 2, 1, 0x0), + gsSP2Triangles( 5, 6, 7, 0x0, 5, 7, 8, 0x0), + gsSP2Triangles( 5, 8, 2, 0x0, 5, 9, 6, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07001850, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07001950, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07001A30, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07001B10, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07001C00, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles( 0, 10, 1, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07001CE0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 8, 0x0), + gsSP2Triangles( 8, 9, 4, 0x0, 4, 6, 10, 0x0), + gsSP2Triangles( 4, 10, 7, 0x0, 8, 11, 9, 0x0), + gsSP2Triangles(11, 12, 9, 0x0, 11, 13, 12, 0x0), + gsSP1Triangle(11, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07001DE0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07001ED0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP2Triangles(12, 14, 13, 0x0, 0, 15, 1, 0x0), + gsSPVertex(intro_seg7_vertex_07001FD0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070020B0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070021A0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 8, 10, 9, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07002280, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 8, 10, 9, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07002370, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 9, 6, 8, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 11, 13, 12, 0x0), + gsSP1Triangle( 0, 2, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07002460, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 8, 12, 0x0), + gsSP2Triangles(11, 9, 8, 0x0, 9, 13, 14, 0x0), + gsSP2Triangles(11, 13, 9, 0x0, 4, 9, 14, 0x0), + gsSP1Triangle( 4, 15, 9, 0x0), + gsSPVertex(intro_seg7_vertex_07002560, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 0, 0x0), + gsSP2Triangles( 0, 4, 1, 0x0, 5, 6, 3, 0x0), + gsSP2Triangles( 5, 7, 8, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles( 9, 12, 10, 0x0, 9, 13, 12, 0x0), + gsSP2Triangles( 9, 14, 15, 0x0, 9, 15, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07002660, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 0, 2, 4, 0x0, 0, 5, 3, 0x0), + gsSP2Triangles( 0, 6, 7, 0x0, 0, 8, 5, 0x0), + gsSP2Triangles( 0, 7, 8, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07002760, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07002840, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 4, 7, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles(12, 13, 14, 0x0, 12, 15, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07002940, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 6, 12, 0x0), + gsSP1Triangle(13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07002A40, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07002B40, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 3, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07002C20, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSP2Triangles(14, 13, 15, 0x0, 14, 11, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07002D20, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 0, 2, 0x0, 4, 2, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 11, 13, 14, 0x0), + gsSP2Triangles(11, 14, 12, 0x0, 13, 15, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07002E20, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 0, 2, 0x0, 6, 2, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07002F10, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07003000, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle( 8, 10, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070030F0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_070031E0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 5, 8, 6, 0x0, 5, 9, 8, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070032E0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070033C0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 10, 11, 8, 0x0), + gsSP2Triangles(12, 3, 6, 0x0, 12, 6, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070034A0, 6, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 1, 4, 5, 0x0, 1, 5, 2, 0x0), + gsSPEndDisplayList(), +}; -static const u8 intro_seg7_dl_07009E38[] = "__OTR__levels/intro/intro_seg7_dl_07009E38"; +// 0x07009E38 - 0x0700ADC0 +static const Gfx intro_seg7_dl_07009E38[] = { + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, intro_seg7_texture_07007EA0), + gsDPLoadSync(), + gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), + gsSPVertex(intro_seg7_vertex_07003500, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 2, 3, 4, 0x0), + gsSP2Triangles( 2, 4, 0, 0x0, 5, 3, 2, 0x0), + gsSP2Triangles( 6, 5, 2, 0x0, 2, 1, 7, 0x0), + gsSP2Triangles( 2, 7, 6, 0x0, 0, 8, 1, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 6, 7, 10, 0x0), + gsSP2Triangles(11, 12, 13, 0x0, 11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_070035F0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 2, 4, 5, 0x0, 3, 2, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), + gsSPVertex(intro_seg7_vertex_070036D0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 0, 0x0), + gsSP2Triangles( 7, 9, 8, 0x0, 10, 11, 7, 0x0), + gsSP2Triangles(12, 9, 7, 0x0, 0, 10, 7, 0x0), + gsSP2Triangles( 0, 8, 1, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070037D0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070038B0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(12, 14, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070039A0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 10, 12, 0x0), + gsSP1Triangle( 0, 14, 1, 0x0), + gsSPVertex(intro_seg7_vertex_07003A90, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 6, 7, 5, 0x0), + gsSP2Triangles( 6, 8, 7, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles( 9, 12, 10, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07003B90, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07003C70, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07003D60, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), + gsSP1Triangle( 0, 14, 1, 0x0), + gsSPVertex(intro_seg7_vertex_07003E50, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07003F40, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 5, 6, 7, 0x0, 8, 5, 7, 0x0), + gsSP2Triangles( 9, 10, 11, 0x0, 10, 12, 11, 0x0), + gsSP1Triangle( 0, 2, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07004020, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 6, 5, 7, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 9, 2, 10, 0x0), + gsSP2Triangles( 9, 10, 11, 0x0, 11, 12, 9, 0x0), + gsSP2Triangles( 0, 2, 9, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07004120, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07004200, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 7, 8, 4, 0x0, 7, 9, 8, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), + gsSPVertex(intro_seg7_vertex_070042E0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 2, 11, 0, 0x0), + gsSP2Triangles( 0, 12, 1, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070043E0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070044C0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 7, 9, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_070045B0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles(10, 2, 11, 0x0, 0, 2, 10, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070046B0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 2, 0x0), + gsSP2Triangles( 2, 1, 5, 0x0, 2, 5, 3, 0x0), + gsSP2Triangles( 0, 6, 1, 0x0, 3, 7, 4, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070047A0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07004880, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 7, 10, 11, 0x0), + gsSP2Triangles(12, 7, 11, 0x0, 13, 8, 7, 0x0), + gsSP1Triangle(13, 14, 8, 0x0), + gsSPVertex(intro_seg7_vertex_07004970, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 5, 6, 7, 0x0, 5, 4, 6, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 9, 11, 10, 0x0), + gsSP2Triangles(12, 1, 0, 0x0, 13, 0, 14, 0x0), + gsSP1Triangle( 0, 2, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07004A60, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), + gsSP1Triangle( 0, 2, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07004B50, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 10, 7, 0x0), + gsSP2Triangles( 7, 9, 12, 0x0, 13, 7, 12, 0x0), + gsSP1Triangle(11, 14, 10, 0x0), + gsSPVertex(intro_seg7_vertex_07004C40, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), + gsSP1Triangle( 0, 2, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07004D30, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSP2Triangles(11, 14, 12, 0x0, 0, 15, 1, 0x0), + gsSPVertex(intro_seg7_vertex_07004E30, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 7, 12, 0x0), + gsSP2Triangles(13, 14, 8, 0x0, 13, 8, 7, 0x0), + gsSP1Triangle( 7, 10, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07004F20, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07005010, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 0, 2, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(12, 14, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07005100, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 1, 4, 5, 0x0, 2, 1, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles( 9, 12, 10, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07005200, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 4, 0x0), + gsSP2Triangles( 2, 1, 4, 0x0, 2, 4, 5, 0x0), + gsSP2Triangles( 6, 2, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07005300, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07005400, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 3, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070054E0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 5, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_070055C0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), + gsSP1Triangle( 0, 14, 1, 0x0), + gsSPVertex(intro_seg7_vertex_070056B0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_070057A0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles( 6, 10, 9, 0x0, 11, 12, 13, 0x0), + gsSP2Triangles(11, 13, 14, 0x0, 0, 2, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070058A0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), + gsSP2Triangles( 3, 5, 4, 0x0, 3, 6, 5, 0x0), + gsSP2Triangles( 7, 8, 9, 0x0, 7, 10, 8, 0x0), + gsSP2Triangles(11, 12, 13, 0x0, 6, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070059A0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07005A80, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(14, 15, 11, 0x0), + gsSPVertex(intro_seg7_vertex_07005B80, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 1, 4, 3, 0x0, 0, 2, 5, 0x0), + gsSP2Triangles( 6, 7, 4, 0x0, 8, 9, 10, 0x0), + gsSP2Triangles( 9, 11, 10, 0x0, 12, 13, 7, 0x0), + gsSPVertex(intro_seg7_vertex_07005C60, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07005D50, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 5, 7, 8, 0x0), + gsSP2Triangles( 9, 10, 11, 0x0, 9, 12, 10, 0x0), + gsSP1Triangle( 0, 2, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07005E30, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 4, 6, 7, 0x0, 4, 7, 5, 0x0), + gsSP2Triangles( 5, 7, 8, 0x0, 3, 5, 9, 0x0), + gsSP2Triangles( 5, 8, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07005F20, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), + gsSP1Triangle( 0, 2, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07006010, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 8, 10, 9, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07006100, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 5, 7, 0x0, 8, 6, 9, 0x0), + gsSP2Triangles( 6, 7, 9, 0x0, 9, 7, 10, 0x0), + gsSP2Triangles( 8, 9, 11, 0x0, 9, 10, 12, 0x0), + gsSP1Triangle( 0, 13, 1, 0x0), + gsSPVertex(intro_seg7_vertex_070061E0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_070062D0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 14, 0x0), + gsSP1Triangle(10, 14, 11, 0x0), + gsSPVertex(intro_seg7_vertex_070063C0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 9, 6, 8, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 10, 13, 11, 0x0), + gsSP1Triangle(12, 11, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070064B0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 4, 0x0, 6, 4, 3, 0x0), + gsSP2Triangles( 8, 9, 7, 0x0, 8, 7, 6, 0x0), + gsSP2Triangles(10, 2, 11, 0x0, 2, 12, 11, 0x0), + gsSP2Triangles( 2, 1, 12, 0x0, 11, 12, 13, 0x0), + gsSP2Triangles(10, 11, 14, 0x0, 11, 13, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070065B0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 7, 0x0), + gsSP2Triangles( 8, 3, 7, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles( 6, 5, 12, 0x0, 6, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07006690, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07006770, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07006850, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07006940, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 0, 3, 4, 0x0, 5, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07006A30, 9, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), + gsSP1Triangle( 4, 6, 8, 0x0), + gsSPEndDisplayList(), +}; -static const u8 intro_seg7_dl_0700ADC0[] = "__OTR__levels/intro/intro_seg7_dl_0700ADC0"; +// 0x0700ADC0 - 0x0700B3A0 +static const Gfx intro_seg7_dl_0700ADC0[] = { + gsSPVertex(intro_seg7_vertex_07006AC0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 7, 9, 0x0, 7, 11, 12, 0x0), + gsSP2Triangles( 7, 12, 8, 0x0, 13, 14, 7, 0x0), + gsSP2Triangles(13, 7, 10, 0x0, 9, 8, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07006BC0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 1, 0x0), + gsSP2Triangles( 1, 4, 2, 0x0, 5, 0, 2, 0x0), + gsSP2Triangles( 6, 3, 0, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 6, 0, 10, 0x0, 10, 0, 5, 0x0), + gsSP2Triangles(11, 12, 13, 0x0, 11, 13, 14, 0x0), + gsSP2Triangles(11, 8, 12, 0x0, 8, 15, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07006CC0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 3, 9, 10, 0x0), + gsSP2Triangles(11, 2, 1, 0x0, 11, 1, 12, 0x0), + gsSP2Triangles(13, 14, 8, 0x0, 14, 15, 8, 0x0), + gsSP1Triangle( 7, 13, 8, 0x0), + gsSPVertex(intro_seg7_vertex_07006DC0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles(10, 7, 9, 0x0, 10, 9, 11, 0x0), + gsSP2Triangles(12, 6, 5, 0x0, 12, 13, 6, 0x0), + gsSP1Triangle( 0, 14, 1, 0x0), + gsSPVertex(intro_seg7_vertex_07006EB0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 5, 0x0, 7, 3, 5, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 9, 11, 10, 0x0), + gsSP2Triangles( 0, 2, 12, 0x0, 9, 13, 14, 0x0), + gsSP2Triangles( 9, 14, 11, 0x0, 15, 7, 6, 0x0), + gsSPVertex(intro_seg7_vertex_07006FB0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 2, 6, 5, 0x0), + gsSP2Triangles( 4, 6, 7, 0x0, 7, 8, 4, 0x0), + gsSP2Triangles( 0, 9, 3, 0x0, 10, 11, 12, 0x0), + gsSP1Triangle(13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_070070B0, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 4, 11, 5, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_070071A0, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07007280, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), + gsSP2Triangles( 8, 10, 9, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(11, 14, 12, 0x0), + gsSPVertex(intro_seg7_vertex_07007370, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), + gsSP2Triangles(10, 11, 12, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07007470, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), + gsSP2Triangles( 1, 4, 3, 0x0, 0, 5, 1, 0x0), + gsSP2Triangles( 3, 4, 6, 0x0, 3, 6, 7, 0x0), + gsSP2Triangles( 8, 5, 0, 0x0, 8, 9, 5, 0x0), + gsSP2Triangles( 7, 6, 10, 0x0, 7, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07007560, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 2, 1, 3, 0x0), + gsSP2Triangles( 2, 3, 4, 0x0, 5, 6, 7, 0x0), + gsSP2Triangles( 5, 7, 8, 0x0, 9, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07007650, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07007740, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07007830, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), + gsSP1Triangle(12, 13, 14, 0x0), + gsSPVertex(intro_seg7_vertex_07007920, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 8, 7, 9, 0x0), + gsSP2Triangles( 7, 10, 9, 0x0, 11, 6, 8, 0x0), + gsSP2Triangles(12, 6, 11, 0x0, 13, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07007A20, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 1, 0, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 5, 7, 6, 0x0), + gsSP2Triangles( 1, 8, 2, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07007B20, 15, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSP1Triangle(14, 12, 11, 0x0), + gsSPVertex(intro_seg7_vertex_07007C10, 14, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 3, 0, 2, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 6, 5, 7, 0x0), + gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), + gsSPVertex(intro_seg7_vertex_07007CF0, 16, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 1, 3, 2, 0x0), + gsSP2Triangles( 4, 1, 0, 0x0, 4, 5, 1, 0x0), + gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), + gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), + gsSPVertex(intro_seg7_vertex_07007DF0, 11, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), + gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), + gsSP1Triangle( 8, 9, 10, 0x0), + gsSPEndDisplayList(), +}; + +// 0x0700B3A0 - 0x0700B420 +const Gfx intro_seg7_dl_0700B3A0[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), + gsSPClearGeometryMode(G_LIGHTING), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 0, 0, G_TX_LOADTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, G_TX_NOMASK, G_TX_NOLOD), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + gsDPTileSync(), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, G_TX_RENDERTILE, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD, G_TX_WRAP | G_TX_NOMIRROR, 5, G_TX_NOLOD), + gsDPSetTileSize(0, 0, 0, (32 - 1) << G_TEXTURE_IMAGE_FRAC, (32 - 1) << G_TEXTURE_IMAGE_FRAC), + gsSPDisplayList(intro_seg7_dl_07008EA0), + gsSPDisplayList(intro_seg7_dl_07009E38), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsSPDisplayList(intro_seg7_dl_0700ADC0), + gsSPSetGeometryMode(G_LIGHTING), + gsSPEndDisplayList(), +}; // 0x0700B420 - 0x0700B460 static const Vtx intro_seg7_vertex_0700B420[] = { @@ -2610,6 +3335,29 @@ ALIGNED8 static const Texture intro_seg7_texture_0700B4A0[] = "__OTR__levels/int // 0x0700C4A0 - 0x0700D4A0 ALIGNED8 static const Texture intro_seg7_texture_0700C4A0[] = "__OTR__levels/intro/3_tm"; +// 0x0700C6A0 - 0x0700C790 +const Gfx intro_seg7_dl_0700C6A0[] = { + gsDPPipeSync(), + gsDPSetCombineMode(G_CC_DECALFADE, G_CC_DECALFADE), + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON), + + gsDPLoadTextureBlock(intro_seg7_texture_0700B4A0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 128, 16, 0, G_TX_CLAMP, G_TX_CLAMP, 7, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPVertex(intro_seg7_vertex_0700B420, 4, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + gsDPLoadTextureBlock(intro_seg7_texture_0700C4A0, G_IM_FMT_RGBA, G_IM_SIZ_16b, 16, 16, 0, G_TX_CLAMP, G_TX_CLAMP, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPVertex(intro_seg7_vertex_0700B460, 4, 0), + gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), + + gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), + gsDPPipeSync(), + gsSPSetGeometryMode(G_LIGHTING), + gsDPSetCombineMode(G_CC_SHADE, G_CC_SHADE), + gsDPSetEnvColor(255, 255, 255, 255), + gsDPSetRenderMode(G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2), + gsSPEndDisplayList(), +}; + // 0x0700C790 const f32 intro_seg7_table_0700C790[] = { 0.016000f, 0.052000f, 0.002500f, 0.148300f, diff --git a/src/game/segment7.h b/src/game/segment7.h index 1e316dea..4416dc09 100644 --- a/src/game/segment7.h +++ b/src/game/segment7.h @@ -25,6 +25,8 @@ extern const u8 eu_course_strings_de_table[]; #endif // from intro_segment7 +extern Gfx *intro_seg7_dl_0700B3A0; +extern Gfx *intro_seg7_dl_0700C6A0; extern f32 intro_seg7_table_0700C790[]; extern f32 intro_seg7_table_0700C880[]; diff --git a/src/menu/intro_geo.c b/src/menu/intro_geo.c index ec149440..55aacdb9 100644 --- a/src/menu/intro_geo.c +++ b/src/menu/intro_geo.c @@ -50,9 +50,6 @@ void patch_title_screen_scales(void) { } } -static const u8 intro_seg7_dl_0700B3A0[] = "__OTR__levels/intro/intro_seg7_dl_0700B3A0"; -static const u8 intro_seg7_dl_0700C6A0[] = "__OTR__levels/intro/intro_seg7_dl_0700C6A0"; - /** * Geo callback to render the "Super Mario 64" logo on the title screen */ @@ -107,7 +104,7 @@ Gfx *geo_intro_super_mario_64_logo(s32 state, struct GraphNode *node, UNUSED voi sIntroScalePos = dlIter; gSPMatrix(dlIter++, scaleMat, G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH); - gSPDisplayList(dlIter++, intro_seg7_dl_0700B3A0); // draw model + gSPDisplayList(dlIter++, &intro_seg7_dl_0700B3A0); // draw model gSPPopMatrix(dlIter++, G_MTX_MODELVIEW); gSPEndDisplayList(dlIter); @@ -141,7 +138,7 @@ Gfx *geo_intro_tm_copyright(s32 state, struct GraphNode *node, UNUSED void *cont gDPSetRenderMode(dlIter++, G_RM_AA_XLU_SURF, G_RM_AA_XLU_SURF2); break; } - gSPDisplayList(dlIter++, intro_seg7_dl_0700C6A0); // draw model + gSPDisplayList(dlIter++, &intro_seg7_dl_0700C6A0); // draw model gSPEndDisplayList(dlIter); // Once the "Super Mario 64" logo has just about zoomed fully, fade in the "TM" and copyright text