From 8bc5dd770498440e9f9073411a3a596988f2bff3 Mon Sep 17 00:00:00 2001 From: aglab2 Date: Tue, 30 Apr 2024 22:31:51 +0800 Subject: [PATCH 1/6] Move level script to bank 0x1A --- include/segment_names.h | 6 +++--- sm64.ld | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/segment_names.h b/include/segment_names.h index 3e84d524ba..12c35cc15a 100644 --- a/include/segment_names.h +++ b/include/segment_names.h @@ -27,7 +27,7 @@ #define SEGMENT_EFFECT_YAY0 0x0B // | Segment 11 | effect_yay0 #define SEGMENT_GROUPA_GEO 0x0C // | Segment 12 | Actor group A geo (group1 - group11) #define SEGMENT_GROUPB_GEO 0x0D // | Segment 13 | Actor group B geo (group12 - group17) -#define SEGMENT_LEVEL_SCRIPT 0x0E // | Segment 14 | level_ending_entry (/levels/ending/), DEFINE_LEVEL +#define SEGMENT_VANILLA_OBJECTS 0x0E // | Segment 14 | Vanilla Objects needed to be referenced from dl #define SEGMENT_COMMON0_GEO 0x0F // | Segment 15 | /actors/common0_geo #define SEGMENT_LEVEL_ENTRY 0x10 // | Segment 16 | Level Script Entry #define SEGMENT_MARIO_ANIMS 0x11 // | Segment 17 | Mario Animations @@ -39,8 +39,8 @@ #define SEGMENT_GROUP0_GEO 0x17 // | Segment 23 | /actors/group0_geo #define SEGMENT_DEMO_INPUTS 0x18 // | Segment 24 | Demo Inputs List #define SEGMENT_EU_TRANSLATION 0x19 // | Segment 25 | EU language translations -#define SEGMENT_UNKNOWN_26 0x1A // | Segment 26 | Unknown/Unused? -#define SEGMENT_UNKNOWN_27 0x1B // | Segment 27 | Unknown/Unused? +#define SEGMENT_LEVEL_SCRIPT 0x1A // | Segment 26 | level_ending_entry (/levels/ending/), DEFINE_LEVEL +#define SEGMENT_VANILLA_GEO 0x1B // | Segment 27 | Geolayouts for vanilla objects #define SEGMENT_UNKNOWN_28 0x1C // | Segment 28 | Unknown/Unused? #define SEGMENT_UNKNOWN_29 0x1D // | Segment 29 | Unknown/Unused? #define SEGMENT_UNKNOWN_30 0x1E // | Segment 30 | Unknown/Unused? diff --git a/sm64.ld b/sm64.ld index 62eaaf75a0..1f66c50aba 100755 --- a/sm64.ld +++ b/sm64.ld @@ -42,7 +42,7 @@ OUTPUT_ARCH (mips) . = ALIGN(0x10); \ } \ END_SEG(name##_segment_7) \ - BEGIN_SEG(name, 0x0E000000) \ + BEGIN_SEG(name, 0x1A000000) \ { \ KEEP(BUILD_DIR/levels/name/script.o(.*data*)); \ KEEP(BUILD_DIR/levels/name/script.o(.text*)); \ From 305a18aaf472a93aa9874c116d1020d122d36a54 Mon Sep 17 00:00:00 2001 From: aglab2 Date: Thu, 2 May 2024 08:20:11 +0800 Subject: [PATCH 2/6] Decouple vanilla objects in a separate bank --- .gitignore | 135 +++++++------ Makefile | 11 +- Makefile.split | 43 ++++- actors/common0_geo.c | 29 +++ actors/group10_geo.c | 9 + actors/group11_geo.c | 12 ++ actors/group12_geo.c | 13 ++ actors/group13_geo.c | 14 ++ actors/group14_geo.c | 14 ++ actors/group15_geo.c | 10 + actors/group16_geo.c | 9 + actors/group17_geo.c | 12 ++ actors/group1_geo.c | 12 ++ actors/group2_geo.c | 9 + actors/group3_geo.c | 9 + actors/group4.h | 3 + actors/group4_geo.c | 38 ++++ actors/group5_geo.c | 12 ++ actors/group6_geo.c | 10 + actors/group7_geo.c | 10 + actors/group8_geo.c | 9 + actors/group9_geo.c | 13 ++ .../bbh/coffin/collision.inc.c | 0 .../bbh/coffin/geo.inc.c | 0 .../bbh/coffin/model.inc.c | 0 actors_vanilla/bbh/data.c | 27 +++ actors_vanilla/bbh/geo.c | 37 ++++ actors_vanilla/bbh/header.h | 29 +++ .../bbh/merry_go_round/collision.inc.c | 0 .../bbh/merry_go_round/geo.inc.c | 0 .../bbh/merry_go_round/model.inc.c | 0 .../bbh/mesh_elevator/collision.inc.c | 0 .../bbh/mesh_elevator/geo.inc.c | 0 .../bbh/mesh_elevator/model.inc.c | 0 .../bbh/moving_bookshelf/collision.inc.c | 0 .../bbh/moving_bookshelf/geo.inc.c | 0 .../bbh/moving_bookshelf/model.inc.c | 0 .../bbh/staircase_step/collision.inc.c | 0 .../bbh/staircase_step/geo.inc.c | 0 .../bbh/staircase_step/model.inc.c | 0 actors_vanilla/bbh/texture.inc.c | 19 ++ .../bbh/tilting_trap_platform/collision.inc.c | 0 .../bbh/tilting_trap_platform/geo.inc.c | 0 .../bbh/tilting_trap_platform/model.inc.c | 0 .../bbh/tumbling_platform_far/geo.inc.c | 0 .../bbh/tumbling_platform_far/model.inc.c | 0 .../tumbling_platform_near/collision.inc.c | 0 .../bbh/tumbling_platform_near/geo.inc.c | 0 .../bbh/tumbling_platform_near/model.inc.c | 0 .../bitdw/collapsing_stairs_1/collision.inc.c | 0 .../bitdw/collapsing_stairs_1/geo.inc.c | 0 .../bitdw/collapsing_stairs_1/model.inc.c | 0 .../bitdw/collapsing_stairs_2/collision.inc.c | 0 .../bitdw/collapsing_stairs_2/geo.inc.c | 0 .../bitdw/collapsing_stairs_2/model.inc.c | 0 .../bitdw/collapsing_stairs_3/collision.inc.c | 0 .../bitdw/collapsing_stairs_3/geo.inc.c | 0 .../bitdw/collapsing_stairs_3/model.inc.c | 0 .../bitdw/collapsing_stairs_4/collision.inc.c | 0 .../bitdw/collapsing_stairs_4/geo.inc.c | 0 .../bitdw/collapsing_stairs_4/model.inc.c | 0 .../bitdw/collapsing_stairs_5/collision.inc.c | 0 .../bitdw/collapsing_stairs_5/geo.inc.c | 0 .../bitdw/collapsing_stairs_5/model.inc.c | 0 actors_vanilla/bitdw/data.c | 35 ++++ .../bitdw/ferris_platform/collision.inc.c | 0 .../bitdw/ferris_platform/geo.inc.c | 0 .../bitdw/ferris_platform/model.inc.c | 0 .../bitdw/ferris_wheel_axle/collision.inc.c | 0 .../bitdw/ferris_wheel_axle/geo.inc.c | 0 .../bitdw/ferris_wheel_axle/model.inc.c | 0 actors_vanilla/bitdw/geo.c | 41 ++++ actors_vanilla/bitdw/header.h | 36 ++++ .../bitdw/seesaw_platform/collision.inc.c | 0 .../bitdw/seesaw_platform/geo.inc.c | 0 .../bitdw/seesaw_platform/model.inc.c | 0 .../bitdw/sliding_platform/collision.inc.c | 0 .../bitdw/sliding_platform/geo.inc.c | 0 .../bitdw/sliding_platform/model.inc.c | 0 .../bitdw/square_platform/collision.inc.c | 0 .../bitdw/square_platform/geo.inc.c | 0 .../bitdw/square_platform/model.inc.c | 0 actors_vanilla/bitdw/texture.inc.c | 4 + actors_vanilla/bitfs/data.c | 38 ++++ .../bitfs/elevator/collision.inc.c | 0 .../bitfs/elevator/geo.inc.c | 0 .../bitfs/elevator/model.inc.c | 0 actors_vanilla/bitfs/geo.c | 45 +++++ actors_vanilla/bitfs/header.h | 42 ++++ .../moving_square_platform/collision.inc.c | 0 .../bitfs/moving_square_platform/geo.inc.c | 0 .../bitfs/moving_square_platform/model.inc.c | 0 .../bitfs/platform_on_track/collision.inc.c | 0 .../bitfs/platform_on_track/geo.inc.c | 0 .../bitfs/platform_on_track/model.inc.c | 0 .../bitfs/seesaw_platform/collision.inc.c | 0 .../bitfs/seesaw_platform/geo.inc.c | 0 .../bitfs/seesaw_platform/model.inc.c | 0 .../sinking_cage_platform/collision.inc.c | 0 .../bitfs/sinking_cage_platform/geo.inc.c | 0 .../bitfs/sinking_cage_platform/model.inc.c | 0 .../bitfs/sinking_cage_pole/geo.inc.c | 0 .../bitfs/sinking_cage_pole/model.inc.c | 0 .../bitfs/sinking_platforms/collision.inc.c | 0 .../bitfs/sinking_platforms/geo.inc.c | 0 .../bitfs/sinking_platforms/model.inc.c | 0 .../bitfs/sliding_platform/collision.inc.c | 0 .../bitfs/sliding_platform/geo.inc.c | 0 .../bitfs/sliding_platform/model.inc.c | 0 .../bitfs/stretching_platform/1.inc.c | 0 .../bitfs/stretching_platform/2.inc.c | 0 .../bitfs/stretching_platform/collision.inc.c | 0 .../bitfs/stretching_platform/geo.inc.c | 0 actors_vanilla/bitfs/texture.inc.c | 9 + .../tilting_square_platform/collision.inc.c | 0 .../bitfs/tilting_square_platform/geo.inc.c | 0 .../bitfs/tilting_square_platform/model.inc.c | 0 .../bitfs/tumbling_platform_far/geo.inc.c | 0 .../bitfs/tumbling_platform_far/model.inc.c | 0 .../tumbling_platform_near/collision.inc.c | 0 .../bitfs/tumbling_platform_near/geo.inc.c | 0 .../bitfs/tumbling_platform_near/model.inc.c | 0 .../bits}/20/collision.inc.c | 0 .../1 => actors_vanilla/bits}/20/geo.inc.c | 0 .../1 => actors_vanilla/bits}/20/model.inc.c | 0 .../bits}/21/collision.inc.c | 0 .../1 => actors_vanilla/bits}/21/geo.inc.c | 0 .../1 => actors_vanilla/bits}/21/model.inc.c | 0 .../bits}/22/collision.inc.c | 0 .../1 => actors_vanilla/bits}/22/geo.inc.c | 0 .../1 => actors_vanilla/bits}/22/model.inc.c | 0 .../bits}/23/collision.inc.c | 0 .../1 => actors_vanilla/bits}/23/geo.inc.c | 0 .../1 => actors_vanilla/bits}/23/model.inc.c | 0 .../bits}/24/collision.inc.c | 0 .../1 => actors_vanilla/bits}/24/geo.inc.c | 0 .../1 => actors_vanilla/bits}/24/model.inc.c | 0 .../bits}/25/collision.inc.c | 0 .../1 => actors_vanilla/bits}/25/geo.inc.c | 0 .../1 => actors_vanilla/bits}/25/model.inc.c | 0 .../bits}/26/collision.inc.c | 0 .../1 => actors_vanilla/bits}/26/geo.inc.c | 0 .../1 => actors_vanilla/bits}/26/model.inc.c | 0 .../bits}/27/collision.inc.c | 0 .../1 => actors_vanilla/bits}/27/geo.inc.c | 0 .../1 => actors_vanilla/bits}/27/model.inc.c | 0 .../bits}/28/collision.inc.c | 0 .../1 => actors_vanilla/bits}/28/geo.inc.c | 0 .../1 => actors_vanilla/bits}/28/model.inc.c | 0 .../bits}/29/collision.inc.c | 0 .../1 => actors_vanilla/bits}/29/geo.inc.c | 0 .../1 => actors_vanilla/bits}/29/model.inc.c | 0 .../bits}/30/collision.inc.c | 0 .../1 => actors_vanilla/bits}/30/geo.inc.c | 0 .../1 => actors_vanilla/bits}/30/model.inc.c | 0 .../bits}/31/collision.inc.c | 0 .../1 => actors_vanilla/bits}/31/geo.inc.c | 0 .../1 => actors_vanilla/bits}/31/model.inc.c | 0 .../bits}/32/collision.inc.c | 0 .../1 => actors_vanilla/bits}/32/geo.inc.c | 0 .../1 => actors_vanilla/bits}/32/model.inc.c | 0 actors_vanilla/bits/data.c | 38 ++++ actors_vanilla/bits/geo.c | 47 +++++ actors_vanilla/bits/header.h | 45 +++++ actors_vanilla/bits/texture.inc.c | 4 + .../bob/chain_chomp_gate/collision.inc.c | 0 .../bob/chain_chomp_gate/geo.inc.c | 0 .../bob/chain_chomp_gate/model.inc.c | 0 actors_vanilla/bob/data.c | 17 ++ actors_vanilla/bob/geo.c | 27 +++ .../bob/grate_door/collision.inc.c | 0 .../bob/grate_door/geo.inc.c | 0 .../bob/grate_door/model.inc.c | 0 actors_vanilla/bob/header.h | 15 ++ .../bob/seesaw_platform/collision.inc.c | 0 .../bob/seesaw_platform/geo.inc.c | 0 .../bob/seesaw_platform/model.inc.c | 0 .../castle_grounds}/11/anim.inc.c | 0 .../castle_grounds}/11/geo.inc.c | 0 .../castle_grounds}/11/model.inc.c | 0 .../castle_grounds}/12/model.inc.c | 4 +- .../castle_grounds}/13/model.inc.c | 2 +- .../castle_grounds}/7/collision.inc.c | 0 .../castle_grounds}/7/geo.inc.c | 0 .../castle_grounds}/7/model.inc.c | 0 .../castle_grounds}/8/collision.inc.c | 0 .../castle_grounds}/8/geo.inc.c | 0 .../castle_grounds}/8/model.inc.c | 0 actors_vanilla/castle_grounds/data.c | 20 ++ actors_vanilla/castle_grounds/geo.c | 27 +++ actors_vanilla/castle_grounds/header.h | 19 ++ actors_vanilla/castle_grounds/texture.inc.c | 0 .../castle_inside/clock_hour_hand/geo.inc.c | 0 .../castle_inside/clock_hour_hand/model.inc.c | 0 .../castle_inside/clock_minute_hand/geo.inc.c | 0 .../clock_minute_hand/model.inc.c | 0 actors_vanilla/castle_inside/data.c | 23 +++ .../castle_inside/ddd_warp/collision.inc.c | 87 +++++++++ actors_vanilla/castle_inside/geo.c | 38 ++++ actors_vanilla/castle_inside/header.h | 45 +++++ .../castle_inside}/pendulum/geo.inc.c | 0 .../castle_inside}/pendulum/model.inc.c | 0 .../castle_inside/star_door/collision.inc.c | 0 .../castle_inside/star_door/geo.inc.c | 0 .../castle_inside/star_door/model.inc.c | 0 actors_vanilla/castle_inside/texture.inc.c | 18 ++ .../castle_inside/trap_door/collision.inc.c | 0 .../castle_inside/trap_door/geo.inc.c | 0 .../castle_inside/trap_door/model.inc.c | 0 .../water_level_pillar/collision.inc.c | 0 .../water_level_pillar/geo.inc.c | 0 .../water_level_pillar/model.inc.c | 0 .../castle_inside/wing_cap_light}/model.inc.c | 0 actors_vanilla/ccm/data.c | 18 ++ actors_vanilla/ccm/geo.c | 27 +++ actors_vanilla/ccm/header.h | 15 ++ .../ccm/ropeway_lift/1.inc.c | 0 .../ccm/ropeway_lift/2.inc.c | 0 .../ccm/ropeway_lift/collision.inc.c | 0 .../ccm/ropeway_lift/geo.inc.c | 0 .../ccm/snowman_base/geo.inc.c | 0 .../ccm/snowman_base/model.inc.c | 2 +- .../ccm/snowman_head/1.inc.c | 0 .../ccm/snowman_head/2.inc.c | 0 .../ccm/snowman_head/geo.inc.c | 0 actors_vanilla/ccm/texture.inc.c | 24 +++ actors_vanilla/ddd/data.c | 23 +++ actors_vanilla/ddd/geo.c | 27 +++ actors_vanilla/ddd/header.h | 17 ++ {levels => actors_vanilla}/ddd/pole/geo.inc.c | 0 .../ddd/pole/model.inc.c | 0 .../ddd/sub_door/1.inc.c | 0 .../ddd/sub_door/2.inc.c | 0 .../ddd/sub_door/3.inc.c | 0 .../ddd/sub_door/collision.inc.c | 0 .../ddd/sub_door/geo.inc.c | 0 .../ddd/submarine/1.inc.c | 0 .../ddd/submarine/2.inc.c | 0 .../ddd/submarine/collision.inc.c | 0 .../ddd/submarine/geo.inc.c | 0 actors_vanilla/ddd/texture.inc.c | 14 ++ .../hmc/arrow_platform/collision.inc.c | 0 .../hmc/arrow_platform/geo.inc.c | 0 .../hmc/arrow_platform/model.inc.c | 0 .../hmc/arrow_platform_button/collision.inc.c | 0 .../hmc/arrow_platform_button/geo.inc.c | 0 .../hmc/arrow_platform_button/model.inc.c | 0 actors_vanilla/hmc/data.c | 23 +++ .../hmc/elevator_platform/collision.inc.c | 0 .../hmc/elevator_platform/geo.inc.c | 0 .../hmc/elevator_platform/model.inc.c | 0 actors_vanilla/hmc/geo.c | 35 ++++ .../hmc/grill_door/collision.inc.c | 0 .../hmc/grill_door/geo.inc.c | 0 .../hmc/grill_door/model.inc.c | 0 actors_vanilla/hmc/header.h | 26 +++ .../hmc/rolling_rock/geo.inc.c | 0 .../hmc/rolling_rock/model.inc.c | 0 .../hmc/rolling_rock_fragment_1/geo.inc.c | 0 .../hmc/rolling_rock_fragment_1/model.inc.c | 0 .../hmc/rolling_rock_fragment_2/geo.inc.c | 0 .../hmc/rolling_rock_fragment_2/model.inc.c | 0 actors_vanilla/hmc/texture.inc.c | 20 ++ actors_vanilla/jrb/data.c | 25 +++ .../jrb/falling_pillar/geo.inc.c | 0 .../jrb/falling_pillar/model.inc.c | 0 .../jrb/falling_pillar_base/collision.inc.c | 0 .../jrb/falling_pillar_base/geo.inc.c | 0 .../jrb/falling_pillar_base/model.inc.c | 0 .../jrb/floating_platform/collision.inc.c | 0 .../jrb/floating_platform/geo.inc.c | 0 .../jrb/floating_platform/model.inc.c | 0 actors_vanilla/jrb/geo.c | 38 ++++ actors_vanilla/jrb/header.h | 39 ++++ .../jrb/rock/collision.inc.c | 0 {levels => actors_vanilla}/jrb/rock/geo.inc.c | 0 .../jrb/rock/model.inc.c | 0 .../jrb/sliding_box/collision.inc.c | 0 .../jrb/sliding_box/geo.inc.c | 0 .../jrb/sliding_box/model.inc.c | 0 actors_vanilla/jrb/texture.inc.c | 9 + .../jrb/unused_lid/collision.inc.c | 0 .../jrb/wooden_ship/collision.inc.c | 0 .../jrb/wooden_ship/geo.inc.c | 0 .../jrb/wooden_ship/model.inc.c | 0 .../lll}/10/collision.inc.c | 0 .../1 => actors_vanilla/lll}/10/geo.inc.c | 0 .../1 => actors_vanilla/lll}/10/model.inc.c | 0 .../collision.inc.c | 0 .../lll/collapsing_wooden_platform/geo.inc.c | 0 .../collapsing_wooden_platform/model.inc.c | 0 actors_vanilla/lll/data.c | 42 ++++ .../lll/drawbridge_part/collision.inc.c | 0 .../lll/drawbridge_part/geo.inc.c | 0 .../lll/drawbridge_part/model.inc.c | 0 actors_vanilla/lll/geo.c | 66 +++++++ actors_vanilla/lll/header.h | 78 ++++++++ .../lll/long_wooden_bridge/geo.inc.c | 0 .../lll/long_wooden_bridge/model.inc.c | 0 .../collision.inc.c | 0 .../moving_octagonal_mesh_platform/geo.inc.c | 0 .../model.inc.c | 0 .../lll/puzzle_piece/collision.inc.c | 0 .../lll/puzzle_piece/geo.inc.c | 0 .../lll/puzzle_piece/model.inc.c | 0 .../lll/rolling_log/collision.inc.c | 0 .../lll/rolling_log/geo.inc.c | 0 .../lll/rolling_log/model.inc.c | 0 .../rotating_block_fire_bars/collision.inc.c | 0 .../lll/rotating_block_fire_bars/geo.inc.c | 0 .../lll/rotating_block_fire_bars/model.inc.c | 0 .../rotating_hexagonal_ring/collision.inc.c | 0 .../lll/rotating_hexagonal_ring/geo.inc.c | 0 .../lll/rotating_hexagonal_ring/model.inc.c | 0 .../collision.inc.c | 0 .../sinking_rectangular_platform/geo.inc.c | 0 .../sinking_rectangular_platform/model.inc.c | 0 .../lll/sinking_rock_block/collision.inc.c | 0 .../lll/sinking_rock_block/geo.inc.c | 0 .../lll/sinking_rock_block/model.inc.c | 0 .../sinking_square_platform/collision.inc.c | 0 .../lll/sinking_square_platform/geo.inc.c | 0 .../lll/sinking_square_platform/model.inc.c | 0 actors_vanilla/lll/texture.inc.c | 109 +++++++++++ .../tilting_square_platform/collision.inc.c | 0 .../lll/tilting_square_platform/geo.inc.c | 0 .../lll/tilting_square_platform/model.inc.c | 0 .../lll/volcano_falling_trap/collision.inc.c | 0 .../lll/volcano_falling_trap/geo.inc.c | 0 .../lll/volcano_falling_trap/model.inc.c | 0 .../lll/wooden_float_large/geo.inc.c | 0 .../lll/wooden_float_large/model.inc.c | 0 .../lll/wooden_float_small/collision.inc.c | 0 .../lll/wooden_float_small/geo.inc.c | 0 .../lll/wooden_float_small/model.inc.c | 0 .../rr/cruiser_wing/geo.inc.c | 0 .../rr/cruiser_wing/model.inc.c | 0 actors_vanilla/rr/data.c | 44 +++++ .../rr/donut_block/1.inc.c | 0 .../rr/donut_block/2.inc.c | 0 .../rr/donut_block/collision.inc.c | 0 .../rr/donut_block/geo.inc.c | 0 .../rr/elevator_platform/collision.inc.c | 0 .../rr/elevator_platform/geo.inc.c | 0 .../rr/elevator_platform/model.inc.c | 0 .../rr/flying_carpet/collision.inc.c | 0 .../rr/flying_carpet/geo.inc.c | 0 .../rr/flying_carpet/model.inc.c | 0 actors_vanilla/rr/geo.c | 53 +++++ actors_vanilla/rr/header.h | 57 ++++++ .../rr/l_platform/collision.inc.c | 0 .../rr/l_platform/geo.inc.c | 0 .../rr/l_platform/model.inc.c | 0 .../rr/octagonal_platform/collision.inc.c | 0 .../rr/octagonal_platform/geo.inc.c | 0 .../rr/octagonal_platform/model.inc.c | 0 .../rr/pyramid_platform/collision.inc.c | 0 .../rr/pyramid_platform/geo.inc.c | 0 .../rr/pyramid_platform/model.inc.c | 0 .../rotating_bridge_platform/collision.inc.c | 0 .../rr/rotating_bridge_platform/geo.inc.c | 0 .../rr/rotating_bridge_platform/model.inc.c | 0 .../rr/seesaw_platform/collision.inc.c | 0 .../rr/seesaw_platform/geo.inc.c | 0 .../rr/seesaw_platform/model.inc.c | 0 .../rr/sliding_platform/collision.inc.c | 0 .../rr/sliding_platform/geo.inc.c | 0 .../rr/sliding_platform/model.inc.c | 0 .../rr/swinging_platform/collision.inc.c | 0 .../rr/swinging_platform/geo.inc.c | 0 .../rr/swinging_platform/model.inc.c | 0 actors_vanilla/rr/texture.inc.c | 8 + .../rr/tricky_triangles_1/collision.inc.c | 0 .../rr/tricky_triangles_1/geo.inc.c | 0 .../rr/tricky_triangles_1/model.inc.c | 0 .../rr/tricky_triangles_2/collision.inc.c | 0 .../rr/tricky_triangles_2/geo.inc.c | 0 .../rr/tricky_triangles_2/model.inc.c | 0 .../rr/tricky_triangles_3/collision.inc.c | 0 .../rr/tricky_triangles_3/geo.inc.c | 0 .../rr/tricky_triangles_3/model.inc.c | 0 .../rr/tricky_triangles_4/collision.inc.c | 0 .../rr/tricky_triangles_4/geo.inc.c | 0 .../rr/tricky_triangles_4/model.inc.c | 0 .../rr/tricky_triangles_5/collision.inc.c | 0 .../rr/tricky_triangles_5/geo.inc.c | 0 .../rr/tricky_triangles_5/model.inc.c | 0 actors_vanilla/sl/data.c | 20 ++ actors_vanilla/sl/geo.c | 27 +++ actors_vanilla/sl/header.h | 14 ++ .../sl/snow_mound/collision.inc.c | 0 .../sl/snow_mound/geo.inc.c | 0 .../sl/snow_mound/model.inc.c | 0 actors_vanilla/sl/texture.inc.c | 4 + .../sl/unused_cracked_ice/collision.inc.c | 0 .../sl/unused_cracked_ice/geo.inc.c | 0 .../sl/unused_cracked_ice/model.inc.c | 0 .../sl/unused_ice_shard/geo.inc.c | 0 .../sl/unused_ice_shard/model.inc.c | 0 actors_vanilla/ssl/data.c | 28 +++ .../ssl/eyerok_col/collision.inc.c | 0 actors_vanilla/ssl/geo.c | 33 ++++ .../ssl/grindel/collision.inc.c | 0 .../ssl/grindel/geo.inc.c | 0 .../ssl/grindel/model.inc.c | 0 actors_vanilla/ssl/header.h | 31 +++ .../ssl/moving_pyramid_wall/collision.inc.c | 0 .../ssl/moving_pyramid_wall/geo.inc.c | 0 .../ssl/moving_pyramid_wall/model.inc.c | 0 .../ssl/pyramid_elevator/collision.inc.c | 0 .../ssl/pyramid_elevator/geo.inc.c | 0 .../ssl/pyramid_elevator/model.inc.c | 0 .../ssl/pyramid_top/collision.inc.c | 0 .../ssl/pyramid_top/geo.inc.c | 0 .../ssl/pyramid_top/model.inc.c | 0 .../ssl/spindel/collision.inc.c | 0 .../ssl/spindel/geo.inc.c | 0 .../ssl/spindel/model.inc.c | 0 actors_vanilla/ssl/texture.inc.c | 9 + .../ssl/tox_box/collision.inc.c | 0 .../ssl/tox_box/geo.inc.c | 0 .../ssl/tox_box/model.inc.c | 8 +- actors_vanilla/thi/data.c | 17 ++ actors_vanilla/thi/geo.c | 24 +++ actors_vanilla/thi/header.h | 10 + actors_vanilla/thi/texture.inc.c | 4 + .../thi/thi_tops}/collision.inc.c | 0 .../thi/thi_tops}/geo.inc.c | 0 .../thi/thi_tops}/model.inc.c | 0 .../ttc/clock_hand/collision.inc.c | 0 .../ttc/clock_hand/geo.inc.c | 0 .../ttc/clock_hand/model.inc.c | 0 actors_vanilla/ttc/data.c | 44 +++++ .../ttc/elevator_platform/collision.inc.c | 0 .../ttc/elevator_platform/geo.inc.c | 0 .../ttc/elevator_platform/model.inc.c | 0 actors_vanilla/ttc/geo.c | 51 +++++ actors_vanilla/ttc/header.h | 49 +++++ .../ttc/large_gear/geo.inc.c | 0 .../ttc/large_gear/model.inc.c | 0 .../ttc/large_treadmill/collision.inc.c | 0 .../ttc/large_treadmill/geo.inc.c | 0 .../ttc/large_treadmill/model.inc.c | 0 .../ttc/pendulum/collision.inc.c | 0 .../ttc/pendulum/geo.inc.c | 0 .../ttc/pendulum/model.inc.c | 0 .../ttc/pit_block/collision.inc.c | 0 .../ttc/pit_block/geo.inc.c | 0 .../ttc/pit_block/model.inc.c | 0 .../ttc/pit_block_2/collision.inc.c | 0 .../ttc/pit_block_2/geo.inc.c | 0 .../ttc/pit_block_2/model.inc.c | 0 .../ttc/push_block/collision.inc.c | 0 .../ttc/push_block/geo.inc.c | 0 .../ttc/push_block/model.inc.c | 0 .../ttc/rotating_cube/collision.inc.c | 0 .../ttc/rotating_cube/geo.inc.c | 0 .../ttc/rotating_cube/model.inc.c | 0 .../ttc/rotating_hexagon/collision.inc.c | 0 .../ttc/rotating_hexagon/geo.inc.c | 0 .../ttc/rotating_hexagon/model.inc.c | 0 .../ttc/rotating_prism/collision.inc.c | 0 .../ttc/rotating_prism/geo.inc.c | 0 .../ttc/rotating_prism/model.inc.c | 0 .../ttc/rotating_triangle/collision.inc.c | 0 .../ttc/rotating_triangle/geo.inc.c | 0 .../ttc/rotating_triangle/model.inc.c | 0 .../ttc/small_gear/geo.inc.c | 0 .../ttc/small_gear/model.inc.c | 0 .../ttc/small_treadmill/collision.inc.c | 0 .../ttc/small_treadmill/geo.inc.c | 0 .../ttc/small_treadmill/model.inc.c | 0 .../ttc/spinner/collision.inc.c | 0 .../ttc/spinner/geo.inc.c | 0 .../ttc/spinner/model.inc.c | 0 actors_vanilla/ttc/texture.inc.c | 9 + .../ttm/blue_smiley/geo.inc.c | 0 .../ttm/blue_smiley/model.inc.c | 0 actors_vanilla/ttm/data.c | 23 +++ actors_vanilla/ttm/geo.c | 35 ++++ actors_vanilla/ttm/header.h | 24 +++ .../ttm/moon_smiley/geo.inc.c | 0 .../ttm/moon_smiley/model.inc.c | 0 .../ttm/rolling_log/collision.inc.c | 0 .../ttm/rolling_log/geo.inc.c | 0 .../ttm/rolling_log/model.inc.c | 0 .../ttm/slide_exit_podium/collision.inc.c | 0 .../ttm/slide_exit_podium/geo.inc.c | 0 .../ttm/slide_exit_podium/model.inc.c | 2 +- .../ttm/star_cage/1.inc.c | 0 .../ttm/star_cage/2.inc.c | 0 .../ttm/star_cage/collision.inc.c | 0 .../ttm/star_cage/geo.inc.c | 0 .../ttm/star_smiley/geo.inc.c | 0 .../ttm/star_smiley/model.inc.c | 0 actors_vanilla/ttm/texture.inc.c | 5 + .../ttm/yellow_smiley/geo.inc.c | 0 .../ttm/yellow_smiley/model.inc.c | 0 actors_vanilla/vcutm/data.c | 13 ++ actors_vanilla/vcutm/geo.c | 23 +++ actors_vanilla/vcutm/header.h | 9 + .../vcutm/seesaw/collision.inc.c | 0 .../vcutm/seesaw/geo.inc.c | 0 .../vcutm/seesaw/model.inc.c | 0 actors_vanilla/vcutm/texture.inc.c | 4 + .../wdw/arrow_lift/collision.inc.c | 0 .../wdw/arrow_lift/geo.inc.c | 0 .../wdw/arrow_lift/model.inc.c | 0 actors_vanilla/wdw/data.c | 26 +++ .../wdw/express_elevator/collision.inc.c | 0 .../wdw/express_elevator/geo.inc.c | 0 .../wdw/express_elevator/model.inc.c | 0 actors_vanilla/wdw/geo.c | 35 ++++ actors_vanilla/wdw/header.h | 27 +++ .../wdw/hidden_platform/collision.inc.c | 0 .../wdw/hidden_platform/geo.inc.c | 0 .../wdw/hidden_platform/model.inc.c | 0 .../collision.inc.c | 0 .../rectangular_floating_platform/geo.inc.c | 0 .../rectangular_floating_platform/model.inc.c | 0 .../wdw/rotating_platform/collision.inc.c | 0 .../wdw/rotating_platform/geo.inc.c | 0 .../wdw/rotating_platform/model.inc.c | 0 .../square_floating_platform/collision.inc.c | 0 .../wdw/square_floating_platform/geo.inc.c | 0 .../wdw/square_floating_platform/model.inc.c | 0 actors_vanilla/wdw/texture.inc.c | 14 ++ .../wdw/water_level_diamond/collision.inc.c | 0 .../wdw/water_level_diamond/geo.inc.c | 0 .../wdw/water_level_diamond/model.inc.c | 0 .../areas/1 => actors_vanilla/wf}/10/1.inc.c | 0 .../areas/1 => actors_vanilla/wf}/10/2.inc.c | 0 .../wf}/10/collision.inc.c | 0 .../1 => actors_vanilla/wf}/10/geo.inc.c | 0 .../wf}/11/collision.inc.c | 0 .../1 => actors_vanilla/wf}/11/geo.inc.c | 0 .../1 => actors_vanilla/wf}/11/model.inc.c | 0 .../beta_extending_platform/collision.inc.c | 0 .../wf/beta_extending_platform/geo.inc.c | 0 .../wf/beta_extending_platform/model.inc.c | 0 .../wf/breakable_wall_left/collision.inc.c | 0 .../wf/breakable_wall_left/geo.inc.c | 0 .../wf/breakable_wall_left/model.inc.c | 0 .../wf/breakable_wall_right/collision.inc.c | 0 .../wf/breakable_wall_right/geo.inc.c | 0 .../wf/breakable_wall_right/model.inc.c | 0 actors_vanilla/wf/data.c | 49 +++++ .../wf/extending_platform/collision.inc.c | 0 .../wf/extending_platform/geo.inc.c | 0 .../wf/extending_platform/model.inc.c | 0 actors_vanilla/wf/geo.c | 56 ++++++ .../wf/giant_pole}/geo.inc.c | 0 .../wf/giant_pole}/model.inc.c | 0 actors_vanilla/wf/header.h | 58 ++++++ .../wf/kickable_board/1.inc.c | 0 .../wf/kickable_board/2.inc.c | 0 .../wf/kickable_board/collision.inc.c | 0 .../wf/kickable_board/geo.inc.c | 0 .../wf/large_bomp/collision.inc.c | 0 .../wf/large_bomp/geo.inc.c | 0 .../wf/large_bomp/model.inc.c | 0 .../wf/rotating_platform/collision.inc.c | 0 .../wf/rotating_platform}/geo.inc.c | 0 .../wf/rotating_platform}/model.inc.c | 0 .../wf/rotating_wooden_platform/1.inc.c | 0 .../wf/rotating_wooden_platform/2.inc.c | 0 .../rotating_wooden_platform/collision.inc.c | 0 .../wf/rotating_wooden_platform/geo.inc.c | 0 .../wf/sliding_platform/collision.inc.c | 0 .../wf/sliding_platform/geo.inc.c | 0 .../wf/sliding_platform/model.inc.c | 0 .../wf/small_bomp/1.inc.c | 0 .../wf/small_bomp/2.inc.c | 0 .../wf/small_bomp/collision.inc.c | 0 .../wf/small_bomp/geo.inc.c | 0 actors_vanilla/wf/texture.inc.c | 19 ++ .../wf/tower_door/collision.inc.c | 0 .../wf/tower_door/geo.inc.c | 0 .../wf/tower_door/model.inc.c | 0 .../wf/tumbling_bridge_far/geo.inc.c | 0 .../wf/tumbling_bridge_far/model.inc.c | 0 .../wf/tumbling_bridge_near/collision.inc.c | 0 .../wf/tumbling_bridge_near/geo.inc.c | 0 .../wf/tumbling_bridge_near/model.inc.c | 0 assets.json | 135 +++++++------ data/behavior_data.c | 38 ++-- include/config/config_debug.h | 2 +- include/level_commands.h | 5 + include/segment_symbols.h | 28 +++ levels/bbh/areas/script_vanilla.inc.c | 5 + levels/bbh/areas/script_vanilla_load.inc.c | 9 + levels/bbh/geo.c | 10 +- levels/bbh/geo.inc.c | 1 + levels/bbh/header.h | 106 +--------- levels/bbh/header.inc.h | 82 ++++++++ levels/bbh/leveldata.c | 62 +----- levels/bbh/leveldata.inc.c | 42 ++++ levels/bbh/script.c | 23 +-- levels/bbh/texture.inc.c | 15 -- levels/bitdw/areas/script_vanilla.inc.c | 20 ++ levels/bitdw/areas/script_vanilla_load.inc.c | 9 + levels/bitdw/geo.c | 27 +-- levels/bitdw/geo.inc.c | 16 ++ levels/bitdw/header.h | 69 +------ levels/bitdw/header.inc.h | 37 ++++ levels/bitdw/leveldata.c | 40 +--- levels/bitdw/leveldata.inc.c | 18 ++ levels/bitdw/script.c | 40 +--- levels/bitfs/areas/script_vanilla.inc.c | 10 + levels/bitfs/areas/script_vanilla_load.inc.c | 23 +++ levels/bitfs/geo.c | 33 +--- levels/bitfs/geo.inc.c | 20 ++ levels/bitfs/header.h | 86 +-------- levels/bitfs/header.inc.h | 49 +++++ levels/bitfs/leveldata.c | 47 +---- levels/bitfs/leveldata.inc.c | 22 +++ levels/bitfs/script.c | 46 +---- levels/bits/areas/script_vanilla.inc.c | 22 +++ levels/bits/areas/script_vanilla_load.inc.c | 7 + levels/bits/geo.c | 33 +--- levels/bits/geo.inc.c | 19 ++ levels/bits/header.h | 84 +------- levels/bits/header.inc.h | 43 +++++ levels/bits/leveldata.c | 49 +---- levels/bits/leveldata.inc.c | 21 ++ levels/bits/script.c | 43 +---- levels/bob/areas/script_vanilla.inc.c | 5 + levels/bob/areas/script_vanilla_load.inc.c | 8 + levels/bob/geo.c | 5 +- levels/bob/geo.inc.c | 1 + levels/bob/header.h | 22 +-- levels/bob/header.inc.h | 12 ++ levels/bob/leveldata.c | 16 +- levels/bob/leveldata.inc.c | 8 + levels/bob/script.c | 17 +- .../areas/script_vanilla.inc.c | 5 + .../areas/script_vanilla_load.inc.c | 7 + levels/castle_courtyard/geo.c | 3 +- levels/castle_courtyard/geo.inc.c | 2 + levels/castle_courtyard/header.h | 12 +- levels/castle_courtyard/header.inc.h | 11 ++ levels/castle_courtyard/leveldata.c | 7 +- levels/castle_courtyard/leveldata.inc.c | 5 + levels/castle_courtyard/script.c | 14 +- .../castle_grounds/areas/script_vanilla.inc.c | 9 + .../areas/script_vanilla_load.inc.c | 9 + levels/castle_grounds/geo.c | 6 +- levels/castle_grounds/geo.inc.c | 2 + levels/castle_grounds/header.h | 34 +--- levels/castle_grounds/header.inc.h | 18 ++ levels/castle_grounds/leveldata.c | 22 +-- levels/castle_grounds/leveldata.inc.c | 10 + levels/castle_grounds/script.c | 22 +-- levels/castle_inside/areas/3/collision.inc.c | 88 --------- .../castle_inside/areas/script_vanilla.inc.c | 11 ++ .../areas/script_vanilla_load.inc.c | 4 + levels/castle_inside/geo.c | 10 +- levels/castle_inside/geo.inc.c | 3 + levels/castle_inside/header.h | 127 +----------- levels/castle_inside/header.inc.h | 90 +++++++++ levels/castle_inside/leveldata.c | 69 +------ levels/castle_inside/leveldata.inc.c | 57 ++++++ levels/castle_inside/script.c | 27 +-- levels/castle_inside/texture.inc.c | 15 -- levels/ccm/areas/script_vanilla.inc.c | 11 ++ levels/ccm/areas/script_vanilla_load.inc.c | 10 + levels/ccm/geo.c | 11 +- levels/ccm/geo.inc.c | 7 + levels/ccm/header.h | 45 +---- levels/ccm/header.inc.h | 36 ++++ levels/ccm/leveldata.c | 33 +--- levels/ccm/leveldata.inc.c | 26 +++ levels/ccm/script.c | 25 +-- levels/ccm/texture.inc.c | 15 -- levels/cotmc/areas/script_vanilla.inc.c | 3 + levels/cotmc/areas/script_vanilla_load.inc.c | 8 + levels/cotmc/geo.c | 2 +- levels/cotmc/geo.inc.c | 1 + levels/cotmc/header.h | 13 +- levels/cotmc/header.inc.h | 12 ++ levels/cotmc/leveldata.c | 7 +- levels/cotmc/leveldata.inc.c | 5 + levels/cotmc/script.c | 13 +- levels/ddd/areas/script_vanilla.inc.c | 4 + levels/ddd/areas/script_vanilla_load.inc.c | 10 + levels/ddd/geo.c | 6 +- levels/ddd/geo.inc.c | 2 + levels/ddd/header.h | 30 +-- levels/ddd/header.inc.h | 19 ++ levels/ddd/leveldata.c | 23 +-- levels/ddd/leveldata.inc.c | 13 ++ levels/ddd/script.c | 18 +- levels/ddd/texture.inc.c | 10 - levels/hmc/areas/script_vanilla.inc.c | 7 + levels/hmc/areas/script_vanilla_load.inc.c | 8 + levels/hmc/geo.c | 9 +- levels/hmc/geo.inc.c | 1 + levels/hmc/header.h | 78 +------- levels/hmc/header.inc.h | 57 ++++++ levels/hmc/leveldata.c | 47 +---- levels/hmc/leveldata.inc.c | 34 ++++ levels/hmc/script.c | 23 +-- levels/hmc/texture.inc.c | 20 -- levels/jrb/areas/1/trajectory.inc.c | 24 --- levels/jrb/areas/script_vanilla.inc.c | 4 + levels/jrb/areas/script_vanilla_load.inc.c | 10 + levels/jrb/geo.c | 9 +- levels/jrb/geo.inc.c | 2 + levels/jrb/header.h | 52 +---- levels/jrb/header.inc.h | 19 ++ levels/jrb/leveldata.c | 27 +-- levels/jrb/leveldata.inc.c | 13 ++ levels/jrb/script.c | 26 +-- levels/jrb/texture.inc.c | 10 - levels/lll/areas/script_vanilla.inc.c | 15 ++ levels/lll/areas/script_vanilla_load.inc.c | 10 + levels/lll/geo.c | 30 +-- levels/lll/geo.inc.c | 13 ++ levels/lll/header.h | 115 +---------- levels/lll/header.inc.h | 44 +++++ levels/lll/leveldata.c | 55 +----- levels/lll/leveldata.inc.c | 23 +++ levels/lll/script.c | 55 +----- levels/lll/texture.inc.c | 105 ---------- levels/pss/areas/script_vanilla.inc.c | 2 + levels/pss/areas/script_vanilla_load.inc.c | 6 + levels/pss/geo.c | 2 +- levels/pss/geo.inc.c | 1 + levels/pss/header.h | 15 +- levels/pss/header.inc.h | 13 ++ levels/pss/leveldata.c | 10 +- levels/pss/leveldata.inc.c | 9 + levels/pss/script.c | 10 +- levels/rr/areas/script_vanilla.inc.c | 23 +++ levels/rr/areas/script_vanilla_load.inc.c | 7 + levels/rr/geo.c | 38 +--- levels/rr/geo.inc.c | 21 ++ levels/rr/header.h | 100 +--------- levels/rr/header.inc.h | 48 +++++ levels/rr/leveldata.c | 58 +----- levels/rr/leveldata.inc.c | 24 +++ levels/rr/script.c | 47 +---- levels/rr/texture.inc.c | 10 - levels/sa/areas/script_vanilla.inc.c | 2 + levels/sa/areas/script_vanilla_load.inc.c | 8 + levels/sa/geo.c | 2 +- levels/sa/geo.inc.c | 1 + levels/sa/header.h | 10 +- levels/sa/header.inc.h | 8 + levels/sa/leveldata.c | 4 +- levels/sa/leveldata.inc.c | 3 + levels/sa/script.c | 12 +- levels/scripts.c | 181 ------------------ levels/scripts.h | 22 +++ levels/sl/areas/script_vanilla.inc.c | 5 + levels/sl/areas/script_vanilla_load.inc.c | 10 + levels/sl/geo.c | 3 - levels/sl/geo.inc.c | 0 levels/sl/header.h | 9 +- levels/sl/header.inc.h | 0 levels/sl/leveldata.c | 5 - levels/sl/leveldata.inc.c | 0 levels/sl/script.c | 19 +- levels/sl/texture.inc.c | 5 - levels/ssl/areas/script_vanilla.inc.c | 6 + levels/ssl/areas/script_vanilla_load.inc.c | 7 + levels/ssl/geo.c | 12 +- levels/ssl/geo.inc.c | 5 + levels/ssl/header.h | 66 +------ levels/ssl/header.inc.h | 42 ++++ levels/ssl/leveldata.c | 31 +-- levels/ssl/leveldata.inc.c | 12 ++ levels/ssl/script.c | 20 +- levels/ssl/texture.inc.c | 10 - levels/thi/areas/script_vanilla.inc.c | 9 + levels/thi/areas/script_vanilla_load.inc.c | 7 + levels/thi/geo.c | 6 +- levels/thi/geo.inc.c | 4 + levels/thi/header.h | 27 +-- levels/thi/header.inc.h | 24 +++ levels/thi/leveldata.c | 19 +- levels/thi/leveldata.inc.c | 16 ++ levels/thi/script.c | 19 +- levels/totwc/areas/script_vanilla.inc.c | 3 + levels/totwc/areas/script_vanilla_load.inc.c | 7 + levels/totwc/geo.c | 3 +- levels/totwc/geo.inc.c | 2 + levels/totwc/header.h | 13 +- levels/totwc/header.inc.h | 11 ++ levels/totwc/leveldata.c | 8 +- levels/totwc/leveldata.inc.c | 6 + levels/totwc/script.c | 12 +- levels/ttc/areas/script_vanilla.inc.c | 3 + levels/ttc/areas/script_vanilla_load.inc.c | 6 + levels/ttc/geo.c | 17 +- levels/ttc/geo.inc.c | 1 + levels/ttc/header.h | 57 +----- levels/ttc/header.inc.h | 13 ++ levels/ttc/leveldata.c | 36 +--- levels/ttc/leveldata.inc.c | 5 + levels/ttc/script.c | 25 +-- levels/ttc/texture.inc.c | 5 - levels/ttm/areas/script_vanilla.inc.c | 22 +++ levels/ttm/areas/script_vanilla_load.inc.c | 7 + levels/ttm/geo.c | 31 +-- levels/ttm/geo.inc.c | 23 +++ levels/ttm/header.h | 93 +-------- levels/ttm/header.inc.h | 77 ++++++++ levels/ttm/leveldata.c | 53 +---- levels/ttm/leveldata.inc.c | 40 ++++ levels/ttm/script.c | 37 +--- levels/ttm/texture.inc.c | 5 - levels/vcutm/areas/script_vanilla.inc.c | 4 + levels/vcutm/areas/script_vanilla_load.inc.c | 6 + levels/vcutm/geo.c | 3 +- levels/vcutm/geo.inc.c | 1 + levels/vcutm/header.h | 15 +- levels/vcutm/header.inc.h | 10 + levels/vcutm/leveldata.c | 9 +- levels/vcutm/leveldata.inc.c | 6 + levels/vcutm/script.c | 12 +- levels/vcutm/texture.inc.c | 5 - levels/wdw/areas/script_vanilla.inc.c | 5 + levels/wdw/areas/script_vanilla_load.inc.c | 9 + levels/wdw/geo.c | 10 +- levels/wdw/geo.inc.c | 2 + levels/wdw/header.h | 36 +--- levels/wdw/header.inc.h | 15 ++ levels/wdw/leveldata.c | 25 +-- levels/wdw/leveldata.inc.c | 10 + levels/wdw/script.c | 22 +-- levels/wdw/texture.inc.c | 10 - levels/wf/areas/script_vanilla.inc.c | 10 + levels/wf/areas/script_vanilla_load.inc.c | 16 ++ levels/wf/geo.c | 29 +-- levels/wf/geo.inc.c | 12 ++ levels/wf/header.h | 91 +-------- levels/wf/header.inc.h | 39 ++++ levels/wf/leveldata.c | 58 +----- levels/wf/leveldata.inc.c | 22 +++ levels/wf/script.c | 45 +---- levels/wf/texture.inc.c | 15 -- levels/wmotr/areas/script_vanilla.inc.c | 3 + levels/wmotr/areas/script_vanilla_load.inc.c | 9 + levels/wmotr/geo.c | 2 +- levels/wmotr/geo.inc.c | 1 + levels/wmotr/header.h | 11 +- levels/wmotr/header.inc.h | 9 + levels/wmotr/leveldata.c | 6 +- levels/wmotr/leveldata.inc.c | 3 + levels/wmotr/script.c | 14 +- sm64.ld | 44 +++++ src/game/behavior_actions.c | 12 +- src/game/behaviors/bowling_ball.inc.c | 4 + .../behaviors/bowser_falling_platform.inc.c | 2 + src/game/behaviors/koopa.inc.c | 4 + src/game/behaviors/platform_on_track.inc.c | 6 + src/game/behaviors/racing_penguin.inc.c | 2 + src/game/behaviors/rotating_platform.inc.c | 3 - src/game/behaviors/tumbling_bridge.inc.c | 5 - src/game/behaviors/unagi.inc.c | 2 + src/game/geo_misc.c | 4 +- src/game/ingame_menu.c | 2 +- src/game/obj_behaviors.c | 2 - src/game/obj_behaviors_2.c | 22 +-- 865 files changed, 5186 insertions(+), 3823 deletions(-) rename {levels => actors_vanilla}/bbh/coffin/collision.inc.c (100%) rename {levels => actors_vanilla}/bbh/coffin/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/coffin/model.inc.c (100%) create mode 100644 actors_vanilla/bbh/data.c create mode 100644 actors_vanilla/bbh/geo.c create mode 100644 actors_vanilla/bbh/header.h rename {levels => actors_vanilla}/bbh/merry_go_round/collision.inc.c (100%) rename {levels => actors_vanilla}/bbh/merry_go_round/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/merry_go_round/model.inc.c (100%) rename {levels => actors_vanilla}/bbh/mesh_elevator/collision.inc.c (100%) rename {levels => actors_vanilla}/bbh/mesh_elevator/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/mesh_elevator/model.inc.c (100%) rename {levels => actors_vanilla}/bbh/moving_bookshelf/collision.inc.c (100%) rename {levels => actors_vanilla}/bbh/moving_bookshelf/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/moving_bookshelf/model.inc.c (100%) rename {levels => actors_vanilla}/bbh/staircase_step/collision.inc.c (100%) rename {levels => actors_vanilla}/bbh/staircase_step/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/staircase_step/model.inc.c (100%) create mode 100644 actors_vanilla/bbh/texture.inc.c rename {levels => actors_vanilla}/bbh/tilting_trap_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bbh/tilting_trap_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/tilting_trap_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bbh/tumbling_platform_far/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/tumbling_platform_far/model.inc.c (100%) rename {levels => actors_vanilla}/bbh/tumbling_platform_near/collision.inc.c (100%) rename {levels => actors_vanilla}/bbh/tumbling_platform_near/geo.inc.c (100%) rename {levels => actors_vanilla}/bbh/tumbling_platform_near/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_1/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_1/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_1/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_2/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_2/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_2/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_3/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_3/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_3/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_4/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_4/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_4/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_5/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_5/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/collapsing_stairs_5/model.inc.c (100%) create mode 100644 actors_vanilla/bitdw/data.c rename {levels => actors_vanilla}/bitdw/ferris_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/ferris_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/ferris_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/ferris_wheel_axle/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/ferris_wheel_axle/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/ferris_wheel_axle/model.inc.c (100%) create mode 100644 actors_vanilla/bitdw/geo.c create mode 100644 actors_vanilla/bitdw/header.h rename {levels => actors_vanilla}/bitdw/seesaw_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/seesaw_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/seesaw_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/sliding_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/sliding_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/sliding_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitdw/square_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitdw/square_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitdw/square_platform/model.inc.c (100%) create mode 100644 actors_vanilla/bitdw/texture.inc.c create mode 100644 actors_vanilla/bitfs/data.c rename {levels => actors_vanilla}/bitfs/elevator/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/elevator/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/elevator/model.inc.c (100%) create mode 100644 actors_vanilla/bitfs/geo.c create mode 100644 actors_vanilla/bitfs/header.h rename {levels => actors_vanilla}/bitfs/moving_square_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/moving_square_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/moving_square_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/platform_on_track/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/platform_on_track/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/platform_on_track/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/seesaw_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/seesaw_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/seesaw_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_cage_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_cage_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_cage_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_cage_pole/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_cage_pole/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_platforms/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_platforms/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sinking_platforms/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sliding_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sliding_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/sliding_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/stretching_platform/1.inc.c (100%) rename {levels => actors_vanilla}/bitfs/stretching_platform/2.inc.c (100%) rename {levels => actors_vanilla}/bitfs/stretching_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/stretching_platform/geo.inc.c (100%) create mode 100644 actors_vanilla/bitfs/texture.inc.c rename {levels => actors_vanilla}/bitfs/tilting_square_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/tilting_square_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/tilting_square_platform/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/tumbling_platform_far/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/tumbling_platform_far/model.inc.c (100%) rename {levels => actors_vanilla}/bitfs/tumbling_platform_near/collision.inc.c (100%) rename {levels => actors_vanilla}/bitfs/tumbling_platform_near/geo.inc.c (100%) rename {levels => actors_vanilla}/bitfs/tumbling_platform_near/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/20/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/20/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/20/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/21/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/21/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/21/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/22/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/22/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/22/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/23/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/23/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/23/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/24/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/24/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/24/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/25/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/25/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/25/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/26/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/26/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/26/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/27/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/27/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/27/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/28/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/28/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/28/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/29/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/29/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/29/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/30/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/30/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/30/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/31/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/31/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/31/model.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/32/collision.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/32/geo.inc.c (100%) rename {levels/bits/areas/1 => actors_vanilla/bits}/32/model.inc.c (100%) create mode 100644 actors_vanilla/bits/data.c create mode 100644 actors_vanilla/bits/geo.c create mode 100644 actors_vanilla/bits/header.h create mode 100644 actors_vanilla/bits/texture.inc.c rename {levels => actors_vanilla}/bob/chain_chomp_gate/collision.inc.c (100%) rename {levels => actors_vanilla}/bob/chain_chomp_gate/geo.inc.c (100%) rename {levels => actors_vanilla}/bob/chain_chomp_gate/model.inc.c (100%) create mode 100644 actors_vanilla/bob/data.c create mode 100644 actors_vanilla/bob/geo.c rename {levels => actors_vanilla}/bob/grate_door/collision.inc.c (100%) rename {levels => actors_vanilla}/bob/grate_door/geo.inc.c (100%) rename {levels => actors_vanilla}/bob/grate_door/model.inc.c (100%) create mode 100644 actors_vanilla/bob/header.h rename {levels => actors_vanilla}/bob/seesaw_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/bob/seesaw_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/bob/seesaw_platform/model.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/11/anim.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/11/geo.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/11/model.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/12/model.inc.c (96%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/13/model.inc.c (96%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/7/collision.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/7/geo.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/7/model.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/8/collision.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/8/geo.inc.c (100%) rename {levels/castle_grounds/areas/1 => actors_vanilla/castle_grounds}/8/model.inc.c (100%) create mode 100644 actors_vanilla/castle_grounds/data.c create mode 100644 actors_vanilla/castle_grounds/geo.c create mode 100644 actors_vanilla/castle_grounds/header.h create mode 100644 actors_vanilla/castle_grounds/texture.inc.c rename {levels => actors_vanilla}/castle_inside/clock_hour_hand/geo.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/clock_hour_hand/model.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/clock_minute_hand/geo.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/clock_minute_hand/model.inc.c (100%) create mode 100644 actors_vanilla/castle_inside/data.c create mode 100644 actors_vanilla/castle_inside/ddd_warp/collision.inc.c create mode 100644 actors_vanilla/castle_inside/geo.c create mode 100644 actors_vanilla/castle_inside/header.h rename {levels/castle_inside/areas/2 => actors_vanilla/castle_inside}/pendulum/geo.inc.c (100%) rename {levels/castle_inside/areas/2 => actors_vanilla/castle_inside}/pendulum/model.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/star_door/collision.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/star_door/geo.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/star_door/model.inc.c (100%) create mode 100644 actors_vanilla/castle_inside/texture.inc.c rename {levels => actors_vanilla}/castle_inside/trap_door/collision.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/trap_door/geo.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/trap_door/model.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/water_level_pillar/collision.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/water_level_pillar/geo.inc.c (100%) rename {levels => actors_vanilla}/castle_inside/water_level_pillar/model.inc.c (100%) rename {levels/castle_inside/areas/1/5 => actors_vanilla/castle_inside/wing_cap_light}/model.inc.c (100%) create mode 100644 actors_vanilla/ccm/data.c create mode 100644 actors_vanilla/ccm/geo.c create mode 100644 actors_vanilla/ccm/header.h rename {levels => actors_vanilla}/ccm/ropeway_lift/1.inc.c (100%) rename {levels => actors_vanilla}/ccm/ropeway_lift/2.inc.c (100%) rename {levels => actors_vanilla}/ccm/ropeway_lift/collision.inc.c (100%) rename {levels => actors_vanilla}/ccm/ropeway_lift/geo.inc.c (100%) rename {levels => actors_vanilla}/ccm/snowman_base/geo.inc.c (100%) rename {levels => actors_vanilla}/ccm/snowman_base/model.inc.c (99%) rename {levels => actors_vanilla}/ccm/snowman_head/1.inc.c (100%) rename {levels => actors_vanilla}/ccm/snowman_head/2.inc.c (100%) rename {levels => actors_vanilla}/ccm/snowman_head/geo.inc.c (100%) create mode 100644 actors_vanilla/ccm/texture.inc.c create mode 100644 actors_vanilla/ddd/data.c create mode 100644 actors_vanilla/ddd/geo.c create mode 100644 actors_vanilla/ddd/header.h rename {levels => actors_vanilla}/ddd/pole/geo.inc.c (100%) rename {levels => actors_vanilla}/ddd/pole/model.inc.c (100%) rename {levels => actors_vanilla}/ddd/sub_door/1.inc.c (100%) rename {levels => actors_vanilla}/ddd/sub_door/2.inc.c (100%) rename {levels => actors_vanilla}/ddd/sub_door/3.inc.c (100%) rename {levels => actors_vanilla}/ddd/sub_door/collision.inc.c (100%) rename {levels => actors_vanilla}/ddd/sub_door/geo.inc.c (100%) rename {levels => actors_vanilla}/ddd/submarine/1.inc.c (100%) rename {levels => actors_vanilla}/ddd/submarine/2.inc.c (100%) rename {levels => actors_vanilla}/ddd/submarine/collision.inc.c (100%) rename {levels => actors_vanilla}/ddd/submarine/geo.inc.c (100%) create mode 100644 actors_vanilla/ddd/texture.inc.c rename {levels => actors_vanilla}/hmc/arrow_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/hmc/arrow_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/hmc/arrow_platform/model.inc.c (100%) rename {levels => actors_vanilla}/hmc/arrow_platform_button/collision.inc.c (100%) rename {levels => actors_vanilla}/hmc/arrow_platform_button/geo.inc.c (100%) rename {levels => actors_vanilla}/hmc/arrow_platform_button/model.inc.c (100%) create mode 100644 actors_vanilla/hmc/data.c rename {levels => actors_vanilla}/hmc/elevator_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/hmc/elevator_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/hmc/elevator_platform/model.inc.c (100%) create mode 100644 actors_vanilla/hmc/geo.c rename {levels => actors_vanilla}/hmc/grill_door/collision.inc.c (100%) rename {levels => actors_vanilla}/hmc/grill_door/geo.inc.c (100%) rename {levels => actors_vanilla}/hmc/grill_door/model.inc.c (100%) create mode 100644 actors_vanilla/hmc/header.h rename {levels => actors_vanilla}/hmc/rolling_rock/geo.inc.c (100%) rename {levels => actors_vanilla}/hmc/rolling_rock/model.inc.c (100%) rename {levels => actors_vanilla}/hmc/rolling_rock_fragment_1/geo.inc.c (100%) rename {levels => actors_vanilla}/hmc/rolling_rock_fragment_1/model.inc.c (100%) rename {levels => actors_vanilla}/hmc/rolling_rock_fragment_2/geo.inc.c (100%) rename {levels => actors_vanilla}/hmc/rolling_rock_fragment_2/model.inc.c (100%) create mode 100644 actors_vanilla/hmc/texture.inc.c create mode 100644 actors_vanilla/jrb/data.c rename {levels => actors_vanilla}/jrb/falling_pillar/geo.inc.c (100%) rename {levels => actors_vanilla}/jrb/falling_pillar/model.inc.c (100%) rename {levels => actors_vanilla}/jrb/falling_pillar_base/collision.inc.c (100%) rename {levels => actors_vanilla}/jrb/falling_pillar_base/geo.inc.c (100%) rename {levels => actors_vanilla}/jrb/falling_pillar_base/model.inc.c (100%) rename {levels => actors_vanilla}/jrb/floating_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/jrb/floating_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/jrb/floating_platform/model.inc.c (100%) create mode 100644 actors_vanilla/jrb/geo.c create mode 100644 actors_vanilla/jrb/header.h rename {levels => actors_vanilla}/jrb/rock/collision.inc.c (100%) rename {levels => actors_vanilla}/jrb/rock/geo.inc.c (100%) rename {levels => actors_vanilla}/jrb/rock/model.inc.c (100%) rename {levels => actors_vanilla}/jrb/sliding_box/collision.inc.c (100%) rename {levels => actors_vanilla}/jrb/sliding_box/geo.inc.c (100%) rename {levels => actors_vanilla}/jrb/sliding_box/model.inc.c (100%) create mode 100644 actors_vanilla/jrb/texture.inc.c rename {levels => actors_vanilla}/jrb/unused_lid/collision.inc.c (100%) rename {levels => actors_vanilla}/jrb/wooden_ship/collision.inc.c (100%) rename {levels => actors_vanilla}/jrb/wooden_ship/geo.inc.c (100%) rename {levels => actors_vanilla}/jrb/wooden_ship/model.inc.c (100%) rename {levels/lll/areas/1 => actors_vanilla/lll}/10/collision.inc.c (100%) rename {levels/lll/areas/1 => actors_vanilla/lll}/10/geo.inc.c (100%) rename {levels/lll/areas/1 => actors_vanilla/lll}/10/model.inc.c (100%) rename {levels => actors_vanilla}/lll/collapsing_wooden_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/collapsing_wooden_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/collapsing_wooden_platform/model.inc.c (100%) create mode 100644 actors_vanilla/lll/data.c rename {levels => actors_vanilla}/lll/drawbridge_part/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/drawbridge_part/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/drawbridge_part/model.inc.c (100%) create mode 100644 actors_vanilla/lll/geo.c create mode 100644 actors_vanilla/lll/header.h rename {levels => actors_vanilla}/lll/long_wooden_bridge/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/long_wooden_bridge/model.inc.c (100%) rename {levels => actors_vanilla}/lll/moving_octagonal_mesh_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/moving_octagonal_mesh_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/moving_octagonal_mesh_platform/model.inc.c (100%) rename {levels => actors_vanilla}/lll/puzzle_piece/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/puzzle_piece/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/puzzle_piece/model.inc.c (100%) rename {levels => actors_vanilla}/lll/rolling_log/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/rolling_log/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/rolling_log/model.inc.c (100%) rename {levels => actors_vanilla}/lll/rotating_block_fire_bars/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/rotating_block_fire_bars/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/rotating_block_fire_bars/model.inc.c (100%) rename {levels => actors_vanilla}/lll/rotating_hexagonal_ring/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/rotating_hexagonal_ring/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/rotating_hexagonal_ring/model.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_rectangular_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_rectangular_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_rectangular_platform/model.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_rock_block/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_rock_block/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_rock_block/model.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_square_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_square_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/sinking_square_platform/model.inc.c (100%) create mode 100644 actors_vanilla/lll/texture.inc.c rename {levels => actors_vanilla}/lll/tilting_square_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/tilting_square_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/tilting_square_platform/model.inc.c (100%) rename {levels => actors_vanilla}/lll/volcano_falling_trap/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/volcano_falling_trap/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/volcano_falling_trap/model.inc.c (100%) rename {levels => actors_vanilla}/lll/wooden_float_large/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/wooden_float_large/model.inc.c (100%) rename {levels => actors_vanilla}/lll/wooden_float_small/collision.inc.c (100%) rename {levels => actors_vanilla}/lll/wooden_float_small/geo.inc.c (100%) rename {levels => actors_vanilla}/lll/wooden_float_small/model.inc.c (100%) rename {levels => actors_vanilla}/rr/cruiser_wing/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/cruiser_wing/model.inc.c (100%) create mode 100644 actors_vanilla/rr/data.c rename {levels => actors_vanilla}/rr/donut_block/1.inc.c (100%) rename {levels => actors_vanilla}/rr/donut_block/2.inc.c (100%) rename {levels => actors_vanilla}/rr/donut_block/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/donut_block/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/elevator_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/elevator_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/elevator_platform/model.inc.c (100%) rename {levels => actors_vanilla}/rr/flying_carpet/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/flying_carpet/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/flying_carpet/model.inc.c (100%) create mode 100644 actors_vanilla/rr/geo.c create mode 100644 actors_vanilla/rr/header.h rename {levels => actors_vanilla}/rr/l_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/l_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/l_platform/model.inc.c (100%) rename {levels => actors_vanilla}/rr/octagonal_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/octagonal_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/octagonal_platform/model.inc.c (100%) rename {levels => actors_vanilla}/rr/pyramid_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/pyramid_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/pyramid_platform/model.inc.c (100%) rename {levels => actors_vanilla}/rr/rotating_bridge_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/rotating_bridge_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/rotating_bridge_platform/model.inc.c (100%) rename {levels => actors_vanilla}/rr/seesaw_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/seesaw_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/seesaw_platform/model.inc.c (100%) rename {levels => actors_vanilla}/rr/sliding_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/sliding_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/sliding_platform/model.inc.c (100%) rename {levels => actors_vanilla}/rr/swinging_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/swinging_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/swinging_platform/model.inc.c (100%) create mode 100644 actors_vanilla/rr/texture.inc.c rename {levels => actors_vanilla}/rr/tricky_triangles_1/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_1/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_1/model.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_2/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_2/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_2/model.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_3/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_3/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_3/model.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_4/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_4/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_4/model.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_5/collision.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_5/geo.inc.c (100%) rename {levels => actors_vanilla}/rr/tricky_triangles_5/model.inc.c (100%) create mode 100644 actors_vanilla/sl/data.c create mode 100644 actors_vanilla/sl/geo.c create mode 100644 actors_vanilla/sl/header.h rename {levels => actors_vanilla}/sl/snow_mound/collision.inc.c (100%) rename {levels => actors_vanilla}/sl/snow_mound/geo.inc.c (100%) rename {levels => actors_vanilla}/sl/snow_mound/model.inc.c (100%) create mode 100644 actors_vanilla/sl/texture.inc.c rename {levels => actors_vanilla}/sl/unused_cracked_ice/collision.inc.c (100%) rename {levels => actors_vanilla}/sl/unused_cracked_ice/geo.inc.c (100%) rename {levels => actors_vanilla}/sl/unused_cracked_ice/model.inc.c (100%) rename {levels => actors_vanilla}/sl/unused_ice_shard/geo.inc.c (100%) rename {levels => actors_vanilla}/sl/unused_ice_shard/model.inc.c (100%) create mode 100644 actors_vanilla/ssl/data.c rename {levels => actors_vanilla}/ssl/eyerok_col/collision.inc.c (100%) create mode 100644 actors_vanilla/ssl/geo.c rename {levels => actors_vanilla}/ssl/grindel/collision.inc.c (100%) rename {levels => actors_vanilla}/ssl/grindel/geo.inc.c (100%) rename {levels => actors_vanilla}/ssl/grindel/model.inc.c (100%) create mode 100644 actors_vanilla/ssl/header.h rename {levels => actors_vanilla}/ssl/moving_pyramid_wall/collision.inc.c (100%) rename {levels => actors_vanilla}/ssl/moving_pyramid_wall/geo.inc.c (100%) rename {levels => actors_vanilla}/ssl/moving_pyramid_wall/model.inc.c (100%) rename {levels => actors_vanilla}/ssl/pyramid_elevator/collision.inc.c (100%) rename {levels => actors_vanilla}/ssl/pyramid_elevator/geo.inc.c (100%) rename {levels => actors_vanilla}/ssl/pyramid_elevator/model.inc.c (100%) rename {levels => actors_vanilla}/ssl/pyramid_top/collision.inc.c (100%) rename {levels => actors_vanilla}/ssl/pyramid_top/geo.inc.c (100%) rename {levels => actors_vanilla}/ssl/pyramid_top/model.inc.c (100%) rename {levels => actors_vanilla}/ssl/spindel/collision.inc.c (100%) rename {levels => actors_vanilla}/ssl/spindel/geo.inc.c (100%) rename {levels => actors_vanilla}/ssl/spindel/model.inc.c (100%) create mode 100644 actors_vanilla/ssl/texture.inc.c rename {levels => actors_vanilla}/ssl/tox_box/collision.inc.c (100%) rename {levels => actors_vanilla}/ssl/tox_box/geo.inc.c (100%) rename {levels => actors_vanilla}/ssl/tox_box/model.inc.c (98%) create mode 100644 actors_vanilla/thi/data.c create mode 100644 actors_vanilla/thi/geo.c create mode 100644 actors_vanilla/thi/header.h create mode 100644 actors_vanilla/thi/texture.inc.c rename {levels/thi/areas/1/6 => actors_vanilla/thi/thi_tops}/collision.inc.c (100%) rename {levels/thi/areas/1/6 => actors_vanilla/thi/thi_tops}/geo.inc.c (100%) rename {levels/thi/areas/1/6 => actors_vanilla/thi/thi_tops}/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/clock_hand/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/clock_hand/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/clock_hand/model.inc.c (100%) create mode 100644 actors_vanilla/ttc/data.c rename {levels => actors_vanilla}/ttc/elevator_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/elevator_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/elevator_platform/model.inc.c (100%) create mode 100644 actors_vanilla/ttc/geo.c create mode 100644 actors_vanilla/ttc/header.h rename {levels => actors_vanilla}/ttc/large_gear/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/large_gear/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/large_treadmill/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/large_treadmill/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/large_treadmill/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/pendulum/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/pendulum/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/pendulum/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/pit_block/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/pit_block/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/pit_block/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/pit_block_2/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/pit_block_2/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/pit_block_2/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/push_block/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/push_block/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/push_block/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_cube/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_cube/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_cube/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_hexagon/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_hexagon/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_hexagon/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_prism/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_prism/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_prism/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_triangle/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_triangle/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/rotating_triangle/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/small_gear/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/small_gear/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/small_treadmill/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/small_treadmill/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/small_treadmill/model.inc.c (100%) rename {levels => actors_vanilla}/ttc/spinner/collision.inc.c (100%) rename {levels => actors_vanilla}/ttc/spinner/geo.inc.c (100%) rename {levels => actors_vanilla}/ttc/spinner/model.inc.c (100%) create mode 100644 actors_vanilla/ttc/texture.inc.c rename {levels => actors_vanilla}/ttm/blue_smiley/geo.inc.c (100%) rename {levels => actors_vanilla}/ttm/blue_smiley/model.inc.c (100%) create mode 100644 actors_vanilla/ttm/data.c create mode 100644 actors_vanilla/ttm/geo.c create mode 100644 actors_vanilla/ttm/header.h rename {levels => actors_vanilla}/ttm/moon_smiley/geo.inc.c (100%) rename {levels => actors_vanilla}/ttm/moon_smiley/model.inc.c (100%) rename {levels => actors_vanilla}/ttm/rolling_log/collision.inc.c (100%) rename {levels => actors_vanilla}/ttm/rolling_log/geo.inc.c (100%) rename {levels => actors_vanilla}/ttm/rolling_log/model.inc.c (100%) rename {levels => actors_vanilla}/ttm/slide_exit_podium/collision.inc.c (100%) rename {levels => actors_vanilla}/ttm/slide_exit_podium/geo.inc.c (100%) rename {levels => actors_vanilla}/ttm/slide_exit_podium/model.inc.c (99%) rename {levels => actors_vanilla}/ttm/star_cage/1.inc.c (100%) rename {levels => actors_vanilla}/ttm/star_cage/2.inc.c (100%) rename {levels => actors_vanilla}/ttm/star_cage/collision.inc.c (100%) rename {levels => actors_vanilla}/ttm/star_cage/geo.inc.c (100%) rename {levels => actors_vanilla}/ttm/star_smiley/geo.inc.c (100%) rename {levels => actors_vanilla}/ttm/star_smiley/model.inc.c (100%) create mode 100644 actors_vanilla/ttm/texture.inc.c rename {levels => actors_vanilla}/ttm/yellow_smiley/geo.inc.c (100%) rename {levels => actors_vanilla}/ttm/yellow_smiley/model.inc.c (100%) create mode 100644 actors_vanilla/vcutm/data.c create mode 100644 actors_vanilla/vcutm/geo.c create mode 100644 actors_vanilla/vcutm/header.h rename {levels => actors_vanilla}/vcutm/seesaw/collision.inc.c (100%) rename {levels => actors_vanilla}/vcutm/seesaw/geo.inc.c (100%) rename {levels => actors_vanilla}/vcutm/seesaw/model.inc.c (100%) create mode 100644 actors_vanilla/vcutm/texture.inc.c rename {levels => actors_vanilla}/wdw/arrow_lift/collision.inc.c (100%) rename {levels => actors_vanilla}/wdw/arrow_lift/geo.inc.c (100%) rename {levels => actors_vanilla}/wdw/arrow_lift/model.inc.c (100%) create mode 100644 actors_vanilla/wdw/data.c rename {levels => actors_vanilla}/wdw/express_elevator/collision.inc.c (100%) rename {levels => actors_vanilla}/wdw/express_elevator/geo.inc.c (100%) rename {levels => actors_vanilla}/wdw/express_elevator/model.inc.c (100%) create mode 100644 actors_vanilla/wdw/geo.c create mode 100644 actors_vanilla/wdw/header.h rename {levels => actors_vanilla}/wdw/hidden_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wdw/hidden_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wdw/hidden_platform/model.inc.c (100%) rename {levels => actors_vanilla}/wdw/rectangular_floating_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wdw/rectangular_floating_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wdw/rectangular_floating_platform/model.inc.c (100%) rename {levels => actors_vanilla}/wdw/rotating_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wdw/rotating_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wdw/rotating_platform/model.inc.c (100%) rename {levels => actors_vanilla}/wdw/square_floating_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wdw/square_floating_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wdw/square_floating_platform/model.inc.c (100%) create mode 100644 actors_vanilla/wdw/texture.inc.c rename {levels => actors_vanilla}/wdw/water_level_diamond/collision.inc.c (100%) rename {levels => actors_vanilla}/wdw/water_level_diamond/geo.inc.c (100%) rename {levels => actors_vanilla}/wdw/water_level_diamond/model.inc.c (100%) rename {levels/wf/areas/1 => actors_vanilla/wf}/10/1.inc.c (100%) rename {levels/wf/areas/1 => actors_vanilla/wf}/10/2.inc.c (100%) rename {levels/wf/areas/1 => actors_vanilla/wf}/10/collision.inc.c (100%) rename {levels/wf/areas/1 => actors_vanilla/wf}/10/geo.inc.c (100%) rename {levels/wf/areas/1 => actors_vanilla/wf}/11/collision.inc.c (100%) rename {levels/wf/areas/1 => actors_vanilla/wf}/11/geo.inc.c (100%) rename {levels/wf/areas/1 => actors_vanilla/wf}/11/model.inc.c (100%) rename {levels => actors_vanilla}/wf/beta_extending_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/beta_extending_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/beta_extending_platform/model.inc.c (100%) rename {levels => actors_vanilla}/wf/breakable_wall_left/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/breakable_wall_left/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/breakable_wall_left/model.inc.c (100%) rename {levels => actors_vanilla}/wf/breakable_wall_right/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/breakable_wall_right/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/breakable_wall_right/model.inc.c (100%) create mode 100644 actors_vanilla/wf/data.c rename {levels => actors_vanilla}/wf/extending_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/extending_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/extending_platform/model.inc.c (100%) create mode 100644 actors_vanilla/wf/geo.c rename {levels/wf/areas/1/14 => actors_vanilla/wf/giant_pole}/geo.inc.c (100%) rename {levels/wf/areas/1/14 => actors_vanilla/wf/giant_pole}/model.inc.c (100%) create mode 100644 actors_vanilla/wf/header.h rename {levels => actors_vanilla}/wf/kickable_board/1.inc.c (100%) rename {levels => actors_vanilla}/wf/kickable_board/2.inc.c (100%) rename {levels => actors_vanilla}/wf/kickable_board/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/kickable_board/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/large_bomp/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/large_bomp/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/large_bomp/model.inc.c (100%) rename {levels => actors_vanilla}/wf/rotating_platform/collision.inc.c (100%) rename {levels/wf/areas/1/17 => actors_vanilla/wf/rotating_platform}/geo.inc.c (100%) rename {levels/wf/areas/1/17 => actors_vanilla/wf/rotating_platform}/model.inc.c (100%) rename {levels => actors_vanilla}/wf/rotating_wooden_platform/1.inc.c (100%) rename {levels => actors_vanilla}/wf/rotating_wooden_platform/2.inc.c (100%) rename {levels => actors_vanilla}/wf/rotating_wooden_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/rotating_wooden_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/sliding_platform/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/sliding_platform/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/sliding_platform/model.inc.c (100%) rename {levels => actors_vanilla}/wf/small_bomp/1.inc.c (100%) rename {levels => actors_vanilla}/wf/small_bomp/2.inc.c (100%) rename {levels => actors_vanilla}/wf/small_bomp/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/small_bomp/geo.inc.c (100%) create mode 100644 actors_vanilla/wf/texture.inc.c rename {levels => actors_vanilla}/wf/tower_door/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/tower_door/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/tower_door/model.inc.c (100%) rename {levels => actors_vanilla}/wf/tumbling_bridge_far/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/tumbling_bridge_far/model.inc.c (100%) rename {levels => actors_vanilla}/wf/tumbling_bridge_near/collision.inc.c (100%) rename {levels => actors_vanilla}/wf/tumbling_bridge_near/geo.inc.c (100%) rename {levels => actors_vanilla}/wf/tumbling_bridge_near/model.inc.c (100%) create mode 100644 levels/bbh/areas/script_vanilla.inc.c create mode 100644 levels/bbh/areas/script_vanilla_load.inc.c create mode 100644 levels/bbh/geo.inc.c create mode 100644 levels/bbh/header.inc.h create mode 100644 levels/bbh/leveldata.inc.c create mode 100644 levels/bitdw/areas/script_vanilla.inc.c create mode 100644 levels/bitdw/areas/script_vanilla_load.inc.c create mode 100644 levels/bitdw/geo.inc.c create mode 100644 levels/bitdw/header.inc.h create mode 100644 levels/bitdw/leveldata.inc.c create mode 100644 levels/bitfs/areas/script_vanilla.inc.c create mode 100644 levels/bitfs/areas/script_vanilla_load.inc.c create mode 100644 levels/bitfs/geo.inc.c create mode 100644 levels/bitfs/header.inc.h create mode 100644 levels/bitfs/leveldata.inc.c create mode 100644 levels/bits/areas/script_vanilla.inc.c create mode 100644 levels/bits/areas/script_vanilla_load.inc.c create mode 100644 levels/bits/geo.inc.c create mode 100644 levels/bits/header.inc.h create mode 100644 levels/bits/leveldata.inc.c create mode 100644 levels/bob/areas/script_vanilla.inc.c create mode 100644 levels/bob/areas/script_vanilla_load.inc.c create mode 100644 levels/bob/geo.inc.c create mode 100644 levels/bob/header.inc.h create mode 100644 levels/bob/leveldata.inc.c create mode 100644 levels/castle_courtyard/areas/script_vanilla.inc.c create mode 100644 levels/castle_courtyard/areas/script_vanilla_load.inc.c create mode 100644 levels/castle_courtyard/geo.inc.c create mode 100644 levels/castle_courtyard/header.inc.h create mode 100644 levels/castle_courtyard/leveldata.inc.c create mode 100644 levels/castle_grounds/areas/script_vanilla.inc.c create mode 100644 levels/castle_grounds/areas/script_vanilla_load.inc.c create mode 100644 levels/castle_grounds/geo.inc.c create mode 100644 levels/castle_grounds/header.inc.h create mode 100644 levels/castle_grounds/leveldata.inc.c create mode 100644 levels/castle_inside/areas/script_vanilla.inc.c create mode 100644 levels/castle_inside/areas/script_vanilla_load.inc.c create mode 100644 levels/castle_inside/geo.inc.c create mode 100644 levels/castle_inside/header.inc.h create mode 100644 levels/castle_inside/leveldata.inc.c create mode 100644 levels/ccm/areas/script_vanilla.inc.c create mode 100644 levels/ccm/areas/script_vanilla_load.inc.c create mode 100644 levels/ccm/geo.inc.c create mode 100644 levels/ccm/header.inc.h create mode 100644 levels/ccm/leveldata.inc.c create mode 100644 levels/cotmc/areas/script_vanilla.inc.c create mode 100644 levels/cotmc/areas/script_vanilla_load.inc.c create mode 100644 levels/cotmc/geo.inc.c create mode 100644 levels/cotmc/header.inc.h create mode 100644 levels/cotmc/leveldata.inc.c create mode 100644 levels/ddd/areas/script_vanilla.inc.c create mode 100644 levels/ddd/areas/script_vanilla_load.inc.c create mode 100644 levels/ddd/geo.inc.c create mode 100644 levels/ddd/header.inc.h create mode 100644 levels/ddd/leveldata.inc.c create mode 100644 levels/hmc/areas/script_vanilla.inc.c create mode 100644 levels/hmc/areas/script_vanilla_load.inc.c create mode 100644 levels/hmc/geo.inc.c create mode 100644 levels/hmc/header.inc.h create mode 100644 levels/hmc/leveldata.inc.c create mode 100644 levels/jrb/areas/script_vanilla.inc.c create mode 100644 levels/jrb/areas/script_vanilla_load.inc.c create mode 100644 levels/jrb/geo.inc.c create mode 100644 levels/jrb/header.inc.h create mode 100644 levels/jrb/leveldata.inc.c create mode 100644 levels/lll/areas/script_vanilla.inc.c create mode 100644 levels/lll/areas/script_vanilla_load.inc.c create mode 100644 levels/lll/geo.inc.c create mode 100644 levels/lll/header.inc.h create mode 100644 levels/lll/leveldata.inc.c create mode 100644 levels/pss/areas/script_vanilla.inc.c create mode 100644 levels/pss/areas/script_vanilla_load.inc.c create mode 100644 levels/pss/geo.inc.c create mode 100644 levels/pss/header.inc.h create mode 100644 levels/pss/leveldata.inc.c create mode 100644 levels/rr/areas/script_vanilla.inc.c create mode 100644 levels/rr/areas/script_vanilla_load.inc.c create mode 100644 levels/rr/geo.inc.c create mode 100644 levels/rr/header.inc.h create mode 100644 levels/rr/leveldata.inc.c create mode 100644 levels/sa/areas/script_vanilla.inc.c create mode 100644 levels/sa/areas/script_vanilla_load.inc.c create mode 100644 levels/sa/geo.inc.c create mode 100644 levels/sa/header.inc.h create mode 100644 levels/sa/leveldata.inc.c create mode 100644 levels/sl/areas/script_vanilla.inc.c create mode 100644 levels/sl/areas/script_vanilla_load.inc.c create mode 100644 levels/sl/geo.inc.c create mode 100644 levels/sl/header.inc.h create mode 100644 levels/sl/leveldata.inc.c create mode 100644 levels/ssl/areas/script_vanilla.inc.c create mode 100644 levels/ssl/areas/script_vanilla_load.inc.c create mode 100644 levels/ssl/geo.inc.c create mode 100644 levels/ssl/header.inc.h create mode 100644 levels/ssl/leveldata.inc.c create mode 100644 levels/thi/areas/script_vanilla.inc.c create mode 100644 levels/thi/areas/script_vanilla_load.inc.c create mode 100644 levels/thi/geo.inc.c create mode 100644 levels/thi/header.inc.h create mode 100644 levels/thi/leveldata.inc.c create mode 100644 levels/totwc/areas/script_vanilla.inc.c create mode 100644 levels/totwc/areas/script_vanilla_load.inc.c create mode 100644 levels/totwc/geo.inc.c create mode 100644 levels/totwc/header.inc.h create mode 100644 levels/totwc/leveldata.inc.c create mode 100644 levels/ttc/areas/script_vanilla.inc.c create mode 100644 levels/ttc/areas/script_vanilla_load.inc.c create mode 100644 levels/ttc/geo.inc.c create mode 100644 levels/ttc/header.inc.h create mode 100644 levels/ttc/leveldata.inc.c create mode 100644 levels/ttm/areas/script_vanilla.inc.c create mode 100644 levels/ttm/areas/script_vanilla_load.inc.c create mode 100644 levels/ttm/geo.inc.c create mode 100644 levels/ttm/header.inc.h create mode 100644 levels/ttm/leveldata.inc.c create mode 100644 levels/vcutm/areas/script_vanilla.inc.c create mode 100644 levels/vcutm/areas/script_vanilla_load.inc.c create mode 100644 levels/vcutm/geo.inc.c create mode 100644 levels/vcutm/header.inc.h create mode 100644 levels/vcutm/leveldata.inc.c create mode 100644 levels/wdw/areas/script_vanilla.inc.c create mode 100644 levels/wdw/areas/script_vanilla_load.inc.c create mode 100644 levels/wdw/geo.inc.c create mode 100644 levels/wdw/header.inc.h create mode 100644 levels/wdw/leveldata.inc.c create mode 100644 levels/wf/areas/script_vanilla.inc.c create mode 100644 levels/wf/areas/script_vanilla_load.inc.c create mode 100644 levels/wf/geo.inc.c create mode 100644 levels/wf/header.inc.h create mode 100644 levels/wf/leveldata.inc.c create mode 100644 levels/wmotr/areas/script_vanilla.inc.c create mode 100644 levels/wmotr/areas/script_vanilla_load.inc.c create mode 100644 levels/wmotr/geo.inc.c create mode 100644 levels/wmotr/header.inc.h create mode 100644 levels/wmotr/leveldata.inc.c diff --git a/.gitignore b/.gitignore index 2851c32410..68e799ebf1 100644 --- a/.gitignore +++ b/.gitignore @@ -528,21 +528,26 @@ assets/demos/pss.bin assets/demos/unused.bin assets/demos/wf.bin levels/bbh/0.rgba16.png +actors_vanilla/bbh/0.rgba16.png levels/bbh/1.rgba16.png levels/bbh/2.rgba16.png levels/bbh/3.rgba16.png -levels/bbh/4.rgba16.png -levels/bbh/5.rgba16.png -levels/bbh/6.rgba16.png +actors_vanilla/bbh/4.rgba16.png +actors_vanilla/bbh/5.rgba16.png +actors_vanilla/bbh/6.rgba16.png +actors_vanilla/bitdw/0.rgba16.png levels/bitdw/0.rgba16.png levels/bitdw/1.rgba16.png levels/bitdw/2.rgba16.png levels/bitdw/3.rgba16.png +actors_vanilla/bitfs/0.rgba16.png levels/bitfs/0.rgba16.png +actors_vanilla/bitfs/1.rgba16.png levels/bitfs/1.rgba16.png levels/bitfs/2.rgba16.png levels/bits/0.rgba16.png levels/bits/1.rgba16.png +actors_vanilla/bits/2.rgba16.png levels/bits/2.rgba16.png levels/bob/0.rgba16.png levels/bob/1.rgba16.png @@ -559,9 +564,9 @@ levels/bowser_3/2.rgba16.png levels/castle_grounds/0.rgba16.png levels/castle_grounds/1.rgba16.png levels/castle_grounds/2.rgba16.png -levels/castle_grounds/3.rgba16.png -levels/castle_grounds/4.rgba16.png -levels/castle_grounds/5.ia8.png +actors_vanilla/castle_grounds/3.rgba16.png +actors_vanilla/castle_grounds/4.rgba16.png +actors_vanilla/castle_grounds/5.ia8.png levels/castle_inside/1.rgba16.png levels/castle_inside/10.rgba16.png levels/castle_inside/11.rgba16.png @@ -599,22 +604,25 @@ levels/castle_inside/38.rgba16.png levels/castle_inside/39.rgba16.png levels/castle_inside/4.rgba16.png levels/castle_inside/40.rgba16.png -levels/castle_inside/5.rgba16.png -levels/castle_inside/6.rgba16.png -levels/castle_inside/7.rgba16.png +actors_vanilla/castle_inside/5.rgba16.png +actors_vanilla/castle_inside/6.rgba16.png +actors_vanilla/castle_inside/7.rgba16.png levels/castle_inside/8.rgba16.png levels/castle_inside/9.rgba16.png +actors_vanilla/castle_inside/castle_light.ia16.png levels/castle_inside/castle_light.ia16.png levels/ccm/0.rgba16.png levels/ccm/1.rgba16.png +actors_vanilla/ccm/1.rgba16.png levels/ccm/10.rgba16.png levels/ccm/11.rgba16.png -levels/ccm/12.rgba16.png +actors_vanilla/ccm/12.rgba16.png levels/ccm/2.rgba16.png -levels/ccm/3.rgba16.png +actors_vanilla/ccm/2.rgba16.png +actors_vanilla/ccm/3.rgba16.png levels/ccm/4.rgba16.png -levels/ccm/5.rgba16.png -levels/ccm/6.rgba16.png +actors_vanilla/ccm/5.rgba16.png +actors_vanilla/ccm/6.rgba16.png levels/ccm/7.rgba16.png levels/ccm/8.ia16.png levels/ccm/9.ia16.png @@ -623,11 +631,12 @@ levels/cotmc/1.rgba16.png levels/cotmc/2.rgba16.png levels/cotmc/3.rgba16.png levels/cotmc/4.rgba16.png -levels/ddd/0.rgba16.png +actors_vanilla/ddd/0.rgba16.png levels/ddd/1.rgba16.png levels/ddd/2.rgba16.png +actors_vanilla/ddd/2.rgba16.png levels/ddd/3.rgba16.png -levels/ddd/4.rgba16.png +actors_vanilla/ddd/4.rgba16.png levels/ending/cake.png levels/ending/cake_eu.png levels/ending/eu_023000.rgba16.png @@ -639,10 +648,10 @@ levels/ending/eu_028000.rgba16.png levels/hmc/0.rgba16.png levels/hmc/1.rgba16.png levels/hmc/2.rgba16.png -levels/hmc/3.rgba16.png -levels/hmc/4.rgba16.png -levels/hmc/5.rgba16.png -levels/hmc/6.rgba16.png +actors_vanilla/hmc/3.rgba16.png +actors_vanilla/hmc/4.rgba16.png +actors_vanilla/hmc/5.rgba16.png +actors_vanilla/hmc/6.rgba16.png levels/hmc/7.rgba16.png levels/intro/0.rgba16.png levels/intro/1.rgba16.png @@ -653,40 +662,41 @@ levels/intro/3_sh_tm.rgba16.png levels/intro/3_tm.rgba16.png levels/jrb/0.rgba16.png levels/jrb/1.rgba16.png -levels/jrb/2.rgba16.png -levels/jrb/3.rgba16.png -levels/lll/0.rgba16.png -levels/lll/1.rgba16.png -levels/lll/10.rgba16.png -levels/lll/11.rgba16.png -levels/lll/12.rgba16.png -levels/lll/13.rgba16.png -levels/lll/14.rgba16.png -levels/lll/15.rgba16.png -levels/lll/16.rgba16.png -levels/lll/17.rgba16.png -levels/lll/18.rgba16.png -levels/lll/19.rgba16.png -levels/lll/2.rgba16.png -levels/lll/20.rgba16.png -levels/lll/21.rgba16.png -levels/lll/22.rgba16.png -levels/lll/23.rgba16.png -levels/lll/24.rgba16.png -levels/lll/25.rgba16.png +actors_vanilla/jrb/2.rgba16.png +actors_vanilla/jrb/3.rgba16.png +actors_vanilla/lll/0.rgba16.png +actors_vanilla/lll/1.rgba16.png +actors_vanilla/lll/10.rgba16.png +actors_vanilla/lll/11.rgba16.png +actors_vanilla/lll/12.rgba16.png +actors_vanilla/lll/13.rgba16.png +actors_vanilla/lll/14.rgba16.png +actors_vanilla/lll/15.rgba16.png +actors_vanilla/lll/16.rgba16.png +actors_vanilla/lll/17.rgba16.png +actors_vanilla/lll/18.rgba16.png +actors_vanilla/lll/19.rgba16.png +actors_vanilla/lll/2.rgba16.png +actors_vanilla/lll/20.rgba16.png +actors_vanilla/lll/21.rgba16.png +actors_vanilla/lll/22.rgba16.png +actors_vanilla/lll/23.rgba16.png +actors_vanilla/lll/24.rgba16.png +actors_vanilla/lll/25.rgba16.png levels/lll/26.rgba16.png levels/lll/27.ia16.png levels/lll/28.rgba16.png levels/lll/29.rgba16.png +actors_vanilla/lll/29.rgba16.png levels/lll/3.rgba16.png levels/lll/30.rgba16.png levels/lll/31.rgba16.png levels/lll/32.rgba16.png levels/lll/4.rgba16.png levels/lll/5.rgba16.png -levels/lll/6.rgba16.png +actors_vanilla/lll/6.rgba16.png levels/lll/7.rgba16.png -levels/lll/8.rgba16.png +actors_vanilla/lll/8.rgba16.png levels/lll/9.rgba16.png levels/menu/main_menu_seg7.00018.rgba16.png levels/menu/main_menu_seg7.00818.rgba16.png @@ -921,59 +931,64 @@ levels/menu/main_menu_seg7_us.0B800.ia8.png levels/pss/0.rgba16.png levels/pss/1.ia16.png levels/pss/2.rgba16.png -levels/rr/1.rgba16.png +actors_vanilla/rr/1.rgba16.png levels/rr/2.rgba16.png -levels/rr/quarter_flying_carpet.rgba16.png +actors_vanilla/rr/quarter_flying_carpet.rgba16.png levels/sl/0.rgba16.png levels/sl/1.rgba16.png -levels/sl/2.rgba16.png +actors_vanilla/sl/2.rgba16.png levels/sl/3.rgba16.png levels/sl/4.rgba16.png levels/ssl/0.rgba16.png levels/ssl/1.ia16.png -levels/ssl/10.rgba16.png -levels/ssl/11.rgba16.png +actors_vanilla/ssl/10.rgba16.png +actors_vanilla/ssl/11.rgba16.png levels/ssl/2.rgba16.png levels/ssl/3.rgba16.png levels/ssl/4.rgba16.png -levels/ssl/5.rgba16.png -levels/ssl/6.rgba16.png +actors_vanilla/ssl/5.rgba16.png +actors_vanilla/ssl/6.rgba16.png levels/ssl/7.rgba16.png -levels/ssl/8.rgba16.png -levels/ssl/9.rgba16.png +actors_vanilla/ssl/8.rgba16.png +actors_vanilla/ssl/9.rgba16.png levels/thi/0.rgba16.png levels/thi/1.rgba16.png +actors_vanilla/thi/1.rgba16.png levels/totwc/0.rgba16.png levels/totwc/1.rgba16.png levels/totwc/2.rgba16.png levels/totwc/3.ia16.png -levels/ttc/0.rgba16.png +actors_vanilla/ttc/0.rgba16.png +actors_vanilla/ttc/1.rgba16.png levels/ttc/1.rgba16.png levels/ttc/2.rgba16.png levels/ttm/0.ia16.png levels/ttm/1.rgba16.png levels/ttm/2.rgba16.png levels/ttm/3.rgba16.png -levels/ttm/4.rgba16.png +actors_vanilla/ttm/4.rgba16.png levels/ttm/5.rgba16.png levels/ttm/6.rgba16.png levels/ttm/7.rgba16.png -levels/ttm/8.rgba16.png +actors_vanilla/ttm/8.rgba16.png levels/vcutm/0.rgba16.png levels/vcutm/1.rgba16.png -levels/vcutm/2.rgba16.png +actors_vanilla/vcutm/2.rgba16.png levels/vcutm/3.rgba16.png levels/wdw/0.rgba16.png levels/wdw/1.rgba16.png -levels/wdw/2.rgba16.png -levels/wdw/3.rgba16.png +actors_vanilla/wdw/1.rgba16.png +actors_vanilla/wdw/2.rgba16.png +actors_vanilla/wdw/3.rgba16.png levels/wdw/4.rgba16.png +actors_vanilla/wf/0.rgba16.png levels/wf/0.rgba16.png levels/wf/1.rgba16.png +actors_vanilla/wf/2.rgba16.png levels/wf/2.rgba16.png -levels/wf/3.rgba16.png -levels/wf/4.rgba16.png -levels/wf/5.ia8.png +actors_vanilla/wf/3.rgba16.png +actors_vanilla/wf/4.rgba16.png +actors_vanilla/wf/5.ia8.png levels/wmotr/0.rgba16.png levels/wmotr/1.rgba16.png levels/wmotr/2.rgba16.png diff --git a/Makefile b/Makefile index 5bfda7a9c5..1e4daf45b3 100644 --- a/Makefile +++ b/Makefile @@ -380,6 +380,7 @@ SOUND_BIN_DIR := $(BUILD_DIR)/sound TEXTURE_DIR := textures ACTOR_DIR := actors LEVEL_DIRS := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h))) +VNL_ACTRS_DIRS := $(patsubst actors_vanilla/%,%,$(dir $(wildcard actors_vanilla/*/header.h))) # Directories containing source files SRC_DIRS += src src/boot src/game src/engine src/audio src/menu src/buffers actors levels bin data assets asm lib sound @@ -392,7 +393,8 @@ include Makefile.split # Source code files LEVEL_C_FILES := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c) -C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES) +VNL_ACTRS_C_FILES := $(wildcard actors_vanilla/*/data.c) $(wildcard actors_vanilla/*/geo.c) +C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES) $(VNL_ACTRS_C_FILES) CPP_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) LIBZ_C_FILES := $(foreach dir,$(LIBZ_SRC_DIRS),$(wildcard $(dir)/*.c)) GODDARD_C_FILES := $(foreach dir,$(GODDARD_SRC_DIRS),$(wildcard $(dir)/*.c)) @@ -662,7 +664,7 @@ $(BUILD_DIR)/src/game/rendering_graph_node.o: OPT_FLAGS := $(GRAPH_NODE_OPT_FLAG # $(info MATH_UTIL_OPT_FLAGS: $(MATH_UTIL_OPT_FLAGS)) # $(info GRAPH_NODE_OPT_FLAGS: $(GRAPH_NODE_OPT_FLAGS)) -ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION) +ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) $(addprefix actors_vanilla/,$(VNL_ACTRS_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION) # Make sure build directory exists before compiling anything DUMMY != mkdir -p $(ALL_DIRS) @@ -711,6 +713,11 @@ $(LEVEL_ELF_FILES): $(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/l $(call print,Linking ELF file:,$<,$@) $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $< +.SECONDEXPANSION: +$(VANILLA_ACTORS_ELF_FILES): $(BUILD_DIR)/actors_vanilla/%/data.elf: $(BUILD_DIR)/actors_vanilla/%/data.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf + $(call print,Linking ELF file:,$<,$@) + $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $< + $(BUILD_DIR)/%.bin: $(BUILD_DIR)/%.elf $(call print,Extracting compressible data from:,$<,$@) $(V)$(EXTRACT_DATA_FOR_MIO) $< $@ diff --git a/Makefile.split b/Makefile.split index f5d1c09de7..38d9a15d6f 100644 --- a/Makefile.split +++ b/Makefile.split @@ -41,15 +41,21 @@ LEVEL_FILES := $(addsuffix leveldata,$(LEVEL_DIRS)) LEVEL_ELF_FILES := $(foreach level_dir,$(LEVEL_DIRS),$(BUILD_DIR)/levels/$(level_dir)leveldata.elf) +VANILLA_ACTORS_FILES := $(addsuffix data,$(VNL_ACTRS_DIRS)) + +VANILLA_ACTORS_ELF_FILES := $(foreach level_dir,$(VNL_ACTRS_DIRS),$(BUILD_DIR)/actors_vanilla/$(level_dir)data.elf) + SEG_FILES := \ $(SEGMENTS:%=$(BUILD_DIR)/bin/%.elf) \ $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \ - $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf) + $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf) \ + $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors_vanilla/%.elf) YAY0_FILES := \ $(SEGMENTS:%=$(BUILD_DIR)/bin/%.szp) \ $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.szp) \ - $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.szp) + $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.szp) \ + $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors_vanilla/%.szp) YAY0_OBJ_FILES := $(YAY0_FILES:.szp=.szp.o) @@ -272,3 +278,36 @@ IPL3_RAW_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%,$(IP CRASH_TEXTURE_FILES := $(wildcard $(TEXTURE_DIR)/crash_custom/*.png) CRASH_TEXTURE_C_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc.c,$(CRASH_TEXTURE_FILES))) + +# -------------------------------------- +# Vanilla Objects Rules +# -------------------------------------- + +define vanilla_objects_rules = + VANILLA_ACTORS_$(1)_TEXTURE_FILES := $$(patsubst %.png,%.inc.c,$$(wildcard actors_vanilla/$(1)/*.png)) + $$(BUILD_DIR)/actors_vanilla/$(1)/data.o: $$(addprefix $$(BUILD_DIR)/,$$(VANILLA_ACTORS_$(1)_TEXTURE_FILES)) + $$(BUILD_DIR)/actors_vanilla/$(1)/data.elf: SEGMENT_ADDRESS := 0x0e000000 + $$(BUILD_DIR)/actors_vanilla/$(1)/data.elf: TEXTURE_BIN := $(2) +endef + +$(eval $(call vanilla_objects_rules,bob,generic)) +$(eval $(call vanilla_objects_rules,wf,grass)) +$(eval $(call vanilla_objects_rules,jrb,water)) +$(eval $(call vanilla_objects_rules,ccm,snow)) +$(eval $(call vanilla_objects_rules,bbh,spooky)) +$(eval $(call vanilla_objects_rules,hmc,cave)) +$(eval $(call vanilla_objects_rules,lll,fire)) +$(eval $(call vanilla_objects_rules,ssl,generic)) +$(eval $(call vanilla_objects_rules,ddd,water)) +$(eval $(call vanilla_objects_rules,sl,snow)) +$(eval $(call vanilla_objects_rules,wdw,grass)) +$(eval $(call vanilla_objects_rules,ttm,mountain)) +$(eval $(call vanilla_objects_rules,thi,grass)) +$(eval $(call vanilla_objects_rules,ttc,machine)) +$(eval $(call vanilla_objects_rules,rr,sky)) +$(eval $(call vanilla_objects_rules,bitdw,sky)) +$(eval $(call vanilla_objects_rules,bitfs,sky)) +$(eval $(call vanilla_objects_rules,bits,sky)) +$(eval $(call vanilla_objects_rules,vcutm,outside)) +$(eval $(call vanilla_objects_rules,castle_inside,inside)) +$(eval $(call vanilla_objects_rules,castle_grounds,outside)) diff --git a/actors/common0_geo.c b/actors/common0_geo.c index f78a10b0b4..a49dc1e724 100644 --- a/actors/common0_geo.c +++ b/actors/common0_geo.c @@ -27,3 +27,32 @@ #include "metal_box/geo.inc.c" #include "exclamation_box_outline/geo.inc.c" #include "koopa_shell/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_1[] = { + LOAD_MODEL_FROM_GEO(MODEL_BLUE_COIN_SWITCH, blue_coin_switch_geo), + LOAD_MODEL_FROM_GEO(MODEL_AMP, dAmpGeo), + LOAD_MODEL_FROM_GEO(MODEL_PURPLE_SWITCH, purple_switch_geo), + LOAD_MODEL_FROM_GEO(MODEL_CHECKERBOARD_PLATFORM, checkerboard_platform_geo), + LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX, breakable_box_geo), + LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX_NO_SHADOW, breakable_box_no_shadow_geo), + LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX_OUTLINE, exclamation_box_outline_geo), + LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX, exclamation_box_geo), + LOAD_MODEL_FROM_GEO(MODEL_GOOMBA, goomba_geo), + LOAD_MODEL_FROM_DL( MODEL_EXCLAMATION_POINT, exclamation_box_outline_seg8_dl_exclamation_point, LAYER_OCCLUDE_SILHOUETTE_ALPHA), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_SHELL, koopa_shell_geo), + LOAD_MODEL_FROM_GEO(MODEL_METAL_BOX, metal_box_geo), + LOAD_MODEL_FROM_DL( MODEL_METAL_BOX_DL, metal_box_dl, LAYER_OPAQUE), + LOAD_MODEL_FROM_GEO(MODEL_BLACK_BOBOMB, black_bobomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOBOMB_BUDDY, bobomb_buddy_geo), + LOAD_MODEL_FROM_DL( MODEL_DL_CANNON_LID, cannon_lid_seg8_dl_080048E0, LAYER_OPAQUE), + LOAD_MODEL_FROM_GEO(MODEL_BOWLING_BALL, bowling_ball_geo), + LOAD_MODEL_FROM_GEO(MODEL_CANNON_BARREL, cannon_barrel_geo), + LOAD_MODEL_FROM_GEO(MODEL_CANNON_BASE, cannon_base_geo), + LOAD_MODEL_FROM_GEO(MODEL_HEART, heart_geo), + LOAD_MODEL_FROM_GEO(MODEL_FLYGUY, flyguy_geo), + LOAD_MODEL_FROM_GEO(MODEL_CHUCKYA, chuckya_geo), + LOAD_MODEL_FROM_GEO(MODEL_TRAJECTORY_MARKER_BALL, bowling_ball_track_geo), + RETURN(), +}; diff --git a/actors/group10_geo.c b/actors/group10_geo.c index 7383d746a8..48e1693f34 100644 --- a/actors/group10_geo.c +++ b/actors/group10_geo.c @@ -10,3 +10,12 @@ #include "bird/geo.inc.c" #include "peach/geo.inc.c" #include "yoshi/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_11[] = { + LOAD_MODEL_FROM_GEO(MODEL_BIRDS, birds_geo), + LOAD_MODEL_FROM_GEO(MODEL_PEACH, peach_geo), + LOAD_MODEL_FROM_GEO(MODEL_YOSHI, yoshi_geo), + RETURN(), +}; diff --git a/actors/group11_geo.c b/actors/group11_geo.c index ae26eddca4..f9f453af67 100644 --- a/actors/group11_geo.c +++ b/actors/group11_geo.c @@ -13,3 +13,15 @@ #include "lakitu_enemy/geo.inc.c" #include "spiny_egg/geo.inc.c" #include "spiny/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_12[] = { + LOAD_MODEL_FROM_GEO(MODEL_ENEMY_LAKITU, enemy_lakitu_geo), + LOAD_MODEL_FROM_GEO(MODEL_SPINY_BALL, spiny_ball_geo), + LOAD_MODEL_FROM_GEO(MODEL_SPINY, spiny_geo), + LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_HEAD, wiggler_head_geo), + LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_BODY, wiggler_body_geo), + LOAD_MODEL_FROM_GEO(MODEL_BUBBA, bubba_geo), + RETURN(), +}; diff --git a/actors/group12_geo.c b/actors/group12_geo.c index cfdbc8237b..dc6ce999ab 100644 --- a/actors/group12_geo.c +++ b/actors/group12_geo.c @@ -13,3 +13,16 @@ #include "bowser/geo.inc.c" #include "bomb/geo.inc.c" #include "impact_smoke/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_13[] = { + LOAD_MODEL_FROM_GEO(MODEL_BOWSER, bowser_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB_CHILD_OBJ, bowser_bomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB, bowser_bomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_SMOKE, bowser_impact_smoke_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_FLAMES, bowser_flames_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_WAVE, invisible_bowser_accessory_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_NO_SHADOW, bowser_geo_no_shadow), + RETURN(), +}; diff --git a/actors/group13_geo.c b/actors/group13_geo.c index 2965e0ec12..b88a09e32a 100644 --- a/actors/group13_geo.c +++ b/actors/group13_geo.c @@ -14,3 +14,17 @@ #include "bub/geo.inc.c" #include "water_ring/geo.inc.c" #include "treasure_chest/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_14[] = { + LOAD_MODEL_FROM_GEO(MODEL_BUB, bub_geo), + LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_BASE, treasure_chest_base_geo), + LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_LID, treasure_chest_lid_geo), + LOAD_MODEL_FROM_GEO(MODEL_CYAN_FISH, cyan_fish_geo), + LOAD_MODEL_FROM_GEO(MODEL_WATER_RING, water_ring_geo), + LOAD_MODEL_FROM_GEO(MODEL_WATER_MINE, water_mine_geo), + LOAD_MODEL_FROM_GEO(MODEL_SEAWEED, seaweed_geo), + LOAD_MODEL_FROM_GEO(MODEL_SKEETER, skeeter_geo), + RETURN(), +}; diff --git a/actors/group14_geo.c b/actors/group14_geo.c index 58424dff38..8d39ce5c77 100644 --- a/actors/group14_geo.c +++ b/actors/group14_geo.c @@ -14,3 +14,17 @@ #include "whomp/geo.inc.c" #include "chain_ball/geo.inc.c" #include "chain_chomp/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_15[] = { + LOAD_MODEL_FROM_GEO(MODEL_PIRANHA_PLANT, piranha_plant_geo), + LOAD_MODEL_FROM_GEO(MODEL_WHOMP, whomp_geo), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITH_SHELL, koopa_with_shell_geo), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITHOUT_SHELL, koopa_without_shell_geo), + LOAD_MODEL_FROM_GEO(MODEL_METALLIC_BALL, metallic_ball_geo), + LOAD_MODEL_FROM_GEO(MODEL_CHAIN_CHOMP, chain_chomp_geo), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_FLAG, koopa_flag_geo), + LOAD_MODEL_FROM_GEO(MODEL_WOODEN_POST, wooden_post_geo), + RETURN(), +}; diff --git a/actors/group15_geo.c b/actors/group15_geo.c index 77954eb15d..947d3d8951 100644 --- a/actors/group15_geo.c +++ b/actors/group15_geo.c @@ -11,3 +11,13 @@ #include "toad/geo.inc.c" #include "mips/geo.inc.c" #include "boo_castle/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_16[] = { + LOAD_MODEL_FROM_GEO(MODEL_MIPS, mips_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOO_CASTLE, boo_castle_geo), + LOAD_MODEL_FROM_GEO(MODEL_LAKITU, lakitu_geo), + LOAD_MODEL_FROM_GEO(MODEL_TOAD, toad_geo), + RETURN(), +}; \ No newline at end of file diff --git a/actors/group16_geo.c b/actors/group16_geo.c index 114eb979e9..f11b020124 100644 --- a/actors/group16_geo.c +++ b/actors/group16_geo.c @@ -9,3 +9,12 @@ #include "chillychief/geo.inc.c" #include "moneybag/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_17[] = { + LOAD_MODEL_FROM_GEO(MODEL_CHILL_BULLY, chilly_chief_geo), + LOAD_MODEL_FROM_GEO(MODEL_BIG_CHILL_BULLY, chilly_chief_big_geo), + LOAD_MODEL_FROM_GEO(MODEL_MONEYBAG, moneybag_geo), + RETURN(), +}; diff --git a/actors/group17_geo.c b/actors/group17_geo.c index 28165b53fe..20c4d0381d 100644 --- a/actors/group17_geo.c +++ b/actors/group17_geo.c @@ -13,3 +13,15 @@ #include "snufit/geo.inc.c" #include "dorrie/geo.inc.c" #include "scuttlebug/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_18[] = { + LOAD_MODEL_FROM_GEO(MODEL_SWOOP, swoop_geo), + LOAD_MODEL_FROM_GEO(MODEL_SCUTTLEBUG, scuttlebug_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_I_IRIS, mr_i_iris_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_I_BODY, mr_i_geo), + LOAD_MODEL_FROM_GEO(MODEL_DORRIE, dorrie_geo), + LOAD_MODEL_FROM_GEO(MODEL_SNUFIT, snufit_geo), + RETURN(), +}; diff --git a/actors/group1_geo.c b/actors/group1_geo.c index bd5fbac807..7ec04303e7 100644 --- a/actors/group1_geo.c +++ b/actors/group1_geo.c @@ -13,3 +13,15 @@ #include "thwomp/geo.inc.c" #include "bullet_bill/geo.inc.c" #include "heave_ho/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_2[] = { + LOAD_MODEL_FROM_GEO(MODEL_BULLET_BILL, bullet_bill_geo), + LOAD_MODEL_FROM_GEO(MODEL_YELLOW_SPHERE, yellow_sphere_geo), + LOAD_MODEL_FROM_GEO(MODEL_HOOT, hoot_geo), + LOAD_MODEL_FROM_GEO(MODEL_YOSHI_EGG, yoshi_egg_geo), + LOAD_MODEL_FROM_GEO(MODEL_THWOMP, thwomp_geo), + LOAD_MODEL_FROM_GEO(MODEL_HEAVE_HO, heave_ho_geo), + RETURN(), +}; diff --git a/actors/group2_geo.c b/actors/group2_geo.c index 88a66f4ef0..0c8c54bf1c 100644 --- a/actors/group2_geo.c +++ b/actors/group2_geo.c @@ -9,3 +9,12 @@ #include "bully/geo.inc.c" #include "blargg/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_3[] = { + LOAD_MODEL_FROM_GEO(MODEL_BLARGG, blargg_geo), + LOAD_MODEL_FROM_GEO(MODEL_BULLY, bully_geo), + LOAD_MODEL_FROM_GEO(MODEL_BULLY_BOSS, bully_boss_geo), + RETURN(), +}; diff --git a/actors/group3_geo.c b/actors/group3_geo.c index b5e32b1b85..f637a89165 100644 --- a/actors/group3_geo.c +++ b/actors/group3_geo.c @@ -9,3 +9,12 @@ #include "king_bobomb/geo.inc.c" #include "water_bubble/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_4[] = { + LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB, water_bomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB_SHADOW, water_bomb_shadow_geo), + LOAD_MODEL_FROM_GEO(MODEL_KING_BOBOMB, king_bobomb_geo), + RETURN(), +}; diff --git a/actors/group4.h b/actors/group4.h index 16b3aa494d..7247c61845 100644 --- a/actors/group4.h +++ b/actors/group4.h @@ -105,4 +105,7 @@ extern const struct Animation *const unagi_seg5_anims_05012824[]; extern const Gfx whirlpool_seg5_dl_05013B58[]; extern const Gfx whirlpool_seg5_dl_05013CB8[]; +extern const Trajectory jrb_seg7_trajectory_unagi_1[]; +extern const Trajectory jrb_seg7_trajectory_unagi_2[]; + #endif diff --git a/actors/group4_geo.c b/actors/group4_geo.c index c922414bf8..20141f1dac 100644 --- a/actors/group4_geo.c +++ b/actors/group4_geo.c @@ -11,3 +11,41 @@ #include "manta/geo.inc.c" #include "sushi/geo.inc.c" #include "unagi/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_5[] = { + LOAD_MODEL_FROM_GEO(MODEL_MANTA_RAY, manta_seg5_geo_05008D14), + LOAD_MODEL_FROM_GEO(MODEL_UNAGI, unagi_geo), + LOAD_MODEL_FROM_GEO(MODEL_SUSHI, sushi_geo), + LOAD_MODEL_FROM_DL( MODEL_DL_WHIRLPOOL, whirlpool_seg5_dl_05013CB8, LAYER_TRANSPARENT), + LOAD_MODEL_FROM_GEO(MODEL_CLAM_SHELL, clam_shell_geo), + RETURN(), +}; + +#include "surface_terrains.h" + +// 0x0700D20C - 0x0700D23E +const Trajectory jrb_seg7_trajectory_unagi_1[] = { + TRAJECTORY_POS(0, /*pos*/ 5300, -3800, 1200), + TRAJECTORY_POS(1, /*pos*/ 3700, -3600, 1700), + TRAJECTORY_POS(2, /*pos*/ 3400, -3400, 3500), + TRAJECTORY_POS(3, /*pos*/ 3900, -3600, 4400), + TRAJECTORY_POS(4, /*pos*/ 5300, -3800, 4400), + TRAJECTORY_POS(5, /*pos*/ 6200, -4000, 2700), + TRAJECTORY_END(), +}; + +// 0x0700D240 - 0x0700D28A +const Trajectory jrb_seg7_trajectory_unagi_2[] = { + TRAJECTORY_POS(0, /*pos*/ 5381, 0, 2758), + TRAJECTORY_POS(1, /*pos*/ 5803, -3130, 3036), + TRAJECTORY_POS(2, /*pos*/ 4876, -3045, 2706), + TRAJECTORY_POS(3, /*pos*/ 4313, -3246, 2736), + TRAJECTORY_POS(4, /*pos*/ 3792, -3413, 3668), + TRAJECTORY_POS(5, /*pos*/ 4971, -3130, 3688), + TRAJECTORY_POS(6, /*pos*/ 5392, -3130, 3326), + TRAJECTORY_POS(7, /*pos*/ 6341, -3130, 2450), + TRAJECTORY_POS(8, /*pos*/ 9431, -3130, 1400), + TRAJECTORY_END(), +}; diff --git a/actors/group5_geo.c b/actors/group5_geo.c index 61208f2db6..856162d621 100644 --- a/actors/group5_geo.c +++ b/actors/group5_geo.c @@ -10,3 +10,15 @@ #include "klepto/geo.inc.c" #include "eyerok/geo.inc.c" #include "pokey/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_6[] = { + LOAD_MODEL_FROM_GEO(MODEL_POKEY_HEAD, pokey_head_geo), + LOAD_MODEL_FROM_GEO(MODEL_POKEY_BODY_PART, pokey_body_part_geo), + LOAD_MODEL_FROM_GEO(MODEL_TWEESTER, tweester_geo), + LOAD_MODEL_FROM_GEO(MODEL_KLEPTO, klepto_geo), + LOAD_MODEL_FROM_GEO(MODEL_EYEROK_LEFT_HAND, eyerok_left_hand_geo), + LOAD_MODEL_FROM_GEO(MODEL_EYEROK_RIGHT_HAND, eyerok_right_hand_geo), + RETURN(), +}; diff --git a/actors/group6_geo.c b/actors/group6_geo.c index 7b9379062a..dcd2a8d5c4 100644 --- a/actors/group6_geo.c +++ b/actors/group6_geo.c @@ -10,3 +10,13 @@ #include "monty_mole/geo.inc.c" #include "ukiki/geo.inc.c" #include "fwoosh/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_7[] = { + LOAD_MODEL_FROM_DL( MODEL_DL_MONTY_MOLE_HOLE, monty_mole_hole_seg5_dl_05000840, LAYER_TRANSPARENT_DECAL), + LOAD_MODEL_FROM_GEO(MODEL_MONTY_MOLE, monty_mole_geo), + LOAD_MODEL_FROM_GEO(MODEL_UKIKI, ukiki_geo), + LOAD_MODEL_FROM_GEO(MODEL_FWOOSH, fwoosh_geo), + RETURN(), +}; diff --git a/actors/group7_geo.c b/actors/group7_geo.c index d4fbc350fe..aeadfdf103 100644 --- a/actors/group7_geo.c +++ b/actors/group7_geo.c @@ -10,3 +10,13 @@ #include "spindrift/geo.inc.c" #include "penguin/geo.inc.c" #include "snowman/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_8[] = { + LOAD_MODEL_FROM_GEO(MODEL_SPINDRIFT, spindrift_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD_HIDDEN, mr_blizzard_hidden_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD, mr_blizzard_geo), + LOAD_MODEL_FROM_GEO(MODEL_PENGUIN, penguin_geo), + RETURN(), +}; diff --git a/actors/group8_geo.c b/actors/group8_geo.c index 2be77f95ef..ac66aa36f2 100644 --- a/actors/group8_geo.c +++ b/actors/group8_geo.c @@ -9,3 +9,12 @@ #include "springboard/geo.inc.c" #include "capswitch/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_9[] = { + LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_EXCLAMATION, cap_switch_exclamation_seg5_dl_05002E00, LAYER_ALPHA), + LOAD_MODEL_FROM_GEO(MODEL_CAP_SWITCH, cap_switch_geo), + LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_BASE, cap_switch_base_seg5_dl_05003120, LAYER_OPAQUE), + RETURN(), +}; diff --git a/actors/group9_geo.c b/actors/group9_geo.c index e63672b0fc..27b66b8e30 100644 --- a/actors/group9_geo.c +++ b/actors/group9_geo.c @@ -14,3 +14,16 @@ #include "mad_piano/geo.inc.c" #include "boo/geo.inc.c" #include "haunted_cage/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_global_10[] = { + LOAD_MODEL_FROM_GEO(MODEL_BOO, boo_geo), + LOAD_MODEL_FROM_GEO(MODEL_BETA_BOO_KEY, small_key_geo), + LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CHAIR, haunted_chair_geo), + LOAD_MODEL_FROM_GEO(MODEL_MAD_PIANO, mad_piano_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOOKEND_PART, bookend_part_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOOKEND, bookend_geo), + LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CAGE, haunted_cage_geo), + RETURN(), +}; diff --git a/levels/bbh/coffin/collision.inc.c b/actors_vanilla/bbh/coffin/collision.inc.c similarity index 100% rename from levels/bbh/coffin/collision.inc.c rename to actors_vanilla/bbh/coffin/collision.inc.c diff --git a/levels/bbh/coffin/geo.inc.c b/actors_vanilla/bbh/coffin/geo.inc.c similarity index 100% rename from levels/bbh/coffin/geo.inc.c rename to actors_vanilla/bbh/coffin/geo.inc.c diff --git a/levels/bbh/coffin/model.inc.c b/actors_vanilla/bbh/coffin/model.inc.c similarity index 100% rename from levels/bbh/coffin/model.inc.c rename to actors_vanilla/bbh/coffin/model.inc.c diff --git a/actors_vanilla/bbh/data.c b/actors_vanilla/bbh/data.c new file mode 100644 index 0000000000..1f5543ef5e --- /dev/null +++ b/actors_vanilla/bbh/data.c @@ -0,0 +1,27 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bbh/texture.inc.c" + +#include "actors_vanilla/bbh/staircase_step/model.inc.c" +#include "actors_vanilla/bbh/tilting_trap_platform/model.inc.c" +#include "actors_vanilla/bbh/tumbling_platform_far/model.inc.c" +#include "actors_vanilla/bbh/tumbling_platform_near/model.inc.c" +#include "actors_vanilla/bbh/moving_bookshelf/model.inc.c" +#include "actors_vanilla/bbh/mesh_elevator/model.inc.c" +#include "actors_vanilla/bbh/merry_go_round/model.inc.c" +#include "actors_vanilla/bbh/coffin/model.inc.c" +#include "actors_vanilla/bbh/staircase_step/collision.inc.c" +#include "actors_vanilla/bbh/tilting_trap_platform/collision.inc.c" +#include "actors_vanilla/bbh/tumbling_platform_near/collision.inc.c" +#include "actors_vanilla/bbh/moving_bookshelf/collision.inc.c" +#include "actors_vanilla/bbh/mesh_elevator/collision.inc.c" +#include "actors_vanilla/bbh/merry_go_round/collision.inc.c" +#include "actors_vanilla/bbh/coffin/collision.inc.c" diff --git a/actors_vanilla/bbh/geo.c b/actors_vanilla/bbh/geo.c new file mode 100644 index 0000000000..c560b28c63 --- /dev/null +++ b/actors_vanilla/bbh/geo.c @@ -0,0 +1,37 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bbh/header.h" + +#include "actors_vanilla/bbh/staircase_step/geo.inc.c" +#include "actors_vanilla/bbh/tilting_trap_platform/geo.inc.c" +#include "actors_vanilla/bbh/tumbling_platform_far/geo.inc.c" +#include "actors_vanilla/bbh/tumbling_platform_near/geo.inc.c" +#include "actors_vanilla/bbh/moving_bookshelf/geo.inc.c" +#include "actors_vanilla/bbh/mesh_elevator/geo.inc.c" +#include "actors_vanilla/bbh/merry_go_round/geo.inc.c" +#include "actors_vanilla/bbh/coffin/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_bbh[] = { + LOAD_MODEL_FROM_GEO(MODEL_BBH_STAIRCASE_STEP, geo_bbh_0005B0), + LOAD_MODEL_FROM_GEO(MODEL_BBH_TILTING_FLOOR_PLATFORM, geo_bbh_0005C8), + LOAD_MODEL_FROM_GEO(MODEL_BBH_TUMBLING_PLATFORM, geo_bbh_0005E0), + LOAD_MODEL_FROM_GEO(MODEL_BBH_TUMBLING_PLATFORM_PART, geo_bbh_0005F8), + LOAD_MODEL_FROM_GEO(MODEL_BBH_MOVING_BOOKSHELF, geo_bbh_000610), + LOAD_MODEL_FROM_GEO(MODEL_BBH_MESH_ELEVATOR, geo_bbh_000628), + LOAD_MODEL_FROM_GEO(MODEL_BBH_MERRY_GO_ROUND, geo_bbh_000640), + LOAD_MODEL_FROM_GEO(MODEL_BBH_WOODEN_TOMB, geo_bbh_000658), + RETURN(), +}; diff --git a/actors_vanilla/bbh/header.h b/actors_vanilla/bbh/header.h new file mode 100644 index 0000000000..b24b84f9fa --- /dev/null +++ b/actors_vanilla/bbh/header.h @@ -0,0 +1,29 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout geo_bbh_0005B0[]; +extern const GeoLayout geo_bbh_0005C8[]; +extern const GeoLayout geo_bbh_0005E0[]; +extern const GeoLayout geo_bbh_0005F8[]; +extern const GeoLayout geo_bbh_000610[]; +extern const GeoLayout geo_bbh_000628[]; +extern const GeoLayout geo_bbh_000640[]; +extern const GeoLayout geo_bbh_000658[]; + +extern const Gfx bbh_seg7_dl_0701F2E8[]; +extern const Gfx bbh_seg7_dl_0701F5F8[]; +extern const Gfx bbh_seg7_dl_0701F7E8[]; +extern const Gfx bbh_seg7_dl_0701FAB0[]; +extern const Gfx bbh_seg7_dl_0701FD28[]; +extern const Gfx bbh_seg7_dl_0701FFE8[]; +extern const Gfx bbh_seg7_dl_070202F0[]; +extern const Gfx bbh_seg7_dl_070206F0[]; + +extern const Collision bbh_seg7_collision_staircase_step[]; +extern const Collision bbh_seg7_collision_tilt_floor_platform[]; +extern const Collision bbh_seg7_collision_07026B1C[]; +extern const Collision bbh_seg7_collision_haunted_bookshelf[]; +extern const Collision bbh_seg7_collision_mesh_elevator[]; +extern const Collision bbh_seg7_collision_merry_go_round[]; +extern const Collision bbh_seg7_collision_coffin[]; diff --git a/levels/bbh/merry_go_round/collision.inc.c b/actors_vanilla/bbh/merry_go_round/collision.inc.c similarity index 100% rename from levels/bbh/merry_go_round/collision.inc.c rename to actors_vanilla/bbh/merry_go_round/collision.inc.c diff --git a/levels/bbh/merry_go_round/geo.inc.c b/actors_vanilla/bbh/merry_go_round/geo.inc.c similarity index 100% rename from levels/bbh/merry_go_round/geo.inc.c rename to actors_vanilla/bbh/merry_go_round/geo.inc.c diff --git a/levels/bbh/merry_go_round/model.inc.c b/actors_vanilla/bbh/merry_go_round/model.inc.c similarity index 100% rename from levels/bbh/merry_go_round/model.inc.c rename to actors_vanilla/bbh/merry_go_round/model.inc.c diff --git a/levels/bbh/mesh_elevator/collision.inc.c b/actors_vanilla/bbh/mesh_elevator/collision.inc.c similarity index 100% rename from levels/bbh/mesh_elevator/collision.inc.c rename to actors_vanilla/bbh/mesh_elevator/collision.inc.c diff --git a/levels/bbh/mesh_elevator/geo.inc.c b/actors_vanilla/bbh/mesh_elevator/geo.inc.c similarity index 100% rename from levels/bbh/mesh_elevator/geo.inc.c rename to actors_vanilla/bbh/mesh_elevator/geo.inc.c diff --git a/levels/bbh/mesh_elevator/model.inc.c b/actors_vanilla/bbh/mesh_elevator/model.inc.c similarity index 100% rename from levels/bbh/mesh_elevator/model.inc.c rename to actors_vanilla/bbh/mesh_elevator/model.inc.c diff --git a/levels/bbh/moving_bookshelf/collision.inc.c b/actors_vanilla/bbh/moving_bookshelf/collision.inc.c similarity index 100% rename from levels/bbh/moving_bookshelf/collision.inc.c rename to actors_vanilla/bbh/moving_bookshelf/collision.inc.c diff --git a/levels/bbh/moving_bookshelf/geo.inc.c b/actors_vanilla/bbh/moving_bookshelf/geo.inc.c similarity index 100% rename from levels/bbh/moving_bookshelf/geo.inc.c rename to actors_vanilla/bbh/moving_bookshelf/geo.inc.c diff --git a/levels/bbh/moving_bookshelf/model.inc.c b/actors_vanilla/bbh/moving_bookshelf/model.inc.c similarity index 100% rename from levels/bbh/moving_bookshelf/model.inc.c rename to actors_vanilla/bbh/moving_bookshelf/model.inc.c diff --git a/levels/bbh/staircase_step/collision.inc.c b/actors_vanilla/bbh/staircase_step/collision.inc.c similarity index 100% rename from levels/bbh/staircase_step/collision.inc.c rename to actors_vanilla/bbh/staircase_step/collision.inc.c diff --git a/levels/bbh/staircase_step/geo.inc.c b/actors_vanilla/bbh/staircase_step/geo.inc.c similarity index 100% rename from levels/bbh/staircase_step/geo.inc.c rename to actors_vanilla/bbh/staircase_step/geo.inc.c diff --git a/levels/bbh/staircase_step/model.inc.c b/actors_vanilla/bbh/staircase_step/model.inc.c similarity index 100% rename from levels/bbh/staircase_step/model.inc.c rename to actors_vanilla/bbh/staircase_step/model.inc.c diff --git a/actors_vanilla/bbh/texture.inc.c b/actors_vanilla/bbh/texture.inc.c new file mode 100644 index 0000000000..2bd8b74d0a --- /dev/null +++ b/actors_vanilla/bbh/texture.inc.c @@ -0,0 +1,19 @@ +// 0x07000000 - 0x07001000 +ALIGNED8 static const Texture bbh_seg7_texture_07000000[] = { +#include "actors_vanilla/bbh/0.rgba16.inc.c" +}; + +// 0x07003000 - 0x07003400 +ALIGNED8 static const Texture bbh_seg7_texture_07003000[] = { +#include "actors_vanilla/bbh/4.rgba16.inc.c" +}; + +// 0x07003400 - 0x07004400 +ALIGNED8 static const Texture bbh_seg7_texture_07003400[] = { +#include "actors_vanilla/bbh/5.rgba16.inc.c" +}; + +// 0x07004400 - 0x07004800 +ALIGNED8 static const Texture bbh_seg7_texture_07004400[] = { +#include "actors_vanilla/bbh/6.rgba16.inc.c" +}; diff --git a/levels/bbh/tilting_trap_platform/collision.inc.c b/actors_vanilla/bbh/tilting_trap_platform/collision.inc.c similarity index 100% rename from levels/bbh/tilting_trap_platform/collision.inc.c rename to actors_vanilla/bbh/tilting_trap_platform/collision.inc.c diff --git a/levels/bbh/tilting_trap_platform/geo.inc.c b/actors_vanilla/bbh/tilting_trap_platform/geo.inc.c similarity index 100% rename from levels/bbh/tilting_trap_platform/geo.inc.c rename to actors_vanilla/bbh/tilting_trap_platform/geo.inc.c diff --git a/levels/bbh/tilting_trap_platform/model.inc.c b/actors_vanilla/bbh/tilting_trap_platform/model.inc.c similarity index 100% rename from levels/bbh/tilting_trap_platform/model.inc.c rename to actors_vanilla/bbh/tilting_trap_platform/model.inc.c diff --git a/levels/bbh/tumbling_platform_far/geo.inc.c b/actors_vanilla/bbh/tumbling_platform_far/geo.inc.c similarity index 100% rename from levels/bbh/tumbling_platform_far/geo.inc.c rename to actors_vanilla/bbh/tumbling_platform_far/geo.inc.c diff --git a/levels/bbh/tumbling_platform_far/model.inc.c b/actors_vanilla/bbh/tumbling_platform_far/model.inc.c similarity index 100% rename from levels/bbh/tumbling_platform_far/model.inc.c rename to actors_vanilla/bbh/tumbling_platform_far/model.inc.c diff --git a/levels/bbh/tumbling_platform_near/collision.inc.c b/actors_vanilla/bbh/tumbling_platform_near/collision.inc.c similarity index 100% rename from levels/bbh/tumbling_platform_near/collision.inc.c rename to actors_vanilla/bbh/tumbling_platform_near/collision.inc.c diff --git a/levels/bbh/tumbling_platform_near/geo.inc.c b/actors_vanilla/bbh/tumbling_platform_near/geo.inc.c similarity index 100% rename from levels/bbh/tumbling_platform_near/geo.inc.c rename to actors_vanilla/bbh/tumbling_platform_near/geo.inc.c diff --git a/levels/bbh/tumbling_platform_near/model.inc.c b/actors_vanilla/bbh/tumbling_platform_near/model.inc.c similarity index 100% rename from levels/bbh/tumbling_platform_near/model.inc.c rename to actors_vanilla/bbh/tumbling_platform_near/model.inc.c diff --git a/levels/bitdw/collapsing_stairs_1/collision.inc.c b/actors_vanilla/bitdw/collapsing_stairs_1/collision.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_1/collision.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_1/collision.inc.c diff --git a/levels/bitdw/collapsing_stairs_1/geo.inc.c b/actors_vanilla/bitdw/collapsing_stairs_1/geo.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_1/geo.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_1/geo.inc.c diff --git a/levels/bitdw/collapsing_stairs_1/model.inc.c b/actors_vanilla/bitdw/collapsing_stairs_1/model.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_1/model.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_1/model.inc.c diff --git a/levels/bitdw/collapsing_stairs_2/collision.inc.c b/actors_vanilla/bitdw/collapsing_stairs_2/collision.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_2/collision.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_2/collision.inc.c diff --git a/levels/bitdw/collapsing_stairs_2/geo.inc.c b/actors_vanilla/bitdw/collapsing_stairs_2/geo.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_2/geo.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_2/geo.inc.c diff --git a/levels/bitdw/collapsing_stairs_2/model.inc.c b/actors_vanilla/bitdw/collapsing_stairs_2/model.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_2/model.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_2/model.inc.c diff --git a/levels/bitdw/collapsing_stairs_3/collision.inc.c b/actors_vanilla/bitdw/collapsing_stairs_3/collision.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_3/collision.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_3/collision.inc.c diff --git a/levels/bitdw/collapsing_stairs_3/geo.inc.c b/actors_vanilla/bitdw/collapsing_stairs_3/geo.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_3/geo.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_3/geo.inc.c diff --git a/levels/bitdw/collapsing_stairs_3/model.inc.c b/actors_vanilla/bitdw/collapsing_stairs_3/model.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_3/model.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_3/model.inc.c diff --git a/levels/bitdw/collapsing_stairs_4/collision.inc.c b/actors_vanilla/bitdw/collapsing_stairs_4/collision.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_4/collision.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_4/collision.inc.c diff --git a/levels/bitdw/collapsing_stairs_4/geo.inc.c b/actors_vanilla/bitdw/collapsing_stairs_4/geo.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_4/geo.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_4/geo.inc.c diff --git a/levels/bitdw/collapsing_stairs_4/model.inc.c b/actors_vanilla/bitdw/collapsing_stairs_4/model.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_4/model.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_4/model.inc.c diff --git a/levels/bitdw/collapsing_stairs_5/collision.inc.c b/actors_vanilla/bitdw/collapsing_stairs_5/collision.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_5/collision.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_5/collision.inc.c diff --git a/levels/bitdw/collapsing_stairs_5/geo.inc.c b/actors_vanilla/bitdw/collapsing_stairs_5/geo.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_5/geo.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_5/geo.inc.c diff --git a/levels/bitdw/collapsing_stairs_5/model.inc.c b/actors_vanilla/bitdw/collapsing_stairs_5/model.inc.c similarity index 100% rename from levels/bitdw/collapsing_stairs_5/model.inc.c rename to actors_vanilla/bitdw/collapsing_stairs_5/model.inc.c diff --git a/actors_vanilla/bitdw/data.c b/actors_vanilla/bitdw/data.c new file mode 100644 index 0000000000..efd5ad4ece --- /dev/null +++ b/actors_vanilla/bitdw/data.c @@ -0,0 +1,35 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bitdw/texture.inc.c" + +#include "actors_vanilla/bitdw/sliding_platform/model.inc.c" +#include "actors_vanilla/bitdw/seesaw_platform/model.inc.c" +#include "actors_vanilla/bitdw/square_platform/model.inc.c" +#include "actors_vanilla/bitdw/ferris_wheel_axle/model.inc.c" +#include "actors_vanilla/bitdw/ferris_platform/model.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_1/model.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_2/model.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_3/model.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_4/model.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_5/model.inc.c" +#include "actors_vanilla/bitdw/sliding_platform/collision.inc.c" +#include "actors_vanilla/bitdw/seesaw_platform/collision.inc.c" +#include "actors_vanilla/bitdw/square_platform/collision.inc.c" +#include "actors_vanilla/bitdw/ferris_wheel_axle/collision.inc.c" +#include "actors_vanilla/bitdw/ferris_platform/collision.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_1/collision.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_2/collision.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_3/collision.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_4/collision.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_5/collision.inc.c" diff --git a/levels/bitdw/ferris_platform/collision.inc.c b/actors_vanilla/bitdw/ferris_platform/collision.inc.c similarity index 100% rename from levels/bitdw/ferris_platform/collision.inc.c rename to actors_vanilla/bitdw/ferris_platform/collision.inc.c diff --git a/levels/bitdw/ferris_platform/geo.inc.c b/actors_vanilla/bitdw/ferris_platform/geo.inc.c similarity index 100% rename from levels/bitdw/ferris_platform/geo.inc.c rename to actors_vanilla/bitdw/ferris_platform/geo.inc.c diff --git a/levels/bitdw/ferris_platform/model.inc.c b/actors_vanilla/bitdw/ferris_platform/model.inc.c similarity index 100% rename from levels/bitdw/ferris_platform/model.inc.c rename to actors_vanilla/bitdw/ferris_platform/model.inc.c diff --git a/levels/bitdw/ferris_wheel_axle/collision.inc.c b/actors_vanilla/bitdw/ferris_wheel_axle/collision.inc.c similarity index 100% rename from levels/bitdw/ferris_wheel_axle/collision.inc.c rename to actors_vanilla/bitdw/ferris_wheel_axle/collision.inc.c diff --git a/levels/bitdw/ferris_wheel_axle/geo.inc.c b/actors_vanilla/bitdw/ferris_wheel_axle/geo.inc.c similarity index 100% rename from levels/bitdw/ferris_wheel_axle/geo.inc.c rename to actors_vanilla/bitdw/ferris_wheel_axle/geo.inc.c diff --git a/levels/bitdw/ferris_wheel_axle/model.inc.c b/actors_vanilla/bitdw/ferris_wheel_axle/model.inc.c similarity index 100% rename from levels/bitdw/ferris_wheel_axle/model.inc.c rename to actors_vanilla/bitdw/ferris_wheel_axle/model.inc.c diff --git a/actors_vanilla/bitdw/geo.c b/actors_vanilla/bitdw/geo.c new file mode 100644 index 0000000000..8d91515529 --- /dev/null +++ b/actors_vanilla/bitdw/geo.c @@ -0,0 +1,41 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bitdw/header.h" + +#include "actors_vanilla/bitdw/sliding_platform/geo.inc.c" +#include "actors_vanilla/bitdw/seesaw_platform/geo.inc.c" +#include "actors_vanilla/bitdw/square_platform/geo.inc.c" +#include "actors_vanilla/bitdw/ferris_wheel_axle/geo.inc.c" +#include "actors_vanilla/bitdw/ferris_platform/geo.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_1/geo.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_2/geo.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_3/geo.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_4/geo.inc.c" +#include "actors_vanilla/bitdw/collapsing_stairs_5/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_bitdw[] = { + LOAD_MODEL_FROM_GEO(MODEL_BITDW_SQUARE_PLATFORM, geo_bitdw_000558), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_SEESAW_PLATFORM, geo_bitdw_000540), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_SLIDING_PLATFORM, geo_bitdw_000528), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_FERRIS_WHEEL_AXLE, geo_bitdw_000570), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_BLUE_PLATFORM, geo_bitdw_000588), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME4, geo_bitdw_0005A0), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME3, geo_bitdw_0005B8), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME2, geo_bitdw_0005D0), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME1, geo_bitdw_0005E8), + LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE, geo_bitdw_000600), + RETURN(), +}; diff --git a/actors_vanilla/bitdw/header.h b/actors_vanilla/bitdw/header.h new file mode 100644 index 0000000000..b7d1d1a53f --- /dev/null +++ b/actors_vanilla/bitdw/header.h @@ -0,0 +1,36 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout geo_bitdw_000528[]; +extern const GeoLayout geo_bitdw_000540[]; +extern const GeoLayout geo_bitdw_000558[]; +extern const GeoLayout geo_bitdw_000570[]; +extern const GeoLayout geo_bitdw_000588[]; +extern const GeoLayout geo_bitdw_0005A0[]; +extern const GeoLayout geo_bitdw_0005B8[]; +extern const GeoLayout geo_bitdw_0005D0[]; +extern const GeoLayout geo_bitdw_0005E8[]; +extern const GeoLayout geo_bitdw_000600[]; + +extern const Gfx bitdw_seg7_dl_0700AFA0[]; +extern const Gfx bitdw_seg7_dl_0700B220[]; +extern const Gfx bitdw_seg7_dl_0700B480[]; +extern const Gfx bitdw_seg7_dl_0700B8D8[]; +extern const Gfx bitdw_seg7_dl_0700BB58[]; +extern const Gfx bitdw_seg7_dl_0700C0E0[]; +extern const Gfx bitdw_seg7_dl_0700C670[]; +extern const Gfx bitdw_seg7_dl_0700CC00[]; +extern const Gfx bitdw_seg7_dl_0700D190[]; +extern const Gfx bitdw_seg7_dl_0700D3E8[]; + +extern const Collision bitdw_seg7_collision_0700F688[]; +extern const Collision bitdw_seg7_collision_0700F70C[]; +extern const Collision bitdw_seg7_collision_moving_pyramid[]; +extern const Collision bitdw_seg7_collision_0700F7F0[]; +extern const Collision bitdw_seg7_collision_0700F898[]; +extern const Collision bitdw_seg7_collision_0700F91C[]; +extern const Collision bitdw_seg7_collision_0700FA3C[]; +extern const Collision bitdw_seg7_collision_0700FB5C[]; +extern const Collision bitdw_seg7_collision_0700FC7C[]; +extern const Collision bitdw_seg7_collision_0700FD9C[]; diff --git a/levels/bitdw/seesaw_platform/collision.inc.c b/actors_vanilla/bitdw/seesaw_platform/collision.inc.c similarity index 100% rename from levels/bitdw/seesaw_platform/collision.inc.c rename to actors_vanilla/bitdw/seesaw_platform/collision.inc.c diff --git a/levels/bitdw/seesaw_platform/geo.inc.c b/actors_vanilla/bitdw/seesaw_platform/geo.inc.c similarity index 100% rename from levels/bitdw/seesaw_platform/geo.inc.c rename to actors_vanilla/bitdw/seesaw_platform/geo.inc.c diff --git a/levels/bitdw/seesaw_platform/model.inc.c b/actors_vanilla/bitdw/seesaw_platform/model.inc.c similarity index 100% rename from levels/bitdw/seesaw_platform/model.inc.c rename to actors_vanilla/bitdw/seesaw_platform/model.inc.c diff --git a/levels/bitdw/sliding_platform/collision.inc.c b/actors_vanilla/bitdw/sliding_platform/collision.inc.c similarity index 100% rename from levels/bitdw/sliding_platform/collision.inc.c rename to actors_vanilla/bitdw/sliding_platform/collision.inc.c diff --git a/levels/bitdw/sliding_platform/geo.inc.c b/actors_vanilla/bitdw/sliding_platform/geo.inc.c similarity index 100% rename from levels/bitdw/sliding_platform/geo.inc.c rename to actors_vanilla/bitdw/sliding_platform/geo.inc.c diff --git a/levels/bitdw/sliding_platform/model.inc.c b/actors_vanilla/bitdw/sliding_platform/model.inc.c similarity index 100% rename from levels/bitdw/sliding_platform/model.inc.c rename to actors_vanilla/bitdw/sliding_platform/model.inc.c diff --git a/levels/bitdw/square_platform/collision.inc.c b/actors_vanilla/bitdw/square_platform/collision.inc.c similarity index 100% rename from levels/bitdw/square_platform/collision.inc.c rename to actors_vanilla/bitdw/square_platform/collision.inc.c diff --git a/levels/bitdw/square_platform/geo.inc.c b/actors_vanilla/bitdw/square_platform/geo.inc.c similarity index 100% rename from levels/bitdw/square_platform/geo.inc.c rename to actors_vanilla/bitdw/square_platform/geo.inc.c diff --git a/levels/bitdw/square_platform/model.inc.c b/actors_vanilla/bitdw/square_platform/model.inc.c similarity index 100% rename from levels/bitdw/square_platform/model.inc.c rename to actors_vanilla/bitdw/square_platform/model.inc.c diff --git a/actors_vanilla/bitdw/texture.inc.c b/actors_vanilla/bitdw/texture.inc.c new file mode 100644 index 0000000000..a602359a02 --- /dev/null +++ b/actors_vanilla/bitdw/texture.inc.c @@ -0,0 +1,4 @@ +// 0x07000000 - 0x07000002 +ALIGNED8 static const Texture bitdw_seg7_texture_07000000[] = { +#include "actors_vanilla/bitdw/0.rgba16.inc.c" +}; diff --git a/actors_vanilla/bitfs/data.c b/actors_vanilla/bitfs/data.c new file mode 100644 index 0000000000..19e8bdbdf9 --- /dev/null +++ b/actors_vanilla/bitfs/data.c @@ -0,0 +1,38 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bitfs/texture.inc.c" + +#include "actors_vanilla/bitfs/elevator/model.inc.c" +#include "actors_vanilla/bitfs/sinking_cage_platform/model.inc.c" +#include "actors_vanilla/bitfs/sinking_cage_pole/model.inc.c" +#include "actors_vanilla/bitfs/tilting_square_platform/model.inc.c" +#include "actors_vanilla/bitfs/tumbling_platform_near/model.inc.c" +#include "actors_vanilla/bitfs/tumbling_platform_far/model.inc.c" +#include "actors_vanilla/bitfs/stretching_platform/1.inc.c" +#include "actors_vanilla/bitfs/stretching_platform/2.inc.c" +#include "actors_vanilla/bitfs/moving_square_platform/model.inc.c" +#include "actors_vanilla/bitfs/sliding_platform/model.inc.c" +#include "actors_vanilla/bitfs/platform_on_track/model.inc.c" +#include "actors_vanilla/bitfs/sinking_platforms/model.inc.c" +#include "actors_vanilla/bitfs/seesaw_platform/model.inc.c" +#include "actors_vanilla/bitfs/elevator/collision.inc.c" +#include "actors_vanilla/bitfs/sinking_cage_platform/collision.inc.c" +#include "actors_vanilla/bitfs/tilting_square_platform/collision.inc.c" +#include "actors_vanilla/bitfs/tumbling_platform_near/collision.inc.c" +#include "actors_vanilla/bitfs/stretching_platform/collision.inc.c" +#include "actors_vanilla/bitfs/moving_square_platform/collision.inc.c" +#include "actors_vanilla/bitfs/sliding_platform/collision.inc.c" +#include "actors_vanilla/bitfs/platform_on_track/collision.inc.c" +#include "actors_vanilla/bitfs/sinking_platforms/collision.inc.c" +#include "actors_vanilla/bitfs/seesaw_platform/collision.inc.c" diff --git a/levels/bitfs/elevator/collision.inc.c b/actors_vanilla/bitfs/elevator/collision.inc.c similarity index 100% rename from levels/bitfs/elevator/collision.inc.c rename to actors_vanilla/bitfs/elevator/collision.inc.c diff --git a/levels/bitfs/elevator/geo.inc.c b/actors_vanilla/bitfs/elevator/geo.inc.c similarity index 100% rename from levels/bitfs/elevator/geo.inc.c rename to actors_vanilla/bitfs/elevator/geo.inc.c diff --git a/levels/bitfs/elevator/model.inc.c b/actors_vanilla/bitfs/elevator/model.inc.c similarity index 100% rename from levels/bitfs/elevator/model.inc.c rename to actors_vanilla/bitfs/elevator/model.inc.c diff --git a/actors_vanilla/bitfs/geo.c b/actors_vanilla/bitfs/geo.c new file mode 100644 index 0000000000..33046dc962 --- /dev/null +++ b/actors_vanilla/bitfs/geo.c @@ -0,0 +1,45 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bitfs/header.h" + +#include "actors_vanilla/bitfs/elevator/geo.inc.c" +#include "actors_vanilla/bitfs/sinking_cage_platform/geo.inc.c" +#include "actors_vanilla/bitfs/sinking_cage_pole/geo.inc.c" +#include "actors_vanilla/bitfs/tilting_square_platform/geo.inc.c" +#include "actors_vanilla/bitfs/tumbling_platform_near/geo.inc.c" +#include "actors_vanilla/bitfs/tumbling_platform_far/geo.inc.c" +#include "actors_vanilla/bitfs/stretching_platform/geo.inc.c" +#include "actors_vanilla/bitfs/moving_square_platform/geo.inc.c" +#include "actors_vanilla/bitfs/sliding_platform/geo.inc.c" +#include "actors_vanilla/bitfs/platform_on_track/geo.inc.c" +#include "actors_vanilla/bitfs/sinking_platforms/geo.inc.c" +#include "actors_vanilla/bitfs/seesaw_platform/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_bitfs[] = { + LOAD_MODEL_FROM_GEO(MODEL_BITFS_PLATFORM_ON_TRACK, bitfs_geo_000758), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_TILTING_SQUARE_PLATFORM, bitfs_geo_0006C0), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_SINKING_PLATFORMS, bitfs_geo_000770), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_BLUE_POLE, bitfs_geo_0006A8), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_SINKING_CAGE_PLATFORM, bitfs_geo_000690), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_ELEVATOR, bitfs_geo_000678), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_STRETCHING_PLATFORMS, bitfs_geo_000708), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_SEESAW_PLATFORM, bitfs_geo_000788), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_MOVING_SQUARE_PLATFORM, bitfs_geo_000728), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_SLIDING_PLATFORM, bitfs_geo_000740), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_TUMBLING_PLATFORM_PART, bitfs_geo_0006D8), + LOAD_MODEL_FROM_GEO(MODEL_BITFS_TUMBLING_PLATFORM, bitfs_geo_0006F0), + RETURN(), +}; diff --git a/actors_vanilla/bitfs/header.h b/actors_vanilla/bitfs/header.h new file mode 100644 index 0000000000..1fe16787a8 --- /dev/null +++ b/actors_vanilla/bitfs/header.h @@ -0,0 +1,42 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout bitfs_geo_000678[]; +extern const GeoLayout bitfs_geo_000690[]; +extern const GeoLayout bitfs_geo_0006A8[]; +extern const GeoLayout bitfs_geo_0006C0[]; +extern const GeoLayout bitfs_geo_0006D8[]; +extern const GeoLayout bitfs_geo_0006F0[]; +extern const GeoLayout bitfs_geo_000708[]; +extern const GeoLayout bitfs_geo_000728[]; +extern const GeoLayout bitfs_geo_000740[]; +extern const GeoLayout bitfs_geo_000758[]; +extern const GeoLayout bitfs_geo_000770[]; +extern const GeoLayout bitfs_geo_000788[]; + +extern const Gfx bitfs_seg7_dl_0700F508[]; +extern const Gfx bitfs_seg7_dl_0700F6A8[]; +extern const Gfx bitfs_seg7_dl_0700FB38[]; +extern const Gfx bitfs_seg7_dl_0700FD08[]; +extern const Gfx bitfs_seg7_dl_0700FF90[]; +extern const Gfx bitfs_seg7_dl_07010168[]; +extern const Gfx bitfs_seg7_dl_07010340[]; +extern const Gfx bitfs_seg7_dl_07011138[]; +extern const Gfx bitfs_seg7_dl_07011318[]; +extern const Gfx bitfs_seg7_dl_07011568[]; +extern const Gfx bitfs_seg7_dl_07011798[]; +extern const Gfx bitfs_seg7_dl_07011BA0[]; +extern const Gfx bitfs_seg7_dl_07011D98[]; +extern const Gfx bitfs_seg7_dl_07011E28[]; + +extern const Collision bitfs_seg7_collision_elevator[]; +extern const Collision bitfs_seg7_collision_sinking_cage_platform[]; +extern const Collision bitfs_seg7_collision_inverted_pyramid[]; +extern const Collision bitfs_seg7_collision_07015288[]; +extern const Collision bitfs_seg7_collision_squishable_platform[]; +extern const Collision bitfs_seg7_collision_07015714[]; +extern const Collision bitfs_seg7_collision_07015768[]; +extern const Collision bitfs_seg7_collision_platform_on_track[]; +extern const Collision bitfs_seg7_collision_sinking_platform[]; +extern const Collision bitfs_seg7_collision_07015928[]; diff --git a/levels/bitfs/moving_square_platform/collision.inc.c b/actors_vanilla/bitfs/moving_square_platform/collision.inc.c similarity index 100% rename from levels/bitfs/moving_square_platform/collision.inc.c rename to actors_vanilla/bitfs/moving_square_platform/collision.inc.c diff --git a/levels/bitfs/moving_square_platform/geo.inc.c b/actors_vanilla/bitfs/moving_square_platform/geo.inc.c similarity index 100% rename from levels/bitfs/moving_square_platform/geo.inc.c rename to actors_vanilla/bitfs/moving_square_platform/geo.inc.c diff --git a/levels/bitfs/moving_square_platform/model.inc.c b/actors_vanilla/bitfs/moving_square_platform/model.inc.c similarity index 100% rename from levels/bitfs/moving_square_platform/model.inc.c rename to actors_vanilla/bitfs/moving_square_platform/model.inc.c diff --git a/levels/bitfs/platform_on_track/collision.inc.c b/actors_vanilla/bitfs/platform_on_track/collision.inc.c similarity index 100% rename from levels/bitfs/platform_on_track/collision.inc.c rename to actors_vanilla/bitfs/platform_on_track/collision.inc.c diff --git a/levels/bitfs/platform_on_track/geo.inc.c b/actors_vanilla/bitfs/platform_on_track/geo.inc.c similarity index 100% rename from levels/bitfs/platform_on_track/geo.inc.c rename to actors_vanilla/bitfs/platform_on_track/geo.inc.c diff --git a/levels/bitfs/platform_on_track/model.inc.c b/actors_vanilla/bitfs/platform_on_track/model.inc.c similarity index 100% rename from levels/bitfs/platform_on_track/model.inc.c rename to actors_vanilla/bitfs/platform_on_track/model.inc.c diff --git a/levels/bitfs/seesaw_platform/collision.inc.c b/actors_vanilla/bitfs/seesaw_platform/collision.inc.c similarity index 100% rename from levels/bitfs/seesaw_platform/collision.inc.c rename to actors_vanilla/bitfs/seesaw_platform/collision.inc.c diff --git a/levels/bitfs/seesaw_platform/geo.inc.c b/actors_vanilla/bitfs/seesaw_platform/geo.inc.c similarity index 100% rename from levels/bitfs/seesaw_platform/geo.inc.c rename to actors_vanilla/bitfs/seesaw_platform/geo.inc.c diff --git a/levels/bitfs/seesaw_platform/model.inc.c b/actors_vanilla/bitfs/seesaw_platform/model.inc.c similarity index 100% rename from levels/bitfs/seesaw_platform/model.inc.c rename to actors_vanilla/bitfs/seesaw_platform/model.inc.c diff --git a/levels/bitfs/sinking_cage_platform/collision.inc.c b/actors_vanilla/bitfs/sinking_cage_platform/collision.inc.c similarity index 100% rename from levels/bitfs/sinking_cage_platform/collision.inc.c rename to actors_vanilla/bitfs/sinking_cage_platform/collision.inc.c diff --git a/levels/bitfs/sinking_cage_platform/geo.inc.c b/actors_vanilla/bitfs/sinking_cage_platform/geo.inc.c similarity index 100% rename from levels/bitfs/sinking_cage_platform/geo.inc.c rename to actors_vanilla/bitfs/sinking_cage_platform/geo.inc.c diff --git a/levels/bitfs/sinking_cage_platform/model.inc.c b/actors_vanilla/bitfs/sinking_cage_platform/model.inc.c similarity index 100% rename from levels/bitfs/sinking_cage_platform/model.inc.c rename to actors_vanilla/bitfs/sinking_cage_platform/model.inc.c diff --git a/levels/bitfs/sinking_cage_pole/geo.inc.c b/actors_vanilla/bitfs/sinking_cage_pole/geo.inc.c similarity index 100% rename from levels/bitfs/sinking_cage_pole/geo.inc.c rename to actors_vanilla/bitfs/sinking_cage_pole/geo.inc.c diff --git a/levels/bitfs/sinking_cage_pole/model.inc.c b/actors_vanilla/bitfs/sinking_cage_pole/model.inc.c similarity index 100% rename from levels/bitfs/sinking_cage_pole/model.inc.c rename to actors_vanilla/bitfs/sinking_cage_pole/model.inc.c diff --git a/levels/bitfs/sinking_platforms/collision.inc.c b/actors_vanilla/bitfs/sinking_platforms/collision.inc.c similarity index 100% rename from levels/bitfs/sinking_platforms/collision.inc.c rename to actors_vanilla/bitfs/sinking_platforms/collision.inc.c diff --git a/levels/bitfs/sinking_platforms/geo.inc.c b/actors_vanilla/bitfs/sinking_platforms/geo.inc.c similarity index 100% rename from levels/bitfs/sinking_platforms/geo.inc.c rename to actors_vanilla/bitfs/sinking_platforms/geo.inc.c diff --git a/levels/bitfs/sinking_platforms/model.inc.c b/actors_vanilla/bitfs/sinking_platforms/model.inc.c similarity index 100% rename from levels/bitfs/sinking_platforms/model.inc.c rename to actors_vanilla/bitfs/sinking_platforms/model.inc.c diff --git a/levels/bitfs/sliding_platform/collision.inc.c b/actors_vanilla/bitfs/sliding_platform/collision.inc.c similarity index 100% rename from levels/bitfs/sliding_platform/collision.inc.c rename to actors_vanilla/bitfs/sliding_platform/collision.inc.c diff --git a/levels/bitfs/sliding_platform/geo.inc.c b/actors_vanilla/bitfs/sliding_platform/geo.inc.c similarity index 100% rename from levels/bitfs/sliding_platform/geo.inc.c rename to actors_vanilla/bitfs/sliding_platform/geo.inc.c diff --git a/levels/bitfs/sliding_platform/model.inc.c b/actors_vanilla/bitfs/sliding_platform/model.inc.c similarity index 100% rename from levels/bitfs/sliding_platform/model.inc.c rename to actors_vanilla/bitfs/sliding_platform/model.inc.c diff --git a/levels/bitfs/stretching_platform/1.inc.c b/actors_vanilla/bitfs/stretching_platform/1.inc.c similarity index 100% rename from levels/bitfs/stretching_platform/1.inc.c rename to actors_vanilla/bitfs/stretching_platform/1.inc.c diff --git a/levels/bitfs/stretching_platform/2.inc.c b/actors_vanilla/bitfs/stretching_platform/2.inc.c similarity index 100% rename from levels/bitfs/stretching_platform/2.inc.c rename to actors_vanilla/bitfs/stretching_platform/2.inc.c diff --git a/levels/bitfs/stretching_platform/collision.inc.c b/actors_vanilla/bitfs/stretching_platform/collision.inc.c similarity index 100% rename from levels/bitfs/stretching_platform/collision.inc.c rename to actors_vanilla/bitfs/stretching_platform/collision.inc.c diff --git a/levels/bitfs/stretching_platform/geo.inc.c b/actors_vanilla/bitfs/stretching_platform/geo.inc.c similarity index 100% rename from levels/bitfs/stretching_platform/geo.inc.c rename to actors_vanilla/bitfs/stretching_platform/geo.inc.c diff --git a/actors_vanilla/bitfs/texture.inc.c b/actors_vanilla/bitfs/texture.inc.c new file mode 100644 index 0000000000..ce360f3035 --- /dev/null +++ b/actors_vanilla/bitfs/texture.inc.c @@ -0,0 +1,9 @@ +// 0x07000000 - 0x07001000 +ALIGNED8 static const Texture bitfs_seg7_texture_07000000[] = { +#include "actors_vanilla/bitfs/0.rgba16.inc.c" +}; + +// 0x07001000 - 0x07001800 +ALIGNED8 static const Texture bitfs_seg7_texture_07001000[] = { +#include "actors_vanilla/bitfs/1.rgba16.inc.c" +}; diff --git a/levels/bitfs/tilting_square_platform/collision.inc.c b/actors_vanilla/bitfs/tilting_square_platform/collision.inc.c similarity index 100% rename from levels/bitfs/tilting_square_platform/collision.inc.c rename to actors_vanilla/bitfs/tilting_square_platform/collision.inc.c diff --git a/levels/bitfs/tilting_square_platform/geo.inc.c b/actors_vanilla/bitfs/tilting_square_platform/geo.inc.c similarity index 100% rename from levels/bitfs/tilting_square_platform/geo.inc.c rename to actors_vanilla/bitfs/tilting_square_platform/geo.inc.c diff --git a/levels/bitfs/tilting_square_platform/model.inc.c b/actors_vanilla/bitfs/tilting_square_platform/model.inc.c similarity index 100% rename from levels/bitfs/tilting_square_platform/model.inc.c rename to actors_vanilla/bitfs/tilting_square_platform/model.inc.c diff --git a/levels/bitfs/tumbling_platform_far/geo.inc.c b/actors_vanilla/bitfs/tumbling_platform_far/geo.inc.c similarity index 100% rename from levels/bitfs/tumbling_platform_far/geo.inc.c rename to actors_vanilla/bitfs/tumbling_platform_far/geo.inc.c diff --git a/levels/bitfs/tumbling_platform_far/model.inc.c b/actors_vanilla/bitfs/tumbling_platform_far/model.inc.c similarity index 100% rename from levels/bitfs/tumbling_platform_far/model.inc.c rename to actors_vanilla/bitfs/tumbling_platform_far/model.inc.c diff --git a/levels/bitfs/tumbling_platform_near/collision.inc.c b/actors_vanilla/bitfs/tumbling_platform_near/collision.inc.c similarity index 100% rename from levels/bitfs/tumbling_platform_near/collision.inc.c rename to actors_vanilla/bitfs/tumbling_platform_near/collision.inc.c diff --git a/levels/bitfs/tumbling_platform_near/geo.inc.c b/actors_vanilla/bitfs/tumbling_platform_near/geo.inc.c similarity index 100% rename from levels/bitfs/tumbling_platform_near/geo.inc.c rename to actors_vanilla/bitfs/tumbling_platform_near/geo.inc.c diff --git a/levels/bitfs/tumbling_platform_near/model.inc.c b/actors_vanilla/bitfs/tumbling_platform_near/model.inc.c similarity index 100% rename from levels/bitfs/tumbling_platform_near/model.inc.c rename to actors_vanilla/bitfs/tumbling_platform_near/model.inc.c diff --git a/levels/bits/areas/1/20/collision.inc.c b/actors_vanilla/bits/20/collision.inc.c similarity index 100% rename from levels/bits/areas/1/20/collision.inc.c rename to actors_vanilla/bits/20/collision.inc.c diff --git a/levels/bits/areas/1/20/geo.inc.c b/actors_vanilla/bits/20/geo.inc.c similarity index 100% rename from levels/bits/areas/1/20/geo.inc.c rename to actors_vanilla/bits/20/geo.inc.c diff --git a/levels/bits/areas/1/20/model.inc.c b/actors_vanilla/bits/20/model.inc.c similarity index 100% rename from levels/bits/areas/1/20/model.inc.c rename to actors_vanilla/bits/20/model.inc.c diff --git a/levels/bits/areas/1/21/collision.inc.c b/actors_vanilla/bits/21/collision.inc.c similarity index 100% rename from levels/bits/areas/1/21/collision.inc.c rename to actors_vanilla/bits/21/collision.inc.c diff --git a/levels/bits/areas/1/21/geo.inc.c b/actors_vanilla/bits/21/geo.inc.c similarity index 100% rename from levels/bits/areas/1/21/geo.inc.c rename to actors_vanilla/bits/21/geo.inc.c diff --git a/levels/bits/areas/1/21/model.inc.c b/actors_vanilla/bits/21/model.inc.c similarity index 100% rename from levels/bits/areas/1/21/model.inc.c rename to actors_vanilla/bits/21/model.inc.c diff --git a/levels/bits/areas/1/22/collision.inc.c b/actors_vanilla/bits/22/collision.inc.c similarity index 100% rename from levels/bits/areas/1/22/collision.inc.c rename to actors_vanilla/bits/22/collision.inc.c diff --git a/levels/bits/areas/1/22/geo.inc.c b/actors_vanilla/bits/22/geo.inc.c similarity index 100% rename from levels/bits/areas/1/22/geo.inc.c rename to actors_vanilla/bits/22/geo.inc.c diff --git a/levels/bits/areas/1/22/model.inc.c b/actors_vanilla/bits/22/model.inc.c similarity index 100% rename from levels/bits/areas/1/22/model.inc.c rename to actors_vanilla/bits/22/model.inc.c diff --git a/levels/bits/areas/1/23/collision.inc.c b/actors_vanilla/bits/23/collision.inc.c similarity index 100% rename from levels/bits/areas/1/23/collision.inc.c rename to actors_vanilla/bits/23/collision.inc.c diff --git a/levels/bits/areas/1/23/geo.inc.c b/actors_vanilla/bits/23/geo.inc.c similarity index 100% rename from levels/bits/areas/1/23/geo.inc.c rename to actors_vanilla/bits/23/geo.inc.c diff --git a/levels/bits/areas/1/23/model.inc.c b/actors_vanilla/bits/23/model.inc.c similarity index 100% rename from levels/bits/areas/1/23/model.inc.c rename to actors_vanilla/bits/23/model.inc.c diff --git a/levels/bits/areas/1/24/collision.inc.c b/actors_vanilla/bits/24/collision.inc.c similarity index 100% rename from levels/bits/areas/1/24/collision.inc.c rename to actors_vanilla/bits/24/collision.inc.c diff --git a/levels/bits/areas/1/24/geo.inc.c b/actors_vanilla/bits/24/geo.inc.c similarity index 100% rename from levels/bits/areas/1/24/geo.inc.c rename to actors_vanilla/bits/24/geo.inc.c diff --git a/levels/bits/areas/1/24/model.inc.c b/actors_vanilla/bits/24/model.inc.c similarity index 100% rename from levels/bits/areas/1/24/model.inc.c rename to actors_vanilla/bits/24/model.inc.c diff --git a/levels/bits/areas/1/25/collision.inc.c b/actors_vanilla/bits/25/collision.inc.c similarity index 100% rename from levels/bits/areas/1/25/collision.inc.c rename to actors_vanilla/bits/25/collision.inc.c diff --git a/levels/bits/areas/1/25/geo.inc.c b/actors_vanilla/bits/25/geo.inc.c similarity index 100% rename from levels/bits/areas/1/25/geo.inc.c rename to actors_vanilla/bits/25/geo.inc.c diff --git a/levels/bits/areas/1/25/model.inc.c b/actors_vanilla/bits/25/model.inc.c similarity index 100% rename from levels/bits/areas/1/25/model.inc.c rename to actors_vanilla/bits/25/model.inc.c diff --git a/levels/bits/areas/1/26/collision.inc.c b/actors_vanilla/bits/26/collision.inc.c similarity index 100% rename from levels/bits/areas/1/26/collision.inc.c rename to actors_vanilla/bits/26/collision.inc.c diff --git a/levels/bits/areas/1/26/geo.inc.c b/actors_vanilla/bits/26/geo.inc.c similarity index 100% rename from levels/bits/areas/1/26/geo.inc.c rename to actors_vanilla/bits/26/geo.inc.c diff --git a/levels/bits/areas/1/26/model.inc.c b/actors_vanilla/bits/26/model.inc.c similarity index 100% rename from levels/bits/areas/1/26/model.inc.c rename to actors_vanilla/bits/26/model.inc.c diff --git a/levels/bits/areas/1/27/collision.inc.c b/actors_vanilla/bits/27/collision.inc.c similarity index 100% rename from levels/bits/areas/1/27/collision.inc.c rename to actors_vanilla/bits/27/collision.inc.c diff --git a/levels/bits/areas/1/27/geo.inc.c b/actors_vanilla/bits/27/geo.inc.c similarity index 100% rename from levels/bits/areas/1/27/geo.inc.c rename to actors_vanilla/bits/27/geo.inc.c diff --git a/levels/bits/areas/1/27/model.inc.c b/actors_vanilla/bits/27/model.inc.c similarity index 100% rename from levels/bits/areas/1/27/model.inc.c rename to actors_vanilla/bits/27/model.inc.c diff --git a/levels/bits/areas/1/28/collision.inc.c b/actors_vanilla/bits/28/collision.inc.c similarity index 100% rename from levels/bits/areas/1/28/collision.inc.c rename to actors_vanilla/bits/28/collision.inc.c diff --git a/levels/bits/areas/1/28/geo.inc.c b/actors_vanilla/bits/28/geo.inc.c similarity index 100% rename from levels/bits/areas/1/28/geo.inc.c rename to actors_vanilla/bits/28/geo.inc.c diff --git a/levels/bits/areas/1/28/model.inc.c b/actors_vanilla/bits/28/model.inc.c similarity index 100% rename from levels/bits/areas/1/28/model.inc.c rename to actors_vanilla/bits/28/model.inc.c diff --git a/levels/bits/areas/1/29/collision.inc.c b/actors_vanilla/bits/29/collision.inc.c similarity index 100% rename from levels/bits/areas/1/29/collision.inc.c rename to actors_vanilla/bits/29/collision.inc.c diff --git a/levels/bits/areas/1/29/geo.inc.c b/actors_vanilla/bits/29/geo.inc.c similarity index 100% rename from levels/bits/areas/1/29/geo.inc.c rename to actors_vanilla/bits/29/geo.inc.c diff --git a/levels/bits/areas/1/29/model.inc.c b/actors_vanilla/bits/29/model.inc.c similarity index 100% rename from levels/bits/areas/1/29/model.inc.c rename to actors_vanilla/bits/29/model.inc.c diff --git a/levels/bits/areas/1/30/collision.inc.c b/actors_vanilla/bits/30/collision.inc.c similarity index 100% rename from levels/bits/areas/1/30/collision.inc.c rename to actors_vanilla/bits/30/collision.inc.c diff --git a/levels/bits/areas/1/30/geo.inc.c b/actors_vanilla/bits/30/geo.inc.c similarity index 100% rename from levels/bits/areas/1/30/geo.inc.c rename to actors_vanilla/bits/30/geo.inc.c diff --git a/levels/bits/areas/1/30/model.inc.c b/actors_vanilla/bits/30/model.inc.c similarity index 100% rename from levels/bits/areas/1/30/model.inc.c rename to actors_vanilla/bits/30/model.inc.c diff --git a/levels/bits/areas/1/31/collision.inc.c b/actors_vanilla/bits/31/collision.inc.c similarity index 100% rename from levels/bits/areas/1/31/collision.inc.c rename to actors_vanilla/bits/31/collision.inc.c diff --git a/levels/bits/areas/1/31/geo.inc.c b/actors_vanilla/bits/31/geo.inc.c similarity index 100% rename from levels/bits/areas/1/31/geo.inc.c rename to actors_vanilla/bits/31/geo.inc.c diff --git a/levels/bits/areas/1/31/model.inc.c b/actors_vanilla/bits/31/model.inc.c similarity index 100% rename from levels/bits/areas/1/31/model.inc.c rename to actors_vanilla/bits/31/model.inc.c diff --git a/levels/bits/areas/1/32/collision.inc.c b/actors_vanilla/bits/32/collision.inc.c similarity index 100% rename from levels/bits/areas/1/32/collision.inc.c rename to actors_vanilla/bits/32/collision.inc.c diff --git a/levels/bits/areas/1/32/geo.inc.c b/actors_vanilla/bits/32/geo.inc.c similarity index 100% rename from levels/bits/areas/1/32/geo.inc.c rename to actors_vanilla/bits/32/geo.inc.c diff --git a/levels/bits/areas/1/32/model.inc.c b/actors_vanilla/bits/32/model.inc.c similarity index 100% rename from levels/bits/areas/1/32/model.inc.c rename to actors_vanilla/bits/32/model.inc.c diff --git a/actors_vanilla/bits/data.c b/actors_vanilla/bits/data.c new file mode 100644 index 0000000000..bc8f35c129 --- /dev/null +++ b/actors_vanilla/bits/data.c @@ -0,0 +1,38 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bits/texture.inc.c" + +#include "actors_vanilla/bits/20/model.inc.c" +#include "actors_vanilla/bits/21/model.inc.c" +#include "actors_vanilla/bits/22/model.inc.c" +#include "actors_vanilla/bits/23/model.inc.c" +#include "actors_vanilla/bits/24/model.inc.c" +#include "actors_vanilla/bits/25/model.inc.c" +#include "actors_vanilla/bits/26/model.inc.c" +#include "actors_vanilla/bits/27/model.inc.c" +#include "actors_vanilla/bits/28/model.inc.c" +#include "actors_vanilla/bits/29/model.inc.c" +#include "actors_vanilla/bits/30/model.inc.c" +#include "actors_vanilla/bits/31/model.inc.c" +#include "actors_vanilla/bits/32/model.inc.c" + +#include "actors_vanilla/bits/20/collision.inc.c" +#include "actors_vanilla/bits/21/collision.inc.c" +#include "actors_vanilla/bits/22/collision.inc.c" +#include "actors_vanilla/bits/23/collision.inc.c" +#include "actors_vanilla/bits/24/collision.inc.c" +#include "actors_vanilla/bits/25/collision.inc.c" +#include "actors_vanilla/bits/26/collision.inc.c" +#include "actors_vanilla/bits/27/collision.inc.c" +#include "actors_vanilla/bits/28/collision.inc.c" +#include "actors_vanilla/bits/29/collision.inc.c" +#include "actors_vanilla/bits/30/collision.inc.c" +#include "actors_vanilla/bits/31/collision.inc.c" +#include "actors_vanilla/bits/32/collision.inc.c" diff --git a/actors_vanilla/bits/geo.c b/actors_vanilla/bits/geo.c new file mode 100644 index 0000000000..ad54c65226 --- /dev/null +++ b/actors_vanilla/bits/geo.c @@ -0,0 +1,47 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bits/header.h" + +#include "actors_vanilla/bits/20/geo.inc.c" +#include "actors_vanilla/bits/21/geo.inc.c" +#include "actors_vanilla/bits/22/geo.inc.c" +#include "actors_vanilla/bits/23/geo.inc.c" +#include "actors_vanilla/bits/24/geo.inc.c" +#include "actors_vanilla/bits/25/geo.inc.c" +#include "actors_vanilla/bits/26/geo.inc.c" +#include "actors_vanilla/bits/27/geo.inc.c" +#include "actors_vanilla/bits/28/geo.inc.c" +#include "actors_vanilla/bits/29/geo.inc.c" +#include "actors_vanilla/bits/30/geo.inc.c" +#include "actors_vanilla/bits/31/geo.inc.c" +#include "actors_vanilla/bits/32/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_bits[] = { + LOAD_MODEL_FROM_GEO(MODEL_BITS_SLIDING_PLATFORM, bits_geo_0005E0), + LOAD_MODEL_FROM_GEO(MODEL_BITS_TWIN_SLIDING_PLATFORMS, bits_geo_0005F8), + LOAD_MODEL_FROM_GEO(MODEL_BITS_OCTAGONAL_PLATFORM, bits_geo_000610), + LOAD_MODEL_FROM_GEO(MODEL_BITS_BLUE_PLATFORM, bits_geo_000628), + LOAD_MODEL_FROM_GEO(MODEL_BITS_FERRIS_WHEEL_AXLE, bits_geo_000640), + LOAD_MODEL_FROM_GEO(MODEL_BITS_ARROW_PLATFORM, bits_geo_000658), + LOAD_MODEL_FROM_GEO(MODEL_BITS_SEESAW_PLATFORM, bits_geo_000670), + LOAD_MODEL_FROM_GEO(MODEL_BITS_TILTING_W_PLATFORM, bits_geo_000688), + LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE, bits_geo_0006A0), + LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME1, bits_geo_0006B8), + LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME2, bits_geo_0006D0), + LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME3, bits_geo_0006E8), + LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME4, bits_geo_000700), + RETURN(), +}; diff --git a/actors_vanilla/bits/header.h b/actors_vanilla/bits/header.h new file mode 100644 index 0000000000..28e74d589d --- /dev/null +++ b/actors_vanilla/bits/header.h @@ -0,0 +1,45 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout bits_geo_0005E0[]; +extern const GeoLayout bits_geo_0005F8[]; +extern const GeoLayout bits_geo_000610[]; +extern const GeoLayout bits_geo_000628[]; +extern const GeoLayout bits_geo_000640[]; +extern const GeoLayout bits_geo_000658[]; +extern const GeoLayout bits_geo_000670[]; +extern const GeoLayout bits_geo_000688[]; +extern const GeoLayout bits_geo_0006A0[]; +extern const GeoLayout bits_geo_0006B8[]; +extern const GeoLayout bits_geo_0006D0[]; +extern const GeoLayout bits_geo_0006E8[]; +extern const GeoLayout bits_geo_000700[]; + +extern const Gfx bits_seg7_dl_07012B10[]; +extern const Gfx bits_seg7_dl_07012D40[]; +extern const Gfx bits_seg7_dl_070135A0[]; +extern const Gfx bits_seg7_dl_07013820[]; +extern const Gfx bits_seg7_dl_07013C78[]; +extern const Gfx bits_seg7_dl_07013EF8[]; +extern const Gfx bits_seg7_dl_07014178[]; +extern const Gfx bits_seg7_dl_07014C28[]; +extern const Gfx bits_seg7_dl_070153C0[]; +extern const Gfx bits_seg7_dl_07015B60[]; +extern const Gfx bits_seg7_dl_07016300[]; +extern const Gfx bits_seg7_dl_07016AA0[]; +extern const Gfx bits_seg7_dl_07016DA0[]; + +extern const Collision bits_seg7_collision_0701A9A0[]; +extern const Collision bits_seg7_collision_0701AA0C[]; +extern const Collision bits_seg7_collision_0701AA84[]; +extern const Collision bits_seg7_collision_0701AC28[]; +extern const Collision bits_seg7_collision_0701ACAC[]; +extern const Collision bits_seg7_collision_arrow_platform[]; +extern const Collision bits_seg7_collision_0701ADD8[]; +extern const Collision bits_seg7_collision_0701AE5C[]; +extern const Collision bits_seg7_collision_0701B0D4[]; +extern const Collision bits_seg7_collision_0701B26C[]; +extern const Collision bits_seg7_collision_0701B404[]; +extern const Collision bits_seg7_collision_0701B59C[]; +extern const Collision bits_seg7_collision_0701B734[]; diff --git a/actors_vanilla/bits/texture.inc.c b/actors_vanilla/bits/texture.inc.c new file mode 100644 index 0000000000..aa67a57fa6 --- /dev/null +++ b/actors_vanilla/bits/texture.inc.c @@ -0,0 +1,4 @@ +// 0x07002000 - 0x07002800 +ALIGNED8 static const Texture bits_seg7_texture_07002000[] = { +#include "actors_vanilla/bits/2.rgba16.inc.c" +}; diff --git a/levels/bob/chain_chomp_gate/collision.inc.c b/actors_vanilla/bob/chain_chomp_gate/collision.inc.c similarity index 100% rename from levels/bob/chain_chomp_gate/collision.inc.c rename to actors_vanilla/bob/chain_chomp_gate/collision.inc.c diff --git a/levels/bob/chain_chomp_gate/geo.inc.c b/actors_vanilla/bob/chain_chomp_gate/geo.inc.c similarity index 100% rename from levels/bob/chain_chomp_gate/geo.inc.c rename to actors_vanilla/bob/chain_chomp_gate/geo.inc.c diff --git a/levels/bob/chain_chomp_gate/model.inc.c b/actors_vanilla/bob/chain_chomp_gate/model.inc.c similarity index 100% rename from levels/bob/chain_chomp_gate/model.inc.c rename to actors_vanilla/bob/chain_chomp_gate/model.inc.c diff --git a/actors_vanilla/bob/data.c b/actors_vanilla/bob/data.c new file mode 100644 index 0000000000..27e3c7decb --- /dev/null +++ b/actors_vanilla/bob/data.c @@ -0,0 +1,17 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bob/chain_chomp_gate/model.inc.c" +#include "actors_vanilla/bob/seesaw_platform/model.inc.c" +#include "actors_vanilla/bob/grate_door/model.inc.c" + +#include "actors_vanilla/bob/chain_chomp_gate/collision.inc.c" +#include "actors_vanilla/bob/seesaw_platform/collision.inc.c" +#include "actors_vanilla/bob/grate_door/collision.inc.c" diff --git a/actors_vanilla/bob/geo.c b/actors_vanilla/bob/geo.c new file mode 100644 index 0000000000..6a4af071d3 --- /dev/null +++ b/actors_vanilla/bob/geo.c @@ -0,0 +1,27 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/bob/header.h" + +#include "actors_vanilla/bob/chain_chomp_gate/geo.inc.c" +#include "actors_vanilla/bob/seesaw_platform/geo.inc.c" +#include "actors_vanilla/bob/grate_door/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_bob[] = { + LOAD_MODEL_FROM_GEO(MODEL_BOB_CHAIN_CHOMP_GATE, bob_geo_000440), + LOAD_MODEL_FROM_GEO(MODEL_BOB_SEESAW_PLATFORM, bob_geo_000458), + LOAD_MODEL_FROM_GEO(MODEL_BOB_BARS_GRILLS, bob_geo_000470), + RETURN(), +}; diff --git a/levels/bob/grate_door/collision.inc.c b/actors_vanilla/bob/grate_door/collision.inc.c similarity index 100% rename from levels/bob/grate_door/collision.inc.c rename to actors_vanilla/bob/grate_door/collision.inc.c diff --git a/levels/bob/grate_door/geo.inc.c b/actors_vanilla/bob/grate_door/geo.inc.c similarity index 100% rename from levels/bob/grate_door/geo.inc.c rename to actors_vanilla/bob/grate_door/geo.inc.c diff --git a/levels/bob/grate_door/model.inc.c b/actors_vanilla/bob/grate_door/model.inc.c similarity index 100% rename from levels/bob/grate_door/model.inc.c rename to actors_vanilla/bob/grate_door/model.inc.c diff --git a/actors_vanilla/bob/header.h b/actors_vanilla/bob/header.h new file mode 100644 index 0000000000..dc85ef6e73 --- /dev/null +++ b/actors_vanilla/bob/header.h @@ -0,0 +1,15 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout bob_geo_000440[]; +extern const GeoLayout bob_geo_000458[]; +extern const GeoLayout bob_geo_000470[]; + +extern const Gfx bob_seg7_dl_0700E458[]; +extern const Gfx bob_seg7_dl_0700E768[]; +extern const Gfx bob_seg7_dl_0700E8A0[]; + +extern const Collision bob_seg7_collision_chain_chomp_gate[]; +extern const Collision bob_seg7_collision_bridge[]; +extern const Collision bob_seg7_collision_gate[]; diff --git a/levels/bob/seesaw_platform/collision.inc.c b/actors_vanilla/bob/seesaw_platform/collision.inc.c similarity index 100% rename from levels/bob/seesaw_platform/collision.inc.c rename to actors_vanilla/bob/seesaw_platform/collision.inc.c diff --git a/levels/bob/seesaw_platform/geo.inc.c b/actors_vanilla/bob/seesaw_platform/geo.inc.c similarity index 100% rename from levels/bob/seesaw_platform/geo.inc.c rename to actors_vanilla/bob/seesaw_platform/geo.inc.c diff --git a/levels/bob/seesaw_platform/model.inc.c b/actors_vanilla/bob/seesaw_platform/model.inc.c similarity index 100% rename from levels/bob/seesaw_platform/model.inc.c rename to actors_vanilla/bob/seesaw_platform/model.inc.c diff --git a/levels/castle_grounds/areas/1/11/anim.inc.c b/actors_vanilla/castle_grounds/11/anim.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/11/anim.inc.c rename to actors_vanilla/castle_grounds/11/anim.inc.c diff --git a/levels/castle_grounds/areas/1/11/geo.inc.c b/actors_vanilla/castle_grounds/11/geo.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/11/geo.inc.c rename to actors_vanilla/castle_grounds/11/geo.inc.c diff --git a/levels/castle_grounds/areas/1/11/model.inc.c b/actors_vanilla/castle_grounds/11/model.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/11/model.inc.c rename to actors_vanilla/castle_grounds/11/model.inc.c diff --git a/levels/castle_grounds/areas/1/12/model.inc.c b/actors_vanilla/castle_grounds/12/model.inc.c similarity index 96% rename from levels/castle_grounds/areas/1/12/model.inc.c rename to actors_vanilla/castle_grounds/12/model.inc.c index 55129ae4c5..e9250dc8f1 100644 --- a/levels/castle_grounds/areas/1/12/model.inc.c +++ b/actors_vanilla/castle_grounds/12/model.inc.c @@ -19,12 +19,12 @@ static const Vtx castle_grounds_seg7_vertex_0700C9A8[] = { // 0x0700C9E8 - 0x0700D9E8 ALIGNED8 static const Texture castle_grounds_seg7_texture_0700C9E8[] = { -#include "levels/castle_grounds/3.rgba16.inc.c" +#include "actors_vanilla/castle_grounds/3.rgba16.inc.c" }; // 0x0700D9E8 - 0x0700E9E8 ALIGNED8 static const Texture castle_grounds_seg7_texture_0700D9E8[] = { -#include "levels/castle_grounds/4.rgba16.inc.c" +#include "actors_vanilla/castle_grounds/4.rgba16.inc.c" }; // 0x0700E9E8 - 0x0700EA20 diff --git a/levels/castle_grounds/areas/1/13/model.inc.c b/actors_vanilla/castle_grounds/13/model.inc.c similarity index 96% rename from levels/castle_grounds/areas/1/13/model.inc.c rename to actors_vanilla/castle_grounds/13/model.inc.c index 20e563d1b6..551c422415 100644 --- a/levels/castle_grounds/areas/1/13/model.inc.c +++ b/actors_vanilla/castle_grounds/13/model.inc.c @@ -1,5 +1,5 @@ ALIGNED8 static const Texture castle_grounds_seg7_us_texture_0700EAE8[] = { -#include "levels/castle_grounds/5.ia8.inc.c" +#include "actors_vanilla/castle_grounds/5.ia8.inc.c" }; // 0x0700F2E8 diff --git a/levels/castle_grounds/areas/1/7/collision.inc.c b/actors_vanilla/castle_grounds/7/collision.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/7/collision.inc.c rename to actors_vanilla/castle_grounds/7/collision.inc.c diff --git a/levels/castle_grounds/areas/1/7/geo.inc.c b/actors_vanilla/castle_grounds/7/geo.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/7/geo.inc.c rename to actors_vanilla/castle_grounds/7/geo.inc.c diff --git a/levels/castle_grounds/areas/1/7/model.inc.c b/actors_vanilla/castle_grounds/7/model.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/7/model.inc.c rename to actors_vanilla/castle_grounds/7/model.inc.c diff --git a/levels/castle_grounds/areas/1/8/collision.inc.c b/actors_vanilla/castle_grounds/8/collision.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/8/collision.inc.c rename to actors_vanilla/castle_grounds/8/collision.inc.c diff --git a/levels/castle_grounds/areas/1/8/geo.inc.c b/actors_vanilla/castle_grounds/8/geo.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/8/geo.inc.c rename to actors_vanilla/castle_grounds/8/geo.inc.c diff --git a/levels/castle_grounds/areas/1/8/model.inc.c b/actors_vanilla/castle_grounds/8/model.inc.c similarity index 100% rename from levels/castle_grounds/areas/1/8/model.inc.c rename to actors_vanilla/castle_grounds/8/model.inc.c diff --git a/actors_vanilla/castle_grounds/data.c b/actors_vanilla/castle_grounds/data.c new file mode 100644 index 0000000000..81cbd00ded --- /dev/null +++ b/actors_vanilla/castle_grounds/data.c @@ -0,0 +1,20 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/castle_grounds/7/model.inc.c" +#include "actors_vanilla/castle_grounds/8/model.inc.c" +#include "actors_vanilla/castle_grounds/11/model.inc.c" +#include "actors_vanilla/castle_grounds/12/model.inc.c" +#ifndef VERSION_JP +#include "actors_vanilla/castle_grounds/13/model.inc.c" +#endif +#include "actors_vanilla/castle_grounds/11/anim.inc.c" +#include "actors_vanilla/castle_grounds/7/collision.inc.c" +#include "actors_vanilla/castle_grounds/8/collision.inc.c" diff --git a/actors_vanilla/castle_grounds/geo.c b/actors_vanilla/castle_grounds/geo.c new file mode 100644 index 0000000000..ccc57aa43b --- /dev/null +++ b/actors_vanilla/castle_grounds/geo.c @@ -0,0 +1,27 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/castle_grounds/header.h" + +#include "actors_vanilla/castle_grounds/11/geo.inc.c" +#include "actors_vanilla/castle_grounds/7/geo.inc.c" +#include "actors_vanilla/castle_grounds/8/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_castle_grounds[] = { + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_VCUTM_GRILL, castle_grounds_geo_00070C), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_FLAG, castle_grounds_geo_000660), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_CANNON_GRILL, castle_grounds_geo_000724), + RETURN(), +}; diff --git a/actors_vanilla/castle_grounds/header.h b/actors_vanilla/castle_grounds/header.h new file mode 100644 index 0000000000..ece551f306 --- /dev/null +++ b/actors_vanilla/castle_grounds/header.h @@ -0,0 +1,19 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout castle_grounds_geo_000660[]; +extern const GeoLayout castle_grounds_geo_00070C[]; +extern const GeoLayout castle_grounds_geo_000724[]; + +extern const Gfx castle_grounds_seg7_dl_0700BB80[]; +extern const Gfx castle_grounds_seg7_dl_0700BC68[]; +extern const Gfx castle_grounds_seg7_dl_0700C670[]; +extern const Gfx castle_grounds_seg7_dl_0700C6A8[]; +extern const Gfx castle_grounds_seg7_dl_0700C6E8[]; +extern const Gfx castle_grounds_seg7_dl_0700C728[]; +extern const Gfx castle_grounds_seg7_dl_0700C768[]; +extern const Gfx castle_grounds_seg7_dl_0700EA58[]; +extern const Gfx castle_grounds_seg7_us_dl_0700F2E8[]; + +extern const struct Animation *const castle_grounds_seg7_anims_flags[]; diff --git a/actors_vanilla/castle_grounds/texture.inc.c b/actors_vanilla/castle_grounds/texture.inc.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/levels/castle_inside/clock_hour_hand/geo.inc.c b/actors_vanilla/castle_inside/clock_hour_hand/geo.inc.c similarity index 100% rename from levels/castle_inside/clock_hour_hand/geo.inc.c rename to actors_vanilla/castle_inside/clock_hour_hand/geo.inc.c diff --git a/levels/castle_inside/clock_hour_hand/model.inc.c b/actors_vanilla/castle_inside/clock_hour_hand/model.inc.c similarity index 100% rename from levels/castle_inside/clock_hour_hand/model.inc.c rename to actors_vanilla/castle_inside/clock_hour_hand/model.inc.c diff --git a/levels/castle_inside/clock_minute_hand/geo.inc.c b/actors_vanilla/castle_inside/clock_minute_hand/geo.inc.c similarity index 100% rename from levels/castle_inside/clock_minute_hand/geo.inc.c rename to actors_vanilla/castle_inside/clock_minute_hand/geo.inc.c diff --git a/levels/castle_inside/clock_minute_hand/model.inc.c b/actors_vanilla/castle_inside/clock_minute_hand/model.inc.c similarity index 100% rename from levels/castle_inside/clock_minute_hand/model.inc.c rename to actors_vanilla/castle_inside/clock_minute_hand/model.inc.c diff --git a/actors_vanilla/castle_inside/data.c b/actors_vanilla/castle_inside/data.c new file mode 100644 index 0000000000..f63b4e888f --- /dev/null +++ b/actors_vanilla/castle_inside/data.c @@ -0,0 +1,23 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/castle_inside/texture.inc.c" + +#include "actors_vanilla/castle_inside/trap_door/model.inc.c" +#include "actors_vanilla/castle_inside/star_door/model.inc.c" +#include "actors_vanilla/castle_inside/pendulum/model.inc.c" +#include "actors_vanilla/castle_inside/clock_minute_hand/model.inc.c" +#include "actors_vanilla/castle_inside/clock_hour_hand/model.inc.c" +#include "actors_vanilla/castle_inside/water_level_pillar/model.inc.c" +#include "actors_vanilla/castle_inside/wing_cap_light/model.inc.c" +#include "actors_vanilla/castle_inside/trap_door/collision.inc.c" +#include "actors_vanilla/castle_inside/star_door/collision.inc.c" +#include "actors_vanilla/castle_inside/water_level_pillar/collision.inc.c" +#include "actors_vanilla/castle_inside/ddd_warp/collision.inc.c" diff --git a/actors_vanilla/castle_inside/ddd_warp/collision.inc.c b/actors_vanilla/castle_inside/ddd_warp/collision.inc.c new file mode 100644 index 0000000000..c56c3a7578 --- /dev/null +++ b/actors_vanilla/castle_inside/ddd_warp/collision.inc.c @@ -0,0 +1,87 @@ +// 0x070775B4 - 0x0707768C +const Collision inside_castle_seg7_collision_ddd_warp[] = { + COL_INIT(), + COL_VERTEX_INIT(0x12), + COL_VERTEX(3866, -1074, 1587), + COL_VERTEX(3487, -1074, 1864), + COL_VERTEX(3866, -1074, 1864), + COL_VERTEX(3487, -1074, 1587), + COL_VERTEX(3487, -1074, 2135), + COL_VERTEX(3866, -1074, 2135), + COL_VERTEX(3487, -1074, 2406), + COL_VERTEX(3866, -1074, 2406), + COL_VERTEX(5939, -1074, 1587), + COL_VERTEX(5530, -1074, 1587), + COL_VERTEX(5530, -1074, 1864), + COL_VERTEX(5939, -1074, 1864), + COL_VERTEX(5530, -1074, 2135), + COL_VERTEX(5939, -1074, 2135), + COL_VERTEX(5530, -1074, 2406), + COL_VERTEX(5939, -1074, 2406), + COL_VERTEX(3456, -1074, 1587), + COL_VERTEX(3456, -1074, 2406), + COL_TRI_INIT(SURFACE_DEFAULT, 8), + COL_TRI(3, 16, 17), + COL_TRI(3, 17, 6), + COL_TRI(8, 9, 10), + COL_TRI(8, 10, 11), + COL_TRI(11, 10, 12), + COL_TRI(11, 12, 13), + COL_TRI(13, 12, 14), + COL_TRI(13, 14, 15), + COL_TRI_INIT(SURFACE_PAINTING_WARP_E8, 2), + COL_TRI(0, 1, 2), + COL_TRI(0, 3, 1), + COL_TRI_INIT(SURFACE_PAINTING_WARP_E9, 2), + COL_TRI(2, 1, 4), + COL_TRI(2, 4, 5), + COL_TRI_INIT(SURFACE_PAINTING_WARP_EA, 2), + COL_TRI(5, 6, 7), + COL_TRI(5, 4, 6), + COL_TRI_STOP(), + COL_END(), +}; + +// 0x0707768C - 0x07077764 +const Collision inside_castle_seg7_collision_ddd_warp_2[] = { + COL_INIT(), + COL_VERTEX_INIT(0x12), + COL_VERTEX(5939, -1074, 1587), + COL_VERTEX(5560, -1074, 1864), + COL_VERTEX(5939, -1074, 1864), + COL_VERTEX(5560, -1074, 1587), + COL_VERTEX(5560, -1074, 2135), + COL_VERTEX(5939, -1074, 2135), + COL_VERTEX(5560, -1074, 2406), + COL_VERTEX(5939, -1074, 2406), + COL_VERTEX(5530, -1074, 1587), + COL_VERTEX(5530, -1074, 2406), + COL_VERTEX(3866, -1074, 1864), + COL_VERTEX(3456, -1074, 2135), + COL_VERTEX(3866, -1074, 2135), + COL_VERTEX(3456, -1074, 2406), + COL_VERTEX(3866, -1074, 2406), + COL_VERTEX(3456, -1074, 1864), + COL_VERTEX(3866, -1074, 1587), + COL_VERTEX(3456, -1074, 1587), + COL_TRI_INIT(SURFACE_DEFAULT, 8), + COL_TRI(8, 9, 6), + COL_TRI(8, 6, 3), + COL_TRI(10, 11, 12), + COL_TRI(12, 13, 14), + COL_TRI(12, 11, 13), + COL_TRI(10, 15, 11), + COL_TRI(16, 15, 10), + COL_TRI(16, 17, 15), + COL_TRI_INIT(SURFACE_PAINTING_WARP_E8, 2), + COL_TRI(0, 1, 2), + COL_TRI(0, 3, 1), + COL_TRI_INIT(SURFACE_PAINTING_WARP_E9, 2), + COL_TRI(2, 4, 5), + COL_TRI(2, 1, 4), + COL_TRI_INIT(SURFACE_PAINTING_WARP_EA, 2), + COL_TRI(5, 4, 6), + COL_TRI(5, 6, 7), + COL_TRI_STOP(), + COL_END(), +}; diff --git a/actors_vanilla/castle_inside/geo.c b/actors_vanilla/castle_inside/geo.c new file mode 100644 index 0000000000..baf62d68eb --- /dev/null +++ b/actors_vanilla/castle_inside/geo.c @@ -0,0 +1,38 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/castle_inside/header.h" + +#include "actors_vanilla/castle_inside/star_door/geo.inc.c" +#include "actors_vanilla/castle_inside/trap_door/geo.inc.c" +#include "actors_vanilla/castle_inside/clock_minute_hand/geo.inc.c" +#include "actors_vanilla/castle_inside/clock_hour_hand/geo.inc.c" +#include "actors_vanilla/castle_inside/water_level_pillar/geo.inc.c" +#include "actors_vanilla/castle_inside/pendulum/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_castle_inside[] = { + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_BOWSER_TRAP, castle_geo_000F18), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WATER_LEVEL_PILLAR, castle_geo_001940), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CLOCK_MINUTE_HAND, castle_geo_001530), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CLOCK_HOUR_HAND, castle_geo_001548), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CLOCK_PENDULUM, castle_geo_001518), + // The different sets of star doors all use different model IDs, despite them all loading the same geo layout. + // It is possible that star doors were originally going to have numbers on them, similar to the other locked doors. + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_30_STARS, castle_geo_000F00), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_8_STARS, castle_geo_000F00), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_50_STARS, castle_geo_000F00), + LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_70_STARS, castle_geo_000F00), + RETURN(), +}; diff --git a/actors_vanilla/castle_inside/header.h b/actors_vanilla/castle_inside/header.h new file mode 100644 index 0000000000..fdb1ee1075 --- /dev/null +++ b/actors_vanilla/castle_inside/header.h @@ -0,0 +1,45 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout castle_geo_000F00[]; +extern const GeoLayout castle_geo_000F18[]; +extern const GeoLayout castle_geo_001518[]; +extern const GeoLayout castle_geo_001530[]; +extern const GeoLayout castle_geo_001548[]; +extern const GeoLayout castle_geo_001560[]; +extern const GeoLayout castle_geo_001578[]; +extern const GeoLayout castle_geo_0015B8[]; +extern const GeoLayout castle_geo_0015F8[]; +extern const GeoLayout castle_geo_001628[]; +extern const GeoLayout castle_geo_001668[]; +extern const GeoLayout castle_geo_001690[]; +extern const GeoLayout castle_geo_0016D8[]; +extern const GeoLayout castle_geo_001740[]; +extern const GeoLayout castle_geo_001798[]; +extern const GeoLayout castle_geo_001800[]; +extern const GeoLayout castle_geo_001940[]; +extern const GeoLayout castle_geo_001958[]; +extern const GeoLayout castle_geo_001980[]; +extern const GeoLayout castle_geo_0019C8[]; +extern const GeoLayout castle_geo_0019F8[]; +extern const GeoLayout castle_geo_001A30[]; +extern const GeoLayout castle_geo_001A58[]; +extern const GeoLayout castle_geo_001AB8[]; +extern const GeoLayout castle_geo_001AF8[]; +extern const GeoLayout castle_geo_001B48[]; +extern const GeoLayout castle_geo_001BB0[]; + +extern const Gfx inside_castle_seg7_dl_0703BCB8[]; +extern const Gfx inside_castle_seg7_dl_0703BFA8[]; +extern const Gfx inside_castle_seg7_dl_070512F8[]; +extern const Gfx inside_castle_seg7_dl_07058950[]; +extern const Gfx inside_castle_seg7_dl_07059190[]; +extern const Gfx inside_castle_seg7_dl_07068B10[]; +extern const Gfx dl_castle_lobby_wing_cap_light[]; + +extern const Collision inside_castle_seg7_collision_floor_trap[]; +extern const Collision inside_castle_seg7_collision_star_door[]; +extern const Collision inside_castle_seg7_collision_water_level_pillar[]; +extern const Collision inside_castle_seg7_collision_ddd_warp[]; +extern const Collision inside_castle_seg7_collision_ddd_warp_2[]; diff --git a/levels/castle_inside/areas/2/pendulum/geo.inc.c b/actors_vanilla/castle_inside/pendulum/geo.inc.c similarity index 100% rename from levels/castle_inside/areas/2/pendulum/geo.inc.c rename to actors_vanilla/castle_inside/pendulum/geo.inc.c diff --git a/levels/castle_inside/areas/2/pendulum/model.inc.c b/actors_vanilla/castle_inside/pendulum/model.inc.c similarity index 100% rename from levels/castle_inside/areas/2/pendulum/model.inc.c rename to actors_vanilla/castle_inside/pendulum/model.inc.c diff --git a/levels/castle_inside/star_door/collision.inc.c b/actors_vanilla/castle_inside/star_door/collision.inc.c similarity index 100% rename from levels/castle_inside/star_door/collision.inc.c rename to actors_vanilla/castle_inside/star_door/collision.inc.c diff --git a/levels/castle_inside/star_door/geo.inc.c b/actors_vanilla/castle_inside/star_door/geo.inc.c similarity index 100% rename from levels/castle_inside/star_door/geo.inc.c rename to actors_vanilla/castle_inside/star_door/geo.inc.c diff --git a/levels/castle_inside/star_door/model.inc.c b/actors_vanilla/castle_inside/star_door/model.inc.c similarity index 100% rename from levels/castle_inside/star_door/model.inc.c rename to actors_vanilla/castle_inside/star_door/model.inc.c diff --git a/actors_vanilla/castle_inside/texture.inc.c b/actors_vanilla/castle_inside/texture.inc.c new file mode 100644 index 0000000000..3c584818aa --- /dev/null +++ b/actors_vanilla/castle_inside/texture.inc.c @@ -0,0 +1,18 @@ +// 0x07003800 - 0x07004800 +ALIGNED8 static const Texture inside_castle_seg7_texture_07003800[] = { +#include "actors_vanilla/castle_inside/5.rgba16.inc.c" +}; + +// 0x07004800 - 0x07005800 +ALIGNED8 static const Texture inside_castle_seg7_texture_07004800[] = { +#include "actors_vanilla/castle_inside/6.rgba16.inc.c" +}; + +// 0x07005800 - 0x07006000 +ALIGNED8 static const Texture inside_castle_seg7_texture_07005800[] = { +#include "actors_vanilla/castle_inside/7.rgba16.inc.c" +}; + +ALIGNED8 static const Texture texture_castle_light[] = { +#include "actors_vanilla/castle_inside/castle_light.ia16.inc.c" +}; diff --git a/levels/castle_inside/trap_door/collision.inc.c b/actors_vanilla/castle_inside/trap_door/collision.inc.c similarity index 100% rename from levels/castle_inside/trap_door/collision.inc.c rename to actors_vanilla/castle_inside/trap_door/collision.inc.c diff --git a/levels/castle_inside/trap_door/geo.inc.c b/actors_vanilla/castle_inside/trap_door/geo.inc.c similarity index 100% rename from levels/castle_inside/trap_door/geo.inc.c rename to actors_vanilla/castle_inside/trap_door/geo.inc.c diff --git a/levels/castle_inside/trap_door/model.inc.c b/actors_vanilla/castle_inside/trap_door/model.inc.c similarity index 100% rename from levels/castle_inside/trap_door/model.inc.c rename to actors_vanilla/castle_inside/trap_door/model.inc.c diff --git a/levels/castle_inside/water_level_pillar/collision.inc.c b/actors_vanilla/castle_inside/water_level_pillar/collision.inc.c similarity index 100% rename from levels/castle_inside/water_level_pillar/collision.inc.c rename to actors_vanilla/castle_inside/water_level_pillar/collision.inc.c diff --git a/levels/castle_inside/water_level_pillar/geo.inc.c b/actors_vanilla/castle_inside/water_level_pillar/geo.inc.c similarity index 100% rename from levels/castle_inside/water_level_pillar/geo.inc.c rename to actors_vanilla/castle_inside/water_level_pillar/geo.inc.c diff --git a/levels/castle_inside/water_level_pillar/model.inc.c b/actors_vanilla/castle_inside/water_level_pillar/model.inc.c similarity index 100% rename from levels/castle_inside/water_level_pillar/model.inc.c rename to actors_vanilla/castle_inside/water_level_pillar/model.inc.c diff --git a/levels/castle_inside/areas/1/5/model.inc.c b/actors_vanilla/castle_inside/wing_cap_light/model.inc.c similarity index 100% rename from levels/castle_inside/areas/1/5/model.inc.c rename to actors_vanilla/castle_inside/wing_cap_light/model.inc.c diff --git a/actors_vanilla/ccm/data.c b/actors_vanilla/ccm/data.c new file mode 100644 index 0000000000..d69f250454 --- /dev/null +++ b/actors_vanilla/ccm/data.c @@ -0,0 +1,18 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ccm/texture.inc.c" + +#include "actors_vanilla/ccm/ropeway_lift/1.inc.c" +#include "actors_vanilla/ccm/ropeway_lift/2.inc.c" +#include "actors_vanilla/ccm/snowman_base/model.inc.c" +#include "actors_vanilla/ccm/snowman_head/1.inc.c" +#include "actors_vanilla/ccm/snowman_head/2.inc.c" +#include "actors_vanilla/ccm/ropeway_lift/collision.inc.c" diff --git a/actors_vanilla/ccm/geo.c b/actors_vanilla/ccm/geo.c new file mode 100644 index 0000000000..2dbd25dab4 --- /dev/null +++ b/actors_vanilla/ccm/geo.c @@ -0,0 +1,27 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ccm/header.h" + +#include "actors_vanilla/ccm/ropeway_lift/geo.inc.c" +#include "actors_vanilla/ccm/snowman_base/geo.inc.c" +#include "actors_vanilla/ccm/snowman_head/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_ccm[] = { + LOAD_MODEL_FROM_GEO(MODEL_CCM_ROPEWAY_LIFT, ccm_geo_0003D0), + LOAD_MODEL_FROM_GEO(MODEL_CCM_SNOWMAN_BASE, ccm_geo_0003F0), + LOAD_MODEL_FROM_GEO(MODEL_CCM_SNOWMAN_HEAD, ccm_geo_00040C), + RETURN(), +}; diff --git a/actors_vanilla/ccm/header.h b/actors_vanilla/ccm/header.h new file mode 100644 index 0000000000..cb75064366 --- /dev/null +++ b/actors_vanilla/ccm/header.h @@ -0,0 +1,15 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout ccm_geo_0003D0[]; +extern const GeoLayout ccm_geo_0003F0[]; +extern const GeoLayout ccm_geo_00040C[]; + +extern const Gfx ccm_seg7_dl_07010F28[]; +extern const Gfx ccm_seg7_dl_070118B0[]; +extern const Gfx ccm_seg7_dl_07012BD8[]; +extern const Gfx ccm_seg7_dl_070136D0[]; +extern const Gfx ccm_seg7_dl_07013870[]; + +extern const Collision ccm_seg7_collision_ropeway_lift[]; diff --git a/levels/ccm/ropeway_lift/1.inc.c b/actors_vanilla/ccm/ropeway_lift/1.inc.c similarity index 100% rename from levels/ccm/ropeway_lift/1.inc.c rename to actors_vanilla/ccm/ropeway_lift/1.inc.c diff --git a/levels/ccm/ropeway_lift/2.inc.c b/actors_vanilla/ccm/ropeway_lift/2.inc.c similarity index 100% rename from levels/ccm/ropeway_lift/2.inc.c rename to actors_vanilla/ccm/ropeway_lift/2.inc.c diff --git a/levels/ccm/ropeway_lift/collision.inc.c b/actors_vanilla/ccm/ropeway_lift/collision.inc.c similarity index 100% rename from levels/ccm/ropeway_lift/collision.inc.c rename to actors_vanilla/ccm/ropeway_lift/collision.inc.c diff --git a/levels/ccm/ropeway_lift/geo.inc.c b/actors_vanilla/ccm/ropeway_lift/geo.inc.c similarity index 100% rename from levels/ccm/ropeway_lift/geo.inc.c rename to actors_vanilla/ccm/ropeway_lift/geo.inc.c diff --git a/levels/ccm/snowman_base/geo.inc.c b/actors_vanilla/ccm/snowman_base/geo.inc.c similarity index 100% rename from levels/ccm/snowman_base/geo.inc.c rename to actors_vanilla/ccm/snowman_base/geo.inc.c diff --git a/levels/ccm/snowman_base/model.inc.c b/actors_vanilla/ccm/snowman_base/model.inc.c similarity index 99% rename from levels/ccm/snowman_base/model.inc.c rename to actors_vanilla/ccm/snowman_base/model.inc.c index ce56ce6b45..c62199a882 100644 --- a/levels/ccm/snowman_base/model.inc.c +++ b/actors_vanilla/ccm/snowman_base/model.inc.c @@ -2,7 +2,7 @@ // 0x07011958 - 0x07012158 ALIGNED8 static const Texture ccm_seg7_texture_07011958[] = { -#include "levels/ccm/12.rgba16.inc.c" +#include "actors_vanilla/ccm/12.rgba16.inc.c" }; // 0x07012158 - 0x07012258 diff --git a/levels/ccm/snowman_head/1.inc.c b/actors_vanilla/ccm/snowman_head/1.inc.c similarity index 100% rename from levels/ccm/snowman_head/1.inc.c rename to actors_vanilla/ccm/snowman_head/1.inc.c diff --git a/levels/ccm/snowman_head/2.inc.c b/actors_vanilla/ccm/snowman_head/2.inc.c similarity index 100% rename from levels/ccm/snowman_head/2.inc.c rename to actors_vanilla/ccm/snowman_head/2.inc.c diff --git a/levels/ccm/snowman_head/geo.inc.c b/actors_vanilla/ccm/snowman_head/geo.inc.c similarity index 100% rename from levels/ccm/snowman_head/geo.inc.c rename to actors_vanilla/ccm/snowman_head/geo.inc.c diff --git a/actors_vanilla/ccm/texture.inc.c b/actors_vanilla/ccm/texture.inc.c new file mode 100644 index 0000000000..6f310c823c --- /dev/null +++ b/actors_vanilla/ccm/texture.inc.c @@ -0,0 +1,24 @@ +// 0x07000800 - 0x07000900 +ALIGNED8 static const Texture ccm_seg7_texture_07000800[] = { +#include "actors_vanilla/ccm/1.rgba16.inc.c" +}; + +// 0x07000900 - 0x07001100 +ALIGNED8 static const Texture ccm_seg7_texture_07000900[] = { +#include "actors_vanilla/ccm/2.rgba16.inc.c" +}; + +// 0x07001100 - 0x07001900 +ALIGNED8 static const Texture ccm_seg7_texture_07001100[] = { +#include "actors_vanilla/ccm/3.rgba16.inc.c" +}; + +// 0x07002100 - 0x07002900 +ALIGNED8 static const Texture ccm_seg7_texture_07002100[] = { +#include "actors_vanilla/ccm/5.rgba16.inc.c" +}; + +// 0x07002900 - 0x07003100 +ALIGNED8 static const Texture ccm_seg7_texture_07002900[] = { +#include "actors_vanilla/ccm/6.rgba16.inc.c" +}; diff --git a/actors_vanilla/ddd/data.c b/actors_vanilla/ddd/data.c new file mode 100644 index 0000000000..97919746f4 --- /dev/null +++ b/actors_vanilla/ddd/data.c @@ -0,0 +1,23 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ddd/texture.inc.c" + +#include "actors_vanilla/ddd/sub_door/1.inc.c" +#include "actors_vanilla/ddd/sub_door/2.inc.c" +#include "actors_vanilla/ddd/sub_door/3.inc.c" +#include "actors_vanilla/ddd/submarine/1.inc.c" +#include "actors_vanilla/ddd/submarine/2.inc.c" +#include "actors_vanilla/ddd/pole/model.inc.c" +#include "actors_vanilla/ddd/submarine/collision.inc.c" +#include "actors_vanilla/ddd/sub_door/collision.inc.c" diff --git a/actors_vanilla/ddd/geo.c b/actors_vanilla/ddd/geo.c new file mode 100644 index 0000000000..228f78629a --- /dev/null +++ b/actors_vanilla/ddd/geo.c @@ -0,0 +1,27 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ddd/header.h" + +#include "actors_vanilla/ddd/pole/geo.inc.c" +#include "actors_vanilla/ddd/sub_door/geo.inc.c" +#include "actors_vanilla/ddd/submarine/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_ddd[] = { + LOAD_MODEL_FROM_GEO(MODEL_DDD_BOWSER_SUB_DOOR, ddd_geo_000478), + LOAD_MODEL_FROM_GEO(MODEL_DDD_BOWSER_SUB, ddd_geo_0004A0), + LOAD_MODEL_FROM_GEO(MODEL_DDD_POLE, ddd_geo_000450), + RETURN(), +}; diff --git a/actors_vanilla/ddd/header.h b/actors_vanilla/ddd/header.h new file mode 100644 index 0000000000..4c2a96b2ba --- /dev/null +++ b/actors_vanilla/ddd/header.h @@ -0,0 +1,17 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout ddd_geo_000450[]; +extern const GeoLayout ddd_geo_000478[]; +extern const GeoLayout ddd_geo_0004A0[]; + +extern const Gfx ddd_seg7_dl_07009030[]; +extern const Gfx ddd_seg7_dl_07009120[]; +extern const Gfx ddd_seg7_dl_07009208[]; +extern const Gfx ddd_seg7_dl_0700AF10[]; +extern const Gfx ddd_seg7_dl_0700B068[]; +extern const Gfx ddd_seg7_dl_0700D2A0[]; + +extern const Collision ddd_seg7_collision_submarine[]; +extern const Collision ddd_seg7_collision_bowser_sub_door[]; diff --git a/levels/ddd/pole/geo.inc.c b/actors_vanilla/ddd/pole/geo.inc.c similarity index 100% rename from levels/ddd/pole/geo.inc.c rename to actors_vanilla/ddd/pole/geo.inc.c diff --git a/levels/ddd/pole/model.inc.c b/actors_vanilla/ddd/pole/model.inc.c similarity index 100% rename from levels/ddd/pole/model.inc.c rename to actors_vanilla/ddd/pole/model.inc.c diff --git a/levels/ddd/sub_door/1.inc.c b/actors_vanilla/ddd/sub_door/1.inc.c similarity index 100% rename from levels/ddd/sub_door/1.inc.c rename to actors_vanilla/ddd/sub_door/1.inc.c diff --git a/levels/ddd/sub_door/2.inc.c b/actors_vanilla/ddd/sub_door/2.inc.c similarity index 100% rename from levels/ddd/sub_door/2.inc.c rename to actors_vanilla/ddd/sub_door/2.inc.c diff --git a/levels/ddd/sub_door/3.inc.c b/actors_vanilla/ddd/sub_door/3.inc.c similarity index 100% rename from levels/ddd/sub_door/3.inc.c rename to actors_vanilla/ddd/sub_door/3.inc.c diff --git a/levels/ddd/sub_door/collision.inc.c b/actors_vanilla/ddd/sub_door/collision.inc.c similarity index 100% rename from levels/ddd/sub_door/collision.inc.c rename to actors_vanilla/ddd/sub_door/collision.inc.c diff --git a/levels/ddd/sub_door/geo.inc.c b/actors_vanilla/ddd/sub_door/geo.inc.c similarity index 100% rename from levels/ddd/sub_door/geo.inc.c rename to actors_vanilla/ddd/sub_door/geo.inc.c diff --git a/levels/ddd/submarine/1.inc.c b/actors_vanilla/ddd/submarine/1.inc.c similarity index 100% rename from levels/ddd/submarine/1.inc.c rename to actors_vanilla/ddd/submarine/1.inc.c diff --git a/levels/ddd/submarine/2.inc.c b/actors_vanilla/ddd/submarine/2.inc.c similarity index 100% rename from levels/ddd/submarine/2.inc.c rename to actors_vanilla/ddd/submarine/2.inc.c diff --git a/levels/ddd/submarine/collision.inc.c b/actors_vanilla/ddd/submarine/collision.inc.c similarity index 100% rename from levels/ddd/submarine/collision.inc.c rename to actors_vanilla/ddd/submarine/collision.inc.c diff --git a/levels/ddd/submarine/geo.inc.c b/actors_vanilla/ddd/submarine/geo.inc.c similarity index 100% rename from levels/ddd/submarine/geo.inc.c rename to actors_vanilla/ddd/submarine/geo.inc.c diff --git a/actors_vanilla/ddd/texture.inc.c b/actors_vanilla/ddd/texture.inc.c new file mode 100644 index 0000000000..17cef28ab3 --- /dev/null +++ b/actors_vanilla/ddd/texture.inc.c @@ -0,0 +1,14 @@ +// 0x07000000 - 0x07001000 +ALIGNED8 static const Texture ddd_seg7_texture_07000000[] = { +#include "actors_vanilla/ddd/0.rgba16.inc.c" +}; + +// 0x07001800 - 0x07002000 +ALIGNED8 static const Texture ddd_seg7_texture_07001800[] = { +#include "actors_vanilla/ddd/2.rgba16.inc.c" +}; + +// 0x07003000 - 0x07003800 +ALIGNED8 static const Texture ddd_seg7_texture_07003000[] = { +#include "actors_vanilla/ddd/4.rgba16.inc.c" +}; diff --git a/levels/hmc/arrow_platform/collision.inc.c b/actors_vanilla/hmc/arrow_platform/collision.inc.c similarity index 100% rename from levels/hmc/arrow_platform/collision.inc.c rename to actors_vanilla/hmc/arrow_platform/collision.inc.c diff --git a/levels/hmc/arrow_platform/geo.inc.c b/actors_vanilla/hmc/arrow_platform/geo.inc.c similarity index 100% rename from levels/hmc/arrow_platform/geo.inc.c rename to actors_vanilla/hmc/arrow_platform/geo.inc.c diff --git a/levels/hmc/arrow_platform/model.inc.c b/actors_vanilla/hmc/arrow_platform/model.inc.c similarity index 100% rename from levels/hmc/arrow_platform/model.inc.c rename to actors_vanilla/hmc/arrow_platform/model.inc.c diff --git a/levels/hmc/arrow_platform_button/collision.inc.c b/actors_vanilla/hmc/arrow_platform_button/collision.inc.c similarity index 100% rename from levels/hmc/arrow_platform_button/collision.inc.c rename to actors_vanilla/hmc/arrow_platform_button/collision.inc.c diff --git a/levels/hmc/arrow_platform_button/geo.inc.c b/actors_vanilla/hmc/arrow_platform_button/geo.inc.c similarity index 100% rename from levels/hmc/arrow_platform_button/geo.inc.c rename to actors_vanilla/hmc/arrow_platform_button/geo.inc.c diff --git a/levels/hmc/arrow_platform_button/model.inc.c b/actors_vanilla/hmc/arrow_platform_button/model.inc.c similarity index 100% rename from levels/hmc/arrow_platform_button/model.inc.c rename to actors_vanilla/hmc/arrow_platform_button/model.inc.c diff --git a/actors_vanilla/hmc/data.c b/actors_vanilla/hmc/data.c new file mode 100644 index 0000000000..593115c8f9 --- /dev/null +++ b/actors_vanilla/hmc/data.c @@ -0,0 +1,23 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/hmc/texture.inc.c" + +#include "actors_vanilla/hmc/elevator_platform/model.inc.c" +#include "actors_vanilla/hmc/arrow_platform/model.inc.c" +#include "actors_vanilla/hmc/arrow_platform_button/model.inc.c" +#include "actors_vanilla/hmc/rolling_rock/model.inc.c" +#include "actors_vanilla/hmc/rolling_rock_fragment_1/model.inc.c" +#include "actors_vanilla/hmc/rolling_rock_fragment_2/model.inc.c" +#include "actors_vanilla/hmc/elevator_platform/collision.inc.c" +#include "actors_vanilla/hmc/grill_door/model.inc.c" +#include "actors_vanilla/hmc/grill_door/collision.inc.c" +#include "actors_vanilla/hmc/arrow_platform/collision.inc.c" +#include "actors_vanilla/hmc/arrow_platform_button/collision.inc.c" diff --git a/levels/hmc/elevator_platform/collision.inc.c b/actors_vanilla/hmc/elevator_platform/collision.inc.c similarity index 100% rename from levels/hmc/elevator_platform/collision.inc.c rename to actors_vanilla/hmc/elevator_platform/collision.inc.c diff --git a/levels/hmc/elevator_platform/geo.inc.c b/actors_vanilla/hmc/elevator_platform/geo.inc.c similarity index 100% rename from levels/hmc/elevator_platform/geo.inc.c rename to actors_vanilla/hmc/elevator_platform/geo.inc.c diff --git a/levels/hmc/elevator_platform/model.inc.c b/actors_vanilla/hmc/elevator_platform/model.inc.c similarity index 100% rename from levels/hmc/elevator_platform/model.inc.c rename to actors_vanilla/hmc/elevator_platform/model.inc.c diff --git a/actors_vanilla/hmc/geo.c b/actors_vanilla/hmc/geo.c new file mode 100644 index 0000000000..623be262a4 --- /dev/null +++ b/actors_vanilla/hmc/geo.c @@ -0,0 +1,35 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/hmc/header.h" + +#include "actors_vanilla/hmc/grill_door/geo.inc.c" +#include "actors_vanilla/hmc/rolling_rock/geo.inc.c" +#include "actors_vanilla/hmc/rolling_rock_fragment_1/geo.inc.c" +#include "actors_vanilla/hmc/rolling_rock_fragment_2/geo.inc.c" +#include "actors_vanilla/hmc/arrow_platform/geo.inc.c" +#include "actors_vanilla/hmc/arrow_platform_button/geo.inc.c" +#include "actors_vanilla/hmc/elevator_platform/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_hmc[] = { + LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_PLATFORM, hmc_geo_0005A0), + LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_ARROW_PLATFORM, hmc_geo_0005B8), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ELEVATOR_PLATFORM, hmc_geo_0005D0), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ROLLING_ROCK, hmc_geo_000548), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_PIECE, hmc_geo_000570), + LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_SMALL_PIECE, hmc_geo_000588), + LOAD_MODEL_FROM_GEO(MODEL_HMC_RED_GRILLS, hmc_geo_000530), + RETURN(), +}; diff --git a/levels/hmc/grill_door/collision.inc.c b/actors_vanilla/hmc/grill_door/collision.inc.c similarity index 100% rename from levels/hmc/grill_door/collision.inc.c rename to actors_vanilla/hmc/grill_door/collision.inc.c diff --git a/levels/hmc/grill_door/geo.inc.c b/actors_vanilla/hmc/grill_door/geo.inc.c similarity index 100% rename from levels/hmc/grill_door/geo.inc.c rename to actors_vanilla/hmc/grill_door/geo.inc.c diff --git a/levels/hmc/grill_door/model.inc.c b/actors_vanilla/hmc/grill_door/model.inc.c similarity index 100% rename from levels/hmc/grill_door/model.inc.c rename to actors_vanilla/hmc/grill_door/model.inc.c diff --git a/actors_vanilla/hmc/header.h b/actors_vanilla/hmc/header.h new file mode 100644 index 0000000000..eff787a4ed --- /dev/null +++ b/actors_vanilla/hmc/header.h @@ -0,0 +1,26 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout hmc_geo_000530[]; +extern const GeoLayout hmc_geo_000548[]; +extern const GeoLayout hmc_geo_000570[]; +extern const GeoLayout hmc_geo_000588[]; +extern const GeoLayout hmc_geo_0005A0[]; +extern const GeoLayout hmc_geo_0005B8[]; +extern const GeoLayout hmc_geo_0005D0[]; + +extern const Gfx hmc_seg7_dl_07022AA0[]; +extern const Gfx hmc_seg7_dl_07022DA0[]; +extern const Gfx hmc_seg7_dl_07023090[]; +extern const Gfx hmc_seg7_dl_07023BC8[]; +extern const Gfx hmc_seg7_dl_07023E10[]; +extern const Gfx hmc_seg7_dl_07024110[]; +extern const Gfx hmc_seg7_dl_07024268[]; +extern const Gfx hmc_seg7_dl_070242A0[]; +extern const Gfx hmc_seg7_dl_0701FFF8[]; + +extern const Collision hmc_seg7_collision_elevator[]; +extern const Collision hmc_seg7_collision_grill_door[]; +extern const Collision hmc_seg7_collision_controllable_platform[]; +extern const Collision hmc_seg7_collision_controllable_platform_sub[]; diff --git a/levels/hmc/rolling_rock/geo.inc.c b/actors_vanilla/hmc/rolling_rock/geo.inc.c similarity index 100% rename from levels/hmc/rolling_rock/geo.inc.c rename to actors_vanilla/hmc/rolling_rock/geo.inc.c diff --git a/levels/hmc/rolling_rock/model.inc.c b/actors_vanilla/hmc/rolling_rock/model.inc.c similarity index 100% rename from levels/hmc/rolling_rock/model.inc.c rename to actors_vanilla/hmc/rolling_rock/model.inc.c diff --git a/levels/hmc/rolling_rock_fragment_1/geo.inc.c b/actors_vanilla/hmc/rolling_rock_fragment_1/geo.inc.c similarity index 100% rename from levels/hmc/rolling_rock_fragment_1/geo.inc.c rename to actors_vanilla/hmc/rolling_rock_fragment_1/geo.inc.c diff --git a/levels/hmc/rolling_rock_fragment_1/model.inc.c b/actors_vanilla/hmc/rolling_rock_fragment_1/model.inc.c similarity index 100% rename from levels/hmc/rolling_rock_fragment_1/model.inc.c rename to actors_vanilla/hmc/rolling_rock_fragment_1/model.inc.c diff --git a/levels/hmc/rolling_rock_fragment_2/geo.inc.c b/actors_vanilla/hmc/rolling_rock_fragment_2/geo.inc.c similarity index 100% rename from levels/hmc/rolling_rock_fragment_2/geo.inc.c rename to actors_vanilla/hmc/rolling_rock_fragment_2/geo.inc.c diff --git a/levels/hmc/rolling_rock_fragment_2/model.inc.c b/actors_vanilla/hmc/rolling_rock_fragment_2/model.inc.c similarity index 100% rename from levels/hmc/rolling_rock_fragment_2/model.inc.c rename to actors_vanilla/hmc/rolling_rock_fragment_2/model.inc.c diff --git a/actors_vanilla/hmc/texture.inc.c b/actors_vanilla/hmc/texture.inc.c new file mode 100644 index 0000000000..2ebc80c632 --- /dev/null +++ b/actors_vanilla/hmc/texture.inc.c @@ -0,0 +1,20 @@ + +// 0x07003000 - 0x07003800 +ALIGNED8 static const Texture hmc_seg7_texture_07003000[] = { +#include "actors_vanilla/hmc/3.rgba16.inc.c" +}; + +// 0x07003800 - 0x07004000 +ALIGNED8 static const Texture hmc_seg7_texture_07003800[] = { +#include "actors_vanilla/hmc/4.rgba16.inc.c" +}; + +// 0x07004000 - 0x07004800 +ALIGNED8 static const Texture hmc_seg7_texture_07004000[] = { +#include "actors_vanilla/hmc/5.rgba16.inc.c" +}; + +// 0x07004800 - 0x07005800 +ALIGNED8 static const Texture hmc_seg7_texture_07004800[] = { +#include "actors_vanilla/hmc/6.rgba16.inc.c" +}; diff --git a/actors_vanilla/jrb/data.c b/actors_vanilla/jrb/data.c new file mode 100644 index 0000000000..ca520c0033 --- /dev/null +++ b/actors_vanilla/jrb/data.c @@ -0,0 +1,25 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/jrb/header.h" +#include "actors_vanilla/jrb/texture.inc.c" + +#include "actors_vanilla/jrb/rock/model.inc.c" +#include "actors_vanilla/jrb/floating_platform/model.inc.c" +#include "actors_vanilla/jrb/sliding_box/model.inc.c" +#include "actors_vanilla/jrb/wooden_ship/model.inc.c" +#include "actors_vanilla/jrb/falling_pillar/model.inc.c" +#include "actors_vanilla/jrb/falling_pillar_base/model.inc.c" +#include "actors_vanilla/jrb/rock/collision.inc.c" +#include "actors_vanilla/jrb/floating_platform/collision.inc.c" +#include "actors_vanilla/jrb/sliding_box/collision.inc.c" +#include "actors_vanilla/jrb/wooden_ship/collision.inc.c" +#include "actors_vanilla/jrb/falling_pillar_base/collision.inc.c" +#include "actors_vanilla/jrb/unused_lid/collision.inc.c" diff --git a/levels/jrb/falling_pillar/geo.inc.c b/actors_vanilla/jrb/falling_pillar/geo.inc.c similarity index 100% rename from levels/jrb/falling_pillar/geo.inc.c rename to actors_vanilla/jrb/falling_pillar/geo.inc.c diff --git a/levels/jrb/falling_pillar/model.inc.c b/actors_vanilla/jrb/falling_pillar/model.inc.c similarity index 100% rename from levels/jrb/falling_pillar/model.inc.c rename to actors_vanilla/jrb/falling_pillar/model.inc.c diff --git a/levels/jrb/falling_pillar_base/collision.inc.c b/actors_vanilla/jrb/falling_pillar_base/collision.inc.c similarity index 100% rename from levels/jrb/falling_pillar_base/collision.inc.c rename to actors_vanilla/jrb/falling_pillar_base/collision.inc.c diff --git a/levels/jrb/falling_pillar_base/geo.inc.c b/actors_vanilla/jrb/falling_pillar_base/geo.inc.c similarity index 100% rename from levels/jrb/falling_pillar_base/geo.inc.c rename to actors_vanilla/jrb/falling_pillar_base/geo.inc.c diff --git a/levels/jrb/falling_pillar_base/model.inc.c b/actors_vanilla/jrb/falling_pillar_base/model.inc.c similarity index 100% rename from levels/jrb/falling_pillar_base/model.inc.c rename to actors_vanilla/jrb/falling_pillar_base/model.inc.c diff --git a/levels/jrb/floating_platform/collision.inc.c b/actors_vanilla/jrb/floating_platform/collision.inc.c similarity index 100% rename from levels/jrb/floating_platform/collision.inc.c rename to actors_vanilla/jrb/floating_platform/collision.inc.c diff --git a/levels/jrb/floating_platform/geo.inc.c b/actors_vanilla/jrb/floating_platform/geo.inc.c similarity index 100% rename from levels/jrb/floating_platform/geo.inc.c rename to actors_vanilla/jrb/floating_platform/geo.inc.c diff --git a/levels/jrb/floating_platform/model.inc.c b/actors_vanilla/jrb/floating_platform/model.inc.c similarity index 100% rename from levels/jrb/floating_platform/model.inc.c rename to actors_vanilla/jrb/floating_platform/model.inc.c diff --git a/actors_vanilla/jrb/geo.c b/actors_vanilla/jrb/geo.c new file mode 100644 index 0000000000..044de2f8a9 --- /dev/null +++ b/actors_vanilla/jrb/geo.c @@ -0,0 +1,38 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/jrb/header.h" + +#include "actors_vanilla/jrb/falling_pillar/geo.inc.c" +#include "actors_vanilla/jrb/falling_pillar_base/geo.inc.c" +#include "actors_vanilla/jrb/rock/geo.inc.c" +#include "actors_vanilla/jrb/floating_platform/geo.inc.c" +#include "actors_vanilla/jrb/sliding_box/geo.inc.c" +#include "actors_vanilla/jrb/wooden_ship/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_jrb[] = { + LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_LEFT_HALF_PART, jrb_geo_000978), + LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_BACK_LEFT_PART, jrb_geo_0009B0), + LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_RIGHT_HALF_PART, jrb_geo_0009E8), + LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_BACK_RIGHT_PART, jrb_geo_000A00), + LOAD_MODEL_FROM_GEO(MODEL_JRB_SUNKEN_SHIP, jrb_geo_000990), + LOAD_MODEL_FROM_GEO(MODEL_JRB_SUNKEN_SHIP_BACK, jrb_geo_0009C8), + LOAD_MODEL_FROM_GEO(MODEL_JRB_ROCK, jrb_geo_000930), + LOAD_MODEL_FROM_GEO(MODEL_JRB_SLIDING_BOX, jrb_geo_000960), + LOAD_MODEL_FROM_GEO(MODEL_JRB_FALLING_PILLAR, jrb_geo_000900), + LOAD_MODEL_FROM_GEO(MODEL_JRB_FALLING_PILLAR_BASE, jrb_geo_000918), + LOAD_MODEL_FROM_GEO(MODEL_JRB_FLOATING_PLATFORM, jrb_geo_000948), + RETURN(), +}; diff --git a/actors_vanilla/jrb/header.h b/actors_vanilla/jrb/header.h new file mode 100644 index 0000000000..91a7b082a0 --- /dev/null +++ b/actors_vanilla/jrb/header.h @@ -0,0 +1,39 @@ +#pragma once + +#include "types.h" +#include "game/moving_texture.h" + +extern const GeoLayout jrb_geo_000900[]; +extern const GeoLayout jrb_geo_000918[]; +extern const GeoLayout jrb_geo_000930[]; +extern const GeoLayout jrb_geo_000948[]; +extern const GeoLayout jrb_geo_000960[]; +extern const GeoLayout jrb_geo_000978[]; +extern const GeoLayout jrb_geo_000990[]; +extern const GeoLayout jrb_geo_0009B0[]; +extern const GeoLayout jrb_geo_0009C8[]; +extern const GeoLayout jrb_geo_0009E8[]; +extern const GeoLayout jrb_geo_000A00[]; + +extern const Gfx jrb_seg7_dl_07007AC8[]; +extern const Gfx jrb_seg7_dl_07007DC8[]; +extern const Gfx jrb_seg7_dl_070080F8[]; +extern const Gfx jrb_seg7_dl_07008FD8[]; +extern const Gfx jrb_seg7_dl_070090B0[]; +extern const Gfx jrb_seg7_dl_07009A58[]; +extern const Gfx jrb_seg7_dl_07009B30[]; +extern const Gfx jrb_seg7_dl_0700A608[]; +extern const Gfx jrb_seg7_dl_0700AC68[]; +extern const Gfx jrb_seg7_dl_0700AE48[]; +extern const Gfx jrb_seg7_dl_0700AFB0[]; + +extern const Collision jrb_seg7_collision_rock_solid[]; +extern const Collision jrb_seg7_collision_floating_platform[]; +extern const Collision jrb_seg7_collision_floating_box[]; +extern const Collision jrb_seg7_collision_in_sunken_ship_3[]; +extern const Collision jrb_seg7_collision_in_sunken_ship[]; +extern const Collision jrb_seg7_collision_0700CEF0[]; +extern const Collision jrb_seg7_collision_in_sunken_ship_2[]; +extern const Collision jrb_seg7_collision_pillar_base[]; +extern const Collision jrb_seg7_collision_0700D1DC[]; + diff --git a/levels/jrb/rock/collision.inc.c b/actors_vanilla/jrb/rock/collision.inc.c similarity index 100% rename from levels/jrb/rock/collision.inc.c rename to actors_vanilla/jrb/rock/collision.inc.c diff --git a/levels/jrb/rock/geo.inc.c b/actors_vanilla/jrb/rock/geo.inc.c similarity index 100% rename from levels/jrb/rock/geo.inc.c rename to actors_vanilla/jrb/rock/geo.inc.c diff --git a/levels/jrb/rock/model.inc.c b/actors_vanilla/jrb/rock/model.inc.c similarity index 100% rename from levels/jrb/rock/model.inc.c rename to actors_vanilla/jrb/rock/model.inc.c diff --git a/levels/jrb/sliding_box/collision.inc.c b/actors_vanilla/jrb/sliding_box/collision.inc.c similarity index 100% rename from levels/jrb/sliding_box/collision.inc.c rename to actors_vanilla/jrb/sliding_box/collision.inc.c diff --git a/levels/jrb/sliding_box/geo.inc.c b/actors_vanilla/jrb/sliding_box/geo.inc.c similarity index 100% rename from levels/jrb/sliding_box/geo.inc.c rename to actors_vanilla/jrb/sliding_box/geo.inc.c diff --git a/levels/jrb/sliding_box/model.inc.c b/actors_vanilla/jrb/sliding_box/model.inc.c similarity index 100% rename from levels/jrb/sliding_box/model.inc.c rename to actors_vanilla/jrb/sliding_box/model.inc.c diff --git a/actors_vanilla/jrb/texture.inc.c b/actors_vanilla/jrb/texture.inc.c new file mode 100644 index 0000000000..326363f8f4 --- /dev/null +++ b/actors_vanilla/jrb/texture.inc.c @@ -0,0 +1,9 @@ +// 0x07001800 - 0x07002000 +ALIGNED8 static const Texture jrb_seg7_texture_07001800[] = { +#include "actors_vanilla/jrb/2.rgba16.inc.c" +}; + +// 0x07002000 - 0x07002800 +ALIGNED8 static const Texture jrb_seg7_texture_07002000[] = { +#include "actors_vanilla/jrb/3.rgba16.inc.c" +}; diff --git a/levels/jrb/unused_lid/collision.inc.c b/actors_vanilla/jrb/unused_lid/collision.inc.c similarity index 100% rename from levels/jrb/unused_lid/collision.inc.c rename to actors_vanilla/jrb/unused_lid/collision.inc.c diff --git a/levels/jrb/wooden_ship/collision.inc.c b/actors_vanilla/jrb/wooden_ship/collision.inc.c similarity index 100% rename from levels/jrb/wooden_ship/collision.inc.c rename to actors_vanilla/jrb/wooden_ship/collision.inc.c diff --git a/levels/jrb/wooden_ship/geo.inc.c b/actors_vanilla/jrb/wooden_ship/geo.inc.c similarity index 100% rename from levels/jrb/wooden_ship/geo.inc.c rename to actors_vanilla/jrb/wooden_ship/geo.inc.c diff --git a/levels/jrb/wooden_ship/model.inc.c b/actors_vanilla/jrb/wooden_ship/model.inc.c similarity index 100% rename from levels/jrb/wooden_ship/model.inc.c rename to actors_vanilla/jrb/wooden_ship/model.inc.c diff --git a/levels/lll/areas/1/10/collision.inc.c b/actors_vanilla/lll/10/collision.inc.c similarity index 100% rename from levels/lll/areas/1/10/collision.inc.c rename to actors_vanilla/lll/10/collision.inc.c diff --git a/levels/lll/areas/1/10/geo.inc.c b/actors_vanilla/lll/10/geo.inc.c similarity index 100% rename from levels/lll/areas/1/10/geo.inc.c rename to actors_vanilla/lll/10/geo.inc.c diff --git a/levels/lll/areas/1/10/model.inc.c b/actors_vanilla/lll/10/model.inc.c similarity index 100% rename from levels/lll/areas/1/10/model.inc.c rename to actors_vanilla/lll/10/model.inc.c diff --git a/levels/lll/collapsing_wooden_platform/collision.inc.c b/actors_vanilla/lll/collapsing_wooden_platform/collision.inc.c similarity index 100% rename from levels/lll/collapsing_wooden_platform/collision.inc.c rename to actors_vanilla/lll/collapsing_wooden_platform/collision.inc.c diff --git a/levels/lll/collapsing_wooden_platform/geo.inc.c b/actors_vanilla/lll/collapsing_wooden_platform/geo.inc.c similarity index 100% rename from levels/lll/collapsing_wooden_platform/geo.inc.c rename to actors_vanilla/lll/collapsing_wooden_platform/geo.inc.c diff --git a/levels/lll/collapsing_wooden_platform/model.inc.c b/actors_vanilla/lll/collapsing_wooden_platform/model.inc.c similarity index 100% rename from levels/lll/collapsing_wooden_platform/model.inc.c rename to actors_vanilla/lll/collapsing_wooden_platform/model.inc.c diff --git a/actors_vanilla/lll/data.c b/actors_vanilla/lll/data.c new file mode 100644 index 0000000000..40d86129e6 --- /dev/null +++ b/actors_vanilla/lll/data.c @@ -0,0 +1,42 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/lll/texture.inc.c" + +#include "actors_vanilla/lll/10/model.inc.c" +#include "actors_vanilla/lll/moving_octagonal_mesh_platform/model.inc.c" +#include "actors_vanilla/lll/drawbridge_part/model.inc.c" +#include "actors_vanilla/lll/rotating_block_fire_bars/model.inc.c" +#include "actors_vanilla/lll/wooden_float_small/model.inc.c" +#include "actors_vanilla/lll/wooden_float_large/model.inc.c" +#include "actors_vanilla/lll/collapsing_wooden_platform/model.inc.c" +#include "actors_vanilla/lll/long_wooden_bridge/model.inc.c" +#include "actors_vanilla/lll/rotating_hexagonal_ring/model.inc.c" +#include "actors_vanilla/lll/sinking_rectangular_platform/model.inc.c" +#include "actors_vanilla/lll/sinking_square_platform/model.inc.c" +#include "actors_vanilla/lll/tilting_square_platform/model.inc.c" +#include "actors_vanilla/lll/puzzle_piece/model.inc.c" +#include "actors_vanilla/lll/sinking_rock_block/model.inc.c" +#include "actors_vanilla/lll/rolling_log/model.inc.c" +#include "actors_vanilla/lll/moving_octagonal_mesh_platform/collision.inc.c" +#include "actors_vanilla/lll/drawbridge_part/collision.inc.c" +#include "actors_vanilla/lll/rotating_block_fire_bars/collision.inc.c" +#include "actors_vanilla/lll/wooden_float_small/collision.inc.c" +#include "actors_vanilla/lll/10/collision.inc.c" +#include "actors_vanilla/lll/collapsing_wooden_platform/collision.inc.c" +#include "actors_vanilla/lll/rotating_hexagonal_ring/collision.inc.c" +#include "actors_vanilla/lll/sinking_rectangular_platform/collision.inc.c" +#include "actors_vanilla/lll/sinking_square_platform/collision.inc.c" +#include "actors_vanilla/lll/tilting_square_platform/collision.inc.c" +#include "actors_vanilla/lll/puzzle_piece/collision.inc.c" +#include "actors_vanilla/lll/sinking_rock_block/collision.inc.c" +#include "actors_vanilla/lll/rolling_log/collision.inc.c" +#include "actors_vanilla/lll/volcano_falling_trap/model.inc.c" +#include "actors_vanilla/lll/volcano_falling_trap/collision.inc.c" diff --git a/levels/lll/drawbridge_part/collision.inc.c b/actors_vanilla/lll/drawbridge_part/collision.inc.c similarity index 100% rename from levels/lll/drawbridge_part/collision.inc.c rename to actors_vanilla/lll/drawbridge_part/collision.inc.c diff --git a/levels/lll/drawbridge_part/geo.inc.c b/actors_vanilla/lll/drawbridge_part/geo.inc.c similarity index 100% rename from levels/lll/drawbridge_part/geo.inc.c rename to actors_vanilla/lll/drawbridge_part/geo.inc.c diff --git a/levels/lll/drawbridge_part/model.inc.c b/actors_vanilla/lll/drawbridge_part/model.inc.c similarity index 100% rename from levels/lll/drawbridge_part/model.inc.c rename to actors_vanilla/lll/drawbridge_part/model.inc.c diff --git a/actors_vanilla/lll/geo.c b/actors_vanilla/lll/geo.c new file mode 100644 index 0000000000..290caf06fe --- /dev/null +++ b/actors_vanilla/lll/geo.c @@ -0,0 +1,66 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/lll/header.h" + +#include "actors_vanilla/lll/10/geo.inc.c" +#include "actors_vanilla/lll/moving_octagonal_mesh_platform/geo.inc.c" +#include "actors_vanilla/lll/drawbridge_part/geo.inc.c" +#include "actors_vanilla/lll/rotating_block_fire_bars/geo.inc.c" +#include "actors_vanilla/lll/wooden_float_small/geo.inc.c" +#include "actors_vanilla/lll/wooden_float_large/geo.inc.c" +#include "actors_vanilla/lll/collapsing_wooden_platform/geo.inc.c" +#include "actors_vanilla/lll/long_wooden_bridge/geo.inc.c" +#include "actors_vanilla/lll/rotating_hexagonal_ring/geo.inc.c" +#include "actors_vanilla/lll/sinking_rectangular_platform/geo.inc.c" +#include "actors_vanilla/lll/sinking_square_platform/geo.inc.c" +#include "actors_vanilla/lll/tilting_square_platform/geo.inc.c" +#include "actors_vanilla/lll/puzzle_piece/geo.inc.c" +#include "actors_vanilla/lll/sinking_rock_block/geo.inc.c" +#include "actors_vanilla/lll/rolling_log/geo.inc.c" +#include "actors_vanilla/lll/volcano_falling_trap/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_lll[] = { + LOAD_MODEL_FROM_GEO(MODEL_LLL_DRAWBRIDGE_PART, lll_geo_000B20), + LOAD_MODEL_FROM_GEO(MODEL_LLL_ROTATING_BLOCK_FIRE_BARS, lll_geo_000B38), + LOAD_MODEL_FROM_GEO(MODEL_LLL_ROTATING_HEXAGONAL_RING, lll_geo_000BB0), + LOAD_MODEL_FROM_GEO(MODEL_LLL_SINKING_RECTANGULAR_PLATFORM, lll_geo_000BC8), + LOAD_MODEL_FROM_GEO(MODEL_LLL_SINKING_SQUARE_PLATFORMS, lll_geo_000BE0), + LOAD_MODEL_FROM_GEO(MODEL_LLL_TILTING_SQUARE_PLATFORM, lll_geo_000BF8), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_1, lll_geo_bowser_puzzle_piece_1), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_2, lll_geo_bowser_puzzle_piece_2), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_3, lll_geo_bowser_puzzle_piece_3), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_4, lll_geo_bowser_puzzle_piece_4), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_5, lll_geo_bowser_puzzle_piece_5), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_6, lll_geo_bowser_puzzle_piece_6), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_7, lll_geo_bowser_puzzle_piece_7), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_8, lll_geo_bowser_puzzle_piece_8), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_9, lll_geo_bowser_puzzle_piece_9), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_10, lll_geo_bowser_puzzle_piece_10), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_11, lll_geo_bowser_puzzle_piece_11), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_12, lll_geo_bowser_puzzle_piece_12), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_13, lll_geo_bowser_puzzle_piece_13), + LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_14, lll_geo_bowser_puzzle_piece_14), + LOAD_MODEL_FROM_GEO(MODEL_LLL_MOVING_OCTAGONAL_MESH_PLATFORM, lll_geo_000B08), + LOAD_MODEL_FROM_GEO(MODEL_LLL_SINKING_ROCK_BLOCK, lll_geo_000DD0), + LOAD_MODEL_FROM_GEO(MODEL_LLL_ROLLING_LOG, lll_geo_000DE8), + LOAD_MODEL_FROM_GEO(MODEL_LLL_ROTATING_HEXAGONAL_PLATFORM, lll_geo_000A78), + LOAD_MODEL_FROM_GEO(MODEL_LLL_WOOD_BRIDGE, lll_geo_000B50), + LOAD_MODEL_FROM_GEO(MODEL_LLL_LARGE_WOOD_BRIDGE, lll_geo_000B68), + LOAD_MODEL_FROM_GEO(MODEL_LLL_FALLING_PLATFORM, lll_geo_000B80), + LOAD_MODEL_FROM_GEO(MODEL_LLL_LARGE_FALLING_PLATFORM, lll_geo_000B98), + LOAD_MODEL_FROM_GEO(MODEL_LLL_VOLCANO_FALLING_TRAP, lll_geo_000EA8), + RETURN(), +}; diff --git a/actors_vanilla/lll/header.h b/actors_vanilla/lll/header.h new file mode 100644 index 0000000000..df665993e2 --- /dev/null +++ b/actors_vanilla/lll/header.h @@ -0,0 +1,78 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout lll_geo_000A78[]; +extern const GeoLayout lll_geo_000B08[]; +extern const GeoLayout lll_geo_000B20[]; +extern const GeoLayout lll_geo_000B38[]; +extern const GeoLayout lll_geo_000B50[]; +extern const GeoLayout lll_geo_000B68[]; +extern const GeoLayout lll_geo_000B80[]; +extern const GeoLayout lll_geo_000B98[]; +extern const GeoLayout lll_geo_000BB0[]; +extern const GeoLayout lll_geo_000BC8[]; +extern const GeoLayout lll_geo_000BE0[]; +extern const GeoLayout lll_geo_000BF8[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_1[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_2[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_3[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_4[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_5[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_6[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_7[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_8[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_9[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_10[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_11[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_12[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_13[]; +extern const GeoLayout lll_geo_bowser_puzzle_piece_14[]; +extern const GeoLayout lll_geo_000DD0[]; +extern const GeoLayout lll_geo_000DE8[]; + +extern const Gfx lll_seg7_dl_070165C8[]; +extern const Gfx lll_seg7_dl_07018380[]; +extern const Gfx lll_seg7_dl_07018680[]; +extern const Gfx lll_seg7_dl_07018A30[]; +extern const Gfx lll_seg7_dl_07018C90[]; +extern const Gfx lll_seg7_dl_07018EF8[]; +extern const Gfx lll_seg7_dl_07019160[]; +extern const Gfx lll_seg7_dl_070193E0[]; +extern const Gfx lll_seg7_dl_07019A08[]; +extern const Gfx lll_seg7_dl_07019C08[]; +extern const Gfx lll_seg7_dl_0701A010[]; +extern const Gfx lll_seg7_dl_0701A1F0[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_1[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_2[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_3[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_4[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_5[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_6[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_7[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_8[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_9[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_10[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_11[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_12[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_13[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_14[]; +extern const Gfx lll_seg7_dl_bowser_puzzle_piece_shadow[]; +extern const Gfx lll_seg7_dl_0701A878[]; +extern const Gfx lll_seg7_dl_0701AD70[]; +extern const Gfx lll_seg7_dl_07025EC0[]; + +extern const Collision lll_seg7_collision_octagonal_moving_platform[]; +extern const Collision lll_seg7_collision_drawbridge[]; +extern const Collision lll_seg7_collision_rotating_fire_bars[]; +extern const Collision lll_seg7_collision_wood_piece[]; +extern const Collision lll_seg7_collision_0701D21C[]; +extern const Collision lll_seg7_collision_rotating_platform[]; +extern const Collision lll_seg7_collision_slow_tilting_platform[]; +extern const Collision lll_seg7_collision_sinking_pyramids[]; +extern const Collision lll_seg7_collision_inverted_pyramid[]; +extern const Collision lll_seg7_collision_puzzle_piece[]; +extern const Collision lll_seg7_collision_floating_block[]; +extern const Collision lll_seg7_collision_pitoune[]; +extern const Collision lll_seg7_collision_hexagonal_platform[]; +extern const Collision lll_seg7_collision_falling_wall[]; diff --git a/levels/lll/long_wooden_bridge/geo.inc.c b/actors_vanilla/lll/long_wooden_bridge/geo.inc.c similarity index 100% rename from levels/lll/long_wooden_bridge/geo.inc.c rename to actors_vanilla/lll/long_wooden_bridge/geo.inc.c diff --git a/levels/lll/long_wooden_bridge/model.inc.c b/actors_vanilla/lll/long_wooden_bridge/model.inc.c similarity index 100% rename from levels/lll/long_wooden_bridge/model.inc.c rename to actors_vanilla/lll/long_wooden_bridge/model.inc.c diff --git a/levels/lll/moving_octagonal_mesh_platform/collision.inc.c b/actors_vanilla/lll/moving_octagonal_mesh_platform/collision.inc.c similarity index 100% rename from levels/lll/moving_octagonal_mesh_platform/collision.inc.c rename to actors_vanilla/lll/moving_octagonal_mesh_platform/collision.inc.c diff --git a/levels/lll/moving_octagonal_mesh_platform/geo.inc.c b/actors_vanilla/lll/moving_octagonal_mesh_platform/geo.inc.c similarity index 100% rename from levels/lll/moving_octagonal_mesh_platform/geo.inc.c rename to actors_vanilla/lll/moving_octagonal_mesh_platform/geo.inc.c diff --git a/levels/lll/moving_octagonal_mesh_platform/model.inc.c b/actors_vanilla/lll/moving_octagonal_mesh_platform/model.inc.c similarity index 100% rename from levels/lll/moving_octagonal_mesh_platform/model.inc.c rename to actors_vanilla/lll/moving_octagonal_mesh_platform/model.inc.c diff --git a/levels/lll/puzzle_piece/collision.inc.c b/actors_vanilla/lll/puzzle_piece/collision.inc.c similarity index 100% rename from levels/lll/puzzle_piece/collision.inc.c rename to actors_vanilla/lll/puzzle_piece/collision.inc.c diff --git a/levels/lll/puzzle_piece/geo.inc.c b/actors_vanilla/lll/puzzle_piece/geo.inc.c similarity index 100% rename from levels/lll/puzzle_piece/geo.inc.c rename to actors_vanilla/lll/puzzle_piece/geo.inc.c diff --git a/levels/lll/puzzle_piece/model.inc.c b/actors_vanilla/lll/puzzle_piece/model.inc.c similarity index 100% rename from levels/lll/puzzle_piece/model.inc.c rename to actors_vanilla/lll/puzzle_piece/model.inc.c diff --git a/levels/lll/rolling_log/collision.inc.c b/actors_vanilla/lll/rolling_log/collision.inc.c similarity index 100% rename from levels/lll/rolling_log/collision.inc.c rename to actors_vanilla/lll/rolling_log/collision.inc.c diff --git a/levels/lll/rolling_log/geo.inc.c b/actors_vanilla/lll/rolling_log/geo.inc.c similarity index 100% rename from levels/lll/rolling_log/geo.inc.c rename to actors_vanilla/lll/rolling_log/geo.inc.c diff --git a/levels/lll/rolling_log/model.inc.c b/actors_vanilla/lll/rolling_log/model.inc.c similarity index 100% rename from levels/lll/rolling_log/model.inc.c rename to actors_vanilla/lll/rolling_log/model.inc.c diff --git a/levels/lll/rotating_block_fire_bars/collision.inc.c b/actors_vanilla/lll/rotating_block_fire_bars/collision.inc.c similarity index 100% rename from levels/lll/rotating_block_fire_bars/collision.inc.c rename to actors_vanilla/lll/rotating_block_fire_bars/collision.inc.c diff --git a/levels/lll/rotating_block_fire_bars/geo.inc.c b/actors_vanilla/lll/rotating_block_fire_bars/geo.inc.c similarity index 100% rename from levels/lll/rotating_block_fire_bars/geo.inc.c rename to actors_vanilla/lll/rotating_block_fire_bars/geo.inc.c diff --git a/levels/lll/rotating_block_fire_bars/model.inc.c b/actors_vanilla/lll/rotating_block_fire_bars/model.inc.c similarity index 100% rename from levels/lll/rotating_block_fire_bars/model.inc.c rename to actors_vanilla/lll/rotating_block_fire_bars/model.inc.c diff --git a/levels/lll/rotating_hexagonal_ring/collision.inc.c b/actors_vanilla/lll/rotating_hexagonal_ring/collision.inc.c similarity index 100% rename from levels/lll/rotating_hexagonal_ring/collision.inc.c rename to actors_vanilla/lll/rotating_hexagonal_ring/collision.inc.c diff --git a/levels/lll/rotating_hexagonal_ring/geo.inc.c b/actors_vanilla/lll/rotating_hexagonal_ring/geo.inc.c similarity index 100% rename from levels/lll/rotating_hexagonal_ring/geo.inc.c rename to actors_vanilla/lll/rotating_hexagonal_ring/geo.inc.c diff --git a/levels/lll/rotating_hexagonal_ring/model.inc.c b/actors_vanilla/lll/rotating_hexagonal_ring/model.inc.c similarity index 100% rename from levels/lll/rotating_hexagonal_ring/model.inc.c rename to actors_vanilla/lll/rotating_hexagonal_ring/model.inc.c diff --git a/levels/lll/sinking_rectangular_platform/collision.inc.c b/actors_vanilla/lll/sinking_rectangular_platform/collision.inc.c similarity index 100% rename from levels/lll/sinking_rectangular_platform/collision.inc.c rename to actors_vanilla/lll/sinking_rectangular_platform/collision.inc.c diff --git a/levels/lll/sinking_rectangular_platform/geo.inc.c b/actors_vanilla/lll/sinking_rectangular_platform/geo.inc.c similarity index 100% rename from levels/lll/sinking_rectangular_platform/geo.inc.c rename to actors_vanilla/lll/sinking_rectangular_platform/geo.inc.c diff --git a/levels/lll/sinking_rectangular_platform/model.inc.c b/actors_vanilla/lll/sinking_rectangular_platform/model.inc.c similarity index 100% rename from levels/lll/sinking_rectangular_platform/model.inc.c rename to actors_vanilla/lll/sinking_rectangular_platform/model.inc.c diff --git a/levels/lll/sinking_rock_block/collision.inc.c b/actors_vanilla/lll/sinking_rock_block/collision.inc.c similarity index 100% rename from levels/lll/sinking_rock_block/collision.inc.c rename to actors_vanilla/lll/sinking_rock_block/collision.inc.c diff --git a/levels/lll/sinking_rock_block/geo.inc.c b/actors_vanilla/lll/sinking_rock_block/geo.inc.c similarity index 100% rename from levels/lll/sinking_rock_block/geo.inc.c rename to actors_vanilla/lll/sinking_rock_block/geo.inc.c diff --git a/levels/lll/sinking_rock_block/model.inc.c b/actors_vanilla/lll/sinking_rock_block/model.inc.c similarity index 100% rename from levels/lll/sinking_rock_block/model.inc.c rename to actors_vanilla/lll/sinking_rock_block/model.inc.c diff --git a/levels/lll/sinking_square_platform/collision.inc.c b/actors_vanilla/lll/sinking_square_platform/collision.inc.c similarity index 100% rename from levels/lll/sinking_square_platform/collision.inc.c rename to actors_vanilla/lll/sinking_square_platform/collision.inc.c diff --git a/levels/lll/sinking_square_platform/geo.inc.c b/actors_vanilla/lll/sinking_square_platform/geo.inc.c similarity index 100% rename from levels/lll/sinking_square_platform/geo.inc.c rename to actors_vanilla/lll/sinking_square_platform/geo.inc.c diff --git a/levels/lll/sinking_square_platform/model.inc.c b/actors_vanilla/lll/sinking_square_platform/model.inc.c similarity index 100% rename from levels/lll/sinking_square_platform/model.inc.c rename to actors_vanilla/lll/sinking_square_platform/model.inc.c diff --git a/actors_vanilla/lll/texture.inc.c b/actors_vanilla/lll/texture.inc.c new file mode 100644 index 0000000000..a713b1c312 --- /dev/null +++ b/actors_vanilla/lll/texture.inc.c @@ -0,0 +1,109 @@ +// 0x07000000 - 0x07000800 +ALIGNED8 static const Texture lll_seg7_texture_07000000[] = { +#include "actors_vanilla/lll/0.rgba16.inc.c" +}; + +// 0x07000800 - 0x07001000 +ALIGNED8 static const Texture lll_seg7_texture_07000800[] = { +#include "actors_vanilla/lll/1.rgba16.inc.c" +}; + +// 0x07001000 - 0x07001800 +ALIGNED8 static const Texture lll_seg7_texture_07001000[] = { +#include "actors_vanilla/lll/2.rgba16.inc.c" +}; + +// 0x07003000 - 0x07003800 +ALIGNED8 static const Texture lll_seg7_texture_07003000[] = { +#include "actors_vanilla/lll/6.rgba16.inc.c" +}; + +// 0x07004000 - 0x07004800 +ALIGNED8 static const Texture lll_seg7_texture_07004000[] = { +#include "actors_vanilla/lll/8.rgba16.inc.c" +}; + +// 0x07005000 - 0x07005800 +ALIGNED8 static const Texture lll_seg7_texture_07005000[] = { +#include "actors_vanilla/lll/10.rgba16.inc.c" +}; + +// 0x07005800 - 0x07006000 +ALIGNED8 static const Texture lll_seg7_texture_07005800[] = { +#include "actors_vanilla/lll/11.rgba16.inc.c" +}; + +// 0x07006000 - 0x07006800 +ALIGNED8 static const Texture lll_seg7_texture_07006000[] = { +#include "actors_vanilla/lll/12.rgba16.inc.c" +}; + +// 0x07006800 - 0x07007000 +ALIGNED8 static const Texture lll_seg7_texture_07006800[] = { +#include "actors_vanilla/lll/13.rgba16.inc.c" +}; + +// 0x07007000 - 0x07007800 +ALIGNED8 static const Texture lll_seg7_texture_07007000[] = { +#include "actors_vanilla/lll/14.rgba16.inc.c" +}; + +// 0x07007800 - 0x07008000 +ALIGNED8 static const Texture lll_seg7_texture_07007800[] = { +#include "actors_vanilla/lll/15.rgba16.inc.c" +}; + +// 0x07008000 - 0x07008800 +ALIGNED8 static const Texture lll_seg7_texture_07008000[] = { +#include "actors_vanilla/lll/16.rgba16.inc.c" +}; + +// 0x07008800 - 0x07009000 +ALIGNED8 static const Texture lll_seg7_texture_07008800[] = { +#include "actors_vanilla/lll/17.rgba16.inc.c" +}; + +// 0x07009000 - 0x07009800 +ALIGNED8 static const Texture lll_seg7_texture_07009000[] = { +#include "actors_vanilla/lll/18.rgba16.inc.c" +}; + +// 0x07009800 - 0x0700A000 +ALIGNED8 static const Texture lll_seg7_texture_07009800[] = { +#include "actors_vanilla/lll/19.rgba16.inc.c" +}; + +// 0x0700A000 - 0x0700A800 +ALIGNED8 static const Texture lll_seg7_texture_0700A000[] = { +#include "actors_vanilla/lll/20.rgba16.inc.c" +}; + +// 0x0700A800 - 0x0700B000 +ALIGNED8 static const Texture lll_seg7_texture_0700A800[] = { +#include "actors_vanilla/lll/21.rgba16.inc.c" +}; + +// 0x0700B000 - 0x0700B800 +ALIGNED8 static const Texture lll_seg7_texture_0700B000[] = { +#include "actors_vanilla/lll/22.rgba16.inc.c" +}; + +// 0x0700B800 - 0x0700C000 +ALIGNED8 static const Texture lll_seg7_texture_0700B800[] = { +#include "actors_vanilla/lll/23.rgba16.inc.c" +}; + +// 0x0700C000 - 0x0700C800 +ALIGNED8 static const Texture lll_seg7_texture_0700C000[] = { +#include "actors_vanilla/lll/24.rgba16.inc.c" +}; + +// 0x0700C800 - 0x0700D000 +ALIGNED8 static const Texture lll_seg7_texture_0700C800[] = { +#include "actors_vanilla/lll/25.rgba16.inc.c" +}; + +// 0x0700DC00 - 0x0700E400 +ALIGNED8 static const Texture lll_seg7_texture_0700DC00[] = { +#include "actors_vanilla/lll/29.rgba16.inc.c" +}; diff --git a/levels/lll/tilting_square_platform/collision.inc.c b/actors_vanilla/lll/tilting_square_platform/collision.inc.c similarity index 100% rename from levels/lll/tilting_square_platform/collision.inc.c rename to actors_vanilla/lll/tilting_square_platform/collision.inc.c diff --git a/levels/lll/tilting_square_platform/geo.inc.c b/actors_vanilla/lll/tilting_square_platform/geo.inc.c similarity index 100% rename from levels/lll/tilting_square_platform/geo.inc.c rename to actors_vanilla/lll/tilting_square_platform/geo.inc.c diff --git a/levels/lll/tilting_square_platform/model.inc.c b/actors_vanilla/lll/tilting_square_platform/model.inc.c similarity index 100% rename from levels/lll/tilting_square_platform/model.inc.c rename to actors_vanilla/lll/tilting_square_platform/model.inc.c diff --git a/levels/lll/volcano_falling_trap/collision.inc.c b/actors_vanilla/lll/volcano_falling_trap/collision.inc.c similarity index 100% rename from levels/lll/volcano_falling_trap/collision.inc.c rename to actors_vanilla/lll/volcano_falling_trap/collision.inc.c diff --git a/levels/lll/volcano_falling_trap/geo.inc.c b/actors_vanilla/lll/volcano_falling_trap/geo.inc.c similarity index 100% rename from levels/lll/volcano_falling_trap/geo.inc.c rename to actors_vanilla/lll/volcano_falling_trap/geo.inc.c diff --git a/levels/lll/volcano_falling_trap/model.inc.c b/actors_vanilla/lll/volcano_falling_trap/model.inc.c similarity index 100% rename from levels/lll/volcano_falling_trap/model.inc.c rename to actors_vanilla/lll/volcano_falling_trap/model.inc.c diff --git a/levels/lll/wooden_float_large/geo.inc.c b/actors_vanilla/lll/wooden_float_large/geo.inc.c similarity index 100% rename from levels/lll/wooden_float_large/geo.inc.c rename to actors_vanilla/lll/wooden_float_large/geo.inc.c diff --git a/levels/lll/wooden_float_large/model.inc.c b/actors_vanilla/lll/wooden_float_large/model.inc.c similarity index 100% rename from levels/lll/wooden_float_large/model.inc.c rename to actors_vanilla/lll/wooden_float_large/model.inc.c diff --git a/levels/lll/wooden_float_small/collision.inc.c b/actors_vanilla/lll/wooden_float_small/collision.inc.c similarity index 100% rename from levels/lll/wooden_float_small/collision.inc.c rename to actors_vanilla/lll/wooden_float_small/collision.inc.c diff --git a/levels/lll/wooden_float_small/geo.inc.c b/actors_vanilla/lll/wooden_float_small/geo.inc.c similarity index 100% rename from levels/lll/wooden_float_small/geo.inc.c rename to actors_vanilla/lll/wooden_float_small/geo.inc.c diff --git a/levels/lll/wooden_float_small/model.inc.c b/actors_vanilla/lll/wooden_float_small/model.inc.c similarity index 100% rename from levels/lll/wooden_float_small/model.inc.c rename to actors_vanilla/lll/wooden_float_small/model.inc.c diff --git a/levels/rr/cruiser_wing/geo.inc.c b/actors_vanilla/rr/cruiser_wing/geo.inc.c similarity index 100% rename from levels/rr/cruiser_wing/geo.inc.c rename to actors_vanilla/rr/cruiser_wing/geo.inc.c diff --git a/levels/rr/cruiser_wing/model.inc.c b/actors_vanilla/rr/cruiser_wing/model.inc.c similarity index 100% rename from levels/rr/cruiser_wing/model.inc.c rename to actors_vanilla/rr/cruiser_wing/model.inc.c diff --git a/actors_vanilla/rr/data.c b/actors_vanilla/rr/data.c new file mode 100644 index 0000000000..16f82d7e61 --- /dev/null +++ b/actors_vanilla/rr/data.c @@ -0,0 +1,44 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/rr/texture.inc.c" + +#include "actors_vanilla/rr/flying_carpet/model.inc.c" +#include "actors_vanilla/rr/swinging_platform/model.inc.c" +#include "actors_vanilla/rr/rotating_bridge_platform/model.inc.c" +#include "actors_vanilla/rr/cruiser_wing/model.inc.c" +#include "actors_vanilla/rr/octagonal_platform/model.inc.c" +#include "actors_vanilla/rr/sliding_platform/model.inc.c" +#include "actors_vanilla/rr/pyramid_platform/model.inc.c" // Unused +#include "actors_vanilla/rr/elevator_platform/model.inc.c" +#include "actors_vanilla/rr/seesaw_platform/model.inc.c" +#include "actors_vanilla/rr/donut_block/1.inc.c" +#include "actors_vanilla/rr/donut_block/2.inc.c" +#include "actors_vanilla/rr/l_platform/model.inc.c" // also unused +#include "actors_vanilla/rr/tricky_triangles_1/model.inc.c" +#include "actors_vanilla/rr/tricky_triangles_2/model.inc.c" +#include "actors_vanilla/rr/tricky_triangles_3/model.inc.c" +#include "actors_vanilla/rr/tricky_triangles_4/model.inc.c" +#include "actors_vanilla/rr/tricky_triangles_5/model.inc.c" +#include "actors_vanilla/rr/flying_carpet/collision.inc.c" +#include "actors_vanilla/rr/swinging_platform/collision.inc.c" +#include "actors_vanilla/rr/rotating_bridge_platform/collision.inc.c" +#include "actors_vanilla/rr/octagonal_platform/collision.inc.c" +#include "actors_vanilla/rr/sliding_platform/collision.inc.c" +#include "actors_vanilla/rr/pyramid_platform/collision.inc.c" +#include "actors_vanilla/rr/elevator_platform/collision.inc.c" +#include "actors_vanilla/rr/seesaw_platform/collision.inc.c" +#include "actors_vanilla/rr/donut_block/collision.inc.c" +#include "actors_vanilla/rr/l_platform/collision.inc.c" +#include "actors_vanilla/rr/tricky_triangles_1/collision.inc.c" +#include "actors_vanilla/rr/tricky_triangles_2/collision.inc.c" +#include "actors_vanilla/rr/tricky_triangles_3/collision.inc.c" +#include "actors_vanilla/rr/tricky_triangles_4/collision.inc.c" +#include "actors_vanilla/rr/tricky_triangles_5/collision.inc.c" diff --git a/levels/rr/donut_block/1.inc.c b/actors_vanilla/rr/donut_block/1.inc.c similarity index 100% rename from levels/rr/donut_block/1.inc.c rename to actors_vanilla/rr/donut_block/1.inc.c diff --git a/levels/rr/donut_block/2.inc.c b/actors_vanilla/rr/donut_block/2.inc.c similarity index 100% rename from levels/rr/donut_block/2.inc.c rename to actors_vanilla/rr/donut_block/2.inc.c diff --git a/levels/rr/donut_block/collision.inc.c b/actors_vanilla/rr/donut_block/collision.inc.c similarity index 100% rename from levels/rr/donut_block/collision.inc.c rename to actors_vanilla/rr/donut_block/collision.inc.c diff --git a/levels/rr/donut_block/geo.inc.c b/actors_vanilla/rr/donut_block/geo.inc.c similarity index 100% rename from levels/rr/donut_block/geo.inc.c rename to actors_vanilla/rr/donut_block/geo.inc.c diff --git a/levels/rr/elevator_platform/collision.inc.c b/actors_vanilla/rr/elevator_platform/collision.inc.c similarity index 100% rename from levels/rr/elevator_platform/collision.inc.c rename to actors_vanilla/rr/elevator_platform/collision.inc.c diff --git a/levels/rr/elevator_platform/geo.inc.c b/actors_vanilla/rr/elevator_platform/geo.inc.c similarity index 100% rename from levels/rr/elevator_platform/geo.inc.c rename to actors_vanilla/rr/elevator_platform/geo.inc.c diff --git a/levels/rr/elevator_platform/model.inc.c b/actors_vanilla/rr/elevator_platform/model.inc.c similarity index 100% rename from levels/rr/elevator_platform/model.inc.c rename to actors_vanilla/rr/elevator_platform/model.inc.c diff --git a/levels/rr/flying_carpet/collision.inc.c b/actors_vanilla/rr/flying_carpet/collision.inc.c similarity index 100% rename from levels/rr/flying_carpet/collision.inc.c rename to actors_vanilla/rr/flying_carpet/collision.inc.c diff --git a/levels/rr/flying_carpet/geo.inc.c b/actors_vanilla/rr/flying_carpet/geo.inc.c similarity index 100% rename from levels/rr/flying_carpet/geo.inc.c rename to actors_vanilla/rr/flying_carpet/geo.inc.c diff --git a/levels/rr/flying_carpet/model.inc.c b/actors_vanilla/rr/flying_carpet/model.inc.c similarity index 100% rename from levels/rr/flying_carpet/model.inc.c rename to actors_vanilla/rr/flying_carpet/model.inc.c diff --git a/actors_vanilla/rr/geo.c b/actors_vanilla/rr/geo.c new file mode 100644 index 0000000000..53e55d0e01 --- /dev/null +++ b/actors_vanilla/rr/geo.c @@ -0,0 +1,53 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/rr/header.h" + +#include "actors_vanilla/rr/flying_carpet/geo.inc.c" +#include "actors_vanilla/rr/swinging_platform/geo.inc.c" +#include "actors_vanilla/rr/rotating_bridge_platform/geo.inc.c" +#include "actors_vanilla/rr/cruiser_wing/geo.inc.c" +#include "actors_vanilla/rr/octagonal_platform/geo.inc.c" +#include "actors_vanilla/rr/sliding_platform/geo.inc.c" +#include "actors_vanilla/rr/pyramid_platform/geo.inc.c" // unused +#include "actors_vanilla/rr/elevator_platform/geo.inc.c" +#include "actors_vanilla/rr/seesaw_platform/geo.inc.c" +#include "actors_vanilla/rr/donut_block/geo.inc.c" +#include "actors_vanilla/rr/l_platform/geo.inc.c" // also unused +#include "actors_vanilla/rr/tricky_triangles_1/geo.inc.c" +#include "actors_vanilla/rr/tricky_triangles_2/geo.inc.c" +#include "actors_vanilla/rr/tricky_triangles_3/geo.inc.c" +#include "actors_vanilla/rr/tricky_triangles_4/geo.inc.c" +#include "actors_vanilla/rr/tricky_triangles_5/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_rr[] = { + LOAD_MODEL_FROM_GEO(MODEL_RR_SLIDING_PLATFORM, rr_geo_0008C0), + LOAD_MODEL_FROM_GEO(MODEL_RR_FLYING_CARPET, rr_geo_000848), + LOAD_MODEL_FROM_GEO(MODEL_RR_OCTAGONAL_PLATFORM, rr_geo_0008A8), + LOAD_MODEL_FROM_GEO(MODEL_RR_ROTATING_BRIDGE_PLATFORM, rr_geo_000878), + LOAD_MODEL_FROM_GEO(MODEL_RR_TRIANGLE_PLATFORM, rr_geo_0008D8), + LOAD_MODEL_FROM_GEO(MODEL_RR_CRUISER_WING, rr_geo_000890), + LOAD_MODEL_FROM_GEO(MODEL_RR_SEESAW_PLATFORM, rr_geo_000908), + LOAD_MODEL_FROM_GEO(MODEL_RR_L_SHAPED_PLATFORM, rr_geo_000940), + LOAD_MODEL_FROM_GEO(MODEL_RR_SWINGING_PLATFORM, rr_geo_000860), + LOAD_MODEL_FROM_GEO(MODEL_RR_DONUT_PLATFORM, rr_geo_000920), + LOAD_MODEL_FROM_GEO(MODEL_RR_ELEVATOR_PLATFORM, rr_geo_0008F0), + LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES, rr_geo_000958), + LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME1, rr_geo_000970), + LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME2, rr_geo_000988), + LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME3, rr_geo_0009A0), + LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME4, rr_geo_0009B8), + RETURN(), +}; diff --git a/actors_vanilla/rr/header.h b/actors_vanilla/rr/header.h new file mode 100644 index 0000000000..5c272af4c6 --- /dev/null +++ b/actors_vanilla/rr/header.h @@ -0,0 +1,57 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout rr_geo_000848[]; +extern const GeoLayout rr_geo_000860[]; +extern const GeoLayout rr_geo_000878[]; +extern const GeoLayout rr_geo_000890[]; +extern const GeoLayout rr_geo_0008A8[]; +extern const GeoLayout rr_geo_0008C0[]; +extern const GeoLayout rr_geo_0008D8[]; +extern const GeoLayout rr_geo_0008F0[]; +extern const GeoLayout rr_geo_000908[]; +extern const GeoLayout rr_geo_000920[]; +extern const GeoLayout rr_geo_000940[]; +extern const GeoLayout rr_geo_000958[]; +extern const GeoLayout rr_geo_000970[]; +extern const GeoLayout rr_geo_000988[]; +extern const GeoLayout rr_geo_0009A0[]; +extern const GeoLayout rr_geo_0009B8[]; + +extern const s16 flying_carpet_static_vertex_data[]; +extern const Gfx dl_flying_carpet_begin[]; +extern const Gfx dl_flying_carpet_model_half[]; +extern const Gfx dl_flying_carpet_end[]; +extern const Gfx rr_seg7_dl_07019AE0[]; +extern const Gfx rr_seg7_dl_0701A568[]; +extern const Gfx rr_seg7_dl_0701A680[]; +extern const Gfx rr_seg7_dl_0701AB78[]; +extern const Gfx rr_seg7_dl_0701ADF8[]; +extern const Gfx rr_seg7_dl_0701AFA0[]; +extern const Gfx rr_seg7_dl_0701B220[]; +extern const Gfx rr_seg7_dl_0701B4C0[]; +extern const Gfx rr_seg7_dl_0701B848[]; +extern const Gfx rr_seg7_dl_0701B980[]; +extern const Gfx rr_seg7_dl_0701BD08[]; +extern const Gfx rr_seg7_dl_0701E670[]; +extern const Gfx rr_seg7_dl_07021100[]; +extern const Gfx rr_seg7_dl_07023B90[]; +extern const Gfx rr_seg7_dl_07026630[]; +extern const Gfx rr_seg7_dl_07028FA8[]; + +extern const Collision rr_seg7_collision_flying_carpet[]; +extern const Collision rr_seg7_collision_pendulum[]; +extern const Collision rr_seg7_collision_rotating_platform_with_fire[]; +extern const Collision rr_seg7_collision_07029508[]; +extern const Collision rr_seg7_collision_070295F8[]; +extern const Collision rr_seg7_collision_0702967C[]; +extern const Collision rr_seg7_collision_elevator_platform[]; +extern const Collision rr_seg7_collision_07029750[]; +extern const Collision rr_seg7_collision_donut_platform[]; +extern const Collision rr_seg7_collision_07029858[]; +extern const Collision rr_seg7_collision_07029924[]; +extern const Collision rr_seg7_collision_07029C1C[]; +extern const Collision rr_seg7_collision_07029FA4[]; +extern const Collision rr_seg7_collision_0702A32C[]; +extern const Collision rr_seg7_collision_0702A6B4[]; diff --git a/levels/rr/l_platform/collision.inc.c b/actors_vanilla/rr/l_platform/collision.inc.c similarity index 100% rename from levels/rr/l_platform/collision.inc.c rename to actors_vanilla/rr/l_platform/collision.inc.c diff --git a/levels/rr/l_platform/geo.inc.c b/actors_vanilla/rr/l_platform/geo.inc.c similarity index 100% rename from levels/rr/l_platform/geo.inc.c rename to actors_vanilla/rr/l_platform/geo.inc.c diff --git a/levels/rr/l_platform/model.inc.c b/actors_vanilla/rr/l_platform/model.inc.c similarity index 100% rename from levels/rr/l_platform/model.inc.c rename to actors_vanilla/rr/l_platform/model.inc.c diff --git a/levels/rr/octagonal_platform/collision.inc.c b/actors_vanilla/rr/octagonal_platform/collision.inc.c similarity index 100% rename from levels/rr/octagonal_platform/collision.inc.c rename to actors_vanilla/rr/octagonal_platform/collision.inc.c diff --git a/levels/rr/octagonal_platform/geo.inc.c b/actors_vanilla/rr/octagonal_platform/geo.inc.c similarity index 100% rename from levels/rr/octagonal_platform/geo.inc.c rename to actors_vanilla/rr/octagonal_platform/geo.inc.c diff --git a/levels/rr/octagonal_platform/model.inc.c b/actors_vanilla/rr/octagonal_platform/model.inc.c similarity index 100% rename from levels/rr/octagonal_platform/model.inc.c rename to actors_vanilla/rr/octagonal_platform/model.inc.c diff --git a/levels/rr/pyramid_platform/collision.inc.c b/actors_vanilla/rr/pyramid_platform/collision.inc.c similarity index 100% rename from levels/rr/pyramid_platform/collision.inc.c rename to actors_vanilla/rr/pyramid_platform/collision.inc.c diff --git a/levels/rr/pyramid_platform/geo.inc.c b/actors_vanilla/rr/pyramid_platform/geo.inc.c similarity index 100% rename from levels/rr/pyramid_platform/geo.inc.c rename to actors_vanilla/rr/pyramid_platform/geo.inc.c diff --git a/levels/rr/pyramid_platform/model.inc.c b/actors_vanilla/rr/pyramid_platform/model.inc.c similarity index 100% rename from levels/rr/pyramid_platform/model.inc.c rename to actors_vanilla/rr/pyramid_platform/model.inc.c diff --git a/levels/rr/rotating_bridge_platform/collision.inc.c b/actors_vanilla/rr/rotating_bridge_platform/collision.inc.c similarity index 100% rename from levels/rr/rotating_bridge_platform/collision.inc.c rename to actors_vanilla/rr/rotating_bridge_platform/collision.inc.c diff --git a/levels/rr/rotating_bridge_platform/geo.inc.c b/actors_vanilla/rr/rotating_bridge_platform/geo.inc.c similarity index 100% rename from levels/rr/rotating_bridge_platform/geo.inc.c rename to actors_vanilla/rr/rotating_bridge_platform/geo.inc.c diff --git a/levels/rr/rotating_bridge_platform/model.inc.c b/actors_vanilla/rr/rotating_bridge_platform/model.inc.c similarity index 100% rename from levels/rr/rotating_bridge_platform/model.inc.c rename to actors_vanilla/rr/rotating_bridge_platform/model.inc.c diff --git a/levels/rr/seesaw_platform/collision.inc.c b/actors_vanilla/rr/seesaw_platform/collision.inc.c similarity index 100% rename from levels/rr/seesaw_platform/collision.inc.c rename to actors_vanilla/rr/seesaw_platform/collision.inc.c diff --git a/levels/rr/seesaw_platform/geo.inc.c b/actors_vanilla/rr/seesaw_platform/geo.inc.c similarity index 100% rename from levels/rr/seesaw_platform/geo.inc.c rename to actors_vanilla/rr/seesaw_platform/geo.inc.c diff --git a/levels/rr/seesaw_platform/model.inc.c b/actors_vanilla/rr/seesaw_platform/model.inc.c similarity index 100% rename from levels/rr/seesaw_platform/model.inc.c rename to actors_vanilla/rr/seesaw_platform/model.inc.c diff --git a/levels/rr/sliding_platform/collision.inc.c b/actors_vanilla/rr/sliding_platform/collision.inc.c similarity index 100% rename from levels/rr/sliding_platform/collision.inc.c rename to actors_vanilla/rr/sliding_platform/collision.inc.c diff --git a/levels/rr/sliding_platform/geo.inc.c b/actors_vanilla/rr/sliding_platform/geo.inc.c similarity index 100% rename from levels/rr/sliding_platform/geo.inc.c rename to actors_vanilla/rr/sliding_platform/geo.inc.c diff --git a/levels/rr/sliding_platform/model.inc.c b/actors_vanilla/rr/sliding_platform/model.inc.c similarity index 100% rename from levels/rr/sliding_platform/model.inc.c rename to actors_vanilla/rr/sliding_platform/model.inc.c diff --git a/levels/rr/swinging_platform/collision.inc.c b/actors_vanilla/rr/swinging_platform/collision.inc.c similarity index 100% rename from levels/rr/swinging_platform/collision.inc.c rename to actors_vanilla/rr/swinging_platform/collision.inc.c diff --git a/levels/rr/swinging_platform/geo.inc.c b/actors_vanilla/rr/swinging_platform/geo.inc.c similarity index 100% rename from levels/rr/swinging_platform/geo.inc.c rename to actors_vanilla/rr/swinging_platform/geo.inc.c diff --git a/levels/rr/swinging_platform/model.inc.c b/actors_vanilla/rr/swinging_platform/model.inc.c similarity index 100% rename from levels/rr/swinging_platform/model.inc.c rename to actors_vanilla/rr/swinging_platform/model.inc.c diff --git a/actors_vanilla/rr/texture.inc.c b/actors_vanilla/rr/texture.inc.c new file mode 100644 index 0000000000..46e756438c --- /dev/null +++ b/actors_vanilla/rr/texture.inc.c @@ -0,0 +1,8 @@ +// 0x07000000 - 0x07000800 +ALIGNED8 static const Texture texture_quarter_flying_carpet[] = { +#include "actors_vanilla/rr/quarter_flying_carpet.rgba16.inc.c" +}; +// 0x07000800 - 0x07001800 +ALIGNED8 static const Texture rr_seg7_texture_07000800[] = { +#include "actors_vanilla/rr/1.rgba16.inc.c" +}; diff --git a/levels/rr/tricky_triangles_1/collision.inc.c b/actors_vanilla/rr/tricky_triangles_1/collision.inc.c similarity index 100% rename from levels/rr/tricky_triangles_1/collision.inc.c rename to actors_vanilla/rr/tricky_triangles_1/collision.inc.c diff --git a/levels/rr/tricky_triangles_1/geo.inc.c b/actors_vanilla/rr/tricky_triangles_1/geo.inc.c similarity index 100% rename from levels/rr/tricky_triangles_1/geo.inc.c rename to actors_vanilla/rr/tricky_triangles_1/geo.inc.c diff --git a/levels/rr/tricky_triangles_1/model.inc.c b/actors_vanilla/rr/tricky_triangles_1/model.inc.c similarity index 100% rename from levels/rr/tricky_triangles_1/model.inc.c rename to actors_vanilla/rr/tricky_triangles_1/model.inc.c diff --git a/levels/rr/tricky_triangles_2/collision.inc.c b/actors_vanilla/rr/tricky_triangles_2/collision.inc.c similarity index 100% rename from levels/rr/tricky_triangles_2/collision.inc.c rename to actors_vanilla/rr/tricky_triangles_2/collision.inc.c diff --git a/levels/rr/tricky_triangles_2/geo.inc.c b/actors_vanilla/rr/tricky_triangles_2/geo.inc.c similarity index 100% rename from levels/rr/tricky_triangles_2/geo.inc.c rename to actors_vanilla/rr/tricky_triangles_2/geo.inc.c diff --git a/levels/rr/tricky_triangles_2/model.inc.c b/actors_vanilla/rr/tricky_triangles_2/model.inc.c similarity index 100% rename from levels/rr/tricky_triangles_2/model.inc.c rename to actors_vanilla/rr/tricky_triangles_2/model.inc.c diff --git a/levels/rr/tricky_triangles_3/collision.inc.c b/actors_vanilla/rr/tricky_triangles_3/collision.inc.c similarity index 100% rename from levels/rr/tricky_triangles_3/collision.inc.c rename to actors_vanilla/rr/tricky_triangles_3/collision.inc.c diff --git a/levels/rr/tricky_triangles_3/geo.inc.c b/actors_vanilla/rr/tricky_triangles_3/geo.inc.c similarity index 100% rename from levels/rr/tricky_triangles_3/geo.inc.c rename to actors_vanilla/rr/tricky_triangles_3/geo.inc.c diff --git a/levels/rr/tricky_triangles_3/model.inc.c b/actors_vanilla/rr/tricky_triangles_3/model.inc.c similarity index 100% rename from levels/rr/tricky_triangles_3/model.inc.c rename to actors_vanilla/rr/tricky_triangles_3/model.inc.c diff --git a/levels/rr/tricky_triangles_4/collision.inc.c b/actors_vanilla/rr/tricky_triangles_4/collision.inc.c similarity index 100% rename from levels/rr/tricky_triangles_4/collision.inc.c rename to actors_vanilla/rr/tricky_triangles_4/collision.inc.c diff --git a/levels/rr/tricky_triangles_4/geo.inc.c b/actors_vanilla/rr/tricky_triangles_4/geo.inc.c similarity index 100% rename from levels/rr/tricky_triangles_4/geo.inc.c rename to actors_vanilla/rr/tricky_triangles_4/geo.inc.c diff --git a/levels/rr/tricky_triangles_4/model.inc.c b/actors_vanilla/rr/tricky_triangles_4/model.inc.c similarity index 100% rename from levels/rr/tricky_triangles_4/model.inc.c rename to actors_vanilla/rr/tricky_triangles_4/model.inc.c diff --git a/levels/rr/tricky_triangles_5/collision.inc.c b/actors_vanilla/rr/tricky_triangles_5/collision.inc.c similarity index 100% rename from levels/rr/tricky_triangles_5/collision.inc.c rename to actors_vanilla/rr/tricky_triangles_5/collision.inc.c diff --git a/levels/rr/tricky_triangles_5/geo.inc.c b/actors_vanilla/rr/tricky_triangles_5/geo.inc.c similarity index 100% rename from levels/rr/tricky_triangles_5/geo.inc.c rename to actors_vanilla/rr/tricky_triangles_5/geo.inc.c diff --git a/levels/rr/tricky_triangles_5/model.inc.c b/actors_vanilla/rr/tricky_triangles_5/model.inc.c similarity index 100% rename from levels/rr/tricky_triangles_5/model.inc.c rename to actors_vanilla/rr/tricky_triangles_5/model.inc.c diff --git a/actors_vanilla/sl/data.c b/actors_vanilla/sl/data.c new file mode 100644 index 0000000000..47fad140cb --- /dev/null +++ b/actors_vanilla/sl/data.c @@ -0,0 +1,20 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/sl/texture.inc.c" + +#include "actors_vanilla/sl/snow_mound/model.inc.c" +#include "actors_vanilla/sl/unused_cracked_ice/model.inc.c" +#include "actors_vanilla/sl/unused_ice_shard/model.inc.c" // Used in the unused behavior when ground pounding the cracked ice show in the above model. +#include "actors_vanilla/sl/snow_mound/collision.inc.c" +#include "actors_vanilla/sl/unused_cracked_ice/collision.inc.c" diff --git a/actors_vanilla/sl/geo.c b/actors_vanilla/sl/geo.c new file mode 100644 index 0000000000..567d3564d8 --- /dev/null +++ b/actors_vanilla/sl/geo.c @@ -0,0 +1,27 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/sl/header.h" + +#include "actors_vanilla/sl/unused_cracked_ice/geo.inc.c" +#include "actors_vanilla/sl/unused_ice_shard/geo.inc.c" +#include "actors_vanilla/sl/snow_mound/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_sl[] = { + LOAD_MODEL_FROM_GEO(MODEL_SL_SNOW_TRIANGLE, sl_geo_000390), + LOAD_MODEL_FROM_GEO(MODEL_SL_CRACKED_ICE, sl_geo_000360), + LOAD_MODEL_FROM_GEO(MODEL_SL_CRACKED_ICE_CHUNK, sl_geo_000378), + RETURN(), +}; diff --git a/actors_vanilla/sl/header.h b/actors_vanilla/sl/header.h new file mode 100644 index 0000000000..9608aecfe8 --- /dev/null +++ b/actors_vanilla/sl/header.h @@ -0,0 +1,14 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout sl_geo_000360[]; +extern const GeoLayout sl_geo_000378[]; +extern const GeoLayout sl_geo_000390[]; + +extern const Gfx sl_seg7_dl_0700A780[]; +extern const Gfx sl_seg7_dl_0700A890[]; +extern const Gfx sl_seg7_dl_0700A980[]; + +extern const Collision sl_seg7_collision_sliding_snow_mound[]; +extern const Collision sl_seg7_collision_pound_explodes[]; diff --git a/levels/sl/snow_mound/collision.inc.c b/actors_vanilla/sl/snow_mound/collision.inc.c similarity index 100% rename from levels/sl/snow_mound/collision.inc.c rename to actors_vanilla/sl/snow_mound/collision.inc.c diff --git a/levels/sl/snow_mound/geo.inc.c b/actors_vanilla/sl/snow_mound/geo.inc.c similarity index 100% rename from levels/sl/snow_mound/geo.inc.c rename to actors_vanilla/sl/snow_mound/geo.inc.c diff --git a/levels/sl/snow_mound/model.inc.c b/actors_vanilla/sl/snow_mound/model.inc.c similarity index 100% rename from levels/sl/snow_mound/model.inc.c rename to actors_vanilla/sl/snow_mound/model.inc.c diff --git a/actors_vanilla/sl/texture.inc.c b/actors_vanilla/sl/texture.inc.c new file mode 100644 index 0000000000..bb89ff256d --- /dev/null +++ b/actors_vanilla/sl/texture.inc.c @@ -0,0 +1,4 @@ +// 0x07001000 - 0x07001800 +ALIGNED8 static const Texture sl_seg7_texture_07001000[] = { +#include "actors_vanilla/sl/2.rgba16.inc.c" +}; diff --git a/levels/sl/unused_cracked_ice/collision.inc.c b/actors_vanilla/sl/unused_cracked_ice/collision.inc.c similarity index 100% rename from levels/sl/unused_cracked_ice/collision.inc.c rename to actors_vanilla/sl/unused_cracked_ice/collision.inc.c diff --git a/levels/sl/unused_cracked_ice/geo.inc.c b/actors_vanilla/sl/unused_cracked_ice/geo.inc.c similarity index 100% rename from levels/sl/unused_cracked_ice/geo.inc.c rename to actors_vanilla/sl/unused_cracked_ice/geo.inc.c diff --git a/levels/sl/unused_cracked_ice/model.inc.c b/actors_vanilla/sl/unused_cracked_ice/model.inc.c similarity index 100% rename from levels/sl/unused_cracked_ice/model.inc.c rename to actors_vanilla/sl/unused_cracked_ice/model.inc.c diff --git a/levels/sl/unused_ice_shard/geo.inc.c b/actors_vanilla/sl/unused_ice_shard/geo.inc.c similarity index 100% rename from levels/sl/unused_ice_shard/geo.inc.c rename to actors_vanilla/sl/unused_ice_shard/geo.inc.c diff --git a/levels/sl/unused_ice_shard/model.inc.c b/actors_vanilla/sl/unused_ice_shard/model.inc.c similarity index 100% rename from levels/sl/unused_ice_shard/model.inc.c rename to actors_vanilla/sl/unused_ice_shard/model.inc.c diff --git a/actors_vanilla/ssl/data.c b/actors_vanilla/ssl/data.c new file mode 100644 index 0000000000..0357effef9 --- /dev/null +++ b/actors_vanilla/ssl/data.c @@ -0,0 +1,28 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ssl/texture.inc.c" + +#include "actors_vanilla/ssl/pyramid_top/model.inc.c" +#include "actors_vanilla/ssl/tox_box/model.inc.c" +#include "actors_vanilla/ssl/pyramid_top/collision.inc.c" +#include "actors_vanilla/ssl/tox_box/collision.inc.c" +#include "actors_vanilla/ssl/grindel/model.inc.c" +#include "actors_vanilla/ssl/spindel/model.inc.c" +#include "actors_vanilla/ssl/moving_pyramid_wall/model.inc.c" +#include "actors_vanilla/ssl/pyramid_elevator/model.inc.c" +#include "actors_vanilla/ssl/grindel/collision.inc.c" +#include "actors_vanilla/ssl/spindel/collision.inc.c" +#include "actors_vanilla/ssl/moving_pyramid_wall/collision.inc.c" +#include "actors_vanilla/ssl/pyramid_elevator/collision.inc.c" +#include "actors_vanilla/ssl/eyerok_col/collision.inc.c" diff --git a/levels/ssl/eyerok_col/collision.inc.c b/actors_vanilla/ssl/eyerok_col/collision.inc.c similarity index 100% rename from levels/ssl/eyerok_col/collision.inc.c rename to actors_vanilla/ssl/eyerok_col/collision.inc.c diff --git a/actors_vanilla/ssl/geo.c b/actors_vanilla/ssl/geo.c new file mode 100644 index 0000000000..a2fdb17c20 --- /dev/null +++ b/actors_vanilla/ssl/geo.c @@ -0,0 +1,33 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ssl/header.h" + +#include "actors_vanilla/ssl/pyramid_top/geo.inc.c" +#include "actors_vanilla/ssl/tox_box/geo.inc.c" +#include "actors_vanilla/ssl/grindel/geo.inc.c" +#include "actors_vanilla/ssl/spindel/geo.inc.c" +#include "actors_vanilla/ssl/moving_pyramid_wall/geo.inc.c" +#include "actors_vanilla/ssl/pyramid_elevator/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_ssl[] = { + LOAD_MODEL_FROM_GEO(MODEL_SSL_PYRAMID_TOP, ssl_geo_000618), + LOAD_MODEL_FROM_GEO(MODEL_SSL_GRINDEL, ssl_geo_000734), + LOAD_MODEL_FROM_GEO(MODEL_SSL_SPINDEL, ssl_geo_000764), + LOAD_MODEL_FROM_GEO(MODEL_SSL_MOVING_PYRAMID_WALL, ssl_geo_000794), + LOAD_MODEL_FROM_GEO(MODEL_SSL_PYRAMID_ELEVATOR, ssl_geo_0007AC), + LOAD_MODEL_FROM_GEO(MODEL_SSL_TOX_BOX, ssl_geo_000630), + RETURN(), +}; diff --git a/levels/ssl/grindel/collision.inc.c b/actors_vanilla/ssl/grindel/collision.inc.c similarity index 100% rename from levels/ssl/grindel/collision.inc.c rename to actors_vanilla/ssl/grindel/collision.inc.c diff --git a/levels/ssl/grindel/geo.inc.c b/actors_vanilla/ssl/grindel/geo.inc.c similarity index 100% rename from levels/ssl/grindel/geo.inc.c rename to actors_vanilla/ssl/grindel/geo.inc.c diff --git a/levels/ssl/grindel/model.inc.c b/actors_vanilla/ssl/grindel/model.inc.c similarity index 100% rename from levels/ssl/grindel/model.inc.c rename to actors_vanilla/ssl/grindel/model.inc.c diff --git a/actors_vanilla/ssl/header.h b/actors_vanilla/ssl/header.h new file mode 100644 index 0000000000..7828a282d8 --- /dev/null +++ b/actors_vanilla/ssl/header.h @@ -0,0 +1,31 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout ssl_geo_000618[]; +extern const GeoLayout ssl_geo_000630[]; +extern const GeoLayout ssl_geo_000734[]; +extern const GeoLayout ssl_geo_000764[]; +extern const GeoLayout ssl_geo_000794[]; +extern const GeoLayout ssl_geo_0007AC[]; + +extern const Gfx ssl_seg7_dl_0700BF18[]; +extern const Gfx ssl_seg7_dl_0700FCE0[]; +extern const Gfx ssl_seg7_dl_070220A8[]; +extern const Gfx ssl_seg7_dl_070221E8[]; +extern const Gfx ssl_seg7_dl_070228A8[]; +extern const Gfx ssl_seg7_dl_070229E8[]; +extern const Gfx ssl_seg7_dl_07022CF8[]; +extern const Gfx ssl_seg7_dl_070233A8[]; +extern const Gfx ssl_seg7_dl_070235C0[]; + +extern const Collision ssl_seg7_collision_grindel[]; +extern const Collision ssl_seg7_collision_spindel[]; +extern const Collision ssl_seg7_collision_0702808C[]; +extern const Collision ssl_seg7_collision_pyramid_elevator[]; +extern const Collision ssl_seg7_collision_07028274[]; +extern const Collision ssl_seg7_collision_070282F8[]; +extern const Collision ssl_seg7_collision_07028370[]; +extern const Collision ssl_seg7_collision_070284B0[]; +extern const Collision ssl_seg7_collision_pyramid_top[]; +extern const Collision ssl_seg7_collision_tox_box[]; \ No newline at end of file diff --git a/levels/ssl/moving_pyramid_wall/collision.inc.c b/actors_vanilla/ssl/moving_pyramid_wall/collision.inc.c similarity index 100% rename from levels/ssl/moving_pyramid_wall/collision.inc.c rename to actors_vanilla/ssl/moving_pyramid_wall/collision.inc.c diff --git a/levels/ssl/moving_pyramid_wall/geo.inc.c b/actors_vanilla/ssl/moving_pyramid_wall/geo.inc.c similarity index 100% rename from levels/ssl/moving_pyramid_wall/geo.inc.c rename to actors_vanilla/ssl/moving_pyramid_wall/geo.inc.c diff --git a/levels/ssl/moving_pyramid_wall/model.inc.c b/actors_vanilla/ssl/moving_pyramid_wall/model.inc.c similarity index 100% rename from levels/ssl/moving_pyramid_wall/model.inc.c rename to actors_vanilla/ssl/moving_pyramid_wall/model.inc.c diff --git a/levels/ssl/pyramid_elevator/collision.inc.c b/actors_vanilla/ssl/pyramid_elevator/collision.inc.c similarity index 100% rename from levels/ssl/pyramid_elevator/collision.inc.c rename to actors_vanilla/ssl/pyramid_elevator/collision.inc.c diff --git a/levels/ssl/pyramid_elevator/geo.inc.c b/actors_vanilla/ssl/pyramid_elevator/geo.inc.c similarity index 100% rename from levels/ssl/pyramid_elevator/geo.inc.c rename to actors_vanilla/ssl/pyramid_elevator/geo.inc.c diff --git a/levels/ssl/pyramid_elevator/model.inc.c b/actors_vanilla/ssl/pyramid_elevator/model.inc.c similarity index 100% rename from levels/ssl/pyramid_elevator/model.inc.c rename to actors_vanilla/ssl/pyramid_elevator/model.inc.c diff --git a/levels/ssl/pyramid_top/collision.inc.c b/actors_vanilla/ssl/pyramid_top/collision.inc.c similarity index 100% rename from levels/ssl/pyramid_top/collision.inc.c rename to actors_vanilla/ssl/pyramid_top/collision.inc.c diff --git a/levels/ssl/pyramid_top/geo.inc.c b/actors_vanilla/ssl/pyramid_top/geo.inc.c similarity index 100% rename from levels/ssl/pyramid_top/geo.inc.c rename to actors_vanilla/ssl/pyramid_top/geo.inc.c diff --git a/levels/ssl/pyramid_top/model.inc.c b/actors_vanilla/ssl/pyramid_top/model.inc.c similarity index 100% rename from levels/ssl/pyramid_top/model.inc.c rename to actors_vanilla/ssl/pyramid_top/model.inc.c diff --git a/levels/ssl/spindel/collision.inc.c b/actors_vanilla/ssl/spindel/collision.inc.c similarity index 100% rename from levels/ssl/spindel/collision.inc.c rename to actors_vanilla/ssl/spindel/collision.inc.c diff --git a/levels/ssl/spindel/geo.inc.c b/actors_vanilla/ssl/spindel/geo.inc.c similarity index 100% rename from levels/ssl/spindel/geo.inc.c rename to actors_vanilla/ssl/spindel/geo.inc.c diff --git a/levels/ssl/spindel/model.inc.c b/actors_vanilla/ssl/spindel/model.inc.c similarity index 100% rename from levels/ssl/spindel/model.inc.c rename to actors_vanilla/ssl/spindel/model.inc.c diff --git a/actors_vanilla/ssl/texture.inc.c b/actors_vanilla/ssl/texture.inc.c new file mode 100644 index 0000000000..a29ca07177 --- /dev/null +++ b/actors_vanilla/ssl/texture.inc.c @@ -0,0 +1,9 @@ +// 0x07002800 - 0x07003800 +ALIGNED8 static const Texture ssl_seg7_texture_07002800[] = { +#include "actors_vanilla/ssl/5.rgba16.inc.c" +}; + +// 0x07003800 - 0x07004000 +ALIGNED8 static const Texture ssl_seg7_texture_07003800[] = { +#include "actors_vanilla/ssl/6.rgba16.inc.c" +}; diff --git a/levels/ssl/tox_box/collision.inc.c b/actors_vanilla/ssl/tox_box/collision.inc.c similarity index 100% rename from levels/ssl/tox_box/collision.inc.c rename to actors_vanilla/ssl/tox_box/collision.inc.c diff --git a/levels/ssl/tox_box/geo.inc.c b/actors_vanilla/ssl/tox_box/geo.inc.c similarity index 100% rename from levels/ssl/tox_box/geo.inc.c rename to actors_vanilla/ssl/tox_box/geo.inc.c diff --git a/levels/ssl/tox_box/model.inc.c b/actors_vanilla/ssl/tox_box/model.inc.c similarity index 98% rename from levels/ssl/tox_box/model.inc.c rename to actors_vanilla/ssl/tox_box/model.inc.c index 487ebfbc22..ff646697ea 100644 --- a/levels/ssl/tox_box/model.inc.c +++ b/actors_vanilla/ssl/tox_box/model.inc.c @@ -2,22 +2,22 @@ // 0x0700BFA8 - 0x0700C7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700BFA8[] = { -#include "levels/ssl/8.rgba16.inc.c" +#include "actors_vanilla/ssl/8.rgba16.inc.c" }; // 0x0700C7A8 - 0x0700D7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700C7A8[] = { -#include "levels/ssl/9.rgba16.inc.c" +#include "actors_vanilla/ssl/9.rgba16.inc.c" }; // 0x0700D7A8 - 0x0700E7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700D7A8[] = { -#include "levels/ssl/10.rgba16.inc.c" +#include "actors_vanilla/ssl/10.rgba16.inc.c" }; // 0x0700E7A8 - 0x0700F7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700E7A8[] = { -#include "levels/ssl/11.rgba16.inc.c" +#include "actors_vanilla/ssl/11.rgba16.inc.c" }; // 0x0700F7A8 - 0x0700F898 diff --git a/actors_vanilla/thi/data.c b/actors_vanilla/thi/data.c new file mode 100644 index 0000000000..c0276b4987 --- /dev/null +++ b/actors_vanilla/thi/data.c @@ -0,0 +1,17 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/thi/texture.inc.c" + +#include "actors_vanilla/thi/thi_tops/model.inc.c" +#include "actors_vanilla/thi/thi_tops/collision.inc.c" diff --git a/actors_vanilla/thi/geo.c b/actors_vanilla/thi/geo.c new file mode 100644 index 0000000000..b38c3a5f98 --- /dev/null +++ b/actors_vanilla/thi/geo.c @@ -0,0 +1,24 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/thi/header.h" + +#include "actors_vanilla/thi/thi_tops/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_thi[] = { + LOAD_MODEL_FROM_GEO(MODEL_THI_HUGE_ISLAND_TOP, thi_geo_0005B0), + LOAD_MODEL_FROM_GEO(MODEL_THI_TINY_ISLAND_TOP, thi_geo_0005C8), + RETURN(), +}; diff --git a/actors_vanilla/thi/header.h b/actors_vanilla/thi/header.h new file mode 100644 index 0000000000..051d29baed --- /dev/null +++ b/actors_vanilla/thi/header.h @@ -0,0 +1,10 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout thi_geo_0005B0[]; +extern const GeoLayout thi_geo_0005C8[]; + +extern const Gfx thi_seg7_dl_07007648[]; + +extern const Collision thi_seg7_collision_top_trap[]; diff --git a/actors_vanilla/thi/texture.inc.c b/actors_vanilla/thi/texture.inc.c new file mode 100644 index 0000000000..74ae96cdc1 --- /dev/null +++ b/actors_vanilla/thi/texture.inc.c @@ -0,0 +1,4 @@ +// 0x07000800 - 0x07000802 +ALIGNED8 static const Texture thi_seg7_texture_07000800[] = { +#include "actors_vanilla/thi/1.rgba16.inc.c" +}; diff --git a/levels/thi/areas/1/6/collision.inc.c b/actors_vanilla/thi/thi_tops/collision.inc.c similarity index 100% rename from levels/thi/areas/1/6/collision.inc.c rename to actors_vanilla/thi/thi_tops/collision.inc.c diff --git a/levels/thi/areas/1/6/geo.inc.c b/actors_vanilla/thi/thi_tops/geo.inc.c similarity index 100% rename from levels/thi/areas/1/6/geo.inc.c rename to actors_vanilla/thi/thi_tops/geo.inc.c diff --git a/levels/thi/areas/1/6/model.inc.c b/actors_vanilla/thi/thi_tops/model.inc.c similarity index 100% rename from levels/thi/areas/1/6/model.inc.c rename to actors_vanilla/thi/thi_tops/model.inc.c diff --git a/levels/ttc/clock_hand/collision.inc.c b/actors_vanilla/ttc/clock_hand/collision.inc.c similarity index 100% rename from levels/ttc/clock_hand/collision.inc.c rename to actors_vanilla/ttc/clock_hand/collision.inc.c diff --git a/levels/ttc/clock_hand/geo.inc.c b/actors_vanilla/ttc/clock_hand/geo.inc.c similarity index 100% rename from levels/ttc/clock_hand/geo.inc.c rename to actors_vanilla/ttc/clock_hand/geo.inc.c diff --git a/levels/ttc/clock_hand/model.inc.c b/actors_vanilla/ttc/clock_hand/model.inc.c similarity index 100% rename from levels/ttc/clock_hand/model.inc.c rename to actors_vanilla/ttc/clock_hand/model.inc.c diff --git a/actors_vanilla/ttc/data.c b/actors_vanilla/ttc/data.c new file mode 100644 index 0000000000..1b7ec1198b --- /dev/null +++ b/actors_vanilla/ttc/data.c @@ -0,0 +1,44 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ttc/texture.inc.c" + +#include "actors_vanilla/ttc/rotating_cube/model.inc.c" +#include "actors_vanilla/ttc/rotating_prism/model.inc.c" +#include "actors_vanilla/ttc/pendulum/model.inc.c" +#include "actors_vanilla/ttc/large_treadmill/model.inc.c" +#include "actors_vanilla/ttc/small_treadmill/model.inc.c" +#include "actors_vanilla/ttc/push_block/model.inc.c" +#include "actors_vanilla/ttc/rotating_hexagon/model.inc.c" +#include "actors_vanilla/ttc/rotating_triangle/model.inc.c" +#include "actors_vanilla/ttc/pit_block/model.inc.c" +#include "actors_vanilla/ttc/pit_block_2/model.inc.c" +#include "actors_vanilla/ttc/elevator_platform/model.inc.c" +#include "actors_vanilla/ttc/clock_hand/model.inc.c" +#include "actors_vanilla/ttc/spinner/model.inc.c" +#include "actors_vanilla/ttc/small_gear/model.inc.c" +#include "actors_vanilla/ttc/large_gear/model.inc.c" + +#include "actors_vanilla/ttc/rotating_cube/collision.inc.c" +#include "actors_vanilla/ttc/rotating_prism/collision.inc.c" +#include "actors_vanilla/ttc/pendulum/collision.inc.c" +#include "actors_vanilla/ttc/large_treadmill/collision.inc.c" +#include "actors_vanilla/ttc/small_treadmill/collision.inc.c" +#include "actors_vanilla/ttc/push_block/collision.inc.c" +#include "actors_vanilla/ttc/rotating_hexagon/collision.inc.c" +#include "actors_vanilla/ttc/rotating_triangle/collision.inc.c" +#include "actors_vanilla/ttc/pit_block/collision.inc.c" +#include "actors_vanilla/ttc/pit_block_2/collision.inc.c" +#include "actors_vanilla/ttc/elevator_platform/collision.inc.c" +#include "actors_vanilla/ttc/clock_hand/collision.inc.c" +#include "actors_vanilla/ttc/spinner/collision.inc.c" diff --git a/levels/ttc/elevator_platform/collision.inc.c b/actors_vanilla/ttc/elevator_platform/collision.inc.c similarity index 100% rename from levels/ttc/elevator_platform/collision.inc.c rename to actors_vanilla/ttc/elevator_platform/collision.inc.c diff --git a/levels/ttc/elevator_platform/geo.inc.c b/actors_vanilla/ttc/elevator_platform/geo.inc.c similarity index 100% rename from levels/ttc/elevator_platform/geo.inc.c rename to actors_vanilla/ttc/elevator_platform/geo.inc.c diff --git a/levels/ttc/elevator_platform/model.inc.c b/actors_vanilla/ttc/elevator_platform/model.inc.c similarity index 100% rename from levels/ttc/elevator_platform/model.inc.c rename to actors_vanilla/ttc/elevator_platform/model.inc.c diff --git a/actors_vanilla/ttc/geo.c b/actors_vanilla/ttc/geo.c new file mode 100644 index 0000000000..9cc4a4b2d7 --- /dev/null +++ b/actors_vanilla/ttc/geo.c @@ -0,0 +1,51 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ttc/header.h" + +#include "actors_vanilla/ttc/rotating_cube/geo.inc.c" +#include "actors_vanilla/ttc/rotating_prism/geo.inc.c" +#include "actors_vanilla/ttc/pendulum/geo.inc.c" +#include "actors_vanilla/ttc/large_treadmill/geo.inc.c" +#include "actors_vanilla/ttc/small_treadmill/geo.inc.c" +#include "actors_vanilla/ttc/push_block/geo.inc.c" +#include "actors_vanilla/ttc/rotating_hexagon/geo.inc.c" +#include "actors_vanilla/ttc/rotating_triangle/geo.inc.c" +#include "actors_vanilla/ttc/pit_block/geo.inc.c" +#include "actors_vanilla/ttc/pit_block_2/geo.inc.c" +#include "actors_vanilla/ttc/elevator_platform/geo.inc.c" +#include "actors_vanilla/ttc/clock_hand/geo.inc.c" +#include "actors_vanilla/ttc/spinner/geo.inc.c" +#include "actors_vanilla/ttc/small_gear/geo.inc.c" +#include "actors_vanilla/ttc/large_gear/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_ttc[] = { + LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_CUBE, ttc_geo_000240), + LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_PRISM, ttc_geo_000258), + LOAD_MODEL_FROM_GEO(MODEL_TTC_PENDULUM, ttc_geo_000270), + LOAD_MODEL_FROM_GEO(MODEL_TTC_LARGE_TREADMILL, ttc_geo_000288), + LOAD_MODEL_FROM_GEO(MODEL_TTC_SMALL_TREADMILL, ttc_geo_0002A8), + LOAD_MODEL_FROM_GEO(MODEL_TTC_PUSH_BLOCK, ttc_geo_0002C8), + LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_HEXAGON, ttc_geo_0002E0), + LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_TRIANGLE, ttc_geo_0002F8), + LOAD_MODEL_FROM_GEO(MODEL_TTC_PIT_BLOCK, ttc_geo_000310), + LOAD_MODEL_FROM_GEO(MODEL_TTC_PIT_BLOCK_UNUSED, ttc_geo_000328), + LOAD_MODEL_FROM_GEO(MODEL_TTC_ELEVATOR_PLATFORM, ttc_geo_000340), + LOAD_MODEL_FROM_GEO(MODEL_TTC_CLOCK_HAND, ttc_geo_000358), + LOAD_MODEL_FROM_GEO(MODEL_TTC_SPINNER, ttc_geo_000370), + LOAD_MODEL_FROM_GEO(MODEL_TTC_SMALL_GEAR, ttc_geo_000388), + LOAD_MODEL_FROM_GEO(MODEL_TTC_LARGE_GEAR, ttc_geo_0003A0), + RETURN(), +}; diff --git a/actors_vanilla/ttc/header.h b/actors_vanilla/ttc/header.h new file mode 100644 index 0000000000..d158b194af --- /dev/null +++ b/actors_vanilla/ttc/header.h @@ -0,0 +1,49 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout ttc_geo_000240[]; +extern const GeoLayout ttc_geo_000258[]; +extern const GeoLayout ttc_geo_000270[]; +extern const GeoLayout ttc_geo_000288[]; +extern const GeoLayout ttc_geo_0002A8[]; +extern const GeoLayout ttc_geo_0002C8[]; +extern const GeoLayout ttc_geo_0002E0[]; +extern const GeoLayout ttc_geo_0002F8[]; +extern const GeoLayout ttc_geo_000310[]; +extern const GeoLayout ttc_geo_000328[]; +extern const GeoLayout ttc_geo_000340[]; +extern const GeoLayout ttc_geo_000358[]; +extern const GeoLayout ttc_geo_000370[]; +extern const GeoLayout ttc_geo_000388[]; +extern const GeoLayout ttc_geo_0003A0[]; + +extern const Gfx ttc_seg7_dl_0700ECB8[]; +extern const Gfx ttc_seg7_dl_0700EFE0[]; +extern const Gfx ttc_seg7_dl_0700F760[]; +extern const Gfx ttc_seg7_dl_0700FBB8[]; +extern const Gfx ttc_seg7_dl_0700FFE8[]; +extern const Gfx ttc_seg7_dl_070102B8[]; +extern const Gfx ttc_seg7_dl_07010868[]; +extern const Gfx ttc_seg7_dl_07010D38[]; +extern const Gfx ttc_seg7_dl_07011040[]; +extern const Gfx ttc_seg7_dl_07011360[]; +extern const Gfx ttc_seg7_dl_070116A8[]; +extern const Gfx ttc_seg7_dl_07011B38[]; +extern const Gfx ttc_seg7_dl_07012028[]; +extern const Gfx ttc_seg7_dl_07012148[]; +extern const Gfx ttc_seg7_dl_07012278[]; + +extern const Collision ttc_seg7_collision_07014F70[]; +extern const Collision ttc_seg7_collision_07015008[]; +extern const Collision ttc_seg7_collision_clock_pendulum[]; +extern const Collision ttc_seg7_collision_070152B4[]; +extern const Collision ttc_seg7_collision_070153E0[]; +extern const Collision ttc_seg7_collision_sliding_surface[]; +extern const Collision ttc_seg7_collision_07015584[]; +extern const Collision ttc_seg7_collision_07015650[]; +extern const Collision ttc_seg7_collision_07015754[]; +extern const Collision ttc_seg7_collision_070157D8[]; +extern const Collision ttc_seg7_collision_clock_platform[]; +extern const Collision ttc_seg7_collision_clock_main_rotation[]; +extern const Collision ttc_seg7_collision_rotating_clock_platform2[]; diff --git a/levels/ttc/large_gear/geo.inc.c b/actors_vanilla/ttc/large_gear/geo.inc.c similarity index 100% rename from levels/ttc/large_gear/geo.inc.c rename to actors_vanilla/ttc/large_gear/geo.inc.c diff --git a/levels/ttc/large_gear/model.inc.c b/actors_vanilla/ttc/large_gear/model.inc.c similarity index 100% rename from levels/ttc/large_gear/model.inc.c rename to actors_vanilla/ttc/large_gear/model.inc.c diff --git a/levels/ttc/large_treadmill/collision.inc.c b/actors_vanilla/ttc/large_treadmill/collision.inc.c similarity index 100% rename from levels/ttc/large_treadmill/collision.inc.c rename to actors_vanilla/ttc/large_treadmill/collision.inc.c diff --git a/levels/ttc/large_treadmill/geo.inc.c b/actors_vanilla/ttc/large_treadmill/geo.inc.c similarity index 100% rename from levels/ttc/large_treadmill/geo.inc.c rename to actors_vanilla/ttc/large_treadmill/geo.inc.c diff --git a/levels/ttc/large_treadmill/model.inc.c b/actors_vanilla/ttc/large_treadmill/model.inc.c similarity index 100% rename from levels/ttc/large_treadmill/model.inc.c rename to actors_vanilla/ttc/large_treadmill/model.inc.c diff --git a/levels/ttc/pendulum/collision.inc.c b/actors_vanilla/ttc/pendulum/collision.inc.c similarity index 100% rename from levels/ttc/pendulum/collision.inc.c rename to actors_vanilla/ttc/pendulum/collision.inc.c diff --git a/levels/ttc/pendulum/geo.inc.c b/actors_vanilla/ttc/pendulum/geo.inc.c similarity index 100% rename from levels/ttc/pendulum/geo.inc.c rename to actors_vanilla/ttc/pendulum/geo.inc.c diff --git a/levels/ttc/pendulum/model.inc.c b/actors_vanilla/ttc/pendulum/model.inc.c similarity index 100% rename from levels/ttc/pendulum/model.inc.c rename to actors_vanilla/ttc/pendulum/model.inc.c diff --git a/levels/ttc/pit_block/collision.inc.c b/actors_vanilla/ttc/pit_block/collision.inc.c similarity index 100% rename from levels/ttc/pit_block/collision.inc.c rename to actors_vanilla/ttc/pit_block/collision.inc.c diff --git a/levels/ttc/pit_block/geo.inc.c b/actors_vanilla/ttc/pit_block/geo.inc.c similarity index 100% rename from levels/ttc/pit_block/geo.inc.c rename to actors_vanilla/ttc/pit_block/geo.inc.c diff --git a/levels/ttc/pit_block/model.inc.c b/actors_vanilla/ttc/pit_block/model.inc.c similarity index 100% rename from levels/ttc/pit_block/model.inc.c rename to actors_vanilla/ttc/pit_block/model.inc.c diff --git a/levels/ttc/pit_block_2/collision.inc.c b/actors_vanilla/ttc/pit_block_2/collision.inc.c similarity index 100% rename from levels/ttc/pit_block_2/collision.inc.c rename to actors_vanilla/ttc/pit_block_2/collision.inc.c diff --git a/levels/ttc/pit_block_2/geo.inc.c b/actors_vanilla/ttc/pit_block_2/geo.inc.c similarity index 100% rename from levels/ttc/pit_block_2/geo.inc.c rename to actors_vanilla/ttc/pit_block_2/geo.inc.c diff --git a/levels/ttc/pit_block_2/model.inc.c b/actors_vanilla/ttc/pit_block_2/model.inc.c similarity index 100% rename from levels/ttc/pit_block_2/model.inc.c rename to actors_vanilla/ttc/pit_block_2/model.inc.c diff --git a/levels/ttc/push_block/collision.inc.c b/actors_vanilla/ttc/push_block/collision.inc.c similarity index 100% rename from levels/ttc/push_block/collision.inc.c rename to actors_vanilla/ttc/push_block/collision.inc.c diff --git a/levels/ttc/push_block/geo.inc.c b/actors_vanilla/ttc/push_block/geo.inc.c similarity index 100% rename from levels/ttc/push_block/geo.inc.c rename to actors_vanilla/ttc/push_block/geo.inc.c diff --git a/levels/ttc/push_block/model.inc.c b/actors_vanilla/ttc/push_block/model.inc.c similarity index 100% rename from levels/ttc/push_block/model.inc.c rename to actors_vanilla/ttc/push_block/model.inc.c diff --git a/levels/ttc/rotating_cube/collision.inc.c b/actors_vanilla/ttc/rotating_cube/collision.inc.c similarity index 100% rename from levels/ttc/rotating_cube/collision.inc.c rename to actors_vanilla/ttc/rotating_cube/collision.inc.c diff --git a/levels/ttc/rotating_cube/geo.inc.c b/actors_vanilla/ttc/rotating_cube/geo.inc.c similarity index 100% rename from levels/ttc/rotating_cube/geo.inc.c rename to actors_vanilla/ttc/rotating_cube/geo.inc.c diff --git a/levels/ttc/rotating_cube/model.inc.c b/actors_vanilla/ttc/rotating_cube/model.inc.c similarity index 100% rename from levels/ttc/rotating_cube/model.inc.c rename to actors_vanilla/ttc/rotating_cube/model.inc.c diff --git a/levels/ttc/rotating_hexagon/collision.inc.c b/actors_vanilla/ttc/rotating_hexagon/collision.inc.c similarity index 100% rename from levels/ttc/rotating_hexagon/collision.inc.c rename to actors_vanilla/ttc/rotating_hexagon/collision.inc.c diff --git a/levels/ttc/rotating_hexagon/geo.inc.c b/actors_vanilla/ttc/rotating_hexagon/geo.inc.c similarity index 100% rename from levels/ttc/rotating_hexagon/geo.inc.c rename to actors_vanilla/ttc/rotating_hexagon/geo.inc.c diff --git a/levels/ttc/rotating_hexagon/model.inc.c b/actors_vanilla/ttc/rotating_hexagon/model.inc.c similarity index 100% rename from levels/ttc/rotating_hexagon/model.inc.c rename to actors_vanilla/ttc/rotating_hexagon/model.inc.c diff --git a/levels/ttc/rotating_prism/collision.inc.c b/actors_vanilla/ttc/rotating_prism/collision.inc.c similarity index 100% rename from levels/ttc/rotating_prism/collision.inc.c rename to actors_vanilla/ttc/rotating_prism/collision.inc.c diff --git a/levels/ttc/rotating_prism/geo.inc.c b/actors_vanilla/ttc/rotating_prism/geo.inc.c similarity index 100% rename from levels/ttc/rotating_prism/geo.inc.c rename to actors_vanilla/ttc/rotating_prism/geo.inc.c diff --git a/levels/ttc/rotating_prism/model.inc.c b/actors_vanilla/ttc/rotating_prism/model.inc.c similarity index 100% rename from levels/ttc/rotating_prism/model.inc.c rename to actors_vanilla/ttc/rotating_prism/model.inc.c diff --git a/levels/ttc/rotating_triangle/collision.inc.c b/actors_vanilla/ttc/rotating_triangle/collision.inc.c similarity index 100% rename from levels/ttc/rotating_triangle/collision.inc.c rename to actors_vanilla/ttc/rotating_triangle/collision.inc.c diff --git a/levels/ttc/rotating_triangle/geo.inc.c b/actors_vanilla/ttc/rotating_triangle/geo.inc.c similarity index 100% rename from levels/ttc/rotating_triangle/geo.inc.c rename to actors_vanilla/ttc/rotating_triangle/geo.inc.c diff --git a/levels/ttc/rotating_triangle/model.inc.c b/actors_vanilla/ttc/rotating_triangle/model.inc.c similarity index 100% rename from levels/ttc/rotating_triangle/model.inc.c rename to actors_vanilla/ttc/rotating_triangle/model.inc.c diff --git a/levels/ttc/small_gear/geo.inc.c b/actors_vanilla/ttc/small_gear/geo.inc.c similarity index 100% rename from levels/ttc/small_gear/geo.inc.c rename to actors_vanilla/ttc/small_gear/geo.inc.c diff --git a/levels/ttc/small_gear/model.inc.c b/actors_vanilla/ttc/small_gear/model.inc.c similarity index 100% rename from levels/ttc/small_gear/model.inc.c rename to actors_vanilla/ttc/small_gear/model.inc.c diff --git a/levels/ttc/small_treadmill/collision.inc.c b/actors_vanilla/ttc/small_treadmill/collision.inc.c similarity index 100% rename from levels/ttc/small_treadmill/collision.inc.c rename to actors_vanilla/ttc/small_treadmill/collision.inc.c diff --git a/levels/ttc/small_treadmill/geo.inc.c b/actors_vanilla/ttc/small_treadmill/geo.inc.c similarity index 100% rename from levels/ttc/small_treadmill/geo.inc.c rename to actors_vanilla/ttc/small_treadmill/geo.inc.c diff --git a/levels/ttc/small_treadmill/model.inc.c b/actors_vanilla/ttc/small_treadmill/model.inc.c similarity index 100% rename from levels/ttc/small_treadmill/model.inc.c rename to actors_vanilla/ttc/small_treadmill/model.inc.c diff --git a/levels/ttc/spinner/collision.inc.c b/actors_vanilla/ttc/spinner/collision.inc.c similarity index 100% rename from levels/ttc/spinner/collision.inc.c rename to actors_vanilla/ttc/spinner/collision.inc.c diff --git a/levels/ttc/spinner/geo.inc.c b/actors_vanilla/ttc/spinner/geo.inc.c similarity index 100% rename from levels/ttc/spinner/geo.inc.c rename to actors_vanilla/ttc/spinner/geo.inc.c diff --git a/levels/ttc/spinner/model.inc.c b/actors_vanilla/ttc/spinner/model.inc.c similarity index 100% rename from levels/ttc/spinner/model.inc.c rename to actors_vanilla/ttc/spinner/model.inc.c diff --git a/actors_vanilla/ttc/texture.inc.c b/actors_vanilla/ttc/texture.inc.c new file mode 100644 index 0000000000..abe601e9f1 --- /dev/null +++ b/actors_vanilla/ttc/texture.inc.c @@ -0,0 +1,9 @@ +// 0x07000000 - 0x07000800 +ALIGNED8 static const Texture ttc_seg7_texture_07000000[] = { +#include "actors_vanilla/ttc/0.rgba16.inc.c" +}; + +// 0x07000800 - 0x07001000 +ALIGNED8 static const Texture ttc_seg7_texture_07000800[] = { +#include "actors_vanilla/ttc/1.rgba16.inc.c" +}; diff --git a/levels/ttm/blue_smiley/geo.inc.c b/actors_vanilla/ttm/blue_smiley/geo.inc.c similarity index 100% rename from levels/ttm/blue_smiley/geo.inc.c rename to actors_vanilla/ttm/blue_smiley/geo.inc.c diff --git a/levels/ttm/blue_smiley/model.inc.c b/actors_vanilla/ttm/blue_smiley/model.inc.c similarity index 100% rename from levels/ttm/blue_smiley/model.inc.c rename to actors_vanilla/ttm/blue_smiley/model.inc.c diff --git a/actors_vanilla/ttm/data.c b/actors_vanilla/ttm/data.c new file mode 100644 index 0000000000..0c040663e3 --- /dev/null +++ b/actors_vanilla/ttm/data.c @@ -0,0 +1,23 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ttm/texture.inc.c" + +#include "actors_vanilla/ttm/rolling_log/model.inc.c" +#include "actors_vanilla/ttm/star_cage/1.inc.c" +#include "actors_vanilla/ttm/star_cage/2.inc.c" +#include "actors_vanilla/ttm/rolling_log/collision.inc.c" +#include "actors_vanilla/ttm/star_cage/collision.inc.c" +#include "actors_vanilla/ttm/blue_smiley/model.inc.c" +#include "actors_vanilla/ttm/yellow_smiley/model.inc.c" +#include "actors_vanilla/ttm/star_smiley/model.inc.c" +#include "actors_vanilla/ttm/moon_smiley/model.inc.c" +#include "actors_vanilla/ttm/slide_exit_podium/model.inc.c" +#include "actors_vanilla/ttm/slide_exit_podium/collision.inc.c" diff --git a/actors_vanilla/ttm/geo.c b/actors_vanilla/ttm/geo.c new file mode 100644 index 0000000000..a8d3ca4f77 --- /dev/null +++ b/actors_vanilla/ttm/geo.c @@ -0,0 +1,35 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/ttm/header.h" + +#include "actors_vanilla/ttm/star_cage/geo.inc.c" +#include "actors_vanilla/ttm/rolling_log/geo.inc.c" +#include "actors_vanilla/ttm/blue_smiley/geo.inc.c" +#include "actors_vanilla/ttm/yellow_smiley/geo.inc.c" +#include "actors_vanilla/ttm/star_smiley/geo.inc.c" +#include "actors_vanilla/ttm/moon_smiley/geo.inc.c" +#include "actors_vanilla/ttm/slide_exit_podium/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_ttm[] = { + LOAD_MODEL_FROM_GEO(MODEL_TTM_SLIDE_EXIT_PODIUM, ttm_geo_000DF4), + LOAD_MODEL_FROM_GEO(MODEL_TTM_ROLLING_LOG, ttm_geo_000730), + LOAD_MODEL_FROM_GEO(MODEL_TTM_STAR_CAGE, ttm_geo_000710), + LOAD_MODEL_FROM_GEO(MODEL_TTM_BLUE_SMILEY, ttm_geo_000D14), + LOAD_MODEL_FROM_GEO(MODEL_TTM_YELLOW_SMILEY, ttm_geo_000D4C), + LOAD_MODEL_FROM_GEO(MODEL_TTM_STAR_SMILEY, ttm_geo_000D84), + LOAD_MODEL_FROM_GEO(MODEL_TTM_MOON_SMILEY, ttm_geo_000DBC), + RETURN(), +}; diff --git a/actors_vanilla/ttm/header.h b/actors_vanilla/ttm/header.h new file mode 100644 index 0000000000..53b9701d79 --- /dev/null +++ b/actors_vanilla/ttm/header.h @@ -0,0 +1,24 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout ttm_geo_000710[]; +extern const GeoLayout ttm_geo_000730[]; +extern const GeoLayout ttm_geo_000D14[]; +extern const GeoLayout ttm_geo_000D4C[]; +extern const GeoLayout ttm_geo_000D84[]; +extern const GeoLayout ttm_geo_000DBC[]; +extern const GeoLayout ttm_geo_000DF4[]; + +extern const Gfx ttm_seg7_dl_07012270[]; +extern const Gfx ttm_seg7_dl_07013430[]; +extern const Gfx ttm_seg7_dl_07013608[]; +extern const Gfx ttm_seg7_dl_0702A9C0[]; +extern const Gfx ttm_seg7_dl_0702AAA8[]; +extern const Gfx ttm_seg7_dl_0702AB90[]; +extern const Gfx ttm_seg7_dl_0702AC78[]; +extern const Gfx ttm_seg7_dl_0702BB60[]; + +extern const Collision ttm_seg7_collision_pitoune_2[]; +extern const Collision ttm_seg7_collision_ukiki_cage[]; +extern const Collision ttm_seg7_collision_podium_warp[]; diff --git a/levels/ttm/moon_smiley/geo.inc.c b/actors_vanilla/ttm/moon_smiley/geo.inc.c similarity index 100% rename from levels/ttm/moon_smiley/geo.inc.c rename to actors_vanilla/ttm/moon_smiley/geo.inc.c diff --git a/levels/ttm/moon_smiley/model.inc.c b/actors_vanilla/ttm/moon_smiley/model.inc.c similarity index 100% rename from levels/ttm/moon_smiley/model.inc.c rename to actors_vanilla/ttm/moon_smiley/model.inc.c diff --git a/levels/ttm/rolling_log/collision.inc.c b/actors_vanilla/ttm/rolling_log/collision.inc.c similarity index 100% rename from levels/ttm/rolling_log/collision.inc.c rename to actors_vanilla/ttm/rolling_log/collision.inc.c diff --git a/levels/ttm/rolling_log/geo.inc.c b/actors_vanilla/ttm/rolling_log/geo.inc.c similarity index 100% rename from levels/ttm/rolling_log/geo.inc.c rename to actors_vanilla/ttm/rolling_log/geo.inc.c diff --git a/levels/ttm/rolling_log/model.inc.c b/actors_vanilla/ttm/rolling_log/model.inc.c similarity index 100% rename from levels/ttm/rolling_log/model.inc.c rename to actors_vanilla/ttm/rolling_log/model.inc.c diff --git a/levels/ttm/slide_exit_podium/collision.inc.c b/actors_vanilla/ttm/slide_exit_podium/collision.inc.c similarity index 100% rename from levels/ttm/slide_exit_podium/collision.inc.c rename to actors_vanilla/ttm/slide_exit_podium/collision.inc.c diff --git a/levels/ttm/slide_exit_podium/geo.inc.c b/actors_vanilla/ttm/slide_exit_podium/geo.inc.c similarity index 100% rename from levels/ttm/slide_exit_podium/geo.inc.c rename to actors_vanilla/ttm/slide_exit_podium/geo.inc.c diff --git a/levels/ttm/slide_exit_podium/model.inc.c b/actors_vanilla/ttm/slide_exit_podium/model.inc.c similarity index 99% rename from levels/ttm/slide_exit_podium/model.inc.c rename to actors_vanilla/ttm/slide_exit_podium/model.inc.c index 247ace2e2d..1a95e8c2ad 100644 --- a/levels/ttm/slide_exit_podium/model.inc.c +++ b/actors_vanilla/ttm/slide_exit_podium/model.inc.c @@ -6,7 +6,7 @@ // 0x0702AD30 - 0x0702B530 ALIGNED8 static const Texture ttm_seg7_texture_0702AD30[] = { -#include "levels/ttm/8.rgba16.inc.c" +#include "actors_vanilla/ttm/8.rgba16.inc.c" }; // 0x0702B530 - 0x0702B570 diff --git a/levels/ttm/star_cage/1.inc.c b/actors_vanilla/ttm/star_cage/1.inc.c similarity index 100% rename from levels/ttm/star_cage/1.inc.c rename to actors_vanilla/ttm/star_cage/1.inc.c diff --git a/levels/ttm/star_cage/2.inc.c b/actors_vanilla/ttm/star_cage/2.inc.c similarity index 100% rename from levels/ttm/star_cage/2.inc.c rename to actors_vanilla/ttm/star_cage/2.inc.c diff --git a/levels/ttm/star_cage/collision.inc.c b/actors_vanilla/ttm/star_cage/collision.inc.c similarity index 100% rename from levels/ttm/star_cage/collision.inc.c rename to actors_vanilla/ttm/star_cage/collision.inc.c diff --git a/levels/ttm/star_cage/geo.inc.c b/actors_vanilla/ttm/star_cage/geo.inc.c similarity index 100% rename from levels/ttm/star_cage/geo.inc.c rename to actors_vanilla/ttm/star_cage/geo.inc.c diff --git a/levels/ttm/star_smiley/geo.inc.c b/actors_vanilla/ttm/star_smiley/geo.inc.c similarity index 100% rename from levels/ttm/star_smiley/geo.inc.c rename to actors_vanilla/ttm/star_smiley/geo.inc.c diff --git a/levels/ttm/star_smiley/model.inc.c b/actors_vanilla/ttm/star_smiley/model.inc.c similarity index 100% rename from levels/ttm/star_smiley/model.inc.c rename to actors_vanilla/ttm/star_smiley/model.inc.c diff --git a/actors_vanilla/ttm/texture.inc.c b/actors_vanilla/ttm/texture.inc.c new file mode 100644 index 0000000000..82b4114c0b --- /dev/null +++ b/actors_vanilla/ttm/texture.inc.c @@ -0,0 +1,5 @@ + +// 0x07002000 - 0x07003000 +ALIGNED8 static const Texture ttm_seg7_texture_07002000[] = { +#include "actors_vanilla/ttm/4.rgba16.inc.c" +}; diff --git a/levels/ttm/yellow_smiley/geo.inc.c b/actors_vanilla/ttm/yellow_smiley/geo.inc.c similarity index 100% rename from levels/ttm/yellow_smiley/geo.inc.c rename to actors_vanilla/ttm/yellow_smiley/geo.inc.c diff --git a/levels/ttm/yellow_smiley/model.inc.c b/actors_vanilla/ttm/yellow_smiley/model.inc.c similarity index 100% rename from levels/ttm/yellow_smiley/model.inc.c rename to actors_vanilla/ttm/yellow_smiley/model.inc.c diff --git a/actors_vanilla/vcutm/data.c b/actors_vanilla/vcutm/data.c new file mode 100644 index 0000000000..446863c9e1 --- /dev/null +++ b/actors_vanilla/vcutm/data.c @@ -0,0 +1,13 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/vcutm/texture.inc.c" + +#include "actors_vanilla/vcutm/seesaw/model.inc.c" +#include "actors_vanilla/vcutm/seesaw/collision.inc.c" diff --git a/actors_vanilla/vcutm/geo.c b/actors_vanilla/vcutm/geo.c new file mode 100644 index 0000000000..4fefae1416 --- /dev/null +++ b/actors_vanilla/vcutm/geo.c @@ -0,0 +1,23 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/vcutm/header.h" + +#include "actors_vanilla/vcutm/seesaw/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_vcutm[] = { + LOAD_MODEL_FROM_GEO(MODEL_VCUTM_SEESAW_PLATFORM, vcutm_geo_0001F0), + RETURN(), +}; diff --git a/actors_vanilla/vcutm/header.h b/actors_vanilla/vcutm/header.h new file mode 100644 index 0000000000..90dfd10b1e --- /dev/null +++ b/actors_vanilla/vcutm/header.h @@ -0,0 +1,9 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout vcutm_geo_0001F0[]; + +extern const Gfx vcutm_seg7_dl_070096E0[]; + +extern const Collision vcutm_seg7_collision_0700AC44[]; diff --git a/levels/vcutm/seesaw/collision.inc.c b/actors_vanilla/vcutm/seesaw/collision.inc.c similarity index 100% rename from levels/vcutm/seesaw/collision.inc.c rename to actors_vanilla/vcutm/seesaw/collision.inc.c diff --git a/levels/vcutm/seesaw/geo.inc.c b/actors_vanilla/vcutm/seesaw/geo.inc.c similarity index 100% rename from levels/vcutm/seesaw/geo.inc.c rename to actors_vanilla/vcutm/seesaw/geo.inc.c diff --git a/levels/vcutm/seesaw/model.inc.c b/actors_vanilla/vcutm/seesaw/model.inc.c similarity index 100% rename from levels/vcutm/seesaw/model.inc.c rename to actors_vanilla/vcutm/seesaw/model.inc.c diff --git a/actors_vanilla/vcutm/texture.inc.c b/actors_vanilla/vcutm/texture.inc.c new file mode 100644 index 0000000000..c34586053c --- /dev/null +++ b/actors_vanilla/vcutm/texture.inc.c @@ -0,0 +1,4 @@ +// 0x07001800 - 0x07002800 +ALIGNED8 static const Texture vcutm_seg7_texture_07001800[] = { +#include "actors_vanilla/vcutm/2.rgba16.inc.c" +}; diff --git a/levels/wdw/arrow_lift/collision.inc.c b/actors_vanilla/wdw/arrow_lift/collision.inc.c similarity index 100% rename from levels/wdw/arrow_lift/collision.inc.c rename to actors_vanilla/wdw/arrow_lift/collision.inc.c diff --git a/levels/wdw/arrow_lift/geo.inc.c b/actors_vanilla/wdw/arrow_lift/geo.inc.c similarity index 100% rename from levels/wdw/arrow_lift/geo.inc.c rename to actors_vanilla/wdw/arrow_lift/geo.inc.c diff --git a/levels/wdw/arrow_lift/model.inc.c b/actors_vanilla/wdw/arrow_lift/model.inc.c similarity index 100% rename from levels/wdw/arrow_lift/model.inc.c rename to actors_vanilla/wdw/arrow_lift/model.inc.c diff --git a/actors_vanilla/wdw/data.c b/actors_vanilla/wdw/data.c new file mode 100644 index 0000000000..e81d58b63d --- /dev/null +++ b/actors_vanilla/wdw/data.c @@ -0,0 +1,26 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/wdw/texture.inc.c" + +#include "actors_vanilla/wdw/square_floating_platform/model.inc.c" +#include "actors_vanilla/wdw/arrow_lift/model.inc.c" +#include "actors_vanilla/wdw/water_level_diamond/model.inc.c" +#include "actors_vanilla/wdw/hidden_platform/model.inc.c" +#include "actors_vanilla/wdw/express_elevator/model.inc.c" +#include "actors_vanilla/wdw/rectangular_floating_platform/model.inc.c" +#include "actors_vanilla/wdw/rotating_platform/model.inc.c" +#include "actors_vanilla/wdw/square_floating_platform/collision.inc.c" +#include "actors_vanilla/wdw/arrow_lift/collision.inc.c" +#include "actors_vanilla/wdw/water_level_diamond/collision.inc.c" // Unused +#include "actors_vanilla/wdw/hidden_platform/collision.inc.c" +#include "actors_vanilla/wdw/express_elevator/collision.inc.c" +#include "actors_vanilla/wdw/rectangular_floating_platform/collision.inc.c" +#include "actors_vanilla/wdw/rotating_platform/collision.inc.c" diff --git a/levels/wdw/express_elevator/collision.inc.c b/actors_vanilla/wdw/express_elevator/collision.inc.c similarity index 100% rename from levels/wdw/express_elevator/collision.inc.c rename to actors_vanilla/wdw/express_elevator/collision.inc.c diff --git a/levels/wdw/express_elevator/geo.inc.c b/actors_vanilla/wdw/express_elevator/geo.inc.c similarity index 100% rename from levels/wdw/express_elevator/geo.inc.c rename to actors_vanilla/wdw/express_elevator/geo.inc.c diff --git a/levels/wdw/express_elevator/model.inc.c b/actors_vanilla/wdw/express_elevator/model.inc.c similarity index 100% rename from levels/wdw/express_elevator/model.inc.c rename to actors_vanilla/wdw/express_elevator/model.inc.c diff --git a/actors_vanilla/wdw/geo.c b/actors_vanilla/wdw/geo.c new file mode 100644 index 0000000000..b4928468a0 --- /dev/null +++ b/actors_vanilla/wdw/geo.c @@ -0,0 +1,35 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/wdw/header.h" + +#include "actors_vanilla/wdw/square_floating_platform/geo.inc.c" +#include "actors_vanilla/wdw/arrow_lift/geo.inc.c" +#include "actors_vanilla/wdw/water_level_diamond/geo.inc.c" +#include "actors_vanilla/wdw/hidden_platform/geo.inc.c" +#include "actors_vanilla/wdw/express_elevator/geo.inc.c" +#include "actors_vanilla/wdw/rectangular_floating_platform/geo.inc.c" +#include "actors_vanilla/wdw/rotating_platform/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_wdw[] = { + LOAD_MODEL_FROM_GEO(MODEL_WDW_SQUARE_FLOATING_PLATFORM, wdw_geo_000580), + LOAD_MODEL_FROM_GEO(MODEL_WDW_ARROW_LIFT, wdw_geo_000598), + LOAD_MODEL_FROM_GEO(MODEL_WDW_WATER_LEVEL_DIAMOND, wdw_geo_0005C0), + LOAD_MODEL_FROM_GEO(MODEL_WDW_HIDDEN_PLATFORM, wdw_geo_0005E8), + LOAD_MODEL_FROM_GEO(MODEL_WDW_EXPRESS_ELEVATOR, wdw_geo_000610), + LOAD_MODEL_FROM_GEO(MODEL_WDW_RECTANGULAR_FLOATING_PLATFORM, wdw_geo_000628), + LOAD_MODEL_FROM_GEO(MODEL_WDW_ROTATING_PLATFORM, wdw_geo_000640), + RETURN(), +}; diff --git a/actors_vanilla/wdw/header.h b/actors_vanilla/wdw/header.h new file mode 100644 index 0000000000..8b46bbc5db --- /dev/null +++ b/actors_vanilla/wdw/header.h @@ -0,0 +1,27 @@ +#pragma once + +#include "types.h" + +extern const GeoLayout wdw_geo_000580[]; +extern const GeoLayout wdw_geo_000598[]; +extern const GeoLayout wdw_geo_0005C0[]; +extern const GeoLayout wdw_geo_0005E8[]; +extern const GeoLayout wdw_geo_000610[]; +extern const GeoLayout wdw_geo_000628[]; +extern const GeoLayout wdw_geo_000640[]; + +extern const Gfx wdw_seg7_dl_07012B90[]; +extern const Gfx wdw_seg7_dl_07012E88[]; +extern const Gfx wdw_seg7_dl_070131B8[]; +extern const Gfx wdw_seg7_dl_07013490[]; +extern const Gfx wdw_seg7_dl_07013B70[]; +extern const Gfx wdw_seg7_dl_07013E40[]; +extern const Gfx wdw_seg7_dl_070140E0[]; + +extern const Collision wdw_seg7_collision_square_floating_platform[]; +extern const Collision wdw_seg7_collision_arrow_lift[]; +extern const Collision wdw_seg7_collision_070184C8[]; +extern const Collision wdw_seg7_collision_hidden_platform[]; +extern const Collision wdw_seg7_collision_express_elevator_platform[]; +extern const Collision wdw_seg7_collision_rect_floating_platform[]; +extern const Collision wdw_seg7_collision_rotating_platform[]; diff --git a/levels/wdw/hidden_platform/collision.inc.c b/actors_vanilla/wdw/hidden_platform/collision.inc.c similarity index 100% rename from levels/wdw/hidden_platform/collision.inc.c rename to actors_vanilla/wdw/hidden_platform/collision.inc.c diff --git a/levels/wdw/hidden_platform/geo.inc.c b/actors_vanilla/wdw/hidden_platform/geo.inc.c similarity index 100% rename from levels/wdw/hidden_platform/geo.inc.c rename to actors_vanilla/wdw/hidden_platform/geo.inc.c diff --git a/levels/wdw/hidden_platform/model.inc.c b/actors_vanilla/wdw/hidden_platform/model.inc.c similarity index 100% rename from levels/wdw/hidden_platform/model.inc.c rename to actors_vanilla/wdw/hidden_platform/model.inc.c diff --git a/levels/wdw/rectangular_floating_platform/collision.inc.c b/actors_vanilla/wdw/rectangular_floating_platform/collision.inc.c similarity index 100% rename from levels/wdw/rectangular_floating_platform/collision.inc.c rename to actors_vanilla/wdw/rectangular_floating_platform/collision.inc.c diff --git a/levels/wdw/rectangular_floating_platform/geo.inc.c b/actors_vanilla/wdw/rectangular_floating_platform/geo.inc.c similarity index 100% rename from levels/wdw/rectangular_floating_platform/geo.inc.c rename to actors_vanilla/wdw/rectangular_floating_platform/geo.inc.c diff --git a/levels/wdw/rectangular_floating_platform/model.inc.c b/actors_vanilla/wdw/rectangular_floating_platform/model.inc.c similarity index 100% rename from levels/wdw/rectangular_floating_platform/model.inc.c rename to actors_vanilla/wdw/rectangular_floating_platform/model.inc.c diff --git a/levels/wdw/rotating_platform/collision.inc.c b/actors_vanilla/wdw/rotating_platform/collision.inc.c similarity index 100% rename from levels/wdw/rotating_platform/collision.inc.c rename to actors_vanilla/wdw/rotating_platform/collision.inc.c diff --git a/levels/wdw/rotating_platform/geo.inc.c b/actors_vanilla/wdw/rotating_platform/geo.inc.c similarity index 100% rename from levels/wdw/rotating_platform/geo.inc.c rename to actors_vanilla/wdw/rotating_platform/geo.inc.c diff --git a/levels/wdw/rotating_platform/model.inc.c b/actors_vanilla/wdw/rotating_platform/model.inc.c similarity index 100% rename from levels/wdw/rotating_platform/model.inc.c rename to actors_vanilla/wdw/rotating_platform/model.inc.c diff --git a/levels/wdw/square_floating_platform/collision.inc.c b/actors_vanilla/wdw/square_floating_platform/collision.inc.c similarity index 100% rename from levels/wdw/square_floating_platform/collision.inc.c rename to actors_vanilla/wdw/square_floating_platform/collision.inc.c diff --git a/levels/wdw/square_floating_platform/geo.inc.c b/actors_vanilla/wdw/square_floating_platform/geo.inc.c similarity index 100% rename from levels/wdw/square_floating_platform/geo.inc.c rename to actors_vanilla/wdw/square_floating_platform/geo.inc.c diff --git a/levels/wdw/square_floating_platform/model.inc.c b/actors_vanilla/wdw/square_floating_platform/model.inc.c similarity index 100% rename from levels/wdw/square_floating_platform/model.inc.c rename to actors_vanilla/wdw/square_floating_platform/model.inc.c diff --git a/actors_vanilla/wdw/texture.inc.c b/actors_vanilla/wdw/texture.inc.c new file mode 100644 index 0000000000..016d195d57 --- /dev/null +++ b/actors_vanilla/wdw/texture.inc.c @@ -0,0 +1,14 @@ +// 0x07000800 - 0x07001000 +ALIGNED8 static const Texture wdw_seg7_texture_07000800[] = { +#include "actors_vanilla/wdw/1.rgba16.inc.c" +}; + +// 0x07001000 - 0x07001800 +ALIGNED8 static const Texture wdw_seg7_texture_07001000[] = { +#include "actors_vanilla/wdw/2.rgba16.inc.c" +}; + +// 0x07001800 - 0x07002000 +ALIGNED8 static const Texture wdw_seg7_texture_07001800[] = { +#include "actors_vanilla/wdw/3.rgba16.inc.c" +}; diff --git a/levels/wdw/water_level_diamond/collision.inc.c b/actors_vanilla/wdw/water_level_diamond/collision.inc.c similarity index 100% rename from levels/wdw/water_level_diamond/collision.inc.c rename to actors_vanilla/wdw/water_level_diamond/collision.inc.c diff --git a/levels/wdw/water_level_diamond/geo.inc.c b/actors_vanilla/wdw/water_level_diamond/geo.inc.c similarity index 100% rename from levels/wdw/water_level_diamond/geo.inc.c rename to actors_vanilla/wdw/water_level_diamond/geo.inc.c diff --git a/levels/wdw/water_level_diamond/model.inc.c b/actors_vanilla/wdw/water_level_diamond/model.inc.c similarity index 100% rename from levels/wdw/water_level_diamond/model.inc.c rename to actors_vanilla/wdw/water_level_diamond/model.inc.c diff --git a/levels/wf/areas/1/10/1.inc.c b/actors_vanilla/wf/10/1.inc.c similarity index 100% rename from levels/wf/areas/1/10/1.inc.c rename to actors_vanilla/wf/10/1.inc.c diff --git a/levels/wf/areas/1/10/2.inc.c b/actors_vanilla/wf/10/2.inc.c similarity index 100% rename from levels/wf/areas/1/10/2.inc.c rename to actors_vanilla/wf/10/2.inc.c diff --git a/levels/wf/areas/1/10/collision.inc.c b/actors_vanilla/wf/10/collision.inc.c similarity index 100% rename from levels/wf/areas/1/10/collision.inc.c rename to actors_vanilla/wf/10/collision.inc.c diff --git a/levels/wf/areas/1/10/geo.inc.c b/actors_vanilla/wf/10/geo.inc.c similarity index 100% rename from levels/wf/areas/1/10/geo.inc.c rename to actors_vanilla/wf/10/geo.inc.c diff --git a/levels/wf/areas/1/11/collision.inc.c b/actors_vanilla/wf/11/collision.inc.c similarity index 100% rename from levels/wf/areas/1/11/collision.inc.c rename to actors_vanilla/wf/11/collision.inc.c diff --git a/levels/wf/areas/1/11/geo.inc.c b/actors_vanilla/wf/11/geo.inc.c similarity index 100% rename from levels/wf/areas/1/11/geo.inc.c rename to actors_vanilla/wf/11/geo.inc.c diff --git a/levels/wf/areas/1/11/model.inc.c b/actors_vanilla/wf/11/model.inc.c similarity index 100% rename from levels/wf/areas/1/11/model.inc.c rename to actors_vanilla/wf/11/model.inc.c diff --git a/levels/wf/beta_extending_platform/collision.inc.c b/actors_vanilla/wf/beta_extending_platform/collision.inc.c similarity index 100% rename from levels/wf/beta_extending_platform/collision.inc.c rename to actors_vanilla/wf/beta_extending_platform/collision.inc.c diff --git a/levels/wf/beta_extending_platform/geo.inc.c b/actors_vanilla/wf/beta_extending_platform/geo.inc.c similarity index 100% rename from levels/wf/beta_extending_platform/geo.inc.c rename to actors_vanilla/wf/beta_extending_platform/geo.inc.c diff --git a/levels/wf/beta_extending_platform/model.inc.c b/actors_vanilla/wf/beta_extending_platform/model.inc.c similarity index 100% rename from levels/wf/beta_extending_platform/model.inc.c rename to actors_vanilla/wf/beta_extending_platform/model.inc.c diff --git a/levels/wf/breakable_wall_left/collision.inc.c b/actors_vanilla/wf/breakable_wall_left/collision.inc.c similarity index 100% rename from levels/wf/breakable_wall_left/collision.inc.c rename to actors_vanilla/wf/breakable_wall_left/collision.inc.c diff --git a/levels/wf/breakable_wall_left/geo.inc.c b/actors_vanilla/wf/breakable_wall_left/geo.inc.c similarity index 100% rename from levels/wf/breakable_wall_left/geo.inc.c rename to actors_vanilla/wf/breakable_wall_left/geo.inc.c diff --git a/levels/wf/breakable_wall_left/model.inc.c b/actors_vanilla/wf/breakable_wall_left/model.inc.c similarity index 100% rename from levels/wf/breakable_wall_left/model.inc.c rename to actors_vanilla/wf/breakable_wall_left/model.inc.c diff --git a/levels/wf/breakable_wall_right/collision.inc.c b/actors_vanilla/wf/breakable_wall_right/collision.inc.c similarity index 100% rename from levels/wf/breakable_wall_right/collision.inc.c rename to actors_vanilla/wf/breakable_wall_right/collision.inc.c diff --git a/levels/wf/breakable_wall_right/geo.inc.c b/actors_vanilla/wf/breakable_wall_right/geo.inc.c similarity index 100% rename from levels/wf/breakable_wall_right/geo.inc.c rename to actors_vanilla/wf/breakable_wall_right/geo.inc.c diff --git a/levels/wf/breakable_wall_right/model.inc.c b/actors_vanilla/wf/breakable_wall_right/model.inc.c similarity index 100% rename from levels/wf/breakable_wall_right/model.inc.c rename to actors_vanilla/wf/breakable_wall_right/model.inc.c diff --git a/actors_vanilla/wf/data.c b/actors_vanilla/wf/data.c new file mode 100644 index 0000000000..217710b271 --- /dev/null +++ b/actors_vanilla/wf/data.c @@ -0,0 +1,49 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/wf/header.h" + +#include "actors_vanilla/wf/texture.inc.c" + +#include "actors_vanilla/wf/small_bomp/1.inc.c" +#include "actors_vanilla/wf/small_bomp/2.inc.c" +#include "actors_vanilla/wf/large_bomp/model.inc.c" +#include "actors_vanilla/wf/tumbling_bridge_near/model.inc.c" +#include "actors_vanilla/wf/tumbling_bridge_far/model.inc.c" +#include "actors_vanilla/wf/rotating_wooden_platform/1.inc.c" +#include "actors_vanilla/wf/rotating_wooden_platform/2.inc.c" +#include "actors_vanilla/wf/sliding_platform/model.inc.c" +#include "actors_vanilla/wf/beta_extending_platform/model.inc.c" +#include "actors_vanilla/wf/extending_platform/model.inc.c" +#include "actors_vanilla/wf/breakable_wall_right/model.inc.c" +#include "actors_vanilla/wf/breakable_wall_left/model.inc.c" +#include "actors_vanilla/wf/giant_pole/model.inc.c" +#include "actors_vanilla/wf/rotating_platform/model.inc.c" +#include "actors_vanilla/wf/10/1.inc.c" +#include "actors_vanilla/wf/10/2.inc.c" +#include "actors_vanilla/wf/11/model.inc.c" + +#include "actors_vanilla/wf/kickable_board/1.inc.c" +#include "actors_vanilla/wf/kickable_board/2.inc.c" +#include "actors_vanilla/wf/tower_door/model.inc.c" +#include "actors_vanilla/wf/small_bomp/collision.inc.c" +#include "actors_vanilla/wf/large_bomp/collision.inc.c" +#include "actors_vanilla/wf/rotating_wooden_platform/collision.inc.c" +#include "actors_vanilla/wf/sliding_platform/collision.inc.c" +#include "actors_vanilla/wf/tumbling_bridge_near/collision.inc.c" +#include "actors_vanilla/wf/beta_extending_platform/collision.inc.c" +#include "actors_vanilla/wf/extending_platform/collision.inc.c" +#include "actors_vanilla/wf/breakable_wall_right/collision.inc.c" +#include "actors_vanilla/wf/breakable_wall_left/collision.inc.c" +#include "actors_vanilla/wf/kickable_board/collision.inc.c" +#include "actors_vanilla/wf/tower_door/collision.inc.c" +#include "actors_vanilla/wf/rotating_platform/collision.inc.c" +#include "actors_vanilla/wf/10/collision.inc.c" +#include "actors_vanilla/wf/11/collision.inc.c" diff --git a/levels/wf/extending_platform/collision.inc.c b/actors_vanilla/wf/extending_platform/collision.inc.c similarity index 100% rename from levels/wf/extending_platform/collision.inc.c rename to actors_vanilla/wf/extending_platform/collision.inc.c diff --git a/levels/wf/extending_platform/geo.inc.c b/actors_vanilla/wf/extending_platform/geo.inc.c similarity index 100% rename from levels/wf/extending_platform/geo.inc.c rename to actors_vanilla/wf/extending_platform/geo.inc.c diff --git a/levels/wf/extending_platform/model.inc.c b/actors_vanilla/wf/extending_platform/model.inc.c similarity index 100% rename from levels/wf/extending_platform/model.inc.c rename to actors_vanilla/wf/extending_platform/model.inc.c diff --git a/actors_vanilla/wf/geo.c b/actors_vanilla/wf/geo.c new file mode 100644 index 0000000000..5fd957c4d9 --- /dev/null +++ b/actors_vanilla/wf/geo.c @@ -0,0 +1,56 @@ +#include +#include "sm64.h" +#include "geo_commands.h" + +#include "game/level_geo.h" +#include "game/geo_misc.h" +#include "game/camera.h" +#include "game/moving_texture.h" +#include "game/screen_transition.h" +#include "game/paintings.h" + +#include "make_const_nonconst.h" + +#include "actors_vanilla/wf/header.h" + +#include "actors_vanilla/wf/small_bomp/geo.inc.c" +#include "actors_vanilla/wf/large_bomp/geo.inc.c" +#include "actors_vanilla/wf/rotating_wooden_platform/geo.inc.c" +#include "actors_vanilla/wf/sliding_platform/geo.inc.c" +#include "actors_vanilla/wf/tumbling_bridge_near/geo.inc.c" +#include "actors_vanilla/wf/tumbling_bridge_far/geo.inc.c" +#include "actors_vanilla/wf/beta_extending_platform/geo.inc.c" +#include "actors_vanilla/wf/extending_platform/geo.inc.c" +#include "actors_vanilla/wf/breakable_wall_right/geo.inc.c" +#include "actors_vanilla/wf/breakable_wall_left/geo.inc.c" +#include "actors_vanilla/wf/kickable_board/geo.inc.c" +#include "actors_vanilla/wf/tower_door/geo.inc.c" +#include "actors_vanilla/wf/giant_pole/geo.inc.c" +#include "actors_vanilla/wf/rotating_platform/geo.inc.c" +#include "actors_vanilla/wf/10/geo.inc.c" +#include "actors_vanilla/wf/11/geo.inc.c" + +#include "level_commands.h" + +const LevelScript script_func_vo_wf[] = { + LOAD_MODEL_FROM_GEO(MODEL_WF_SMALL_BOMP, wf_geo_000A00), + LOAD_MODEL_FROM_GEO(MODEL_WF_LARGE_BOMP, wf_geo_000A40), + LOAD_MODEL_FROM_GEO(MODEL_WF_ROTATING_WOODEN_PLATFORM, wf_geo_000A58), + LOAD_MODEL_FROM_GEO(MODEL_WF_SLIDING_PLATFORM, wf_geo_000A98), + LOAD_MODEL_FROM_GEO(MODEL_WF_TUMBLING_BRIDGE_PART, wf_geo_000AB0), + LOAD_MODEL_FROM_GEO(MODEL_WF_TUMBLING_BRIDGE, wf_geo_000AC8), + LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_TRAPEZOID_PLATORM, wf_geo_000AF8), + LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_SQUARE_PLATORM, wf_geo_000B10), + LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_SQUARE_PLATORM_UNUSED, wf_geo_000B38), + LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_SQUARE_PLATORM_ELEVATOR, wf_geo_000B60), + LOAD_MODEL_FROM_GEO(MODEL_WF_BREAKABLE_WALL_RIGHT, wf_geo_000B78), + LOAD_MODEL_FROM_GEO(MODEL_WF_BREAKABLE_WALL_LEFT, wf_geo_000B90), + LOAD_MODEL_FROM_GEO(MODEL_WF_KICKABLE_BOARD, wf_geo_000BA8), + LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_DOOR, wf_geo_000BE0), + LOAD_MODEL_FROM_GEO(MODEL_WF_KICKABLE_BOARD_FELLED, wf_geo_000BC8), + LOAD_MODEL_FROM_GEO(MODEL_WF_GIANT_POLE, wf_geo_000AE0), + LOAD_MODEL_FROM_GEO(MODEL_WF_ROTATING_PLATFORM, wf_geo_0009B8), + LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, wf_geo_0008A8), + LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, wf_geo_0008E8), + RETURN(), +}; diff --git a/levels/wf/areas/1/14/geo.inc.c b/actors_vanilla/wf/giant_pole/geo.inc.c similarity index 100% rename from levels/wf/areas/1/14/geo.inc.c rename to actors_vanilla/wf/giant_pole/geo.inc.c diff --git a/levels/wf/areas/1/14/model.inc.c b/actors_vanilla/wf/giant_pole/model.inc.c similarity index 100% rename from levels/wf/areas/1/14/model.inc.c rename to actors_vanilla/wf/giant_pole/model.inc.c diff --git a/actors_vanilla/wf/header.h b/actors_vanilla/wf/header.h new file mode 100644 index 0000000000..7361798177 --- /dev/null +++ b/actors_vanilla/wf/header.h @@ -0,0 +1,58 @@ +#pragma once + +#include "types.h" + +extern const Gfx wf_seg7_dl_0700E9B8[]; +extern const Gfx wf_seg7_dl_0700EB40[]; +extern const Gfx wf_seg7_dl_0700EDC0[]; +extern const Gfx wf_seg7_dl_0700F018[]; +extern const Gfx wf_seg7_dl_0700F1A8[]; +extern const Gfx wf_seg7_dl_0700F340[]; +extern const Gfx wf_seg7_dl_0700F610[]; +extern const Gfx wf_seg7_dl_0700F6C0[]; +extern const Gfx wf_seg7_dl_0700F7F8[]; +extern const Gfx wf_seg7_dl_0700A170[]; + +extern const Gfx wf_seg7_dl_0700D708[]; +extern const Gfx wf_seg7_dl_0700D9F0[]; +extern const Gfx wf_seg7_dl_0700DE20[]; +extern const Gfx wf_seg7_dl_0700E0F0[]; +extern const Gfx wf_seg7_dl_0700E3D0[]; +extern const Gfx wf_seg7_dl_0700E760[]; +extern const Gfx wf_seg7_dl_0700BF50[]; +extern const Gfx wf_seg7_dl_07008FE8[]; +extern const Gfx wf_seg7_dl_07009278[]; +extern const Gfx wf_seg7_dl_070087B0[]; + +extern const GeoLayout wf_geo_000A00[]; +extern const GeoLayout wf_geo_000A40[]; +extern const GeoLayout wf_geo_000A58[]; +extern const GeoLayout wf_geo_000A98[]; +extern const GeoLayout wf_geo_000AB0[]; +extern const GeoLayout wf_geo_000AC8[]; +extern const GeoLayout wf_geo_000AE0[]; +extern const GeoLayout wf_geo_000AF8[]; +extern const GeoLayout wf_geo_000B10[]; +extern const GeoLayout wf_geo_000B38[]; +extern const GeoLayout wf_geo_000B60[]; +extern const GeoLayout wf_geo_000B78[]; +extern const GeoLayout wf_geo_000B90[]; +extern const GeoLayout wf_geo_000BA8[]; +extern const GeoLayout wf_geo_000BC8[]; +extern const GeoLayout wf_geo_000BE0[]; +extern const GeoLayout wf_geo_0009B8[]; + +extern const Collision wf_seg7_collision_small_bomp[]; +extern const Collision wf_seg7_collision_large_bomp[]; +extern const Collision wf_seg7_collision_clocklike_rotation[]; +extern const Collision wf_seg7_collision_sliding_brick_platform[]; +extern const Collision wf_seg7_collision_tumbling_bridge[]; +extern const Collision wf_seg7_collision_trapezoid[]; +extern const Collision wf_seg7_collision_platform[]; +extern const Collision wf_seg7_collision_breakable_wall[]; +extern const Collision wf_seg7_collision_breakable_wall_2[]; +extern const Collision wf_seg7_collision_kickable_board[]; +extern const Collision wf_seg7_collision_tower_door[]; +extern const Collision wf_seg7_collision_rotating_platform[]; +extern const Collision wf_seg7_collision_tower[]; +extern const Collision wf_seg7_collision_bullet_bill_cannon[]; \ No newline at end of file diff --git a/levels/wf/kickable_board/1.inc.c b/actors_vanilla/wf/kickable_board/1.inc.c similarity index 100% rename from levels/wf/kickable_board/1.inc.c rename to actors_vanilla/wf/kickable_board/1.inc.c diff --git a/levels/wf/kickable_board/2.inc.c b/actors_vanilla/wf/kickable_board/2.inc.c similarity index 100% rename from levels/wf/kickable_board/2.inc.c rename to actors_vanilla/wf/kickable_board/2.inc.c diff --git a/levels/wf/kickable_board/collision.inc.c b/actors_vanilla/wf/kickable_board/collision.inc.c similarity index 100% rename from levels/wf/kickable_board/collision.inc.c rename to actors_vanilla/wf/kickable_board/collision.inc.c diff --git a/levels/wf/kickable_board/geo.inc.c b/actors_vanilla/wf/kickable_board/geo.inc.c similarity index 100% rename from levels/wf/kickable_board/geo.inc.c rename to actors_vanilla/wf/kickable_board/geo.inc.c diff --git a/levels/wf/large_bomp/collision.inc.c b/actors_vanilla/wf/large_bomp/collision.inc.c similarity index 100% rename from levels/wf/large_bomp/collision.inc.c rename to actors_vanilla/wf/large_bomp/collision.inc.c diff --git a/levels/wf/large_bomp/geo.inc.c b/actors_vanilla/wf/large_bomp/geo.inc.c similarity index 100% rename from levels/wf/large_bomp/geo.inc.c rename to actors_vanilla/wf/large_bomp/geo.inc.c diff --git a/levels/wf/large_bomp/model.inc.c b/actors_vanilla/wf/large_bomp/model.inc.c similarity index 100% rename from levels/wf/large_bomp/model.inc.c rename to actors_vanilla/wf/large_bomp/model.inc.c diff --git a/levels/wf/rotating_platform/collision.inc.c b/actors_vanilla/wf/rotating_platform/collision.inc.c similarity index 100% rename from levels/wf/rotating_platform/collision.inc.c rename to actors_vanilla/wf/rotating_platform/collision.inc.c diff --git a/levels/wf/areas/1/17/geo.inc.c b/actors_vanilla/wf/rotating_platform/geo.inc.c similarity index 100% rename from levels/wf/areas/1/17/geo.inc.c rename to actors_vanilla/wf/rotating_platform/geo.inc.c diff --git a/levels/wf/areas/1/17/model.inc.c b/actors_vanilla/wf/rotating_platform/model.inc.c similarity index 100% rename from levels/wf/areas/1/17/model.inc.c rename to actors_vanilla/wf/rotating_platform/model.inc.c diff --git a/levels/wf/rotating_wooden_platform/1.inc.c b/actors_vanilla/wf/rotating_wooden_platform/1.inc.c similarity index 100% rename from levels/wf/rotating_wooden_platform/1.inc.c rename to actors_vanilla/wf/rotating_wooden_platform/1.inc.c diff --git a/levels/wf/rotating_wooden_platform/2.inc.c b/actors_vanilla/wf/rotating_wooden_platform/2.inc.c similarity index 100% rename from levels/wf/rotating_wooden_platform/2.inc.c rename to actors_vanilla/wf/rotating_wooden_platform/2.inc.c diff --git a/levels/wf/rotating_wooden_platform/collision.inc.c b/actors_vanilla/wf/rotating_wooden_platform/collision.inc.c similarity index 100% rename from levels/wf/rotating_wooden_platform/collision.inc.c rename to actors_vanilla/wf/rotating_wooden_platform/collision.inc.c diff --git a/levels/wf/rotating_wooden_platform/geo.inc.c b/actors_vanilla/wf/rotating_wooden_platform/geo.inc.c similarity index 100% rename from levels/wf/rotating_wooden_platform/geo.inc.c rename to actors_vanilla/wf/rotating_wooden_platform/geo.inc.c diff --git a/levels/wf/sliding_platform/collision.inc.c b/actors_vanilla/wf/sliding_platform/collision.inc.c similarity index 100% rename from levels/wf/sliding_platform/collision.inc.c rename to actors_vanilla/wf/sliding_platform/collision.inc.c diff --git a/levels/wf/sliding_platform/geo.inc.c b/actors_vanilla/wf/sliding_platform/geo.inc.c similarity index 100% rename from levels/wf/sliding_platform/geo.inc.c rename to actors_vanilla/wf/sliding_platform/geo.inc.c diff --git a/levels/wf/sliding_platform/model.inc.c b/actors_vanilla/wf/sliding_platform/model.inc.c similarity index 100% rename from levels/wf/sliding_platform/model.inc.c rename to actors_vanilla/wf/sliding_platform/model.inc.c diff --git a/levels/wf/small_bomp/1.inc.c b/actors_vanilla/wf/small_bomp/1.inc.c similarity index 100% rename from levels/wf/small_bomp/1.inc.c rename to actors_vanilla/wf/small_bomp/1.inc.c diff --git a/levels/wf/small_bomp/2.inc.c b/actors_vanilla/wf/small_bomp/2.inc.c similarity index 100% rename from levels/wf/small_bomp/2.inc.c rename to actors_vanilla/wf/small_bomp/2.inc.c diff --git a/levels/wf/small_bomp/collision.inc.c b/actors_vanilla/wf/small_bomp/collision.inc.c similarity index 100% rename from levels/wf/small_bomp/collision.inc.c rename to actors_vanilla/wf/small_bomp/collision.inc.c diff --git a/levels/wf/small_bomp/geo.inc.c b/actors_vanilla/wf/small_bomp/geo.inc.c similarity index 100% rename from levels/wf/small_bomp/geo.inc.c rename to actors_vanilla/wf/small_bomp/geo.inc.c diff --git a/actors_vanilla/wf/texture.inc.c b/actors_vanilla/wf/texture.inc.c new file mode 100644 index 0000000000..1900ce5fe6 --- /dev/null +++ b/actors_vanilla/wf/texture.inc.c @@ -0,0 +1,19 @@ +ALIGNED8 static const Texture wf_seg7_texture_07000000[] = { +#include "actors_vanilla/wf/0.rgba16.inc.c" +}; + +ALIGNED8 static const Texture wf_seg7_texture_07001000[] = { +#include "actors_vanilla/wf/2.rgba16.inc.c" +}; + +ALIGNED8 static const Texture wf_seg7_texture_07001800[] = { +#include "actors_vanilla/wf/3.rgba16.inc.c" +}; + +ALIGNED8 static const Texture wf_seg7_texture_07002000[] = { +#include "actors_vanilla/wf/4.rgba16.inc.c" +}; + +ALIGNED8 static const Texture wf_seg7_texture_07002800[] = { +#include "actors_vanilla/wf/5.ia8.inc.c" +}; diff --git a/levels/wf/tower_door/collision.inc.c b/actors_vanilla/wf/tower_door/collision.inc.c similarity index 100% rename from levels/wf/tower_door/collision.inc.c rename to actors_vanilla/wf/tower_door/collision.inc.c diff --git a/levels/wf/tower_door/geo.inc.c b/actors_vanilla/wf/tower_door/geo.inc.c similarity index 100% rename from levels/wf/tower_door/geo.inc.c rename to actors_vanilla/wf/tower_door/geo.inc.c diff --git a/levels/wf/tower_door/model.inc.c b/actors_vanilla/wf/tower_door/model.inc.c similarity index 100% rename from levels/wf/tower_door/model.inc.c rename to actors_vanilla/wf/tower_door/model.inc.c diff --git a/levels/wf/tumbling_bridge_far/geo.inc.c b/actors_vanilla/wf/tumbling_bridge_far/geo.inc.c similarity index 100% rename from levels/wf/tumbling_bridge_far/geo.inc.c rename to actors_vanilla/wf/tumbling_bridge_far/geo.inc.c diff --git a/levels/wf/tumbling_bridge_far/model.inc.c b/actors_vanilla/wf/tumbling_bridge_far/model.inc.c similarity index 100% rename from levels/wf/tumbling_bridge_far/model.inc.c rename to actors_vanilla/wf/tumbling_bridge_far/model.inc.c diff --git a/levels/wf/tumbling_bridge_near/collision.inc.c b/actors_vanilla/wf/tumbling_bridge_near/collision.inc.c similarity index 100% rename from levels/wf/tumbling_bridge_near/collision.inc.c rename to actors_vanilla/wf/tumbling_bridge_near/collision.inc.c diff --git a/levels/wf/tumbling_bridge_near/geo.inc.c b/actors_vanilla/wf/tumbling_bridge_near/geo.inc.c similarity index 100% rename from levels/wf/tumbling_bridge_near/geo.inc.c rename to actors_vanilla/wf/tumbling_bridge_near/geo.inc.c diff --git a/levels/wf/tumbling_bridge_near/model.inc.c b/actors_vanilla/wf/tumbling_bridge_near/model.inc.c similarity index 100% rename from levels/wf/tumbling_bridge_near/model.inc.c rename to actors_vanilla/wf/tumbling_bridge_near/model.inc.c diff --git a/assets.json b/assets.json index 9ceab3345b..caa4198089 100644 --- a/assets.json +++ b/assets.json @@ -534,21 +534,26 @@ "assets/demos/unused.bin": [108,{"jp":[5738696],"us":[5746992],"eu":[5625912],"sh":[5594960]}], "assets/demos/wf.bin": [672,{"jp":[5737276],"us":[5745572],"eu":[5624492],"sh":[5593540]}], "levels/bbh/0.rgba16.png": [32,64,4096,{"jp":[3604960,0],"us":[3611712,0],"eu":[3485312,0],"sh":[3459680,0]}], +"actors_vanilla/bbh/0.rgba16.png": [32,64,4096,{"jp":[3604960,0],"us":[3611712,0],"eu":[3485312,0],"sh":[3459680,0]}], "levels/bbh/1.rgba16.png": [32,32,2048,{"jp":[3604960,4096],"us":[3611712,4096],"eu":[3485312,4096],"sh":[3459680,4096]}], "levels/bbh/2.rgba16.png": [32,32,2048,{"jp":[3604960,6144],"us":[3611712,6144],"eu":[3485312,6144],"sh":[3459680,6144]}], "levels/bbh/3.rgba16.png": [32,64,4096,{"jp":[3604960,8192],"us":[3611712,8192],"eu":[3485312,8192],"sh":[3459680,8192]}], -"levels/bbh/4.rgba16.png": [16,32,1024,{"jp":[3604960,12288],"us":[3611712,12288],"eu":[3485312,12288],"sh":[3459680,12288]}], -"levels/bbh/5.rgba16.png": [32,64,4096,{"jp":[3604960,13312],"us":[3611712,13312],"eu":[3485312,13312],"sh":[3459680,13312]}], -"levels/bbh/6.rgba16.png": [16,32,1024,{"jp":[3604960,17408],"us":[3611712,17408],"eu":[3485312,17408],"sh":[3459680,17408]}], +"actors_vanilla/bbh/4.rgba16.png": [16,32,1024,{"jp":[3604960,12288],"us":[3611712,12288],"eu":[3485312,12288],"sh":[3459680,12288]}], +"actors_vanilla/bbh/5.rgba16.png": [32,64,4096,{"jp":[3604960,13312],"us":[3611712,13312],"eu":[3485312,13312],"sh":[3459680,13312]}], +"actors_vanilla/bbh/6.rgba16.png": [16,32,1024,{"jp":[3604960,17408],"us":[3611712,17408],"eu":[3485312,17408],"sh":[3459680,17408]}], +"actors_vanilla/bitdw/0.rgba16.png": [32,32,2048,{"jp":[4533568,0],"us":[4541952,0],"eu":[4415552,0],"sh":[4389920,0]}], "levels/bitdw/0.rgba16.png": [32,32,2048,{"jp":[4533568,0],"us":[4541952,0],"eu":[4415552,0],"sh":[4389920,0]}], "levels/bitdw/1.rgba16.png": [32,32,2048,{"jp":[4533568,2048],"us":[4541952,2048],"eu":[4415552,2048],"sh":[4389920,2048]}], "levels/bitdw/2.rgba16.png": [32,32,2048,{"jp":[4533568,4096],"us":[4541952,4096],"eu":[4415552,4096],"sh":[4389920,4096]}], "levels/bitdw/3.rgba16.png": [32,32,2048,{"jp":[4533568,6144],"us":[4541952,6144],"eu":[4415552,6144],"sh":[4389920,6144]}], +"actors_vanilla/bitfs/0.rgba16.png": [32,64,4096,{"jp":[4584464,0],"us":[4592848,0],"eu":[4466448,0],"sh":[4440816,0]}], "levels/bitfs/0.rgba16.png": [32,64,4096,{"jp":[4584464,0],"us":[4592848,0],"eu":[4466448,0],"sh":[4440816,0]}], +"actors_vanilla/bitfs/1.rgba16.png": [32,32,2048,{"jp":[4584464,4096],"us":[4592848,4096],"eu":[4466448,4096],"sh":[4440816,4096]}], "levels/bitfs/1.rgba16.png": [32,32,2048,{"jp":[4584464,4096],"us":[4592848,4096],"eu":[4466448,4096],"sh":[4440816,4096]}], "levels/bitfs/2.rgba16.png": [32,32,2048,{"jp":[4584464,6144],"us":[4592848,6144],"eu":[4466448,6144],"sh":[4440816,6144]}], "levels/bits/0.rgba16.png": [32,64,4096,{"jp":[4629216,0],"us":[4637600,0],"eu":[4511200,0],"sh":[4485568,0]}], "levels/bits/1.rgba16.png": [64,32,4096,{"jp":[4629216,4096],"us":[4637600,4096],"eu":[4511200,4096],"sh":[4485568,4096]}], +"actors_vanilla/bits/2.rgba16.png": [32,32,2048,{"jp":[4629216,8192],"us":[4637600,8192],"eu":[4511200,8192],"sh":[4485568,8192]}], "levels/bits/2.rgba16.png": [32,32,2048,{"jp":[4629216,8192],"us":[4637600,8192],"eu":[4511200,8192],"sh":[4485568,8192]}], "levels/bob/0.rgba16.png": [32,32,2048,{"jp":[4170512,0],"us":[4178608,0],"eu":[4052208,0],"sh":[4026576,0]}], "levels/bob/1.rgba16.png": [32,32,2048,{"jp":[4170512,2048],"us":[4178608,2048],"eu":[4052208,2048],"sh":[4026576,2048]}], @@ -565,9 +570,9 @@ "levels/castle_grounds/0.rgba16.png": [32,64,4096,{"jp":[4492416,0],"us":[4500416,0],"eu":[4374016,0],"sh":[4348384,0]}], "levels/castle_grounds/1.rgba16.png": [64,32,4096,{"jp":[4492416,4096],"us":[4500416,4096],"eu":[4374016,4096],"sh":[4348384,4096]}], "levels/castle_grounds/2.rgba16.png": [64,32,4096,{"jp":[4492416,8192],"us":[4500416,8192],"eu":[4374016,8192],"sh":[4348384,8192]}], -"levels/castle_grounds/3.rgba16.png": [32,64,4096,{"jp":[4492416,51688],"us":[4500416,51688],"eu":[4374016,51688],"sh":[4348384,51688]}], -"levels/castle_grounds/4.rgba16.png": [32,64,4096,{"jp":[4492416,55784],"us":[4500416,55784],"eu":[4374016,55784],"sh":[4348384,55784]}], -"levels/castle_grounds/5.ia8.png": [64,32,2048,{"us":[4500416,60136],"eu":[4374016,60136],"sh":[4348384,60136]}], +"actors_vanilla/castle_grounds/3.rgba16.png": [32,64,4096,{"jp":[4492416,51688],"us":[4500416,51688],"eu":[4374016,51688],"sh":[4348384,51688]}], +"actors_vanilla/castle_grounds/4.rgba16.png": [32,64,4096,{"jp":[4492416,55784],"us":[4500416,55784],"eu":[4374016,55784],"sh":[4348384,55784]}], +"actors_vanilla/castle_grounds/5.ia8.png": [64,32,2048,{"us":[4500416,60136],"eu":[4374016,60136],"sh":[4348384,60136]}], "levels/castle_inside/1.rgba16.png": [32,32,2048,{"jp":[3754192,2048],"us":[3760960,2048],"eu":[3634560,2048],"sh":[3608928,2048]}], "levels/castle_inside/10.rgba16.png": [32,32,2048,{"jp":[3754192,28672],"us":[3760960,28672],"eu":[3634560,28672],"sh":[3608928,28672]}], "levels/castle_inside/11.rgba16.png": [32,32,2048,{"jp":[3754192,30720],"us":[3760960,30720],"eu":[3634560,30720],"sh":[3608928,30720]}], @@ -605,22 +610,25 @@ "levels/castle_inside/39.rgba16.png": [64,32,4096,{"jp":[3754192,129024],"us":[3760960,129024],"eu":[3634560,129024],"sh":[3608928,129024]}], "levels/castle_inside/4.rgba16.png": [32,32,2048,{"jp":[3754192,12288],"us":[3760960,12288],"eu":[3634560,12288],"sh":[3608928,12288]}], "levels/castle_inside/40.rgba16.png": [64,32,4096,{"jp":[3754192,133120],"us":[3760960,133120],"eu":[3634560,133120],"sh":[3608928,133120]}], -"levels/castle_inside/5.rgba16.png": [32,64,4096,{"jp":[3754192,14336],"us":[3760960,14336],"eu":[3634560,14336],"sh":[3608928,14336]}], -"levels/castle_inside/6.rgba16.png": [32,64,4096,{"jp":[3754192,18432],"us":[3760960,18432],"eu":[3634560,18432],"sh":[3608928,18432]}], -"levels/castle_inside/7.rgba16.png": [32,32,2048,{"jp":[3754192,22528],"us":[3760960,22528],"eu":[3634560,22528],"sh":[3608928,22528]}], +"actors_vanilla/castle_inside/5.rgba16.png": [32,64,4096,{"jp":[3754192,14336],"us":[3760960,14336],"eu":[3634560,14336],"sh":[3608928,14336]}], +"actors_vanilla/castle_inside/6.rgba16.png": [32,64,4096,{"jp":[3754192,18432],"us":[3760960,18432],"eu":[3634560,18432],"sh":[3608928,18432]}], +"actors_vanilla/castle_inside/7.rgba16.png": [32,32,2048,{"jp":[3754192,22528],"us":[3760960,22528],"eu":[3634560,22528],"sh":[3608928,22528]}], "levels/castle_inside/8.rgba16.png": [32,32,2048,{"jp":[3754192,24576],"us":[3760960,24576],"eu":[3634560,24576],"sh":[3608928,24576]}], "levels/castle_inside/9.rgba16.png": [32,32,2048,{"jp":[3754192,26624],"us":[3760960,26624],"eu":[3634560,26624],"sh":[3608928,26624]}], +"actors_vanilla/castle_inside/castle_light.ia16.png": [32,32,2048,{"jp":[3432432,47104],"us":[3439184,47104],"eu":[3312784,47104],"sh":[3287152,47104]}], "levels/castle_inside/castle_light.ia16.png": [32,32,2048,{"jp":[3432432,47104],"us":[3439184,47104],"eu":[3312784,47104],"sh":[3287152,47104]}], "levels/ccm/0.rgba16.png": [32,32,2048,{"jp":[3677936,0],"us":[3684688,0],"eu":[3558288,0],"sh":[3532656,0]}], "levels/ccm/1.rgba16.png": [32,4,256,{"jp":[3677936,2048],"us":[3684688,2048],"eu":[3558288,2048],"sh":[3532656,2048]}], +"actors_vanilla/ccm/1.rgba16.png": [32,4,256,{"jp":[3677936,2048],"us":[3684688,2048],"eu":[3558288,2048],"sh":[3532656,2048]}], "levels/ccm/10.rgba16.png": [32,32,2048,{"jp":[3677936,17152],"us":[3684688,17152],"eu":[3558288,17152],"sh":[3532656,17152]}], "levels/ccm/11.rgba16.png": [32,32,2048,{"jp":[3677936,19200],"us":[3684688,19200],"eu":[3558288,19200],"sh":[3532656,19200]}], -"levels/ccm/12.rgba16.png": [32,32,2048,{"jp":[3677936,72024],"us":[3684688,72024],"eu":[3558288,72024],"sh":[3532656,72024]}], +"actors_vanilla/ccm/12.rgba16.png": [32,32,2048,{"jp":[3677936,72024],"us":[3684688,72024],"eu":[3558288,72024],"sh":[3532656,72024]}], "levels/ccm/2.rgba16.png": [32,32,2048,{"jp":[3677936,2304],"us":[3684688,2304],"eu":[3558288,2304],"sh":[3532656,2304]}], -"levels/ccm/3.rgba16.png": [32,32,2048,{"jp":[3677936,4352],"us":[3684688,4352],"eu":[3558288,4352],"sh":[3532656,4352]}], +"actors_vanilla/ccm/2.rgba16.png": [32,32,2048,{"jp":[3677936,2304],"us":[3684688,2304],"eu":[3558288,2304],"sh":[3532656,2304]}], +"actors_vanilla/ccm/3.rgba16.png": [32,32,2048,{"jp":[3677936,4352],"us":[3684688,4352],"eu":[3558288,4352],"sh":[3532656,4352]}], "levels/ccm/4.rgba16.png": [32,32,2048,{"jp":[3677936,6400],"us":[3684688,6400],"eu":[3558288,6400],"sh":[3532656,6400]}], -"levels/ccm/5.rgba16.png": [32,32,2048,{"jp":[1436272,48240],"us":[1443440,48240],"eu":[1315408,48240],"sh":[1291920,48240]}], -"levels/ccm/6.rgba16.png": [32,32,2048,{"jp":[1436272,46192],"us":[1443440,46192],"eu":[1315408,46192],"sh":[1291920,46192]}], +"actors_vanilla/ccm/5.rgba16.png": [32,32,2048,{"jp":[1436272,48240],"us":[1443440,48240],"eu":[1315408,48240],"sh":[1291920,48240]}], +"actors_vanilla/ccm/6.rgba16.png": [32,32,2048,{"jp":[1436272,46192],"us":[1443440,46192],"eu":[1315408,46192],"sh":[1291920,46192]}], "levels/ccm/7.rgba16.png": [32,32,2048,{"jp":[3677936,12544],"us":[3684688,12544],"eu":[3558288,12544],"sh":[3532656,12544]}], "levels/ccm/8.ia16.png": [16,16,512,{"jp":[3677936,14592],"us":[3684688,14592],"eu":[3558288,14592],"sh":[3532656,14592]}], "levels/ccm/9.ia16.png": [32,32,2048,{"jp":[3677936,15104],"us":[3684688,15104],"eu":[3558288,15104],"sh":[3532656,15104]}], @@ -629,11 +637,12 @@ "levels/cotmc/2.rgba16.png": [32,32,2048,{"jp":[4939888,6144],"us":[4948176,6144],"eu":[4827104,6144],"sh":[4796144,6144]}], "levels/cotmc/3.rgba16.png": [32,32,2048,{"jp":[4939888,8192],"us":[4948176,8192],"eu":[4827104,8192],"sh":[4796144,8192]}], "levels/cotmc/4.rgba16.png": [64,16,2048,{"jp":[4939888,10240],"us":[4948176,10240],"eu":[4827104,10240],"sh":[4796144,10240]}], -"levels/ddd/0.rgba16.png": [32,64,4096,{"jp":[4765904,0],"us":[4774192,0],"eu":[4647792,0],"sh":[4622160,0]}], +"actors_vanilla/ddd/0.rgba16.png": [32,64,4096,{"jp":[4765904,0],"us":[4774192,0],"eu":[4647792,0],"sh":[4622160,0]}], "levels/ddd/1.rgba16.png": [32,32,2048,{"jp":[3432432,4096],"us":[3439184,4096],"eu":[3312784,4096],"sh":[3287152,4096]}], "levels/ddd/2.rgba16.png": [32,32,2048,{"jp":[4765904,6144],"us":[4774192,6144],"eu":[4647792,6144],"sh":[4622160,6144]}], +"actors_vanilla/ddd/2.rgba16.png": [32,32,2048,{"jp":[4765904,6144],"us":[4774192,6144],"eu":[4647792,6144],"sh":[4622160,6144]}], "levels/ddd/3.rgba16.png": [64,32,4096,{"jp":[4765904,8192],"us":[4774192,8192],"eu":[4647792,8192],"sh":[4622160,8192]}], -"levels/ddd/4.rgba16.png": [32,32,2048,{"jp":[4765904,12288],"us":[4774192,12288],"eu":[4647792,12288],"sh":[4622160,12288]}], +"actors_vanilla/ddd/4.rgba16.png": [32,32,2048,{"jp":[4765904,12288],"us":[4774192,12288],"eu":[4647792,12288],"sh":[4622160,12288]}], "levels/ending/cake.png": [153600,{"jp":[4834992,0],"us":[4843280,0],"sh":[4691248,0]}], "levels/ending/cake_eu.png": [143360,{"eu":[4716880,0]}], "levels/ending/eu_023000.rgba16.png": [64,32,4096,{"eu":[4716880,143360]}], @@ -645,10 +654,10 @@ "levels/hmc/0.rgba16.png": [32,64,4096,{"jp":[3993136,0],"us":[4001216,0],"eu":[3874816,0],"sh":[3849184,0]}], "levels/hmc/1.rgba16.png": [32,64,4096,{"jp":[3993136,4096],"us":[4001216,4096],"eu":[3874816,4096],"sh":[3849184,4096]}], "levels/hmc/2.rgba16.png": [32,64,4096,{"jp":[3993136,8192],"us":[4001216,8192],"eu":[3874816,8192],"sh":[3849184,8192]}], -"levels/hmc/3.rgba16.png": [32,32,2048,{"jp":[3993136,12288],"us":[4001216,12288],"eu":[3874816,12288],"sh":[3849184,12288]}], -"levels/hmc/4.rgba16.png": [32,32,2048,{"jp":[3993136,14336],"us":[4001216,14336],"eu":[3874816,14336],"sh":[3849184,14336]}], -"levels/hmc/5.rgba16.png": [32,32,2048,{"jp":[3993136,16384],"us":[4001216,16384],"eu":[3874816,16384],"sh":[3849184,16384]}], -"levels/hmc/6.rgba16.png": [32,64,4096,{"jp":[3993136,18432],"us":[4001216,18432],"eu":[3874816,18432],"sh":[3849184,18432]}], +"actors_vanilla/hmc/3.rgba16.png": [32,32,2048,{"jp":[3993136,12288],"us":[4001216,12288],"eu":[3874816,12288],"sh":[3849184,12288]}], +"actors_vanilla/hmc/4.rgba16.png": [32,32,2048,{"jp":[3993136,14336],"us":[4001216,14336],"eu":[3874816,14336],"sh":[3849184,14336]}], +"actors_vanilla/hmc/5.rgba16.png": [32,32,2048,{"jp":[3993136,16384],"us":[4001216,16384],"eu":[3874816,16384],"sh":[3849184,16384]}], +"actors_vanilla/hmc/6.rgba16.png": [32,64,4096,{"jp":[3993136,18432],"us":[4001216,18432],"eu":[3874816,18432],"sh":[3849184,18432]}], "levels/hmc/7.rgba16.png": [32,32,2048,{"jp":[3754192,92160],"us":[3760960,92160],"eu":[3634560,92160],"sh":[3608928,92160]}], "levels/intro/0.rgba16.png": [32,32,2048,{"jp":[2524448,32416],"us":[2532256,32416],"eu":[2401056,32416],"sh":[2377888,32416]}], "levels/intro/1.rgba16.png": [32,32,2048,{"jp":[2524448,34464],"us":[2532256,34464],"eu":[2401056,34464],"sh":[2377888,34464]}], @@ -659,40 +668,41 @@ "levels/intro/3_sh_tm.rgba16.png": [16,16,512,{"sh":[2377888,50336]}], "levels/jrb/0.rgba16.png": [32,32,2048,{"jp":[3432432,4096],"us":[3439184,4096],"eu":[3312784,4096],"sh":[3287152,4096]}], "levels/jrb/1.rgba16.png": [64,32,4096,{"jp":[4294592,2048],"us":[4302688,2048],"eu":[4176288,2048],"sh":[4150656,2048]}], -"levels/jrb/2.rgba16.png": [32,32,2048,{"jp":[4294592,6144],"us":[4302688,6144],"eu":[4176288,6144],"sh":[4150656,6144]}], -"levels/jrb/3.rgba16.png": [32,32,2048,{"jp":[4294592,8192],"us":[4302688,8192],"eu":[4176288,8192],"sh":[4150656,8192]}], -"levels/lll/0.rgba16.png": [32,32,2048,{"jp":[4678592,0],"us":[4687008,0],"eu":[4560608,0],"sh":[4534976,0]}], -"levels/lll/1.rgba16.png": [32,32,2048,{"jp":[4678592,2048],"us":[4687008,2048],"eu":[4560608,2048],"sh":[4534976,2048]}], -"levels/lll/10.rgba16.png": [32,32,2048,{"jp":[4678592,20480],"us":[4687008,20480],"eu":[4560608,20480],"sh":[4534976,20480]}], -"levels/lll/11.rgba16.png": [32,32,2048,{"jp":[4678592,22528],"us":[4687008,22528],"eu":[4560608,22528],"sh":[4534976,22528]}], -"levels/lll/12.rgba16.png": [32,32,2048,{"jp":[4678592,24576],"us":[4687008,24576],"eu":[4560608,24576],"sh":[4534976,24576]}], -"levels/lll/13.rgba16.png": [32,32,2048,{"jp":[4678592,26624],"us":[4687008,26624],"eu":[4560608,26624],"sh":[4534976,26624]}], -"levels/lll/14.rgba16.png": [32,32,2048,{"jp":[4678592,28672],"us":[4687008,28672],"eu":[4560608,28672],"sh":[4534976,28672]}], -"levels/lll/15.rgba16.png": [32,32,2048,{"jp":[4678592,30720],"us":[4687008,30720],"eu":[4560608,30720],"sh":[4534976,30720]}], -"levels/lll/16.rgba16.png": [32,32,2048,{"jp":[4678592,32768],"us":[4687008,32768],"eu":[4560608,32768],"sh":[4534976,32768]}], -"levels/lll/17.rgba16.png": [32,32,2048,{"jp":[4678592,34816],"us":[4687008,34816],"eu":[4560608,34816],"sh":[4534976,34816]}], -"levels/lll/18.rgba16.png": [32,32,2048,{"jp":[4678592,36864],"us":[4687008,36864],"eu":[4560608,36864],"sh":[4534976,36864]}], -"levels/lll/19.rgba16.png": [32,32,2048,{"jp":[4678592,38912],"us":[4687008,38912],"eu":[4560608,38912],"sh":[4534976,38912]}], -"levels/lll/2.rgba16.png": [32,32,2048,{"jp":[4678592,4096],"us":[4687008,4096],"eu":[4560608,4096],"sh":[4534976,4096]}], -"levels/lll/20.rgba16.png": [32,32,2048,{"jp":[4678592,40960],"us":[4687008,40960],"eu":[4560608,40960],"sh":[4534976,40960]}], -"levels/lll/21.rgba16.png": [32,32,2048,{"jp":[4678592,43008],"us":[4687008,43008],"eu":[4560608,43008],"sh":[4534976,43008]}], -"levels/lll/22.rgba16.png": [32,32,2048,{"jp":[4678592,45056],"us":[4687008,45056],"eu":[4560608,45056],"sh":[4534976,45056]}], -"levels/lll/23.rgba16.png": [32,32,2048,{"jp":[4678592,47104],"us":[4687008,47104],"eu":[4560608,47104],"sh":[4534976,47104]}], -"levels/lll/24.rgba16.png": [32,32,2048,{"jp":[4678592,49152],"us":[4687008,49152],"eu":[4560608,49152],"sh":[4534976,49152]}], -"levels/lll/25.rgba16.png": [32,32,2048,{"jp":[4678592,51200],"us":[4687008,51200],"eu":[4560608,51200],"sh":[4534976,51200]}], +"actors_vanilla/jrb/2.rgba16.png": [32,32,2048,{"jp":[4294592,6144],"us":[4302688,6144],"eu":[4176288,6144],"sh":[4150656,6144]}], +"actors_vanilla/jrb/3.rgba16.png": [32,32,2048,{"jp":[4294592,8192],"us":[4302688,8192],"eu":[4176288,8192],"sh":[4150656,8192]}], +"actors_vanilla/lll/0.rgba16.png": [32,32,2048,{"jp":[4678592,0],"us":[4687008,0],"eu":[4560608,0],"sh":[4534976,0]}], +"actors_vanilla/lll/1.rgba16.png": [32,32,2048,{"jp":[4678592,2048],"us":[4687008,2048],"eu":[4560608,2048],"sh":[4534976,2048]}], +"actors_vanilla/lll/10.rgba16.png": [32,32,2048,{"jp":[4678592,20480],"us":[4687008,20480],"eu":[4560608,20480],"sh":[4534976,20480]}], +"actors_vanilla/lll/11.rgba16.png": [32,32,2048,{"jp":[4678592,22528],"us":[4687008,22528],"eu":[4560608,22528],"sh":[4534976,22528]}], +"actors_vanilla/lll/12.rgba16.png": [32,32,2048,{"jp":[4678592,24576],"us":[4687008,24576],"eu":[4560608,24576],"sh":[4534976,24576]}], +"actors_vanilla/lll/13.rgba16.png": [32,32,2048,{"jp":[4678592,26624],"us":[4687008,26624],"eu":[4560608,26624],"sh":[4534976,26624]}], +"actors_vanilla/lll/14.rgba16.png": [32,32,2048,{"jp":[4678592,28672],"us":[4687008,28672],"eu":[4560608,28672],"sh":[4534976,28672]}], +"actors_vanilla/lll/15.rgba16.png": [32,32,2048,{"jp":[4678592,30720],"us":[4687008,30720],"eu":[4560608,30720],"sh":[4534976,30720]}], +"actors_vanilla/lll/16.rgba16.png": [32,32,2048,{"jp":[4678592,32768],"us":[4687008,32768],"eu":[4560608,32768],"sh":[4534976,32768]}], +"actors_vanilla/lll/17.rgba16.png": [32,32,2048,{"jp":[4678592,34816],"us":[4687008,34816],"eu":[4560608,34816],"sh":[4534976,34816]}], +"actors_vanilla/lll/18.rgba16.png": [32,32,2048,{"jp":[4678592,36864],"us":[4687008,36864],"eu":[4560608,36864],"sh":[4534976,36864]}], +"actors_vanilla/lll/19.rgba16.png": [32,32,2048,{"jp":[4678592,38912],"us":[4687008,38912],"eu":[4560608,38912],"sh":[4534976,38912]}], +"actors_vanilla/lll/2.rgba16.png": [32,32,2048,{"jp":[4678592,4096],"us":[4687008,4096],"eu":[4560608,4096],"sh":[4534976,4096]}], +"actors_vanilla/lll/20.rgba16.png": [32,32,2048,{"jp":[4678592,40960],"us":[4687008,40960],"eu":[4560608,40960],"sh":[4534976,40960]}], +"actors_vanilla/lll/21.rgba16.png": [32,32,2048,{"jp":[4678592,43008],"us":[4687008,43008],"eu":[4560608,43008],"sh":[4534976,43008]}], +"actors_vanilla/lll/22.rgba16.png": [32,32,2048,{"jp":[4678592,45056],"us":[4687008,45056],"eu":[4560608,45056],"sh":[4534976,45056]}], +"actors_vanilla/lll/23.rgba16.png": [32,32,2048,{"jp":[4678592,47104],"us":[4687008,47104],"eu":[4560608,47104],"sh":[4534976,47104]}], +"actors_vanilla/lll/24.rgba16.png": [32,32,2048,{"jp":[4678592,49152],"us":[4687008,49152],"eu":[4560608,49152],"sh":[4534976,49152]}], +"actors_vanilla/lll/25.rgba16.png": [32,32,2048,{"jp":[4678592,51200],"us":[4687008,51200],"eu":[4560608,51200],"sh":[4534976,51200]}], "levels/lll/26.rgba16.png": [16,16,512,{"jp":[4678592,53248],"us":[4687008,53248],"eu":[4560608,53248],"sh":[4534976,53248]}], "levels/lll/27.ia16.png": [16,16,512,{"jp":[3677936,14592],"us":[3684688,14592],"eu":[3558288,14592],"sh":[3532656,14592]}], "levels/lll/28.rgba16.png": [32,32,2048,{"jp":[4678592,54272],"us":[4687008,54272],"eu":[4560608,54272],"sh":[4534976,54272]}], "levels/lll/29.rgba16.png": [32,32,2048,{"jp":[4678592,56320],"us":[4687008,56320],"eu":[4560608,56320],"sh":[4534976,56320]}], +"actors_vanilla/lll/29.rgba16.png": [32,32,2048,{"jp":[4678592,56320],"us":[4687008,56320],"eu":[4560608,56320],"sh":[4534976,56320]}], "levels/lll/3.rgba16.png": [32,32,2048,{"jp":[4678592,6144],"us":[4687008,6144],"eu":[4560608,6144],"sh":[4534976,6144]}], "levels/lll/30.rgba16.png": [32,32,2048,{"jp":[4678592,58368],"us":[4687008,58368],"eu":[4560608,58368],"sh":[4534976,58368]}], "levels/lll/31.rgba16.png": [32,32,2048,{"jp":[4678592,60416],"us":[4687008,60416],"eu":[4560608,60416],"sh":[4534976,60416]}], "levels/lll/32.rgba16.png": [64,16,2048,{"jp":[4678592,62464],"us":[4687008,62464],"eu":[4560608,62464],"sh":[4534976,62464]}], "levels/lll/4.rgba16.png": [32,32,2048,{"jp":[4678592,8192],"us":[4687008,8192],"eu":[4560608,8192],"sh":[4534976,8192]}], "levels/lll/5.rgba16.png": [32,32,2048,{"jp":[4678592,10240],"us":[4687008,10240],"eu":[4560608,10240],"sh":[4534976,10240]}], -"levels/lll/6.rgba16.png": [32,32,2048,{"jp":[4678592,12288],"us":[4687008,12288],"eu":[4560608,12288],"sh":[4534976,12288]}], +"actors_vanilla/lll/6.rgba16.png": [32,32,2048,{"jp":[4678592,12288],"us":[4687008,12288],"eu":[4560608,12288],"sh":[4534976,12288]}], "levels/lll/7.rgba16.png": [32,32,2048,{"jp":[3262320,6144],"us":[3269072,6144],"eu":[3142672,6144],"sh":[3117040,6144]}], -"levels/lll/8.rgba16.png": [32,32,2048,{"jp":[4678592,16384],"us":[4687008,16384],"eu":[4560608,16384],"sh":[4534976,16384]}], +"actors_vanilla/lll/8.rgba16.png": [32,32,2048,{"jp":[4678592,16384],"us":[4687008,16384],"eu":[4560608,16384],"sh":[4534976,16384]}], "levels/lll/9.rgba16.png": [32,32,2048,{"jp":[4678592,18432],"us":[4687008,18432],"eu":[4560608,18432],"sh":[4534976,18432]}], "levels/menu/main_menu_seg7.00018.rgba16.png": [32,32,2048,{"jp":[2770736,24],"us":[2778544,24],"eu":[2647072,24],"sh":[2625456,24]}], "levels/menu/main_menu_seg7.00818.rgba16.png": [32,32,2048,{"jp":[2770736,2072],"us":[2778544,2072],"eu":[2647072,2072],"sh":[2625456,2072]}], @@ -927,59 +937,64 @@ "levels/pss/0.rgba16.png": [32,32,2048,{"jp":[4905168,0],"us":[4913456,0],"eu":[4792384,0],"sh":[4761424,0]}], "levels/pss/1.ia16.png": [32,32,2048,{"jp":[4905168,2048],"us":[4913456,2048],"eu":[4792384,2048],"sh":[4761424,2048]}], "levels/pss/2.rgba16.png": [32,32,2048,{"jp":[4905168,4096],"us":[4913456,4096],"eu":[4792384,4096],"sh":[4761424,4096]}], -"levels/rr/1.rgba16.png": [64,32,4096,{"jp":[4413648,2048],"us":[4421744,2048],"eu":[4295344,2048],"sh":[4269712,2048]}], +"actors_vanilla/rr/1.rgba16.png": [64,32,4096,{"jp":[4413648,2048],"us":[4421744,2048],"eu":[4295344,2048],"sh":[4269712,2048]}], "levels/rr/2.rgba16.png": [32,32,2048,{"jp":[4413648,6144],"us":[4421744,6144],"eu":[4295344,6144],"sh":[4269712,6144]}], -"levels/rr/quarter_flying_carpet.rgba16.png": [32,32,2048,{"jp":[4413648,0],"us":[4421744,0],"eu":[4295344,0],"sh":[4269712,0]}], +"actors_vanilla/rr/quarter_flying_carpet.rgba16.png": [32,32,2048,{"jp":[4413648,0],"us":[4421744,0],"eu":[4295344,0],"sh":[4269712,0]}], "levels/sl/0.rgba16.png": [32,32,2048,{"jp":[4210704,0],"us":[4218800,0],"eu":[4092400,0],"sh":[4066768,0]}], "levels/sl/1.rgba16.png": [32,32,2048,{"jp":[4210704,2048],"us":[4218800,2048],"eu":[4092400,2048],"sh":[4066768,2048]}], -"levels/sl/2.rgba16.png": [32,32,2048,{"jp":[4210704,4096],"us":[4218800,4096],"eu":[4092400,4096],"sh":[4066768,4096]}], +"actors_vanilla/sl/2.rgba16.png": [32,32,2048,{"jp":[4210704,4096],"us":[4218800,4096],"eu":[4092400,4096],"sh":[4066768,4096]}], "levels/sl/3.rgba16.png": [32,32,2048,{"jp":[4210704,6144],"us":[4218800,6144],"eu":[4092400,6144],"sh":[4066768,6144]}], "levels/sl/4.rgba16.png": [32,32,2048,{"jp":[4210704,8192],"us":[4218800,8192],"eu":[4092400,8192],"sh":[4066768,8192]}], "levels/ssl/0.rgba16.png": [32,32,2048,{"jp":[4085520,0],"us":[4093616,0],"eu":[3967216,0],"sh":[3941584,0]}], "levels/ssl/1.ia16.png": [32,32,2048,{"jp":[4085520,2048],"us":[4093616,2048],"eu":[3967216,2048],"sh":[3941584,2048]}], -"levels/ssl/10.rgba16.png": [32,64,4096,{"jp":[4085520,55208],"us":[4093616,55208],"eu":[3967216,55208],"sh":[3941584,55208]}], -"levels/ssl/11.rgba16.png": [32,64,4096,{"jp":[4085520,59304],"us":[4093616,59304],"eu":[3967216,59304],"sh":[3941584,59304]}], +"actors_vanilla/ssl/10.rgba16.png": [32,64,4096,{"jp":[4085520,55208],"us":[4093616,55208],"eu":[3967216,55208],"sh":[3941584,55208]}], +"actors_vanilla/ssl/11.rgba16.png": [32,64,4096,{"jp":[4085520,59304],"us":[4093616,59304],"eu":[3967216,59304],"sh":[3941584,59304]}], "levels/ssl/2.rgba16.png": [32,32,2048,{"jp":[4085520,4096],"us":[4093616,4096],"eu":[3967216,4096],"sh":[3941584,4096]}], "levels/ssl/3.rgba16.png": [32,32,2048,{"jp":[4085520,6144],"us":[4093616,6144],"eu":[3967216,6144],"sh":[3941584,6144]}], "levels/ssl/4.rgba16.png": [32,32,2048,{"jp":[4085520,8192],"us":[4093616,8192],"eu":[3967216,8192],"sh":[3941584,8192]}], -"levels/ssl/5.rgba16.png": [32,64,4096,{"jp":[4085520,10240],"us":[4093616,10240],"eu":[3967216,10240],"sh":[3941584,10240]}], -"levels/ssl/6.rgba16.png": [32,32,2048,{"jp":[4085520,14336],"us":[4093616,14336],"eu":[3967216,14336],"sh":[3941584,14336]}], +"actors_vanilla/ssl/5.rgba16.png": [32,64,4096,{"jp":[4085520,10240],"us":[4093616,10240],"eu":[3967216,10240],"sh":[3941584,10240]}], +"actors_vanilla/ssl/6.rgba16.png": [32,32,2048,{"jp":[4085520,14336],"us":[4093616,14336],"eu":[3967216,14336],"sh":[3941584,14336]}], "levels/ssl/7.rgba16.png": [32,32,2048,{"jp":[3323408,32768],"us":[3330160,32768],"eu":[3203760,32768],"sh":[3178128,32768]}], -"levels/ssl/8.rgba16.png": [32,32,2048,{"jp":[4085520,49064],"us":[4093616,49064],"eu":[3967216,49064],"sh":[3941584,49064]}], -"levels/ssl/9.rgba16.png": [32,64,4096,{"jp":[4085520,51112],"us":[4093616,51112],"eu":[3967216,51112],"sh":[3941584,51112]}], +"actors_vanilla/ssl/8.rgba16.png": [32,32,2048,{"jp":[4085520,49064],"us":[4093616,49064],"eu":[3967216,49064],"sh":[3941584,49064]}], +"actors_vanilla/ssl/9.rgba16.png": [32,64,4096,{"jp":[4085520,51112],"us":[4093616,51112],"eu":[3967216,51112],"sh":[3941584,51112]}], "levels/thi/0.rgba16.png": [32,32,2048,{"jp":[4335408,0],"us":[4343504,0],"eu":[4217104,0],"sh":[4191472,0]}], "levels/thi/1.rgba16.png": [32,32,2048,{"jp":[4335408,2048],"us":[4343504,2048],"eu":[4217104,2048],"sh":[4191472,2048]}], +"actors_vanilla/thi/1.rgba16.png": [32,32,2048,{"jp":[4335408,2048],"us":[4343504,2048],"eu":[4217104,2048],"sh":[4191472,2048]}], "levels/totwc/0.rgba16.png": [32,64,4096,{"jp":[4967376,0],"us":[4975664,0],"eu":[4854592,0],"sh":[4823632,0]}], "levels/totwc/1.rgba16.png": [32,32,2048,{"jp":[4967376,4096],"us":[4975664,4096],"eu":[4854592,4096],"sh":[4823632,4096]}], "levels/totwc/2.rgba16.png": [32,32,2048,{"jp":[4967376,6144],"us":[4975664,6144],"eu":[4854592,6144],"sh":[4823632,6144]}], "levels/totwc/3.ia16.png": [32,32,2048,{"jp":[4967376,8192],"us":[4975664,8192],"eu":[4854592,8192],"sh":[4823632,8192]}], -"levels/ttc/0.rgba16.png": [32,32,2048,{"jp":[4370304,0],"us":[4378400,0],"eu":[4252000,0],"sh":[4226368,0]}], +"actors_vanilla/ttc/0.rgba16.png": [32,32,2048,{"jp":[4370304,0],"us":[4378400,0],"eu":[4252000,0],"sh":[4226368,0]}], +"actors_vanilla/ttc/1.rgba16.png": [16,64,2048,{"jp":[4370304,2048],"us":[4378400,2048],"eu":[4252000,2048],"sh":[4226368,2048]}], "levels/ttc/1.rgba16.png": [16,64,2048,{"jp":[4370304,2048],"us":[4378400,2048],"eu":[4252000,2048],"sh":[4226368,2048]}], "levels/ttc/2.rgba16.png": [32,32,2048,{"jp":[4370304,90000],"us":[4378400,90000],"eu":[4252000,90000],"sh":[4226368,90000]}], "levels/ttm/0.ia16.png": [32,32,2048,{"jp":[5044400,0],"us":[5052688,0],"eu":[4931616,0],"sh":[4900656,0]}], "levels/ttm/1.rgba16.png": [32,32,2048,{"jp":[5044400,2048],"us":[5052688,2048],"eu":[4931616,2048],"sh":[4900656,2048]}], "levels/ttm/2.rgba16.png": [32,32,2048,{"jp":[5044400,4096],"us":[5052688,4096],"eu":[4931616,4096],"sh":[4900656,4096]}], "levels/ttm/3.rgba16.png": [32,32,2048,{"jp":[5044400,6144],"us":[5052688,6144],"eu":[4931616,6144],"sh":[4900656,6144]}], -"levels/ttm/4.rgba16.png": [32,32,2048,{"jp":[5044400,8192],"us":[5052688,8192],"eu":[4931616,8192],"sh":[4900656,8192]}], +"actors_vanilla/ttm/4.rgba16.png": [32,32,2048,{"jp":[5044400,8192],"us":[5052688,8192],"eu":[4931616,8192],"sh":[4900656,8192]}], "levels/ttm/5.rgba16.png": [32,32,2048,{"jp":[5044400,10240],"us":[5052688,10240],"eu":[4931616,10240],"sh":[4900656,10240]}], "levels/ttm/6.rgba16.png": [64,32,4096,{"jp":[5044400,12288],"us":[5052688,12288],"eu":[4931616,12288],"sh":[4900656,12288]}], "levels/ttm/7.rgba16.png": [64,32,4096,{"jp":[5044400,16384],"us":[5052688,16384],"eu":[4931616,16384],"sh":[4900656,16384]}], -"levels/ttm/8.rgba16.png": [32,32,2048,{"jp":[3473152,43008],"us":[3479904,43008],"eu":[3353504,43008],"sh":[3327872,43008]}], +"actors_vanilla/ttm/8.rgba16.png": [32,32,2048,{"jp":[3473152,43008],"us":[3479904,43008],"eu":[3353504,43008],"sh":[3327872,43008]}], "levels/vcutm/0.rgba16.png": [32,32,2048,{"jp":[4564288,0],"us":[4572672,0],"eu":[4446272,0],"sh":[4420640,0]}], "levels/vcutm/1.rgba16.png": [64,32,4096,{"jp":[4564288,2048],"us":[4572672,2048],"eu":[4446272,2048],"sh":[4420640,2048]}], -"levels/vcutm/2.rgba16.png": [32,64,4096,{"jp":[4564288,6144],"us":[4572672,6144],"eu":[4446272,6144],"sh":[4420640,6144]}], +"actors_vanilla/vcutm/2.rgba16.png": [32,64,4096,{"jp":[4564288,6144],"us":[4572672,6144],"eu":[4446272,6144],"sh":[4420640,6144]}], "levels/vcutm/3.rgba16.png": [32,32,2048,{"jp":[4564288,10240],"us":[4572672,10240],"eu":[4446272,10240],"sh":[4420640,10240]}], "levels/wdw/0.rgba16.png": [32,32,2048,{"jp":[4246992,0],"us":[4255088,0],"eu":[4128688,0],"sh":[4103056,0]}], "levels/wdw/1.rgba16.png": [32,32,2048,{"jp":[4246992,2048],"us":[4255088,2048],"eu":[4128688,2048],"sh":[4103056,2048]}], -"levels/wdw/2.rgba16.png": [32,32,2048,{"jp":[4246992,4096],"us":[4255088,4096],"eu":[4128688,4096],"sh":[4103056,4096]}], -"levels/wdw/3.rgba16.png": [32,32,2048,{"jp":[4246992,6144],"us":[4255088,6144],"eu":[4128688,6144],"sh":[4103056,6144]}], +"actors_vanilla/wdw/1.rgba16.png": [32,32,2048,{"jp":[4246992,2048],"us":[4255088,2048],"eu":[4128688,2048],"sh":[4103056,2048]}], +"actors_vanilla/wdw/2.rgba16.png": [32,32,2048,{"jp":[4246992,4096],"us":[4255088,4096],"eu":[4128688,4096],"sh":[4103056,4096]}], +"actors_vanilla/wdw/3.rgba16.png": [32,32,2048,{"jp":[4246992,6144],"us":[4255088,6144],"eu":[4128688,6144],"sh":[4103056,6144]}], "levels/wdw/4.rgba16.png": [32,32,2048,{"jp":[4246992,8192],"us":[4255088,8192],"eu":[4128688,8192],"sh":[4103056,8192]}], +"actors_vanilla/wf/0.rgba16.png": [32,32,2048,{"jp":[4800560,0],"us":[4808848,0],"eu":[4682448,0],"sh":[4656816,0]}], "levels/wf/0.rgba16.png": [32,32,2048,{"jp":[4800560,0],"us":[4808848,0],"eu":[4682448,0],"sh":[4656816,0]}], "levels/wf/1.rgba16.png": [32,32,2048,{"jp":[4800560,2048],"us":[4808848,2048],"eu":[4682448,2048],"sh":[4656816,2048]}], +"actors_vanilla/wf/2.rgba16.png": [32,32,2048,{"jp":[4800560,4096],"us":[4808848,4096],"eu":[4682448,4096],"sh":[4656816,4096]}], "levels/wf/2.rgba16.png": [32,32,2048,{"jp":[4800560,4096],"us":[4808848,4096],"eu":[4682448,4096],"sh":[4656816,4096]}], -"levels/wf/3.rgba16.png": [32,32,2048,{"jp":[4800560,6144],"us":[4808848,6144],"eu":[4682448,6144],"sh":[4656816,6144]}], -"levels/wf/4.rgba16.png": [32,32,2048,{"jp":[4800560,8192],"us":[4808848,8192],"eu":[4682448,8192],"sh":[4656816,8192]}], -"levels/wf/5.ia8.png": [16,16,256,{"jp":[1078992,62296],"us":[1083968,74168],"eu":[909712,30840],"sh":[934640,62296]}], +"actors_vanilla/wf/3.rgba16.png": [32,32,2048,{"jp":[4800560,6144],"us":[4808848,6144],"eu":[4682448,6144],"sh":[4656816,6144]}], +"actors_vanilla/wf/4.rgba16.png": [32,32,2048,{"jp":[4800560,8192],"us":[4808848,8192],"eu":[4682448,8192],"sh":[4656816,8192]}], +"actors_vanilla/wf/5.ia8.png": [16,16,256,{"jp":[1078992,62296],"us":[1083968,74168],"eu":[909712,30840],"sh":[934640,62296]}], "levels/wmotr/0.rgba16.png": [32,32,2048,{"jp":[4989632,0],"us":[4997920,0],"eu":[4876848,0],"sh":[4845888,0]}], "levels/wmotr/1.rgba16.png": [32,16,1024,{"jp":[4989632,2048],"us":[4997920,2048],"eu":[4876848,2048],"sh":[4845888,2048]}], "levels/wmotr/2.rgba16.png": [32,32,2048,{"jp":[4989632,3072],"us":[4997920,3072],"eu":[4876848,3072],"sh":[4845888,3072]}], diff --git a/data/behavior_data.c b/data/behavior_data.c index a0d4303e8c..2aa6661286 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -13,6 +13,24 @@ #include "menu/file_select.h" #include "engine/surface_load.h" +#include "actors_vanilla/bob/header.h" +#include "actors_vanilla/jrb/header.h" +#include "actors_vanilla/wf/header.h" +#include "actors_vanilla/bbh/header.h" +#include "actors_vanilla/hmc/header.h" +#include "actors_vanilla/lll/header.h" +#include "actors_vanilla/ssl/header.h" +#include "actors_vanilla/ddd/header.h" +#include "actors_vanilla/sl/header.h" +#include "actors_vanilla/wdw/header.h" +#include "actors_vanilla/ttm/header.h" +#include "actors_vanilla/thi/header.h" +#include "actors_vanilla/ttc/header.h" +#include "actors_vanilla/rr/header.h" +#include "actors_vanilla/bitdw/header.h" +#include "actors_vanilla/bitfs/header.h" +#include "actors_vanilla/castle_inside/header.h" +#include "actors_vanilla/castle_grounds/header.h" #include "actors/common0.h" #include "actors/common1.h" #include "actors/group0.h" @@ -33,26 +51,8 @@ #include "actors/group15.h" #include "actors/group16.h" #include "actors/group17.h" -#include "levels/bbh/header.h" -#include "levels/castle_inside/header.h" -#include "levels/hmc/header.h" -#include "levels/ssl/header.h" -#include "levels/bob/header.h" -#include "levels/sl/header.h" -#include "levels/wdw/header.h" -#include "levels/jrb/header.h" -#include "levels/thi/header.h" -#include "levels/ttc/header.h" -#include "levels/rr/header.h" -#include "levels/castle_grounds/header.h" -#include "levels/bitdw/header.h" -#include "levels/lll/header.h" -#include "levels/sa/header.h" -#include "levels/bitfs/header.h" -#include "levels/ddd/header.h" -#include "levels/wf/header.h" #include "levels/bowser_2/header.h" -#include "levels/ttm/header.h" +#include "levels/bowser_3/header.h" #include "make_const_nonconst.h" #include "behavior_data.h" diff --git a/include/config/config_debug.h b/include/config/config_debug.h index 7ed67cac93..d9054c8fdd 100644 --- a/include/config/config_debug.h +++ b/include/config/config_debug.h @@ -30,7 +30,7 @@ * This allows you to quickly test the level you're working on. * If you want the game to boot normally, just comment out the define again. */ -// #define TEST_LEVEL LEVEL_BOB +// #define TEST_LEVEL LEVEL_WMOTR /** * Enables debug level select. Hold L while the game boots to turn it on. diff --git a/include/level_commands.h b/include/level_commands.h index 91243f5baa..24f5566420 100644 --- a/include/level_commands.h +++ b/include/level_commands.h @@ -480,6 +480,11 @@ enum GoddardScene { #define LOAD_TEXTURE_BIN(textureBin) \ LOAD_YAY0_TEXTURE(/*seg*/ SEGMENT_TEXTURE, /*romStart*/ _##textureBin##_yay0SegmentRomStart, /*romEnd*/ _##textureBin##_yay0SegmentRomEnd) +#define LOAD_VANILLA_OBJECTS(objectBin, textureBin) \ + LOAD_YAY0_TEXTURE(/*seg*/ SEGMENT_TEXTURE, _##textureBin##_yay0SegmentRomStart, _##textureBin##_yay0SegmentRomEnd), \ + LOAD_YAY0( /*seg*/ SEGMENT_VANILLA_OBJECTS, _vo_##objectBin##_yay0SegmentRomStart, _vo_##objectBin##_yay0SegmentRomEnd), \ + LOAD_RAW( /*seg*/ SEGMENT_VANILLA_GEO, _vo_##objectBin##_geoSegmentRomStart, _vo_##objectBin##_geoSegmentRomEnd) + #define LOAD_SKYBOX(skybox) \ LOAD_YAY0(/*seg*/ SEGMENT_SKYBOX, /*romStart*/ _##skybox##_skybox_yay0SegmentRomStart, /*romEnd*/ _##skybox##_skybox_yay0SegmentRomEnd) diff --git a/include/segment_symbols.h b/include/segment_symbols.h index beebd1f445..074dc20e61 100644 --- a/include/segment_symbols.h +++ b/include/segment_symbols.h @@ -16,6 +16,12 @@ DECLARE_SEGMENT(name##_geo) \ DECLARE_NOLOAD(name##_geo) +#define DECLARE_VANILLA_ACTOR_SEGMENT(name) \ + DECLARE_SEGMENT(vo_##name##_mio0) \ + DECLARE_SEGMENT(vo_##name##_yay0) \ + DECLARE_SEGMENT(vo_##name##_geo) \ + DECLARE_NOLOAD(vo_##name##_geo) + #define DECLARE_LEVEL_SEGMENT(name) \ DECLARE_SEGMENT(name) \ DECLARE_NOLOAD(name) \ @@ -42,6 +48,28 @@ DECLARE_ACTOR_SEGMENT(group15) DECLARE_ACTOR_SEGMENT(group16) DECLARE_ACTOR_SEGMENT(group17) +DECLARE_VANILLA_ACTOR_SEGMENT(bob) +DECLARE_VANILLA_ACTOR_SEGMENT(wf) +DECLARE_VANILLA_ACTOR_SEGMENT(jrb) +DECLARE_VANILLA_ACTOR_SEGMENT(ccm) +DECLARE_VANILLA_ACTOR_SEGMENT(bbh) +DECLARE_VANILLA_ACTOR_SEGMENT(hmc) +DECLARE_VANILLA_ACTOR_SEGMENT(lll) +DECLARE_VANILLA_ACTOR_SEGMENT(ssl) +DECLARE_VANILLA_ACTOR_SEGMENT(ddd) +DECLARE_VANILLA_ACTOR_SEGMENT(sl) +DECLARE_VANILLA_ACTOR_SEGMENT(wdw) +DECLARE_VANILLA_ACTOR_SEGMENT(ttm) +DECLARE_VANILLA_ACTOR_SEGMENT(thi) +DECLARE_VANILLA_ACTOR_SEGMENT(ttc) +DECLARE_VANILLA_ACTOR_SEGMENT(rr) +DECLARE_VANILLA_ACTOR_SEGMENT(bitdw) +DECLARE_VANILLA_ACTOR_SEGMENT(bitfs) +DECLARE_VANILLA_ACTOR_SEGMENT(bits) +DECLARE_VANILLA_ACTOR_SEGMENT(vcutm) +DECLARE_VANILLA_ACTOR_SEGMENT(castle_inside) +DECLARE_VANILLA_ACTOR_SEGMENT(castle_grounds) + DECLARE_SEGMENT(entry) DECLARE_SEGMENT(engine) DECLARE_SEGMENT(behavior) diff --git a/levels/bbh/areas/script_vanilla.inc.c b/levels/bbh/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..9394d33349 --- /dev/null +++ b/levels/bbh/areas/script_vanilla.inc.c @@ -0,0 +1,5 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_10), +JUMP_LINK(script_func_global_18), +JUMP_LINK(script_func_vo_bbh), +LOAD_MODEL_FROM_GEO(MODEL_BBH_HAUNTED_DOOR, haunted_door_geo), diff --git a/levels/bbh/areas/script_vanilla_load.inc.c b/levels/bbh/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..69a64d7c21 --- /dev/null +++ b/levels/bbh/areas/script_vanilla_load.inc.c @@ -0,0 +1,9 @@ +LOAD_YAY0( /*seg*/ 0x07, _bbh_segment_7SegmentRomStart, _bbh_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _bbh_skybox_yay0SegmentRomStart, _bbh_skybox_yay0SegmentRomEnd), +LOAD_VANILLA_OBJECTS(bbh, spooky), +LOAD_YAY0( /*seg*/ 0x05, _group9_yay0SegmentRomStart, _group9_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group9_geoSegmentRomStart, _group9_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/bbh/geo.c b/levels/bbh/geo.c index 12712e116d..7fdbec841c 100644 --- a/levels/bbh/geo.c +++ b/levels/bbh/geo.c @@ -13,12 +13,4 @@ #include "levels/bbh/header.h" -#include "levels/bbh/staircase_step/geo.inc.c" -#include "levels/bbh/tilting_trap_platform/geo.inc.c" -#include "levels/bbh/tumbling_platform_far/geo.inc.c" -#include "levels/bbh/tumbling_platform_near/geo.inc.c" -#include "levels/bbh/moving_bookshelf/geo.inc.c" -#include "levels/bbh/mesh_elevator/geo.inc.c" -#include "levels/bbh/merry_go_round/geo.inc.c" -#include "levels/bbh/coffin/geo.inc.c" -#include "levels/bbh/areas/1/geo.inc.c" +#include "levels/bbh/geo.inc.c" diff --git a/levels/bbh/geo.inc.c b/levels/bbh/geo.inc.c new file mode 100644 index 0000000000..145e8f6cf1 --- /dev/null +++ b/levels/bbh/geo.inc.c @@ -0,0 +1 @@ +#include "levels/bbh/areas/1/geo.inc.c" diff --git a/levels/bbh/header.h b/levels/bbh/header.h index 09206284a2..3985b6e070 100644 --- a/levels/bbh/header.h +++ b/levels/bbh/header.h @@ -2,112 +2,10 @@ #define BBH_HEADER_H #include "types.h" -#include "game/moving_texture.h" - -// geo -extern const GeoLayout geo_bbh_0005B0[]; -extern const GeoLayout geo_bbh_0005C8[]; -extern const GeoLayout geo_bbh_0005E0[]; -extern const GeoLayout geo_bbh_0005F8[]; -extern const GeoLayout geo_bbh_000610[]; -extern const GeoLayout geo_bbh_000628[]; -extern const GeoLayout geo_bbh_000640[]; -extern const GeoLayout geo_bbh_000658[]; -extern const GeoLayout geo_bbh_000670[]; -extern const GeoLayout geo_bbh_0006B0[]; -extern const GeoLayout geo_bbh_0006E8[]; -extern const GeoLayout geo_bbh_000730[]; -extern const GeoLayout geo_bbh_000750[]; -extern const GeoLayout geo_bbh_000768[]; -extern const GeoLayout geo_bbh_0007B0[]; -extern const GeoLayout geo_bbh_0007D0[]; -extern const GeoLayout geo_bbh_000800[]; -extern const GeoLayout geo_bbh_000828[]; -extern const GeoLayout geo_bbh_000860[]; -extern const GeoLayout geo_bbh_000888[]; -extern const GeoLayout geo_bbh_0008B0[]; -extern const GeoLayout geo_bbh_0008E8[]; -extern const GeoLayout geo_bbh_000950[]; -extern const GeoLayout geo_bbh_0009C8[]; -extern const GeoLayout geo_bbh_000A18[]; -extern const GeoLayout geo_bbh_000A60[]; -extern const GeoLayout geo_bbh_000AD8[]; -extern const GeoLayout geo_bbh_000B28[]; -extern const GeoLayout geo_bbh_000B88[]; -extern const GeoLayout geo_bbh_000BF0[]; -extern const GeoLayout geo_bbh_000C38[]; -extern const GeoLayout geo_bbh_000C88[]; -extern const GeoLayout geo_bbh_000CE8[]; -extern const GeoLayout geo_bbh_000D20[]; -extern const GeoLayout geo_bbh_000D68[]; -extern const GeoLayout geo_bbh_000DB0[]; -extern const GeoLayout geo_bbh_000DF0[]; -extern const GeoLayout geo_bbh_000E40[]; -extern const GeoLayout geo_bbh_000E80[]; -extern const GeoLayout geo_bbh_000EB0[]; -extern const GeoLayout geo_bbh_000F00[]; - -// leveldata -extern const Gfx bbh_seg7_dl_070075A8[]; -extern const Gfx bbh_seg7_dl_07007940[]; -extern const Gfx bbh_seg7_dl_07007B90[]; -extern const Gfx bbh_seg7_dl_07007FD0[]; -extern const Gfx bbh_seg7_dl_07008B58[]; -extern const Gfx bbh_seg7_dl_07008EA8[]; -extern const Gfx bbh_seg7_dl_0700AFF0[]; -extern const Gfx bbh_seg7_dl_0700B1C8[]; -extern const Gfx bbh_seg7_dl_0700B418[]; -extern const Gfx bbh_seg7_dl_0700B9E0[]; -extern const Gfx bbh_seg7_dl_0700BBF8[]; -extern const Gfx bbh_seg7_dl_0700D080[]; -extern const Gfx bbh_seg7_dl_0700D2E0[]; -extern const Gfx bbh_seg7_dl_0700D490[]; -extern const Gfx bbh_seg7_dl_0700D7E0[]; -extern const Gfx bbh_seg7_dl_0700F510[]; -extern const Gfx bbh_seg7_dl_0700F848[]; -extern const Gfx bbh_seg7_dl_07011120[]; -extern const Gfx bbh_seg7_dl_07012220[]; -extern const Gfx bbh_seg7_dl_07012510[]; -extern const Gfx bbh_seg7_dl_070126E8[]; -extern const Gfx bbh_seg7_dl_070139A8[]; -extern const Gfx bbh_seg7_dl_07013BE8[]; -extern const Gfx bbh_seg7_dl_07014FD8[]; -extern const Gfx bbh_seg7_dl_07015398[]; -extern const Gfx bbh_seg7_dl_070156E0[]; -extern const Gfx bbh_seg7_dl_07015A20[]; -extern const Gfx bbh_seg7_dl_07017378[]; -extern const Gfx bbh_seg7_dl_07017570[]; -extern const Gfx bbh_seg7_dl_07017788[]; -extern const Gfx bbh_seg7_dl_07019EF8[]; -extern const Gfx bbh_seg7_dl_0701A080[]; -extern const Gfx bbh_seg7_dl_0701A850[]; -extern const Gfx bbh_seg7_dl_0701B6D0[]; -extern const Gfx bbh_seg7_dl_0701E4E0[]; -extern const Gfx bbh_seg7_dl_0701E8D8[]; -extern const Gfx bbh_seg7_dl_0701ED18[]; -extern const Gfx bbh_seg7_dl_0701EEC8[]; -extern const Gfx bbh_seg7_dl_0701F070[]; -extern const Gfx bbh_seg7_dl_0701F2E8[]; -extern const Gfx bbh_seg7_dl_0701F5F8[]; -extern const Gfx bbh_seg7_dl_0701F7E8[]; -extern const Gfx bbh_seg7_dl_0701FAB0[]; -extern const Gfx bbh_seg7_dl_0701FD28[]; -extern const Gfx bbh_seg7_dl_0701FFE8[]; -extern const Gfx bbh_seg7_dl_070202F0[]; -extern const Gfx bbh_seg7_dl_070206F0[]; -extern const Collision bbh_seg7_collision_level[]; -extern const RoomData bbh_seg7_rooms[]; -extern const Collision bbh_seg7_collision_staircase_step[]; -extern const Collision bbh_seg7_collision_tilt_floor_platform[]; -extern const Collision bbh_seg7_collision_07026B1C[]; -extern const Collision bbh_seg7_collision_haunted_bookshelf[]; -extern const Collision bbh_seg7_collision_mesh_elevator[]; -extern const Collision bbh_seg7_collision_merry_go_round[]; -extern const Collision bbh_seg7_collision_coffin[]; -extern const struct MovtexQuadCollection bbh_movtex_merry_go_round_water_entrance[]; -extern const struct MovtexQuadCollection bbh_movtex_merry_go_round_water_side[]; // script extern const LevelScript level_bbh_entry[]; +#include "levels/bbh/header.inc.h" + #endif diff --git a/levels/bbh/header.inc.h b/levels/bbh/header.inc.h new file mode 100644 index 0000000000..c5d019d41e --- /dev/null +++ b/levels/bbh/header.inc.h @@ -0,0 +1,82 @@ +#include "game/moving_texture.h" + +// geo +extern const GeoLayout geo_bbh_000670[]; +extern const GeoLayout geo_bbh_0006B0[]; +extern const GeoLayout geo_bbh_0006E8[]; +extern const GeoLayout geo_bbh_000730[]; +extern const GeoLayout geo_bbh_000750[]; +extern const GeoLayout geo_bbh_000768[]; +extern const GeoLayout geo_bbh_0007B0[]; +extern const GeoLayout geo_bbh_0007D0[]; +extern const GeoLayout geo_bbh_000800[]; +extern const GeoLayout geo_bbh_000828[]; +extern const GeoLayout geo_bbh_000860[]; +extern const GeoLayout geo_bbh_000888[]; +extern const GeoLayout geo_bbh_0008B0[]; +extern const GeoLayout geo_bbh_0008E8[]; +extern const GeoLayout geo_bbh_000950[]; +extern const GeoLayout geo_bbh_0009C8[]; +extern const GeoLayout geo_bbh_000A18[]; +extern const GeoLayout geo_bbh_000A60[]; +extern const GeoLayout geo_bbh_000AD8[]; +extern const GeoLayout geo_bbh_000B28[]; +extern const GeoLayout geo_bbh_000B88[]; +extern const GeoLayout geo_bbh_000BF0[]; +extern const GeoLayout geo_bbh_000C38[]; +extern const GeoLayout geo_bbh_000C88[]; +extern const GeoLayout geo_bbh_000CE8[]; +extern const GeoLayout geo_bbh_000D20[]; +extern const GeoLayout geo_bbh_000D68[]; +extern const GeoLayout geo_bbh_000DB0[]; +extern const GeoLayout geo_bbh_000DF0[]; +extern const GeoLayout geo_bbh_000E40[]; +extern const GeoLayout geo_bbh_000E80[]; +extern const GeoLayout geo_bbh_000EB0[]; +extern const GeoLayout geo_bbh_000F00[]; + +// leveldata +extern const Gfx bbh_seg7_dl_070075A8[]; +extern const Gfx bbh_seg7_dl_07007940[]; +extern const Gfx bbh_seg7_dl_07007B90[]; +extern const Gfx bbh_seg7_dl_07007FD0[]; +extern const Gfx bbh_seg7_dl_07008B58[]; +extern const Gfx bbh_seg7_dl_07008EA8[]; +extern const Gfx bbh_seg7_dl_0700AFF0[]; +extern const Gfx bbh_seg7_dl_0700B1C8[]; +extern const Gfx bbh_seg7_dl_0700B418[]; +extern const Gfx bbh_seg7_dl_0700B9E0[]; +extern const Gfx bbh_seg7_dl_0700BBF8[]; +extern const Gfx bbh_seg7_dl_0700D080[]; +extern const Gfx bbh_seg7_dl_0700D2E0[]; +extern const Gfx bbh_seg7_dl_0700D490[]; +extern const Gfx bbh_seg7_dl_0700D7E0[]; +extern const Gfx bbh_seg7_dl_0700F510[]; +extern const Gfx bbh_seg7_dl_0700F848[]; +extern const Gfx bbh_seg7_dl_07011120[]; +extern const Gfx bbh_seg7_dl_07012220[]; +extern const Gfx bbh_seg7_dl_07012510[]; +extern const Gfx bbh_seg7_dl_070126E8[]; +extern const Gfx bbh_seg7_dl_070139A8[]; +extern const Gfx bbh_seg7_dl_07013BE8[]; +extern const Gfx bbh_seg7_dl_07014FD8[]; +extern const Gfx bbh_seg7_dl_07015398[]; +extern const Gfx bbh_seg7_dl_070156E0[]; +extern const Gfx bbh_seg7_dl_07015A20[]; +extern const Gfx bbh_seg7_dl_07017378[]; +extern const Gfx bbh_seg7_dl_07017570[]; +extern const Gfx bbh_seg7_dl_07017788[]; +extern const Gfx bbh_seg7_dl_07019EF8[]; +extern const Gfx bbh_seg7_dl_0701A080[]; +extern const Gfx bbh_seg7_dl_0701A850[]; +extern const Gfx bbh_seg7_dl_0701B6D0[]; +extern const Gfx bbh_seg7_dl_0701E4E0[]; +extern const Gfx bbh_seg7_dl_0701E8D8[]; +extern const Gfx bbh_seg7_dl_0701ED18[]; +extern const Gfx bbh_seg7_dl_0701EEC8[]; +extern const Gfx bbh_seg7_dl_0701F070[]; +extern const Collision bbh_seg7_collision_level[]; +extern const RoomData bbh_seg7_rooms[]; +extern const MacroObject bbh_seg7_macro_objs[]; +extern const struct MovtexQuadCollection bbh_movtex_merry_go_round_water_entrance[]; +extern const struct MovtexQuadCollection bbh_movtex_merry_go_round_water_side[]; diff --git a/levels/bbh/leveldata.c b/levels/bbh/leveldata.c index 22702aa6a5..fe43d24795 100644 --- a/levels/bbh/leveldata.c +++ b/levels/bbh/leveldata.c @@ -5,61 +5,9 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/bbh/texture.inc.c" -#include "levels/bbh/areas/1/1/model.inc.c" -#include "levels/bbh/areas/1/2/model.inc.c" -#include "levels/bbh/areas/1/3/model.inc.c" -#include "levels/bbh/areas/1/4/model.inc.c" -#include "levels/bbh/areas/1/5/model.inc.c" -#include "levels/bbh/areas/1/6/model.inc.c" -#include "levels/bbh/areas/1/7/model.inc.c" -#include "levels/bbh/areas/1/8/model.inc.c" -#include "levels/bbh/areas/1/9/model.inc.c" -#include "levels/bbh/areas/1/10/model.inc.c" -#include "levels/bbh/areas/1/11/model.inc.c" -#include "levels/bbh/areas/1/12/model.inc.c" -#include "levels/bbh/areas/1/13/model.inc.c" -#include "levels/bbh/areas/1/14/model.inc.c" -#include "levels/bbh/areas/1/15/model.inc.c" -#include "levels/bbh/areas/1/16/model.inc.c" -#include "levels/bbh/areas/1/17/model.inc.c" -#include "levels/bbh/areas/1/18/model.inc.c" -#include "levels/bbh/areas/1/19/model.inc.c" -#include "levels/bbh/areas/1/20/model.inc.c" -#include "levels/bbh/areas/1/21/model.inc.c" -#include "levels/bbh/areas/1/22/model.inc.c" -#include "levels/bbh/areas/1/23/model.inc.c" -#include "levels/bbh/areas/1/24/model.inc.c" -#include "levels/bbh/areas/1/25/model.inc.c" -#include "levels/bbh/areas/1/26/model.inc.c" -#include "levels/bbh/areas/1/27/model.inc.c" -#include "levels/bbh/areas/1/28/model.inc.c" -#include "levels/bbh/areas/1/29/model.inc.c" -#include "levels/bbh/areas/1/30/model.inc.c" -#include "levels/bbh/areas/1/31/model.inc.c" -#include "levels/bbh/areas/1/32/model.inc.c" -#include "levels/bbh/areas/1/33/model.inc.c" -#include "levels/bbh/areas/1/34/model.inc.c" -#include "levels/bbh/areas/1/35/model.inc.c" -#include "levels/bbh/areas/1/36/model.inc.c" -#include "levels/bbh/areas/1/37/model.inc.c" -#include "levels/bbh/areas/1/38/model.inc.c" -#include "levels/bbh/areas/1/39/model.inc.c" -#include "levels/bbh/staircase_step/model.inc.c" -#include "levels/bbh/tilting_trap_platform/model.inc.c" -#include "levels/bbh/tumbling_platform_far/model.inc.c" -#include "levels/bbh/tumbling_platform_near/model.inc.c" -#include "levels/bbh/moving_bookshelf/model.inc.c" -#include "levels/bbh/mesh_elevator/model.inc.c" -#include "levels/bbh/merry_go_round/model.inc.c" -#include "levels/bbh/coffin/model.inc.c" -#include "levels/bbh/areas/1/collision.inc.c" -#include "levels/bbh/areas/1/room.inc.c" -#include "levels/bbh/staircase_step/collision.inc.c" -#include "levels/bbh/tilting_trap_platform/collision.inc.c" -#include "levels/bbh/tumbling_platform_near/collision.inc.c" -#include "levels/bbh/moving_bookshelf/collision.inc.c" -#include "levels/bbh/mesh_elevator/collision.inc.c" -#include "levels/bbh/merry_go_round/collision.inc.c" -#include "levels/bbh/coffin/collision.inc.c" + +// Unfortunately this garbage is referenced from get_quad_collection_from_id +// Ideally scrolls should be recoded to be fast64 like #include "levels/bbh/areas/1/movtext.inc.c" + +#include "levels/bbh/leveldata.inc.c" diff --git a/levels/bbh/leveldata.inc.c b/levels/bbh/leveldata.inc.c new file mode 100644 index 0000000000..4d2c37e451 --- /dev/null +++ b/levels/bbh/leveldata.inc.c @@ -0,0 +1,42 @@ +#include "levels/bbh/texture.inc.c" +#include "levels/bbh/areas/1/1/model.inc.c" +#include "levels/bbh/areas/1/2/model.inc.c" +#include "levels/bbh/areas/1/3/model.inc.c" +#include "levels/bbh/areas/1/4/model.inc.c" +#include "levels/bbh/areas/1/5/model.inc.c" +#include "levels/bbh/areas/1/6/model.inc.c" +#include "levels/bbh/areas/1/7/model.inc.c" +#include "levels/bbh/areas/1/8/model.inc.c" +#include "levels/bbh/areas/1/9/model.inc.c" +#include "levels/bbh/areas/1/10/model.inc.c" +#include "levels/bbh/areas/1/11/model.inc.c" +#include "levels/bbh/areas/1/12/model.inc.c" +#include "levels/bbh/areas/1/13/model.inc.c" +#include "levels/bbh/areas/1/14/model.inc.c" +#include "levels/bbh/areas/1/15/model.inc.c" +#include "levels/bbh/areas/1/16/model.inc.c" +#include "levels/bbh/areas/1/17/model.inc.c" +#include "levels/bbh/areas/1/18/model.inc.c" +#include "levels/bbh/areas/1/19/model.inc.c" +#include "levels/bbh/areas/1/20/model.inc.c" +#include "levels/bbh/areas/1/21/model.inc.c" +#include "levels/bbh/areas/1/22/model.inc.c" +#include "levels/bbh/areas/1/23/model.inc.c" +#include "levels/bbh/areas/1/24/model.inc.c" +#include "levels/bbh/areas/1/25/model.inc.c" +#include "levels/bbh/areas/1/26/model.inc.c" +#include "levels/bbh/areas/1/27/model.inc.c" +#include "levels/bbh/areas/1/28/model.inc.c" +#include "levels/bbh/areas/1/29/model.inc.c" +#include "levels/bbh/areas/1/30/model.inc.c" +#include "levels/bbh/areas/1/31/model.inc.c" +#include "levels/bbh/areas/1/32/model.inc.c" +#include "levels/bbh/areas/1/33/model.inc.c" +#include "levels/bbh/areas/1/34/model.inc.c" +#include "levels/bbh/areas/1/35/model.inc.c" +#include "levels/bbh/areas/1/36/model.inc.c" +#include "levels/bbh/areas/1/37/model.inc.c" +#include "levels/bbh/areas/1/38/model.inc.c" +#include "levels/bbh/areas/1/39/model.inc.c" +#include "levels/bbh/areas/1/collision.inc.c" +#include "levels/bbh/areas/1/room.inc.c" diff --git a/levels/bbh/script.c b/levels/bbh/script.c index 71c4632156..ae9dee769c 100644 --- a/levels/bbh/script.c +++ b/levels/bbh/script.c @@ -143,29 +143,10 @@ static const LevelScript script_bbh_objects_4[] = { const LevelScript level_bbh_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _bbh_segment_7SegmentRomStart, _bbh_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _bbh_skybox_yay0SegmentRomStart, _bbh_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _spooky_yay0SegmentRomStart, _spooky_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group9_yay0SegmentRomStart, _group9_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group9_geoSegmentRomStart, _group9_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/bbh/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_10), - JUMP_LINK(script_func_global_18), - LOAD_MODEL_FROM_GEO(MODEL_BBH_HAUNTED_DOOR, haunted_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_BBH_STAIRCASE_STEP, geo_bbh_0005B0), - LOAD_MODEL_FROM_GEO(MODEL_BBH_TILTING_FLOOR_PLATFORM, geo_bbh_0005C8), - LOAD_MODEL_FROM_GEO(MODEL_BBH_TUMBLING_PLATFORM, geo_bbh_0005E0), - LOAD_MODEL_FROM_GEO(MODEL_BBH_TUMBLING_PLATFORM_PART, geo_bbh_0005F8), - LOAD_MODEL_FROM_GEO(MODEL_BBH_MOVING_BOOKSHELF, geo_bbh_000610), - LOAD_MODEL_FROM_GEO(MODEL_BBH_MESH_ELEVATOR, geo_bbh_000628), - LOAD_MODEL_FROM_GEO(MODEL_BBH_MERRY_GO_ROUND, geo_bbh_000640), - LOAD_MODEL_FROM_GEO(MODEL_BBH_WOODEN_TOMB, geo_bbh_000658), +#include "levels/bbh/areas/script_vanilla.inc.c" AREA(/*index*/ 1, geo_bbh_000F00), JUMP_LINK(script_bbh_objects_1), diff --git a/levels/bbh/texture.inc.c b/levels/bbh/texture.inc.c index 00380afe03..79ab77fbc9 100644 --- a/levels/bbh/texture.inc.c +++ b/levels/bbh/texture.inc.c @@ -17,18 +17,3 @@ ALIGNED8 static const Texture bbh_seg7_texture_07001800[] = { ALIGNED8 static const Texture bbh_seg7_texture_07002000[] = { #include "levels/bbh/3.rgba16.inc.c" }; - -// 0x07003000 - 0x07003400 -ALIGNED8 static const Texture bbh_seg7_texture_07003000[] = { -#include "levels/bbh/4.rgba16.inc.c" -}; - -// 0x07003400 - 0x07004400 -ALIGNED8 static const Texture bbh_seg7_texture_07003400[] = { -#include "levels/bbh/5.rgba16.inc.c" -}; - -// 0x07004400 - 0x07004800 -ALIGNED8 static const Texture bbh_seg7_texture_07004400[] = { -#include "levels/bbh/6.rgba16.inc.c" -}; diff --git a/levels/bitdw/areas/script_vanilla.inc.c b/levels/bitdw/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..c93a547420 --- /dev/null +++ b/levels/bitdw/areas/script_vanilla.inc.c @@ -0,0 +1,20 @@ +JUMP_LINK(script_func_global_12), +JUMP_LINK(script_func_global_18), +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_vo_bitdw), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, geo_bitdw_0003C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, geo_bitdw_0003D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, geo_bitdw_0003F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, geo_bitdw_000408), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, geo_bitdw_000420), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, geo_bitdw_000438), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, geo_bitdw_000450), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, geo_bitdw_000468), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, geo_bitdw_000480), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, geo_bitdw_000498), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, geo_bitdw_0004B0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, geo_bitdw_000510), +LOAD_MODEL_FROM_GEO(MODEL_BITDW_WARP_PIPE, warp_pipe_geo), \ No newline at end of file diff --git a/levels/bitdw/areas/script_vanilla_load.inc.c b/levels/bitdw/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..75799af3e2 --- /dev/null +++ b/levels/bitdw/areas/script_vanilla_load.inc.c @@ -0,0 +1,9 @@ +LOAD_YAY0( /*seg*/ 0x07, _bitdw_segment_7SegmentRomStart, _bitdw_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _bidw_skybox_yay0SegmentRomStart, _bidw_skybox_yay0SegmentRomEnd), +LOAD_VANILLA_OBJECTS(bitdw, sky), +LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), \ No newline at end of file diff --git a/levels/bitdw/geo.c b/levels/bitdw/geo.c index 2b1a17073c..6a09229973 100644 --- a/levels/bitdw/geo.c +++ b/levels/bitdw/geo.c @@ -13,29 +13,4 @@ #include "levels/bitdw/header.h" -#include "levels/bitdw/areas/1/starting_platform/geo.inc.c" -#include "levels/bitdw/areas/1/large_platform/geo.inc.c" -#include "levels/bitdw/areas/1/wooden_bridge_and_fences/geo.inc.c" -#include "levels/bitdw/areas/1/quartzy_path_1/geo.inc.c" -#include "levels/bitdw/areas/1/quartzy_path_2/geo.inc.c" -#include "levels/bitdw/areas/1/quartzy_path_fences/geo.inc.c" -#include "levels/bitdw/areas/1/octogonal_platform/geo.inc.c" -#include "levels/bitdw/areas/1/platform_with_hill/geo.inc.c" -#include "levels/bitdw/areas/1/wooden_platform/geo.inc.c" -#include "levels/bitdw/areas/1/platforms_and_tilting/geo.inc.c" -#include "levels/bitdw/areas/1/platforms_and_tilting_2/geo.inc.c" -#include "levels/bitdw/areas/1/quartz_crystal/geo.inc.c" -#include "levels/bitdw/areas/1/staircase_slope_and_platform/geo.inc.c" -#include "levels/bitdw/areas/1/track_for_pyramid_platforms/geo.inc.c" -#include "levels/bitdw/areas/1/narrow_path_platform/geo.inc.c" -#include "levels/bitdw/sliding_platform/geo.inc.c" -#include "levels/bitdw/seesaw_platform/geo.inc.c" -#include "levels/bitdw/square_platform/geo.inc.c" -#include "levels/bitdw/ferris_wheel_axle/geo.inc.c" -#include "levels/bitdw/ferris_platform/geo.inc.c" -#include "levels/bitdw/collapsing_stairs_1/geo.inc.c" -#include "levels/bitdw/collapsing_stairs_2/geo.inc.c" -#include "levels/bitdw/collapsing_stairs_3/geo.inc.c" -#include "levels/bitdw/collapsing_stairs_4/geo.inc.c" -#include "levels/bitdw/collapsing_stairs_5/geo.inc.c" -#include "levels/bitdw/areas/1/geo.inc.c" +#include "levels/bitdw/geo.inc.c" diff --git a/levels/bitdw/geo.inc.c b/levels/bitdw/geo.inc.c new file mode 100644 index 0000000000..9ccb351a2f --- /dev/null +++ b/levels/bitdw/geo.inc.c @@ -0,0 +1,16 @@ +#include "levels/bitdw/areas/1/starting_platform/geo.inc.c" +#include "levels/bitdw/areas/1/large_platform/geo.inc.c" +#include "levels/bitdw/areas/1/wooden_bridge_and_fences/geo.inc.c" +#include "levels/bitdw/areas/1/quartzy_path_1/geo.inc.c" +#include "levels/bitdw/areas/1/quartzy_path_2/geo.inc.c" +#include "levels/bitdw/areas/1/quartzy_path_fences/geo.inc.c" +#include "levels/bitdw/areas/1/octogonal_platform/geo.inc.c" +#include "levels/bitdw/areas/1/platform_with_hill/geo.inc.c" +#include "levels/bitdw/areas/1/wooden_platform/geo.inc.c" +#include "levels/bitdw/areas/1/platforms_and_tilting/geo.inc.c" +#include "levels/bitdw/areas/1/platforms_and_tilting_2/geo.inc.c" +#include "levels/bitdw/areas/1/quartz_crystal/geo.inc.c" +#include "levels/bitdw/areas/1/staircase_slope_and_platform/geo.inc.c" +#include "levels/bitdw/areas/1/track_for_pyramid_platforms/geo.inc.c" +#include "levels/bitdw/areas/1/narrow_path_platform/geo.inc.c" +#include "levels/bitdw/areas/1/geo.inc.c" diff --git a/levels/bitdw/header.h b/levels/bitdw/header.h index f995c30e27..bd9e399af8 100644 --- a/levels/bitdw/header.h +++ b/levels/bitdw/header.h @@ -3,74 +3,9 @@ #include "types.h" -// geo -extern const GeoLayout geo_bitdw_0003C0[]; -extern const GeoLayout geo_bitdw_0003D8[]; -extern const GeoLayout geo_bitdw_0003F0[]; -extern const GeoLayout geo_bitdw_000408[]; -extern const GeoLayout geo_bitdw_000420[]; -extern const GeoLayout geo_bitdw_000438[]; -extern const GeoLayout geo_bitdw_000450[]; -extern const GeoLayout geo_bitdw_000468[]; -extern const GeoLayout geo_bitdw_000480[]; -extern const GeoLayout geo_bitdw_000498[]; -extern const GeoLayout geo_bitdw_0004B0[]; -extern const GeoLayout geo_bitdw_0004C8[]; -extern const GeoLayout geo_bitdw_0004E0[]; -extern const GeoLayout geo_bitdw_0004F8[]; -extern const GeoLayout geo_bitdw_000510[]; -extern const GeoLayout geo_bitdw_000528[]; -extern const GeoLayout geo_bitdw_000540[]; -extern const GeoLayout geo_bitdw_000558[]; -extern const GeoLayout geo_bitdw_000570[]; -extern const GeoLayout geo_bitdw_000588[]; -extern const GeoLayout geo_bitdw_0005A0[]; -extern const GeoLayout geo_bitdw_0005B8[]; -extern const GeoLayout geo_bitdw_0005D0[]; -extern const GeoLayout geo_bitdw_0005E8[]; -extern const GeoLayout geo_bitdw_000600[]; -extern const GeoLayout geo_bitdw_000618[]; - -// leveldata -extern const Gfx bitdw_seg7_dl_070020C8[]; -extern const Gfx bitdw_seg7_dl_070028A0[]; -extern const Gfx bitdw_seg7_dl_070032F8[]; -extern const Gfx bitdw_seg7_dl_07003608[]; -extern const Gfx bitdw_seg7_dl_07003BF0[]; -extern const Gfx bitdw_seg7_dl_07004318[]; -extern const Gfx bitdw_seg7_dl_070045C0[]; -extern const Gfx bitdw_seg7_dl_07005078[]; -extern const Gfx bitdw_seg7_dl_07005BC0[]; -extern const Gfx bitdw_seg7_dl_070065F0[]; -extern const Gfx bitdw_seg7_dl_07007AA8[]; -extern const Gfx bitdw_seg7_dl_07008FF0[]; -extern const Gfx bitdw_seg7_dl_070093B0[]; -extern const Gfx bitdw_seg7_dl_0700A368[]; -extern const Gfx bitdw_seg7_dl_0700A6A8[]; -extern const Gfx bitdw_seg7_dl_0700AD10[]; -extern const Gfx bitdw_seg7_dl_0700AFA0[]; -extern const Gfx bitdw_seg7_dl_0700B220[]; -extern const Gfx bitdw_seg7_dl_0700B480[]; -extern const Gfx bitdw_seg7_dl_0700B8D8[]; -extern const Gfx bitdw_seg7_dl_0700BB58[]; -extern const Gfx bitdw_seg7_dl_0700C0E0[]; -extern const Gfx bitdw_seg7_dl_0700C670[]; -extern const Gfx bitdw_seg7_dl_0700CC00[]; -extern const Gfx bitdw_seg7_dl_0700D190[]; -extern const Gfx bitdw_seg7_dl_0700D3E8[]; -extern const Collision bitdw_seg7_collision_level[]; -extern const Collision bitdw_seg7_collision_0700F688[]; -extern const Collision bitdw_seg7_collision_0700F70C[]; -extern const Collision bitdw_seg7_collision_moving_pyramid[]; -extern const Collision bitdw_seg7_collision_0700F7F0[]; -extern const Collision bitdw_seg7_collision_0700F898[]; -extern const Collision bitdw_seg7_collision_0700F91C[]; -extern const Collision bitdw_seg7_collision_0700FA3C[]; -extern const Collision bitdw_seg7_collision_0700FB5C[]; -extern const Collision bitdw_seg7_collision_0700FC7C[]; -extern const Collision bitdw_seg7_collision_0700FD9C[]; - // script extern const LevelScript level_bitdw_entry[]; +#include "levels/bitdw/header.inc.h" + #endif diff --git a/levels/bitdw/header.inc.h b/levels/bitdw/header.inc.h new file mode 100644 index 0000000000..8b53b5d711 --- /dev/null +++ b/levels/bitdw/header.inc.h @@ -0,0 +1,37 @@ +// geo +extern const GeoLayout geo_bitdw_0003C0[]; +extern const GeoLayout geo_bitdw_0003D8[]; +extern const GeoLayout geo_bitdw_0003F0[]; +extern const GeoLayout geo_bitdw_000408[]; +extern const GeoLayout geo_bitdw_000420[]; +extern const GeoLayout geo_bitdw_000438[]; +extern const GeoLayout geo_bitdw_000450[]; +extern const GeoLayout geo_bitdw_000468[]; +extern const GeoLayout geo_bitdw_000480[]; +extern const GeoLayout geo_bitdw_000498[]; +extern const GeoLayout geo_bitdw_0004B0[]; +extern const GeoLayout geo_bitdw_0004C8[]; +extern const GeoLayout geo_bitdw_0004E0[]; +extern const GeoLayout geo_bitdw_0004F8[]; +extern const GeoLayout geo_bitdw_000510[]; +extern const GeoLayout geo_bitdw_000618[]; + +// leveldata +extern const Gfx bitdw_seg7_dl_070020C8[]; +extern const Gfx bitdw_seg7_dl_070028A0[]; +extern const Gfx bitdw_seg7_dl_070032F8[]; +extern const Gfx bitdw_seg7_dl_07003608[]; +extern const Gfx bitdw_seg7_dl_07003BF0[]; +extern const Gfx bitdw_seg7_dl_07004318[]; +extern const Gfx bitdw_seg7_dl_070045C0[]; +extern const Gfx bitdw_seg7_dl_07005078[]; +extern const Gfx bitdw_seg7_dl_07005BC0[]; +extern const Gfx bitdw_seg7_dl_070065F0[]; +extern const Gfx bitdw_seg7_dl_07007AA8[]; +extern const Gfx bitdw_seg7_dl_07008FF0[]; +extern const Gfx bitdw_seg7_dl_070093B0[]; +extern const Gfx bitdw_seg7_dl_0700A368[]; +extern const Gfx bitdw_seg7_dl_0700A6A8[]; +extern const Gfx bitdw_seg7_dl_0700AD10[]; +extern const Collision bitdw_seg7_collision_level[]; +extern const MacroObject bitdw_seg7_macro_objs[]; diff --git a/levels/bitdw/leveldata.c b/levels/bitdw/leveldata.c index fa93d9a51d..b841ca77bc 100644 --- a/levels/bitdw/leveldata.c +++ b/levels/bitdw/leveldata.c @@ -5,41 +5,5 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/bitdw/texture.inc.c" -#include "levels/bitdw/areas/1/1/model.inc.c" -#include "levels/bitdw/areas/1/starting_platform/model.inc.c" -#include "levels/bitdw/areas/1/large_platform/model.inc.c" -#include "levels/bitdw/areas/1/wooden_bridge_and_fences/model.inc.c" -#include "levels/bitdw/areas/1/quartzy_path_1/model.inc.c" -#include "levels/bitdw/areas/1/quartzy_path_2/model.inc.c" -#include "levels/bitdw/areas/1/quartzy_path_fences/model.inc.c" -#include "levels/bitdw/areas/1/octogonal_platform/model.inc.c" -#include "levels/bitdw/areas/1/platform_with_hill/model.inc.c" -#include "levels/bitdw/areas/1/wooden_platform/model.inc.c" -#include "levels/bitdw/areas/1/platforms_and_tilting/model.inc.c" -#include "levels/bitdw/areas/1/platforms_and_tilting_2/model.inc.c" -#include "levels/bitdw/areas/1/quartz_crystal/model.inc.c" -#include "levels/bitdw/areas/1/staircase_slope_and_platform/model.inc.c" -#include "levels/bitdw/areas/1/track_for_pyramid_platforms/model.inc.c" -#include "levels/bitdw/areas/1/narrow_path_platform/model.inc.c" -#include "levels/bitdw/sliding_platform/model.inc.c" -#include "levels/bitdw/seesaw_platform/model.inc.c" -#include "levels/bitdw/square_platform/model.inc.c" -#include "levels/bitdw/ferris_wheel_axle/model.inc.c" -#include "levels/bitdw/ferris_platform/model.inc.c" -#include "levels/bitdw/collapsing_stairs_1/model.inc.c" -#include "levels/bitdw/collapsing_stairs_2/model.inc.c" -#include "levels/bitdw/collapsing_stairs_3/model.inc.c" -#include "levels/bitdw/collapsing_stairs_4/model.inc.c" -#include "levels/bitdw/collapsing_stairs_5/model.inc.c" -#include "levels/bitdw/areas/1/collision.inc.c" -#include "levels/bitdw/sliding_platform/collision.inc.c" -#include "levels/bitdw/seesaw_platform/collision.inc.c" -#include "levels/bitdw/square_platform/collision.inc.c" -#include "levels/bitdw/ferris_wheel_axle/collision.inc.c" -#include "levels/bitdw/ferris_platform/collision.inc.c" -#include "levels/bitdw/collapsing_stairs_1/collision.inc.c" -#include "levels/bitdw/collapsing_stairs_2/collision.inc.c" -#include "levels/bitdw/collapsing_stairs_3/collision.inc.c" -#include "levels/bitdw/collapsing_stairs_4/collision.inc.c" -#include "levels/bitdw/collapsing_stairs_5/collision.inc.c" + +#include "levels/bitdw/leveldata.inc.c" diff --git a/levels/bitdw/leveldata.inc.c b/levels/bitdw/leveldata.inc.c new file mode 100644 index 0000000000..9576832714 --- /dev/null +++ b/levels/bitdw/leveldata.inc.c @@ -0,0 +1,18 @@ +#include "levels/bitdw/texture.inc.c" +#include "levels/bitdw/areas/1/1/model.inc.c" +#include "levels/bitdw/areas/1/starting_platform/model.inc.c" +#include "levels/bitdw/areas/1/large_platform/model.inc.c" +#include "levels/bitdw/areas/1/wooden_bridge_and_fences/model.inc.c" +#include "levels/bitdw/areas/1/quartzy_path_1/model.inc.c" +#include "levels/bitdw/areas/1/quartzy_path_2/model.inc.c" +#include "levels/bitdw/areas/1/quartzy_path_fences/model.inc.c" +#include "levels/bitdw/areas/1/octogonal_platform/model.inc.c" +#include "levels/bitdw/areas/1/platform_with_hill/model.inc.c" +#include "levels/bitdw/areas/1/wooden_platform/model.inc.c" +#include "levels/bitdw/areas/1/platforms_and_tilting/model.inc.c" +#include "levels/bitdw/areas/1/platforms_and_tilting_2/model.inc.c" +#include "levels/bitdw/areas/1/quartz_crystal/model.inc.c" +#include "levels/bitdw/areas/1/staircase_slope_and_platform/model.inc.c" +#include "levels/bitdw/areas/1/track_for_pyramid_platforms/model.inc.c" +#include "levels/bitdw/areas/1/narrow_path_platform/model.inc.c" +#include "levels/bitdw/areas/1/collision.inc.c" diff --git a/levels/bitdw/script.c b/levels/bitdw/script.c index dad70eb3ee..e075d4e2d6 100644 --- a/levels/bitdw/script.c +++ b/levels/bitdw/script.c @@ -133,46 +133,10 @@ static const LevelScript script_bitdw_objects_3[] = { const LevelScript level_bitdw_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _bitdw_segment_7SegmentRomStart, _bitdw_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _bidw_skybox_yay0SegmentRomStart, _bidw_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/bitdw/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_12), - JUMP_LINK(script_func_global_18), - JUMP_LINK(script_func_global_1), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, geo_bitdw_0003C0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, geo_bitdw_0003D8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, geo_bitdw_0003F0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, geo_bitdw_000408), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, geo_bitdw_000420), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, geo_bitdw_000438), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, geo_bitdw_000450), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, geo_bitdw_000468), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, geo_bitdw_000480), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, geo_bitdw_000498), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, geo_bitdw_0004B0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, geo_bitdw_000510), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_WARP_PIPE, warp_pipe_geo), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_SQUARE_PLATFORM, geo_bitdw_000558), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_SEESAW_PLATFORM, geo_bitdw_000540), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_SLIDING_PLATFORM, geo_bitdw_000528), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_FERRIS_WHEEL_AXLE, geo_bitdw_000570), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_BLUE_PLATFORM, geo_bitdw_000588), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME4, geo_bitdw_0005A0), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME3, geo_bitdw_0005B8), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME2, geo_bitdw_0005D0), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE_FRAME1, geo_bitdw_0005E8), - LOAD_MODEL_FROM_GEO(MODEL_BITDW_STAIRCASE, geo_bitdw_000600), +#include "levels/bitdw/areas/script_vanilla.inc.c" AREA(/*index*/ 1, geo_bitdw_000618), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7443, -2153, 3886, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), diff --git a/levels/bitfs/areas/script_vanilla.inc.c b/levels/bitfs/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..213bc6050d --- /dev/null +++ b/levels/bitfs/areas/script_vanilla.inc.c @@ -0,0 +1,10 @@ +LOAD_YAY0( /*seg*/ 0x07, _bitfs_segment_7SegmentRomStart, _bitfs_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(bitfs, sky), +LOAD_YAY0( /*seg*/ 0x0A, _bitfs_skybox_yay0SegmentRomStart, _bitfs_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group2_geoSegmentRomStart, _group2_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), \ No newline at end of file diff --git a/levels/bitfs/areas/script_vanilla_load.inc.c b/levels/bitfs/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..8f652882e4 --- /dev/null +++ b/levels/bitfs/areas/script_vanilla_load.inc.c @@ -0,0 +1,23 @@ +JUMP_LINK(script_func_global_3), +JUMP_LINK(script_func_global_18), +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_vo_bitfs), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bitfs_geo_0004B0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bitfs_geo_0004C8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bitfs_geo_0004E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bitfs_geo_0004F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bitfs_geo_000510), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bitfs_geo_000528), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bitfs_geo_000540), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bitfs_geo_000558), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bitfs_geo_000570), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bitfs_geo_000588), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bitfs_geo_0005A0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bitfs_geo_0005B8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bitfs_geo_0005D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bitfs_geo_0005E8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bitfs_geo_000600), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bitfs_geo_000618), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bitfs_geo_000630), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bitfs_geo_000648), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, bitfs_geo_000660), \ No newline at end of file diff --git a/levels/bitfs/geo.c b/levels/bitfs/geo.c index 96851ba026..1233e379af 100644 --- a/levels/bitfs/geo.c +++ b/levels/bitfs/geo.c @@ -13,35 +13,4 @@ #include "levels/bitfs/header.h" -#include "levels/bitfs/areas/1/2/geo.inc.c" -#include "levels/bitfs/areas/1/3/geo.inc.c" -#include "levels/bitfs/areas/1/4/geo.inc.c" -#include "levels/bitfs/areas/1/5/geo.inc.c" -#include "levels/bitfs/areas/1/6/geo.inc.c" -#include "levels/bitfs/areas/1/7/geo.inc.c" -#include "levels/bitfs/areas/1/8/geo.inc.c" -#include "levels/bitfs/areas/1/9/geo.inc.c" -#include "levels/bitfs/areas/1/10/geo.inc.c" -#include "levels/bitfs/areas/1/11/geo.inc.c" -#include "levels/bitfs/areas/1/12/geo.inc.c" -#include "levels/bitfs/areas/1/13/geo.inc.c" -#include "levels/bitfs/areas/1/14/geo.inc.c" -#include "levels/bitfs/areas/1/15/geo.inc.c" -#include "levels/bitfs/areas/1/16/geo.inc.c" -#include "levels/bitfs/areas/1/17/geo.inc.c" -#include "levels/bitfs/areas/1/18/geo.inc.c" -#include "levels/bitfs/areas/1/19/geo.inc.c" -#include "levels/bitfs/areas/1/20/geo.inc.c" -#include "levels/bitfs/elevator/geo.inc.c" -#include "levels/bitfs/sinking_cage_platform/geo.inc.c" -#include "levels/bitfs/sinking_cage_pole/geo.inc.c" -#include "levels/bitfs/tilting_square_platform/geo.inc.c" -#include "levels/bitfs/tumbling_platform_near/geo.inc.c" -#include "levels/bitfs/tumbling_platform_far/geo.inc.c" -#include "levels/bitfs/stretching_platform/geo.inc.c" -#include "levels/bitfs/moving_square_platform/geo.inc.c" -#include "levels/bitfs/sliding_platform/geo.inc.c" -#include "levels/bitfs/platform_on_track/geo.inc.c" -#include "levels/bitfs/sinking_platforms/geo.inc.c" -#include "levels/bitfs/seesaw_platform/geo.inc.c" -#include "levels/bitfs/areas/1/geo.inc.c" +#include "levels/bitfs/geo.inc.c" diff --git a/levels/bitfs/geo.inc.c b/levels/bitfs/geo.inc.c new file mode 100644 index 0000000000..bd265ef945 --- /dev/null +++ b/levels/bitfs/geo.inc.c @@ -0,0 +1,20 @@ +#include "levels/bitfs/areas/1/2/geo.inc.c" +#include "levels/bitfs/areas/1/3/geo.inc.c" +#include "levels/bitfs/areas/1/4/geo.inc.c" +#include "levels/bitfs/areas/1/5/geo.inc.c" +#include "levels/bitfs/areas/1/6/geo.inc.c" +#include "levels/bitfs/areas/1/7/geo.inc.c" +#include "levels/bitfs/areas/1/8/geo.inc.c" +#include "levels/bitfs/areas/1/9/geo.inc.c" +#include "levels/bitfs/areas/1/10/geo.inc.c" +#include "levels/bitfs/areas/1/11/geo.inc.c" +#include "levels/bitfs/areas/1/12/geo.inc.c" +#include "levels/bitfs/areas/1/13/geo.inc.c" +#include "levels/bitfs/areas/1/14/geo.inc.c" +#include "levels/bitfs/areas/1/15/geo.inc.c" +#include "levels/bitfs/areas/1/16/geo.inc.c" +#include "levels/bitfs/areas/1/17/geo.inc.c" +#include "levels/bitfs/areas/1/18/geo.inc.c" +#include "levels/bitfs/areas/1/19/geo.inc.c" +#include "levels/bitfs/areas/1/20/geo.inc.c" +#include "levels/bitfs/areas/1/geo.inc.c" diff --git a/levels/bitfs/header.h b/levels/bitfs/header.h index d65883fcb3..3b60c831f0 100644 --- a/levels/bitfs/header.h +++ b/levels/bitfs/header.h @@ -3,94 +3,14 @@ #include "types.h" -// geo -extern const GeoLayout bitfs_geo_0004B0[]; -extern const GeoLayout bitfs_geo_0004C8[]; -extern const GeoLayout bitfs_geo_0004E0[]; -extern const GeoLayout bitfs_geo_0004F8[]; -extern const GeoLayout bitfs_geo_000510[]; -extern const GeoLayout bitfs_geo_000528[]; -extern const GeoLayout bitfs_geo_000540[]; -extern const GeoLayout bitfs_geo_000558[]; -extern const GeoLayout bitfs_geo_000570[]; -extern const GeoLayout bitfs_geo_000588[]; -extern const GeoLayout bitfs_geo_0005A0[]; -extern const GeoLayout bitfs_geo_0005B8[]; -extern const GeoLayout bitfs_geo_0005D0[]; -extern const GeoLayout bitfs_geo_0005E8[]; -extern const GeoLayout bitfs_geo_000600[]; -extern const GeoLayout bitfs_geo_000618[]; -extern const GeoLayout bitfs_geo_000630[]; -extern const GeoLayout bitfs_geo_000648[]; -extern const GeoLayout bitfs_geo_000660[]; -extern const GeoLayout bitfs_geo_000678[]; -extern const GeoLayout bitfs_geo_000690[]; -extern const GeoLayout bitfs_geo_0006A8[]; -extern const GeoLayout bitfs_geo_0006C0[]; -extern const GeoLayout bitfs_geo_0006D8[]; -extern const GeoLayout bitfs_geo_0006F0[]; -extern const GeoLayout bitfs_geo_000708[]; -extern const GeoLayout bitfs_geo_000728[]; -extern const GeoLayout bitfs_geo_000740[]; -extern const GeoLayout bitfs_geo_000758[]; -extern const GeoLayout bitfs_geo_000770[]; -extern const GeoLayout bitfs_geo_000788[]; -extern const GeoLayout bitfs_geo_0007A0[]; +// script +extern const LevelScript level_bitfs_entry[]; -// leveldata -extern const Gfx bitfs_seg7_dl_07002118[]; -extern const Gfx bitfs_seg7_dl_07002A78[]; -extern const Gfx bitfs_seg7_dl_07003670[]; -extern const Gfx bitfs_seg7_dl_07003C60[]; -extern const Gfx bitfs_seg7_dl_070040B0[]; -extern const Gfx bitfs_seg7_dl_07004630[]; -extern const Gfx bitfs_seg7_dl_07006B90[]; -extern const Gfx bitfs_seg7_dl_07007070[]; -extern const Gfx bitfs_seg7_dl_07007720[]; -extern const Gfx bitfs_seg7_dl_07007958[]; -extern const Gfx bitfs_seg7_dl_07008F48[]; -extern const Gfx bitfs_seg7_dl_070091E0[]; -extern const Gfx bitfs_seg7_dl_070095E0[]; -extern const Gfx bitfs_seg7_dl_0700AA00[]; -extern const Gfx bitfs_seg7_dl_0700AB90[]; -extern const Gfx bitfs_seg7_dl_0700BED8[]; -extern const Gfx bitfs_seg7_dl_0700C3C0[]; -extern const Gfx bitfs_seg7_dl_0700EC78[]; -extern const Gfx bitfs_seg7_dl_0700ED90[]; -extern const Gfx bitfs_seg7_dl_0700F1C8[]; -extern const Gfx bitfs_seg7_dl_0700F508[]; -extern const Gfx bitfs_seg7_dl_0700F6A8[]; -extern const Gfx bitfs_seg7_dl_0700FB38[]; -extern const Gfx bitfs_seg7_dl_0700FD08[]; -extern const Gfx bitfs_seg7_dl_0700FF90[]; -extern const Gfx bitfs_seg7_dl_07010168[]; -extern const Gfx bitfs_seg7_dl_07010340[]; -extern const Gfx bitfs_seg7_dl_07011138[]; -extern const Gfx bitfs_seg7_dl_07011318[]; -extern const Gfx bitfs_seg7_dl_07011568[]; -extern const Gfx bitfs_seg7_dl_07011798[]; -extern const Gfx bitfs_seg7_dl_07011BA0[]; -extern const Gfx bitfs_seg7_dl_07011D98[]; -extern const Gfx bitfs_seg7_dl_07011E28[]; -extern const Collision bitfs_seg7_collision_level[]; -extern const Collision bitfs_seg7_collision_elevator[]; -extern const Collision bitfs_seg7_collision_sinking_cage_platform[]; -extern const Collision bitfs_seg7_collision_inverted_pyramid[]; -extern const Collision bitfs_seg7_collision_07015288[]; -extern const Collision bitfs_seg7_collision_squishable_platform[]; -extern const Collision bitfs_seg7_collision_07015714[]; -extern const Collision bitfs_seg7_collision_07015768[]; -extern const Collision bitfs_seg7_collision_platform_on_track[]; -extern const Collision bitfs_seg7_collision_sinking_platform[]; -extern const Collision bitfs_seg7_collision_07015928[]; extern const Trajectory bitfs_seg7_trajectory_070159AC[]; extern Movtex bitfs_movtex_tris_lava_first_section[]; extern Movtex bitfs_movtex_tris_lava_second_section[]; extern Movtex bitfs_movtex_tris_lava_floor[]; -extern const Gfx bitfs_dl_lava_sections[]; -extern const Gfx bitfs_dl_lava_floor[]; -// script -extern const LevelScript level_bitfs_entry[]; +#include "levels/bitfs/header.inc.h" #endif diff --git a/levels/bitfs/header.inc.h b/levels/bitfs/header.inc.h new file mode 100644 index 0000000000..a1c7e8d430 --- /dev/null +++ b/levels/bitfs/header.inc.h @@ -0,0 +1,49 @@ + +// geo +extern const GeoLayout bitfs_geo_0004B0[]; +extern const GeoLayout bitfs_geo_0004C8[]; +extern const GeoLayout bitfs_geo_0004E0[]; +extern const GeoLayout bitfs_geo_0004F8[]; +extern const GeoLayout bitfs_geo_000510[]; +extern const GeoLayout bitfs_geo_000528[]; +extern const GeoLayout bitfs_geo_000540[]; +extern const GeoLayout bitfs_geo_000558[]; +extern const GeoLayout bitfs_geo_000570[]; +extern const GeoLayout bitfs_geo_000588[]; +extern const GeoLayout bitfs_geo_0005A0[]; +extern const GeoLayout bitfs_geo_0005B8[]; +extern const GeoLayout bitfs_geo_0005D0[]; +extern const GeoLayout bitfs_geo_0005E8[]; +extern const GeoLayout bitfs_geo_000600[]; +extern const GeoLayout bitfs_geo_000618[]; +extern const GeoLayout bitfs_geo_000630[]; +extern const GeoLayout bitfs_geo_000648[]; +extern const GeoLayout bitfs_geo_000660[]; +extern const GeoLayout bitfs_geo_0007A0[]; + +// leveldata +extern const Gfx bitfs_seg7_dl_07002118[]; +extern const Gfx bitfs_seg7_dl_07002A78[]; +extern const Gfx bitfs_seg7_dl_07003670[]; +extern const Gfx bitfs_seg7_dl_07003C60[]; +extern const Gfx bitfs_seg7_dl_070040B0[]; +extern const Gfx bitfs_seg7_dl_07004630[]; +extern const Gfx bitfs_seg7_dl_07006B90[]; +extern const Gfx bitfs_seg7_dl_07007070[]; +extern const Gfx bitfs_seg7_dl_07007720[]; +extern const Gfx bitfs_seg7_dl_07007958[]; +extern const Gfx bitfs_seg7_dl_07008F48[]; +extern const Gfx bitfs_seg7_dl_070091E0[]; +extern const Gfx bitfs_seg7_dl_070095E0[]; +extern const Gfx bitfs_seg7_dl_0700AA00[]; +extern const Gfx bitfs_seg7_dl_0700AB90[]; +extern const Gfx bitfs_seg7_dl_0700BED8[]; +extern const Gfx bitfs_seg7_dl_0700C3C0[]; +extern const Gfx bitfs_seg7_dl_0700EC78[]; +extern const Gfx bitfs_seg7_dl_0700ED90[]; +extern const Gfx bitfs_seg7_dl_0700F1C8[]; + +extern const Collision bitfs_seg7_collision_level[]; +extern const MacroObject bitfs_seg7_macro_objs[]; +extern const Gfx bitfs_dl_lava_sections[]; +extern const Gfx bitfs_dl_lava_floor[]; diff --git a/levels/bitfs/leveldata.c b/levels/bitfs/leveldata.c index e179d417ff..a6e22cc734 100644 --- a/levels/bitfs/leveldata.c +++ b/levels/bitfs/leveldata.c @@ -5,50 +5,7 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/bitfs/texture.inc.c" -#include "levels/bitfs/areas/1/1/model.inc.c" -#include "levels/bitfs/areas/1/2/model.inc.c" -#include "levels/bitfs/areas/1/3/model.inc.c" -#include "levels/bitfs/areas/1/4/model.inc.c" -#include "levels/bitfs/areas/1/5/model.inc.c" -#include "levels/bitfs/areas/1/6/model.inc.c" -#include "levels/bitfs/areas/1/7/model.inc.c" -#include "levels/bitfs/areas/1/8/model.inc.c" -#include "levels/bitfs/areas/1/9/model.inc.c" -#include "levels/bitfs/areas/1/10/model.inc.c" -#include "levels/bitfs/areas/1/11/model.inc.c" -#include "levels/bitfs/areas/1/12/model.inc.c" -#include "levels/bitfs/areas/1/13/model.inc.c" -#include "levels/bitfs/areas/1/14/model.inc.c" -#include "levels/bitfs/areas/1/15/model.inc.c" -#include "levels/bitfs/areas/1/16/model.inc.c" -#include "levels/bitfs/areas/1/17/model.inc.c" -#include "levels/bitfs/areas/1/18/model.inc.c" -#include "levels/bitfs/areas/1/19/model.inc.c" -#include "levels/bitfs/areas/1/20/model.inc.c" -#include "levels/bitfs/elevator/model.inc.c" -#include "levels/bitfs/sinking_cage_platform/model.inc.c" -#include "levels/bitfs/sinking_cage_pole/model.inc.c" -#include "levels/bitfs/tilting_square_platform/model.inc.c" -#include "levels/bitfs/tumbling_platform_near/model.inc.c" -#include "levels/bitfs/tumbling_platform_far/model.inc.c" -#include "levels/bitfs/stretching_platform/1.inc.c" -#include "levels/bitfs/stretching_platform/2.inc.c" -#include "levels/bitfs/moving_square_platform/model.inc.c" -#include "levels/bitfs/sliding_platform/model.inc.c" -#include "levels/bitfs/platform_on_track/model.inc.c" -#include "levels/bitfs/sinking_platforms/model.inc.c" -#include "levels/bitfs/seesaw_platform/model.inc.c" -#include "levels/bitfs/areas/1/collision.inc.c" -#include "levels/bitfs/elevator/collision.inc.c" -#include "levels/bitfs/sinking_cage_platform/collision.inc.c" -#include "levels/bitfs/tilting_square_platform/collision.inc.c" -#include "levels/bitfs/tumbling_platform_near/collision.inc.c" -#include "levels/bitfs/stretching_platform/collision.inc.c" -#include "levels/bitfs/moving_square_platform/collision.inc.c" -#include "levels/bitfs/sliding_platform/collision.inc.c" -#include "levels/bitfs/platform_on_track/collision.inc.c" -#include "levels/bitfs/sinking_platforms/collision.inc.c" -#include "levels/bitfs/seesaw_platform/collision.inc.c" #include "levels/bitfs/areas/1/trajectory.inc.c" #include "levels/bitfs/areas/1/movtext.inc.c" + +#include "levels/bitfs/leveldata.inc.c" diff --git a/levels/bitfs/leveldata.inc.c b/levels/bitfs/leveldata.inc.c new file mode 100644 index 0000000000..653719c01d --- /dev/null +++ b/levels/bitfs/leveldata.inc.c @@ -0,0 +1,22 @@ +#include "levels/bitfs/texture.inc.c" +#include "levels/bitfs/areas/1/1/model.inc.c" +#include "levels/bitfs/areas/1/2/model.inc.c" +#include "levels/bitfs/areas/1/3/model.inc.c" +#include "levels/bitfs/areas/1/4/model.inc.c" +#include "levels/bitfs/areas/1/5/model.inc.c" +#include "levels/bitfs/areas/1/6/model.inc.c" +#include "levels/bitfs/areas/1/7/model.inc.c" +#include "levels/bitfs/areas/1/8/model.inc.c" +#include "levels/bitfs/areas/1/9/model.inc.c" +#include "levels/bitfs/areas/1/10/model.inc.c" +#include "levels/bitfs/areas/1/11/model.inc.c" +#include "levels/bitfs/areas/1/12/model.inc.c" +#include "levels/bitfs/areas/1/13/model.inc.c" +#include "levels/bitfs/areas/1/14/model.inc.c" +#include "levels/bitfs/areas/1/15/model.inc.c" +#include "levels/bitfs/areas/1/16/model.inc.c" +#include "levels/bitfs/areas/1/17/model.inc.c" +#include "levels/bitfs/areas/1/18/model.inc.c" +#include "levels/bitfs/areas/1/19/model.inc.c" +#include "levels/bitfs/areas/1/20/model.inc.c" +#include "levels/bitfs/areas/1/collision.inc.c" diff --git a/levels/bitfs/script.c b/levels/bitfs/script.c index d450325920..afceff0378 100644 --- a/levels/bitfs/script.c +++ b/levels/bitfs/script.c @@ -122,52 +122,10 @@ static const LevelScript script_bitfs_objects_3[] = { const LevelScript level_bitfs_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _bitfs_segment_7SegmentRomStart, _bitfs_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _bitfs_skybox_yay0SegmentRomStart, _bitfs_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group2_geoSegmentRomStart, _group2_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/bitfs/areas/script_vanilla.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_3), - JUMP_LINK(script_func_global_18), - JUMP_LINK(script_func_global_1), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bitfs_geo_0004B0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bitfs_geo_0004C8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bitfs_geo_0004E0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bitfs_geo_0004F8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bitfs_geo_000510), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bitfs_geo_000528), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bitfs_geo_000540), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bitfs_geo_000558), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bitfs_geo_000570), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bitfs_geo_000588), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bitfs_geo_0005A0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bitfs_geo_0005B8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bitfs_geo_0005D0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bitfs_geo_0005E8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bitfs_geo_000600), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bitfs_geo_000618), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bitfs_geo_000630), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bitfs_geo_000648), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, bitfs_geo_000660), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_PLATFORM_ON_TRACK, bitfs_geo_000758), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_TILTING_SQUARE_PLATFORM, bitfs_geo_0006C0), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_SINKING_PLATFORMS, bitfs_geo_000770), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_BLUE_POLE, bitfs_geo_0006A8), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_SINKING_CAGE_PLATFORM, bitfs_geo_000690), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_ELEVATOR, bitfs_geo_000678), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_STRETCHING_PLATFORMS, bitfs_geo_000708), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_SEESAW_PLATFORM, bitfs_geo_000788), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_MOVING_SQUARE_PLATFORM, bitfs_geo_000728), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_SLIDING_PLATFORM, bitfs_geo_000740), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_TUMBLING_PLATFORM_PART, bitfs_geo_0006D8), - LOAD_MODEL_FROM_GEO(MODEL_BITFS_TUMBLING_PLATFORM, bitfs_geo_0006F0), +#include "levels/bitfs/areas/script_vanilla_load.inc.c" AREA(/*index*/ 1, bitfs_geo_0007A0), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7577, -1764, 0, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), diff --git a/levels/bits/areas/script_vanilla.inc.c b/levels/bits/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..f0b13d2205 --- /dev/null +++ b/levels/bits/areas/script_vanilla.inc.c @@ -0,0 +1,22 @@ +JUMP_LINK(script_func_global_15), +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_vo_bits), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bits_geo_000430), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bits_geo_000448), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bits_geo_000460), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bits_geo_000478), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bits_geo_000490), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bits_geo_0004A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bits_geo_0004C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bits_geo_0004D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bits_geo_0004F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bits_geo_000508), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bits_geo_000520), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bits_geo_000538), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bits_geo_000550), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bits_geo_000568), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bits_geo_000580), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bits_geo_000598), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bits_geo_0005B0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bits_geo_0005C8), +LOAD_MODEL_FROM_GEO(MODEL_BITS_WARP_PIPE, warp_pipe_geo), diff --git a/levels/bits/areas/script_vanilla_load.inc.c b/levels/bits/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..1e755e1547 --- /dev/null +++ b/levels/bits/areas/script_vanilla_load.inc.c @@ -0,0 +1,7 @@ +LOAD_YAY0( /*seg*/ 0x07, _bits_segment_7SegmentRomStart, _bits_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _bits_skybox_yay0SegmentRomStart, _bits_skybox_yay0SegmentRomEnd), +LOAD_VANILLA_OBJECTS(bits, sky), +LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/bits/geo.c b/levels/bits/geo.c index fe1078fb18..6be4fd3465 100644 --- a/levels/bits/geo.c +++ b/levels/bits/geo.c @@ -13,35 +13,4 @@ #include "levels/bits/header.h" -#include "levels/bits/areas/1/2/geo.inc.c" -#include "levels/bits/areas/1/3/geo.inc.c" -#include "levels/bits/areas/1/4/geo.inc.c" -#include "levels/bits/areas/1/5/geo.inc.c" -#include "levels/bits/areas/1/6/geo.inc.c" -#include "levels/bits/areas/1/7/geo.inc.c" -#include "levels/bits/areas/1/8/geo.inc.c" -#include "levels/bits/areas/1/9/geo.inc.c" -#include "levels/bits/areas/1/10/geo.inc.c" -#include "levels/bits/areas/1/11/geo.inc.c" -#include "levels/bits/areas/1/12/geo.inc.c" -#include "levels/bits/areas/1/13/geo.inc.c" -#include "levels/bits/areas/1/14/geo.inc.c" -#include "levels/bits/areas/1/15/geo.inc.c" -#include "levels/bits/areas/1/16/geo.inc.c" -#include "levels/bits/areas/1/17/geo.inc.c" -#include "levels/bits/areas/1/18/geo.inc.c" -#include "levels/bits/areas/1/19/geo.inc.c" -#include "levels/bits/areas/1/20/geo.inc.c" -#include "levels/bits/areas/1/21/geo.inc.c" -#include "levels/bits/areas/1/22/geo.inc.c" -#include "levels/bits/areas/1/23/geo.inc.c" -#include "levels/bits/areas/1/24/geo.inc.c" -#include "levels/bits/areas/1/25/geo.inc.c" -#include "levels/bits/areas/1/26/geo.inc.c" -#include "levels/bits/areas/1/27/geo.inc.c" -#include "levels/bits/areas/1/28/geo.inc.c" -#include "levels/bits/areas/1/29/geo.inc.c" -#include "levels/bits/areas/1/30/geo.inc.c" -#include "levels/bits/areas/1/31/geo.inc.c" -#include "levels/bits/areas/1/32/geo.inc.c" -#include "levels/bits/areas/1/geo.inc.c" +#include "levels/bits/geo.inc.c" diff --git a/levels/bits/geo.inc.c b/levels/bits/geo.inc.c new file mode 100644 index 0000000000..d1ed5e728c --- /dev/null +++ b/levels/bits/geo.inc.c @@ -0,0 +1,19 @@ +#include "levels/bits/areas/1/2/geo.inc.c" +#include "levels/bits/areas/1/3/geo.inc.c" +#include "levels/bits/areas/1/4/geo.inc.c" +#include "levels/bits/areas/1/5/geo.inc.c" +#include "levels/bits/areas/1/6/geo.inc.c" +#include "levels/bits/areas/1/7/geo.inc.c" +#include "levels/bits/areas/1/8/geo.inc.c" +#include "levels/bits/areas/1/9/geo.inc.c" +#include "levels/bits/areas/1/10/geo.inc.c" +#include "levels/bits/areas/1/11/geo.inc.c" +#include "levels/bits/areas/1/12/geo.inc.c" +#include "levels/bits/areas/1/13/geo.inc.c" +#include "levels/bits/areas/1/14/geo.inc.c" +#include "levels/bits/areas/1/15/geo.inc.c" +#include "levels/bits/areas/1/16/geo.inc.c" +#include "levels/bits/areas/1/17/geo.inc.c" +#include "levels/bits/areas/1/18/geo.inc.c" +#include "levels/bits/areas/1/19/geo.inc.c" +#include "levels/bits/areas/1/geo.inc.c" diff --git a/levels/bits/header.h b/levels/bits/header.h index 5b08ddd975..2f4ff29f29 100644 --- a/levels/bits/header.h +++ b/levels/bits/header.h @@ -3,89 +3,9 @@ #include "types.h" -// geo -extern const GeoLayout bits_geo_000430[]; -extern const GeoLayout bits_geo_000448[]; -extern const GeoLayout bits_geo_000460[]; -extern const GeoLayout bits_geo_000478[]; -extern const GeoLayout bits_geo_000490[]; -extern const GeoLayout bits_geo_0004A8[]; -extern const GeoLayout bits_geo_0004C0[]; -extern const GeoLayout bits_geo_0004D8[]; -extern const GeoLayout bits_geo_0004F0[]; -extern const GeoLayout bits_geo_000508[]; -extern const GeoLayout bits_geo_000520[]; -extern const GeoLayout bits_geo_000538[]; -extern const GeoLayout bits_geo_000550[]; -extern const GeoLayout bits_geo_000568[]; -extern const GeoLayout bits_geo_000580[]; -extern const GeoLayout bits_geo_000598[]; -extern const GeoLayout bits_geo_0005B0[]; -extern const GeoLayout bits_geo_0005C8[]; -extern const GeoLayout bits_geo_0005E0[]; -extern const GeoLayout bits_geo_0005F8[]; -extern const GeoLayout bits_geo_000610[]; -extern const GeoLayout bits_geo_000628[]; -extern const GeoLayout bits_geo_000640[]; -extern const GeoLayout bits_geo_000658[]; -extern const GeoLayout bits_geo_000670[]; -extern const GeoLayout bits_geo_000688[]; -extern const GeoLayout bits_geo_0006A0[]; -extern const GeoLayout bits_geo_0006B8[]; -extern const GeoLayout bits_geo_0006D0[]; -extern const GeoLayout bits_geo_0006E8[]; -extern const GeoLayout bits_geo_000700[]; -extern const GeoLayout bits_geo_000718[]; - -// leveldata -extern const Gfx bits_seg7_dl_07002918[]; -extern const Gfx bits_seg7_dl_07003670[]; -extern const Gfx bits_seg7_dl_070047F0[]; -extern const Gfx bits_seg7_dl_07005DB8[]; -extern const Gfx bits_seg7_dl_07007AF0[]; -extern const Gfx bits_seg7_dl_07007C28[]; -extern const Gfx bits_seg7_dl_07007EC8[]; -extern const Gfx bits_seg7_dl_07008D18[]; -extern const Gfx bits_seg7_dl_07008FE8[]; -extern const Gfx bits_seg7_dl_07009690[]; -extern const Gfx bits_seg7_dl_0700B4A0[]; -extern const Gfx bits_seg7_dl_0700B820[]; -extern const Gfx bits_seg7_dl_0700BA18[]; -extern const Gfx bits_seg7_dl_0700CDC0[]; -extern const Gfx bits_seg7_dl_0700D278[]; -extern const Gfx bits_seg7_dl_0700D5A0[]; -extern const Gfx bits_seg7_dl_0700DD00[]; -extern const Gfx bits_seg7_dl_0700FC70[]; -extern const Gfx bits_seg7_dl_070128F0[]; -extern const Gfx bits_seg7_dl_07012B10[]; -extern const Gfx bits_seg7_dl_07012D40[]; -extern const Gfx bits_seg7_dl_070135A0[]; -extern const Gfx bits_seg7_dl_07013820[]; -extern const Gfx bits_seg7_dl_07013C78[]; -extern const Gfx bits_seg7_dl_07013EF8[]; -extern const Gfx bits_seg7_dl_07014178[]; -extern const Gfx bits_seg7_dl_07014C28[]; -extern const Gfx bits_seg7_dl_070153C0[]; -extern const Gfx bits_seg7_dl_07015B60[]; -extern const Gfx bits_seg7_dl_07016300[]; -extern const Gfx bits_seg7_dl_07016AA0[]; -extern const Gfx bits_seg7_dl_07016DA0[]; -extern const Collision bits_seg7_collision_level[]; -extern const Collision bits_seg7_collision_0701A9A0[]; -extern const Collision bits_seg7_collision_0701AA0C[]; -extern const Collision bits_seg7_collision_0701AA84[]; -extern const Collision bits_seg7_collision_0701AC28[]; -extern const Collision bits_seg7_collision_0701ACAC[]; -extern const Collision bits_seg7_collision_arrow_platform[]; -extern const Collision bits_seg7_collision_0701ADD8[]; -extern const Collision bits_seg7_collision_0701AE5C[]; -extern const Collision bits_seg7_collision_0701B0D4[]; -extern const Collision bits_seg7_collision_0701B26C[]; -extern const Collision bits_seg7_collision_0701B404[]; -extern const Collision bits_seg7_collision_0701B59C[]; -extern const Collision bits_seg7_collision_0701B734[]; - // script extern const LevelScript level_bits_entry[]; +#include "levels/bits/header.inc.h" + #endif diff --git a/levels/bits/header.inc.h b/levels/bits/header.inc.h new file mode 100644 index 0000000000..45b192cb3f --- /dev/null +++ b/levels/bits/header.inc.h @@ -0,0 +1,43 @@ +// geo +extern const GeoLayout bits_geo_000430[]; +extern const GeoLayout bits_geo_000448[]; +extern const GeoLayout bits_geo_000460[]; +extern const GeoLayout bits_geo_000478[]; +extern const GeoLayout bits_geo_000490[]; +extern const GeoLayout bits_geo_0004A8[]; +extern const GeoLayout bits_geo_0004C0[]; +extern const GeoLayout bits_geo_0004D8[]; +extern const GeoLayout bits_geo_0004F0[]; +extern const GeoLayout bits_geo_000508[]; +extern const GeoLayout bits_geo_000520[]; +extern const GeoLayout bits_geo_000538[]; +extern const GeoLayout bits_geo_000550[]; +extern const GeoLayout bits_geo_000568[]; +extern const GeoLayout bits_geo_000580[]; +extern const GeoLayout bits_geo_000598[]; +extern const GeoLayout bits_geo_0005B0[]; +extern const GeoLayout bits_geo_0005C8[]; +extern const GeoLayout bits_geo_000718[]; + +// leveldata +extern const Gfx bits_seg7_dl_07002918[]; +extern const Gfx bits_seg7_dl_07003670[]; +extern const Gfx bits_seg7_dl_070047F0[]; +extern const Gfx bits_seg7_dl_07005DB8[]; +extern const Gfx bits_seg7_dl_07007AF0[]; +extern const Gfx bits_seg7_dl_07007C28[]; +extern const Gfx bits_seg7_dl_07007EC8[]; +extern const Gfx bits_seg7_dl_07008D18[]; +extern const Gfx bits_seg7_dl_07008FE8[]; +extern const Gfx bits_seg7_dl_07009690[]; +extern const Gfx bits_seg7_dl_0700B4A0[]; +extern const Gfx bits_seg7_dl_0700B820[]; +extern const Gfx bits_seg7_dl_0700BA18[]; +extern const Gfx bits_seg7_dl_0700CDC0[]; +extern const Gfx bits_seg7_dl_0700D278[]; +extern const Gfx bits_seg7_dl_0700D5A0[]; +extern const Gfx bits_seg7_dl_0700DD00[]; +extern const Gfx bits_seg7_dl_0700FC70[]; +extern const Gfx bits_seg7_dl_070128F0[]; +extern const Collision bits_seg7_collision_level[]; +extern const MacroObject bits_seg7_macro_objs[]; diff --git a/levels/bits/leveldata.c b/levels/bits/leveldata.c index dbd54bf4df..a95f56f2f0 100644 --- a/levels/bits/leveldata.c +++ b/levels/bits/leveldata.c @@ -5,50 +5,5 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/bits/texture.inc.c" -#include "levels/bits/areas/1/1/model.inc.c" -#include "levels/bits/areas/1/2/model.inc.c" -#include "levels/bits/areas/1/3/model.inc.c" -#include "levels/bits/areas/1/4/model.inc.c" -#include "levels/bits/areas/1/5/model.inc.c" -#include "levels/bits/areas/1/6/model.inc.c" -#include "levels/bits/areas/1/7/model.inc.c" -#include "levels/bits/areas/1/8/model.inc.c" -#include "levels/bits/areas/1/9/model.inc.c" -#include "levels/bits/areas/1/10/model.inc.c" -#include "levels/bits/areas/1/11/model.inc.c" -#include "levels/bits/areas/1/12/model.inc.c" -#include "levels/bits/areas/1/13/model.inc.c" -#include "levels/bits/areas/1/14/model.inc.c" -#include "levels/bits/areas/1/15/model.inc.c" -#include "levels/bits/areas/1/16/model.inc.c" -#include "levels/bits/areas/1/17/model.inc.c" -#include "levels/bits/areas/1/18/model.inc.c" -#include "levels/bits/areas/1/19/model.inc.c" -#include "levels/bits/areas/1/20/model.inc.c" -#include "levels/bits/areas/1/21/model.inc.c" -#include "levels/bits/areas/1/22/model.inc.c" -#include "levels/bits/areas/1/23/model.inc.c" -#include "levels/bits/areas/1/24/model.inc.c" -#include "levels/bits/areas/1/25/model.inc.c" -#include "levels/bits/areas/1/26/model.inc.c" -#include "levels/bits/areas/1/27/model.inc.c" -#include "levels/bits/areas/1/28/model.inc.c" -#include "levels/bits/areas/1/29/model.inc.c" -#include "levels/bits/areas/1/30/model.inc.c" -#include "levels/bits/areas/1/31/model.inc.c" -#include "levels/bits/areas/1/32/model.inc.c" -#include "levels/bits/areas/1/collision.inc.c" -#include "levels/bits/areas/1/20/collision.inc.c" -#include "levels/bits/areas/1/21/collision.inc.c" -#include "levels/bits/areas/1/22/collision.inc.c" -#include "levels/bits/areas/1/23/collision.inc.c" -#include "levels/bits/areas/1/24/collision.inc.c" -#include "levels/bits/areas/1/25/collision.inc.c" -#include "levels/bits/areas/1/26/collision.inc.c" -#include "levels/bits/areas/1/27/collision.inc.c" -#include "levels/bits/areas/1/28/collision.inc.c" -#include "levels/bits/areas/1/29/collision.inc.c" -#include "levels/bits/areas/1/30/collision.inc.c" -#include "levels/bits/areas/1/31/collision.inc.c" -#include "levels/bits/areas/1/32/collision.inc.c" + +#include "levels/bits/leveldata.inc.c" diff --git a/levels/bits/leveldata.inc.c b/levels/bits/leveldata.inc.c new file mode 100644 index 0000000000..2ffb19487e --- /dev/null +++ b/levels/bits/leveldata.inc.c @@ -0,0 +1,21 @@ +#include "levels/bits/texture.inc.c" +#include "levels/bits/areas/1/1/model.inc.c" +#include "levels/bits/areas/1/2/model.inc.c" +#include "levels/bits/areas/1/3/model.inc.c" +#include "levels/bits/areas/1/4/model.inc.c" +#include "levels/bits/areas/1/5/model.inc.c" +#include "levels/bits/areas/1/6/model.inc.c" +#include "levels/bits/areas/1/7/model.inc.c" +#include "levels/bits/areas/1/8/model.inc.c" +#include "levels/bits/areas/1/9/model.inc.c" +#include "levels/bits/areas/1/10/model.inc.c" +#include "levels/bits/areas/1/11/model.inc.c" +#include "levels/bits/areas/1/12/model.inc.c" +#include "levels/bits/areas/1/13/model.inc.c" +#include "levels/bits/areas/1/14/model.inc.c" +#include "levels/bits/areas/1/15/model.inc.c" +#include "levels/bits/areas/1/16/model.inc.c" +#include "levels/bits/areas/1/17/model.inc.c" +#include "levels/bits/areas/1/18/model.inc.c" +#include "levels/bits/areas/1/19/model.inc.c" +#include "levels/bits/areas/1/collision.inc.c" diff --git a/levels/bits/script.c b/levels/bits/script.c index 1827b7e452..f24503d878 100644 --- a/levels/bits/script.c +++ b/levels/bits/script.c @@ -129,49 +129,10 @@ static const LevelScript script_bits_objects_2[] = { const LevelScript level_bits_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _bits_segment_7SegmentRomStart, _bits_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _bits_skybox_yay0SegmentRomStart, _bits_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/bits/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_15), - JUMP_LINK(script_func_global_1), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, bits_geo_000430), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, bits_geo_000448), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, bits_geo_000460), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, bits_geo_000478), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, bits_geo_000490), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, bits_geo_0004A8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, bits_geo_0004C0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, bits_geo_0004D8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, bits_geo_0004F0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, bits_geo_000508), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, bits_geo_000520), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, bits_geo_000538), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, bits_geo_000550), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, bits_geo_000568), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bits_geo_000580), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bits_geo_000598), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bits_geo_0005B0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bits_geo_0005C8), - LOAD_MODEL_FROM_GEO(MODEL_BITS_SLIDING_PLATFORM, bits_geo_0005E0), - LOAD_MODEL_FROM_GEO(MODEL_BITS_TWIN_SLIDING_PLATFORMS, bits_geo_0005F8), - LOAD_MODEL_FROM_GEO(MODEL_BITS_OCTAGONAL_PLATFORM, bits_geo_000610), - LOAD_MODEL_FROM_GEO(MODEL_BITS_BLUE_PLATFORM, bits_geo_000628), - LOAD_MODEL_FROM_GEO(MODEL_BITS_FERRIS_WHEEL_AXLE, bits_geo_000640), - LOAD_MODEL_FROM_GEO(MODEL_BITS_ARROW_PLATFORM, bits_geo_000658), - LOAD_MODEL_FROM_GEO(MODEL_BITS_SEESAW_PLATFORM, bits_geo_000670), - LOAD_MODEL_FROM_GEO(MODEL_BITS_TILTING_W_PLATFORM, bits_geo_000688), - LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE, bits_geo_0006A0), - LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME1, bits_geo_0006B8), - LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME2, bits_geo_0006D0), - LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME3, bits_geo_0006E8), - LOAD_MODEL_FROM_GEO(MODEL_BITS_STAIRCASE_FRAME4, bits_geo_000700), - LOAD_MODEL_FROM_GEO(MODEL_BITS_WARP_PIPE, warp_pipe_geo), +#include "levels/bits/areas/script_vanilla.inc.c" AREA(/*index*/ 1, bits_geo_000718), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7039, -3812, 4, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), diff --git a/levels/bob/areas/script_vanilla.inc.c b/levels/bob/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..5f50c94e1c --- /dev/null +++ b/levels/bob/areas/script_vanilla.inc.c @@ -0,0 +1,5 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_4), +JUMP_LINK(script_func_global_15), +JUMP_LINK(script_func_vo_bob), +LOAD_MODEL_FROM_GEO(MODEL_BOB_BUBBLY_TREE, bubbly_tree_geo), diff --git a/levels/bob/areas/script_vanilla_load.inc.c b/levels/bob/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..997da3efe8 --- /dev/null +++ b/levels/bob/areas/script_vanilla_load.inc.c @@ -0,0 +1,8 @@ +LOAD_VANILLA_OBJECTS(bob, generic), +LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group3_yay0SegmentRomStart, _group3_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group3_geoSegmentRomStart, _group3_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/bob/geo.c b/levels/bob/geo.c index 59376b7369..16ddf16d6b 100644 --- a/levels/bob/geo.c +++ b/levels/bob/geo.c @@ -13,7 +13,4 @@ #include "levels/bob/header.h" -#include "levels/bob/chain_chomp_gate/geo.inc.c" -#include "levels/bob/seesaw_platform/geo.inc.c" -#include "levels/bob/grate_door/geo.inc.c" -#include "levels/bob/areas/1/geo.inc.c" +#include "levels/bob/geo.inc.c" diff --git a/levels/bob/geo.inc.c b/levels/bob/geo.inc.c new file mode 100644 index 0000000000..53a444793a --- /dev/null +++ b/levels/bob/geo.inc.c @@ -0,0 +1 @@ +#include "levels/bob/areas/1/geo.inc.c" \ No newline at end of file diff --git a/levels/bob/header.h b/levels/bob/header.h index 4440830ac2..6a9479ac6b 100644 --- a/levels/bob/header.h +++ b/levels/bob/header.h @@ -3,26 +3,6 @@ #include "types.h" -// geo -extern const GeoLayout bob_geo_000440[]; -extern const GeoLayout bob_geo_000458[]; -extern const GeoLayout bob_geo_000470[]; -extern const GeoLayout bob_geo_000488[]; - -// leveldata -extern const Gfx bob_seg7_dl_07004390[]; -extern const Gfx bob_seg7_dl_07009D80[]; -extern const Gfx bob_seg7_dl_0700A470[]; -extern const Gfx bob_seg7_dl_0700A920[]; -extern const Gfx bob_seg7_dl_0700DD18[]; -extern const Gfx bob_seg7_dl_0700E338[]; -extern const Gfx bob_seg7_dl_0700E458[]; -extern const Gfx bob_seg7_dl_0700E768[]; -extern const Gfx bob_seg7_dl_0700E8A0[]; -extern const Collision bob_seg7_collision_level[]; -extern const Collision bob_seg7_collision_chain_chomp_gate[]; -extern const Collision bob_seg7_collision_bridge[]; -extern const Collision bob_seg7_collision_gate[]; extern const Trajectory bob_seg7_metal_ball_path0[]; extern const Trajectory bob_seg7_metal_ball_path1[]; extern const Trajectory bob_seg7_trajectory_koopa[]; @@ -30,4 +10,6 @@ extern const Trajectory bob_seg7_trajectory_koopa[]; // script extern const LevelScript level_bob_entry[]; +#include "levels/bob/header.inc.h" + #endif diff --git a/levels/bob/header.inc.h b/levels/bob/header.inc.h new file mode 100644 index 0000000000..d580506f8c --- /dev/null +++ b/levels/bob/header.inc.h @@ -0,0 +1,12 @@ +// geo +extern const GeoLayout bob_geo_000488[]; + +// leveldata +extern const Gfx bob_seg7_dl_07004390[]; +extern const Gfx bob_seg7_dl_07009D80[]; +extern const Gfx bob_seg7_dl_0700A470[]; +extern const Gfx bob_seg7_dl_0700A920[]; +extern const Gfx bob_seg7_dl_0700DD18[]; +extern const Gfx bob_seg7_dl_0700E338[]; +extern const Collision bob_seg7_collision_level[]; +extern const MacroObject bob_seg7_macro_objs[]; diff --git a/levels/bob/leveldata.c b/levels/bob/leveldata.c index 7795bc01c1..71eb08c3d3 100644 --- a/levels/bob/leveldata.c +++ b/levels/bob/leveldata.c @@ -5,18 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/bob/texture.inc.c" -#include "levels/bob/areas/1/1/model.inc.c" -#include "levels/bob/areas/1/2/model.inc.c" -#include "levels/bob/areas/1/3/model.inc.c" -#include "levels/bob/areas/1/4/model.inc.c" -#include "levels/bob/areas/1/5/model.inc.c" -#include "levels/bob/areas/1/6/model.inc.c" -#include "levels/bob/chain_chomp_gate/model.inc.c" -#include "levels/bob/seesaw_platform/model.inc.c" -#include "levels/bob/grate_door/model.inc.c" -#include "levels/bob/areas/1/collision.inc.c" -#include "levels/bob/chain_chomp_gate/collision.inc.c" -#include "levels/bob/seesaw_platform/collision.inc.c" -#include "levels/bob/grate_door/collision.inc.c" #include "levels/bob/areas/1/trajectory.inc.c" + +#include "levels/bob/leveldata.inc.c" diff --git a/levels/bob/leveldata.inc.c b/levels/bob/leveldata.inc.c new file mode 100644 index 0000000000..ddb5fa7dc9 --- /dev/null +++ b/levels/bob/leveldata.inc.c @@ -0,0 +1,8 @@ +#include "levels/bob/texture.inc.c" +#include "levels/bob/areas/1/1/model.inc.c" +#include "levels/bob/areas/1/2/model.inc.c" +#include "levels/bob/areas/1/3/model.inc.c" +#include "levels/bob/areas/1/4/model.inc.c" +#include "levels/bob/areas/1/5/model.inc.c" +#include "levels/bob/areas/1/6/model.inc.c" +#include "levels/bob/areas/1/collision.inc.c" diff --git a/levels/bob/script.c b/levels/bob/script.c index 0ef8de92a7..1effa77486 100644 --- a/levels/bob/script.c +++ b/levels/bob/script.c @@ -168,23 +168,10 @@ static const LevelScript script_bob_objects_3[] = { const LevelScript level_bob_entry[] = { INIT_LEVEL(), LOAD_YAY0( /*seg*/ 0x07, _bob_segment_7SegmentRomStart, _bob_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _generic_yay0SegmentRomStart, _generic_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group3_yay0SegmentRomStart, _group3_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group3_geoSegmentRomStart, _group3_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/bob/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_4), - JUMP_LINK(script_func_global_15), - LOAD_MODEL_FROM_GEO(MODEL_BOB_BUBBLY_TREE, bubbly_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOB_CHAIN_CHOMP_GATE, bob_geo_000440), - LOAD_MODEL_FROM_GEO(MODEL_BOB_SEESAW_PLATFORM, bob_geo_000458), - LOAD_MODEL_FROM_GEO(MODEL_BOB_BARS_GRILLS, bob_geo_000470), +#include "levels/bob/areas/script_vanilla.inc.c" AREA(/*index*/ 1, bob_geo_000488), JUMP_LINK(script_bob_objects_1), diff --git a/levels/castle_courtyard/areas/script_vanilla.inc.c b/levels/castle_courtyard/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..c26f8c5713 --- /dev/null +++ b/levels/castle_courtyard/areas/script_vanilla.inc.c @@ -0,0 +1,5 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_10), +LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_SPIKY_TREE, spiky_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_WOODEN_DOOR, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200), diff --git a/levels/castle_courtyard/areas/script_vanilla_load.inc.c b/levels/castle_courtyard/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..605be41390 --- /dev/null +++ b/levels/castle_courtyard/areas/script_vanilla_load.inc.c @@ -0,0 +1,7 @@ +LOAD_YAY0( /*seg*/ 0x07, _castle_courtyard_segment_7SegmentRomStart, _castle_courtyard_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), +LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _outside_yay0SegmentRomStart, _outside_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group9_yay0SegmentRomStart, _group9_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group9_geoSegmentRomStart, _group9_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/castle_courtyard/geo.c b/levels/castle_courtyard/geo.c index 46418bf983..92eef5732b 100644 --- a/levels/castle_courtyard/geo.c +++ b/levels/castle_courtyard/geo.c @@ -13,5 +13,4 @@ #include "levels/castle_courtyard/header.h" -#include "levels/castle_courtyard/areas/1/spire/geo.inc.c" -#include "levels/castle_courtyard/areas/1/geo.inc.c" +#include "levels/castle_courtyard/geo.inc.c" diff --git a/levels/castle_courtyard/geo.inc.c b/levels/castle_courtyard/geo.inc.c new file mode 100644 index 0000000000..4507bbc1b7 --- /dev/null +++ b/levels/castle_courtyard/geo.inc.c @@ -0,0 +1,2 @@ +#include "levels/castle_courtyard/areas/1/spire/geo.inc.c" +#include "levels/castle_courtyard/areas/1/geo.inc.c" \ No newline at end of file diff --git a/levels/castle_courtyard/header.h b/levels/castle_courtyard/header.h index 63608fde1e..6ebe75b7e1 100644 --- a/levels/castle_courtyard/header.h +++ b/levels/castle_courtyard/header.h @@ -4,19 +4,11 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout castle_courtyard_geo_000200[]; -extern const GeoLayout castle_courtyard_geo_000218[]; - -// leveldata -extern const Gfx castle_courtyard_seg7_dl_070048B8[]; -extern const Gfx castle_courtyard_seg7_dl_07005078[]; -extern const Gfx castle_courtyard_seg7_dl_07005698[]; -extern const Gfx castle_courtyard_seg7_dl_07005938[]; -extern const Collision castle_courtyard_seg7_collision[]; extern const struct MovtexQuadCollection castle_courtyard_movtex_star_statue_water[]; // script extern const LevelScript level_castle_courtyard_entry[]; +#include "levels/castle_courtyard/header.inc.h" + #endif diff --git a/levels/castle_courtyard/header.inc.h b/levels/castle_courtyard/header.inc.h new file mode 100644 index 0000000000..06e3a127e2 --- /dev/null +++ b/levels/castle_courtyard/header.inc.h @@ -0,0 +1,11 @@ +// geo +extern const GeoLayout castle_courtyard_geo_000200[]; +extern const GeoLayout castle_courtyard_geo_000218[]; + +// leveldata +extern const Gfx castle_courtyard_seg7_dl_070048B8[]; +extern const Gfx castle_courtyard_seg7_dl_07005078[]; +extern const Gfx castle_courtyard_seg7_dl_07005698[]; +extern const Gfx castle_courtyard_seg7_dl_07005938[]; +extern const Collision castle_courtyard_seg7_collision[]; +extern const MacroObject castle_courtyard_seg7_macro_objs[]; diff --git a/levels/castle_courtyard/leveldata.c b/levels/castle_courtyard/leveldata.c index 145c7ae17a..f24810b515 100644 --- a/levels/castle_courtyard/leveldata.c +++ b/levels/castle_courtyard/leveldata.c @@ -5,9 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/castle_courtyard/areas/1/1/model.inc.c" -#include "levels/castle_courtyard/areas/1/spire/model.inc.c" -#include "levels/castle_courtyard/areas/1/2/model.inc.c" -#include "levels/castle_courtyard/areas/1/3/model.inc.c" -#include "levels/castle_courtyard/areas/1/collision.inc.c" #include "levels/castle_courtyard/areas/1/movtext.inc.c" + +#include "levels/castle_courtyard/leveldata.inc.c" diff --git a/levels/castle_courtyard/leveldata.inc.c b/levels/castle_courtyard/leveldata.inc.c new file mode 100644 index 0000000000..7c460f5b3a --- /dev/null +++ b/levels/castle_courtyard/leveldata.inc.c @@ -0,0 +1,5 @@ +#include "levels/castle_courtyard/areas/1/1/model.inc.c" +#include "levels/castle_courtyard/areas/1/spire/model.inc.c" +#include "levels/castle_courtyard/areas/1/2/model.inc.c" +#include "levels/castle_courtyard/areas/1/3/model.inc.c" +#include "levels/castle_courtyard/areas/1/collision.inc.c" diff --git a/levels/castle_courtyard/script.c b/levels/castle_courtyard/script.c index 55ea6bc5e5..4a9a560b69 100644 --- a/levels/castle_courtyard/script.c +++ b/levels/castle_courtyard/script.c @@ -61,20 +61,10 @@ static const LevelScript script_castle_courtyard_objects_2[] = { const LevelScript level_castle_courtyard_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _castle_courtyard_segment_7SegmentRomStart, _castle_courtyard_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _outside_yay0SegmentRomStart, _outside_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group9_yay0SegmentRomStart, _group9_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group9_geoSegmentRomStart, _group9_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/castle_courtyard/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_10), - LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_SPIKY_TREE, spiky_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_COURTYARD_WOODEN_DOOR, wooden_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_courtyard_geo_000200), +#include "levels/castle_courtyard/areas/script_vanilla.inc.c" AREA(/*index*/ 1, castle_courtyard_geo_000218), OBJECT(/*model*/ MODEL_BOO, /*pos*/ -2360, -100, -2712, /*angle*/ 0, 0, 0, /*behParam*/ 0x01050000, /*beh*/ bhvBooWithCage), diff --git a/levels/castle_grounds/areas/script_vanilla.inc.c b/levels/castle_grounds/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..def29732cf --- /dev/null +++ b/levels/castle_grounds/areas/script_vanilla.inc.c @@ -0,0 +1,9 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_11), +JUMP_LINK(script_func_global_16), +JUMP_LINK(script_func_vo_castle_grounds), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_WARP_PIPE, warp_pipe_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_CASTLE_DOOR, castle_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_METAL_DOOR, metal_door_geo), diff --git a/levels/castle_grounds/areas/script_vanilla_load.inc.c b/levels/castle_grounds/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..788ab21a53 --- /dev/null +++ b/levels/castle_grounds/areas/script_vanilla_load.inc.c @@ -0,0 +1,9 @@ +LOAD_YAY0( /*seg*/ 0x07, _castle_grounds_segment_7SegmentRomStart, _castle_grounds_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), +LOAD_VANILLA_OBJECTS(castle_grounds, outside), +LOAD_YAY0( /*seg*/ 0x05, _group10_yay0SegmentRomStart, _group10_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group10_geoSegmentRomStart, _group10_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group15_yay0SegmentRomStart, _group15_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group15_geoSegmentRomStart, _group15_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/castle_grounds/geo.c b/levels/castle_grounds/geo.c index 31f74204ce..c6e4d639c3 100644 --- a/levels/castle_grounds/geo.c +++ b/levels/castle_grounds/geo.c @@ -13,8 +13,4 @@ #include "levels/castle_grounds/header.h" -#include "levels/castle_grounds/areas/1/11/geo.inc.c" -#include "levels/castle_grounds/areas/1/3/geo.inc.c" -#include "levels/castle_grounds/areas/1/7/geo.inc.c" -#include "levels/castle_grounds/areas/1/8/geo.inc.c" -#include "levels/castle_grounds/areas/1/geo.inc.c" +#include "levels/castle_grounds/geo.inc.c" diff --git a/levels/castle_grounds/geo.inc.c b/levels/castle_grounds/geo.inc.c new file mode 100644 index 0000000000..1f7e3285a4 --- /dev/null +++ b/levels/castle_grounds/geo.inc.c @@ -0,0 +1,2 @@ +#include "levels/castle_grounds/areas/1/3/geo.inc.c" +#include "levels/castle_grounds/areas/1/geo.inc.c" diff --git a/levels/castle_grounds/header.h b/levels/castle_grounds/header.h index 19d6852381..d3b57be6f2 100644 --- a/levels/castle_grounds/header.h +++ b/levels/castle_grounds/header.h @@ -4,40 +4,12 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout castle_grounds_geo_000660[]; -extern const GeoLayout castle_grounds_geo_0006F4[]; -extern const GeoLayout castle_grounds_geo_00070C[]; -extern const GeoLayout castle_grounds_geo_000724[]; -extern const GeoLayout castle_grounds_geo_00073C[]; +// script +extern const LevelScript level_castle_grounds_entry[]; -// leveldata -extern const Gfx castle_grounds_seg7_dl_07006D70[]; -extern const Gfx castle_grounds_seg7_dl_070095F0[]; -extern const Gfx castle_grounds_seg7_dl_0700A290[]; -extern const Gfx castle_grounds_seg7_dl_0700A860[]; -extern const Gfx castle_grounds_seg7_dl_0700B1D0[]; -extern const Gfx castle_grounds_seg7_dl_0700BA20[]; -extern const Gfx castle_grounds_seg7_dl_0700BB80[]; -extern const Gfx castle_grounds_seg7_dl_0700BC68[]; -extern const Gfx castle_grounds_seg7_dl_0700C210[]; -extern const Gfx castle_grounds_seg7_dl_0700C430[]; -extern const Gfx castle_grounds_seg7_dl_0700C670[]; -extern const Gfx castle_grounds_seg7_dl_0700C6A8[]; -extern const Gfx castle_grounds_seg7_dl_0700C6E8[]; -extern const Gfx castle_grounds_seg7_dl_0700C728[]; -extern const Gfx castle_grounds_seg7_dl_0700C768[]; -extern const struct Animation *const castle_grounds_seg7_anims_flags[]; -extern const Gfx castle_grounds_seg7_dl_0700EA58[]; -extern const Gfx castle_grounds_seg7_us_dl_0700F2E8[]; -extern const Collision castle_grounds_seg7_collision_level[]; -extern const Collision castle_grounds_seg7_collision_moat_grills[]; -extern const Collision castle_grounds_seg7_collision_cannon_grill[]; extern const struct MovtexQuadCollection castle_grounds_movtex_water[]; extern Movtex castle_grounds_movtex_tris_waterfall[]; -extern const Gfx castle_grounds_dl_waterfall[]; -// script -extern const LevelScript level_castle_grounds_entry[]; +#include "levels/castle_grounds/header.inc.h" #endif diff --git a/levels/castle_grounds/header.inc.h b/levels/castle_grounds/header.inc.h new file mode 100644 index 0000000000..96a1903ca8 --- /dev/null +++ b/levels/castle_grounds/header.inc.h @@ -0,0 +1,18 @@ +// geo +extern const GeoLayout castle_grounds_geo_0006F4[]; +extern const GeoLayout castle_grounds_geo_00073C[]; + +// leveldata +extern const Gfx castle_grounds_seg7_dl_07006D70[]; +extern const Gfx castle_grounds_seg7_dl_070095F0[]; +extern const Gfx castle_grounds_seg7_dl_0700A290[]; +extern const Gfx castle_grounds_seg7_dl_0700A860[]; +extern const Gfx castle_grounds_seg7_dl_0700B1D0[]; +extern const Gfx castle_grounds_seg7_dl_0700BA20[]; +extern const Gfx castle_grounds_seg7_dl_0700C210[]; +extern const Gfx castle_grounds_seg7_dl_0700C430[]; +extern const Collision castle_grounds_seg7_collision_level[]; +extern const MacroObject castle_grounds_seg7_macro_objs[]; +extern const Collision castle_grounds_seg7_collision_moat_grills[]; +extern const Collision castle_grounds_seg7_collision_cannon_grill[]; +extern const Gfx castle_grounds_dl_waterfall[]; diff --git a/levels/castle_grounds/leveldata.c b/levels/castle_grounds/leveldata.c index df5d482ad9..75a0f2a018 100644 --- a/levels/castle_grounds/leveldata.c +++ b/levels/castle_grounds/leveldata.c @@ -5,24 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/castle_grounds/texture.inc.c" -#include "levels/castle_grounds/areas/1/1/model.inc.c" -#include "levels/castle_grounds/areas/1/2/model.inc.c" -#include "levels/castle_grounds/areas/1/3/model.inc.c" -#include "levels/castle_grounds/areas/1/4/model.inc.c" -#include "levels/castle_grounds/areas/1/5/model.inc.c" -#include "levels/castle_grounds/areas/1/6/model.inc.c" -#include "levels/castle_grounds/areas/1/7/model.inc.c" -#include "levels/castle_grounds/areas/1/8/model.inc.c" -#include "levels/castle_grounds/areas/1/9/model.inc.c" -#include "levels/castle_grounds/areas/1/10/model.inc.c" -#include "levels/castle_grounds/areas/1/11/model.inc.c" -#include "levels/castle_grounds/areas/1/11/anim.inc.c" -#include "levels/castle_grounds/areas/1/12/model.inc.c" // Letter -#ifndef VERSION_JP -#include "levels/castle_grounds/areas/1/13/model.inc.c" // Peach signature -#endif -#include "levels/castle_grounds/areas/1/collision.inc.c" -#include "levels/castle_grounds/areas/1/7/collision.inc.c" -#include "levels/castle_grounds/areas/1/8/collision.inc.c" #include "levels/castle_grounds/areas/1/movtext.inc.c" + +#include "levels/castle_grounds/leveldata.inc.c" diff --git a/levels/castle_grounds/leveldata.inc.c b/levels/castle_grounds/leveldata.inc.c new file mode 100644 index 0000000000..279213984d --- /dev/null +++ b/levels/castle_grounds/leveldata.inc.c @@ -0,0 +1,10 @@ +#include "levels/castle_grounds/texture.inc.c" +#include "levels/castle_grounds/areas/1/1/model.inc.c" +#include "levels/castle_grounds/areas/1/2/model.inc.c" +#include "levels/castle_grounds/areas/1/3/model.inc.c" +#include "levels/castle_grounds/areas/1/4/model.inc.c" +#include "levels/castle_grounds/areas/1/5/model.inc.c" +#include "levels/castle_grounds/areas/1/6/model.inc.c" +#include "levels/castle_grounds/areas/1/9/model.inc.c" +#include "levels/castle_grounds/areas/1/10/model.inc.c" +#include "levels/castle_grounds/areas/1/collision.inc.c" diff --git a/levels/castle_grounds/script.c b/levels/castle_grounds/script.c index 1aedda6821..c3ccd49eeb 100644 --- a/levels/castle_grounds/script.c +++ b/levels/castle_grounds/script.c @@ -149,28 +149,10 @@ static const LevelScript script_castle_grounds_objects_4[] = { const LevelScript level_castle_grounds_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _castle_grounds_segment_7SegmentRomStart, _castle_grounds_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _outside_yay0SegmentRomStart, _outside_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group10_yay0SegmentRomStart, _group10_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group10_geoSegmentRomStart, _group10_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group15_yay0SegmentRomStart, _group15_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group15_geoSegmentRomStart, _group15_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/castle_grounds/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_11), - JUMP_LINK(script_func_global_16), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, castle_grounds_geo_0006F4), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_BUBBLY_TREE, bubbly_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_WARP_PIPE, warp_pipe_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_CASTLE_DOOR, castle_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_METAL_DOOR, metal_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_VCUTM_GRILL, castle_grounds_geo_00070C), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_FLAG, castle_grounds_geo_000660), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_GROUNDS_CANNON_GRILL, castle_grounds_geo_000724), +#include "levels/castle_grounds/areas/script_vanilla.inc.c" AREA(/*index*/ 1, castle_grounds_geo_00073C), WARP_NODE(/*id*/ 0xF1, /*destLevel*/ LEVEL_CASTLE_GROUNDS, /*destArea*/ 0x01, /*destNode*/ 0x03, /*flags*/ WARP_NO_CHECKPOINT), diff --git a/levels/castle_inside/areas/3/collision.inc.c b/levels/castle_inside/areas/3/collision.inc.c index fb86638ad3..fc33ad6d08 100644 --- a/levels/castle_inside/areas/3/collision.inc.c +++ b/levels/castle_inside/areas/3/collision.inc.c @@ -2517,91 +2517,3 @@ const Collision inside_castle_seg7_area_3_collision[] = { COL_WATER_BOX(2, 5786, -1330, 8038, 410, -1228), COL_END(), }; - -// 0x070775B4 - 0x0707768C -const Collision inside_castle_seg7_collision_ddd_warp[] = { - COL_INIT(), - COL_VERTEX_INIT(0x12), - COL_VERTEX(3866, -1074, 1587), - COL_VERTEX(3487, -1074, 1864), - COL_VERTEX(3866, -1074, 1864), - COL_VERTEX(3487, -1074, 1587), - COL_VERTEX(3487, -1074, 2135), - COL_VERTEX(3866, -1074, 2135), - COL_VERTEX(3487, -1074, 2406), - COL_VERTEX(3866, -1074, 2406), - COL_VERTEX(5939, -1074, 1587), - COL_VERTEX(5530, -1074, 1587), - COL_VERTEX(5530, -1074, 1864), - COL_VERTEX(5939, -1074, 1864), - COL_VERTEX(5530, -1074, 2135), - COL_VERTEX(5939, -1074, 2135), - COL_VERTEX(5530, -1074, 2406), - COL_VERTEX(5939, -1074, 2406), - COL_VERTEX(3456, -1074, 1587), - COL_VERTEX(3456, -1074, 2406), - COL_TRI_INIT(SURFACE_DEFAULT, 8), - COL_TRI(3, 16, 17), - COL_TRI(3, 17, 6), - COL_TRI(8, 9, 10), - COL_TRI(8, 10, 11), - COL_TRI(11, 10, 12), - COL_TRI(11, 12, 13), - COL_TRI(13, 12, 14), - COL_TRI(13, 14, 15), - COL_TRI_INIT(SURFACE_PAINTING_WARP_E8, 2), - COL_TRI(0, 1, 2), - COL_TRI(0, 3, 1), - COL_TRI_INIT(SURFACE_PAINTING_WARP_E9, 2), - COL_TRI(2, 1, 4), - COL_TRI(2, 4, 5), - COL_TRI_INIT(SURFACE_PAINTING_WARP_EA, 2), - COL_TRI(5, 6, 7), - COL_TRI(5, 4, 6), - COL_TRI_STOP(), - COL_END(), -}; - -// 0x0707768C - 0x07077764 -const Collision inside_castle_seg7_collision_ddd_warp_2[] = { - COL_INIT(), - COL_VERTEX_INIT(0x12), - COL_VERTEX(5939, -1074, 1587), - COL_VERTEX(5560, -1074, 1864), - COL_VERTEX(5939, -1074, 1864), - COL_VERTEX(5560, -1074, 1587), - COL_VERTEX(5560, -1074, 2135), - COL_VERTEX(5939, -1074, 2135), - COL_VERTEX(5560, -1074, 2406), - COL_VERTEX(5939, -1074, 2406), - COL_VERTEX(5530, -1074, 1587), - COL_VERTEX(5530, -1074, 2406), - COL_VERTEX(3866, -1074, 1864), - COL_VERTEX(3456, -1074, 2135), - COL_VERTEX(3866, -1074, 2135), - COL_VERTEX(3456, -1074, 2406), - COL_VERTEX(3866, -1074, 2406), - COL_VERTEX(3456, -1074, 1864), - COL_VERTEX(3866, -1074, 1587), - COL_VERTEX(3456, -1074, 1587), - COL_TRI_INIT(SURFACE_DEFAULT, 8), - COL_TRI(8, 9, 6), - COL_TRI(8, 6, 3), - COL_TRI(10, 11, 12), - COL_TRI(12, 13, 14), - COL_TRI(12, 11, 13), - COL_TRI(10, 15, 11), - COL_TRI(16, 15, 10), - COL_TRI(16, 17, 15), - COL_TRI_INIT(SURFACE_PAINTING_WARP_E8, 2), - COL_TRI(0, 1, 2), - COL_TRI(0, 3, 1), - COL_TRI_INIT(SURFACE_PAINTING_WARP_E9, 2), - COL_TRI(2, 4, 5), - COL_TRI(2, 1, 4), - COL_TRI_INIT(SURFACE_PAINTING_WARP_EA, 2), - COL_TRI(5, 4, 6), - COL_TRI(5, 6, 7), - COL_TRI_STOP(), - COL_END(), -}; diff --git a/levels/castle_inside/areas/script_vanilla.inc.c b/levels/castle_inside/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..0312b79549 --- /dev/null +++ b/levels/castle_inside/areas/script_vanilla.inc.c @@ -0,0 +1,11 @@ +JUMP_LINK(script_func_global_16), +JUMP_LINK(script_func_vo_castle_inside), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR, castle_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WOODEN_DOOR, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_METAL_DOOR, metal_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR_UNUSED, castle_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WOODEN_DOOR_UNUSED, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_0_STARS, castle_door_0_star_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_1_STAR, castle_door_1_star_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_3_STARS, castle_door_3_stars_geo), +LOAD_MODEL_FROM_GEO(MODEL_CASTLE_KEY_DOOR, key_door_geo), diff --git a/levels/castle_inside/areas/script_vanilla_load.inc.c b/levels/castle_inside/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..45fddd9931 --- /dev/null +++ b/levels/castle_inside/areas/script_vanilla_load.inc.c @@ -0,0 +1,4 @@ +LOAD_YAY0( /*seg*/ 0x07, _castle_inside_segment_7SegmentRomStart, _castle_inside_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(castle_inside, inside), +LOAD_YAY0( /*seg*/ 0x06, _group15_yay0SegmentRomStart, _group15_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group15_geoSegmentRomStart, _group15_geoSegmentRomEnd), diff --git a/levels/castle_inside/geo.c b/levels/castle_inside/geo.c index 53c8b3a254..ed8c5b0de2 100644 --- a/levels/castle_inside/geo.c +++ b/levels/castle_inside/geo.c @@ -13,12 +13,4 @@ #include "levels/castle_inside/header.h" -#include "levels/castle_inside/star_door/geo.inc.c" -#include "levels/castle_inside/trap_door/geo.inc.c" -#include "levels/castle_inside/areas/1/geo.inc.c" -#include "levels/castle_inside/areas/2/pendulum/geo.inc.c" // Another weird case -#include "levels/castle_inside/clock_minute_hand/geo.inc.c" -#include "levels/castle_inside/clock_hour_hand/geo.inc.c" -#include "levels/castle_inside/areas/2/geo.inc.c" -#include "levels/castle_inside/water_level_pillar/geo.inc.c" -#include "levels/castle_inside/areas/3/geo.inc.c" +#include "levels/castle_inside/geo.inc.c" diff --git a/levels/castle_inside/geo.inc.c b/levels/castle_inside/geo.inc.c new file mode 100644 index 0000000000..0444eed32e --- /dev/null +++ b/levels/castle_inside/geo.inc.c @@ -0,0 +1,3 @@ +#include "levels/castle_inside/areas/1/geo.inc.c" +#include "levels/castle_inside/areas/2/geo.inc.c" +#include "levels/castle_inside/areas/3/geo.inc.c" diff --git a/levels/castle_inside/header.h b/levels/castle_inside/header.h index 398e0f4953..2b895364cf 100644 --- a/levels/castle_inside/header.h +++ b/levels/castle_inside/header.h @@ -5,60 +5,6 @@ #include "game/paintings.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout castle_geo_000F00[]; -extern const GeoLayout castle_geo_000F18[]; -extern const GeoLayout castle_geo_000F30[]; -extern const GeoLayout castle_geo_000F70[]; -extern const GeoLayout castle_geo_000F88[]; -extern const GeoLayout castle_geo_000FA8[]; -extern const GeoLayout castle_geo_000FD0[]; -extern const GeoLayout castle_geo_001000[]; -extern const GeoLayout castle_geo_001038[]; -extern const GeoLayout castle_geo_001088[]; -extern const GeoLayout castle_geo_0010C8[]; -extern const GeoLayout castle_geo_001110[]; -extern const GeoLayout castle_geo_001158[]; -extern const GeoLayout castle_geo_0011A8[]; -extern const GeoLayout castle_geo_001200[]; -extern const GeoLayout castle_geo_001260[]; -extern const GeoLayout castle_geo_0012C8[]; -extern const GeoLayout castle_geo_001348[]; -extern const GeoLayout castle_geo_0013B8[]; -extern const GeoLayout castle_geo_001400[]; -extern const GeoLayout castle_geo_001518[]; -extern const GeoLayout castle_geo_001530[]; -extern const GeoLayout castle_geo_001548[]; -extern const GeoLayout castle_geo_001560[]; -extern const GeoLayout castle_geo_001578[]; -extern const GeoLayout castle_geo_0015B8[]; -extern const GeoLayout castle_geo_0015F8[]; -extern const GeoLayout castle_geo_001628[]; -extern const GeoLayout castle_geo_001668[]; -extern const GeoLayout castle_geo_001690[]; -extern const GeoLayout castle_geo_0016D8[]; -extern const GeoLayout castle_geo_001740[]; -extern const GeoLayout castle_geo_001798[]; -extern const GeoLayout castle_geo_001800[]; -extern const GeoLayout castle_geo_001858[]; -extern const GeoLayout castle_geo_001940[]; -extern const GeoLayout castle_geo_001958[]; -extern const GeoLayout castle_geo_001980[]; -extern const GeoLayout castle_geo_0019C8[]; -extern const GeoLayout castle_geo_0019F8[]; -extern const GeoLayout castle_geo_001A30[]; -extern const GeoLayout castle_geo_001A58[]; -extern const GeoLayout castle_geo_001AB8[]; -extern const GeoLayout castle_geo_001AF8[]; -extern const GeoLayout castle_geo_001B48[]; -extern const GeoLayout castle_geo_001BB0[]; -extern const GeoLayout castle_geo_001C10[]; - -// leveldata -extern const Gfx inside_castle_seg7_dl_070225D8[]; -extern const Gfx inside_castle_seg7_dl_07022610[]; -extern const Gfx inside_castle_seg7_dl_070234C0[]; -extern const Gfx inside_castle_seg7_dl_07023520[]; extern struct Painting bob_painting; extern struct Painting ccm_painting; extern struct Painting wf_painting; @@ -73,77 +19,6 @@ extern struct Painting ttm_painting; extern struct Painting ttc_painting; extern struct Painting sl_painting; extern struct Painting thi_huge_painting; -extern const Gfx inside_castle_seg7_dl_bowser_1_painting[]; -extern const Gfx inside_castle_seg7_dl_07028FD0[]; -extern const Gfx inside_castle_seg7_dl_07029578[]; -extern const Gfx inside_castle_seg7_dl_0702A650[]; -extern const Gfx dl_castle_lobby_wing_cap_light[]; -extern const Gfx inside_castle_seg7_dl_0702AA10[]; -extern const Gfx inside_castle_seg7_dl_0702AB20[]; -extern const Gfx inside_castle_seg7_dl_0702E408[]; -extern const Gfx inside_castle_seg7_dl_0702FD30[]; -extern const Vtx inside_castle_seg7_vertex_07030940[]; -extern const Gfx inside_castle_seg7_dl_07031168[]; -extern const Gfx inside_castle_seg7_dl_07031588[]; -extern const Gfx inside_castle_seg7_dl_07031720[]; -extern const Gfx inside_castle_seg7_dl_07031830[]; -extern const Gfx inside_castle_seg7_dl_07032FC0[]; -extern const Gfx inside_castle_seg7_dl_07033158[]; -extern const Gfx inside_castle_seg7_dl_07034D88[]; -extern const Gfx inside_castle_seg7_dl_07035178[]; -extern const Gfx inside_castle_seg7_dl_07035288[]; -extern const Gfx inside_castle_seg7_dl_07036D88[]; -extern const Gfx inside_castle_seg7_dl_07037988[]; -extern const Gfx inside_castle_seg7_dl_07037BF8[]; -extern const Gfx inside_castle_seg7_dl_07037DE8[]; -extern const Gfx dl_castle_aquarium_light[]; -extern const Gfx inside_castle_seg7_dl_07038350[]; -extern const Gfx inside_castle_seg7_dl_0703A6C8[]; -extern const Gfx inside_castle_seg7_dl_0703A808[]; -extern const Gfx inside_castle_seg7_dl_0703BA08[]; -extern const Gfx inside_castle_seg7_dl_0703BCB8[]; -extern const Gfx inside_castle_seg7_dl_0703BFA8[]; -extern const Gfx inside_castle_seg7_dl_0703E6F0[]; -extern const Gfx inside_castle_seg7_dl_07043028[]; -extern const Gfx inside_castle_seg7_dl_07043B48[]; -extern const Gfx inside_castle_seg7_dl_07043CD8[]; -extern const Gfx inside_castle_seg7_dl_0704A0E8[]; -extern const Gfx inside_castle_seg7_dl_0704A2E0[]; -extern const Gfx inside_castle_seg7_dl_0704AA98[]; -extern const Gfx inside_castle_seg7_dl_0704C7D8[]; -extern const Gfx inside_castle_seg7_dl_07050938[]; -extern const Gfx inside_castle_seg7_dl_070512F8[]; -extern const Gfx inside_castle_seg7_dl_07051678[]; -extern const Gfx inside_castle_seg7_dl_070519C8[]; -extern const Gfx inside_castle_seg7_dl_07051B60[]; -extern const Gfx inside_castle_seg7_dl_070558D0[]; -extern const Gfx inside_castle_seg7_dl_070572A0[]; -extern const Gfx inside_castle_seg7_dl_07057F00[]; -extern const Gfx inside_castle_seg7_dl_07058950[]; -extern const Gfx inside_castle_seg7_dl_07059190[]; -extern const Gfx inside_castle_seg7_dl_0705E088[]; -extern const Gfx inside_castle_seg7_dl_0705E2A0[]; -extern const Gfx inside_castle_seg7_dl_0705E450[]; -extern const Gfx inside_castle_seg7_dl_070616E8[]; -extern const Gfx inside_castle_seg7_dl_07061C20[]; -extern const Gfx inside_castle_seg7_dl_07064B78[]; -extern const Gfx inside_castle_seg7_dl_07064D58[]; -extern const Gfx inside_castle_seg7_dl_07066CE0[]; -extern const Gfx inside_castle_seg7_dl_07066E90[]; -extern const Gfx inside_castle_seg7_dl_07066FA0[]; -extern const Gfx inside_castle_seg7_dl_07068850[]; -extern const Gfx inside_castle_seg7_dl_07068B10[]; -extern const Collision inside_castle_seg7_area_1_collision[]; -extern const Collision inside_castle_seg7_area_2_collision[]; -extern const Collision inside_castle_seg7_area_3_collision[]; -extern const Collision inside_castle_seg7_collision_ddd_warp[]; -extern const Collision inside_castle_seg7_collision_ddd_warp_2[]; -extern const RoomData inside_castle_seg7_area_1_rooms[]; -extern const RoomData inside_castle_seg7_area_2_rooms[]; -extern const RoomData inside_castle_seg7_area_3_rooms[]; -extern const Collision inside_castle_seg7_collision_floor_trap[]; -extern const Collision inside_castle_seg7_collision_star_door[]; -extern const Collision inside_castle_seg7_collision_water_level_pillar[]; extern const Trajectory *const inside_castle_seg7_trajectory_mips[]; extern const struct MovtexQuadCollection inside_castle_movtex_green_room_water[]; extern const struct MovtexQuadCollection inside_castle_movtex_moat_water[]; @@ -151,4 +26,6 @@ extern const struct MovtexQuadCollection inside_castle_movtex_moat_water[]; // script extern const LevelScript level_castle_inside_entry[]; +#include "levels/castle_inside/header.inc.h" + #endif diff --git a/levels/castle_inside/header.inc.h b/levels/castle_inside/header.inc.h new file mode 100644 index 0000000000..f56beab2b8 --- /dev/null +++ b/levels/castle_inside/header.inc.h @@ -0,0 +1,90 @@ +// geo +extern const GeoLayout castle_geo_000F30[]; +extern const GeoLayout castle_geo_000F70[]; +extern const GeoLayout castle_geo_000F88[]; +extern const GeoLayout castle_geo_000FA8[]; +extern const GeoLayout castle_geo_000FD0[]; +extern const GeoLayout castle_geo_001000[]; +extern const GeoLayout castle_geo_001038[]; +extern const GeoLayout castle_geo_001088[]; +extern const GeoLayout castle_geo_0010C8[]; +extern const GeoLayout castle_geo_001110[]; +extern const GeoLayout castle_geo_001158[]; +extern const GeoLayout castle_geo_0011A8[]; +extern const GeoLayout castle_geo_001200[]; +extern const GeoLayout castle_geo_001260[]; +extern const GeoLayout castle_geo_0012C8[]; +extern const GeoLayout castle_geo_001348[]; +extern const GeoLayout castle_geo_0013B8[]; +extern const GeoLayout castle_geo_001400[]; +extern const GeoLayout castle_geo_001858[]; +extern const GeoLayout castle_geo_001C10[]; + +// leveldata +extern const Gfx inside_castle_seg7_dl_070225D8[]; +extern const Gfx inside_castle_seg7_dl_07022610[]; +extern const Gfx inside_castle_seg7_dl_070234C0[]; +extern const Gfx inside_castle_seg7_dl_07023520[]; +extern const Gfx inside_castle_seg7_dl_bowser_1_painting[]; +extern const Gfx inside_castle_seg7_dl_07028FD0[]; +extern const Gfx inside_castle_seg7_dl_07029578[]; +extern const Gfx inside_castle_seg7_dl_0702A650[]; +extern const Gfx dl_castle_lobby_wing_cap_light[]; +extern const Gfx inside_castle_seg7_dl_0702AA10[]; +extern const Gfx inside_castle_seg7_dl_0702AB20[]; +extern const Gfx inside_castle_seg7_dl_0702E408[]; +extern const Gfx inside_castle_seg7_dl_0702FD30[]; +extern const Vtx inside_castle_seg7_vertex_07030940[]; +extern const Gfx inside_castle_seg7_dl_07031168[]; +extern const Gfx inside_castle_seg7_dl_07031588[]; +extern const Gfx inside_castle_seg7_dl_07031720[]; +extern const Gfx inside_castle_seg7_dl_07031830[]; +extern const Gfx inside_castle_seg7_dl_07032FC0[]; +extern const Gfx inside_castle_seg7_dl_07033158[]; +extern const Gfx inside_castle_seg7_dl_07034D88[]; +extern const Gfx inside_castle_seg7_dl_07035178[]; +extern const Gfx inside_castle_seg7_dl_07035288[]; +extern const Gfx inside_castle_seg7_dl_07036D88[]; +extern const Gfx inside_castle_seg7_dl_07037988[]; +extern const Gfx inside_castle_seg7_dl_07037BF8[]; +extern const Gfx inside_castle_seg7_dl_07037DE8[]; +extern const Gfx dl_castle_aquarium_light[]; +extern const Gfx inside_castle_seg7_dl_07038350[]; +extern const Gfx inside_castle_seg7_dl_0703A6C8[]; +extern const Gfx inside_castle_seg7_dl_0703A808[]; +extern const Gfx inside_castle_seg7_dl_0703BA08[]; +extern const Gfx inside_castle_seg7_dl_0703E6F0[]; +extern const Gfx inside_castle_seg7_dl_07043028[]; +extern const Gfx inside_castle_seg7_dl_07043B48[]; +extern const Gfx inside_castle_seg7_dl_07043CD8[]; +extern const Gfx inside_castle_seg7_dl_0704A0E8[]; +extern const Gfx inside_castle_seg7_dl_0704A2E0[]; +extern const Gfx inside_castle_seg7_dl_0704AA98[]; +extern const Gfx inside_castle_seg7_dl_0704C7D8[]; +extern const Gfx inside_castle_seg7_dl_07050938[]; +extern const Gfx inside_castle_seg7_dl_07051678[]; +extern const Gfx inside_castle_seg7_dl_070519C8[]; +extern const Gfx inside_castle_seg7_dl_07051B60[]; +extern const Gfx inside_castle_seg7_dl_070558D0[]; +extern const Gfx inside_castle_seg7_dl_070572A0[]; +extern const Gfx inside_castle_seg7_dl_07057F00[]; +extern const Gfx inside_castle_seg7_dl_0705E088[]; +extern const Gfx inside_castle_seg7_dl_0705E2A0[]; +extern const Gfx inside_castle_seg7_dl_0705E450[]; +extern const Gfx inside_castle_seg7_dl_070616E8[]; +extern const Gfx inside_castle_seg7_dl_07061C20[]; +extern const Gfx inside_castle_seg7_dl_07064B78[]; +extern const Gfx inside_castle_seg7_dl_07064D58[]; +extern const Gfx inside_castle_seg7_dl_07066CE0[]; +extern const Gfx inside_castle_seg7_dl_07066E90[]; +extern const Gfx inside_castle_seg7_dl_07066FA0[]; +extern const Gfx inside_castle_seg7_dl_07068850[]; +extern const Collision inside_castle_seg7_area_1_collision[]; +extern const Collision inside_castle_seg7_area_2_collision[]; +extern const Collision inside_castle_seg7_area_3_collision[]; +extern const MacroObject inside_castle_seg7_area_1_macro_objs[]; +extern const MacroObject inside_castle_seg7_area_2_macro_objs[]; +extern const MacroObject inside_castle_seg7_area_3_macro_objs[]; +extern const RoomData inside_castle_seg7_area_1_rooms[]; +extern const RoomData inside_castle_seg7_area_2_rooms[]; +extern const RoomData inside_castle_seg7_area_3_rooms[]; diff --git a/levels/castle_inside/leveldata.c b/levels/castle_inside/leveldata.c index eee12c20f8..f2c067a5b4 100644 --- a/levels/castle_inside/leveldata.c +++ b/levels/castle_inside/leveldata.c @@ -7,72 +7,7 @@ #include "make_const_nonconst.h" #include "levels/castle_inside/texture.inc.c" #include "levels/castle_inside/painting.inc.c" -#include "levels/castle_inside/areas/1/1/model.inc.c" -#include "levels/castle_inside/areas/1/2/model.inc.c" -#include "levels/castle_inside/areas/1/3/model.inc.c" -#include "levels/castle_inside/areas/1/4/model.inc.c" -#include "levels/castle_inside/areas/1/5/model.inc.c" -#include "levels/castle_inside/areas/1/6/model.inc.c" -#include "levels/castle_inside/areas/1/7/model.inc.c" -#include "levels/castle_inside/areas/1/8/model.inc.c" -#include "levels/castle_inside/areas/1/9/model.inc.c" -#include "levels/castle_inside/areas/1/10/model.inc.c" -#include "levels/castle_inside/areas/1/11/model.inc.c" -#include "levels/castle_inside/areas/1/12/model.inc.c" -#include "levels/castle_inside/areas/1/13/model.inc.c" -#include "levels/castle_inside/areas/1/14/model.inc.c" -#include "levels/castle_inside/areas/1/15/model.inc.c" -#include "levels/castle_inside/areas/1/16/model.inc.c" -#include "levels/castle_inside/areas/1/17/model.inc.c" -#include "levels/castle_inside/areas/1/18/model.inc.c" -#include "levels/castle_inside/areas/1/19/model.inc.c" -#include "levels/castle_inside/areas/1/20/model.inc.c" -#include "levels/castle_inside/areas/1/21/model.inc.c" -#include "levels/castle_inside/areas/1/22/model.inc.c" -#include "levels/castle_inside/areas/1/23/model.inc.c" -#include "levels/castle_inside/areas/1/24/model.inc.c" -#include "levels/castle_inside/areas/1/25/model.inc.c" -#include "levels/castle_inside/areas/1/26/model.inc.c" -#include "levels/castle_inside/trap_door/model.inc.c" -#include "levels/castle_inside/star_door/model.inc.c" -#include "levels/castle_inside/areas/2/1/model.inc.c" -#include "levels/castle_inside/areas/2/2/model.inc.c" -#include "levels/castle_inside/areas/2/3/model.inc.c" -#include "levels/castle_inside/areas/2/4/model.inc.c" -#include "levels/castle_inside/areas/2/5/model.inc.c" -#include "levels/castle_inside/areas/2/6/model.inc.c" -#include "levels/castle_inside/areas/2/7/model.inc.c" -#include "levels/castle_inside/areas/2/8/model.inc.c" -#include "levels/castle_inside/areas/2/9/model.inc.c" -#include "levels/castle_inside/areas/2/pendulum/model.inc.c" -#include "levels/castle_inside/areas/2/10/model.inc.c" -#include "levels/castle_inside/areas/2/11/model.inc.c" -#include "levels/castle_inside/areas/2/12/model.inc.c" -#include "levels/castle_inside/areas/2/13/model.inc.c" -#include "levels/castle_inside/areas/2/14/model.inc.c" -#include "levels/castle_inside/areas/2/15/model.inc.c" -#include "levels/castle_inside/clock_minute_hand/model.inc.c" -#include "levels/castle_inside/clock_hour_hand/model.inc.c" -#include "levels/castle_inside/areas/3/1/model.inc.c" -#include "levels/castle_inside/areas/3/2/model.inc.c" -#include "levels/castle_inside/areas/3/3/model.inc.c" -#include "levels/castle_inside/areas/3/4/model.inc.c" -#include "levels/castle_inside/areas/3/5/model.inc.c" -#include "levels/castle_inside/areas/3/6/model.inc.c" -#include "levels/castle_inside/areas/3/7/model.inc.c" -#include "levels/castle_inside/areas/3/8/model.inc.c" -#include "levels/castle_inside/areas/3/9/model.inc.c" -#include "levels/castle_inside/areas/3/10/model.inc.c" -#include "levels/castle_inside/areas/3/11/model.inc.c" -#include "levels/castle_inside/water_level_pillar/model.inc.c" -#include "levels/castle_inside/areas/1/collision.inc.c" -#include "levels/castle_inside/areas/2/collision.inc.c" -#include "levels/castle_inside/areas/3/collision.inc.c" -#include "levels/castle_inside/areas/1/room.inc.c" -#include "levels/castle_inside/areas/2/room.inc.c" -#include "levels/castle_inside/areas/3/room.inc.c" -#include "levels/castle_inside/trap_door/collision.inc.c" -#include "levels/castle_inside/star_door/collision.inc.c" -#include "levels/castle_inside/water_level_pillar/collision.inc.c" #include "levels/castle_inside/areas/3/trajectory.inc.c" #include "levels/castle_inside/areas/3/movtext.inc.c" + +#include "levels/castle_inside/leveldata.inc.c" diff --git a/levels/castle_inside/leveldata.inc.c b/levels/castle_inside/leveldata.inc.c new file mode 100644 index 0000000000..fb66045bdc --- /dev/null +++ b/levels/castle_inside/leveldata.inc.c @@ -0,0 +1,57 @@ +#include "levels/castle_inside/areas/1/1/model.inc.c" +#include "levels/castle_inside/areas/1/2/model.inc.c" +#include "levels/castle_inside/areas/1/3/model.inc.c" +#include "levels/castle_inside/areas/1/4/model.inc.c" +#include "levels/castle_inside/areas/1/6/model.inc.c" +#include "levels/castle_inside/areas/1/7/model.inc.c" +#include "levels/castle_inside/areas/1/8/model.inc.c" +#include "levels/castle_inside/areas/1/9/model.inc.c" +#include "levels/castle_inside/areas/1/10/model.inc.c" +#include "levels/castle_inside/areas/1/11/model.inc.c" +#include "levels/castle_inside/areas/1/12/model.inc.c" +#include "levels/castle_inside/areas/1/13/model.inc.c" +#include "levels/castle_inside/areas/1/14/model.inc.c" +#include "levels/castle_inside/areas/1/15/model.inc.c" +#include "levels/castle_inside/areas/1/16/model.inc.c" +#include "levels/castle_inside/areas/1/17/model.inc.c" +#include "levels/castle_inside/areas/1/18/model.inc.c" +#include "levels/castle_inside/areas/1/19/model.inc.c" +#include "levels/castle_inside/areas/1/20/model.inc.c" +#include "levels/castle_inside/areas/1/21/model.inc.c" +#include "levels/castle_inside/areas/1/22/model.inc.c" +#include "levels/castle_inside/areas/1/23/model.inc.c" +#include "levels/castle_inside/areas/1/24/model.inc.c" +#include "levels/castle_inside/areas/1/25/model.inc.c" +#include "levels/castle_inside/areas/1/26/model.inc.c" +#include "levels/castle_inside/areas/2/1/model.inc.c" +#include "levels/castle_inside/areas/2/2/model.inc.c" +#include "levels/castle_inside/areas/2/3/model.inc.c" +#include "levels/castle_inside/areas/2/4/model.inc.c" +#include "levels/castle_inside/areas/2/5/model.inc.c" +#include "levels/castle_inside/areas/2/6/model.inc.c" +#include "levels/castle_inside/areas/2/7/model.inc.c" +#include "levels/castle_inside/areas/2/8/model.inc.c" +#include "levels/castle_inside/areas/2/9/model.inc.c" +#include "levels/castle_inside/areas/2/10/model.inc.c" +#include "levels/castle_inside/areas/2/11/model.inc.c" +#include "levels/castle_inside/areas/2/12/model.inc.c" +#include "levels/castle_inside/areas/2/13/model.inc.c" +#include "levels/castle_inside/areas/2/14/model.inc.c" +#include "levels/castle_inside/areas/2/15/model.inc.c" +#include "levels/castle_inside/areas/3/1/model.inc.c" +#include "levels/castle_inside/areas/3/2/model.inc.c" +#include "levels/castle_inside/areas/3/3/model.inc.c" +#include "levels/castle_inside/areas/3/4/model.inc.c" +#include "levels/castle_inside/areas/3/5/model.inc.c" +#include "levels/castle_inside/areas/3/6/model.inc.c" +#include "levels/castle_inside/areas/3/7/model.inc.c" +#include "levels/castle_inside/areas/3/8/model.inc.c" +#include "levels/castle_inside/areas/3/9/model.inc.c" +#include "levels/castle_inside/areas/3/10/model.inc.c" +#include "levels/castle_inside/areas/3/11/model.inc.c" +#include "levels/castle_inside/areas/1/collision.inc.c" +#include "levels/castle_inside/areas/2/collision.inc.c" +#include "levels/castle_inside/areas/3/collision.inc.c" +#include "levels/castle_inside/areas/1/room.inc.c" +#include "levels/castle_inside/areas/2/room.inc.c" +#include "levels/castle_inside/areas/3/room.inc.c" diff --git a/levels/castle_inside/script.c b/levels/castle_inside/script.c index dd92e900db..d29ceed281 100644 --- a/levels/castle_inside/script.c +++ b/levels/castle_inside/script.c @@ -278,33 +278,10 @@ static const LevelScript script_castle_inside_area_3_objects_2[] = { const LevelScript level_castle_inside_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _castle_inside_segment_7SegmentRomStart, _castle_inside_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _inside_yay0SegmentRomStart, _inside_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group15_yay0SegmentRomStart, _group15_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group15_geoSegmentRomStart, _group15_geoSegmentRomEnd), +#include "levels/castle_inside/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_16), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_BOWSER_TRAP, castle_geo_000F18), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WATER_LEVEL_PILLAR, castle_geo_001940), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CLOCK_MINUTE_HAND, castle_geo_001530), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CLOCK_HOUR_HAND, castle_geo_001548), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CLOCK_PENDULUM, castle_geo_001518), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR, castle_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WOODEN_DOOR, wooden_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_METAL_DOOR, metal_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_CASTLE_DOOR_UNUSED, castle_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_WOODEN_DOOR_UNUSED, wooden_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_0_STARS, castle_door_0_star_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_1_STAR, castle_door_1_star_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_DOOR_3_STARS, castle_door_3_stars_geo), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_KEY_DOOR, key_door_geo), - // The different sets of star doors all use different model IDs, despite them all loading the same geo layout. - // It is possible that star doors were originally going to have numbers on them, similar to the other locked doors. - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_30_STARS, castle_geo_000F00), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_8_STARS, castle_geo_000F00), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_50_STARS, castle_geo_000F00), - LOAD_MODEL_FROM_GEO(MODEL_CASTLE_STAR_DOOR_70_STARS, castle_geo_000F00), +#include "levels/castle_inside/areas/script_vanilla.inc.c" AREA(/*index*/ 1, castle_geo_001400), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -5513, 717, -4324, /*angle*/ 0, 45, 0, /*behParam*/ 0x00140000, /*beh*/ bhvCastleFloorTrap), diff --git a/levels/castle_inside/texture.inc.c b/levels/castle_inside/texture.inc.c index 6ffde7f95c..0db4aa9fbb 100644 --- a/levels/castle_inside/texture.inc.c +++ b/levels/castle_inside/texture.inc.c @@ -22,21 +22,6 @@ ALIGNED8 static const Texture inside_castle_seg7_texture_07003000[] = { #include "levels/castle_inside/4.rgba16.inc.c" }; -// 0x07003800 - 0x07004800 -ALIGNED8 static const Texture inside_castle_seg7_texture_07003800[] = { -#include "levels/castle_inside/5.rgba16.inc.c" -}; - -// 0x07004800 - 0x07005800 -ALIGNED8 static const Texture inside_castle_seg7_texture_07004800[] = { -#include "levels/castle_inside/6.rgba16.inc.c" -}; - -// 0x07005800 - 0x07006000 -ALIGNED8 static const Texture inside_castle_seg7_texture_07005800[] = { -#include "levels/castle_inside/7.rgba16.inc.c" -}; - // 0x07006000 - 0x07006800 ALIGNED8 static const Texture inside_castle_seg7_texture_peach_top_left[] = { #include "levels/castle_inside/8.rgba16.inc.c" diff --git a/levels/ccm/areas/script_vanilla.inc.c b/levels/ccm/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..5fa055b9be --- /dev/null +++ b/levels/ccm/areas/script_vanilla.inc.c @@ -0,0 +1,11 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_8), +JUMP_LINK(script_func_global_17), +JUMP_LINK(script_func_vo_ccm), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ccm_geo_00042C), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ccm_geo_00045C), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ccm_geo_000494), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ccm_geo_0004BC), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ccm_geo_0004E4), +LOAD_MODEL_FROM_GEO(MODEL_CCM_CABIN_DOOR, cabin_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_CCM_SNOW_TREE, snow_tree_geo), diff --git a/levels/ccm/areas/script_vanilla_load.inc.c b/levels/ccm/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..f8b6af4235 --- /dev/null +++ b/levels/ccm/areas/script_vanilla_load.inc.c @@ -0,0 +1,10 @@ +LOAD_YAY0( /*seg*/ 0x07, _ccm_segment_7SegmentRomStart, _ccm_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(ccm, snow), +LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _ccm_skybox_yay0SegmentRomStart, _ccm_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group7_yay0SegmentRomStart, _group7_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group7_geoSegmentRomStart, _group7_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group16_yay0SegmentRomStart, _group16_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group16_geoSegmentRomStart, _group16_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/ccm/geo.c b/levels/ccm/geo.c index aaa0432578..1f0d93a890 100644 --- a/levels/ccm/geo.c +++ b/levels/ccm/geo.c @@ -13,13 +13,4 @@ #include "levels/ccm/header.h" -#include "levels/ccm/ropeway_lift/geo.inc.c" -#include "levels/ccm/snowman_base/geo.inc.c" -#include "levels/ccm/snowman_head/geo.inc.c" -#include "levels/ccm/areas/1/6/geo.inc.c" -#include "levels/ccm/areas/1/7/geo.inc.c" -#include "levels/ccm/areas/1/8/geo.inc.c" -#include "levels/ccm/areas/1/9/geo.inc.c" -#include "levels/ccm/areas/1/10/geo.inc.c" -#include "levels/ccm/areas/1/geo.inc.c" -#include "levels/ccm/areas/2/geo.inc.c" +#include "levels/ccm/geo.inc.c" diff --git a/levels/ccm/geo.inc.c b/levels/ccm/geo.inc.c new file mode 100644 index 0000000000..549af901fe --- /dev/null +++ b/levels/ccm/geo.inc.c @@ -0,0 +1,7 @@ +#include "levels/ccm/areas/1/6/geo.inc.c" +#include "levels/ccm/areas/1/7/geo.inc.c" +#include "levels/ccm/areas/1/8/geo.inc.c" +#include "levels/ccm/areas/1/9/geo.inc.c" +#include "levels/ccm/areas/1/10/geo.inc.c" +#include "levels/ccm/areas/1/geo.inc.c" +#include "levels/ccm/areas/2/geo.inc.c" diff --git a/levels/ccm/header.h b/levels/ccm/header.h index a4e7a83d85..7a904ef4c6 100644 --- a/levels/ccm/header.h +++ b/levels/ccm/header.h @@ -4,55 +4,14 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout ccm_geo_0003D0[]; -extern const GeoLayout ccm_geo_0003F0[]; -extern const GeoLayout ccm_geo_00040C[]; -extern const GeoLayout ccm_geo_00042C[]; -extern const GeoLayout ccm_geo_00045C[]; -extern const GeoLayout ccm_geo_000494[]; -extern const GeoLayout ccm_geo_0004BC[]; -extern const GeoLayout ccm_geo_0004E4[]; -extern const GeoLayout ccm_geo_00051C[]; -extern const GeoLayout ccm_geo_0005E8[]; - -// leveldata -extern const Gfx ccm_seg7_dl_0700B090[]; -extern const Gfx ccm_seg7_dl_0700B1D8[]; -extern const Gfx ccm_seg7_dl_0700C380[]; -extern const Gfx ccm_seg7_dl_0700D578[]; -extern const Gfx ccm_seg7_dl_0700DDF0[]; -extern const Gfx ccm_seg7_dl_0700E708[]; -extern const Gfx ccm_seg7_dl_0700E970[]; -extern const Gfx ccm_seg7_dl_0700F440[]; -extern const Gfx ccm_seg7_dl_0700F650[]; -extern const Gfx ccm_seg7_dl_0700F780[]; -extern const Gfx ccm_seg7_dl_0700FB00[]; -extern const Gfx ccm_seg7_dl_0700FD08[]; -extern const Gfx ccm_seg7_dl_07010660[]; -extern const Gfx ccm_seg7_dl_070109D0[]; -extern const Gfx ccm_seg7_dl_07010B50[]; -extern const Gfx ccm_seg7_dl_07010F28[]; -extern const Gfx ccm_seg7_dl_070118B0[]; -extern const Gfx ccm_seg7_dl_07012BD8[]; -extern const Gfx ccm_seg7_dl_070136D0[]; -extern const Gfx ccm_seg7_dl_07013870[]; -extern const Collision ccm_seg7_area_1_collision[]; -extern const Collision ccm_seg7_collision_ropeway_lift[]; extern const Trajectory ccm_seg7_trajectory_snowman[]; extern const Trajectory ccm_seg7_trajectory_ropeway_lift[]; extern const struct MovtexQuadCollection ccm_movtex_penguin_puddle_water[]; -extern const Gfx ccm_seg7_dl_0701CE30[]; -extern const Gfx ccm_seg7_dl_0701E558[]; -extern const Gfx ccm_seg7_dl_0701E6B0[]; -extern const Gfx ccm_seg7_dl_0701FC78[]; -extern const Gfx ccm_seg7_dl_0701FD78[]; -extern const Gfx ccm_seg7_dl_0701FE60[]; -extern const Gfx ccm_seg7_dl_070207F0[]; -extern const Collision ccm_seg7_area_2_collision[]; extern const Trajectory ccm_seg7_trajectory_penguin_race[]; // script extern const LevelScript level_ccm_entry[]; +#include "levels/ccm/header.inc.h" + #endif diff --git a/levels/ccm/header.inc.h b/levels/ccm/header.inc.h new file mode 100644 index 0000000000..2aa6bb1928 --- /dev/null +++ b/levels/ccm/header.inc.h @@ -0,0 +1,36 @@ +// geo +extern const GeoLayout ccm_geo_00042C[]; +extern const GeoLayout ccm_geo_00045C[]; +extern const GeoLayout ccm_geo_000494[]; +extern const GeoLayout ccm_geo_0004BC[]; +extern const GeoLayout ccm_geo_0004E4[]; +extern const GeoLayout ccm_geo_00051C[]; +extern const GeoLayout ccm_geo_0005E8[]; + +// leveldata +extern const Gfx ccm_seg7_dl_0700B090[]; +extern const Gfx ccm_seg7_dl_0700B1D8[]; +extern const Gfx ccm_seg7_dl_0700C380[]; +extern const Gfx ccm_seg7_dl_0700D578[]; +extern const Gfx ccm_seg7_dl_0700DDF0[]; +extern const Gfx ccm_seg7_dl_0700E708[]; +extern const Gfx ccm_seg7_dl_0700E970[]; +extern const Gfx ccm_seg7_dl_0700F440[]; +extern const Gfx ccm_seg7_dl_0700F650[]; +extern const Gfx ccm_seg7_dl_0700F780[]; +extern const Gfx ccm_seg7_dl_0700FB00[]; +extern const Gfx ccm_seg7_dl_0700FD08[]; +extern const Gfx ccm_seg7_dl_07010660[]; +extern const Gfx ccm_seg7_dl_070109D0[]; +extern const Gfx ccm_seg7_dl_07010B50[]; +extern const Collision ccm_seg7_area_1_collision[]; +extern const MacroObject ccm_seg7_area_1_macro_objs[]; +extern const Gfx ccm_seg7_dl_0701CE30[]; +extern const Gfx ccm_seg7_dl_0701E558[]; +extern const Gfx ccm_seg7_dl_0701E6B0[]; +extern const Gfx ccm_seg7_dl_0701FC78[]; +extern const Gfx ccm_seg7_dl_0701FD78[]; +extern const Gfx ccm_seg7_dl_0701FE60[]; +extern const Gfx ccm_seg7_dl_070207F0[]; +extern const Collision ccm_seg7_area_2_collision[]; +extern const MacroObject ccm_seg7_area_2_macro_objs[]; diff --git a/levels/ccm/leveldata.c b/levels/ccm/leveldata.c index 9f70fc2fc8..f4790c58f2 100644 --- a/levels/ccm/leveldata.c +++ b/levels/ccm/leveldata.c @@ -5,37 +5,8 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/ccm/texture.inc.c" -#include "levels/ccm/areas/1/1/model.inc.c" -#include "levels/ccm/areas/1/2/model.inc.c" -#include "levels/ccm/areas/1/3/model.inc.c" -#include "levels/ccm/areas/1/4/model.inc.c" -#include "levels/ccm/areas/1/5/model.inc.c" -#include "levels/ccm/areas/1/6/1.inc.c" -#include "levels/ccm/areas/1/6/2.inc.c" -#include "levels/ccm/areas/1/7/1.inc.c" -#include "levels/ccm/areas/1/7/2.inc.c" -#include "levels/ccm/areas/1/7/3.inc.c" -#include "levels/ccm/areas/1/8/model.inc.c" -#include "levels/ccm/areas/1/9/model.inc.c" -#include "levels/ccm/areas/1/10/1.inc.c" -#include "levels/ccm/areas/1/10/2.inc.c" -#include "levels/ccm/areas/1/10/3.inc.c" -#include "levels/ccm/ropeway_lift/1.inc.c" -#include "levels/ccm/ropeway_lift/2.inc.c" -#include "levels/ccm/snowman_base/model.inc.c" -#include "levels/ccm/snowman_head/1.inc.c" -#include "levels/ccm/snowman_head/2.inc.c" -#include "levels/ccm/areas/1/collision.inc.c" -#include "levels/ccm/ropeway_lift/collision.inc.c" #include "levels/ccm/areas/1/trajectory.inc.c" #include "levels/ccm/areas/1/movtext.inc.c" -#include "levels/ccm/areas/2/1/model.inc.c" -#include "levels/ccm/areas/2/2/model.inc.c" -#include "levels/ccm/areas/2/3/model.inc.c" -#include "levels/ccm/areas/2/4/model.inc.c" -#include "levels/ccm/areas/2/5/model.inc.c" -#include "levels/ccm/areas/2/6/model.inc.c" -#include "levels/ccm/areas/2/7/model.inc.c" -#include "levels/ccm/areas/2/collision.inc.c" #include "levels/ccm/areas/2/trajectory.inc.c" + +#include "levels/ccm/leveldata.inc.c" diff --git a/levels/ccm/leveldata.inc.c b/levels/ccm/leveldata.inc.c new file mode 100644 index 0000000000..a2b10a9ac9 --- /dev/null +++ b/levels/ccm/leveldata.inc.c @@ -0,0 +1,26 @@ + +#include "levels/ccm/texture.inc.c" +#include "levels/ccm/areas/1/1/model.inc.c" +#include "levels/ccm/areas/1/2/model.inc.c" +#include "levels/ccm/areas/1/3/model.inc.c" +#include "levels/ccm/areas/1/4/model.inc.c" +#include "levels/ccm/areas/1/5/model.inc.c" +#include "levels/ccm/areas/1/6/1.inc.c" +#include "levels/ccm/areas/1/6/2.inc.c" +#include "levels/ccm/areas/1/7/1.inc.c" +#include "levels/ccm/areas/1/7/2.inc.c" +#include "levels/ccm/areas/1/7/3.inc.c" +#include "levels/ccm/areas/1/8/model.inc.c" +#include "levels/ccm/areas/1/9/model.inc.c" +#include "levels/ccm/areas/1/10/1.inc.c" +#include "levels/ccm/areas/1/10/2.inc.c" +#include "levels/ccm/areas/1/10/3.inc.c" +#include "levels/ccm/areas/1/collision.inc.c" +#include "levels/ccm/areas/2/1/model.inc.c" +#include "levels/ccm/areas/2/2/model.inc.c" +#include "levels/ccm/areas/2/3/model.inc.c" +#include "levels/ccm/areas/2/4/model.inc.c" +#include "levels/ccm/areas/2/5/model.inc.c" +#include "levels/ccm/areas/2/6/model.inc.c" +#include "levels/ccm/areas/2/7/model.inc.c" +#include "levels/ccm/areas/2/collision.inc.c" diff --git a/levels/ccm/script.c b/levels/ccm/script.c index 97d3242665..d29107e88e 100644 --- a/levels/ccm/script.c +++ b/levels/ccm/script.c @@ -161,31 +161,10 @@ static const LevelScript script_ccm_area_2_objects_1[] = { const LevelScript level_ccm_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _ccm_segment_7SegmentRomStart, _ccm_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _snow_yay0SegmentRomStart, _snow_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _ccm_skybox_yay0SegmentRomStart, _ccm_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group7_yay0SegmentRomStart, _group7_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group7_geoSegmentRomStart, _group7_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group16_yay0SegmentRomStart, _group16_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group16_geoSegmentRomStart, _group16_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/ccm/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_8), - JUMP_LINK(script_func_global_17), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ccm_geo_00042C), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ccm_geo_00045C), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ccm_geo_000494), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ccm_geo_0004BC), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ccm_geo_0004E4), - LOAD_MODEL_FROM_GEO(MODEL_CCM_CABIN_DOOR, cabin_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_CCM_SNOW_TREE, snow_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_CCM_ROPEWAY_LIFT, ccm_geo_0003D0), - LOAD_MODEL_FROM_GEO(MODEL_CCM_SNOWMAN_BASE, ccm_geo_0003F0), - LOAD_MODEL_FROM_GEO(MODEL_CCM_SNOWMAN_HEAD, ccm_geo_00040C), +#include "levels/ccm/areas/script_vanilla.inc.c" AREA(/*index*/ 1, ccm_geo_00051C), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -1512, 3560, -2305, /*angle*/ 0, 140, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/ccm/texture.inc.c b/levels/ccm/texture.inc.c index 94c95bf87a..fab24343e6 100644 --- a/levels/ccm/texture.inc.c +++ b/levels/ccm/texture.inc.c @@ -13,26 +13,11 @@ ALIGNED8 static const Texture ccm_seg7_texture_07000900[] = { #include "levels/ccm/2.rgba16.inc.c" }; -// 0x07001100 - 0x07001900 -ALIGNED8 static const Texture ccm_seg7_texture_07001100[] = { -#include "levels/ccm/3.rgba16.inc.c" -}; - // 0x07001900 - 0x07002100 ALIGNED8 static const Texture ccm_seg7_texture_07001900[] = { #include "levels/ccm/4.rgba16.inc.c" }; -// 0x07002100 - 0x07002900 -ALIGNED8 static const Texture ccm_seg7_texture_07002100[] = { -#include "levels/ccm/5.rgba16.inc.c" -}; - -// 0x07002900 - 0x07003100 -ALIGNED8 static const Texture ccm_seg7_texture_07002900[] = { -#include "levels/ccm/6.rgba16.inc.c" -}; - // 0x07003100 - 0x07003900 ALIGNED8 static const Texture ccm_seg7_texture_07003100[] = { #include "levels/ccm/7.rgba16.inc.c" diff --git a/levels/cotmc/areas/script_vanilla.inc.c b/levels/cotmc/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..27630a0dbf --- /dev/null +++ b/levels/cotmc/areas/script_vanilla.inc.c @@ -0,0 +1,3 @@ +JUMP_LINK(script_func_global_9), +JUMP_LINK(script_func_global_18), +JUMP_LINK(script_func_global_1), diff --git a/levels/cotmc/areas/script_vanilla_load.inc.c b/levels/cotmc/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..b6152f128f --- /dev/null +++ b/levels/cotmc/areas/script_vanilla_load.inc.c @@ -0,0 +1,8 @@ +LOAD_YAY0( /*seg*/ 0x07, _cotmc_segment_7SegmentRomStart, _cotmc_segment_7SegmentRomEnd), +LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _cave_yay0SegmentRomStart, _cave_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/cotmc/geo.c b/levels/cotmc/geo.c index 9deb6ef30b..e892137a42 100644 --- a/levels/cotmc/geo.c +++ b/levels/cotmc/geo.c @@ -13,4 +13,4 @@ #include "levels/cotmc/header.h" -#include "levels/cotmc/areas/1/geo.inc.c" +#include "levels/cotmc/geo.inc.c" diff --git a/levels/cotmc/geo.inc.c b/levels/cotmc/geo.inc.c new file mode 100644 index 0000000000..206f55adbf --- /dev/null +++ b/levels/cotmc/geo.inc.c @@ -0,0 +1 @@ +#include "levels/cotmc/areas/1/geo.inc.c" diff --git a/levels/cotmc/header.h b/levels/cotmc/header.h index b035854580..6c68ad05bd 100644 --- a/levels/cotmc/header.h +++ b/levels/cotmc/header.h @@ -3,20 +3,11 @@ #include "types.h" -// geo -extern const GeoLayout cotmc_geo_0001A0[]; - -// leveldata -extern const Gfx cotmc_seg7_dl_07007D48[]; -extern const Gfx cotmc_seg7_dl_0700A160[]; -extern const Gfx cotmc_seg7_dl_0700A4B8[]; -extern const Collision cotmc_seg7_collision_level[]; -extern const Gfx cotmc_dl_water_begin[]; -extern const Gfx cotmc_dl_water_end[]; extern Movtex cotmc_movtex_tris_water[]; -extern const Gfx cotmc_dl_water[]; // script extern const LevelScript level_cotmc_entry[]; +#include "levels/cotmc/header.inc.h" + #endif diff --git a/levels/cotmc/header.inc.h b/levels/cotmc/header.inc.h new file mode 100644 index 0000000000..14b7d897fb --- /dev/null +++ b/levels/cotmc/header.inc.h @@ -0,0 +1,12 @@ +// geo +extern const GeoLayout cotmc_geo_0001A0[]; + +// leveldata +extern const Gfx cotmc_seg7_dl_07007D48[]; +extern const Gfx cotmc_seg7_dl_0700A160[]; +extern const Gfx cotmc_seg7_dl_0700A4B8[]; +extern const Collision cotmc_seg7_collision_level[]; +extern const MacroObject cotmc_seg7_macro_objs[]; +extern const Gfx cotmc_dl_water_begin[]; +extern const Gfx cotmc_dl_water_end[]; +extern const Gfx cotmc_dl_water[]; diff --git a/levels/cotmc/leveldata.c b/levels/cotmc/leveldata.c index e24d46fd56..7fbdf5ae11 100644 --- a/levels/cotmc/leveldata.c +++ b/levels/cotmc/leveldata.c @@ -5,9 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/cotmc/texture.inc.c" -#include "levels/cotmc/areas/1/1/model.inc.c" -#include "levels/cotmc/areas/1/2/model.inc.c" -#include "levels/cotmc/areas/1/3/model.inc.c" -#include "levels/cotmc/areas/1/collision.inc.c" #include "levels/cotmc/movtext.inc.c" + +#include "levels/cotmc/leveldata.inc.c" diff --git a/levels/cotmc/leveldata.inc.c b/levels/cotmc/leveldata.inc.c new file mode 100644 index 0000000000..e2b6da0df7 --- /dev/null +++ b/levels/cotmc/leveldata.inc.c @@ -0,0 +1,5 @@ +#include "levels/cotmc/texture.inc.c" +#include "levels/cotmc/areas/1/1/model.inc.c" +#include "levels/cotmc/areas/1/2/model.inc.c" +#include "levels/cotmc/areas/1/3/model.inc.c" +#include "levels/cotmc/areas/1/collision.inc.c" diff --git a/levels/cotmc/script.c b/levels/cotmc/script.c index b1db1ebc7c..025dffe2d4 100644 --- a/levels/cotmc/script.c +++ b/levels/cotmc/script.c @@ -57,19 +57,10 @@ static const LevelScript script_cotmc_objects_2[] = { const LevelScript level_cotmc_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _cotmc_segment_7SegmentRomStart, _cotmc_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _cave_yay0SegmentRomStart, _cave_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/cotmc/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_9), - JUMP_LINK(script_func_global_18), - JUMP_LINK(script_func_global_1), +#include "levels/cotmc/areas/script_vanilla.inc.c" AREA(/*index*/ 1, cotmc_geo_0001A0), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -4185, 1020, -47, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), diff --git a/levels/ddd/areas/script_vanilla.inc.c b/levels/ddd/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..28310ca5dc --- /dev/null +++ b/levels/ddd/areas/script_vanilla.inc.c @@ -0,0 +1,4 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_5), +JUMP_LINK(script_func_global_14), +JUMP_LINK(script_func_vo_ddd), diff --git a/levels/ddd/areas/script_vanilla_load.inc.c b/levels/ddd/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..f994a76bd6 --- /dev/null +++ b/levels/ddd/areas/script_vanilla_load.inc.c @@ -0,0 +1,10 @@ +LOAD_YAY0( /*seg*/ 0x07, _ddd_segment_7SegmentRomStart, _ddd_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(ddd, water), +LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group4_geoSegmentRomStart, _group4_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/ddd/geo.c b/levels/ddd/geo.c index 8dbd49703b..79537f0445 100644 --- a/levels/ddd/geo.c +++ b/levels/ddd/geo.c @@ -13,8 +13,4 @@ #include "levels/ddd/header.h" -#include "levels/ddd/pole/geo.inc.c" -#include "levels/ddd/sub_door/geo.inc.c" -#include "levels/ddd/submarine/geo.inc.c" -#include "levels/ddd/areas/1/geo.inc.c" -#include "levels/ddd/areas/2/geo.inc.c" +#include "levels/ddd/geo.inc.c" diff --git a/levels/ddd/geo.inc.c b/levels/ddd/geo.inc.c new file mode 100644 index 0000000000..e67f129906 --- /dev/null +++ b/levels/ddd/geo.inc.c @@ -0,0 +1,2 @@ +#include "levels/ddd/areas/1/geo.inc.c" +#include "levels/ddd/areas/2/geo.inc.c" diff --git a/levels/ddd/header.h b/levels/ddd/header.h index 4b8252c467..0a506e12e6 100644 --- a/levels/ddd/header.h +++ b/levels/ddd/header.h @@ -4,38 +4,12 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout ddd_geo_000450[]; -extern const GeoLayout ddd_geo_000478[]; -extern const GeoLayout ddd_geo_0004A0[]; -extern const GeoLayout ddd_geo_0004C0[]; -extern const GeoLayout ddd_geo_000570[]; - -// leveldata -extern const Gfx ddd_seg7_dl_07004D48[]; -extern const Gfx ddd_seg7_dl_070057E8[]; -extern const Gfx ddd_seg7_dl_07005C40[]; -extern const Gfx ddd_seg7_dl_07005F78[]; -extern const Gfx ddd_seg7_dl_07007408[]; -extern const Gfx ddd_seg7_dl_07007CB8[]; -extern const Gfx ddd_seg7_dl_07008C48[]; -extern const Gfx ddd_seg7_dl_07008F80[]; -extern const Gfx ddd_seg7_dl_07009030[]; -extern const Gfx ddd_seg7_dl_07009120[]; -extern const Gfx ddd_seg7_dl_07009208[]; -extern const Gfx ddd_seg7_dl_0700AF10[]; -extern const Gfx ddd_seg7_dl_0700B068[]; -extern const Gfx ddd_seg7_dl_0700BAE0[]; -extern const Gfx ddd_seg7_dl_0700CE48[]; -extern const Gfx ddd_seg7_dl_0700D2A0[]; -extern const Collision ddd_seg7_area_1_collision[]; -extern const Collision ddd_seg7_area_2_collision[]; -extern const Collision ddd_seg7_collision_submarine[]; -extern const Collision ddd_seg7_collision_bowser_sub_door[]; extern const struct MovtexQuadCollection ddd_movtex_area1_water[]; extern const struct MovtexQuadCollection ddd_movtex_area2_water[]; // script extern const LevelScript level_ddd_entry[]; +#include "levels/ddd/header.inc.h" + #endif diff --git a/levels/ddd/header.inc.h b/levels/ddd/header.inc.h new file mode 100644 index 0000000000..b206e5502d --- /dev/null +++ b/levels/ddd/header.inc.h @@ -0,0 +1,19 @@ +// geo +extern const GeoLayout ddd_geo_0004C0[]; +extern const GeoLayout ddd_geo_000570[]; + +// leveldata +extern const Gfx ddd_seg7_dl_07004D48[]; +extern const Gfx ddd_seg7_dl_070057E8[]; +extern const Gfx ddd_seg7_dl_07005C40[]; +extern const Gfx ddd_seg7_dl_07005F78[]; +extern const Gfx ddd_seg7_dl_07007408[]; +extern const Gfx ddd_seg7_dl_07007CB8[]; +extern const Gfx ddd_seg7_dl_07008C48[]; +extern const Gfx ddd_seg7_dl_07008F80[]; +extern const Gfx ddd_seg7_dl_0700BAE0[]; +extern const Gfx ddd_seg7_dl_0700CE48[]; +extern const Collision ddd_seg7_area_1_collision[]; +extern const Collision ddd_seg7_area_2_collision[]; +extern const MacroObject ddd_seg7_area_1_macro_objs[]; +extern const MacroObject ddd_seg7_area_2_macro_objs[]; diff --git a/levels/ddd/leveldata.c b/levels/ddd/leveldata.c index 7326c7f4ec..d189cfd3eb 100644 --- a/levels/ddd/leveldata.c +++ b/levels/ddd/leveldata.c @@ -5,26 +5,7 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/ddd/texture.inc.c" -#include "levels/ddd/areas/1/1/model.inc.c" -#include "levels/ddd/areas/1/2/model.inc.c" -#include "levels/ddd/areas/1/3/model.inc.c" -#include "levels/ddd/areas/1/4/model.inc.c" -#include "levels/ddd/areas/2/1/model.inc.c" -#include "levels/ddd/areas/2/2/model.inc.c" -#include "levels/ddd/areas/2/3/model.inc.c" -#include "levels/ddd/areas/2/4/model.inc.c" -#include "levels/ddd/sub_door/1.inc.c" -#include "levels/ddd/sub_door/2.inc.c" -#include "levels/ddd/sub_door/3.inc.c" -#include "levels/ddd/submarine/1.inc.c" -#include "levels/ddd/submarine/2.inc.c" -#include "levels/ddd/areas/2/5/model.inc.c" -#include "levels/ddd/areas/2/6/model.inc.c" -#include "levels/ddd/pole/model.inc.c" -#include "levels/ddd/areas/1/collision.inc.c" -#include "levels/ddd/areas/2/collision.inc.c" -#include "levels/ddd/submarine/collision.inc.c" -#include "levels/ddd/sub_door/collision.inc.c" #include "levels/ddd/areas/1/movtext.inc.c" #include "levels/ddd/areas/2/movtext.inc.c" + +#include "levels/ddd/leveldata.inc.c" diff --git a/levels/ddd/leveldata.inc.c b/levels/ddd/leveldata.inc.c new file mode 100644 index 0000000000..2c6b1f003d --- /dev/null +++ b/levels/ddd/leveldata.inc.c @@ -0,0 +1,13 @@ +#include "levels/ddd/texture.inc.c" +#include "levels/ddd/areas/1/1/model.inc.c" +#include "levels/ddd/areas/1/2/model.inc.c" +#include "levels/ddd/areas/1/3/model.inc.c" +#include "levels/ddd/areas/1/4/model.inc.c" +#include "levels/ddd/areas/2/1/model.inc.c" +#include "levels/ddd/areas/2/2/model.inc.c" +#include "levels/ddd/areas/2/3/model.inc.c" +#include "levels/ddd/areas/2/4/model.inc.c" +#include "levels/ddd/areas/2/5/model.inc.c" +#include "levels/ddd/areas/2/6/model.inc.c" +#include "levels/ddd/areas/1/collision.inc.c" +#include "levels/ddd/areas/2/collision.inc.c" diff --git a/levels/ddd/script.c b/levels/ddd/script.c index e45433587b..9c3d810e66 100644 --- a/levels/ddd/script.c +++ b/levels/ddd/script.c @@ -138,24 +138,10 @@ static const LevelScript script_ddd_area_2_objects_3[] = { const LevelScript level_ddd_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _ddd_segment_7SegmentRomStart, _ddd_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _water_yay0SegmentRomStart, _water_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group4_geoSegmentRomStart, _group4_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/ddd/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_5), - JUMP_LINK(script_func_global_14), - LOAD_MODEL_FROM_GEO(MODEL_DDD_BOWSER_SUB_DOOR, ddd_geo_000478), - LOAD_MODEL_FROM_GEO(MODEL_DDD_BOWSER_SUB, ddd_geo_0004A0), - LOAD_MODEL_FROM_GEO(MODEL_DDD_POLE, ddd_geo_000450), +#include "levels/ddd/areas/script_vanilla.inc.c" AREA(/*index*/ 1, ddd_geo_0004C0), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3071, 3000, 0, /*angle*/ 0, 7, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/ddd/texture.inc.c b/levels/ddd/texture.inc.c index caa01f31d8..158ac64128 100644 --- a/levels/ddd/texture.inc.c +++ b/levels/ddd/texture.inc.c @@ -1,8 +1,3 @@ -// 0x07000000 - 0x07001000 -ALIGNED8 static const Texture ddd_seg7_texture_07000000[] = { -#include "levels/ddd/0.rgba16.inc.c" -}; - // 0x07001000 - 0x07001800 ALIGNED8 static const Texture ddd_seg7_texture_07001000[] = { #include "levels/ddd/1.rgba16.inc.c" @@ -17,8 +12,3 @@ ALIGNED8 static const Texture ddd_seg7_texture_07001800[] = { ALIGNED8 static const Texture ddd_seg7_texture_07002000[] = { #include "levels/ddd/3.rgba16.inc.c" }; - -// 0x07003000 - 0x07003800 -ALIGNED8 static const Texture ddd_seg7_texture_07003000[] = { -#include "levels/ddd/4.rgba16.inc.c" -}; diff --git a/levels/hmc/areas/script_vanilla.inc.c b/levels/hmc/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..8bcfe24f3b --- /dev/null +++ b/levels/hmc/areas/script_vanilla.inc.c @@ -0,0 +1,7 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_7), +JUMP_LINK(script_func_global_18), +JUMP_LINK(script_func_vo_hmc), +LOAD_MODEL_FROM_GEO(MODEL_HMC_WOODEN_DOOR, wooden_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_DOOR, metal_door_geo), +LOAD_MODEL_FROM_GEO(MODEL_HMC_HAZY_MAZE_DOOR, hazy_maze_door_geo), diff --git a/levels/hmc/areas/script_vanilla_load.inc.c b/levels/hmc/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..efc45c7c71 --- /dev/null +++ b/levels/hmc/areas/script_vanilla_load.inc.c @@ -0,0 +1,8 @@ +LOAD_YAY0( /*seg*/ 0x07, _hmc_segment_7SegmentRomStart, _hmc_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(hmc, cave), +LOAD_YAY0( /*seg*/ 0x05, _group6_yay0SegmentRomStart, _group6_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group6_geoSegmentRomStart, _group6_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/hmc/geo.c b/levels/hmc/geo.c index 48c7362305..8cc72f0bef 100644 --- a/levels/hmc/geo.c +++ b/levels/hmc/geo.c @@ -13,11 +13,4 @@ #include "levels/hmc/header.h" -#include "levels/hmc/grill_door/geo.inc.c" -#include "levels/hmc/rolling_rock/geo.inc.c" -#include "levels/hmc/rolling_rock_fragment_1/geo.inc.c" -#include "levels/hmc/rolling_rock_fragment_2/geo.inc.c" -#include "levels/hmc/arrow_platform/geo.inc.c" -#include "levels/hmc/arrow_platform_button/geo.inc.c" -#include "levels/hmc/elevator_platform/geo.inc.c" -#include "levels/hmc/areas/1/geo.inc.c" +#include "levels/hmc/geo.inc.c" diff --git a/levels/hmc/geo.inc.c b/levels/hmc/geo.inc.c new file mode 100644 index 0000000000..342908c778 --- /dev/null +++ b/levels/hmc/geo.inc.c @@ -0,0 +1 @@ +#include "levels/hmc/areas/1/geo.inc.c" diff --git a/levels/hmc/header.h b/levels/hmc/header.h index f75dac1368..7bbec7400c 100644 --- a/levels/hmc/header.h +++ b/levels/hmc/header.h @@ -4,84 +4,8 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout hmc_geo_000530[]; -extern const GeoLayout hmc_geo_000548[]; -extern const GeoLayout hmc_geo_000570[]; -extern const GeoLayout hmc_geo_000588[]; -extern const GeoLayout hmc_geo_0005A0[]; -extern const GeoLayout hmc_geo_0005B8[]; -extern const GeoLayout hmc_geo_0005D0[]; -extern const GeoLayout hmc_geo_0005E8[]; -extern const GeoLayout hmc_geo_000618[]; -extern const GeoLayout hmc_geo_000658[]; -extern const GeoLayout hmc_geo_0006A8[]; -extern const GeoLayout hmc_geo_0006E0[]; -extern const GeoLayout hmc_geo_000700[]; -extern const GeoLayout hmc_geo_000748[]; -extern const GeoLayout hmc_geo_000770[]; -extern const GeoLayout hmc_geo_000798[]; -extern const GeoLayout hmc_geo_0007F8[]; -extern const GeoLayout hmc_geo_000850[]; -extern const GeoLayout hmc_geo_0008D0[]; -extern const GeoLayout hmc_geo_000938[]; -extern const GeoLayout hmc_geo_000998[]; -extern const GeoLayout hmc_geo_000A18[]; -extern const GeoLayout hmc_geo_000A88[]; -extern const GeoLayout hmc_geo_000AE8[]; -extern const GeoLayout hmc_geo_000B48[]; -extern const GeoLayout hmc_geo_000B90[]; - -// leveldata -extern const Gfx hmc_seg7_dl_070078B0[]; -extern const Gfx hmc_seg7_dl_07007B50[]; -extern const Gfx hmc_seg7_dl_070080E8[]; -extern const Gfx hmc_seg7_dl_070093F0[]; -extern const Gfx hmc_seg7_dl_0700E448[]; -extern const Gfx hmc_seg7_dl_0700EF00[]; -extern const Gfx hmc_seg7_dl_0700F3E8[]; -extern const Gfx hmc_seg7_dl_0700FA40[]; -extern const Gfx hmc_seg7_dl_0700FEF0[]; -extern const Gfx hmc_seg7_dl_07010070[]; -extern const Gfx hmc_seg7_dl_07013CA8[]; -extern const Gfx hmc_seg7_dl_07013E80[]; -extern const Gfx hmc_seg7_dl_07014300[]; -extern const Gfx hmc_seg7_dl_07014B08[]; -extern const Gfx hmc_seg7_dl_07014C00[]; -extern const Gfx hmc_seg7_dl_07014E48[]; -extern const Gfx hmc_seg7_dl_070173A8[]; -extern const Gfx hmc_seg7_dl_07017C98[]; -extern const Gfx hmc_seg7_dl_07018200[]; -extern const Gfx hmc_seg7_dl_07019248[]; -extern const Gfx hmc_seg7_dl_07019368[]; -extern const Gfx hmc_seg7_dl_0701A080[]; -extern const Gfx hmc_seg7_dl_0701A400[]; -extern const Gfx hmc_seg7_dl_0701E820[]; -extern const Gfx hmc_seg7_dl_0701F1B0[]; -extern const Gfx hmc_seg7_dl_0701F690[]; -extern const Gfx hmc_seg7_dl_0701F818[]; -extern const Gfx hmc_seg7_dl_0701FD58[]; -extern const Gfx hmc_seg7_dl_0701FFF8[]; -extern const Gfx hmc_seg7_dl_07020FD0[]; -extern const Gfx hmc_seg7_dl_07021760[]; -extern const Gfx hmc_seg7_dl_07021BA0[]; -extern const Gfx hmc_seg7_dl_070228A0[]; -extern const Gfx hmc_seg7_dl_07022AA0[]; -extern const Gfx hmc_seg7_dl_07022DA0[]; -extern const Gfx hmc_seg7_dl_07023090[]; -extern const Gfx hmc_seg7_dl_07023BC8[]; -extern const Gfx hmc_seg7_dl_07023E10[]; -extern const Gfx hmc_seg7_dl_07024110[]; -extern const Gfx hmc_seg7_dl_07024268[]; -extern const Gfx hmc_seg7_dl_070242A0[]; extern const Texture *const hmc_seg7_painting_textures_07025518[]; extern struct Painting cotmc_painting; -extern const Collision hmc_seg7_collision_level[]; -extern const RoomData hmc_seg7_rooms[]; -extern const Collision hmc_seg7_collision_elevator[]; -extern const Collision hmc_seg7_collision_grill_door[]; -extern const Collision hmc_seg7_collision_controllable_platform[]; -extern const Collision hmc_seg7_collision_controllable_platform_sub[]; extern const Trajectory hmc_seg7_trajectory_checkerboard_platform[]; extern const struct MovtexQuadCollection hmc_movtex_dorrie_pool_water[]; extern const struct MovtexQuadCollection hmc_movtex_toxic_maze_mist[]; @@ -89,4 +13,6 @@ extern const struct MovtexQuadCollection hmc_movtex_toxic_maze_mist[]; // script extern const LevelScript level_hmc_entry[]; +#include "levels/hmc/header.inc.h" + #endif diff --git a/levels/hmc/header.inc.h b/levels/hmc/header.inc.h new file mode 100644 index 0000000000..05076f9ec2 --- /dev/null +++ b/levels/hmc/header.inc.h @@ -0,0 +1,57 @@ +// geo +extern const GeoLayout hmc_geo_0005E8[]; +extern const GeoLayout hmc_geo_000618[]; +extern const GeoLayout hmc_geo_000658[]; +extern const GeoLayout hmc_geo_0006A8[]; +extern const GeoLayout hmc_geo_0006E0[]; +extern const GeoLayout hmc_geo_000700[]; +extern const GeoLayout hmc_geo_000748[]; +extern const GeoLayout hmc_geo_000770[]; +extern const GeoLayout hmc_geo_000798[]; +extern const GeoLayout hmc_geo_0007F8[]; +extern const GeoLayout hmc_geo_000850[]; +extern const GeoLayout hmc_geo_0008D0[]; +extern const GeoLayout hmc_geo_000938[]; +extern const GeoLayout hmc_geo_000998[]; +extern const GeoLayout hmc_geo_000A18[]; +extern const GeoLayout hmc_geo_000A88[]; +extern const GeoLayout hmc_geo_000AE8[]; +extern const GeoLayout hmc_geo_000B48[]; +extern const GeoLayout hmc_geo_000B90[]; + +// leveldata +extern const Gfx hmc_seg7_dl_070078B0[]; +extern const Gfx hmc_seg7_dl_07007B50[]; +extern const Gfx hmc_seg7_dl_070080E8[]; +extern const Gfx hmc_seg7_dl_070093F0[]; +extern const Gfx hmc_seg7_dl_0700E448[]; +extern const Gfx hmc_seg7_dl_0700EF00[]; +extern const Gfx hmc_seg7_dl_0700F3E8[]; +extern const Gfx hmc_seg7_dl_0700FA40[]; +extern const Gfx hmc_seg7_dl_0700FEF0[]; +extern const Gfx hmc_seg7_dl_07010070[]; +extern const Gfx hmc_seg7_dl_07013CA8[]; +extern const Gfx hmc_seg7_dl_07013E80[]; +extern const Gfx hmc_seg7_dl_07014300[]; +extern const Gfx hmc_seg7_dl_07014B08[]; +extern const Gfx hmc_seg7_dl_07014C00[]; +extern const Gfx hmc_seg7_dl_07014E48[]; +extern const Gfx hmc_seg7_dl_070173A8[]; +extern const Gfx hmc_seg7_dl_07017C98[]; +extern const Gfx hmc_seg7_dl_07018200[]; +extern const Gfx hmc_seg7_dl_07019248[]; +extern const Gfx hmc_seg7_dl_07019368[]; +extern const Gfx hmc_seg7_dl_0701A080[]; +extern const Gfx hmc_seg7_dl_0701A400[]; +extern const Gfx hmc_seg7_dl_0701E820[]; +extern const Gfx hmc_seg7_dl_0701F1B0[]; +extern const Gfx hmc_seg7_dl_0701F690[]; +extern const Gfx hmc_seg7_dl_0701F818[]; +extern const Gfx hmc_seg7_dl_0701FD58[]; +extern const Gfx hmc_seg7_dl_07020FD0[]; +extern const Gfx hmc_seg7_dl_07021760[]; +extern const Gfx hmc_seg7_dl_07021BA0[]; +extern const Gfx hmc_seg7_dl_070228A0[]; +extern const Collision hmc_seg7_collision_level[]; +extern const MacroObject hmc_seg7_macro_objs[]; +extern const RoomData hmc_seg7_rooms[]; diff --git a/levels/hmc/leveldata.c b/levels/hmc/leveldata.c index 72d363d815..eafc5bbd9d 100644 --- a/levels/hmc/leveldata.c +++ b/levels/hmc/leveldata.c @@ -6,51 +6,8 @@ #include "make_const_nonconst.h" #include "levels/hmc/texture.inc.c" -#include "levels/hmc/areas/1/1/model.inc.c" -#include "levels/hmc/areas/1/2/model.inc.c" -#include "levels/hmc/areas/1/3/model.inc.c" -#include "levels/hmc/areas/1/4/model.inc.c" -#include "levels/hmc/areas/1/5/model.inc.c" -#include "levels/hmc/areas/1/6/model.inc.c" -#include "levels/hmc/areas/1/7/model.inc.c" -#include "levels/hmc/areas/1/8/model.inc.c" -#include "levels/hmc/areas/1/9/model.inc.c" -#include "levels/hmc/areas/1/10/model.inc.c" -#include "levels/hmc/areas/1/11/model.inc.c" -#include "levels/hmc/areas/1/12/model.inc.c" -#include "levels/hmc/areas/1/13/model.inc.c" -#include "levels/hmc/areas/1/14/model.inc.c" -#include "levels/hmc/areas/1/15/model.inc.c" -#include "levels/hmc/areas/1/16/model.inc.c" -#include "levels/hmc/areas/1/17/model.inc.c" -#include "levels/hmc/areas/1/18/model.inc.c" -#include "levels/hmc/areas/1/19/model.inc.c" -#include "levels/hmc/areas/1/20/model.inc.c" -#include "levels/hmc/areas/1/21/model.inc.c" -#include "levels/hmc/areas/1/22/model.inc.c" -#include "levels/hmc/areas/1/23/model.inc.c" -#include "levels/hmc/areas/1/24/model.inc.c" -#include "levels/hmc/areas/1/25/model.inc.c" -#include "levels/hmc/areas/1/26/model.inc.c" -#include "levels/hmc/areas/1/27/model.inc.c" -#include "levels/hmc/areas/1/28/model.inc.c" -#include "levels/hmc/areas/1/29/model.inc.c" -#include "levels/hmc/areas/1/30/model.inc.c" -#include "levels/hmc/areas/1/31/model.inc.c" -#include "levels/hmc/areas/1/32/model.inc.c" -#include "levels/hmc/elevator_platform/model.inc.c" -#include "levels/hmc/arrow_platform/model.inc.c" -#include "levels/hmc/arrow_platform_button/model.inc.c" -#include "levels/hmc/rolling_rock/model.inc.c" -#include "levels/hmc/rolling_rock_fragment_1/model.inc.c" -#include "levels/hmc/rolling_rock_fragment_2/model.inc.c" #include "levels/hmc/areas/1/painting.inc.c" -#include "levels/hmc/areas/1/collision.inc.c" -#include "levels/hmc/areas/1/room.inc.c" -#include "levels/hmc/elevator_platform/collision.inc.c" -#include "levels/hmc/grill_door/model.inc.c" -#include "levels/hmc/grill_door/collision.inc.c" // This is odd, but the model data for this is in the middle of area 1. I have to conclude it is an area local object, despite the fact it has collision. Let's hope this is the only oddity... -#include "levels/hmc/arrow_platform/collision.inc.c" -#include "levels/hmc/arrow_platform_button/collision.inc.c" #include "levels/hmc/areas/1/trajectory.inc.c" #include "levels/hmc/areas/1/movtext.inc.c" + +#include "levels/hmc/leveldata.inc.c" diff --git a/levels/hmc/leveldata.inc.c b/levels/hmc/leveldata.inc.c new file mode 100644 index 0000000000..936979a82a --- /dev/null +++ b/levels/hmc/leveldata.inc.c @@ -0,0 +1,34 @@ +#include "levels/hmc/areas/1/1/model.inc.c" +#include "levels/hmc/areas/1/2/model.inc.c" +#include "levels/hmc/areas/1/3/model.inc.c" +#include "levels/hmc/areas/1/4/model.inc.c" +#include "levels/hmc/areas/1/5/model.inc.c" +#include "levels/hmc/areas/1/6/model.inc.c" +#include "levels/hmc/areas/1/7/model.inc.c" +#include "levels/hmc/areas/1/8/model.inc.c" +#include "levels/hmc/areas/1/9/model.inc.c" +#include "levels/hmc/areas/1/10/model.inc.c" +#include "levels/hmc/areas/1/11/model.inc.c" +#include "levels/hmc/areas/1/12/model.inc.c" +#include "levels/hmc/areas/1/13/model.inc.c" +#include "levels/hmc/areas/1/14/model.inc.c" +#include "levels/hmc/areas/1/15/model.inc.c" +#include "levels/hmc/areas/1/16/model.inc.c" +#include "levels/hmc/areas/1/17/model.inc.c" +#include "levels/hmc/areas/1/18/model.inc.c" +#include "levels/hmc/areas/1/19/model.inc.c" +#include "levels/hmc/areas/1/20/model.inc.c" +#include "levels/hmc/areas/1/21/model.inc.c" +#include "levels/hmc/areas/1/22/model.inc.c" +#include "levels/hmc/areas/1/23/model.inc.c" +#include "levels/hmc/areas/1/24/model.inc.c" +#include "levels/hmc/areas/1/25/model.inc.c" +#include "levels/hmc/areas/1/26/model.inc.c" +#include "levels/hmc/areas/1/27/model.inc.c" +#include "levels/hmc/areas/1/28/model.inc.c" +#include "levels/hmc/areas/1/29/model.inc.c" +#include "levels/hmc/areas/1/30/model.inc.c" +#include "levels/hmc/areas/1/31/model.inc.c" +#include "levels/hmc/areas/1/32/model.inc.c" +#include "levels/hmc/areas/1/collision.inc.c" +#include "levels/hmc/areas/1/room.inc.c" diff --git a/levels/hmc/script.c b/levels/hmc/script.c index b2a863d217..7056af0304 100644 --- a/levels/hmc/script.c +++ b/levels/hmc/script.c @@ -174,29 +174,10 @@ static const LevelScript script_hmc_objects_4[] = { const LevelScript level_hmc_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _hmc_segment_7SegmentRomStart, _hmc_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _cave_yay0SegmentRomStart, _cave_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group6_yay0SegmentRomStart, _group6_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group6_geoSegmentRomStart, _group6_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/hmc/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_7), - JUMP_LINK(script_func_global_18), - LOAD_MODEL_FROM_GEO(MODEL_HMC_WOODEN_DOOR, wooden_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_DOOR, metal_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_HMC_HAZY_MAZE_DOOR, hazy_maze_door_geo), - LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_PLATFORM, hmc_geo_0005A0), - LOAD_MODEL_FROM_GEO(MODEL_HMC_METAL_ARROW_PLATFORM, hmc_geo_0005B8), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ELEVATOR_PLATFORM, hmc_geo_0005D0), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ROLLING_ROCK, hmc_geo_000548), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_PIECE, hmc_geo_000570), - LOAD_MODEL_FROM_GEO(MODEL_HMC_ROCK_SMALL_PIECE, hmc_geo_000588), - LOAD_MODEL_FROM_GEO(MODEL_HMC_RED_GRILLS, hmc_geo_000530), +#include "levels/hmc/areas/script_vanilla.inc.c" AREA(/*index*/ 1, hmc_geo_000B90), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7152, 3161, 7181, /*angle*/ 0, 135, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/hmc/texture.inc.c b/levels/hmc/texture.inc.c index 3bb680e557..23a84860d1 100644 --- a/levels/hmc/texture.inc.c +++ b/levels/hmc/texture.inc.c @@ -12,23 +12,3 @@ ALIGNED8 static const Texture hmc_seg7_texture_07001000[] = { ALIGNED8 static const Texture hmc_seg7_texture_07002000[] = { #include "levels/hmc/2.rgba16.inc.c" }; - -// 0x07003000 - 0x07003800 -ALIGNED8 static const Texture hmc_seg7_texture_07003000[] = { -#include "levels/hmc/3.rgba16.inc.c" -}; - -// 0x07003800 - 0x07004000 -ALIGNED8 static const Texture hmc_seg7_texture_07003800[] = { -#include "levels/hmc/4.rgba16.inc.c" -}; - -// 0x07004000 - 0x07004800 -ALIGNED8 static const Texture hmc_seg7_texture_07004000[] = { -#include "levels/hmc/5.rgba16.inc.c" -}; - -// 0x07004800 - 0x07005800 -ALIGNED8 static const Texture hmc_seg7_texture_07004800[] = { -#include "levels/hmc/6.rgba16.inc.c" -}; diff --git a/levels/jrb/areas/1/trajectory.inc.c b/levels/jrb/areas/1/trajectory.inc.c index e34cfd8957..e69de29bb2 100644 --- a/levels/jrb/areas/1/trajectory.inc.c +++ b/levels/jrb/areas/1/trajectory.inc.c @@ -1,24 +0,0 @@ -// 0x0700D20C - 0x0700D23E -const Trajectory jrb_seg7_trajectory_unagi_1[] = { - TRAJECTORY_POS(0, /*pos*/ 5300, -3800, 1200), - TRAJECTORY_POS(1, /*pos*/ 3700, -3600, 1700), - TRAJECTORY_POS(2, /*pos*/ 3400, -3400, 3500), - TRAJECTORY_POS(3, /*pos*/ 3900, -3600, 4400), - TRAJECTORY_POS(4, /*pos*/ 5300, -3800, 4400), - TRAJECTORY_POS(5, /*pos*/ 6200, -4000, 2700), - TRAJECTORY_END(), -}; - -// 0x0700D240 - 0x0700D28A -const Trajectory jrb_seg7_trajectory_unagi_2[] = { - TRAJECTORY_POS(0, /*pos*/ 5381, 0, 2758), - TRAJECTORY_POS(1, /*pos*/ 5803, -3130, 3036), - TRAJECTORY_POS(2, /*pos*/ 4876, -3045, 2706), - TRAJECTORY_POS(3, /*pos*/ 4313, -3246, 2736), - TRAJECTORY_POS(4, /*pos*/ 3792, -3413, 3668), - TRAJECTORY_POS(5, /*pos*/ 4971, -3130, 3688), - TRAJECTORY_POS(6, /*pos*/ 5392, -3130, 3326), - TRAJECTORY_POS(7, /*pos*/ 6341, -3130, 2450), - TRAJECTORY_POS(8, /*pos*/ 9431, -3130, 1400), - TRAJECTORY_END(), -}; diff --git a/levels/jrb/areas/script_vanilla.inc.c b/levels/jrb/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..0007c259ae --- /dev/null +++ b/levels/jrb/areas/script_vanilla.inc.c @@ -0,0 +1,4 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_5), +JUMP_LINK(script_func_global_14), +JUMP_LINK(script_func_vo_jrb), diff --git a/levels/jrb/areas/script_vanilla_load.inc.c b/levels/jrb/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..e5ab02c673 --- /dev/null +++ b/levels/jrb/areas/script_vanilla_load.inc.c @@ -0,0 +1,10 @@ +LOAD_YAY0( /*seg*/ 0x07, _jrb_segment_7SegmentRomStart, _jrb_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), +LOAD_VANILLA_OBJECTS(jrb, water), +LOAD_YAY0( /*seg*/ 0x0A, _clouds_skybox_yay0SegmentRomStart, _clouds_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group4_geoSegmentRomStart, _group4_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/jrb/geo.c b/levels/jrb/geo.c index d7d0f900b9..6c96d4059e 100644 --- a/levels/jrb/geo.c +++ b/levels/jrb/geo.c @@ -13,11 +13,4 @@ #include "levels/jrb/header.h" -#include "levels/jrb/falling_pillar/geo.inc.c" -#include "levels/jrb/falling_pillar_base/geo.inc.c" -#include "levels/jrb/rock/geo.inc.c" -#include "levels/jrb/floating_platform/geo.inc.c" -#include "levels/jrb/sliding_box/geo.inc.c" -#include "levels/jrb/wooden_ship/geo.inc.c" -#include "levels/jrb/areas/1/geo.inc.c" -#include "levels/jrb/areas/2/geo.inc.c" +#include "levels/jrb/geo.inc.c" diff --git a/levels/jrb/geo.inc.c b/levels/jrb/geo.inc.c new file mode 100644 index 0000000000..bd26e0a436 --- /dev/null +++ b/levels/jrb/geo.inc.c @@ -0,0 +1,2 @@ +#include "levels/jrb/areas/1/geo.inc.c" +#include "levels/jrb/areas/2/geo.inc.c" diff --git a/levels/jrb/header.h b/levels/jrb/header.h index 4102454139..af57b064e1 100644 --- a/levels/jrb/header.h +++ b/levels/jrb/header.h @@ -4,61 +4,13 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout jrb_geo_000900[]; -extern const GeoLayout jrb_geo_000918[]; -extern const GeoLayout jrb_geo_000930[]; -extern const GeoLayout jrb_geo_000948[]; -extern const GeoLayout jrb_geo_000960[]; -extern const GeoLayout jrb_geo_000978[]; -extern const GeoLayout jrb_geo_000990[]; -extern const GeoLayout jrb_geo_0009B0[]; -extern const GeoLayout jrb_geo_0009C8[]; -extern const GeoLayout jrb_geo_0009E8[]; -extern const GeoLayout jrb_geo_000A00[]; -extern const GeoLayout jrb_geo_000A18[]; -extern const GeoLayout jrb_geo_000AFC[]; - -// leveldata -extern const Gfx jrb_seg7_dl_07002FD0[]; -extern const Gfx jrb_seg7_dl_07004940[]; -extern const Gfx jrb_seg7_dl_07004C78[]; -extern const Gfx jrb_seg7_dl_070058C8[]; -extern const Gfx jrb_seg7_dl_070069B0[]; -extern const Gfx jrb_seg7_dl_07007570[]; -extern const Gfx jrb_seg7_dl_07007718[]; -extern const Gfx jrb_seg7_dl_07007AC8[]; -extern const Gfx jrb_seg7_dl_07007DC8[]; -extern const Gfx jrb_seg7_dl_070080F8[]; -extern const Gfx jrb_seg7_dl_07008FD8[]; -extern const Gfx jrb_seg7_dl_070090B0[]; -extern const Gfx jrb_seg7_dl_07009A58[]; -extern const Gfx jrb_seg7_dl_07009B30[]; -extern const Gfx jrb_seg7_dl_0700A608[]; -extern const Gfx jrb_seg7_dl_0700AC68[]; -extern const Gfx jrb_seg7_dl_0700AE48[]; -extern const Gfx jrb_seg7_dl_0700AFB0[]; -extern const Collision jrb_seg7_area_1_collision[]; -extern const Collision jrb_seg7_collision_rock_solid[]; -extern const Collision jrb_seg7_collision_floating_platform[]; -extern const Collision jrb_seg7_collision_floating_box[]; -extern const Collision jrb_seg7_collision_in_sunken_ship_3[]; -extern const Collision jrb_seg7_collision_in_sunken_ship[]; -extern const Collision jrb_seg7_collision_0700CEF0[]; -extern const Collision jrb_seg7_collision_in_sunken_ship_2[]; -extern const Collision jrb_seg7_collision_pillar_base[]; -extern const Collision jrb_seg7_collision_0700D1DC[]; -extern const Trajectory jrb_seg7_trajectory_unagi_1[]; -extern const Trajectory jrb_seg7_trajectory_unagi_2[]; extern const struct MovtexQuadCollection jrb_movtex_water[]; extern const struct MovtexQuadCollection jrb_movtex_initial_mist[]; -extern const Gfx jrb_seg7_dl_0700EF00[]; -extern const Gfx jrb_seg7_dl_0700FE48[]; -extern const Gfx jrb_seg7_dl_07010548[]; -extern const Collision jrb_seg7_area_2_collision[]; extern const struct MovtexQuadCollection jrb_movtex_sunken_ship_water[]; // script extern const LevelScript level_jrb_entry[]; +#include "levels/jrb/header.inc.h" + #endif diff --git a/levels/jrb/header.inc.h b/levels/jrb/header.inc.h new file mode 100644 index 0000000000..6a5e1ae56d --- /dev/null +++ b/levels/jrb/header.inc.h @@ -0,0 +1,19 @@ +// geo +extern const GeoLayout jrb_geo_000A18[]; +extern const GeoLayout jrb_geo_000AFC[]; + +// leveldata +extern const Gfx jrb_seg7_dl_07002FD0[]; +extern const Gfx jrb_seg7_dl_07004940[]; +extern const Gfx jrb_seg7_dl_07004C78[]; +extern const Gfx jrb_seg7_dl_070058C8[]; +extern const Gfx jrb_seg7_dl_070069B0[]; +extern const Gfx jrb_seg7_dl_07007570[]; +extern const Gfx jrb_seg7_dl_07007718[]; +extern const Collision jrb_seg7_area_1_collision[]; +extern const MacroObject jrb_seg7_area_1_macro_objs[]; +extern const Gfx jrb_seg7_dl_0700EF00[]; +extern const Gfx jrb_seg7_dl_0700FE48[]; +extern const Gfx jrb_seg7_dl_07010548[]; +extern const Collision jrb_seg7_area_2_collision[]; +extern const MacroObject jrb_seg7_area_2_macro_objs[]; diff --git a/levels/jrb/leveldata.c b/levels/jrb/leveldata.c index c0e435d34f..75c0ff14b6 100644 --- a/levels/jrb/leveldata.c +++ b/levels/jrb/leveldata.c @@ -5,31 +5,8 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/jrb/texture.inc.c" -#include "levels/jrb/areas/1/1/model.inc.c" -#include "levels/jrb/areas/1/2/model.inc.c" -#include "levels/jrb/areas/1/3/model.inc.c" -#include "levels/jrb/areas/1/4/model.inc.c" -#include "levels/jrb/areas/1/5/model.inc.c" -#include "levels/jrb/areas/1/6/model.inc.c" -#include "levels/jrb/areas/1/7/model.inc.c" -#include "levels/jrb/rock/model.inc.c" -#include "levels/jrb/floating_platform/model.inc.c" -#include "levels/jrb/sliding_box/model.inc.c" -#include "levels/jrb/wooden_ship/model.inc.c" -#include "levels/jrb/falling_pillar/model.inc.c" -#include "levels/jrb/falling_pillar_base/model.inc.c" -#include "levels/jrb/areas/1/collision.inc.c" -#include "levels/jrb/rock/collision.inc.c" -#include "levels/jrb/floating_platform/collision.inc.c" -#include "levels/jrb/sliding_box/collision.inc.c" -#include "levels/jrb/wooden_ship/collision.inc.c" -#include "levels/jrb/falling_pillar_base/collision.inc.c" -#include "levels/jrb/unused_lid/collision.inc.c" #include "levels/jrb/areas/1/trajectory.inc.c" #include "levels/jrb/areas/1/movtext.inc.c" -#include "levels/jrb/areas/2/1/model.inc.c" -#include "levels/jrb/areas/2/2/model.inc.c" -#include "levels/jrb/areas/2/3/model.inc.c" -#include "levels/jrb/areas/2/collision.inc.c" #include "levels/jrb/areas/2/movtext.inc.c" + +#include "levels/jrb/leveldata.inc.c" diff --git a/levels/jrb/leveldata.inc.c b/levels/jrb/leveldata.inc.c new file mode 100644 index 0000000000..c9f4214ff7 --- /dev/null +++ b/levels/jrb/leveldata.inc.c @@ -0,0 +1,13 @@ +#include "levels/jrb/texture.inc.c" +#include "levels/jrb/areas/1/1/model.inc.c" +#include "levels/jrb/areas/1/2/model.inc.c" +#include "levels/jrb/areas/1/3/model.inc.c" +#include "levels/jrb/areas/1/4/model.inc.c" +#include "levels/jrb/areas/1/5/model.inc.c" +#include "levels/jrb/areas/1/6/model.inc.c" +#include "levels/jrb/areas/1/7/model.inc.c" +#include "levels/jrb/areas/1/collision.inc.c" +#include "levels/jrb/areas/2/1/model.inc.c" +#include "levels/jrb/areas/2/2/model.inc.c" +#include "levels/jrb/areas/2/3/model.inc.c" +#include "levels/jrb/areas/2/collision.inc.c" diff --git a/levels/jrb/script.c b/levels/jrb/script.c index 787ae2e612..cb53e079f2 100644 --- a/levels/jrb/script.c +++ b/levels/jrb/script.c @@ -184,32 +184,10 @@ static const LevelScript script_jrb_area_2_objects_1[] = { const LevelScript level_jrb_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _jrb_segment_7SegmentRomStart, _jrb_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _water_yay0SegmentRomStart, _water_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _clouds_skybox_yay0SegmentRomStart, _clouds_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group4_geoSegmentRomStart, _group4_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/jrb/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_5), - JUMP_LINK(script_func_global_14), - LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_LEFT_HALF_PART, jrb_geo_000978), - LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_BACK_LEFT_PART, jrb_geo_0009B0), - LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_RIGHT_HALF_PART, jrb_geo_0009E8), - LOAD_MODEL_FROM_GEO(MODEL_JRB_SHIP_BACK_RIGHT_PART, jrb_geo_000A00), - LOAD_MODEL_FROM_GEO(MODEL_JRB_SUNKEN_SHIP, jrb_geo_000990), - LOAD_MODEL_FROM_GEO(MODEL_JRB_SUNKEN_SHIP_BACK, jrb_geo_0009C8), - LOAD_MODEL_FROM_GEO(MODEL_JRB_ROCK, jrb_geo_000930), - LOAD_MODEL_FROM_GEO(MODEL_JRB_SLIDING_BOX, jrb_geo_000960), - LOAD_MODEL_FROM_GEO(MODEL_JRB_FALLING_PILLAR, jrb_geo_000900), - LOAD_MODEL_FROM_GEO(MODEL_JRB_FALLING_PILLAR_BASE, jrb_geo_000918), - LOAD_MODEL_FROM_GEO(MODEL_JRB_FLOATING_PLATFORM, jrb_geo_000948), +#include "levels/jrb/areas/script_vanilla.inc.c" AREA(/*index*/ 1, jrb_geo_000A18), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6750, 2126, 1482, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/jrb/texture.inc.c b/levels/jrb/texture.inc.c index 731cfe3d5b..2aefaa5445 100644 --- a/levels/jrb/texture.inc.c +++ b/levels/jrb/texture.inc.c @@ -7,13 +7,3 @@ ALIGNED8 static const Texture jrb_seg7_texture_07000000[] = { ALIGNED8 static const Texture jrb_seg7_texture_07000800[] = { #include "levels/jrb/1.rgba16.inc.c" }; - -// 0x07001800 - 0x07002000 -ALIGNED8 static const Texture jrb_seg7_texture_07001800[] = { -#include "levels/jrb/2.rgba16.inc.c" -}; - -// 0x07002000 - 0x07002800 -ALIGNED8 static const Texture jrb_seg7_texture_07002000[] = { -#include "levels/jrb/3.rgba16.inc.c" -}; diff --git a/levels/lll/areas/script_vanilla.inc.c b/levels/lll/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..ee587e90ad --- /dev/null +++ b/levels/lll/areas/script_vanilla.inc.c @@ -0,0 +1,15 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_3), +JUMP_LINK(script_func_global_18), +JUMP_LINK(script_func_vo_lll), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, lll_geo_0009E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, lll_geo_0009F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, lll_geo_000A10), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, lll_geo_000A28), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, lll_geo_000A40), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, lll_geo_000A60), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, lll_geo_000A90), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, lll_geo_000AA8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, lll_geo_000AC0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, lll_geo_000AD8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, lll_geo_000AF0), diff --git a/levels/lll/areas/script_vanilla_load.inc.c b/levels/lll/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..d60866ef55 --- /dev/null +++ b/levels/lll/areas/script_vanilla_load.inc.c @@ -0,0 +1,10 @@ +LOAD_YAY0( /*seg*/ 0x07, _lll_segment_7SegmentRomStart, _lll_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(lll, fire), +LOAD_YAY0( /*seg*/ 0x0A, _bitfs_skybox_yay0SegmentRomStart, _bitfs_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group2_geoSegmentRomStart, _group2_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/lll/geo.c b/levels/lll/geo.c index 43b6dfe466..a62056cc98 100644 --- a/levels/lll/geo.c +++ b/levels/lll/geo.c @@ -13,32 +13,4 @@ #include "levels/lll/header.h" -#include "levels/lll/areas/1/4/geo.inc.c" -#include "levels/lll/areas/1/5/geo.inc.c" -#include "levels/lll/areas/1/6/geo.inc.c" -#include "levels/lll/areas/1/7/geo.inc.c" -#include "levels/lll/areas/1/8/geo.inc.c" -#include "levels/lll/areas/1/9/geo.inc.c" -#include "levels/lll/areas/1/10/geo.inc.c" -#include "levels/lll/areas/1/11/geo.inc.c" -#include "levels/lll/areas/1/12/geo.inc.c" -#include "levels/lll/areas/1/13/geo.inc.c" -#include "levels/lll/areas/1/14/geo.inc.c" -#include "levels/lll/areas/1/15/geo.inc.c" -#include "levels/lll/moving_octagonal_mesh_platform/geo.inc.c" -#include "levels/lll/drawbridge_part/geo.inc.c" -#include "levels/lll/rotating_block_fire_bars/geo.inc.c" -#include "levels/lll/wooden_float_small/geo.inc.c" -#include "levels/lll/wooden_float_large/geo.inc.c" -#include "levels/lll/collapsing_wooden_platform/geo.inc.c" -#include "levels/lll/long_wooden_bridge/geo.inc.c" -#include "levels/lll/rotating_hexagonal_ring/geo.inc.c" -#include "levels/lll/sinking_rectangular_platform/geo.inc.c" -#include "levels/lll/sinking_square_platform/geo.inc.c" -#include "levels/lll/tilting_square_platform/geo.inc.c" -#include "levels/lll/puzzle_piece/geo.inc.c" -#include "levels/lll/sinking_rock_block/geo.inc.c" -#include "levels/lll/rolling_log/geo.inc.c" -#include "levels/lll/areas/1/geo.inc.c" -#include "levels/lll/volcano_falling_trap/geo.inc.c" -#include "levels/lll/areas/2/geo.inc.c" +#include "levels/lll/geo.inc.c" diff --git a/levels/lll/geo.inc.c b/levels/lll/geo.inc.c new file mode 100644 index 0000000000..114818704f --- /dev/null +++ b/levels/lll/geo.inc.c @@ -0,0 +1,13 @@ +#include "levels/lll/areas/1/4/geo.inc.c" +#include "levels/lll/areas/1/5/geo.inc.c" +#include "levels/lll/areas/1/6/geo.inc.c" +#include "levels/lll/areas/1/7/geo.inc.c" +#include "levels/lll/areas/1/8/geo.inc.c" +#include "levels/lll/areas/1/9/geo.inc.c" +#include "levels/lll/areas/1/11/geo.inc.c" +#include "levels/lll/areas/1/12/geo.inc.c" +#include "levels/lll/areas/1/13/geo.inc.c" +#include "levels/lll/areas/1/14/geo.inc.c" +#include "levels/lll/areas/1/15/geo.inc.c" +#include "levels/lll/areas/1/geo.inc.c" +#include "levels/lll/areas/2/geo.inc.c" diff --git a/levels/lll/header.h b/levels/lll/header.h index 94810884f2..c90b14a8ed 100644 --- a/levels/lll/header.h +++ b/levels/lll/header.h @@ -4,126 +4,15 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout lll_geo_0009E0[]; -extern const GeoLayout lll_geo_0009F8[]; -extern const GeoLayout lll_geo_000A10[]; -extern const GeoLayout lll_geo_000A28[]; -extern const GeoLayout lll_geo_000A40[]; -extern const GeoLayout lll_geo_000A60[]; -extern const GeoLayout lll_geo_000A78[]; -extern const GeoLayout lll_geo_000A90[]; -extern const GeoLayout lll_geo_000AA8[]; -extern const GeoLayout lll_geo_000AC0[]; -extern const GeoLayout lll_geo_000AD8[]; -extern const GeoLayout lll_geo_000AF0[]; -extern const GeoLayout lll_geo_000B08[]; -extern const GeoLayout lll_geo_000B20[]; -extern const GeoLayout lll_geo_000B38[]; -extern const GeoLayout lll_geo_000B50[]; -extern const GeoLayout lll_geo_000B68[]; -extern const GeoLayout lll_geo_000B80[]; -extern const GeoLayout lll_geo_000B98[]; -extern const GeoLayout lll_geo_000BB0[]; -extern const GeoLayout lll_geo_000BC8[]; -extern const GeoLayout lll_geo_000BE0[]; -extern const GeoLayout lll_geo_000BF8[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_1[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_2[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_3[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_4[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_5[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_6[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_7[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_8[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_9[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_10[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_11[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_12[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_13[]; -extern const GeoLayout lll_geo_bowser_puzzle_piece_14[]; -extern const GeoLayout lll_geo_000DD0[]; -extern const GeoLayout lll_geo_000DE8[]; -extern const GeoLayout lll_geo_000E00[]; -extern const GeoLayout lll_geo_000EA8[]; -extern const GeoLayout lll_geo_000EC0[]; - -// leveldata -extern const Gfx lll_seg7_dl_070134E0[]; -extern const Gfx lll_seg7_dl_070137C0[]; -extern const Gfx lll_seg7_dl_070138F8[]; -extern const Gfx lll_seg7_dl_07013D28[]; -extern const Gfx lll_seg7_dl_07014788[]; -extern const Gfx lll_seg7_dl_07014BD8[]; -extern const Gfx lll_seg7_dl_07015458[]; -extern const Gfx lll_seg7_dl_07015C88[]; -extern const Gfx lll_seg7_dl_07015E20[]; -extern const Gfx lll_seg7_dl_07016250[]; -extern const Gfx lll_seg7_dl_070165C8[]; -extern const Gfx lll_seg7_dl_07016B00[]; -extern const Gfx lll_seg7_dl_070174E0[]; -extern const Gfx lll_seg7_dl_070178A8[]; -extern const Gfx lll_seg7_dl_07017B50[]; -extern const Gfx lll_seg7_dl_07017F40[]; -extern const Gfx lll_seg7_dl_07018380[]; -extern const Gfx lll_seg7_dl_07018680[]; -extern const Gfx lll_seg7_dl_07018A30[]; -extern const Gfx lll_seg7_dl_07018C90[]; -extern const Gfx lll_seg7_dl_07018EF8[]; -extern const Gfx lll_seg7_dl_07019160[]; -extern const Gfx lll_seg7_dl_070193E0[]; -extern const Gfx lll_seg7_dl_07019A08[]; -extern const Gfx lll_seg7_dl_07019C08[]; -extern const Gfx lll_seg7_dl_0701A010[]; -extern const Gfx lll_seg7_dl_0701A1F0[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_1[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_2[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_3[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_4[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_5[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_6[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_7[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_8[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_9[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_10[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_11[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_12[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_13[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_14[]; -extern const Gfx lll_seg7_dl_bowser_puzzle_piece_shadow[]; -extern const Gfx lll_seg7_dl_0701A878[]; -extern const Gfx lll_seg7_dl_0701AD70[]; -extern const Collision lll_seg7_area_1_collision[]; -extern const Collision lll_seg7_collision_octagonal_moving_platform[]; -extern const Collision lll_seg7_collision_drawbridge[]; -extern const Collision lll_seg7_collision_rotating_fire_bars[]; -extern const Collision lll_seg7_collision_wood_piece[]; -extern const Collision lll_seg7_collision_0701D21C[]; -extern const Collision lll_seg7_collision_rotating_platform[]; -extern const Collision lll_seg7_collision_slow_tilting_platform[]; -extern const Collision lll_seg7_collision_sinking_pyramids[]; -extern const Collision lll_seg7_collision_inverted_pyramid[]; -extern const Collision lll_seg7_collision_puzzle_piece[]; -extern const Collision lll_seg7_collision_floating_block[]; -extern const Collision lll_seg7_collision_pitoune[]; -extern const Collision lll_seg7_collision_hexagonal_platform[]; -extern const Gfx lll_seg7_dl_070235C8[]; -extern const Gfx lll_seg7_dl_07024C18[]; -extern const Gfx lll_seg7_dl_070255D8[]; -extern const Gfx lll_seg7_dl_07025A48[]; -extern const Gfx lll_seg7_dl_07025BD8[]; -extern const Gfx lll_seg7_dl_07025EC0[]; -extern const Collision lll_seg7_area_2_collision[]; -extern const Collision lll_seg7_collision_falling_wall[]; extern const Trajectory lll_seg7_trajectory_0702856C[]; extern const Trajectory lll_seg7_trajectory_07028660[]; extern Movtex lll_movtex_tris_lava_floor[]; -extern const Gfx lll_dl_lava_floor[]; extern const struct MovtexQuadCollection lll_movtex_volcano_floor_lava[]; extern Movtex lll_movtex_tris_lavafall_volcano[]; -extern const Gfx lll_dl_lavafall_volcano[]; // script extern const LevelScript level_lll_entry[]; +#include "levels/lll/header.inc.h" + #endif diff --git a/levels/lll/header.inc.h b/levels/lll/header.inc.h new file mode 100644 index 0000000000..18b7a20572 --- /dev/null +++ b/levels/lll/header.inc.h @@ -0,0 +1,44 @@ +// geo +extern const GeoLayout lll_geo_0009E0[]; +extern const GeoLayout lll_geo_0009F8[]; +extern const GeoLayout lll_geo_000A10[]; +extern const GeoLayout lll_geo_000A28[]; +extern const GeoLayout lll_geo_000A40[]; +extern const GeoLayout lll_geo_000A60[]; +extern const GeoLayout lll_geo_000A90[]; +extern const GeoLayout lll_geo_000AA8[]; +extern const GeoLayout lll_geo_000AC0[]; +extern const GeoLayout lll_geo_000AD8[]; +extern const GeoLayout lll_geo_000AF0[]; +extern const GeoLayout lll_geo_000E00[]; +extern const GeoLayout lll_geo_000EA8[]; +extern const GeoLayout lll_geo_000EC0[]; + +// leveldata +extern const Gfx lll_seg7_dl_070134E0[]; +extern const Gfx lll_seg7_dl_070137C0[]; +extern const Gfx lll_seg7_dl_070138F8[]; +extern const Gfx lll_seg7_dl_07013D28[]; +extern const Gfx lll_seg7_dl_07014788[]; +extern const Gfx lll_seg7_dl_07014BD8[]; +extern const Gfx lll_seg7_dl_07015458[]; +extern const Gfx lll_seg7_dl_07015C88[]; +extern const Gfx lll_seg7_dl_07015E20[]; +extern const Gfx lll_seg7_dl_07016250[]; +extern const Gfx lll_seg7_dl_07016B00[]; +extern const Gfx lll_seg7_dl_070174E0[]; +extern const Gfx lll_seg7_dl_070178A8[]; +extern const Gfx lll_seg7_dl_07017B50[]; +extern const Gfx lll_seg7_dl_07017F40[]; + +extern const Collision lll_seg7_area_1_collision[]; +extern const MacroObject lll_seg7_area_1_macro_objs[]; +extern const Gfx lll_seg7_dl_070235C8[]; +extern const Gfx lll_seg7_dl_07024C18[]; +extern const Gfx lll_seg7_dl_070255D8[]; +extern const Gfx lll_seg7_dl_07025A48[]; +extern const Gfx lll_seg7_dl_07025BD8[]; +extern const Collision lll_seg7_area_2_collision[]; +extern const MacroObject lll_seg7_area_2_macro_objs[]; +extern const Gfx lll_dl_lava_floor[]; +extern const Gfx lll_dl_lavafall_volcano[]; diff --git a/levels/lll/leveldata.c b/levels/lll/leveldata.c index 7e549a166e..c9bef88ebe 100644 --- a/levels/lll/leveldata.c +++ b/levels/lll/leveldata.c @@ -5,58 +5,7 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/lll/texture.inc.c" -#include "levels/lll/areas/1/light.inc.c" // What the hell? Every level up until LLL hasn't needed this. Some models share lights, so we'll assume its a shared area file for level optimization. -#include "levels/lll/areas/1/1/model.inc.c" -#include "levels/lll/areas/1/2/model.inc.c" -#include "levels/lll/areas/1/3/model.inc.c" -#include "levels/lll/areas/1/4/model.inc.c" -#include "levels/lll/areas/1/5/model.inc.c" -#include "levels/lll/areas/1/6/model.inc.c" -#include "levels/lll/areas/1/7/model.inc.c" -#include "levels/lll/areas/1/8/model.inc.c" -#include "levels/lll/areas/1/9/model.inc.c" -#include "levels/lll/areas/1/10/model.inc.c" -#include "levels/lll/areas/1/11/model.inc.c" -#include "levels/lll/areas/1/12/model.inc.c" -#include "levels/lll/areas/1/13/model.inc.c" -#include "levels/lll/areas/1/14/model.inc.c" -#include "levels/lll/areas/1/15/model.inc.c" -#include "levels/lll/moving_octagonal_mesh_platform/model.inc.c" -#include "levels/lll/drawbridge_part/model.inc.c" -#include "levels/lll/rotating_block_fire_bars/model.inc.c" -#include "levels/lll/wooden_float_small/model.inc.c" -#include "levels/lll/wooden_float_large/model.inc.c" -#include "levels/lll/collapsing_wooden_platform/model.inc.c" -#include "levels/lll/long_wooden_bridge/model.inc.c" -#include "levels/lll/rotating_hexagonal_ring/model.inc.c" -#include "levels/lll/sinking_rectangular_platform/model.inc.c" -#include "levels/lll/sinking_square_platform/model.inc.c" -#include "levels/lll/tilting_square_platform/model.inc.c" -#include "levels/lll/puzzle_piece/model.inc.c" -#include "levels/lll/sinking_rock_block/model.inc.c" -#include "levels/lll/rolling_log/model.inc.c" -#include "levels/lll/areas/1/collision.inc.c" -#include "levels/lll/moving_octagonal_mesh_platform/collision.inc.c" -#include "levels/lll/drawbridge_part/collision.inc.c" -#include "levels/lll/rotating_block_fire_bars/collision.inc.c" -#include "levels/lll/wooden_float_small/collision.inc.c" -#include "levels/lll/collapsing_wooden_platform/collision.inc.c" -#include "levels/lll/rotating_hexagonal_ring/collision.inc.c" -#include "levels/lll/sinking_rectangular_platform/collision.inc.c" -#include "levels/lll/sinking_square_platform/collision.inc.c" -#include "levels/lll/tilting_square_platform/collision.inc.c" -#include "levels/lll/puzzle_piece/collision.inc.c" -#include "levels/lll/sinking_rock_block/collision.inc.c" -#include "levels/lll/rolling_log/collision.inc.c" -#include "levels/lll/areas/1/10/collision.inc.c" -#include "levels/lll/areas/2/1/model.inc.c" -#include "levels/lll/areas/2/2/model.inc.c" -#include "levels/lll/areas/2/3/model.inc.c" -#include "levels/lll/areas/2/4/model.inc.c" -#include "levels/lll/areas/2/5/model.inc.c" -#include "levels/lll/volcano_falling_trap/model.inc.c" -#include "levels/lll/areas/2/collision.inc.c" -#include "levels/lll/volcano_falling_trap/collision.inc.c" #include "levels/lll/areas/2/trajectory.inc.c" #include "levels/lll/areas/2/movtext.inc.c" + +#include "levels/lll/leveldata.inc.c" diff --git a/levels/lll/leveldata.inc.c b/levels/lll/leveldata.inc.c new file mode 100644 index 0000000000..d56ded605c --- /dev/null +++ b/levels/lll/leveldata.inc.c @@ -0,0 +1,23 @@ +#include "levels/lll/texture.inc.c" +#include "levels/lll/areas/1/light.inc.c" // What the hell? Every level up until LLL hasn't needed this. Some models share lights, so we'll assume its a shared area file for level optimization. +#include "levels/lll/areas/1/1/model.inc.c" +#include "levels/lll/areas/1/2/model.inc.c" +#include "levels/lll/areas/1/3/model.inc.c" +#include "levels/lll/areas/1/4/model.inc.c" +#include "levels/lll/areas/1/5/model.inc.c" +#include "levels/lll/areas/1/6/model.inc.c" +#include "levels/lll/areas/1/7/model.inc.c" +#include "levels/lll/areas/1/8/model.inc.c" +#include "levels/lll/areas/1/9/model.inc.c" +#include "levels/lll/areas/1/11/model.inc.c" +#include "levels/lll/areas/1/12/model.inc.c" +#include "levels/lll/areas/1/13/model.inc.c" +#include "levels/lll/areas/1/14/model.inc.c" +#include "levels/lll/areas/1/15/model.inc.c" +#include "levels/lll/areas/1/collision.inc.c" +#include "levels/lll/areas/2/1/model.inc.c" +#include "levels/lll/areas/2/2/model.inc.c" +#include "levels/lll/areas/2/3/model.inc.c" +#include "levels/lll/areas/2/4/model.inc.c" +#include "levels/lll/areas/2/5/model.inc.c" +#include "levels/lll/areas/2/collision.inc.c" diff --git a/levels/lll/script.c b/levels/lll/script.c index e8568c8088..c5d4175590 100644 --- a/levels/lll/script.c +++ b/levels/lll/script.c @@ -202,61 +202,10 @@ static const LevelScript script_lll_area_2_objects_2[] = { const LevelScript level_lll_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _lll_segment_7SegmentRomStart, _lll_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _fire_yay0SegmentRomStart, _fire_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _bitfs_skybox_yay0SegmentRomStart, _bitfs_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group2_geoSegmentRomStart, _group2_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/lll/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_3), - JUMP_LINK(script_func_global_18), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, lll_geo_0009E0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, lll_geo_0009F8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, lll_geo_000A10), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, lll_geo_000A28), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, lll_geo_000A40), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, lll_geo_000A60), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, lll_geo_000A90), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, lll_geo_000AA8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, lll_geo_000AC0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, lll_geo_000AD8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, lll_geo_000AF0), - LOAD_MODEL_FROM_GEO(MODEL_LLL_DRAWBRIDGE_PART, lll_geo_000B20), - LOAD_MODEL_FROM_GEO(MODEL_LLL_ROTATING_BLOCK_FIRE_BARS, lll_geo_000B38), - LOAD_MODEL_FROM_GEO(MODEL_LLL_ROTATING_HEXAGONAL_RING, lll_geo_000BB0), - LOAD_MODEL_FROM_GEO(MODEL_LLL_SINKING_RECTANGULAR_PLATFORM, lll_geo_000BC8), - LOAD_MODEL_FROM_GEO(MODEL_LLL_SINKING_SQUARE_PLATFORMS, lll_geo_000BE0), - LOAD_MODEL_FROM_GEO(MODEL_LLL_TILTING_SQUARE_PLATFORM, lll_geo_000BF8), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_1, lll_geo_bowser_puzzle_piece_1), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_2, lll_geo_bowser_puzzle_piece_2), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_3, lll_geo_bowser_puzzle_piece_3), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_4, lll_geo_bowser_puzzle_piece_4), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_5, lll_geo_bowser_puzzle_piece_5), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_6, lll_geo_bowser_puzzle_piece_6), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_7, lll_geo_bowser_puzzle_piece_7), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_8, lll_geo_bowser_puzzle_piece_8), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_9, lll_geo_bowser_puzzle_piece_9), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_10, lll_geo_bowser_puzzle_piece_10), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_11, lll_geo_bowser_puzzle_piece_11), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_12, lll_geo_bowser_puzzle_piece_12), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_13, lll_geo_bowser_puzzle_piece_13), - LOAD_MODEL_FROM_GEO(MODEL_LLL_BOWSER_PIECE_14, lll_geo_bowser_puzzle_piece_14), - LOAD_MODEL_FROM_GEO(MODEL_LLL_MOVING_OCTAGONAL_MESH_PLATFORM, lll_geo_000B08), - LOAD_MODEL_FROM_GEO(MODEL_LLL_SINKING_ROCK_BLOCK, lll_geo_000DD0), - LOAD_MODEL_FROM_GEO(MODEL_LLL_ROLLING_LOG, lll_geo_000DE8), - LOAD_MODEL_FROM_GEO(MODEL_LLL_ROTATING_HEXAGONAL_PLATFORM, lll_geo_000A78), - LOAD_MODEL_FROM_GEO(MODEL_LLL_WOOD_BRIDGE, lll_geo_000B50), - LOAD_MODEL_FROM_GEO(MODEL_LLL_LARGE_WOOD_BRIDGE, lll_geo_000B68), - LOAD_MODEL_FROM_GEO(MODEL_LLL_FALLING_PLATFORM, lll_geo_000B80), - LOAD_MODEL_FROM_GEO(MODEL_LLL_LARGE_FALLING_PLATFORM, lll_geo_000B98), - LOAD_MODEL_FROM_GEO(MODEL_LLL_VOLCANO_FALLING_TRAP, lll_geo_000EA8), +#include "levels/lll/areas/script_vanilla.inc.c" AREA(/*index*/ 1, lll_geo_000E00), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3839, 1154, 6272, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/lll/texture.inc.c b/levels/lll/texture.inc.c index 8d7e49f5bf..eb12d1a23a 100644 --- a/levels/lll/texture.inc.c +++ b/levels/lll/texture.inc.c @@ -1,18 +1,3 @@ -// 0x07000000 - 0x07000800 -ALIGNED8 static const Texture lll_seg7_texture_07000000[] = { -#include "levels/lll/0.rgba16.inc.c" -}; - -// 0x07000800 - 0x07001000 -ALIGNED8 static const Texture lll_seg7_texture_07000800[] = { -#include "levels/lll/1.rgba16.inc.c" -}; - -// 0x07001000 - 0x07001800 -ALIGNED8 static const Texture lll_seg7_texture_07001000[] = { -#include "levels/lll/2.rgba16.inc.c" -}; - // 0x07001800 - 0x07002000 UNUSED ALIGNED8 static const Texture lll_seg7_texture_07001800[] = { #include "levels/lll/3.rgba16.inc.c" @@ -28,106 +13,16 @@ ALIGNED8 static const Texture lll_seg7_texture_07002800[] = { #include "levels/lll/5.rgba16.inc.c" }; -// 0x07003000 - 0x07003800 -ALIGNED8 static const Texture lll_seg7_texture_07003000[] = { -#include "levels/lll/6.rgba16.inc.c" -}; - // 0x07003800 - 0x07004000 UNUSED ALIGNED8 static const Texture lll_seg7_texture_07003800[] = { #include "levels/lll/7.rgba16.inc.c" }; -// 0x07004000 - 0x07004800 -ALIGNED8 static const Texture lll_seg7_texture_07004000[] = { -#include "levels/lll/8.rgba16.inc.c" -}; - // 0x07004800 - 0x07005000 ALIGNED8 static const Texture lll_seg7_texture_07004800[] = { #include "levels/lll/9.rgba16.inc.c" }; -// 0x07005000 - 0x07005800 -ALIGNED8 static const Texture lll_seg7_texture_07005000[] = { -#include "levels/lll/10.rgba16.inc.c" -}; - -// 0x07005800 - 0x07006000 -ALIGNED8 static const Texture lll_seg7_texture_07005800[] = { -#include "levels/lll/11.rgba16.inc.c" -}; - -// 0x07006000 - 0x07006800 -ALIGNED8 static const Texture lll_seg7_texture_07006000[] = { -#include "levels/lll/12.rgba16.inc.c" -}; - -// 0x07006800 - 0x07007000 -ALIGNED8 static const Texture lll_seg7_texture_07006800[] = { -#include "levels/lll/13.rgba16.inc.c" -}; - -// 0x07007000 - 0x07007800 -ALIGNED8 static const Texture lll_seg7_texture_07007000[] = { -#include "levels/lll/14.rgba16.inc.c" -}; - -// 0x07007800 - 0x07008000 -ALIGNED8 static const Texture lll_seg7_texture_07007800[] = { -#include "levels/lll/15.rgba16.inc.c" -}; - -// 0x07008000 - 0x07008800 -ALIGNED8 static const Texture lll_seg7_texture_07008000[] = { -#include "levels/lll/16.rgba16.inc.c" -}; - -// 0x07008800 - 0x07009000 -ALIGNED8 static const Texture lll_seg7_texture_07008800[] = { -#include "levels/lll/17.rgba16.inc.c" -}; - -// 0x07009000 - 0x07009800 -ALIGNED8 static const Texture lll_seg7_texture_07009000[] = { -#include "levels/lll/18.rgba16.inc.c" -}; - -// 0x07009800 - 0x0700A000 -ALIGNED8 static const Texture lll_seg7_texture_07009800[] = { -#include "levels/lll/19.rgba16.inc.c" -}; - -// 0x0700A000 - 0x0700A800 -ALIGNED8 static const Texture lll_seg7_texture_0700A000[] = { -#include "levels/lll/20.rgba16.inc.c" -}; - -// 0x0700A800 - 0x0700B000 -ALIGNED8 static const Texture lll_seg7_texture_0700A800[] = { -#include "levels/lll/21.rgba16.inc.c" -}; - -// 0x0700B000 - 0x0700B800 -ALIGNED8 static const Texture lll_seg7_texture_0700B000[] = { -#include "levels/lll/22.rgba16.inc.c" -}; - -// 0x0700B800 - 0x0700C000 -ALIGNED8 static const Texture lll_seg7_texture_0700B800[] = { -#include "levels/lll/23.rgba16.inc.c" -}; - -// 0x0700C000 - 0x0700C800 -ALIGNED8 static const Texture lll_seg7_texture_0700C000[] = { -#include "levels/lll/24.rgba16.inc.c" -}; - -// 0x0700C800 - 0x0700D000 -ALIGNED8 static const Texture lll_seg7_texture_0700C800[] = { -#include "levels/lll/25.rgba16.inc.c" -}; - // 0x0700D000 - 0x0700D200 ALIGNED8 static const Texture lll_seg7_texture_0700D000[] = { #include "levels/lll/26.rgba16.inc.c" diff --git a/levels/pss/areas/script_vanilla.inc.c b/levels/pss/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..1c5468c2d4 --- /dev/null +++ b/levels/pss/areas/script_vanilla.inc.c @@ -0,0 +1,2 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_9), diff --git a/levels/pss/areas/script_vanilla_load.inc.c b/levels/pss/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..f8b0380254 --- /dev/null +++ b/levels/pss/areas/script_vanilla_load.inc.c @@ -0,0 +1,6 @@ +LOAD_YAY0( /*seg*/ 0x07, _pss_segment_7SegmentRomStart, _pss_segment_7SegmentRomEnd), +LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _mountain_yay0SegmentRomStart, _mountain_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/pss/geo.c b/levels/pss/geo.c index 58c3aa1c10..2c2d2d6803 100644 --- a/levels/pss/geo.c +++ b/levels/pss/geo.c @@ -13,4 +13,4 @@ #include "levels/pss/header.h" -#include "levels/pss/areas/1/geo.inc.c" +#include "levels/pss/geo.inc.c" diff --git a/levels/pss/geo.inc.c b/levels/pss/geo.inc.c new file mode 100644 index 0000000000..acd9a38c21 --- /dev/null +++ b/levels/pss/geo.inc.c @@ -0,0 +1 @@ +#include "levels/pss/areas/1/geo.inc.c" diff --git a/levels/pss/header.h b/levels/pss/header.h index 4c0f8cd64c..ead2ea7e3d 100644 --- a/levels/pss/header.h +++ b/levels/pss/header.h @@ -3,20 +3,9 @@ #include "types.h" -// geo -extern const GeoLayout pss_geo_000100[]; - -// leveldata -extern const Gfx pss_seg7_dl_0700A7C0[]; -extern const Gfx pss_seg7_dl_0700AFA8[]; -extern const Gfx pss_seg7_dl_0700B3F0[]; -extern const Gfx pss_seg7_dl_0700D338[]; -extern const Gfx pss_seg7_dl_0700DAD8[]; -extern const Gfx pss_seg7_dl_0700E2B0[]; -extern const Gfx pss_seg7_dl_0700E3E8[]; -extern const Collision pss_seg7_collision[]; - // script extern const LevelScript level_pss_entry[]; +#include "levels/pss/header.inc.h" + #endif diff --git a/levels/pss/header.inc.h b/levels/pss/header.inc.h new file mode 100644 index 0000000000..486ceddda0 --- /dev/null +++ b/levels/pss/header.inc.h @@ -0,0 +1,13 @@ +// geo +extern const GeoLayout pss_geo_000100[]; + +// leveldata +extern const Gfx pss_seg7_dl_0700A7C0[]; +extern const Gfx pss_seg7_dl_0700AFA8[]; +extern const Gfx pss_seg7_dl_0700B3F0[]; +extern const Gfx pss_seg7_dl_0700D338[]; +extern const Gfx pss_seg7_dl_0700DAD8[]; +extern const Gfx pss_seg7_dl_0700E2B0[]; +extern const Gfx pss_seg7_dl_0700E3E8[]; +extern const Collision pss_seg7_collision[]; +extern const MacroObject pss_seg7_macro_objs[]; diff --git a/levels/pss/leveldata.c b/levels/pss/leveldata.c index 40cbccd97a..f927252d10 100644 --- a/levels/pss/leveldata.c +++ b/levels/pss/leveldata.c @@ -5,12 +5,4 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/pss/texture.inc.c" -#include "levels/pss/areas/1/1/model.inc.c" -#include "levels/pss/areas/1/2/model.inc.c" -#include "levels/pss/areas/1/3/model.inc.c" -#include "levels/pss/areas/1/4/model.inc.c" -#include "levels/pss/areas/1/5/model.inc.c" -#include "levels/pss/areas/1/6/model.inc.c" -#include "levels/pss/areas/1/7/model.inc.c" -#include "levels/pss/areas/1/collision.inc.c" +#include "levels/pss/leveldata.inc.c" diff --git a/levels/pss/leveldata.inc.c b/levels/pss/leveldata.inc.c new file mode 100644 index 0000000000..fe1630ebc9 --- /dev/null +++ b/levels/pss/leveldata.inc.c @@ -0,0 +1,9 @@ +#include "levels/pss/texture.inc.c" +#include "levels/pss/areas/1/1/model.inc.c" +#include "levels/pss/areas/1/2/model.inc.c" +#include "levels/pss/areas/1/3/model.inc.c" +#include "levels/pss/areas/1/4/model.inc.c" +#include "levels/pss/areas/1/5/model.inc.c" +#include "levels/pss/areas/1/6/model.inc.c" +#include "levels/pss/areas/1/7/model.inc.c" +#include "levels/pss/areas/1/collision.inc.c" diff --git a/levels/pss/script.c b/levels/pss/script.c index d765c07c5f..5e2ba8a95e 100644 --- a/levels/pss/script.c +++ b/levels/pss/script.c @@ -65,16 +65,10 @@ static const LevelScript script_pss_macro_objects[] = { const LevelScript level_pss_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _pss_segment_7SegmentRomStart, _pss_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _mountain_yay0SegmentRomStart, _mountain_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/pss/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_9), +#include "levels/pss/areas/script_vanilla.inc.c" AREA(/*index*/ 1, pss_geo_000100), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 5632, 6751, -5631, /*angle*/ 0, 270, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), diff --git a/levels/rr/areas/script_vanilla.inc.c b/levels/rr/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..b7eb754e27 --- /dev/null +++ b/levels/rr/areas/script_vanilla.inc.c @@ -0,0 +1,23 @@ +JUMP_LINK(script_func_global_12), +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_vo_rr), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, rr_geo_000660), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, rr_geo_000678), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, rr_geo_000690), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, rr_geo_0006A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, rr_geo_0006C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, rr_geo_0006D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, rr_geo_0006F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, rr_geo_000708), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, rr_geo_000720), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, rr_geo_000738), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, rr_geo_000758), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, rr_geo_000770), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, rr_geo_000788), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, rr_geo_0007A0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, rr_geo_0007B8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, rr_geo_0007D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, rr_geo_0007E8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, rr_geo_000800), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, rr_geo_000818), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, rr_geo_000830), diff --git a/levels/rr/areas/script_vanilla_load.inc.c b/levels/rr/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..02fdac7298 --- /dev/null +++ b/levels/rr/areas/script_vanilla_load.inc.c @@ -0,0 +1,7 @@ +LOAD_YAY0( /*seg*/ 0x07, _rr_segment_7SegmentRomStart, _rr_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(rr, sky), +LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/rr/geo.c b/levels/rr/geo.c index 2fc7289fcb..8609a915c8 100644 --- a/levels/rr/geo.c +++ b/levels/rr/geo.c @@ -13,40 +13,4 @@ #include "levels/rr/header.h" -#include "levels/rr/areas/1/2/geo.inc.c" -#include "levels/rr/areas/1/3/geo.inc.c" -#include "levels/rr/areas/1/4/geo.inc.c" -#include "levels/rr/areas/1/5/geo.inc.c" -#include "levels/rr/areas/1/6/geo.inc.c" -#include "levels/rr/areas/1/7/geo.inc.c" -#include "levels/rr/areas/1/8/geo.inc.c" -#include "levels/rr/areas/1/9/geo.inc.c" -#include "levels/rr/areas/1/10/geo.inc.c" -#include "levels/rr/areas/1/11/geo.inc.c" -#include "levels/rr/areas/1/12/geo.inc.c" -#include "levels/rr/areas/1/13/geo.inc.c" -#include "levels/rr/areas/1/14/geo.inc.c" -#include "levels/rr/areas/1/15/geo.inc.c" -#include "levels/rr/areas/1/16/geo.inc.c" -#include "levels/rr/areas/1/17/geo.inc.c" -#include "levels/rr/areas/1/18/geo.inc.c" -#include "levels/rr/areas/1/19/geo.inc.c" -#include "levels/rr/areas/1/20/geo.inc.c" -#include "levels/rr/areas/1/21/geo.inc.c" -#include "levels/rr/flying_carpet/geo.inc.c" -#include "levels/rr/swinging_platform/geo.inc.c" -#include "levels/rr/rotating_bridge_platform/geo.inc.c" -#include "levels/rr/cruiser_wing/geo.inc.c" -#include "levels/rr/octagonal_platform/geo.inc.c" -#include "levels/rr/sliding_platform/geo.inc.c" -#include "levels/rr/pyramid_platform/geo.inc.c" // unused -#include "levels/rr/elevator_platform/geo.inc.c" -#include "levels/rr/seesaw_platform/geo.inc.c" -#include "levels/rr/donut_block/geo.inc.c" -#include "levels/rr/l_platform/geo.inc.c" // also unused -#include "levels/rr/tricky_triangles_1/geo.inc.c" -#include "levels/rr/tricky_triangles_2/geo.inc.c" -#include "levels/rr/tricky_triangles_3/geo.inc.c" -#include "levels/rr/tricky_triangles_4/geo.inc.c" -#include "levels/rr/tricky_triangles_5/geo.inc.c" -#include "levels/rr/areas/1/geo.inc.c" +#include "levels/rr/geo.inc.c" diff --git a/levels/rr/geo.inc.c b/levels/rr/geo.inc.c new file mode 100644 index 0000000000..3e211a8ff0 --- /dev/null +++ b/levels/rr/geo.inc.c @@ -0,0 +1,21 @@ +#include "levels/rr/areas/1/2/geo.inc.c" +#include "levels/rr/areas/1/3/geo.inc.c" +#include "levels/rr/areas/1/4/geo.inc.c" +#include "levels/rr/areas/1/5/geo.inc.c" +#include "levels/rr/areas/1/6/geo.inc.c" +#include "levels/rr/areas/1/7/geo.inc.c" +#include "levels/rr/areas/1/8/geo.inc.c" +#include "levels/rr/areas/1/9/geo.inc.c" +#include "levels/rr/areas/1/10/geo.inc.c" +#include "levels/rr/areas/1/11/geo.inc.c" +#include "levels/rr/areas/1/12/geo.inc.c" +#include "levels/rr/areas/1/13/geo.inc.c" +#include "levels/rr/areas/1/14/geo.inc.c" +#include "levels/rr/areas/1/15/geo.inc.c" +#include "levels/rr/areas/1/16/geo.inc.c" +#include "levels/rr/areas/1/17/geo.inc.c" +#include "levels/rr/areas/1/18/geo.inc.c" +#include "levels/rr/areas/1/19/geo.inc.c" +#include "levels/rr/areas/1/20/geo.inc.c" +#include "levels/rr/areas/1/21/geo.inc.c" +#include "levels/rr/areas/1/geo.inc.c" diff --git a/levels/rr/header.h b/levels/rr/header.h index 85e62adf9d..aa380d117a 100644 --- a/levels/rr/header.h +++ b/levels/rr/header.h @@ -3,104 +3,6 @@ #include "types.h" -// geo -extern const GeoLayout rr_geo_000660[]; -extern const GeoLayout rr_geo_000678[]; -extern const GeoLayout rr_geo_000690[]; -extern const GeoLayout rr_geo_0006A8[]; -extern const GeoLayout rr_geo_0006C0[]; -extern const GeoLayout rr_geo_0006D8[]; -extern const GeoLayout rr_geo_0006F0[]; -extern const GeoLayout rr_geo_000708[]; -extern const GeoLayout rr_geo_000720[]; -extern const GeoLayout rr_geo_000738[]; -extern const GeoLayout rr_geo_000758[]; -extern const GeoLayout rr_geo_000770[]; -extern const GeoLayout rr_geo_000788[]; -extern const GeoLayout rr_geo_0007A0[]; -extern const GeoLayout rr_geo_0007B8[]; -extern const GeoLayout rr_geo_0007D0[]; -extern const GeoLayout rr_geo_0007E8[]; -extern const GeoLayout rr_geo_000800[]; -extern const GeoLayout rr_geo_000818[]; -extern const GeoLayout rr_geo_000830[]; -extern const GeoLayout rr_geo_000848[]; -extern const GeoLayout rr_geo_000860[]; -extern const GeoLayout rr_geo_000878[]; -extern const GeoLayout rr_geo_000890[]; -extern const GeoLayout rr_geo_0008A8[]; -extern const GeoLayout rr_geo_0008C0[]; -extern const GeoLayout rr_geo_0008D8[]; -extern const GeoLayout rr_geo_0008F0[]; -extern const GeoLayout rr_geo_000908[]; -extern const GeoLayout rr_geo_000920[]; -extern const GeoLayout rr_geo_000940[]; -extern const GeoLayout rr_geo_000958[]; -extern const GeoLayout rr_geo_000970[]; -extern const GeoLayout rr_geo_000988[]; -extern const GeoLayout rr_geo_0009A0[]; -extern const GeoLayout rr_geo_0009B8[]; -extern const GeoLayout rr_geo_0009D0[]; - -// leveldata -extern const Gfx dl_cruiser_metal_holes[]; -extern const Gfx rr_seg7_dl_07002CC8[]; -extern const Gfx rr_seg7_dl_07002E80[]; -extern const Gfx rr_seg7_dl_07004A98[]; -extern const Gfx rr_seg7_dl_07005C80[]; -extern const Gfx rr_seg7_dl_07007E60[]; -extern const Gfx rr_seg7_dl_07008258[]; -extern const Gfx rr_seg7_dl_07008E20[]; -extern const Gfx rr_seg7_dl_0700BB48[]; -extern const Gfx rr_seg7_dl_0700CA38[]; -extern const Gfx rr_seg7_dl_0700DBD8[]; -extern const Gfx rr_seg7_dl_0700DE88[]; -extern const Gfx rr_seg7_dl_0700E178[]; -extern const Gfx rr_seg7_dl_0700E830[]; -extern const Gfx rr_seg7_dl_07012758[]; -extern const Gfx rr_seg7_dl_07014508[]; -extern const Gfx rr_seg7_dl_07014F30[]; -extern const Gfx rr_seg7_dl_070156B8[]; -extern const Gfx rr_seg7_dl_07015C68[]; -extern const Gfx rr_seg7_dl_07017530[]; -extern const Gfx rr_seg7_dl_07018B58[]; -extern const Gfx rr_seg7_dl_070191A0[]; -extern const s16 flying_carpet_static_vertex_data[]; -extern const Gfx dl_flying_carpet_begin[]; -extern const Gfx dl_flying_carpet_model_half[]; -extern const Gfx dl_flying_carpet_end[]; -extern const Gfx rr_seg7_dl_07019AE0[]; -extern const Gfx rr_seg7_dl_0701A568[]; -extern const Gfx rr_seg7_dl_0701A680[]; -extern const Gfx rr_seg7_dl_0701AB78[]; -extern const Gfx rr_seg7_dl_0701ADF8[]; -extern const Gfx rr_seg7_dl_0701AFA0[]; -extern const Gfx rr_seg7_dl_0701B220[]; -extern const Gfx rr_seg7_dl_0701B4C0[]; -extern const Gfx rr_seg7_dl_0701B848[]; -extern const Gfx rr_seg7_dl_0701B980[]; -extern const Gfx rr_seg7_dl_0701BD08[]; -extern const Gfx rr_seg7_dl_0701E670[]; -extern const Gfx rr_seg7_dl_07021100[]; -extern const Gfx rr_seg7_dl_07023B90[]; -extern const Gfx rr_seg7_dl_07026630[]; -extern const Gfx rr_seg7_dl_07028FA8[]; -extern const Collision rr_seg7_collision_flying_carpet[]; -extern const Collision rr_seg7_collision_pendulum[]; -extern const Collision rr_seg7_collision_rotating_platform_with_fire[]; -extern const Collision rr_seg7_collision_07029508[]; -extern const Collision rr_seg7_collision_070295F8[]; -extern const Collision rr_seg7_collision_0702967C[]; -extern const Collision rr_seg7_collision_elevator_platform[]; -extern const Collision rr_seg7_collision_07029750[]; -extern const Collision rr_seg7_collision_donut_platform[]; -extern const Collision rr_seg7_collision_07029858[]; -extern const Collision rr_seg7_collision_07029924[]; -extern const Collision rr_seg7_collision_07029C1C[]; -extern const Collision rr_seg7_collision_07029FA4[]; -extern const Collision rr_seg7_collision_0702A32C[]; -extern const Collision rr_seg7_collision_0702A6B4[]; -extern const Collision rr_seg7_collision_level[]; extern const Trajectory rr_seg7_trajectory_0702EC3C[]; extern const Trajectory rr_seg7_trajectory_0702ECC0[]; extern const Trajectory rr_seg7_trajectory_0702ED9C[]; @@ -109,4 +11,6 @@ extern const Trajectory rr_seg7_trajectory_0702EEE0[]; // script extern const LevelScript level_rr_entry[]; +#include "levels/rr/header.inc.h" + #endif diff --git a/levels/rr/header.inc.h b/levels/rr/header.inc.h new file mode 100644 index 0000000000..0795b9dfe2 --- /dev/null +++ b/levels/rr/header.inc.h @@ -0,0 +1,48 @@ +// geo +extern const GeoLayout rr_geo_000660[]; +extern const GeoLayout rr_geo_000678[]; +extern const GeoLayout rr_geo_000690[]; +extern const GeoLayout rr_geo_0006A8[]; +extern const GeoLayout rr_geo_0006C0[]; +extern const GeoLayout rr_geo_0006D8[]; +extern const GeoLayout rr_geo_0006F0[]; +extern const GeoLayout rr_geo_000708[]; +extern const GeoLayout rr_geo_000720[]; +extern const GeoLayout rr_geo_000738[]; +extern const GeoLayout rr_geo_000758[]; +extern const GeoLayout rr_geo_000770[]; +extern const GeoLayout rr_geo_000788[]; +extern const GeoLayout rr_geo_0007A0[]; +extern const GeoLayout rr_geo_0007B8[]; +extern const GeoLayout rr_geo_0007D0[]; +extern const GeoLayout rr_geo_0007E8[]; +extern const GeoLayout rr_geo_000800[]; +extern const GeoLayout rr_geo_000818[]; +extern const GeoLayout rr_geo_000830[]; +extern const GeoLayout rr_geo_0009D0[]; + +// leveldata +extern const Gfx dl_cruiser_metal_holes[]; +extern const Gfx rr_seg7_dl_07002CC8[]; +extern const Gfx rr_seg7_dl_07002E80[]; +extern const Gfx rr_seg7_dl_07004A98[]; +extern const Gfx rr_seg7_dl_07005C80[]; +extern const Gfx rr_seg7_dl_07007E60[]; +extern const Gfx rr_seg7_dl_07008258[]; +extern const Gfx rr_seg7_dl_07008E20[]; +extern const Gfx rr_seg7_dl_0700BB48[]; +extern const Gfx rr_seg7_dl_0700CA38[]; +extern const Gfx rr_seg7_dl_0700DBD8[]; +extern const Gfx rr_seg7_dl_0700DE88[]; +extern const Gfx rr_seg7_dl_0700E178[]; +extern const Gfx rr_seg7_dl_0700E830[]; +extern const Gfx rr_seg7_dl_07012758[]; +extern const Gfx rr_seg7_dl_07014508[]; +extern const Gfx rr_seg7_dl_07014F30[]; +extern const Gfx rr_seg7_dl_070156B8[]; +extern const Gfx rr_seg7_dl_07015C68[]; +extern const Gfx rr_seg7_dl_07017530[]; +extern const Gfx rr_seg7_dl_07018B58[]; +extern const Gfx rr_seg7_dl_070191A0[]; +extern const Collision rr_seg7_collision_level[]; +extern const MacroObject rr_seg7_macro_objs[]; diff --git a/levels/rr/leveldata.c b/levels/rr/leveldata.c index ff568af12a..d61e7066cb 100644 --- a/levels/rr/leveldata.c +++ b/levels/rr/leveldata.c @@ -5,60 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/rr/texture.inc.c" -#include "levels/rr/areas/1/1/model.inc.c" -#include "levels/rr/areas/1/2/model.inc.c" -#include "levels/rr/areas/1/3/model.inc.c" -#include "levels/rr/areas/1/4/model.inc.c" -#include "levels/rr/areas/1/5/model.inc.c" -#include "levels/rr/areas/1/6/model.inc.c" -#include "levels/rr/areas/1/7/model.inc.c" -#include "levels/rr/areas/1/8/model.inc.c" -#include "levels/rr/areas/1/9/model.inc.c" -#include "levels/rr/areas/1/10/model.inc.c" -#include "levels/rr/areas/1/11/1.inc.c" -#include "levels/rr/areas/1/11/2.inc.c" -#include "levels/rr/areas/1/12/model.inc.c" -#include "levels/rr/areas/1/13/model.inc.c" -#include "levels/rr/areas/1/14/model.inc.c" -#include "levels/rr/areas/1/15/model.inc.c" -#include "levels/rr/areas/1/16/model.inc.c" -#include "levels/rr/areas/1/17/model.inc.c" -#include "levels/rr/areas/1/18/model.inc.c" -#include "levels/rr/areas/1/19/model.inc.c" -#include "levels/rr/areas/1/20/model.inc.c" -#include "levels/rr/areas/1/21/model.inc.c" -#include "levels/rr/flying_carpet/model.inc.c" -#include "levels/rr/swinging_platform/model.inc.c" -#include "levels/rr/rotating_bridge_platform/model.inc.c" -#include "levels/rr/cruiser_wing/model.inc.c" -#include "levels/rr/octagonal_platform/model.inc.c" -#include "levels/rr/sliding_platform/model.inc.c" -#include "levels/rr/pyramid_platform/model.inc.c" // Unused -#include "levels/rr/elevator_platform/model.inc.c" -#include "levels/rr/seesaw_platform/model.inc.c" -#include "levels/rr/donut_block/1.inc.c" -#include "levels/rr/donut_block/2.inc.c" -#include "levels/rr/l_platform/model.inc.c" // also unused -#include "levels/rr/tricky_triangles_1/model.inc.c" -#include "levels/rr/tricky_triangles_2/model.inc.c" -#include "levels/rr/tricky_triangles_3/model.inc.c" -#include "levels/rr/tricky_triangles_4/model.inc.c" -#include "levels/rr/tricky_triangles_5/model.inc.c" -#include "levels/rr/flying_carpet/collision.inc.c" -#include "levels/rr/swinging_platform/collision.inc.c" -#include "levels/rr/rotating_bridge_platform/collision.inc.c" -#include "levels/rr/octagonal_platform/collision.inc.c" -#include "levels/rr/sliding_platform/collision.inc.c" -#include "levels/rr/pyramid_platform/collision.inc.c" -#include "levels/rr/elevator_platform/collision.inc.c" -#include "levels/rr/seesaw_platform/collision.inc.c" -#include "levels/rr/donut_block/collision.inc.c" -#include "levels/rr/l_platform/collision.inc.c" -#include "levels/rr/tricky_triangles_1/collision.inc.c" -#include "levels/rr/tricky_triangles_2/collision.inc.c" -#include "levels/rr/tricky_triangles_3/collision.inc.c" -#include "levels/rr/tricky_triangles_4/collision.inc.c" -#include "levels/rr/tricky_triangles_5/collision.inc.c" -#include "levels/rr/areas/1/collision.inc.c" #include "levels/rr/areas/1/trajectory.inc.c" + +#include "levels/rr/leveldata.inc.c" diff --git a/levels/rr/leveldata.inc.c b/levels/rr/leveldata.inc.c new file mode 100644 index 0000000000..94feec7da2 --- /dev/null +++ b/levels/rr/leveldata.inc.c @@ -0,0 +1,24 @@ +#include "levels/rr/texture.inc.c" +#include "levels/rr/areas/1/1/model.inc.c" +#include "levels/rr/areas/1/2/model.inc.c" +#include "levels/rr/areas/1/3/model.inc.c" +#include "levels/rr/areas/1/4/model.inc.c" +#include "levels/rr/areas/1/5/model.inc.c" +#include "levels/rr/areas/1/6/model.inc.c" +#include "levels/rr/areas/1/7/model.inc.c" +#include "levels/rr/areas/1/8/model.inc.c" +#include "levels/rr/areas/1/9/model.inc.c" +#include "levels/rr/areas/1/10/model.inc.c" +#include "levels/rr/areas/1/11/1.inc.c" +#include "levels/rr/areas/1/11/2.inc.c" +#include "levels/rr/areas/1/12/model.inc.c" +#include "levels/rr/areas/1/13/model.inc.c" +#include "levels/rr/areas/1/14/model.inc.c" +#include "levels/rr/areas/1/15/model.inc.c" +#include "levels/rr/areas/1/16/model.inc.c" +#include "levels/rr/areas/1/17/model.inc.c" +#include "levels/rr/areas/1/18/model.inc.c" +#include "levels/rr/areas/1/19/model.inc.c" +#include "levels/rr/areas/1/20/model.inc.c" +#include "levels/rr/areas/1/21/model.inc.c" +#include "levels/rr/areas/1/collision.inc.c" diff --git a/levels/rr/script.c b/levels/rr/script.c index e440b81596..5e05e57379 100644 --- a/levels/rr/script.c +++ b/levels/rr/script.c @@ -160,53 +160,10 @@ static const LevelScript script_rr_objects_3[] = { const LevelScript level_rr_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _rr_segment_7SegmentRomStart, _rr_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/rr/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_12), - JUMP_LINK(script_func_global_1), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, rr_geo_000660), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, rr_geo_000678), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, rr_geo_000690), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, rr_geo_0006A8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, rr_geo_0006C0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, rr_geo_0006D8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, rr_geo_0006F0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, rr_geo_000708), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, rr_geo_000720), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, rr_geo_000738), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, rr_geo_000758), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, rr_geo_000770), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, rr_geo_000788), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, rr_geo_0007A0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, rr_geo_0007B8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, rr_geo_0007D0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, rr_geo_0007E8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, rr_geo_000800), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, rr_geo_000818), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, rr_geo_000830), - LOAD_MODEL_FROM_GEO(MODEL_RR_SLIDING_PLATFORM, rr_geo_0008C0), - LOAD_MODEL_FROM_GEO(MODEL_RR_FLYING_CARPET, rr_geo_000848), - LOAD_MODEL_FROM_GEO(MODEL_RR_OCTAGONAL_PLATFORM, rr_geo_0008A8), - LOAD_MODEL_FROM_GEO(MODEL_RR_ROTATING_BRIDGE_PLATFORM, rr_geo_000878), - LOAD_MODEL_FROM_GEO(MODEL_RR_TRIANGLE_PLATFORM, rr_geo_0008D8), - LOAD_MODEL_FROM_GEO(MODEL_RR_CRUISER_WING, rr_geo_000890), - LOAD_MODEL_FROM_GEO(MODEL_RR_SEESAW_PLATFORM, rr_geo_000908), - LOAD_MODEL_FROM_GEO(MODEL_RR_L_SHAPED_PLATFORM, rr_geo_000940), - LOAD_MODEL_FROM_GEO(MODEL_RR_SWINGING_PLATFORM, rr_geo_000860), - LOAD_MODEL_FROM_GEO(MODEL_RR_DONUT_PLATFORM, rr_geo_000920), - LOAD_MODEL_FROM_GEO(MODEL_RR_ELEVATOR_PLATFORM, rr_geo_0008F0), - LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES, rr_geo_000958), - LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME1, rr_geo_000970), - LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME2, rr_geo_000988), - LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME3, rr_geo_0009A0), - LOAD_MODEL_FROM_GEO(MODEL_RR_TRICKY_TRIANGLES_FRAME4, rr_geo_0009B8), +#include "levels/rr/areas/script_vanilla.inc.c" AREA(/*index*/ 1, rr_geo_0009D0), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2599, -833, 2071, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/rr/texture.inc.c b/levels/rr/texture.inc.c index 52e689cfc5..c8defeaaba 100644 --- a/levels/rr/texture.inc.c +++ b/levels/rr/texture.inc.c @@ -1,13 +1,3 @@ -// 0x07000000 - 0x07000800 -ALIGNED8 static const Texture texture_quarter_flying_carpet[] = { -#include "levels/rr/quarter_flying_carpet.rgba16.inc.c" -}; - -// 0x07000800 - 0x07001800 -ALIGNED8 static const Texture rr_seg7_texture_07000800[] = { -#include "levels/rr/1.rgba16.inc.c" -}; - // 0x07001800 - 0x07002000 ALIGNED8 static const Texture rr_seg7_texture_07001800[] = { #include "levels/rr/2.rgba16.inc.c" diff --git a/levels/sa/areas/script_vanilla.inc.c b/levels/sa/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..6eee645b21 --- /dev/null +++ b/levels/sa/areas/script_vanilla.inc.c @@ -0,0 +1,2 @@ +JUMP_LINK(script_func_global_5), +JUMP_LINK(script_func_global_14), diff --git a/levels/sa/areas/script_vanilla_load.inc.c b/levels/sa/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..112abe0526 --- /dev/null +++ b/levels/sa/areas/script_vanilla_load.inc.c @@ -0,0 +1,8 @@ +LOAD_YAY0( /*seg*/ 0x07, _sa_segment_7SegmentRomStart, _sa_segment_7SegmentRomEnd), +LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _inside_yay0SegmentRomStart, _inside_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group4_geoSegmentRomStart, _group4_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), diff --git a/levels/sa/geo.c b/levels/sa/geo.c index bcf1e782ec..607c213e4a 100644 --- a/levels/sa/geo.c +++ b/levels/sa/geo.c @@ -13,4 +13,4 @@ #include "levels/sa/header.h" -#include "levels/sa/areas/1/geo.inc.c" +#include "levels/sa/geo.inc.c" diff --git a/levels/sa/geo.inc.c b/levels/sa/geo.inc.c new file mode 100644 index 0000000000..6e6a9c2073 --- /dev/null +++ b/levels/sa/geo.inc.c @@ -0,0 +1 @@ +#include "levels/sa/areas/1/geo.inc.c" diff --git a/levels/sa/header.h b/levels/sa/header.h index e74eec2ebb..add4a53798 100644 --- a/levels/sa/header.h +++ b/levels/sa/header.h @@ -3,15 +3,9 @@ #include "types.h" -// geo -extern const GeoLayout sa_geo_000170[]; - -// leveldata -extern const Gfx sa_seg7_dl_07002DE8[]; -extern const Gfx sa_seg7_dl_07002FD0[]; -extern const Collision sa_seg7_collision[]; - // script extern const LevelScript level_sa_entry[]; +#include "levels/sa/header.inc.h" + #endif diff --git a/levels/sa/header.inc.h b/levels/sa/header.inc.h new file mode 100644 index 0000000000..d4aa848338 --- /dev/null +++ b/levels/sa/header.inc.h @@ -0,0 +1,8 @@ +// geo +extern const GeoLayout sa_geo_000170[]; + +// leveldata +extern const Gfx sa_seg7_dl_07002DE8[]; +extern const Gfx sa_seg7_dl_07002FD0[]; +extern const Collision sa_seg7_collision[]; +extern const MacroObject sa_seg7_macro_objs[]; diff --git a/levels/sa/leveldata.c b/levels/sa/leveldata.c index fb8b1bea53..c34d9da67e 100644 --- a/levels/sa/leveldata.c +++ b/levels/sa/leveldata.c @@ -5,6 +5,4 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/sa/areas/1/1/model.inc.c" -#include "levels/sa/areas/1/2/model.inc.c" -#include "levels/sa/areas/1/collision.inc.c" +#include "levels/sa/leveldata.inc.c" diff --git a/levels/sa/leveldata.inc.c b/levels/sa/leveldata.inc.c new file mode 100644 index 0000000000..3f9ba693db --- /dev/null +++ b/levels/sa/leveldata.inc.c @@ -0,0 +1,3 @@ +#include "levels/sa/areas/1/1/model.inc.c" +#include "levels/sa/areas/1/2/model.inc.c" +#include "levels/sa/areas/1/collision.inc.c" diff --git a/levels/sa/script.c b/levels/sa/script.c index 05ebc06035..f34bf0bbc6 100644 --- a/levels/sa/script.c +++ b/levels/sa/script.c @@ -51,18 +51,10 @@ static const LevelScript script_sa_objects_2[] = { const LevelScript level_sa_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _sa_segment_7SegmentRomStart, _sa_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _inside_yay0SegmentRomStart, _inside_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group4_geoSegmentRomStart, _group4_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), +#include "levels/sa/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_5), - JUMP_LINK(script_func_global_14), +#include "levels/sa/areas/script_vanilla.inc.c" AREA(/*index*/ 1, sa_geo_000170), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 0, -1535, 0, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSwimmingWarp), diff --git a/levels/scripts.c b/levels/scripts.c index c2cf6d8a4f..dc81d0806b 100644 --- a/levels/scripts.c +++ b/levels/scripts.c @@ -172,184 +172,3 @@ static const LevelScript script_exec_ ## folder [] = { \ #include "levels/level_defines.h" #undef STUB_LEVEL #undef DEFINE_LEVEL - -const LevelScript script_func_global_1[] = { - LOAD_MODEL_FROM_GEO(MODEL_BLUE_COIN_SWITCH, blue_coin_switch_geo), - LOAD_MODEL_FROM_GEO(MODEL_AMP, dAmpGeo), - LOAD_MODEL_FROM_GEO(MODEL_PURPLE_SWITCH, purple_switch_geo), - LOAD_MODEL_FROM_GEO(MODEL_CHECKERBOARD_PLATFORM, checkerboard_platform_geo), - LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX, breakable_box_geo), - LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX_NO_SHADOW, breakable_box_no_shadow_geo), - LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX_OUTLINE, exclamation_box_outline_geo), - LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX, exclamation_box_geo), - LOAD_MODEL_FROM_GEO(MODEL_GOOMBA, goomba_geo), - LOAD_MODEL_FROM_DL( MODEL_EXCLAMATION_POINT, exclamation_box_outline_seg8_dl_exclamation_point, LAYER_OCCLUDE_SILHOUETTE_ALPHA), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_SHELL, koopa_shell_geo), - LOAD_MODEL_FROM_GEO(MODEL_METAL_BOX, metal_box_geo), - LOAD_MODEL_FROM_DL( MODEL_METAL_BOX_DL, metal_box_dl, LAYER_OPAQUE), - LOAD_MODEL_FROM_GEO(MODEL_BLACK_BOBOMB, black_bobomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOBOMB_BUDDY, bobomb_buddy_geo), - LOAD_MODEL_FROM_DL( MODEL_DL_CANNON_LID, cannon_lid_seg8_dl_080048E0, LAYER_OPAQUE), - LOAD_MODEL_FROM_GEO(MODEL_BOWLING_BALL, bowling_ball_geo), - LOAD_MODEL_FROM_GEO(MODEL_CANNON_BARREL, cannon_barrel_geo), - LOAD_MODEL_FROM_GEO(MODEL_CANNON_BASE, cannon_base_geo), - LOAD_MODEL_FROM_GEO(MODEL_HEART, heart_geo), - LOAD_MODEL_FROM_GEO(MODEL_FLYGUY, flyguy_geo), - LOAD_MODEL_FROM_GEO(MODEL_CHUCKYA, chuckya_geo), - LOAD_MODEL_FROM_GEO(MODEL_TRAJECTORY_MARKER_BALL, bowling_ball_track_geo), - RETURN(), -}; - -const LevelScript script_func_global_2[] = { - LOAD_MODEL_FROM_GEO(MODEL_BULLET_BILL, bullet_bill_geo), - LOAD_MODEL_FROM_GEO(MODEL_YELLOW_SPHERE, yellow_sphere_geo), - LOAD_MODEL_FROM_GEO(MODEL_HOOT, hoot_geo), - LOAD_MODEL_FROM_GEO(MODEL_YOSHI_EGG, yoshi_egg_geo), - LOAD_MODEL_FROM_GEO(MODEL_THWOMP, thwomp_geo), - LOAD_MODEL_FROM_GEO(MODEL_HEAVE_HO, heave_ho_geo), - RETURN(), -}; - -const LevelScript script_func_global_3[] = { - LOAD_MODEL_FROM_GEO(MODEL_BLARGG, blargg_geo), - LOAD_MODEL_FROM_GEO(MODEL_BULLY, bully_geo), - LOAD_MODEL_FROM_GEO(MODEL_BULLY_BOSS, bully_boss_geo), - RETURN(), -}; - -const LevelScript script_func_global_4[] = { - LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB, water_bomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB_SHADOW, water_bomb_shadow_geo), - LOAD_MODEL_FROM_GEO(MODEL_KING_BOBOMB, king_bobomb_geo), - RETURN(), -}; - -const LevelScript script_func_global_5[] = { - LOAD_MODEL_FROM_GEO(MODEL_MANTA_RAY, manta_seg5_geo_05008D14), - LOAD_MODEL_FROM_GEO(MODEL_UNAGI, unagi_geo), - LOAD_MODEL_FROM_GEO(MODEL_SUSHI, sushi_geo), - LOAD_MODEL_FROM_DL( MODEL_DL_WHIRLPOOL, whirlpool_seg5_dl_05013CB8, LAYER_TRANSPARENT), - LOAD_MODEL_FROM_GEO(MODEL_CLAM_SHELL, clam_shell_geo), - RETURN(), -}; - -const LevelScript script_func_global_6[] = { - LOAD_MODEL_FROM_GEO(MODEL_POKEY_HEAD, pokey_head_geo), - LOAD_MODEL_FROM_GEO(MODEL_POKEY_BODY_PART, pokey_body_part_geo), - LOAD_MODEL_FROM_GEO(MODEL_TWEESTER, tweester_geo), - LOAD_MODEL_FROM_GEO(MODEL_KLEPTO, klepto_geo), - LOAD_MODEL_FROM_GEO(MODEL_EYEROK_LEFT_HAND, eyerok_left_hand_geo), - LOAD_MODEL_FROM_GEO(MODEL_EYEROK_RIGHT_HAND, eyerok_right_hand_geo), - RETURN(), -}; - -const LevelScript script_func_global_7[] = { - LOAD_MODEL_FROM_DL( MODEL_DL_MONTY_MOLE_HOLE, monty_mole_hole_seg5_dl_05000840, LAYER_TRANSPARENT_DECAL), - LOAD_MODEL_FROM_GEO(MODEL_MONTY_MOLE, monty_mole_geo), - LOAD_MODEL_FROM_GEO(MODEL_UKIKI, ukiki_geo), - LOAD_MODEL_FROM_GEO(MODEL_FWOOSH, fwoosh_geo), - RETURN(), -}; - -const LevelScript script_func_global_8[] = { - LOAD_MODEL_FROM_GEO(MODEL_SPINDRIFT, spindrift_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD_HIDDEN, mr_blizzard_hidden_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD, mr_blizzard_geo), - LOAD_MODEL_FROM_GEO(MODEL_PENGUIN, penguin_geo), - RETURN(), -}; - -const LevelScript script_func_global_9[] = { - LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_EXCLAMATION, cap_switch_exclamation_seg5_dl_05002E00, LAYER_ALPHA), - LOAD_MODEL_FROM_GEO(MODEL_CAP_SWITCH, cap_switch_geo), - LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_BASE, cap_switch_base_seg5_dl_05003120, LAYER_OPAQUE), - RETURN(), -}; - -const LevelScript script_func_global_10[] = { - LOAD_MODEL_FROM_GEO(MODEL_BOO, boo_geo), - LOAD_MODEL_FROM_GEO(MODEL_BETA_BOO_KEY, small_key_geo), - LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CHAIR, haunted_chair_geo), - LOAD_MODEL_FROM_GEO(MODEL_MAD_PIANO, mad_piano_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOOKEND_PART, bookend_part_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOOKEND, bookend_geo), - LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CAGE, haunted_cage_geo), - RETURN(), -}; - -const LevelScript script_func_global_11[] = { - LOAD_MODEL_FROM_GEO(MODEL_BIRDS, birds_geo), - LOAD_MODEL_FROM_GEO(MODEL_PEACH, peach_geo), - LOAD_MODEL_FROM_GEO(MODEL_YOSHI, yoshi_geo), - RETURN(), -}; - -const LevelScript script_func_global_12[] = { - LOAD_MODEL_FROM_GEO(MODEL_ENEMY_LAKITU, enemy_lakitu_geo), - LOAD_MODEL_FROM_GEO(MODEL_SPINY_BALL, spiny_ball_geo), - LOAD_MODEL_FROM_GEO(MODEL_SPINY, spiny_geo), - LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_HEAD, wiggler_head_geo), - LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_BODY, wiggler_body_geo), - LOAD_MODEL_FROM_GEO(MODEL_BUBBA, bubba_geo), - RETURN(), -}; - -const LevelScript script_func_global_13[] = { - LOAD_MODEL_FROM_GEO(MODEL_BOWSER, bowser_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB_CHILD_OBJ, bowser_bomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB, bowser_bomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_SMOKE, bowser_impact_smoke_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_FLAMES, bowser_flames_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_WAVE, invisible_bowser_accessory_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_NO_SHADOW, bowser_geo_no_shadow), - RETURN(), -}; - -const LevelScript script_func_global_14[] = { - LOAD_MODEL_FROM_GEO(MODEL_BUB, bub_geo), - LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_BASE, treasure_chest_base_geo), - LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_LID, treasure_chest_lid_geo), - LOAD_MODEL_FROM_GEO(MODEL_CYAN_FISH, cyan_fish_geo), - LOAD_MODEL_FROM_GEO(MODEL_WATER_RING, water_ring_geo), - LOAD_MODEL_FROM_GEO(MODEL_WATER_MINE, water_mine_geo), - LOAD_MODEL_FROM_GEO(MODEL_SEAWEED, seaweed_geo), - LOAD_MODEL_FROM_GEO(MODEL_SKEETER, skeeter_geo), - RETURN(), -}; - -const LevelScript script_func_global_15[] = { - LOAD_MODEL_FROM_GEO(MODEL_PIRANHA_PLANT, piranha_plant_geo), - LOAD_MODEL_FROM_GEO(MODEL_WHOMP, whomp_geo), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITH_SHELL, koopa_with_shell_geo), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITHOUT_SHELL, koopa_without_shell_geo), - LOAD_MODEL_FROM_GEO(MODEL_METALLIC_BALL, metallic_ball_geo), - LOAD_MODEL_FROM_GEO(MODEL_CHAIN_CHOMP, chain_chomp_geo), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_FLAG, koopa_flag_geo), - LOAD_MODEL_FROM_GEO(MODEL_WOODEN_POST, wooden_post_geo), - RETURN(), -}; - -const LevelScript script_func_global_16[] = { - LOAD_MODEL_FROM_GEO(MODEL_MIPS, mips_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOO_CASTLE, boo_castle_geo), - LOAD_MODEL_FROM_GEO(MODEL_LAKITU, lakitu_geo), - LOAD_MODEL_FROM_GEO(MODEL_TOAD, toad_geo), - RETURN(), -}; - -const LevelScript script_func_global_17[] = { - LOAD_MODEL_FROM_GEO(MODEL_CHILL_BULLY, chilly_chief_geo), - LOAD_MODEL_FROM_GEO(MODEL_BIG_CHILL_BULLY, chilly_chief_big_geo), - LOAD_MODEL_FROM_GEO(MODEL_MONEYBAG, moneybag_geo), - RETURN(), -}; - -const LevelScript script_func_global_18[] = { - LOAD_MODEL_FROM_GEO(MODEL_SWOOP, swoop_geo), - LOAD_MODEL_FROM_GEO(MODEL_SCUTTLEBUG, scuttlebug_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_I_IRIS, mr_i_iris_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_I_BODY, mr_i_geo), - LOAD_MODEL_FROM_GEO(MODEL_DORRIE, dorrie_geo), - LOAD_MODEL_FROM_GEO(MODEL_SNUFIT, snufit_geo), - RETURN(), -}; diff --git a/levels/scripts.h b/levels/scripts.h index dc0196828f..c7a76b250b 100644 --- a/levels/scripts.h +++ b/levels/scripts.h @@ -25,4 +25,26 @@ extern const LevelScript script_func_global_16[]; extern const LevelScript script_func_global_17[]; extern const LevelScript script_func_global_18[]; +extern const LevelScript script_func_vo_bob[]; +extern const LevelScript script_func_vo_wf[]; +extern const LevelScript script_func_vo_jrb[]; +extern const LevelScript script_func_vo_ccm[]; +extern const LevelScript script_func_vo_bbh[]; +extern const LevelScript script_func_vo_hmc[]; +extern const LevelScript script_func_vo_lll[]; +extern const LevelScript script_func_vo_ssl[]; +extern const LevelScript script_func_vo_ddd[]; +extern const LevelScript script_func_vo_sl[]; +extern const LevelScript script_func_vo_wdw[]; +extern const LevelScript script_func_vo_ttm[]; +extern const LevelScript script_func_vo_thi[]; +extern const LevelScript script_func_vo_ttc[]; +extern const LevelScript script_func_vo_rr[]; +extern const LevelScript script_func_vo_bitdw[]; +extern const LevelScript script_func_vo_bitfs[]; +extern const LevelScript script_func_vo_bits[]; +extern const LevelScript script_func_vo_vcutm[]; +extern const LevelScript script_func_vo_castle_inside[]; +extern const LevelScript script_func_vo_castle_grounds[]; + #endif diff --git a/levels/sl/areas/script_vanilla.inc.c b/levels/sl/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..485c82f203 --- /dev/null +++ b/levels/sl/areas/script_vanilla.inc.c @@ -0,0 +1,5 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_8), +JUMP_LINK(script_func_global_17), +JUMP_LINK(script_func_vo_sl), +LOAD_MODEL_FROM_GEO(MODEL_SL_SNOW_TREE, snow_tree_geo), diff --git a/levels/sl/areas/script_vanilla_load.inc.c b/levels/sl/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..02a3a59ab2 --- /dev/null +++ b/levels/sl/areas/script_vanilla_load.inc.c @@ -0,0 +1,10 @@ +LOAD_YAY0( /*seg*/ 0x07, _sl_segment_7SegmentRomStart, _sl_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(sl, snow), +LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _ccm_skybox_yay0SegmentRomStart, _ccm_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group7_yay0SegmentRomStart, _group7_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group7_geoSegmentRomStart, _group7_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group16_yay0SegmentRomStart, _group16_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group16_geoSegmentRomStart, _group16_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/sl/geo.c b/levels/sl/geo.c index 8b4219c1a7..7e344120e8 100644 --- a/levels/sl/geo.c +++ b/levels/sl/geo.c @@ -13,8 +13,5 @@ #include "levels/sl/header.h" -#include "levels/sl/unused_cracked_ice/geo.inc.c" -#include "levels/sl/unused_ice_shard/geo.inc.c" -#include "levels/sl/snow_mound/geo.inc.c" #include "levels/sl/areas/1/geo.inc.c" #include "levels/sl/areas/2/geo.inc.c" diff --git a/levels/sl/geo.inc.c b/levels/sl/geo.inc.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/levels/sl/header.h b/levels/sl/header.h index 6953037c57..4acadc80ad 100644 --- a/levels/sl/header.h +++ b/levels/sl/header.h @@ -5,9 +5,6 @@ #include "game/moving_texture.h" // geo -extern const GeoLayout sl_geo_000360[]; -extern const GeoLayout sl_geo_000378[]; -extern const GeoLayout sl_geo_000390[]; extern const GeoLayout sl_geo_0003A8[]; extern const GeoLayout sl_geo_000484[]; @@ -19,16 +16,12 @@ extern const Gfx sl_seg7_dl_07007880[]; extern const Gfx sl_seg7_dl_070088B0[]; extern const Gfx sl_seg7_dl_07008D58[]; extern const Gfx sl_seg7_dl_0700A5A0[]; -extern const Gfx sl_seg7_dl_0700A780[]; -extern const Gfx sl_seg7_dl_0700A890[]; -extern const Gfx sl_seg7_dl_0700A980[]; extern const Gfx sl_seg7_dl_0700BAE8[]; extern const Gfx sl_seg7_dl_0700BCF8[]; extern const Gfx sl_seg7_dl_0700C9E8[]; extern const Gfx sl_seg7_dl_0700CB58[]; extern const Collision sl_seg7_area_1_collision[]; -extern const Collision sl_seg7_collision_sliding_snow_mound[]; -extern const Collision sl_seg7_collision_pound_explodes[]; +extern const MacroObject sl_seg7_area_1_macro_objs[]; extern const Collision sl_seg7_area_2_collision[]; extern const struct MovtexQuadCollection sl_movtex_water[]; diff --git a/levels/sl/header.inc.h b/levels/sl/header.inc.h new file mode 100644 index 0000000000..e69de29bb2 diff --git a/levels/sl/leveldata.c b/levels/sl/leveldata.c index f38e4d4908..b2d5dd907e 100644 --- a/levels/sl/leveldata.c +++ b/levels/sl/leveldata.c @@ -13,15 +13,10 @@ #include "levels/sl/areas/1/5/model.inc.c" #include "levels/sl/areas/1/6/model.inc.c" #include "levels/sl/areas/1/7/model.inc.c" -#include "levels/sl/snow_mound/model.inc.c" -#include "levels/sl/unused_cracked_ice/model.inc.c" -#include "levels/sl/unused_ice_shard/model.inc.c" // Used in the unused behavior when ground pounding the cracked ice show in the above model. #include "levels/sl/areas/2/1/model.inc.c" #include "levels/sl/areas/2/2/model.inc.c" #include "levels/sl/areas/2/3/model.inc.c" #include "levels/sl/areas/2/4/model.inc.c" #include "levels/sl/areas/1/collision.inc.c" -#include "levels/sl/snow_mound/collision.inc.c" -#include "levels/sl/unused_cracked_ice/collision.inc.c" #include "levels/sl/areas/2/collision.inc.c" #include "levels/sl/areas/1/movtext.inc.c" diff --git a/levels/sl/leveldata.inc.c b/levels/sl/leveldata.inc.c new file mode 100644 index 0000000000..e69de29bb2 diff --git a/levels/sl/script.c b/levels/sl/script.c index bb3e1512a0..1ae3fab21b 100644 --- a/levels/sl/script.c +++ b/levels/sl/script.c @@ -130,25 +130,10 @@ static const LevelScript script_sl_area_2_objects_1[] = { const LevelScript level_sl_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _sl_segment_7SegmentRomStart, _sl_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _snow_yay0SegmentRomStart, _snow_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _ccm_skybox_yay0SegmentRomStart, _ccm_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group7_yay0SegmentRomStart, _group7_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group7_geoSegmentRomStart, _group7_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group16_yay0SegmentRomStart, _group16_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group16_geoSegmentRomStart, _group16_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/sl/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_8), - JUMP_LINK(script_func_global_17), - LOAD_MODEL_FROM_GEO(MODEL_SL_SNOW_TRIANGLE, sl_geo_000390), - LOAD_MODEL_FROM_GEO(MODEL_SL_CRACKED_ICE, sl_geo_000360), - LOAD_MODEL_FROM_GEO(MODEL_SL_CRACKED_ICE_CHUNK, sl_geo_000378), - LOAD_MODEL_FROM_GEO(MODEL_SL_SNOW_TREE, snow_tree_geo), +#include "levels/sl/areas/script_vanilla.inc.c" AREA(/*index*/ 1, sl_geo_0003A8), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 5541, 2024, 443, /*angle*/ 0, 270, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/sl/texture.inc.c b/levels/sl/texture.inc.c index 1fc94696d8..6a31575eb5 100644 --- a/levels/sl/texture.inc.c +++ b/levels/sl/texture.inc.c @@ -8,11 +8,6 @@ ALIGNED8 static const Texture sl_seg7_texture_07000800[] = { #include "levels/sl/1.rgba16.inc.c" }; -// 0x07001000 - 0x07001800 -ALIGNED8 static const Texture sl_seg7_texture_07001000[] = { -#include "levels/sl/2.rgba16.inc.c" -}; - // 0x07001800 - 0x07002000 ALIGNED8 static const Texture sl_seg7_texture_07001800[] = { #include "levels/sl/3.rgba16.inc.c" diff --git a/levels/ssl/areas/script_vanilla.inc.c b/levels/ssl/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..05e189afd2 --- /dev/null +++ b/levels/ssl/areas/script_vanilla.inc.c @@ -0,0 +1,6 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_6), +JUMP_LINK(script_func_vo_ssl), +LOAD_MODEL_FROM_GEO(MODEL_SSL_PALM_TREE, palm_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ssl_geo_0005C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ssl_geo_0005D8), diff --git a/levels/ssl/areas/script_vanilla_load.inc.c b/levels/ssl/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..178354cb11 --- /dev/null +++ b/levels/ssl/areas/script_vanilla_load.inc.c @@ -0,0 +1,7 @@ +LOAD_YAY0( /*seg*/ 0x07, _ssl_segment_7SegmentRomStart, _ssl_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _ssl_skybox_yay0SegmentRomStart, _ssl_skybox_yay0SegmentRomEnd), +LOAD_VANILLA_OBJECTS(ssl, generic), +LOAD_YAY0( /*seg*/ 0x05, _group5_yay0SegmentRomStart, _group5_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group5_geoSegmentRomStart, _group5_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/ssl/geo.c b/levels/ssl/geo.c index 70f02b4e04..e0baa3a721 100644 --- a/levels/ssl/geo.c +++ b/levels/ssl/geo.c @@ -13,14 +13,4 @@ #include "levels/ssl/header.h" -#include "levels/ssl/areas/1/5/geo.inc.c" -#include "levels/ssl/areas/2/4/geo.inc.c" -#include "levels/ssl/pyramid_top/geo.inc.c" -#include "levels/ssl/tox_box/geo.inc.c" -#include "levels/ssl/areas/1/geo.inc.c" -#include "levels/ssl/grindel/geo.inc.c" -#include "levels/ssl/spindel/geo.inc.c" -#include "levels/ssl/moving_pyramid_wall/geo.inc.c" -#include "levels/ssl/pyramid_elevator/geo.inc.c" -#include "levels/ssl/areas/2/geo.inc.c" -#include "levels/ssl/areas/3/geo.inc.c" +#include "levels/ssl/geo.inc.c" diff --git a/levels/ssl/geo.inc.c b/levels/ssl/geo.inc.c new file mode 100644 index 0000000000..aba6f60be2 --- /dev/null +++ b/levels/ssl/geo.inc.c @@ -0,0 +1,5 @@ +#include "levels/ssl/areas/1/5/geo.inc.c" +#include "levels/ssl/areas/2/4/geo.inc.c" +#include "levels/ssl/areas/1/geo.inc.c" +#include "levels/ssl/areas/2/geo.inc.c" +#include "levels/ssl/areas/3/geo.inc.c" diff --git a/levels/ssl/header.h b/levels/ssl/header.h index 3634fcb0d8..07e9373c4c 100644 --- a/levels/ssl/header.h +++ b/levels/ssl/header.h @@ -4,82 +4,20 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout ssl_geo_0005C0[]; -extern const GeoLayout ssl_geo_0005D8[]; -extern const GeoLayout ssl_geo_000618[]; -extern const GeoLayout ssl_geo_000630[]; -extern const GeoLayout ssl_geo_000648[]; -extern const GeoLayout ssl_geo_000734[]; -extern const GeoLayout ssl_geo_000764[]; -extern const GeoLayout ssl_geo_000794[]; -extern const GeoLayout ssl_geo_0007AC[]; -extern const GeoLayout ssl_geo_0007CC[]; -extern const GeoLayout ssl_geo_00088C[]; - -// leveldata -extern const Texture ssl_pyramid_sand[]; -extern const Texture ssl_quicksand[]; -extern const Gfx ssl_dl_quicksand_pit_begin[]; -extern const Gfx ssl_dl_quicksand_pit_end[]; -extern const Gfx ssl_dl_pyramid_quicksand_pit_begin[]; -extern const Gfx ssl_dl_pyramid_quicksand_pit_end[]; extern Movtex ssl_movtex_tris_quicksand_pit[]; extern Movtex ssl_movtex_tris_pyramid_quicksand_pit[]; -extern const Gfx ssl_dl_quicksand_pit[]; -extern const Gfx ssl_dl_pyramid_quicksand_pit_static[]; -extern const Gfx ssl_seg7_dl_07009F48[]; -extern const Gfx ssl_seg7_dl_0700BA78[]; -extern const Gfx ssl_seg7_dl_0700BC18[]; -extern const Gfx ssl_seg7_dl_0700BD00[]; -extern const Gfx ssl_seg7_dl_0700BF18[]; -extern const Gfx ssl_seg7_dl_0700FCE0[]; -extern const Collision ssl_seg7_area_1_collision[]; -extern const Collision ssl_seg7_collision_pyramid_top[]; -extern const Collision ssl_seg7_collision_tox_box[]; extern const struct MovtexQuadCollection ssl_movtex_puddle_water[]; extern const struct MovtexQuadCollection ssl_movtex_toxbox_quicksand_mist[]; -extern const Gfx ssl_dl_quicksand_begin[]; -extern const Gfx ssl_dl_quicksand_end[]; extern Movtex ssl_movtex_tris_pyramid_quicksand[]; -extern const Gfx ssl_dl_pyramid_quicksand[]; extern Movtex ssl_movtex_tris_pyramid_corners_quicksand[]; -extern const Gfx ssl_dl_pyramid_corners_quicksand[]; extern Movtex ssl_movtex_tris_sides_quicksand[]; -extern const Gfx ssl_dl_sides_quicksand[]; -extern const Gfx ssl_seg7_dl_0701EE80[]; -extern const Gfx ssl_seg7_dl_0701F920[]; -extern const Gfx ssl_seg7_dl_0701FCE0[]; -extern const Gfx ssl_seg7_dl_07021A08[]; -extern const Gfx ssl_seg7_dl_07021DE8[]; -extern const Gfx ssl_seg7_dl_070220A8[]; -extern const Gfx ssl_seg7_dl_070221E8[]; -extern const Gfx ssl_seg7_dl_070228A8[]; -extern const Gfx ssl_seg7_dl_070229E8[]; -extern const Gfx ssl_seg7_dl_07022CF8[]; -extern const Gfx ssl_seg7_dl_070233A8[]; -extern const Gfx ssl_seg7_dl_070235C0[]; -extern const Collision ssl_seg7_area_2_collision[]; -extern const Collision ssl_seg7_area_3_collision[]; -extern const Collision ssl_seg7_collision_grindel[]; -extern const Collision ssl_seg7_collision_spindel[]; -extern const Collision ssl_seg7_collision_0702808C[]; -extern const Collision ssl_seg7_collision_pyramid_elevator[]; -extern const Collision ssl_seg7_collision_07028274[]; -extern const Collision ssl_seg7_collision_070282F8[]; -extern const Collision ssl_seg7_collision_07028370[]; -extern const Collision ssl_seg7_collision_070284B0[]; -extern const Gfx ssl_dl_pyramid_sand_pathway_floor_begin[]; -extern const Gfx ssl_dl_pyramid_sand_pathway_floor_end[]; -extern const Gfx ssl_dl_pyramid_sand_pathway_begin[]; -extern const Gfx ssl_dl_pyramid_sand_pathway_end[]; extern Movtex ssl_movtex_tris_pyramid_sand_pathway_front[]; -extern const Gfx ssl_dl_pyramid_sand_pathway_front_end[]; extern Movtex ssl_movtex_tris_pyramid_sand_pathway_floor[]; extern Movtex ssl_movtex_tris_pyramid_sand_pathway_side[]; -extern const Gfx ssl_dl_pyramid_sand_pathway_side_end[]; // script extern const LevelScript level_ssl_entry[]; +#include "levels/ssl/header.inc.h" + #endif diff --git a/levels/ssl/header.inc.h b/levels/ssl/header.inc.h new file mode 100644 index 0000000000..03881d62e7 --- /dev/null +++ b/levels/ssl/header.inc.h @@ -0,0 +1,42 @@ +// geo +extern const GeoLayout ssl_geo_0005C0[]; +extern const GeoLayout ssl_geo_0005D8[]; +extern const GeoLayout ssl_geo_000648[]; +extern const GeoLayout ssl_geo_0007CC[]; +extern const GeoLayout ssl_geo_00088C[]; + +// leveldata +extern const Texture ssl_pyramid_sand[]; +extern const Texture ssl_quicksand[]; +extern const Gfx ssl_dl_quicksand_pit_begin[]; +extern const Gfx ssl_dl_quicksand_pit_end[]; +extern const Gfx ssl_dl_pyramid_quicksand_pit_begin[]; +extern const Gfx ssl_dl_pyramid_quicksand_pit_end[]; +extern const Gfx ssl_dl_quicksand_pit[]; +extern const Gfx ssl_dl_pyramid_quicksand_pit_static[]; +extern const Gfx ssl_seg7_dl_07009F48[]; +extern const Gfx ssl_seg7_dl_0700BA78[]; +extern const Gfx ssl_seg7_dl_0700BC18[]; +extern const Gfx ssl_seg7_dl_0700BD00[]; +extern const Collision ssl_seg7_area_1_collision[]; +extern const MacroObject ssl_seg7_area_1_macro_objs[]; +extern const Gfx ssl_dl_quicksand_begin[]; +extern const Gfx ssl_dl_quicksand_end[]; +extern const Gfx ssl_dl_pyramid_quicksand[]; +extern const Gfx ssl_dl_pyramid_corners_quicksand[]; +extern const Gfx ssl_dl_sides_quicksand[]; +extern const Gfx ssl_seg7_dl_0701EE80[]; +extern const Gfx ssl_seg7_dl_0701F920[]; +extern const Gfx ssl_seg7_dl_0701FCE0[]; +extern const Gfx ssl_seg7_dl_07021A08[]; +extern const Gfx ssl_seg7_dl_07021DE8[]; +extern const Collision ssl_seg7_area_2_collision[]; +extern const Collision ssl_seg7_area_3_collision[]; +extern const MacroObject ssl_seg7_area_2_macro_objs[]; +extern const MacroObject ssl_seg7_area_3_macro_objs[]; +extern const Gfx ssl_dl_pyramid_sand_pathway_floor_begin[]; +extern const Gfx ssl_dl_pyramid_sand_pathway_floor_end[]; +extern const Gfx ssl_dl_pyramid_sand_pathway_begin[]; +extern const Gfx ssl_dl_pyramid_sand_pathway_end[]; +extern const Gfx ssl_dl_pyramid_sand_pathway_front_end[]; +extern const Gfx ssl_dl_pyramid_sand_pathway_side_end[]; diff --git a/levels/ssl/leveldata.c b/levels/ssl/leveldata.c index 00e3ee2973..318f18ad97 100644 --- a/levels/ssl/leveldata.c +++ b/levels/ssl/leveldata.c @@ -8,36 +8,9 @@ #include "types.h" #include "make_const_nonconst.h" -// LEVEL DATA #include "levels/ssl/texture.inc.c" -// This is an oddity, but it is assumed this because of the likelyhood SSL's -// course used to be smaller in a prototype build and that moving areas around -// caused this discrepency. (See the 3 Star Course theory) #include "levels/ssl/areas/2/4/model.inc.c" -#include "levels/ssl/areas/1/1/model.inc.c" -#include "levels/ssl/areas/1/2/model.inc.c" -#include "levels/ssl/areas/1/3/model.inc.c" -#include "levels/ssl/areas/1/4/model.inc.c" -#include "levels/ssl/pyramid_top/model.inc.c" -#include "levels/ssl/tox_box/model.inc.c" -#include "levels/ssl/areas/1/collision.inc.c" -#include "levels/ssl/pyramid_top/collision.inc.c" -#include "levels/ssl/tox_box/collision.inc.c" #include "levels/ssl/areas/1/movtext.inc.c" -#include "levels/ssl/areas/2/1/model.inc.c" -#include "levels/ssl/areas/2/2/model.inc.c" -#include "levels/ssl/areas/2/3/model.inc.c" -#include "levels/ssl/areas/3/1/model.inc.c" -#include "levels/ssl/areas/3/2/model.inc.c" -#include "levels/ssl/grindel/model.inc.c" -#include "levels/ssl/spindel/model.inc.c" -#include "levels/ssl/moving_pyramid_wall/model.inc.c" -#include "levels/ssl/pyramid_elevator/model.inc.c" -#include "levels/ssl/areas/2/collision.inc.c" -#include "levels/ssl/areas/3/collision.inc.c" -#include "levels/ssl/grindel/collision.inc.c" -#include "levels/ssl/spindel/collision.inc.c" -#include "levels/ssl/moving_pyramid_wall/collision.inc.c" -#include "levels/ssl/pyramid_elevator/collision.inc.c" -#include "levels/ssl/eyerok_col/collision.inc.c" #include "levels/ssl/areas/2/movtext.inc.c" + +#include "levels/ssl/leveldata.inc.c" diff --git a/levels/ssl/leveldata.inc.c b/levels/ssl/leveldata.inc.c new file mode 100644 index 0000000000..7a16157a63 --- /dev/null +++ b/levels/ssl/leveldata.inc.c @@ -0,0 +1,12 @@ +#include "levels/ssl/areas/1/1/model.inc.c" +#include "levels/ssl/areas/1/2/model.inc.c" +#include "levels/ssl/areas/1/3/model.inc.c" +#include "levels/ssl/areas/1/4/model.inc.c" +#include "levels/ssl/areas/1/collision.inc.c" +#include "levels/ssl/areas/2/1/model.inc.c" +#include "levels/ssl/areas/2/2/model.inc.c" +#include "levels/ssl/areas/2/3/model.inc.c" +#include "levels/ssl/areas/3/1/model.inc.c" +#include "levels/ssl/areas/3/2/model.inc.c" +#include "levels/ssl/areas/2/collision.inc.c" +#include "levels/ssl/areas/3/collision.inc.c" diff --git a/levels/ssl/script.c b/levels/ssl/script.c index edd9df7c55..c0ac82738c 100644 --- a/levels/ssl/script.c +++ b/levels/ssl/script.c @@ -188,26 +188,10 @@ static const LevelScript script_ssl_area_3_objects_1[] = { const LevelScript level_ssl_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _ssl_segment_7SegmentRomStart, _ssl_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _ssl_skybox_yay0SegmentRomStart, _ssl_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _generic_yay0SegmentRomStart, _generic_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group5_yay0SegmentRomStart, _group5_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group5_geoSegmentRomStart, _group5_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/ssl/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_6), - LOAD_MODEL_FROM_GEO(MODEL_SSL_PALM_TREE, palm_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ssl_geo_0005C0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ssl_geo_0005D8), - LOAD_MODEL_FROM_GEO(MODEL_SSL_PYRAMID_TOP, ssl_geo_000618), - LOAD_MODEL_FROM_GEO(MODEL_SSL_GRINDEL, ssl_geo_000734), - LOAD_MODEL_FROM_GEO(MODEL_SSL_SPINDEL, ssl_geo_000764), - LOAD_MODEL_FROM_GEO(MODEL_SSL_MOVING_PYRAMID_WALL, ssl_geo_000794), - LOAD_MODEL_FROM_GEO(MODEL_SSL_PYRAMID_ELEVATOR, ssl_geo_0007AC), - LOAD_MODEL_FROM_GEO(MODEL_SSL_TOX_BOX, ssl_geo_000630), +#include "levels/ssl/areas/script_vanilla.inc.c" AREA(/*index*/ 1, ssl_geo_000648), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 653, 1038, 6566, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/ssl/texture.inc.c b/levels/ssl/texture.inc.c index d3ca223d40..ac023cf4f7 100644 --- a/levels/ssl/texture.inc.c +++ b/levels/ssl/texture.inc.c @@ -22,13 +22,3 @@ ALIGNED8 static const Texture ssl_seg7_texture_07001800[] = { UNUSED ALIGNED8 static const Texture ssl_seg7_texture_07002000[] = { #include "levels/ssl/4.rgba16.inc.c" }; - -// 0x07002800 - 0x07003800 -ALIGNED8 static const Texture ssl_seg7_texture_07002800[] = { -#include "levels/ssl/5.rgba16.inc.c" -}; - -// 0x07003800 - 0x07004000 -ALIGNED8 static const Texture ssl_seg7_texture_07003800[] = { -#include "levels/ssl/6.rgba16.inc.c" -}; diff --git a/levels/thi/areas/script_vanilla.inc.c b/levels/thi/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..3cb037076e --- /dev/null +++ b/levels/thi/areas/script_vanilla.inc.c @@ -0,0 +1,9 @@ +LOAD_YAY0( /*seg*/ 0x07, _thi_segment_7SegmentRomStart, _thi_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(thi, grass), +LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/thi/areas/script_vanilla_load.inc.c b/levels/thi/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..5d9279bc22 --- /dev/null +++ b/levels/thi/areas/script_vanilla_load.inc.c @@ -0,0 +1,7 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_12), +JUMP_LINK(script_func_global_15), +JUMP_LINK(script_func_vo_thi), +LOAD_MODEL_FROM_GEO(MODEL_THI_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, thi_geo_0005F0), +LOAD_MODEL_FROM_GEO(MODEL_THI_WARP_PIPE, warp_pipe_geo), diff --git a/levels/thi/geo.c b/levels/thi/geo.c index a47ae6f22c..85b54fd461 100644 --- a/levels/thi/geo.c +++ b/levels/thi/geo.c @@ -13,8 +13,4 @@ #include "levels/thi/header.h" -#include "levels/thi/areas/1/6/geo.inc.c" -#include "levels/thi/areas/1/7/geo.inc.c" -#include "levels/thi/areas/1/geo.inc.c" -#include "levels/thi/areas/2/geo.inc.c" -#include "levels/thi/areas/3/geo.inc.c" +#include "levels/thi/geo.inc.c" diff --git a/levels/thi/geo.inc.c b/levels/thi/geo.inc.c new file mode 100644 index 0000000000..e71258b1a8 --- /dev/null +++ b/levels/thi/geo.inc.c @@ -0,0 +1,4 @@ +#include "levels/thi/areas/1/7/geo.inc.c" +#include "levels/thi/areas/1/geo.inc.c" +#include "levels/thi/areas/2/geo.inc.c" +#include "levels/thi/areas/3/geo.inc.c" diff --git a/levels/thi/header.h b/levels/thi/header.h index 4a369bf900..fb96fce765 100644 --- a/levels/thi/header.h +++ b/levels/thi/header.h @@ -4,31 +4,6 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout thi_geo_0005B0[]; -extern const GeoLayout thi_geo_0005C8[]; -extern const GeoLayout thi_geo_0005F0[]; -extern const GeoLayout thi_geo_000608[]; -extern const GeoLayout thi_geo_0006D4[]; -extern const GeoLayout thi_geo_00079C[]; - -// leveldata -extern const Gfx thi_seg7_dl_07005260[]; -extern const Gfx thi_seg7_dl_07006968[]; -extern const Gfx thi_seg7_dl_07007008[]; -extern const Gfx thi_seg7_dl_070072E8[]; -extern const Gfx thi_seg7_dl_070073C0[]; -extern const Gfx thi_seg7_dl_07007538[]; -extern const Gfx thi_seg7_dl_07007648[]; -extern const Gfx thi_seg7_dl_07007930[]; -extern const Gfx thi_seg7_dl_07007C20[]; -extern const Gfx thi_seg7_dl_07009670[]; -extern const Gfx thi_seg7_dl_07009D50[]; -extern const Gfx thi_seg7_dl_07009F58[]; -extern const Collision thi_seg7_area_1_collision[]; -extern const Collision thi_seg7_area_2_collision[]; -extern const Collision thi_seg7_area_3_collision[]; -extern const Collision thi_seg7_collision_top_trap[]; extern const Trajectory thi_seg7_trajectory_koopa[]; extern const struct MovtexQuadCollection thi_movtex_area1_water[]; extern const struct MovtexQuadCollection thi_movtex_area2_water[]; @@ -36,4 +11,6 @@ extern const struct MovtexQuadCollection thi_movtex_area2_water[]; // script extern const LevelScript level_thi_entry[]; +#include "levels/thi/header.inc.h" + #endif diff --git a/levels/thi/header.inc.h b/levels/thi/header.inc.h new file mode 100644 index 0000000000..f76da4a819 --- /dev/null +++ b/levels/thi/header.inc.h @@ -0,0 +1,24 @@ +// geo +extern const GeoLayout thi_geo_0005F0[]; +extern const GeoLayout thi_geo_000608[]; +extern const GeoLayout thi_geo_0006D4[]; +extern const GeoLayout thi_geo_00079C[]; + +// leveldata +extern const Gfx thi_seg7_dl_07005260[]; +extern const Gfx thi_seg7_dl_07006968[]; +extern const Gfx thi_seg7_dl_07007008[]; +extern const Gfx thi_seg7_dl_070072E8[]; +extern const Gfx thi_seg7_dl_070073C0[]; +extern const Gfx thi_seg7_dl_07007538[]; +extern const Gfx thi_seg7_dl_07007930[]; +extern const Gfx thi_seg7_dl_07007C20[]; +extern const Gfx thi_seg7_dl_07009670[]; +extern const Gfx thi_seg7_dl_07009D50[]; +extern const Gfx thi_seg7_dl_07009F58[]; +extern const Collision thi_seg7_area_1_collision[]; +extern const Collision thi_seg7_area_2_collision[]; +extern const Collision thi_seg7_area_3_collision[]; +extern const MacroObject thi_seg7_area_1_macro_objs[]; +extern const MacroObject thi_seg7_area_2_macro_objs[]; +extern const MacroObject thi_seg7_area_3_macro_objs[]; diff --git a/levels/thi/leveldata.c b/levels/thi/leveldata.c index 65f869d72e..3f62d861a6 100644 --- a/levels/thi/leveldata.c +++ b/levels/thi/leveldata.c @@ -5,23 +5,8 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/thi/texture.inc.c" -#include "levels/thi/areas/1/1/model.inc.c" // Area 2 defines a share path to load these DLs as part of its geo script. -#include "levels/thi/areas/1/2/model.inc.c" -#include "levels/thi/areas/1/3/model.inc.c" -#include "levels/thi/areas/1/4/model.inc.c" -#include "levels/thi/areas/1/5/model.inc.c" -#include "levels/thi/areas/2/1/model.inc.c" // This looks a little weird being here but look at the usage and it makes sense. -#include "levels/thi/areas/1/6/model.inc.c" -#include "levels/thi/areas/1/7/model.inc.c" -#include "levels/thi/areas/3/1/model.inc.c" -#include "levels/thi/areas/3/2/model.inc.c" -#include "levels/thi/areas/3/3/model.inc.c" -#include "levels/thi/areas/3/4/model.inc.c" -#include "levels/thi/areas/1/collision.inc.c" -#include "levels/thi/areas/2/collision.inc.c" -#include "levels/thi/areas/3/collision.inc.c" -#include "levels/thi/areas/1/6/collision.inc.c" #include "levels/thi/areas/1/trajectory.inc.c" #include "levels/thi/areas/1/movtext.inc.c" #include "levels/thi/areas/2/movtext.inc.c" + +#include "levels/thi/leveldata.inc.c" diff --git a/levels/thi/leveldata.inc.c b/levels/thi/leveldata.inc.c new file mode 100644 index 0000000000..7fda0c241c --- /dev/null +++ b/levels/thi/leveldata.inc.c @@ -0,0 +1,16 @@ + +#include "levels/thi/texture.inc.c" +#include "levels/thi/areas/1/1/model.inc.c" // Area 2 defines a share path to load these DLs as part of its geo script. +#include "levels/thi/areas/1/2/model.inc.c" +#include "levels/thi/areas/1/3/model.inc.c" +#include "levels/thi/areas/1/4/model.inc.c" +#include "levels/thi/areas/1/5/model.inc.c" +#include "levels/thi/areas/2/1/model.inc.c" // This looks a little weird being here but look at the usage and it makes sense. +#include "levels/thi/areas/1/7/model.inc.c" +#include "levels/thi/areas/3/1/model.inc.c" +#include "levels/thi/areas/3/2/model.inc.c" +#include "levels/thi/areas/3/3/model.inc.c" +#include "levels/thi/areas/3/4/model.inc.c" +#include "levels/thi/areas/1/collision.inc.c" +#include "levels/thi/areas/2/collision.inc.c" +#include "levels/thi/areas/3/collision.inc.c" diff --git a/levels/thi/script.c b/levels/thi/script.c index 7668906184..425a07e28c 100644 --- a/levels/thi/script.c +++ b/levels/thi/script.c @@ -220,25 +220,10 @@ static const LevelScript script_thi_area_2_objects_3[] = { const LevelScript level_thi_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _thi_segment_7SegmentRomStart, _thi_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _grass_yay0SegmentRomStart, _grass_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/thi/areas/script_vanilla.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_12), - JUMP_LINK(script_func_global_15), - LOAD_MODEL_FROM_GEO(MODEL_THI_BUBBLY_TREE, bubbly_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, thi_geo_0005F0), - LOAD_MODEL_FROM_GEO(MODEL_THI_WARP_PIPE, warp_pipe_geo), - LOAD_MODEL_FROM_GEO(MODEL_THI_HUGE_ISLAND_TOP, thi_geo_0005B0), - LOAD_MODEL_FROM_GEO(MODEL_THI_TINY_ISLAND_TOP, thi_geo_0005C8), +#include "levels/thi/areas/script_vanilla_load.inc.c" AREA(/*index*/ 1, thi_geo_000608), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -7372, -1969, 7373, /*angle*/ 0, 149, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/totwc/areas/script_vanilla.inc.c b/levels/totwc/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..39175812c7 --- /dev/null +++ b/levels/totwc/areas/script_vanilla.inc.c @@ -0,0 +1,3 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_9), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, totwc_geo_000160), diff --git a/levels/totwc/areas/script_vanilla_load.inc.c b/levels/totwc/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..189821f5c0 --- /dev/null +++ b/levels/totwc/areas/script_vanilla_load.inc.c @@ -0,0 +1,7 @@ +LOAD_YAY0( /*seg*/ 0x07, _totwc_segment_7SegmentRomStart, _totwc_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), +LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/totwc/geo.c b/levels/totwc/geo.c index 4391e675e6..c2d3ceb7e8 100644 --- a/levels/totwc/geo.c +++ b/levels/totwc/geo.c @@ -13,5 +13,4 @@ #include "levels/totwc/header.h" -#include "levels/totwc/cloud/geo.inc.c" -#include "levels/totwc/areas/1/geo.inc.c" +#include "levels/totwc/geo.inc.c" diff --git a/levels/totwc/geo.inc.c b/levels/totwc/geo.inc.c new file mode 100644 index 0000000000..0e3deb4d68 --- /dev/null +++ b/levels/totwc/geo.inc.c @@ -0,0 +1,2 @@ +#include "levels/totwc/cloud/geo.inc.c" +#include "levels/totwc/areas/1/geo.inc.c" diff --git a/levels/totwc/header.h b/levels/totwc/header.h index d1754759fb..aecb25b977 100644 --- a/levels/totwc/header.h +++ b/levels/totwc/header.h @@ -3,18 +3,9 @@ #include "types.h" -// geo -extern const GeoLayout totwc_geo_000160[]; -extern const GeoLayout totwc_geo_000188[]; - -// leveldata -extern const Gfx totwc_seg7_dl_07005D28[]; -extern const Gfx totwc_seg7_dl_07007048[]; -extern const Gfx totwc_seg7_dl_070078B8[]; -extern const Gfx totwc_seg7_dl_070079A8[]; -extern const Collision totwc_seg7_collision[]; - // script extern const LevelScript level_totwc_entry[]; +#include "levels/totwc/header.inc.h" + #endif diff --git a/levels/totwc/header.inc.h b/levels/totwc/header.inc.h new file mode 100644 index 0000000000..0f566bd8b3 --- /dev/null +++ b/levels/totwc/header.inc.h @@ -0,0 +1,11 @@ +// geo +extern const GeoLayout totwc_geo_000160[]; +extern const GeoLayout totwc_geo_000188[]; + +// leveldata +extern const Gfx totwc_seg7_dl_07005D28[]; +extern const Gfx totwc_seg7_dl_07007048[]; +extern const Gfx totwc_seg7_dl_070078B8[]; +extern const Gfx totwc_seg7_dl_070079A8[]; +extern const Collision totwc_seg7_collision[]; +extern const MacroObject totwc_seg7_macro_objs[]; diff --git a/levels/totwc/leveldata.c b/levels/totwc/leveldata.c index d6a6490da1..a889289d13 100644 --- a/levels/totwc/leveldata.c +++ b/levels/totwc/leveldata.c @@ -5,9 +5,5 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/totwc/texture.inc.c" -#include "levels/totwc/areas/1/1/model.inc.c" -#include "levels/totwc/areas/1/2/model.inc.c" -#include "levels/totwc/areas/1/3/model.inc.c" -#include "levels/totwc/cloud/model.inc.c" -#include "levels/totwc/areas/1/collision.inc.c" + +#include "levels/totwc/leveldata.inc.c" diff --git a/levels/totwc/leveldata.inc.c b/levels/totwc/leveldata.inc.c new file mode 100644 index 0000000000..13df1f8527 --- /dev/null +++ b/levels/totwc/leveldata.inc.c @@ -0,0 +1,6 @@ +#include "levels/totwc/texture.inc.c" +#include "levels/totwc/areas/1/1/model.inc.c" +#include "levels/totwc/areas/1/2/model.inc.c" +#include "levels/totwc/areas/1/3/model.inc.c" +#include "levels/totwc/cloud/model.inc.c" +#include "levels/totwc/areas/1/collision.inc.c" diff --git a/levels/totwc/script.c b/levels/totwc/script.c index 9a779a9a97..ffefbf4b8a 100644 --- a/levels/totwc/script.c +++ b/levels/totwc/script.c @@ -85,18 +85,10 @@ static const LevelScript script_totwc_objects_2[] = { const LevelScript level_totwc_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _totwc_segment_7SegmentRomStart, _totwc_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/totwc/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_9), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, totwc_geo_000160), +#include "levels/totwc/areas/script_vanilla.inc.c" AREA(/*index*/ 1, totwc_geo_000188), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -4095, 2935, 0, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvFlyingWarp), diff --git a/levels/ttc/areas/script_vanilla.inc.c b/levels/ttc/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..a6bd1bea4a --- /dev/null +++ b/levels/ttc/areas/script_vanilla.inc.c @@ -0,0 +1,3 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_2), +JUMP_LINK(script_func_vo_ttc), diff --git a/levels/ttc/areas/script_vanilla_load.inc.c b/levels/ttc/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..1e57bab62d --- /dev/null +++ b/levels/ttc/areas/script_vanilla_load.inc.c @@ -0,0 +1,6 @@ +LOAD_YAY0( /*seg*/ 0x07, _ttc_segment_7SegmentRomStart, _ttc_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(ttc, machine), +LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/ttc/geo.c b/levels/ttc/geo.c index 5c37c754a4..9a10f54a80 100644 --- a/levels/ttc/geo.c +++ b/levels/ttc/geo.c @@ -13,19 +13,4 @@ #include "levels/ttc/header.h" -#include "levels/ttc/rotating_cube/geo.inc.c" -#include "levels/ttc/rotating_prism/geo.inc.c" -#include "levels/ttc/pendulum/geo.inc.c" -#include "levels/ttc/large_treadmill/geo.inc.c" -#include "levels/ttc/small_treadmill/geo.inc.c" -#include "levels/ttc/push_block/geo.inc.c" -#include "levels/ttc/rotating_hexagon/geo.inc.c" -#include "levels/ttc/rotating_triangle/geo.inc.c" -#include "levels/ttc/pit_block/geo.inc.c" -#include "levels/ttc/pit_block_2/geo.inc.c" -#include "levels/ttc/elevator_platform/geo.inc.c" -#include "levels/ttc/clock_hand/geo.inc.c" -#include "levels/ttc/spinner/geo.inc.c" -#include "levels/ttc/small_gear/geo.inc.c" -#include "levels/ttc/large_gear/geo.inc.c" -#include "levels/ttc/areas/1/geo.inc.c" +#include "levels/ttc/geo.inc.c" diff --git a/levels/ttc/geo.inc.c b/levels/ttc/geo.inc.c new file mode 100644 index 0000000000..26d713eb58 --- /dev/null +++ b/levels/ttc/geo.inc.c @@ -0,0 +1 @@ +#include "levels/ttc/areas/1/geo.inc.c" diff --git a/levels/ttc/header.h b/levels/ttc/header.h index af2a7d73c8..897d73be9e 100644 --- a/levels/ttc/header.h +++ b/levels/ttc/header.h @@ -3,65 +3,12 @@ #include "types.h" -// geo -extern const GeoLayout ttc_geo_000240[]; -extern const GeoLayout ttc_geo_000258[]; -extern const GeoLayout ttc_geo_000270[]; -extern const GeoLayout ttc_geo_000288[]; -extern const GeoLayout ttc_geo_0002A8[]; -extern const GeoLayout ttc_geo_0002C8[]; -extern const GeoLayout ttc_geo_0002E0[]; -extern const GeoLayout ttc_geo_0002F8[]; -extern const GeoLayout ttc_geo_000310[]; -extern const GeoLayout ttc_geo_000328[]; -extern const GeoLayout ttc_geo_000340[]; -extern const GeoLayout ttc_geo_000358[]; -extern const GeoLayout ttc_geo_000370[]; -extern const GeoLayout ttc_geo_000388[]; -extern const GeoLayout ttc_geo_0003A0[]; -extern const GeoLayout ttc_geo_0003B8[]; - -// leveldata -extern const Gfx ttc_seg7_dl_0700AD38[]; -extern const Gfx ttc_seg7_dl_0700B1D8[]; -extern const Gfx ttc_seg7_dl_0700E878[]; -extern const Gfx ttc_seg7_dl_0700ECB8[]; -extern const Gfx ttc_seg7_dl_0700EFE0[]; -extern const Gfx ttc_seg7_dl_0700F760[]; -extern const Gfx ttc_seg7_dl_0700FBB8[]; -extern const Gfx ttc_seg7_dl_0700FFE8[]; -extern const Gfx ttc_seg7_dl_070102B8[]; -extern const Gfx ttc_seg7_dl_07010868[]; -extern const Gfx ttc_seg7_dl_07010D38[]; -extern const Gfx ttc_seg7_dl_07011040[]; -extern const Gfx ttc_seg7_dl_07011360[]; -extern const Gfx ttc_seg7_dl_070116A8[]; -extern const Gfx ttc_seg7_dl_07011B38[]; -extern const Gfx ttc_seg7_dl_07012028[]; -extern const Gfx ttc_seg7_dl_07012148[]; -extern const Gfx ttc_seg7_dl_07012278[]; -extern const Collision ttc_seg7_collision_level[]; -extern const Collision ttc_seg7_collision_07014F70[]; -extern const Collision ttc_seg7_collision_07015008[]; -extern const Collision ttc_seg7_collision_clock_pendulum[]; -extern const Collision ttc_seg7_collision_070152B4[]; -extern const Collision ttc_seg7_collision_070153E0[]; -extern const Collision ttc_seg7_collision_sliding_surface[]; -extern const Collision ttc_seg7_collision_07015584[]; -extern const Collision ttc_seg7_collision_07015650[]; -extern const Collision ttc_seg7_collision_07015754[]; -extern const Collision ttc_seg7_collision_070157D8[]; -extern const Collision ttc_seg7_collision_clock_platform[]; -extern const Collision ttc_seg7_collision_clock_main_rotation[]; -extern const Collision ttc_seg7_collision_rotating_clock_platform2[]; -extern const Texture ttc_yellow_triangle[]; -extern const Gfx ttc_dl_surface_treadmill_begin[]; -extern const Gfx ttc_dl_surface_treadmill_end[]; extern Movtex ttc_movtex_tris_big_surface_treadmill[]; extern Movtex ttc_movtex_tris_small_surface_treadmill[]; -extern const Gfx ttc_dl_surface_treadmill[]; // script extern const LevelScript level_ttc_entry[]; +#include "levels/ttc/header.inc.h" + #endif diff --git a/levels/ttc/header.inc.h b/levels/ttc/header.inc.h new file mode 100644 index 0000000000..56cb08696d --- /dev/null +++ b/levels/ttc/header.inc.h @@ -0,0 +1,13 @@ +// geo +extern const GeoLayout ttc_geo_0003B8[]; + +// leveldata +extern const Gfx ttc_seg7_dl_0700AD38[]; +extern const Gfx ttc_seg7_dl_0700B1D8[]; +extern const Gfx ttc_seg7_dl_0700E878[]; +extern const Collision ttc_seg7_collision_level[]; +extern const MacroObject ttc_seg7_macro_objs[]; +extern const Texture ttc_yellow_triangle[]; +extern const Gfx ttc_dl_surface_treadmill_begin[]; +extern const Gfx ttc_dl_surface_treadmill_end[]; +extern const Gfx ttc_dl_surface_treadmill[]; diff --git a/levels/ttc/leveldata.c b/levels/ttc/leveldata.c index 01fbaf5273..cb1fc95214 100644 --- a/levels/ttc/leveldata.c +++ b/levels/ttc/leveldata.c @@ -5,38 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -// LEVEL DATA -#include "levels/ttc/texture.inc.c" -#include "levels/ttc/areas/1/1/model.inc.c" -#include "levels/ttc/areas/1/2/model.inc.c" -#include "levels/ttc/areas/1/3/model.inc.c" -#include "levels/ttc/rotating_cube/model.inc.c" -#include "levels/ttc/rotating_prism/model.inc.c" -#include "levels/ttc/pendulum/model.inc.c" -#include "levels/ttc/large_treadmill/model.inc.c" -#include "levels/ttc/small_treadmill/model.inc.c" -#include "levels/ttc/push_block/model.inc.c" -#include "levels/ttc/rotating_hexagon/model.inc.c" -#include "levels/ttc/rotating_triangle/model.inc.c" -#include "levels/ttc/pit_block/model.inc.c" -#include "levels/ttc/pit_block_2/model.inc.c" -#include "levels/ttc/elevator_platform/model.inc.c" -#include "levels/ttc/clock_hand/model.inc.c" -#include "levels/ttc/spinner/model.inc.c" -#include "levels/ttc/small_gear/model.inc.c" -#include "levels/ttc/large_gear/model.inc.c" -#include "levels/ttc/areas/1/collision.inc.c" -#include "levels/ttc/rotating_cube/collision.inc.c" -#include "levels/ttc/rotating_prism/collision.inc.c" -#include "levels/ttc/pendulum/collision.inc.c" -#include "levels/ttc/large_treadmill/collision.inc.c" -#include "levels/ttc/small_treadmill/collision.inc.c" -#include "levels/ttc/push_block/collision.inc.c" -#include "levels/ttc/rotating_hexagon/collision.inc.c" -#include "levels/ttc/rotating_triangle/collision.inc.c" -#include "levels/ttc/pit_block/collision.inc.c" -#include "levels/ttc/pit_block_2/collision.inc.c" -#include "levels/ttc/elevator_platform/collision.inc.c" -#include "levels/ttc/clock_hand/collision.inc.c" -#include "levels/ttc/spinner/collision.inc.c" #include "levels/ttc/areas/1/movtext.inc.c" + +#include "levels/ttc/leveldata.inc.c" diff --git a/levels/ttc/leveldata.inc.c b/levels/ttc/leveldata.inc.c new file mode 100644 index 0000000000..57cc2efd2a --- /dev/null +++ b/levels/ttc/leveldata.inc.c @@ -0,0 +1,5 @@ +#include "levels/ttc/texture.inc.c" +#include "levels/ttc/areas/1/1/model.inc.c" +#include "levels/ttc/areas/1/2/model.inc.c" +#include "levels/ttc/areas/1/3/model.inc.c" +#include "levels/ttc/areas/1/collision.inc.c" diff --git a/levels/ttc/script.c b/levels/ttc/script.c index e30eab16c6..40c05e2d71 100644 --- a/levels/ttc/script.c +++ b/levels/ttc/script.c @@ -149,31 +149,10 @@ static const LevelScript script_ttc_objects_2[] = { const LevelScript level_ttc_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _ttc_segment_7SegmentRomStart, _ttc_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _machine_yay0SegmentRomStart, _machine_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/ttc/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_2), - LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_CUBE, ttc_geo_000240), - LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_PRISM, ttc_geo_000258), - LOAD_MODEL_FROM_GEO(MODEL_TTC_PENDULUM, ttc_geo_000270), - LOAD_MODEL_FROM_GEO(MODEL_TTC_LARGE_TREADMILL, ttc_geo_000288), - LOAD_MODEL_FROM_GEO(MODEL_TTC_SMALL_TREADMILL, ttc_geo_0002A8), - LOAD_MODEL_FROM_GEO(MODEL_TTC_PUSH_BLOCK, ttc_geo_0002C8), - LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_HEXAGON, ttc_geo_0002E0), - LOAD_MODEL_FROM_GEO(MODEL_TTC_ROTATING_TRIANGLE, ttc_geo_0002F8), - LOAD_MODEL_FROM_GEO(MODEL_TTC_PIT_BLOCK, ttc_geo_000310), - LOAD_MODEL_FROM_GEO(MODEL_TTC_PIT_BLOCK_UNUSED, ttc_geo_000328), - LOAD_MODEL_FROM_GEO(MODEL_TTC_ELEVATOR_PLATFORM, ttc_geo_000340), - LOAD_MODEL_FROM_GEO(MODEL_TTC_CLOCK_HAND, ttc_geo_000358), - LOAD_MODEL_FROM_GEO(MODEL_TTC_SPINNER, ttc_geo_000370), - LOAD_MODEL_FROM_GEO(MODEL_TTC_SMALL_GEAR, ttc_geo_000388), - LOAD_MODEL_FROM_GEO(MODEL_TTC_LARGE_GEAR, ttc_geo_0003A0), +#include "levels/ttc/areas/script_vanilla.inc.c" AREA(/*index*/ 1, ttc_geo_0003B8), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 1417, -3822, -548, /*angle*/ 0, 316, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/ttc/texture.inc.c b/levels/ttc/texture.inc.c index 984abbbc36..fcc1ed34fa 100644 --- a/levels/ttc/texture.inc.c +++ b/levels/ttc/texture.inc.c @@ -1,8 +1,3 @@ -// 0x07000000 - 0x07000800 -ALIGNED8 static const Texture ttc_seg7_texture_07000000[] = { -#include "levels/ttc/0.rgba16.inc.c" -}; - // 0x07000800 - 0x07001000 ALIGNED8 static const Texture ttc_seg7_texture_07000800[] = { #include "levels/ttc/1.rgba16.inc.c" diff --git a/levels/ttm/areas/script_vanilla.inc.c b/levels/ttm/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..5e5785d602 --- /dev/null +++ b/levels/ttm/areas/script_vanilla.inc.c @@ -0,0 +1,22 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_7), +JUMP_LINK(script_func_vo_ttm), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ttm_geo_000748), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ttm_geo_000778), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ttm_geo_0007A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ttm_geo_0007D8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ttm_geo_000808), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, ttm_geo_000830), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, ttm_geo_000858), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, ttm_geo_000880), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, ttm_geo_0008A8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, ttm_geo_0008D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, ttm_geo_0008F8), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, ttm_geo_000920), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, ttm_geo_000948), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, ttm_geo_000970), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, ttm_geo_000990), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, ttm_geo_0009C0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, ttm_geo_0009F0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, ttm_geo_000A18), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, ttm_geo_000A40), diff --git a/levels/ttm/areas/script_vanilla_load.inc.c b/levels/ttm/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..cc27c95221 --- /dev/null +++ b/levels/ttm/areas/script_vanilla_load.inc.c @@ -0,0 +1,7 @@ +LOAD_YAY0( /*seg*/ 0x07, _ttm_segment_7SegmentRomStart, _ttm_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(ttm, mountain), +LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group6_yay0SegmentRomStart, _group6_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group6_geoSegmentRomStart, _group6_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/ttm/geo.c b/levels/ttm/geo.c index 07d6207042..e6b7808a04 100644 --- a/levels/ttm/geo.c +++ b/levels/ttm/geo.c @@ -13,33 +13,4 @@ #include "levels/ttm/header.h" -#include "levels/ttm/star_cage/geo.inc.c" -#include "levels/ttm/rolling_log/geo.inc.c" -#include "levels/ttm/areas/1/3/geo.inc.c" -#include "levels/ttm/areas/1/4/geo.inc.c" -#include "levels/ttm/areas/1/5/geo.inc.c" -#include "levels/ttm/areas/1/6/geo.inc.c" -#include "levels/ttm/areas/1/7/geo.inc.c" -#include "levels/ttm/areas/1/8/geo.inc.c" -#include "levels/ttm/areas/1/9/geo.inc.c" -#include "levels/ttm/areas/1/10/geo.inc.c" -#include "levels/ttm/areas/1/11/geo.inc.c" -#include "levels/ttm/areas/1/12/geo.inc.c" -#include "levels/ttm/areas/1/13/geo.inc.c" -#include "levels/ttm/areas/1/14/geo.inc.c" -#include "levels/ttm/areas/1/15/geo.inc.c" -#include "levels/ttm/areas/1/16/geo.inc.c" -#include "levels/ttm/areas/1/17/geo.inc.c" -#include "levels/ttm/areas/1/18/geo.inc.c" -#include "levels/ttm/areas/1/19/geo.inc.c" -#include "levels/ttm/areas/1/20/geo.inc.c" -#include "levels/ttm/areas/1/21/geo.inc.c" -#include "levels/ttm/areas/1/geo.inc.c" -#include "levels/ttm/areas/2/geo.inc.c" -#include "levels/ttm/areas/3/geo.inc.c" -#include "levels/ttm/areas/4/geo.inc.c" -#include "levels/ttm/blue_smiley/geo.inc.c" -#include "levels/ttm/yellow_smiley/geo.inc.c" -#include "levels/ttm/star_smiley/geo.inc.c" -#include "levels/ttm/moon_smiley/geo.inc.c" -#include "levels/ttm/slide_exit_podium/geo.inc.c" +#include "levels/ttm/geo.inc.c" diff --git a/levels/ttm/geo.inc.c b/levels/ttm/geo.inc.c new file mode 100644 index 0000000000..9ba4828949 --- /dev/null +++ b/levels/ttm/geo.inc.c @@ -0,0 +1,23 @@ +#include "levels/ttm/areas/1/3/geo.inc.c" +#include "levels/ttm/areas/1/4/geo.inc.c" +#include "levels/ttm/areas/1/5/geo.inc.c" +#include "levels/ttm/areas/1/6/geo.inc.c" +#include "levels/ttm/areas/1/7/geo.inc.c" +#include "levels/ttm/areas/1/8/geo.inc.c" +#include "levels/ttm/areas/1/9/geo.inc.c" +#include "levels/ttm/areas/1/10/geo.inc.c" +#include "levels/ttm/areas/1/11/geo.inc.c" +#include "levels/ttm/areas/1/12/geo.inc.c" +#include "levels/ttm/areas/1/13/geo.inc.c" +#include "levels/ttm/areas/1/14/geo.inc.c" +#include "levels/ttm/areas/1/15/geo.inc.c" +#include "levels/ttm/areas/1/16/geo.inc.c" +#include "levels/ttm/areas/1/17/geo.inc.c" +#include "levels/ttm/areas/1/18/geo.inc.c" +#include "levels/ttm/areas/1/19/geo.inc.c" +#include "levels/ttm/areas/1/20/geo.inc.c" +#include "levels/ttm/areas/1/21/geo.inc.c" +#include "levels/ttm/areas/1/geo.inc.c" +#include "levels/ttm/areas/2/geo.inc.c" +#include "levels/ttm/areas/3/geo.inc.c" +#include "levels/ttm/areas/4/geo.inc.c" diff --git a/levels/ttm/header.h b/levels/ttm/header.h index a91ca0d4a4..dc40f13eba 100644 --- a/levels/ttm/header.h +++ b/levels/ttm/header.h @@ -4,79 +4,7 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout ttm_geo_000710[]; -extern const GeoLayout ttm_geo_000730[]; -extern const GeoLayout ttm_geo_000748[]; -extern const GeoLayout ttm_geo_000778[]; -extern const GeoLayout ttm_geo_0007A8[]; -extern const GeoLayout ttm_geo_0007D8[]; -extern const GeoLayout ttm_geo_000808[]; -extern const GeoLayout ttm_geo_000830[]; -extern const GeoLayout ttm_geo_000858[]; -extern const GeoLayout ttm_geo_000880[]; -extern const GeoLayout ttm_geo_0008A8[]; -extern const GeoLayout ttm_geo_0008D0[]; -extern const GeoLayout ttm_geo_0008F8[]; -extern const GeoLayout ttm_geo_000920[]; -extern const GeoLayout ttm_geo_000948[]; -extern const GeoLayout ttm_geo_000970[]; -extern const GeoLayout ttm_geo_000990[]; -extern const GeoLayout ttm_geo_0009C0[]; -extern const GeoLayout ttm_geo_0009F0[]; -extern const GeoLayout ttm_geo_000A18[]; -extern const GeoLayout ttm_geo_000A40[]; -extern const GeoLayout ttm_geo_000A70[]; -extern const GeoLayout ttm_geo_000B5C[]; -extern const GeoLayout ttm_geo_000BEC[]; -extern const GeoLayout ttm_geo_000C84[]; -extern const GeoLayout ttm_geo_000D14[]; -extern const GeoLayout ttm_geo_000D4C[]; -extern const GeoLayout ttm_geo_000D84[]; -extern const GeoLayout ttm_geo_000DBC[]; -extern const GeoLayout ttm_geo_000DF4[]; - -// leveldata -extern const Gfx ttm_seg7_dl_0700A120[]; -extern const Gfx ttm_seg7_dl_0700A2E0[]; -extern const Gfx ttm_seg7_dl_0700A8C0[]; -extern const Gfx ttm_seg7_dl_0700AB08[]; -extern const Gfx ttm_seg7_dl_0700AF90[]; -extern const Gfx ttm_seg7_dl_0700B0D0[]; -extern const Gfx ttm_seg7_dl_0700B530[]; -extern const Gfx ttm_seg7_dl_0700B670[]; -extern const Gfx ttm_seg7_dl_0700BAD0[]; -extern const Gfx ttm_seg7_dl_0700BC10[]; -extern const Gfx ttm_seg7_dl_0700BE20[]; -extern const Gfx ttm_seg7_dl_0700C070[]; -extern const Gfx ttm_seg7_dl_0700C408[]; -extern const Gfx ttm_seg7_dl_0700CAE0[]; -extern const Gfx ttm_seg7_dl_0700CD10[]; -extern const Gfx ttm_seg7_dl_0700D1D8[]; -extern const Gfx ttm_seg7_dl_0700D688[]; -extern const Gfx ttm_seg7_dl_0700DF78[]; -extern const Gfx ttm_seg7_dl_0700E308[]; -extern const Gfx ttm_seg7_dl_0700EAC8[]; -extern const Gfx ttm_seg7_dl_0700EC58[]; -extern const Gfx ttm_seg7_dl_0700F270[]; -extern const Gfx ttm_seg7_dl_0700FA18[]; -extern const Gfx ttm_seg7_dl_07010978[]; -extern const Gfx ttm_seg7_dl_07010A68[]; -extern const Gfx ttm_seg7_dl_07011128[]; -extern const Gfx ttm_seg7_dl_07011608[]; -extern const Gfx ttm_seg7_dl_07011C78[]; -extern const Gfx ttm_seg7_dl_07011D78[]; -extern const Gfx ttm_seg7_dl_07012270[]; -extern const Gfx ttm_seg7_dl_07012388[]; -extern const Gfx ttm_seg7_dl_070123A0[]; -extern const Gfx ttm_seg7_dl_070123B8[]; -extern const Gfx ttm_seg7_dl_07012410[]; extern struct Painting ttm_slide_painting; -extern const Gfx ttm_seg7_dl_07013430[]; -extern const Gfx ttm_seg7_dl_07013608[]; -extern const Collision ttm_seg7_collision_pitoune_2[]; -extern const Collision ttm_seg7_collision_ukiki_cage[]; -extern const Collision ttm_seg7_area_1_collision[]; extern const Trajectory ttm_seg7_trajectory_070170A0[]; extern const struct MovtexQuadCollection ttm_movtex_puddle[]; extern Movtex ttm_movtex_tris_begin_waterfall[]; @@ -84,27 +12,10 @@ extern Movtex ttm_movtex_tris_begin_puddle_waterfall[]; extern Movtex ttm_movtex_tris_end_waterfall[]; extern Movtex ttm_movtex_tris_end_puddle_waterfall[]; extern Movtex ttm_movtex_tris_puddle_waterfall[]; -extern const Gfx ttm_dl_waterfall[]; -extern const Gfx ttm_dl_bottom_waterfall[]; -extern const Gfx ttm_dl_puddle_waterfall[]; -extern const Gfx ttm_seg7_dl_0701D798[]; -extern const Gfx ttm_seg7_dl_0701DBB8[]; -extern const Gfx ttm_seg7_dl_070249A0[]; -extern const Gfx ttm_seg7_dl_07024C78[]; -extern const Gfx ttm_seg7_dl_07025F48[]; -extern const Gfx ttm_seg7_dl_0702A1B8[]; -extern const Gfx ttm_seg7_dl_0702A8A0[]; -extern const Gfx ttm_seg7_dl_0702A9C0[]; -extern const Gfx ttm_seg7_dl_0702AAA8[]; -extern const Gfx ttm_seg7_dl_0702AB90[]; -extern const Gfx ttm_seg7_dl_0702AC78[]; -extern const Gfx ttm_seg7_dl_0702BB60[]; -extern const Collision ttm_seg7_area_2_collision[]; -extern const Collision ttm_seg7_area_3_collision[]; -extern const Collision ttm_seg7_area_4_collision[]; -extern const Collision ttm_seg7_collision_podium_warp[]; // script extern const LevelScript level_ttm_entry[]; +#include "levels/ttm/header.inc.h" + #endif diff --git a/levels/ttm/header.inc.h b/levels/ttm/header.inc.h new file mode 100644 index 0000000000..0fb2ccddab --- /dev/null +++ b/levels/ttm/header.inc.h @@ -0,0 +1,77 @@ +// geo +extern const GeoLayout ttm_geo_000748[]; +extern const GeoLayout ttm_geo_000778[]; +extern const GeoLayout ttm_geo_0007A8[]; +extern const GeoLayout ttm_geo_0007D8[]; +extern const GeoLayout ttm_geo_000808[]; +extern const GeoLayout ttm_geo_000830[]; +extern const GeoLayout ttm_geo_000858[]; +extern const GeoLayout ttm_geo_000880[]; +extern const GeoLayout ttm_geo_0008A8[]; +extern const GeoLayout ttm_geo_0008D0[]; +extern const GeoLayout ttm_geo_0008F8[]; +extern const GeoLayout ttm_geo_000920[]; +extern const GeoLayout ttm_geo_000948[]; +extern const GeoLayout ttm_geo_000970[]; +extern const GeoLayout ttm_geo_000990[]; +extern const GeoLayout ttm_geo_0009C0[]; +extern const GeoLayout ttm_geo_0009F0[]; +extern const GeoLayout ttm_geo_000A18[]; +extern const GeoLayout ttm_geo_000A40[]; +extern const GeoLayout ttm_geo_000A70[]; +extern const GeoLayout ttm_geo_000B5C[]; +extern const GeoLayout ttm_geo_000BEC[]; +extern const GeoLayout ttm_geo_000C84[]; + +// leveldata +extern const Gfx ttm_seg7_dl_0700A120[]; +extern const Gfx ttm_seg7_dl_0700A2E0[]; +extern const Gfx ttm_seg7_dl_0700A8C0[]; +extern const Gfx ttm_seg7_dl_0700AB08[]; +extern const Gfx ttm_seg7_dl_0700AF90[]; +extern const Gfx ttm_seg7_dl_0700B0D0[]; +extern const Gfx ttm_seg7_dl_0700B530[]; +extern const Gfx ttm_seg7_dl_0700B670[]; +extern const Gfx ttm_seg7_dl_0700BAD0[]; +extern const Gfx ttm_seg7_dl_0700BC10[]; +extern const Gfx ttm_seg7_dl_0700BE20[]; +extern const Gfx ttm_seg7_dl_0700C070[]; +extern const Gfx ttm_seg7_dl_0700C408[]; +extern const Gfx ttm_seg7_dl_0700CAE0[]; +extern const Gfx ttm_seg7_dl_0700CD10[]; +extern const Gfx ttm_seg7_dl_0700D1D8[]; +extern const Gfx ttm_seg7_dl_0700D688[]; +extern const Gfx ttm_seg7_dl_0700DF78[]; +extern const Gfx ttm_seg7_dl_0700E308[]; +extern const Gfx ttm_seg7_dl_0700EAC8[]; +extern const Gfx ttm_seg7_dl_0700EC58[]; +extern const Gfx ttm_seg7_dl_0700F270[]; +extern const Gfx ttm_seg7_dl_0700FA18[]; +extern const Gfx ttm_seg7_dl_07010978[]; +extern const Gfx ttm_seg7_dl_07010A68[]; +extern const Gfx ttm_seg7_dl_07011128[]; +extern const Gfx ttm_seg7_dl_07011608[]; +extern const Gfx ttm_seg7_dl_07011C78[]; +extern const Gfx ttm_seg7_dl_07011D78[]; +extern const Gfx ttm_seg7_dl_07012388[]; +extern const Gfx ttm_seg7_dl_070123A0[]; +extern const Gfx ttm_seg7_dl_070123B8[]; +extern const Gfx ttm_seg7_dl_07012410[]; +extern const Collision ttm_seg7_area_1_collision[]; +extern const MacroObject ttm_seg7_area_1_macro_objs[]; +extern const Gfx ttm_dl_waterfall[]; +extern const Gfx ttm_dl_bottom_waterfall[]; +extern const Gfx ttm_dl_puddle_waterfall[]; +extern const Gfx ttm_seg7_dl_0701D798[]; +extern const Gfx ttm_seg7_dl_0701DBB8[]; +extern const Gfx ttm_seg7_dl_070249A0[]; +extern const Gfx ttm_seg7_dl_07024C78[]; +extern const Gfx ttm_seg7_dl_07025F48[]; +extern const Gfx ttm_seg7_dl_0702A1B8[]; +extern const Gfx ttm_seg7_dl_0702A8A0[]; +extern const Collision ttm_seg7_area_2_collision[]; +extern const Collision ttm_seg7_area_3_collision[]; +extern const Collision ttm_seg7_area_4_collision[]; +extern const MacroObject ttm_seg7_area_2_macro_objs[]; +extern const MacroObject ttm_seg7_area_3_macro_objs[]; +extern const MacroObject ttm_seg7_area_4_macro_objs[]; diff --git a/levels/ttm/leveldata.c b/levels/ttm/leveldata.c index 0524ebecf4..372ab08450 100644 --- a/levels/ttm/leveldata.c +++ b/levels/ttm/leveldata.c @@ -6,57 +6,8 @@ #include "make_const_nonconst.h" #include "levels/ttm/texture.inc.c" -#include "levels/ttm/areas/1/1/model.inc.c" -#include "levels/ttm/areas/1/2/model.inc.c" -#include "levels/ttm/areas/1/3/1.inc.c" -#include "levels/ttm/areas/1/3/2.inc.c" -#include "levels/ttm/areas/1/4/1.inc.c" -#include "levels/ttm/areas/1/4/2.inc.c" -#include "levels/ttm/areas/1/5/1.inc.c" -#include "levels/ttm/areas/1/5/2.inc.c" -#include "levels/ttm/areas/1/6/1.inc.c" -#include "levels/ttm/areas/1/6/2.inc.c" -#include "levels/ttm/areas/1/7/model.inc.c" -#include "levels/ttm/areas/1/8/model.inc.c" -#include "levels/ttm/areas/1/9/model.inc.c" -#include "levels/ttm/areas/1/10/model.inc.c" -#include "levels/ttm/areas/1/11/model.inc.c" -#include "levels/ttm/areas/1/12/model.inc.c" -#include "levels/ttm/areas/1/13/model.inc.c" -#include "levels/ttm/areas/1/14/model.inc.c" -#include "levels/ttm/areas/1/15/model.inc.c" -#include "levels/ttm/areas/1/16/1.inc.c" -#include "levels/ttm/areas/1/16/2.inc.c" -#include "levels/ttm/areas/1/17/1.inc.c" -#include "levels/ttm/areas/1/17/2.inc.c" -#include "levels/ttm/areas/1/18/1.inc.c" -#include "levels/ttm/areas/1/18/2.inc.c" -#include "levels/ttm/areas/1/19/model.inc.c" -#include "levels/ttm/areas/1/20/model.inc.c" -#include "levels/ttm/areas/1/21/1.inc.c" -#include "levels/ttm/areas/1/21/2.inc.c" -#include "levels/ttm/rolling_log/model.inc.c" #include "levels/ttm/areas/1/painting.inc.c" -#include "levels/ttm/star_cage/1.inc.c" -#include "levels/ttm/star_cage/2.inc.c" -#include "levels/ttm/rolling_log/collision.inc.c" -#include "levels/ttm/star_cage/collision.inc.c" -#include "levels/ttm/areas/1/collision.inc.c" #include "levels/ttm/areas/1/trajectory.inc.c" #include "levels/ttm/areas/1/movtext.inc.c" -#include "levels/ttm/areas/2/1/model.inc.c" -#include "levels/ttm/areas/2/2/model.inc.c" -#include "levels/ttm/areas/3/1/model.inc.c" -#include "levels/ttm/areas/3/2/model.inc.c" -#include "levels/ttm/areas/3/3/model.inc.c" -#include "levels/ttm/areas/4/1/model.inc.c" -#include "levels/ttm/areas/4/2/model.inc.c" -#include "levels/ttm/blue_smiley/model.inc.c" -#include "levels/ttm/yellow_smiley/model.inc.c" -#include "levels/ttm/star_smiley/model.inc.c" -#include "levels/ttm/moon_smiley/model.inc.c" -#include "levels/ttm/slide_exit_podium/model.inc.c" -#include "levels/ttm/areas/2/collision.inc.c" -#include "levels/ttm/areas/3/collision.inc.c" -#include "levels/ttm/areas/4/collision.inc.c" -#include "levels/ttm/slide_exit_podium/collision.inc.c" + +#include "levels/ttm/leveldata.inc.c" diff --git a/levels/ttm/leveldata.inc.c b/levels/ttm/leveldata.inc.c new file mode 100644 index 0000000000..31444fae24 --- /dev/null +++ b/levels/ttm/leveldata.inc.c @@ -0,0 +1,40 @@ +#include "levels/ttm/areas/1/1/model.inc.c" +#include "levels/ttm/areas/1/2/model.inc.c" +#include "levels/ttm/areas/1/3/1.inc.c" +#include "levels/ttm/areas/1/3/2.inc.c" +#include "levels/ttm/areas/1/4/1.inc.c" +#include "levels/ttm/areas/1/4/2.inc.c" +#include "levels/ttm/areas/1/5/1.inc.c" +#include "levels/ttm/areas/1/5/2.inc.c" +#include "levels/ttm/areas/1/6/1.inc.c" +#include "levels/ttm/areas/1/6/2.inc.c" +#include "levels/ttm/areas/1/7/model.inc.c" +#include "levels/ttm/areas/1/8/model.inc.c" +#include "levels/ttm/areas/1/9/model.inc.c" +#include "levels/ttm/areas/1/10/model.inc.c" +#include "levels/ttm/areas/1/11/model.inc.c" +#include "levels/ttm/areas/1/12/model.inc.c" +#include "levels/ttm/areas/1/13/model.inc.c" +#include "levels/ttm/areas/1/14/model.inc.c" +#include "levels/ttm/areas/1/15/model.inc.c" +#include "levels/ttm/areas/1/16/1.inc.c" +#include "levels/ttm/areas/1/16/2.inc.c" +#include "levels/ttm/areas/1/17/1.inc.c" +#include "levels/ttm/areas/1/17/2.inc.c" +#include "levels/ttm/areas/1/18/1.inc.c" +#include "levels/ttm/areas/1/18/2.inc.c" +#include "levels/ttm/areas/1/19/model.inc.c" +#include "levels/ttm/areas/1/20/model.inc.c" +#include "levels/ttm/areas/1/21/1.inc.c" +#include "levels/ttm/areas/1/21/2.inc.c" +#include "levels/ttm/areas/1/collision.inc.c" +#include "levels/ttm/areas/2/1/model.inc.c" +#include "levels/ttm/areas/2/2/model.inc.c" +#include "levels/ttm/areas/3/1/model.inc.c" +#include "levels/ttm/areas/3/2/model.inc.c" +#include "levels/ttm/areas/3/3/model.inc.c" +#include "levels/ttm/areas/4/1/model.inc.c" +#include "levels/ttm/areas/4/2/model.inc.c" +#include "levels/ttm/areas/2/collision.inc.c" +#include "levels/ttm/areas/3/collision.inc.c" +#include "levels/ttm/areas/4/collision.inc.c" diff --git a/levels/ttm/script.c b/levels/ttm/script.c index 3f50beea48..a09680b8f8 100644 --- a/levels/ttm/script.c +++ b/levels/ttm/script.c @@ -210,43 +210,10 @@ static const LevelScript script_ttm_area_4_objects_1[] = { const LevelScript level_ttm_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _ttm_segment_7SegmentRomStart, _ttm_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _mountain_yay0SegmentRomStart, _mountain_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group6_yay0SegmentRomStart, _group6_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group6_geoSegmentRomStart, _group6_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/ttm/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_7), - LOAD_MODEL_FROM_GEO(MODEL_TTM_SLIDE_EXIT_PODIUM, ttm_geo_000DF4), - LOAD_MODEL_FROM_GEO(MODEL_TTM_ROLLING_LOG, ttm_geo_000730), - LOAD_MODEL_FROM_GEO(MODEL_TTM_STAR_CAGE, ttm_geo_000710), - LOAD_MODEL_FROM_GEO(MODEL_TTM_BLUE_SMILEY, ttm_geo_000D14), - LOAD_MODEL_FROM_GEO(MODEL_TTM_YELLOW_SMILEY, ttm_geo_000D4C), - LOAD_MODEL_FROM_GEO(MODEL_TTM_STAR_SMILEY, ttm_geo_000D84), - LOAD_MODEL_FROM_GEO(MODEL_TTM_MOON_SMILEY, ttm_geo_000DBC), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, ttm_geo_000748), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, ttm_geo_000778), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, ttm_geo_0007A8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, ttm_geo_0007D8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, ttm_geo_000808), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, ttm_geo_000830), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, ttm_geo_000858), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, ttm_geo_000880), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0B, ttm_geo_0008A8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, ttm_geo_0008D0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0D, ttm_geo_0008F8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, ttm_geo_000920), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, ttm_geo_000948), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, ttm_geo_000970), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, ttm_geo_000990), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, ttm_geo_0009C0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, ttm_geo_0009F0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, ttm_geo_000A18), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_16, ttm_geo_000A40), +#include "levels/ttm/areas/script_vanilla.inc.c" AREA(/*index*/ 1, ttm_geo_000A70), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 102, -3332, 5734, /*angle*/ 0, 45, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/ttm/texture.inc.c b/levels/ttm/texture.inc.c index 43b1b09017..419d0e6a15 100644 --- a/levels/ttm/texture.inc.c +++ b/levels/ttm/texture.inc.c @@ -18,11 +18,6 @@ ALIGNED8 static const Texture ttm_seg7_texture_07001800[] = { #include "levels/ttm/3.rgba16.inc.c" }; -// 0x07002000 - 0x07003000 -ALIGNED8 static const Texture ttm_seg7_texture_07002000[] = { -#include "levels/ttm/4.rgba16.inc.c" -}; - // 0x07002800 - 0x07003800 ALIGNED8 static const Texture ttm_seg7_texture_07002800[] = { #include "levels/ttm/5.rgba16.inc.c" diff --git a/levels/vcutm/areas/script_vanilla.inc.c b/levels/vcutm/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..563e9dd551 --- /dev/null +++ b/levels/vcutm/areas/script_vanilla.inc.c @@ -0,0 +1,4 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_9), +JUMP_LINK(script_func_vo_vcutm), +LOAD_MODEL_FROM_GEO(MODEL_VCUTM_WARP_PIPE, warp_pipe_geo), diff --git a/levels/vcutm/areas/script_vanilla_load.inc.c b/levels/vcutm/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..464ca4fa0f --- /dev/null +++ b/levels/vcutm/areas/script_vanilla_load.inc.c @@ -0,0 +1,6 @@ +LOAD_VANILLA_OBJECTS(vcutm, outside), +LOAD_YAY0( /*seg*/ 0x07, _vcutm_segment_7SegmentRomStart, _vcutm_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/vcutm/geo.c b/levels/vcutm/geo.c index e1d27e6711..8179592457 100644 --- a/levels/vcutm/geo.c +++ b/levels/vcutm/geo.c @@ -13,5 +13,4 @@ #include "levels/vcutm/header.h" -#include "levels/vcutm/seesaw/geo.inc.c" -#include "levels/vcutm/areas/1/geo.inc.c" +#include "levels/vcutm/geo.inc.c" diff --git a/levels/vcutm/geo.inc.c b/levels/vcutm/geo.inc.c new file mode 100644 index 0000000000..7e97765099 --- /dev/null +++ b/levels/vcutm/geo.inc.c @@ -0,0 +1 @@ +#include "levels/vcutm/areas/1/geo.inc.c" diff --git a/levels/vcutm/header.h b/levels/vcutm/header.h index 1bd67e3057..778242a192 100644 --- a/levels/vcutm/header.h +++ b/levels/vcutm/header.h @@ -3,20 +3,9 @@ #include "types.h" -// geo -extern const GeoLayout vcutm_geo_0001F0[]; -extern const GeoLayout vcutm_geo_000208[]; - -// leveldata -extern const Gfx vcutm_seg7_dl_07007E88[]; -extern const Gfx vcutm_seg7_dl_070080D0[]; -extern const Gfx vcutm_seg7_dl_07008E10[]; -extern const Gfx vcutm_seg7_dl_070093E8[]; -extern const Gfx vcutm_seg7_dl_070096E0[]; -extern const Collision vcutm_seg7_collision[]; -extern const Collision vcutm_seg7_collision_0700AC44[]; - // script extern const LevelScript level_vcutm_entry[]; +#include "levels/vcutm/header.inc.h" + #endif diff --git a/levels/vcutm/header.inc.h b/levels/vcutm/header.inc.h new file mode 100644 index 0000000000..25fdf6243e --- /dev/null +++ b/levels/vcutm/header.inc.h @@ -0,0 +1,10 @@ +// geo +extern const GeoLayout vcutm_geo_000208[]; + +// leveldata +extern const Gfx vcutm_seg7_dl_07007E88[]; +extern const Gfx vcutm_seg7_dl_070080D0[]; +extern const Gfx vcutm_seg7_dl_07008E10[]; +extern const Gfx vcutm_seg7_dl_070093E8[]; +extern const Collision vcutm_seg7_collision[]; +extern const MacroObject vcutm_seg7_macro_objs[]; diff --git a/levels/vcutm/leveldata.c b/levels/vcutm/leveldata.c index 956442ae14..0e54b3d154 100644 --- a/levels/vcutm/leveldata.c +++ b/levels/vcutm/leveldata.c @@ -5,11 +5,4 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/vcutm/texture.inc.c" -#include "levels/vcutm/areas/1/1/model.inc.c" -#include "levels/vcutm/areas/1/2/model.inc.c" -#include "levels/vcutm/areas/1/3/model.inc.c" -#include "levels/vcutm/areas/1/4/model.inc.c" -#include "levels/vcutm/seesaw/model.inc.c" -#include "levels/vcutm/areas/1/collision.inc.c" -#include "levels/vcutm/seesaw/collision.inc.c" +#include "levels/vcutm/leveldata.inc.c" diff --git a/levels/vcutm/leveldata.inc.c b/levels/vcutm/leveldata.inc.c new file mode 100644 index 0000000000..12dea1c739 --- /dev/null +++ b/levels/vcutm/leveldata.inc.c @@ -0,0 +1,6 @@ +#include "levels/vcutm/texture.inc.c" +#include "levels/vcutm/areas/1/1/model.inc.c" +#include "levels/vcutm/areas/1/2/model.inc.c" +#include "levels/vcutm/areas/1/3/model.inc.c" +#include "levels/vcutm/areas/1/4/model.inc.c" +#include "levels/vcutm/areas/1/collision.inc.c" diff --git a/levels/vcutm/script.c b/levels/vcutm/script.c index 3a096011da..2935ff5052 100644 --- a/levels/vcutm/script.c +++ b/levels/vcutm/script.c @@ -75,18 +75,10 @@ static const LevelScript script_vcutm_objects_3[] = { const LevelScript level_vcutm_entry[] = { INIT_LEVEL(), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _outside_yay0SegmentRomStart, _outside_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x07, _vcutm_segment_7SegmentRomStart, _vcutm_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/vcutm/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_9), - LOAD_MODEL_FROM_GEO(MODEL_VCUTM_SEESAW_PLATFORM, vcutm_geo_0001F0), - LOAD_MODEL_FROM_GEO(MODEL_VCUTM_WARP_PIPE, warp_pipe_geo), +#include "levels/vcutm/areas/script_vanilla.inc.c" AREA(/*index*/ 1, vcutm_geo_000208), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6143, 6734, -6143, /*angle*/ 0, 0, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), diff --git a/levels/vcutm/texture.inc.c b/levels/vcutm/texture.inc.c index e78781381c..4427e954a8 100644 --- a/levels/vcutm/texture.inc.c +++ b/levels/vcutm/texture.inc.c @@ -8,11 +8,6 @@ ALIGNED8 static const Texture vcutm_seg7_texture_07000800[] = { #include "levels/vcutm/1.rgba16.inc.c" }; -// 0x07001800 - 0x07002800 -ALIGNED8 static const Texture vcutm_seg7_texture_07001800[] = { -#include "levels/vcutm/2.rgba16.inc.c" -}; - // 0x07002800 - 0x07003000 ALIGNED8 static const Texture vcutm_seg7_texture_07002800[] = { #include "levels/vcutm/3.rgba16.inc.c" diff --git a/levels/wdw/areas/script_vanilla.inc.c b/levels/wdw/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..d1990a857c --- /dev/null +++ b/levels/wdw/areas/script_vanilla.inc.c @@ -0,0 +1,5 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_2), +JUMP_LINK(script_func_global_14), +JUMP_LINK(script_func_vo_wdw), +LOAD_MODEL_FROM_GEO(MODEL_WDW_BUBBLY_TREE, bubbly_tree_geo), diff --git a/levels/wdw/areas/script_vanilla_load.inc.c b/levels/wdw/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..b94f0e60ee --- /dev/null +++ b/levels/wdw/areas/script_vanilla_load.inc.c @@ -0,0 +1,9 @@ +LOAD_YAY0( /*seg*/ 0x07, _wdw_segment_7SegmentRomStart, _wdw_segment_7SegmentRomEnd), +LOAD_VANILLA_OBJECTS(wdw, grass), +LOAD_YAY0( /*seg*/ 0x0A, _wdw_skybox_yay0SegmentRomStart, _wdw_skybox_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/wdw/geo.c b/levels/wdw/geo.c index 458a1ce9e6..78307f069f 100644 --- a/levels/wdw/geo.c +++ b/levels/wdw/geo.c @@ -13,12 +13,4 @@ #include "levels/wdw/header.h" -#include "levels/wdw/square_floating_platform/geo.inc.c" -#include "levels/wdw/arrow_lift/geo.inc.c" -#include "levels/wdw/water_level_diamond/geo.inc.c" -#include "levels/wdw/hidden_platform/geo.inc.c" -#include "levels/wdw/express_elevator/geo.inc.c" -#include "levels/wdw/rectangular_floating_platform/geo.inc.c" -#include "levels/wdw/rotating_platform/geo.inc.c" -#include "levels/wdw/areas/1/geo.inc.c" -#include "levels/wdw/areas/2/geo.inc.c" +#include "levels/wdw/geo.inc.c" diff --git a/levels/wdw/geo.inc.c b/levels/wdw/geo.inc.c new file mode 100644 index 0000000000..6813914cee --- /dev/null +++ b/levels/wdw/geo.inc.c @@ -0,0 +1,2 @@ +#include "levels/wdw/areas/1/geo.inc.c" +#include "levels/wdw/areas/2/geo.inc.c" diff --git a/levels/wdw/header.h b/levels/wdw/header.h index 97051fb719..a7342301ab 100644 --- a/levels/wdw/header.h +++ b/levels/wdw/header.h @@ -4,44 +4,12 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout wdw_geo_000580[]; -extern const GeoLayout wdw_geo_000598[]; -extern const GeoLayout wdw_geo_0005C0[]; -extern const GeoLayout wdw_geo_0005E8[]; -extern const GeoLayout wdw_geo_000610[]; -extern const GeoLayout wdw_geo_000628[]; -extern const GeoLayout wdw_geo_000640[]; -extern const GeoLayout wdw_geo_000658[]; -extern const GeoLayout wdw_geo_000724[]; - -// leveldata -extern const Gfx wdw_seg7_dl_07009AB0[]; -extern const Gfx wdw_seg7_dl_0700A138[]; -extern const Gfx wdw_seg7_dl_07011E48[]; -extern const Gfx wdw_seg7_dl_07012258[]; -extern const Gfx wdw_seg7_dl_07012798[]; -extern const Gfx wdw_seg7_dl_07012908[]; -extern const Gfx wdw_seg7_dl_07012B90[]; -extern const Gfx wdw_seg7_dl_07012E88[]; -extern const Gfx wdw_seg7_dl_070131B8[]; -extern const Gfx wdw_seg7_dl_07013490[]; -extern const Gfx wdw_seg7_dl_07013B70[]; -extern const Gfx wdw_seg7_dl_07013E40[]; -extern const Gfx wdw_seg7_dl_070140E0[]; -extern const Collision wdw_seg7_area_1_collision[]; -extern const Collision wdw_seg7_area_2_collision[]; -extern const Collision wdw_seg7_collision_square_floating_platform[]; -extern const Collision wdw_seg7_collision_arrow_lift[]; -extern const Collision wdw_seg7_collision_070184C8[]; -extern const Collision wdw_seg7_collision_hidden_platform[]; -extern const Collision wdw_seg7_collision_express_elevator_platform[]; -extern const Collision wdw_seg7_collision_rect_floating_platform[]; -extern const Collision wdw_seg7_collision_rotating_platform[]; extern const struct MovtexQuadCollection wdw_movtex_area1_water[]; extern const struct MovtexQuadCollection wdw_movtex_area2_water[]; // script extern const LevelScript level_wdw_entry[]; +#include "levels/wdw/header.inc.h" + #endif diff --git a/levels/wdw/header.inc.h b/levels/wdw/header.inc.h new file mode 100644 index 0000000000..0a1a39d723 --- /dev/null +++ b/levels/wdw/header.inc.h @@ -0,0 +1,15 @@ +// geo +extern const GeoLayout wdw_geo_000658[]; +extern const GeoLayout wdw_geo_000724[]; + +// leveldata +extern const Gfx wdw_seg7_dl_07009AB0[]; +extern const Gfx wdw_seg7_dl_0700A138[]; +extern const Gfx wdw_seg7_dl_07011E48[]; +extern const Gfx wdw_seg7_dl_07012258[]; +extern const Gfx wdw_seg7_dl_07012798[]; +extern const Gfx wdw_seg7_dl_07012908[]; +extern const Collision wdw_seg7_area_1_collision[]; +extern const MacroObject wdw_seg7_area_1_macro_objs[]; +extern const Collision wdw_seg7_area_2_collision[]; +extern const MacroObject wdw_seg7_area_2_macro_objs[]; diff --git a/levels/wdw/leveldata.c b/levels/wdw/leveldata.c index 52d7bf06d2..8f27732b1a 100644 --- a/levels/wdw/leveldata.c +++ b/levels/wdw/leveldata.c @@ -5,28 +5,7 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/wdw/texture.inc.c" -#include "levels/wdw/areas/1/1/model.inc.c" -#include "levels/wdw/areas/1/2/model.inc.c" -#include "levels/wdw/areas/2/1/model.inc.c" -#include "levels/wdw/areas/2/2/model.inc.c" -#include "levels/wdw/areas/1/3/model.inc.c" -#include "levels/wdw/double_arrows/model.inc.c" // This is weird, but the only instance of a shared area object in a level. So we're treating it as a seperate model. It does not have collision anyway so it may have been combined in both areas by some sort of optimizer at compile time. -#include "levels/wdw/square_floating_platform/model.inc.c" -#include "levels/wdw/arrow_lift/model.inc.c" -#include "levels/wdw/water_level_diamond/model.inc.c" -#include "levels/wdw/hidden_platform/model.inc.c" -#include "levels/wdw/express_elevator/model.inc.c" -#include "levels/wdw/rectangular_floating_platform/model.inc.c" -#include "levels/wdw/rotating_platform/model.inc.c" -#include "levels/wdw/areas/1/collision.inc.c" -#include "levels/wdw/areas/2/collision.inc.c" -#include "levels/wdw/square_floating_platform/collision.inc.c" -#include "levels/wdw/arrow_lift/collision.inc.c" -#include "levels/wdw/water_level_diamond/collision.inc.c" // Unused -#include "levels/wdw/hidden_platform/collision.inc.c" -#include "levels/wdw/express_elevator/collision.inc.c" -#include "levels/wdw/rectangular_floating_platform/collision.inc.c" -#include "levels/wdw/rotating_platform/collision.inc.c" #include "levels/wdw/areas/1/movtext.inc.c" #include "levels/wdw/areas/2/movtext.inc.c" + +#include "levels/wdw/leveldata.inc.c" diff --git a/levels/wdw/leveldata.inc.c b/levels/wdw/leveldata.inc.c new file mode 100644 index 0000000000..4a25913515 --- /dev/null +++ b/levels/wdw/leveldata.inc.c @@ -0,0 +1,10 @@ + +#include "levels/wdw/texture.inc.c" +#include "levels/wdw/areas/1/1/model.inc.c" +#include "levels/wdw/areas/1/2/model.inc.c" +#include "levels/wdw/areas/2/1/model.inc.c" +#include "levels/wdw/areas/2/2/model.inc.c" +#include "levels/wdw/areas/1/3/model.inc.c" +#include "levels/wdw/double_arrows/model.inc.c" // This is weird, but the only instance of a shared area object in a level. So we're treating it as a seperate model. It does not have collision anyway so it may have been combined in both areas by some sort of optimizer at compile time. +#include "levels/wdw/areas/1/collision.inc.c" +#include "levels/wdw/areas/2/collision.inc.c" diff --git a/levels/wdw/script.c b/levels/wdw/script.c index c328404879..7a483bd3ce 100644 --- a/levels/wdw/script.c +++ b/levels/wdw/script.c @@ -186,28 +186,10 @@ static const LevelScript script_wdw_area_2_objects_2[] = { const LevelScript level_wdw_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _wdw_segment_7SegmentRomStart, _wdw_segment_7SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _grass_yay0SegmentRomStart, _grass_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _wdw_skybox_yay0SegmentRomStart, _wdw_skybox_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group13_yay0SegmentRomStart, _group13_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group13_geoSegmentRomStart, _group13_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/wdw/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_2), - JUMP_LINK(script_func_global_14), - LOAD_MODEL_FROM_GEO(MODEL_WDW_BUBBLY_TREE, bubbly_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_WDW_SQUARE_FLOATING_PLATFORM, wdw_geo_000580), - LOAD_MODEL_FROM_GEO(MODEL_WDW_ARROW_LIFT, wdw_geo_000598), - LOAD_MODEL_FROM_GEO(MODEL_WDW_WATER_LEVEL_DIAMOND, wdw_geo_0005C0), - LOAD_MODEL_FROM_GEO(MODEL_WDW_HIDDEN_PLATFORM, wdw_geo_0005E8), - LOAD_MODEL_FROM_GEO(MODEL_WDW_EXPRESS_ELEVATOR, wdw_geo_000610), - LOAD_MODEL_FROM_GEO(MODEL_WDW_RECTANGULAR_FLOATING_PLATFORM, wdw_geo_000628), - LOAD_MODEL_FROM_GEO(MODEL_WDW_ROTATING_PLATFORM, wdw_geo_000640), +#include "levels/wdw/areas/script_vanilla.inc.c" AREA(/*index*/ 1, wdw_geo_000658), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3395, 3580, 384, /*angle*/ 0, 180, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/wdw/texture.inc.c b/levels/wdw/texture.inc.c index 0e510b0634..f07472b746 100644 --- a/levels/wdw/texture.inc.c +++ b/levels/wdw/texture.inc.c @@ -8,16 +8,6 @@ ALIGNED8 static const Texture wdw_seg7_texture_07000800[] = { #include "levels/wdw/1.rgba16.inc.c" }; -// 0x07001000 - 0x07001800 -ALIGNED8 static const Texture wdw_seg7_texture_07001000[] = { -#include "levels/wdw/2.rgba16.inc.c" -}; - -// 0x07001800 - 0x07002000 -ALIGNED8 static const Texture wdw_seg7_texture_07001800[] = { -#include "levels/wdw/3.rgba16.inc.c" -}; - // 0x07002000 - 0x07002800 ALIGNED8 static const Texture wdw_seg7_texture_07002000[] = { #include "levels/wdw/4.rgba16.inc.c" diff --git a/levels/wf/areas/script_vanilla.inc.c b/levels/wf/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..ab2f3afc4e --- /dev/null +++ b/levels/wf/areas/script_vanilla.inc.c @@ -0,0 +1,10 @@ +LOAD_YAY0( /*seg*/ 0x07, _wf_segment_7SegmentRomStart, _wf_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), +LOAD_VANILLA_OBJECTS(wf, grass), +LOAD_RAW( /*seg*/ 0x1B, _vo_wf_geoSegmentRomStart, _vo_wf_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/wf/areas/script_vanilla_load.inc.c b/levels/wf/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..1718fddf6d --- /dev/null +++ b/levels/wf/areas/script_vanilla_load.inc.c @@ -0,0 +1,16 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_2), +JUMP_LINK(script_func_global_15), +JUMP_LINK(script_func_vo_wf), +LOAD_MODEL_FROM_GEO(MODEL_WF_BUBBLY_TREE, bubbly_tree_geo), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, wf_geo_0007E0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, wf_geo_000820), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, wf_geo_000860), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, wf_geo_000878), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, wf_geo_000890), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, wf_geo_000900), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, wf_geo_000940), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, wf_geo_000958), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, wf_geo_0009A0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, wf_geo_0009D0), +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, wf_geo_0009E8), diff --git a/levels/wf/geo.c b/levels/wf/geo.c index f31514b62f..92465782d2 100644 --- a/levels/wf/geo.c +++ b/levels/wf/geo.c @@ -13,31 +13,4 @@ #include "levels/wf/header.h" -#include "levels/wf/areas/1/5/geo.inc.c" -#include "levels/wf/areas/1/6/geo.inc.c" -#include "levels/wf/areas/1/7/geo.inc.c" -#include "levels/wf/areas/1/8/geo.inc.c" -#include "levels/wf/areas/1/9/geo.inc.c" -#include "levels/wf/areas/1/10/geo.inc.c" -#include "levels/wf/areas/1/11/geo.inc.c" -#include "levels/wf/areas/1/12/geo.inc.c" -#include "levels/wf/areas/1/13/geo.inc.c" -#include "levels/wf/areas/1/15/geo.inc.c" -#include "levels/wf/areas/1/16/geo.inc.c" -#include "levels/wf/areas/1/17/geo.inc.c" -#include "levels/wf/areas/1/18/geo.inc.c" -#include "levels/wf/areas/1/19/geo.inc.c" -#include "levels/wf/small_bomp/geo.inc.c" -#include "levels/wf/large_bomp/geo.inc.c" -#include "levels/wf/rotating_wooden_platform/geo.inc.c" -#include "levels/wf/sliding_platform/geo.inc.c" -#include "levels/wf/tumbling_bridge_near/geo.inc.c" -#include "levels/wf/tumbling_bridge_far/geo.inc.c" -#include "levels/wf/areas/1/14/geo.inc.c" -#include "levels/wf/beta_extending_platform/geo.inc.c" -#include "levels/wf/extending_platform/geo.inc.c" -#include "levels/wf/breakable_wall_right/geo.inc.c" -#include "levels/wf/breakable_wall_left/geo.inc.c" -#include "levels/wf/kickable_board/geo.inc.c" -#include "levels/wf/tower_door/geo.inc.c" -#include "levels/wf/areas/1/geo.inc.c" +#include "levels/wf/geo.inc.c" diff --git a/levels/wf/geo.inc.c b/levels/wf/geo.inc.c new file mode 100644 index 0000000000..b23589ef19 --- /dev/null +++ b/levels/wf/geo.inc.c @@ -0,0 +1,12 @@ +#include "levels/wf/areas/1/5/geo.inc.c" +#include "levels/wf/areas/1/6/geo.inc.c" +#include "levels/wf/areas/1/7/geo.inc.c" +#include "levels/wf/areas/1/8/geo.inc.c" +#include "levels/wf/areas/1/9/geo.inc.c" +#include "levels/wf/areas/1/12/geo.inc.c" +#include "levels/wf/areas/1/13/geo.inc.c" +#include "levels/wf/areas/1/15/geo.inc.c" +#include "levels/wf/areas/1/16/geo.inc.c" +#include "levels/wf/areas/1/18/geo.inc.c" +#include "levels/wf/areas/1/19/geo.inc.c" +#include "levels/wf/areas/1/geo.inc.c" diff --git a/levels/wf/header.h b/levels/wf/header.h index 5e1beff7a0..3057252386 100644 --- a/levels/wf/header.h +++ b/levels/wf/header.h @@ -4,98 +4,11 @@ #include "types.h" #include "game/moving_texture.h" -// geo -extern const GeoLayout wf_geo_0007E0[]; -extern const GeoLayout wf_geo_000820[]; -extern const GeoLayout wf_geo_000860[]; -extern const GeoLayout wf_geo_000878[]; -extern const GeoLayout wf_geo_000890[]; -extern const GeoLayout wf_geo_0008A8[]; -extern const GeoLayout wf_geo_0008E8[]; -extern const GeoLayout wf_geo_000900[]; -extern const GeoLayout wf_geo_000940[]; -extern const GeoLayout wf_geo_000958[]; -extern const GeoLayout wf_geo_0009A0[]; -extern const GeoLayout wf_geo_0009B8[]; -extern const GeoLayout wf_geo_0009D0[]; -extern const GeoLayout wf_geo_0009E8[]; -extern const GeoLayout wf_geo_000A00[]; -extern const GeoLayout wf_geo_000A40[]; -extern const GeoLayout wf_geo_000A58[]; -extern const GeoLayout wf_geo_000A98[]; -extern const GeoLayout wf_geo_000AB0[]; -extern const GeoLayout wf_geo_000AC8[]; -extern const GeoLayout wf_geo_000AE0[]; -extern const GeoLayout wf_geo_000AF8[]; -extern const GeoLayout wf_geo_000B10[]; -extern const GeoLayout wf_geo_000B38[]; -extern const GeoLayout wf_geo_000B60[]; -extern const GeoLayout wf_geo_000B78[]; -extern const GeoLayout wf_geo_000B90[]; -extern const GeoLayout wf_geo_000BA8[]; -extern const GeoLayout wf_geo_000BC8[]; -extern const GeoLayout wf_geo_000BE0[]; -extern const GeoLayout wf_geo_000BF8[]; - -// leveldata -extern const Gfx wf_seg7_dl_070050C8[]; -extern const Gfx wf_seg7_dl_070052B8[]; -extern const Gfx wf_seg7_dl_07005538[]; -extern const Gfx wf_seg7_dl_07005690[]; -extern const Gfx wf_seg7_dl_07005DD8[]; -extern const Gfx wf_seg7_dl_07005EE8[]; -extern const Gfx wf_seg7_dl_070064E8[]; -extern const Gfx wf_seg7_dl_070065F8[]; -extern const Gfx wf_seg7_dl_07006820[]; -extern const Gfx wf_seg7_dl_07007220[]; -extern const Gfx wf_seg7_dl_07007518[]; -extern const Gfx wf_seg7_dl_070087B0[]; -extern const Gfx wf_seg7_dl_07008FE8[]; -extern const Gfx wf_seg7_dl_07009278[]; -extern const Gfx wf_seg7_dl_07009780[]; -extern const Gfx wf_seg7_dl_07009890[]; -extern const Gfx wf_seg7_dl_07009DB0[]; -extern const Gfx wf_seg7_dl_0700A170[]; -extern const Gfx wf_seg7_dl_0700ABA0[]; -extern const Gfx wf_seg7_dl_0700AEC8[]; -extern const Gfx wf_seg7_dl_0700AFB8[]; -extern const Gfx wf_seg7_dl_0700BA28[]; -extern const Gfx wf_seg7_dl_0700BF50[]; -extern const Gfx wf_seg7_dl_0700D028[]; -extern const Gfx wf_seg7_dl_0700D300[]; -extern const Gfx wf_seg7_dl_0700D708[]; -extern const Gfx wf_seg7_dl_0700D9F0[]; -extern const Gfx wf_seg7_dl_0700DE20[]; -extern const Gfx wf_seg7_dl_0700E0F0[]; -extern const Gfx wf_seg7_dl_0700E3D0[]; -extern const Gfx wf_seg7_dl_0700E760[]; -extern const Gfx wf_seg7_dl_0700E9B8[]; -extern const Gfx wf_seg7_dl_0700EB40[]; -extern const Gfx wf_seg7_dl_0700EDC0[]; -extern const Gfx wf_seg7_dl_0700F018[]; -extern const Gfx wf_seg7_dl_0700F1A8[]; -extern const Gfx wf_seg7_dl_0700F340[]; -extern const Gfx wf_seg7_dl_0700F610[]; -extern const Gfx wf_seg7_dl_0700F6C0[]; -extern const Gfx wf_seg7_dl_0700F7F8[]; -extern const Collision wf_seg7_collision_small_bomp[]; -extern const Collision wf_seg7_collision_large_bomp[]; -extern const Collision wf_seg7_collision_clocklike_rotation[]; -extern const Collision wf_seg7_collision_sliding_brick_platform[]; -extern const Collision wf_seg7_collision_tumbling_bridge[]; -extern const Collision wf_seg7_collision_trapezoid[]; -extern const Collision wf_seg7_collision_platform[]; -extern const Collision wf_seg7_collision_breakable_wall[]; -extern const Collision wf_seg7_collision_breakable_wall_2[]; -extern const Collision wf_seg7_collision_kickable_board[]; -extern const Collision wf_seg7_collision_tower_door[]; -extern const Collision wf_seg7_collision_rotating_platform[]; -extern const Collision wf_seg7_collision_tower[]; -extern const Collision wf_seg7_collision_bullet_bill_cannon[]; -extern const Collision wf_seg7_collision_070102D8[]; extern const struct MovtexQuadCollection wf_movtex_water[]; // script extern const LevelScript level_wf_entry[]; +#include "levels/wf/header.inc.h" + #endif diff --git a/levels/wf/header.inc.h b/levels/wf/header.inc.h new file mode 100644 index 0000000000..3e7a5b9e82 --- /dev/null +++ b/levels/wf/header.inc.h @@ -0,0 +1,39 @@ +// geo +extern const GeoLayout wf_geo_0007E0[]; +extern const GeoLayout wf_geo_000820[]; +extern const GeoLayout wf_geo_000860[]; +extern const GeoLayout wf_geo_000878[]; +extern const GeoLayout wf_geo_000890[]; +extern const GeoLayout wf_geo_0008A8[]; +extern const GeoLayout wf_geo_0008E8[]; +extern const GeoLayout wf_geo_000900[]; +extern const GeoLayout wf_geo_000940[]; +extern const GeoLayout wf_geo_000958[]; +extern const GeoLayout wf_geo_0009A0[]; +extern const GeoLayout wf_geo_0009D0[]; +extern const GeoLayout wf_geo_0009E8[]; +extern const GeoLayout wf_geo_000BF8[]; + +// leveldata +extern const Gfx wf_seg7_dl_070050C8[]; +extern const Gfx wf_seg7_dl_070052B8[]; +extern const Gfx wf_seg7_dl_07005538[]; +extern const Gfx wf_seg7_dl_07005690[]; +extern const Gfx wf_seg7_dl_07005DD8[]; +extern const Gfx wf_seg7_dl_07005EE8[]; +extern const Gfx wf_seg7_dl_070064E8[]; +extern const Gfx wf_seg7_dl_070065F8[]; +extern const Gfx wf_seg7_dl_07006820[]; +extern const Gfx wf_seg7_dl_07007220[]; +extern const Gfx wf_seg7_dl_07007518[]; +extern const Gfx wf_seg7_dl_07009780[]; +extern const Gfx wf_seg7_dl_07009890[]; +extern const Gfx wf_seg7_dl_07009DB0[]; +extern const Gfx wf_seg7_dl_0700ABA0[]; +extern const Gfx wf_seg7_dl_0700AEC8[]; +extern const Gfx wf_seg7_dl_0700AFB8[]; +extern const Gfx wf_seg7_dl_0700BA28[]; +extern const Gfx wf_seg7_dl_0700D028[]; +extern const Gfx wf_seg7_dl_0700D300[]; +extern const Collision wf_seg7_collision_070102D8[]; +extern const MacroObject wf_seg7_macro_objs[]; diff --git a/levels/wf/leveldata.c b/levels/wf/leveldata.c index e31eeb858d..bc53a6f1a2 100644 --- a/levels/wf/leveldata.c +++ b/levels/wf/leveldata.c @@ -5,60 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/wf/texture.inc.c" -#include "levels/wf/areas/1/1/model.inc.c" -#include "levels/wf/areas/1/2/model.inc.c" -#include "levels/wf/areas/1/3/model.inc.c" -#include "levels/wf/areas/1/4/model.inc.c" -#include "levels/wf/areas/1/5/1.inc.c" -#include "levels/wf/areas/1/5/2.inc.c" -#include "levels/wf/areas/1/6/1.inc.c" -#include "levels/wf/areas/1/6/2.inc.c" -#include "levels/wf/areas/1/7/model.inc.c" -#include "levels/wf/areas/1/8/model.inc.c" -#include "levels/wf/areas/1/9/model.inc.c" -#include "levels/wf/areas/1/10/1.inc.c" -#include "levels/wf/areas/1/10/2.inc.c" -#include "levels/wf/areas/1/11/model.inc.c" -#include "levels/wf/areas/1/12/1.inc.c" -#include "levels/wf/areas/1/12/2.inc.c" -#include "levels/wf/areas/1/13/model.inc.c" -#include "levels/wf/areas/1/14/model.inc.c" -#include "levels/wf/areas/1/15/1.inc.c" -#include "levels/wf/areas/1/15/2.inc.c" -#include "levels/wf/areas/1/15/3.inc.c" -#include "levels/wf/areas/1/16/model.inc.c" -#include "levels/wf/areas/1/17/model.inc.c" -#include "levels/wf/areas/1/18/model.inc.c" -#include "levels/wf/areas/1/19/model.inc.c" -#include "levels/wf/small_bomp/1.inc.c" -#include "levels/wf/small_bomp/2.inc.c" -#include "levels/wf/large_bomp/model.inc.c" -#include "levels/wf/tumbling_bridge_near/model.inc.c" -#include "levels/wf/tumbling_bridge_far/model.inc.c" -#include "levels/wf/rotating_wooden_platform/1.inc.c" -#include "levels/wf/rotating_wooden_platform/2.inc.c" -#include "levels/wf/sliding_platform/model.inc.c" -#include "levels/wf/beta_extending_platform/model.inc.c" -#include "levels/wf/extending_platform/model.inc.c" -#include "levels/wf/breakable_wall_right/model.inc.c" -#include "levels/wf/breakable_wall_left/model.inc.c" -#include "levels/wf/kickable_board/1.inc.c" -#include "levels/wf/kickable_board/2.inc.c" -#include "levels/wf/tower_door/model.inc.c" -#include "levels/wf/small_bomp/collision.inc.c" -#include "levels/wf/large_bomp/collision.inc.c" -#include "levels/wf/rotating_wooden_platform/collision.inc.c" -#include "levels/wf/sliding_platform/collision.inc.c" -#include "levels/wf/tumbling_bridge_near/collision.inc.c" -#include "levels/wf/beta_extending_platform/collision.inc.c" -#include "levels/wf/extending_platform/collision.inc.c" -#include "levels/wf/breakable_wall_right/collision.inc.c" -#include "levels/wf/breakable_wall_left/collision.inc.c" -#include "levels/wf/kickable_board/collision.inc.c" -#include "levels/wf/tower_door/collision.inc.c" -#include "levels/wf/rotating_platform/collision.inc.c" // This is odd... TODO: investigate this. -#include "levels/wf/areas/1/10/collision.inc.c" -#include "levels/wf/areas/1/11/collision.inc.c" -#include "levels/wf/areas/1/collision.inc.c" #include "levels/wf/areas/1/movtext.inc.c" + +#include "levels/wf/leveldata.inc.c" diff --git a/levels/wf/leveldata.inc.c b/levels/wf/leveldata.inc.c new file mode 100644 index 0000000000..56f58c4a22 --- /dev/null +++ b/levels/wf/leveldata.inc.c @@ -0,0 +1,22 @@ +#include "levels/wf/texture.inc.c" +#include "levels/wf/areas/1/1/model.inc.c" +#include "levels/wf/areas/1/2/model.inc.c" +#include "levels/wf/areas/1/3/model.inc.c" +#include "levels/wf/areas/1/4/model.inc.c" +#include "levels/wf/areas/1/5/1.inc.c" +#include "levels/wf/areas/1/5/2.inc.c" +#include "levels/wf/areas/1/6/1.inc.c" +#include "levels/wf/areas/1/6/2.inc.c" +#include "levels/wf/areas/1/7/model.inc.c" +#include "levels/wf/areas/1/8/model.inc.c" +#include "levels/wf/areas/1/9/model.inc.c" +#include "levels/wf/areas/1/12/1.inc.c" +#include "levels/wf/areas/1/12/2.inc.c" +#include "levels/wf/areas/1/13/model.inc.c" +#include "levels/wf/areas/1/15/1.inc.c" +#include "levels/wf/areas/1/15/2.inc.c" +#include "levels/wf/areas/1/15/3.inc.c" +#include "levels/wf/areas/1/16/model.inc.c" +#include "levels/wf/areas/1/18/model.inc.c" +#include "levels/wf/areas/1/19/model.inc.c" +#include "levels/wf/areas/1/collision.inc.c" diff --git a/levels/wf/script.c b/levels/wf/script.c index 2ed31cdade..39cd829767 100644 --- a/levels/wf/script.c +++ b/levels/wf/script.c @@ -146,51 +146,10 @@ static const LevelScript script_wf_objects_4[] = { const LevelScript level_wf_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _wf_segment_7SegmentRomStart, _wf_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _grass_yay0SegmentRomStart, _grass_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/wf/areas/script_vanilla.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_2), - JUMP_LINK(script_func_global_15), - LOAD_MODEL_FROM_GEO(MODEL_WF_BUBBLY_TREE, bubbly_tree_geo), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_03, wf_geo_0007E0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_04, wf_geo_000820), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_05, wf_geo_000860), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_06, wf_geo_000878), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_07, wf_geo_000890), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_08, wf_geo_0008A8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_09, wf_geo_0008E8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0A, wf_geo_000900), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0C, wf_geo_000940), - LOAD_MODEL_FROM_GEO(MODEL_WF_GIANT_POLE, wf_geo_000AE0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, wf_geo_000958), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, wf_geo_0009A0), - LOAD_MODEL_FROM_GEO(MODEL_WF_ROTATING_PLATFORM, wf_geo_0009B8), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, wf_geo_0009D0), - LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, wf_geo_0009E8), - LOAD_MODEL_FROM_GEO(MODEL_WF_SMALL_BOMP, wf_geo_000A00), - LOAD_MODEL_FROM_GEO(MODEL_WF_LARGE_BOMP, wf_geo_000A40), - LOAD_MODEL_FROM_GEO(MODEL_WF_ROTATING_WOODEN_PLATFORM, wf_geo_000A58), - LOAD_MODEL_FROM_GEO(MODEL_WF_SLIDING_PLATFORM, wf_geo_000A98), - LOAD_MODEL_FROM_GEO(MODEL_WF_TUMBLING_BRIDGE_PART, wf_geo_000AB0), - LOAD_MODEL_FROM_GEO(MODEL_WF_TUMBLING_BRIDGE, wf_geo_000AC8), - LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_TRAPEZOID_PLATORM, wf_geo_000AF8), - LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_SQUARE_PLATORM, wf_geo_000B10), - LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_SQUARE_PLATORM_UNUSED, wf_geo_000B38), - LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_SQUARE_PLATORM_ELEVATOR, wf_geo_000B60), - LOAD_MODEL_FROM_GEO(MODEL_WF_BREAKABLE_WALL_RIGHT, wf_geo_000B78), - LOAD_MODEL_FROM_GEO(MODEL_WF_BREAKABLE_WALL_LEFT, wf_geo_000B90), - LOAD_MODEL_FROM_GEO(MODEL_WF_KICKABLE_BOARD, wf_geo_000BA8), - LOAD_MODEL_FROM_GEO(MODEL_WF_TOWER_DOOR, wf_geo_000BE0), - LOAD_MODEL_FROM_GEO(MODEL_WF_KICKABLE_BOARD_FELLED, wf_geo_000BC8), +#include "levels/wf/areas/script_vanilla_load.inc.c" AREA(/*index*/ 1, wf_geo_000BF8), OBJECT(/*model*/ MODEL_NONE, /*pos*/ 2600, 1256, 5120, /*angle*/ 0, 90, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvSpinAirborneWarp), diff --git a/levels/wf/texture.inc.c b/levels/wf/texture.inc.c index 2b58e2b8da..9a577a725b 100644 --- a/levels/wf/texture.inc.c +++ b/levels/wf/texture.inc.c @@ -12,18 +12,3 @@ ALIGNED8 static const Texture wf_seg7_texture_07000800[] = { ALIGNED8 static const Texture wf_seg7_texture_07001000[] = { #include "levels/wf/2.rgba16.inc.c" }; - -// 0x07001800 - 0x07002000 -ALIGNED8 static const Texture wf_seg7_texture_07001800[] = { -#include "levels/wf/3.rgba16.inc.c" -}; - -// 0x07002000 - 0x07002800 -ALIGNED8 static const Texture wf_seg7_texture_07002000[] = { -#include "levels/wf/4.rgba16.inc.c" -}; - -// 0x07002800 - 0x07002900 -ALIGNED8 static const Texture wf_seg7_texture_07002800[] = { -#include "levels/wf/5.ia8.inc.c" -}; diff --git a/levels/wmotr/areas/script_vanilla.inc.c b/levels/wmotr/areas/script_vanilla.inc.c new file mode 100644 index 0000000000..a9045a4f92 --- /dev/null +++ b/levels/wmotr/areas/script_vanilla.inc.c @@ -0,0 +1,3 @@ +JUMP_LINK(script_func_global_1), +JUMP_LINK(script_func_global_3), +JUMP_LINK(script_func_global_18), diff --git a/levels/wmotr/areas/script_vanilla_load.inc.c b/levels/wmotr/areas/script_vanilla_load.inc.c new file mode 100644 index 0000000000..9d5d0bd8b5 --- /dev/null +++ b/levels/wmotr/areas/script_vanilla_load.inc.c @@ -0,0 +1,9 @@ +LOAD_YAY0( /*seg*/ 0x07, _wmotr_segment_7SegmentRomStart, _wmotr_segment_7SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), +LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0C, _group2_geoSegmentRomStart, _group2_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), +LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/wmotr/geo.c b/levels/wmotr/geo.c index edc66962d8..3956ac8b4c 100644 --- a/levels/wmotr/geo.c +++ b/levels/wmotr/geo.c @@ -13,4 +13,4 @@ #include "levels/wmotr/header.h" -#include "levels/wmotr/areas/1/geo.inc.c" +#include "levels/wmotr/geo.inc.c" diff --git a/levels/wmotr/geo.inc.c b/levels/wmotr/geo.inc.c new file mode 100644 index 0000000000..876e9bffde --- /dev/null +++ b/levels/wmotr/geo.inc.c @@ -0,0 +1 @@ +#include "levels/wmotr/areas/1/geo.inc.c" diff --git a/levels/wmotr/header.h b/levels/wmotr/header.h index 8a79b671f8..9523d86cb9 100644 --- a/levels/wmotr/header.h +++ b/levels/wmotr/header.h @@ -3,16 +3,9 @@ #include "types.h" -// geo -extern const GeoLayout wmotr_geo_0001F0[]; - -// leveldata -extern const Gfx wmotr_seg7_dl_0700C1F8[]; -extern const Gfx wmotr_seg7_dl_0700EFD8[]; -extern const Gfx wmotr_seg7_dl_07010608[]; -extern const Collision wmotr_seg7_collision[]; - // script extern const LevelScript level_wmotr_entry[]; +#include "levels/wmotr/header.inc.h" + #endif diff --git a/levels/wmotr/header.inc.h b/levels/wmotr/header.inc.h new file mode 100644 index 0000000000..7846bac7e8 --- /dev/null +++ b/levels/wmotr/header.inc.h @@ -0,0 +1,9 @@ +// geo +extern const GeoLayout wmotr_geo_0001F0[]; + +// leveldata +extern const Gfx wmotr_seg7_dl_0700C1F8[]; +extern const Gfx wmotr_seg7_dl_0700EFD8[]; +extern const Gfx wmotr_seg7_dl_07010608[]; +extern const Collision wmotr_seg7_collision[]; +extern const MacroObject wmotr_seg7_macro_objs[]; diff --git a/levels/wmotr/leveldata.c b/levels/wmotr/leveldata.c index ad4642670d..569a0f6f87 100644 --- a/levels/wmotr/leveldata.c +++ b/levels/wmotr/leveldata.c @@ -5,6 +5,6 @@ #include "textures.h" #include "make_const_nonconst.h" -#include "levels/wmotr/texture.inc.c" -#include "levels/wmotr/areas/1/model.inc.c" -#include "levels/wmotr/areas/1/collision.inc.c" + +#include "levels/wmotr/leveldata.inc.c" + diff --git a/levels/wmotr/leveldata.inc.c b/levels/wmotr/leveldata.inc.c new file mode 100644 index 0000000000..5ba32c2f29 --- /dev/null +++ b/levels/wmotr/leveldata.inc.c @@ -0,0 +1,3 @@ +#include "levels/wmotr/texture.inc.c" +#include "levels/wmotr/areas/1/model.inc.c" +#include "levels/wmotr/areas/1/collision.inc.c" diff --git a/levels/wmotr/script.c b/levels/wmotr/script.c index 11d6aea909..1a4c97b34c 100644 --- a/levels/wmotr/script.c +++ b/levels/wmotr/script.c @@ -64,20 +64,10 @@ static const LevelScript script_wmotr_objects_2[] = { const LevelScript level_wmotr_entry[] = { INIT_LEVEL(), - LOAD_YAY0( /*seg*/ 0x07, _wmotr_segment_7SegmentRomStart, _wmotr_segment_7SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), - LOAD_YAY0_TEXTURE(/*seg*/ 0x09, _sky_yay0SegmentRomStart, _sky_yay0SegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0C, _group2_geoSegmentRomStart, _group2_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), - LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), - LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), +#include "levels/wmotr/areas/script_vanilla_load.inc.c" ALLOC_LEVEL_POOL(), MARIO(/*model*/ MODEL_MARIO, /*behParam*/ 0x00000001, /*beh*/ bhvMario), - JUMP_LINK(script_func_global_1), - JUMP_LINK(script_func_global_3), - JUMP_LINK(script_func_global_18), +#include "levels/wmotr/areas/script_vanilla.inc.c" AREA(/*index*/ 1, wmotr_geo_0001F0), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -67, 2669, -16, /*angle*/ 0, 270, 0, /*behParam*/ 0x000A0000, /*beh*/ bhvAirborneWarp), diff --git a/sm64.ld b/sm64.ld index 1f66c50aba..e84004bb65 100755 --- a/sm64.ld +++ b/sm64.ld @@ -81,6 +81,28 @@ OUTPUT_ARCH (mips) _##name##_mio0SegmentRomStart = _##name##_yay0SegmentRomStart; \ _##name##_mio0SegmentRomEnd = _##name##_yay0SegmentRomEnd; +#define VANILLA_OBJECTS(name, segAddr, geoAddr) \ + BEGIN_SEG(vo_##name##_yay0, segAddr) \ + { \ + KEEP(BUILD_DIR/actors_vanilla/name/data.szp.o(.data*)); \ + . = ALIGN(0x10); \ + } \ + END_SEG(vo_##name##_yay0) \ + BEGIN_SEG(vo_##name##_geo, geoAddr) \ + { \ + KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.*data*)); \ + KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.rodata*)); \ + KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.text*)); \ + } \ + END_SEG(vo_##name##_geo) \ + BEGIN_NOLOAD(vo_##name##_geo) \ + { \ + KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.bss*)); \ + } \ + END_NOLOAD(vo_##name##_geo) \ + _vo_##name##_mio0SegmentRomStart = _vo_##name##_yay0SegmentRomStart; \ + _vo_##name##_mio0SegmentRomEnd = _vo_##name##_yay0SegmentRomEnd; + SECTIONS { __romPos = 0; @@ -345,6 +367,28 @@ SECTIONS STANDARD_OBJECTS(common0, 0x08000000, 0x0F000000) STANDARD_OBJECTS(common1, 0x03000000, 0x16000000) + VANILLA_OBJECTS(bob, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(wf, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(jrb, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(ccm, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(bbh, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(hmc, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(lll, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(ssl, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(ddd, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(sl, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(wdw, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(ttm, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(thi, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(ttc, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(rr, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(bitdw, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(bitfs, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(bits, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(vcutm, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(castle_inside, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(castle_grounds, 0x0E000000, 0x1B000000) + /* use segmented addressing for behaviors */ BEGIN_SEG(behavior, 0x13000000) { diff --git a/src/game/behavior_actions.c b/src/game/behavior_actions.c index 98a0c927c7..1c5b5abac7 100644 --- a/src/game/behavior_actions.c +++ b/src/game/behavior_actions.c @@ -1,6 +1,14 @@ #include #include "types.h" +#include "actors_vanilla/bob/header.h" +#include "actors_vanilla/wf/header.h" +#include "actors_vanilla/bbh/header.h" +#include "actors_vanilla/hmc/header.h" +#include "actors_vanilla/lll/header.h" +#include "actors_vanilla/wdw/header.h" +#include "actors_vanilla/bitfs/header.h" +#include "actors_vanilla/castle_inside/header.h" #include "actors/common1.h" #include "actors/group12.h" #include "actors/group13.h" @@ -21,10 +29,6 @@ #include "interaction.h" #include "level_table.h" #include "level_update.h" -#include "levels/bob/header.h" -#include "levels/bowser_3/header.h" -#include "levels/castle_inside/header.h" -#include "levels/hmc/header.h" #include "main.h" #include "mario.h" #include "mario_actions_cutscene.h" diff --git a/src/game/behaviors/bowling_ball.inc.c b/src/game/behaviors/bowling_ball.inc.c index 55493ff9da..d0996bde07 100644 --- a/src/game/behaviors/bowling_ball.inc.c +++ b/src/game/behaviors/bowling_ball.inc.c @@ -1,5 +1,9 @@ // bowling_ball.inc.c +// There is no good way to handle this +#include "levels/bob/header.h" +#include "levels/ttm/header.h" + static struct ObjectHitbox sBowlingBallHitbox = { /* interactType: */ INTERACT_DAMAGE, /* downOffset: */ 0, diff --git a/src/game/behaviors/bowser_falling_platform.inc.c b/src/game/behaviors/bowser_falling_platform.inc.c index c5c31680af..7057e038ec 100644 --- a/src/game/behaviors/bowser_falling_platform.inc.c +++ b/src/game/behaviors/bowser_falling_platform.inc.c @@ -1,5 +1,7 @@ // bowser_falling_platform.inc.c +#include "levels/bowser_3/header.h" + struct BowserFallingPlatformData { const Collision *collision; s16 posX; diff --git a/src/game/behaviors/koopa.inc.c b/src/game/behaviors/koopa.inc.c index 3608553da7..c9a2ff538a 100644 --- a/src/game/behaviors/koopa.inc.c +++ b/src/game/behaviors/koopa.inc.c @@ -7,6 +7,10 @@ * flag. */ +// There is no good solution for this - just keep paths in BOB and THI for now +#include "levels/bob/header.h" +#include "levels/thi/header.h" + /** * Hitbox for koopa - this is used for every form except Koopa the Quick, which * uses a hardcoded soft hitbox. diff --git a/src/game/behaviors/platform_on_track.inc.c b/src/game/behaviors/platform_on_track.inc.c index beb1a46772..69bb176c46 100644 --- a/src/game/behaviors/platform_on_track.inc.c +++ b/src/game/behaviors/platform_on_track.inc.c @@ -5,6 +5,12 @@ * themselves as the platform moves past them. */ +#include "levels/bitfs/header.h" +#include "levels/ccm/header.h" +#include "levels/hmc/header.h" +#include "levels/lll/header.h" +#include "levels/rr/header.h" + /** * Collision models for the different types of platforms. */ diff --git a/src/game/behaviors/racing_penguin.inc.c b/src/game/behaviors/racing_penguin.inc.c index 5b49c5daae..ae8ce6cc83 100644 --- a/src/game/behaviors/racing_penguin.inc.c +++ b/src/game/behaviors/racing_penguin.inc.c @@ -1,5 +1,7 @@ // racing_penguin.inc.c +#include "levels/ccm/header.h" + struct RacingPenguinData { s16 text; f32 radius; diff --git a/src/game/behaviors/rotating_platform.inc.c b/src/game/behaviors/rotating_platform.inc.c index 6487b79908..962c5f39f4 100644 --- a/src/game/behaviors/rotating_platform.inc.c +++ b/src/game/behaviors/rotating_platform.inc.c @@ -1,8 +1,5 @@ // rotating_platform.inc.c -#include "levels/wf/header.h" -#include "levels/wdw/header.h" - struct WFRotatingPlatformData { s16 unused; s16 scale; diff --git a/src/game/behaviors/tumbling_bridge.inc.c b/src/game/behaviors/tumbling_bridge.inc.c index 7471b77e3b..d0a3e5ada6 100644 --- a/src/game/behaviors/tumbling_bridge.inc.c +++ b/src/game/behaviors/tumbling_bridge.inc.c @@ -1,10 +1,5 @@ // tumbling_bridge.inc.c -#include "levels/wf/header.h" -#include "levels/bbh/header.h" -#include "levels/lll/header.h" -#include "levels/bitfs/header.h" - struct TumblingBridgeParams { s16 numBridgeSections; s16 bridgeRelativeStartingXorZ; diff --git a/src/game/behaviors/unagi.inc.c b/src/game/behaviors/unagi.inc.c index 6d51d0ccc6..de1658b959 100644 --- a/src/game/behaviors/unagi.inc.c +++ b/src/game/behaviors/unagi.inc.c @@ -1,5 +1,7 @@ // unagi.inc.c +#include "actors/group4.h" + struct ObjectHitbox sUnagiHitbox = { /* interactType: */ INTERACT_CLAM_OR_BUBBA, /* downOffset: */ 50, diff --git a/src/game/geo_misc.c b/src/game/geo_misc.c index 63bfa9d809..67da9ab0b5 100644 --- a/src/game/geo_misc.c +++ b/src/game/geo_misc.c @@ -3,12 +3,12 @@ #include "sm64.h" #include "geo_misc.h" +#include "actors_vanilla/castle_inside/header.h" +#include "actors_vanilla/rr/header.h" #include "area.h" #include "engine/math_util.h" #include "level_update.h" -#include "levels/castle_inside/header.h" #include "levels/ending/header.h" -#include "levels/rr/header.h" #include "mario.h" #include "mario_actions_cutscene.h" #include "memory.h" diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 6713bae8a8..75d14a3929 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -1,6 +1,7 @@ #include #include "actors/common1.h" +#include "actors_vanilla/castle_grounds/header.h" #include "area.h" #include "audio/external.h" #include "camera.h" @@ -12,7 +13,6 @@ #include "gfx_dimensions.h" #include "ingame_menu.h" #include "level_update.h" -#include "levels/castle_grounds/header.h" #include "memory.h" #include "print.h" #include "save_file.h" diff --git a/src/game/obj_behaviors.c b/src/game/obj_behaviors.c index 16be7a4c13..14f0b885aa 100644 --- a/src/game/obj_behaviors.c +++ b/src/game/obj_behaviors.c @@ -17,8 +17,6 @@ #include "interaction.h" #include "level_table.h" #include "level_update.h" -#include "levels/bob/header.h" -#include "levels/ttm/header.h" #include "mario.h" #include "mario_actions_cutscene.h" #include "mario_misc.h" diff --git a/src/game/obj_behaviors_2.c b/src/game/obj_behaviors_2.c index eacaceaf93..43ff87260b 100644 --- a/src/game/obj_behaviors_2.c +++ b/src/game/obj_behaviors_2.c @@ -1,6 +1,15 @@ #include #include "sm64.h" +#include "actors_vanilla/bob/header.h" +#include "actors_vanilla/ccm/header.h" +#include "actors_vanilla/ssl/header.h" +#include "actors_vanilla/ttc/header.h" +#include "actors_vanilla/rr/header.h" +#include "actors_vanilla/bitdw/header.h" +#include "actors_vanilla/bitfs/header.h" +#include "actors_vanilla/bits/header.h" +#include "actors_vanilla/vcutm/header.h" #include "actors/common0.h" #include "actors/group11.h" #include "actors/group17.h" @@ -19,19 +28,6 @@ #include "interaction.h" #include "level_table.h" #include "level_update.h" -#include "levels/bitdw/header.h" -#include "levels/bitfs/header.h" -#include "levels/bits/header.h" -#include "levels/bob/header.h" -#include "levels/ccm/header.h" -#include "levels/hmc/header.h" -#include "levels/jrb/header.h" -#include "levels/lll/header.h" -#include "levels/rr/header.h" -#include "levels/ssl/header.h" -#include "levels/thi/header.h" -#include "levels/ttc/header.h" -#include "levels/vcutm/header.h" #include "mario.h" #include "mario_actions_cutscene.h" #include "memory.h" From 5f6d6c23bb036c867bd59db90f35b46c3f132865 Mon Sep 17 00:00:00 2001 From: aglab2 Date: Thu, 2 May 2024 21:49:39 +0800 Subject: [PATCH 3/6] Rollback group level scripts move, fixed nits --- actors/common0_geo.c | 29 --- actors/group10_geo.c | 9 - actors/group11_geo.c | 12 -- actors/group12_geo.c | 13 -- actors/group13_geo.c | 14 -- actors/group14_geo.c | 14 -- actors/group15_geo.c | 10 - actors/group16_geo.c | 9 - actors/group17_geo.c | 12 -- actors/group1_geo.c | 12 -- actors/group2_geo.c | 9 - actors/group3_geo.c | 9 - actors/group4_geo.c | 11 -- actors/group5_geo.c | 12 -- actors/group6_geo.c | 10 - actors/group7_geo.c | 10 - actors/group8_geo.c | 9 - actors/group9_geo.c | 13 -- data/behavior_data.c | 2 +- include/config/config_debug.h | 2 +- levels/bitdw/areas/script_vanilla.inc.c | 2 +- levels/bitdw/areas/script_vanilla_load.inc.c | 2 +- levels/bitfs/areas/script_vanilla.inc.c | 2 +- levels/bitfs/areas/script_vanilla_load.inc.c | 2 +- levels/bob/geo.inc.c | 2 +- levels/castle_courtyard/geo.inc.c | 2 +- levels/scripts.c | 181 +++++++++++++++++++ 27 files changed, 189 insertions(+), 225 deletions(-) diff --git a/actors/common0_geo.c b/actors/common0_geo.c index a49dc1e724..f78a10b0b4 100644 --- a/actors/common0_geo.c +++ b/actors/common0_geo.c @@ -27,32 +27,3 @@ #include "metal_box/geo.inc.c" #include "exclamation_box_outline/geo.inc.c" #include "koopa_shell/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_1[] = { - LOAD_MODEL_FROM_GEO(MODEL_BLUE_COIN_SWITCH, blue_coin_switch_geo), - LOAD_MODEL_FROM_GEO(MODEL_AMP, dAmpGeo), - LOAD_MODEL_FROM_GEO(MODEL_PURPLE_SWITCH, purple_switch_geo), - LOAD_MODEL_FROM_GEO(MODEL_CHECKERBOARD_PLATFORM, checkerboard_platform_geo), - LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX, breakable_box_geo), - LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX_NO_SHADOW, breakable_box_no_shadow_geo), - LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX_OUTLINE, exclamation_box_outline_geo), - LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX, exclamation_box_geo), - LOAD_MODEL_FROM_GEO(MODEL_GOOMBA, goomba_geo), - LOAD_MODEL_FROM_DL( MODEL_EXCLAMATION_POINT, exclamation_box_outline_seg8_dl_exclamation_point, LAYER_OCCLUDE_SILHOUETTE_ALPHA), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_SHELL, koopa_shell_geo), - LOAD_MODEL_FROM_GEO(MODEL_METAL_BOX, metal_box_geo), - LOAD_MODEL_FROM_DL( MODEL_METAL_BOX_DL, metal_box_dl, LAYER_OPAQUE), - LOAD_MODEL_FROM_GEO(MODEL_BLACK_BOBOMB, black_bobomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOBOMB_BUDDY, bobomb_buddy_geo), - LOAD_MODEL_FROM_DL( MODEL_DL_CANNON_LID, cannon_lid_seg8_dl_080048E0, LAYER_OPAQUE), - LOAD_MODEL_FROM_GEO(MODEL_BOWLING_BALL, bowling_ball_geo), - LOAD_MODEL_FROM_GEO(MODEL_CANNON_BARREL, cannon_barrel_geo), - LOAD_MODEL_FROM_GEO(MODEL_CANNON_BASE, cannon_base_geo), - LOAD_MODEL_FROM_GEO(MODEL_HEART, heart_geo), - LOAD_MODEL_FROM_GEO(MODEL_FLYGUY, flyguy_geo), - LOAD_MODEL_FROM_GEO(MODEL_CHUCKYA, chuckya_geo), - LOAD_MODEL_FROM_GEO(MODEL_TRAJECTORY_MARKER_BALL, bowling_ball_track_geo), - RETURN(), -}; diff --git a/actors/group10_geo.c b/actors/group10_geo.c index 48e1693f34..7383d746a8 100644 --- a/actors/group10_geo.c +++ b/actors/group10_geo.c @@ -10,12 +10,3 @@ #include "bird/geo.inc.c" #include "peach/geo.inc.c" #include "yoshi/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_11[] = { - LOAD_MODEL_FROM_GEO(MODEL_BIRDS, birds_geo), - LOAD_MODEL_FROM_GEO(MODEL_PEACH, peach_geo), - LOAD_MODEL_FROM_GEO(MODEL_YOSHI, yoshi_geo), - RETURN(), -}; diff --git a/actors/group11_geo.c b/actors/group11_geo.c index f9f453af67..ae26eddca4 100644 --- a/actors/group11_geo.c +++ b/actors/group11_geo.c @@ -13,15 +13,3 @@ #include "lakitu_enemy/geo.inc.c" #include "spiny_egg/geo.inc.c" #include "spiny/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_12[] = { - LOAD_MODEL_FROM_GEO(MODEL_ENEMY_LAKITU, enemy_lakitu_geo), - LOAD_MODEL_FROM_GEO(MODEL_SPINY_BALL, spiny_ball_geo), - LOAD_MODEL_FROM_GEO(MODEL_SPINY, spiny_geo), - LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_HEAD, wiggler_head_geo), - LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_BODY, wiggler_body_geo), - LOAD_MODEL_FROM_GEO(MODEL_BUBBA, bubba_geo), - RETURN(), -}; diff --git a/actors/group12_geo.c b/actors/group12_geo.c index dc6ce999ab..cfdbc8237b 100644 --- a/actors/group12_geo.c +++ b/actors/group12_geo.c @@ -13,16 +13,3 @@ #include "bowser/geo.inc.c" #include "bomb/geo.inc.c" #include "impact_smoke/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_13[] = { - LOAD_MODEL_FROM_GEO(MODEL_BOWSER, bowser_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB_CHILD_OBJ, bowser_bomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB, bowser_bomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_SMOKE, bowser_impact_smoke_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_FLAMES, bowser_flames_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_WAVE, invisible_bowser_accessory_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOWSER_NO_SHADOW, bowser_geo_no_shadow), - RETURN(), -}; diff --git a/actors/group13_geo.c b/actors/group13_geo.c index b88a09e32a..2965e0ec12 100644 --- a/actors/group13_geo.c +++ b/actors/group13_geo.c @@ -14,17 +14,3 @@ #include "bub/geo.inc.c" #include "water_ring/geo.inc.c" #include "treasure_chest/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_14[] = { - LOAD_MODEL_FROM_GEO(MODEL_BUB, bub_geo), - LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_BASE, treasure_chest_base_geo), - LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_LID, treasure_chest_lid_geo), - LOAD_MODEL_FROM_GEO(MODEL_CYAN_FISH, cyan_fish_geo), - LOAD_MODEL_FROM_GEO(MODEL_WATER_RING, water_ring_geo), - LOAD_MODEL_FROM_GEO(MODEL_WATER_MINE, water_mine_geo), - LOAD_MODEL_FROM_GEO(MODEL_SEAWEED, seaweed_geo), - LOAD_MODEL_FROM_GEO(MODEL_SKEETER, skeeter_geo), - RETURN(), -}; diff --git a/actors/group14_geo.c b/actors/group14_geo.c index 8d39ce5c77..58424dff38 100644 --- a/actors/group14_geo.c +++ b/actors/group14_geo.c @@ -14,17 +14,3 @@ #include "whomp/geo.inc.c" #include "chain_ball/geo.inc.c" #include "chain_chomp/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_15[] = { - LOAD_MODEL_FROM_GEO(MODEL_PIRANHA_PLANT, piranha_plant_geo), - LOAD_MODEL_FROM_GEO(MODEL_WHOMP, whomp_geo), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITH_SHELL, koopa_with_shell_geo), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITHOUT_SHELL, koopa_without_shell_geo), - LOAD_MODEL_FROM_GEO(MODEL_METALLIC_BALL, metallic_ball_geo), - LOAD_MODEL_FROM_GEO(MODEL_CHAIN_CHOMP, chain_chomp_geo), - LOAD_MODEL_FROM_GEO(MODEL_KOOPA_FLAG, koopa_flag_geo), - LOAD_MODEL_FROM_GEO(MODEL_WOODEN_POST, wooden_post_geo), - RETURN(), -}; diff --git a/actors/group15_geo.c b/actors/group15_geo.c index 947d3d8951..77954eb15d 100644 --- a/actors/group15_geo.c +++ b/actors/group15_geo.c @@ -11,13 +11,3 @@ #include "toad/geo.inc.c" #include "mips/geo.inc.c" #include "boo_castle/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_16[] = { - LOAD_MODEL_FROM_GEO(MODEL_MIPS, mips_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOO_CASTLE, boo_castle_geo), - LOAD_MODEL_FROM_GEO(MODEL_LAKITU, lakitu_geo), - LOAD_MODEL_FROM_GEO(MODEL_TOAD, toad_geo), - RETURN(), -}; \ No newline at end of file diff --git a/actors/group16_geo.c b/actors/group16_geo.c index f11b020124..114eb979e9 100644 --- a/actors/group16_geo.c +++ b/actors/group16_geo.c @@ -9,12 +9,3 @@ #include "chillychief/geo.inc.c" #include "moneybag/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_17[] = { - LOAD_MODEL_FROM_GEO(MODEL_CHILL_BULLY, chilly_chief_geo), - LOAD_MODEL_FROM_GEO(MODEL_BIG_CHILL_BULLY, chilly_chief_big_geo), - LOAD_MODEL_FROM_GEO(MODEL_MONEYBAG, moneybag_geo), - RETURN(), -}; diff --git a/actors/group17_geo.c b/actors/group17_geo.c index 20c4d0381d..28165b53fe 100644 --- a/actors/group17_geo.c +++ b/actors/group17_geo.c @@ -13,15 +13,3 @@ #include "snufit/geo.inc.c" #include "dorrie/geo.inc.c" #include "scuttlebug/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_18[] = { - LOAD_MODEL_FROM_GEO(MODEL_SWOOP, swoop_geo), - LOAD_MODEL_FROM_GEO(MODEL_SCUTTLEBUG, scuttlebug_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_I_IRIS, mr_i_iris_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_I_BODY, mr_i_geo), - LOAD_MODEL_FROM_GEO(MODEL_DORRIE, dorrie_geo), - LOAD_MODEL_FROM_GEO(MODEL_SNUFIT, snufit_geo), - RETURN(), -}; diff --git a/actors/group1_geo.c b/actors/group1_geo.c index 7ec04303e7..bd5fbac807 100644 --- a/actors/group1_geo.c +++ b/actors/group1_geo.c @@ -13,15 +13,3 @@ #include "thwomp/geo.inc.c" #include "bullet_bill/geo.inc.c" #include "heave_ho/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_2[] = { - LOAD_MODEL_FROM_GEO(MODEL_BULLET_BILL, bullet_bill_geo), - LOAD_MODEL_FROM_GEO(MODEL_YELLOW_SPHERE, yellow_sphere_geo), - LOAD_MODEL_FROM_GEO(MODEL_HOOT, hoot_geo), - LOAD_MODEL_FROM_GEO(MODEL_YOSHI_EGG, yoshi_egg_geo), - LOAD_MODEL_FROM_GEO(MODEL_THWOMP, thwomp_geo), - LOAD_MODEL_FROM_GEO(MODEL_HEAVE_HO, heave_ho_geo), - RETURN(), -}; diff --git a/actors/group2_geo.c b/actors/group2_geo.c index 0c8c54bf1c..88a66f4ef0 100644 --- a/actors/group2_geo.c +++ b/actors/group2_geo.c @@ -9,12 +9,3 @@ #include "bully/geo.inc.c" #include "blargg/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_3[] = { - LOAD_MODEL_FROM_GEO(MODEL_BLARGG, blargg_geo), - LOAD_MODEL_FROM_GEO(MODEL_BULLY, bully_geo), - LOAD_MODEL_FROM_GEO(MODEL_BULLY_BOSS, bully_boss_geo), - RETURN(), -}; diff --git a/actors/group3_geo.c b/actors/group3_geo.c index f637a89165..b5e32b1b85 100644 --- a/actors/group3_geo.c +++ b/actors/group3_geo.c @@ -9,12 +9,3 @@ #include "king_bobomb/geo.inc.c" #include "water_bubble/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_4[] = { - LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB, water_bomb_geo), - LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB_SHADOW, water_bomb_shadow_geo), - LOAD_MODEL_FROM_GEO(MODEL_KING_BOBOMB, king_bobomb_geo), - RETURN(), -}; diff --git a/actors/group4_geo.c b/actors/group4_geo.c index 20141f1dac..17c7d00291 100644 --- a/actors/group4_geo.c +++ b/actors/group4_geo.c @@ -12,17 +12,6 @@ #include "sushi/geo.inc.c" #include "unagi/geo.inc.c" -#include "level_commands.h" - -const LevelScript script_func_global_5[] = { - LOAD_MODEL_FROM_GEO(MODEL_MANTA_RAY, manta_seg5_geo_05008D14), - LOAD_MODEL_FROM_GEO(MODEL_UNAGI, unagi_geo), - LOAD_MODEL_FROM_GEO(MODEL_SUSHI, sushi_geo), - LOAD_MODEL_FROM_DL( MODEL_DL_WHIRLPOOL, whirlpool_seg5_dl_05013CB8, LAYER_TRANSPARENT), - LOAD_MODEL_FROM_GEO(MODEL_CLAM_SHELL, clam_shell_geo), - RETURN(), -}; - #include "surface_terrains.h" // 0x0700D20C - 0x0700D23E diff --git a/actors/group5_geo.c b/actors/group5_geo.c index 856162d621..61208f2db6 100644 --- a/actors/group5_geo.c +++ b/actors/group5_geo.c @@ -10,15 +10,3 @@ #include "klepto/geo.inc.c" #include "eyerok/geo.inc.c" #include "pokey/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_6[] = { - LOAD_MODEL_FROM_GEO(MODEL_POKEY_HEAD, pokey_head_geo), - LOAD_MODEL_FROM_GEO(MODEL_POKEY_BODY_PART, pokey_body_part_geo), - LOAD_MODEL_FROM_GEO(MODEL_TWEESTER, tweester_geo), - LOAD_MODEL_FROM_GEO(MODEL_KLEPTO, klepto_geo), - LOAD_MODEL_FROM_GEO(MODEL_EYEROK_LEFT_HAND, eyerok_left_hand_geo), - LOAD_MODEL_FROM_GEO(MODEL_EYEROK_RIGHT_HAND, eyerok_right_hand_geo), - RETURN(), -}; diff --git a/actors/group6_geo.c b/actors/group6_geo.c index dcd2a8d5c4..7b9379062a 100644 --- a/actors/group6_geo.c +++ b/actors/group6_geo.c @@ -10,13 +10,3 @@ #include "monty_mole/geo.inc.c" #include "ukiki/geo.inc.c" #include "fwoosh/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_7[] = { - LOAD_MODEL_FROM_DL( MODEL_DL_MONTY_MOLE_HOLE, monty_mole_hole_seg5_dl_05000840, LAYER_TRANSPARENT_DECAL), - LOAD_MODEL_FROM_GEO(MODEL_MONTY_MOLE, monty_mole_geo), - LOAD_MODEL_FROM_GEO(MODEL_UKIKI, ukiki_geo), - LOAD_MODEL_FROM_GEO(MODEL_FWOOSH, fwoosh_geo), - RETURN(), -}; diff --git a/actors/group7_geo.c b/actors/group7_geo.c index aeadfdf103..d4fbc350fe 100644 --- a/actors/group7_geo.c +++ b/actors/group7_geo.c @@ -10,13 +10,3 @@ #include "spindrift/geo.inc.c" #include "penguin/geo.inc.c" #include "snowman/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_8[] = { - LOAD_MODEL_FROM_GEO(MODEL_SPINDRIFT, spindrift_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD_HIDDEN, mr_blizzard_hidden_geo), - LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD, mr_blizzard_geo), - LOAD_MODEL_FROM_GEO(MODEL_PENGUIN, penguin_geo), - RETURN(), -}; diff --git a/actors/group8_geo.c b/actors/group8_geo.c index ac66aa36f2..2be77f95ef 100644 --- a/actors/group8_geo.c +++ b/actors/group8_geo.c @@ -9,12 +9,3 @@ #include "springboard/geo.inc.c" #include "capswitch/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_9[] = { - LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_EXCLAMATION, cap_switch_exclamation_seg5_dl_05002E00, LAYER_ALPHA), - LOAD_MODEL_FROM_GEO(MODEL_CAP_SWITCH, cap_switch_geo), - LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_BASE, cap_switch_base_seg5_dl_05003120, LAYER_OPAQUE), - RETURN(), -}; diff --git a/actors/group9_geo.c b/actors/group9_geo.c index 27b66b8e30..e63672b0fc 100644 --- a/actors/group9_geo.c +++ b/actors/group9_geo.c @@ -14,16 +14,3 @@ #include "mad_piano/geo.inc.c" #include "boo/geo.inc.c" #include "haunted_cage/geo.inc.c" - -#include "level_commands.h" - -const LevelScript script_func_global_10[] = { - LOAD_MODEL_FROM_GEO(MODEL_BOO, boo_geo), - LOAD_MODEL_FROM_GEO(MODEL_BETA_BOO_KEY, small_key_geo), - LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CHAIR, haunted_chair_geo), - LOAD_MODEL_FROM_GEO(MODEL_MAD_PIANO, mad_piano_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOOKEND_PART, bookend_part_geo), - LOAD_MODEL_FROM_GEO(MODEL_BOOKEND, bookend_geo), - LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CAGE, haunted_cage_geo), - RETURN(), -}; diff --git a/data/behavior_data.c b/data/behavior_data.c index 2aa6661286..411a46bbb0 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -14,8 +14,8 @@ #include "engine/surface_load.h" #include "actors_vanilla/bob/header.h" -#include "actors_vanilla/jrb/header.h" #include "actors_vanilla/wf/header.h" +#include "actors_vanilla/jrb/header.h" #include "actors_vanilla/bbh/header.h" #include "actors_vanilla/hmc/header.h" #include "actors_vanilla/lll/header.h" diff --git a/include/config/config_debug.h b/include/config/config_debug.h index d9054c8fdd..7ed67cac93 100644 --- a/include/config/config_debug.h +++ b/include/config/config_debug.h @@ -30,7 +30,7 @@ * This allows you to quickly test the level you're working on. * If you want the game to boot normally, just comment out the define again. */ -// #define TEST_LEVEL LEVEL_WMOTR +// #define TEST_LEVEL LEVEL_BOB /** * Enables debug level select. Hold L while the game boots to turn it on. diff --git a/levels/bitdw/areas/script_vanilla.inc.c b/levels/bitdw/areas/script_vanilla.inc.c index c93a547420..5186a5635e 100644 --- a/levels/bitdw/areas/script_vanilla.inc.c +++ b/levels/bitdw/areas/script_vanilla.inc.c @@ -17,4 +17,4 @@ LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0E, geo_bitdw_0004C8), LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_0F, geo_bitdw_0004E0), LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_10, geo_bitdw_0004F8), LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, geo_bitdw_000510), -LOAD_MODEL_FROM_GEO(MODEL_BITDW_WARP_PIPE, warp_pipe_geo), \ No newline at end of file +LOAD_MODEL_FROM_GEO(MODEL_BITDW_WARP_PIPE, warp_pipe_geo), diff --git a/levels/bitdw/areas/script_vanilla_load.inc.c b/levels/bitdw/areas/script_vanilla_load.inc.c index 75799af3e2..ec7885ce15 100644 --- a/levels/bitdw/areas/script_vanilla_load.inc.c +++ b/levels/bitdw/areas/script_vanilla_load.inc.c @@ -6,4 +6,4 @@ LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmen LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), -LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), \ No newline at end of file +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/bitfs/areas/script_vanilla.inc.c b/levels/bitfs/areas/script_vanilla.inc.c index 213bc6050d..9acbd224f7 100644 --- a/levels/bitfs/areas/script_vanilla.inc.c +++ b/levels/bitfs/areas/script_vanilla.inc.c @@ -7,4 +7,4 @@ LOAD_RAW( /*seg*/ 0x0C, _group2_geoSegmentRomStart, _group2_geoSegmentRo LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0D, _group17_geoSegmentRomStart, _group17_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), -LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), \ No newline at end of file +LOAD_RAW( /*seg*/ 0x0F, _common0_geoSegmentRomStart, _common0_geoSegmentRomEnd), diff --git a/levels/bitfs/areas/script_vanilla_load.inc.c b/levels/bitfs/areas/script_vanilla_load.inc.c index 8f652882e4..8abc50dd90 100644 --- a/levels/bitfs/areas/script_vanilla_load.inc.c +++ b/levels/bitfs/areas/script_vanilla_load.inc.c @@ -20,4 +20,4 @@ LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_11, bitfs_geo_000600), LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_12, bitfs_geo_000618), LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_13, bitfs_geo_000630), LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_14, bitfs_geo_000648), -LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, bitfs_geo_000660), \ No newline at end of file +LOAD_MODEL_FROM_GEO(MODEL_LEVEL_GEOMETRY_15, bitfs_geo_000660), diff --git a/levels/bob/geo.inc.c b/levels/bob/geo.inc.c index 53a444793a..94a4afb232 100644 --- a/levels/bob/geo.inc.c +++ b/levels/bob/geo.inc.c @@ -1 +1 @@ -#include "levels/bob/areas/1/geo.inc.c" \ No newline at end of file +#include "levels/bob/areas/1/geo.inc.c" diff --git a/levels/castle_courtyard/geo.inc.c b/levels/castle_courtyard/geo.inc.c index 4507bbc1b7..1c17868f2f 100644 --- a/levels/castle_courtyard/geo.inc.c +++ b/levels/castle_courtyard/geo.inc.c @@ -1,2 +1,2 @@ #include "levels/castle_courtyard/areas/1/spire/geo.inc.c" -#include "levels/castle_courtyard/areas/1/geo.inc.c" \ No newline at end of file +#include "levels/castle_courtyard/areas/1/geo.inc.c" diff --git a/levels/scripts.c b/levels/scripts.c index dc81d0806b..c2cf6d8a4f 100644 --- a/levels/scripts.c +++ b/levels/scripts.c @@ -172,3 +172,184 @@ static const LevelScript script_exec_ ## folder [] = { \ #include "levels/level_defines.h" #undef STUB_LEVEL #undef DEFINE_LEVEL + +const LevelScript script_func_global_1[] = { + LOAD_MODEL_FROM_GEO(MODEL_BLUE_COIN_SWITCH, blue_coin_switch_geo), + LOAD_MODEL_FROM_GEO(MODEL_AMP, dAmpGeo), + LOAD_MODEL_FROM_GEO(MODEL_PURPLE_SWITCH, purple_switch_geo), + LOAD_MODEL_FROM_GEO(MODEL_CHECKERBOARD_PLATFORM, checkerboard_platform_geo), + LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX, breakable_box_geo), + LOAD_MODEL_FROM_GEO(MODEL_BREAKABLE_BOX_NO_SHADOW, breakable_box_no_shadow_geo), + LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX_OUTLINE, exclamation_box_outline_geo), + LOAD_MODEL_FROM_GEO(MODEL_EXCLAMATION_BOX, exclamation_box_geo), + LOAD_MODEL_FROM_GEO(MODEL_GOOMBA, goomba_geo), + LOAD_MODEL_FROM_DL( MODEL_EXCLAMATION_POINT, exclamation_box_outline_seg8_dl_exclamation_point, LAYER_OCCLUDE_SILHOUETTE_ALPHA), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_SHELL, koopa_shell_geo), + LOAD_MODEL_FROM_GEO(MODEL_METAL_BOX, metal_box_geo), + LOAD_MODEL_FROM_DL( MODEL_METAL_BOX_DL, metal_box_dl, LAYER_OPAQUE), + LOAD_MODEL_FROM_GEO(MODEL_BLACK_BOBOMB, black_bobomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOBOMB_BUDDY, bobomb_buddy_geo), + LOAD_MODEL_FROM_DL( MODEL_DL_CANNON_LID, cannon_lid_seg8_dl_080048E0, LAYER_OPAQUE), + LOAD_MODEL_FROM_GEO(MODEL_BOWLING_BALL, bowling_ball_geo), + LOAD_MODEL_FROM_GEO(MODEL_CANNON_BARREL, cannon_barrel_geo), + LOAD_MODEL_FROM_GEO(MODEL_CANNON_BASE, cannon_base_geo), + LOAD_MODEL_FROM_GEO(MODEL_HEART, heart_geo), + LOAD_MODEL_FROM_GEO(MODEL_FLYGUY, flyguy_geo), + LOAD_MODEL_FROM_GEO(MODEL_CHUCKYA, chuckya_geo), + LOAD_MODEL_FROM_GEO(MODEL_TRAJECTORY_MARKER_BALL, bowling_ball_track_geo), + RETURN(), +}; + +const LevelScript script_func_global_2[] = { + LOAD_MODEL_FROM_GEO(MODEL_BULLET_BILL, bullet_bill_geo), + LOAD_MODEL_FROM_GEO(MODEL_YELLOW_SPHERE, yellow_sphere_geo), + LOAD_MODEL_FROM_GEO(MODEL_HOOT, hoot_geo), + LOAD_MODEL_FROM_GEO(MODEL_YOSHI_EGG, yoshi_egg_geo), + LOAD_MODEL_FROM_GEO(MODEL_THWOMP, thwomp_geo), + LOAD_MODEL_FROM_GEO(MODEL_HEAVE_HO, heave_ho_geo), + RETURN(), +}; + +const LevelScript script_func_global_3[] = { + LOAD_MODEL_FROM_GEO(MODEL_BLARGG, blargg_geo), + LOAD_MODEL_FROM_GEO(MODEL_BULLY, bully_geo), + LOAD_MODEL_FROM_GEO(MODEL_BULLY_BOSS, bully_boss_geo), + RETURN(), +}; + +const LevelScript script_func_global_4[] = { + LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB, water_bomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_WATER_BOMB_SHADOW, water_bomb_shadow_geo), + LOAD_MODEL_FROM_GEO(MODEL_KING_BOBOMB, king_bobomb_geo), + RETURN(), +}; + +const LevelScript script_func_global_5[] = { + LOAD_MODEL_FROM_GEO(MODEL_MANTA_RAY, manta_seg5_geo_05008D14), + LOAD_MODEL_FROM_GEO(MODEL_UNAGI, unagi_geo), + LOAD_MODEL_FROM_GEO(MODEL_SUSHI, sushi_geo), + LOAD_MODEL_FROM_DL( MODEL_DL_WHIRLPOOL, whirlpool_seg5_dl_05013CB8, LAYER_TRANSPARENT), + LOAD_MODEL_FROM_GEO(MODEL_CLAM_SHELL, clam_shell_geo), + RETURN(), +}; + +const LevelScript script_func_global_6[] = { + LOAD_MODEL_FROM_GEO(MODEL_POKEY_HEAD, pokey_head_geo), + LOAD_MODEL_FROM_GEO(MODEL_POKEY_BODY_PART, pokey_body_part_geo), + LOAD_MODEL_FROM_GEO(MODEL_TWEESTER, tweester_geo), + LOAD_MODEL_FROM_GEO(MODEL_KLEPTO, klepto_geo), + LOAD_MODEL_FROM_GEO(MODEL_EYEROK_LEFT_HAND, eyerok_left_hand_geo), + LOAD_MODEL_FROM_GEO(MODEL_EYEROK_RIGHT_HAND, eyerok_right_hand_geo), + RETURN(), +}; + +const LevelScript script_func_global_7[] = { + LOAD_MODEL_FROM_DL( MODEL_DL_MONTY_MOLE_HOLE, monty_mole_hole_seg5_dl_05000840, LAYER_TRANSPARENT_DECAL), + LOAD_MODEL_FROM_GEO(MODEL_MONTY_MOLE, monty_mole_geo), + LOAD_MODEL_FROM_GEO(MODEL_UKIKI, ukiki_geo), + LOAD_MODEL_FROM_GEO(MODEL_FWOOSH, fwoosh_geo), + RETURN(), +}; + +const LevelScript script_func_global_8[] = { + LOAD_MODEL_FROM_GEO(MODEL_SPINDRIFT, spindrift_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD_HIDDEN, mr_blizzard_hidden_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_BLIZZARD, mr_blizzard_geo), + LOAD_MODEL_FROM_GEO(MODEL_PENGUIN, penguin_geo), + RETURN(), +}; + +const LevelScript script_func_global_9[] = { + LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_EXCLAMATION, cap_switch_exclamation_seg5_dl_05002E00, LAYER_ALPHA), + LOAD_MODEL_FROM_GEO(MODEL_CAP_SWITCH, cap_switch_geo), + LOAD_MODEL_FROM_DL( MODEL_CAP_SWITCH_BASE, cap_switch_base_seg5_dl_05003120, LAYER_OPAQUE), + RETURN(), +}; + +const LevelScript script_func_global_10[] = { + LOAD_MODEL_FROM_GEO(MODEL_BOO, boo_geo), + LOAD_MODEL_FROM_GEO(MODEL_BETA_BOO_KEY, small_key_geo), + LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CHAIR, haunted_chair_geo), + LOAD_MODEL_FROM_GEO(MODEL_MAD_PIANO, mad_piano_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOOKEND_PART, bookend_part_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOOKEND, bookend_geo), + LOAD_MODEL_FROM_GEO(MODEL_HAUNTED_CAGE, haunted_cage_geo), + RETURN(), +}; + +const LevelScript script_func_global_11[] = { + LOAD_MODEL_FROM_GEO(MODEL_BIRDS, birds_geo), + LOAD_MODEL_FROM_GEO(MODEL_PEACH, peach_geo), + LOAD_MODEL_FROM_GEO(MODEL_YOSHI, yoshi_geo), + RETURN(), +}; + +const LevelScript script_func_global_12[] = { + LOAD_MODEL_FROM_GEO(MODEL_ENEMY_LAKITU, enemy_lakitu_geo), + LOAD_MODEL_FROM_GEO(MODEL_SPINY_BALL, spiny_ball_geo), + LOAD_MODEL_FROM_GEO(MODEL_SPINY, spiny_geo), + LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_HEAD, wiggler_head_geo), + LOAD_MODEL_FROM_GEO(MODEL_WIGGLER_BODY, wiggler_body_geo), + LOAD_MODEL_FROM_GEO(MODEL_BUBBA, bubba_geo), + RETURN(), +}; + +const LevelScript script_func_global_13[] = { + LOAD_MODEL_FROM_GEO(MODEL_BOWSER, bowser_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB_CHILD_OBJ, bowser_bomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_BOMB, bowser_bomb_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_SMOKE, bowser_impact_smoke_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_FLAMES, bowser_flames_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_WAVE, invisible_bowser_accessory_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOWSER_NO_SHADOW, bowser_geo_no_shadow), + RETURN(), +}; + +const LevelScript script_func_global_14[] = { + LOAD_MODEL_FROM_GEO(MODEL_BUB, bub_geo), + LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_BASE, treasure_chest_base_geo), + LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_LID, treasure_chest_lid_geo), + LOAD_MODEL_FROM_GEO(MODEL_CYAN_FISH, cyan_fish_geo), + LOAD_MODEL_FROM_GEO(MODEL_WATER_RING, water_ring_geo), + LOAD_MODEL_FROM_GEO(MODEL_WATER_MINE, water_mine_geo), + LOAD_MODEL_FROM_GEO(MODEL_SEAWEED, seaweed_geo), + LOAD_MODEL_FROM_GEO(MODEL_SKEETER, skeeter_geo), + RETURN(), +}; + +const LevelScript script_func_global_15[] = { + LOAD_MODEL_FROM_GEO(MODEL_PIRANHA_PLANT, piranha_plant_geo), + LOAD_MODEL_FROM_GEO(MODEL_WHOMP, whomp_geo), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITH_SHELL, koopa_with_shell_geo), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_WITHOUT_SHELL, koopa_without_shell_geo), + LOAD_MODEL_FROM_GEO(MODEL_METALLIC_BALL, metallic_ball_geo), + LOAD_MODEL_FROM_GEO(MODEL_CHAIN_CHOMP, chain_chomp_geo), + LOAD_MODEL_FROM_GEO(MODEL_KOOPA_FLAG, koopa_flag_geo), + LOAD_MODEL_FROM_GEO(MODEL_WOODEN_POST, wooden_post_geo), + RETURN(), +}; + +const LevelScript script_func_global_16[] = { + LOAD_MODEL_FROM_GEO(MODEL_MIPS, mips_geo), + LOAD_MODEL_FROM_GEO(MODEL_BOO_CASTLE, boo_castle_geo), + LOAD_MODEL_FROM_GEO(MODEL_LAKITU, lakitu_geo), + LOAD_MODEL_FROM_GEO(MODEL_TOAD, toad_geo), + RETURN(), +}; + +const LevelScript script_func_global_17[] = { + LOAD_MODEL_FROM_GEO(MODEL_CHILL_BULLY, chilly_chief_geo), + LOAD_MODEL_FROM_GEO(MODEL_BIG_CHILL_BULLY, chilly_chief_big_geo), + LOAD_MODEL_FROM_GEO(MODEL_MONEYBAG, moneybag_geo), + RETURN(), +}; + +const LevelScript script_func_global_18[] = { + LOAD_MODEL_FROM_GEO(MODEL_SWOOP, swoop_geo), + LOAD_MODEL_FROM_GEO(MODEL_SCUTTLEBUG, scuttlebug_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_I_IRIS, mr_i_iris_geo), + LOAD_MODEL_FROM_GEO(MODEL_MR_I_BODY, mr_i_geo), + LOAD_MODEL_FROM_GEO(MODEL_DORRIE, dorrie_geo), + LOAD_MODEL_FROM_GEO(MODEL_SNUFIT, snufit_geo), + RETURN(), +}; From 18cead5acbfc2a5ab54c6c9dbb742158cfa0edb3 Mon Sep 17 00:00:00 2001 From: aglab2 Date: Thu, 2 May 2024 22:04:55 +0800 Subject: [PATCH 4/6] Move actors_vanilla to actors/vanilla_actors --- .gitignore | 150 +++++++++--------- Makefile | 8 +- Makefile.split | 14 +- .../bbh/coffin/collision.inc.c | 0 .../vanilla_actors}/bbh/coffin/geo.inc.c | 0 .../vanilla_actors}/bbh/coffin/model.inc.c | 0 actors/vanilla_actors/bbh/data.c | 27 ++++ .../vanilla_actors}/bbh/geo.c | 18 +-- .../vanilla_actors}/bbh/header.h | 0 .../bbh/merry_go_round/collision.inc.c | 0 .../bbh/merry_go_round/geo.inc.c | 0 .../bbh/merry_go_round/model.inc.c | 0 .../bbh/mesh_elevator/collision.inc.c | 0 .../bbh/mesh_elevator/geo.inc.c | 0 .../bbh/mesh_elevator/model.inc.c | 0 .../bbh/moving_bookshelf/collision.inc.c | 0 .../bbh/moving_bookshelf/geo.inc.c | 0 .../bbh/moving_bookshelf/model.inc.c | 0 .../bbh/staircase_step/collision.inc.c | 0 .../bbh/staircase_step/geo.inc.c | 0 .../bbh/staircase_step/model.inc.c | 0 .../vanilla_actors}/bbh/texture.inc.c | 8 +- .../bbh/tilting_trap_platform/collision.inc.c | 0 .../bbh/tilting_trap_platform/geo.inc.c | 0 .../bbh/tilting_trap_platform/model.inc.c | 0 .../bbh/tumbling_platform_far/geo.inc.c | 0 .../bbh/tumbling_platform_far/model.inc.c | 0 .../tumbling_platform_near/collision.inc.c | 0 .../bbh/tumbling_platform_near/geo.inc.c | 0 .../bbh/tumbling_platform_near/model.inc.c | 0 .../bitdw/collapsing_stairs_1/collision.inc.c | 0 .../bitdw/collapsing_stairs_1/geo.inc.c | 0 .../bitdw/collapsing_stairs_1/model.inc.c | 0 .../bitdw/collapsing_stairs_2/collision.inc.c | 0 .../bitdw/collapsing_stairs_2/geo.inc.c | 0 .../bitdw/collapsing_stairs_2/model.inc.c | 0 .../bitdw/collapsing_stairs_3/collision.inc.c | 0 .../bitdw/collapsing_stairs_3/geo.inc.c | 0 .../bitdw/collapsing_stairs_3/model.inc.c | 0 .../bitdw/collapsing_stairs_4/collision.inc.c | 0 .../bitdw/collapsing_stairs_4/geo.inc.c | 0 .../bitdw/collapsing_stairs_4/model.inc.c | 0 .../bitdw/collapsing_stairs_5/collision.inc.c | 0 .../bitdw/collapsing_stairs_5/geo.inc.c | 0 .../bitdw/collapsing_stairs_5/model.inc.c | 0 actors/vanilla_actors/bitdw/data.c | 35 ++++ .../bitdw/ferris_platform/collision.inc.c | 0 .../bitdw/ferris_platform/geo.inc.c | 0 .../bitdw/ferris_platform/model.inc.c | 0 .../bitdw/ferris_wheel_axle/collision.inc.c | 0 .../bitdw/ferris_wheel_axle/geo.inc.c | 0 .../bitdw/ferris_wheel_axle/model.inc.c | 0 .../vanilla_actors}/bitdw/geo.c | 22 +-- .../vanilla_actors}/bitdw/header.h | 0 .../bitdw/seesaw_platform/collision.inc.c | 0 .../bitdw/seesaw_platform/geo.inc.c | 0 .../bitdw/seesaw_platform/model.inc.c | 0 .../bitdw/sliding_platform/collision.inc.c | 0 .../bitdw/sliding_platform/geo.inc.c | 0 .../bitdw/sliding_platform/model.inc.c | 0 .../bitdw/square_platform/collision.inc.c | 0 .../bitdw/square_platform/geo.inc.c | 0 .../bitdw/square_platform/model.inc.c | 0 .../vanilla_actors}/bitdw/texture.inc.c | 2 +- actors/vanilla_actors/bitfs/data.c | 38 +++++ .../bitfs/elevator/collision.inc.c | 0 .../vanilla_actors}/bitfs/elevator/geo.inc.c | 0 .../bitfs/elevator/model.inc.c | 0 .../vanilla_actors}/bitfs/geo.c | 26 +-- .../vanilla_actors}/bitfs/header.h | 0 .../moving_square_platform/collision.inc.c | 0 .../bitfs/moving_square_platform/geo.inc.c | 0 .../bitfs/moving_square_platform/model.inc.c | 0 .../bitfs/platform_on_track/collision.inc.c | 0 .../bitfs/platform_on_track/geo.inc.c | 0 .../bitfs/platform_on_track/model.inc.c | 0 .../bitfs/seesaw_platform/collision.inc.c | 0 .../bitfs/seesaw_platform/geo.inc.c | 0 .../bitfs/seesaw_platform/model.inc.c | 0 .../sinking_cage_platform/collision.inc.c | 0 .../bitfs/sinking_cage_platform/geo.inc.c | 0 .../bitfs/sinking_cage_platform/model.inc.c | 0 .../bitfs/sinking_cage_pole/geo.inc.c | 0 .../bitfs/sinking_cage_pole/model.inc.c | 0 .../bitfs/sinking_platforms/collision.inc.c | 0 .../bitfs/sinking_platforms/geo.inc.c | 0 .../bitfs/sinking_platforms/model.inc.c | 0 .../bitfs/sliding_platform/collision.inc.c | 0 .../bitfs/sliding_platform/geo.inc.c | 0 .../bitfs/sliding_platform/model.inc.c | 0 .../bitfs/stretching_platform/1.inc.c | 0 .../bitfs/stretching_platform/2.inc.c | 0 .../bitfs/stretching_platform/collision.inc.c | 0 .../bitfs/stretching_platform/geo.inc.c | 0 .../vanilla_actors}/bitfs/texture.inc.c | 4 +- .../tilting_square_platform/collision.inc.c | 0 .../bitfs/tilting_square_platform/geo.inc.c | 0 .../bitfs/tilting_square_platform/model.inc.c | 0 .../bitfs/tumbling_platform_far/geo.inc.c | 0 .../bitfs/tumbling_platform_far/model.inc.c | 0 .../tumbling_platform_near/collision.inc.c | 0 .../bitfs/tumbling_platform_near/geo.inc.c | 0 .../bitfs/tumbling_platform_near/model.inc.c | 0 .../vanilla_actors}/bits/20/collision.inc.c | 0 .../vanilla_actors}/bits/20/geo.inc.c | 0 .../vanilla_actors}/bits/20/model.inc.c | 0 .../vanilla_actors}/bits/21/collision.inc.c | 0 .../vanilla_actors}/bits/21/geo.inc.c | 0 .../vanilla_actors}/bits/21/model.inc.c | 0 .../vanilla_actors}/bits/22/collision.inc.c | 0 .../vanilla_actors}/bits/22/geo.inc.c | 0 .../vanilla_actors}/bits/22/model.inc.c | 0 .../vanilla_actors}/bits/23/collision.inc.c | 0 .../vanilla_actors}/bits/23/geo.inc.c | 0 .../vanilla_actors}/bits/23/model.inc.c | 0 .../vanilla_actors}/bits/24/collision.inc.c | 0 .../vanilla_actors}/bits/24/geo.inc.c | 0 .../vanilla_actors}/bits/24/model.inc.c | 0 .../vanilla_actors}/bits/25/collision.inc.c | 0 .../vanilla_actors}/bits/25/geo.inc.c | 0 .../vanilla_actors}/bits/25/model.inc.c | 0 .../vanilla_actors}/bits/26/collision.inc.c | 0 .../vanilla_actors}/bits/26/geo.inc.c | 0 .../vanilla_actors}/bits/26/model.inc.c | 0 .../vanilla_actors}/bits/27/collision.inc.c | 0 .../vanilla_actors}/bits/27/geo.inc.c | 0 .../vanilla_actors}/bits/27/model.inc.c | 0 .../vanilla_actors}/bits/28/collision.inc.c | 0 .../vanilla_actors}/bits/28/geo.inc.c | 0 .../vanilla_actors}/bits/28/model.inc.c | 0 .../vanilla_actors}/bits/29/collision.inc.c | 0 .../vanilla_actors}/bits/29/geo.inc.c | 0 .../vanilla_actors}/bits/29/model.inc.c | 0 .../vanilla_actors}/bits/30/collision.inc.c | 0 .../vanilla_actors}/bits/30/geo.inc.c | 0 .../vanilla_actors}/bits/30/model.inc.c | 0 .../vanilla_actors}/bits/31/collision.inc.c | 0 .../vanilla_actors}/bits/31/geo.inc.c | 0 .../vanilla_actors}/bits/31/model.inc.c | 0 .../vanilla_actors}/bits/32/collision.inc.c | 0 .../vanilla_actors}/bits/32/geo.inc.c | 0 .../vanilla_actors}/bits/32/model.inc.c | 0 actors/vanilla_actors/bits/data.c | 38 +++++ .../vanilla_actors}/bits/geo.c | 28 ++-- .../vanilla_actors}/bits/header.h | 0 .../vanilla_actors}/bits/texture.inc.c | 2 +- .../bob/chain_chomp_gate/collision.inc.c | 0 .../bob/chain_chomp_gate/geo.inc.c | 0 .../bob/chain_chomp_gate/model.inc.c | 0 actors/vanilla_actors/bob/data.c | 17 ++ .../vanilla_actors}/bob/geo.c | 8 +- .../bob/grate_door/collision.inc.c | 0 .../vanilla_actors}/bob/grate_door/geo.inc.c | 0 .../bob/grate_door/model.inc.c | 0 .../vanilla_actors}/bob/header.h | 0 .../bob/seesaw_platform/collision.inc.c | 0 .../bob/seesaw_platform/geo.inc.c | 0 .../bob/seesaw_platform/model.inc.c | 0 .../castle_grounds/11/anim.inc.c | 0 .../castle_grounds/11/geo.inc.c | 0 .../castle_grounds/11/model.inc.c | 0 .../castle_grounds/12/model.inc.c | 4 +- .../castle_grounds/13/model.inc.c | 2 +- .../castle_grounds/7/collision.inc.c | 0 .../castle_grounds/7/geo.inc.c | 0 .../castle_grounds/7/model.inc.c | 0 .../castle_grounds/8/collision.inc.c | 0 .../castle_grounds/8/geo.inc.c | 0 .../castle_grounds/8/model.inc.c | 0 actors/vanilla_actors/castle_grounds/data.c | 20 +++ .../vanilla_actors}/castle_grounds/geo.c | 8 +- .../vanilla_actors}/castle_grounds/header.h | 0 .../castle_grounds/texture.inc.c | 0 .../castle_inside/clock_hour_hand/geo.inc.c | 0 .../castle_inside/clock_hour_hand/model.inc.c | 0 .../castle_inside/clock_minute_hand/geo.inc.c | 0 .../clock_minute_hand/model.inc.c | 0 actors/vanilla_actors/castle_inside/data.c | 23 +++ .../castle_inside/ddd_warp/collision.inc.c | 0 .../vanilla_actors}/castle_inside/geo.c | 14 +- .../vanilla_actors}/castle_inside/header.h | 0 .../castle_inside/pendulum/geo.inc.c | 0 .../castle_inside/pendulum/model.inc.c | 0 .../castle_inside/star_door/collision.inc.c | 0 .../castle_inside/star_door/geo.inc.c | 0 .../castle_inside/star_door/model.inc.c | 0 .../castle_inside/texture.inc.c | 8 +- .../castle_inside/trap_door/collision.inc.c | 0 .../castle_inside/trap_door/geo.inc.c | 0 .../castle_inside/trap_door/model.inc.c | 0 .../water_level_pillar/collision.inc.c | 0 .../water_level_pillar/geo.inc.c | 0 .../water_level_pillar/model.inc.c | 0 .../castle_inside/wing_cap_light/model.inc.c | 0 actors/vanilla_actors/ccm/data.c | 18 +++ .../vanilla_actors}/ccm/geo.c | 8 +- .../vanilla_actors}/ccm/header.h | 0 .../vanilla_actors}/ccm/ropeway_lift/1.inc.c | 0 .../vanilla_actors}/ccm/ropeway_lift/2.inc.c | 0 .../ccm/ropeway_lift/collision.inc.c | 0 .../ccm/ropeway_lift/geo.inc.c | 0 .../ccm/snowman_base/geo.inc.c | 0 .../ccm/snowman_base/model.inc.c | 2 +- .../vanilla_actors}/ccm/snowman_head/1.inc.c | 0 .../vanilla_actors}/ccm/snowman_head/2.inc.c | 0 .../ccm/snowman_head/geo.inc.c | 0 .../vanilla_actors}/ccm/texture.inc.c | 10 +- actors/vanilla_actors/ddd/data.c | 23 +++ .../vanilla_actors}/ddd/geo.c | 8 +- .../vanilla_actors}/ddd/header.h | 0 .../vanilla_actors}/ddd/pole/geo.inc.c | 0 .../vanilla_actors}/ddd/pole/model.inc.c | 0 .../vanilla_actors}/ddd/sub_door/1.inc.c | 0 .../vanilla_actors}/ddd/sub_door/2.inc.c | 0 .../vanilla_actors}/ddd/sub_door/3.inc.c | 0 .../ddd/sub_door/collision.inc.c | 0 .../vanilla_actors}/ddd/sub_door/geo.inc.c | 0 .../vanilla_actors}/ddd/submarine/1.inc.c | 0 .../vanilla_actors}/ddd/submarine/2.inc.c | 0 .../ddd/submarine/collision.inc.c | 0 .../vanilla_actors}/ddd/submarine/geo.inc.c | 0 .../vanilla_actors}/ddd/texture.inc.c | 6 +- .../hmc/arrow_platform/collision.inc.c | 0 .../hmc/arrow_platform/geo.inc.c | 0 .../hmc/arrow_platform/model.inc.c | 0 .../hmc/arrow_platform_button/collision.inc.c | 0 .../hmc/arrow_platform_button/geo.inc.c | 0 .../hmc/arrow_platform_button/model.inc.c | 0 actors/vanilla_actors/hmc/data.c | 23 +++ .../hmc/elevator_platform/collision.inc.c | 0 .../hmc/elevator_platform/geo.inc.c | 0 .../hmc/elevator_platform/model.inc.c | 0 .../vanilla_actors}/hmc/geo.c | 16 +- .../hmc/grill_door/collision.inc.c | 0 .../vanilla_actors}/hmc/grill_door/geo.inc.c | 0 .../hmc/grill_door/model.inc.c | 0 .../vanilla_actors}/hmc/header.h | 0 .../hmc/rolling_rock/geo.inc.c | 0 .../hmc/rolling_rock/model.inc.c | 0 .../hmc/rolling_rock_fragment_1/geo.inc.c | 0 .../hmc/rolling_rock_fragment_1/model.inc.c | 0 .../hmc/rolling_rock_fragment_2/geo.inc.c | 0 .../hmc/rolling_rock_fragment_2/model.inc.c | 0 .../vanilla_actors}/hmc/texture.inc.c | 8 +- actors/vanilla_actors/jrb/data.c | 25 +++ .../jrb/falling_pillar/geo.inc.c | 0 .../jrb/falling_pillar/model.inc.c | 0 .../jrb/falling_pillar_base/collision.inc.c | 0 .../jrb/falling_pillar_base/geo.inc.c | 0 .../jrb/falling_pillar_base/model.inc.c | 0 .../jrb/floating_platform/collision.inc.c | 0 .../jrb/floating_platform/geo.inc.c | 0 .../jrb/floating_platform/model.inc.c | 0 .../vanilla_actors}/jrb/geo.c | 14 +- .../vanilla_actors}/jrb/header.h | 0 .../vanilla_actors}/jrb/rock/collision.inc.c | 0 .../vanilla_actors}/jrb/rock/geo.inc.c | 0 .../vanilla_actors}/jrb/rock/model.inc.c | 0 .../jrb/sliding_box/collision.inc.c | 0 .../vanilla_actors}/jrb/sliding_box/geo.inc.c | 0 .../jrb/sliding_box/model.inc.c | 0 .../vanilla_actors}/jrb/texture.inc.c | 4 +- .../jrb/unused_lid/collision.inc.c | 0 .../jrb/wooden_ship/collision.inc.c | 0 .../vanilla_actors}/jrb/wooden_ship/geo.inc.c | 0 .../jrb/wooden_ship/model.inc.c | 0 .../vanilla_actors}/lll/10/collision.inc.c | 0 .../vanilla_actors}/lll/10/geo.inc.c | 0 .../vanilla_actors}/lll/10/model.inc.c | 0 .../collision.inc.c | 0 .../lll/collapsing_wooden_platform/geo.inc.c | 0 .../collapsing_wooden_platform/model.inc.c | 0 actors/vanilla_actors/lll/data.c | 42 +++++ .../lll/drawbridge_part/collision.inc.c | 0 .../lll/drawbridge_part/geo.inc.c | 0 .../lll/drawbridge_part/model.inc.c | 0 .../vanilla_actors}/lll/geo.c | 34 ++-- .../vanilla_actors}/lll/header.h | 0 .../lll/long_wooden_bridge/geo.inc.c | 0 .../lll/long_wooden_bridge/model.inc.c | 0 .../collision.inc.c | 0 .../moving_octagonal_mesh_platform/geo.inc.c | 0 .../model.inc.c | 0 .../lll/puzzle_piece/collision.inc.c | 0 .../lll/puzzle_piece/geo.inc.c | 0 .../lll/puzzle_piece/model.inc.c | 0 .../lll/rolling_log/collision.inc.c | 0 .../vanilla_actors}/lll/rolling_log/geo.inc.c | 0 .../lll/rolling_log/model.inc.c | 0 .../rotating_block_fire_bars/collision.inc.c | 0 .../lll/rotating_block_fire_bars/geo.inc.c | 0 .../lll/rotating_block_fire_bars/model.inc.c | 0 .../rotating_hexagonal_ring/collision.inc.c | 0 .../lll/rotating_hexagonal_ring/geo.inc.c | 0 .../lll/rotating_hexagonal_ring/model.inc.c | 0 .../collision.inc.c | 0 .../sinking_rectangular_platform/geo.inc.c | 0 .../sinking_rectangular_platform/model.inc.c | 0 .../lll/sinking_rock_block/collision.inc.c | 0 .../lll/sinking_rock_block/geo.inc.c | 0 .../lll/sinking_rock_block/model.inc.c | 0 .../sinking_square_platform/collision.inc.c | 0 .../lll/sinking_square_platform/geo.inc.c | 0 .../lll/sinking_square_platform/model.inc.c | 0 .../vanilla_actors}/lll/texture.inc.c | 44 ++--- .../tilting_square_platform/collision.inc.c | 0 .../lll/tilting_square_platform/geo.inc.c | 0 .../lll/tilting_square_platform/model.inc.c | 0 .../lll/volcano_falling_trap/collision.inc.c | 0 .../lll/volcano_falling_trap/geo.inc.c | 0 .../lll/volcano_falling_trap/model.inc.c | 0 .../lll/wooden_float_large/geo.inc.c | 0 .../lll/wooden_float_large/model.inc.c | 0 .../lll/wooden_float_small/collision.inc.c | 0 .../lll/wooden_float_small/geo.inc.c | 0 .../lll/wooden_float_small/model.inc.c | 0 .../vanilla_actors}/rr/cruiser_wing/geo.inc.c | 0 .../rr/cruiser_wing/model.inc.c | 0 actors/vanilla_actors/rr/data.c | 44 +++++ .../vanilla_actors}/rr/donut_block/1.inc.c | 0 .../vanilla_actors}/rr/donut_block/2.inc.c | 0 .../rr/donut_block/collision.inc.c | 0 .../vanilla_actors}/rr/donut_block/geo.inc.c | 0 .../rr/elevator_platform/collision.inc.c | 0 .../rr/elevator_platform/geo.inc.c | 0 .../rr/elevator_platform/model.inc.c | 0 .../rr/flying_carpet/collision.inc.c | 0 .../rr/flying_carpet/geo.inc.c | 0 .../rr/flying_carpet/model.inc.c | 0 .../vanilla_actors}/rr/geo.c | 34 ++-- .../vanilla_actors}/rr/header.h | 0 .../rr/l_platform/collision.inc.c | 0 .../vanilla_actors}/rr/l_platform/geo.inc.c | 0 .../vanilla_actors}/rr/l_platform/model.inc.c | 0 .../rr/octagonal_platform/collision.inc.c | 0 .../rr/octagonal_platform/geo.inc.c | 0 .../rr/octagonal_platform/model.inc.c | 0 .../rr/pyramid_platform/collision.inc.c | 0 .../rr/pyramid_platform/geo.inc.c | 0 .../rr/pyramid_platform/model.inc.c | 0 .../rotating_bridge_platform/collision.inc.c | 0 .../rr/rotating_bridge_platform/geo.inc.c | 0 .../rr/rotating_bridge_platform/model.inc.c | 0 .../rr/seesaw_platform/collision.inc.c | 0 .../rr/seesaw_platform/geo.inc.c | 0 .../rr/seesaw_platform/model.inc.c | 0 .../rr/sliding_platform/collision.inc.c | 0 .../rr/sliding_platform/geo.inc.c | 0 .../rr/sliding_platform/model.inc.c | 0 .../rr/swinging_platform/collision.inc.c | 0 .../rr/swinging_platform/geo.inc.c | 0 .../rr/swinging_platform/model.inc.c | 0 .../vanilla_actors}/rr/texture.inc.c | 4 +- .../rr/tricky_triangles_1/collision.inc.c | 0 .../rr/tricky_triangles_1/geo.inc.c | 0 .../rr/tricky_triangles_1/model.inc.c | 0 .../rr/tricky_triangles_2/collision.inc.c | 0 .../rr/tricky_triangles_2/geo.inc.c | 0 .../rr/tricky_triangles_2/model.inc.c | 0 .../rr/tricky_triangles_3/collision.inc.c | 0 .../rr/tricky_triangles_3/geo.inc.c | 0 .../rr/tricky_triangles_3/model.inc.c | 0 .../rr/tricky_triangles_4/collision.inc.c | 0 .../rr/tricky_triangles_4/geo.inc.c | 0 .../rr/tricky_triangles_4/model.inc.c | 0 .../rr/tricky_triangles_5/collision.inc.c | 0 .../rr/tricky_triangles_5/geo.inc.c | 0 .../rr/tricky_triangles_5/model.inc.c | 0 actors/vanilla_actors/sl/data.c | 20 +++ .../vanilla_actors}/sl/geo.c | 8 +- .../vanilla_actors}/sl/header.h | 0 .../sl/snow_mound/collision.inc.c | 0 .../vanilla_actors}/sl/snow_mound/geo.inc.c | 0 .../vanilla_actors}/sl/snow_mound/model.inc.c | 0 .../vanilla_actors}/sl/texture.inc.c | 2 +- .../sl/unused_cracked_ice/collision.inc.c | 0 .../sl/unused_cracked_ice/geo.inc.c | 0 .../sl/unused_cracked_ice/model.inc.c | 0 .../sl/unused_ice_shard/geo.inc.c | 0 .../sl/unused_ice_shard/model.inc.c | 0 actors/vanilla_actors/ssl/data.c | 28 ++++ .../ssl/eyerok_col/collision.inc.c | 0 .../vanilla_actors}/ssl/geo.c | 14 +- .../ssl/grindel/collision.inc.c | 0 .../vanilla_actors}/ssl/grindel/geo.inc.c | 0 .../vanilla_actors}/ssl/grindel/model.inc.c | 0 .../vanilla_actors}/ssl/header.h | 0 .../ssl/moving_pyramid_wall/collision.inc.c | 0 .../ssl/moving_pyramid_wall/geo.inc.c | 0 .../ssl/moving_pyramid_wall/model.inc.c | 0 .../ssl/pyramid_elevator/collision.inc.c | 0 .../ssl/pyramid_elevator/geo.inc.c | 0 .../ssl/pyramid_elevator/model.inc.c | 0 .../ssl/pyramid_top/collision.inc.c | 0 .../vanilla_actors}/ssl/pyramid_top/geo.inc.c | 0 .../ssl/pyramid_top/model.inc.c | 0 .../ssl/spindel/collision.inc.c | 0 .../vanilla_actors}/ssl/spindel/geo.inc.c | 0 .../vanilla_actors}/ssl/spindel/model.inc.c | 0 .../vanilla_actors}/ssl/texture.inc.c | 4 +- .../ssl/tox_box/collision.inc.c | 0 .../vanilla_actors}/ssl/tox_box/geo.inc.c | 0 .../vanilla_actors}/ssl/tox_box/model.inc.c | 8 +- .../vanilla_actors}/thi/data.c | 6 +- .../vanilla_actors}/thi/geo.c | 4 +- .../vanilla_actors}/thi/header.h | 0 .../vanilla_actors}/thi/texture.inc.c | 2 +- .../thi/thi_tops/collision.inc.c | 0 .../vanilla_actors}/thi/thi_tops/geo.inc.c | 0 .../vanilla_actors}/thi/thi_tops/model.inc.c | 0 .../ttc/clock_hand/collision.inc.c | 0 .../vanilla_actors}/ttc/clock_hand/geo.inc.c | 0 .../ttc/clock_hand/model.inc.c | 0 actors/vanilla_actors/ttc/data.c | 44 +++++ .../ttc/elevator_platform/collision.inc.c | 0 .../ttc/elevator_platform/geo.inc.c | 0 .../ttc/elevator_platform/model.inc.c | 0 .../vanilla_actors}/ttc/geo.c | 32 ++-- .../vanilla_actors}/ttc/header.h | 0 .../vanilla_actors}/ttc/large_gear/geo.inc.c | 0 .../ttc/large_gear/model.inc.c | 0 .../ttc/large_treadmill/collision.inc.c | 0 .../ttc/large_treadmill/geo.inc.c | 0 .../ttc/large_treadmill/model.inc.c | 0 .../ttc/pendulum/collision.inc.c | 0 .../vanilla_actors}/ttc/pendulum/geo.inc.c | 0 .../vanilla_actors}/ttc/pendulum/model.inc.c | 0 .../ttc/pit_block/collision.inc.c | 0 .../vanilla_actors}/ttc/pit_block/geo.inc.c | 0 .../vanilla_actors}/ttc/pit_block/model.inc.c | 0 .../ttc/pit_block_2/collision.inc.c | 0 .../vanilla_actors}/ttc/pit_block_2/geo.inc.c | 0 .../ttc/pit_block_2/model.inc.c | 0 .../ttc/push_block/collision.inc.c | 0 .../vanilla_actors}/ttc/push_block/geo.inc.c | 0 .../ttc/push_block/model.inc.c | 0 .../ttc/rotating_cube/collision.inc.c | 0 .../ttc/rotating_cube/geo.inc.c | 0 .../ttc/rotating_cube/model.inc.c | 0 .../ttc/rotating_hexagon/collision.inc.c | 0 .../ttc/rotating_hexagon/geo.inc.c | 0 .../ttc/rotating_hexagon/model.inc.c | 0 .../ttc/rotating_prism/collision.inc.c | 0 .../ttc/rotating_prism/geo.inc.c | 0 .../ttc/rotating_prism/model.inc.c | 0 .../ttc/rotating_triangle/collision.inc.c | 0 .../ttc/rotating_triangle/geo.inc.c | 0 .../ttc/rotating_triangle/model.inc.c | 0 .../vanilla_actors}/ttc/small_gear/geo.inc.c | 0 .../ttc/small_gear/model.inc.c | 0 .../ttc/small_treadmill/collision.inc.c | 0 .../ttc/small_treadmill/geo.inc.c | 0 .../ttc/small_treadmill/model.inc.c | 0 .../ttc/spinner/collision.inc.c | 0 .../vanilla_actors}/ttc/spinner/geo.inc.c | 0 .../vanilla_actors}/ttc/spinner/model.inc.c | 0 .../vanilla_actors}/ttc/texture.inc.c | 4 +- .../vanilla_actors}/ttm/blue_smiley/geo.inc.c | 0 .../ttm/blue_smiley/model.inc.c | 0 actors/vanilla_actors/ttm/data.c | 23 +++ .../vanilla_actors}/ttm/geo.c | 16 +- .../vanilla_actors}/ttm/header.h | 0 .../vanilla_actors}/ttm/moon_smiley/geo.inc.c | 0 .../ttm/moon_smiley/model.inc.c | 0 .../ttm/rolling_log/collision.inc.c | 0 .../vanilla_actors}/ttm/rolling_log/geo.inc.c | 0 .../ttm/rolling_log/model.inc.c | 0 .../ttm/slide_exit_podium/collision.inc.c | 0 .../ttm/slide_exit_podium/geo.inc.c | 0 .../ttm/slide_exit_podium/model.inc.c | 2 +- .../vanilla_actors}/ttm/star_cage/1.inc.c | 0 .../vanilla_actors}/ttm/star_cage/2.inc.c | 0 .../ttm/star_cage/collision.inc.c | 0 .../vanilla_actors}/ttm/star_cage/geo.inc.c | 0 .../vanilla_actors}/ttm/star_smiley/geo.inc.c | 0 .../ttm/star_smiley/model.inc.c | 0 .../vanilla_actors}/ttm/texture.inc.c | 2 +- .../ttm/yellow_smiley/geo.inc.c | 0 .../ttm/yellow_smiley/model.inc.c | 0 .../vanilla_actors}/vcutm/data.c | 6 +- .../vanilla_actors}/vcutm/geo.c | 4 +- .../vanilla_actors}/vcutm/header.h | 0 .../vcutm/seesaw/collision.inc.c | 0 .../vanilla_actors}/vcutm/seesaw/geo.inc.c | 0 .../vanilla_actors}/vcutm/seesaw/model.inc.c | 0 .../vanilla_actors}/vcutm/texture.inc.c | 2 +- .../wdw/arrow_lift/collision.inc.c | 0 .../vanilla_actors}/wdw/arrow_lift/geo.inc.c | 0 .../wdw/arrow_lift/model.inc.c | 0 actors/vanilla_actors/wdw/data.c | 26 +++ .../wdw/express_elevator/collision.inc.c | 0 .../wdw/express_elevator/geo.inc.c | 0 .../wdw/express_elevator/model.inc.c | 0 .../vanilla_actors}/wdw/geo.c | 16 +- .../vanilla_actors}/wdw/header.h | 0 .../wdw/hidden_platform/collision.inc.c | 0 .../wdw/hidden_platform/geo.inc.c | 0 .../wdw/hidden_platform/model.inc.c | 0 .../collision.inc.c | 0 .../rectangular_floating_platform/geo.inc.c | 0 .../rectangular_floating_platform/model.inc.c | 0 .../wdw/rotating_platform/collision.inc.c | 0 .../wdw/rotating_platform/geo.inc.c | 0 .../wdw/rotating_platform/model.inc.c | 0 .../square_floating_platform/collision.inc.c | 0 .../wdw/square_floating_platform/geo.inc.c | 0 .../wdw/square_floating_platform/model.inc.c | 0 .../vanilla_actors}/wdw/texture.inc.c | 6 +- .../wdw/water_level_diamond/collision.inc.c | 0 .../wdw/water_level_diamond/geo.inc.c | 0 .../wdw/water_level_diamond/model.inc.c | 0 .../vanilla_actors}/wf/10/1.inc.c | 0 .../vanilla_actors}/wf/10/2.inc.c | 0 .../vanilla_actors}/wf/10/collision.inc.c | 0 .../vanilla_actors}/wf/10/geo.inc.c | 0 .../vanilla_actors}/wf/11/collision.inc.c | 0 .../vanilla_actors}/wf/11/geo.inc.c | 0 .../vanilla_actors}/wf/11/model.inc.c | 0 .../beta_extending_platform/collision.inc.c | 0 .../wf/beta_extending_platform/geo.inc.c | 0 .../wf/beta_extending_platform/model.inc.c | 0 .../wf/breakable_wall_left/collision.inc.c | 0 .../wf/breakable_wall_left/geo.inc.c | 0 .../wf/breakable_wall_left/model.inc.c | 0 .../wf/breakable_wall_right/collision.inc.c | 0 .../wf/breakable_wall_right/geo.inc.c | 0 .../wf/breakable_wall_right/model.inc.c | 0 actors/vanilla_actors/wf/data.c | 49 ++++++ .../wf/extending_platform/collision.inc.c | 0 .../wf/extending_platform/geo.inc.c | 0 .../wf/extending_platform/model.inc.c | 0 .../vanilla_actors}/wf/geo.c | 34 ++-- .../vanilla_actors}/wf/giant_pole/geo.inc.c | 0 .../vanilla_actors}/wf/giant_pole/model.inc.c | 0 .../vanilla_actors}/wf/header.h | 0 .../vanilla_actors}/wf/kickable_board/1.inc.c | 0 .../vanilla_actors}/wf/kickable_board/2.inc.c | 0 .../wf/kickable_board/collision.inc.c | 0 .../wf/kickable_board/geo.inc.c | 0 .../wf/large_bomp/collision.inc.c | 0 .../vanilla_actors}/wf/large_bomp/geo.inc.c | 0 .../vanilla_actors}/wf/large_bomp/model.inc.c | 0 .../wf/rotating_platform/collision.inc.c | 0 .../wf/rotating_platform/geo.inc.c | 0 .../wf/rotating_platform/model.inc.c | 0 .../wf/rotating_wooden_platform/1.inc.c | 0 .../wf/rotating_wooden_platform/2.inc.c | 0 .../rotating_wooden_platform/collision.inc.c | 0 .../wf/rotating_wooden_platform/geo.inc.c | 0 .../wf/sliding_platform/collision.inc.c | 0 .../wf/sliding_platform/geo.inc.c | 0 .../wf/sliding_platform/model.inc.c | 0 .../vanilla_actors}/wf/small_bomp/1.inc.c | 0 .../vanilla_actors}/wf/small_bomp/2.inc.c | 0 .../wf/small_bomp/collision.inc.c | 0 .../vanilla_actors}/wf/small_bomp/geo.inc.c | 0 .../vanilla_actors}/wf/texture.inc.c | 10 +- .../wf/tower_door/collision.inc.c | 0 .../vanilla_actors}/wf/tower_door/geo.inc.c | 0 .../vanilla_actors}/wf/tower_door/model.inc.c | 0 .../wf/tumbling_bridge_far/geo.inc.c | 0 .../wf/tumbling_bridge_far/model.inc.c | 0 .../wf/tumbling_bridge_near/collision.inc.c | 0 .../wf/tumbling_bridge_near/geo.inc.c | 0 .../wf/tumbling_bridge_near/model.inc.c | 0 actors_vanilla/bbh/data.c | 27 ---- actors_vanilla/bitdw/data.c | 35 ---- actors_vanilla/bitfs/data.c | 38 ----- actors_vanilla/bits/data.c | 38 ----- actors_vanilla/bob/data.c | 17 -- actors_vanilla/castle_grounds/data.c | 20 --- actors_vanilla/castle_inside/data.c | 23 --- actors_vanilla/ccm/data.c | 18 --- actors_vanilla/ddd/data.c | 23 --- actors_vanilla/hmc/data.c | 23 --- actors_vanilla/jrb/data.c | 25 --- actors_vanilla/lll/data.c | 42 ----- actors_vanilla/rr/data.c | 44 ----- actors_vanilla/sl/data.c | 20 --- actors_vanilla/ssl/data.c | 28 ---- actors_vanilla/ttc/data.c | 44 ----- actors_vanilla/ttm/data.c | 23 --- actors_vanilla/wdw/data.c | 26 --- actors_vanilla/wf/data.c | 49 ------ assets.json | 150 +++++++++--------- data/behavior_data.c | 36 ++--- sm64.ld | 10 +- src/game/behavior_actions.c | 16 +- src/game/geo_misc.c | 4 +- src/game/ingame_menu.c | 2 +- src/game/obj_behaviors_2.c | 18 +-- 591 files changed, 1031 insertions(+), 1031 deletions(-) rename {actors_vanilla => actors/vanilla_actors}/bbh/coffin/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/coffin/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/coffin/model.inc.c (100%) create mode 100644 actors/vanilla_actors/bbh/data.c rename {actors_vanilla => actors/vanilla_actors}/bbh/geo.c (63%) rename {actors_vanilla => actors/vanilla_actors}/bbh/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/merry_go_round/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/merry_go_round/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/merry_go_round/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/mesh_elevator/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/mesh_elevator/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/mesh_elevator/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/moving_bookshelf/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/moving_bookshelf/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/moving_bookshelf/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/staircase_step/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/staircase_step/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/staircase_step/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tilting_trap_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tilting_trap_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tilting_trap_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tumbling_platform_far/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tumbling_platform_far/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tumbling_platform_near/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tumbling_platform_near/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bbh/tumbling_platform_near/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_1/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_1/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_1/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_2/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_2/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_2/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_3/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_3/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_3/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_4/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_4/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_4/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_5/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_5/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/collapsing_stairs_5/model.inc.c (100%) create mode 100644 actors/vanilla_actors/bitdw/data.c rename {actors_vanilla => actors/vanilla_actors}/bitdw/ferris_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/ferris_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/ferris_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/ferris_wheel_axle/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/ferris_wheel_axle/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/ferris_wheel_axle/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/geo.c (60%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/seesaw_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/seesaw_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/seesaw_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/sliding_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/sliding_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/sliding_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/square_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/square_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/square_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitdw/texture.inc.c (63%) create mode 100644 actors/vanilla_actors/bitfs/data.c rename {actors_vanilla => actors/vanilla_actors}/bitfs/elevator/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/elevator/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/elevator/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/geo.c (60%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/moving_square_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/moving_square_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/moving_square_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/platform_on_track/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/platform_on_track/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/platform_on_track/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/seesaw_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/seesaw_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/seesaw_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_cage_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_cage_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_cage_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_cage_pole/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_cage_pole/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_platforms/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_platforms/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sinking_platforms/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sliding_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sliding_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/sliding_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/stretching_platform/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/stretching_platform/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/stretching_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/stretching_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/texture.inc.c (63%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tilting_square_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tilting_square_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tilting_square_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tumbling_platform_far/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tumbling_platform_far/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tumbling_platform_near/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tumbling_platform_near/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bitfs/tumbling_platform_near/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/20/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/20/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/20/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/21/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/21/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/21/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/22/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/22/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/22/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/23/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/23/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/23/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/24/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/24/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/24/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/25/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/25/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/25/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/26/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/26/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/26/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/27/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/27/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/27/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/28/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/28/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/28/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/29/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/29/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/29/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/30/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/30/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/30/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/31/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/31/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/31/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/32/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/32/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/32/model.inc.c (100%) create mode 100644 actors/vanilla_actors/bits/data.c rename {actors_vanilla => actors/vanilla_actors}/bits/geo.c (65%) rename {actors_vanilla => actors/vanilla_actors}/bits/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/bits/texture.inc.c (63%) rename {actors_vanilla => actors/vanilla_actors}/bob/chain_chomp_gate/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/chain_chomp_gate/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/chain_chomp_gate/model.inc.c (100%) create mode 100644 actors/vanilla_actors/bob/data.c rename {actors_vanilla => actors/vanilla_actors}/bob/geo.c (71%) rename {actors_vanilla => actors/vanilla_actors}/bob/grate_door/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/grate_door/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/grate_door/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/seesaw_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/seesaw_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/bob/seesaw_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/11/anim.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/11/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/11/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/12/model.inc.c (96%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/13/model.inc.c (95%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/7/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/7/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/7/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/8/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/8/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/8/model.inc.c (100%) create mode 100644 actors/vanilla_actors/castle_grounds/data.c rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/geo.c (72%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_grounds/texture.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/clock_hour_hand/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/clock_hour_hand/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/clock_minute_hand/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/clock_minute_hand/model.inc.c (100%) create mode 100644 actors/vanilla_actors/castle_inside/data.c rename {actors_vanilla => actors/vanilla_actors}/castle_inside/ddd_warp/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/geo.c (73%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/pendulum/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/pendulum/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/star_door/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/star_door/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/star_door/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/texture.inc.c (58%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/trap_door/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/trap_door/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/trap_door/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/water_level_pillar/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/water_level_pillar/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/water_level_pillar/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/castle_inside/wing_cap_light/model.inc.c (100%) create mode 100644 actors/vanilla_actors/ccm/data.c rename {actors_vanilla => actors/vanilla_actors}/ccm/geo.c (71%) rename {actors_vanilla => actors/vanilla_actors}/ccm/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/ropeway_lift/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/ropeway_lift/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/ropeway_lift/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/ropeway_lift/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/snowman_base/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/snowman_base/model.inc.c (99%) rename {actors_vanilla => actors/vanilla_actors}/ccm/snowman_head/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/snowman_head/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/snowman_head/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ccm/texture.inc.c (64%) create mode 100644 actors/vanilla_actors/ddd/data.c rename {actors_vanilla => actors/vanilla_actors}/ddd/geo.c (73%) rename {actors_vanilla => actors/vanilla_actors}/ddd/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/pole/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/pole/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/sub_door/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/sub_door/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/sub_door/3.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/sub_door/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/sub_door/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/submarine/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/submarine/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/submarine/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/submarine/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ddd/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/hmc/arrow_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/arrow_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/arrow_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/arrow_platform_button/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/arrow_platform_button/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/arrow_platform_button/model.inc.c (100%) create mode 100644 actors/vanilla_actors/hmc/data.c rename {actors_vanilla => actors/vanilla_actors}/hmc/elevator_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/elevator_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/elevator_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/geo.c (63%) rename {actors_vanilla => actors/vanilla_actors}/hmc/grill_door/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/grill_door/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/grill_door/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/rolling_rock/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/rolling_rock/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/rolling_rock_fragment_1/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/rolling_rock_fragment_1/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/rolling_rock_fragment_2/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/rolling_rock_fragment_2/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/hmc/texture.inc.c (64%) create mode 100644 actors/vanilla_actors/jrb/data.c rename {actors_vanilla => actors/vanilla_actors}/jrb/falling_pillar/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/falling_pillar/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/falling_pillar_base/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/falling_pillar_base/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/falling_pillar_base/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/floating_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/floating_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/floating_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/geo.c (74%) rename {actors_vanilla => actors/vanilla_actors}/jrb/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/rock/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/rock/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/rock/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/sliding_box/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/sliding_box/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/sliding_box/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/jrb/unused_lid/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/wooden_ship/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/wooden_ship/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/jrb/wooden_ship/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/10/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/10/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/10/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/collapsing_wooden_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/collapsing_wooden_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/collapsing_wooden_platform/model.inc.c (100%) create mode 100644 actors/vanilla_actors/lll/data.c rename {actors_vanilla => actors/vanilla_actors}/lll/drawbridge_part/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/drawbridge_part/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/drawbridge_part/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/geo.c (72%) rename {actors_vanilla => actors/vanilla_actors}/lll/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/long_wooden_bridge/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/long_wooden_bridge/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/moving_octagonal_mesh_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/moving_octagonal_mesh_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/moving_octagonal_mesh_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/puzzle_piece/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/puzzle_piece/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/puzzle_piece/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rolling_log/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rolling_log/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rolling_log/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rotating_block_fire_bars/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rotating_block_fire_bars/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rotating_block_fire_bars/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rotating_hexagonal_ring/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rotating_hexagonal_ring/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/rotating_hexagonal_ring/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_rectangular_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_rectangular_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_rectangular_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_rock_block/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_rock_block/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_rock_block/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_square_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_square_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/sinking_square_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/texture.inc.c (63%) rename {actors_vanilla => actors/vanilla_actors}/lll/tilting_square_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/tilting_square_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/tilting_square_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/volcano_falling_trap/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/volcano_falling_trap/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/volcano_falling_trap/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/wooden_float_large/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/wooden_float_large/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/wooden_float_small/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/wooden_float_small/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/lll/wooden_float_small/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/cruiser_wing/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/cruiser_wing/model.inc.c (100%) create mode 100644 actors/vanilla_actors/rr/data.c rename {actors_vanilla => actors/vanilla_actors}/rr/donut_block/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/donut_block/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/donut_block/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/donut_block/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/elevator_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/elevator_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/elevator_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/flying_carpet/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/flying_carpet/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/flying_carpet/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/geo.c (59%) rename {actors_vanilla => actors/vanilla_actors}/rr/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/l_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/l_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/l_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/octagonal_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/octagonal_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/octagonal_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/pyramid_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/pyramid_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/pyramid_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/rotating_bridge_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/rotating_bridge_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/rotating_bridge_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/seesaw_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/seesaw_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/seesaw_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/sliding_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/sliding_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/sliding_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/swinging_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/swinging_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/swinging_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/texture.inc.c (60%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_1/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_1/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_1/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_2/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_2/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_2/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_3/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_3/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_3/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_4/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_4/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_4/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_5/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_5/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/rr/tricky_triangles_5/model.inc.c (100%) create mode 100644 actors/vanilla_actors/sl/data.c rename {actors_vanilla => actors/vanilla_actors}/sl/geo.c (71%) rename {actors_vanilla => actors/vanilla_actors}/sl/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/snow_mound/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/snow_mound/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/snow_mound/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/sl/unused_cracked_ice/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/unused_cracked_ice/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/unused_cracked_ice/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/unused_ice_shard/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/sl/unused_ice_shard/model.inc.c (100%) create mode 100644 actors/vanilla_actors/ssl/data.c rename {actors_vanilla => actors/vanilla_actors}/ssl/eyerok_col/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/geo.c (66%) rename {actors_vanilla => actors/vanilla_actors}/ssl/grindel/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/grindel/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/grindel/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/moving_pyramid_wall/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/moving_pyramid_wall/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/moving_pyramid_wall/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/pyramid_elevator/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/pyramid_elevator/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/pyramid_elevator/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/pyramid_top/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/pyramid_top/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/pyramid_top/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/spindel/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/spindel/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/spindel/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/ssl/tox_box/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/tox_box/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ssl/tox_box/model.inc.c (97%) rename {actors_vanilla => actors/vanilla_actors}/thi/data.c (60%) rename {actors_vanilla => actors/vanilla_actors}/thi/geo.c (83%) rename {actors_vanilla => actors/vanilla_actors}/thi/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/thi/texture.inc.c (63%) rename {actors_vanilla => actors/vanilla_actors}/thi/thi_tops/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/thi/thi_tops/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/thi/thi_tops/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/clock_hand/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/clock_hand/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/clock_hand/model.inc.c (100%) create mode 100644 actors/vanilla_actors/ttc/data.c rename {actors_vanilla => actors/vanilla_actors}/ttc/elevator_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/elevator_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/elevator_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/geo.c (59%) rename {actors_vanilla => actors/vanilla_actors}/ttc/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/large_gear/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/large_gear/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/large_treadmill/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/large_treadmill/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/large_treadmill/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pendulum/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pendulum/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pendulum/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pit_block/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pit_block/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pit_block/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pit_block_2/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pit_block_2/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/pit_block_2/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/push_block/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/push_block/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/push_block/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_cube/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_cube/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_cube/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_hexagon/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_hexagon/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_hexagon/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_prism/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_prism/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_prism/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_triangle/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_triangle/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/rotating_triangle/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/small_gear/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/small_gear/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/small_treadmill/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/small_treadmill/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/small_treadmill/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/spinner/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/spinner/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/spinner/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttc/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/ttm/blue_smiley/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/blue_smiley/model.inc.c (100%) create mode 100644 actors/vanilla_actors/ttm/data.c rename {actors_vanilla => actors/vanilla_actors}/ttm/geo.c (64%) rename {actors_vanilla => actors/vanilla_actors}/ttm/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/moon_smiley/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/moon_smiley/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/rolling_log/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/rolling_log/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/rolling_log/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/slide_exit_podium/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/slide_exit_podium/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/slide_exit_podium/model.inc.c (99%) rename {actors_vanilla => actors/vanilla_actors}/ttm/star_cage/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/star_cage/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/star_cage/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/star_cage/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/star_smiley/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/star_smiley/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/ttm/yellow_smiley/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/ttm/yellow_smiley/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/vcutm/data.c (52%) rename {actors_vanilla => actors/vanilla_actors}/vcutm/geo.c (80%) rename {actors_vanilla => actors/vanilla_actors}/vcutm/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/vcutm/seesaw/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/vcutm/seesaw/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/vcutm/seesaw/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/vcutm/texture.inc.c (63%) rename {actors_vanilla => actors/vanilla_actors}/wdw/arrow_lift/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/arrow_lift/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/arrow_lift/model.inc.c (100%) create mode 100644 actors/vanilla_actors/wdw/data.c rename {actors_vanilla => actors/vanilla_actors}/wdw/express_elevator/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/express_elevator/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/express_elevator/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/geo.c (64%) rename {actors_vanilla => actors/vanilla_actors}/wdw/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/hidden_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/hidden_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/hidden_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/rectangular_floating_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/rectangular_floating_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/rectangular_floating_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/rotating_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/rotating_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/rotating_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/square_floating_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/square_floating_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/square_floating_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/texture.inc.c (64%) rename {actors_vanilla => actors/vanilla_actors}/wdw/water_level_diamond/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/water_level_diamond/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wdw/water_level_diamond/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/10/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/10/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/10/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/10/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/11/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/11/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/11/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/beta_extending_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/beta_extending_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/beta_extending_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/breakable_wall_left/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/breakable_wall_left/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/breakable_wall_left/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/breakable_wall_right/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/breakable_wall_right/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/breakable_wall_right/model.inc.c (100%) create mode 100644 actors/vanilla_actors/wf/data.c rename {actors_vanilla => actors/vanilla_actors}/wf/extending_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/extending_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/extending_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/geo.c (64%) rename {actors_vanilla => actors/vanilla_actors}/wf/giant_pole/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/giant_pole/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/header.h (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/kickable_board/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/kickable_board/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/kickable_board/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/kickable_board/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/large_bomp/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/large_bomp/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/large_bomp/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/rotating_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/rotating_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/rotating_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/rotating_wooden_platform/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/rotating_wooden_platform/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/rotating_wooden_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/rotating_wooden_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/sliding_platform/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/sliding_platform/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/sliding_platform/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/small_bomp/1.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/small_bomp/2.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/small_bomp/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/small_bomp/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/texture.inc.c (56%) rename {actors_vanilla => actors/vanilla_actors}/wf/tower_door/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/tower_door/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/tower_door/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/tumbling_bridge_far/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/tumbling_bridge_far/model.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/tumbling_bridge_near/collision.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/tumbling_bridge_near/geo.inc.c (100%) rename {actors_vanilla => actors/vanilla_actors}/wf/tumbling_bridge_near/model.inc.c (100%) delete mode 100644 actors_vanilla/bbh/data.c delete mode 100644 actors_vanilla/bitdw/data.c delete mode 100644 actors_vanilla/bitfs/data.c delete mode 100644 actors_vanilla/bits/data.c delete mode 100644 actors_vanilla/bob/data.c delete mode 100644 actors_vanilla/castle_grounds/data.c delete mode 100644 actors_vanilla/castle_inside/data.c delete mode 100644 actors_vanilla/ccm/data.c delete mode 100644 actors_vanilla/ddd/data.c delete mode 100644 actors_vanilla/hmc/data.c delete mode 100644 actors_vanilla/jrb/data.c delete mode 100644 actors_vanilla/lll/data.c delete mode 100644 actors_vanilla/rr/data.c delete mode 100644 actors_vanilla/sl/data.c delete mode 100644 actors_vanilla/ssl/data.c delete mode 100644 actors_vanilla/ttc/data.c delete mode 100644 actors_vanilla/ttm/data.c delete mode 100644 actors_vanilla/wdw/data.c delete mode 100644 actors_vanilla/wf/data.c diff --git a/.gitignore b/.gitignore index 68e799ebf1..37de5bf743 100644 --- a/.gitignore +++ b/.gitignore @@ -528,26 +528,26 @@ assets/demos/pss.bin assets/demos/unused.bin assets/demos/wf.bin levels/bbh/0.rgba16.png -actors_vanilla/bbh/0.rgba16.png +actors/vanilla_actors/bbh/0.rgba16.png levels/bbh/1.rgba16.png levels/bbh/2.rgba16.png levels/bbh/3.rgba16.png -actors_vanilla/bbh/4.rgba16.png -actors_vanilla/bbh/5.rgba16.png -actors_vanilla/bbh/6.rgba16.png -actors_vanilla/bitdw/0.rgba16.png +actors/vanilla_actors/bbh/4.rgba16.png +actors/vanilla_actors/bbh/5.rgba16.png +actors/vanilla_actors/bbh/6.rgba16.png +actors/vanilla_actors/bitdw/0.rgba16.png levels/bitdw/0.rgba16.png levels/bitdw/1.rgba16.png levels/bitdw/2.rgba16.png levels/bitdw/3.rgba16.png -actors_vanilla/bitfs/0.rgba16.png +actors/vanilla_actors/bitfs/0.rgba16.png levels/bitfs/0.rgba16.png -actors_vanilla/bitfs/1.rgba16.png +actors/vanilla_actors/bitfs/1.rgba16.png levels/bitfs/1.rgba16.png levels/bitfs/2.rgba16.png levels/bits/0.rgba16.png levels/bits/1.rgba16.png -actors_vanilla/bits/2.rgba16.png +actors/vanilla_actors/bits/2.rgba16.png levels/bits/2.rgba16.png levels/bob/0.rgba16.png levels/bob/1.rgba16.png @@ -564,9 +564,9 @@ levels/bowser_3/2.rgba16.png levels/castle_grounds/0.rgba16.png levels/castle_grounds/1.rgba16.png levels/castle_grounds/2.rgba16.png -actors_vanilla/castle_grounds/3.rgba16.png -actors_vanilla/castle_grounds/4.rgba16.png -actors_vanilla/castle_grounds/5.ia8.png +actors/vanilla_actors/castle_grounds/3.rgba16.png +actors/vanilla_actors/castle_grounds/4.rgba16.png +actors/vanilla_actors/castle_grounds/5.ia8.png levels/castle_inside/1.rgba16.png levels/castle_inside/10.rgba16.png levels/castle_inside/11.rgba16.png @@ -604,25 +604,25 @@ levels/castle_inside/38.rgba16.png levels/castle_inside/39.rgba16.png levels/castle_inside/4.rgba16.png levels/castle_inside/40.rgba16.png -actors_vanilla/castle_inside/5.rgba16.png -actors_vanilla/castle_inside/6.rgba16.png -actors_vanilla/castle_inside/7.rgba16.png +actors/vanilla_actors/castle_inside/5.rgba16.png +actors/vanilla_actors/castle_inside/6.rgba16.png +actors/vanilla_actors/castle_inside/7.rgba16.png levels/castle_inside/8.rgba16.png levels/castle_inside/9.rgba16.png -actors_vanilla/castle_inside/castle_light.ia16.png +actors/vanilla_actors/castle_inside/castle_light.ia16.png levels/castle_inside/castle_light.ia16.png levels/ccm/0.rgba16.png levels/ccm/1.rgba16.png -actors_vanilla/ccm/1.rgba16.png +actors/vanilla_actors/ccm/1.rgba16.png levels/ccm/10.rgba16.png levels/ccm/11.rgba16.png -actors_vanilla/ccm/12.rgba16.png +actors/vanilla_actors/ccm/12.rgba16.png levels/ccm/2.rgba16.png -actors_vanilla/ccm/2.rgba16.png -actors_vanilla/ccm/3.rgba16.png +actors/vanilla_actors/ccm/2.rgba16.png +actors/vanilla_actors/ccm/3.rgba16.png levels/ccm/4.rgba16.png -actors_vanilla/ccm/5.rgba16.png -actors_vanilla/ccm/6.rgba16.png +actors/vanilla_actors/ccm/5.rgba16.png +actors/vanilla_actors/ccm/6.rgba16.png levels/ccm/7.rgba16.png levels/ccm/8.ia16.png levels/ccm/9.ia16.png @@ -631,12 +631,12 @@ levels/cotmc/1.rgba16.png levels/cotmc/2.rgba16.png levels/cotmc/3.rgba16.png levels/cotmc/4.rgba16.png -actors_vanilla/ddd/0.rgba16.png +actors/vanilla_actors/ddd/0.rgba16.png levels/ddd/1.rgba16.png levels/ddd/2.rgba16.png -actors_vanilla/ddd/2.rgba16.png +actors/vanilla_actors/ddd/2.rgba16.png levels/ddd/3.rgba16.png -actors_vanilla/ddd/4.rgba16.png +actors/vanilla_actors/ddd/4.rgba16.png levels/ending/cake.png levels/ending/cake_eu.png levels/ending/eu_023000.rgba16.png @@ -648,10 +648,10 @@ levels/ending/eu_028000.rgba16.png levels/hmc/0.rgba16.png levels/hmc/1.rgba16.png levels/hmc/2.rgba16.png -actors_vanilla/hmc/3.rgba16.png -actors_vanilla/hmc/4.rgba16.png -actors_vanilla/hmc/5.rgba16.png -actors_vanilla/hmc/6.rgba16.png +actors/vanilla_actors/hmc/3.rgba16.png +actors/vanilla_actors/hmc/4.rgba16.png +actors/vanilla_actors/hmc/5.rgba16.png +actors/vanilla_actors/hmc/6.rgba16.png levels/hmc/7.rgba16.png levels/intro/0.rgba16.png levels/intro/1.rgba16.png @@ -662,41 +662,41 @@ levels/intro/3_sh_tm.rgba16.png levels/intro/3_tm.rgba16.png levels/jrb/0.rgba16.png levels/jrb/1.rgba16.png -actors_vanilla/jrb/2.rgba16.png -actors_vanilla/jrb/3.rgba16.png -actors_vanilla/lll/0.rgba16.png -actors_vanilla/lll/1.rgba16.png -actors_vanilla/lll/10.rgba16.png -actors_vanilla/lll/11.rgba16.png -actors_vanilla/lll/12.rgba16.png -actors_vanilla/lll/13.rgba16.png -actors_vanilla/lll/14.rgba16.png -actors_vanilla/lll/15.rgba16.png -actors_vanilla/lll/16.rgba16.png -actors_vanilla/lll/17.rgba16.png -actors_vanilla/lll/18.rgba16.png -actors_vanilla/lll/19.rgba16.png -actors_vanilla/lll/2.rgba16.png -actors_vanilla/lll/20.rgba16.png -actors_vanilla/lll/21.rgba16.png -actors_vanilla/lll/22.rgba16.png -actors_vanilla/lll/23.rgba16.png -actors_vanilla/lll/24.rgba16.png -actors_vanilla/lll/25.rgba16.png +actors/vanilla_actors/jrb/2.rgba16.png +actors/vanilla_actors/jrb/3.rgba16.png +actors/vanilla_actors/lll/0.rgba16.png +actors/vanilla_actors/lll/1.rgba16.png +actors/vanilla_actors/lll/10.rgba16.png +actors/vanilla_actors/lll/11.rgba16.png +actors/vanilla_actors/lll/12.rgba16.png +actors/vanilla_actors/lll/13.rgba16.png +actors/vanilla_actors/lll/14.rgba16.png +actors/vanilla_actors/lll/15.rgba16.png +actors/vanilla_actors/lll/16.rgba16.png +actors/vanilla_actors/lll/17.rgba16.png +actors/vanilla_actors/lll/18.rgba16.png +actors/vanilla_actors/lll/19.rgba16.png +actors/vanilla_actors/lll/2.rgba16.png +actors/vanilla_actors/lll/20.rgba16.png +actors/vanilla_actors/lll/21.rgba16.png +actors/vanilla_actors/lll/22.rgba16.png +actors/vanilla_actors/lll/23.rgba16.png +actors/vanilla_actors/lll/24.rgba16.png +actors/vanilla_actors/lll/25.rgba16.png levels/lll/26.rgba16.png levels/lll/27.ia16.png levels/lll/28.rgba16.png levels/lll/29.rgba16.png -actors_vanilla/lll/29.rgba16.png +actors/vanilla_actors/lll/29.rgba16.png levels/lll/3.rgba16.png levels/lll/30.rgba16.png levels/lll/31.rgba16.png levels/lll/32.rgba16.png levels/lll/4.rgba16.png levels/lll/5.rgba16.png -actors_vanilla/lll/6.rgba16.png +actors/vanilla_actors/lll/6.rgba16.png levels/lll/7.rgba16.png -actors_vanilla/lll/8.rgba16.png +actors/vanilla_actors/lll/8.rgba16.png levels/lll/9.rgba16.png levels/menu/main_menu_seg7.00018.rgba16.png levels/menu/main_menu_seg7.00818.rgba16.png @@ -931,64 +931,64 @@ levels/menu/main_menu_seg7_us.0B800.ia8.png levels/pss/0.rgba16.png levels/pss/1.ia16.png levels/pss/2.rgba16.png -actors_vanilla/rr/1.rgba16.png +actors/vanilla_actors/rr/1.rgba16.png levels/rr/2.rgba16.png -actors_vanilla/rr/quarter_flying_carpet.rgba16.png +actors/vanilla_actors/rr/quarter_flying_carpet.rgba16.png levels/sl/0.rgba16.png levels/sl/1.rgba16.png -actors_vanilla/sl/2.rgba16.png +actors/vanilla_actors/sl/2.rgba16.png levels/sl/3.rgba16.png levels/sl/4.rgba16.png levels/ssl/0.rgba16.png levels/ssl/1.ia16.png -actors_vanilla/ssl/10.rgba16.png -actors_vanilla/ssl/11.rgba16.png +actors/vanilla_actors/ssl/10.rgba16.png +actors/vanilla_actors/ssl/11.rgba16.png levels/ssl/2.rgba16.png levels/ssl/3.rgba16.png levels/ssl/4.rgba16.png -actors_vanilla/ssl/5.rgba16.png -actors_vanilla/ssl/6.rgba16.png +actors/vanilla_actors/ssl/5.rgba16.png +actors/vanilla_actors/ssl/6.rgba16.png levels/ssl/7.rgba16.png -actors_vanilla/ssl/8.rgba16.png -actors_vanilla/ssl/9.rgba16.png +actors/vanilla_actors/ssl/8.rgba16.png +actors/vanilla_actors/ssl/9.rgba16.png levels/thi/0.rgba16.png levels/thi/1.rgba16.png -actors_vanilla/thi/1.rgba16.png +actors/vanilla_actors/thi/1.rgba16.png levels/totwc/0.rgba16.png levels/totwc/1.rgba16.png levels/totwc/2.rgba16.png levels/totwc/3.ia16.png -actors_vanilla/ttc/0.rgba16.png -actors_vanilla/ttc/1.rgba16.png +actors/vanilla_actors/ttc/0.rgba16.png +actors/vanilla_actors/ttc/1.rgba16.png levels/ttc/1.rgba16.png levels/ttc/2.rgba16.png levels/ttm/0.ia16.png levels/ttm/1.rgba16.png levels/ttm/2.rgba16.png levels/ttm/3.rgba16.png -actors_vanilla/ttm/4.rgba16.png +actors/vanilla_actors/ttm/4.rgba16.png levels/ttm/5.rgba16.png levels/ttm/6.rgba16.png levels/ttm/7.rgba16.png -actors_vanilla/ttm/8.rgba16.png +actors/vanilla_actors/ttm/8.rgba16.png levels/vcutm/0.rgba16.png levels/vcutm/1.rgba16.png -actors_vanilla/vcutm/2.rgba16.png +actors/vanilla_actors/vcutm/2.rgba16.png levels/vcutm/3.rgba16.png levels/wdw/0.rgba16.png levels/wdw/1.rgba16.png -actors_vanilla/wdw/1.rgba16.png -actors_vanilla/wdw/2.rgba16.png -actors_vanilla/wdw/3.rgba16.png +actors/vanilla_actors/wdw/1.rgba16.png +actors/vanilla_actors/wdw/2.rgba16.png +actors/vanilla_actors/wdw/3.rgba16.png levels/wdw/4.rgba16.png -actors_vanilla/wf/0.rgba16.png +actors/vanilla_actors/wf/0.rgba16.png levels/wf/0.rgba16.png levels/wf/1.rgba16.png -actors_vanilla/wf/2.rgba16.png +actors/vanilla_actors/wf/2.rgba16.png levels/wf/2.rgba16.png -actors_vanilla/wf/3.rgba16.png -actors_vanilla/wf/4.rgba16.png -actors_vanilla/wf/5.ia8.png +actors/vanilla_actors/wf/3.rgba16.png +actors/vanilla_actors/wf/4.rgba16.png +actors/vanilla_actors/wf/5.ia8.png levels/wmotr/0.rgba16.png levels/wmotr/1.rgba16.png levels/wmotr/2.rgba16.png diff --git a/Makefile b/Makefile index 1e4daf45b3..7c37182c08 100644 --- a/Makefile +++ b/Makefile @@ -380,7 +380,7 @@ SOUND_BIN_DIR := $(BUILD_DIR)/sound TEXTURE_DIR := textures ACTOR_DIR := actors LEVEL_DIRS := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h))) -VNL_ACTRS_DIRS := $(patsubst actors_vanilla/%,%,$(dir $(wildcard actors_vanilla/*/header.h))) +VNL_ACTRS_DIRS := $(patsubst actors/vanilla_actors/%,%,$(dir $(wildcard actors/vanilla_actors/*/header.h))) # Directories containing source files SRC_DIRS += src src/boot src/game src/engine src/audio src/menu src/buffers actors levels bin data assets asm lib sound @@ -393,7 +393,7 @@ include Makefile.split # Source code files LEVEL_C_FILES := $(wildcard levels/*/leveldata.c) $(wildcard levels/*/script.c) $(wildcard levels/*/geo.c) -VNL_ACTRS_C_FILES := $(wildcard actors_vanilla/*/data.c) $(wildcard actors_vanilla/*/geo.c) +VNL_ACTRS_C_FILES := $(wildcard actors/vanilla_actors/*/data.c) $(wildcard actors/vanilla_actors/*/geo.c) C_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.c)) $(LEVEL_C_FILES) $(VNL_ACTRS_C_FILES) CPP_FILES := $(foreach dir,$(SRC_DIRS),$(wildcard $(dir)/*.cpp)) LIBZ_C_FILES := $(foreach dir,$(LIBZ_SRC_DIRS),$(wildcard $(dir)/*.c)) @@ -664,7 +664,7 @@ $(BUILD_DIR)/src/game/rendering_graph_node.o: OPT_FLAGS := $(GRAPH_NODE_OPT_FLAG # $(info MATH_UTIL_OPT_FLAGS: $(MATH_UTIL_OPT_FLAGS)) # $(info GRAPH_NODE_OPT_FLAGS: $(GRAPH_NODE_OPT_FLAGS)) -ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) $(addprefix actors_vanilla/,$(VNL_ACTRS_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION) +ALL_DIRS := $(BUILD_DIR) $(addprefix $(BUILD_DIR)/,$(SRC_DIRS) asm/debug $(GODDARD_SRC_DIRS) $(LIBZ_SRC_DIRS) $(ULTRA_BIN_DIRS) $(BIN_DIRS) $(TEXTURE_DIRS) $(SOUND_SAMPLE_DIRS) $(addprefix levels/,$(LEVEL_DIRS)) $(addprefix actors/vanilla_actors/,$(VNL_ACTRS_DIRS)) rsp include) $(YAY0_DIR) $(addprefix $(YAY0_DIR)/,$(VERSION)) $(SOUND_BIN_DIR) $(SOUND_BIN_DIR)/sequences/$(VERSION) # Make sure build directory exists before compiling anything DUMMY != mkdir -p $(ALL_DIRS) @@ -714,7 +714,7 @@ $(LEVEL_ELF_FILES): $(BUILD_DIR)/levels/%/leveldata.elf: $(BUILD_DIR)/levels/%/l $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $< .SECONDEXPANSION: -$(VANILLA_ACTORS_ELF_FILES): $(BUILD_DIR)/actors_vanilla/%/data.elf: $(BUILD_DIR)/actors_vanilla/%/data.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf +$(VANILLA_ACTORS_ELF_FILES): $(BUILD_DIR)/actors/vanilla_actors/%/data.elf: $(BUILD_DIR)/actors/vanilla_actors/%/data.o $(BUILD_DIR)/bin/$$(TEXTURE_BIN).elf $(call print,Linking ELF file:,$<,$@) $(V)$(LD) -e 0 -Ttext=$(SEGMENT_ADDRESS) -Map $@.map --just-symbols=$(BUILD_DIR)/bin/$(TEXTURE_BIN).elf -o $@ $< diff --git a/Makefile.split b/Makefile.split index 38d9a15d6f..532df39e97 100644 --- a/Makefile.split +++ b/Makefile.split @@ -43,19 +43,19 @@ LEVEL_ELF_FILES := $(foreach level_dir,$(LEVEL_DIRS),$(BUILD_DIR)/levels/$(level VANILLA_ACTORS_FILES := $(addsuffix data,$(VNL_ACTRS_DIRS)) -VANILLA_ACTORS_ELF_FILES := $(foreach level_dir,$(VNL_ACTRS_DIRS),$(BUILD_DIR)/actors_vanilla/$(level_dir)data.elf) +VANILLA_ACTORS_ELF_FILES := $(foreach level_dir,$(VNL_ACTRS_DIRS),$(BUILD_DIR)/actors/vanilla_actors/$(level_dir)data.elf) SEG_FILES := \ $(SEGMENTS:%=$(BUILD_DIR)/bin/%.elf) \ $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.elf) \ $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.elf) \ - $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors_vanilla/%.elf) + $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors/vanilla_actors/%.elf) YAY0_FILES := \ $(SEGMENTS:%=$(BUILD_DIR)/bin/%.szp) \ $(ACTOR_GROUPS:%=$(BUILD_DIR)/actors/%.szp) \ $(LEVEL_FILES:%=$(BUILD_DIR)/levels/%.szp) \ - $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors_vanilla/%.szp) + $(VANILLA_ACTORS_FILES:%=$(BUILD_DIR)/actors/vanilla_actors/%.szp) YAY0_OBJ_FILES := $(YAY0_FILES:.szp=.szp.o) @@ -284,10 +284,10 @@ CRASH_TEXTURE_C_FILES := $(addprefix $(BUILD_DIR)/,$(patsubst %.png,%.inc. # -------------------------------------- define vanilla_objects_rules = - VANILLA_ACTORS_$(1)_TEXTURE_FILES := $$(patsubst %.png,%.inc.c,$$(wildcard actors_vanilla/$(1)/*.png)) - $$(BUILD_DIR)/actors_vanilla/$(1)/data.o: $$(addprefix $$(BUILD_DIR)/,$$(VANILLA_ACTORS_$(1)_TEXTURE_FILES)) - $$(BUILD_DIR)/actors_vanilla/$(1)/data.elf: SEGMENT_ADDRESS := 0x0e000000 - $$(BUILD_DIR)/actors_vanilla/$(1)/data.elf: TEXTURE_BIN := $(2) + VANILLA_ACTORS_$(1)_TEXTURE_FILES := $$(patsubst %.png,%.inc.c,$$(wildcard actors/vanilla_actors/$(1)/*.png)) + $$(BUILD_DIR)/actors/vanilla_actors/$(1)/data.o: $$(addprefix $$(BUILD_DIR)/,$$(VANILLA_ACTORS_$(1)_TEXTURE_FILES)) + $$(BUILD_DIR)/actors/vanilla_actors/$(1)/data.elf: SEGMENT_ADDRESS := 0x0e000000 + $$(BUILD_DIR)/actors/vanilla_actors/$(1)/data.elf: TEXTURE_BIN := $(2) endef $(eval $(call vanilla_objects_rules,bob,generic)) diff --git a/actors_vanilla/bbh/coffin/collision.inc.c b/actors/vanilla_actors/bbh/coffin/collision.inc.c similarity index 100% rename from actors_vanilla/bbh/coffin/collision.inc.c rename to actors/vanilla_actors/bbh/coffin/collision.inc.c diff --git a/actors_vanilla/bbh/coffin/geo.inc.c b/actors/vanilla_actors/bbh/coffin/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/coffin/geo.inc.c rename to actors/vanilla_actors/bbh/coffin/geo.inc.c diff --git a/actors_vanilla/bbh/coffin/model.inc.c b/actors/vanilla_actors/bbh/coffin/model.inc.c similarity index 100% rename from actors_vanilla/bbh/coffin/model.inc.c rename to actors/vanilla_actors/bbh/coffin/model.inc.c diff --git a/actors/vanilla_actors/bbh/data.c b/actors/vanilla_actors/bbh/data.c new file mode 100644 index 0000000000..2eafd240cc --- /dev/null +++ b/actors/vanilla_actors/bbh/data.c @@ -0,0 +1,27 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/bbh/texture.inc.c" + +#include "actors/vanilla_actors/bbh/staircase_step/model.inc.c" +#include "actors/vanilla_actors/bbh/tilting_trap_platform/model.inc.c" +#include "actors/vanilla_actors/bbh/tumbling_platform_far/model.inc.c" +#include "actors/vanilla_actors/bbh/tumbling_platform_near/model.inc.c" +#include "actors/vanilla_actors/bbh/moving_bookshelf/model.inc.c" +#include "actors/vanilla_actors/bbh/mesh_elevator/model.inc.c" +#include "actors/vanilla_actors/bbh/merry_go_round/model.inc.c" +#include "actors/vanilla_actors/bbh/coffin/model.inc.c" +#include "actors/vanilla_actors/bbh/staircase_step/collision.inc.c" +#include "actors/vanilla_actors/bbh/tilting_trap_platform/collision.inc.c" +#include "actors/vanilla_actors/bbh/tumbling_platform_near/collision.inc.c" +#include "actors/vanilla_actors/bbh/moving_bookshelf/collision.inc.c" +#include "actors/vanilla_actors/bbh/mesh_elevator/collision.inc.c" +#include "actors/vanilla_actors/bbh/merry_go_round/collision.inc.c" +#include "actors/vanilla_actors/bbh/coffin/collision.inc.c" diff --git a/actors_vanilla/bbh/geo.c b/actors/vanilla_actors/bbh/geo.c similarity index 63% rename from actors_vanilla/bbh/geo.c rename to actors/vanilla_actors/bbh/geo.c index c560b28c63..9dc760112b 100644 --- a/actors_vanilla/bbh/geo.c +++ b/actors/vanilla_actors/bbh/geo.c @@ -11,16 +11,16 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/bbh/header.h" +#include "actors/vanilla_actors/bbh/header.h" -#include "actors_vanilla/bbh/staircase_step/geo.inc.c" -#include "actors_vanilla/bbh/tilting_trap_platform/geo.inc.c" -#include "actors_vanilla/bbh/tumbling_platform_far/geo.inc.c" -#include "actors_vanilla/bbh/tumbling_platform_near/geo.inc.c" -#include "actors_vanilla/bbh/moving_bookshelf/geo.inc.c" -#include "actors_vanilla/bbh/mesh_elevator/geo.inc.c" -#include "actors_vanilla/bbh/merry_go_round/geo.inc.c" -#include "actors_vanilla/bbh/coffin/geo.inc.c" +#include "actors/vanilla_actors/bbh/staircase_step/geo.inc.c" +#include "actors/vanilla_actors/bbh/tilting_trap_platform/geo.inc.c" +#include "actors/vanilla_actors/bbh/tumbling_platform_far/geo.inc.c" +#include "actors/vanilla_actors/bbh/tumbling_platform_near/geo.inc.c" +#include "actors/vanilla_actors/bbh/moving_bookshelf/geo.inc.c" +#include "actors/vanilla_actors/bbh/mesh_elevator/geo.inc.c" +#include "actors/vanilla_actors/bbh/merry_go_round/geo.inc.c" +#include "actors/vanilla_actors/bbh/coffin/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/bbh/header.h b/actors/vanilla_actors/bbh/header.h similarity index 100% rename from actors_vanilla/bbh/header.h rename to actors/vanilla_actors/bbh/header.h diff --git a/actors_vanilla/bbh/merry_go_round/collision.inc.c b/actors/vanilla_actors/bbh/merry_go_round/collision.inc.c similarity index 100% rename from actors_vanilla/bbh/merry_go_round/collision.inc.c rename to actors/vanilla_actors/bbh/merry_go_round/collision.inc.c diff --git a/actors_vanilla/bbh/merry_go_round/geo.inc.c b/actors/vanilla_actors/bbh/merry_go_round/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/merry_go_round/geo.inc.c rename to actors/vanilla_actors/bbh/merry_go_round/geo.inc.c diff --git a/actors_vanilla/bbh/merry_go_round/model.inc.c b/actors/vanilla_actors/bbh/merry_go_round/model.inc.c similarity index 100% rename from actors_vanilla/bbh/merry_go_round/model.inc.c rename to actors/vanilla_actors/bbh/merry_go_round/model.inc.c diff --git a/actors_vanilla/bbh/mesh_elevator/collision.inc.c b/actors/vanilla_actors/bbh/mesh_elevator/collision.inc.c similarity index 100% rename from actors_vanilla/bbh/mesh_elevator/collision.inc.c rename to actors/vanilla_actors/bbh/mesh_elevator/collision.inc.c diff --git a/actors_vanilla/bbh/mesh_elevator/geo.inc.c b/actors/vanilla_actors/bbh/mesh_elevator/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/mesh_elevator/geo.inc.c rename to actors/vanilla_actors/bbh/mesh_elevator/geo.inc.c diff --git a/actors_vanilla/bbh/mesh_elevator/model.inc.c b/actors/vanilla_actors/bbh/mesh_elevator/model.inc.c similarity index 100% rename from actors_vanilla/bbh/mesh_elevator/model.inc.c rename to actors/vanilla_actors/bbh/mesh_elevator/model.inc.c diff --git a/actors_vanilla/bbh/moving_bookshelf/collision.inc.c b/actors/vanilla_actors/bbh/moving_bookshelf/collision.inc.c similarity index 100% rename from actors_vanilla/bbh/moving_bookshelf/collision.inc.c rename to actors/vanilla_actors/bbh/moving_bookshelf/collision.inc.c diff --git a/actors_vanilla/bbh/moving_bookshelf/geo.inc.c b/actors/vanilla_actors/bbh/moving_bookshelf/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/moving_bookshelf/geo.inc.c rename to actors/vanilla_actors/bbh/moving_bookshelf/geo.inc.c diff --git a/actors_vanilla/bbh/moving_bookshelf/model.inc.c b/actors/vanilla_actors/bbh/moving_bookshelf/model.inc.c similarity index 100% rename from actors_vanilla/bbh/moving_bookshelf/model.inc.c rename to actors/vanilla_actors/bbh/moving_bookshelf/model.inc.c diff --git a/actors_vanilla/bbh/staircase_step/collision.inc.c b/actors/vanilla_actors/bbh/staircase_step/collision.inc.c similarity index 100% rename from actors_vanilla/bbh/staircase_step/collision.inc.c rename to actors/vanilla_actors/bbh/staircase_step/collision.inc.c diff --git a/actors_vanilla/bbh/staircase_step/geo.inc.c b/actors/vanilla_actors/bbh/staircase_step/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/staircase_step/geo.inc.c rename to actors/vanilla_actors/bbh/staircase_step/geo.inc.c diff --git a/actors_vanilla/bbh/staircase_step/model.inc.c b/actors/vanilla_actors/bbh/staircase_step/model.inc.c similarity index 100% rename from actors_vanilla/bbh/staircase_step/model.inc.c rename to actors/vanilla_actors/bbh/staircase_step/model.inc.c diff --git a/actors_vanilla/bbh/texture.inc.c b/actors/vanilla_actors/bbh/texture.inc.c similarity index 64% rename from actors_vanilla/bbh/texture.inc.c rename to actors/vanilla_actors/bbh/texture.inc.c index 2bd8b74d0a..e26f1bad76 100644 --- a/actors_vanilla/bbh/texture.inc.c +++ b/actors/vanilla_actors/bbh/texture.inc.c @@ -1,19 +1,19 @@ // 0x07000000 - 0x07001000 ALIGNED8 static const Texture bbh_seg7_texture_07000000[] = { -#include "actors_vanilla/bbh/0.rgba16.inc.c" +#include "actors/vanilla_actors/bbh/0.rgba16.inc.c" }; // 0x07003000 - 0x07003400 ALIGNED8 static const Texture bbh_seg7_texture_07003000[] = { -#include "actors_vanilla/bbh/4.rgba16.inc.c" +#include "actors/vanilla_actors/bbh/4.rgba16.inc.c" }; // 0x07003400 - 0x07004400 ALIGNED8 static const Texture bbh_seg7_texture_07003400[] = { -#include "actors_vanilla/bbh/5.rgba16.inc.c" +#include "actors/vanilla_actors/bbh/5.rgba16.inc.c" }; // 0x07004400 - 0x07004800 ALIGNED8 static const Texture bbh_seg7_texture_07004400[] = { -#include "actors_vanilla/bbh/6.rgba16.inc.c" +#include "actors/vanilla_actors/bbh/6.rgba16.inc.c" }; diff --git a/actors_vanilla/bbh/tilting_trap_platform/collision.inc.c b/actors/vanilla_actors/bbh/tilting_trap_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bbh/tilting_trap_platform/collision.inc.c rename to actors/vanilla_actors/bbh/tilting_trap_platform/collision.inc.c diff --git a/actors_vanilla/bbh/tilting_trap_platform/geo.inc.c b/actors/vanilla_actors/bbh/tilting_trap_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/tilting_trap_platform/geo.inc.c rename to actors/vanilla_actors/bbh/tilting_trap_platform/geo.inc.c diff --git a/actors_vanilla/bbh/tilting_trap_platform/model.inc.c b/actors/vanilla_actors/bbh/tilting_trap_platform/model.inc.c similarity index 100% rename from actors_vanilla/bbh/tilting_trap_platform/model.inc.c rename to actors/vanilla_actors/bbh/tilting_trap_platform/model.inc.c diff --git a/actors_vanilla/bbh/tumbling_platform_far/geo.inc.c b/actors/vanilla_actors/bbh/tumbling_platform_far/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/tumbling_platform_far/geo.inc.c rename to actors/vanilla_actors/bbh/tumbling_platform_far/geo.inc.c diff --git a/actors_vanilla/bbh/tumbling_platform_far/model.inc.c b/actors/vanilla_actors/bbh/tumbling_platform_far/model.inc.c similarity index 100% rename from actors_vanilla/bbh/tumbling_platform_far/model.inc.c rename to actors/vanilla_actors/bbh/tumbling_platform_far/model.inc.c diff --git a/actors_vanilla/bbh/tumbling_platform_near/collision.inc.c b/actors/vanilla_actors/bbh/tumbling_platform_near/collision.inc.c similarity index 100% rename from actors_vanilla/bbh/tumbling_platform_near/collision.inc.c rename to actors/vanilla_actors/bbh/tumbling_platform_near/collision.inc.c diff --git a/actors_vanilla/bbh/tumbling_platform_near/geo.inc.c b/actors/vanilla_actors/bbh/tumbling_platform_near/geo.inc.c similarity index 100% rename from actors_vanilla/bbh/tumbling_platform_near/geo.inc.c rename to actors/vanilla_actors/bbh/tumbling_platform_near/geo.inc.c diff --git a/actors_vanilla/bbh/tumbling_platform_near/model.inc.c b/actors/vanilla_actors/bbh/tumbling_platform_near/model.inc.c similarity index 100% rename from actors_vanilla/bbh/tumbling_platform_near/model.inc.c rename to actors/vanilla_actors/bbh/tumbling_platform_near/model.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_1/collision.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_1/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_1/collision.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_1/collision.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_1/geo.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_1/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_1/geo.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_1/geo.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_1/model.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_1/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_1/model.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_1/model.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_2/collision.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_2/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_2/collision.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_2/collision.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_2/geo.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_2/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_2/geo.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_2/geo.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_2/model.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_2/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_2/model.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_2/model.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_3/collision.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_3/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_3/collision.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_3/collision.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_3/geo.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_3/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_3/geo.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_3/geo.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_3/model.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_3/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_3/model.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_3/model.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_4/collision.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_4/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_4/collision.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_4/collision.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_4/geo.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_4/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_4/geo.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_4/geo.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_4/model.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_4/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_4/model.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_4/model.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_5/collision.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_5/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_5/collision.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_5/collision.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_5/geo.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_5/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_5/geo.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_5/geo.inc.c diff --git a/actors_vanilla/bitdw/collapsing_stairs_5/model.inc.c b/actors/vanilla_actors/bitdw/collapsing_stairs_5/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/collapsing_stairs_5/model.inc.c rename to actors/vanilla_actors/bitdw/collapsing_stairs_5/model.inc.c diff --git a/actors/vanilla_actors/bitdw/data.c b/actors/vanilla_actors/bitdw/data.c new file mode 100644 index 0000000000..4076761c4e --- /dev/null +++ b/actors/vanilla_actors/bitdw/data.c @@ -0,0 +1,35 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/bitdw/texture.inc.c" + +#include "actors/vanilla_actors/bitdw/sliding_platform/model.inc.c" +#include "actors/vanilla_actors/bitdw/seesaw_platform/model.inc.c" +#include "actors/vanilla_actors/bitdw/square_platform/model.inc.c" +#include "actors/vanilla_actors/bitdw/ferris_wheel_axle/model.inc.c" +#include "actors/vanilla_actors/bitdw/ferris_platform/model.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_1/model.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_2/model.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_3/model.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_4/model.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_5/model.inc.c" +#include "actors/vanilla_actors/bitdw/sliding_platform/collision.inc.c" +#include "actors/vanilla_actors/bitdw/seesaw_platform/collision.inc.c" +#include "actors/vanilla_actors/bitdw/square_platform/collision.inc.c" +#include "actors/vanilla_actors/bitdw/ferris_wheel_axle/collision.inc.c" +#include "actors/vanilla_actors/bitdw/ferris_platform/collision.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_1/collision.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_2/collision.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_3/collision.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_4/collision.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_5/collision.inc.c" diff --git a/actors_vanilla/bitdw/ferris_platform/collision.inc.c b/actors/vanilla_actors/bitdw/ferris_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/ferris_platform/collision.inc.c rename to actors/vanilla_actors/bitdw/ferris_platform/collision.inc.c diff --git a/actors_vanilla/bitdw/ferris_platform/geo.inc.c b/actors/vanilla_actors/bitdw/ferris_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/ferris_platform/geo.inc.c rename to actors/vanilla_actors/bitdw/ferris_platform/geo.inc.c diff --git a/actors_vanilla/bitdw/ferris_platform/model.inc.c b/actors/vanilla_actors/bitdw/ferris_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/ferris_platform/model.inc.c rename to actors/vanilla_actors/bitdw/ferris_platform/model.inc.c diff --git a/actors_vanilla/bitdw/ferris_wheel_axle/collision.inc.c b/actors/vanilla_actors/bitdw/ferris_wheel_axle/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/ferris_wheel_axle/collision.inc.c rename to actors/vanilla_actors/bitdw/ferris_wheel_axle/collision.inc.c diff --git a/actors_vanilla/bitdw/ferris_wheel_axle/geo.inc.c b/actors/vanilla_actors/bitdw/ferris_wheel_axle/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/ferris_wheel_axle/geo.inc.c rename to actors/vanilla_actors/bitdw/ferris_wheel_axle/geo.inc.c diff --git a/actors_vanilla/bitdw/ferris_wheel_axle/model.inc.c b/actors/vanilla_actors/bitdw/ferris_wheel_axle/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/ferris_wheel_axle/model.inc.c rename to actors/vanilla_actors/bitdw/ferris_wheel_axle/model.inc.c diff --git a/actors_vanilla/bitdw/geo.c b/actors/vanilla_actors/bitdw/geo.c similarity index 60% rename from actors_vanilla/bitdw/geo.c rename to actors/vanilla_actors/bitdw/geo.c index 8d91515529..3dfb118e37 100644 --- a/actors_vanilla/bitdw/geo.c +++ b/actors/vanilla_actors/bitdw/geo.c @@ -11,18 +11,18 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/bitdw/header.h" +#include "actors/vanilla_actors/bitdw/header.h" -#include "actors_vanilla/bitdw/sliding_platform/geo.inc.c" -#include "actors_vanilla/bitdw/seesaw_platform/geo.inc.c" -#include "actors_vanilla/bitdw/square_platform/geo.inc.c" -#include "actors_vanilla/bitdw/ferris_wheel_axle/geo.inc.c" -#include "actors_vanilla/bitdw/ferris_platform/geo.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_1/geo.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_2/geo.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_3/geo.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_4/geo.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_5/geo.inc.c" +#include "actors/vanilla_actors/bitdw/sliding_platform/geo.inc.c" +#include "actors/vanilla_actors/bitdw/seesaw_platform/geo.inc.c" +#include "actors/vanilla_actors/bitdw/square_platform/geo.inc.c" +#include "actors/vanilla_actors/bitdw/ferris_wheel_axle/geo.inc.c" +#include "actors/vanilla_actors/bitdw/ferris_platform/geo.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_1/geo.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_2/geo.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_3/geo.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_4/geo.inc.c" +#include "actors/vanilla_actors/bitdw/collapsing_stairs_5/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/bitdw/header.h b/actors/vanilla_actors/bitdw/header.h similarity index 100% rename from actors_vanilla/bitdw/header.h rename to actors/vanilla_actors/bitdw/header.h diff --git a/actors_vanilla/bitdw/seesaw_platform/collision.inc.c b/actors/vanilla_actors/bitdw/seesaw_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/seesaw_platform/collision.inc.c rename to actors/vanilla_actors/bitdw/seesaw_platform/collision.inc.c diff --git a/actors_vanilla/bitdw/seesaw_platform/geo.inc.c b/actors/vanilla_actors/bitdw/seesaw_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/seesaw_platform/geo.inc.c rename to actors/vanilla_actors/bitdw/seesaw_platform/geo.inc.c diff --git a/actors_vanilla/bitdw/seesaw_platform/model.inc.c b/actors/vanilla_actors/bitdw/seesaw_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/seesaw_platform/model.inc.c rename to actors/vanilla_actors/bitdw/seesaw_platform/model.inc.c diff --git a/actors_vanilla/bitdw/sliding_platform/collision.inc.c b/actors/vanilla_actors/bitdw/sliding_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/sliding_platform/collision.inc.c rename to actors/vanilla_actors/bitdw/sliding_platform/collision.inc.c diff --git a/actors_vanilla/bitdw/sliding_platform/geo.inc.c b/actors/vanilla_actors/bitdw/sliding_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/sliding_platform/geo.inc.c rename to actors/vanilla_actors/bitdw/sliding_platform/geo.inc.c diff --git a/actors_vanilla/bitdw/sliding_platform/model.inc.c b/actors/vanilla_actors/bitdw/sliding_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/sliding_platform/model.inc.c rename to actors/vanilla_actors/bitdw/sliding_platform/model.inc.c diff --git a/actors_vanilla/bitdw/square_platform/collision.inc.c b/actors/vanilla_actors/bitdw/square_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitdw/square_platform/collision.inc.c rename to actors/vanilla_actors/bitdw/square_platform/collision.inc.c diff --git a/actors_vanilla/bitdw/square_platform/geo.inc.c b/actors/vanilla_actors/bitdw/square_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitdw/square_platform/geo.inc.c rename to actors/vanilla_actors/bitdw/square_platform/geo.inc.c diff --git a/actors_vanilla/bitdw/square_platform/model.inc.c b/actors/vanilla_actors/bitdw/square_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitdw/square_platform/model.inc.c rename to actors/vanilla_actors/bitdw/square_platform/model.inc.c diff --git a/actors_vanilla/bitdw/texture.inc.c b/actors/vanilla_actors/bitdw/texture.inc.c similarity index 63% rename from actors_vanilla/bitdw/texture.inc.c rename to actors/vanilla_actors/bitdw/texture.inc.c index a602359a02..f6d1fb7092 100644 --- a/actors_vanilla/bitdw/texture.inc.c +++ b/actors/vanilla_actors/bitdw/texture.inc.c @@ -1,4 +1,4 @@ // 0x07000000 - 0x07000002 ALIGNED8 static const Texture bitdw_seg7_texture_07000000[] = { -#include "actors_vanilla/bitdw/0.rgba16.inc.c" +#include "actors/vanilla_actors/bitdw/0.rgba16.inc.c" }; diff --git a/actors/vanilla_actors/bitfs/data.c b/actors/vanilla_actors/bitfs/data.c new file mode 100644 index 0000000000..5a60470238 --- /dev/null +++ b/actors/vanilla_actors/bitfs/data.c @@ -0,0 +1,38 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/bitfs/texture.inc.c" + +#include "actors/vanilla_actors/bitfs/elevator/model.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_cage_platform/model.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_cage_pole/model.inc.c" +#include "actors/vanilla_actors/bitfs/tilting_square_platform/model.inc.c" +#include "actors/vanilla_actors/bitfs/tumbling_platform_near/model.inc.c" +#include "actors/vanilla_actors/bitfs/tumbling_platform_far/model.inc.c" +#include "actors/vanilla_actors/bitfs/stretching_platform/1.inc.c" +#include "actors/vanilla_actors/bitfs/stretching_platform/2.inc.c" +#include "actors/vanilla_actors/bitfs/moving_square_platform/model.inc.c" +#include "actors/vanilla_actors/bitfs/sliding_platform/model.inc.c" +#include "actors/vanilla_actors/bitfs/platform_on_track/model.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_platforms/model.inc.c" +#include "actors/vanilla_actors/bitfs/seesaw_platform/model.inc.c" +#include "actors/vanilla_actors/bitfs/elevator/collision.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_cage_platform/collision.inc.c" +#include "actors/vanilla_actors/bitfs/tilting_square_platform/collision.inc.c" +#include "actors/vanilla_actors/bitfs/tumbling_platform_near/collision.inc.c" +#include "actors/vanilla_actors/bitfs/stretching_platform/collision.inc.c" +#include "actors/vanilla_actors/bitfs/moving_square_platform/collision.inc.c" +#include "actors/vanilla_actors/bitfs/sliding_platform/collision.inc.c" +#include "actors/vanilla_actors/bitfs/platform_on_track/collision.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_platforms/collision.inc.c" +#include "actors/vanilla_actors/bitfs/seesaw_platform/collision.inc.c" diff --git a/actors_vanilla/bitfs/elevator/collision.inc.c b/actors/vanilla_actors/bitfs/elevator/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/elevator/collision.inc.c rename to actors/vanilla_actors/bitfs/elevator/collision.inc.c diff --git a/actors_vanilla/bitfs/elevator/geo.inc.c b/actors/vanilla_actors/bitfs/elevator/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/elevator/geo.inc.c rename to actors/vanilla_actors/bitfs/elevator/geo.inc.c diff --git a/actors_vanilla/bitfs/elevator/model.inc.c b/actors/vanilla_actors/bitfs/elevator/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/elevator/model.inc.c rename to actors/vanilla_actors/bitfs/elevator/model.inc.c diff --git a/actors_vanilla/bitfs/geo.c b/actors/vanilla_actors/bitfs/geo.c similarity index 60% rename from actors_vanilla/bitfs/geo.c rename to actors/vanilla_actors/bitfs/geo.c index 33046dc962..44f0bdb813 100644 --- a/actors_vanilla/bitfs/geo.c +++ b/actors/vanilla_actors/bitfs/geo.c @@ -11,20 +11,20 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/bitfs/header.h" +#include "actors/vanilla_actors/bitfs/header.h" -#include "actors_vanilla/bitfs/elevator/geo.inc.c" -#include "actors_vanilla/bitfs/sinking_cage_platform/geo.inc.c" -#include "actors_vanilla/bitfs/sinking_cage_pole/geo.inc.c" -#include "actors_vanilla/bitfs/tilting_square_platform/geo.inc.c" -#include "actors_vanilla/bitfs/tumbling_platform_near/geo.inc.c" -#include "actors_vanilla/bitfs/tumbling_platform_far/geo.inc.c" -#include "actors_vanilla/bitfs/stretching_platform/geo.inc.c" -#include "actors_vanilla/bitfs/moving_square_platform/geo.inc.c" -#include "actors_vanilla/bitfs/sliding_platform/geo.inc.c" -#include "actors_vanilla/bitfs/platform_on_track/geo.inc.c" -#include "actors_vanilla/bitfs/sinking_platforms/geo.inc.c" -#include "actors_vanilla/bitfs/seesaw_platform/geo.inc.c" +#include "actors/vanilla_actors/bitfs/elevator/geo.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_cage_platform/geo.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_cage_pole/geo.inc.c" +#include "actors/vanilla_actors/bitfs/tilting_square_platform/geo.inc.c" +#include "actors/vanilla_actors/bitfs/tumbling_platform_near/geo.inc.c" +#include "actors/vanilla_actors/bitfs/tumbling_platform_far/geo.inc.c" +#include "actors/vanilla_actors/bitfs/stretching_platform/geo.inc.c" +#include "actors/vanilla_actors/bitfs/moving_square_platform/geo.inc.c" +#include "actors/vanilla_actors/bitfs/sliding_platform/geo.inc.c" +#include "actors/vanilla_actors/bitfs/platform_on_track/geo.inc.c" +#include "actors/vanilla_actors/bitfs/sinking_platforms/geo.inc.c" +#include "actors/vanilla_actors/bitfs/seesaw_platform/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/bitfs/header.h b/actors/vanilla_actors/bitfs/header.h similarity index 100% rename from actors_vanilla/bitfs/header.h rename to actors/vanilla_actors/bitfs/header.h diff --git a/actors_vanilla/bitfs/moving_square_platform/collision.inc.c b/actors/vanilla_actors/bitfs/moving_square_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/moving_square_platform/collision.inc.c rename to actors/vanilla_actors/bitfs/moving_square_platform/collision.inc.c diff --git a/actors_vanilla/bitfs/moving_square_platform/geo.inc.c b/actors/vanilla_actors/bitfs/moving_square_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/moving_square_platform/geo.inc.c rename to actors/vanilla_actors/bitfs/moving_square_platform/geo.inc.c diff --git a/actors_vanilla/bitfs/moving_square_platform/model.inc.c b/actors/vanilla_actors/bitfs/moving_square_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/moving_square_platform/model.inc.c rename to actors/vanilla_actors/bitfs/moving_square_platform/model.inc.c diff --git a/actors_vanilla/bitfs/platform_on_track/collision.inc.c b/actors/vanilla_actors/bitfs/platform_on_track/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/platform_on_track/collision.inc.c rename to actors/vanilla_actors/bitfs/platform_on_track/collision.inc.c diff --git a/actors_vanilla/bitfs/platform_on_track/geo.inc.c b/actors/vanilla_actors/bitfs/platform_on_track/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/platform_on_track/geo.inc.c rename to actors/vanilla_actors/bitfs/platform_on_track/geo.inc.c diff --git a/actors_vanilla/bitfs/platform_on_track/model.inc.c b/actors/vanilla_actors/bitfs/platform_on_track/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/platform_on_track/model.inc.c rename to actors/vanilla_actors/bitfs/platform_on_track/model.inc.c diff --git a/actors_vanilla/bitfs/seesaw_platform/collision.inc.c b/actors/vanilla_actors/bitfs/seesaw_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/seesaw_platform/collision.inc.c rename to actors/vanilla_actors/bitfs/seesaw_platform/collision.inc.c diff --git a/actors_vanilla/bitfs/seesaw_platform/geo.inc.c b/actors/vanilla_actors/bitfs/seesaw_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/seesaw_platform/geo.inc.c rename to actors/vanilla_actors/bitfs/seesaw_platform/geo.inc.c diff --git a/actors_vanilla/bitfs/seesaw_platform/model.inc.c b/actors/vanilla_actors/bitfs/seesaw_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/seesaw_platform/model.inc.c rename to actors/vanilla_actors/bitfs/seesaw_platform/model.inc.c diff --git a/actors_vanilla/bitfs/sinking_cage_platform/collision.inc.c b/actors/vanilla_actors/bitfs/sinking_cage_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_cage_platform/collision.inc.c rename to actors/vanilla_actors/bitfs/sinking_cage_platform/collision.inc.c diff --git a/actors_vanilla/bitfs/sinking_cage_platform/geo.inc.c b/actors/vanilla_actors/bitfs/sinking_cage_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_cage_platform/geo.inc.c rename to actors/vanilla_actors/bitfs/sinking_cage_platform/geo.inc.c diff --git a/actors_vanilla/bitfs/sinking_cage_platform/model.inc.c b/actors/vanilla_actors/bitfs/sinking_cage_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_cage_platform/model.inc.c rename to actors/vanilla_actors/bitfs/sinking_cage_platform/model.inc.c diff --git a/actors_vanilla/bitfs/sinking_cage_pole/geo.inc.c b/actors/vanilla_actors/bitfs/sinking_cage_pole/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_cage_pole/geo.inc.c rename to actors/vanilla_actors/bitfs/sinking_cage_pole/geo.inc.c diff --git a/actors_vanilla/bitfs/sinking_cage_pole/model.inc.c b/actors/vanilla_actors/bitfs/sinking_cage_pole/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_cage_pole/model.inc.c rename to actors/vanilla_actors/bitfs/sinking_cage_pole/model.inc.c diff --git a/actors_vanilla/bitfs/sinking_platforms/collision.inc.c b/actors/vanilla_actors/bitfs/sinking_platforms/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_platforms/collision.inc.c rename to actors/vanilla_actors/bitfs/sinking_platforms/collision.inc.c diff --git a/actors_vanilla/bitfs/sinking_platforms/geo.inc.c b/actors/vanilla_actors/bitfs/sinking_platforms/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_platforms/geo.inc.c rename to actors/vanilla_actors/bitfs/sinking_platforms/geo.inc.c diff --git a/actors_vanilla/bitfs/sinking_platforms/model.inc.c b/actors/vanilla_actors/bitfs/sinking_platforms/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/sinking_platforms/model.inc.c rename to actors/vanilla_actors/bitfs/sinking_platforms/model.inc.c diff --git a/actors_vanilla/bitfs/sliding_platform/collision.inc.c b/actors/vanilla_actors/bitfs/sliding_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/sliding_platform/collision.inc.c rename to actors/vanilla_actors/bitfs/sliding_platform/collision.inc.c diff --git a/actors_vanilla/bitfs/sliding_platform/geo.inc.c b/actors/vanilla_actors/bitfs/sliding_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/sliding_platform/geo.inc.c rename to actors/vanilla_actors/bitfs/sliding_platform/geo.inc.c diff --git a/actors_vanilla/bitfs/sliding_platform/model.inc.c b/actors/vanilla_actors/bitfs/sliding_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/sliding_platform/model.inc.c rename to actors/vanilla_actors/bitfs/sliding_platform/model.inc.c diff --git a/actors_vanilla/bitfs/stretching_platform/1.inc.c b/actors/vanilla_actors/bitfs/stretching_platform/1.inc.c similarity index 100% rename from actors_vanilla/bitfs/stretching_platform/1.inc.c rename to actors/vanilla_actors/bitfs/stretching_platform/1.inc.c diff --git a/actors_vanilla/bitfs/stretching_platform/2.inc.c b/actors/vanilla_actors/bitfs/stretching_platform/2.inc.c similarity index 100% rename from actors_vanilla/bitfs/stretching_platform/2.inc.c rename to actors/vanilla_actors/bitfs/stretching_platform/2.inc.c diff --git a/actors_vanilla/bitfs/stretching_platform/collision.inc.c b/actors/vanilla_actors/bitfs/stretching_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/stretching_platform/collision.inc.c rename to actors/vanilla_actors/bitfs/stretching_platform/collision.inc.c diff --git a/actors_vanilla/bitfs/stretching_platform/geo.inc.c b/actors/vanilla_actors/bitfs/stretching_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/stretching_platform/geo.inc.c rename to actors/vanilla_actors/bitfs/stretching_platform/geo.inc.c diff --git a/actors_vanilla/bitfs/texture.inc.c b/actors/vanilla_actors/bitfs/texture.inc.c similarity index 63% rename from actors_vanilla/bitfs/texture.inc.c rename to actors/vanilla_actors/bitfs/texture.inc.c index ce360f3035..25d2b3ad4f 100644 --- a/actors_vanilla/bitfs/texture.inc.c +++ b/actors/vanilla_actors/bitfs/texture.inc.c @@ -1,9 +1,9 @@ // 0x07000000 - 0x07001000 ALIGNED8 static const Texture bitfs_seg7_texture_07000000[] = { -#include "actors_vanilla/bitfs/0.rgba16.inc.c" +#include "actors/vanilla_actors/bitfs/0.rgba16.inc.c" }; // 0x07001000 - 0x07001800 ALIGNED8 static const Texture bitfs_seg7_texture_07001000[] = { -#include "actors_vanilla/bitfs/1.rgba16.inc.c" +#include "actors/vanilla_actors/bitfs/1.rgba16.inc.c" }; diff --git a/actors_vanilla/bitfs/tilting_square_platform/collision.inc.c b/actors/vanilla_actors/bitfs/tilting_square_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/tilting_square_platform/collision.inc.c rename to actors/vanilla_actors/bitfs/tilting_square_platform/collision.inc.c diff --git a/actors_vanilla/bitfs/tilting_square_platform/geo.inc.c b/actors/vanilla_actors/bitfs/tilting_square_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/tilting_square_platform/geo.inc.c rename to actors/vanilla_actors/bitfs/tilting_square_platform/geo.inc.c diff --git a/actors_vanilla/bitfs/tilting_square_platform/model.inc.c b/actors/vanilla_actors/bitfs/tilting_square_platform/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/tilting_square_platform/model.inc.c rename to actors/vanilla_actors/bitfs/tilting_square_platform/model.inc.c diff --git a/actors_vanilla/bitfs/tumbling_platform_far/geo.inc.c b/actors/vanilla_actors/bitfs/tumbling_platform_far/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/tumbling_platform_far/geo.inc.c rename to actors/vanilla_actors/bitfs/tumbling_platform_far/geo.inc.c diff --git a/actors_vanilla/bitfs/tumbling_platform_far/model.inc.c b/actors/vanilla_actors/bitfs/tumbling_platform_far/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/tumbling_platform_far/model.inc.c rename to actors/vanilla_actors/bitfs/tumbling_platform_far/model.inc.c diff --git a/actors_vanilla/bitfs/tumbling_platform_near/collision.inc.c b/actors/vanilla_actors/bitfs/tumbling_platform_near/collision.inc.c similarity index 100% rename from actors_vanilla/bitfs/tumbling_platform_near/collision.inc.c rename to actors/vanilla_actors/bitfs/tumbling_platform_near/collision.inc.c diff --git a/actors_vanilla/bitfs/tumbling_platform_near/geo.inc.c b/actors/vanilla_actors/bitfs/tumbling_platform_near/geo.inc.c similarity index 100% rename from actors_vanilla/bitfs/tumbling_platform_near/geo.inc.c rename to actors/vanilla_actors/bitfs/tumbling_platform_near/geo.inc.c diff --git a/actors_vanilla/bitfs/tumbling_platform_near/model.inc.c b/actors/vanilla_actors/bitfs/tumbling_platform_near/model.inc.c similarity index 100% rename from actors_vanilla/bitfs/tumbling_platform_near/model.inc.c rename to actors/vanilla_actors/bitfs/tumbling_platform_near/model.inc.c diff --git a/actors_vanilla/bits/20/collision.inc.c b/actors/vanilla_actors/bits/20/collision.inc.c similarity index 100% rename from actors_vanilla/bits/20/collision.inc.c rename to actors/vanilla_actors/bits/20/collision.inc.c diff --git a/actors_vanilla/bits/20/geo.inc.c b/actors/vanilla_actors/bits/20/geo.inc.c similarity index 100% rename from actors_vanilla/bits/20/geo.inc.c rename to actors/vanilla_actors/bits/20/geo.inc.c diff --git a/actors_vanilla/bits/20/model.inc.c b/actors/vanilla_actors/bits/20/model.inc.c similarity index 100% rename from actors_vanilla/bits/20/model.inc.c rename to actors/vanilla_actors/bits/20/model.inc.c diff --git a/actors_vanilla/bits/21/collision.inc.c b/actors/vanilla_actors/bits/21/collision.inc.c similarity index 100% rename from actors_vanilla/bits/21/collision.inc.c rename to actors/vanilla_actors/bits/21/collision.inc.c diff --git a/actors_vanilla/bits/21/geo.inc.c b/actors/vanilla_actors/bits/21/geo.inc.c similarity index 100% rename from actors_vanilla/bits/21/geo.inc.c rename to actors/vanilla_actors/bits/21/geo.inc.c diff --git a/actors_vanilla/bits/21/model.inc.c b/actors/vanilla_actors/bits/21/model.inc.c similarity index 100% rename from actors_vanilla/bits/21/model.inc.c rename to actors/vanilla_actors/bits/21/model.inc.c diff --git a/actors_vanilla/bits/22/collision.inc.c b/actors/vanilla_actors/bits/22/collision.inc.c similarity index 100% rename from actors_vanilla/bits/22/collision.inc.c rename to actors/vanilla_actors/bits/22/collision.inc.c diff --git a/actors_vanilla/bits/22/geo.inc.c b/actors/vanilla_actors/bits/22/geo.inc.c similarity index 100% rename from actors_vanilla/bits/22/geo.inc.c rename to actors/vanilla_actors/bits/22/geo.inc.c diff --git a/actors_vanilla/bits/22/model.inc.c b/actors/vanilla_actors/bits/22/model.inc.c similarity index 100% rename from actors_vanilla/bits/22/model.inc.c rename to actors/vanilla_actors/bits/22/model.inc.c diff --git a/actors_vanilla/bits/23/collision.inc.c b/actors/vanilla_actors/bits/23/collision.inc.c similarity index 100% rename from actors_vanilla/bits/23/collision.inc.c rename to actors/vanilla_actors/bits/23/collision.inc.c diff --git a/actors_vanilla/bits/23/geo.inc.c b/actors/vanilla_actors/bits/23/geo.inc.c similarity index 100% rename from actors_vanilla/bits/23/geo.inc.c rename to actors/vanilla_actors/bits/23/geo.inc.c diff --git a/actors_vanilla/bits/23/model.inc.c b/actors/vanilla_actors/bits/23/model.inc.c similarity index 100% rename from actors_vanilla/bits/23/model.inc.c rename to actors/vanilla_actors/bits/23/model.inc.c diff --git a/actors_vanilla/bits/24/collision.inc.c b/actors/vanilla_actors/bits/24/collision.inc.c similarity index 100% rename from actors_vanilla/bits/24/collision.inc.c rename to actors/vanilla_actors/bits/24/collision.inc.c diff --git a/actors_vanilla/bits/24/geo.inc.c b/actors/vanilla_actors/bits/24/geo.inc.c similarity index 100% rename from actors_vanilla/bits/24/geo.inc.c rename to actors/vanilla_actors/bits/24/geo.inc.c diff --git a/actors_vanilla/bits/24/model.inc.c b/actors/vanilla_actors/bits/24/model.inc.c similarity index 100% rename from actors_vanilla/bits/24/model.inc.c rename to actors/vanilla_actors/bits/24/model.inc.c diff --git a/actors_vanilla/bits/25/collision.inc.c b/actors/vanilla_actors/bits/25/collision.inc.c similarity index 100% rename from actors_vanilla/bits/25/collision.inc.c rename to actors/vanilla_actors/bits/25/collision.inc.c diff --git a/actors_vanilla/bits/25/geo.inc.c b/actors/vanilla_actors/bits/25/geo.inc.c similarity index 100% rename from actors_vanilla/bits/25/geo.inc.c rename to actors/vanilla_actors/bits/25/geo.inc.c diff --git a/actors_vanilla/bits/25/model.inc.c b/actors/vanilla_actors/bits/25/model.inc.c similarity index 100% rename from actors_vanilla/bits/25/model.inc.c rename to actors/vanilla_actors/bits/25/model.inc.c diff --git a/actors_vanilla/bits/26/collision.inc.c b/actors/vanilla_actors/bits/26/collision.inc.c similarity index 100% rename from actors_vanilla/bits/26/collision.inc.c rename to actors/vanilla_actors/bits/26/collision.inc.c diff --git a/actors_vanilla/bits/26/geo.inc.c b/actors/vanilla_actors/bits/26/geo.inc.c similarity index 100% rename from actors_vanilla/bits/26/geo.inc.c rename to actors/vanilla_actors/bits/26/geo.inc.c diff --git a/actors_vanilla/bits/26/model.inc.c b/actors/vanilla_actors/bits/26/model.inc.c similarity index 100% rename from actors_vanilla/bits/26/model.inc.c rename to actors/vanilla_actors/bits/26/model.inc.c diff --git a/actors_vanilla/bits/27/collision.inc.c b/actors/vanilla_actors/bits/27/collision.inc.c similarity index 100% rename from actors_vanilla/bits/27/collision.inc.c rename to actors/vanilla_actors/bits/27/collision.inc.c diff --git a/actors_vanilla/bits/27/geo.inc.c b/actors/vanilla_actors/bits/27/geo.inc.c similarity index 100% rename from actors_vanilla/bits/27/geo.inc.c rename to actors/vanilla_actors/bits/27/geo.inc.c diff --git a/actors_vanilla/bits/27/model.inc.c b/actors/vanilla_actors/bits/27/model.inc.c similarity index 100% rename from actors_vanilla/bits/27/model.inc.c rename to actors/vanilla_actors/bits/27/model.inc.c diff --git a/actors_vanilla/bits/28/collision.inc.c b/actors/vanilla_actors/bits/28/collision.inc.c similarity index 100% rename from actors_vanilla/bits/28/collision.inc.c rename to actors/vanilla_actors/bits/28/collision.inc.c diff --git a/actors_vanilla/bits/28/geo.inc.c b/actors/vanilla_actors/bits/28/geo.inc.c similarity index 100% rename from actors_vanilla/bits/28/geo.inc.c rename to actors/vanilla_actors/bits/28/geo.inc.c diff --git a/actors_vanilla/bits/28/model.inc.c b/actors/vanilla_actors/bits/28/model.inc.c similarity index 100% rename from actors_vanilla/bits/28/model.inc.c rename to actors/vanilla_actors/bits/28/model.inc.c diff --git a/actors_vanilla/bits/29/collision.inc.c b/actors/vanilla_actors/bits/29/collision.inc.c similarity index 100% rename from actors_vanilla/bits/29/collision.inc.c rename to actors/vanilla_actors/bits/29/collision.inc.c diff --git a/actors_vanilla/bits/29/geo.inc.c b/actors/vanilla_actors/bits/29/geo.inc.c similarity index 100% rename from actors_vanilla/bits/29/geo.inc.c rename to actors/vanilla_actors/bits/29/geo.inc.c diff --git a/actors_vanilla/bits/29/model.inc.c b/actors/vanilla_actors/bits/29/model.inc.c similarity index 100% rename from actors_vanilla/bits/29/model.inc.c rename to actors/vanilla_actors/bits/29/model.inc.c diff --git a/actors_vanilla/bits/30/collision.inc.c b/actors/vanilla_actors/bits/30/collision.inc.c similarity index 100% rename from actors_vanilla/bits/30/collision.inc.c rename to actors/vanilla_actors/bits/30/collision.inc.c diff --git a/actors_vanilla/bits/30/geo.inc.c b/actors/vanilla_actors/bits/30/geo.inc.c similarity index 100% rename from actors_vanilla/bits/30/geo.inc.c rename to actors/vanilla_actors/bits/30/geo.inc.c diff --git a/actors_vanilla/bits/30/model.inc.c b/actors/vanilla_actors/bits/30/model.inc.c similarity index 100% rename from actors_vanilla/bits/30/model.inc.c rename to actors/vanilla_actors/bits/30/model.inc.c diff --git a/actors_vanilla/bits/31/collision.inc.c b/actors/vanilla_actors/bits/31/collision.inc.c similarity index 100% rename from actors_vanilla/bits/31/collision.inc.c rename to actors/vanilla_actors/bits/31/collision.inc.c diff --git a/actors_vanilla/bits/31/geo.inc.c b/actors/vanilla_actors/bits/31/geo.inc.c similarity index 100% rename from actors_vanilla/bits/31/geo.inc.c rename to actors/vanilla_actors/bits/31/geo.inc.c diff --git a/actors_vanilla/bits/31/model.inc.c b/actors/vanilla_actors/bits/31/model.inc.c similarity index 100% rename from actors_vanilla/bits/31/model.inc.c rename to actors/vanilla_actors/bits/31/model.inc.c diff --git a/actors_vanilla/bits/32/collision.inc.c b/actors/vanilla_actors/bits/32/collision.inc.c similarity index 100% rename from actors_vanilla/bits/32/collision.inc.c rename to actors/vanilla_actors/bits/32/collision.inc.c diff --git a/actors_vanilla/bits/32/geo.inc.c b/actors/vanilla_actors/bits/32/geo.inc.c similarity index 100% rename from actors_vanilla/bits/32/geo.inc.c rename to actors/vanilla_actors/bits/32/geo.inc.c diff --git a/actors_vanilla/bits/32/model.inc.c b/actors/vanilla_actors/bits/32/model.inc.c similarity index 100% rename from actors_vanilla/bits/32/model.inc.c rename to actors/vanilla_actors/bits/32/model.inc.c diff --git a/actors/vanilla_actors/bits/data.c b/actors/vanilla_actors/bits/data.c new file mode 100644 index 0000000000..2665f0c16a --- /dev/null +++ b/actors/vanilla_actors/bits/data.c @@ -0,0 +1,38 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/bits/texture.inc.c" + +#include "actors/vanilla_actors/bits/20/model.inc.c" +#include "actors/vanilla_actors/bits/21/model.inc.c" +#include "actors/vanilla_actors/bits/22/model.inc.c" +#include "actors/vanilla_actors/bits/23/model.inc.c" +#include "actors/vanilla_actors/bits/24/model.inc.c" +#include "actors/vanilla_actors/bits/25/model.inc.c" +#include "actors/vanilla_actors/bits/26/model.inc.c" +#include "actors/vanilla_actors/bits/27/model.inc.c" +#include "actors/vanilla_actors/bits/28/model.inc.c" +#include "actors/vanilla_actors/bits/29/model.inc.c" +#include "actors/vanilla_actors/bits/30/model.inc.c" +#include "actors/vanilla_actors/bits/31/model.inc.c" +#include "actors/vanilla_actors/bits/32/model.inc.c" + +#include "actors/vanilla_actors/bits/20/collision.inc.c" +#include "actors/vanilla_actors/bits/21/collision.inc.c" +#include "actors/vanilla_actors/bits/22/collision.inc.c" +#include "actors/vanilla_actors/bits/23/collision.inc.c" +#include "actors/vanilla_actors/bits/24/collision.inc.c" +#include "actors/vanilla_actors/bits/25/collision.inc.c" +#include "actors/vanilla_actors/bits/26/collision.inc.c" +#include "actors/vanilla_actors/bits/27/collision.inc.c" +#include "actors/vanilla_actors/bits/28/collision.inc.c" +#include "actors/vanilla_actors/bits/29/collision.inc.c" +#include "actors/vanilla_actors/bits/30/collision.inc.c" +#include "actors/vanilla_actors/bits/31/collision.inc.c" +#include "actors/vanilla_actors/bits/32/collision.inc.c" diff --git a/actors_vanilla/bits/geo.c b/actors/vanilla_actors/bits/geo.c similarity index 65% rename from actors_vanilla/bits/geo.c rename to actors/vanilla_actors/bits/geo.c index ad54c65226..e9d2aad809 100644 --- a/actors_vanilla/bits/geo.c +++ b/actors/vanilla_actors/bits/geo.c @@ -11,21 +11,21 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/bits/header.h" +#include "actors/vanilla_actors/bits/header.h" -#include "actors_vanilla/bits/20/geo.inc.c" -#include "actors_vanilla/bits/21/geo.inc.c" -#include "actors_vanilla/bits/22/geo.inc.c" -#include "actors_vanilla/bits/23/geo.inc.c" -#include "actors_vanilla/bits/24/geo.inc.c" -#include "actors_vanilla/bits/25/geo.inc.c" -#include "actors_vanilla/bits/26/geo.inc.c" -#include "actors_vanilla/bits/27/geo.inc.c" -#include "actors_vanilla/bits/28/geo.inc.c" -#include "actors_vanilla/bits/29/geo.inc.c" -#include "actors_vanilla/bits/30/geo.inc.c" -#include "actors_vanilla/bits/31/geo.inc.c" -#include "actors_vanilla/bits/32/geo.inc.c" +#include "actors/vanilla_actors/bits/20/geo.inc.c" +#include "actors/vanilla_actors/bits/21/geo.inc.c" +#include "actors/vanilla_actors/bits/22/geo.inc.c" +#include "actors/vanilla_actors/bits/23/geo.inc.c" +#include "actors/vanilla_actors/bits/24/geo.inc.c" +#include "actors/vanilla_actors/bits/25/geo.inc.c" +#include "actors/vanilla_actors/bits/26/geo.inc.c" +#include "actors/vanilla_actors/bits/27/geo.inc.c" +#include "actors/vanilla_actors/bits/28/geo.inc.c" +#include "actors/vanilla_actors/bits/29/geo.inc.c" +#include "actors/vanilla_actors/bits/30/geo.inc.c" +#include "actors/vanilla_actors/bits/31/geo.inc.c" +#include "actors/vanilla_actors/bits/32/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/bits/header.h b/actors/vanilla_actors/bits/header.h similarity index 100% rename from actors_vanilla/bits/header.h rename to actors/vanilla_actors/bits/header.h diff --git a/actors_vanilla/bits/texture.inc.c b/actors/vanilla_actors/bits/texture.inc.c similarity index 63% rename from actors_vanilla/bits/texture.inc.c rename to actors/vanilla_actors/bits/texture.inc.c index aa67a57fa6..51a8dfb14d 100644 --- a/actors_vanilla/bits/texture.inc.c +++ b/actors/vanilla_actors/bits/texture.inc.c @@ -1,4 +1,4 @@ // 0x07002000 - 0x07002800 ALIGNED8 static const Texture bits_seg7_texture_07002000[] = { -#include "actors_vanilla/bits/2.rgba16.inc.c" +#include "actors/vanilla_actors/bits/2.rgba16.inc.c" }; diff --git a/actors_vanilla/bob/chain_chomp_gate/collision.inc.c b/actors/vanilla_actors/bob/chain_chomp_gate/collision.inc.c similarity index 100% rename from actors_vanilla/bob/chain_chomp_gate/collision.inc.c rename to actors/vanilla_actors/bob/chain_chomp_gate/collision.inc.c diff --git a/actors_vanilla/bob/chain_chomp_gate/geo.inc.c b/actors/vanilla_actors/bob/chain_chomp_gate/geo.inc.c similarity index 100% rename from actors_vanilla/bob/chain_chomp_gate/geo.inc.c rename to actors/vanilla_actors/bob/chain_chomp_gate/geo.inc.c diff --git a/actors_vanilla/bob/chain_chomp_gate/model.inc.c b/actors/vanilla_actors/bob/chain_chomp_gate/model.inc.c similarity index 100% rename from actors_vanilla/bob/chain_chomp_gate/model.inc.c rename to actors/vanilla_actors/bob/chain_chomp_gate/model.inc.c diff --git a/actors/vanilla_actors/bob/data.c b/actors/vanilla_actors/bob/data.c new file mode 100644 index 0000000000..19d5816f43 --- /dev/null +++ b/actors/vanilla_actors/bob/data.c @@ -0,0 +1,17 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/bob/chain_chomp_gate/model.inc.c" +#include "actors/vanilla_actors/bob/seesaw_platform/model.inc.c" +#include "actors/vanilla_actors/bob/grate_door/model.inc.c" + +#include "actors/vanilla_actors/bob/chain_chomp_gate/collision.inc.c" +#include "actors/vanilla_actors/bob/seesaw_platform/collision.inc.c" +#include "actors/vanilla_actors/bob/grate_door/collision.inc.c" diff --git a/actors_vanilla/bob/geo.c b/actors/vanilla_actors/bob/geo.c similarity index 71% rename from actors_vanilla/bob/geo.c rename to actors/vanilla_actors/bob/geo.c index 6a4af071d3..8d99b88c0e 100644 --- a/actors_vanilla/bob/geo.c +++ b/actors/vanilla_actors/bob/geo.c @@ -11,11 +11,11 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/bob/header.h" +#include "actors/vanilla_actors/bob/header.h" -#include "actors_vanilla/bob/chain_chomp_gate/geo.inc.c" -#include "actors_vanilla/bob/seesaw_platform/geo.inc.c" -#include "actors_vanilla/bob/grate_door/geo.inc.c" +#include "actors/vanilla_actors/bob/chain_chomp_gate/geo.inc.c" +#include "actors/vanilla_actors/bob/seesaw_platform/geo.inc.c" +#include "actors/vanilla_actors/bob/grate_door/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/bob/grate_door/collision.inc.c b/actors/vanilla_actors/bob/grate_door/collision.inc.c similarity index 100% rename from actors_vanilla/bob/grate_door/collision.inc.c rename to actors/vanilla_actors/bob/grate_door/collision.inc.c diff --git a/actors_vanilla/bob/grate_door/geo.inc.c b/actors/vanilla_actors/bob/grate_door/geo.inc.c similarity index 100% rename from actors_vanilla/bob/grate_door/geo.inc.c rename to actors/vanilla_actors/bob/grate_door/geo.inc.c diff --git a/actors_vanilla/bob/grate_door/model.inc.c b/actors/vanilla_actors/bob/grate_door/model.inc.c similarity index 100% rename from actors_vanilla/bob/grate_door/model.inc.c rename to actors/vanilla_actors/bob/grate_door/model.inc.c diff --git a/actors_vanilla/bob/header.h b/actors/vanilla_actors/bob/header.h similarity index 100% rename from actors_vanilla/bob/header.h rename to actors/vanilla_actors/bob/header.h diff --git a/actors_vanilla/bob/seesaw_platform/collision.inc.c b/actors/vanilla_actors/bob/seesaw_platform/collision.inc.c similarity index 100% rename from actors_vanilla/bob/seesaw_platform/collision.inc.c rename to actors/vanilla_actors/bob/seesaw_platform/collision.inc.c diff --git a/actors_vanilla/bob/seesaw_platform/geo.inc.c b/actors/vanilla_actors/bob/seesaw_platform/geo.inc.c similarity index 100% rename from actors_vanilla/bob/seesaw_platform/geo.inc.c rename to actors/vanilla_actors/bob/seesaw_platform/geo.inc.c diff --git a/actors_vanilla/bob/seesaw_platform/model.inc.c b/actors/vanilla_actors/bob/seesaw_platform/model.inc.c similarity index 100% rename from actors_vanilla/bob/seesaw_platform/model.inc.c rename to actors/vanilla_actors/bob/seesaw_platform/model.inc.c diff --git a/actors_vanilla/castle_grounds/11/anim.inc.c b/actors/vanilla_actors/castle_grounds/11/anim.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/11/anim.inc.c rename to actors/vanilla_actors/castle_grounds/11/anim.inc.c diff --git a/actors_vanilla/castle_grounds/11/geo.inc.c b/actors/vanilla_actors/castle_grounds/11/geo.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/11/geo.inc.c rename to actors/vanilla_actors/castle_grounds/11/geo.inc.c diff --git a/actors_vanilla/castle_grounds/11/model.inc.c b/actors/vanilla_actors/castle_grounds/11/model.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/11/model.inc.c rename to actors/vanilla_actors/castle_grounds/11/model.inc.c diff --git a/actors_vanilla/castle_grounds/12/model.inc.c b/actors/vanilla_actors/castle_grounds/12/model.inc.c similarity index 96% rename from actors_vanilla/castle_grounds/12/model.inc.c rename to actors/vanilla_actors/castle_grounds/12/model.inc.c index e9250dc8f1..326840962c 100644 --- a/actors_vanilla/castle_grounds/12/model.inc.c +++ b/actors/vanilla_actors/castle_grounds/12/model.inc.c @@ -19,12 +19,12 @@ static const Vtx castle_grounds_seg7_vertex_0700C9A8[] = { // 0x0700C9E8 - 0x0700D9E8 ALIGNED8 static const Texture castle_grounds_seg7_texture_0700C9E8[] = { -#include "actors_vanilla/castle_grounds/3.rgba16.inc.c" +#include "actors/vanilla_actors/castle_grounds/3.rgba16.inc.c" }; // 0x0700D9E8 - 0x0700E9E8 ALIGNED8 static const Texture castle_grounds_seg7_texture_0700D9E8[] = { -#include "actors_vanilla/castle_grounds/4.rgba16.inc.c" +#include "actors/vanilla_actors/castle_grounds/4.rgba16.inc.c" }; // 0x0700E9E8 - 0x0700EA20 diff --git a/actors_vanilla/castle_grounds/13/model.inc.c b/actors/vanilla_actors/castle_grounds/13/model.inc.c similarity index 95% rename from actors_vanilla/castle_grounds/13/model.inc.c rename to actors/vanilla_actors/castle_grounds/13/model.inc.c index 551c422415..d70c0a04ed 100644 --- a/actors_vanilla/castle_grounds/13/model.inc.c +++ b/actors/vanilla_actors/castle_grounds/13/model.inc.c @@ -1,5 +1,5 @@ ALIGNED8 static const Texture castle_grounds_seg7_us_texture_0700EAE8[] = { -#include "actors_vanilla/castle_grounds/5.ia8.inc.c" +#include "actors/vanilla_actors/castle_grounds/5.ia8.inc.c" }; // 0x0700F2E8 diff --git a/actors_vanilla/castle_grounds/7/collision.inc.c b/actors/vanilla_actors/castle_grounds/7/collision.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/7/collision.inc.c rename to actors/vanilla_actors/castle_grounds/7/collision.inc.c diff --git a/actors_vanilla/castle_grounds/7/geo.inc.c b/actors/vanilla_actors/castle_grounds/7/geo.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/7/geo.inc.c rename to actors/vanilla_actors/castle_grounds/7/geo.inc.c diff --git a/actors_vanilla/castle_grounds/7/model.inc.c b/actors/vanilla_actors/castle_grounds/7/model.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/7/model.inc.c rename to actors/vanilla_actors/castle_grounds/7/model.inc.c diff --git a/actors_vanilla/castle_grounds/8/collision.inc.c b/actors/vanilla_actors/castle_grounds/8/collision.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/8/collision.inc.c rename to actors/vanilla_actors/castle_grounds/8/collision.inc.c diff --git a/actors_vanilla/castle_grounds/8/geo.inc.c b/actors/vanilla_actors/castle_grounds/8/geo.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/8/geo.inc.c rename to actors/vanilla_actors/castle_grounds/8/geo.inc.c diff --git a/actors_vanilla/castle_grounds/8/model.inc.c b/actors/vanilla_actors/castle_grounds/8/model.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/8/model.inc.c rename to actors/vanilla_actors/castle_grounds/8/model.inc.c diff --git a/actors/vanilla_actors/castle_grounds/data.c b/actors/vanilla_actors/castle_grounds/data.c new file mode 100644 index 0000000000..34e7f01205 --- /dev/null +++ b/actors/vanilla_actors/castle_grounds/data.c @@ -0,0 +1,20 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/castle_grounds/7/model.inc.c" +#include "actors/vanilla_actors/castle_grounds/8/model.inc.c" +#include "actors/vanilla_actors/castle_grounds/11/model.inc.c" +#include "actors/vanilla_actors/castle_grounds/12/model.inc.c" +#ifndef VERSION_JP +#include "actors/vanilla_actors/castle_grounds/13/model.inc.c" +#endif +#include "actors/vanilla_actors/castle_grounds/11/anim.inc.c" +#include "actors/vanilla_actors/castle_grounds/7/collision.inc.c" +#include "actors/vanilla_actors/castle_grounds/8/collision.inc.c" diff --git a/actors_vanilla/castle_grounds/geo.c b/actors/vanilla_actors/castle_grounds/geo.c similarity index 72% rename from actors_vanilla/castle_grounds/geo.c rename to actors/vanilla_actors/castle_grounds/geo.c index ccc57aa43b..5fa225ce3e 100644 --- a/actors_vanilla/castle_grounds/geo.c +++ b/actors/vanilla_actors/castle_grounds/geo.c @@ -11,11 +11,11 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/castle_grounds/header.h" +#include "actors/vanilla_actors/castle_grounds/header.h" -#include "actors_vanilla/castle_grounds/11/geo.inc.c" -#include "actors_vanilla/castle_grounds/7/geo.inc.c" -#include "actors_vanilla/castle_grounds/8/geo.inc.c" +#include "actors/vanilla_actors/castle_grounds/11/geo.inc.c" +#include "actors/vanilla_actors/castle_grounds/7/geo.inc.c" +#include "actors/vanilla_actors/castle_grounds/8/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/castle_grounds/header.h b/actors/vanilla_actors/castle_grounds/header.h similarity index 100% rename from actors_vanilla/castle_grounds/header.h rename to actors/vanilla_actors/castle_grounds/header.h diff --git a/actors_vanilla/castle_grounds/texture.inc.c b/actors/vanilla_actors/castle_grounds/texture.inc.c similarity index 100% rename from actors_vanilla/castle_grounds/texture.inc.c rename to actors/vanilla_actors/castle_grounds/texture.inc.c diff --git a/actors_vanilla/castle_inside/clock_hour_hand/geo.inc.c b/actors/vanilla_actors/castle_inside/clock_hour_hand/geo.inc.c similarity index 100% rename from actors_vanilla/castle_inside/clock_hour_hand/geo.inc.c rename to actors/vanilla_actors/castle_inside/clock_hour_hand/geo.inc.c diff --git a/actors_vanilla/castle_inside/clock_hour_hand/model.inc.c b/actors/vanilla_actors/castle_inside/clock_hour_hand/model.inc.c similarity index 100% rename from actors_vanilla/castle_inside/clock_hour_hand/model.inc.c rename to actors/vanilla_actors/castle_inside/clock_hour_hand/model.inc.c diff --git a/actors_vanilla/castle_inside/clock_minute_hand/geo.inc.c b/actors/vanilla_actors/castle_inside/clock_minute_hand/geo.inc.c similarity index 100% rename from actors_vanilla/castle_inside/clock_minute_hand/geo.inc.c rename to actors/vanilla_actors/castle_inside/clock_minute_hand/geo.inc.c diff --git a/actors_vanilla/castle_inside/clock_minute_hand/model.inc.c b/actors/vanilla_actors/castle_inside/clock_minute_hand/model.inc.c similarity index 100% rename from actors_vanilla/castle_inside/clock_minute_hand/model.inc.c rename to actors/vanilla_actors/castle_inside/clock_minute_hand/model.inc.c diff --git a/actors/vanilla_actors/castle_inside/data.c b/actors/vanilla_actors/castle_inside/data.c new file mode 100644 index 0000000000..32add0c01a --- /dev/null +++ b/actors/vanilla_actors/castle_inside/data.c @@ -0,0 +1,23 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/castle_inside/texture.inc.c" + +#include "actors/vanilla_actors/castle_inside/trap_door/model.inc.c" +#include "actors/vanilla_actors/castle_inside/star_door/model.inc.c" +#include "actors/vanilla_actors/castle_inside/pendulum/model.inc.c" +#include "actors/vanilla_actors/castle_inside/clock_minute_hand/model.inc.c" +#include "actors/vanilla_actors/castle_inside/clock_hour_hand/model.inc.c" +#include "actors/vanilla_actors/castle_inside/water_level_pillar/model.inc.c" +#include "actors/vanilla_actors/castle_inside/wing_cap_light/model.inc.c" +#include "actors/vanilla_actors/castle_inside/trap_door/collision.inc.c" +#include "actors/vanilla_actors/castle_inside/star_door/collision.inc.c" +#include "actors/vanilla_actors/castle_inside/water_level_pillar/collision.inc.c" +#include "actors/vanilla_actors/castle_inside/ddd_warp/collision.inc.c" diff --git a/actors_vanilla/castle_inside/ddd_warp/collision.inc.c b/actors/vanilla_actors/castle_inside/ddd_warp/collision.inc.c similarity index 100% rename from actors_vanilla/castle_inside/ddd_warp/collision.inc.c rename to actors/vanilla_actors/castle_inside/ddd_warp/collision.inc.c diff --git a/actors_vanilla/castle_inside/geo.c b/actors/vanilla_actors/castle_inside/geo.c similarity index 73% rename from actors_vanilla/castle_inside/geo.c rename to actors/vanilla_actors/castle_inside/geo.c index baf62d68eb..fdcfd41fcc 100644 --- a/actors_vanilla/castle_inside/geo.c +++ b/actors/vanilla_actors/castle_inside/geo.c @@ -11,14 +11,14 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/castle_inside/header.h" +#include "actors/vanilla_actors/castle_inside/header.h" -#include "actors_vanilla/castle_inside/star_door/geo.inc.c" -#include "actors_vanilla/castle_inside/trap_door/geo.inc.c" -#include "actors_vanilla/castle_inside/clock_minute_hand/geo.inc.c" -#include "actors_vanilla/castle_inside/clock_hour_hand/geo.inc.c" -#include "actors_vanilla/castle_inside/water_level_pillar/geo.inc.c" -#include "actors_vanilla/castle_inside/pendulum/geo.inc.c" +#include "actors/vanilla_actors/castle_inside/star_door/geo.inc.c" +#include "actors/vanilla_actors/castle_inside/trap_door/geo.inc.c" +#include "actors/vanilla_actors/castle_inside/clock_minute_hand/geo.inc.c" +#include "actors/vanilla_actors/castle_inside/clock_hour_hand/geo.inc.c" +#include "actors/vanilla_actors/castle_inside/water_level_pillar/geo.inc.c" +#include "actors/vanilla_actors/castle_inside/pendulum/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/castle_inside/header.h b/actors/vanilla_actors/castle_inside/header.h similarity index 100% rename from actors_vanilla/castle_inside/header.h rename to actors/vanilla_actors/castle_inside/header.h diff --git a/actors_vanilla/castle_inside/pendulum/geo.inc.c b/actors/vanilla_actors/castle_inside/pendulum/geo.inc.c similarity index 100% rename from actors_vanilla/castle_inside/pendulum/geo.inc.c rename to actors/vanilla_actors/castle_inside/pendulum/geo.inc.c diff --git a/actors_vanilla/castle_inside/pendulum/model.inc.c b/actors/vanilla_actors/castle_inside/pendulum/model.inc.c similarity index 100% rename from actors_vanilla/castle_inside/pendulum/model.inc.c rename to actors/vanilla_actors/castle_inside/pendulum/model.inc.c diff --git a/actors_vanilla/castle_inside/star_door/collision.inc.c b/actors/vanilla_actors/castle_inside/star_door/collision.inc.c similarity index 100% rename from actors_vanilla/castle_inside/star_door/collision.inc.c rename to actors/vanilla_actors/castle_inside/star_door/collision.inc.c diff --git a/actors_vanilla/castle_inside/star_door/geo.inc.c b/actors/vanilla_actors/castle_inside/star_door/geo.inc.c similarity index 100% rename from actors_vanilla/castle_inside/star_door/geo.inc.c rename to actors/vanilla_actors/castle_inside/star_door/geo.inc.c diff --git a/actors_vanilla/castle_inside/star_door/model.inc.c b/actors/vanilla_actors/castle_inside/star_door/model.inc.c similarity index 100% rename from actors_vanilla/castle_inside/star_door/model.inc.c rename to actors/vanilla_actors/castle_inside/star_door/model.inc.c diff --git a/actors_vanilla/castle_inside/texture.inc.c b/actors/vanilla_actors/castle_inside/texture.inc.c similarity index 58% rename from actors_vanilla/castle_inside/texture.inc.c rename to actors/vanilla_actors/castle_inside/texture.inc.c index 3c584818aa..dc686f5ddf 100644 --- a/actors_vanilla/castle_inside/texture.inc.c +++ b/actors/vanilla_actors/castle_inside/texture.inc.c @@ -1,18 +1,18 @@ // 0x07003800 - 0x07004800 ALIGNED8 static const Texture inside_castle_seg7_texture_07003800[] = { -#include "actors_vanilla/castle_inside/5.rgba16.inc.c" +#include "actors/vanilla_actors/castle_inside/5.rgba16.inc.c" }; // 0x07004800 - 0x07005800 ALIGNED8 static const Texture inside_castle_seg7_texture_07004800[] = { -#include "actors_vanilla/castle_inside/6.rgba16.inc.c" +#include "actors/vanilla_actors/castle_inside/6.rgba16.inc.c" }; // 0x07005800 - 0x07006000 ALIGNED8 static const Texture inside_castle_seg7_texture_07005800[] = { -#include "actors_vanilla/castle_inside/7.rgba16.inc.c" +#include "actors/vanilla_actors/castle_inside/7.rgba16.inc.c" }; ALIGNED8 static const Texture texture_castle_light[] = { -#include "actors_vanilla/castle_inside/castle_light.ia16.inc.c" +#include "actors/vanilla_actors/castle_inside/castle_light.ia16.inc.c" }; diff --git a/actors_vanilla/castle_inside/trap_door/collision.inc.c b/actors/vanilla_actors/castle_inside/trap_door/collision.inc.c similarity index 100% rename from actors_vanilla/castle_inside/trap_door/collision.inc.c rename to actors/vanilla_actors/castle_inside/trap_door/collision.inc.c diff --git a/actors_vanilla/castle_inside/trap_door/geo.inc.c b/actors/vanilla_actors/castle_inside/trap_door/geo.inc.c similarity index 100% rename from actors_vanilla/castle_inside/trap_door/geo.inc.c rename to actors/vanilla_actors/castle_inside/trap_door/geo.inc.c diff --git a/actors_vanilla/castle_inside/trap_door/model.inc.c b/actors/vanilla_actors/castle_inside/trap_door/model.inc.c similarity index 100% rename from actors_vanilla/castle_inside/trap_door/model.inc.c rename to actors/vanilla_actors/castle_inside/trap_door/model.inc.c diff --git a/actors_vanilla/castle_inside/water_level_pillar/collision.inc.c b/actors/vanilla_actors/castle_inside/water_level_pillar/collision.inc.c similarity index 100% rename from actors_vanilla/castle_inside/water_level_pillar/collision.inc.c rename to actors/vanilla_actors/castle_inside/water_level_pillar/collision.inc.c diff --git a/actors_vanilla/castle_inside/water_level_pillar/geo.inc.c b/actors/vanilla_actors/castle_inside/water_level_pillar/geo.inc.c similarity index 100% rename from actors_vanilla/castle_inside/water_level_pillar/geo.inc.c rename to actors/vanilla_actors/castle_inside/water_level_pillar/geo.inc.c diff --git a/actors_vanilla/castle_inside/water_level_pillar/model.inc.c b/actors/vanilla_actors/castle_inside/water_level_pillar/model.inc.c similarity index 100% rename from actors_vanilla/castle_inside/water_level_pillar/model.inc.c rename to actors/vanilla_actors/castle_inside/water_level_pillar/model.inc.c diff --git a/actors_vanilla/castle_inside/wing_cap_light/model.inc.c b/actors/vanilla_actors/castle_inside/wing_cap_light/model.inc.c similarity index 100% rename from actors_vanilla/castle_inside/wing_cap_light/model.inc.c rename to actors/vanilla_actors/castle_inside/wing_cap_light/model.inc.c diff --git a/actors/vanilla_actors/ccm/data.c b/actors/vanilla_actors/ccm/data.c new file mode 100644 index 0000000000..99e486d0db --- /dev/null +++ b/actors/vanilla_actors/ccm/data.c @@ -0,0 +1,18 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/ccm/texture.inc.c" + +#include "actors/vanilla_actors/ccm/ropeway_lift/1.inc.c" +#include "actors/vanilla_actors/ccm/ropeway_lift/2.inc.c" +#include "actors/vanilla_actors/ccm/snowman_base/model.inc.c" +#include "actors/vanilla_actors/ccm/snowman_head/1.inc.c" +#include "actors/vanilla_actors/ccm/snowman_head/2.inc.c" +#include "actors/vanilla_actors/ccm/ropeway_lift/collision.inc.c" diff --git a/actors_vanilla/ccm/geo.c b/actors/vanilla_actors/ccm/geo.c similarity index 71% rename from actors_vanilla/ccm/geo.c rename to actors/vanilla_actors/ccm/geo.c index 2dbd25dab4..7e55e45793 100644 --- a/actors_vanilla/ccm/geo.c +++ b/actors/vanilla_actors/ccm/geo.c @@ -11,11 +11,11 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/ccm/header.h" +#include "actors/vanilla_actors/ccm/header.h" -#include "actors_vanilla/ccm/ropeway_lift/geo.inc.c" -#include "actors_vanilla/ccm/snowman_base/geo.inc.c" -#include "actors_vanilla/ccm/snowman_head/geo.inc.c" +#include "actors/vanilla_actors/ccm/ropeway_lift/geo.inc.c" +#include "actors/vanilla_actors/ccm/snowman_base/geo.inc.c" +#include "actors/vanilla_actors/ccm/snowman_head/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/ccm/header.h b/actors/vanilla_actors/ccm/header.h similarity index 100% rename from actors_vanilla/ccm/header.h rename to actors/vanilla_actors/ccm/header.h diff --git a/actors_vanilla/ccm/ropeway_lift/1.inc.c b/actors/vanilla_actors/ccm/ropeway_lift/1.inc.c similarity index 100% rename from actors_vanilla/ccm/ropeway_lift/1.inc.c rename to actors/vanilla_actors/ccm/ropeway_lift/1.inc.c diff --git a/actors_vanilla/ccm/ropeway_lift/2.inc.c b/actors/vanilla_actors/ccm/ropeway_lift/2.inc.c similarity index 100% rename from actors_vanilla/ccm/ropeway_lift/2.inc.c rename to actors/vanilla_actors/ccm/ropeway_lift/2.inc.c diff --git a/actors_vanilla/ccm/ropeway_lift/collision.inc.c b/actors/vanilla_actors/ccm/ropeway_lift/collision.inc.c similarity index 100% rename from actors_vanilla/ccm/ropeway_lift/collision.inc.c rename to actors/vanilla_actors/ccm/ropeway_lift/collision.inc.c diff --git a/actors_vanilla/ccm/ropeway_lift/geo.inc.c b/actors/vanilla_actors/ccm/ropeway_lift/geo.inc.c similarity index 100% rename from actors_vanilla/ccm/ropeway_lift/geo.inc.c rename to actors/vanilla_actors/ccm/ropeway_lift/geo.inc.c diff --git a/actors_vanilla/ccm/snowman_base/geo.inc.c b/actors/vanilla_actors/ccm/snowman_base/geo.inc.c similarity index 100% rename from actors_vanilla/ccm/snowman_base/geo.inc.c rename to actors/vanilla_actors/ccm/snowman_base/geo.inc.c diff --git a/actors_vanilla/ccm/snowman_base/model.inc.c b/actors/vanilla_actors/ccm/snowman_base/model.inc.c similarity index 99% rename from actors_vanilla/ccm/snowman_base/model.inc.c rename to actors/vanilla_actors/ccm/snowman_base/model.inc.c index c62199a882..8f3da7de59 100644 --- a/actors_vanilla/ccm/snowman_base/model.inc.c +++ b/actors/vanilla_actors/ccm/snowman_base/model.inc.c @@ -2,7 +2,7 @@ // 0x07011958 - 0x07012158 ALIGNED8 static const Texture ccm_seg7_texture_07011958[] = { -#include "actors_vanilla/ccm/12.rgba16.inc.c" +#include "actors/vanilla_actors/ccm/12.rgba16.inc.c" }; // 0x07012158 - 0x07012258 diff --git a/actors_vanilla/ccm/snowman_head/1.inc.c b/actors/vanilla_actors/ccm/snowman_head/1.inc.c similarity index 100% rename from actors_vanilla/ccm/snowman_head/1.inc.c rename to actors/vanilla_actors/ccm/snowman_head/1.inc.c diff --git a/actors_vanilla/ccm/snowman_head/2.inc.c b/actors/vanilla_actors/ccm/snowman_head/2.inc.c similarity index 100% rename from actors_vanilla/ccm/snowman_head/2.inc.c rename to actors/vanilla_actors/ccm/snowman_head/2.inc.c diff --git a/actors_vanilla/ccm/snowman_head/geo.inc.c b/actors/vanilla_actors/ccm/snowman_head/geo.inc.c similarity index 100% rename from actors_vanilla/ccm/snowman_head/geo.inc.c rename to actors/vanilla_actors/ccm/snowman_head/geo.inc.c diff --git a/actors_vanilla/ccm/texture.inc.c b/actors/vanilla_actors/ccm/texture.inc.c similarity index 64% rename from actors_vanilla/ccm/texture.inc.c rename to actors/vanilla_actors/ccm/texture.inc.c index 6f310c823c..0c0c9ca728 100644 --- a/actors_vanilla/ccm/texture.inc.c +++ b/actors/vanilla_actors/ccm/texture.inc.c @@ -1,24 +1,24 @@ // 0x07000800 - 0x07000900 ALIGNED8 static const Texture ccm_seg7_texture_07000800[] = { -#include "actors_vanilla/ccm/1.rgba16.inc.c" +#include "actors/vanilla_actors/ccm/1.rgba16.inc.c" }; // 0x07000900 - 0x07001100 ALIGNED8 static const Texture ccm_seg7_texture_07000900[] = { -#include "actors_vanilla/ccm/2.rgba16.inc.c" +#include "actors/vanilla_actors/ccm/2.rgba16.inc.c" }; // 0x07001100 - 0x07001900 ALIGNED8 static const Texture ccm_seg7_texture_07001100[] = { -#include "actors_vanilla/ccm/3.rgba16.inc.c" +#include "actors/vanilla_actors/ccm/3.rgba16.inc.c" }; // 0x07002100 - 0x07002900 ALIGNED8 static const Texture ccm_seg7_texture_07002100[] = { -#include "actors_vanilla/ccm/5.rgba16.inc.c" +#include "actors/vanilla_actors/ccm/5.rgba16.inc.c" }; // 0x07002900 - 0x07003100 ALIGNED8 static const Texture ccm_seg7_texture_07002900[] = { -#include "actors_vanilla/ccm/6.rgba16.inc.c" +#include "actors/vanilla_actors/ccm/6.rgba16.inc.c" }; diff --git a/actors/vanilla_actors/ddd/data.c b/actors/vanilla_actors/ddd/data.c new file mode 100644 index 0000000000..507854ffeb --- /dev/null +++ b/actors/vanilla_actors/ddd/data.c @@ -0,0 +1,23 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/ddd/texture.inc.c" + +#include "actors/vanilla_actors/ddd/sub_door/1.inc.c" +#include "actors/vanilla_actors/ddd/sub_door/2.inc.c" +#include "actors/vanilla_actors/ddd/sub_door/3.inc.c" +#include "actors/vanilla_actors/ddd/submarine/1.inc.c" +#include "actors/vanilla_actors/ddd/submarine/2.inc.c" +#include "actors/vanilla_actors/ddd/pole/model.inc.c" +#include "actors/vanilla_actors/ddd/submarine/collision.inc.c" +#include "actors/vanilla_actors/ddd/sub_door/collision.inc.c" diff --git a/actors_vanilla/ddd/geo.c b/actors/vanilla_actors/ddd/geo.c similarity index 73% rename from actors_vanilla/ddd/geo.c rename to actors/vanilla_actors/ddd/geo.c index 228f78629a..dca26e4463 100644 --- a/actors_vanilla/ddd/geo.c +++ b/actors/vanilla_actors/ddd/geo.c @@ -11,11 +11,11 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/ddd/header.h" +#include "actors/vanilla_actors/ddd/header.h" -#include "actors_vanilla/ddd/pole/geo.inc.c" -#include "actors_vanilla/ddd/sub_door/geo.inc.c" -#include "actors_vanilla/ddd/submarine/geo.inc.c" +#include "actors/vanilla_actors/ddd/pole/geo.inc.c" +#include "actors/vanilla_actors/ddd/sub_door/geo.inc.c" +#include "actors/vanilla_actors/ddd/submarine/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/ddd/header.h b/actors/vanilla_actors/ddd/header.h similarity index 100% rename from actors_vanilla/ddd/header.h rename to actors/vanilla_actors/ddd/header.h diff --git a/actors_vanilla/ddd/pole/geo.inc.c b/actors/vanilla_actors/ddd/pole/geo.inc.c similarity index 100% rename from actors_vanilla/ddd/pole/geo.inc.c rename to actors/vanilla_actors/ddd/pole/geo.inc.c diff --git a/actors_vanilla/ddd/pole/model.inc.c b/actors/vanilla_actors/ddd/pole/model.inc.c similarity index 100% rename from actors_vanilla/ddd/pole/model.inc.c rename to actors/vanilla_actors/ddd/pole/model.inc.c diff --git a/actors_vanilla/ddd/sub_door/1.inc.c b/actors/vanilla_actors/ddd/sub_door/1.inc.c similarity index 100% rename from actors_vanilla/ddd/sub_door/1.inc.c rename to actors/vanilla_actors/ddd/sub_door/1.inc.c diff --git a/actors_vanilla/ddd/sub_door/2.inc.c b/actors/vanilla_actors/ddd/sub_door/2.inc.c similarity index 100% rename from actors_vanilla/ddd/sub_door/2.inc.c rename to actors/vanilla_actors/ddd/sub_door/2.inc.c diff --git a/actors_vanilla/ddd/sub_door/3.inc.c b/actors/vanilla_actors/ddd/sub_door/3.inc.c similarity index 100% rename from actors_vanilla/ddd/sub_door/3.inc.c rename to actors/vanilla_actors/ddd/sub_door/3.inc.c diff --git a/actors_vanilla/ddd/sub_door/collision.inc.c b/actors/vanilla_actors/ddd/sub_door/collision.inc.c similarity index 100% rename from actors_vanilla/ddd/sub_door/collision.inc.c rename to actors/vanilla_actors/ddd/sub_door/collision.inc.c diff --git a/actors_vanilla/ddd/sub_door/geo.inc.c b/actors/vanilla_actors/ddd/sub_door/geo.inc.c similarity index 100% rename from actors_vanilla/ddd/sub_door/geo.inc.c rename to actors/vanilla_actors/ddd/sub_door/geo.inc.c diff --git a/actors_vanilla/ddd/submarine/1.inc.c b/actors/vanilla_actors/ddd/submarine/1.inc.c similarity index 100% rename from actors_vanilla/ddd/submarine/1.inc.c rename to actors/vanilla_actors/ddd/submarine/1.inc.c diff --git a/actors_vanilla/ddd/submarine/2.inc.c b/actors/vanilla_actors/ddd/submarine/2.inc.c similarity index 100% rename from actors_vanilla/ddd/submarine/2.inc.c rename to actors/vanilla_actors/ddd/submarine/2.inc.c diff --git a/actors_vanilla/ddd/submarine/collision.inc.c b/actors/vanilla_actors/ddd/submarine/collision.inc.c similarity index 100% rename from actors_vanilla/ddd/submarine/collision.inc.c rename to actors/vanilla_actors/ddd/submarine/collision.inc.c diff --git a/actors_vanilla/ddd/submarine/geo.inc.c b/actors/vanilla_actors/ddd/submarine/geo.inc.c similarity index 100% rename from actors_vanilla/ddd/submarine/geo.inc.c rename to actors/vanilla_actors/ddd/submarine/geo.inc.c diff --git a/actors_vanilla/ddd/texture.inc.c b/actors/vanilla_actors/ddd/texture.inc.c similarity index 64% rename from actors_vanilla/ddd/texture.inc.c rename to actors/vanilla_actors/ddd/texture.inc.c index 17cef28ab3..74a0871896 100644 --- a/actors_vanilla/ddd/texture.inc.c +++ b/actors/vanilla_actors/ddd/texture.inc.c @@ -1,14 +1,14 @@ // 0x07000000 - 0x07001000 ALIGNED8 static const Texture ddd_seg7_texture_07000000[] = { -#include "actors_vanilla/ddd/0.rgba16.inc.c" +#include "actors/vanilla_actors/ddd/0.rgba16.inc.c" }; // 0x07001800 - 0x07002000 ALIGNED8 static const Texture ddd_seg7_texture_07001800[] = { -#include "actors_vanilla/ddd/2.rgba16.inc.c" +#include "actors/vanilla_actors/ddd/2.rgba16.inc.c" }; // 0x07003000 - 0x07003800 ALIGNED8 static const Texture ddd_seg7_texture_07003000[] = { -#include "actors_vanilla/ddd/4.rgba16.inc.c" +#include "actors/vanilla_actors/ddd/4.rgba16.inc.c" }; diff --git a/actors_vanilla/hmc/arrow_platform/collision.inc.c b/actors/vanilla_actors/hmc/arrow_platform/collision.inc.c similarity index 100% rename from actors_vanilla/hmc/arrow_platform/collision.inc.c rename to actors/vanilla_actors/hmc/arrow_platform/collision.inc.c diff --git a/actors_vanilla/hmc/arrow_platform/geo.inc.c b/actors/vanilla_actors/hmc/arrow_platform/geo.inc.c similarity index 100% rename from actors_vanilla/hmc/arrow_platform/geo.inc.c rename to actors/vanilla_actors/hmc/arrow_platform/geo.inc.c diff --git a/actors_vanilla/hmc/arrow_platform/model.inc.c b/actors/vanilla_actors/hmc/arrow_platform/model.inc.c similarity index 100% rename from actors_vanilla/hmc/arrow_platform/model.inc.c rename to actors/vanilla_actors/hmc/arrow_platform/model.inc.c diff --git a/actors_vanilla/hmc/arrow_platform_button/collision.inc.c b/actors/vanilla_actors/hmc/arrow_platform_button/collision.inc.c similarity index 100% rename from actors_vanilla/hmc/arrow_platform_button/collision.inc.c rename to actors/vanilla_actors/hmc/arrow_platform_button/collision.inc.c diff --git a/actors_vanilla/hmc/arrow_platform_button/geo.inc.c b/actors/vanilla_actors/hmc/arrow_platform_button/geo.inc.c similarity index 100% rename from actors_vanilla/hmc/arrow_platform_button/geo.inc.c rename to actors/vanilla_actors/hmc/arrow_platform_button/geo.inc.c diff --git a/actors_vanilla/hmc/arrow_platform_button/model.inc.c b/actors/vanilla_actors/hmc/arrow_platform_button/model.inc.c similarity index 100% rename from actors_vanilla/hmc/arrow_platform_button/model.inc.c rename to actors/vanilla_actors/hmc/arrow_platform_button/model.inc.c diff --git a/actors/vanilla_actors/hmc/data.c b/actors/vanilla_actors/hmc/data.c new file mode 100644 index 0000000000..4cd6030605 --- /dev/null +++ b/actors/vanilla_actors/hmc/data.c @@ -0,0 +1,23 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/hmc/texture.inc.c" + +#include "actors/vanilla_actors/hmc/elevator_platform/model.inc.c" +#include "actors/vanilla_actors/hmc/arrow_platform/model.inc.c" +#include "actors/vanilla_actors/hmc/arrow_platform_button/model.inc.c" +#include "actors/vanilla_actors/hmc/rolling_rock/model.inc.c" +#include "actors/vanilla_actors/hmc/rolling_rock_fragment_1/model.inc.c" +#include "actors/vanilla_actors/hmc/rolling_rock_fragment_2/model.inc.c" +#include "actors/vanilla_actors/hmc/elevator_platform/collision.inc.c" +#include "actors/vanilla_actors/hmc/grill_door/model.inc.c" +#include "actors/vanilla_actors/hmc/grill_door/collision.inc.c" +#include "actors/vanilla_actors/hmc/arrow_platform/collision.inc.c" +#include "actors/vanilla_actors/hmc/arrow_platform_button/collision.inc.c" diff --git a/actors_vanilla/hmc/elevator_platform/collision.inc.c b/actors/vanilla_actors/hmc/elevator_platform/collision.inc.c similarity index 100% rename from actors_vanilla/hmc/elevator_platform/collision.inc.c rename to actors/vanilla_actors/hmc/elevator_platform/collision.inc.c diff --git a/actors_vanilla/hmc/elevator_platform/geo.inc.c b/actors/vanilla_actors/hmc/elevator_platform/geo.inc.c similarity index 100% rename from actors_vanilla/hmc/elevator_platform/geo.inc.c rename to actors/vanilla_actors/hmc/elevator_platform/geo.inc.c diff --git a/actors_vanilla/hmc/elevator_platform/model.inc.c b/actors/vanilla_actors/hmc/elevator_platform/model.inc.c similarity index 100% rename from actors_vanilla/hmc/elevator_platform/model.inc.c rename to actors/vanilla_actors/hmc/elevator_platform/model.inc.c diff --git a/actors_vanilla/hmc/geo.c b/actors/vanilla_actors/hmc/geo.c similarity index 63% rename from actors_vanilla/hmc/geo.c rename to actors/vanilla_actors/hmc/geo.c index 623be262a4..c5877ec9ad 100644 --- a/actors_vanilla/hmc/geo.c +++ b/actors/vanilla_actors/hmc/geo.c @@ -11,15 +11,15 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/hmc/header.h" +#include "actors/vanilla_actors/hmc/header.h" -#include "actors_vanilla/hmc/grill_door/geo.inc.c" -#include "actors_vanilla/hmc/rolling_rock/geo.inc.c" -#include "actors_vanilla/hmc/rolling_rock_fragment_1/geo.inc.c" -#include "actors_vanilla/hmc/rolling_rock_fragment_2/geo.inc.c" -#include "actors_vanilla/hmc/arrow_platform/geo.inc.c" -#include "actors_vanilla/hmc/arrow_platform_button/geo.inc.c" -#include "actors_vanilla/hmc/elevator_platform/geo.inc.c" +#include "actors/vanilla_actors/hmc/grill_door/geo.inc.c" +#include "actors/vanilla_actors/hmc/rolling_rock/geo.inc.c" +#include "actors/vanilla_actors/hmc/rolling_rock_fragment_1/geo.inc.c" +#include "actors/vanilla_actors/hmc/rolling_rock_fragment_2/geo.inc.c" +#include "actors/vanilla_actors/hmc/arrow_platform/geo.inc.c" +#include "actors/vanilla_actors/hmc/arrow_platform_button/geo.inc.c" +#include "actors/vanilla_actors/hmc/elevator_platform/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/hmc/grill_door/collision.inc.c b/actors/vanilla_actors/hmc/grill_door/collision.inc.c similarity index 100% rename from actors_vanilla/hmc/grill_door/collision.inc.c rename to actors/vanilla_actors/hmc/grill_door/collision.inc.c diff --git a/actors_vanilla/hmc/grill_door/geo.inc.c b/actors/vanilla_actors/hmc/grill_door/geo.inc.c similarity index 100% rename from actors_vanilla/hmc/grill_door/geo.inc.c rename to actors/vanilla_actors/hmc/grill_door/geo.inc.c diff --git a/actors_vanilla/hmc/grill_door/model.inc.c b/actors/vanilla_actors/hmc/grill_door/model.inc.c similarity index 100% rename from actors_vanilla/hmc/grill_door/model.inc.c rename to actors/vanilla_actors/hmc/grill_door/model.inc.c diff --git a/actors_vanilla/hmc/header.h b/actors/vanilla_actors/hmc/header.h similarity index 100% rename from actors_vanilla/hmc/header.h rename to actors/vanilla_actors/hmc/header.h diff --git a/actors_vanilla/hmc/rolling_rock/geo.inc.c b/actors/vanilla_actors/hmc/rolling_rock/geo.inc.c similarity index 100% rename from actors_vanilla/hmc/rolling_rock/geo.inc.c rename to actors/vanilla_actors/hmc/rolling_rock/geo.inc.c diff --git a/actors_vanilla/hmc/rolling_rock/model.inc.c b/actors/vanilla_actors/hmc/rolling_rock/model.inc.c similarity index 100% rename from actors_vanilla/hmc/rolling_rock/model.inc.c rename to actors/vanilla_actors/hmc/rolling_rock/model.inc.c diff --git a/actors_vanilla/hmc/rolling_rock_fragment_1/geo.inc.c b/actors/vanilla_actors/hmc/rolling_rock_fragment_1/geo.inc.c similarity index 100% rename from actors_vanilla/hmc/rolling_rock_fragment_1/geo.inc.c rename to actors/vanilla_actors/hmc/rolling_rock_fragment_1/geo.inc.c diff --git a/actors_vanilla/hmc/rolling_rock_fragment_1/model.inc.c b/actors/vanilla_actors/hmc/rolling_rock_fragment_1/model.inc.c similarity index 100% rename from actors_vanilla/hmc/rolling_rock_fragment_1/model.inc.c rename to actors/vanilla_actors/hmc/rolling_rock_fragment_1/model.inc.c diff --git a/actors_vanilla/hmc/rolling_rock_fragment_2/geo.inc.c b/actors/vanilla_actors/hmc/rolling_rock_fragment_2/geo.inc.c similarity index 100% rename from actors_vanilla/hmc/rolling_rock_fragment_2/geo.inc.c rename to actors/vanilla_actors/hmc/rolling_rock_fragment_2/geo.inc.c diff --git a/actors_vanilla/hmc/rolling_rock_fragment_2/model.inc.c b/actors/vanilla_actors/hmc/rolling_rock_fragment_2/model.inc.c similarity index 100% rename from actors_vanilla/hmc/rolling_rock_fragment_2/model.inc.c rename to actors/vanilla_actors/hmc/rolling_rock_fragment_2/model.inc.c diff --git a/actors_vanilla/hmc/texture.inc.c b/actors/vanilla_actors/hmc/texture.inc.c similarity index 64% rename from actors_vanilla/hmc/texture.inc.c rename to actors/vanilla_actors/hmc/texture.inc.c index 2ebc80c632..0419bfebcf 100644 --- a/actors_vanilla/hmc/texture.inc.c +++ b/actors/vanilla_actors/hmc/texture.inc.c @@ -1,20 +1,20 @@ // 0x07003000 - 0x07003800 ALIGNED8 static const Texture hmc_seg7_texture_07003000[] = { -#include "actors_vanilla/hmc/3.rgba16.inc.c" +#include "actors/vanilla_actors/hmc/3.rgba16.inc.c" }; // 0x07003800 - 0x07004000 ALIGNED8 static const Texture hmc_seg7_texture_07003800[] = { -#include "actors_vanilla/hmc/4.rgba16.inc.c" +#include "actors/vanilla_actors/hmc/4.rgba16.inc.c" }; // 0x07004000 - 0x07004800 ALIGNED8 static const Texture hmc_seg7_texture_07004000[] = { -#include "actors_vanilla/hmc/5.rgba16.inc.c" +#include "actors/vanilla_actors/hmc/5.rgba16.inc.c" }; // 0x07004800 - 0x07005800 ALIGNED8 static const Texture hmc_seg7_texture_07004800[] = { -#include "actors_vanilla/hmc/6.rgba16.inc.c" +#include "actors/vanilla_actors/hmc/6.rgba16.inc.c" }; diff --git a/actors/vanilla_actors/jrb/data.c b/actors/vanilla_actors/jrb/data.c new file mode 100644 index 0000000000..29ba10451e --- /dev/null +++ b/actors/vanilla_actors/jrb/data.c @@ -0,0 +1,25 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/jrb/header.h" +#include "actors/vanilla_actors/jrb/texture.inc.c" + +#include "actors/vanilla_actors/jrb/rock/model.inc.c" +#include "actors/vanilla_actors/jrb/floating_platform/model.inc.c" +#include "actors/vanilla_actors/jrb/sliding_box/model.inc.c" +#include "actors/vanilla_actors/jrb/wooden_ship/model.inc.c" +#include "actors/vanilla_actors/jrb/falling_pillar/model.inc.c" +#include "actors/vanilla_actors/jrb/falling_pillar_base/model.inc.c" +#include "actors/vanilla_actors/jrb/rock/collision.inc.c" +#include "actors/vanilla_actors/jrb/floating_platform/collision.inc.c" +#include "actors/vanilla_actors/jrb/sliding_box/collision.inc.c" +#include "actors/vanilla_actors/jrb/wooden_ship/collision.inc.c" +#include "actors/vanilla_actors/jrb/falling_pillar_base/collision.inc.c" +#include "actors/vanilla_actors/jrb/unused_lid/collision.inc.c" diff --git a/actors_vanilla/jrb/falling_pillar/geo.inc.c b/actors/vanilla_actors/jrb/falling_pillar/geo.inc.c similarity index 100% rename from actors_vanilla/jrb/falling_pillar/geo.inc.c rename to actors/vanilla_actors/jrb/falling_pillar/geo.inc.c diff --git a/actors_vanilla/jrb/falling_pillar/model.inc.c b/actors/vanilla_actors/jrb/falling_pillar/model.inc.c similarity index 100% rename from actors_vanilla/jrb/falling_pillar/model.inc.c rename to actors/vanilla_actors/jrb/falling_pillar/model.inc.c diff --git a/actors_vanilla/jrb/falling_pillar_base/collision.inc.c b/actors/vanilla_actors/jrb/falling_pillar_base/collision.inc.c similarity index 100% rename from actors_vanilla/jrb/falling_pillar_base/collision.inc.c rename to actors/vanilla_actors/jrb/falling_pillar_base/collision.inc.c diff --git a/actors_vanilla/jrb/falling_pillar_base/geo.inc.c b/actors/vanilla_actors/jrb/falling_pillar_base/geo.inc.c similarity index 100% rename from actors_vanilla/jrb/falling_pillar_base/geo.inc.c rename to actors/vanilla_actors/jrb/falling_pillar_base/geo.inc.c diff --git a/actors_vanilla/jrb/falling_pillar_base/model.inc.c b/actors/vanilla_actors/jrb/falling_pillar_base/model.inc.c similarity index 100% rename from actors_vanilla/jrb/falling_pillar_base/model.inc.c rename to actors/vanilla_actors/jrb/falling_pillar_base/model.inc.c diff --git a/actors_vanilla/jrb/floating_platform/collision.inc.c b/actors/vanilla_actors/jrb/floating_platform/collision.inc.c similarity index 100% rename from actors_vanilla/jrb/floating_platform/collision.inc.c rename to actors/vanilla_actors/jrb/floating_platform/collision.inc.c diff --git a/actors_vanilla/jrb/floating_platform/geo.inc.c b/actors/vanilla_actors/jrb/floating_platform/geo.inc.c similarity index 100% rename from actors_vanilla/jrb/floating_platform/geo.inc.c rename to actors/vanilla_actors/jrb/floating_platform/geo.inc.c diff --git a/actors_vanilla/jrb/floating_platform/model.inc.c b/actors/vanilla_actors/jrb/floating_platform/model.inc.c similarity index 100% rename from actors_vanilla/jrb/floating_platform/model.inc.c rename to actors/vanilla_actors/jrb/floating_platform/model.inc.c diff --git a/actors_vanilla/jrb/geo.c b/actors/vanilla_actors/jrb/geo.c similarity index 74% rename from actors_vanilla/jrb/geo.c rename to actors/vanilla_actors/jrb/geo.c index 044de2f8a9..3caf30bfd5 100644 --- a/actors_vanilla/jrb/geo.c +++ b/actors/vanilla_actors/jrb/geo.c @@ -11,14 +11,14 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/jrb/header.h" +#include "actors/vanilla_actors/jrb/header.h" -#include "actors_vanilla/jrb/falling_pillar/geo.inc.c" -#include "actors_vanilla/jrb/falling_pillar_base/geo.inc.c" -#include "actors_vanilla/jrb/rock/geo.inc.c" -#include "actors_vanilla/jrb/floating_platform/geo.inc.c" -#include "actors_vanilla/jrb/sliding_box/geo.inc.c" -#include "actors_vanilla/jrb/wooden_ship/geo.inc.c" +#include "actors/vanilla_actors/jrb/falling_pillar/geo.inc.c" +#include "actors/vanilla_actors/jrb/falling_pillar_base/geo.inc.c" +#include "actors/vanilla_actors/jrb/rock/geo.inc.c" +#include "actors/vanilla_actors/jrb/floating_platform/geo.inc.c" +#include "actors/vanilla_actors/jrb/sliding_box/geo.inc.c" +#include "actors/vanilla_actors/jrb/wooden_ship/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/jrb/header.h b/actors/vanilla_actors/jrb/header.h similarity index 100% rename from actors_vanilla/jrb/header.h rename to actors/vanilla_actors/jrb/header.h diff --git a/actors_vanilla/jrb/rock/collision.inc.c b/actors/vanilla_actors/jrb/rock/collision.inc.c similarity index 100% rename from actors_vanilla/jrb/rock/collision.inc.c rename to actors/vanilla_actors/jrb/rock/collision.inc.c diff --git a/actors_vanilla/jrb/rock/geo.inc.c b/actors/vanilla_actors/jrb/rock/geo.inc.c similarity index 100% rename from actors_vanilla/jrb/rock/geo.inc.c rename to actors/vanilla_actors/jrb/rock/geo.inc.c diff --git a/actors_vanilla/jrb/rock/model.inc.c b/actors/vanilla_actors/jrb/rock/model.inc.c similarity index 100% rename from actors_vanilla/jrb/rock/model.inc.c rename to actors/vanilla_actors/jrb/rock/model.inc.c diff --git a/actors_vanilla/jrb/sliding_box/collision.inc.c b/actors/vanilla_actors/jrb/sliding_box/collision.inc.c similarity index 100% rename from actors_vanilla/jrb/sliding_box/collision.inc.c rename to actors/vanilla_actors/jrb/sliding_box/collision.inc.c diff --git a/actors_vanilla/jrb/sliding_box/geo.inc.c b/actors/vanilla_actors/jrb/sliding_box/geo.inc.c similarity index 100% rename from actors_vanilla/jrb/sliding_box/geo.inc.c rename to actors/vanilla_actors/jrb/sliding_box/geo.inc.c diff --git a/actors_vanilla/jrb/sliding_box/model.inc.c b/actors/vanilla_actors/jrb/sliding_box/model.inc.c similarity index 100% rename from actors_vanilla/jrb/sliding_box/model.inc.c rename to actors/vanilla_actors/jrb/sliding_box/model.inc.c diff --git a/actors_vanilla/jrb/texture.inc.c b/actors/vanilla_actors/jrb/texture.inc.c similarity index 64% rename from actors_vanilla/jrb/texture.inc.c rename to actors/vanilla_actors/jrb/texture.inc.c index 326363f8f4..3cf825ff70 100644 --- a/actors_vanilla/jrb/texture.inc.c +++ b/actors/vanilla_actors/jrb/texture.inc.c @@ -1,9 +1,9 @@ // 0x07001800 - 0x07002000 ALIGNED8 static const Texture jrb_seg7_texture_07001800[] = { -#include "actors_vanilla/jrb/2.rgba16.inc.c" +#include "actors/vanilla_actors/jrb/2.rgba16.inc.c" }; // 0x07002000 - 0x07002800 ALIGNED8 static const Texture jrb_seg7_texture_07002000[] = { -#include "actors_vanilla/jrb/3.rgba16.inc.c" +#include "actors/vanilla_actors/jrb/3.rgba16.inc.c" }; diff --git a/actors_vanilla/jrb/unused_lid/collision.inc.c b/actors/vanilla_actors/jrb/unused_lid/collision.inc.c similarity index 100% rename from actors_vanilla/jrb/unused_lid/collision.inc.c rename to actors/vanilla_actors/jrb/unused_lid/collision.inc.c diff --git a/actors_vanilla/jrb/wooden_ship/collision.inc.c b/actors/vanilla_actors/jrb/wooden_ship/collision.inc.c similarity index 100% rename from actors_vanilla/jrb/wooden_ship/collision.inc.c rename to actors/vanilla_actors/jrb/wooden_ship/collision.inc.c diff --git a/actors_vanilla/jrb/wooden_ship/geo.inc.c b/actors/vanilla_actors/jrb/wooden_ship/geo.inc.c similarity index 100% rename from actors_vanilla/jrb/wooden_ship/geo.inc.c rename to actors/vanilla_actors/jrb/wooden_ship/geo.inc.c diff --git a/actors_vanilla/jrb/wooden_ship/model.inc.c b/actors/vanilla_actors/jrb/wooden_ship/model.inc.c similarity index 100% rename from actors_vanilla/jrb/wooden_ship/model.inc.c rename to actors/vanilla_actors/jrb/wooden_ship/model.inc.c diff --git a/actors_vanilla/lll/10/collision.inc.c b/actors/vanilla_actors/lll/10/collision.inc.c similarity index 100% rename from actors_vanilla/lll/10/collision.inc.c rename to actors/vanilla_actors/lll/10/collision.inc.c diff --git a/actors_vanilla/lll/10/geo.inc.c b/actors/vanilla_actors/lll/10/geo.inc.c similarity index 100% rename from actors_vanilla/lll/10/geo.inc.c rename to actors/vanilla_actors/lll/10/geo.inc.c diff --git a/actors_vanilla/lll/10/model.inc.c b/actors/vanilla_actors/lll/10/model.inc.c similarity index 100% rename from actors_vanilla/lll/10/model.inc.c rename to actors/vanilla_actors/lll/10/model.inc.c diff --git a/actors_vanilla/lll/collapsing_wooden_platform/collision.inc.c b/actors/vanilla_actors/lll/collapsing_wooden_platform/collision.inc.c similarity index 100% rename from actors_vanilla/lll/collapsing_wooden_platform/collision.inc.c rename to actors/vanilla_actors/lll/collapsing_wooden_platform/collision.inc.c diff --git a/actors_vanilla/lll/collapsing_wooden_platform/geo.inc.c b/actors/vanilla_actors/lll/collapsing_wooden_platform/geo.inc.c similarity index 100% rename from actors_vanilla/lll/collapsing_wooden_platform/geo.inc.c rename to actors/vanilla_actors/lll/collapsing_wooden_platform/geo.inc.c diff --git a/actors_vanilla/lll/collapsing_wooden_platform/model.inc.c b/actors/vanilla_actors/lll/collapsing_wooden_platform/model.inc.c similarity index 100% rename from actors_vanilla/lll/collapsing_wooden_platform/model.inc.c rename to actors/vanilla_actors/lll/collapsing_wooden_platform/model.inc.c diff --git a/actors/vanilla_actors/lll/data.c b/actors/vanilla_actors/lll/data.c new file mode 100644 index 0000000000..8df39561eb --- /dev/null +++ b/actors/vanilla_actors/lll/data.c @@ -0,0 +1,42 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/lll/texture.inc.c" + +#include "actors/vanilla_actors/lll/10/model.inc.c" +#include "actors/vanilla_actors/lll/moving_octagonal_mesh_platform/model.inc.c" +#include "actors/vanilla_actors/lll/drawbridge_part/model.inc.c" +#include "actors/vanilla_actors/lll/rotating_block_fire_bars/model.inc.c" +#include "actors/vanilla_actors/lll/wooden_float_small/model.inc.c" +#include "actors/vanilla_actors/lll/wooden_float_large/model.inc.c" +#include "actors/vanilla_actors/lll/collapsing_wooden_platform/model.inc.c" +#include "actors/vanilla_actors/lll/long_wooden_bridge/model.inc.c" +#include "actors/vanilla_actors/lll/rotating_hexagonal_ring/model.inc.c" +#include "actors/vanilla_actors/lll/sinking_rectangular_platform/model.inc.c" +#include "actors/vanilla_actors/lll/sinking_square_platform/model.inc.c" +#include "actors/vanilla_actors/lll/tilting_square_platform/model.inc.c" +#include "actors/vanilla_actors/lll/puzzle_piece/model.inc.c" +#include "actors/vanilla_actors/lll/sinking_rock_block/model.inc.c" +#include "actors/vanilla_actors/lll/rolling_log/model.inc.c" +#include "actors/vanilla_actors/lll/moving_octagonal_mesh_platform/collision.inc.c" +#include "actors/vanilla_actors/lll/drawbridge_part/collision.inc.c" +#include "actors/vanilla_actors/lll/rotating_block_fire_bars/collision.inc.c" +#include "actors/vanilla_actors/lll/wooden_float_small/collision.inc.c" +#include "actors/vanilla_actors/lll/10/collision.inc.c" +#include "actors/vanilla_actors/lll/collapsing_wooden_platform/collision.inc.c" +#include "actors/vanilla_actors/lll/rotating_hexagonal_ring/collision.inc.c" +#include "actors/vanilla_actors/lll/sinking_rectangular_platform/collision.inc.c" +#include "actors/vanilla_actors/lll/sinking_square_platform/collision.inc.c" +#include "actors/vanilla_actors/lll/tilting_square_platform/collision.inc.c" +#include "actors/vanilla_actors/lll/puzzle_piece/collision.inc.c" +#include "actors/vanilla_actors/lll/sinking_rock_block/collision.inc.c" +#include "actors/vanilla_actors/lll/rolling_log/collision.inc.c" +#include "actors/vanilla_actors/lll/volcano_falling_trap/model.inc.c" +#include "actors/vanilla_actors/lll/volcano_falling_trap/collision.inc.c" diff --git a/actors_vanilla/lll/drawbridge_part/collision.inc.c b/actors/vanilla_actors/lll/drawbridge_part/collision.inc.c similarity index 100% rename from actors_vanilla/lll/drawbridge_part/collision.inc.c rename to actors/vanilla_actors/lll/drawbridge_part/collision.inc.c diff --git a/actors_vanilla/lll/drawbridge_part/geo.inc.c b/actors/vanilla_actors/lll/drawbridge_part/geo.inc.c similarity index 100% rename from actors_vanilla/lll/drawbridge_part/geo.inc.c rename to actors/vanilla_actors/lll/drawbridge_part/geo.inc.c diff --git a/actors_vanilla/lll/drawbridge_part/model.inc.c b/actors/vanilla_actors/lll/drawbridge_part/model.inc.c similarity index 100% rename from actors_vanilla/lll/drawbridge_part/model.inc.c rename to actors/vanilla_actors/lll/drawbridge_part/model.inc.c diff --git a/actors_vanilla/lll/geo.c b/actors/vanilla_actors/lll/geo.c similarity index 72% rename from actors_vanilla/lll/geo.c rename to actors/vanilla_actors/lll/geo.c index 290caf06fe..71e0699d6d 100644 --- a/actors_vanilla/lll/geo.c +++ b/actors/vanilla_actors/lll/geo.c @@ -11,24 +11,24 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/lll/header.h" +#include "actors/vanilla_actors/lll/header.h" -#include "actors_vanilla/lll/10/geo.inc.c" -#include "actors_vanilla/lll/moving_octagonal_mesh_platform/geo.inc.c" -#include "actors_vanilla/lll/drawbridge_part/geo.inc.c" -#include "actors_vanilla/lll/rotating_block_fire_bars/geo.inc.c" -#include "actors_vanilla/lll/wooden_float_small/geo.inc.c" -#include "actors_vanilla/lll/wooden_float_large/geo.inc.c" -#include "actors_vanilla/lll/collapsing_wooden_platform/geo.inc.c" -#include "actors_vanilla/lll/long_wooden_bridge/geo.inc.c" -#include "actors_vanilla/lll/rotating_hexagonal_ring/geo.inc.c" -#include "actors_vanilla/lll/sinking_rectangular_platform/geo.inc.c" -#include "actors_vanilla/lll/sinking_square_platform/geo.inc.c" -#include "actors_vanilla/lll/tilting_square_platform/geo.inc.c" -#include "actors_vanilla/lll/puzzle_piece/geo.inc.c" -#include "actors_vanilla/lll/sinking_rock_block/geo.inc.c" -#include "actors_vanilla/lll/rolling_log/geo.inc.c" -#include "actors_vanilla/lll/volcano_falling_trap/geo.inc.c" +#include "actors/vanilla_actors/lll/10/geo.inc.c" +#include "actors/vanilla_actors/lll/moving_octagonal_mesh_platform/geo.inc.c" +#include "actors/vanilla_actors/lll/drawbridge_part/geo.inc.c" +#include "actors/vanilla_actors/lll/rotating_block_fire_bars/geo.inc.c" +#include "actors/vanilla_actors/lll/wooden_float_small/geo.inc.c" +#include "actors/vanilla_actors/lll/wooden_float_large/geo.inc.c" +#include "actors/vanilla_actors/lll/collapsing_wooden_platform/geo.inc.c" +#include "actors/vanilla_actors/lll/long_wooden_bridge/geo.inc.c" +#include "actors/vanilla_actors/lll/rotating_hexagonal_ring/geo.inc.c" +#include "actors/vanilla_actors/lll/sinking_rectangular_platform/geo.inc.c" +#include "actors/vanilla_actors/lll/sinking_square_platform/geo.inc.c" +#include "actors/vanilla_actors/lll/tilting_square_platform/geo.inc.c" +#include "actors/vanilla_actors/lll/puzzle_piece/geo.inc.c" +#include "actors/vanilla_actors/lll/sinking_rock_block/geo.inc.c" +#include "actors/vanilla_actors/lll/rolling_log/geo.inc.c" +#include "actors/vanilla_actors/lll/volcano_falling_trap/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/lll/header.h b/actors/vanilla_actors/lll/header.h similarity index 100% rename from actors_vanilla/lll/header.h rename to actors/vanilla_actors/lll/header.h diff --git a/actors_vanilla/lll/long_wooden_bridge/geo.inc.c b/actors/vanilla_actors/lll/long_wooden_bridge/geo.inc.c similarity index 100% rename from actors_vanilla/lll/long_wooden_bridge/geo.inc.c rename to actors/vanilla_actors/lll/long_wooden_bridge/geo.inc.c diff --git a/actors_vanilla/lll/long_wooden_bridge/model.inc.c b/actors/vanilla_actors/lll/long_wooden_bridge/model.inc.c similarity index 100% rename from actors_vanilla/lll/long_wooden_bridge/model.inc.c rename to actors/vanilla_actors/lll/long_wooden_bridge/model.inc.c diff --git a/actors_vanilla/lll/moving_octagonal_mesh_platform/collision.inc.c b/actors/vanilla_actors/lll/moving_octagonal_mesh_platform/collision.inc.c similarity index 100% rename from actors_vanilla/lll/moving_octagonal_mesh_platform/collision.inc.c rename to actors/vanilla_actors/lll/moving_octagonal_mesh_platform/collision.inc.c diff --git a/actors_vanilla/lll/moving_octagonal_mesh_platform/geo.inc.c b/actors/vanilla_actors/lll/moving_octagonal_mesh_platform/geo.inc.c similarity index 100% rename from actors_vanilla/lll/moving_octagonal_mesh_platform/geo.inc.c rename to actors/vanilla_actors/lll/moving_octagonal_mesh_platform/geo.inc.c diff --git a/actors_vanilla/lll/moving_octagonal_mesh_platform/model.inc.c b/actors/vanilla_actors/lll/moving_octagonal_mesh_platform/model.inc.c similarity index 100% rename from actors_vanilla/lll/moving_octagonal_mesh_platform/model.inc.c rename to actors/vanilla_actors/lll/moving_octagonal_mesh_platform/model.inc.c diff --git a/actors_vanilla/lll/puzzle_piece/collision.inc.c b/actors/vanilla_actors/lll/puzzle_piece/collision.inc.c similarity index 100% rename from actors_vanilla/lll/puzzle_piece/collision.inc.c rename to actors/vanilla_actors/lll/puzzle_piece/collision.inc.c diff --git a/actors_vanilla/lll/puzzle_piece/geo.inc.c b/actors/vanilla_actors/lll/puzzle_piece/geo.inc.c similarity index 100% rename from actors_vanilla/lll/puzzle_piece/geo.inc.c rename to actors/vanilla_actors/lll/puzzle_piece/geo.inc.c diff --git a/actors_vanilla/lll/puzzle_piece/model.inc.c b/actors/vanilla_actors/lll/puzzle_piece/model.inc.c similarity index 100% rename from actors_vanilla/lll/puzzle_piece/model.inc.c rename to actors/vanilla_actors/lll/puzzle_piece/model.inc.c diff --git a/actors_vanilla/lll/rolling_log/collision.inc.c b/actors/vanilla_actors/lll/rolling_log/collision.inc.c similarity index 100% rename from actors_vanilla/lll/rolling_log/collision.inc.c rename to actors/vanilla_actors/lll/rolling_log/collision.inc.c diff --git a/actors_vanilla/lll/rolling_log/geo.inc.c b/actors/vanilla_actors/lll/rolling_log/geo.inc.c similarity index 100% rename from actors_vanilla/lll/rolling_log/geo.inc.c rename to actors/vanilla_actors/lll/rolling_log/geo.inc.c diff --git a/actors_vanilla/lll/rolling_log/model.inc.c b/actors/vanilla_actors/lll/rolling_log/model.inc.c similarity index 100% rename from actors_vanilla/lll/rolling_log/model.inc.c rename to actors/vanilla_actors/lll/rolling_log/model.inc.c diff --git a/actors_vanilla/lll/rotating_block_fire_bars/collision.inc.c b/actors/vanilla_actors/lll/rotating_block_fire_bars/collision.inc.c similarity index 100% rename from actors_vanilla/lll/rotating_block_fire_bars/collision.inc.c rename to actors/vanilla_actors/lll/rotating_block_fire_bars/collision.inc.c diff --git a/actors_vanilla/lll/rotating_block_fire_bars/geo.inc.c b/actors/vanilla_actors/lll/rotating_block_fire_bars/geo.inc.c similarity index 100% rename from actors_vanilla/lll/rotating_block_fire_bars/geo.inc.c rename to actors/vanilla_actors/lll/rotating_block_fire_bars/geo.inc.c diff --git a/actors_vanilla/lll/rotating_block_fire_bars/model.inc.c b/actors/vanilla_actors/lll/rotating_block_fire_bars/model.inc.c similarity index 100% rename from actors_vanilla/lll/rotating_block_fire_bars/model.inc.c rename to actors/vanilla_actors/lll/rotating_block_fire_bars/model.inc.c diff --git a/actors_vanilla/lll/rotating_hexagonal_ring/collision.inc.c b/actors/vanilla_actors/lll/rotating_hexagonal_ring/collision.inc.c similarity index 100% rename from actors_vanilla/lll/rotating_hexagonal_ring/collision.inc.c rename to actors/vanilla_actors/lll/rotating_hexagonal_ring/collision.inc.c diff --git a/actors_vanilla/lll/rotating_hexagonal_ring/geo.inc.c b/actors/vanilla_actors/lll/rotating_hexagonal_ring/geo.inc.c similarity index 100% rename from actors_vanilla/lll/rotating_hexagonal_ring/geo.inc.c rename to actors/vanilla_actors/lll/rotating_hexagonal_ring/geo.inc.c diff --git a/actors_vanilla/lll/rotating_hexagonal_ring/model.inc.c b/actors/vanilla_actors/lll/rotating_hexagonal_ring/model.inc.c similarity index 100% rename from actors_vanilla/lll/rotating_hexagonal_ring/model.inc.c rename to actors/vanilla_actors/lll/rotating_hexagonal_ring/model.inc.c diff --git a/actors_vanilla/lll/sinking_rectangular_platform/collision.inc.c b/actors/vanilla_actors/lll/sinking_rectangular_platform/collision.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_rectangular_platform/collision.inc.c rename to actors/vanilla_actors/lll/sinking_rectangular_platform/collision.inc.c diff --git a/actors_vanilla/lll/sinking_rectangular_platform/geo.inc.c b/actors/vanilla_actors/lll/sinking_rectangular_platform/geo.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_rectangular_platform/geo.inc.c rename to actors/vanilla_actors/lll/sinking_rectangular_platform/geo.inc.c diff --git a/actors_vanilla/lll/sinking_rectangular_platform/model.inc.c b/actors/vanilla_actors/lll/sinking_rectangular_platform/model.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_rectangular_platform/model.inc.c rename to actors/vanilla_actors/lll/sinking_rectangular_platform/model.inc.c diff --git a/actors_vanilla/lll/sinking_rock_block/collision.inc.c b/actors/vanilla_actors/lll/sinking_rock_block/collision.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_rock_block/collision.inc.c rename to actors/vanilla_actors/lll/sinking_rock_block/collision.inc.c diff --git a/actors_vanilla/lll/sinking_rock_block/geo.inc.c b/actors/vanilla_actors/lll/sinking_rock_block/geo.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_rock_block/geo.inc.c rename to actors/vanilla_actors/lll/sinking_rock_block/geo.inc.c diff --git a/actors_vanilla/lll/sinking_rock_block/model.inc.c b/actors/vanilla_actors/lll/sinking_rock_block/model.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_rock_block/model.inc.c rename to actors/vanilla_actors/lll/sinking_rock_block/model.inc.c diff --git a/actors_vanilla/lll/sinking_square_platform/collision.inc.c b/actors/vanilla_actors/lll/sinking_square_platform/collision.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_square_platform/collision.inc.c rename to actors/vanilla_actors/lll/sinking_square_platform/collision.inc.c diff --git a/actors_vanilla/lll/sinking_square_platform/geo.inc.c b/actors/vanilla_actors/lll/sinking_square_platform/geo.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_square_platform/geo.inc.c rename to actors/vanilla_actors/lll/sinking_square_platform/geo.inc.c diff --git a/actors_vanilla/lll/sinking_square_platform/model.inc.c b/actors/vanilla_actors/lll/sinking_square_platform/model.inc.c similarity index 100% rename from actors_vanilla/lll/sinking_square_platform/model.inc.c rename to actors/vanilla_actors/lll/sinking_square_platform/model.inc.c diff --git a/actors_vanilla/lll/texture.inc.c b/actors/vanilla_actors/lll/texture.inc.c similarity index 63% rename from actors_vanilla/lll/texture.inc.c rename to actors/vanilla_actors/lll/texture.inc.c index a713b1c312..0c22ed9898 100644 --- a/actors_vanilla/lll/texture.inc.c +++ b/actors/vanilla_actors/lll/texture.inc.c @@ -1,109 +1,109 @@ // 0x07000000 - 0x07000800 ALIGNED8 static const Texture lll_seg7_texture_07000000[] = { -#include "actors_vanilla/lll/0.rgba16.inc.c" +#include "actors/vanilla_actors/lll/0.rgba16.inc.c" }; // 0x07000800 - 0x07001000 ALIGNED8 static const Texture lll_seg7_texture_07000800[] = { -#include "actors_vanilla/lll/1.rgba16.inc.c" +#include "actors/vanilla_actors/lll/1.rgba16.inc.c" }; // 0x07001000 - 0x07001800 ALIGNED8 static const Texture lll_seg7_texture_07001000[] = { -#include "actors_vanilla/lll/2.rgba16.inc.c" +#include "actors/vanilla_actors/lll/2.rgba16.inc.c" }; // 0x07003000 - 0x07003800 ALIGNED8 static const Texture lll_seg7_texture_07003000[] = { -#include "actors_vanilla/lll/6.rgba16.inc.c" +#include "actors/vanilla_actors/lll/6.rgba16.inc.c" }; // 0x07004000 - 0x07004800 ALIGNED8 static const Texture lll_seg7_texture_07004000[] = { -#include "actors_vanilla/lll/8.rgba16.inc.c" +#include "actors/vanilla_actors/lll/8.rgba16.inc.c" }; // 0x07005000 - 0x07005800 ALIGNED8 static const Texture lll_seg7_texture_07005000[] = { -#include "actors_vanilla/lll/10.rgba16.inc.c" +#include "actors/vanilla_actors/lll/10.rgba16.inc.c" }; // 0x07005800 - 0x07006000 ALIGNED8 static const Texture lll_seg7_texture_07005800[] = { -#include "actors_vanilla/lll/11.rgba16.inc.c" +#include "actors/vanilla_actors/lll/11.rgba16.inc.c" }; // 0x07006000 - 0x07006800 ALIGNED8 static const Texture lll_seg7_texture_07006000[] = { -#include "actors_vanilla/lll/12.rgba16.inc.c" +#include "actors/vanilla_actors/lll/12.rgba16.inc.c" }; // 0x07006800 - 0x07007000 ALIGNED8 static const Texture lll_seg7_texture_07006800[] = { -#include "actors_vanilla/lll/13.rgba16.inc.c" +#include "actors/vanilla_actors/lll/13.rgba16.inc.c" }; // 0x07007000 - 0x07007800 ALIGNED8 static const Texture lll_seg7_texture_07007000[] = { -#include "actors_vanilla/lll/14.rgba16.inc.c" +#include "actors/vanilla_actors/lll/14.rgba16.inc.c" }; // 0x07007800 - 0x07008000 ALIGNED8 static const Texture lll_seg7_texture_07007800[] = { -#include "actors_vanilla/lll/15.rgba16.inc.c" +#include "actors/vanilla_actors/lll/15.rgba16.inc.c" }; // 0x07008000 - 0x07008800 ALIGNED8 static const Texture lll_seg7_texture_07008000[] = { -#include "actors_vanilla/lll/16.rgba16.inc.c" +#include "actors/vanilla_actors/lll/16.rgba16.inc.c" }; // 0x07008800 - 0x07009000 ALIGNED8 static const Texture lll_seg7_texture_07008800[] = { -#include "actors_vanilla/lll/17.rgba16.inc.c" +#include "actors/vanilla_actors/lll/17.rgba16.inc.c" }; // 0x07009000 - 0x07009800 ALIGNED8 static const Texture lll_seg7_texture_07009000[] = { -#include "actors_vanilla/lll/18.rgba16.inc.c" +#include "actors/vanilla_actors/lll/18.rgba16.inc.c" }; // 0x07009800 - 0x0700A000 ALIGNED8 static const Texture lll_seg7_texture_07009800[] = { -#include "actors_vanilla/lll/19.rgba16.inc.c" +#include "actors/vanilla_actors/lll/19.rgba16.inc.c" }; // 0x0700A000 - 0x0700A800 ALIGNED8 static const Texture lll_seg7_texture_0700A000[] = { -#include "actors_vanilla/lll/20.rgba16.inc.c" +#include "actors/vanilla_actors/lll/20.rgba16.inc.c" }; // 0x0700A800 - 0x0700B000 ALIGNED8 static const Texture lll_seg7_texture_0700A800[] = { -#include "actors_vanilla/lll/21.rgba16.inc.c" +#include "actors/vanilla_actors/lll/21.rgba16.inc.c" }; // 0x0700B000 - 0x0700B800 ALIGNED8 static const Texture lll_seg7_texture_0700B000[] = { -#include "actors_vanilla/lll/22.rgba16.inc.c" +#include "actors/vanilla_actors/lll/22.rgba16.inc.c" }; // 0x0700B800 - 0x0700C000 ALIGNED8 static const Texture lll_seg7_texture_0700B800[] = { -#include "actors_vanilla/lll/23.rgba16.inc.c" +#include "actors/vanilla_actors/lll/23.rgba16.inc.c" }; // 0x0700C000 - 0x0700C800 ALIGNED8 static const Texture lll_seg7_texture_0700C000[] = { -#include "actors_vanilla/lll/24.rgba16.inc.c" +#include "actors/vanilla_actors/lll/24.rgba16.inc.c" }; // 0x0700C800 - 0x0700D000 ALIGNED8 static const Texture lll_seg7_texture_0700C800[] = { -#include "actors_vanilla/lll/25.rgba16.inc.c" +#include "actors/vanilla_actors/lll/25.rgba16.inc.c" }; // 0x0700DC00 - 0x0700E400 ALIGNED8 static const Texture lll_seg7_texture_0700DC00[] = { -#include "actors_vanilla/lll/29.rgba16.inc.c" +#include "actors/vanilla_actors/lll/29.rgba16.inc.c" }; diff --git a/actors_vanilla/lll/tilting_square_platform/collision.inc.c b/actors/vanilla_actors/lll/tilting_square_platform/collision.inc.c similarity index 100% rename from actors_vanilla/lll/tilting_square_platform/collision.inc.c rename to actors/vanilla_actors/lll/tilting_square_platform/collision.inc.c diff --git a/actors_vanilla/lll/tilting_square_platform/geo.inc.c b/actors/vanilla_actors/lll/tilting_square_platform/geo.inc.c similarity index 100% rename from actors_vanilla/lll/tilting_square_platform/geo.inc.c rename to actors/vanilla_actors/lll/tilting_square_platform/geo.inc.c diff --git a/actors_vanilla/lll/tilting_square_platform/model.inc.c b/actors/vanilla_actors/lll/tilting_square_platform/model.inc.c similarity index 100% rename from actors_vanilla/lll/tilting_square_platform/model.inc.c rename to actors/vanilla_actors/lll/tilting_square_platform/model.inc.c diff --git a/actors_vanilla/lll/volcano_falling_trap/collision.inc.c b/actors/vanilla_actors/lll/volcano_falling_trap/collision.inc.c similarity index 100% rename from actors_vanilla/lll/volcano_falling_trap/collision.inc.c rename to actors/vanilla_actors/lll/volcano_falling_trap/collision.inc.c diff --git a/actors_vanilla/lll/volcano_falling_trap/geo.inc.c b/actors/vanilla_actors/lll/volcano_falling_trap/geo.inc.c similarity index 100% rename from actors_vanilla/lll/volcano_falling_trap/geo.inc.c rename to actors/vanilla_actors/lll/volcano_falling_trap/geo.inc.c diff --git a/actors_vanilla/lll/volcano_falling_trap/model.inc.c b/actors/vanilla_actors/lll/volcano_falling_trap/model.inc.c similarity index 100% rename from actors_vanilla/lll/volcano_falling_trap/model.inc.c rename to actors/vanilla_actors/lll/volcano_falling_trap/model.inc.c diff --git a/actors_vanilla/lll/wooden_float_large/geo.inc.c b/actors/vanilla_actors/lll/wooden_float_large/geo.inc.c similarity index 100% rename from actors_vanilla/lll/wooden_float_large/geo.inc.c rename to actors/vanilla_actors/lll/wooden_float_large/geo.inc.c diff --git a/actors_vanilla/lll/wooden_float_large/model.inc.c b/actors/vanilla_actors/lll/wooden_float_large/model.inc.c similarity index 100% rename from actors_vanilla/lll/wooden_float_large/model.inc.c rename to actors/vanilla_actors/lll/wooden_float_large/model.inc.c diff --git a/actors_vanilla/lll/wooden_float_small/collision.inc.c b/actors/vanilla_actors/lll/wooden_float_small/collision.inc.c similarity index 100% rename from actors_vanilla/lll/wooden_float_small/collision.inc.c rename to actors/vanilla_actors/lll/wooden_float_small/collision.inc.c diff --git a/actors_vanilla/lll/wooden_float_small/geo.inc.c b/actors/vanilla_actors/lll/wooden_float_small/geo.inc.c similarity index 100% rename from actors_vanilla/lll/wooden_float_small/geo.inc.c rename to actors/vanilla_actors/lll/wooden_float_small/geo.inc.c diff --git a/actors_vanilla/lll/wooden_float_small/model.inc.c b/actors/vanilla_actors/lll/wooden_float_small/model.inc.c similarity index 100% rename from actors_vanilla/lll/wooden_float_small/model.inc.c rename to actors/vanilla_actors/lll/wooden_float_small/model.inc.c diff --git a/actors_vanilla/rr/cruiser_wing/geo.inc.c b/actors/vanilla_actors/rr/cruiser_wing/geo.inc.c similarity index 100% rename from actors_vanilla/rr/cruiser_wing/geo.inc.c rename to actors/vanilla_actors/rr/cruiser_wing/geo.inc.c diff --git a/actors_vanilla/rr/cruiser_wing/model.inc.c b/actors/vanilla_actors/rr/cruiser_wing/model.inc.c similarity index 100% rename from actors_vanilla/rr/cruiser_wing/model.inc.c rename to actors/vanilla_actors/rr/cruiser_wing/model.inc.c diff --git a/actors/vanilla_actors/rr/data.c b/actors/vanilla_actors/rr/data.c new file mode 100644 index 0000000000..bad9d49629 --- /dev/null +++ b/actors/vanilla_actors/rr/data.c @@ -0,0 +1,44 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/rr/texture.inc.c" + +#include "actors/vanilla_actors/rr/flying_carpet/model.inc.c" +#include "actors/vanilla_actors/rr/swinging_platform/model.inc.c" +#include "actors/vanilla_actors/rr/rotating_bridge_platform/model.inc.c" +#include "actors/vanilla_actors/rr/cruiser_wing/model.inc.c" +#include "actors/vanilla_actors/rr/octagonal_platform/model.inc.c" +#include "actors/vanilla_actors/rr/sliding_platform/model.inc.c" +#include "actors/vanilla_actors/rr/pyramid_platform/model.inc.c" // Unused +#include "actors/vanilla_actors/rr/elevator_platform/model.inc.c" +#include "actors/vanilla_actors/rr/seesaw_platform/model.inc.c" +#include "actors/vanilla_actors/rr/donut_block/1.inc.c" +#include "actors/vanilla_actors/rr/donut_block/2.inc.c" +#include "actors/vanilla_actors/rr/l_platform/model.inc.c" // also unused +#include "actors/vanilla_actors/rr/tricky_triangles_1/model.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_2/model.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_3/model.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_4/model.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_5/model.inc.c" +#include "actors/vanilla_actors/rr/flying_carpet/collision.inc.c" +#include "actors/vanilla_actors/rr/swinging_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/rotating_bridge_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/octagonal_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/sliding_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/pyramid_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/elevator_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/seesaw_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/donut_block/collision.inc.c" +#include "actors/vanilla_actors/rr/l_platform/collision.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_1/collision.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_2/collision.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_3/collision.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_4/collision.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_5/collision.inc.c" diff --git a/actors_vanilla/rr/donut_block/1.inc.c b/actors/vanilla_actors/rr/donut_block/1.inc.c similarity index 100% rename from actors_vanilla/rr/donut_block/1.inc.c rename to actors/vanilla_actors/rr/donut_block/1.inc.c diff --git a/actors_vanilla/rr/donut_block/2.inc.c b/actors/vanilla_actors/rr/donut_block/2.inc.c similarity index 100% rename from actors_vanilla/rr/donut_block/2.inc.c rename to actors/vanilla_actors/rr/donut_block/2.inc.c diff --git a/actors_vanilla/rr/donut_block/collision.inc.c b/actors/vanilla_actors/rr/donut_block/collision.inc.c similarity index 100% rename from actors_vanilla/rr/donut_block/collision.inc.c rename to actors/vanilla_actors/rr/donut_block/collision.inc.c diff --git a/actors_vanilla/rr/donut_block/geo.inc.c b/actors/vanilla_actors/rr/donut_block/geo.inc.c similarity index 100% rename from actors_vanilla/rr/donut_block/geo.inc.c rename to actors/vanilla_actors/rr/donut_block/geo.inc.c diff --git a/actors_vanilla/rr/elevator_platform/collision.inc.c b/actors/vanilla_actors/rr/elevator_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/elevator_platform/collision.inc.c rename to actors/vanilla_actors/rr/elevator_platform/collision.inc.c diff --git a/actors_vanilla/rr/elevator_platform/geo.inc.c b/actors/vanilla_actors/rr/elevator_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/elevator_platform/geo.inc.c rename to actors/vanilla_actors/rr/elevator_platform/geo.inc.c diff --git a/actors_vanilla/rr/elevator_platform/model.inc.c b/actors/vanilla_actors/rr/elevator_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/elevator_platform/model.inc.c rename to actors/vanilla_actors/rr/elevator_platform/model.inc.c diff --git a/actors_vanilla/rr/flying_carpet/collision.inc.c b/actors/vanilla_actors/rr/flying_carpet/collision.inc.c similarity index 100% rename from actors_vanilla/rr/flying_carpet/collision.inc.c rename to actors/vanilla_actors/rr/flying_carpet/collision.inc.c diff --git a/actors_vanilla/rr/flying_carpet/geo.inc.c b/actors/vanilla_actors/rr/flying_carpet/geo.inc.c similarity index 100% rename from actors_vanilla/rr/flying_carpet/geo.inc.c rename to actors/vanilla_actors/rr/flying_carpet/geo.inc.c diff --git a/actors_vanilla/rr/flying_carpet/model.inc.c b/actors/vanilla_actors/rr/flying_carpet/model.inc.c similarity index 100% rename from actors_vanilla/rr/flying_carpet/model.inc.c rename to actors/vanilla_actors/rr/flying_carpet/model.inc.c diff --git a/actors_vanilla/rr/geo.c b/actors/vanilla_actors/rr/geo.c similarity index 59% rename from actors_vanilla/rr/geo.c rename to actors/vanilla_actors/rr/geo.c index 53e55d0e01..28d7a71799 100644 --- a/actors_vanilla/rr/geo.c +++ b/actors/vanilla_actors/rr/geo.c @@ -11,24 +11,24 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/rr/header.h" +#include "actors/vanilla_actors/rr/header.h" -#include "actors_vanilla/rr/flying_carpet/geo.inc.c" -#include "actors_vanilla/rr/swinging_platform/geo.inc.c" -#include "actors_vanilla/rr/rotating_bridge_platform/geo.inc.c" -#include "actors_vanilla/rr/cruiser_wing/geo.inc.c" -#include "actors_vanilla/rr/octagonal_platform/geo.inc.c" -#include "actors_vanilla/rr/sliding_platform/geo.inc.c" -#include "actors_vanilla/rr/pyramid_platform/geo.inc.c" // unused -#include "actors_vanilla/rr/elevator_platform/geo.inc.c" -#include "actors_vanilla/rr/seesaw_platform/geo.inc.c" -#include "actors_vanilla/rr/donut_block/geo.inc.c" -#include "actors_vanilla/rr/l_platform/geo.inc.c" // also unused -#include "actors_vanilla/rr/tricky_triangles_1/geo.inc.c" -#include "actors_vanilla/rr/tricky_triangles_2/geo.inc.c" -#include "actors_vanilla/rr/tricky_triangles_3/geo.inc.c" -#include "actors_vanilla/rr/tricky_triangles_4/geo.inc.c" -#include "actors_vanilla/rr/tricky_triangles_5/geo.inc.c" +#include "actors/vanilla_actors/rr/flying_carpet/geo.inc.c" +#include "actors/vanilla_actors/rr/swinging_platform/geo.inc.c" +#include "actors/vanilla_actors/rr/rotating_bridge_platform/geo.inc.c" +#include "actors/vanilla_actors/rr/cruiser_wing/geo.inc.c" +#include "actors/vanilla_actors/rr/octagonal_platform/geo.inc.c" +#include "actors/vanilla_actors/rr/sliding_platform/geo.inc.c" +#include "actors/vanilla_actors/rr/pyramid_platform/geo.inc.c" // unused +#include "actors/vanilla_actors/rr/elevator_platform/geo.inc.c" +#include "actors/vanilla_actors/rr/seesaw_platform/geo.inc.c" +#include "actors/vanilla_actors/rr/donut_block/geo.inc.c" +#include "actors/vanilla_actors/rr/l_platform/geo.inc.c" // also unused +#include "actors/vanilla_actors/rr/tricky_triangles_1/geo.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_2/geo.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_3/geo.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_4/geo.inc.c" +#include "actors/vanilla_actors/rr/tricky_triangles_5/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/rr/header.h b/actors/vanilla_actors/rr/header.h similarity index 100% rename from actors_vanilla/rr/header.h rename to actors/vanilla_actors/rr/header.h diff --git a/actors_vanilla/rr/l_platform/collision.inc.c b/actors/vanilla_actors/rr/l_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/l_platform/collision.inc.c rename to actors/vanilla_actors/rr/l_platform/collision.inc.c diff --git a/actors_vanilla/rr/l_platform/geo.inc.c b/actors/vanilla_actors/rr/l_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/l_platform/geo.inc.c rename to actors/vanilla_actors/rr/l_platform/geo.inc.c diff --git a/actors_vanilla/rr/l_platform/model.inc.c b/actors/vanilla_actors/rr/l_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/l_platform/model.inc.c rename to actors/vanilla_actors/rr/l_platform/model.inc.c diff --git a/actors_vanilla/rr/octagonal_platform/collision.inc.c b/actors/vanilla_actors/rr/octagonal_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/octagonal_platform/collision.inc.c rename to actors/vanilla_actors/rr/octagonal_platform/collision.inc.c diff --git a/actors_vanilla/rr/octagonal_platform/geo.inc.c b/actors/vanilla_actors/rr/octagonal_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/octagonal_platform/geo.inc.c rename to actors/vanilla_actors/rr/octagonal_platform/geo.inc.c diff --git a/actors_vanilla/rr/octagonal_platform/model.inc.c b/actors/vanilla_actors/rr/octagonal_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/octagonal_platform/model.inc.c rename to actors/vanilla_actors/rr/octagonal_platform/model.inc.c diff --git a/actors_vanilla/rr/pyramid_platform/collision.inc.c b/actors/vanilla_actors/rr/pyramid_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/pyramid_platform/collision.inc.c rename to actors/vanilla_actors/rr/pyramid_platform/collision.inc.c diff --git a/actors_vanilla/rr/pyramid_platform/geo.inc.c b/actors/vanilla_actors/rr/pyramid_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/pyramid_platform/geo.inc.c rename to actors/vanilla_actors/rr/pyramid_platform/geo.inc.c diff --git a/actors_vanilla/rr/pyramid_platform/model.inc.c b/actors/vanilla_actors/rr/pyramid_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/pyramid_platform/model.inc.c rename to actors/vanilla_actors/rr/pyramid_platform/model.inc.c diff --git a/actors_vanilla/rr/rotating_bridge_platform/collision.inc.c b/actors/vanilla_actors/rr/rotating_bridge_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/rotating_bridge_platform/collision.inc.c rename to actors/vanilla_actors/rr/rotating_bridge_platform/collision.inc.c diff --git a/actors_vanilla/rr/rotating_bridge_platform/geo.inc.c b/actors/vanilla_actors/rr/rotating_bridge_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/rotating_bridge_platform/geo.inc.c rename to actors/vanilla_actors/rr/rotating_bridge_platform/geo.inc.c diff --git a/actors_vanilla/rr/rotating_bridge_platform/model.inc.c b/actors/vanilla_actors/rr/rotating_bridge_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/rotating_bridge_platform/model.inc.c rename to actors/vanilla_actors/rr/rotating_bridge_platform/model.inc.c diff --git a/actors_vanilla/rr/seesaw_platform/collision.inc.c b/actors/vanilla_actors/rr/seesaw_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/seesaw_platform/collision.inc.c rename to actors/vanilla_actors/rr/seesaw_platform/collision.inc.c diff --git a/actors_vanilla/rr/seesaw_platform/geo.inc.c b/actors/vanilla_actors/rr/seesaw_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/seesaw_platform/geo.inc.c rename to actors/vanilla_actors/rr/seesaw_platform/geo.inc.c diff --git a/actors_vanilla/rr/seesaw_platform/model.inc.c b/actors/vanilla_actors/rr/seesaw_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/seesaw_platform/model.inc.c rename to actors/vanilla_actors/rr/seesaw_platform/model.inc.c diff --git a/actors_vanilla/rr/sliding_platform/collision.inc.c b/actors/vanilla_actors/rr/sliding_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/sliding_platform/collision.inc.c rename to actors/vanilla_actors/rr/sliding_platform/collision.inc.c diff --git a/actors_vanilla/rr/sliding_platform/geo.inc.c b/actors/vanilla_actors/rr/sliding_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/sliding_platform/geo.inc.c rename to actors/vanilla_actors/rr/sliding_platform/geo.inc.c diff --git a/actors_vanilla/rr/sliding_platform/model.inc.c b/actors/vanilla_actors/rr/sliding_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/sliding_platform/model.inc.c rename to actors/vanilla_actors/rr/sliding_platform/model.inc.c diff --git a/actors_vanilla/rr/swinging_platform/collision.inc.c b/actors/vanilla_actors/rr/swinging_platform/collision.inc.c similarity index 100% rename from actors_vanilla/rr/swinging_platform/collision.inc.c rename to actors/vanilla_actors/rr/swinging_platform/collision.inc.c diff --git a/actors_vanilla/rr/swinging_platform/geo.inc.c b/actors/vanilla_actors/rr/swinging_platform/geo.inc.c similarity index 100% rename from actors_vanilla/rr/swinging_platform/geo.inc.c rename to actors/vanilla_actors/rr/swinging_platform/geo.inc.c diff --git a/actors_vanilla/rr/swinging_platform/model.inc.c b/actors/vanilla_actors/rr/swinging_platform/model.inc.c similarity index 100% rename from actors_vanilla/rr/swinging_platform/model.inc.c rename to actors/vanilla_actors/rr/swinging_platform/model.inc.c diff --git a/actors_vanilla/rr/texture.inc.c b/actors/vanilla_actors/rr/texture.inc.c similarity index 60% rename from actors_vanilla/rr/texture.inc.c rename to actors/vanilla_actors/rr/texture.inc.c index 46e756438c..73448b7cbe 100644 --- a/actors_vanilla/rr/texture.inc.c +++ b/actors/vanilla_actors/rr/texture.inc.c @@ -1,8 +1,8 @@ // 0x07000000 - 0x07000800 ALIGNED8 static const Texture texture_quarter_flying_carpet[] = { -#include "actors_vanilla/rr/quarter_flying_carpet.rgba16.inc.c" +#include "actors/vanilla_actors/rr/quarter_flying_carpet.rgba16.inc.c" }; // 0x07000800 - 0x07001800 ALIGNED8 static const Texture rr_seg7_texture_07000800[] = { -#include "actors_vanilla/rr/1.rgba16.inc.c" +#include "actors/vanilla_actors/rr/1.rgba16.inc.c" }; diff --git a/actors_vanilla/rr/tricky_triangles_1/collision.inc.c b/actors/vanilla_actors/rr/tricky_triangles_1/collision.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_1/collision.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_1/collision.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_1/geo.inc.c b/actors/vanilla_actors/rr/tricky_triangles_1/geo.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_1/geo.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_1/geo.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_1/model.inc.c b/actors/vanilla_actors/rr/tricky_triangles_1/model.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_1/model.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_1/model.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_2/collision.inc.c b/actors/vanilla_actors/rr/tricky_triangles_2/collision.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_2/collision.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_2/collision.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_2/geo.inc.c b/actors/vanilla_actors/rr/tricky_triangles_2/geo.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_2/geo.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_2/geo.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_2/model.inc.c b/actors/vanilla_actors/rr/tricky_triangles_2/model.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_2/model.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_2/model.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_3/collision.inc.c b/actors/vanilla_actors/rr/tricky_triangles_3/collision.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_3/collision.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_3/collision.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_3/geo.inc.c b/actors/vanilla_actors/rr/tricky_triangles_3/geo.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_3/geo.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_3/geo.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_3/model.inc.c b/actors/vanilla_actors/rr/tricky_triangles_3/model.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_3/model.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_3/model.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_4/collision.inc.c b/actors/vanilla_actors/rr/tricky_triangles_4/collision.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_4/collision.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_4/collision.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_4/geo.inc.c b/actors/vanilla_actors/rr/tricky_triangles_4/geo.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_4/geo.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_4/geo.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_4/model.inc.c b/actors/vanilla_actors/rr/tricky_triangles_4/model.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_4/model.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_4/model.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_5/collision.inc.c b/actors/vanilla_actors/rr/tricky_triangles_5/collision.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_5/collision.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_5/collision.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_5/geo.inc.c b/actors/vanilla_actors/rr/tricky_triangles_5/geo.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_5/geo.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_5/geo.inc.c diff --git a/actors_vanilla/rr/tricky_triangles_5/model.inc.c b/actors/vanilla_actors/rr/tricky_triangles_5/model.inc.c similarity index 100% rename from actors_vanilla/rr/tricky_triangles_5/model.inc.c rename to actors/vanilla_actors/rr/tricky_triangles_5/model.inc.c diff --git a/actors/vanilla_actors/sl/data.c b/actors/vanilla_actors/sl/data.c new file mode 100644 index 0000000000..e58d10f554 --- /dev/null +++ b/actors/vanilla_actors/sl/data.c @@ -0,0 +1,20 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/sl/texture.inc.c" + +#include "actors/vanilla_actors/sl/snow_mound/model.inc.c" +#include "actors/vanilla_actors/sl/unused_cracked_ice/model.inc.c" +#include "actors/vanilla_actors/sl/unused_ice_shard/model.inc.c" // Used in the unused behavior when ground pounding the cracked ice show in the above model. +#include "actors/vanilla_actors/sl/snow_mound/collision.inc.c" +#include "actors/vanilla_actors/sl/unused_cracked_ice/collision.inc.c" diff --git a/actors_vanilla/sl/geo.c b/actors/vanilla_actors/sl/geo.c similarity index 71% rename from actors_vanilla/sl/geo.c rename to actors/vanilla_actors/sl/geo.c index 567d3564d8..6b089ffdb3 100644 --- a/actors_vanilla/sl/geo.c +++ b/actors/vanilla_actors/sl/geo.c @@ -11,11 +11,11 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/sl/header.h" +#include "actors/vanilla_actors/sl/header.h" -#include "actors_vanilla/sl/unused_cracked_ice/geo.inc.c" -#include "actors_vanilla/sl/unused_ice_shard/geo.inc.c" -#include "actors_vanilla/sl/snow_mound/geo.inc.c" +#include "actors/vanilla_actors/sl/unused_cracked_ice/geo.inc.c" +#include "actors/vanilla_actors/sl/unused_ice_shard/geo.inc.c" +#include "actors/vanilla_actors/sl/snow_mound/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/sl/header.h b/actors/vanilla_actors/sl/header.h similarity index 100% rename from actors_vanilla/sl/header.h rename to actors/vanilla_actors/sl/header.h diff --git a/actors_vanilla/sl/snow_mound/collision.inc.c b/actors/vanilla_actors/sl/snow_mound/collision.inc.c similarity index 100% rename from actors_vanilla/sl/snow_mound/collision.inc.c rename to actors/vanilla_actors/sl/snow_mound/collision.inc.c diff --git a/actors_vanilla/sl/snow_mound/geo.inc.c b/actors/vanilla_actors/sl/snow_mound/geo.inc.c similarity index 100% rename from actors_vanilla/sl/snow_mound/geo.inc.c rename to actors/vanilla_actors/sl/snow_mound/geo.inc.c diff --git a/actors_vanilla/sl/snow_mound/model.inc.c b/actors/vanilla_actors/sl/snow_mound/model.inc.c similarity index 100% rename from actors_vanilla/sl/snow_mound/model.inc.c rename to actors/vanilla_actors/sl/snow_mound/model.inc.c diff --git a/actors_vanilla/sl/texture.inc.c b/actors/vanilla_actors/sl/texture.inc.c similarity index 64% rename from actors_vanilla/sl/texture.inc.c rename to actors/vanilla_actors/sl/texture.inc.c index bb89ff256d..ba5aad002f 100644 --- a/actors_vanilla/sl/texture.inc.c +++ b/actors/vanilla_actors/sl/texture.inc.c @@ -1,4 +1,4 @@ // 0x07001000 - 0x07001800 ALIGNED8 static const Texture sl_seg7_texture_07001000[] = { -#include "actors_vanilla/sl/2.rgba16.inc.c" +#include "actors/vanilla_actors/sl/2.rgba16.inc.c" }; diff --git a/actors_vanilla/sl/unused_cracked_ice/collision.inc.c b/actors/vanilla_actors/sl/unused_cracked_ice/collision.inc.c similarity index 100% rename from actors_vanilla/sl/unused_cracked_ice/collision.inc.c rename to actors/vanilla_actors/sl/unused_cracked_ice/collision.inc.c diff --git a/actors_vanilla/sl/unused_cracked_ice/geo.inc.c b/actors/vanilla_actors/sl/unused_cracked_ice/geo.inc.c similarity index 100% rename from actors_vanilla/sl/unused_cracked_ice/geo.inc.c rename to actors/vanilla_actors/sl/unused_cracked_ice/geo.inc.c diff --git a/actors_vanilla/sl/unused_cracked_ice/model.inc.c b/actors/vanilla_actors/sl/unused_cracked_ice/model.inc.c similarity index 100% rename from actors_vanilla/sl/unused_cracked_ice/model.inc.c rename to actors/vanilla_actors/sl/unused_cracked_ice/model.inc.c diff --git a/actors_vanilla/sl/unused_ice_shard/geo.inc.c b/actors/vanilla_actors/sl/unused_ice_shard/geo.inc.c similarity index 100% rename from actors_vanilla/sl/unused_ice_shard/geo.inc.c rename to actors/vanilla_actors/sl/unused_ice_shard/geo.inc.c diff --git a/actors_vanilla/sl/unused_ice_shard/model.inc.c b/actors/vanilla_actors/sl/unused_ice_shard/model.inc.c similarity index 100% rename from actors_vanilla/sl/unused_ice_shard/model.inc.c rename to actors/vanilla_actors/sl/unused_ice_shard/model.inc.c diff --git a/actors/vanilla_actors/ssl/data.c b/actors/vanilla_actors/ssl/data.c new file mode 100644 index 0000000000..a706e8a5cc --- /dev/null +++ b/actors/vanilla_actors/ssl/data.c @@ -0,0 +1,28 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/ssl/texture.inc.c" + +#include "actors/vanilla_actors/ssl/pyramid_top/model.inc.c" +#include "actors/vanilla_actors/ssl/tox_box/model.inc.c" +#include "actors/vanilla_actors/ssl/pyramid_top/collision.inc.c" +#include "actors/vanilla_actors/ssl/tox_box/collision.inc.c" +#include "actors/vanilla_actors/ssl/grindel/model.inc.c" +#include "actors/vanilla_actors/ssl/spindel/model.inc.c" +#include "actors/vanilla_actors/ssl/moving_pyramid_wall/model.inc.c" +#include "actors/vanilla_actors/ssl/pyramid_elevator/model.inc.c" +#include "actors/vanilla_actors/ssl/grindel/collision.inc.c" +#include "actors/vanilla_actors/ssl/spindel/collision.inc.c" +#include "actors/vanilla_actors/ssl/moving_pyramid_wall/collision.inc.c" +#include "actors/vanilla_actors/ssl/pyramid_elevator/collision.inc.c" +#include "actors/vanilla_actors/ssl/eyerok_col/collision.inc.c" diff --git a/actors_vanilla/ssl/eyerok_col/collision.inc.c b/actors/vanilla_actors/ssl/eyerok_col/collision.inc.c similarity index 100% rename from actors_vanilla/ssl/eyerok_col/collision.inc.c rename to actors/vanilla_actors/ssl/eyerok_col/collision.inc.c diff --git a/actors_vanilla/ssl/geo.c b/actors/vanilla_actors/ssl/geo.c similarity index 66% rename from actors_vanilla/ssl/geo.c rename to actors/vanilla_actors/ssl/geo.c index a2fdb17c20..cc0758ed58 100644 --- a/actors_vanilla/ssl/geo.c +++ b/actors/vanilla_actors/ssl/geo.c @@ -11,14 +11,14 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/ssl/header.h" +#include "actors/vanilla_actors/ssl/header.h" -#include "actors_vanilla/ssl/pyramid_top/geo.inc.c" -#include "actors_vanilla/ssl/tox_box/geo.inc.c" -#include "actors_vanilla/ssl/grindel/geo.inc.c" -#include "actors_vanilla/ssl/spindel/geo.inc.c" -#include "actors_vanilla/ssl/moving_pyramid_wall/geo.inc.c" -#include "actors_vanilla/ssl/pyramid_elevator/geo.inc.c" +#include "actors/vanilla_actors/ssl/pyramid_top/geo.inc.c" +#include "actors/vanilla_actors/ssl/tox_box/geo.inc.c" +#include "actors/vanilla_actors/ssl/grindel/geo.inc.c" +#include "actors/vanilla_actors/ssl/spindel/geo.inc.c" +#include "actors/vanilla_actors/ssl/moving_pyramid_wall/geo.inc.c" +#include "actors/vanilla_actors/ssl/pyramid_elevator/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/ssl/grindel/collision.inc.c b/actors/vanilla_actors/ssl/grindel/collision.inc.c similarity index 100% rename from actors_vanilla/ssl/grindel/collision.inc.c rename to actors/vanilla_actors/ssl/grindel/collision.inc.c diff --git a/actors_vanilla/ssl/grindel/geo.inc.c b/actors/vanilla_actors/ssl/grindel/geo.inc.c similarity index 100% rename from actors_vanilla/ssl/grindel/geo.inc.c rename to actors/vanilla_actors/ssl/grindel/geo.inc.c diff --git a/actors_vanilla/ssl/grindel/model.inc.c b/actors/vanilla_actors/ssl/grindel/model.inc.c similarity index 100% rename from actors_vanilla/ssl/grindel/model.inc.c rename to actors/vanilla_actors/ssl/grindel/model.inc.c diff --git a/actors_vanilla/ssl/header.h b/actors/vanilla_actors/ssl/header.h similarity index 100% rename from actors_vanilla/ssl/header.h rename to actors/vanilla_actors/ssl/header.h diff --git a/actors_vanilla/ssl/moving_pyramid_wall/collision.inc.c b/actors/vanilla_actors/ssl/moving_pyramid_wall/collision.inc.c similarity index 100% rename from actors_vanilla/ssl/moving_pyramid_wall/collision.inc.c rename to actors/vanilla_actors/ssl/moving_pyramid_wall/collision.inc.c diff --git a/actors_vanilla/ssl/moving_pyramid_wall/geo.inc.c b/actors/vanilla_actors/ssl/moving_pyramid_wall/geo.inc.c similarity index 100% rename from actors_vanilla/ssl/moving_pyramid_wall/geo.inc.c rename to actors/vanilla_actors/ssl/moving_pyramid_wall/geo.inc.c diff --git a/actors_vanilla/ssl/moving_pyramid_wall/model.inc.c b/actors/vanilla_actors/ssl/moving_pyramid_wall/model.inc.c similarity index 100% rename from actors_vanilla/ssl/moving_pyramid_wall/model.inc.c rename to actors/vanilla_actors/ssl/moving_pyramid_wall/model.inc.c diff --git a/actors_vanilla/ssl/pyramid_elevator/collision.inc.c b/actors/vanilla_actors/ssl/pyramid_elevator/collision.inc.c similarity index 100% rename from actors_vanilla/ssl/pyramid_elevator/collision.inc.c rename to actors/vanilla_actors/ssl/pyramid_elevator/collision.inc.c diff --git a/actors_vanilla/ssl/pyramid_elevator/geo.inc.c b/actors/vanilla_actors/ssl/pyramid_elevator/geo.inc.c similarity index 100% rename from actors_vanilla/ssl/pyramid_elevator/geo.inc.c rename to actors/vanilla_actors/ssl/pyramid_elevator/geo.inc.c diff --git a/actors_vanilla/ssl/pyramid_elevator/model.inc.c b/actors/vanilla_actors/ssl/pyramid_elevator/model.inc.c similarity index 100% rename from actors_vanilla/ssl/pyramid_elevator/model.inc.c rename to actors/vanilla_actors/ssl/pyramid_elevator/model.inc.c diff --git a/actors_vanilla/ssl/pyramid_top/collision.inc.c b/actors/vanilla_actors/ssl/pyramid_top/collision.inc.c similarity index 100% rename from actors_vanilla/ssl/pyramid_top/collision.inc.c rename to actors/vanilla_actors/ssl/pyramid_top/collision.inc.c diff --git a/actors_vanilla/ssl/pyramid_top/geo.inc.c b/actors/vanilla_actors/ssl/pyramid_top/geo.inc.c similarity index 100% rename from actors_vanilla/ssl/pyramid_top/geo.inc.c rename to actors/vanilla_actors/ssl/pyramid_top/geo.inc.c diff --git a/actors_vanilla/ssl/pyramid_top/model.inc.c b/actors/vanilla_actors/ssl/pyramid_top/model.inc.c similarity index 100% rename from actors_vanilla/ssl/pyramid_top/model.inc.c rename to actors/vanilla_actors/ssl/pyramid_top/model.inc.c diff --git a/actors_vanilla/ssl/spindel/collision.inc.c b/actors/vanilla_actors/ssl/spindel/collision.inc.c similarity index 100% rename from actors_vanilla/ssl/spindel/collision.inc.c rename to actors/vanilla_actors/ssl/spindel/collision.inc.c diff --git a/actors_vanilla/ssl/spindel/geo.inc.c b/actors/vanilla_actors/ssl/spindel/geo.inc.c similarity index 100% rename from actors_vanilla/ssl/spindel/geo.inc.c rename to actors/vanilla_actors/ssl/spindel/geo.inc.c diff --git a/actors_vanilla/ssl/spindel/model.inc.c b/actors/vanilla_actors/ssl/spindel/model.inc.c similarity index 100% rename from actors_vanilla/ssl/spindel/model.inc.c rename to actors/vanilla_actors/ssl/spindel/model.inc.c diff --git a/actors_vanilla/ssl/texture.inc.c b/actors/vanilla_actors/ssl/texture.inc.c similarity index 64% rename from actors_vanilla/ssl/texture.inc.c rename to actors/vanilla_actors/ssl/texture.inc.c index a29ca07177..0082f1eef0 100644 --- a/actors_vanilla/ssl/texture.inc.c +++ b/actors/vanilla_actors/ssl/texture.inc.c @@ -1,9 +1,9 @@ // 0x07002800 - 0x07003800 ALIGNED8 static const Texture ssl_seg7_texture_07002800[] = { -#include "actors_vanilla/ssl/5.rgba16.inc.c" +#include "actors/vanilla_actors/ssl/5.rgba16.inc.c" }; // 0x07003800 - 0x07004000 ALIGNED8 static const Texture ssl_seg7_texture_07003800[] = { -#include "actors_vanilla/ssl/6.rgba16.inc.c" +#include "actors/vanilla_actors/ssl/6.rgba16.inc.c" }; diff --git a/actors_vanilla/ssl/tox_box/collision.inc.c b/actors/vanilla_actors/ssl/tox_box/collision.inc.c similarity index 100% rename from actors_vanilla/ssl/tox_box/collision.inc.c rename to actors/vanilla_actors/ssl/tox_box/collision.inc.c diff --git a/actors_vanilla/ssl/tox_box/geo.inc.c b/actors/vanilla_actors/ssl/tox_box/geo.inc.c similarity index 100% rename from actors_vanilla/ssl/tox_box/geo.inc.c rename to actors/vanilla_actors/ssl/tox_box/geo.inc.c diff --git a/actors_vanilla/ssl/tox_box/model.inc.c b/actors/vanilla_actors/ssl/tox_box/model.inc.c similarity index 97% rename from actors_vanilla/ssl/tox_box/model.inc.c rename to actors/vanilla_actors/ssl/tox_box/model.inc.c index ff646697ea..a49f24d333 100644 --- a/actors_vanilla/ssl/tox_box/model.inc.c +++ b/actors/vanilla_actors/ssl/tox_box/model.inc.c @@ -2,22 +2,22 @@ // 0x0700BFA8 - 0x0700C7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700BFA8[] = { -#include "actors_vanilla/ssl/8.rgba16.inc.c" +#include "actors/vanilla_actors/ssl/8.rgba16.inc.c" }; // 0x0700C7A8 - 0x0700D7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700C7A8[] = { -#include "actors_vanilla/ssl/9.rgba16.inc.c" +#include "actors/vanilla_actors/ssl/9.rgba16.inc.c" }; // 0x0700D7A8 - 0x0700E7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700D7A8[] = { -#include "actors_vanilla/ssl/10.rgba16.inc.c" +#include "actors/vanilla_actors/ssl/10.rgba16.inc.c" }; // 0x0700E7A8 - 0x0700F7A8 ALIGNED8 static const Texture ssl_seg7_texture_0700E7A8[] = { -#include "actors_vanilla/ssl/11.rgba16.inc.c" +#include "actors/vanilla_actors/ssl/11.rgba16.inc.c" }; // 0x0700F7A8 - 0x0700F898 diff --git a/actors_vanilla/thi/data.c b/actors/vanilla_actors/thi/data.c similarity index 60% rename from actors_vanilla/thi/data.c rename to actors/vanilla_actors/thi/data.c index c0276b4987..897ea1abd0 100644 --- a/actors_vanilla/thi/data.c +++ b/actors/vanilla_actors/thi/data.c @@ -11,7 +11,7 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/thi/texture.inc.c" +#include "actors/vanilla_actors/thi/texture.inc.c" -#include "actors_vanilla/thi/thi_tops/model.inc.c" -#include "actors_vanilla/thi/thi_tops/collision.inc.c" +#include "actors/vanilla_actors/thi/thi_tops/model.inc.c" +#include "actors/vanilla_actors/thi/thi_tops/collision.inc.c" diff --git a/actors_vanilla/thi/geo.c b/actors/vanilla_actors/thi/geo.c similarity index 83% rename from actors_vanilla/thi/geo.c rename to actors/vanilla_actors/thi/geo.c index b38c3a5f98..b4bb6084d5 100644 --- a/actors_vanilla/thi/geo.c +++ b/actors/vanilla_actors/thi/geo.c @@ -11,9 +11,9 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/thi/header.h" +#include "actors/vanilla_actors/thi/header.h" -#include "actors_vanilla/thi/thi_tops/geo.inc.c" +#include "actors/vanilla_actors/thi/thi_tops/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/thi/header.h b/actors/vanilla_actors/thi/header.h similarity index 100% rename from actors_vanilla/thi/header.h rename to actors/vanilla_actors/thi/header.h diff --git a/actors_vanilla/thi/texture.inc.c b/actors/vanilla_actors/thi/texture.inc.c similarity index 63% rename from actors_vanilla/thi/texture.inc.c rename to actors/vanilla_actors/thi/texture.inc.c index 74ae96cdc1..47146d20fe 100644 --- a/actors_vanilla/thi/texture.inc.c +++ b/actors/vanilla_actors/thi/texture.inc.c @@ -1,4 +1,4 @@ // 0x07000800 - 0x07000802 ALIGNED8 static const Texture thi_seg7_texture_07000800[] = { -#include "actors_vanilla/thi/1.rgba16.inc.c" +#include "actors/vanilla_actors/thi/1.rgba16.inc.c" }; diff --git a/actors_vanilla/thi/thi_tops/collision.inc.c b/actors/vanilla_actors/thi/thi_tops/collision.inc.c similarity index 100% rename from actors_vanilla/thi/thi_tops/collision.inc.c rename to actors/vanilla_actors/thi/thi_tops/collision.inc.c diff --git a/actors_vanilla/thi/thi_tops/geo.inc.c b/actors/vanilla_actors/thi/thi_tops/geo.inc.c similarity index 100% rename from actors_vanilla/thi/thi_tops/geo.inc.c rename to actors/vanilla_actors/thi/thi_tops/geo.inc.c diff --git a/actors_vanilla/thi/thi_tops/model.inc.c b/actors/vanilla_actors/thi/thi_tops/model.inc.c similarity index 100% rename from actors_vanilla/thi/thi_tops/model.inc.c rename to actors/vanilla_actors/thi/thi_tops/model.inc.c diff --git a/actors_vanilla/ttc/clock_hand/collision.inc.c b/actors/vanilla_actors/ttc/clock_hand/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/clock_hand/collision.inc.c rename to actors/vanilla_actors/ttc/clock_hand/collision.inc.c diff --git a/actors_vanilla/ttc/clock_hand/geo.inc.c b/actors/vanilla_actors/ttc/clock_hand/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/clock_hand/geo.inc.c rename to actors/vanilla_actors/ttc/clock_hand/geo.inc.c diff --git a/actors_vanilla/ttc/clock_hand/model.inc.c b/actors/vanilla_actors/ttc/clock_hand/model.inc.c similarity index 100% rename from actors_vanilla/ttc/clock_hand/model.inc.c rename to actors/vanilla_actors/ttc/clock_hand/model.inc.c diff --git a/actors/vanilla_actors/ttc/data.c b/actors/vanilla_actors/ttc/data.c new file mode 100644 index 0000000000..1573a0bdae --- /dev/null +++ b/actors/vanilla_actors/ttc/data.c @@ -0,0 +1,44 @@ +#include +#include + +#include "dialog_ids.h" +#include "surface_terrains.h" +#include "macros.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "types.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/ttc/texture.inc.c" + +#include "actors/vanilla_actors/ttc/rotating_cube/model.inc.c" +#include "actors/vanilla_actors/ttc/rotating_prism/model.inc.c" +#include "actors/vanilla_actors/ttc/pendulum/model.inc.c" +#include "actors/vanilla_actors/ttc/large_treadmill/model.inc.c" +#include "actors/vanilla_actors/ttc/small_treadmill/model.inc.c" +#include "actors/vanilla_actors/ttc/push_block/model.inc.c" +#include "actors/vanilla_actors/ttc/rotating_hexagon/model.inc.c" +#include "actors/vanilla_actors/ttc/rotating_triangle/model.inc.c" +#include "actors/vanilla_actors/ttc/pit_block/model.inc.c" +#include "actors/vanilla_actors/ttc/pit_block_2/model.inc.c" +#include "actors/vanilla_actors/ttc/elevator_platform/model.inc.c" +#include "actors/vanilla_actors/ttc/clock_hand/model.inc.c" +#include "actors/vanilla_actors/ttc/spinner/model.inc.c" +#include "actors/vanilla_actors/ttc/small_gear/model.inc.c" +#include "actors/vanilla_actors/ttc/large_gear/model.inc.c" + +#include "actors/vanilla_actors/ttc/rotating_cube/collision.inc.c" +#include "actors/vanilla_actors/ttc/rotating_prism/collision.inc.c" +#include "actors/vanilla_actors/ttc/pendulum/collision.inc.c" +#include "actors/vanilla_actors/ttc/large_treadmill/collision.inc.c" +#include "actors/vanilla_actors/ttc/small_treadmill/collision.inc.c" +#include "actors/vanilla_actors/ttc/push_block/collision.inc.c" +#include "actors/vanilla_actors/ttc/rotating_hexagon/collision.inc.c" +#include "actors/vanilla_actors/ttc/rotating_triangle/collision.inc.c" +#include "actors/vanilla_actors/ttc/pit_block/collision.inc.c" +#include "actors/vanilla_actors/ttc/pit_block_2/collision.inc.c" +#include "actors/vanilla_actors/ttc/elevator_platform/collision.inc.c" +#include "actors/vanilla_actors/ttc/clock_hand/collision.inc.c" +#include "actors/vanilla_actors/ttc/spinner/collision.inc.c" diff --git a/actors_vanilla/ttc/elevator_platform/collision.inc.c b/actors/vanilla_actors/ttc/elevator_platform/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/elevator_platform/collision.inc.c rename to actors/vanilla_actors/ttc/elevator_platform/collision.inc.c diff --git a/actors_vanilla/ttc/elevator_platform/geo.inc.c b/actors/vanilla_actors/ttc/elevator_platform/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/elevator_platform/geo.inc.c rename to actors/vanilla_actors/ttc/elevator_platform/geo.inc.c diff --git a/actors_vanilla/ttc/elevator_platform/model.inc.c b/actors/vanilla_actors/ttc/elevator_platform/model.inc.c similarity index 100% rename from actors_vanilla/ttc/elevator_platform/model.inc.c rename to actors/vanilla_actors/ttc/elevator_platform/model.inc.c diff --git a/actors_vanilla/ttc/geo.c b/actors/vanilla_actors/ttc/geo.c similarity index 59% rename from actors_vanilla/ttc/geo.c rename to actors/vanilla_actors/ttc/geo.c index 9cc4a4b2d7..fb9727e500 100644 --- a/actors_vanilla/ttc/geo.c +++ b/actors/vanilla_actors/ttc/geo.c @@ -11,23 +11,23 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/ttc/header.h" +#include "actors/vanilla_actors/ttc/header.h" -#include "actors_vanilla/ttc/rotating_cube/geo.inc.c" -#include "actors_vanilla/ttc/rotating_prism/geo.inc.c" -#include "actors_vanilla/ttc/pendulum/geo.inc.c" -#include "actors_vanilla/ttc/large_treadmill/geo.inc.c" -#include "actors_vanilla/ttc/small_treadmill/geo.inc.c" -#include "actors_vanilla/ttc/push_block/geo.inc.c" -#include "actors_vanilla/ttc/rotating_hexagon/geo.inc.c" -#include "actors_vanilla/ttc/rotating_triangle/geo.inc.c" -#include "actors_vanilla/ttc/pit_block/geo.inc.c" -#include "actors_vanilla/ttc/pit_block_2/geo.inc.c" -#include "actors_vanilla/ttc/elevator_platform/geo.inc.c" -#include "actors_vanilla/ttc/clock_hand/geo.inc.c" -#include "actors_vanilla/ttc/spinner/geo.inc.c" -#include "actors_vanilla/ttc/small_gear/geo.inc.c" -#include "actors_vanilla/ttc/large_gear/geo.inc.c" +#include "actors/vanilla_actors/ttc/rotating_cube/geo.inc.c" +#include "actors/vanilla_actors/ttc/rotating_prism/geo.inc.c" +#include "actors/vanilla_actors/ttc/pendulum/geo.inc.c" +#include "actors/vanilla_actors/ttc/large_treadmill/geo.inc.c" +#include "actors/vanilla_actors/ttc/small_treadmill/geo.inc.c" +#include "actors/vanilla_actors/ttc/push_block/geo.inc.c" +#include "actors/vanilla_actors/ttc/rotating_hexagon/geo.inc.c" +#include "actors/vanilla_actors/ttc/rotating_triangle/geo.inc.c" +#include "actors/vanilla_actors/ttc/pit_block/geo.inc.c" +#include "actors/vanilla_actors/ttc/pit_block_2/geo.inc.c" +#include "actors/vanilla_actors/ttc/elevator_platform/geo.inc.c" +#include "actors/vanilla_actors/ttc/clock_hand/geo.inc.c" +#include "actors/vanilla_actors/ttc/spinner/geo.inc.c" +#include "actors/vanilla_actors/ttc/small_gear/geo.inc.c" +#include "actors/vanilla_actors/ttc/large_gear/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/ttc/header.h b/actors/vanilla_actors/ttc/header.h similarity index 100% rename from actors_vanilla/ttc/header.h rename to actors/vanilla_actors/ttc/header.h diff --git a/actors_vanilla/ttc/large_gear/geo.inc.c b/actors/vanilla_actors/ttc/large_gear/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/large_gear/geo.inc.c rename to actors/vanilla_actors/ttc/large_gear/geo.inc.c diff --git a/actors_vanilla/ttc/large_gear/model.inc.c b/actors/vanilla_actors/ttc/large_gear/model.inc.c similarity index 100% rename from actors_vanilla/ttc/large_gear/model.inc.c rename to actors/vanilla_actors/ttc/large_gear/model.inc.c diff --git a/actors_vanilla/ttc/large_treadmill/collision.inc.c b/actors/vanilla_actors/ttc/large_treadmill/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/large_treadmill/collision.inc.c rename to actors/vanilla_actors/ttc/large_treadmill/collision.inc.c diff --git a/actors_vanilla/ttc/large_treadmill/geo.inc.c b/actors/vanilla_actors/ttc/large_treadmill/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/large_treadmill/geo.inc.c rename to actors/vanilla_actors/ttc/large_treadmill/geo.inc.c diff --git a/actors_vanilla/ttc/large_treadmill/model.inc.c b/actors/vanilla_actors/ttc/large_treadmill/model.inc.c similarity index 100% rename from actors_vanilla/ttc/large_treadmill/model.inc.c rename to actors/vanilla_actors/ttc/large_treadmill/model.inc.c diff --git a/actors_vanilla/ttc/pendulum/collision.inc.c b/actors/vanilla_actors/ttc/pendulum/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/pendulum/collision.inc.c rename to actors/vanilla_actors/ttc/pendulum/collision.inc.c diff --git a/actors_vanilla/ttc/pendulum/geo.inc.c b/actors/vanilla_actors/ttc/pendulum/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/pendulum/geo.inc.c rename to actors/vanilla_actors/ttc/pendulum/geo.inc.c diff --git a/actors_vanilla/ttc/pendulum/model.inc.c b/actors/vanilla_actors/ttc/pendulum/model.inc.c similarity index 100% rename from actors_vanilla/ttc/pendulum/model.inc.c rename to actors/vanilla_actors/ttc/pendulum/model.inc.c diff --git a/actors_vanilla/ttc/pit_block/collision.inc.c b/actors/vanilla_actors/ttc/pit_block/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/pit_block/collision.inc.c rename to actors/vanilla_actors/ttc/pit_block/collision.inc.c diff --git a/actors_vanilla/ttc/pit_block/geo.inc.c b/actors/vanilla_actors/ttc/pit_block/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/pit_block/geo.inc.c rename to actors/vanilla_actors/ttc/pit_block/geo.inc.c diff --git a/actors_vanilla/ttc/pit_block/model.inc.c b/actors/vanilla_actors/ttc/pit_block/model.inc.c similarity index 100% rename from actors_vanilla/ttc/pit_block/model.inc.c rename to actors/vanilla_actors/ttc/pit_block/model.inc.c diff --git a/actors_vanilla/ttc/pit_block_2/collision.inc.c b/actors/vanilla_actors/ttc/pit_block_2/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/pit_block_2/collision.inc.c rename to actors/vanilla_actors/ttc/pit_block_2/collision.inc.c diff --git a/actors_vanilla/ttc/pit_block_2/geo.inc.c b/actors/vanilla_actors/ttc/pit_block_2/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/pit_block_2/geo.inc.c rename to actors/vanilla_actors/ttc/pit_block_2/geo.inc.c diff --git a/actors_vanilla/ttc/pit_block_2/model.inc.c b/actors/vanilla_actors/ttc/pit_block_2/model.inc.c similarity index 100% rename from actors_vanilla/ttc/pit_block_2/model.inc.c rename to actors/vanilla_actors/ttc/pit_block_2/model.inc.c diff --git a/actors_vanilla/ttc/push_block/collision.inc.c b/actors/vanilla_actors/ttc/push_block/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/push_block/collision.inc.c rename to actors/vanilla_actors/ttc/push_block/collision.inc.c diff --git a/actors_vanilla/ttc/push_block/geo.inc.c b/actors/vanilla_actors/ttc/push_block/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/push_block/geo.inc.c rename to actors/vanilla_actors/ttc/push_block/geo.inc.c diff --git a/actors_vanilla/ttc/push_block/model.inc.c b/actors/vanilla_actors/ttc/push_block/model.inc.c similarity index 100% rename from actors_vanilla/ttc/push_block/model.inc.c rename to actors/vanilla_actors/ttc/push_block/model.inc.c diff --git a/actors_vanilla/ttc/rotating_cube/collision.inc.c b/actors/vanilla_actors/ttc/rotating_cube/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_cube/collision.inc.c rename to actors/vanilla_actors/ttc/rotating_cube/collision.inc.c diff --git a/actors_vanilla/ttc/rotating_cube/geo.inc.c b/actors/vanilla_actors/ttc/rotating_cube/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_cube/geo.inc.c rename to actors/vanilla_actors/ttc/rotating_cube/geo.inc.c diff --git a/actors_vanilla/ttc/rotating_cube/model.inc.c b/actors/vanilla_actors/ttc/rotating_cube/model.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_cube/model.inc.c rename to actors/vanilla_actors/ttc/rotating_cube/model.inc.c diff --git a/actors_vanilla/ttc/rotating_hexagon/collision.inc.c b/actors/vanilla_actors/ttc/rotating_hexagon/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_hexagon/collision.inc.c rename to actors/vanilla_actors/ttc/rotating_hexagon/collision.inc.c diff --git a/actors_vanilla/ttc/rotating_hexagon/geo.inc.c b/actors/vanilla_actors/ttc/rotating_hexagon/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_hexagon/geo.inc.c rename to actors/vanilla_actors/ttc/rotating_hexagon/geo.inc.c diff --git a/actors_vanilla/ttc/rotating_hexagon/model.inc.c b/actors/vanilla_actors/ttc/rotating_hexagon/model.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_hexagon/model.inc.c rename to actors/vanilla_actors/ttc/rotating_hexagon/model.inc.c diff --git a/actors_vanilla/ttc/rotating_prism/collision.inc.c b/actors/vanilla_actors/ttc/rotating_prism/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_prism/collision.inc.c rename to actors/vanilla_actors/ttc/rotating_prism/collision.inc.c diff --git a/actors_vanilla/ttc/rotating_prism/geo.inc.c b/actors/vanilla_actors/ttc/rotating_prism/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_prism/geo.inc.c rename to actors/vanilla_actors/ttc/rotating_prism/geo.inc.c diff --git a/actors_vanilla/ttc/rotating_prism/model.inc.c b/actors/vanilla_actors/ttc/rotating_prism/model.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_prism/model.inc.c rename to actors/vanilla_actors/ttc/rotating_prism/model.inc.c diff --git a/actors_vanilla/ttc/rotating_triangle/collision.inc.c b/actors/vanilla_actors/ttc/rotating_triangle/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_triangle/collision.inc.c rename to actors/vanilla_actors/ttc/rotating_triangle/collision.inc.c diff --git a/actors_vanilla/ttc/rotating_triangle/geo.inc.c b/actors/vanilla_actors/ttc/rotating_triangle/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_triangle/geo.inc.c rename to actors/vanilla_actors/ttc/rotating_triangle/geo.inc.c diff --git a/actors_vanilla/ttc/rotating_triangle/model.inc.c b/actors/vanilla_actors/ttc/rotating_triangle/model.inc.c similarity index 100% rename from actors_vanilla/ttc/rotating_triangle/model.inc.c rename to actors/vanilla_actors/ttc/rotating_triangle/model.inc.c diff --git a/actors_vanilla/ttc/small_gear/geo.inc.c b/actors/vanilla_actors/ttc/small_gear/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/small_gear/geo.inc.c rename to actors/vanilla_actors/ttc/small_gear/geo.inc.c diff --git a/actors_vanilla/ttc/small_gear/model.inc.c b/actors/vanilla_actors/ttc/small_gear/model.inc.c similarity index 100% rename from actors_vanilla/ttc/small_gear/model.inc.c rename to actors/vanilla_actors/ttc/small_gear/model.inc.c diff --git a/actors_vanilla/ttc/small_treadmill/collision.inc.c b/actors/vanilla_actors/ttc/small_treadmill/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/small_treadmill/collision.inc.c rename to actors/vanilla_actors/ttc/small_treadmill/collision.inc.c diff --git a/actors_vanilla/ttc/small_treadmill/geo.inc.c b/actors/vanilla_actors/ttc/small_treadmill/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/small_treadmill/geo.inc.c rename to actors/vanilla_actors/ttc/small_treadmill/geo.inc.c diff --git a/actors_vanilla/ttc/small_treadmill/model.inc.c b/actors/vanilla_actors/ttc/small_treadmill/model.inc.c similarity index 100% rename from actors_vanilla/ttc/small_treadmill/model.inc.c rename to actors/vanilla_actors/ttc/small_treadmill/model.inc.c diff --git a/actors_vanilla/ttc/spinner/collision.inc.c b/actors/vanilla_actors/ttc/spinner/collision.inc.c similarity index 100% rename from actors_vanilla/ttc/spinner/collision.inc.c rename to actors/vanilla_actors/ttc/spinner/collision.inc.c diff --git a/actors_vanilla/ttc/spinner/geo.inc.c b/actors/vanilla_actors/ttc/spinner/geo.inc.c similarity index 100% rename from actors_vanilla/ttc/spinner/geo.inc.c rename to actors/vanilla_actors/ttc/spinner/geo.inc.c diff --git a/actors_vanilla/ttc/spinner/model.inc.c b/actors/vanilla_actors/ttc/spinner/model.inc.c similarity index 100% rename from actors_vanilla/ttc/spinner/model.inc.c rename to actors/vanilla_actors/ttc/spinner/model.inc.c diff --git a/actors_vanilla/ttc/texture.inc.c b/actors/vanilla_actors/ttc/texture.inc.c similarity index 64% rename from actors_vanilla/ttc/texture.inc.c rename to actors/vanilla_actors/ttc/texture.inc.c index abe601e9f1..1e985f8c34 100644 --- a/actors_vanilla/ttc/texture.inc.c +++ b/actors/vanilla_actors/ttc/texture.inc.c @@ -1,9 +1,9 @@ // 0x07000000 - 0x07000800 ALIGNED8 static const Texture ttc_seg7_texture_07000000[] = { -#include "actors_vanilla/ttc/0.rgba16.inc.c" +#include "actors/vanilla_actors/ttc/0.rgba16.inc.c" }; // 0x07000800 - 0x07001000 ALIGNED8 static const Texture ttc_seg7_texture_07000800[] = { -#include "actors_vanilla/ttc/1.rgba16.inc.c" +#include "actors/vanilla_actors/ttc/1.rgba16.inc.c" }; diff --git a/actors_vanilla/ttm/blue_smiley/geo.inc.c b/actors/vanilla_actors/ttm/blue_smiley/geo.inc.c similarity index 100% rename from actors_vanilla/ttm/blue_smiley/geo.inc.c rename to actors/vanilla_actors/ttm/blue_smiley/geo.inc.c diff --git a/actors_vanilla/ttm/blue_smiley/model.inc.c b/actors/vanilla_actors/ttm/blue_smiley/model.inc.c similarity index 100% rename from actors_vanilla/ttm/blue_smiley/model.inc.c rename to actors/vanilla_actors/ttm/blue_smiley/model.inc.c diff --git a/actors/vanilla_actors/ttm/data.c b/actors/vanilla_actors/ttm/data.c new file mode 100644 index 0000000000..89a422c179 --- /dev/null +++ b/actors/vanilla_actors/ttm/data.c @@ -0,0 +1,23 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/ttm/texture.inc.c" + +#include "actors/vanilla_actors/ttm/rolling_log/model.inc.c" +#include "actors/vanilla_actors/ttm/star_cage/1.inc.c" +#include "actors/vanilla_actors/ttm/star_cage/2.inc.c" +#include "actors/vanilla_actors/ttm/rolling_log/collision.inc.c" +#include "actors/vanilla_actors/ttm/star_cage/collision.inc.c" +#include "actors/vanilla_actors/ttm/blue_smiley/model.inc.c" +#include "actors/vanilla_actors/ttm/yellow_smiley/model.inc.c" +#include "actors/vanilla_actors/ttm/star_smiley/model.inc.c" +#include "actors/vanilla_actors/ttm/moon_smiley/model.inc.c" +#include "actors/vanilla_actors/ttm/slide_exit_podium/model.inc.c" +#include "actors/vanilla_actors/ttm/slide_exit_podium/collision.inc.c" diff --git a/actors_vanilla/ttm/geo.c b/actors/vanilla_actors/ttm/geo.c similarity index 64% rename from actors_vanilla/ttm/geo.c rename to actors/vanilla_actors/ttm/geo.c index a8d3ca4f77..5c828ba605 100644 --- a/actors_vanilla/ttm/geo.c +++ b/actors/vanilla_actors/ttm/geo.c @@ -11,15 +11,15 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/ttm/header.h" +#include "actors/vanilla_actors/ttm/header.h" -#include "actors_vanilla/ttm/star_cage/geo.inc.c" -#include "actors_vanilla/ttm/rolling_log/geo.inc.c" -#include "actors_vanilla/ttm/blue_smiley/geo.inc.c" -#include "actors_vanilla/ttm/yellow_smiley/geo.inc.c" -#include "actors_vanilla/ttm/star_smiley/geo.inc.c" -#include "actors_vanilla/ttm/moon_smiley/geo.inc.c" -#include "actors_vanilla/ttm/slide_exit_podium/geo.inc.c" +#include "actors/vanilla_actors/ttm/star_cage/geo.inc.c" +#include "actors/vanilla_actors/ttm/rolling_log/geo.inc.c" +#include "actors/vanilla_actors/ttm/blue_smiley/geo.inc.c" +#include "actors/vanilla_actors/ttm/yellow_smiley/geo.inc.c" +#include "actors/vanilla_actors/ttm/star_smiley/geo.inc.c" +#include "actors/vanilla_actors/ttm/moon_smiley/geo.inc.c" +#include "actors/vanilla_actors/ttm/slide_exit_podium/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/ttm/header.h b/actors/vanilla_actors/ttm/header.h similarity index 100% rename from actors_vanilla/ttm/header.h rename to actors/vanilla_actors/ttm/header.h diff --git a/actors_vanilla/ttm/moon_smiley/geo.inc.c b/actors/vanilla_actors/ttm/moon_smiley/geo.inc.c similarity index 100% rename from actors_vanilla/ttm/moon_smiley/geo.inc.c rename to actors/vanilla_actors/ttm/moon_smiley/geo.inc.c diff --git a/actors_vanilla/ttm/moon_smiley/model.inc.c b/actors/vanilla_actors/ttm/moon_smiley/model.inc.c similarity index 100% rename from actors_vanilla/ttm/moon_smiley/model.inc.c rename to actors/vanilla_actors/ttm/moon_smiley/model.inc.c diff --git a/actors_vanilla/ttm/rolling_log/collision.inc.c b/actors/vanilla_actors/ttm/rolling_log/collision.inc.c similarity index 100% rename from actors_vanilla/ttm/rolling_log/collision.inc.c rename to actors/vanilla_actors/ttm/rolling_log/collision.inc.c diff --git a/actors_vanilla/ttm/rolling_log/geo.inc.c b/actors/vanilla_actors/ttm/rolling_log/geo.inc.c similarity index 100% rename from actors_vanilla/ttm/rolling_log/geo.inc.c rename to actors/vanilla_actors/ttm/rolling_log/geo.inc.c diff --git a/actors_vanilla/ttm/rolling_log/model.inc.c b/actors/vanilla_actors/ttm/rolling_log/model.inc.c similarity index 100% rename from actors_vanilla/ttm/rolling_log/model.inc.c rename to actors/vanilla_actors/ttm/rolling_log/model.inc.c diff --git a/actors_vanilla/ttm/slide_exit_podium/collision.inc.c b/actors/vanilla_actors/ttm/slide_exit_podium/collision.inc.c similarity index 100% rename from actors_vanilla/ttm/slide_exit_podium/collision.inc.c rename to actors/vanilla_actors/ttm/slide_exit_podium/collision.inc.c diff --git a/actors_vanilla/ttm/slide_exit_podium/geo.inc.c b/actors/vanilla_actors/ttm/slide_exit_podium/geo.inc.c similarity index 100% rename from actors_vanilla/ttm/slide_exit_podium/geo.inc.c rename to actors/vanilla_actors/ttm/slide_exit_podium/geo.inc.c diff --git a/actors_vanilla/ttm/slide_exit_podium/model.inc.c b/actors/vanilla_actors/ttm/slide_exit_podium/model.inc.c similarity index 99% rename from actors_vanilla/ttm/slide_exit_podium/model.inc.c rename to actors/vanilla_actors/ttm/slide_exit_podium/model.inc.c index 1a95e8c2ad..cd0a9f8ec6 100644 --- a/actors_vanilla/ttm/slide_exit_podium/model.inc.c +++ b/actors/vanilla_actors/ttm/slide_exit_podium/model.inc.c @@ -6,7 +6,7 @@ // 0x0702AD30 - 0x0702B530 ALIGNED8 static const Texture ttm_seg7_texture_0702AD30[] = { -#include "actors_vanilla/ttm/8.rgba16.inc.c" +#include "actors/vanilla_actors/ttm/8.rgba16.inc.c" }; // 0x0702B530 - 0x0702B570 diff --git a/actors_vanilla/ttm/star_cage/1.inc.c b/actors/vanilla_actors/ttm/star_cage/1.inc.c similarity index 100% rename from actors_vanilla/ttm/star_cage/1.inc.c rename to actors/vanilla_actors/ttm/star_cage/1.inc.c diff --git a/actors_vanilla/ttm/star_cage/2.inc.c b/actors/vanilla_actors/ttm/star_cage/2.inc.c similarity index 100% rename from actors_vanilla/ttm/star_cage/2.inc.c rename to actors/vanilla_actors/ttm/star_cage/2.inc.c diff --git a/actors_vanilla/ttm/star_cage/collision.inc.c b/actors/vanilla_actors/ttm/star_cage/collision.inc.c similarity index 100% rename from actors_vanilla/ttm/star_cage/collision.inc.c rename to actors/vanilla_actors/ttm/star_cage/collision.inc.c diff --git a/actors_vanilla/ttm/star_cage/geo.inc.c b/actors/vanilla_actors/ttm/star_cage/geo.inc.c similarity index 100% rename from actors_vanilla/ttm/star_cage/geo.inc.c rename to actors/vanilla_actors/ttm/star_cage/geo.inc.c diff --git a/actors_vanilla/ttm/star_smiley/geo.inc.c b/actors/vanilla_actors/ttm/star_smiley/geo.inc.c similarity index 100% rename from actors_vanilla/ttm/star_smiley/geo.inc.c rename to actors/vanilla_actors/ttm/star_smiley/geo.inc.c diff --git a/actors_vanilla/ttm/star_smiley/model.inc.c b/actors/vanilla_actors/ttm/star_smiley/model.inc.c similarity index 100% rename from actors_vanilla/ttm/star_smiley/model.inc.c rename to actors/vanilla_actors/ttm/star_smiley/model.inc.c diff --git a/actors_vanilla/ttm/texture.inc.c b/actors/vanilla_actors/ttm/texture.inc.c similarity index 64% rename from actors_vanilla/ttm/texture.inc.c rename to actors/vanilla_actors/ttm/texture.inc.c index 82b4114c0b..3b748f66b5 100644 --- a/actors_vanilla/ttm/texture.inc.c +++ b/actors/vanilla_actors/ttm/texture.inc.c @@ -1,5 +1,5 @@ // 0x07002000 - 0x07003000 ALIGNED8 static const Texture ttm_seg7_texture_07002000[] = { -#include "actors_vanilla/ttm/4.rgba16.inc.c" +#include "actors/vanilla_actors/ttm/4.rgba16.inc.c" }; diff --git a/actors_vanilla/ttm/yellow_smiley/geo.inc.c b/actors/vanilla_actors/ttm/yellow_smiley/geo.inc.c similarity index 100% rename from actors_vanilla/ttm/yellow_smiley/geo.inc.c rename to actors/vanilla_actors/ttm/yellow_smiley/geo.inc.c diff --git a/actors_vanilla/ttm/yellow_smiley/model.inc.c b/actors/vanilla_actors/ttm/yellow_smiley/model.inc.c similarity index 100% rename from actors_vanilla/ttm/yellow_smiley/model.inc.c rename to actors/vanilla_actors/ttm/yellow_smiley/model.inc.c diff --git a/actors_vanilla/vcutm/data.c b/actors/vanilla_actors/vcutm/data.c similarity index 52% rename from actors_vanilla/vcutm/data.c rename to actors/vanilla_actors/vcutm/data.c index 446863c9e1..661b012d33 100644 --- a/actors_vanilla/vcutm/data.c +++ b/actors/vanilla_actors/vcutm/data.c @@ -7,7 +7,7 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/vcutm/texture.inc.c" +#include "actors/vanilla_actors/vcutm/texture.inc.c" -#include "actors_vanilla/vcutm/seesaw/model.inc.c" -#include "actors_vanilla/vcutm/seesaw/collision.inc.c" +#include "actors/vanilla_actors/vcutm/seesaw/model.inc.c" +#include "actors/vanilla_actors/vcutm/seesaw/collision.inc.c" diff --git a/actors_vanilla/vcutm/geo.c b/actors/vanilla_actors/vcutm/geo.c similarity index 80% rename from actors_vanilla/vcutm/geo.c rename to actors/vanilla_actors/vcutm/geo.c index 4fefae1416..f150663d3e 100644 --- a/actors_vanilla/vcutm/geo.c +++ b/actors/vanilla_actors/vcutm/geo.c @@ -11,9 +11,9 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/vcutm/header.h" +#include "actors/vanilla_actors/vcutm/header.h" -#include "actors_vanilla/vcutm/seesaw/geo.inc.c" +#include "actors/vanilla_actors/vcutm/seesaw/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/vcutm/header.h b/actors/vanilla_actors/vcutm/header.h similarity index 100% rename from actors_vanilla/vcutm/header.h rename to actors/vanilla_actors/vcutm/header.h diff --git a/actors_vanilla/vcutm/seesaw/collision.inc.c b/actors/vanilla_actors/vcutm/seesaw/collision.inc.c similarity index 100% rename from actors_vanilla/vcutm/seesaw/collision.inc.c rename to actors/vanilla_actors/vcutm/seesaw/collision.inc.c diff --git a/actors_vanilla/vcutm/seesaw/geo.inc.c b/actors/vanilla_actors/vcutm/seesaw/geo.inc.c similarity index 100% rename from actors_vanilla/vcutm/seesaw/geo.inc.c rename to actors/vanilla_actors/vcutm/seesaw/geo.inc.c diff --git a/actors_vanilla/vcutm/seesaw/model.inc.c b/actors/vanilla_actors/vcutm/seesaw/model.inc.c similarity index 100% rename from actors_vanilla/vcutm/seesaw/model.inc.c rename to actors/vanilla_actors/vcutm/seesaw/model.inc.c diff --git a/actors_vanilla/vcutm/texture.inc.c b/actors/vanilla_actors/vcutm/texture.inc.c similarity index 63% rename from actors_vanilla/vcutm/texture.inc.c rename to actors/vanilla_actors/vcutm/texture.inc.c index c34586053c..dd21fbc089 100644 --- a/actors_vanilla/vcutm/texture.inc.c +++ b/actors/vanilla_actors/vcutm/texture.inc.c @@ -1,4 +1,4 @@ // 0x07001800 - 0x07002800 ALIGNED8 static const Texture vcutm_seg7_texture_07001800[] = { -#include "actors_vanilla/vcutm/2.rgba16.inc.c" +#include "actors/vanilla_actors/vcutm/2.rgba16.inc.c" }; diff --git a/actors_vanilla/wdw/arrow_lift/collision.inc.c b/actors/vanilla_actors/wdw/arrow_lift/collision.inc.c similarity index 100% rename from actors_vanilla/wdw/arrow_lift/collision.inc.c rename to actors/vanilla_actors/wdw/arrow_lift/collision.inc.c diff --git a/actors_vanilla/wdw/arrow_lift/geo.inc.c b/actors/vanilla_actors/wdw/arrow_lift/geo.inc.c similarity index 100% rename from actors_vanilla/wdw/arrow_lift/geo.inc.c rename to actors/vanilla_actors/wdw/arrow_lift/geo.inc.c diff --git a/actors_vanilla/wdw/arrow_lift/model.inc.c b/actors/vanilla_actors/wdw/arrow_lift/model.inc.c similarity index 100% rename from actors_vanilla/wdw/arrow_lift/model.inc.c rename to actors/vanilla_actors/wdw/arrow_lift/model.inc.c diff --git a/actors/vanilla_actors/wdw/data.c b/actors/vanilla_actors/wdw/data.c new file mode 100644 index 0000000000..2d1e3137a4 --- /dev/null +++ b/actors/vanilla_actors/wdw/data.c @@ -0,0 +1,26 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/wdw/texture.inc.c" + +#include "actors/vanilla_actors/wdw/square_floating_platform/model.inc.c" +#include "actors/vanilla_actors/wdw/arrow_lift/model.inc.c" +#include "actors/vanilla_actors/wdw/water_level_diamond/model.inc.c" +#include "actors/vanilla_actors/wdw/hidden_platform/model.inc.c" +#include "actors/vanilla_actors/wdw/express_elevator/model.inc.c" +#include "actors/vanilla_actors/wdw/rectangular_floating_platform/model.inc.c" +#include "actors/vanilla_actors/wdw/rotating_platform/model.inc.c" +#include "actors/vanilla_actors/wdw/square_floating_platform/collision.inc.c" +#include "actors/vanilla_actors/wdw/arrow_lift/collision.inc.c" +#include "actors/vanilla_actors/wdw/water_level_diamond/collision.inc.c" // Unused +#include "actors/vanilla_actors/wdw/hidden_platform/collision.inc.c" +#include "actors/vanilla_actors/wdw/express_elevator/collision.inc.c" +#include "actors/vanilla_actors/wdw/rectangular_floating_platform/collision.inc.c" +#include "actors/vanilla_actors/wdw/rotating_platform/collision.inc.c" diff --git a/actors_vanilla/wdw/express_elevator/collision.inc.c b/actors/vanilla_actors/wdw/express_elevator/collision.inc.c similarity index 100% rename from actors_vanilla/wdw/express_elevator/collision.inc.c rename to actors/vanilla_actors/wdw/express_elevator/collision.inc.c diff --git a/actors_vanilla/wdw/express_elevator/geo.inc.c b/actors/vanilla_actors/wdw/express_elevator/geo.inc.c similarity index 100% rename from actors_vanilla/wdw/express_elevator/geo.inc.c rename to actors/vanilla_actors/wdw/express_elevator/geo.inc.c diff --git a/actors_vanilla/wdw/express_elevator/model.inc.c b/actors/vanilla_actors/wdw/express_elevator/model.inc.c similarity index 100% rename from actors_vanilla/wdw/express_elevator/model.inc.c rename to actors/vanilla_actors/wdw/express_elevator/model.inc.c diff --git a/actors_vanilla/wdw/geo.c b/actors/vanilla_actors/wdw/geo.c similarity index 64% rename from actors_vanilla/wdw/geo.c rename to actors/vanilla_actors/wdw/geo.c index b4928468a0..996a942a0a 100644 --- a/actors_vanilla/wdw/geo.c +++ b/actors/vanilla_actors/wdw/geo.c @@ -11,15 +11,15 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/wdw/header.h" +#include "actors/vanilla_actors/wdw/header.h" -#include "actors_vanilla/wdw/square_floating_platform/geo.inc.c" -#include "actors_vanilla/wdw/arrow_lift/geo.inc.c" -#include "actors_vanilla/wdw/water_level_diamond/geo.inc.c" -#include "actors_vanilla/wdw/hidden_platform/geo.inc.c" -#include "actors_vanilla/wdw/express_elevator/geo.inc.c" -#include "actors_vanilla/wdw/rectangular_floating_platform/geo.inc.c" -#include "actors_vanilla/wdw/rotating_platform/geo.inc.c" +#include "actors/vanilla_actors/wdw/square_floating_platform/geo.inc.c" +#include "actors/vanilla_actors/wdw/arrow_lift/geo.inc.c" +#include "actors/vanilla_actors/wdw/water_level_diamond/geo.inc.c" +#include "actors/vanilla_actors/wdw/hidden_platform/geo.inc.c" +#include "actors/vanilla_actors/wdw/express_elevator/geo.inc.c" +#include "actors/vanilla_actors/wdw/rectangular_floating_platform/geo.inc.c" +#include "actors/vanilla_actors/wdw/rotating_platform/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/wdw/header.h b/actors/vanilla_actors/wdw/header.h similarity index 100% rename from actors_vanilla/wdw/header.h rename to actors/vanilla_actors/wdw/header.h diff --git a/actors_vanilla/wdw/hidden_platform/collision.inc.c b/actors/vanilla_actors/wdw/hidden_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wdw/hidden_platform/collision.inc.c rename to actors/vanilla_actors/wdw/hidden_platform/collision.inc.c diff --git a/actors_vanilla/wdw/hidden_platform/geo.inc.c b/actors/vanilla_actors/wdw/hidden_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wdw/hidden_platform/geo.inc.c rename to actors/vanilla_actors/wdw/hidden_platform/geo.inc.c diff --git a/actors_vanilla/wdw/hidden_platform/model.inc.c b/actors/vanilla_actors/wdw/hidden_platform/model.inc.c similarity index 100% rename from actors_vanilla/wdw/hidden_platform/model.inc.c rename to actors/vanilla_actors/wdw/hidden_platform/model.inc.c diff --git a/actors_vanilla/wdw/rectangular_floating_platform/collision.inc.c b/actors/vanilla_actors/wdw/rectangular_floating_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wdw/rectangular_floating_platform/collision.inc.c rename to actors/vanilla_actors/wdw/rectangular_floating_platform/collision.inc.c diff --git a/actors_vanilla/wdw/rectangular_floating_platform/geo.inc.c b/actors/vanilla_actors/wdw/rectangular_floating_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wdw/rectangular_floating_platform/geo.inc.c rename to actors/vanilla_actors/wdw/rectangular_floating_platform/geo.inc.c diff --git a/actors_vanilla/wdw/rectangular_floating_platform/model.inc.c b/actors/vanilla_actors/wdw/rectangular_floating_platform/model.inc.c similarity index 100% rename from actors_vanilla/wdw/rectangular_floating_platform/model.inc.c rename to actors/vanilla_actors/wdw/rectangular_floating_platform/model.inc.c diff --git a/actors_vanilla/wdw/rotating_platform/collision.inc.c b/actors/vanilla_actors/wdw/rotating_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wdw/rotating_platform/collision.inc.c rename to actors/vanilla_actors/wdw/rotating_platform/collision.inc.c diff --git a/actors_vanilla/wdw/rotating_platform/geo.inc.c b/actors/vanilla_actors/wdw/rotating_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wdw/rotating_platform/geo.inc.c rename to actors/vanilla_actors/wdw/rotating_platform/geo.inc.c diff --git a/actors_vanilla/wdw/rotating_platform/model.inc.c b/actors/vanilla_actors/wdw/rotating_platform/model.inc.c similarity index 100% rename from actors_vanilla/wdw/rotating_platform/model.inc.c rename to actors/vanilla_actors/wdw/rotating_platform/model.inc.c diff --git a/actors_vanilla/wdw/square_floating_platform/collision.inc.c b/actors/vanilla_actors/wdw/square_floating_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wdw/square_floating_platform/collision.inc.c rename to actors/vanilla_actors/wdw/square_floating_platform/collision.inc.c diff --git a/actors_vanilla/wdw/square_floating_platform/geo.inc.c b/actors/vanilla_actors/wdw/square_floating_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wdw/square_floating_platform/geo.inc.c rename to actors/vanilla_actors/wdw/square_floating_platform/geo.inc.c diff --git a/actors_vanilla/wdw/square_floating_platform/model.inc.c b/actors/vanilla_actors/wdw/square_floating_platform/model.inc.c similarity index 100% rename from actors_vanilla/wdw/square_floating_platform/model.inc.c rename to actors/vanilla_actors/wdw/square_floating_platform/model.inc.c diff --git a/actors_vanilla/wdw/texture.inc.c b/actors/vanilla_actors/wdw/texture.inc.c similarity index 64% rename from actors_vanilla/wdw/texture.inc.c rename to actors/vanilla_actors/wdw/texture.inc.c index 016d195d57..26311d0c50 100644 --- a/actors_vanilla/wdw/texture.inc.c +++ b/actors/vanilla_actors/wdw/texture.inc.c @@ -1,14 +1,14 @@ // 0x07000800 - 0x07001000 ALIGNED8 static const Texture wdw_seg7_texture_07000800[] = { -#include "actors_vanilla/wdw/1.rgba16.inc.c" +#include "actors/vanilla_actors/wdw/1.rgba16.inc.c" }; // 0x07001000 - 0x07001800 ALIGNED8 static const Texture wdw_seg7_texture_07001000[] = { -#include "actors_vanilla/wdw/2.rgba16.inc.c" +#include "actors/vanilla_actors/wdw/2.rgba16.inc.c" }; // 0x07001800 - 0x07002000 ALIGNED8 static const Texture wdw_seg7_texture_07001800[] = { -#include "actors_vanilla/wdw/3.rgba16.inc.c" +#include "actors/vanilla_actors/wdw/3.rgba16.inc.c" }; diff --git a/actors_vanilla/wdw/water_level_diamond/collision.inc.c b/actors/vanilla_actors/wdw/water_level_diamond/collision.inc.c similarity index 100% rename from actors_vanilla/wdw/water_level_diamond/collision.inc.c rename to actors/vanilla_actors/wdw/water_level_diamond/collision.inc.c diff --git a/actors_vanilla/wdw/water_level_diamond/geo.inc.c b/actors/vanilla_actors/wdw/water_level_diamond/geo.inc.c similarity index 100% rename from actors_vanilla/wdw/water_level_diamond/geo.inc.c rename to actors/vanilla_actors/wdw/water_level_diamond/geo.inc.c diff --git a/actors_vanilla/wdw/water_level_diamond/model.inc.c b/actors/vanilla_actors/wdw/water_level_diamond/model.inc.c similarity index 100% rename from actors_vanilla/wdw/water_level_diamond/model.inc.c rename to actors/vanilla_actors/wdw/water_level_diamond/model.inc.c diff --git a/actors_vanilla/wf/10/1.inc.c b/actors/vanilla_actors/wf/10/1.inc.c similarity index 100% rename from actors_vanilla/wf/10/1.inc.c rename to actors/vanilla_actors/wf/10/1.inc.c diff --git a/actors_vanilla/wf/10/2.inc.c b/actors/vanilla_actors/wf/10/2.inc.c similarity index 100% rename from actors_vanilla/wf/10/2.inc.c rename to actors/vanilla_actors/wf/10/2.inc.c diff --git a/actors_vanilla/wf/10/collision.inc.c b/actors/vanilla_actors/wf/10/collision.inc.c similarity index 100% rename from actors_vanilla/wf/10/collision.inc.c rename to actors/vanilla_actors/wf/10/collision.inc.c diff --git a/actors_vanilla/wf/10/geo.inc.c b/actors/vanilla_actors/wf/10/geo.inc.c similarity index 100% rename from actors_vanilla/wf/10/geo.inc.c rename to actors/vanilla_actors/wf/10/geo.inc.c diff --git a/actors_vanilla/wf/11/collision.inc.c b/actors/vanilla_actors/wf/11/collision.inc.c similarity index 100% rename from actors_vanilla/wf/11/collision.inc.c rename to actors/vanilla_actors/wf/11/collision.inc.c diff --git a/actors_vanilla/wf/11/geo.inc.c b/actors/vanilla_actors/wf/11/geo.inc.c similarity index 100% rename from actors_vanilla/wf/11/geo.inc.c rename to actors/vanilla_actors/wf/11/geo.inc.c diff --git a/actors_vanilla/wf/11/model.inc.c b/actors/vanilla_actors/wf/11/model.inc.c similarity index 100% rename from actors_vanilla/wf/11/model.inc.c rename to actors/vanilla_actors/wf/11/model.inc.c diff --git a/actors_vanilla/wf/beta_extending_platform/collision.inc.c b/actors/vanilla_actors/wf/beta_extending_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wf/beta_extending_platform/collision.inc.c rename to actors/vanilla_actors/wf/beta_extending_platform/collision.inc.c diff --git a/actors_vanilla/wf/beta_extending_platform/geo.inc.c b/actors/vanilla_actors/wf/beta_extending_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wf/beta_extending_platform/geo.inc.c rename to actors/vanilla_actors/wf/beta_extending_platform/geo.inc.c diff --git a/actors_vanilla/wf/beta_extending_platform/model.inc.c b/actors/vanilla_actors/wf/beta_extending_platform/model.inc.c similarity index 100% rename from actors_vanilla/wf/beta_extending_platform/model.inc.c rename to actors/vanilla_actors/wf/beta_extending_platform/model.inc.c diff --git a/actors_vanilla/wf/breakable_wall_left/collision.inc.c b/actors/vanilla_actors/wf/breakable_wall_left/collision.inc.c similarity index 100% rename from actors_vanilla/wf/breakable_wall_left/collision.inc.c rename to actors/vanilla_actors/wf/breakable_wall_left/collision.inc.c diff --git a/actors_vanilla/wf/breakable_wall_left/geo.inc.c b/actors/vanilla_actors/wf/breakable_wall_left/geo.inc.c similarity index 100% rename from actors_vanilla/wf/breakable_wall_left/geo.inc.c rename to actors/vanilla_actors/wf/breakable_wall_left/geo.inc.c diff --git a/actors_vanilla/wf/breakable_wall_left/model.inc.c b/actors/vanilla_actors/wf/breakable_wall_left/model.inc.c similarity index 100% rename from actors_vanilla/wf/breakable_wall_left/model.inc.c rename to actors/vanilla_actors/wf/breakable_wall_left/model.inc.c diff --git a/actors_vanilla/wf/breakable_wall_right/collision.inc.c b/actors/vanilla_actors/wf/breakable_wall_right/collision.inc.c similarity index 100% rename from actors_vanilla/wf/breakable_wall_right/collision.inc.c rename to actors/vanilla_actors/wf/breakable_wall_right/collision.inc.c diff --git a/actors_vanilla/wf/breakable_wall_right/geo.inc.c b/actors/vanilla_actors/wf/breakable_wall_right/geo.inc.c similarity index 100% rename from actors_vanilla/wf/breakable_wall_right/geo.inc.c rename to actors/vanilla_actors/wf/breakable_wall_right/geo.inc.c diff --git a/actors_vanilla/wf/breakable_wall_right/model.inc.c b/actors/vanilla_actors/wf/breakable_wall_right/model.inc.c similarity index 100% rename from actors_vanilla/wf/breakable_wall_right/model.inc.c rename to actors/vanilla_actors/wf/breakable_wall_right/model.inc.c diff --git a/actors/vanilla_actors/wf/data.c b/actors/vanilla_actors/wf/data.c new file mode 100644 index 0000000000..5af78c544f --- /dev/null +++ b/actors/vanilla_actors/wf/data.c @@ -0,0 +1,49 @@ +#include +#include "sm64.h" +#include "surface_terrains.h" +#include "moving_texture_macros.h" +#include "surface_terrains.h" +#include "textures.h" +#include "dialog_ids.h" + +#include "make_const_nonconst.h" + +#include "actors/vanilla_actors/wf/header.h" + +#include "actors/vanilla_actors/wf/texture.inc.c" + +#include "actors/vanilla_actors/wf/small_bomp/1.inc.c" +#include "actors/vanilla_actors/wf/small_bomp/2.inc.c" +#include "actors/vanilla_actors/wf/large_bomp/model.inc.c" +#include "actors/vanilla_actors/wf/tumbling_bridge_near/model.inc.c" +#include "actors/vanilla_actors/wf/tumbling_bridge_far/model.inc.c" +#include "actors/vanilla_actors/wf/rotating_wooden_platform/1.inc.c" +#include "actors/vanilla_actors/wf/rotating_wooden_platform/2.inc.c" +#include "actors/vanilla_actors/wf/sliding_platform/model.inc.c" +#include "actors/vanilla_actors/wf/beta_extending_platform/model.inc.c" +#include "actors/vanilla_actors/wf/extending_platform/model.inc.c" +#include "actors/vanilla_actors/wf/breakable_wall_right/model.inc.c" +#include "actors/vanilla_actors/wf/breakable_wall_left/model.inc.c" +#include "actors/vanilla_actors/wf/giant_pole/model.inc.c" +#include "actors/vanilla_actors/wf/rotating_platform/model.inc.c" +#include "actors/vanilla_actors/wf/10/1.inc.c" +#include "actors/vanilla_actors/wf/10/2.inc.c" +#include "actors/vanilla_actors/wf/11/model.inc.c" + +#include "actors/vanilla_actors/wf/kickable_board/1.inc.c" +#include "actors/vanilla_actors/wf/kickable_board/2.inc.c" +#include "actors/vanilla_actors/wf/tower_door/model.inc.c" +#include "actors/vanilla_actors/wf/small_bomp/collision.inc.c" +#include "actors/vanilla_actors/wf/large_bomp/collision.inc.c" +#include "actors/vanilla_actors/wf/rotating_wooden_platform/collision.inc.c" +#include "actors/vanilla_actors/wf/sliding_platform/collision.inc.c" +#include "actors/vanilla_actors/wf/tumbling_bridge_near/collision.inc.c" +#include "actors/vanilla_actors/wf/beta_extending_platform/collision.inc.c" +#include "actors/vanilla_actors/wf/extending_platform/collision.inc.c" +#include "actors/vanilla_actors/wf/breakable_wall_right/collision.inc.c" +#include "actors/vanilla_actors/wf/breakable_wall_left/collision.inc.c" +#include "actors/vanilla_actors/wf/kickable_board/collision.inc.c" +#include "actors/vanilla_actors/wf/tower_door/collision.inc.c" +#include "actors/vanilla_actors/wf/rotating_platform/collision.inc.c" +#include "actors/vanilla_actors/wf/10/collision.inc.c" +#include "actors/vanilla_actors/wf/11/collision.inc.c" diff --git a/actors_vanilla/wf/extending_platform/collision.inc.c b/actors/vanilla_actors/wf/extending_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wf/extending_platform/collision.inc.c rename to actors/vanilla_actors/wf/extending_platform/collision.inc.c diff --git a/actors_vanilla/wf/extending_platform/geo.inc.c b/actors/vanilla_actors/wf/extending_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wf/extending_platform/geo.inc.c rename to actors/vanilla_actors/wf/extending_platform/geo.inc.c diff --git a/actors_vanilla/wf/extending_platform/model.inc.c b/actors/vanilla_actors/wf/extending_platform/model.inc.c similarity index 100% rename from actors_vanilla/wf/extending_platform/model.inc.c rename to actors/vanilla_actors/wf/extending_platform/model.inc.c diff --git a/actors_vanilla/wf/geo.c b/actors/vanilla_actors/wf/geo.c similarity index 64% rename from actors_vanilla/wf/geo.c rename to actors/vanilla_actors/wf/geo.c index 5fd957c4d9..87085bdbf8 100644 --- a/actors_vanilla/wf/geo.c +++ b/actors/vanilla_actors/wf/geo.c @@ -11,24 +11,24 @@ #include "make_const_nonconst.h" -#include "actors_vanilla/wf/header.h" +#include "actors/vanilla_actors/wf/header.h" -#include "actors_vanilla/wf/small_bomp/geo.inc.c" -#include "actors_vanilla/wf/large_bomp/geo.inc.c" -#include "actors_vanilla/wf/rotating_wooden_platform/geo.inc.c" -#include "actors_vanilla/wf/sliding_platform/geo.inc.c" -#include "actors_vanilla/wf/tumbling_bridge_near/geo.inc.c" -#include "actors_vanilla/wf/tumbling_bridge_far/geo.inc.c" -#include "actors_vanilla/wf/beta_extending_platform/geo.inc.c" -#include "actors_vanilla/wf/extending_platform/geo.inc.c" -#include "actors_vanilla/wf/breakable_wall_right/geo.inc.c" -#include "actors_vanilla/wf/breakable_wall_left/geo.inc.c" -#include "actors_vanilla/wf/kickable_board/geo.inc.c" -#include "actors_vanilla/wf/tower_door/geo.inc.c" -#include "actors_vanilla/wf/giant_pole/geo.inc.c" -#include "actors_vanilla/wf/rotating_platform/geo.inc.c" -#include "actors_vanilla/wf/10/geo.inc.c" -#include "actors_vanilla/wf/11/geo.inc.c" +#include "actors/vanilla_actors/wf/small_bomp/geo.inc.c" +#include "actors/vanilla_actors/wf/large_bomp/geo.inc.c" +#include "actors/vanilla_actors/wf/rotating_wooden_platform/geo.inc.c" +#include "actors/vanilla_actors/wf/sliding_platform/geo.inc.c" +#include "actors/vanilla_actors/wf/tumbling_bridge_near/geo.inc.c" +#include "actors/vanilla_actors/wf/tumbling_bridge_far/geo.inc.c" +#include "actors/vanilla_actors/wf/beta_extending_platform/geo.inc.c" +#include "actors/vanilla_actors/wf/extending_platform/geo.inc.c" +#include "actors/vanilla_actors/wf/breakable_wall_right/geo.inc.c" +#include "actors/vanilla_actors/wf/breakable_wall_left/geo.inc.c" +#include "actors/vanilla_actors/wf/kickable_board/geo.inc.c" +#include "actors/vanilla_actors/wf/tower_door/geo.inc.c" +#include "actors/vanilla_actors/wf/giant_pole/geo.inc.c" +#include "actors/vanilla_actors/wf/rotating_platform/geo.inc.c" +#include "actors/vanilla_actors/wf/10/geo.inc.c" +#include "actors/vanilla_actors/wf/11/geo.inc.c" #include "level_commands.h" diff --git a/actors_vanilla/wf/giant_pole/geo.inc.c b/actors/vanilla_actors/wf/giant_pole/geo.inc.c similarity index 100% rename from actors_vanilla/wf/giant_pole/geo.inc.c rename to actors/vanilla_actors/wf/giant_pole/geo.inc.c diff --git a/actors_vanilla/wf/giant_pole/model.inc.c b/actors/vanilla_actors/wf/giant_pole/model.inc.c similarity index 100% rename from actors_vanilla/wf/giant_pole/model.inc.c rename to actors/vanilla_actors/wf/giant_pole/model.inc.c diff --git a/actors_vanilla/wf/header.h b/actors/vanilla_actors/wf/header.h similarity index 100% rename from actors_vanilla/wf/header.h rename to actors/vanilla_actors/wf/header.h diff --git a/actors_vanilla/wf/kickable_board/1.inc.c b/actors/vanilla_actors/wf/kickable_board/1.inc.c similarity index 100% rename from actors_vanilla/wf/kickable_board/1.inc.c rename to actors/vanilla_actors/wf/kickable_board/1.inc.c diff --git a/actors_vanilla/wf/kickable_board/2.inc.c b/actors/vanilla_actors/wf/kickable_board/2.inc.c similarity index 100% rename from actors_vanilla/wf/kickable_board/2.inc.c rename to actors/vanilla_actors/wf/kickable_board/2.inc.c diff --git a/actors_vanilla/wf/kickable_board/collision.inc.c b/actors/vanilla_actors/wf/kickable_board/collision.inc.c similarity index 100% rename from actors_vanilla/wf/kickable_board/collision.inc.c rename to actors/vanilla_actors/wf/kickable_board/collision.inc.c diff --git a/actors_vanilla/wf/kickable_board/geo.inc.c b/actors/vanilla_actors/wf/kickable_board/geo.inc.c similarity index 100% rename from actors_vanilla/wf/kickable_board/geo.inc.c rename to actors/vanilla_actors/wf/kickable_board/geo.inc.c diff --git a/actors_vanilla/wf/large_bomp/collision.inc.c b/actors/vanilla_actors/wf/large_bomp/collision.inc.c similarity index 100% rename from actors_vanilla/wf/large_bomp/collision.inc.c rename to actors/vanilla_actors/wf/large_bomp/collision.inc.c diff --git a/actors_vanilla/wf/large_bomp/geo.inc.c b/actors/vanilla_actors/wf/large_bomp/geo.inc.c similarity index 100% rename from actors_vanilla/wf/large_bomp/geo.inc.c rename to actors/vanilla_actors/wf/large_bomp/geo.inc.c diff --git a/actors_vanilla/wf/large_bomp/model.inc.c b/actors/vanilla_actors/wf/large_bomp/model.inc.c similarity index 100% rename from actors_vanilla/wf/large_bomp/model.inc.c rename to actors/vanilla_actors/wf/large_bomp/model.inc.c diff --git a/actors_vanilla/wf/rotating_platform/collision.inc.c b/actors/vanilla_actors/wf/rotating_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wf/rotating_platform/collision.inc.c rename to actors/vanilla_actors/wf/rotating_platform/collision.inc.c diff --git a/actors_vanilla/wf/rotating_platform/geo.inc.c b/actors/vanilla_actors/wf/rotating_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wf/rotating_platform/geo.inc.c rename to actors/vanilla_actors/wf/rotating_platform/geo.inc.c diff --git a/actors_vanilla/wf/rotating_platform/model.inc.c b/actors/vanilla_actors/wf/rotating_platform/model.inc.c similarity index 100% rename from actors_vanilla/wf/rotating_platform/model.inc.c rename to actors/vanilla_actors/wf/rotating_platform/model.inc.c diff --git a/actors_vanilla/wf/rotating_wooden_platform/1.inc.c b/actors/vanilla_actors/wf/rotating_wooden_platform/1.inc.c similarity index 100% rename from actors_vanilla/wf/rotating_wooden_platform/1.inc.c rename to actors/vanilla_actors/wf/rotating_wooden_platform/1.inc.c diff --git a/actors_vanilla/wf/rotating_wooden_platform/2.inc.c b/actors/vanilla_actors/wf/rotating_wooden_platform/2.inc.c similarity index 100% rename from actors_vanilla/wf/rotating_wooden_platform/2.inc.c rename to actors/vanilla_actors/wf/rotating_wooden_platform/2.inc.c diff --git a/actors_vanilla/wf/rotating_wooden_platform/collision.inc.c b/actors/vanilla_actors/wf/rotating_wooden_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wf/rotating_wooden_platform/collision.inc.c rename to actors/vanilla_actors/wf/rotating_wooden_platform/collision.inc.c diff --git a/actors_vanilla/wf/rotating_wooden_platform/geo.inc.c b/actors/vanilla_actors/wf/rotating_wooden_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wf/rotating_wooden_platform/geo.inc.c rename to actors/vanilla_actors/wf/rotating_wooden_platform/geo.inc.c diff --git a/actors_vanilla/wf/sliding_platform/collision.inc.c b/actors/vanilla_actors/wf/sliding_platform/collision.inc.c similarity index 100% rename from actors_vanilla/wf/sliding_platform/collision.inc.c rename to actors/vanilla_actors/wf/sliding_platform/collision.inc.c diff --git a/actors_vanilla/wf/sliding_platform/geo.inc.c b/actors/vanilla_actors/wf/sliding_platform/geo.inc.c similarity index 100% rename from actors_vanilla/wf/sliding_platform/geo.inc.c rename to actors/vanilla_actors/wf/sliding_platform/geo.inc.c diff --git a/actors_vanilla/wf/sliding_platform/model.inc.c b/actors/vanilla_actors/wf/sliding_platform/model.inc.c similarity index 100% rename from actors_vanilla/wf/sliding_platform/model.inc.c rename to actors/vanilla_actors/wf/sliding_platform/model.inc.c diff --git a/actors_vanilla/wf/small_bomp/1.inc.c b/actors/vanilla_actors/wf/small_bomp/1.inc.c similarity index 100% rename from actors_vanilla/wf/small_bomp/1.inc.c rename to actors/vanilla_actors/wf/small_bomp/1.inc.c diff --git a/actors_vanilla/wf/small_bomp/2.inc.c b/actors/vanilla_actors/wf/small_bomp/2.inc.c similarity index 100% rename from actors_vanilla/wf/small_bomp/2.inc.c rename to actors/vanilla_actors/wf/small_bomp/2.inc.c diff --git a/actors_vanilla/wf/small_bomp/collision.inc.c b/actors/vanilla_actors/wf/small_bomp/collision.inc.c similarity index 100% rename from actors_vanilla/wf/small_bomp/collision.inc.c rename to actors/vanilla_actors/wf/small_bomp/collision.inc.c diff --git a/actors_vanilla/wf/small_bomp/geo.inc.c b/actors/vanilla_actors/wf/small_bomp/geo.inc.c similarity index 100% rename from actors_vanilla/wf/small_bomp/geo.inc.c rename to actors/vanilla_actors/wf/small_bomp/geo.inc.c diff --git a/actors_vanilla/wf/texture.inc.c b/actors/vanilla_actors/wf/texture.inc.c similarity index 56% rename from actors_vanilla/wf/texture.inc.c rename to actors/vanilla_actors/wf/texture.inc.c index 1900ce5fe6..f0bad8bc2b 100644 --- a/actors_vanilla/wf/texture.inc.c +++ b/actors/vanilla_actors/wf/texture.inc.c @@ -1,19 +1,19 @@ ALIGNED8 static const Texture wf_seg7_texture_07000000[] = { -#include "actors_vanilla/wf/0.rgba16.inc.c" +#include "actors/vanilla_actors/wf/0.rgba16.inc.c" }; ALIGNED8 static const Texture wf_seg7_texture_07001000[] = { -#include "actors_vanilla/wf/2.rgba16.inc.c" +#include "actors/vanilla_actors/wf/2.rgba16.inc.c" }; ALIGNED8 static const Texture wf_seg7_texture_07001800[] = { -#include "actors_vanilla/wf/3.rgba16.inc.c" +#include "actors/vanilla_actors/wf/3.rgba16.inc.c" }; ALIGNED8 static const Texture wf_seg7_texture_07002000[] = { -#include "actors_vanilla/wf/4.rgba16.inc.c" +#include "actors/vanilla_actors/wf/4.rgba16.inc.c" }; ALIGNED8 static const Texture wf_seg7_texture_07002800[] = { -#include "actors_vanilla/wf/5.ia8.inc.c" +#include "actors/vanilla_actors/wf/5.ia8.inc.c" }; diff --git a/actors_vanilla/wf/tower_door/collision.inc.c b/actors/vanilla_actors/wf/tower_door/collision.inc.c similarity index 100% rename from actors_vanilla/wf/tower_door/collision.inc.c rename to actors/vanilla_actors/wf/tower_door/collision.inc.c diff --git a/actors_vanilla/wf/tower_door/geo.inc.c b/actors/vanilla_actors/wf/tower_door/geo.inc.c similarity index 100% rename from actors_vanilla/wf/tower_door/geo.inc.c rename to actors/vanilla_actors/wf/tower_door/geo.inc.c diff --git a/actors_vanilla/wf/tower_door/model.inc.c b/actors/vanilla_actors/wf/tower_door/model.inc.c similarity index 100% rename from actors_vanilla/wf/tower_door/model.inc.c rename to actors/vanilla_actors/wf/tower_door/model.inc.c diff --git a/actors_vanilla/wf/tumbling_bridge_far/geo.inc.c b/actors/vanilla_actors/wf/tumbling_bridge_far/geo.inc.c similarity index 100% rename from actors_vanilla/wf/tumbling_bridge_far/geo.inc.c rename to actors/vanilla_actors/wf/tumbling_bridge_far/geo.inc.c diff --git a/actors_vanilla/wf/tumbling_bridge_far/model.inc.c b/actors/vanilla_actors/wf/tumbling_bridge_far/model.inc.c similarity index 100% rename from actors_vanilla/wf/tumbling_bridge_far/model.inc.c rename to actors/vanilla_actors/wf/tumbling_bridge_far/model.inc.c diff --git a/actors_vanilla/wf/tumbling_bridge_near/collision.inc.c b/actors/vanilla_actors/wf/tumbling_bridge_near/collision.inc.c similarity index 100% rename from actors_vanilla/wf/tumbling_bridge_near/collision.inc.c rename to actors/vanilla_actors/wf/tumbling_bridge_near/collision.inc.c diff --git a/actors_vanilla/wf/tumbling_bridge_near/geo.inc.c b/actors/vanilla_actors/wf/tumbling_bridge_near/geo.inc.c similarity index 100% rename from actors_vanilla/wf/tumbling_bridge_near/geo.inc.c rename to actors/vanilla_actors/wf/tumbling_bridge_near/geo.inc.c diff --git a/actors_vanilla/wf/tumbling_bridge_near/model.inc.c b/actors/vanilla_actors/wf/tumbling_bridge_near/model.inc.c similarity index 100% rename from actors_vanilla/wf/tumbling_bridge_near/model.inc.c rename to actors/vanilla_actors/wf/tumbling_bridge_near/model.inc.c diff --git a/actors_vanilla/bbh/data.c b/actors_vanilla/bbh/data.c deleted file mode 100644 index 1f5543ef5e..0000000000 --- a/actors_vanilla/bbh/data.c +++ /dev/null @@ -1,27 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/bbh/texture.inc.c" - -#include "actors_vanilla/bbh/staircase_step/model.inc.c" -#include "actors_vanilla/bbh/tilting_trap_platform/model.inc.c" -#include "actors_vanilla/bbh/tumbling_platform_far/model.inc.c" -#include "actors_vanilla/bbh/tumbling_platform_near/model.inc.c" -#include "actors_vanilla/bbh/moving_bookshelf/model.inc.c" -#include "actors_vanilla/bbh/mesh_elevator/model.inc.c" -#include "actors_vanilla/bbh/merry_go_round/model.inc.c" -#include "actors_vanilla/bbh/coffin/model.inc.c" -#include "actors_vanilla/bbh/staircase_step/collision.inc.c" -#include "actors_vanilla/bbh/tilting_trap_platform/collision.inc.c" -#include "actors_vanilla/bbh/tumbling_platform_near/collision.inc.c" -#include "actors_vanilla/bbh/moving_bookshelf/collision.inc.c" -#include "actors_vanilla/bbh/mesh_elevator/collision.inc.c" -#include "actors_vanilla/bbh/merry_go_round/collision.inc.c" -#include "actors_vanilla/bbh/coffin/collision.inc.c" diff --git a/actors_vanilla/bitdw/data.c b/actors_vanilla/bitdw/data.c deleted file mode 100644 index efd5ad4ece..0000000000 --- a/actors_vanilla/bitdw/data.c +++ /dev/null @@ -1,35 +0,0 @@ -#include -#include - -#include "dialog_ids.h" -#include "surface_terrains.h" -#include "macros.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "types.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/bitdw/texture.inc.c" - -#include "actors_vanilla/bitdw/sliding_platform/model.inc.c" -#include "actors_vanilla/bitdw/seesaw_platform/model.inc.c" -#include "actors_vanilla/bitdw/square_platform/model.inc.c" -#include "actors_vanilla/bitdw/ferris_wheel_axle/model.inc.c" -#include "actors_vanilla/bitdw/ferris_platform/model.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_1/model.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_2/model.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_3/model.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_4/model.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_5/model.inc.c" -#include "actors_vanilla/bitdw/sliding_platform/collision.inc.c" -#include "actors_vanilla/bitdw/seesaw_platform/collision.inc.c" -#include "actors_vanilla/bitdw/square_platform/collision.inc.c" -#include "actors_vanilla/bitdw/ferris_wheel_axle/collision.inc.c" -#include "actors_vanilla/bitdw/ferris_platform/collision.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_1/collision.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_2/collision.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_3/collision.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_4/collision.inc.c" -#include "actors_vanilla/bitdw/collapsing_stairs_5/collision.inc.c" diff --git a/actors_vanilla/bitfs/data.c b/actors_vanilla/bitfs/data.c deleted file mode 100644 index 19e8bdbdf9..0000000000 --- a/actors_vanilla/bitfs/data.c +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include - -#include "dialog_ids.h" -#include "surface_terrains.h" -#include "macros.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "types.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/bitfs/texture.inc.c" - -#include "actors_vanilla/bitfs/elevator/model.inc.c" -#include "actors_vanilla/bitfs/sinking_cage_platform/model.inc.c" -#include "actors_vanilla/bitfs/sinking_cage_pole/model.inc.c" -#include "actors_vanilla/bitfs/tilting_square_platform/model.inc.c" -#include "actors_vanilla/bitfs/tumbling_platform_near/model.inc.c" -#include "actors_vanilla/bitfs/tumbling_platform_far/model.inc.c" -#include "actors_vanilla/bitfs/stretching_platform/1.inc.c" -#include "actors_vanilla/bitfs/stretching_platform/2.inc.c" -#include "actors_vanilla/bitfs/moving_square_platform/model.inc.c" -#include "actors_vanilla/bitfs/sliding_platform/model.inc.c" -#include "actors_vanilla/bitfs/platform_on_track/model.inc.c" -#include "actors_vanilla/bitfs/sinking_platforms/model.inc.c" -#include "actors_vanilla/bitfs/seesaw_platform/model.inc.c" -#include "actors_vanilla/bitfs/elevator/collision.inc.c" -#include "actors_vanilla/bitfs/sinking_cage_platform/collision.inc.c" -#include "actors_vanilla/bitfs/tilting_square_platform/collision.inc.c" -#include "actors_vanilla/bitfs/tumbling_platform_near/collision.inc.c" -#include "actors_vanilla/bitfs/stretching_platform/collision.inc.c" -#include "actors_vanilla/bitfs/moving_square_platform/collision.inc.c" -#include "actors_vanilla/bitfs/sliding_platform/collision.inc.c" -#include "actors_vanilla/bitfs/platform_on_track/collision.inc.c" -#include "actors_vanilla/bitfs/sinking_platforms/collision.inc.c" -#include "actors_vanilla/bitfs/seesaw_platform/collision.inc.c" diff --git a/actors_vanilla/bits/data.c b/actors_vanilla/bits/data.c deleted file mode 100644 index bc8f35c129..0000000000 --- a/actors_vanilla/bits/data.c +++ /dev/null @@ -1,38 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/bits/texture.inc.c" - -#include "actors_vanilla/bits/20/model.inc.c" -#include "actors_vanilla/bits/21/model.inc.c" -#include "actors_vanilla/bits/22/model.inc.c" -#include "actors_vanilla/bits/23/model.inc.c" -#include "actors_vanilla/bits/24/model.inc.c" -#include "actors_vanilla/bits/25/model.inc.c" -#include "actors_vanilla/bits/26/model.inc.c" -#include "actors_vanilla/bits/27/model.inc.c" -#include "actors_vanilla/bits/28/model.inc.c" -#include "actors_vanilla/bits/29/model.inc.c" -#include "actors_vanilla/bits/30/model.inc.c" -#include "actors_vanilla/bits/31/model.inc.c" -#include "actors_vanilla/bits/32/model.inc.c" - -#include "actors_vanilla/bits/20/collision.inc.c" -#include "actors_vanilla/bits/21/collision.inc.c" -#include "actors_vanilla/bits/22/collision.inc.c" -#include "actors_vanilla/bits/23/collision.inc.c" -#include "actors_vanilla/bits/24/collision.inc.c" -#include "actors_vanilla/bits/25/collision.inc.c" -#include "actors_vanilla/bits/26/collision.inc.c" -#include "actors_vanilla/bits/27/collision.inc.c" -#include "actors_vanilla/bits/28/collision.inc.c" -#include "actors_vanilla/bits/29/collision.inc.c" -#include "actors_vanilla/bits/30/collision.inc.c" -#include "actors_vanilla/bits/31/collision.inc.c" -#include "actors_vanilla/bits/32/collision.inc.c" diff --git a/actors_vanilla/bob/data.c b/actors_vanilla/bob/data.c deleted file mode 100644 index 27e3c7decb..0000000000 --- a/actors_vanilla/bob/data.c +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/bob/chain_chomp_gate/model.inc.c" -#include "actors_vanilla/bob/seesaw_platform/model.inc.c" -#include "actors_vanilla/bob/grate_door/model.inc.c" - -#include "actors_vanilla/bob/chain_chomp_gate/collision.inc.c" -#include "actors_vanilla/bob/seesaw_platform/collision.inc.c" -#include "actors_vanilla/bob/grate_door/collision.inc.c" diff --git a/actors_vanilla/castle_grounds/data.c b/actors_vanilla/castle_grounds/data.c deleted file mode 100644 index 81cbd00ded..0000000000 --- a/actors_vanilla/castle_grounds/data.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/castle_grounds/7/model.inc.c" -#include "actors_vanilla/castle_grounds/8/model.inc.c" -#include "actors_vanilla/castle_grounds/11/model.inc.c" -#include "actors_vanilla/castle_grounds/12/model.inc.c" -#ifndef VERSION_JP -#include "actors_vanilla/castle_grounds/13/model.inc.c" -#endif -#include "actors_vanilla/castle_grounds/11/anim.inc.c" -#include "actors_vanilla/castle_grounds/7/collision.inc.c" -#include "actors_vanilla/castle_grounds/8/collision.inc.c" diff --git a/actors_vanilla/castle_inside/data.c b/actors_vanilla/castle_inside/data.c deleted file mode 100644 index f63b4e888f..0000000000 --- a/actors_vanilla/castle_inside/data.c +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/castle_inside/texture.inc.c" - -#include "actors_vanilla/castle_inside/trap_door/model.inc.c" -#include "actors_vanilla/castle_inside/star_door/model.inc.c" -#include "actors_vanilla/castle_inside/pendulum/model.inc.c" -#include "actors_vanilla/castle_inside/clock_minute_hand/model.inc.c" -#include "actors_vanilla/castle_inside/clock_hour_hand/model.inc.c" -#include "actors_vanilla/castle_inside/water_level_pillar/model.inc.c" -#include "actors_vanilla/castle_inside/wing_cap_light/model.inc.c" -#include "actors_vanilla/castle_inside/trap_door/collision.inc.c" -#include "actors_vanilla/castle_inside/star_door/collision.inc.c" -#include "actors_vanilla/castle_inside/water_level_pillar/collision.inc.c" -#include "actors_vanilla/castle_inside/ddd_warp/collision.inc.c" diff --git a/actors_vanilla/ccm/data.c b/actors_vanilla/ccm/data.c deleted file mode 100644 index d69f250454..0000000000 --- a/actors_vanilla/ccm/data.c +++ /dev/null @@ -1,18 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/ccm/texture.inc.c" - -#include "actors_vanilla/ccm/ropeway_lift/1.inc.c" -#include "actors_vanilla/ccm/ropeway_lift/2.inc.c" -#include "actors_vanilla/ccm/snowman_base/model.inc.c" -#include "actors_vanilla/ccm/snowman_head/1.inc.c" -#include "actors_vanilla/ccm/snowman_head/2.inc.c" -#include "actors_vanilla/ccm/ropeway_lift/collision.inc.c" diff --git a/actors_vanilla/ddd/data.c b/actors_vanilla/ddd/data.c deleted file mode 100644 index 97919746f4..0000000000 --- a/actors_vanilla/ddd/data.c +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include - -#include "dialog_ids.h" -#include "surface_terrains.h" -#include "macros.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "types.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/ddd/texture.inc.c" - -#include "actors_vanilla/ddd/sub_door/1.inc.c" -#include "actors_vanilla/ddd/sub_door/2.inc.c" -#include "actors_vanilla/ddd/sub_door/3.inc.c" -#include "actors_vanilla/ddd/submarine/1.inc.c" -#include "actors_vanilla/ddd/submarine/2.inc.c" -#include "actors_vanilla/ddd/pole/model.inc.c" -#include "actors_vanilla/ddd/submarine/collision.inc.c" -#include "actors_vanilla/ddd/sub_door/collision.inc.c" diff --git a/actors_vanilla/hmc/data.c b/actors_vanilla/hmc/data.c deleted file mode 100644 index 593115c8f9..0000000000 --- a/actors_vanilla/hmc/data.c +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/hmc/texture.inc.c" - -#include "actors_vanilla/hmc/elevator_platform/model.inc.c" -#include "actors_vanilla/hmc/arrow_platform/model.inc.c" -#include "actors_vanilla/hmc/arrow_platform_button/model.inc.c" -#include "actors_vanilla/hmc/rolling_rock/model.inc.c" -#include "actors_vanilla/hmc/rolling_rock_fragment_1/model.inc.c" -#include "actors_vanilla/hmc/rolling_rock_fragment_2/model.inc.c" -#include "actors_vanilla/hmc/elevator_platform/collision.inc.c" -#include "actors_vanilla/hmc/grill_door/model.inc.c" -#include "actors_vanilla/hmc/grill_door/collision.inc.c" -#include "actors_vanilla/hmc/arrow_platform/collision.inc.c" -#include "actors_vanilla/hmc/arrow_platform_button/collision.inc.c" diff --git a/actors_vanilla/jrb/data.c b/actors_vanilla/jrb/data.c deleted file mode 100644 index ca520c0033..0000000000 --- a/actors_vanilla/jrb/data.c +++ /dev/null @@ -1,25 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/jrb/header.h" -#include "actors_vanilla/jrb/texture.inc.c" - -#include "actors_vanilla/jrb/rock/model.inc.c" -#include "actors_vanilla/jrb/floating_platform/model.inc.c" -#include "actors_vanilla/jrb/sliding_box/model.inc.c" -#include "actors_vanilla/jrb/wooden_ship/model.inc.c" -#include "actors_vanilla/jrb/falling_pillar/model.inc.c" -#include "actors_vanilla/jrb/falling_pillar_base/model.inc.c" -#include "actors_vanilla/jrb/rock/collision.inc.c" -#include "actors_vanilla/jrb/floating_platform/collision.inc.c" -#include "actors_vanilla/jrb/sliding_box/collision.inc.c" -#include "actors_vanilla/jrb/wooden_ship/collision.inc.c" -#include "actors_vanilla/jrb/falling_pillar_base/collision.inc.c" -#include "actors_vanilla/jrb/unused_lid/collision.inc.c" diff --git a/actors_vanilla/lll/data.c b/actors_vanilla/lll/data.c deleted file mode 100644 index 40d86129e6..0000000000 --- a/actors_vanilla/lll/data.c +++ /dev/null @@ -1,42 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/lll/texture.inc.c" - -#include "actors_vanilla/lll/10/model.inc.c" -#include "actors_vanilla/lll/moving_octagonal_mesh_platform/model.inc.c" -#include "actors_vanilla/lll/drawbridge_part/model.inc.c" -#include "actors_vanilla/lll/rotating_block_fire_bars/model.inc.c" -#include "actors_vanilla/lll/wooden_float_small/model.inc.c" -#include "actors_vanilla/lll/wooden_float_large/model.inc.c" -#include "actors_vanilla/lll/collapsing_wooden_platform/model.inc.c" -#include "actors_vanilla/lll/long_wooden_bridge/model.inc.c" -#include "actors_vanilla/lll/rotating_hexagonal_ring/model.inc.c" -#include "actors_vanilla/lll/sinking_rectangular_platform/model.inc.c" -#include "actors_vanilla/lll/sinking_square_platform/model.inc.c" -#include "actors_vanilla/lll/tilting_square_platform/model.inc.c" -#include "actors_vanilla/lll/puzzle_piece/model.inc.c" -#include "actors_vanilla/lll/sinking_rock_block/model.inc.c" -#include "actors_vanilla/lll/rolling_log/model.inc.c" -#include "actors_vanilla/lll/moving_octagonal_mesh_platform/collision.inc.c" -#include "actors_vanilla/lll/drawbridge_part/collision.inc.c" -#include "actors_vanilla/lll/rotating_block_fire_bars/collision.inc.c" -#include "actors_vanilla/lll/wooden_float_small/collision.inc.c" -#include "actors_vanilla/lll/10/collision.inc.c" -#include "actors_vanilla/lll/collapsing_wooden_platform/collision.inc.c" -#include "actors_vanilla/lll/rotating_hexagonal_ring/collision.inc.c" -#include "actors_vanilla/lll/sinking_rectangular_platform/collision.inc.c" -#include "actors_vanilla/lll/sinking_square_platform/collision.inc.c" -#include "actors_vanilla/lll/tilting_square_platform/collision.inc.c" -#include "actors_vanilla/lll/puzzle_piece/collision.inc.c" -#include "actors_vanilla/lll/sinking_rock_block/collision.inc.c" -#include "actors_vanilla/lll/rolling_log/collision.inc.c" -#include "actors_vanilla/lll/volcano_falling_trap/model.inc.c" -#include "actors_vanilla/lll/volcano_falling_trap/collision.inc.c" diff --git a/actors_vanilla/rr/data.c b/actors_vanilla/rr/data.c deleted file mode 100644 index 16f82d7e61..0000000000 --- a/actors_vanilla/rr/data.c +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/rr/texture.inc.c" - -#include "actors_vanilla/rr/flying_carpet/model.inc.c" -#include "actors_vanilla/rr/swinging_platform/model.inc.c" -#include "actors_vanilla/rr/rotating_bridge_platform/model.inc.c" -#include "actors_vanilla/rr/cruiser_wing/model.inc.c" -#include "actors_vanilla/rr/octagonal_platform/model.inc.c" -#include "actors_vanilla/rr/sliding_platform/model.inc.c" -#include "actors_vanilla/rr/pyramid_platform/model.inc.c" // Unused -#include "actors_vanilla/rr/elevator_platform/model.inc.c" -#include "actors_vanilla/rr/seesaw_platform/model.inc.c" -#include "actors_vanilla/rr/donut_block/1.inc.c" -#include "actors_vanilla/rr/donut_block/2.inc.c" -#include "actors_vanilla/rr/l_platform/model.inc.c" // also unused -#include "actors_vanilla/rr/tricky_triangles_1/model.inc.c" -#include "actors_vanilla/rr/tricky_triangles_2/model.inc.c" -#include "actors_vanilla/rr/tricky_triangles_3/model.inc.c" -#include "actors_vanilla/rr/tricky_triangles_4/model.inc.c" -#include "actors_vanilla/rr/tricky_triangles_5/model.inc.c" -#include "actors_vanilla/rr/flying_carpet/collision.inc.c" -#include "actors_vanilla/rr/swinging_platform/collision.inc.c" -#include "actors_vanilla/rr/rotating_bridge_platform/collision.inc.c" -#include "actors_vanilla/rr/octagonal_platform/collision.inc.c" -#include "actors_vanilla/rr/sliding_platform/collision.inc.c" -#include "actors_vanilla/rr/pyramid_platform/collision.inc.c" -#include "actors_vanilla/rr/elevator_platform/collision.inc.c" -#include "actors_vanilla/rr/seesaw_platform/collision.inc.c" -#include "actors_vanilla/rr/donut_block/collision.inc.c" -#include "actors_vanilla/rr/l_platform/collision.inc.c" -#include "actors_vanilla/rr/tricky_triangles_1/collision.inc.c" -#include "actors_vanilla/rr/tricky_triangles_2/collision.inc.c" -#include "actors_vanilla/rr/tricky_triangles_3/collision.inc.c" -#include "actors_vanilla/rr/tricky_triangles_4/collision.inc.c" -#include "actors_vanilla/rr/tricky_triangles_5/collision.inc.c" diff --git a/actors_vanilla/sl/data.c b/actors_vanilla/sl/data.c deleted file mode 100644 index 47fad140cb..0000000000 --- a/actors_vanilla/sl/data.c +++ /dev/null @@ -1,20 +0,0 @@ -#include -#include - -#include "dialog_ids.h" -#include "surface_terrains.h" -#include "macros.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "types.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/sl/texture.inc.c" - -#include "actors_vanilla/sl/snow_mound/model.inc.c" -#include "actors_vanilla/sl/unused_cracked_ice/model.inc.c" -#include "actors_vanilla/sl/unused_ice_shard/model.inc.c" // Used in the unused behavior when ground pounding the cracked ice show in the above model. -#include "actors_vanilla/sl/snow_mound/collision.inc.c" -#include "actors_vanilla/sl/unused_cracked_ice/collision.inc.c" diff --git a/actors_vanilla/ssl/data.c b/actors_vanilla/ssl/data.c deleted file mode 100644 index 0357effef9..0000000000 --- a/actors_vanilla/ssl/data.c +++ /dev/null @@ -1,28 +0,0 @@ -#include -#include - -#include "dialog_ids.h" -#include "surface_terrains.h" -#include "macros.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "types.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/ssl/texture.inc.c" - -#include "actors_vanilla/ssl/pyramid_top/model.inc.c" -#include "actors_vanilla/ssl/tox_box/model.inc.c" -#include "actors_vanilla/ssl/pyramid_top/collision.inc.c" -#include "actors_vanilla/ssl/tox_box/collision.inc.c" -#include "actors_vanilla/ssl/grindel/model.inc.c" -#include "actors_vanilla/ssl/spindel/model.inc.c" -#include "actors_vanilla/ssl/moving_pyramid_wall/model.inc.c" -#include "actors_vanilla/ssl/pyramid_elevator/model.inc.c" -#include "actors_vanilla/ssl/grindel/collision.inc.c" -#include "actors_vanilla/ssl/spindel/collision.inc.c" -#include "actors_vanilla/ssl/moving_pyramid_wall/collision.inc.c" -#include "actors_vanilla/ssl/pyramid_elevator/collision.inc.c" -#include "actors_vanilla/ssl/eyerok_col/collision.inc.c" diff --git a/actors_vanilla/ttc/data.c b/actors_vanilla/ttc/data.c deleted file mode 100644 index 1b7ec1198b..0000000000 --- a/actors_vanilla/ttc/data.c +++ /dev/null @@ -1,44 +0,0 @@ -#include -#include - -#include "dialog_ids.h" -#include "surface_terrains.h" -#include "macros.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "types.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/ttc/texture.inc.c" - -#include "actors_vanilla/ttc/rotating_cube/model.inc.c" -#include "actors_vanilla/ttc/rotating_prism/model.inc.c" -#include "actors_vanilla/ttc/pendulum/model.inc.c" -#include "actors_vanilla/ttc/large_treadmill/model.inc.c" -#include "actors_vanilla/ttc/small_treadmill/model.inc.c" -#include "actors_vanilla/ttc/push_block/model.inc.c" -#include "actors_vanilla/ttc/rotating_hexagon/model.inc.c" -#include "actors_vanilla/ttc/rotating_triangle/model.inc.c" -#include "actors_vanilla/ttc/pit_block/model.inc.c" -#include "actors_vanilla/ttc/pit_block_2/model.inc.c" -#include "actors_vanilla/ttc/elevator_platform/model.inc.c" -#include "actors_vanilla/ttc/clock_hand/model.inc.c" -#include "actors_vanilla/ttc/spinner/model.inc.c" -#include "actors_vanilla/ttc/small_gear/model.inc.c" -#include "actors_vanilla/ttc/large_gear/model.inc.c" - -#include "actors_vanilla/ttc/rotating_cube/collision.inc.c" -#include "actors_vanilla/ttc/rotating_prism/collision.inc.c" -#include "actors_vanilla/ttc/pendulum/collision.inc.c" -#include "actors_vanilla/ttc/large_treadmill/collision.inc.c" -#include "actors_vanilla/ttc/small_treadmill/collision.inc.c" -#include "actors_vanilla/ttc/push_block/collision.inc.c" -#include "actors_vanilla/ttc/rotating_hexagon/collision.inc.c" -#include "actors_vanilla/ttc/rotating_triangle/collision.inc.c" -#include "actors_vanilla/ttc/pit_block/collision.inc.c" -#include "actors_vanilla/ttc/pit_block_2/collision.inc.c" -#include "actors_vanilla/ttc/elevator_platform/collision.inc.c" -#include "actors_vanilla/ttc/clock_hand/collision.inc.c" -#include "actors_vanilla/ttc/spinner/collision.inc.c" diff --git a/actors_vanilla/ttm/data.c b/actors_vanilla/ttm/data.c deleted file mode 100644 index 0c040663e3..0000000000 --- a/actors_vanilla/ttm/data.c +++ /dev/null @@ -1,23 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/ttm/texture.inc.c" - -#include "actors_vanilla/ttm/rolling_log/model.inc.c" -#include "actors_vanilla/ttm/star_cage/1.inc.c" -#include "actors_vanilla/ttm/star_cage/2.inc.c" -#include "actors_vanilla/ttm/rolling_log/collision.inc.c" -#include "actors_vanilla/ttm/star_cage/collision.inc.c" -#include "actors_vanilla/ttm/blue_smiley/model.inc.c" -#include "actors_vanilla/ttm/yellow_smiley/model.inc.c" -#include "actors_vanilla/ttm/star_smiley/model.inc.c" -#include "actors_vanilla/ttm/moon_smiley/model.inc.c" -#include "actors_vanilla/ttm/slide_exit_podium/model.inc.c" -#include "actors_vanilla/ttm/slide_exit_podium/collision.inc.c" diff --git a/actors_vanilla/wdw/data.c b/actors_vanilla/wdw/data.c deleted file mode 100644 index e81d58b63d..0000000000 --- a/actors_vanilla/wdw/data.c +++ /dev/null @@ -1,26 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/wdw/texture.inc.c" - -#include "actors_vanilla/wdw/square_floating_platform/model.inc.c" -#include "actors_vanilla/wdw/arrow_lift/model.inc.c" -#include "actors_vanilla/wdw/water_level_diamond/model.inc.c" -#include "actors_vanilla/wdw/hidden_platform/model.inc.c" -#include "actors_vanilla/wdw/express_elevator/model.inc.c" -#include "actors_vanilla/wdw/rectangular_floating_platform/model.inc.c" -#include "actors_vanilla/wdw/rotating_platform/model.inc.c" -#include "actors_vanilla/wdw/square_floating_platform/collision.inc.c" -#include "actors_vanilla/wdw/arrow_lift/collision.inc.c" -#include "actors_vanilla/wdw/water_level_diamond/collision.inc.c" // Unused -#include "actors_vanilla/wdw/hidden_platform/collision.inc.c" -#include "actors_vanilla/wdw/express_elevator/collision.inc.c" -#include "actors_vanilla/wdw/rectangular_floating_platform/collision.inc.c" -#include "actors_vanilla/wdw/rotating_platform/collision.inc.c" diff --git a/actors_vanilla/wf/data.c b/actors_vanilla/wf/data.c deleted file mode 100644 index 217710b271..0000000000 --- a/actors_vanilla/wf/data.c +++ /dev/null @@ -1,49 +0,0 @@ -#include -#include "sm64.h" -#include "surface_terrains.h" -#include "moving_texture_macros.h" -#include "surface_terrains.h" -#include "textures.h" -#include "dialog_ids.h" - -#include "make_const_nonconst.h" - -#include "actors_vanilla/wf/header.h" - -#include "actors_vanilla/wf/texture.inc.c" - -#include "actors_vanilla/wf/small_bomp/1.inc.c" -#include "actors_vanilla/wf/small_bomp/2.inc.c" -#include "actors_vanilla/wf/large_bomp/model.inc.c" -#include "actors_vanilla/wf/tumbling_bridge_near/model.inc.c" -#include "actors_vanilla/wf/tumbling_bridge_far/model.inc.c" -#include "actors_vanilla/wf/rotating_wooden_platform/1.inc.c" -#include "actors_vanilla/wf/rotating_wooden_platform/2.inc.c" -#include "actors_vanilla/wf/sliding_platform/model.inc.c" -#include "actors_vanilla/wf/beta_extending_platform/model.inc.c" -#include "actors_vanilla/wf/extending_platform/model.inc.c" -#include "actors_vanilla/wf/breakable_wall_right/model.inc.c" -#include "actors_vanilla/wf/breakable_wall_left/model.inc.c" -#include "actors_vanilla/wf/giant_pole/model.inc.c" -#include "actors_vanilla/wf/rotating_platform/model.inc.c" -#include "actors_vanilla/wf/10/1.inc.c" -#include "actors_vanilla/wf/10/2.inc.c" -#include "actors_vanilla/wf/11/model.inc.c" - -#include "actors_vanilla/wf/kickable_board/1.inc.c" -#include "actors_vanilla/wf/kickable_board/2.inc.c" -#include "actors_vanilla/wf/tower_door/model.inc.c" -#include "actors_vanilla/wf/small_bomp/collision.inc.c" -#include "actors_vanilla/wf/large_bomp/collision.inc.c" -#include "actors_vanilla/wf/rotating_wooden_platform/collision.inc.c" -#include "actors_vanilla/wf/sliding_platform/collision.inc.c" -#include "actors_vanilla/wf/tumbling_bridge_near/collision.inc.c" -#include "actors_vanilla/wf/beta_extending_platform/collision.inc.c" -#include "actors_vanilla/wf/extending_platform/collision.inc.c" -#include "actors_vanilla/wf/breakable_wall_right/collision.inc.c" -#include "actors_vanilla/wf/breakable_wall_left/collision.inc.c" -#include "actors_vanilla/wf/kickable_board/collision.inc.c" -#include "actors_vanilla/wf/tower_door/collision.inc.c" -#include "actors_vanilla/wf/rotating_platform/collision.inc.c" -#include "actors_vanilla/wf/10/collision.inc.c" -#include "actors_vanilla/wf/11/collision.inc.c" diff --git a/assets.json b/assets.json index caa4198089..d7b700688a 100644 --- a/assets.json +++ b/assets.json @@ -534,26 +534,26 @@ "assets/demos/unused.bin": [108,{"jp":[5738696],"us":[5746992],"eu":[5625912],"sh":[5594960]}], "assets/demos/wf.bin": [672,{"jp":[5737276],"us":[5745572],"eu":[5624492],"sh":[5593540]}], "levels/bbh/0.rgba16.png": [32,64,4096,{"jp":[3604960,0],"us":[3611712,0],"eu":[3485312,0],"sh":[3459680,0]}], -"actors_vanilla/bbh/0.rgba16.png": [32,64,4096,{"jp":[3604960,0],"us":[3611712,0],"eu":[3485312,0],"sh":[3459680,0]}], +"actors/vanilla_actors/bbh/0.rgba16.png": [32,64,4096,{"jp":[3604960,0],"us":[3611712,0],"eu":[3485312,0],"sh":[3459680,0]}], "levels/bbh/1.rgba16.png": [32,32,2048,{"jp":[3604960,4096],"us":[3611712,4096],"eu":[3485312,4096],"sh":[3459680,4096]}], "levels/bbh/2.rgba16.png": [32,32,2048,{"jp":[3604960,6144],"us":[3611712,6144],"eu":[3485312,6144],"sh":[3459680,6144]}], "levels/bbh/3.rgba16.png": [32,64,4096,{"jp":[3604960,8192],"us":[3611712,8192],"eu":[3485312,8192],"sh":[3459680,8192]}], -"actors_vanilla/bbh/4.rgba16.png": [16,32,1024,{"jp":[3604960,12288],"us":[3611712,12288],"eu":[3485312,12288],"sh":[3459680,12288]}], -"actors_vanilla/bbh/5.rgba16.png": [32,64,4096,{"jp":[3604960,13312],"us":[3611712,13312],"eu":[3485312,13312],"sh":[3459680,13312]}], -"actors_vanilla/bbh/6.rgba16.png": [16,32,1024,{"jp":[3604960,17408],"us":[3611712,17408],"eu":[3485312,17408],"sh":[3459680,17408]}], -"actors_vanilla/bitdw/0.rgba16.png": [32,32,2048,{"jp":[4533568,0],"us":[4541952,0],"eu":[4415552,0],"sh":[4389920,0]}], +"actors/vanilla_actors/bbh/4.rgba16.png": [16,32,1024,{"jp":[3604960,12288],"us":[3611712,12288],"eu":[3485312,12288],"sh":[3459680,12288]}], +"actors/vanilla_actors/bbh/5.rgba16.png": [32,64,4096,{"jp":[3604960,13312],"us":[3611712,13312],"eu":[3485312,13312],"sh":[3459680,13312]}], +"actors/vanilla_actors/bbh/6.rgba16.png": [16,32,1024,{"jp":[3604960,17408],"us":[3611712,17408],"eu":[3485312,17408],"sh":[3459680,17408]}], +"actors/vanilla_actors/bitdw/0.rgba16.png": [32,32,2048,{"jp":[4533568,0],"us":[4541952,0],"eu":[4415552,0],"sh":[4389920,0]}], "levels/bitdw/0.rgba16.png": [32,32,2048,{"jp":[4533568,0],"us":[4541952,0],"eu":[4415552,0],"sh":[4389920,0]}], "levels/bitdw/1.rgba16.png": [32,32,2048,{"jp":[4533568,2048],"us":[4541952,2048],"eu":[4415552,2048],"sh":[4389920,2048]}], "levels/bitdw/2.rgba16.png": [32,32,2048,{"jp":[4533568,4096],"us":[4541952,4096],"eu":[4415552,4096],"sh":[4389920,4096]}], "levels/bitdw/3.rgba16.png": [32,32,2048,{"jp":[4533568,6144],"us":[4541952,6144],"eu":[4415552,6144],"sh":[4389920,6144]}], -"actors_vanilla/bitfs/0.rgba16.png": [32,64,4096,{"jp":[4584464,0],"us":[4592848,0],"eu":[4466448,0],"sh":[4440816,0]}], +"actors/vanilla_actors/bitfs/0.rgba16.png": [32,64,4096,{"jp":[4584464,0],"us":[4592848,0],"eu":[4466448,0],"sh":[4440816,0]}], "levels/bitfs/0.rgba16.png": [32,64,4096,{"jp":[4584464,0],"us":[4592848,0],"eu":[4466448,0],"sh":[4440816,0]}], -"actors_vanilla/bitfs/1.rgba16.png": [32,32,2048,{"jp":[4584464,4096],"us":[4592848,4096],"eu":[4466448,4096],"sh":[4440816,4096]}], +"actors/vanilla_actors/bitfs/1.rgba16.png": [32,32,2048,{"jp":[4584464,4096],"us":[4592848,4096],"eu":[4466448,4096],"sh":[4440816,4096]}], "levels/bitfs/1.rgba16.png": [32,32,2048,{"jp":[4584464,4096],"us":[4592848,4096],"eu":[4466448,4096],"sh":[4440816,4096]}], "levels/bitfs/2.rgba16.png": [32,32,2048,{"jp":[4584464,6144],"us":[4592848,6144],"eu":[4466448,6144],"sh":[4440816,6144]}], "levels/bits/0.rgba16.png": [32,64,4096,{"jp":[4629216,0],"us":[4637600,0],"eu":[4511200,0],"sh":[4485568,0]}], "levels/bits/1.rgba16.png": [64,32,4096,{"jp":[4629216,4096],"us":[4637600,4096],"eu":[4511200,4096],"sh":[4485568,4096]}], -"actors_vanilla/bits/2.rgba16.png": [32,32,2048,{"jp":[4629216,8192],"us":[4637600,8192],"eu":[4511200,8192],"sh":[4485568,8192]}], +"actors/vanilla_actors/bits/2.rgba16.png": [32,32,2048,{"jp":[4629216,8192],"us":[4637600,8192],"eu":[4511200,8192],"sh":[4485568,8192]}], "levels/bits/2.rgba16.png": [32,32,2048,{"jp":[4629216,8192],"us":[4637600,8192],"eu":[4511200,8192],"sh":[4485568,8192]}], "levels/bob/0.rgba16.png": [32,32,2048,{"jp":[4170512,0],"us":[4178608,0],"eu":[4052208,0],"sh":[4026576,0]}], "levels/bob/1.rgba16.png": [32,32,2048,{"jp":[4170512,2048],"us":[4178608,2048],"eu":[4052208,2048],"sh":[4026576,2048]}], @@ -570,9 +570,9 @@ "levels/castle_grounds/0.rgba16.png": [32,64,4096,{"jp":[4492416,0],"us":[4500416,0],"eu":[4374016,0],"sh":[4348384,0]}], "levels/castle_grounds/1.rgba16.png": [64,32,4096,{"jp":[4492416,4096],"us":[4500416,4096],"eu":[4374016,4096],"sh":[4348384,4096]}], "levels/castle_grounds/2.rgba16.png": [64,32,4096,{"jp":[4492416,8192],"us":[4500416,8192],"eu":[4374016,8192],"sh":[4348384,8192]}], -"actors_vanilla/castle_grounds/3.rgba16.png": [32,64,4096,{"jp":[4492416,51688],"us":[4500416,51688],"eu":[4374016,51688],"sh":[4348384,51688]}], -"actors_vanilla/castle_grounds/4.rgba16.png": [32,64,4096,{"jp":[4492416,55784],"us":[4500416,55784],"eu":[4374016,55784],"sh":[4348384,55784]}], -"actors_vanilla/castle_grounds/5.ia8.png": [64,32,2048,{"us":[4500416,60136],"eu":[4374016,60136],"sh":[4348384,60136]}], +"actors/vanilla_actors/castle_grounds/3.rgba16.png": [32,64,4096,{"jp":[4492416,51688],"us":[4500416,51688],"eu":[4374016,51688],"sh":[4348384,51688]}], +"actors/vanilla_actors/castle_grounds/4.rgba16.png": [32,64,4096,{"jp":[4492416,55784],"us":[4500416,55784],"eu":[4374016,55784],"sh":[4348384,55784]}], +"actors/vanilla_actors/castle_grounds/5.ia8.png": [64,32,2048,{"us":[4500416,60136],"eu":[4374016,60136],"sh":[4348384,60136]}], "levels/castle_inside/1.rgba16.png": [32,32,2048,{"jp":[3754192,2048],"us":[3760960,2048],"eu":[3634560,2048],"sh":[3608928,2048]}], "levels/castle_inside/10.rgba16.png": [32,32,2048,{"jp":[3754192,28672],"us":[3760960,28672],"eu":[3634560,28672],"sh":[3608928,28672]}], "levels/castle_inside/11.rgba16.png": [32,32,2048,{"jp":[3754192,30720],"us":[3760960,30720],"eu":[3634560,30720],"sh":[3608928,30720]}], @@ -610,25 +610,25 @@ "levels/castle_inside/39.rgba16.png": [64,32,4096,{"jp":[3754192,129024],"us":[3760960,129024],"eu":[3634560,129024],"sh":[3608928,129024]}], "levels/castle_inside/4.rgba16.png": [32,32,2048,{"jp":[3754192,12288],"us":[3760960,12288],"eu":[3634560,12288],"sh":[3608928,12288]}], "levels/castle_inside/40.rgba16.png": [64,32,4096,{"jp":[3754192,133120],"us":[3760960,133120],"eu":[3634560,133120],"sh":[3608928,133120]}], -"actors_vanilla/castle_inside/5.rgba16.png": [32,64,4096,{"jp":[3754192,14336],"us":[3760960,14336],"eu":[3634560,14336],"sh":[3608928,14336]}], -"actors_vanilla/castle_inside/6.rgba16.png": [32,64,4096,{"jp":[3754192,18432],"us":[3760960,18432],"eu":[3634560,18432],"sh":[3608928,18432]}], -"actors_vanilla/castle_inside/7.rgba16.png": [32,32,2048,{"jp":[3754192,22528],"us":[3760960,22528],"eu":[3634560,22528],"sh":[3608928,22528]}], +"actors/vanilla_actors/castle_inside/5.rgba16.png": [32,64,4096,{"jp":[3754192,14336],"us":[3760960,14336],"eu":[3634560,14336],"sh":[3608928,14336]}], +"actors/vanilla_actors/castle_inside/6.rgba16.png": [32,64,4096,{"jp":[3754192,18432],"us":[3760960,18432],"eu":[3634560,18432],"sh":[3608928,18432]}], +"actors/vanilla_actors/castle_inside/7.rgba16.png": [32,32,2048,{"jp":[3754192,22528],"us":[3760960,22528],"eu":[3634560,22528],"sh":[3608928,22528]}], "levels/castle_inside/8.rgba16.png": [32,32,2048,{"jp":[3754192,24576],"us":[3760960,24576],"eu":[3634560,24576],"sh":[3608928,24576]}], "levels/castle_inside/9.rgba16.png": [32,32,2048,{"jp":[3754192,26624],"us":[3760960,26624],"eu":[3634560,26624],"sh":[3608928,26624]}], -"actors_vanilla/castle_inside/castle_light.ia16.png": [32,32,2048,{"jp":[3432432,47104],"us":[3439184,47104],"eu":[3312784,47104],"sh":[3287152,47104]}], +"actors/vanilla_actors/castle_inside/castle_light.ia16.png": [32,32,2048,{"jp":[3432432,47104],"us":[3439184,47104],"eu":[3312784,47104],"sh":[3287152,47104]}], "levels/castle_inside/castle_light.ia16.png": [32,32,2048,{"jp":[3432432,47104],"us":[3439184,47104],"eu":[3312784,47104],"sh":[3287152,47104]}], "levels/ccm/0.rgba16.png": [32,32,2048,{"jp":[3677936,0],"us":[3684688,0],"eu":[3558288,0],"sh":[3532656,0]}], "levels/ccm/1.rgba16.png": [32,4,256,{"jp":[3677936,2048],"us":[3684688,2048],"eu":[3558288,2048],"sh":[3532656,2048]}], -"actors_vanilla/ccm/1.rgba16.png": [32,4,256,{"jp":[3677936,2048],"us":[3684688,2048],"eu":[3558288,2048],"sh":[3532656,2048]}], +"actors/vanilla_actors/ccm/1.rgba16.png": [32,4,256,{"jp":[3677936,2048],"us":[3684688,2048],"eu":[3558288,2048],"sh":[3532656,2048]}], "levels/ccm/10.rgba16.png": [32,32,2048,{"jp":[3677936,17152],"us":[3684688,17152],"eu":[3558288,17152],"sh":[3532656,17152]}], "levels/ccm/11.rgba16.png": [32,32,2048,{"jp":[3677936,19200],"us":[3684688,19200],"eu":[3558288,19200],"sh":[3532656,19200]}], -"actors_vanilla/ccm/12.rgba16.png": [32,32,2048,{"jp":[3677936,72024],"us":[3684688,72024],"eu":[3558288,72024],"sh":[3532656,72024]}], +"actors/vanilla_actors/ccm/12.rgba16.png": [32,32,2048,{"jp":[3677936,72024],"us":[3684688,72024],"eu":[3558288,72024],"sh":[3532656,72024]}], "levels/ccm/2.rgba16.png": [32,32,2048,{"jp":[3677936,2304],"us":[3684688,2304],"eu":[3558288,2304],"sh":[3532656,2304]}], -"actors_vanilla/ccm/2.rgba16.png": [32,32,2048,{"jp":[3677936,2304],"us":[3684688,2304],"eu":[3558288,2304],"sh":[3532656,2304]}], -"actors_vanilla/ccm/3.rgba16.png": [32,32,2048,{"jp":[3677936,4352],"us":[3684688,4352],"eu":[3558288,4352],"sh":[3532656,4352]}], +"actors/vanilla_actors/ccm/2.rgba16.png": [32,32,2048,{"jp":[3677936,2304],"us":[3684688,2304],"eu":[3558288,2304],"sh":[3532656,2304]}], +"actors/vanilla_actors/ccm/3.rgba16.png": [32,32,2048,{"jp":[3677936,4352],"us":[3684688,4352],"eu":[3558288,4352],"sh":[3532656,4352]}], "levels/ccm/4.rgba16.png": [32,32,2048,{"jp":[3677936,6400],"us":[3684688,6400],"eu":[3558288,6400],"sh":[3532656,6400]}], -"actors_vanilla/ccm/5.rgba16.png": [32,32,2048,{"jp":[1436272,48240],"us":[1443440,48240],"eu":[1315408,48240],"sh":[1291920,48240]}], -"actors_vanilla/ccm/6.rgba16.png": [32,32,2048,{"jp":[1436272,46192],"us":[1443440,46192],"eu":[1315408,46192],"sh":[1291920,46192]}], +"actors/vanilla_actors/ccm/5.rgba16.png": [32,32,2048,{"jp":[1436272,48240],"us":[1443440,48240],"eu":[1315408,48240],"sh":[1291920,48240]}], +"actors/vanilla_actors/ccm/6.rgba16.png": [32,32,2048,{"jp":[1436272,46192],"us":[1443440,46192],"eu":[1315408,46192],"sh":[1291920,46192]}], "levels/ccm/7.rgba16.png": [32,32,2048,{"jp":[3677936,12544],"us":[3684688,12544],"eu":[3558288,12544],"sh":[3532656,12544]}], "levels/ccm/8.ia16.png": [16,16,512,{"jp":[3677936,14592],"us":[3684688,14592],"eu":[3558288,14592],"sh":[3532656,14592]}], "levels/ccm/9.ia16.png": [32,32,2048,{"jp":[3677936,15104],"us":[3684688,15104],"eu":[3558288,15104],"sh":[3532656,15104]}], @@ -637,12 +637,12 @@ "levels/cotmc/2.rgba16.png": [32,32,2048,{"jp":[4939888,6144],"us":[4948176,6144],"eu":[4827104,6144],"sh":[4796144,6144]}], "levels/cotmc/3.rgba16.png": [32,32,2048,{"jp":[4939888,8192],"us":[4948176,8192],"eu":[4827104,8192],"sh":[4796144,8192]}], "levels/cotmc/4.rgba16.png": [64,16,2048,{"jp":[4939888,10240],"us":[4948176,10240],"eu":[4827104,10240],"sh":[4796144,10240]}], -"actors_vanilla/ddd/0.rgba16.png": [32,64,4096,{"jp":[4765904,0],"us":[4774192,0],"eu":[4647792,0],"sh":[4622160,0]}], +"actors/vanilla_actors/ddd/0.rgba16.png": [32,64,4096,{"jp":[4765904,0],"us":[4774192,0],"eu":[4647792,0],"sh":[4622160,0]}], "levels/ddd/1.rgba16.png": [32,32,2048,{"jp":[3432432,4096],"us":[3439184,4096],"eu":[3312784,4096],"sh":[3287152,4096]}], "levels/ddd/2.rgba16.png": [32,32,2048,{"jp":[4765904,6144],"us":[4774192,6144],"eu":[4647792,6144],"sh":[4622160,6144]}], -"actors_vanilla/ddd/2.rgba16.png": [32,32,2048,{"jp":[4765904,6144],"us":[4774192,6144],"eu":[4647792,6144],"sh":[4622160,6144]}], +"actors/vanilla_actors/ddd/2.rgba16.png": [32,32,2048,{"jp":[4765904,6144],"us":[4774192,6144],"eu":[4647792,6144],"sh":[4622160,6144]}], "levels/ddd/3.rgba16.png": [64,32,4096,{"jp":[4765904,8192],"us":[4774192,8192],"eu":[4647792,8192],"sh":[4622160,8192]}], -"actors_vanilla/ddd/4.rgba16.png": [32,32,2048,{"jp":[4765904,12288],"us":[4774192,12288],"eu":[4647792,12288],"sh":[4622160,12288]}], +"actors/vanilla_actors/ddd/4.rgba16.png": [32,32,2048,{"jp":[4765904,12288],"us":[4774192,12288],"eu":[4647792,12288],"sh":[4622160,12288]}], "levels/ending/cake.png": [153600,{"jp":[4834992,0],"us":[4843280,0],"sh":[4691248,0]}], "levels/ending/cake_eu.png": [143360,{"eu":[4716880,0]}], "levels/ending/eu_023000.rgba16.png": [64,32,4096,{"eu":[4716880,143360]}], @@ -654,10 +654,10 @@ "levels/hmc/0.rgba16.png": [32,64,4096,{"jp":[3993136,0],"us":[4001216,0],"eu":[3874816,0],"sh":[3849184,0]}], "levels/hmc/1.rgba16.png": [32,64,4096,{"jp":[3993136,4096],"us":[4001216,4096],"eu":[3874816,4096],"sh":[3849184,4096]}], "levels/hmc/2.rgba16.png": [32,64,4096,{"jp":[3993136,8192],"us":[4001216,8192],"eu":[3874816,8192],"sh":[3849184,8192]}], -"actors_vanilla/hmc/3.rgba16.png": [32,32,2048,{"jp":[3993136,12288],"us":[4001216,12288],"eu":[3874816,12288],"sh":[3849184,12288]}], -"actors_vanilla/hmc/4.rgba16.png": [32,32,2048,{"jp":[3993136,14336],"us":[4001216,14336],"eu":[3874816,14336],"sh":[3849184,14336]}], -"actors_vanilla/hmc/5.rgba16.png": [32,32,2048,{"jp":[3993136,16384],"us":[4001216,16384],"eu":[3874816,16384],"sh":[3849184,16384]}], -"actors_vanilla/hmc/6.rgba16.png": [32,64,4096,{"jp":[3993136,18432],"us":[4001216,18432],"eu":[3874816,18432],"sh":[3849184,18432]}], +"actors/vanilla_actors/hmc/3.rgba16.png": [32,32,2048,{"jp":[3993136,12288],"us":[4001216,12288],"eu":[3874816,12288],"sh":[3849184,12288]}], +"actors/vanilla_actors/hmc/4.rgba16.png": [32,32,2048,{"jp":[3993136,14336],"us":[4001216,14336],"eu":[3874816,14336],"sh":[3849184,14336]}], +"actors/vanilla_actors/hmc/5.rgba16.png": [32,32,2048,{"jp":[3993136,16384],"us":[4001216,16384],"eu":[3874816,16384],"sh":[3849184,16384]}], +"actors/vanilla_actors/hmc/6.rgba16.png": [32,64,4096,{"jp":[3993136,18432],"us":[4001216,18432],"eu":[3874816,18432],"sh":[3849184,18432]}], "levels/hmc/7.rgba16.png": [32,32,2048,{"jp":[3754192,92160],"us":[3760960,92160],"eu":[3634560,92160],"sh":[3608928,92160]}], "levels/intro/0.rgba16.png": [32,32,2048,{"jp":[2524448,32416],"us":[2532256,32416],"eu":[2401056,32416],"sh":[2377888,32416]}], "levels/intro/1.rgba16.png": [32,32,2048,{"jp":[2524448,34464],"us":[2532256,34464],"eu":[2401056,34464],"sh":[2377888,34464]}], @@ -668,41 +668,41 @@ "levels/intro/3_sh_tm.rgba16.png": [16,16,512,{"sh":[2377888,50336]}], "levels/jrb/0.rgba16.png": [32,32,2048,{"jp":[3432432,4096],"us":[3439184,4096],"eu":[3312784,4096],"sh":[3287152,4096]}], "levels/jrb/1.rgba16.png": [64,32,4096,{"jp":[4294592,2048],"us":[4302688,2048],"eu":[4176288,2048],"sh":[4150656,2048]}], -"actors_vanilla/jrb/2.rgba16.png": [32,32,2048,{"jp":[4294592,6144],"us":[4302688,6144],"eu":[4176288,6144],"sh":[4150656,6144]}], -"actors_vanilla/jrb/3.rgba16.png": [32,32,2048,{"jp":[4294592,8192],"us":[4302688,8192],"eu":[4176288,8192],"sh":[4150656,8192]}], -"actors_vanilla/lll/0.rgba16.png": [32,32,2048,{"jp":[4678592,0],"us":[4687008,0],"eu":[4560608,0],"sh":[4534976,0]}], -"actors_vanilla/lll/1.rgba16.png": [32,32,2048,{"jp":[4678592,2048],"us":[4687008,2048],"eu":[4560608,2048],"sh":[4534976,2048]}], -"actors_vanilla/lll/10.rgba16.png": [32,32,2048,{"jp":[4678592,20480],"us":[4687008,20480],"eu":[4560608,20480],"sh":[4534976,20480]}], -"actors_vanilla/lll/11.rgba16.png": [32,32,2048,{"jp":[4678592,22528],"us":[4687008,22528],"eu":[4560608,22528],"sh":[4534976,22528]}], -"actors_vanilla/lll/12.rgba16.png": [32,32,2048,{"jp":[4678592,24576],"us":[4687008,24576],"eu":[4560608,24576],"sh":[4534976,24576]}], -"actors_vanilla/lll/13.rgba16.png": [32,32,2048,{"jp":[4678592,26624],"us":[4687008,26624],"eu":[4560608,26624],"sh":[4534976,26624]}], -"actors_vanilla/lll/14.rgba16.png": [32,32,2048,{"jp":[4678592,28672],"us":[4687008,28672],"eu":[4560608,28672],"sh":[4534976,28672]}], -"actors_vanilla/lll/15.rgba16.png": [32,32,2048,{"jp":[4678592,30720],"us":[4687008,30720],"eu":[4560608,30720],"sh":[4534976,30720]}], -"actors_vanilla/lll/16.rgba16.png": [32,32,2048,{"jp":[4678592,32768],"us":[4687008,32768],"eu":[4560608,32768],"sh":[4534976,32768]}], -"actors_vanilla/lll/17.rgba16.png": [32,32,2048,{"jp":[4678592,34816],"us":[4687008,34816],"eu":[4560608,34816],"sh":[4534976,34816]}], -"actors_vanilla/lll/18.rgba16.png": [32,32,2048,{"jp":[4678592,36864],"us":[4687008,36864],"eu":[4560608,36864],"sh":[4534976,36864]}], -"actors_vanilla/lll/19.rgba16.png": [32,32,2048,{"jp":[4678592,38912],"us":[4687008,38912],"eu":[4560608,38912],"sh":[4534976,38912]}], -"actors_vanilla/lll/2.rgba16.png": [32,32,2048,{"jp":[4678592,4096],"us":[4687008,4096],"eu":[4560608,4096],"sh":[4534976,4096]}], -"actors_vanilla/lll/20.rgba16.png": [32,32,2048,{"jp":[4678592,40960],"us":[4687008,40960],"eu":[4560608,40960],"sh":[4534976,40960]}], -"actors_vanilla/lll/21.rgba16.png": [32,32,2048,{"jp":[4678592,43008],"us":[4687008,43008],"eu":[4560608,43008],"sh":[4534976,43008]}], -"actors_vanilla/lll/22.rgba16.png": [32,32,2048,{"jp":[4678592,45056],"us":[4687008,45056],"eu":[4560608,45056],"sh":[4534976,45056]}], -"actors_vanilla/lll/23.rgba16.png": [32,32,2048,{"jp":[4678592,47104],"us":[4687008,47104],"eu":[4560608,47104],"sh":[4534976,47104]}], -"actors_vanilla/lll/24.rgba16.png": [32,32,2048,{"jp":[4678592,49152],"us":[4687008,49152],"eu":[4560608,49152],"sh":[4534976,49152]}], -"actors_vanilla/lll/25.rgba16.png": [32,32,2048,{"jp":[4678592,51200],"us":[4687008,51200],"eu":[4560608,51200],"sh":[4534976,51200]}], +"actors/vanilla_actors/jrb/2.rgba16.png": [32,32,2048,{"jp":[4294592,6144],"us":[4302688,6144],"eu":[4176288,6144],"sh":[4150656,6144]}], +"actors/vanilla_actors/jrb/3.rgba16.png": [32,32,2048,{"jp":[4294592,8192],"us":[4302688,8192],"eu":[4176288,8192],"sh":[4150656,8192]}], +"actors/vanilla_actors/lll/0.rgba16.png": [32,32,2048,{"jp":[4678592,0],"us":[4687008,0],"eu":[4560608,0],"sh":[4534976,0]}], +"actors/vanilla_actors/lll/1.rgba16.png": [32,32,2048,{"jp":[4678592,2048],"us":[4687008,2048],"eu":[4560608,2048],"sh":[4534976,2048]}], +"actors/vanilla_actors/lll/10.rgba16.png": [32,32,2048,{"jp":[4678592,20480],"us":[4687008,20480],"eu":[4560608,20480],"sh":[4534976,20480]}], +"actors/vanilla_actors/lll/11.rgba16.png": [32,32,2048,{"jp":[4678592,22528],"us":[4687008,22528],"eu":[4560608,22528],"sh":[4534976,22528]}], +"actors/vanilla_actors/lll/12.rgba16.png": [32,32,2048,{"jp":[4678592,24576],"us":[4687008,24576],"eu":[4560608,24576],"sh":[4534976,24576]}], +"actors/vanilla_actors/lll/13.rgba16.png": [32,32,2048,{"jp":[4678592,26624],"us":[4687008,26624],"eu":[4560608,26624],"sh":[4534976,26624]}], +"actors/vanilla_actors/lll/14.rgba16.png": [32,32,2048,{"jp":[4678592,28672],"us":[4687008,28672],"eu":[4560608,28672],"sh":[4534976,28672]}], +"actors/vanilla_actors/lll/15.rgba16.png": [32,32,2048,{"jp":[4678592,30720],"us":[4687008,30720],"eu":[4560608,30720],"sh":[4534976,30720]}], +"actors/vanilla_actors/lll/16.rgba16.png": [32,32,2048,{"jp":[4678592,32768],"us":[4687008,32768],"eu":[4560608,32768],"sh":[4534976,32768]}], +"actors/vanilla_actors/lll/17.rgba16.png": [32,32,2048,{"jp":[4678592,34816],"us":[4687008,34816],"eu":[4560608,34816],"sh":[4534976,34816]}], +"actors/vanilla_actors/lll/18.rgba16.png": [32,32,2048,{"jp":[4678592,36864],"us":[4687008,36864],"eu":[4560608,36864],"sh":[4534976,36864]}], +"actors/vanilla_actors/lll/19.rgba16.png": [32,32,2048,{"jp":[4678592,38912],"us":[4687008,38912],"eu":[4560608,38912],"sh":[4534976,38912]}], +"actors/vanilla_actors/lll/2.rgba16.png": [32,32,2048,{"jp":[4678592,4096],"us":[4687008,4096],"eu":[4560608,4096],"sh":[4534976,4096]}], +"actors/vanilla_actors/lll/20.rgba16.png": [32,32,2048,{"jp":[4678592,40960],"us":[4687008,40960],"eu":[4560608,40960],"sh":[4534976,40960]}], +"actors/vanilla_actors/lll/21.rgba16.png": [32,32,2048,{"jp":[4678592,43008],"us":[4687008,43008],"eu":[4560608,43008],"sh":[4534976,43008]}], +"actors/vanilla_actors/lll/22.rgba16.png": [32,32,2048,{"jp":[4678592,45056],"us":[4687008,45056],"eu":[4560608,45056],"sh":[4534976,45056]}], +"actors/vanilla_actors/lll/23.rgba16.png": [32,32,2048,{"jp":[4678592,47104],"us":[4687008,47104],"eu":[4560608,47104],"sh":[4534976,47104]}], +"actors/vanilla_actors/lll/24.rgba16.png": [32,32,2048,{"jp":[4678592,49152],"us":[4687008,49152],"eu":[4560608,49152],"sh":[4534976,49152]}], +"actors/vanilla_actors/lll/25.rgba16.png": [32,32,2048,{"jp":[4678592,51200],"us":[4687008,51200],"eu":[4560608,51200],"sh":[4534976,51200]}], "levels/lll/26.rgba16.png": [16,16,512,{"jp":[4678592,53248],"us":[4687008,53248],"eu":[4560608,53248],"sh":[4534976,53248]}], "levels/lll/27.ia16.png": [16,16,512,{"jp":[3677936,14592],"us":[3684688,14592],"eu":[3558288,14592],"sh":[3532656,14592]}], "levels/lll/28.rgba16.png": [32,32,2048,{"jp":[4678592,54272],"us":[4687008,54272],"eu":[4560608,54272],"sh":[4534976,54272]}], "levels/lll/29.rgba16.png": [32,32,2048,{"jp":[4678592,56320],"us":[4687008,56320],"eu":[4560608,56320],"sh":[4534976,56320]}], -"actors_vanilla/lll/29.rgba16.png": [32,32,2048,{"jp":[4678592,56320],"us":[4687008,56320],"eu":[4560608,56320],"sh":[4534976,56320]}], +"actors/vanilla_actors/lll/29.rgba16.png": [32,32,2048,{"jp":[4678592,56320],"us":[4687008,56320],"eu":[4560608,56320],"sh":[4534976,56320]}], "levels/lll/3.rgba16.png": [32,32,2048,{"jp":[4678592,6144],"us":[4687008,6144],"eu":[4560608,6144],"sh":[4534976,6144]}], "levels/lll/30.rgba16.png": [32,32,2048,{"jp":[4678592,58368],"us":[4687008,58368],"eu":[4560608,58368],"sh":[4534976,58368]}], "levels/lll/31.rgba16.png": [32,32,2048,{"jp":[4678592,60416],"us":[4687008,60416],"eu":[4560608,60416],"sh":[4534976,60416]}], "levels/lll/32.rgba16.png": [64,16,2048,{"jp":[4678592,62464],"us":[4687008,62464],"eu":[4560608,62464],"sh":[4534976,62464]}], "levels/lll/4.rgba16.png": [32,32,2048,{"jp":[4678592,8192],"us":[4687008,8192],"eu":[4560608,8192],"sh":[4534976,8192]}], "levels/lll/5.rgba16.png": [32,32,2048,{"jp":[4678592,10240],"us":[4687008,10240],"eu":[4560608,10240],"sh":[4534976,10240]}], -"actors_vanilla/lll/6.rgba16.png": [32,32,2048,{"jp":[4678592,12288],"us":[4687008,12288],"eu":[4560608,12288],"sh":[4534976,12288]}], +"actors/vanilla_actors/lll/6.rgba16.png": [32,32,2048,{"jp":[4678592,12288],"us":[4687008,12288],"eu":[4560608,12288],"sh":[4534976,12288]}], "levels/lll/7.rgba16.png": [32,32,2048,{"jp":[3262320,6144],"us":[3269072,6144],"eu":[3142672,6144],"sh":[3117040,6144]}], -"actors_vanilla/lll/8.rgba16.png": [32,32,2048,{"jp":[4678592,16384],"us":[4687008,16384],"eu":[4560608,16384],"sh":[4534976,16384]}], +"actors/vanilla_actors/lll/8.rgba16.png": [32,32,2048,{"jp":[4678592,16384],"us":[4687008,16384],"eu":[4560608,16384],"sh":[4534976,16384]}], "levels/lll/9.rgba16.png": [32,32,2048,{"jp":[4678592,18432],"us":[4687008,18432],"eu":[4560608,18432],"sh":[4534976,18432]}], "levels/menu/main_menu_seg7.00018.rgba16.png": [32,32,2048,{"jp":[2770736,24],"us":[2778544,24],"eu":[2647072,24],"sh":[2625456,24]}], "levels/menu/main_menu_seg7.00818.rgba16.png": [32,32,2048,{"jp":[2770736,2072],"us":[2778544,2072],"eu":[2647072,2072],"sh":[2625456,2072]}], @@ -937,64 +937,64 @@ "levels/pss/0.rgba16.png": [32,32,2048,{"jp":[4905168,0],"us":[4913456,0],"eu":[4792384,0],"sh":[4761424,0]}], "levels/pss/1.ia16.png": [32,32,2048,{"jp":[4905168,2048],"us":[4913456,2048],"eu":[4792384,2048],"sh":[4761424,2048]}], "levels/pss/2.rgba16.png": [32,32,2048,{"jp":[4905168,4096],"us":[4913456,4096],"eu":[4792384,4096],"sh":[4761424,4096]}], -"actors_vanilla/rr/1.rgba16.png": [64,32,4096,{"jp":[4413648,2048],"us":[4421744,2048],"eu":[4295344,2048],"sh":[4269712,2048]}], +"actors/vanilla_actors/rr/1.rgba16.png": [64,32,4096,{"jp":[4413648,2048],"us":[4421744,2048],"eu":[4295344,2048],"sh":[4269712,2048]}], "levels/rr/2.rgba16.png": [32,32,2048,{"jp":[4413648,6144],"us":[4421744,6144],"eu":[4295344,6144],"sh":[4269712,6144]}], -"actors_vanilla/rr/quarter_flying_carpet.rgba16.png": [32,32,2048,{"jp":[4413648,0],"us":[4421744,0],"eu":[4295344,0],"sh":[4269712,0]}], +"actors/vanilla_actors/rr/quarter_flying_carpet.rgba16.png": [32,32,2048,{"jp":[4413648,0],"us":[4421744,0],"eu":[4295344,0],"sh":[4269712,0]}], "levels/sl/0.rgba16.png": [32,32,2048,{"jp":[4210704,0],"us":[4218800,0],"eu":[4092400,0],"sh":[4066768,0]}], "levels/sl/1.rgba16.png": [32,32,2048,{"jp":[4210704,2048],"us":[4218800,2048],"eu":[4092400,2048],"sh":[4066768,2048]}], -"actors_vanilla/sl/2.rgba16.png": [32,32,2048,{"jp":[4210704,4096],"us":[4218800,4096],"eu":[4092400,4096],"sh":[4066768,4096]}], +"actors/vanilla_actors/sl/2.rgba16.png": [32,32,2048,{"jp":[4210704,4096],"us":[4218800,4096],"eu":[4092400,4096],"sh":[4066768,4096]}], "levels/sl/3.rgba16.png": [32,32,2048,{"jp":[4210704,6144],"us":[4218800,6144],"eu":[4092400,6144],"sh":[4066768,6144]}], "levels/sl/4.rgba16.png": [32,32,2048,{"jp":[4210704,8192],"us":[4218800,8192],"eu":[4092400,8192],"sh":[4066768,8192]}], "levels/ssl/0.rgba16.png": [32,32,2048,{"jp":[4085520,0],"us":[4093616,0],"eu":[3967216,0],"sh":[3941584,0]}], "levels/ssl/1.ia16.png": [32,32,2048,{"jp":[4085520,2048],"us":[4093616,2048],"eu":[3967216,2048],"sh":[3941584,2048]}], -"actors_vanilla/ssl/10.rgba16.png": [32,64,4096,{"jp":[4085520,55208],"us":[4093616,55208],"eu":[3967216,55208],"sh":[3941584,55208]}], -"actors_vanilla/ssl/11.rgba16.png": [32,64,4096,{"jp":[4085520,59304],"us":[4093616,59304],"eu":[3967216,59304],"sh":[3941584,59304]}], +"actors/vanilla_actors/ssl/10.rgba16.png": [32,64,4096,{"jp":[4085520,55208],"us":[4093616,55208],"eu":[3967216,55208],"sh":[3941584,55208]}], +"actors/vanilla_actors/ssl/11.rgba16.png": [32,64,4096,{"jp":[4085520,59304],"us":[4093616,59304],"eu":[3967216,59304],"sh":[3941584,59304]}], "levels/ssl/2.rgba16.png": [32,32,2048,{"jp":[4085520,4096],"us":[4093616,4096],"eu":[3967216,4096],"sh":[3941584,4096]}], "levels/ssl/3.rgba16.png": [32,32,2048,{"jp":[4085520,6144],"us":[4093616,6144],"eu":[3967216,6144],"sh":[3941584,6144]}], "levels/ssl/4.rgba16.png": [32,32,2048,{"jp":[4085520,8192],"us":[4093616,8192],"eu":[3967216,8192],"sh":[3941584,8192]}], -"actors_vanilla/ssl/5.rgba16.png": [32,64,4096,{"jp":[4085520,10240],"us":[4093616,10240],"eu":[3967216,10240],"sh":[3941584,10240]}], -"actors_vanilla/ssl/6.rgba16.png": [32,32,2048,{"jp":[4085520,14336],"us":[4093616,14336],"eu":[3967216,14336],"sh":[3941584,14336]}], +"actors/vanilla_actors/ssl/5.rgba16.png": [32,64,4096,{"jp":[4085520,10240],"us":[4093616,10240],"eu":[3967216,10240],"sh":[3941584,10240]}], +"actors/vanilla_actors/ssl/6.rgba16.png": [32,32,2048,{"jp":[4085520,14336],"us":[4093616,14336],"eu":[3967216,14336],"sh":[3941584,14336]}], "levels/ssl/7.rgba16.png": [32,32,2048,{"jp":[3323408,32768],"us":[3330160,32768],"eu":[3203760,32768],"sh":[3178128,32768]}], -"actors_vanilla/ssl/8.rgba16.png": [32,32,2048,{"jp":[4085520,49064],"us":[4093616,49064],"eu":[3967216,49064],"sh":[3941584,49064]}], -"actors_vanilla/ssl/9.rgba16.png": [32,64,4096,{"jp":[4085520,51112],"us":[4093616,51112],"eu":[3967216,51112],"sh":[3941584,51112]}], +"actors/vanilla_actors/ssl/8.rgba16.png": [32,32,2048,{"jp":[4085520,49064],"us":[4093616,49064],"eu":[3967216,49064],"sh":[3941584,49064]}], +"actors/vanilla_actors/ssl/9.rgba16.png": [32,64,4096,{"jp":[4085520,51112],"us":[4093616,51112],"eu":[3967216,51112],"sh":[3941584,51112]}], "levels/thi/0.rgba16.png": [32,32,2048,{"jp":[4335408,0],"us":[4343504,0],"eu":[4217104,0],"sh":[4191472,0]}], "levels/thi/1.rgba16.png": [32,32,2048,{"jp":[4335408,2048],"us":[4343504,2048],"eu":[4217104,2048],"sh":[4191472,2048]}], -"actors_vanilla/thi/1.rgba16.png": [32,32,2048,{"jp":[4335408,2048],"us":[4343504,2048],"eu":[4217104,2048],"sh":[4191472,2048]}], +"actors/vanilla_actors/thi/1.rgba16.png": [32,32,2048,{"jp":[4335408,2048],"us":[4343504,2048],"eu":[4217104,2048],"sh":[4191472,2048]}], "levels/totwc/0.rgba16.png": [32,64,4096,{"jp":[4967376,0],"us":[4975664,0],"eu":[4854592,0],"sh":[4823632,0]}], "levels/totwc/1.rgba16.png": [32,32,2048,{"jp":[4967376,4096],"us":[4975664,4096],"eu":[4854592,4096],"sh":[4823632,4096]}], "levels/totwc/2.rgba16.png": [32,32,2048,{"jp":[4967376,6144],"us":[4975664,6144],"eu":[4854592,6144],"sh":[4823632,6144]}], "levels/totwc/3.ia16.png": [32,32,2048,{"jp":[4967376,8192],"us":[4975664,8192],"eu":[4854592,8192],"sh":[4823632,8192]}], -"actors_vanilla/ttc/0.rgba16.png": [32,32,2048,{"jp":[4370304,0],"us":[4378400,0],"eu":[4252000,0],"sh":[4226368,0]}], -"actors_vanilla/ttc/1.rgba16.png": [16,64,2048,{"jp":[4370304,2048],"us":[4378400,2048],"eu":[4252000,2048],"sh":[4226368,2048]}], +"actors/vanilla_actors/ttc/0.rgba16.png": [32,32,2048,{"jp":[4370304,0],"us":[4378400,0],"eu":[4252000,0],"sh":[4226368,0]}], +"actors/vanilla_actors/ttc/1.rgba16.png": [16,64,2048,{"jp":[4370304,2048],"us":[4378400,2048],"eu":[4252000,2048],"sh":[4226368,2048]}], "levels/ttc/1.rgba16.png": [16,64,2048,{"jp":[4370304,2048],"us":[4378400,2048],"eu":[4252000,2048],"sh":[4226368,2048]}], "levels/ttc/2.rgba16.png": [32,32,2048,{"jp":[4370304,90000],"us":[4378400,90000],"eu":[4252000,90000],"sh":[4226368,90000]}], "levels/ttm/0.ia16.png": [32,32,2048,{"jp":[5044400,0],"us":[5052688,0],"eu":[4931616,0],"sh":[4900656,0]}], "levels/ttm/1.rgba16.png": [32,32,2048,{"jp":[5044400,2048],"us":[5052688,2048],"eu":[4931616,2048],"sh":[4900656,2048]}], "levels/ttm/2.rgba16.png": [32,32,2048,{"jp":[5044400,4096],"us":[5052688,4096],"eu":[4931616,4096],"sh":[4900656,4096]}], "levels/ttm/3.rgba16.png": [32,32,2048,{"jp":[5044400,6144],"us":[5052688,6144],"eu":[4931616,6144],"sh":[4900656,6144]}], -"actors_vanilla/ttm/4.rgba16.png": [32,32,2048,{"jp":[5044400,8192],"us":[5052688,8192],"eu":[4931616,8192],"sh":[4900656,8192]}], +"actors/vanilla_actors/ttm/4.rgba16.png": [32,32,2048,{"jp":[5044400,8192],"us":[5052688,8192],"eu":[4931616,8192],"sh":[4900656,8192]}], "levels/ttm/5.rgba16.png": [32,32,2048,{"jp":[5044400,10240],"us":[5052688,10240],"eu":[4931616,10240],"sh":[4900656,10240]}], "levels/ttm/6.rgba16.png": [64,32,4096,{"jp":[5044400,12288],"us":[5052688,12288],"eu":[4931616,12288],"sh":[4900656,12288]}], "levels/ttm/7.rgba16.png": [64,32,4096,{"jp":[5044400,16384],"us":[5052688,16384],"eu":[4931616,16384],"sh":[4900656,16384]}], -"actors_vanilla/ttm/8.rgba16.png": [32,32,2048,{"jp":[3473152,43008],"us":[3479904,43008],"eu":[3353504,43008],"sh":[3327872,43008]}], +"actors/vanilla_actors/ttm/8.rgba16.png": [32,32,2048,{"jp":[3473152,43008],"us":[3479904,43008],"eu":[3353504,43008],"sh":[3327872,43008]}], "levels/vcutm/0.rgba16.png": [32,32,2048,{"jp":[4564288,0],"us":[4572672,0],"eu":[4446272,0],"sh":[4420640,0]}], "levels/vcutm/1.rgba16.png": [64,32,4096,{"jp":[4564288,2048],"us":[4572672,2048],"eu":[4446272,2048],"sh":[4420640,2048]}], -"actors_vanilla/vcutm/2.rgba16.png": [32,64,4096,{"jp":[4564288,6144],"us":[4572672,6144],"eu":[4446272,6144],"sh":[4420640,6144]}], +"actors/vanilla_actors/vcutm/2.rgba16.png": [32,64,4096,{"jp":[4564288,6144],"us":[4572672,6144],"eu":[4446272,6144],"sh":[4420640,6144]}], "levels/vcutm/3.rgba16.png": [32,32,2048,{"jp":[4564288,10240],"us":[4572672,10240],"eu":[4446272,10240],"sh":[4420640,10240]}], "levels/wdw/0.rgba16.png": [32,32,2048,{"jp":[4246992,0],"us":[4255088,0],"eu":[4128688,0],"sh":[4103056,0]}], "levels/wdw/1.rgba16.png": [32,32,2048,{"jp":[4246992,2048],"us":[4255088,2048],"eu":[4128688,2048],"sh":[4103056,2048]}], -"actors_vanilla/wdw/1.rgba16.png": [32,32,2048,{"jp":[4246992,2048],"us":[4255088,2048],"eu":[4128688,2048],"sh":[4103056,2048]}], -"actors_vanilla/wdw/2.rgba16.png": [32,32,2048,{"jp":[4246992,4096],"us":[4255088,4096],"eu":[4128688,4096],"sh":[4103056,4096]}], -"actors_vanilla/wdw/3.rgba16.png": [32,32,2048,{"jp":[4246992,6144],"us":[4255088,6144],"eu":[4128688,6144],"sh":[4103056,6144]}], +"actors/vanilla_actors/wdw/1.rgba16.png": [32,32,2048,{"jp":[4246992,2048],"us":[4255088,2048],"eu":[4128688,2048],"sh":[4103056,2048]}], +"actors/vanilla_actors/wdw/2.rgba16.png": [32,32,2048,{"jp":[4246992,4096],"us":[4255088,4096],"eu":[4128688,4096],"sh":[4103056,4096]}], +"actors/vanilla_actors/wdw/3.rgba16.png": [32,32,2048,{"jp":[4246992,6144],"us":[4255088,6144],"eu":[4128688,6144],"sh":[4103056,6144]}], "levels/wdw/4.rgba16.png": [32,32,2048,{"jp":[4246992,8192],"us":[4255088,8192],"eu":[4128688,8192],"sh":[4103056,8192]}], -"actors_vanilla/wf/0.rgba16.png": [32,32,2048,{"jp":[4800560,0],"us":[4808848,0],"eu":[4682448,0],"sh":[4656816,0]}], +"actors/vanilla_actors/wf/0.rgba16.png": [32,32,2048,{"jp":[4800560,0],"us":[4808848,0],"eu":[4682448,0],"sh":[4656816,0]}], "levels/wf/0.rgba16.png": [32,32,2048,{"jp":[4800560,0],"us":[4808848,0],"eu":[4682448,0],"sh":[4656816,0]}], "levels/wf/1.rgba16.png": [32,32,2048,{"jp":[4800560,2048],"us":[4808848,2048],"eu":[4682448,2048],"sh":[4656816,2048]}], -"actors_vanilla/wf/2.rgba16.png": [32,32,2048,{"jp":[4800560,4096],"us":[4808848,4096],"eu":[4682448,4096],"sh":[4656816,4096]}], +"actors/vanilla_actors/wf/2.rgba16.png": [32,32,2048,{"jp":[4800560,4096],"us":[4808848,4096],"eu":[4682448,4096],"sh":[4656816,4096]}], "levels/wf/2.rgba16.png": [32,32,2048,{"jp":[4800560,4096],"us":[4808848,4096],"eu":[4682448,4096],"sh":[4656816,4096]}], -"actors_vanilla/wf/3.rgba16.png": [32,32,2048,{"jp":[4800560,6144],"us":[4808848,6144],"eu":[4682448,6144],"sh":[4656816,6144]}], -"actors_vanilla/wf/4.rgba16.png": [32,32,2048,{"jp":[4800560,8192],"us":[4808848,8192],"eu":[4682448,8192],"sh":[4656816,8192]}], -"actors_vanilla/wf/5.ia8.png": [16,16,256,{"jp":[1078992,62296],"us":[1083968,74168],"eu":[909712,30840],"sh":[934640,62296]}], +"actors/vanilla_actors/wf/3.rgba16.png": [32,32,2048,{"jp":[4800560,6144],"us":[4808848,6144],"eu":[4682448,6144],"sh":[4656816,6144]}], +"actors/vanilla_actors/wf/4.rgba16.png": [32,32,2048,{"jp":[4800560,8192],"us":[4808848,8192],"eu":[4682448,8192],"sh":[4656816,8192]}], +"actors/vanilla_actors/wf/5.ia8.png": [16,16,256,{"jp":[1078992,62296],"us":[1083968,74168],"eu":[909712,30840],"sh":[934640,62296]}], "levels/wmotr/0.rgba16.png": [32,32,2048,{"jp":[4989632,0],"us":[4997920,0],"eu":[4876848,0],"sh":[4845888,0]}], "levels/wmotr/1.rgba16.png": [32,16,1024,{"jp":[4989632,2048],"us":[4997920,2048],"eu":[4876848,2048],"sh":[4845888,2048]}], "levels/wmotr/2.rgba16.png": [32,32,2048,{"jp":[4989632,3072],"us":[4997920,3072],"eu":[4876848,3072],"sh":[4845888,3072]}], diff --git a/data/behavior_data.c b/data/behavior_data.c index 411a46bbb0..b2570baabe 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -13,24 +13,24 @@ #include "menu/file_select.h" #include "engine/surface_load.h" -#include "actors_vanilla/bob/header.h" -#include "actors_vanilla/wf/header.h" -#include "actors_vanilla/jrb/header.h" -#include "actors_vanilla/bbh/header.h" -#include "actors_vanilla/hmc/header.h" -#include "actors_vanilla/lll/header.h" -#include "actors_vanilla/ssl/header.h" -#include "actors_vanilla/ddd/header.h" -#include "actors_vanilla/sl/header.h" -#include "actors_vanilla/wdw/header.h" -#include "actors_vanilla/ttm/header.h" -#include "actors_vanilla/thi/header.h" -#include "actors_vanilla/ttc/header.h" -#include "actors_vanilla/rr/header.h" -#include "actors_vanilla/bitdw/header.h" -#include "actors_vanilla/bitfs/header.h" -#include "actors_vanilla/castle_inside/header.h" -#include "actors_vanilla/castle_grounds/header.h" +#include "actors/vanilla_actors/bob/header.h" +#include "actors/vanilla_actors/wf/header.h" +#include "actors/vanilla_actors/jrb/header.h" +#include "actors/vanilla_actors/bbh/header.h" +#include "actors/vanilla_actors/hmc/header.h" +#include "actors/vanilla_actors/lll/header.h" +#include "actors/vanilla_actors/ssl/header.h" +#include "actors/vanilla_actors/ddd/header.h" +#include "actors/vanilla_actors/sl/header.h" +#include "actors/vanilla_actors/wdw/header.h" +#include "actors/vanilla_actors/ttm/header.h" +#include "actors/vanilla_actors/thi/header.h" +#include "actors/vanilla_actors/ttc/header.h" +#include "actors/vanilla_actors/rr/header.h" +#include "actors/vanilla_actors/bitdw/header.h" +#include "actors/vanilla_actors/bitfs/header.h" +#include "actors/vanilla_actors/castle_inside/header.h" +#include "actors/vanilla_actors/castle_grounds/header.h" #include "actors/common0.h" #include "actors/common1.h" #include "actors/group0.h" diff --git a/sm64.ld b/sm64.ld index e84004bb65..cb9ab55434 100755 --- a/sm64.ld +++ b/sm64.ld @@ -84,20 +84,20 @@ OUTPUT_ARCH (mips) #define VANILLA_OBJECTS(name, segAddr, geoAddr) \ BEGIN_SEG(vo_##name##_yay0, segAddr) \ { \ - KEEP(BUILD_DIR/actors_vanilla/name/data.szp.o(.data*)); \ + KEEP(BUILD_DIR/actors/vanilla_actors/name/data.szp.o(.data*)); \ . = ALIGN(0x10); \ } \ END_SEG(vo_##name##_yay0) \ BEGIN_SEG(vo_##name##_geo, geoAddr) \ { \ - KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.*data*)); \ - KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.rodata*)); \ - KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.text*)); \ + KEEP(BUILD_DIR/actors/vanilla_actors/name/geo.o(.*data*)); \ + KEEP(BUILD_DIR/actors/vanilla_actors/name/geo.o(.rodata*)); \ + KEEP(BUILD_DIR/actors/vanilla_actors/name/geo.o(.text*)); \ } \ END_SEG(vo_##name##_geo) \ BEGIN_NOLOAD(vo_##name##_geo) \ { \ - KEEP(BUILD_DIR/actors_vanilla/name/geo.o(.bss*)); \ + KEEP(BUILD_DIR/actors/vanilla_actors/name/geo.o(.bss*)); \ } \ END_NOLOAD(vo_##name##_geo) \ _vo_##name##_mio0SegmentRomStart = _vo_##name##_yay0SegmentRomStart; \ diff --git a/src/game/behavior_actions.c b/src/game/behavior_actions.c index 1c5b5abac7..ee66b6b02a 100644 --- a/src/game/behavior_actions.c +++ b/src/game/behavior_actions.c @@ -1,14 +1,14 @@ #include #include "types.h" -#include "actors_vanilla/bob/header.h" -#include "actors_vanilla/wf/header.h" -#include "actors_vanilla/bbh/header.h" -#include "actors_vanilla/hmc/header.h" -#include "actors_vanilla/lll/header.h" -#include "actors_vanilla/wdw/header.h" -#include "actors_vanilla/bitfs/header.h" -#include "actors_vanilla/castle_inside/header.h" +#include "actors/vanilla_actors/bob/header.h" +#include "actors/vanilla_actors/wf/header.h" +#include "actors/vanilla_actors/bbh/header.h" +#include "actors/vanilla_actors/hmc/header.h" +#include "actors/vanilla_actors/lll/header.h" +#include "actors/vanilla_actors/wdw/header.h" +#include "actors/vanilla_actors/bitfs/header.h" +#include "actors/vanilla_actors/castle_inside/header.h" #include "actors/common1.h" #include "actors/group12.h" #include "actors/group13.h" diff --git a/src/game/geo_misc.c b/src/game/geo_misc.c index 67da9ab0b5..6b84874a34 100644 --- a/src/game/geo_misc.c +++ b/src/game/geo_misc.c @@ -3,8 +3,8 @@ #include "sm64.h" #include "geo_misc.h" -#include "actors_vanilla/castle_inside/header.h" -#include "actors_vanilla/rr/header.h" +#include "actors/vanilla_actors/castle_inside/header.h" +#include "actors/vanilla_actors/rr/header.h" #include "area.h" #include "engine/math_util.h" #include "level_update.h" diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index 75d14a3929..53bf88cd8d 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -1,7 +1,7 @@ #include #include "actors/common1.h" -#include "actors_vanilla/castle_grounds/header.h" +#include "actors/vanilla_actors/castle_grounds/header.h" #include "area.h" #include "audio/external.h" #include "camera.h" diff --git a/src/game/obj_behaviors_2.c b/src/game/obj_behaviors_2.c index 43ff87260b..8b396b898d 100644 --- a/src/game/obj_behaviors_2.c +++ b/src/game/obj_behaviors_2.c @@ -1,15 +1,15 @@ #include #include "sm64.h" -#include "actors_vanilla/bob/header.h" -#include "actors_vanilla/ccm/header.h" -#include "actors_vanilla/ssl/header.h" -#include "actors_vanilla/ttc/header.h" -#include "actors_vanilla/rr/header.h" -#include "actors_vanilla/bitdw/header.h" -#include "actors_vanilla/bitfs/header.h" -#include "actors_vanilla/bits/header.h" -#include "actors_vanilla/vcutm/header.h" +#include "actors/vanilla_actors/bob/header.h" +#include "actors/vanilla_actors/ccm/header.h" +#include "actors/vanilla_actors/ssl/header.h" +#include "actors/vanilla_actors/ttc/header.h" +#include "actors/vanilla_actors/rr/header.h" +#include "actors/vanilla_actors/bitdw/header.h" +#include "actors/vanilla_actors/bitfs/header.h" +#include "actors/vanilla_actors/bits/header.h" +#include "actors/vanilla_actors/vcutm/header.h" #include "actors/common0.h" #include "actors/group11.h" #include "actors/group17.h" From b4d60ef0991dc812fd263c8c9364721baedacfde Mon Sep 17 00:00:00 2001 From: aglab2 Date: Fri, 3 May 2024 20:11:43 +0800 Subject: [PATCH 5/6] Make EU translation segment last, remove vanilla objects segments copypaste --- Makefile.split | 10 +++---- include/segment_names.h | 6 ++--- sm64.ld | 60 ++++++++++++++++++++--------------------- 3 files changed, 38 insertions(+), 38 deletions(-) diff --git a/Makefile.split b/Makefile.split index 532df39e97..9fe299e79f 100644 --- a/Makefile.split +++ b/Makefile.split @@ -249,11 +249,11 @@ $(BUILD_DIR)/bin/machine.elf: SEGMENT_ADDRESS := 0x09000000 $(BUILD_DIR)/bin/mountain.elf: SEGMENT_ADDRESS := 0x09000000 $(BUILD_DIR)/bin/grass.elf: SEGMENT_ADDRESS := 0x09000000 # EU segment 19 translations -$(BUILD_DIR)/bin/translation_de.elf: SEGMENT_ADDRESS := 0x19000000 -$(BUILD_DIR)/bin/translation_en.elf: SEGMENT_ADDRESS := 0x19000000 -$(BUILD_DIR)/bin/translation_fr.elf: SEGMENT_ADDRESS := 0x19000000 -$(BUILD_DIR)/bin/translation_jp.elf: SEGMENT_ADDRESS := 0x19000000 -$(BUILD_DIR)/bin/translation_es.elf: SEGMENT_ADDRESS := 0x19000000 +$(BUILD_DIR)/bin/translation_de.elf: SEGMENT_ADDRESS := 0x1B000000 +$(BUILD_DIR)/bin/translation_en.elf: SEGMENT_ADDRESS := 0x1B000000 +$(BUILD_DIR)/bin/translation_fr.elf: SEGMENT_ADDRESS := 0x1B000000 +$(BUILD_DIR)/bin/translation_jp.elf: SEGMENT_ADDRESS := 0x1B000000 +$(BUILD_DIR)/bin/translation_es.elf: SEGMENT_ADDRESS := 0x1B000000 # -------------------------------------- # Skybox Rules diff --git a/include/segment_names.h b/include/segment_names.h index 12c35cc15a..70770b125c 100644 --- a/include/segment_names.h +++ b/include/segment_names.h @@ -38,9 +38,9 @@ #define SEGMENT_COMMON1_GEO 0x16 // | Segment 22 | /actors/common1_geo #define SEGMENT_GROUP0_GEO 0x17 // | Segment 23 | /actors/group0_geo #define SEGMENT_DEMO_INPUTS 0x18 // | Segment 24 | Demo Inputs List -#define SEGMENT_EU_TRANSLATION 0x19 // | Segment 25 | EU language translations -#define SEGMENT_LEVEL_SCRIPT 0x1A // | Segment 26 | level_ending_entry (/levels/ending/), DEFINE_LEVEL -#define SEGMENT_VANILLA_GEO 0x1B // | Segment 27 | Geolayouts for vanilla objects +#define SEGMENT_LEVEL_SCRIPT 0x19 // | Segment 25 | level_ending_entry (/levels/ending/), DEFINE_LEVEL +#define SEGMENT_VANILLA_GEO 0x1A // | Segment 26 | Geolayouts for vanilla objects +#define SEGMENT_EU_TRANSLATION 0x1B // | Segment 27 | EU language translations #define SEGMENT_UNKNOWN_28 0x1C // | Segment 28 | Unknown/Unused? #define SEGMENT_UNKNOWN_29 0x1D // | Segment 29 | Unknown/Unused? #define SEGMENT_UNKNOWN_30 0x1E // | Segment 30 | Unknown/Unused? diff --git a/sm64.ld b/sm64.ld index cb9ab55434..ce9d38d69e 100755 --- a/sm64.ld +++ b/sm64.ld @@ -42,7 +42,7 @@ OUTPUT_ARCH (mips) . = ALIGN(0x10); \ } \ END_SEG(name##_segment_7) \ - BEGIN_SEG(name, 0x1A000000) \ + BEGIN_SEG(name, 0x19000000) \ { \ KEEP(BUILD_DIR/levels/name/script.o(.*data*)); \ KEEP(BUILD_DIR/levels/name/script.o(.text*)); \ @@ -81,14 +81,14 @@ OUTPUT_ARCH (mips) _##name##_mio0SegmentRomStart = _##name##_yay0SegmentRomStart; \ _##name##_mio0SegmentRomEnd = _##name##_yay0SegmentRomEnd; -#define VANILLA_OBJECTS(name, segAddr, geoAddr) \ - BEGIN_SEG(vo_##name##_yay0, segAddr) \ +#define VANILLA_OBJECTS(name) \ + BEGIN_SEG(vo_##name##_yay0, 0x0e000000) \ { \ KEEP(BUILD_DIR/actors/vanilla_actors/name/data.szp.o(.data*)); \ . = ALIGN(0x10); \ } \ END_SEG(vo_##name##_yay0) \ - BEGIN_SEG(vo_##name##_geo, geoAddr) \ + BEGIN_SEG(vo_##name##_geo, 0x1a000000) \ { \ KEEP(BUILD_DIR/actors/vanilla_actors/name/geo.o(.*data*)); \ KEEP(BUILD_DIR/actors/vanilla_actors/name/geo.o(.rodata*)); \ @@ -326,18 +326,18 @@ SECTIONS YAY0_SEG(segment2, 0x02000000) #ifdef MULTILANG - YAY0_SEG(translation_en, 0x19000000) + YAY0_SEG(translation_en, 0x1B000000) #ifdef ENABLE_FRENCH - YAY0_SEG(translation_fr, 0x19000000) + YAY0_SEG(translation_fr, 0x1B000000) #endif #ifdef ENABLE_GERMAN - YAY0_SEG(translation_de, 0x19000000) + YAY0_SEG(translation_de, 0x1B000000) #endif #ifdef ENABLE_JAPANESE - YAY0_SEG(translation_jp, 0x19000000) + YAY0_SEG(translation_jp, 0x1B000000) #endif #ifdef ENABLE_SPANISH - YAY0_SEG(translation_es, 0x19000000) + YAY0_SEG(translation_es, 0x1B000000) #endif #endif @@ -367,27 +367,27 @@ SECTIONS STANDARD_OBJECTS(common0, 0x08000000, 0x0F000000) STANDARD_OBJECTS(common1, 0x03000000, 0x16000000) - VANILLA_OBJECTS(bob, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(wf, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(jrb, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(ccm, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(bbh, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(hmc, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(lll, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(ssl, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(ddd, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(sl, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(wdw, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(ttm, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(thi, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(ttc, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(rr, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(bitdw, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(bitfs, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(bits, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(vcutm, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(castle_inside, 0x0E000000, 0x1B000000) - VANILLA_OBJECTS(castle_grounds, 0x0E000000, 0x1B000000) + VANILLA_OBJECTS(bob) + VANILLA_OBJECTS(wf) + VANILLA_OBJECTS(jrb) + VANILLA_OBJECTS(ccm) + VANILLA_OBJECTS(bbh) + VANILLA_OBJECTS(hmc) + VANILLA_OBJECTS(lll) + VANILLA_OBJECTS(ssl) + VANILLA_OBJECTS(ddd) + VANILLA_OBJECTS(sl) + VANILLA_OBJECTS(wdw) + VANILLA_OBJECTS(ttm) + VANILLA_OBJECTS(thi) + VANILLA_OBJECTS(ttc) + VANILLA_OBJECTS(rr) + VANILLA_OBJECTS(bitdw) + VANILLA_OBJECTS(bitfs) + VANILLA_OBJECTS(bits) + VANILLA_OBJECTS(vcutm) + VANILLA_OBJECTS(castle_inside) + VANILLA_OBJECTS(castle_grounds) /* use segmented addressing for behaviors */ BEGIN_SEG(behavior, 0x13000000) From ba484ba22b67fa1e238958d1a6ecb34c08db645d Mon Sep 17 00:00:00 2001 From: aglab2 Date: Sat, 1 Jun 2024 09:15:46 +0800 Subject: [PATCH 6/6] Added LOAD_VANILLA_OBJECTS segment id stub --- include/level_commands.h | 2 +- levels/bbh/areas/script_vanilla_load.inc.c | 2 +- levels/bitdw/areas/script_vanilla_load.inc.c | 2 +- levels/bitfs/areas/script_vanilla.inc.c | 2 +- levels/bits/areas/script_vanilla_load.inc.c | 2 +- levels/bob/areas/script_vanilla_load.inc.c | 2 +- levels/castle_grounds/areas/script_vanilla_load.inc.c | 2 +- levels/castle_inside/areas/script_vanilla_load.inc.c | 2 +- levels/ccm/areas/script_vanilla_load.inc.c | 2 +- levels/ddd/areas/script_vanilla_load.inc.c | 2 +- levels/hmc/areas/script_vanilla_load.inc.c | 2 +- levels/jrb/areas/script_vanilla_load.inc.c | 2 +- levels/lll/areas/script_vanilla_load.inc.c | 2 +- levels/rr/areas/script_vanilla_load.inc.c | 2 +- levels/sl/areas/script_vanilla_load.inc.c | 2 +- levels/ssl/areas/script_vanilla_load.inc.c | 2 +- levels/thi/areas/script_vanilla.inc.c | 2 +- levels/ttc/areas/script_vanilla_load.inc.c | 2 +- levels/ttm/areas/script_vanilla_load.inc.c | 2 +- levels/vcutm/areas/script_vanilla_load.inc.c | 2 +- levels/wdw/areas/script_vanilla_load.inc.c | 2 +- levels/wf/areas/script_vanilla.inc.c | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/include/level_commands.h b/include/level_commands.h index 24f5566420..9e12e1b4b3 100644 --- a/include/level_commands.h +++ b/include/level_commands.h @@ -480,7 +480,7 @@ enum GoddardScene { #define LOAD_TEXTURE_BIN(textureBin) \ LOAD_YAY0_TEXTURE(/*seg*/ SEGMENT_TEXTURE, /*romStart*/ _##textureBin##_yay0SegmentRomStart, /*romEnd*/ _##textureBin##_yay0SegmentRomEnd) -#define LOAD_VANILLA_OBJECTS(objectBin, textureBin) \ +#define LOAD_VANILLA_OBJECTS(s, objectBin, textureBin) \ LOAD_YAY0_TEXTURE(/*seg*/ SEGMENT_TEXTURE, _##textureBin##_yay0SegmentRomStart, _##textureBin##_yay0SegmentRomEnd), \ LOAD_YAY0( /*seg*/ SEGMENT_VANILLA_OBJECTS, _vo_##objectBin##_yay0SegmentRomStart, _vo_##objectBin##_yay0SegmentRomEnd), \ LOAD_RAW( /*seg*/ SEGMENT_VANILLA_GEO, _vo_##objectBin##_geoSegmentRomStart, _vo_##objectBin##_geoSegmentRomEnd) diff --git a/levels/bbh/areas/script_vanilla_load.inc.c b/levels/bbh/areas/script_vanilla_load.inc.c index 69a64d7c21..5dbac93081 100644 --- a/levels/bbh/areas/script_vanilla_load.inc.c +++ b/levels/bbh/areas/script_vanilla_load.inc.c @@ -1,6 +1,6 @@ LOAD_YAY0( /*seg*/ 0x07, _bbh_segment_7SegmentRomStart, _bbh_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _bbh_skybox_yay0SegmentRomStart, _bbh_skybox_yay0SegmentRomEnd), -LOAD_VANILLA_OBJECTS(bbh, spooky), +LOAD_VANILLA_OBJECTS(0, bbh, spooky), LOAD_YAY0( /*seg*/ 0x05, _group9_yay0SegmentRomStart, _group9_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group9_geoSegmentRomStart, _group9_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), diff --git a/levels/bitdw/areas/script_vanilla_load.inc.c b/levels/bitdw/areas/script_vanilla_load.inc.c index ec7885ce15..442f4ed66f 100644 --- a/levels/bitdw/areas/script_vanilla_load.inc.c +++ b/levels/bitdw/areas/script_vanilla_load.inc.c @@ -1,6 +1,6 @@ LOAD_YAY0( /*seg*/ 0x07, _bitdw_segment_7SegmentRomStart, _bitdw_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _bidw_skybox_yay0SegmentRomStart, _bidw_skybox_yay0SegmentRomEnd), -LOAD_VANILLA_OBJECTS(bitdw, sky), +LOAD_VANILLA_OBJECTS(0, bitdw, sky), LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), diff --git a/levels/bitfs/areas/script_vanilla.inc.c b/levels/bitfs/areas/script_vanilla.inc.c index 9acbd224f7..077225e268 100644 --- a/levels/bitfs/areas/script_vanilla.inc.c +++ b/levels/bitfs/areas/script_vanilla.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _bitfs_segment_7SegmentRomStart, _bitfs_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(bitfs, sky), +LOAD_VANILLA_OBJECTS(0, bitfs, sky), LOAD_YAY0( /*seg*/ 0x0A, _bitfs_skybox_yay0SegmentRomStart, _bitfs_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), diff --git a/levels/bits/areas/script_vanilla_load.inc.c b/levels/bits/areas/script_vanilla_load.inc.c index 1e755e1547..d2e34135b0 100644 --- a/levels/bits/areas/script_vanilla_load.inc.c +++ b/levels/bits/areas/script_vanilla_load.inc.c @@ -1,6 +1,6 @@ LOAD_YAY0( /*seg*/ 0x07, _bits_segment_7SegmentRomStart, _bits_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _bits_skybox_yay0SegmentRomStart, _bits_skybox_yay0SegmentRomEnd), -LOAD_VANILLA_OBJECTS(bits, sky), +LOAD_VANILLA_OBJECTS(0, bits, sky), LOAD_YAY0( /*seg*/ 0x06, _group14_yay0SegmentRomStart, _group14_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0D, _group14_geoSegmentRomStart, _group14_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), diff --git a/levels/bob/areas/script_vanilla_load.inc.c b/levels/bob/areas/script_vanilla_load.inc.c index 997da3efe8..69a1d8643c 100644 --- a/levels/bob/areas/script_vanilla_load.inc.c +++ b/levels/bob/areas/script_vanilla_load.inc.c @@ -1,4 +1,4 @@ -LOAD_VANILLA_OBJECTS(bob, generic), +LOAD_VANILLA_OBJECTS(0, bob, generic), LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group3_yay0SegmentRomStart, _group3_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group3_geoSegmentRomStart, _group3_geoSegmentRomEnd), diff --git a/levels/castle_grounds/areas/script_vanilla_load.inc.c b/levels/castle_grounds/areas/script_vanilla_load.inc.c index 788ab21a53..ac18e2b82c 100644 --- a/levels/castle_grounds/areas/script_vanilla_load.inc.c +++ b/levels/castle_grounds/areas/script_vanilla_load.inc.c @@ -1,6 +1,6 @@ LOAD_YAY0( /*seg*/ 0x07, _castle_grounds_segment_7SegmentRomStart, _castle_grounds_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), -LOAD_VANILLA_OBJECTS(castle_grounds, outside), +LOAD_VANILLA_OBJECTS(0, castle_grounds, outside), LOAD_YAY0( /*seg*/ 0x05, _group10_yay0SegmentRomStart, _group10_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group10_geoSegmentRomStart, _group10_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x06, _group15_yay0SegmentRomStart, _group15_yay0SegmentRomEnd), diff --git a/levels/castle_inside/areas/script_vanilla_load.inc.c b/levels/castle_inside/areas/script_vanilla_load.inc.c index 45fddd9931..a7f2db662f 100644 --- a/levels/castle_inside/areas/script_vanilla_load.inc.c +++ b/levels/castle_inside/areas/script_vanilla_load.inc.c @@ -1,4 +1,4 @@ LOAD_YAY0( /*seg*/ 0x07, _castle_inside_segment_7SegmentRomStart, _castle_inside_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(castle_inside, inside), +LOAD_VANILLA_OBJECTS(0, castle_inside, inside), LOAD_YAY0( /*seg*/ 0x06, _group15_yay0SegmentRomStart, _group15_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0D, _group15_geoSegmentRomStart, _group15_geoSegmentRomEnd), diff --git a/levels/ccm/areas/script_vanilla_load.inc.c b/levels/ccm/areas/script_vanilla_load.inc.c index f8b6af4235..d3f8b51884 100644 --- a/levels/ccm/areas/script_vanilla_load.inc.c +++ b/levels/ccm/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _ccm_segment_7SegmentRomStart, _ccm_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(ccm, snow), +LOAD_VANILLA_OBJECTS(0, ccm, snow), LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _ccm_skybox_yay0SegmentRomStart, _ccm_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group7_yay0SegmentRomStart, _group7_yay0SegmentRomEnd), diff --git a/levels/ddd/areas/script_vanilla_load.inc.c b/levels/ddd/areas/script_vanilla_load.inc.c index f994a76bd6..db29e4c414 100644 --- a/levels/ddd/areas/script_vanilla_load.inc.c +++ b/levels/ddd/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _ddd_segment_7SegmentRomStart, _ddd_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(ddd, water), +LOAD_VANILLA_OBJECTS(0, ddd, water), LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), diff --git a/levels/hmc/areas/script_vanilla_load.inc.c b/levels/hmc/areas/script_vanilla_load.inc.c index efc45c7c71..a3eedc37a2 100644 --- a/levels/hmc/areas/script_vanilla_load.inc.c +++ b/levels/hmc/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _hmc_segment_7SegmentRomStart, _hmc_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(hmc, cave), +LOAD_VANILLA_OBJECTS(0, hmc, cave), LOAD_YAY0( /*seg*/ 0x05, _group6_yay0SegmentRomStart, _group6_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group6_geoSegmentRomStart, _group6_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x06, _group17_yay0SegmentRomStart, _group17_yay0SegmentRomEnd), diff --git a/levels/jrb/areas/script_vanilla_load.inc.c b/levels/jrb/areas/script_vanilla_load.inc.c index e5ab02c673..8935365f0c 100644 --- a/levels/jrb/areas/script_vanilla_load.inc.c +++ b/levels/jrb/areas/script_vanilla_load.inc.c @@ -1,6 +1,6 @@ LOAD_YAY0( /*seg*/ 0x07, _jrb_segment_7SegmentRomStart, _jrb_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), -LOAD_VANILLA_OBJECTS(jrb, water), +LOAD_VANILLA_OBJECTS(0, jrb, water), LOAD_YAY0( /*seg*/ 0x0A, _clouds_skybox_yay0SegmentRomStart, _clouds_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group4_yay0SegmentRomStart, _group4_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group4_geoSegmentRomStart, _group4_geoSegmentRomEnd), diff --git a/levels/lll/areas/script_vanilla_load.inc.c b/levels/lll/areas/script_vanilla_load.inc.c index d60866ef55..652412aa66 100644 --- a/levels/lll/areas/script_vanilla_load.inc.c +++ b/levels/lll/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _lll_segment_7SegmentRomStart, _lll_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(lll, fire), +LOAD_VANILLA_OBJECTS(0, lll, fire), LOAD_YAY0( /*seg*/ 0x0A, _bitfs_skybox_yay0SegmentRomStart, _bitfs_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group2_yay0SegmentRomStart, _group2_yay0SegmentRomEnd), diff --git a/levels/rr/areas/script_vanilla_load.inc.c b/levels/rr/areas/script_vanilla_load.inc.c index 02fdac7298..2ce3a85f2c 100644 --- a/levels/rr/areas/script_vanilla_load.inc.c +++ b/levels/rr/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _rr_segment_7SegmentRomStart, _rr_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(rr, sky), +LOAD_VANILLA_OBJECTS(0, rr, sky), LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), diff --git a/levels/sl/areas/script_vanilla_load.inc.c b/levels/sl/areas/script_vanilla_load.inc.c index 02a3a59ab2..33f558dbab 100644 --- a/levels/sl/areas/script_vanilla_load.inc.c +++ b/levels/sl/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _sl_segment_7SegmentRomStart, _sl_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(sl, snow), +LOAD_VANILLA_OBJECTS(0, sl, snow), LOAD_YAY0( /*seg*/ 0x0B, _effect_yay0SegmentRomStart, _effect_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _ccm_skybox_yay0SegmentRomStart, _ccm_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group7_yay0SegmentRomStart, _group7_yay0SegmentRomEnd), diff --git a/levels/ssl/areas/script_vanilla_load.inc.c b/levels/ssl/areas/script_vanilla_load.inc.c index 178354cb11..724111a7d9 100644 --- a/levels/ssl/areas/script_vanilla_load.inc.c +++ b/levels/ssl/areas/script_vanilla_load.inc.c @@ -1,6 +1,6 @@ LOAD_YAY0( /*seg*/ 0x07, _ssl_segment_7SegmentRomStart, _ssl_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _ssl_skybox_yay0SegmentRomStart, _ssl_skybox_yay0SegmentRomEnd), -LOAD_VANILLA_OBJECTS(ssl, generic), +LOAD_VANILLA_OBJECTS(0, ssl, generic), LOAD_YAY0( /*seg*/ 0x05, _group5_yay0SegmentRomStart, _group5_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group5_geoSegmentRomStart, _group5_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), diff --git a/levels/thi/areas/script_vanilla.inc.c b/levels/thi/areas/script_vanilla.inc.c index 3cb037076e..a2464e1227 100644 --- a/levels/thi/areas/script_vanilla.inc.c +++ b/levels/thi/areas/script_vanilla.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _thi_segment_7SegmentRomStart, _thi_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(thi, grass), +LOAD_VANILLA_OBJECTS(0, thi, grass), LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group11_yay0SegmentRomStart, _group11_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group11_geoSegmentRomStart, _group11_geoSegmentRomEnd), diff --git a/levels/ttc/areas/script_vanilla_load.inc.c b/levels/ttc/areas/script_vanilla_load.inc.c index 1e57bab62d..581140e4d3 100644 --- a/levels/ttc/areas/script_vanilla_load.inc.c +++ b/levels/ttc/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _ttc_segment_7SegmentRomStart, _ttc_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(ttc, machine), +LOAD_VANILLA_OBJECTS(0, ttc, machine), LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x08, _common0_yay0SegmentRomStart, _common0_yay0SegmentRomEnd), diff --git a/levels/ttm/areas/script_vanilla_load.inc.c b/levels/ttm/areas/script_vanilla_load.inc.c index cc27c95221..05bb2fd932 100644 --- a/levels/ttm/areas/script_vanilla_load.inc.c +++ b/levels/ttm/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _ttm_segment_7SegmentRomStart, _ttm_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(ttm, mountain), +LOAD_VANILLA_OBJECTS(0, ttm, mountain), LOAD_YAY0( /*seg*/ 0x0A, _water_skybox_yay0SegmentRomStart, _water_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group6_yay0SegmentRomStart, _group6_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group6_geoSegmentRomStart, _group6_geoSegmentRomEnd), diff --git a/levels/vcutm/areas/script_vanilla_load.inc.c b/levels/vcutm/areas/script_vanilla_load.inc.c index 464ca4fa0f..f0d551bec9 100644 --- a/levels/vcutm/areas/script_vanilla_load.inc.c +++ b/levels/vcutm/areas/script_vanilla_load.inc.c @@ -1,4 +1,4 @@ -LOAD_VANILLA_OBJECTS(vcutm, outside), +LOAD_VANILLA_OBJECTS(0, vcutm, outside), LOAD_YAY0( /*seg*/ 0x07, _vcutm_segment_7SegmentRomStart, _vcutm_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group8_yay0SegmentRomStart, _group8_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group8_geoSegmentRomStart, _group8_geoSegmentRomEnd), diff --git a/levels/wdw/areas/script_vanilla_load.inc.c b/levels/wdw/areas/script_vanilla_load.inc.c index b94f0e60ee..7e3381ab20 100644 --- a/levels/wdw/areas/script_vanilla_load.inc.c +++ b/levels/wdw/areas/script_vanilla_load.inc.c @@ -1,5 +1,5 @@ LOAD_YAY0( /*seg*/ 0x07, _wdw_segment_7SegmentRomStart, _wdw_segment_7SegmentRomEnd), -LOAD_VANILLA_OBJECTS(wdw, grass), +LOAD_VANILLA_OBJECTS(0, wdw, grass), LOAD_YAY0( /*seg*/ 0x0A, _wdw_skybox_yay0SegmentRomStart, _wdw_skybox_yay0SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd), diff --git a/levels/wf/areas/script_vanilla.inc.c b/levels/wf/areas/script_vanilla.inc.c index ab2f3afc4e..be0ad06f85 100644 --- a/levels/wf/areas/script_vanilla.inc.c +++ b/levels/wf/areas/script_vanilla.inc.c @@ -1,6 +1,6 @@ LOAD_YAY0( /*seg*/ 0x07, _wf_segment_7SegmentRomStart, _wf_segment_7SegmentRomEnd), LOAD_YAY0( /*seg*/ 0x0A, _cloud_floor_skybox_yay0SegmentRomStart, _cloud_floor_skybox_yay0SegmentRomEnd), -LOAD_VANILLA_OBJECTS(wf, grass), +LOAD_VANILLA_OBJECTS(0, wf, grass), LOAD_RAW( /*seg*/ 0x1B, _vo_wf_geoSegmentRomStart, _vo_wf_geoSegmentRomEnd), LOAD_YAY0( /*seg*/ 0x05, _group1_yay0SegmentRomStart, _group1_yay0SegmentRomEnd), LOAD_RAW( /*seg*/ 0x0C, _group1_geoSegmentRomStart, _group1_geoSegmentRomEnd),