diff --git a/actors/amp/model.inc.c b/actors/amp/model.inc.c index 15745bd0..b3f50eb8 100644 --- a/actors/amp/model.inc.c +++ b/actors/amp/model.inc.c @@ -1,22 +1,22 @@ // Amp // 0x08000F18 -ALIGNED8 static const Texture amp_seg8_texture_08000F18[] = { +ALIGNED8 const Texture amp_seg8_texture_08000F18[] = { #include "actors/amp/amp_electricity.rgba16.inc.c" }; // 0x08001318 -ALIGNED8 static const Texture amp_seg8_texture_08001318[] = { +ALIGNED8 const Texture amp_seg8_texture_08001318[] = { #include "actors/amp/amp_eyes.rgba16.inc.c" }; // 0x08001B18 -ALIGNED8 static const Texture amp_seg8_texture_08001B18[] = { +ALIGNED8 const Texture amp_seg8_texture_08001B18[] = { #include "actors/amp/amp_body.rgba16.inc.c" }; // 0x08002318 -ALIGNED8 static const Texture amp_seg8_texture_08002318[] = { +ALIGNED8 const Texture amp_seg8_texture_08002318[] = { #include "actors/amp/amp_mouth.rgba16.inc.c" }; diff --git a/actors/blue_coin_switch/model.inc.c b/actors/blue_coin_switch/model.inc.c index bb5c89fd..002a1ea8 100644 --- a/actors/blue_coin_switch/model.inc.c +++ b/actors/blue_coin_switch/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 blue_coin_switch_seg8_lights_08000000 = gdSPDefLights1( ); // 0x08000018 -ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000018[] = { +ALIGNED8 const Texture blue_coin_switch_seg8_texture_08000018[] = { #include "actors/blue_coin_switch/blue_coin_switch_side.rgba16.inc.c" }; // 0x08000418 -ALIGNED8 static const Texture blue_coin_switch_seg8_texture_08000418[] = { +ALIGNED8 const Texture blue_coin_switch_seg8_texture_08000418[] = { #include "actors/blue_coin_switch/blue_coin_switch_top.rgba16.inc.c" }; diff --git a/actors/blue_fish/model.inc.c b/actors/blue_fish/model.inc.c index 3545358a..aac165a9 100644 --- a/actors/blue_fish/model.inc.c +++ b/actors/blue_fish/model.inc.c @@ -7,7 +7,7 @@ static const Lights1 blue_fish_seg3_lights_0301B5C8 = gdSPDefLights1( ); // 0x0301B5E0 -ALIGNED8 static const Texture blue_fish_seg3_texture_0301B5E0[] = { +ALIGNED8 const Texture blue_fish_seg3_texture_0301B5E0[] = { #include "actors/blue_fish/blue_fish.rgba16.inc.c" }; diff --git a/actors/bobomb/model.inc.c b/actors/bobomb/model.inc.c index b4f56adb..31af0eef 100644 --- a/actors/bobomb/model.inc.c +++ b/actors/bobomb/model.inc.c @@ -1,32 +1,32 @@ // Bobomb // 0x0801DA60 -ALIGNED8 static const Texture bobomb_seg8_texture_0801DA60[] = { +ALIGNED8 const Texture bobomb_seg8_texture_0801DA60[] = { #include "actors/bobomb/bob-omb_left_side.rgba16.inc.c" }; // 0x0801EA60 -ALIGNED8 static const Texture bobomb_seg8_texture_0801EA60[] = { +ALIGNED8 const Texture bobomb_seg8_texture_0801EA60[] = { #include "actors/bobomb/bob-omb_right_side.rgba16.inc.c" }; // 0x0801FA60 -ALIGNED8 static const Texture bobomb_seg8_texture_0801FA60[] = { +ALIGNED8 const Texture bobomb_seg8_texture_0801FA60[] = { #include "actors/bobomb/bob-omb_buddy_left_side.rgba16.inc.c" }; // 0x08020A60 -ALIGNED8 static const Texture bobomb_seg8_texture_08020A60[] = { +ALIGNED8 const Texture bobomb_seg8_texture_08020A60[] = { #include "actors/bobomb/bob-omb_buddy_right_side.rgba16.inc.c" }; // 0x08021A60 -ALIGNED8 static const Texture bobomb_seg8_texture_08021A60[] = { +ALIGNED8 const Texture bobomb_seg8_texture_08021A60[] = { #include "actors/bobomb/bob-omb_eyes.rgba16.inc.c" }; // 0x08022260 -ALIGNED8 static const Texture bobomb_seg8_texture_08022260[] = { +ALIGNED8 const Texture bobomb_seg8_texture_08022260[] = { #include "actors/bobomb/bob-omb_eyes_blink.rgba16.inc.c" }; diff --git a/actors/bomb/model.inc.c b/actors/bomb/model.inc.c index 9ccb342a..e5791236 100644 --- a/actors/bomb/model.inc.c +++ b/actors/bomb/model.inc.c @@ -7,17 +7,17 @@ static const Lights1 bomb_seg6_lights_06057AA8 = gdSPDefLights1( ); // 0x06057AC0 -ALIGNED8 static const Texture bomb_seg6_texture_06057AC0[] = { +ALIGNED8 const Texture bomb_seg6_texture_06057AC0[] = { #include "actors/bomb/bomb_left_side.rgba16.inc.c" }; // 0x06058AC0 -ALIGNED8 static const Texture bomb_seg6_texture_06058AC0[] = { +ALIGNED8 const Texture bomb_seg6_texture_06058AC0[] = { #include "actors/bomb/bomb_right_side.rgba16.inc.c" }; // 0x06059AC0 -ALIGNED8 static const Texture bomb_seg6_texture_06059AC0[] = { +ALIGNED8 const Texture bomb_seg6_texture_06059AC0[] = { #include "actors/bomb/bomb_spike.rgba16.inc.c" }; diff --git a/actors/boo/model.inc.c b/actors/boo/model.inc.c index 8d77221e..d3db7bf7 100644 --- a/actors/boo/model.inc.c +++ b/actors/boo/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 boo_seg5_lights_05009B28 = gdSPDefLights1( ); // 0x05009B40 -ALIGNED8 static const Texture boo_seg5_texture_05009B40[] = { +ALIGNED8 const Texture boo_seg5_texture_05009B40[] = { #include "actors/boo/boo_eyes.rgba16.inc.c" }; // 0x0500AB40 -ALIGNED8 static const Texture boo_seg5_texture_0500AB40[] = { +ALIGNED8 const Texture boo_seg5_texture_0500AB40[] = { #include "actors/boo/boo_mouth.rgba16.inc.c" }; diff --git a/actors/boo_castle/model.inc.c b/actors/boo_castle/model.inc.c index 24506c4b..17b7cae8 100644 --- a/actors/boo_castle/model.inc.c +++ b/actors/boo_castle/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 boo_castle_seg6_lights_06015658 = gdSPDefLights1( ); // 0x06015670 -ALIGNED8 static const Texture boo_castle_seg6_texture_06015670[] = { +ALIGNED8 const Texture boo_castle_seg6_texture_06015670[] = { #include "actors/boo_castle/bbh_boo_eyes.rgba16.inc.c" }; // 0x06016670 -ALIGNED8 static const Texture boo_castle_seg6_texture_06016670[] = { +ALIGNED8 const Texture boo_castle_seg6_texture_06016670[] = { #include "actors/boo_castle/bbh_boo_mouth.rgba16.inc.c" }; diff --git a/actors/book/model.inc.c b/actors/book/model.inc.c index 309d7f7e..7ae4d455 100644 --- a/actors/book/model.inc.c +++ b/actors/book/model.inc.c @@ -9,7 +9,7 @@ static const Lights1 book_seg5_lights_05002558 = gdSPDefLights1( ); // 0x05002570 -ALIGNED8 static const Texture book_seg5_texture_05002570[] = { +ALIGNED8 const Texture book_seg5_texture_05002570[] = { #include "actors/book/book_cover.rgba16.inc.c" }; diff --git a/actors/bookend/model.inc.c b/actors/bookend/model.inc.c index 02d862e8..355eae65 100644 --- a/actors/bookend/model.inc.c +++ b/actors/bookend/model.inc.c @@ -25,27 +25,27 @@ UNUSED static const Lights1 bookend_lights_unused4 = gdSPDefLights1( ); // 0x05000060 -ALIGNED8 static const Texture bookend_seg5_texture_05000060[] = { +ALIGNED8 const Texture bookend_seg5_texture_05000060[] = { #include "actors/bookend/bookend_spine.rgba16.inc.c" }; // 0x05000460 -ALIGNED8 static const Texture bookend_seg5_texture_05000460[] = { +ALIGNED8 const Texture bookend_seg5_texture_05000460[] = { #include "actors/bookend/bookend_tooth.rgba16.inc.c" }; // 0x05000860 -ALIGNED8 static const Texture bookend_seg5_texture_05000860[] = { +ALIGNED8 const Texture bookend_seg5_texture_05000860[] = { #include "actors/bookend/bookend_mouth.rgba16.inc.c" }; // 0x05000C60 -ALIGNED8 static const Texture bookend_seg5_texture_05000C60[] = { +ALIGNED8 const Texture bookend_seg5_texture_05000C60[] = { #include "actors/bookend/bookend_pages.rgba16.inc.c" }; // 0x05001060 -ALIGNED8 static const Texture bookend_seg5_texture_05001060[] = { +ALIGNED8 const Texture bookend_seg5_texture_05001060[] = { #include "actors/bookend/bookend_cover.rgba16.inc.c" }; diff --git a/actors/bowser/model.inc.c b/actors/bowser/model.inc.c index 69a0b083..26adbf5e 100644 --- a/actors/bowser/model.inc.c +++ b/actors/bowser/model.inc.c @@ -1,149 +1,149 @@ // Bowser (King Koopa) // 0x0601F438 -ALIGNED8 static const Texture bowser_seg6_texture_0601F438[] = { +ALIGNED8 const Texture bowser_seg6_texture_0601F438[] = { #include "actors/bowser/bowser_shell.rgba16.inc.c" }; // 0x0601FC38 -ALIGNED8 static const Texture bowser_seg6_texture_0601FC38[] = { +ALIGNED8 const Texture bowser_seg6_texture_0601FC38[] = { #include "actors/bowser/bowser_eyebrow.rgba16.inc.c" }; // 0x06020C38 -ALIGNED8 static const Texture bowser_seg6_texture_06020C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06020C38[] = { #include "actors/bowser/bowser_muzzle.rgba16.inc.c" }; // 0x06021438 -ALIGNED8 static const Texture bowser_seg6_texture_06021438[] = { +ALIGNED8 const Texture bowser_seg6_texture_06021438[] = { #include "actors/bowser/bowser_nostrils.rgba16.inc.c" }; // 0x06022438 -ALIGNED8 static const Texture bowser_seg6_texture_06022438[] = { +ALIGNED8 const Texture bowser_seg6_texture_06022438[] = { #include "actors/bowser/bowser_body.rgba16.inc.c" }; // 0x06022C38 -ALIGNED8 static const Texture bowser_seg6_texture_06022C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06022C38[] = { #include "actors/bowser/bowser_armband_spike.rgba16.inc.c" }; // 0x06023C38 -ALIGNED8 static const Texture bowser_seg6_texture_06023C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06023C38[] = { #include "actors/bowser/bowser_armband.rgba16.inc.c" }; // 0x06024438 -ALIGNED8 static const Texture bowser_seg6_texture_06024438[] = { +ALIGNED8 const Texture bowser_seg6_texture_06024438[] = { #include "actors/bowser/bowser_tongue.rgba16.inc.c" }; // 0x06025438 -ALIGNED8 static const Texture bowser_seg6_texture_06025438[] = { +ALIGNED8 const Texture bowser_seg6_texture_06025438[] = { #include "actors/bowser/bowser_chest.rgba16.inc.c" }; // 0x06025C38 -ALIGNED8 static const Texture bowser_seg6_texture_06025C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06025C38[] = { #include "actors/bowser/bowser_shell_edge.rgba16.inc.c" }; // unreferenced, seen in pre-Spaceworld 1995 B-roll footage build // 0x06026438 -ALIGNED8 static const Texture bowser_seg6_texture_06026438[] = { +ALIGNED8 const Texture bowser_seg6_texture_06026438[] = { #include "actors/bowser/bowser_blue_eye_unused.rgba16.inc.c" }; // unreferenced (stubbed texture? possibly original texture for mouth) // 0x06027438 -ALIGNED8 static const Texture bowser_seg6_texture_06027438[] = { +ALIGNED8 const Texture bowser_seg6_texture_06027438[] = { #include "actors/bowser/bowser_mouth_unused.rgba16.inc.c" }; // 0x06028438 -ALIGNED8 static const Texture bowser_seg6_texture_06028438[] = { +ALIGNED8 const Texture bowser_seg6_texture_06028438[] = { #include "actors/bowser/bowser_upper_face.rgba16.inc.c" }; // 0x06028C38 -ALIGNED8 static const Texture bowser_seg6_texture_06028C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06028C38[] = { #include "actors/bowser/bowser_hair.rgba16.inc.c" }; // 0x06029C38 -ALIGNED8 static const Texture bowser_seg6_texture_06029C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06029C38[] = { #include "actors/bowser/bowser_claw_edge.rgba16.inc.c" }; // 0x0602AC38 -ALIGNED8 static const Texture bowser_seg6_texture_0602AC38[] = { +ALIGNED8 const Texture bowser_seg6_texture_0602AC38[] = { #include "actors/bowser/bowser_claw_horn_tooth.rgba16.inc.c" }; // 0x0602BC38 -ALIGNED8 static const Texture bowser_seg6_texture_0602BC38[] = { +ALIGNED8 const Texture bowser_seg6_texture_0602BC38[] = { #include "actors/bowser/bowser_claw_horn_angle.rgba16.inc.c" }; // 0x0602CC38 -ALIGNED8 static const Texture bowser_seg6_texture_0602CC38[] = { +ALIGNED8 const Texture bowser_seg6_texture_0602CC38[] = { #include "actors/bowser/bowser_eye_left_0.rgba16.inc.c" }; // 0x0602DC38 -ALIGNED8 static const Texture bowser_seg6_texture_0602DC38[] = { +ALIGNED8 const Texture bowser_seg6_texture_0602DC38[] = { #include "actors/bowser/bowser_eye_half_closed_0.rgba16.inc.c" }; // 0x0602EC38 -ALIGNED8 static const Texture bowser_seg6_texture_0602EC38[] = { +ALIGNED8 const Texture bowser_seg6_texture_0602EC38[] = { #include "actors/bowser/bowser_eye_closed_0.rgba16.inc.c" }; // 0x0602FC38 -ALIGNED8 static const Texture bowser_seg6_texture_0602FC38[] = { +ALIGNED8 const Texture bowser_seg6_texture_0602FC38[] = { #include "actors/bowser/bowser_eye_center_0.rgba16.inc.c" }; // 0x06030C38 -ALIGNED8 static const Texture bowser_seg6_texture_06030C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06030C38[] = { #include "actors/bowser/bowser_eye_right_0.rgba16.inc.c" }; // 0x06031C38 -ALIGNED8 static const Texture bowser_seg6_texture_06031C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06031C38[] = { #include "actors/bowser/bowser_eye_far_left_0.rgba16.inc.c" }; // 0x06032C38 -ALIGNED8 static const Texture bowser_seg6_texture_06032C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06032C38[] = { #include "actors/bowser/bowser_eye_left_1.rgba16.inc.c" }; // 0x06033C38 -ALIGNED8 static const Texture bowser_seg6_texture_06033C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06033C38[] = { #include "actors/bowser/bowser_eye_half_closed_1.rgba16.inc.c" }; // 0x06034C38 -ALIGNED8 static const Texture bowser_seg6_texture_06034C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06034C38[] = { #include "actors/bowser/bowser_eye_closed_1.rgba16.inc.c" }; // 0x06035C38 -ALIGNED8 static const Texture bowser_seg6_texture_06035C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06035C38[] = { #include "actors/bowser/bowser_eye_center_1.rgba16.inc.c" }; // 0x06036C38 -ALIGNED8 static const Texture bowser_seg6_texture_06036C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06036C38[] = { #include "actors/bowser/bowser_eye_right_1.rgba16.inc.c" }; // 0x06037C38 -ALIGNED8 static const Texture bowser_seg6_texture_06037C38[] = { +ALIGNED8 const Texture bowser_seg6_texture_06037C38[] = { #include "actors/bowser/bowser_eye_far_left_1.rgba16.inc.c" }; diff --git a/actors/bowser_flame/model.inc.c b/actors/bowser_flame/model.inc.c index d93d733c..da2351a1 100644 --- a/actors/bowser_flame/model.inc.c +++ b/actors/bowser_flame/model.inc.c @@ -3,72 +3,72 @@ // TODO: These 64x64 textures are referenced as two different texture addresses in the DLs // 0x06000000 -ALIGNED8 static const Texture flame_seg6_texture_06000000[] = { +ALIGNED8 const Texture flame_seg6_texture_06000000[] = { #include "actors/bowser_flame/bowser_flame_0.rgba16.inc.c" }; // 0x06002000 -ALIGNED8 static const Texture flame_seg6_texture_06002000[] = { +ALIGNED8 const Texture flame_seg6_texture_06002000[] = { #include "actors/bowser_flame/bowser_flame_1.rgba16.inc.c" }; // 0x06004000 -ALIGNED8 static const Texture flame_seg6_texture_06004000[] = { +ALIGNED8 const Texture flame_seg6_texture_06004000[] = { #include "actors/bowser_flame/bowser_flame_2.rgba16.inc.c" }; // 0x06006000 -ALIGNED8 static const Texture flame_seg6_texture_06006000[] = { +ALIGNED8 const Texture flame_seg6_texture_06006000[] = { #include "actors/bowser_flame/bowser_flame_3.rgba16.inc.c" }; // 0x06008000 -ALIGNED8 static const Texture flame_seg6_texture_06008000[] = { +ALIGNED8 const Texture flame_seg6_texture_06008000[] = { #include "actors/bowser_flame/bowser_flame_4.rgba16.inc.c" }; // 0x0600A000 -ALIGNED8 static const Texture flame_seg6_texture_0600A000[] = { +ALIGNED8 const Texture flame_seg6_texture_0600A000[] = { #include "actors/bowser_flame/bowser_flame_5.rgba16.inc.c" }; // 0x0600C000 -ALIGNED8 static const Texture flame_seg6_texture_0600C000[] = { +ALIGNED8 const Texture flame_seg6_texture_0600C000[] = { #include "actors/bowser_flame/bowser_flame_6.rgba16.inc.c" }; // 0x0600E000 -ALIGNED8 static const Texture flame_seg6_texture_0600E000[] = { +ALIGNED8 const Texture flame_seg6_texture_0600E000[] = { #include "actors/bowser_flame/bowser_flame_7.rgba16.inc.c" }; // 0x06010000 -ALIGNED8 static const Texture flame_seg6_texture_06010000[] = { +ALIGNED8 const Texture flame_seg6_texture_06010000[] = { #include "actors/bowser_flame/bowser_flame_8.rgba16.inc.c" }; // 0x06012000 -ALIGNED8 static const Texture flame_seg6_texture_06012000[] = { +ALIGNED8 const Texture flame_seg6_texture_06012000[] = { #include "actors/bowser_flame/bowser_flame_9.rgba16.inc.c" }; // 0x06014000 -ALIGNED8 static const Texture flame_seg6_texture_06014000[] = { +ALIGNED8 const Texture flame_seg6_texture_06014000[] = { #include "actors/bowser_flame/bowser_flame_10.rgba16.inc.c" }; // 0x06016000 -ALIGNED8 static const Texture flame_seg6_texture_06016000[] = { +ALIGNED8 const Texture flame_seg6_texture_06016000[] = { #include "actors/bowser_flame/bowser_flame_11.rgba16.inc.c" }; // 0x06018000 -ALIGNED8 static const Texture flame_seg6_texture_06018000[] = { +ALIGNED8 const Texture flame_seg6_texture_06018000[] = { #include "actors/bowser_flame/bowser_flame_12.rgba16.inc.c" }; // 0x0601A000 -ALIGNED8 static const Texture flame_seg6_texture_0601A000[] = { +ALIGNED8 const Texture flame_seg6_texture_0601A000[] = { #include "actors/bowser_flame/bowser_flame_13.rgba16.inc.c" }; diff --git a/actors/breakable_box/model.inc.c b/actors/breakable_box/model.inc.c index c319b300..970d9a1a 100644 --- a/actors/breakable_box/model.inc.c +++ b/actors/breakable_box/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 breakable_box_seg8_lights_08011A80 = gdSPDefLights1( ); // 0x08011A90 -ALIGNED8 static const Texture breakable_box_seg8_texture_08011A90[] = { +ALIGNED8 const Texture breakable_box_seg8_texture_08011A90[] = { #include "actors/breakable_box/crazy_box_surface.rgba16.inc.c" }; // 0x08012290 -ALIGNED8 static const Texture breakable_box_seg8_texture_08012290[] = { +ALIGNED8 const Texture breakable_box_seg8_texture_08012290[] = { #include "actors/breakable_box/cork_box_surface.rgba16.inc.c" }; diff --git a/actors/bub/model.inc.c b/actors/bub/model.inc.c index 97d570f3..9ab2772b 100644 --- a/actors/bub/model.inc.c +++ b/actors/bub/model.inc.c @@ -13,22 +13,22 @@ static const Lights1 bub_seg6_lights_0600E290 = gdSPDefLights1( ); // 0x0600E2A8 -ALIGNED8 static const Texture bub_seg6_texture_0600E2A8[] = { +ALIGNED8 const Texture bub_seg6_texture_0600E2A8[] = { #include "actors/bub/bub_eye_border.rgba16.inc.c" }; // 0x0600EAA8 -ALIGNED8 static const Texture bub_seg6_texture_0600EAA8[] = { +ALIGNED8 const Texture bub_seg6_texture_0600EAA8[] = { #include "actors/bub/bub_fins.rgba16.inc.c" }; // 0x0600F2A8 -ALIGNED8 static const Texture bub_seg6_texture_0600F2A8[] = { +ALIGNED8 const Texture bub_seg6_texture_0600F2A8[] = { #include "actors/bub/bub_eyes.rgba16.inc.c" }; // 0x060102A8 -ALIGNED8 static const Texture bub_seg6_texture_060102A8[] = { +ALIGNED8 const Texture bub_seg6_texture_060102A8[] = { #include "actors/bub/bub_scales.rgba16.inc.c" }; diff --git a/actors/bubba/model.inc.c b/actors/bubba/model.inc.c index 5775b710..e6f8ea18 100644 --- a/actors/bubba/model.inc.c +++ b/actors/bubba/model.inc.c @@ -8,28 +8,28 @@ UNUSED static const u64 bubba_unused_1 = 0; // Bubba // 0x05000008 -ALIGNED8 static const Texture bubba_seg5_texture_05000008[] = { +ALIGNED8 const Texture bubba_seg5_texture_05000008[] = { #include "actors/bubba/bubba_sunglasses.rgba16.inc.c" }; // unused eye texture, assumed leftover from when actor file was copied from bub // 0x05000408 -ALIGNED8 static const Texture bubba_seg5_texture_05000408[] = { +ALIGNED8 const Texture bubba_seg5_texture_05000408[] = { #include "actors/bubba/bubba_eyes_unused.rgba16.inc.c" }; // 0x05001408 -ALIGNED8 static const Texture bubba_seg5_texture_05001408[] = { +ALIGNED8 const Texture bubba_seg5_texture_05001408[] = { #include "actors/bubba/bubba_eye_border.rgba16.inc.c" }; // 0x05001C08 -ALIGNED8 static const Texture bubba_seg5_texture_05001C08[] = { +ALIGNED8 const Texture bubba_seg5_texture_05001C08[] = { #include "actors/bubba/bubba_fins.rgba16.inc.c" }; // 0x05002408 -ALIGNED8 static const Texture bubba_seg5_texture_05002408[] = { +ALIGNED8 const Texture bubba_seg5_texture_05002408[] = { #include "actors/bubba/bubba_scales.rgba16.inc.c" }; diff --git a/actors/bubble/model.inc.c b/actors/bubble/model.inc.c index 150ee15e..f7acbe9e 100644 --- a/actors/bubble/model.inc.c +++ b/actors/bubble/model.inc.c @@ -9,12 +9,12 @@ static const Vtx bubble_seg4_vertex_0401CD20[] = { }; // 0x0401CD60 -ALIGNED8 static const Texture bubble_seg4_texture_0401CD60[] = { +ALIGNED8 const Texture bubble_seg4_texture_0401CD60[] = { #include "actors/bubble/bubble.rgba16.inc.c" }; // 0x0401D560 -ALIGNED8 static const Texture bubble_seg4_texture_0401D560[] = { +ALIGNED8 const Texture bubble_seg4_texture_0401D560[] = { #include "actors/bubble/mr_i_bubble.rgba16.inc.c" }; diff --git a/actors/bullet_bill/model.inc.c b/actors/bullet_bill/model.inc.c index e54a9de9..0bb1d8ef 100644 --- a/actors/bullet_bill/model.inc.c +++ b/actors/bullet_bill/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 bullet_bill_seg5_lights_0500BA90 = gdSPDefLights1( ); // 0x0500BAA8 -ALIGNED8 static const Texture bullet_bill_seg5_texture_0500BAA8[] = { +ALIGNED8 const Texture bullet_bill_seg5_texture_0500BAA8[] = { #include "actors/bullet_bill/bullet_bill_eye.rgba16.inc.c" }; // 0x0500CAA8 -ALIGNED8 static const Texture bullet_bill_seg5_texture_0500CAA8[] = { +ALIGNED8 const Texture bullet_bill_seg5_texture_0500CAA8[] = { #include "actors/bullet_bill/bullet_bill_mouth.rgba16.inc.c" }; diff --git a/actors/bully/model.inc.c b/actors/bully/model.inc.c index 8eaf7e73..47350189 100644 --- a/actors/bully/model.inc.c +++ b/actors/bully/model.inc.c @@ -19,7 +19,7 @@ static const Vtx bully_seg5_vertex_05000000[] = { }; // 0x050000E0 -ALIGNED8 static const Texture bully_seg5_texture_050000E0[] = { +ALIGNED8 const Texture bully_seg5_texture_050000E0[] = { #include "actors/bully/bully_horn.rgba16.inc.c" }; @@ -85,17 +85,17 @@ static const Lights1 bully_seg5_lights_05000450 = gdSPDefLights1( // //! There's another malformed light entry here. // 0x05000468 -ALIGNED8 static const Texture bully_seg5_texture_05000468[] = { +ALIGNED8 const Texture bully_seg5_texture_05000468[] = { #include "actors/bully/bully_left_side.rgba16.inc.c" }; // 0x05001468 -ALIGNED8 static const Texture bully_seg5_texture_05001468[] = { +ALIGNED8 const Texture bully_seg5_texture_05001468[] = { #include "actors/bully/bully_right_side.rgba16.inc.c" }; // 0x05002468 -ALIGNED8 static const Texture bully_seg5_texture_05002468[] = { +ALIGNED8 const Texture bully_seg5_texture_05002468[] = { #include "actors/bully/bully_eye.rgba16.inc.c" }; diff --git a/actors/burn_smoke/model.inc.c b/actors/burn_smoke/model.inc.c index be50055a..f270b8ab 100644 --- a/actors/burn_smoke/model.inc.c +++ b/actors/burn_smoke/model.inc.c @@ -15,7 +15,7 @@ static const Vtx burn_smoke_seg4_vertex_040217C0[] = { // said fix is on a compile-time variable. Use TEXTURE_FIX=1 at compile time // to fix this. // 0x04021800 -ALIGNED8 static const Texture burn_smoke_seg4_texture_04021800[] = { +ALIGNED8 const Texture burn_smoke_seg4_texture_04021800[] = { #include "actors/burn_smoke/burn_smoke.ia16.inc.c" }; diff --git a/actors/butterfly/model.inc.c b/actors/butterfly/model.inc.c index 575f6187..8f142774 100644 --- a/actors/butterfly/model.inc.c +++ b/actors/butterfly/model.inc.c @@ -11,7 +11,7 @@ static const Vtx butterfly_seg3_vertex_03004348[] = { }; // 0x030043A8 -ALIGNED8 static const Texture butterfly_seg3_texture_030043A8[] = { +ALIGNED8 const Texture butterfly_seg3_texture_030043A8[] = { #include "actors/butterfly/butterfly_wing.rgba16.inc.c" }; diff --git a/actors/cannon_barrel/model.inc.c b/actors/cannon_barrel/model.inc.c index de69ffff..4fb2258f 100644 --- a/actors/cannon_barrel/model.inc.c +++ b/actors/cannon_barrel/model.inc.c @@ -13,7 +13,7 @@ static const Lights1 cannon_barrel_seg8_lights_08005890 = gdSPDefLights1( ); // 0x080058A8 -ALIGNED8 static const Texture cannon_barrel_seg8_texture_080058A8[] = { +ALIGNED8 const Texture cannon_barrel_seg8_texture_080058A8[] = { #include "actors/cannon_barrel/cannon_barrel.rgba16.inc.c" }; diff --git a/actors/cannon_base/model.inc.c b/actors/cannon_base/model.inc.c index 61816de6..5efad556 100644 --- a/actors/cannon_base/model.inc.c +++ b/actors/cannon_base/model.inc.c @@ -13,7 +13,7 @@ static const Lights1 cannon_base_seg8_lights_080049A0 = gdSPDefLights1( ); // 0x080049B8 -ALIGNED8 static const Texture cannon_base_seg8_texture_080049B8[] = { +ALIGNED8 const Texture cannon_base_seg8_texture_080049B8[] = { #include "actors/cannon_base/cannon_base.rgba16.inc.c" }; diff --git a/actors/cannon_lid/model.inc.c b/actors/cannon_lid/model.inc.c index 96e4ecc9..df278596 100644 --- a/actors/cannon_lid/model.inc.c +++ b/actors/cannon_lid/model.inc.c @@ -7,7 +7,7 @@ static const Lights1 cannon_lid_seg8_lights_08004040 = gdSPDefLights1( ); // 0x08004058 -ALIGNED8 static const Texture cannon_lid_seg8_texture_08004058[] = { +ALIGNED8 const Texture cannon_lid_seg8_texture_08004058[] = { #include "actors/cannon_lid/cannon_lid.rgba16.inc.c" }; diff --git a/actors/capswitch/model.inc.c b/actors/capswitch/model.inc.c index 2f3f0cd5..16794957 100644 --- a/actors/capswitch/model.inc.c +++ b/actors/capswitch/model.inc.c @@ -37,12 +37,12 @@ static const Lights1 capswitch_seg5_lights_05001C30 = gdSPDefLights1( ); // 0x05001C48 -ALIGNED8 static const Texture capswitch_seg5_texture_05001C48[] = { +ALIGNED8 const Texture capswitch_seg5_texture_05001C48[] = { #include "actors/capswitch/cap_switch_head.ia16.inc.c" }; // 0x05002C48 -ALIGNED8 static const Texture capswitch_seg5_texture_05002C48[] = { +ALIGNED8 const Texture capswitch_seg5_texture_05002C48[] = { #include "actors/capswitch/cap_switch_base.rgba16.inc.c" }; diff --git a/actors/chain_ball/model.inc.c b/actors/chain_ball/model.inc.c index cd0a92bd..182d97e3 100644 --- a/actors/chain_ball/model.inc.c +++ b/actors/chain_ball/model.inc.c @@ -13,7 +13,7 @@ static const Vtx chain_ball_seg6_vertex_06020AA0[] = { UNUSED static const u64 chain_ball_unused_1 = 0; // 0x06020AE8 -ALIGNED8 static const Texture chain_ball_seg6_texture_06020AE8[] = { +ALIGNED8 const Texture chain_ball_seg6_texture_06020AE8[] = { #include "actors/chain_ball/chain_ball.rgba16.inc.c" }; diff --git a/actors/chain_chomp/model.inc.c b/actors/chain_chomp/model.inc.c index 1f8bab63..79b9fdce 100644 --- a/actors/chain_chomp/model.inc.c +++ b/actors/chain_chomp/model.inc.c @@ -19,27 +19,27 @@ UNUSED static const Lights1 chain_chomp_lights_unused3 = gdSPDefLights1( ); // 0x060213D0 -ALIGNED8 static const Texture chain_chomp_seg6_texture_060213D0[] = { +ALIGNED8 const Texture chain_chomp_seg6_texture_060213D0[] = { #include "actors/chain_chomp/chain_chomp_bright_shine.rgba16.inc.c" }; // 0x06021BD0 -ALIGNED8 static const Texture chain_chomp_seg6_texture_06021BD0[] = { +ALIGNED8 const Texture chain_chomp_seg6_texture_06021BD0[] = { #include "actors/chain_chomp/chain_chomp_dull_shine.rgba16.inc.c" }; // 0x060223D0 -ALIGNED8 static const Texture chain_chomp_seg6_texture_060223D0[] = { +ALIGNED8 const Texture chain_chomp_seg6_texture_060223D0[] = { #include "actors/chain_chomp/chain_chomp_tongue.rgba16.inc.c" }; // 0x06022BD0 -ALIGNED8 static const Texture chain_chomp_seg6_texture_06022BD0[] = { +ALIGNED8 const Texture chain_chomp_seg6_texture_06022BD0[] = { #include "actors/chain_chomp/chain_chomp_tooth.rgba16.inc.c" }; // 0x060233D0 -ALIGNED8 static const Texture chain_chomp_seg6_texture_060233D0[] = { +ALIGNED8 const Texture chain_chomp_seg6_texture_060233D0[] = { #include "actors/chain_chomp/chain_chomp_eye.rgba16.inc.c" }; diff --git a/actors/chair/model.inc.c b/actors/chair/model.inc.c index 1a833f5b..b9e4a43a 100644 --- a/actors/chair/model.inc.c +++ b/actors/chair/model.inc.c @@ -7,23 +7,23 @@ UNUSED static const Lights1 chair_lights_unused = gdSPDefLights1( ); // 0x05003060 -ALIGNED8 static const Texture chair_seg5_texture_05003060[] = { +ALIGNED8 const Texture chair_seg5_texture_05003060[] = { #include "actors/chair/chair_front.rgba16.inc.c" }; // 0x05003860 -ALIGNED8 static const Texture chair_seg5_texture_05003860[] = { +ALIGNED8 const Texture chair_seg5_texture_05003860[] = { #include "actors/chair/chair_leg.rgba16.inc.c" }; // 0x05004060 -ALIGNED8 static const Texture chair_seg5_texture_05004060[] = { +ALIGNED8 const Texture chair_seg5_texture_05004060[] = { #include "actors/chair/chair_bottom.rgba16.inc.c" }; // unreferenced // 0x05004460 -ALIGNED8 static const Texture chair_seg5_texture_05004460[] = { +ALIGNED8 const Texture chair_seg5_texture_05004460[] = { #include "actors/chair/chair_surface_unused.rgba16.inc.c" }; diff --git a/actors/checkerboard_platform/model.inc.c b/actors/checkerboard_platform/model.inc.c index 3ce6ef3e..81c38b9d 100644 --- a/actors/checkerboard_platform/model.inc.c +++ b/actors/checkerboard_platform/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 checkerboard_platform_seg8_lights_0800C828 = gdSPDefLights1 ); // 0x0800C840 -ALIGNED8 static const Texture checkerboard_platform_seg8_texture_0800C840[] = { +ALIGNED8 const Texture checkerboard_platform_seg8_texture_0800C840[] = { #include "actors/checkerboard_platform/checkerboard_platform_side.rgba16.inc.c" }; // 0x0800CC40 -ALIGNED8 static const Texture checkerboard_platform_seg8_texture_0800CC40[] = { +ALIGNED8 const Texture checkerboard_platform_seg8_texture_0800CC40[] = { #include "actors/checkerboard_platform/checkerboard_platform.rgba16.inc.c" }; diff --git a/actors/chillychief/model.inc.c b/actors/chillychief/model.inc.c index 415329e2..477b2bcd 100644 --- a/actors/chillychief/model.inc.c +++ b/actors/chillychief/model.inc.c @@ -25,17 +25,17 @@ UNUSED static const Lights1 chillychief_lights_unused = gdSPDefLights1( ); // 0x06000060 -ALIGNED8 static const Texture chilly_chief_seg6_texture_06000060[] = { +ALIGNED8 const Texture chilly_chief_seg6_texture_06000060[] = { #include "actors/chillychief/chill_bully_left_side.rgba16.inc.c" }; // 0x06001060 -ALIGNED8 static const Texture chilly_chief_seg6_texture_06001060[] = { +ALIGNED8 const Texture chilly_chief_seg6_texture_06001060[] = { #include "actors/chillychief/chill_bully_right_side.rgba16.inc.c" }; // 0x06002060 -ALIGNED8 static const Texture chilly_chief_seg6_texture_06002060[] = { +ALIGNED8 const Texture chilly_chief_seg6_texture_06002060[] = { #include "actors/chillychief/chill_bully_eye.rgba16.inc.c" }; diff --git a/actors/chuckya/model.inc.c b/actors/chuckya/model.inc.c index 3cbc31b2..ce41aabc 100644 --- a/actors/chuckya/model.inc.c +++ b/actors/chuckya/model.inc.c @@ -43,22 +43,22 @@ UNUSED static const Lights1 chuckya_lights_unused7 = gdSPDefLights1( ); // 0x08006778 -ALIGNED8 static const Texture chuckya_seg8_texture_08006778[] = { +ALIGNED8 const Texture chuckya_seg8_texture_08006778[] = { #include "actors/chuckya/chuckya_eyes.rgba16.inc.c" }; // 0x08007778 -ALIGNED8 static const Texture chuckya_seg8_texture_08007778[] = { +ALIGNED8 const Texture chuckya_seg8_texture_08007778[] = { #include "actors/chuckya/chuckya_hand_antenna.rgba16.inc.c" }; // 0x08007F78 -ALIGNED8 static const Texture chuckya_seg8_texture_08007F78[] = { +ALIGNED8 const Texture chuckya_seg8_texture_08007F78[] = { #include "actors/chuckya/chuckya_body_arm_left_side.rgba16.inc.c" }; // 0x08008F78 -ALIGNED8 static const Texture chuckya_seg8_texture_08008F78[] = { +ALIGNED8 const Texture chuckya_seg8_texture_08008F78[] = { #include "actors/chuckya/chuckya_body_arm_right_side.rgba16.inc.c" }; diff --git a/actors/clam_shell/model.inc.c b/actors/clam_shell/model.inc.c index 40ebc6b3..2333f6a6 100644 --- a/actors/clam_shell/model.inc.c +++ b/actors/clam_shell/model.inc.c @@ -13,12 +13,12 @@ UNUSED static const Lights1 clam_shell_lights_unused2 = gdSPDefLights1( ); // 0x05000030 -ALIGNED8 static const Texture clam_shell_seg5_texture_05000030[] = { +ALIGNED8 const Texture clam_shell_seg5_texture_05000030[] = { #include "actors/clam_shell/clam_shell.rgba16.inc.c" }; // 0x05000830 -ALIGNED8 static const Texture clam_shell_seg5_texture_05000830[] = { +ALIGNED8 const Texture clam_shell_seg5_texture_05000830[] = { #include "actors/clam_shell/clam_shell_mouth.rgba16.inc.c" }; diff --git a/actors/coin/model.inc.c b/actors/coin/model.inc.c index dcb637de..9e5f0d73 100644 --- a/actors/coin/model.inc.c +++ b/actors/coin/model.inc.c @@ -25,22 +25,22 @@ static const Vtx coin_seg3_vertex_03005740[] = { }; // 0x03005780 -ALIGNED8 static const Texture coin_seg3_texture_03005780[] = { +ALIGNED8 const Texture coin_seg3_texture_03005780[] = { #include "actors/coin/coin_front.ia16.inc.c" }; // 0x03005F80 -ALIGNED8 static const Texture coin_seg3_texture_03005F80[] = { +ALIGNED8 const Texture coin_seg3_texture_03005F80[] = { #include "actors/coin/coin_tilt_right.ia16.inc.c" }; // 0x03006780 -ALIGNED8 static const Texture coin_seg3_texture_03006780[] = { +ALIGNED8 const Texture coin_seg3_texture_03006780[] = { #include "actors/coin/coin_side.ia16.inc.c" }; // 0x03006F80 -ALIGNED8 static const Texture coin_seg3_texture_03006F80[] = { +ALIGNED8 const Texture coin_seg3_texture_03006F80[] = { #include "actors/coin/coin_tilt_left.ia16.inc.c" }; diff --git a/actors/cyan_fish/model.inc.c b/actors/cyan_fish/model.inc.c index 9dff09c9..99f00f58 100644 --- a/actors/cyan_fish/model.inc.c +++ b/actors/cyan_fish/model.inc.c @@ -4,7 +4,7 @@ UNUSED static const u64 cyan_fish_unused_1 = 0; // 0x0600D468 -ALIGNED8 static const Texture cyan_fish_seg6_texture_0600D468[] = { +ALIGNED8 const Texture cyan_fish_seg6_texture_0600D468[] = { #include "actors/cyan_fish/cyan_fish.rgba16.inc.c" }; diff --git a/actors/dirt/model.inc.c b/actors/dirt/model.inc.c index d630615f..eb981aae 100644 --- a/actors/dirt/model.inc.c +++ b/actors/dirt/model.inc.c @@ -32,7 +32,7 @@ static const Vtx dirt_seg3_vertex_0302BDC8[] = { }; // 0x0302BDF8 -ALIGNED8 static const Texture dirt_seg3_texture_0302BDF8[] = { +ALIGNED8 const Texture dirt_seg3_texture_0302BDF8[] = { #include "actors/dirt/dirt_particle.rgba16.inc.c" }; diff --git a/actors/door/model.inc.c b/actors/door/model.inc.c index a4059d85..cab9c108 100644 --- a/actors/door/model.inc.c +++ b/actors/door/model.inc.c @@ -13,72 +13,72 @@ static const Lights1 door_seg3_lights_03009CF8 = gdSPDefLights1( ); // 0x03009D10 -ALIGNED8 static const Texture door_seg3_texture_03009D10[] = { +ALIGNED8 const Texture door_seg3_texture_03009D10[] = { #include "actors/door/polished_wooden_door.rgba16.inc.c" }; // 0x0300AD10 -ALIGNED8 static const Texture door_seg3_texture_0300AD10[] = { +ALIGNED8 const Texture door_seg3_texture_0300AD10[] = { #include "actors/door/polished_wooden_door_overlay.rgba16.inc.c" }; // 0x0300BD10 -ALIGNED8 static const Texture door_seg3_texture_0300BD10[] = { +ALIGNED8 const Texture door_seg3_texture_0300BD10[] = { #include "actors/door/rough_wooden_door.rgba16.inc.c" }; // 0x0300CD10 -ALIGNED8 static const Texture door_seg3_texture_0300CD10[] = { +ALIGNED8 const Texture door_seg3_texture_0300CD10[] = { #include "actors/door/rough_wooden_door_overlay.rgba16.inc.c" }; // 0x0300D510 -ALIGNED8 static const Texture door_seg3_texture_0300D510[] = { +ALIGNED8 const Texture door_seg3_texture_0300D510[] = { #include "actors/door/metal_door.rgba16.inc.c" }; // 0x0300E510 -ALIGNED8 static const Texture door_seg3_texture_0300E510[] = { +ALIGNED8 const Texture door_seg3_texture_0300E510[] = { #include "actors/door/metal_door_overlay.rgba16.inc.c" }; // 0x0300ED10 -ALIGNED8 static const Texture door_seg3_texture_0300ED10[] = { +ALIGNED8 const Texture door_seg3_texture_0300ED10[] = { #include "actors/door/hmc_mural_door.rgba16.inc.c" }; // 0x0300FD10 -ALIGNED8 static const Texture door_seg3_texture_0300FD10[] = { +ALIGNED8 const Texture door_seg3_texture_0300FD10[] = { #include "actors/door/hmc_mural_door_overlay.rgba16.inc.c" }; // 0x03010510 -ALIGNED8 static const Texture door_seg3_texture_03010510[] = { +ALIGNED8 const Texture door_seg3_texture_03010510[] = { #include "actors/door/bbh_door.rgba16.inc.c" }; // 0x03011510 -ALIGNED8 static const Texture door_seg3_texture_03011510[] = { +ALIGNED8 const Texture door_seg3_texture_03011510[] = { #include "actors/door/bbh_door_overlay.rgba16.inc.c" }; // 0x03011D10 -ALIGNED8 static const Texture door_seg3_texture_03011D10[] = { +ALIGNED8 const Texture door_seg3_texture_03011D10[] = { #include "actors/door/zero_star_door_sign.rgba16.inc.c" }; // 0x03012510 -ALIGNED8 static const Texture door_seg3_texture_03012510[] = { +ALIGNED8 const Texture door_seg3_texture_03012510[] = { #include "actors/door/one_star_door_sign.rgba16.inc.c" }; // 0x03012D10 -ALIGNED8 static const Texture door_seg3_texture_03012D10[] = { +ALIGNED8 const Texture door_seg3_texture_03012D10[] = { #include "actors/door/three_star_door_sign.rgba16.inc.c" }; // 0x03013510 -ALIGNED8 static const Texture door_seg3_texture_03013510[] = { +ALIGNED8 const Texture door_seg3_texture_03013510[] = { #include "actors/door/door_lock.rgba16.inc.c" }; diff --git a/actors/dorrie/model.inc.c b/actors/dorrie/model.inc.c index b2097a5d..8c15e267 100644 --- a/actors/dorrie/model.inc.c +++ b/actors/dorrie/model.inc.c @@ -1,17 +1,17 @@ // Dorrie // 0x06009BA0 -ALIGNED8 static const Texture dorrie_seg6_texture_06009BA0[] = { +ALIGNED8 const Texture dorrie_seg6_texture_06009BA0[] = { #include "actors/dorrie/dorrie_eye.rgba16.inc.c" }; // 0x06009DA0 -ALIGNED8 static const Texture dorrie_seg6_texture_06009DA0[] = { +ALIGNED8 const Texture dorrie_seg6_texture_06009DA0[] = { #include "actors/dorrie/dorrie_skin.rgba16.inc.c" }; // 0x0600ADA0 -ALIGNED8 static const Texture dorrie_seg6_texture_0600ADA0[] = { +ALIGNED8 const Texture dorrie_seg6_texture_0600ADA0[] = { #include "actors/dorrie/dorrie_tongue.rgba16.inc.c" }; diff --git a/actors/exclamation_box/model.inc.c b/actors/exclamation_box/model.inc.c index a59b2280..095db98c 100644 --- a/actors/exclamation_box/model.inc.c +++ b/actors/exclamation_box/model.inc.c @@ -7,42 +7,42 @@ static const Lights1 exclamation_box_seg8_lights_08012E10 = gdSPDefLights1( ); // 0x08012E28 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08012E28[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08012E28[] = { #include "actors/exclamation_box/vanish_cap_box_front.rgba16.inc.c" }; // 0x08013628 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08013628[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08013628[] = { #include "actors/exclamation_box/vanish_cap_box_side.rgba16.inc.c" }; // 0x08014628 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08014628[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08014628[] = { #include "actors/exclamation_box/metal_cap_box_front.rgba16.inc.c" }; // 0x08014E28 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08014E28[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08014E28[] = { #include "actors/exclamation_box/metal_cap_box_side.rgba16.inc.c" }; // 0x08015E28 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08015E28[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08015E28[] = { #include "actors/exclamation_box/wing_cap_box_front.rgba16.inc.c" }; // 0x08016628 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08016628[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08016628[] = { #include "actors/exclamation_box/wing_cap_box_side.rgba16.inc.c" }; // 0x08017628 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08017628[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08017628[] = { #include "actors/exclamation_box/exclamation_box_front.rgba16.inc.c" }; // 0x08017E28 -ALIGNED8 static const Texture exclamation_box_seg8_texture_08017E28[] = { +ALIGNED8 const Texture exclamation_box_seg8_texture_08017E28[] = { #include "actors/exclamation_box/exclamation_box_side.rgba16.inc.c" }; diff --git a/actors/exclamation_box_outline/model.inc.c b/actors/exclamation_box_outline/model.inc.c index 61b5ecd1..bc6cf083 100644 --- a/actors/exclamation_box_outline/model.inc.c +++ b/actors/exclamation_box_outline/model.inc.c @@ -154,7 +154,7 @@ static const Vtx exclamation_box_outline_seg8_vertex_080250E8[] = { }; // 0x08025168 -ALIGNED8 static const Texture exclamation_box_outline_seg8_texture_08025168[] = { +ALIGNED8 const Texture exclamation_box_outline_seg8_texture_08025168[] = { #include "actors/exclamation_box_outline/exclamation_box_outline.rgba16.inc.c" }; @@ -199,7 +199,7 @@ static const Lights1 exclamation_box_outline_seg8_lights_08025A68 = gdSPDefLight ); // 0x08025A80 -ALIGNED8 static const Texture exclamation_box_outline_seg8_texture_08025A80[] = { +ALIGNED8 const Texture exclamation_box_outline_seg8_texture_08025A80[] = { #include "actors/exclamation_box_outline/exclamation_point.rgba16.inc.c" }; diff --git a/actors/explosion/model.inc.c b/actors/explosion/model.inc.c index 8bc4b447..cc05170b 100644 --- a/actors/explosion/model.inc.c +++ b/actors/explosion/model.inc.c @@ -9,37 +9,37 @@ static const Vtx explosion_seg3_vertex_030009C8[] = { }; // 0x03000A08 -ALIGNED8 static const Texture explosion_seg3_texture_03000A08[] = { +ALIGNED8 const Texture explosion_seg3_texture_03000A08[] = { #include "actors/explosion/explosion_0.rgba16.inc.c" }; // 0x03001208 -ALIGNED8 static const Texture explosion_seg3_texture_03001208[] = { +ALIGNED8 const Texture explosion_seg3_texture_03001208[] = { #include "actors/explosion/explosion_1.rgba16.inc.c" }; // 0x03001A08 -ALIGNED8 static const Texture explosion_seg3_texture_03001A08[] = { +ALIGNED8 const Texture explosion_seg3_texture_03001A08[] = { #include "actors/explosion/explosion_2.rgba16.inc.c" }; // 0x03002208 -ALIGNED8 static const Texture explosion_seg3_texture_03002208[] = { +ALIGNED8 const Texture explosion_seg3_texture_03002208[] = { #include "actors/explosion/explosion_3.rgba16.inc.c" }; // 0x03002A08 -ALIGNED8 static const Texture explosion_seg3_texture_03002A08[] = { +ALIGNED8 const Texture explosion_seg3_texture_03002A08[] = { #include "actors/explosion/explosion_4.rgba16.inc.c" }; // 0x03003208 -ALIGNED8 static const Texture explosion_seg3_texture_03003208[] = { +ALIGNED8 const Texture explosion_seg3_texture_03003208[] = { #include "actors/explosion/explosion_5.rgba16.inc.c" }; // 0x03003A08 -ALIGNED8 static const Texture explosion_seg3_texture_03003A08[] = { +ALIGNED8 const Texture explosion_seg3_texture_03003A08[] = { #include "actors/explosion/explosion_6.rgba16.inc.c" }; diff --git a/actors/eyerok/model.inc.c b/actors/eyerok/model.inc.c index 629b3cda..c605865c 100644 --- a/actors/eyerok/model.inc.c +++ b/actors/eyerok/model.inc.c @@ -7,27 +7,27 @@ UNUSED static const Lights1 eyerok_lights_unused = gdSPDefLights1( ); // 0x05008D40 -ALIGNED8 static const Texture eyerok_seg5_texture_05008D40[] = { +ALIGNED8 const Texture eyerok_seg5_texture_05008D40[] = { #include "actors/eyerok/eyerok_bricks.rgba16.inc.c" }; // 0x05009540 -ALIGNED8 static const Texture eyerok_seg5_texture_05009540[] = { +ALIGNED8 const Texture eyerok_seg5_texture_05009540[] = { #include "actors/eyerok/eyerok_eye_open.rgba16.inc.c" }; // 0x05009D40 -ALIGNED8 static const Texture eyerok_seg5_texture_05009D40[] = { +ALIGNED8 const Texture eyerok_seg5_texture_05009D40[] = { #include "actors/eyerok/eyerok_eye_mostly_open.rgba16.inc.c" }; // 0x0500A540 -ALIGNED8 static const Texture eyerok_seg5_texture_0500A540[] = { +ALIGNED8 const Texture eyerok_seg5_texture_0500A540[] = { #include "actors/eyerok/eyerok_eye_mostly_closed.rgba16.inc.c" }; // 0x0500AD40 -ALIGNED8 static const Texture eyerok_seg5_texture_0500AD40[] = { +ALIGNED8 const Texture eyerok_seg5_texture_0500AD40[] = { #include "actors/eyerok/eyerok_eye_closed.rgba16.inc.c" }; diff --git a/actors/flame/model.inc.c b/actors/flame/model.inc.c index 09226058..927fc9c1 100644 --- a/actors/flame/model.inc.c +++ b/actors/flame/model.inc.c @@ -9,42 +9,42 @@ static const Vtx flame_seg3_vertex_030172E0[] = { }; // 0x03017320 -ALIGNED8 static const Texture flame_seg3_texture_03017320[] = { +ALIGNED8 const Texture flame_seg3_texture_03017320[] = { #include "actors/flame/flame_0.ia16.inc.c" }; // 0x03017B20 -ALIGNED8 static const Texture flame_seg3_texture_03017B20[] = { +ALIGNED8 const Texture flame_seg3_texture_03017B20[] = { #include "actors/flame/flame_1.ia16.inc.c" }; // 0x03018320 -ALIGNED8 static const Texture flame_seg3_texture_03018320[] = { +ALIGNED8 const Texture flame_seg3_texture_03018320[] = { #include "actors/flame/flame_2.ia16.inc.c" }; // 0x03018B20 -ALIGNED8 static const Texture flame_seg3_texture_03018B20[] = { +ALIGNED8 const Texture flame_seg3_texture_03018B20[] = { #include "actors/flame/flame_3.ia16.inc.c" }; // 0x03019320 -ALIGNED8 static const Texture flame_seg3_texture_03019320[] = { +ALIGNED8 const Texture flame_seg3_texture_03019320[] = { #include "actors/flame/flame_4.ia16.inc.c" }; // 0x03019B20 -ALIGNED8 static const Texture flame_seg3_texture_03019B20[] = { +ALIGNED8 const Texture flame_seg3_texture_03019B20[] = { #include "actors/flame/flame_5.ia16.inc.c" }; // 0x0301A320 -ALIGNED8 static const Texture flame_seg3_texture_0301A320[] = { +ALIGNED8 const Texture flame_seg3_texture_0301A320[] = { #include "actors/flame/flame_6.ia16.inc.c" }; // 0x0301AB20 -ALIGNED8 static const Texture flame_seg3_texture_0301AB20[] = { +ALIGNED8 const Texture flame_seg3_texture_0301AB20[] = { #include "actors/flame/flame_7.ia16.inc.c" }; diff --git a/actors/flyguy/model.inc.c b/actors/flyguy/model.inc.c index c9fc0648..ee0ad1af 100644 --- a/actors/flyguy/model.inc.c +++ b/actors/flyguy/model.inc.c @@ -4,17 +4,17 @@ UNUSED static const u64 flyguy_unused_1 = 0; // 0x0800E088 -ALIGNED8 static const Texture flyguy_seg8_texture_0800E088[] = { +ALIGNED8 const Texture flyguy_seg8_texture_0800E088[] = { #include "actors/flyguy/flyguy_cloth_wrinkle.rgba16.inc.c" }; // 0x0800F088 -ALIGNED8 static const Texture flyguy_seg8_texture_0800F088[] = { +ALIGNED8 const Texture flyguy_seg8_texture_0800F088[] = { #include "actors/flyguy/flyguy_face.rgba16.inc.c" }; // 0x0800F888 -ALIGNED8 static const Texture flyguy_seg8_texture_0800F888[] = { +ALIGNED8 const Texture flyguy_seg8_texture_0800F888[] = { #include "actors/flyguy/flyguy_propeller.ia16.inc.c" }; diff --git a/actors/fwoosh/model.inc.c b/actors/fwoosh/model.inc.c index a6aa202c..d6c27b70 100644 --- a/actors/fwoosh/model.inc.c +++ b/actors/fwoosh/model.inc.c @@ -9,7 +9,7 @@ static const Vtx fwoosh_seg5_vertex_050157C8[] = { }; // 0x05015808 -ALIGNED8 static const Texture fwoosh_seg5_texture_05015808[] = { +ALIGNED8 const Texture fwoosh_seg5_texture_05015808[] = { #include "actors/fwoosh/fwoosh_face.ia16.inc.c" }; diff --git a/actors/goomba/model.inc.c b/actors/goomba/model.inc.c index f45d3918..baa4af97 100644 --- a/actors/goomba/model.inc.c +++ b/actors/goomba/model.inc.c @@ -37,17 +37,17 @@ static const Lights1 goomba_seg8_lights_08019518 = gdSPDefLights1( ); // 0x08019530 -ALIGNED8 static const Texture goomba_seg8_texture_08019530[] = { +ALIGNED8 const Texture goomba_seg8_texture_08019530[] = { #include "actors/goomba/goomba_body.rgba16.inc.c" }; // 0x08019D30 -ALIGNED8 static const Texture goomba_seg8_texture_08019D30[] = { +ALIGNED8 const Texture goomba_seg8_texture_08019D30[] = { #include "actors/goomba/goomba_face.rgba16.inc.c" }; // 0x0801A530 -ALIGNED8 static const Texture goomba_seg8_texture_0801A530[] = { +ALIGNED8 const Texture goomba_seg8_texture_0801A530[] = { #include "actors/goomba/goomba_face_blink.rgba16.inc.c" }; diff --git a/actors/haunted_cage/model.inc.c b/actors/haunted_cage/model.inc.c index 0f221d98..3e2a3b05 100644 --- a/actors/haunted_cage/model.inc.c +++ b/actors/haunted_cage/model.inc.c @@ -13,27 +13,27 @@ static const Lights1 haunted_cage_seg5_lights_0500C270 = gdSPDefLights1( ); // 0x0500C288 -ALIGNED8 static const Texture haunted_cage_seg5_texture_0500C288[] = { +ALIGNED8 const Texture haunted_cage_seg5_texture_0500C288[] = { #include "actors/haunted_cage/bbh_cage_floor.rgba16.inc.c" }; // 0x0500CA88 -ALIGNED8 static const Texture haunted_cage_seg5_texture_0500CA88[] = { +ALIGNED8 const Texture haunted_cage_seg5_texture_0500CA88[] = { #include "actors/haunted_cage/bbh_cage_double_ornament.rgba16.inc.c" }; // 0x0500D288 -ALIGNED8 static const Texture haunted_cage_seg5_texture_0500D288[] = { +ALIGNED8 const Texture haunted_cage_seg5_texture_0500D288[] = { #include "actors/haunted_cage/bbh_cage_ornament.rgba16.inc.c" }; // 0x0500D688 -ALIGNED8 static const Texture haunted_cage_seg5_texture_0500D688[] = { +ALIGNED8 const Texture haunted_cage_seg5_texture_0500D688[] = { #include "actors/haunted_cage/bbh_cage_wooden_base.rgba16.inc.c" }; // 0x0500DA88 -ALIGNED8 static const Texture haunted_cage_seg5_texture_0500DA88[] = { +ALIGNED8 const Texture haunted_cage_seg5_texture_0500DA88[] = { #include "actors/haunted_cage/bbh_cage_bars.rgba16.inc.c" }; @@ -41,7 +41,7 @@ ALIGNED8 static const Texture haunted_cage_seg5_texture_0500DA88[] = { // also could be some sort of shader mask from much earlier in development, considering // Big Boo's Haunt was a very very early level. // 0x0500E288 -ALIGNED8 static const Texture haunted_cage_seg5_texture_0500E288[] = { +ALIGNED8 const Texture haunted_cage_seg5_texture_0500E288[] = { #include "actors/haunted_cage/bbh_cage_garbage.rgba16.inc.c" }; diff --git a/actors/heart/model.inc.c b/actors/heart/model.inc.c index b5962946..1dcb5e34 100644 --- a/actors/heart/model.inc.c +++ b/actors/heart/model.inc.c @@ -9,7 +9,7 @@ static const Vtx heart_seg8_vertex_0800D7A0[] = { }; // 0x0800D7E0 -ALIGNED8 static const Texture heart_seg8_texture_0800D7E0[] = { +ALIGNED8 const Texture heart_seg8_texture_0800D7E0[] = { #include "actors/heart/spinning_heart.rgba16.inc.c" }; diff --git a/actors/heave_ho/model.inc.c b/actors/heave_ho/model.inc.c index 3868cd1d..65cafe8a 100644 --- a/actors/heave_ho/model.inc.c +++ b/actors/heave_ho/model.inc.c @@ -43,32 +43,32 @@ static const Lights1 heave_ho_lights_unused5 = gdSPDefLights1( ); // 0x0500E9C8 -ALIGNED8 static const Texture heave_ho_seg5_texture_0500E9C8[] = { +ALIGNED8 const Texture heave_ho_seg5_texture_0500E9C8[] = { #include "actors/heave_ho/heave-ho_face.rgba16.inc.c" }; // 0x0500F1C8 -ALIGNED8 static const Texture heave_ho_seg5_texture_0500F1C8[] = { +ALIGNED8 const Texture heave_ho_seg5_texture_0500F1C8[] = { #include "actors/heave_ho/heave-ho_platform.rgba16.inc.c" }; // 0x0500F9C8 -ALIGNED8 static const Texture heave_ho_seg5_texture_0500F9C8[] = { +ALIGNED8 const Texture heave_ho_seg5_texture_0500F9C8[] = { #include "actors/heave_ho/heave-ho_logo.rgba16.inc.c" }; // 0x050109C8 -ALIGNED8 static const Texture heave_ho_seg5_texture_050109C8[] = { +ALIGNED8 const Texture heave_ho_seg5_texture_050109C8[] = { #include "actors/heave_ho/heave-ho_arm_ornament.rgba16.inc.c" }; // 0x050111C8 -ALIGNED8 static const Texture heave_ho_seg5_texture_050111C8[] = { +ALIGNED8 const Texture heave_ho_seg5_texture_050111C8[] = { #include "actors/heave_ho/heave-ho_roller.rgba16.inc.c" }; // 0x050113C8 -ALIGNED8 static const Texture heave_ho_seg5_texture_050113C8[] = { +ALIGNED8 const Texture heave_ho_seg5_texture_050113C8[] = { #include "actors/heave_ho/heave-ho_turnkey.rgba16.inc.c" }; diff --git a/actors/hoot/model.inc.c b/actors/hoot/model.inc.c index 02b814d4..f3b56711 100644 --- a/actors/hoot/model.inc.c +++ b/actors/hoot/model.inc.c @@ -73,7 +73,7 @@ static const Lights1 hoot_seg5_lights_05000A08 = gdSPDefLights1( ); // 0x05000A20 -ALIGNED8 static const Texture hoot_seg5_texture_05000A20[] = { +ALIGNED8 const Texture hoot_seg5_texture_05000A20[] = { #include "actors/hoot/hoot_eyes.rgba16.inc.c" }; @@ -351,12 +351,12 @@ static const Lights1 hoot_seg5_lights_05001E38 = gdSPDefLights1( ); // 0x05001E50 -ALIGNED8 static const Texture hoot_seg5_texture_05001E50[] = { +ALIGNED8 const Texture hoot_seg5_texture_05001E50[] = { #include "actors/hoot/hoot_wing.rgba16.inc.c" }; // 0x05002650 -ALIGNED8 static const Texture hoot_seg5_texture_05002650[] = { +ALIGNED8 const Texture hoot_seg5_texture_05002650[] = { #include "actors/hoot/hoot_wing_tip.rgba16.inc.c" }; diff --git a/actors/impact_ring/model.inc.c b/actors/impact_ring/model.inc.c index 075f12da..0cd2341c 100644 --- a/actors/impact_ring/model.inc.c +++ b/actors/impact_ring/model.inc.c @@ -17,12 +17,12 @@ static const Vtx impact_ring_seg6_vertex_0601CA10[] = { }; // 0x0601CA50 -ALIGNED8 static const Texture impact_ring_seg6_texture_0601CA50[] = { +ALIGNED8 const Texture impact_ring_seg6_texture_0601CA50[] = { #include "actors/impact_ring/impact_ring_left_side.ia16.inc.c" }; // 0x0601DA50 -ALIGNED8 static const Texture impact_ring_seg6_texture_0601DA50[] = { +ALIGNED8 const Texture impact_ring_seg6_texture_0601DA50[] = { #include "actors/impact_ring/impact_ring_right_side.ia16.inc.c" }; diff --git a/actors/king_bobomb/model.inc.c b/actors/king_bobomb/model.inc.c index 9b947c05..bffb5fd6 100644 --- a/actors/king_bobomb/model.inc.c +++ b/actors/king_bobomb/model.inc.c @@ -31,52 +31,52 @@ UNUSED static const Lights1 king_bobomb_lights_unused5 = gdSPDefLights1( ); // 0x05000078 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05000078[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05000078[] = { #include "actors/king_bobomb/bob-omb_buddy_left_side_unused.rgba16.inc.c" }; // 0x05001078 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05001078[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05001078[] = { #include "actors/king_bobomb/bob-omb_buddy_right_side_unused.rgba16.inc.c" }; // 0x05002078 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05002078[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05002078[] = { #include "actors/king_bobomb/king_bob-omb_arm.rgba16.inc.c" }; // 0x05002878 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05002878[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05002878[] = { #include "actors/king_bobomb/king_bob-omb_body_unused.rgba16.inc.c" }; // 0x05004878 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05004878[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05004878[] = { #include "actors/king_bobomb/king_bob-omb_eyes.rgba16.inc.c" }; // 0x05005878 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05005878[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05005878[] = { #include "actors/king_bobomb/king_bob-omb_hand.rgba16.inc.c" }; // 0x05006078 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05006078[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05006078[] = { #include "actors/king_bobomb/king_bob-omb_crown_rim.rgba16.inc.c" }; // 0x05006478 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05006478[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05006478[] = { #include "actors/king_bobomb/bob-omb_buddy_body_unused.rgba16.inc.c" }; // 0x05008478 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05008478[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05008478[] = { #include "actors/king_bobomb/king_bob-omb_left_side.rgba16.inc.c" }; // 0x05009478 -ALIGNED8 static const Texture king_bobomb_seg5_texture_05009478[] = { +ALIGNED8 const Texture king_bobomb_seg5_texture_05009478[] = { #include "actors/king_bobomb/king_bob-omb_right_side.rgba16.inc.c" }; diff --git a/actors/klepto/model.inc.c b/actors/klepto/model.inc.c index 3b2eec96..4e11062e 100644 --- a/actors/klepto/model.inc.c +++ b/actors/klepto/model.inc.c @@ -6,27 +6,27 @@ UNUSED static const u64 klepto_unused_1 = 0; // Klepto // 0x05000008 -ALIGNED8 static const Texture klepto_seg5_texture_05000008[] = { +ALIGNED8 const Texture klepto_seg5_texture_05000008[] = { #include "actors/klepto/klepto_chest_tuft.rgba16.inc.c" }; // 0x05000808 -ALIGNED8 static const Texture klepto_seg5_texture_05000808[] = { +ALIGNED8 const Texture klepto_seg5_texture_05000808[] = { #include "actors/klepto/klepto_eye.rgba16.inc.c" }; // 0x05001008 -ALIGNED8 static const Texture klepto_seg5_texture_05001008[] = { +ALIGNED8 const Texture klepto_seg5_texture_05001008[] = { #include "actors/klepto/klepto_beak.rgba16.inc.c" }; // 0x05002008 -ALIGNED8 static const Texture klepto_seg5_texture_05002008[] = { +ALIGNED8 const Texture klepto_seg5_texture_05002008[] = { #include "actors/klepto/klepto_wing.rgba16.inc.c" }; // 0x05003008 -ALIGNED8 static const Texture klepto_seg5_texture_05003008[] = { +ALIGNED8 const Texture klepto_seg5_texture_05003008[] = { #include "actors/klepto/klepto_wing_flap.rgba16.inc.c" }; diff --git a/actors/koopa/model.inc.c b/actors/koopa/model.inc.c index 16bacf09..87db7f35 100644 --- a/actors/koopa/model.inc.c +++ b/actors/koopa/model.inc.c @@ -57,42 +57,42 @@ static const Lights1 koopa_seg6_lights_06002630 = gdSPDefLights1( // Due to debate in the PR surrounding the fix to this, said fix is on // a compile-time variable. Use TEXTURE_FIX=1 at compile time to fix this. // 0x06002648 -ALIGNED8 static const Texture koopa_seg6_texture_06002648[] = { +ALIGNED8 const Texture koopa_seg6_texture_06002648[] = { #include "actors/koopa/koopa_shell_front.rgba16.inc.c" }; // 0x06002E48 -ALIGNED8 static const Texture koopa_seg6_texture_06002E48[] = { +ALIGNED8 const Texture koopa_seg6_texture_06002E48[] = { #include "actors/koopa/koopa_shell_back.rgba16.inc.c" }; // 0x06003648 -ALIGNED8 static const Texture koopa_seg6_texture_06003648[] = { +ALIGNED8 const Texture koopa_seg6_texture_06003648[] = { #include "actors/koopa/koopa_shoe.rgba16.inc.c" }; // 0x06003E48 -ALIGNED8 static const Texture koopa_seg6_texture_06003E48[] = { +ALIGNED8 const Texture koopa_seg6_texture_06003E48[] = { #include "actors/koopa/koopa_shell_front_top.rgba16.inc.c" }; // 0x06004648 -ALIGNED8 static const Texture koopa_seg6_texture_06004648[] = { +ALIGNED8 const Texture koopa_seg6_texture_06004648[] = { #include "actors/koopa/koopa_eyes_open.rgba16.inc.c" }; // 0x06004E48 -ALIGNED8 static const Texture koopa_seg6_texture_06004E48[] = { +ALIGNED8 const Texture koopa_seg6_texture_06004E48[] = { #include "actors/koopa/koopa_eyes_closed.rgba16.inc.c" }; // 0x06005648 -ALIGNED8 static const Texture koopa_seg6_texture_06005648[] = { +ALIGNED8 const Texture koopa_seg6_texture_06005648[] = { #include "actors/koopa/koopa_eye_border.rgba16.inc.c" }; // 0x06005E48 -ALIGNED8 static const Texture koopa_seg6_texture_06005E48[] = { +ALIGNED8 const Texture koopa_seg6_texture_06005E48[] = { #include "actors/koopa/koopa_nostrils.rgba16.inc.c" }; diff --git a/actors/koopa_flag/model.inc.c b/actors/koopa_flag/model.inc.c index d56af4be..1416a9cb 100644 --- a/actors/koopa_flag/model.inc.c +++ b/actors/koopa_flag/model.inc.c @@ -19,7 +19,7 @@ static const Lights1 koopa_flag_seg6_lights_06000030 = gdSPDefLights1( ); // 0x06000048 -ALIGNED8 static const Texture koopa_flag_seg6_texture_06000048[] = { +ALIGNED8 const Texture koopa_flag_seg6_texture_06000048[] = { #include "actors/koopa_flag/koopa_flag_banner.rgba16.inc.c" }; diff --git a/actors/koopa_shell/model.inc.c b/actors/koopa_shell/model.inc.c index 15ab72e8..d140e240 100644 --- a/actors/koopa_shell/model.inc.c +++ b/actors/koopa_shell/model.inc.c @@ -408,12 +408,12 @@ static const Lights1 koopa_shell_seg8_lights_08027488 = gdSPDefLights1( ); // 0x080274A0 -ALIGNED8 static const Texture koopa_shell_seg8_texture_080274A0[] = { +ALIGNED8 const Texture koopa_shell_seg8_texture_080274A0[] = { #include "actors/koopa_shell/koopa_shell_front.rgba16.inc.c" }; // 0x08027CA0 -ALIGNED8 static const Texture koopa_shell_seg8_texture_08027CA0[] = { +ALIGNED8 const Texture koopa_shell_seg8_texture_08027CA0[] = { #include "actors/koopa_shell/koopa_shell_back.rgba16.inc.c" }; diff --git a/actors/lakitu_cameraman/model.inc.c b/actors/lakitu_cameraman/model.inc.c index 7392743b..1c4d4b1c 100644 --- a/actors/lakitu_cameraman/model.inc.c +++ b/actors/lakitu_cameraman/model.inc.c @@ -1,32 +1,32 @@ // Lakitu (Cameraman) // 0x06000000 -ALIGNED8 static const Texture lakitu_seg6_texture_06000000[] = { +ALIGNED8 const Texture lakitu_seg6_texture_06000000[] = { #include "actors/lakitu_cameraman/lakitu_cameraman_cloud_face_unused.rgba16.inc.c" }; // 0x06000800 -ALIGNED8 static const Texture lakitu_seg6_texture_06000800[] = { +ALIGNED8 const Texture lakitu_seg6_texture_06000800[] = { #include "actors/lakitu_cameraman/lakitu_cameraman_eyes_open.rgba16.inc.c" }; // 0x06001800 -ALIGNED8 static const Texture lakitu_seg6_texture_06001800[] = { +ALIGNED8 const Texture lakitu_seg6_texture_06001800[] = { #include "actors/lakitu_cameraman/lakitu_cameraman_eyes_closed.rgba16.inc.c" }; // 0x06002800 -ALIGNED8 static const Texture lakitu_seg6_texture_06002800[] = { +ALIGNED8 const Texture lakitu_seg6_texture_06002800[] = { #include "actors/lakitu_cameraman/lakitu_cameraman_shell.rgba16.inc.c" }; // 0x06003000 -ALIGNED8 static const Texture lakitu_seg6_texture_06003000[] = { +ALIGNED8 const Texture lakitu_seg6_texture_06003000[] = { #include "actors/lakitu_cameraman/lakitu_cameraman_frown.rgba16.inc.c" }; // 0x06003800 -ALIGNED8 static const Texture lakitu_seg6_texture_06003800[] = { +ALIGNED8 const Texture lakitu_seg6_texture_06003800[] = { #include "actors/lakitu_cameraman/lakitu_camera_lens.rgba16.inc.c" }; diff --git a/actors/lakitu_enemy/model.inc.c b/actors/lakitu_enemy/model.inc.c index 669f917f..df9c560a 100644 --- a/actors/lakitu_enemy/model.inc.c +++ b/actors/lakitu_enemy/model.inc.c @@ -20,27 +20,27 @@ UNUSED static const Lights1 lakitu_enemy_lights_unused2 = gdSPDefLights1( // Unreferenced texture // 0x0500ECE0 -ALIGNED8 static const Texture lakitu_enemy_seg5_texture_0500ECE0[] = { +ALIGNED8 const Texture lakitu_enemy_seg5_texture_0500ECE0[] = { #include "actors/lakitu_enemy/lakitu_enemy_cloud_face_unused.rgba16.inc.c" }; // 0x0500F4E0 -ALIGNED8 static const Texture lakitu_enemy_seg5_texture_0500F4E0[] = { +ALIGNED8 const Texture lakitu_enemy_seg5_texture_0500F4E0[] = { #include "actors/lakitu_enemy/lakitu_enemy_eyes_open.rgba16.inc.c" }; // 0x050104E0 -ALIGNED8 static const Texture lakitu_enemy_seg5_texture_050104E0[] = { +ALIGNED8 const Texture lakitu_enemy_seg5_texture_050104E0[] = { #include "actors/lakitu_enemy/lakitu_enemy_eyes_closed.rgba16.inc.c" }; // 0x050114E0 -ALIGNED8 static const Texture lakitu_enemy_seg5_texture_050114E0[] = { +ALIGNED8 const Texture lakitu_enemy_seg5_texture_050114E0[] = { #include "actors/lakitu_enemy/lakitu_enemy_shell.rgba16.inc.c" }; // 0x05011CE0 -ALIGNED8 static const Texture lakitu_enemy_seg5_texture_05011CE0[] = { +ALIGNED8 const Texture lakitu_enemy_seg5_texture_05011CE0[] = { #include "actors/lakitu_enemy/lakitu_enemy_frown.rgba16.inc.c" }; diff --git a/actors/leaves/model.inc.c b/actors/leaves/model.inc.c index 72c52331..4fcabc66 100644 --- a/actors/leaves/model.inc.c +++ b/actors/leaves/model.inc.c @@ -9,7 +9,7 @@ static const Vtx leaves_seg3_vertex_0301CBA0[] = { }; // 0x0301CBE0 -ALIGNED8 static const Texture leaves_seg3_texture_0301CBE0[] = { +ALIGNED8 const Texture leaves_seg3_texture_0301CBE0[] = { #include "actors/leaves/leaf.rgba16.inc.c" }; diff --git a/actors/mad_piano/model.inc.c b/actors/mad_piano/model.inc.c index da3c9fd4..e0160fc6 100644 --- a/actors/mad_piano/model.inc.c +++ b/actors/mad_piano/model.inc.c @@ -25,32 +25,32 @@ UNUSED static const Lights1 mad_piano_lights_unused4 = gdSPDefLights1( ); // 0x05006AF0 -ALIGNED8 static const Texture mad_piano_seg5_texture_05006AF0[] = { +ALIGNED8 const Texture mad_piano_seg5_texture_05006AF0[] = { #include "actors/mad_piano/mad_piano_tooth.rgba16.inc.c" }; // 0x050072F0 -ALIGNED8 static const Texture mad_piano_seg5_texture_050072F0[] = { +ALIGNED8 const Texture mad_piano_seg5_texture_050072F0[] = { #include "actors/mad_piano/mad_piano_body.rgba16.inc.c" }; // 0x050076F0 -ALIGNED8 static const Texture mad_piano_seg5_texture_050076F0[] = { +ALIGNED8 const Texture mad_piano_seg5_texture_050076F0[] = { #include "actors/mad_piano/mad_piano_keys_corner.rgba16.inc.c" }; // 0x05007AF0 -ALIGNED8 static const Texture mad_piano_seg5_texture_05007AF0[] = { +ALIGNED8 const Texture mad_piano_seg5_texture_05007AF0[] = { #include "actors/mad_piano/mad_piano_mouth.rgba16.inc.c" }; // 0x05007EF0 -ALIGNED8 static const Texture mad_piano_seg5_texture_05007EF0[] = { +ALIGNED8 const Texture mad_piano_seg5_texture_05007EF0[] = { #include "actors/mad_piano/mad_piano_keys.rgba16.inc.c" }; // 0x050082F0 -ALIGNED8 static const Texture mad_piano_seg5_texture_050082F0[] = { +ALIGNED8 const Texture mad_piano_seg5_texture_050082F0[] = { #include "actors/mad_piano/mad_piano_keys_edge.rgba16.inc.c" }; diff --git a/actors/manta/model.inc.c b/actors/manta/model.inc.c index dc5c6519..c34d8328 100644 --- a/actors/manta/model.inc.c +++ b/actors/manta/model.inc.c @@ -19,22 +19,22 @@ static const Lights1 manta_lights_unused = gdSPDefLights1( ); // 0x050017A0 -ALIGNED8 static const Texture manta_seg5_texture_050017A0[] = { +ALIGNED8 const Texture manta_seg5_texture_050017A0[] = { #include "actors/manta/manta_fin_corner.rgba16.inc.c" }; // 0x05001FA0 -ALIGNED8 static const Texture manta_seg5_texture_05001FA0[] = { +ALIGNED8 const Texture manta_seg5_texture_05001FA0[] = { #include "actors/manta/manta_gills.rgba16.inc.c" }; // 0x05002FA0 -ALIGNED8 static const Texture manta_seg5_texture_05002FA0[] = { +ALIGNED8 const Texture manta_seg5_texture_05002FA0[] = { #include "actors/manta/manta_eye.rgba16.inc.c" }; // 0x050037A0 -ALIGNED8 static const Texture manta_seg5_texture_050037A0[] = { +ALIGNED8 const Texture manta_seg5_texture_050037A0[] = { #include "actors/manta/manta_fin_edge.rgba16.inc.c" }; diff --git a/actors/metal_box/model.inc.c b/actors/metal_box/model.inc.c index a19761a4..f8a5c6ec 100644 --- a/actors/metal_box/model.inc.c +++ b/actors/metal_box/model.inc.c @@ -7,7 +7,7 @@ static const Lights1 metal_box_seg8_lights_08023980 = gdSPDefLights1( ); // 0x08023998 -ALIGNED8 static const Texture metal_box_seg8_texture_08023998[] = { +ALIGNED8 const Texture metal_box_seg8_texture_08023998[] = { #include "actors/metal_box/metal_box_side.rgba16.inc.c" }; diff --git a/actors/mips/model.inc.c b/actors/mips/model.inc.c index de120fb0..053a11da 100644 --- a/actors/mips/model.inc.c +++ b/actors/mips/model.inc.c @@ -1,7 +1,7 @@ // Mips // 0x0600FB80 -ALIGNED8 static const Texture mips_seg6_texture_0600FB80[] = { +ALIGNED8 const Texture mips_seg6_texture_0600FB80[] = { #include "actors/mips/mips_eyes.rgba16.inc.c" }; diff --git a/actors/mist/model.inc.c b/actors/mist/model.inc.c index 4407457b..edeccdba 100644 --- a/actors/mist/model.inc.c +++ b/actors/mist/model.inc.c @@ -17,7 +17,7 @@ static const Vtx mist_seg3_vertex_03000040[] = { }; // 0x03000080 -ALIGNED8 static const Texture mist_seg3_texture_03000080[] = { +ALIGNED8 const Texture mist_seg3_texture_03000080[] = { #include "actors/mist/mist.ia16.inc.c" }; diff --git a/actors/moneybag/model.inc.c b/actors/moneybag/model.inc.c index fa3505bc..d284ae4d 100644 --- a/actors/moneybag/model.inc.c +++ b/actors/moneybag/model.inc.c @@ -1,12 +1,12 @@ // Moneybag // 0x060039B0 -ALIGNED8 static const Texture moneybag_seg6_texture_060039B0[] = { +ALIGNED8 const Texture moneybag_seg6_texture_060039B0[] = { #include "actors/moneybag/moneybag_mouth.rgba16.inc.c" }; // 0x060049B0 -ALIGNED8 static const Texture moneybag_seg6_texture_060049B0[] = { +ALIGNED8 const Texture moneybag_seg6_texture_060049B0[] = { #include "actors/moneybag/moneybag_eyes.rgba16.inc.c" }; diff --git a/actors/monty_mole/model.inc.c b/actors/monty_mole/model.inc.c index c9f0c129..d2648620 100644 --- a/actors/monty_mole/model.inc.c +++ b/actors/monty_mole/model.inc.c @@ -37,27 +37,27 @@ UNUSED static const Lights1 monty_mole_lights_unused6 = gdSPDefLights1( ); // 0x05000970 -ALIGNED8 static const Texture monty_mole_seg5_texture_05000970[] = { +ALIGNED8 const Texture monty_mole_seg5_texture_05000970[] = { #include "actors/monty_mole/monty_mole_cheek.rgba16.inc.c" }; // 0x05001170 -ALIGNED8 static const Texture monty_mole_seg5_texture_05001170[] = { +ALIGNED8 const Texture monty_mole_seg5_texture_05001170[] = { #include "actors/monty_mole/monty_mole_eye.rgba16.inc.c" }; // 0x05001970 -ALIGNED8 static const Texture monty_mole_seg5_texture_05001970[] = { +ALIGNED8 const Texture monty_mole_seg5_texture_05001970[] = { #include "actors/monty_mole/monty_mole_nose.rgba16.inc.c" }; // 0x05002170 -ALIGNED8 static const Texture monty_mole_seg5_texture_05002170[] = { +ALIGNED8 const Texture monty_mole_seg5_texture_05002170[] = { #include "actors/monty_mole/monty_mole_tooth.rgba16.inc.c" }; // 0x05002970 -ALIGNED8 static const Texture monty_mole_seg5_texture_05002970[] = { +ALIGNED8 const Texture monty_mole_seg5_texture_05002970[] = { #include "actors/monty_mole/monty_mole_claw.rgba16.inc.c" }; diff --git a/actors/monty_mole_hole/model.inc.c b/actors/monty_mole_hole/model.inc.c index 23f7fc63..90a3b48c 100644 --- a/actors/monty_mole_hole/model.inc.c +++ b/actors/monty_mole_hole/model.inc.c @@ -9,7 +9,7 @@ static const Vtx monty_mole_hole_seg5_vertex_05000000[] = { }; // 0x05000040 -ALIGNED8 static const Texture monty_mole_hole_seg5_texture_05000040[] = { +ALIGNED8 const Texture monty_mole_hole_seg5_texture_05000040[] = { #include "actors/monty_mole_hole/monty_mole_hole.ia16.inc.c" }; diff --git a/actors/mr_i_eyeball/model.inc.c b/actors/mr_i_eyeball/model.inc.c index 0ddd68be..632b2c05 100644 --- a/actors/mr_i_eyeball/model.inc.c +++ b/actors/mr_i_eyeball/model.inc.c @@ -13,12 +13,12 @@ static const Vtx mr_i_eyeball_seg6_vertex_06000000[] = { }; // 0x06000080 -ALIGNED8 static const Texture mr_i_eyeball_seg6_texture_06000080[] = { +ALIGNED8 const Texture mr_i_eyeball_seg6_texture_06000080[] = { #include "actors/mr_i_eyeball/mr_i_eyeball_left_side.rgba16.inc.c" }; // 0x06001080 -ALIGNED8 static const Texture mr_i_eyeball_seg6_texture_06001080[] = { +ALIGNED8 const Texture mr_i_eyeball_seg6_texture_06001080[] = { #include "actors/mr_i_eyeball/mr_i_eyeball_right_side.rgba16.inc.c" }; diff --git a/actors/mr_i_iris/model.inc.c b/actors/mr_i_iris/model.inc.c index 17368e9b..4638f0a8 100644 --- a/actors/mr_i_iris/model.inc.c +++ b/actors/mr_i_iris/model.inc.c @@ -9,22 +9,22 @@ static const Vtx mr_i_iris_seg6_vertex_06002130[] = { }; // 0x06002170 -ALIGNED8 static const Texture mr_i_iris_seg6_texture_06002170[] = { +ALIGNED8 const Texture mr_i_iris_seg6_texture_06002170[] = { #include "actors/mr_i_iris/mr_i_iris_open.rgba16.inc.c" }; // 0x06002970 -ALIGNED8 static const Texture mr_i_iris_seg6_texture_06002970[] = { +ALIGNED8 const Texture mr_i_iris_seg6_texture_06002970[] = { #include "actors/mr_i_iris/mr_i_iris_mostly_open.rgba16.inc.c" }; // 0x06003170 -ALIGNED8 static const Texture mr_i_iris_seg6_texture_06003170[] = { +ALIGNED8 const Texture mr_i_iris_seg6_texture_06003170[] = { #include "actors/mr_i_iris/mr_i_iris_mostly_closed.rgba16.inc.c" }; // 0x06003970 -ALIGNED8 static const Texture mr_i_iris_seg6_texture_06003970[] = { +ALIGNED8 const Texture mr_i_iris_seg6_texture_06003970[] = { #include "actors/mr_i_iris/mr_i_iris_closed.rgba16.inc.c" }; diff --git a/actors/mushroom_1up/model.inc.c b/actors/mushroom_1up/model.inc.c index eaaa1d13..ce2bafc4 100644 --- a/actors/mushroom_1up/model.inc.c +++ b/actors/mushroom_1up/model.inc.c @@ -9,7 +9,7 @@ static const Vtx mushroom_1up_seg3_vertex_030295E8[] = { }; // 0x03029628 -ALIGNED8 static const Texture mushroom_1up_seg3_texture_03029628[] = { +ALIGNED8 const Texture mushroom_1up_seg3_texture_03029628[] = { #include "actors/mushroom_1up/1-up_mushroom.rgba16.inc.c" }; diff --git a/actors/peach/model.inc.c b/actors/peach/model.inc.c index 05ad2cba..e4a958bd 100644 --- a/actors/peach/model.inc.c +++ b/actors/peach/model.inc.c @@ -13,52 +13,52 @@ static const Lights1 peach_seg5_lights_05000A10 = gdSPDefLights1( ); // 0x05000A28 -ALIGNED8 static const Texture peach_seg5_texture_05000A28[] = { +ALIGNED8 const Texture peach_seg5_texture_05000A28[] = { #include "actors/peach/peach_eye_open.rgba16.inc.c" }; // 0x05001228 -ALIGNED8 static const Texture peach_seg5_texture_05001228[] = { +ALIGNED8 const Texture peach_seg5_texture_05001228[] = { #include "actors/peach/peach_eye_mostly_open.rgba16.inc.c" }; // 0x05001A28 -ALIGNED8 static const Texture peach_seg5_texture_05001A28[] = { +ALIGNED8 const Texture peach_seg5_texture_05001A28[] = { #include "actors/peach/peach_eye_mostly_closed.rgba16.inc.c" }; // 0x05002228 -ALIGNED8 static const Texture peach_seg5_texture_05002228[] = { +ALIGNED8 const Texture peach_seg5_texture_05002228[] = { #include "actors/peach/peach_eye_closed.rgba16.inc.c" }; // 0x05002A28 -ALIGNED8 static const Texture peach_seg5_texture_05002A28[] = { +ALIGNED8 const Texture peach_seg5_texture_05002A28[] = { #include "actors/peach/peach_crown_jewel.rgba16.inc.c" }; // 0x05002C28 -ALIGNED8 static const Texture peach_seg5_texture_05002C28[] = { +ALIGNED8 const Texture peach_seg5_texture_05002C28[] = { #include "actors/peach/peach_chest_jewel.rgba16.inc.c" }; // 0x05002E28 -ALIGNED8 static const Texture peach_seg5_texture_05002E28[] = { +ALIGNED8 const Texture peach_seg5_texture_05002E28[] = { #include "actors/peach/peach_lips_scrunched.rgba16.inc.c" }; // 0x05003628 -ALIGNED8 static const Texture peach_seg5_texture_05003628[] = { +ALIGNED8 const Texture peach_seg5_texture_05003628[] = { #include "actors/peach/peach_lips.rgba16.inc.c" }; // 0x05003E28 -ALIGNED8 static const Texture peach_seg5_texture_05003E28[] = { +ALIGNED8 const Texture peach_seg5_texture_05003E28[] = { #include "actors/peach/peach_nostril.rgba16.inc.c" }; // 0x05004028 -ALIGNED8 static const Texture peach_seg5_texture_05004028[] = { +ALIGNED8 const Texture peach_seg5_texture_05004028[] = { #include "actors/peach/peach_dress.rgba16.inc.c" }; diff --git a/actors/pebble/model.inc.c b/actors/pebble/model.inc.c index 7a72ff3d..f2dd54e8 100644 --- a/actors/pebble/model.inc.c +++ b/actors/pebble/model.inc.c @@ -9,7 +9,7 @@ static const Vtx pebble_seg3_vertex_0301C2C0[] = { }; // 0x0301C300 -ALIGNED8 static const Texture pebble_seg3_texture_0301C300[] = { +ALIGNED8 const Texture pebble_seg3_texture_0301C300[] = { #include "actors/pebble/pebble.rgba16.inc.c" }; diff --git a/actors/penguin/model.inc.c b/actors/penguin/model.inc.c index 5dcc513e..942f99a0 100644 --- a/actors/penguin/model.inc.c +++ b/actors/penguin/model.inc.c @@ -25,32 +25,32 @@ static const Lights1 penguin_seg5_lights_05002DC8 = gdSPDefLights1( ); // 0x05002DE0 -ALIGNED8 static const Texture penguin_seg5_texture_05002DE0[] = { +ALIGNED8 const Texture penguin_seg5_texture_05002DE0[] = { #include "actors/penguin/penguin_eye_open.rgba16.inc.c" }; // 0x050035E0 -ALIGNED8 static const Texture penguin_seg5_texture_050035E0[] = { +ALIGNED8 const Texture penguin_seg5_texture_050035E0[] = { #include "actors/penguin/penguin_eye_half_closed.rgba16.inc.c" }; // 0x05003DE0 -ALIGNED8 static const Texture penguin_seg5_texture_05003DE0[] = { +ALIGNED8 const Texture penguin_seg5_texture_05003DE0[] = { #include "actors/penguin/penguin_eye_closed.rgba16.inc.c" }; // 0x050045E0 -ALIGNED8 static const Texture penguin_seg5_texture_050045E0[] = { +ALIGNED8 const Texture penguin_seg5_texture_050045E0[] = { #include "actors/penguin/penguin_eye_angry.rgba16.inc.c" }; // 0x05004DE0 -ALIGNED8 static const Texture penguin_seg5_texture_05004DE0[] = { +ALIGNED8 const Texture penguin_seg5_texture_05004DE0[] = { #include "actors/penguin/penguin_eye_angry_unused.rgba16.inc.c" }; // 0x050055E0 -ALIGNED8 static const Texture penguin_seg5_texture_050055E0[] = { +ALIGNED8 const Texture penguin_seg5_texture_050055E0[] = { #include "actors/penguin/penguin_beak.rgba16.inc.c" }; diff --git a/actors/piranha_plant/model.inc.c b/actors/piranha_plant/model.inc.c index 9d6a8f46..7dedcb63 100644 --- a/actors/piranha_plant/model.inc.c +++ b/actors/piranha_plant/model.inc.c @@ -19,32 +19,32 @@ static const Lights1 piranha_plant_seg6_lights_060113E0 = gdSPDefLights1( ); // 0x060113F8 -ALIGNED8 static const Texture piranha_plant_seg6_texture_060113F8[] = { +ALIGNED8 const Texture piranha_plant_seg6_texture_060113F8[] = { #include "actors/piranha_plant/piranha_plant_tongue.rgba16.inc.c" }; // 0x060123F8 -ALIGNED8 static const Texture piranha_plant_seg6_texture_060123F8[] = { +ALIGNED8 const Texture piranha_plant_seg6_texture_060123F8[] = { #include "actors/piranha_plant/piranha_plant_skin.rgba16.inc.c" }; // 0x06012BF8 -ALIGNED8 static const Texture piranha_plant_seg6_texture_06012BF8[] = { +ALIGNED8 const Texture piranha_plant_seg6_texture_06012BF8[] = { #include "actors/piranha_plant/piranha_plant_stem.rgba16.inc.c" }; // 0x060133F8 -ALIGNED8 static const Texture piranha_plant_seg6_texture_060133F8[] = { +ALIGNED8 const Texture piranha_plant_seg6_texture_060133F8[] = { #include "actors/piranha_plant/piranha_plant_bottom_lip.rgba16.inc.c" }; // 0x06013BF8 -ALIGNED8 static const Texture piranha_plant_seg6_texture_06013BF8[] = { +ALIGNED8 const Texture piranha_plant_seg6_texture_06013BF8[] = { #include "actors/piranha_plant/piranha_plant_tooth.rgba16.inc.c" }; // 0x060143F8 -ALIGNED8 static const Texture piranha_plant_seg6_texture_060143F8[] = { +ALIGNED8 const Texture piranha_plant_seg6_texture_060143F8[] = { #include "actors/piranha_plant/piranha_plant_leaf.rgba16.inc.c" }; diff --git a/actors/pokey/model.inc.c b/actors/pokey/model.inc.c index c91d515c..fe36f26d 100644 --- a/actors/pokey/model.inc.c +++ b/actors/pokey/model.inc.c @@ -9,12 +9,12 @@ static const Vtx pokey_seg5_vertex_05011710[] = { }; // 0x05011750 -ALIGNED8 static const Texture pokey_seg5_texture_05011750[] = { +ALIGNED8 const Texture pokey_seg5_texture_05011750[] = { #include "actors/pokey/pokey_face.rgba16.inc.c" }; // 0x05011F50 -ALIGNED8 static const Texture pokey_seg5_texture_05011F50[] = { +ALIGNED8 const Texture pokey_seg5_texture_05011F50[] = { #include "actors/pokey/pokey_face_blink.rgba16.inc.c" }; @@ -71,7 +71,7 @@ static const Vtx pokey_seg5_vertex_05012838[] = { }; // 0x05012878 -ALIGNED8 static const Texture pokey_seg5_texture_05012878[] = { +ALIGNED8 const Texture pokey_seg5_texture_05012878[] = { #include "actors/pokey/pokey_body.rgba16.inc.c" }; diff --git a/actors/poundable_pole/model.inc.c b/actors/poundable_pole/model.inc.c index 2268e858..4bdec567 100644 --- a/actors/poundable_pole/model.inc.c +++ b/actors/poundable_pole/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 poundable_pole_seg6_lights_06001038 = gdSPDefLights1( ); // 0x06001050 -ALIGNED8 static const Texture poundable_pole_seg6_texture_06001050[] = { +ALIGNED8 const Texture poundable_pole_seg6_texture_06001050[] = { #include "actors/poundable_pole/poundable_pole_top.rgba16.inc.c" }; // 0x06001850 -ALIGNED8 static const Texture poundable_pole_seg6_texture_06001850[] = { +ALIGNED8 const Texture poundable_pole_seg6_texture_06001850[] = { #include "actors/poundable_pole/poundable_pole_side.rgba16.inc.c" }; diff --git a/actors/power_meter/model.inc.c b/actors/power_meter/model.inc.c index 1a2c17f6..4e0a5fe6 100644 --- a/actors/power_meter/model.inc.c +++ b/actors/power_meter/model.inc.c @@ -3,52 +3,52 @@ UNUSED static const u64 power_meter_unused_1 = 0; // 0x030233E0 -ALIGNED8 static const Texture texture_power_meter_left_side[] = { +ALIGNED8 const Texture texture_power_meter_left_side[] = { #include "actors/power_meter/power_meter_left_side.rgba16.inc.c" }; // 0x030243E0 -ALIGNED8 static const Texture texture_power_meter_right_side[] = { +ALIGNED8 const Texture texture_power_meter_right_side[] = { #include "actors/power_meter/power_meter_right_side.rgba16.inc.c" }; // 0x030253E0 -ALIGNED8 static const Texture texture_power_meter_full[] = { +ALIGNED8 const Texture texture_power_meter_full[] = { #include "actors/power_meter/power_meter_full.rgba16.inc.c" }; // 0x03025BE0 -ALIGNED8 static const Texture texture_power_meter_seven_segments[] = { +ALIGNED8 const Texture texture_power_meter_seven_segments[] = { #include "actors/power_meter/power_meter_seven_segments.rgba16.inc.c" }; // 0x030263E0 -ALIGNED8 static const Texture texture_power_meter_six_segments[] = { +ALIGNED8 const Texture texture_power_meter_six_segments[] = { #include "actors/power_meter/power_meter_six_segments.rgba16.inc.c" }; // 0x03026BE0 -ALIGNED8 static const Texture texture_power_meter_five_segments[] = { +ALIGNED8 const Texture texture_power_meter_five_segments[] = { #include "actors/power_meter/power_meter_five_segments.rgba16.inc.c" }; // 0x030273E0 -ALIGNED8 static const Texture texture_power_meter_four_segments[] = { +ALIGNED8 const Texture texture_power_meter_four_segments[] = { #include "actors/power_meter/power_meter_four_segments.rgba16.inc.c" }; // 0x03027BE0 -ALIGNED8 static const Texture texture_power_meter_three_segments[] = { +ALIGNED8 const Texture texture_power_meter_three_segments[] = { #include "actors/power_meter/power_meter_three_segments.rgba16.inc.c" }; // 0x030283E0 -ALIGNED8 static const Texture texture_power_meter_two_segments[] = { +ALIGNED8 const Texture texture_power_meter_two_segments[] = { #include "actors/power_meter/power_meter_two_segments.rgba16.inc.c" }; // 0x03028BE0 -ALIGNED8 static const Texture texture_power_meter_one_segments[] = { +ALIGNED8 const Texture texture_power_meter_one_segments[] = { #include "actors/power_meter/power_meter_one_segment.rgba16.inc.c" }; diff --git a/actors/purple_switch/model.inc.c b/actors/purple_switch/model.inc.c index 25b41250..bef887cf 100644 --- a/actors/purple_switch/model.inc.c +++ b/actors/purple_switch/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 purple_switch_seg8_lights_0800C090 = gdSPDefLights1( ); // 0x0800C0A8 -ALIGNED8 static const Texture purple_switch_seg8_texture_0800C0A8[] = { +ALIGNED8 const Texture purple_switch_seg8_texture_0800C0A8[] = { #include "actors/purple_switch/purple_switch_base.rgba16.inc.c" }; // 0x0800C128 -ALIGNED8 static const Texture purple_switch_seg8_texture_0800C128[] = { +ALIGNED8 const Texture purple_switch_seg8_texture_0800C128[] = { #include "actors/purple_switch/purple_switch_exclamation_point.rgba16.inc.c" }; diff --git a/actors/sand/model.inc.c b/actors/sand/model.inc.c index d8319165..213628fb 100644 --- a/actors/sand/model.inc.c +++ b/actors/sand/model.inc.c @@ -9,7 +9,7 @@ static const Vtx sand_seg3_vertex_0302BA90[] = { }; // 0x0302BAD0 -ALIGNED8 static const Texture sand_seg3_texture_0302BAD0[] = { +ALIGNED8 const Texture sand_seg3_texture_0302BAD0[] = { #include "actors/sand/sand_particle.rgba16.inc.c" }; diff --git a/actors/scuttlebug/model.inc.c b/actors/scuttlebug/model.inc.c index d53a250e..21513ae3 100644 --- a/actors/scuttlebug/model.inc.c +++ b/actors/scuttlebug/model.inc.c @@ -13,27 +13,27 @@ UNUSED static const Lights1 scuttlebug_lights_unused2 = gdSPDefLights1( ); // 0x06010108 -ALIGNED8 static const Texture scuttlebug_seg6_texture_06010108[] = { +ALIGNED8 const Texture scuttlebug_seg6_texture_06010108[] = { #include "actors/scuttlebug/scuttlebug_eye.rgba16.inc.c" }; // 0x06010908 -ALIGNED8 static const Texture scuttlebug_seg6_texture_06010908[] = { +ALIGNED8 const Texture scuttlebug_seg6_texture_06010908[] = { #include "actors/scuttlebug/scuttlebug_left_side.rgba16.inc.c" }; // 0x06011908 -ALIGNED8 static const Texture scuttlebug_seg6_texture_06011908[] = { +ALIGNED8 const Texture scuttlebug_seg6_texture_06011908[] = { #include "actors/scuttlebug/scuttlebug_right_side.rgba16.inc.c" }; // 0x06012908 -ALIGNED8 static const Texture scuttlebug_seg6_texture_06012908[] = { +ALIGNED8 const Texture scuttlebug_seg6_texture_06012908[] = { #include "actors/scuttlebug/scuttlebug_iris.rgba16.inc.c" }; // 0x06013108 -ALIGNED8 static const Texture scuttlebug_seg6_texture_06013108[] = { +ALIGNED8 const Texture scuttlebug_seg6_texture_06013108[] = { #include "actors/scuttlebug/scuttlebug_leg.rgba16.inc.c" }; diff --git a/actors/seaweed/model.inc.c b/actors/seaweed/model.inc.c index c3c074c5..595abd84 100644 --- a/actors/seaweed/model.inc.c +++ b/actors/seaweed/model.inc.c @@ -7,22 +7,22 @@ static const Lights1 seaweed_seg6_lights_06007DF8 = gdSPDefLights1( ); // 0x06007E10 -ALIGNED8 static const Texture seaweed_seg6_texture_06007E10[] = { +ALIGNED8 const Texture seaweed_seg6_texture_06007E10[] = { #include "actors/seaweed/seaweed_tip.rgba16.inc.c" }; // 0x06008610 -ALIGNED8 static const Texture seaweed_seg6_texture_06008610[] = { +ALIGNED8 const Texture seaweed_seg6_texture_06008610[] = { #include "actors/seaweed/seaweed_upper_center.rgba16.inc.c" }; // 0x06008E10 -ALIGNED8 static const Texture seaweed_seg6_texture_06008E10[] = { +ALIGNED8 const Texture seaweed_seg6_texture_06008E10[] = { #include "actors/seaweed/seaweed_lower_center.rgba16.inc.c" }; // 0x06009610 -ALIGNED8 static const Texture seaweed_seg6_texture_06009610[] = { +ALIGNED8 const Texture seaweed_seg6_texture_06009610[] = { #include "actors/seaweed/seaweed_base.rgba16.inc.c" }; diff --git a/actors/skeeter/model.inc.c b/actors/skeeter/model.inc.c index 104b3a31..e935d704 100644 --- a/actors/skeeter/model.inc.c +++ b/actors/skeeter/model.inc.c @@ -37,12 +37,12 @@ UNUSED static const Lights1 skeeter_lights_unused6 = gdSPDefLights1( ); // 0x06000090 -ALIGNED8 static const Texture skeeter_seg6_texture_06000090[] = { +ALIGNED8 const Texture skeeter_seg6_texture_06000090[] = { #include "actors/skeeter/skeeter_eye.rgba16.inc.c" }; // 0x06000890 -ALIGNED8 static const Texture skeeter_seg6_texture_06000890[] = { +ALIGNED8 const Texture skeeter_seg6_texture_06000890[] = { #include "actors/skeeter/skeeter_iris.rgba16.inc.c" }; diff --git a/actors/smoke/model.inc.c b/actors/smoke/model.inc.c index 88e25788..9aedb4d3 100644 --- a/actors/smoke/model.inc.c +++ b/actors/smoke/model.inc.c @@ -9,7 +9,7 @@ static const Vtx smoke_seg5_vertex_05007280[] = { }; // 0x050072C0 -ALIGNED8 static const Texture smoke_seg5_texture_050072C0[] = { +ALIGNED8 const Texture smoke_seg5_texture_050072C0[] = { #include "actors/smoke/smoke.ia16.inc.c" }; diff --git a/actors/snowman/model.inc.c b/actors/snowman/model.inc.c index ada671f0..1508e094 100644 --- a/actors/snowman/model.inc.c +++ b/actors/snowman/model.inc.c @@ -28,27 +28,27 @@ UNUSED static const Lights1 snowman_lights_unused4 = gdSPDefLights1( ); // 0x05008C70 -ALIGNED8 static const Texture snowman_seg5_texture_05008C70[] = { +ALIGNED8 const Texture snowman_seg5_texture_05008C70[] = { #include "actors/snowman/mr_blizzard_mitten.rgba16.inc.c" }; // 0x05009470 -ALIGNED8 static const Texture snowman_seg5_texture_05009470[] = { +ALIGNED8 const Texture snowman_seg5_texture_05009470[] = { #include "actors/snowman/mr_blizzard_left_side.rgba16.inc.c" }; // 0x0500A470 -ALIGNED8 static const Texture snowman_seg5_texture_0500A470[] = { +ALIGNED8 const Texture snowman_seg5_texture_0500A470[] = { #include "actors/snowman/mr_blizzard_right_side.rgba16.inc.c" }; // 0x0500B470 -ALIGNED8 static const Texture snowman_seg5_texture_0500B470[] = { +ALIGNED8 const Texture snowman_seg5_texture_0500B470[] = { #include "actors/snowman/mr_blizzard_eye.rgba16.inc.c" }; // 0x0500BC70 -ALIGNED8 static const Texture snowman_seg5_texture_0500BC70[] = { +ALIGNED8 const Texture snowman_seg5_texture_0500BC70[] = { #include "actors/snowman/mr_blizzard_mouth.rgba16.inc.c" }; diff --git a/actors/snufit/model.inc.c b/actors/snufit/model.inc.c index 0a4ea3b2..0b45b1b4 100644 --- a/actors/snufit/model.inc.c +++ b/actors/snufit/model.inc.c @@ -1,22 +1,22 @@ // Snufit // 0x060070E0 -ALIGNED8 static const Texture snufit_seg6_texture_060070E0[] = { +ALIGNED8 const Texture snufit_seg6_texture_060070E0[] = { #include "actors/snufit/snufit_body.rgba16.inc.c" }; // 0x060078E0 -ALIGNED8 static const Texture snufit_seg6_texture_060078E0[] = { +ALIGNED8 const Texture snufit_seg6_texture_060078E0[] = { #include "actors/snufit/snufit_eye.rgba16.inc.c" }; // 0x060080E0 -ALIGNED8 static const Texture snufit_seg6_texture_060080E0[] = { +ALIGNED8 const Texture snufit_seg6_texture_060080E0[] = { #include "actors/snufit/snufit_mask_strap.rgba16.inc.c" }; // 0x060084E0 -ALIGNED8 static const Texture snufit_seg6_texture_060084E0[] = { +ALIGNED8 const Texture snufit_seg6_texture_060084E0[] = { #include "actors/snufit/snufit_mouth.rgba16.inc.c" }; diff --git a/actors/sparkle/model.inc.c b/actors/sparkle/model.inc.c index c863ad45..70e4f46c 100644 --- a/actors/sparkle/model.inc.c +++ b/actors/sparkle/model.inc.c @@ -9,32 +9,32 @@ static const Vtx sparkles_seg4_vertex_04027450[] = { }; // 0x04027490 -ALIGNED8 static const Texture sparkles_seg4_texture_04027490[] = { +ALIGNED8 const Texture sparkles_seg4_texture_04027490[] = { #include "actors/sparkle/sparkle_0.rgba16.inc.c" }; // 0x04027C90 -ALIGNED8 static const Texture sparkles_seg4_texture_04027C90[] = { +ALIGNED8 const Texture sparkles_seg4_texture_04027C90[] = { #include "actors/sparkle/sparkle_1.rgba16.inc.c" }; // 0x04028490 -ALIGNED8 static const Texture sparkles_seg4_texture_04028490[] = { +ALIGNED8 const Texture sparkles_seg4_texture_04028490[] = { #include "actors/sparkle/sparkle_2.rgba16.inc.c" }; // 0x04028C90 -ALIGNED8 static const Texture sparkles_seg4_texture_04028C90[] = { +ALIGNED8 const Texture sparkles_seg4_texture_04028C90[] = { #include "actors/sparkle/sparkle_3.rgba16.inc.c" }; // 0x04029490 -ALIGNED8 static const Texture sparkles_seg4_texture_04029490[] = { +ALIGNED8 const Texture sparkles_seg4_texture_04029490[] = { #include "actors/sparkle/sparkle_4.rgba16.inc.c" }; // 0x04029C90 -ALIGNED8 static const Texture sparkles_seg4_texture_04029C90[] = { +ALIGNED8 const Texture sparkles_seg4_texture_04029C90[] = { #include "actors/sparkle/sparkle_5.rgba16.inc.c" }; diff --git a/actors/sparkle_animation/model.inc.c b/actors/sparkle_animation/model.inc.c index 09ef7947..733744fd 100644 --- a/actors/sparkle_animation/model.inc.c +++ b/actors/sparkle_animation/model.inc.c @@ -9,27 +9,27 @@ static const Vtx sparkles_animation_seg4_vertex_04032A48[] = { }; // 0x04032A88 -ALIGNED8 static const Texture sparkles_animation_seg4_texture_04032A88[] = { +ALIGNED8 const Texture sparkles_animation_seg4_texture_04032A88[] = { #include "actors/sparkle_animation/sparkle_animation_0.ia16.inc.c" }; // 0x04033288 -ALIGNED8 static const Texture sparkles_animation_seg4_texture_04033288[] = { +ALIGNED8 const Texture sparkles_animation_seg4_texture_04033288[] = { #include "actors/sparkle_animation/sparkle_animation_1.ia16.inc.c" }; // 0x04033A88 -ALIGNED8 static const Texture sparkles_animation_seg4_texture_04033A88[] = { +ALIGNED8 const Texture sparkles_animation_seg4_texture_04033A88[] = { #include "actors/sparkle_animation/sparkle_animation_2.ia16.inc.c" }; // 0x04034288 -ALIGNED8 static const Texture sparkles_animation_seg4_texture_04034288[] = { +ALIGNED8 const Texture sparkles_animation_seg4_texture_04034288[] = { #include "actors/sparkle_animation/sparkle_animation_3.ia16.inc.c" }; // 0x04034A88 -ALIGNED8 static const Texture sparkles_animation_seg4_texture_04034A88[] = { +ALIGNED8 const Texture sparkles_animation_seg4_texture_04034A88[] = { #include "actors/sparkle_animation/sparkle_animation_4.ia16.inc.c" }; diff --git a/actors/spindrift/anims/anim_050006AC.inc.c b/actors/spindrift/anims/anim_050006AC.inc.c index 3e65567a..84b78656 100644 --- a/actors/spindrift/anims/anim_050006AC.inc.c +++ b/actors/spindrift/anims/anim_050006AC.inc.c @@ -72,22 +72,22 @@ static const struct Animation spindrift_seg5_anim_050006AC = { UNUSED static const u64 spindrift_unused_1 = 1; // 0x050006D0 -ALIGNED8 static const Texture spindrift_seg5_texture_050006D0[] = { +ALIGNED8 const Texture spindrift_seg5_texture_050006D0[] = { #include "actors/spindrift/spindrift_face.rgba16.inc.c" }; // 0x05000ED0 -ALIGNED8 static const Texture spindrift_seg5_texture_05000ED0[] = { +ALIGNED8 const Texture spindrift_seg5_texture_05000ED0[] = { #include "actors/spindrift/spindrift_petal.rgba16.inc.c" }; // 0x050016D0 -ALIGNED8 static const Texture spindrift_seg5_texture_050016D0[] = { +ALIGNED8 const Texture spindrift_seg5_texture_050016D0[] = { #include "actors/spindrift/spindrift_leaf.rgba16.inc.c" }; // 0x05001ED0 -ALIGNED8 static const Texture spindrift_seg5_texture_05001ED0[] = { +ALIGNED8 const Texture spindrift_seg5_texture_05001ED0[] = { #include "actors/spindrift/spindrift_head.rgba16.inc.c" }; diff --git a/actors/springboard/model.inc.c b/actors/springboard/model.inc.c index 61a7a06c..0c414a25 100644 --- a/actors/springboard/model.inc.c +++ b/actors/springboard/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 springboard_seg5_lights_05000000 = gdSPDefLights1( ); // 0x05000018 -ALIGNED8 static const Texture springboard_seg5_texture_05000018[] = { +ALIGNED8 const Texture springboard_seg5_texture_05000018[] = { #include "actors/springboard/springboard_top_unused.rgba16.inc.c" }; // 0x05000818 -ALIGNED8 static const Texture springboard_seg5_texture_05000818[] = { +ALIGNED8 const Texture springboard_seg5_texture_05000818[] = { #include "actors/springboard/springboard_base_unused.rgba16.inc.c" }; diff --git a/actors/star/model.inc.c b/actors/star/model.inc.c index b0a4dfce..a07ed05d 100644 --- a/actors/star/model.inc.c +++ b/actors/star/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 star_seg3_lights_0302A6D8 = gdSPDefLights1( ); // 0x0302A6F0 -ALIGNED8 static const Texture star_seg3_texture_0302A6F0[] = { +ALIGNED8 const Texture star_seg3_texture_0302A6F0[] = { #include "actors/star/star_surface.rgba16.inc.c" }; // 0x0302AEF0 -ALIGNED8 static const Texture star_seg3_texture_0302AEF0[] = { +ALIGNED8 const Texture star_seg3_texture_0302AEF0[] = { #include "actors/star/star_eye.rgba16.inc.c" }; diff --git a/actors/stomp_smoke/model.inc.c b/actors/stomp_smoke/model.inc.c index 8f5bcd26..8be1f006 100644 --- a/actors/stomp_smoke/model.inc.c +++ b/actors/stomp_smoke/model.inc.c @@ -17,32 +17,32 @@ static const Vtx stomp_smoke_seg4_vertex_04022108[] = { }; // 0x04022148 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04022148[] = { +ALIGNED8 const Texture stomp_smoke_seg4_texture_04022148[] = { #include "actors/stomp_smoke/stomp_smoke_0.ia16.inc.c" }; // 0x04022948 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04022948[] = { +ALIGNED8 const Texture stomp_smoke_seg4_texture_04022948[] = { #include "actors/stomp_smoke/stomp_smoke_1.ia16.inc.c" }; // 0x04023148 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04023148[] = { +ALIGNED8 const Texture stomp_smoke_seg4_texture_04023148[] = { #include "actors/stomp_smoke/stomp_smoke_2.ia16.inc.c" }; // 0x04023948 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04023948[] = { +ALIGNED8 const Texture stomp_smoke_seg4_texture_04023948[] = { #include "actors/stomp_smoke/stomp_smoke_3.ia16.inc.c" }; // 0x04024148 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04024148[] = { +ALIGNED8 const Texture stomp_smoke_seg4_texture_04024148[] = { #include "actors/stomp_smoke/stomp_smoke_4.ia16.inc.c" }; // 0x04024948 -ALIGNED8 static const Texture stomp_smoke_seg4_texture_04024948[] = { +ALIGNED8 const Texture stomp_smoke_seg4_texture_04024948[] = { #include "actors/stomp_smoke/stomp_smoke_5.ia16.inc.c" }; diff --git a/actors/sushi/model.inc.c b/actors/sushi/model.inc.c index d62bc9e7..83bfae3c 100644 --- a/actors/sushi/model.inc.c +++ b/actors/sushi/model.inc.c @@ -6,17 +6,17 @@ UNUSED static const u64 sushi_unused_1 = 1; // 0x05008ED0 -ALIGNED8 static const Texture sushi_seg5_texture_05008ED0[] = { +ALIGNED8 const Texture sushi_seg5_texture_05008ED0[] = { #include "actors/sushi/sushi_snout.rgba16.inc.c" }; // 0x050096D0 -ALIGNED8 static const Texture sushi_seg5_texture_050096D0[] = { +ALIGNED8 const Texture sushi_seg5_texture_050096D0[] = { #include "actors/sushi/sushi_eye.rgba16.inc.c" }; // 0x05009AD0 -ALIGNED8 static const Texture sushi_seg5_texture_05009AD0[] = { +ALIGNED8 const Texture sushi_seg5_texture_05009AD0[] = { #include "actors/sushi/sushi_tooth.rgba16.inc.c" }; diff --git a/actors/swoop/model.inc.c b/actors/swoop/model.inc.c index d1a3a29c..e7d9b12a 100644 --- a/actors/swoop/model.inc.c +++ b/actors/swoop/model.inc.c @@ -13,22 +13,22 @@ UNUSED static const Lights1 swoop_lights_unused2 = gdSPDefLights1( ); // 0x06004270 -ALIGNED8 static const Texture swoop_seg6_texture_06004270[] = { +ALIGNED8 const Texture swoop_seg6_texture_06004270[] = { #include "actors/swoop/swoop_body.rgba16.inc.c" }; // 0x06004A70 -ALIGNED8 static const Texture swoop_seg6_texture_06004A70[] = { +ALIGNED8 const Texture swoop_seg6_texture_06004A70[] = { #include "actors/swoop/swoop_eye.rgba16.inc.c" }; // 0x06005270 -ALIGNED8 static const Texture swoop_seg6_texture_06005270[] = { +ALIGNED8 const Texture swoop_seg6_texture_06005270[] = { #include "actors/swoop/swoop_nose.rgba16.inc.c" }; // 0x06005A70 -ALIGNED8 static const Texture swoop_seg6_texture_06005A70[] = { +ALIGNED8 const Texture swoop_seg6_texture_06005A70[] = { #include "actors/swoop/swoop_wing.rgba16.inc.c" }; diff --git a/actors/thwomp/model.inc.c b/actors/thwomp/model.inc.c index 2dee226e..eb8761e3 100644 --- a/actors/thwomp/model.inc.c +++ b/actors/thwomp/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 thwomp_seg5_lights_050098E8 = gdSPDefLights1( ); // 0x05009900 -ALIGNED8 static const Texture thwomp_seg5_texture_05009900[] = { +ALIGNED8 const Texture thwomp_seg5_texture_05009900[] = { #include "actors/thwomp/thwomp_face.rgba16.inc.c" }; // 0x0500A900 -ALIGNED8 static const Texture thwomp_seg5_texture_0500A900[] = { +ALIGNED8 const Texture thwomp_seg5_texture_0500A900[] = { #include "actors/thwomp/thwomp_surface.rgba16.inc.c" }; diff --git a/actors/toad/model.inc.c b/actors/toad/model.inc.c index d58b7400..4c914af4 100644 --- a/actors/toad/model.inc.c +++ b/actors/toad/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 toad_seg6_lights_06005908 = gdSPDefLights1( ); // 0x06005920 -ALIGNED8 static const Texture toad_seg6_texture_06005920[] = { +ALIGNED8 const Texture toad_seg6_texture_06005920[] = { #include "actors/toad/toad_face.rgba16.inc.c" }; // 0x06006120 -ALIGNED8 static const Texture toad_seg6_texture_06006120[] = { +ALIGNED8 const Texture toad_seg6_texture_06006120[] = { #include "actors/toad/toad_head.rgba16.inc.c" }; diff --git a/actors/tornado/model.inc.c b/actors/tornado/model.inc.c index 42f3dad0..ee5731b6 100644 --- a/actors/tornado/model.inc.c +++ b/actors/tornado/model.inc.c @@ -1,7 +1,7 @@ // Tornado // 0x05013128 -ALIGNED8 static const Texture tornado_seg5_texture_05013128[] = { +ALIGNED8 const Texture tornado_seg5_texture_05013128[] = { #include "actors/tornado/tornado.ia16.inc.c" }; diff --git a/actors/treasure_chest/model.inc.c b/actors/treasure_chest/model.inc.c index 3b0bb9e4..ece8451d 100644 --- a/actors/treasure_chest/model.inc.c +++ b/actors/treasure_chest/model.inc.c @@ -7,22 +7,22 @@ static const Lights1 treasure_chest_seg6_lights_06013F90 = gdSPDefLights1( ); // 0x06013FA8 -ALIGNED8 static const Texture treasure_chest_seg6_texture_06013FA8[] = { +ALIGNED8 const Texture treasure_chest_seg6_texture_06013FA8[] = { #include "actors/treasure_chest/treasure_chest_lock.rgba16.inc.c" }; // 0x060147A8 -ALIGNED8 static const Texture treasure_chest_seg6_texture_060147A8[] = { +ALIGNED8 const Texture treasure_chest_seg6_texture_060147A8[] = { #include "actors/treasure_chest/treasure_chest_side.rgba16.inc.c" }; // 0x06014FA8 -ALIGNED8 static const Texture treasure_chest_seg6_texture_06014FA8[] = { +ALIGNED8 const Texture treasure_chest_seg6_texture_06014FA8[] = { #include "actors/treasure_chest/treasure_chest_lock_top.rgba16.inc.c" }; // 0x060157A8 -ALIGNED8 static const Texture treasure_chest_seg6_texture_060157A8[] = { +ALIGNED8 const Texture treasure_chest_seg6_texture_060157A8[] = { #include "actors/treasure_chest/treasure_chest_front.rgba16.inc.c" }; diff --git a/actors/tree/model.inc.c b/actors/tree/model.inc.c index a4bbf492..3482426c 100644 --- a/actors/tree/model.inc.c +++ b/actors/tree/model.inc.c @@ -7,12 +7,12 @@ static const Lights1 tree_seg3_lights_0302DE10 = gdSPDefLights1( ); // 0x0302DE28 -ALIGNED8 static const Texture tree_seg3_texture_0302DE28[] = { +ALIGNED8 const Texture tree_seg3_texture_0302DE28[] = { #include "actors/tree/tree_left_side.rgba16.inc.c" }; // 0x0302EE28 -ALIGNED8 static const Texture tree_seg3_texture_0302EE28[] = { +ALIGNED8 const Texture tree_seg3_texture_0302EE28[] = { #include "actors/tree/tree_right_side.rgba16.inc.c" }; @@ -70,7 +70,7 @@ const Gfx tree_seg3_dl_0302FEE8[] = { }; // 0x0302FF60 -ALIGNED8 static const Texture tree_seg3_texture_0302FF60[] = { +ALIGNED8 const Texture tree_seg3_texture_0302FF60[] = { #include "actors/tree/pine_tree.rgba16.inc.c" }; @@ -107,7 +107,7 @@ const Gfx tree_seg3_dl_03030FA0[] = { }; // 0x03031048 -ALIGNED8 static const Texture tree_seg3_texture_03031048[] = { +ALIGNED8 const Texture tree_seg3_texture_03031048[] = { #include "actors/tree/snowy_pine_tree.rgba16.inc.c" }; @@ -176,7 +176,7 @@ const Gfx tree_seg3_dl_03032170[] = { }; // 0x03032218 -ALIGNED8 static const Texture tree_seg3_texture_03032218[] = { +ALIGNED8 const Texture tree_seg3_texture_03032218[] = { #include "actors/tree/palm_tree.rgba16.inc.c" }; diff --git a/actors/ukiki/model.inc.c b/actors/ukiki/model.inc.c index fdc22c14..fa61d053 100644 --- a/actors/ukiki/model.inc.c +++ b/actors/ukiki/model.inc.c @@ -22,22 +22,22 @@ static const Lights1 ukiki_seg5_lights_05007BA0 = gdSPDefLights1( UNUSED static const u64 ukiki_unused_1 = 1; // 0x05007BC0 -ALIGNED8 static const Texture ukiki_seg5_texture_05007BC0[] = { +ALIGNED8 const Texture ukiki_seg5_texture_05007BC0[] = { #include "actors/ukiki/ukiki_face.rgba16.inc.c" }; // 0x05008BC0 -ALIGNED8 static const Texture ukiki_seg5_texture_05008BC0[] = { +ALIGNED8 const Texture ukiki_seg5_texture_05008BC0[] = { #include "actors/ukiki/ukiki_face_blink.rgba16.inc.c" }; // 0x05009BC0 -ALIGNED8 static const Texture ukiki_seg5_texture_05009BC0[] = { +ALIGNED8 const Texture ukiki_seg5_texture_05009BC0[] = { #include "actors/ukiki/ukiki_butt.rgba16.inc.c" }; // 0x0500A3C0 -ALIGNED8 static const Texture ukiki_seg5_texture_0500A3C0[] = { +ALIGNED8 const Texture ukiki_seg5_texture_0500A3C0[] = { #include "actors/ukiki/ukiki_fur.rgba16.inc.c" }; diff --git a/actors/unagi/model.inc.c b/actors/unagi/model.inc.c index 6d0eda36..1c322f88 100644 --- a/actors/unagi/model.inc.c +++ b/actors/unagi/model.inc.c @@ -49,32 +49,32 @@ UNUSED static const Lights1 unagi_lights_unused8 = gdSPDefLights1( ); // 0x0500AF20 -ALIGNED8 static const Texture unagi_seg5_texture_0500AF20[] = { +ALIGNED8 const Texture unagi_seg5_texture_0500AF20[] = { #include "actors/unagi/unagi_body.rgba16.inc.c" }; // 0x0500B720 -ALIGNED8 static const Texture unagi_seg5_texture_0500B720[] = { +ALIGNED8 const Texture unagi_seg5_texture_0500B720[] = { #include "actors/unagi/unagi_eye.rgba16.inc.c" }; // 0x0500B920 -ALIGNED8 static const Texture unagi_seg5_texture_0500B920[] = { +ALIGNED8 const Texture unagi_seg5_texture_0500B920[] = { #include "actors/unagi/unagi_head_base.rgba16.inc.c" }; // 0x0500C120 -ALIGNED8 static const Texture unagi_seg5_texture_0500C120[] = { +ALIGNED8 const Texture unagi_seg5_texture_0500C120[] = { #include "actors/unagi/unagi_tooth.rgba16.inc.c" }; // 0x0500C320 -ALIGNED8 static const Texture unagi_seg5_texture_0500C320[] = { +ALIGNED8 const Texture unagi_seg5_texture_0500C320[] = { #include "actors/unagi/unagi_mouth.rgba16.inc.c" }; // 0x0500C3A0 -ALIGNED8 static const Texture unagi_seg5_texture_0500C3A0[] = { +ALIGNED8 const Texture unagi_seg5_texture_0500C3A0[] = { #include "actors/unagi/unagi_tail.rgba16.inc.c" }; diff --git a/actors/walk_smoke/model.inc.c b/actors/walk_smoke/model.inc.c index 1b0452c6..e41b23b8 100644 --- a/actors/walk_smoke/model.inc.c +++ b/actors/walk_smoke/model.inc.c @@ -9,37 +9,37 @@ static const Vtx smoke_seg4_vertex_0401DE60[] = { }; // 0x0401DEA0 -ALIGNED8 static const Texture smoke_seg4_texture_0401DEA0[] = { +ALIGNED8 const Texture smoke_seg4_texture_0401DEA0[] = { #include "actors/walk_smoke/walk_smoke_0.ia16.inc.c" }; // 0x0401E6A0 -ALIGNED8 static const Texture smoke_seg4_texture_0401E6A0[] = { +ALIGNED8 const Texture smoke_seg4_texture_0401E6A0[] = { #include "actors/walk_smoke/walk_smoke_1.ia16.inc.c" }; // 0x0401EEA0 -ALIGNED8 static const Texture smoke_seg4_texture_0401EEA0[] = { +ALIGNED8 const Texture smoke_seg4_texture_0401EEA0[] = { #include "actors/walk_smoke/walk_smoke_2.ia16.inc.c" }; // 0x0401F6A0 -ALIGNED8 static const Texture smoke_seg4_texture_0401F6A0[] = { +ALIGNED8 const Texture smoke_seg4_texture_0401F6A0[] = { #include "actors/walk_smoke/walk_smoke_3.ia16.inc.c" }; // 0x0401FEA0 -ALIGNED8 static const Texture smoke_seg4_texture_0401FEA0[] = { +ALIGNED8 const Texture smoke_seg4_texture_0401FEA0[] = { #include "actors/walk_smoke/walk_smoke_4.ia16.inc.c" }; // 0x040206A0 -ALIGNED8 static const Texture smoke_seg4_texture_040206A0[] = { +ALIGNED8 const Texture smoke_seg4_texture_040206A0[] = { #include "actors/walk_smoke/walk_smoke_5.ia16.inc.c" }; // 0x04020EA0 -ALIGNED8 static const Texture smoke_seg4_texture_04020EA0[] = { +ALIGNED8 const Texture smoke_seg4_texture_04020EA0[] = { #include "actors/walk_smoke/walk_smoke_6.ia16.inc.c" }; diff --git a/actors/warp_pipe/model.inc.c b/actors/warp_pipe/model.inc.c index 418bd7c9..e2b2d217 100644 --- a/actors/warp_pipe/model.inc.c +++ b/actors/warp_pipe/model.inc.c @@ -95,7 +95,7 @@ static const Vtx warp_pipe_seg3_vertex_03007DC0[] = { }; // 0x03007E40 -ALIGNED8 static const Texture warp_pipe_seg3_texture_03007E40[] = { +ALIGNED8 const Texture warp_pipe_seg3_texture_03007E40[] = { #include "actors/warp_pipe/warp_pipe_side.rgba16.inc.c" }; @@ -189,7 +189,7 @@ static const Vtx warp_pipe_seg3_vertex_03009128[] = { }; // 0x03009168 -ALIGNED8 static const Texture warp_pipe_seg3_texture_03009168[] = { +ALIGNED8 const Texture warp_pipe_seg3_texture_03009168[] = { #include "actors/warp_pipe/warp_pipe_top.rgba16.inc.c" }; diff --git a/actors/water_bubble/model.inc.c b/actors/water_bubble/model.inc.c index 512551f2..a6786d31 100644 --- a/actors/water_bubble/model.inc.c +++ b/actors/water_bubble/model.inc.c @@ -7,7 +7,7 @@ static const Lights1 water_bubble_seg5_lights_0500FE68 = gdSPDefLights1( ); // 0x0500FE80 -ALIGNED8 static const Texture water_bubble_seg5_texture_0500FE80[] = { +ALIGNED8 const Texture water_bubble_seg5_texture_0500FE80[] = { #include "actors/water_bubble/water_bubble.rgba16.inc.c" }; diff --git a/actors/water_mine/model.inc.c b/actors/water_mine/model.inc.c index 182d8e29..2923bbe1 100644 --- a/actors/water_mine/model.inc.c +++ b/actors/water_mine/model.inc.c @@ -7,17 +7,17 @@ static const Lights1 water_mine_seg6_lights_0600A4E0 = gdSPDefLights1( ); // 0x0600A4F8 -ALIGNED8 static const Texture water_mine_seg6_texture_0600A4F8[] = { +ALIGNED8 const Texture water_mine_seg6_texture_0600A4F8[] = { #include "actors/water_mine/water_mine_left_side_unused.rgba16.inc.c" }; // 0x0600B4F8 -ALIGNED8 static const Texture water_mine_seg6_texture_0600B4F8[] = { +ALIGNED8 const Texture water_mine_seg6_texture_0600B4F8[] = { #include "actors/water_mine/water_mine_right_side_unused.rgba16.inc.c" }; // 0x0600C4F8 -ALIGNED8 static const Texture water_mine_seg6_texture_0600C4F8[] = { +ALIGNED8 const Texture water_mine_seg6_texture_0600C4F8[] = { #include "actors/water_mine/water_mine_spike_unused.rgba16.inc.c" }; diff --git a/actors/water_ring/model.inc.c b/actors/water_ring/model.inc.c index 3c772931..c7498722 100644 --- a/actors/water_ring/model.inc.c +++ b/actors/water_ring/model.inc.c @@ -7,7 +7,7 @@ static const Lights1 water_ring_seg6_lights_06012368 = gdSPDefLights1( ); // 0x06012380 -ALIGNED8 static const Texture water_ring_seg6_texture_06012380[] = { +ALIGNED8 const Texture water_ring_seg6_texture_06012380[] = { #include "actors/water_ring/water_ring.rgba16.inc.c" }; diff --git a/actors/water_splash/model.inc.c b/actors/water_splash/model.inc.c index 6b7b2daf..54ba97a1 100644 --- a/actors/water_splash/model.inc.c +++ b/actors/water_splash/model.inc.c @@ -9,42 +9,42 @@ static const Vtx water_splash_seg4_vertex_0402A588[] = { }; // 0x0402A5C8 -ALIGNED8 static const Texture water_splash_seg4_texture_0402A5C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_0402A5C8[] = { #include "actors/water_splash/water_splash_0.rgba16.inc.c" }; // 0x0402B5C8 -ALIGNED8 static const Texture water_splash_seg4_texture_0402B5C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_0402B5C8[] = { #include "actors/water_splash/water_splash_1.rgba16.inc.c" }; // 0x0402C5C8 -ALIGNED8 static const Texture water_splash_seg4_texture_0402C5C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_0402C5C8[] = { #include "actors/water_splash/water_splash_2.rgba16.inc.c" }; // 0x0402D5C8 -ALIGNED8 static const Texture water_splash_seg4_texture_0402D5C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_0402D5C8[] = { #include "actors/water_splash/water_splash_3.rgba16.inc.c" }; // 0x0402E5C8 -ALIGNED8 static const Texture water_splash_seg4_texture_0402E5C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_0402E5C8[] = { #include "actors/water_splash/water_splash_4.rgba16.inc.c" }; // 0x0402F5C8 -ALIGNED8 static const Texture water_splash_seg4_texture_0402F5C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_0402F5C8[] = { #include "actors/water_splash/water_splash_5.rgba16.inc.c" }; // 0x040305C8 -ALIGNED8 static const Texture water_splash_seg4_texture_040305C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_040305C8[] = { #include "actors/water_splash/water_splash_6.rgba16.inc.c" }; // 0x040315C8 -ALIGNED8 static const Texture water_splash_seg4_texture_040315C8[] = { +ALIGNED8 const Texture water_splash_seg4_texture_040315C8[] = { #include "actors/water_splash/water_splash_7.rgba16.inc.c" }; diff --git a/actors/water_wave/model.inc.c b/actors/water_wave/model.inc.c index bc2653e9..ef3ede1f 100644 --- a/actors/water_wave/model.inc.c +++ b/actors/water_wave/model.inc.c @@ -9,22 +9,22 @@ static const Vtx water_wave_seg4_vertex_04025318[] = { }; // 0x04025358 -ALIGNED8 static const Texture water_wave_seg4_texture_04025358[] = { +ALIGNED8 const Texture water_wave_seg4_texture_04025358[] = { #include "actors/water_wave/water_wave_0.ia16.inc.c" }; // 0x04025B58 -ALIGNED8 static const Texture water_wave_seg4_texture_04025B58[] = { +ALIGNED8 const Texture water_wave_seg4_texture_04025B58[] = { #include "actors/water_wave/water_wave_1.ia16.inc.c" }; // 0x04026358 -ALIGNED8 static const Texture water_wave_seg4_texture_04026358[] = { +ALIGNED8 const Texture water_wave_seg4_texture_04026358[] = { #include "actors/water_wave/water_wave_2.ia16.inc.c" }; // 0x04026B58 -ALIGNED8 static const Texture water_wave_seg4_texture_04026B58[] = { +ALIGNED8 const Texture water_wave_seg4_texture_04026B58[] = { #include "actors/water_wave/water_wave_3.ia16.inc.c" }; diff --git a/actors/whirlpool/model.inc.c b/actors/whirlpool/model.inc.c index c517a48a..21af3aa5 100644 --- a/actors/whirlpool/model.inc.c +++ b/actors/whirlpool/model.inc.c @@ -1,7 +1,7 @@ // Whirlpool // 0x05012848 -ALIGNED8 static const Texture whirlpool_seg5_texture_05012848[] = { +ALIGNED8 const Texture whirlpool_seg5_texture_05012848[] = { #include "actors/whirlpool/whirlpool.ia16.inc.c" }; diff --git a/actors/white_particle/model.inc.c b/actors/white_particle/model.inc.c index e463bc1d..02514be8 100644 --- a/actors/white_particle/model.inc.c +++ b/actors/white_particle/model.inc.c @@ -9,7 +9,7 @@ static const Vtx white_particle_vertex[] = { }; // 0x0302C6A0 -ALIGNED8 static const Texture white_particle_texture[] = { +ALIGNED8 const Texture white_particle_texture[] = { #include "actors/white_particle/snow_particle.rgba16.inc.c" }; diff --git a/actors/white_particle_small/model.inc.c b/actors/white_particle_small/model.inc.c index f780c59a..24ab4526 100644 --- a/actors/white_particle_small/model.inc.c +++ b/actors/white_particle_small/model.inc.c @@ -17,7 +17,7 @@ static const Vtx white_particle_small_unused_vertex[] = { }; // 0x04032780 -ALIGNED8 static const Texture white_particle_small_texture[] = { +ALIGNED8 const Texture white_particle_small_texture[] = { #include "actors/white_particle_small/small_snow_particle.rgba16.inc.c" }; diff --git a/actors/whomp/model.inc.c b/actors/whomp/model.inc.c index a359d0f3..2f5e6858 100644 --- a/actors/whomp/model.inc.c +++ b/actors/whomp/model.inc.c @@ -5,22 +5,22 @@ UNUSED static const u64 whomp_unused_1 = 2; // 0x0601C360 -ALIGNED8 static const Texture whomp_seg6_texture_0601C360[] = { +ALIGNED8 const Texture whomp_seg6_texture_0601C360[] = { #include "actors/whomp/whomp_back.rgba16.inc.c" }; // 0x0601D360 -ALIGNED8 static const Texture whomp_seg6_texture_0601D360[] = { +ALIGNED8 const Texture whomp_seg6_texture_0601D360[] = { #include "actors/whomp/whomp_face.rgba16.inc.c" }; // 0x0601D360 -ALIGNED8 static const Texture whomp_seg6_texture_0601E360[] = { +ALIGNED8 const Texture whomp_seg6_texture_0601E360[] = { #include "actors/whomp/whomp_hand.rgba16.inc.c" }; // 0x0601EB60 -ALIGNED8 static const Texture whomp_seg6_texture_0601EB60[] = { +ALIGNED8 const Texture whomp_seg6_texture_0601EB60[] = { #include "actors/whomp/whomp_surface.rgba16.inc.c" }; diff --git a/actors/wiggler_body/model.inc.c b/actors/wiggler_body/model.inc.c index ed1efc8e..d21c5944 100644 --- a/actors/wiggler_body/model.inc.c +++ b/actors/wiggler_body/model.inc.c @@ -1,37 +1,37 @@ // Wiggler Body // 0x05005A30 -ALIGNED8 static const Texture wiggler_seg5_texture_05005A30[] = { +ALIGNED8 const Texture wiggler_seg5_texture_05005A30[] = { #include "actors/wiggler/wiggler_segment_left_side.rgba16.inc.c" }; // 0x05006A30 -ALIGNED8 static const Texture wiggler_seg5_texture_05006A30[] = { +ALIGNED8 const Texture wiggler_seg5_texture_05006A30[] = { #include "actors/wiggler/wiggler_segment_right_side.rgba16.inc.c" }; // 0x05007A30 -ALIGNED8 static const Texture wiggler_seg5_texture_05007A30[] = { +ALIGNED8 const Texture wiggler_seg5_texture_05007A30[] = { #include "actors/wiggler/wiggler_eye.rgba16.inc.c" }; // 0x05008230 -ALIGNED8 static const Texture wiggler_seg5_texture_05008230[] = { +ALIGNED8 const Texture wiggler_seg5_texture_05008230[] = { #include "actors/wiggler/wiggler_flower.rgba16.inc.c" }; // 0x05008A30 -ALIGNED8 static const Texture wiggler_seg5_texture_05008A30[] = { +ALIGNED8 const Texture wiggler_seg5_texture_05008A30[] = { #include "actors/wiggler/wiggler_frown.rgba16.inc.c" }; // 0x05009230 -ALIGNED8 static const Texture wiggler_seg5_texture_05009230[] = { +ALIGNED8 const Texture wiggler_seg5_texture_05009230[] = { #include "actors/wiggler/wiggler_nose_left_side.rgba16.inc.c" }; // 0x0500A230 -ALIGNED8 static const Texture wiggler_seg5_texture_0500A230[] = { +ALIGNED8 const Texture wiggler_seg5_texture_0500A230[] = { #include "actors/wiggler/wiggler_nose_right_side.rgba16.inc.c" }; diff --git a/actors/wooden_signpost/model.inc.c b/actors/wooden_signpost/model.inc.c index a0889e81..3f18393b 100644 --- a/actors/wooden_signpost/model.inc.c +++ b/actors/wooden_signpost/model.inc.c @@ -18,12 +18,12 @@ static const Vtx wooden_signpost_seg3_vertex_0302C958[] = { }; // 0x0302C9C8 -ALIGNED8 static const Texture wooden_signpost_seg3_texture_0302C9C8[] = { +ALIGNED8 const Texture wooden_signpost_seg3_texture_0302C9C8[] = { #include "actors/wooden_signpost/wooden_signpost_back.rgba16.inc.c" }; // 0x0302D1C8 -ALIGNED8 static const Texture wooden_signpost_seg3_texture_0302D1C8[] = { +ALIGNED8 const Texture wooden_signpost_seg3_texture_0302D1C8[] = { #include "actors/wooden_signpost/wooden_signpost_front.rgba16.inc.c" }; diff --git a/actors/yellow_sphere/model.inc.c b/actors/yellow_sphere/model.inc.c index 8c4111f6..77fcd690 100644 --- a/actors/yellow_sphere/model.inc.c +++ b/actors/yellow_sphere/model.inc.c @@ -9,7 +9,7 @@ static const Vtx yellow_sphere_seg6_vertex_0601EB48[] = { }; // 0x0601EB88 -ALIGNED8 static const Texture yellow_sphere_seg6_texture_0601EB88[] = { +ALIGNED8 const Texture yellow_sphere_seg6_texture_0601EB88[] = { #include "actors/yellow_sphere/yellow_sphere.rgba16.inc.c" }; diff --git a/actors/yellow_sphere_small/model.inc.c b/actors/yellow_sphere_small/model.inc.c index 589d4280..d28e7db9 100644 --- a/actors/yellow_sphere_small/model.inc.c +++ b/actors/yellow_sphere_small/model.inc.c @@ -9,7 +9,7 @@ static const Vtx yellow_sphere_seg5_vertex_05000000[] = { }; // 0x05000040 -ALIGNED8 static const Texture yellow_sphere_seg5_texture_05000040[] = { +ALIGNED8 const Texture yellow_sphere_seg5_texture_05000040[] = { #include "actors/yellow_sphere_small/small_yellow_sphere.rgba16.inc.c" }; diff --git a/actors/yoshi/model.inc.c b/actors/yoshi/model.inc.c index f5c9514e..d47e48fb 100644 --- a/actors/yoshi/model.inc.c +++ b/actors/yoshi/model.inc.c @@ -19,17 +19,17 @@ static const Lights1 yoshi_seg5_lights_0501C488 = gdSPDefLights1( ); // 0x0501C4A0 -ALIGNED8 static const Texture yoshi_seg5_texture_0501C4A0[] = { +ALIGNED8 const Texture yoshi_seg5_texture_0501C4A0[] = { #include "actors/yoshi/yoshi_eye.rgba16.inc.c" }; // 0x0501C6A0 -ALIGNED8 static const Texture yoshi_seg5_texture_0501C6A0[] = { +ALIGNED8 const Texture yoshi_seg5_texture_0501C6A0[] = { #include "actors/yoshi/yoshi_eye_blink.rgba16.inc.c" }; // 0x0501C8A0 -ALIGNED8 static const Texture yoshi_seg5_texture_0501C8A0[] = { +ALIGNED8 const Texture yoshi_seg5_texture_0501C8A0[] = { #include "actors/yoshi/yoshi_nostril.rgba16.inc.c" }; diff --git a/actors/yoshi_egg/model.inc.c b/actors/yoshi_egg/model.inc.c index 56cb16c9..f5a831d7 100644 --- a/actors/yoshi_egg/model.inc.c +++ b/actors/yoshi_egg/model.inc.c @@ -9,42 +9,42 @@ static const Vtx yoshi_egg_seg5_vertex_05005778[] = { }; // 0x050057B8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_050057B8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_050057B8[] = { #include "actors/yoshi_egg/yoshi_egg_0_unused.rgba16.inc.c" }; // 0x05005FB8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_05005FB8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_05005FB8[] = { #include "actors/yoshi_egg/yoshi_egg_1_unused.rgba16.inc.c" }; // 0x050067B8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_050067B8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_050067B8[] = { #include "actors/yoshi_egg/yoshi_egg_2_unused.rgba16.inc.c" }; // 0x05006FB8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_05006FB8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_05006FB8[] = { #include "actors/yoshi_egg/yoshi_egg_3_unused.rgba16.inc.c" }; // 0x050077B8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_050077B8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_050077B8[] = { #include "actors/yoshi_egg/yoshi_egg_4_unused.rgba16.inc.c" }; // 0x05007FB8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_05007FB8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_05007FB8[] = { #include "actors/yoshi_egg/yoshi_egg_5_unused.rgba16.inc.c" }; // 0x050087B8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_050087B8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_050087B8[] = { #include "actors/yoshi_egg/yoshi_egg_6_unused.rgba16.inc.c" }; // 0x05008FB8 -ALIGNED8 static const Texture yoshi_egg_seg5_texture_05008FB8[] = { +ALIGNED8 const Texture yoshi_egg_seg5_texture_05008FB8[] = { #include "actors/yoshi_egg/yoshi_egg_7_unused.rgba16.inc.c" }; diff --git a/bin/segment2.c b/bin/segment2.c index 11b4fe37..d73e9180 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -2483,6 +2483,10 @@ ALIGNED8 static const Texture texture_shadow_quarter_square[] = { #include "textures/segment2/shadow_quarter_square.ia8.inc.c" }; +ALIGNED8 static const Texture texture_shadow_spike_ext[] = { +#include "textures/segment2/shadow_spike_custom.ia8.inc.c" +}; + const Texture texture_transition_star_half[] = { #include "textures/segment2/segment2.0F458.ia8.inc.c" }; @@ -2575,6 +2579,12 @@ const Gfx dl_shadow_square[] = { gsSPEndDisplayList(), }; +const Gfx dl_shadow_spike_ext[] = { + gsSPDisplayList(dl_shadow_begin), + gsDPLoadTextureBlock(texture_shadow_spike_ext, G_IM_FMT_IA, G_IM_SIZ_8b, 16, 16, 0, G_TX_WRAP | G_TX_MIRROR, G_TX_WRAP | G_TX_MIRROR, 4, 4, G_TX_NOLOD, G_TX_NOLOD), + gsSPEndDisplayList(), +}; + // 0x020145D8 - 0x02014620 const Gfx dl_shadow_9_verts[] = { gsSP2Triangles( 0, 3, 4, 0x0, 0, 4, 1, 0x0), diff --git a/data/dynos_bin_geo.cpp b/data/dynos_bin_geo.cpp index be556e3b..2853143a 100644 --- a/data/dynos_bin_geo.cpp +++ b/data/dynos_bin_geo.cpp @@ -64,6 +64,7 @@ static s64 ParseGeoSymbolArg(GfxData* aGfxData, DataNode* aNode, u64& geo_constant(SHADOW_SQUARE_TOGGLABLE); geo_constant(SHADOW_RECTANGLE_HARDCODED_OFFSET); geo_constant(SHADOW_CIRCLE_PLAYER); + geo_constant(SHADOW_SPIKE_EXT); // Envfx constants geo_constant(ENVFX_MODE_NONE); diff --git a/data/dynos_mgr_builtin.cpp b/data/dynos_mgr_builtin.cpp index 0d507cee..d5446a6d 100644 --- a/data/dynos_mgr_builtin.cpp +++ b/data/dynos_mgr_builtin.cpp @@ -75,6 +75,7 @@ extern "C" { #include "levels/wf/header.h" #include "levels/wmotr/header.h" +#include "dynos_mgr_builtin_externs.h" #include "textures.h" } @@ -1074,6 +1075,7 @@ const char* DynOS_Builtin_LvlCol_GetFromData(const Collision* aData) { ////////////// static const void* sDynosBuiltinTexs[] = { + // levels define_builtin(cave_09000000), define_builtin(cave_09001000), define_builtin(cave_09001800), @@ -1302,6 +1304,446 @@ static const void* sDynosBuiltinTexs[] = { define_builtin(water_0900A000), define_builtin(water_0900A800), define_builtin(water_0900B800), + // actors + define_builtin(amp_seg8_texture_08000F18), + define_builtin(amp_seg8_texture_08001318), + define_builtin(amp_seg8_texture_08001B18), + define_builtin(amp_seg8_texture_08002318), + define_builtin(blue_coin_switch_seg8_texture_08000018), + define_builtin(blue_coin_switch_seg8_texture_08000418), + define_builtin(blue_fish_seg3_texture_0301B5E0), + define_builtin(bobomb_seg8_texture_0801DA60), + define_builtin(bobomb_seg8_texture_0801EA60), + define_builtin(bobomb_seg8_texture_0801FA60), + define_builtin(bobomb_seg8_texture_08020A60), + define_builtin(bobomb_seg8_texture_08021A60), + define_builtin(bobomb_seg8_texture_08022260), + define_builtin(bomb_seg6_texture_06057AC0), + define_builtin(bomb_seg6_texture_06058AC0), + define_builtin(bomb_seg6_texture_06059AC0), + define_builtin(boo_seg5_texture_05009B40), + define_builtin(boo_seg5_texture_0500AB40), + define_builtin(boo_castle_seg6_texture_06015670), + define_builtin(boo_castle_seg6_texture_06016670), + define_builtin(book_seg5_texture_05002570), + define_builtin(bookend_seg5_texture_05000060), + define_builtin(bookend_seg5_texture_05000460), + define_builtin(bookend_seg5_texture_05000860), + define_builtin(bookend_seg5_texture_05000C60), + define_builtin(bookend_seg5_texture_05001060), + define_builtin(bowser_seg6_texture_0601F438), + define_builtin(bowser_seg6_texture_0601FC38), + define_builtin(bowser_seg6_texture_06020C38), + define_builtin(bowser_seg6_texture_06021438), + define_builtin(bowser_seg6_texture_06022438), + define_builtin(bowser_seg6_texture_06022C38), + define_builtin(bowser_seg6_texture_06023C38), + define_builtin(bowser_seg6_texture_06024438), + define_builtin(bowser_seg6_texture_06025438), + define_builtin(bowser_seg6_texture_06025C38), + define_builtin(bowser_seg6_texture_06026438), + define_builtin(bowser_seg6_texture_06027438), + define_builtin(bowser_seg6_texture_06028438), + define_builtin(bowser_seg6_texture_06028C38), + define_builtin(bowser_seg6_texture_06029C38), + define_builtin(bowser_seg6_texture_0602AC38), + define_builtin(bowser_seg6_texture_0602BC38), + define_builtin(bowser_seg6_texture_0602CC38), + define_builtin(bowser_seg6_texture_0602DC38), + define_builtin(bowser_seg6_texture_0602EC38), + define_builtin(bowser_seg6_texture_0602FC38), + define_builtin(bowser_seg6_texture_06030C38), + define_builtin(bowser_seg6_texture_06031C38), + define_builtin(bowser_seg6_texture_06032C38), + define_builtin(bowser_seg6_texture_06033C38), + define_builtin(bowser_seg6_texture_06034C38), + define_builtin(bowser_seg6_texture_06035C38), + define_builtin(bowser_seg6_texture_06036C38), + define_builtin(bowser_seg6_texture_06037C38), + define_builtin(flame_seg6_texture_06000000), + define_builtin(flame_seg6_texture_06002000), + define_builtin(flame_seg6_texture_06004000), + define_builtin(flame_seg6_texture_06006000), + define_builtin(flame_seg6_texture_06008000), + define_builtin(flame_seg6_texture_0600A000), + define_builtin(flame_seg6_texture_0600C000), + define_builtin(flame_seg6_texture_0600E000), + define_builtin(flame_seg6_texture_06010000), + define_builtin(flame_seg6_texture_06012000), + define_builtin(flame_seg6_texture_06014000), + define_builtin(flame_seg6_texture_06016000), + define_builtin(flame_seg6_texture_06018000), + define_builtin(flame_seg6_texture_0601A000), + define_builtin(breakable_box_seg8_texture_08011A90), + define_builtin(breakable_box_seg8_texture_08012290), + define_builtin(bub_seg6_texture_0600E2A8), + define_builtin(bub_seg6_texture_0600EAA8), + define_builtin(bub_seg6_texture_0600F2A8), + define_builtin(bub_seg6_texture_060102A8), + define_builtin(bubba_seg5_texture_05000008), + define_builtin(bubba_seg5_texture_05000408), + define_builtin(bubba_seg5_texture_05001408), + define_builtin(bubba_seg5_texture_05001C08), + define_builtin(bubba_seg5_texture_05002408), + define_builtin(bubble_seg4_texture_0401CD60), + define_builtin(bubble_seg4_texture_0401D560), + define_builtin(bullet_bill_seg5_texture_0500BAA8), + define_builtin(bullet_bill_seg5_texture_0500CAA8), + define_builtin(bully_seg5_texture_050000E0), + define_builtin(bully_seg5_texture_05000468), + define_builtin(bully_seg5_texture_05001468), + define_builtin(bully_seg5_texture_05002468), + define_builtin(burn_smoke_seg4_texture_04021800), + define_builtin(butterfly_seg3_texture_030043A8), + define_builtin(cannon_barrel_seg8_texture_080058A8), + define_builtin(cannon_base_seg8_texture_080049B8), + define_builtin(cannon_lid_seg8_texture_08004058), + define_builtin(capswitch_seg5_texture_05001C48), + define_builtin(capswitch_seg5_texture_05002C48), + define_builtin(chain_ball_seg6_texture_06020AE8), + define_builtin(chain_chomp_seg6_texture_060213D0), + define_builtin(chain_chomp_seg6_texture_06021BD0), + define_builtin(chain_chomp_seg6_texture_060223D0), + define_builtin(chain_chomp_seg6_texture_06022BD0), + define_builtin(chain_chomp_seg6_texture_060233D0), + define_builtin(chair_seg5_texture_05003060), + define_builtin(chair_seg5_texture_05003860), + define_builtin(chair_seg5_texture_05004060), + define_builtin(chair_seg5_texture_05004460), + define_builtin(checkerboard_platform_seg8_texture_0800C840), + define_builtin(checkerboard_platform_seg8_texture_0800CC40), + define_builtin(chilly_chief_seg6_texture_06000060), + define_builtin(chilly_chief_seg6_texture_06001060), + define_builtin(chilly_chief_seg6_texture_06002060), + define_builtin(chuckya_seg8_texture_08006778), + define_builtin(chuckya_seg8_texture_08007778), + define_builtin(chuckya_seg8_texture_08007F78), + define_builtin(chuckya_seg8_texture_08008F78), + define_builtin(clam_shell_seg5_texture_05000030), + define_builtin(clam_shell_seg5_texture_05000830), + define_builtin(coin_seg3_texture_03005780), + define_builtin(coin_seg3_texture_03005F80), + define_builtin(coin_seg3_texture_03006780), + define_builtin(coin_seg3_texture_03006F80), + define_builtin(cyan_fish_seg6_texture_0600D468), + define_builtin(dirt_seg3_texture_0302BDF8), + define_builtin(door_seg3_texture_03009D10), + define_builtin(door_seg3_texture_0300AD10), + define_builtin(door_seg3_texture_0300BD10), + define_builtin(door_seg3_texture_0300CD10), + define_builtin(door_seg3_texture_0300D510), + define_builtin(door_seg3_texture_0300E510), + define_builtin(door_seg3_texture_0300ED10), + define_builtin(door_seg3_texture_0300FD10), + define_builtin(door_seg3_texture_03010510), + define_builtin(door_seg3_texture_03011510), + define_builtin(door_seg3_texture_03011D10), + define_builtin(door_seg3_texture_03012510), + define_builtin(door_seg3_texture_03012D10), + define_builtin(door_seg3_texture_03013510), + define_builtin(dorrie_seg6_texture_06009BA0), + define_builtin(dorrie_seg6_texture_06009DA0), + define_builtin(dorrie_seg6_texture_0600ADA0), + define_builtin(exclamation_box_seg8_texture_08012E28), + define_builtin(exclamation_box_seg8_texture_08013628), + define_builtin(exclamation_box_seg8_texture_08014628), + define_builtin(exclamation_box_seg8_texture_08014E28), + define_builtin(exclamation_box_seg8_texture_08015E28), + define_builtin(exclamation_box_seg8_texture_08016628), + define_builtin(exclamation_box_seg8_texture_08017628), + define_builtin(exclamation_box_seg8_texture_08017E28), + define_builtin(exclamation_box_outline_seg8_texture_08025168), + define_builtin(exclamation_box_outline_seg8_texture_08025A80), + define_builtin(explosion_seg3_texture_03000A08), + define_builtin(explosion_seg3_texture_03001208), + define_builtin(explosion_seg3_texture_03001A08), + define_builtin(explosion_seg3_texture_03002208), + define_builtin(explosion_seg3_texture_03002A08), + define_builtin(explosion_seg3_texture_03003208), + define_builtin(explosion_seg3_texture_03003A08), + define_builtin(eyerok_seg5_texture_05008D40), + define_builtin(eyerok_seg5_texture_05009540), + define_builtin(eyerok_seg5_texture_05009D40), + define_builtin(eyerok_seg5_texture_0500A540), + define_builtin(eyerok_seg5_texture_0500AD40), + define_builtin(flame_seg3_texture_03017320), + define_builtin(flame_seg3_texture_03017B20), + define_builtin(flame_seg3_texture_03018320), + define_builtin(flame_seg3_texture_03018B20), + define_builtin(flame_seg3_texture_03019320), + define_builtin(flame_seg3_texture_03019B20), + define_builtin(flame_seg3_texture_0301A320), + define_builtin(flame_seg3_texture_0301AB20), + define_builtin(flyguy_seg8_texture_0800E088), + define_builtin(flyguy_seg8_texture_0800F088), + define_builtin(flyguy_seg8_texture_0800F888), + define_builtin(fwoosh_seg5_texture_05015808), + define_builtin(goomba_seg8_texture_08019530), + define_builtin(goomba_seg8_texture_08019D30), + define_builtin(goomba_seg8_texture_0801A530), + define_builtin(haunted_cage_seg5_texture_0500C288), + define_builtin(haunted_cage_seg5_texture_0500CA88), + define_builtin(haunted_cage_seg5_texture_0500D288), + define_builtin(haunted_cage_seg5_texture_0500D688), + define_builtin(haunted_cage_seg5_texture_0500DA88), + define_builtin(haunted_cage_seg5_texture_0500E288), + define_builtin(heart_seg8_texture_0800D7E0), + define_builtin(heave_ho_seg5_texture_0500E9C8), + define_builtin(heave_ho_seg5_texture_0500F1C8), + define_builtin(heave_ho_seg5_texture_0500F9C8), + define_builtin(heave_ho_seg5_texture_050109C8), + define_builtin(heave_ho_seg5_texture_050111C8), + define_builtin(heave_ho_seg5_texture_050113C8), + define_builtin(hoot_seg5_texture_05000A20), + define_builtin(hoot_seg5_texture_05001E50), + define_builtin(hoot_seg5_texture_05002650), + define_builtin(impact_ring_seg6_texture_0601CA50), + define_builtin(impact_ring_seg6_texture_0601DA50), + define_builtin(king_bobomb_seg5_texture_05000078), + define_builtin(king_bobomb_seg5_texture_05001078), + define_builtin(king_bobomb_seg5_texture_05002078), + define_builtin(king_bobomb_seg5_texture_05002878), + define_builtin(king_bobomb_seg5_texture_05004878), + define_builtin(king_bobomb_seg5_texture_05005878), + define_builtin(king_bobomb_seg5_texture_05006078), + define_builtin(king_bobomb_seg5_texture_05006478), + define_builtin(king_bobomb_seg5_texture_05008478), + define_builtin(king_bobomb_seg5_texture_05009478), + define_builtin(klepto_seg5_texture_05000008), + define_builtin(klepto_seg5_texture_05000808), + define_builtin(klepto_seg5_texture_05001008), + define_builtin(klepto_seg5_texture_05002008), + define_builtin(klepto_seg5_texture_05003008), + define_builtin(koopa_seg6_texture_06002648), + define_builtin(koopa_seg6_texture_06002E48), + define_builtin(koopa_seg6_texture_06003648), + define_builtin(koopa_seg6_texture_06003E48), + define_builtin(koopa_seg6_texture_06004648), + define_builtin(koopa_seg6_texture_06004E48), + define_builtin(koopa_seg6_texture_06005648), + define_builtin(koopa_seg6_texture_06005E48), + define_builtin(koopa_flag_seg6_texture_06000048), + define_builtin(koopa_shell_seg8_texture_080274A0), + define_builtin(koopa_shell_seg8_texture_08027CA0), + define_builtin(lakitu_seg6_texture_06000000), + define_builtin(lakitu_seg6_texture_06000800), + define_builtin(lakitu_seg6_texture_06001800), + define_builtin(lakitu_seg6_texture_06002800), + define_builtin(lakitu_seg6_texture_06003000), + define_builtin(lakitu_seg6_texture_06003800), + define_builtin(lakitu_enemy_seg5_texture_0500ECE0), + define_builtin(lakitu_enemy_seg5_texture_0500F4E0), + define_builtin(lakitu_enemy_seg5_texture_050104E0), + define_builtin(lakitu_enemy_seg5_texture_050114E0), + define_builtin(lakitu_enemy_seg5_texture_05011CE0), + define_builtin(leaves_seg3_texture_0301CBE0), + define_builtin(mad_piano_seg5_texture_05006AF0), + define_builtin(mad_piano_seg5_texture_050072F0), + define_builtin(mad_piano_seg5_texture_050076F0), + define_builtin(mad_piano_seg5_texture_05007AF0), + define_builtin(mad_piano_seg5_texture_05007EF0), + define_builtin(mad_piano_seg5_texture_050082F0), + define_builtin(manta_seg5_texture_050017A0), + define_builtin(manta_seg5_texture_05001FA0), + define_builtin(manta_seg5_texture_05002FA0), + define_builtin(manta_seg5_texture_050037A0), + define_builtin(metal_box_seg8_texture_08023998), + define_builtin(mips_seg6_texture_0600FB80), + define_builtin(mist_seg3_texture_03000080), + define_builtin(moneybag_seg6_texture_060039B0), + define_builtin(moneybag_seg6_texture_060049B0), + define_builtin(monty_mole_seg5_texture_05000970), + define_builtin(monty_mole_seg5_texture_05001170), + define_builtin(monty_mole_seg5_texture_05001970), + define_builtin(monty_mole_seg5_texture_05002170), + define_builtin(monty_mole_seg5_texture_05002970), + define_builtin(monty_mole_hole_seg5_texture_05000040), + define_builtin(mr_i_eyeball_seg6_texture_06000080), + define_builtin(mr_i_eyeball_seg6_texture_06001080), + define_builtin(mr_i_iris_seg6_texture_06002170), + define_builtin(mr_i_iris_seg6_texture_06002970), + define_builtin(mr_i_iris_seg6_texture_06003170), + define_builtin(mr_i_iris_seg6_texture_06003970), + define_builtin(mushroom_1up_seg3_texture_03029628), + define_builtin(peach_seg5_texture_05000A28), + define_builtin(peach_seg5_texture_05001228), + define_builtin(peach_seg5_texture_05001A28), + define_builtin(peach_seg5_texture_05002228), + define_builtin(peach_seg5_texture_05002A28), + define_builtin(peach_seg5_texture_05002C28), + define_builtin(peach_seg5_texture_05002E28), + define_builtin(peach_seg5_texture_05003628), + define_builtin(peach_seg5_texture_05003E28), + define_builtin(peach_seg5_texture_05004028), + define_builtin(pebble_seg3_texture_0301C300), + define_builtin(penguin_seg5_texture_05002DE0), + define_builtin(penguin_seg5_texture_050035E0), + define_builtin(penguin_seg5_texture_05003DE0), + define_builtin(penguin_seg5_texture_050045E0), + define_builtin(penguin_seg5_texture_05004DE0), + define_builtin(penguin_seg5_texture_050055E0), + define_builtin(piranha_plant_seg6_texture_060113F8), + define_builtin(piranha_plant_seg6_texture_060123F8), + define_builtin(piranha_plant_seg6_texture_06012BF8), + define_builtin(piranha_plant_seg6_texture_060133F8), + define_builtin(piranha_plant_seg6_texture_06013BF8), + define_builtin(piranha_plant_seg6_texture_060143F8), + define_builtin(pokey_seg5_texture_05011750), + define_builtin(pokey_seg5_texture_05011F50), + define_builtin(pokey_seg5_texture_05012878), + define_builtin(poundable_pole_seg6_texture_06001050), + define_builtin(poundable_pole_seg6_texture_06001850), + define_builtin(texture_power_meter_left_side), + define_builtin(texture_power_meter_right_side), + define_builtin(texture_power_meter_full), + define_builtin(texture_power_meter_seven_segments), + define_builtin(texture_power_meter_six_segments), + define_builtin(texture_power_meter_five_segments), + define_builtin(texture_power_meter_four_segments), + define_builtin(texture_power_meter_three_segments), + define_builtin(texture_power_meter_two_segments), + define_builtin(texture_power_meter_one_segments), + define_builtin(purple_switch_seg8_texture_0800C0A8), + define_builtin(purple_switch_seg8_texture_0800C128), + define_builtin(sand_seg3_texture_0302BAD0), + define_builtin(scuttlebug_seg6_texture_06010108), + define_builtin(scuttlebug_seg6_texture_06010908), + define_builtin(scuttlebug_seg6_texture_06011908), + define_builtin(scuttlebug_seg6_texture_06012908), + define_builtin(scuttlebug_seg6_texture_06013108), + define_builtin(seaweed_seg6_texture_06007E10), + define_builtin(seaweed_seg6_texture_06008610), + define_builtin(seaweed_seg6_texture_06008E10), + define_builtin(seaweed_seg6_texture_06009610), + define_builtin(skeeter_seg6_texture_06000090), + define_builtin(skeeter_seg6_texture_06000890), + define_builtin(smoke_seg5_texture_050072C0), + define_builtin(snowman_seg5_texture_05008C70), + define_builtin(snowman_seg5_texture_05009470), + define_builtin(snowman_seg5_texture_0500A470), + define_builtin(snowman_seg5_texture_0500B470), + define_builtin(snowman_seg5_texture_0500BC70), + define_builtin(snufit_seg6_texture_060070E0), + define_builtin(snufit_seg6_texture_060078E0), + define_builtin(snufit_seg6_texture_060080E0), + define_builtin(snufit_seg6_texture_060084E0), + define_builtin(sparkles_seg4_texture_04027490), + define_builtin(sparkles_seg4_texture_04027C90), + define_builtin(sparkles_seg4_texture_04028490), + define_builtin(sparkles_seg4_texture_04028C90), + define_builtin(sparkles_seg4_texture_04029490), + define_builtin(sparkles_seg4_texture_04029C90), + define_builtin(sparkles_animation_seg4_texture_04032A88), + define_builtin(sparkles_animation_seg4_texture_04033288), + define_builtin(sparkles_animation_seg4_texture_04033A88), + define_builtin(sparkles_animation_seg4_texture_04034288), + define_builtin(sparkles_animation_seg4_texture_04034A88), + define_builtin(spindrift_seg5_texture_050006D0), + define_builtin(spindrift_seg5_texture_05000ED0), + define_builtin(spindrift_seg5_texture_050016D0), + define_builtin(spindrift_seg5_texture_05001ED0), + define_builtin(springboard_seg5_texture_05000018), + define_builtin(springboard_seg5_texture_05000818), + define_builtin(star_seg3_texture_0302A6F0), + define_builtin(star_seg3_texture_0302AEF0), + define_builtin(stomp_smoke_seg4_texture_04022148), + define_builtin(stomp_smoke_seg4_texture_04022948), + define_builtin(stomp_smoke_seg4_texture_04023148), + define_builtin(stomp_smoke_seg4_texture_04023948), + define_builtin(stomp_smoke_seg4_texture_04024148), + define_builtin(stomp_smoke_seg4_texture_04024948), + define_builtin(sushi_seg5_texture_05008ED0), + define_builtin(sushi_seg5_texture_050096D0), + define_builtin(sushi_seg5_texture_05009AD0), + define_builtin(swoop_seg6_texture_06004270), + define_builtin(swoop_seg6_texture_06004A70), + define_builtin(swoop_seg6_texture_06005270), + define_builtin(swoop_seg6_texture_06005A70), + define_builtin(thwomp_seg5_texture_05009900), + define_builtin(thwomp_seg5_texture_0500A900), + define_builtin(toad_seg6_texture_06005920), + define_builtin(toad_seg6_texture_06006120), + define_builtin(tornado_seg5_texture_05013128), + define_builtin(treasure_chest_seg6_texture_06013FA8), + define_builtin(treasure_chest_seg6_texture_060147A8), + define_builtin(treasure_chest_seg6_texture_06014FA8), + define_builtin(treasure_chest_seg6_texture_060157A8), + define_builtin(tree_seg3_texture_0302DE28), + define_builtin(tree_seg3_texture_0302EE28), + define_builtin(tree_seg3_texture_0302FF60), + define_builtin(tree_seg3_texture_03031048), + define_builtin(tree_seg3_texture_03032218), + define_builtin(ukiki_seg5_texture_05007BC0), + define_builtin(ukiki_seg5_texture_05008BC0), + define_builtin(ukiki_seg5_texture_05009BC0), + define_builtin(ukiki_seg5_texture_0500A3C0), + define_builtin(unagi_seg5_texture_0500AF20), + define_builtin(unagi_seg5_texture_0500B720), + define_builtin(unagi_seg5_texture_0500B920), + define_builtin(unagi_seg5_texture_0500C120), + define_builtin(unagi_seg5_texture_0500C320), + define_builtin(unagi_seg5_texture_0500C3A0), + define_builtin(smoke_seg4_texture_0401DEA0), + define_builtin(smoke_seg4_texture_0401E6A0), + define_builtin(smoke_seg4_texture_0401EEA0), + define_builtin(smoke_seg4_texture_0401F6A0), + define_builtin(smoke_seg4_texture_0401FEA0), + define_builtin(smoke_seg4_texture_040206A0), + define_builtin(smoke_seg4_texture_04020EA0), + define_builtin(warp_pipe_seg3_texture_03007E40), + define_builtin(warp_pipe_seg3_texture_03009168), + define_builtin(water_bubble_seg5_texture_0500FE80), + define_builtin(water_mine_seg6_texture_0600A4F8), + define_builtin(water_mine_seg6_texture_0600B4F8), + define_builtin(water_mine_seg6_texture_0600C4F8), + define_builtin(water_ring_seg6_texture_06012380), + define_builtin(water_splash_seg4_texture_0402A5C8), + define_builtin(water_splash_seg4_texture_0402B5C8), + define_builtin(water_splash_seg4_texture_0402C5C8), + define_builtin(water_splash_seg4_texture_0402D5C8), + define_builtin(water_splash_seg4_texture_0402E5C8), + define_builtin(water_splash_seg4_texture_0402F5C8), + define_builtin(water_splash_seg4_texture_040305C8), + define_builtin(water_splash_seg4_texture_040315C8), + define_builtin(water_wave_seg4_texture_04025358), + define_builtin(water_wave_seg4_texture_04025B58), + define_builtin(water_wave_seg4_texture_04026358), + define_builtin(water_wave_seg4_texture_04026B58), + define_builtin(whirlpool_seg5_texture_05012848), + define_builtin(white_particle_texture), + define_builtin(white_particle_small_texture), + define_builtin(whomp_seg6_texture_0601C360), + define_builtin(whomp_seg6_texture_0601D360), + define_builtin(whomp_seg6_texture_0601E360), + define_builtin(whomp_seg6_texture_0601EB60), + define_builtin(wiggler_seg5_texture_05005A30), + define_builtin(wiggler_seg5_texture_05006A30), + define_builtin(wiggler_seg5_texture_05007A30), + define_builtin(wiggler_seg5_texture_05008230), + define_builtin(wiggler_seg5_texture_05008A30), + define_builtin(wiggler_seg5_texture_05009230), + define_builtin(wiggler_seg5_texture_0500A230), + define_builtin(wooden_signpost_seg3_texture_0302C9C8), + define_builtin(wooden_signpost_seg3_texture_0302D1C8), + define_builtin(yellow_sphere_seg6_texture_0601EB88), + define_builtin(yellow_sphere_seg5_texture_05000040), + define_builtin(yoshi_seg5_texture_0501C4A0), + define_builtin(yoshi_seg5_texture_0501C6A0), + define_builtin(yoshi_seg5_texture_0501C8A0), + define_builtin(yoshi_egg_seg5_texture_050057B8), + define_builtin(yoshi_egg_seg5_texture_05005FB8), + define_builtin(yoshi_egg_seg5_texture_050067B8), + define_builtin(yoshi_egg_seg5_texture_05006FB8), + define_builtin(yoshi_egg_seg5_texture_050077B8), + define_builtin(yoshi_egg_seg5_texture_05007FB8), + define_builtin(yoshi_egg_seg5_texture_050087B8), + define_builtin(yoshi_egg_seg5_texture_05008FB8), + define_builtin(bobomb_seg8_texture_0801DA60), + define_builtin(bobomb_seg8_texture_0801EA60), + define_builtin(bobomb_seg8_texture_0801FA60), + define_builtin(bobomb_seg8_texture_08020A60), + define_builtin(bobomb_seg8_texture_08021A60), + define_builtin(bobomb_seg8_texture_08022260), }; const Texture* DynOS_Builtin_Tex_GetFromName(const char* aDataName) { diff --git a/data/dynos_mgr_builtin_externs.h b/data/dynos_mgr_builtin_externs.h new file mode 100644 index 00000000..ae274c07 --- /dev/null +++ b/data/dynos_mgr_builtin_externs.h @@ -0,0 +1,441 @@ +// actor textures +extern ALIGNED8 const Texture amp_seg8_texture_08000F18[]; +extern ALIGNED8 const Texture amp_seg8_texture_08001318[]; +extern ALIGNED8 const Texture amp_seg8_texture_08001B18[]; +extern ALIGNED8 const Texture amp_seg8_texture_08002318[]; +extern ALIGNED8 const Texture blue_coin_switch_seg8_texture_08000018[]; +extern ALIGNED8 const Texture blue_coin_switch_seg8_texture_08000418[]; +extern ALIGNED8 const Texture blue_fish_seg3_texture_0301B5E0[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_0801DA60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_0801EA60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_0801FA60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_08020A60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_08021A60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_08022260[]; +extern ALIGNED8 const Texture bomb_seg6_texture_06057AC0[]; +extern ALIGNED8 const Texture bomb_seg6_texture_06058AC0[]; +extern ALIGNED8 const Texture bomb_seg6_texture_06059AC0[]; +extern ALIGNED8 const Texture boo_seg5_texture_05009B40[]; +extern ALIGNED8 const Texture boo_seg5_texture_0500AB40[]; +extern ALIGNED8 const Texture boo_castle_seg6_texture_06015670[]; +extern ALIGNED8 const Texture boo_castle_seg6_texture_06016670[]; +extern ALIGNED8 const Texture book_seg5_texture_05002570[]; +extern ALIGNED8 const Texture bookend_seg5_texture_05000060[]; +extern ALIGNED8 const Texture bookend_seg5_texture_05000460[]; +extern ALIGNED8 const Texture bookend_seg5_texture_05000860[]; +extern ALIGNED8 const Texture bookend_seg5_texture_05000C60[]; +extern ALIGNED8 const Texture bookend_seg5_texture_05001060[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0601F438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0601FC38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06020C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06021438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06022438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06022C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06023C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06024438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06025438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06025C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06026438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06027438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06028438[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06028C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06029C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0602AC38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0602BC38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0602CC38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0602DC38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0602EC38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_0602FC38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06030C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06031C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06032C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06033C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06034C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06035C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06036C38[]; +extern ALIGNED8 const Texture bowser_seg6_texture_06037C38[]; +extern ALIGNED8 const Texture flame_seg6_texture_06000000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06002000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06004000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06006000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06008000[]; +extern ALIGNED8 const Texture flame_seg6_texture_0600A000[]; +extern ALIGNED8 const Texture flame_seg6_texture_0600C000[]; +extern ALIGNED8 const Texture flame_seg6_texture_0600E000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06010000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06012000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06014000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06016000[]; +extern ALIGNED8 const Texture flame_seg6_texture_06018000[]; +extern ALIGNED8 const Texture flame_seg6_texture_0601A000[]; +extern ALIGNED8 const Texture breakable_box_seg8_texture_08011A90[]; +extern ALIGNED8 const Texture breakable_box_seg8_texture_08012290[]; +extern ALIGNED8 const Texture bub_seg6_texture_0600E2A8[]; +extern ALIGNED8 const Texture bub_seg6_texture_0600EAA8[]; +extern ALIGNED8 const Texture bub_seg6_texture_0600F2A8[]; +extern ALIGNED8 const Texture bub_seg6_texture_060102A8[]; +extern ALIGNED8 const Texture bubba_seg5_texture_05000008[]; +extern ALIGNED8 const Texture bubba_seg5_texture_05000408[]; +extern ALIGNED8 const Texture bubba_seg5_texture_05001408[]; +extern ALIGNED8 const Texture bubba_seg5_texture_05001C08[]; +extern ALIGNED8 const Texture bubba_seg5_texture_05002408[]; +extern ALIGNED8 const Texture bubble_seg4_texture_0401CD60[]; +extern ALIGNED8 const Texture bubble_seg4_texture_0401D560[]; +extern ALIGNED8 const Texture bullet_bill_seg5_texture_0500BAA8[]; +extern ALIGNED8 const Texture bullet_bill_seg5_texture_0500CAA8[]; +extern ALIGNED8 const Texture bully_seg5_texture_050000E0[]; +extern ALIGNED8 const Texture bully_seg5_texture_05000468[]; +extern ALIGNED8 const Texture bully_seg5_texture_05001468[]; +extern ALIGNED8 const Texture bully_seg5_texture_05002468[]; +extern ALIGNED8 const Texture burn_smoke_seg4_texture_04021800[]; +extern ALIGNED8 const Texture butterfly_seg3_texture_030043A8[]; +extern ALIGNED8 const Texture cannon_barrel_seg8_texture_080058A8[]; +extern ALIGNED8 const Texture cannon_base_seg8_texture_080049B8[]; +extern ALIGNED8 const Texture cannon_lid_seg8_texture_08004058[]; +extern ALIGNED8 const Texture capswitch_seg5_texture_05001C48[]; +extern ALIGNED8 const Texture capswitch_seg5_texture_05002C48[]; +extern ALIGNED8 const Texture chain_ball_seg6_texture_06020AE8[]; +extern ALIGNED8 const Texture chain_chomp_seg6_texture_060213D0[]; +extern ALIGNED8 const Texture chain_chomp_seg6_texture_06021BD0[]; +extern ALIGNED8 const Texture chain_chomp_seg6_texture_060223D0[]; +extern ALIGNED8 const Texture chain_chomp_seg6_texture_06022BD0[]; +extern ALIGNED8 const Texture chain_chomp_seg6_texture_060233D0[]; +extern ALIGNED8 const Texture chair_seg5_texture_05003060[]; +extern ALIGNED8 const Texture chair_seg5_texture_05003860[]; +extern ALIGNED8 const Texture chair_seg5_texture_05004060[]; +extern ALIGNED8 const Texture chair_seg5_texture_05004460[]; +extern ALIGNED8 const Texture checkerboard_platform_seg8_texture_0800C840[]; +extern ALIGNED8 const Texture checkerboard_platform_seg8_texture_0800CC40[]; +extern ALIGNED8 const Texture chilly_chief_seg6_texture_06000060[]; +extern ALIGNED8 const Texture chilly_chief_seg6_texture_06001060[]; +extern ALIGNED8 const Texture chilly_chief_seg6_texture_06002060[]; +extern ALIGNED8 const Texture chuckya_seg8_texture_08006778[]; +extern ALIGNED8 const Texture chuckya_seg8_texture_08007778[]; +extern ALIGNED8 const Texture chuckya_seg8_texture_08007F78[]; +extern ALIGNED8 const Texture chuckya_seg8_texture_08008F78[]; +extern ALIGNED8 const Texture clam_shell_seg5_texture_05000030[]; +extern ALIGNED8 const Texture clam_shell_seg5_texture_05000830[]; +extern ALIGNED8 const Texture coin_seg3_texture_03005780[]; +extern ALIGNED8 const Texture coin_seg3_texture_03005F80[]; +extern ALIGNED8 const Texture coin_seg3_texture_03006780[]; +extern ALIGNED8 const Texture coin_seg3_texture_03006F80[]; +extern ALIGNED8 const Texture cyan_fish_seg6_texture_0600D468[]; +extern ALIGNED8 const Texture dirt_seg3_texture_0302BDF8[]; +extern ALIGNED8 const Texture door_seg3_texture_03009D10[]; +extern ALIGNED8 const Texture door_seg3_texture_0300AD10[]; +extern ALIGNED8 const Texture door_seg3_texture_0300BD10[]; +extern ALIGNED8 const Texture door_seg3_texture_0300CD10[]; +extern ALIGNED8 const Texture door_seg3_texture_0300D510[]; +extern ALIGNED8 const Texture door_seg3_texture_0300E510[]; +extern ALIGNED8 const Texture door_seg3_texture_0300ED10[]; +extern ALIGNED8 const Texture door_seg3_texture_0300FD10[]; +extern ALIGNED8 const Texture door_seg3_texture_03010510[]; +extern ALIGNED8 const Texture door_seg3_texture_03011510[]; +extern ALIGNED8 const Texture door_seg3_texture_03011D10[]; +extern ALIGNED8 const Texture door_seg3_texture_03012510[]; +extern ALIGNED8 const Texture door_seg3_texture_03012D10[]; +extern ALIGNED8 const Texture door_seg3_texture_03013510[]; +extern ALIGNED8 const Texture dorrie_seg6_texture_06009BA0[]; +extern ALIGNED8 const Texture dorrie_seg6_texture_06009DA0[]; +extern ALIGNED8 const Texture dorrie_seg6_texture_0600ADA0[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08012E28[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08013628[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08014628[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08014E28[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08015E28[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08016628[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08017628[]; +extern ALIGNED8 const Texture exclamation_box_seg8_texture_08017E28[]; +extern ALIGNED8 const Texture exclamation_box_outline_seg8_texture_08025168[]; +extern ALIGNED8 const Texture exclamation_box_outline_seg8_texture_08025A80[]; +extern ALIGNED8 const Texture explosion_seg3_texture_03000A08[]; +extern ALIGNED8 const Texture explosion_seg3_texture_03001208[]; +extern ALIGNED8 const Texture explosion_seg3_texture_03001A08[]; +extern ALIGNED8 const Texture explosion_seg3_texture_03002208[]; +extern ALIGNED8 const Texture explosion_seg3_texture_03002A08[]; +extern ALIGNED8 const Texture explosion_seg3_texture_03003208[]; +extern ALIGNED8 const Texture explosion_seg3_texture_03003A08[]; +extern ALIGNED8 const Texture eyerok_seg5_texture_05008D40[]; +extern ALIGNED8 const Texture eyerok_seg5_texture_05009540[]; +extern ALIGNED8 const Texture eyerok_seg5_texture_05009D40[]; +extern ALIGNED8 const Texture eyerok_seg5_texture_0500A540[]; +extern ALIGNED8 const Texture eyerok_seg5_texture_0500AD40[]; +extern ALIGNED8 const Texture flame_seg3_texture_03017320[]; +extern ALIGNED8 const Texture flame_seg3_texture_03017B20[]; +extern ALIGNED8 const Texture flame_seg3_texture_03018320[]; +extern ALIGNED8 const Texture flame_seg3_texture_03018B20[]; +extern ALIGNED8 const Texture flame_seg3_texture_03019320[]; +extern ALIGNED8 const Texture flame_seg3_texture_03019B20[]; +extern ALIGNED8 const Texture flame_seg3_texture_0301A320[]; +extern ALIGNED8 const Texture flame_seg3_texture_0301AB20[]; +extern ALIGNED8 const Texture flyguy_seg8_texture_0800E088[]; +extern ALIGNED8 const Texture flyguy_seg8_texture_0800F088[]; +extern ALIGNED8 const Texture flyguy_seg8_texture_0800F888[]; +extern ALIGNED8 const Texture fwoosh_seg5_texture_05015808[]; +extern ALIGNED8 const Texture goomba_seg8_texture_08019530[]; +extern ALIGNED8 const Texture goomba_seg8_texture_08019D30[]; +extern ALIGNED8 const Texture goomba_seg8_texture_0801A530[]; +extern ALIGNED8 const Texture haunted_cage_seg5_texture_0500C288[]; +extern ALIGNED8 const Texture haunted_cage_seg5_texture_0500CA88[]; +extern ALIGNED8 const Texture haunted_cage_seg5_texture_0500D288[]; +extern ALIGNED8 const Texture haunted_cage_seg5_texture_0500D688[]; +extern ALIGNED8 const Texture haunted_cage_seg5_texture_0500DA88[]; +extern ALIGNED8 const Texture haunted_cage_seg5_texture_0500E288[]; +extern ALIGNED8 const Texture heart_seg8_texture_0800D7E0[]; +extern ALIGNED8 const Texture heave_ho_seg5_texture_0500E9C8[]; +extern ALIGNED8 const Texture heave_ho_seg5_texture_0500F1C8[]; +extern ALIGNED8 const Texture heave_ho_seg5_texture_0500F9C8[]; +extern ALIGNED8 const Texture heave_ho_seg5_texture_050109C8[]; +extern ALIGNED8 const Texture heave_ho_seg5_texture_050111C8[]; +extern ALIGNED8 const Texture heave_ho_seg5_texture_050113C8[]; +extern ALIGNED8 const Texture hoot_seg5_texture_05000A20[]; +extern ALIGNED8 const Texture hoot_seg5_texture_05001E50[]; +extern ALIGNED8 const Texture hoot_seg5_texture_05002650[]; +extern ALIGNED8 const Texture impact_ring_seg6_texture_0601CA50[]; +extern ALIGNED8 const Texture impact_ring_seg6_texture_0601DA50[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05000078[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05001078[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05002078[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05002878[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05004878[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05005878[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05006078[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05006478[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05008478[]; +extern ALIGNED8 const Texture king_bobomb_seg5_texture_05009478[]; +extern ALIGNED8 const Texture klepto_seg5_texture_05000008[]; +extern ALIGNED8 const Texture klepto_seg5_texture_05000808[]; +extern ALIGNED8 const Texture klepto_seg5_texture_05001008[]; +extern ALIGNED8 const Texture klepto_seg5_texture_05002008[]; +extern ALIGNED8 const Texture klepto_seg5_texture_05003008[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06002648[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06002E48[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06003648[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06003E48[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06004648[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06004E48[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06005648[]; +extern ALIGNED8 const Texture koopa_seg6_texture_06005E48[]; +extern ALIGNED8 const Texture koopa_flag_seg6_texture_06000048[]; +extern ALIGNED8 const Texture koopa_shell_seg8_texture_080274A0[]; +extern ALIGNED8 const Texture koopa_shell_seg8_texture_08027CA0[]; +extern ALIGNED8 const Texture lakitu_seg6_texture_06000000[]; +extern ALIGNED8 const Texture lakitu_seg6_texture_06000800[]; +extern ALIGNED8 const Texture lakitu_seg6_texture_06001800[]; +extern ALIGNED8 const Texture lakitu_seg6_texture_06002800[]; +extern ALIGNED8 const Texture lakitu_seg6_texture_06003000[]; +extern ALIGNED8 const Texture lakitu_seg6_texture_06003800[]; +extern ALIGNED8 const Texture lakitu_enemy_seg5_texture_0500ECE0[]; +extern ALIGNED8 const Texture lakitu_enemy_seg5_texture_0500F4E0[]; +extern ALIGNED8 const Texture lakitu_enemy_seg5_texture_050104E0[]; +extern ALIGNED8 const Texture lakitu_enemy_seg5_texture_050114E0[]; +extern ALIGNED8 const Texture lakitu_enemy_seg5_texture_05011CE0[]; +extern ALIGNED8 const Texture leaves_seg3_texture_0301CBE0[]; +extern ALIGNED8 const Texture mad_piano_seg5_texture_05006AF0[]; +extern ALIGNED8 const Texture mad_piano_seg5_texture_050072F0[]; +extern ALIGNED8 const Texture mad_piano_seg5_texture_050076F0[]; +extern ALIGNED8 const Texture mad_piano_seg5_texture_05007AF0[]; +extern ALIGNED8 const Texture mad_piano_seg5_texture_05007EF0[]; +extern ALIGNED8 const Texture mad_piano_seg5_texture_050082F0[]; +extern ALIGNED8 const Texture manta_seg5_texture_050017A0[]; +extern ALIGNED8 const Texture manta_seg5_texture_05001FA0[]; +extern ALIGNED8 const Texture manta_seg5_texture_05002FA0[]; +extern ALIGNED8 const Texture manta_seg5_texture_050037A0[]; +extern ALIGNED8 const Texture metal_box_seg8_texture_08023998[]; +extern ALIGNED8 const Texture mips_seg6_texture_0600FB80[]; +extern ALIGNED8 const Texture mist_seg3_texture_03000080[]; +extern ALIGNED8 const Texture moneybag_seg6_texture_060039B0[]; +extern ALIGNED8 const Texture moneybag_seg6_texture_060049B0[]; +extern ALIGNED8 const Texture monty_mole_seg5_texture_05000970[]; +extern ALIGNED8 const Texture monty_mole_seg5_texture_05001170[]; +extern ALIGNED8 const Texture monty_mole_seg5_texture_05001970[]; +extern ALIGNED8 const Texture monty_mole_seg5_texture_05002170[]; +extern ALIGNED8 const Texture monty_mole_seg5_texture_05002970[]; +extern ALIGNED8 const Texture monty_mole_hole_seg5_texture_05000040[]; +extern ALIGNED8 const Texture mr_i_eyeball_seg6_texture_06000080[]; +extern ALIGNED8 const Texture mr_i_eyeball_seg6_texture_06001080[]; +extern ALIGNED8 const Texture mr_i_iris_seg6_texture_06002170[]; +extern ALIGNED8 const Texture mr_i_iris_seg6_texture_06002970[]; +extern ALIGNED8 const Texture mr_i_iris_seg6_texture_06003170[]; +extern ALIGNED8 const Texture mr_i_iris_seg6_texture_06003970[]; +extern ALIGNED8 const Texture mushroom_1up_seg3_texture_03029628[]; +extern ALIGNED8 const Texture peach_seg5_texture_05000A28[]; +extern ALIGNED8 const Texture peach_seg5_texture_05001228[]; +extern ALIGNED8 const Texture peach_seg5_texture_05001A28[]; +extern ALIGNED8 const Texture peach_seg5_texture_05002228[]; +extern ALIGNED8 const Texture peach_seg5_texture_05002A28[]; +extern ALIGNED8 const Texture peach_seg5_texture_05002C28[]; +extern ALIGNED8 const Texture peach_seg5_texture_05002E28[]; +extern ALIGNED8 const Texture peach_seg5_texture_05003628[]; +extern ALIGNED8 const Texture peach_seg5_texture_05003E28[]; +extern ALIGNED8 const Texture peach_seg5_texture_05004028[]; +extern ALIGNED8 const Texture pebble_seg3_texture_0301C300[]; +extern ALIGNED8 const Texture penguin_seg5_texture_05002DE0[]; +extern ALIGNED8 const Texture penguin_seg5_texture_050035E0[]; +extern ALIGNED8 const Texture penguin_seg5_texture_05003DE0[]; +extern ALIGNED8 const Texture penguin_seg5_texture_050045E0[]; +extern ALIGNED8 const Texture penguin_seg5_texture_05004DE0[]; +extern ALIGNED8 const Texture penguin_seg5_texture_050055E0[]; +extern ALIGNED8 const Texture piranha_plant_seg6_texture_060113F8[]; +extern ALIGNED8 const Texture piranha_plant_seg6_texture_060123F8[]; +extern ALIGNED8 const Texture piranha_plant_seg6_texture_06012BF8[]; +extern ALIGNED8 const Texture piranha_plant_seg6_texture_060133F8[]; +extern ALIGNED8 const Texture piranha_plant_seg6_texture_06013BF8[]; +extern ALIGNED8 const Texture piranha_plant_seg6_texture_060143F8[]; +extern ALIGNED8 const Texture pokey_seg5_texture_05011750[]; +extern ALIGNED8 const Texture pokey_seg5_texture_05011F50[]; +extern ALIGNED8 const Texture pokey_seg5_texture_05012878[]; +extern ALIGNED8 const Texture poundable_pole_seg6_texture_06001050[]; +extern ALIGNED8 const Texture poundable_pole_seg6_texture_06001850[]; +extern ALIGNED8 const Texture texture_power_meter_left_side[]; +extern ALIGNED8 const Texture texture_power_meter_right_side[]; +extern ALIGNED8 const Texture texture_power_meter_full[]; +extern ALIGNED8 const Texture texture_power_meter_seven_segments[]; +extern ALIGNED8 const Texture texture_power_meter_six_segments[]; +extern ALIGNED8 const Texture texture_power_meter_five_segments[]; +extern ALIGNED8 const Texture texture_power_meter_four_segments[]; +extern ALIGNED8 const Texture texture_power_meter_three_segments[]; +extern ALIGNED8 const Texture texture_power_meter_two_segments[]; +extern ALIGNED8 const Texture texture_power_meter_one_segments[]; +extern ALIGNED8 const Texture purple_switch_seg8_texture_0800C0A8[]; +extern ALIGNED8 const Texture purple_switch_seg8_texture_0800C128[]; +extern ALIGNED8 const Texture sand_seg3_texture_0302BAD0[]; +extern ALIGNED8 const Texture scuttlebug_seg6_texture_06010108[]; +extern ALIGNED8 const Texture scuttlebug_seg6_texture_06010908[]; +extern ALIGNED8 const Texture scuttlebug_seg6_texture_06011908[]; +extern ALIGNED8 const Texture scuttlebug_seg6_texture_06012908[]; +extern ALIGNED8 const Texture scuttlebug_seg6_texture_06013108[]; +extern ALIGNED8 const Texture seaweed_seg6_texture_06007E10[]; +extern ALIGNED8 const Texture seaweed_seg6_texture_06008610[]; +extern ALIGNED8 const Texture seaweed_seg6_texture_06008E10[]; +extern ALIGNED8 const Texture seaweed_seg6_texture_06009610[]; +extern ALIGNED8 const Texture skeeter_seg6_texture_06000090[]; +extern ALIGNED8 const Texture skeeter_seg6_texture_06000890[]; +extern ALIGNED8 const Texture smoke_seg5_texture_050072C0[]; +extern ALIGNED8 const Texture snowman_seg5_texture_05008C70[]; +extern ALIGNED8 const Texture snowman_seg5_texture_05009470[]; +extern ALIGNED8 const Texture snowman_seg5_texture_0500A470[]; +extern ALIGNED8 const Texture snowman_seg5_texture_0500B470[]; +extern ALIGNED8 const Texture snowman_seg5_texture_0500BC70[]; +extern ALIGNED8 const Texture snufit_seg6_texture_060070E0[]; +extern ALIGNED8 const Texture snufit_seg6_texture_060078E0[]; +extern ALIGNED8 const Texture snufit_seg6_texture_060080E0[]; +extern ALIGNED8 const Texture snufit_seg6_texture_060084E0[]; +extern ALIGNED8 const Texture sparkles_seg4_texture_04027490[]; +extern ALIGNED8 const Texture sparkles_seg4_texture_04027C90[]; +extern ALIGNED8 const Texture sparkles_seg4_texture_04028490[]; +extern ALIGNED8 const Texture sparkles_seg4_texture_04028C90[]; +extern ALIGNED8 const Texture sparkles_seg4_texture_04029490[]; +extern ALIGNED8 const Texture sparkles_seg4_texture_04029C90[]; +extern ALIGNED8 const Texture sparkles_animation_seg4_texture_04032A88[]; +extern ALIGNED8 const Texture sparkles_animation_seg4_texture_04033288[]; +extern ALIGNED8 const Texture sparkles_animation_seg4_texture_04033A88[]; +extern ALIGNED8 const Texture sparkles_animation_seg4_texture_04034288[]; +extern ALIGNED8 const Texture sparkles_animation_seg4_texture_04034A88[]; +extern ALIGNED8 const Texture spindrift_seg5_texture_050006D0[]; +extern ALIGNED8 const Texture spindrift_seg5_texture_05000ED0[]; +extern ALIGNED8 const Texture spindrift_seg5_texture_050016D0[]; +extern ALIGNED8 const Texture spindrift_seg5_texture_05001ED0[]; +extern ALIGNED8 const Texture springboard_seg5_texture_05000018[]; +extern ALIGNED8 const Texture springboard_seg5_texture_05000818[]; +extern ALIGNED8 const Texture star_seg3_texture_0302A6F0[]; +extern ALIGNED8 const Texture star_seg3_texture_0302AEF0[]; +extern ALIGNED8 const Texture stomp_smoke_seg4_texture_04022148[]; +extern ALIGNED8 const Texture stomp_smoke_seg4_texture_04022948[]; +extern ALIGNED8 const Texture stomp_smoke_seg4_texture_04023148[]; +extern ALIGNED8 const Texture stomp_smoke_seg4_texture_04023948[]; +extern ALIGNED8 const Texture stomp_smoke_seg4_texture_04024148[]; +extern ALIGNED8 const Texture stomp_smoke_seg4_texture_04024948[]; +extern ALIGNED8 const Texture sushi_seg5_texture_05008ED0[]; +extern ALIGNED8 const Texture sushi_seg5_texture_050096D0[]; +extern ALIGNED8 const Texture sushi_seg5_texture_05009AD0[]; +extern ALIGNED8 const Texture swoop_seg6_texture_06004270[]; +extern ALIGNED8 const Texture swoop_seg6_texture_06004A70[]; +extern ALIGNED8 const Texture swoop_seg6_texture_06005270[]; +extern ALIGNED8 const Texture swoop_seg6_texture_06005A70[]; +extern ALIGNED8 const Texture thwomp_seg5_texture_05009900[]; +extern ALIGNED8 const Texture thwomp_seg5_texture_0500A900[]; +extern ALIGNED8 const Texture toad_seg6_texture_06005920[]; +extern ALIGNED8 const Texture toad_seg6_texture_06006120[]; +extern ALIGNED8 const Texture tornado_seg5_texture_05013128[]; +extern ALIGNED8 const Texture treasure_chest_seg6_texture_06013FA8[]; +extern ALIGNED8 const Texture treasure_chest_seg6_texture_060147A8[]; +extern ALIGNED8 const Texture treasure_chest_seg6_texture_06014FA8[]; +extern ALIGNED8 const Texture treasure_chest_seg6_texture_060157A8[]; +extern ALIGNED8 const Texture tree_seg3_texture_0302DE28[]; +extern ALIGNED8 const Texture tree_seg3_texture_0302EE28[]; +extern ALIGNED8 const Texture tree_seg3_texture_0302FF60[]; +extern ALIGNED8 const Texture tree_seg3_texture_03031048[]; +extern ALIGNED8 const Texture tree_seg3_texture_03032218[]; +extern ALIGNED8 const Texture ukiki_seg5_texture_05007BC0[]; +extern ALIGNED8 const Texture ukiki_seg5_texture_05008BC0[]; +extern ALIGNED8 const Texture ukiki_seg5_texture_05009BC0[]; +extern ALIGNED8 const Texture ukiki_seg5_texture_0500A3C0[]; +extern ALIGNED8 const Texture unagi_seg5_texture_0500AF20[]; +extern ALIGNED8 const Texture unagi_seg5_texture_0500B720[]; +extern ALIGNED8 const Texture unagi_seg5_texture_0500B920[]; +extern ALIGNED8 const Texture unagi_seg5_texture_0500C120[]; +extern ALIGNED8 const Texture unagi_seg5_texture_0500C320[]; +extern ALIGNED8 const Texture unagi_seg5_texture_0500C3A0[]; +extern ALIGNED8 const Texture smoke_seg4_texture_0401DEA0[]; +extern ALIGNED8 const Texture smoke_seg4_texture_0401E6A0[]; +extern ALIGNED8 const Texture smoke_seg4_texture_0401EEA0[]; +extern ALIGNED8 const Texture smoke_seg4_texture_0401F6A0[]; +extern ALIGNED8 const Texture smoke_seg4_texture_0401FEA0[]; +extern ALIGNED8 const Texture smoke_seg4_texture_040206A0[]; +extern ALIGNED8 const Texture smoke_seg4_texture_04020EA0[]; +extern ALIGNED8 const Texture warp_pipe_seg3_texture_03007E40[]; +extern ALIGNED8 const Texture warp_pipe_seg3_texture_03009168[]; +extern ALIGNED8 const Texture water_bubble_seg5_texture_0500FE80[]; +extern ALIGNED8 const Texture water_mine_seg6_texture_0600A4F8[]; +extern ALIGNED8 const Texture water_mine_seg6_texture_0600B4F8[]; +extern ALIGNED8 const Texture water_mine_seg6_texture_0600C4F8[]; +extern ALIGNED8 const Texture water_ring_seg6_texture_06012380[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_0402A5C8[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_0402B5C8[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_0402C5C8[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_0402D5C8[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_0402E5C8[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_0402F5C8[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_040305C8[]; +extern ALIGNED8 const Texture water_splash_seg4_texture_040315C8[]; +extern ALIGNED8 const Texture water_wave_seg4_texture_04025358[]; +extern ALIGNED8 const Texture water_wave_seg4_texture_04025B58[]; +extern ALIGNED8 const Texture water_wave_seg4_texture_04026358[]; +extern ALIGNED8 const Texture water_wave_seg4_texture_04026B58[]; +extern ALIGNED8 const Texture whirlpool_seg5_texture_05012848[]; +extern ALIGNED8 const Texture white_particle_texture[]; +extern ALIGNED8 const Texture white_particle_small_texture[]; +extern ALIGNED8 const Texture whomp_seg6_texture_0601C360[]; +extern ALIGNED8 const Texture whomp_seg6_texture_0601D360[]; +extern ALIGNED8 const Texture whomp_seg6_texture_0601E360[]; +extern ALIGNED8 const Texture whomp_seg6_texture_0601EB60[]; +extern ALIGNED8 const Texture wiggler_seg5_texture_05005A30[]; +extern ALIGNED8 const Texture wiggler_seg5_texture_05006A30[]; +extern ALIGNED8 const Texture wiggler_seg5_texture_05007A30[]; +extern ALIGNED8 const Texture wiggler_seg5_texture_05008230[]; +extern ALIGNED8 const Texture wiggler_seg5_texture_05008A30[]; +extern ALIGNED8 const Texture wiggler_seg5_texture_05009230[]; +extern ALIGNED8 const Texture wiggler_seg5_texture_0500A230[]; +extern ALIGNED8 const Texture wooden_signpost_seg3_texture_0302C9C8[]; +extern ALIGNED8 const Texture wooden_signpost_seg3_texture_0302D1C8[]; +extern ALIGNED8 const Texture yellow_sphere_seg6_texture_0601EB88[]; +extern ALIGNED8 const Texture yellow_sphere_seg5_texture_05000040[]; +extern ALIGNED8 const Texture yoshi_seg5_texture_0501C4A0[]; +extern ALIGNED8 const Texture yoshi_seg5_texture_0501C6A0[]; +extern ALIGNED8 const Texture yoshi_seg5_texture_0501C8A0[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_050057B8[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_05005FB8[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_050067B8[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_05006FB8[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_050077B8[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_05007FB8[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_050087B8[]; +extern ALIGNED8 const Texture yoshi_egg_seg5_texture_05008FB8[]; +extern ALIGNED8 const Texture custom_box_texture[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_0801DA60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_0801EA60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_0801FA60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_08020A60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_08021A60[]; +extern ALIGNED8 const Texture bobomb_seg8_texture_08022260[]; diff --git a/src/game/segment2.h b/src/game/segment2.h index 48066525..87e601f4 100644 --- a/src/game/segment2.h +++ b/src/game/segment2.h @@ -28,6 +28,7 @@ extern Gfx dl_screen_transition_end[]; extern Gfx dl_transition_draw_filled_region[]; extern Gfx dl_shadow_circle[]; extern Gfx dl_shadow_square[]; +extern Gfx dl_shadow_spike_ext[]; extern Gfx dl_shadow_9_verts[]; extern Gfx dl_shadow_4_verts[]; extern Gfx dl_shadow_end[]; diff --git a/src/game/shadow.c b/src/game/shadow.c index 897c54e6..12da7b59 100644 --- a/src/game/shadow.c +++ b/src/game/shadow.c @@ -72,6 +72,11 @@ struct Shadow { */ #define SHADOW_SHAPE_SQUARE 20 +/** + * Constant to indicate spike + */ +#define SHADOW_SHAPE_SPIKE_EXT 30 + /** * Constant to indicate a shadow consists of 9 vertices. */ @@ -471,7 +476,11 @@ void add_shadow_to_display_list(Gfx *displayListHead, Vtx *verts, s8 shadowVerte gSPDisplayList(displayListHead++, dl_shadow_circle); break; case SHADOW_SHAPE_SQUARE: - gSPDisplayList(displayListHead++, dl_shadow_square) break; + gSPDisplayList(displayListHead++, dl_shadow_square); + break; + case SHADOW_SHAPE_SPIKE_EXT: + gSPDisplayList(displayListHead++, dl_shadow_spike_ext); + break; } switch (shadowVertexType) { case SHADOW_WITH_9_VERTS: @@ -716,6 +725,33 @@ Gfx *create_shadow_circle_assuming_flat_ground(f32 xPos, f32 yPos, f32 zPos, s16 return displayList; } +/** + * Create a spike shadow composed of 4 vertices. + */ +Gfx *create_shadow_spike_ext(f32 xPos, f32 yPos, f32 zPos, s16 shadowScale, u8 solidity) { + Vtx *verts; + Gfx *displayList; + struct Shadow shadow; + s32 i; + + if (init_shadow(&shadow, xPos, yPos, zPos, shadowScale, solidity) != 0) { + return NULL; + } + + verts = alloc_display_list(4 * sizeof(Vtx)); + displayList = alloc_display_list(5 * sizeof(Gfx)); + + if (verts == NULL || displayList == NULL) { + return 0; + } + + for (i = 0; i < 4; i++) { + make_shadow_vertex(verts, i, shadow, SHADOW_WITH_4_VERTS); + } + add_shadow_to_display_list(displayList, verts, SHADOW_WITH_4_VERTS, SHADOW_SHAPE_SPIKE_EXT); + return displayList; +} + /** * Create a rectangular shadow composed of 4 vertices. This assumes the ground * underneath the shadow is totally flat. @@ -863,6 +899,9 @@ Gfx *create_shadow_below_xyz(f32 xPos, f32 yPos, f32 zPos, s16 shadowScale, u8 s displayList = create_shadow_circle_assuming_flat_ground(xPos, yPos, zPos, shadowScale, shadowSolidity); break; + case SHADOW_SPIKE_EXT: + displayList = create_shadow_spike_ext(xPos, yPos, zPos, shadowScale, shadowSolidity); + break; case SHADOW_SQUARE_PERMANENT: displayList = create_shadow_square(xPos, yPos, zPos, shadowScale, shadowSolidity, shadowType); diff --git a/src/game/shadow.h b/src/game/shadow.h index 36b3ef06..31d674c6 100644 --- a/src/game/shadow.h +++ b/src/game/shadow.h @@ -13,6 +13,7 @@ enum ShadowType SHADOW_CIRCLE_9_VERTS = 0, SHADOW_CIRCLE_4_VERTS = 1, SHADOW_CIRCLE_4_VERTS_FLAT_UNUSED = 2, + SHADOW_SPIKE_EXT = 3, SHADOW_SQUARE_PERMANENT = 10, SHADOW_SQUARE_SCALABLE = 11, SHADOW_SQUARE_TOGGLABLE = 12, diff --git a/textures/segment2/shadow_spike_custom.ia8.png b/textures/segment2/shadow_spike_custom.ia8.png new file mode 100644 index 00000000..1972b5fa Binary files /dev/null and b/textures/segment2/shadow_spike_custom.ia8.png differ