diff --git a/actors/common1.c b/actors/common1.c index 3f645ab3..b71eb8cc 100644 --- a/actors/common1.c +++ b/actors/common1.c @@ -31,6 +31,11 @@ UNUSED static const u64 binid_7 = 7; #include "blue_fish/anims/table.inc.c" UNUSED static const u64 binid_8 = 8; +#include "bub/model.inc.c" +#include "bub/anims/data.inc.c" +#include "bub/anims/table.inc.c" +UNUSED static const u64 binid_9 = 9; + #include "leaves/model.inc.c" UNUSED static const u64 binid_10 = 10; diff --git a/actors/common1.h b/actors/common1.h index 30abf504..a453f4d7 100644 --- a/actors/common1.h +++ b/actors/common1.h @@ -4,6 +4,22 @@ #include "types.h" #include "headers.h" +// bub +extern const GeoLayout bub_geo[]; +extern const Gfx bub_seg6_dl_06011848[]; +extern const Gfx bub_seg6_dl_060118C0[]; +extern const Gfx bub_seg6_dl_06011918[]; +extern const Gfx bub_seg6_dl_06011968[]; +extern const Gfx bub_seg6_dl_06011A50[]; +extern const Gfx bub_seg6_dl_06011B28[]; +extern const Gfx bub_seg6_dl_06011C58[]; +extern const Gfx bub_seg6_dl_06011CF0[]; +extern const Gfx bub_seg6_dl_06011DC0[]; +extern const Gfx bub_seg6_dl_06011E48[]; +extern const Gfx bub_seg6_dl_06011F18[]; +extern const Gfx bub_seg6_dl_06011FA0[]; +extern const struct Animation *const bub_seg6_anims_06012354[]; + // blue_fish extern const GeoLayout fish_shadow_geo[]; extern const GeoLayout fish_geo[]; diff --git a/actors/common1_geo.c b/actors/common1_geo.c index 0116f8de..6f90e21c 100644 --- a/actors/common1_geo.c +++ b/actors/common1_geo.c @@ -13,6 +13,7 @@ #include "warp_pipe/geo.inc.c" #include "door/door.hms" #include "flame/geo.inc.c" +#include "bub/geo.inc.c" #include "blue_fish/geo.inc.c" #include "leaves/geo.inc.c" #include "number/geo.inc.c" diff --git a/actors/group13.c b/actors/group13.c index 2e018f4f..2b612934 100644 --- a/actors/group13.c +++ b/actors/group13.c @@ -15,11 +15,6 @@ UNUSED static const u64 binid_0 = 0; #include "cyan_fish/anims/table.inc.c" UNUSED static const u64 binid_1 = 1; -#include "bub/model.inc.c" -#include "bub/anims/data.inc.c" -#include "bub/anims/table.inc.c" -UNUSED static const u64 binid_2 = 2; - #include "water_ring/model.inc.c" #include "water_ring/anims/data.inc.c" #include "water_ring/anims/table.inc.c" diff --git a/actors/group13.h b/actors/group13.h index 3e850722..80da2cd4 100644 --- a/actors/group13.h +++ b/actors/group13.h @@ -4,22 +4,6 @@ #include "types.h" #include "headers.h" -// bub -extern const GeoLayout bub_geo[]; -extern const Gfx bub_seg6_dl_06011848[]; -extern const Gfx bub_seg6_dl_060118C0[]; -extern const Gfx bub_seg6_dl_06011918[]; -extern const Gfx bub_seg6_dl_06011968[]; -extern const Gfx bub_seg6_dl_06011A50[]; -extern const Gfx bub_seg6_dl_06011B28[]; -extern const Gfx bub_seg6_dl_06011C58[]; -extern const Gfx bub_seg6_dl_06011CF0[]; -extern const Gfx bub_seg6_dl_06011DC0[]; -extern const Gfx bub_seg6_dl_06011E48[]; -extern const Gfx bub_seg6_dl_06011F18[]; -extern const Gfx bub_seg6_dl_06011FA0[]; -extern const struct Animation *const bub_seg6_anims_06012354[]; - // cyan_fish extern const GeoLayout cyan_fish_geo[]; extern const Gfx cyan_fish_seg6_dl_0600DD20[]; diff --git a/actors/group13_geo.c b/actors/group13_geo.c index 37acf29a..67da830f 100644 --- a/actors/group13_geo.c +++ b/actors/group13_geo.c @@ -10,6 +10,5 @@ #include "water_mine/geo.inc.c" #include "cyan_fish/geo.inc.c" -#include "bub/geo.inc.c" #include "water_ring/geo.inc.c" #include "treasure_chest/geo.inc.c" diff --git a/actors/impact_smoke/geo.inc.c b/actors/impact_smoke/geo.inc.c index b5c5ef42..4da7129a 100644 --- a/actors/impact_smoke/geo.inc.c +++ b/actors/impact_smoke/geo.inc.c @@ -1,12 +1,14 @@ // 0x0D000BB8 / 0BFC const GeoLayout bowser_impact_smoke_geo[] = { - GEO_SWITCH_CASE(5, geo_switch_anim_state), + GEO_NODE_START(), GEO_OPEN_NODE(), + GEO_SWITCH_CASE(5, geo_switch_anim_state) GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062B38), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062BD8), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062C78), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062D18), GEO_DISPLAY_LIST(LAYER_TRANSPARENT, impact_smoke_seg6_dl_06062BD8), + GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_END(), }; diff --git a/actors/walk_smoke/walk_smoke_1.ia16.png b/actors/walk_smoke/walk_smoke_1.ia16.png index 5d695934..9bc19b7d 100644 Binary files a/actors/walk_smoke/walk_smoke_1.ia16.png and b/actors/walk_smoke/walk_smoke_1.ia16.png differ diff --git a/actors/whomp/wallman.sou b/actors/whomp/wallman.sou index 7794208b..f0c20809 100644 --- a/actors/whomp/wallman.sou +++ b/actors/whomp/wallman.sou @@ -2,7 +2,7 @@ /* shape data wallman_base_data (skeleton & animation) */ /**************************************************************/ -#define SCALE 0.25 +#define SCALE 0.24 #define ShapeColor_wallman(R,G,B) {{R*SCALE ,G*SCALE ,B*SCALE ,0 ,R*SCALE ,G*SCALE ,B*SCALE ,0 },{ R, G, B, 0, R, G, B, 0, LIGHT_X, LIGHT_Y, LIGHT_Z, 0} } diff --git a/assets/anims/anim_0D.inc.c b/assets/anims/anim_0D.inc.c index efb1b042..da81bc22 100644 --- a/assets/anims/anim_0D.inc.c +++ b/assets/anims/anim_0D.inc.c @@ -1,9 +1,9 @@ static const struct Animation anim_0D[] = { - 0, - 0, - 0, + 0, + 0, + 0, 1, - 119, + 156, ANIMINDEX_NUMPARTS(anim_0D_indices), anim_0D_values, anim_0D_indices, @@ -13,66 +13,467 @@ static const struct Animation anim_0D[] = { static const u16 anim_0D_indices[] = { 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0002, 0x0001, 0x0003, 0x0001, 0x0004, 0x0001, 0x0005, 0x0001, 0x0006, 0x0001, 0x0007, 0x0001, 0x0008, - 0x0001, 0x0009, 0x0001, 0x000A, 0x0001, 0x000B, 0x0078, 0x000C, 0x0078, - 0x0084, 0x0078, 0x00FC, 0x0001, 0x0174, 0x0001, 0x0175, 0x0001, 0x0176, - 0x0001, 0x0177, 0x0001, 0x0178, 0x0001, 0x0179, 0x0001, 0x017A, 0x0001, - 0x017B, 0x0001, 0x017C, 0x0001, 0x017D, 0x0001, 0x017E, 0x0001, 0x017F, - 0x0001, 0x0180, 0x0001, 0x0181, 0x0001, 0x0182, 0x0001, 0x0183, 0x0001, - 0x0184, 0x0001, 0x0185, 0x0001, 0x0186, 0x0001, 0x0187, 0x0001, 0x0188, - 0x0001, 0x0189, 0x0001, 0x018A, 0x0001, 0x018B, 0x0001, 0x018C, 0x0001, - 0x018D, 0x0001, 0x018E, 0x0001, 0x018F, 0x0001, 0x0190, 0x0001, 0x0191, - 0x0001, 0x0192, 0x0001, 0x0193, 0x0001, 0x0194, 0x0001, 0x0195, 0x0001, - 0x0196, 0x0001, 0x0197, 0x0001, 0x0198, 0x0001, 0x0199, 0x0001, 0x019A, - 0x0001, 0x019B, 0x0001, 0x019C, 0x0001, 0x019D, 0x0001, 0x019E, 0x0001, - 0x019F, 0x0001, 0x01A0, 0x0001, 0x01A1, 0x0001, 0x01A2, 0x0001, 0x01A3, + 0x0096, 0x0009, 0x0096, 0x009F, 0x0096, 0x0135, 0x009C, 0x01CB, 0x009C, + 0x0267, 0x009C, 0x0303, 0x0001, 0x039F, 0x0001, 0x03A0, 0x0001, 0x03A1, + 0x008D, 0x03A2, 0x008D, 0x042F, 0x008D, 0x04BC, 0x0094, 0x0549, 0x0091, + 0x05DD, 0x0084, 0x066E, 0x0077, 0x06F2, 0x0077, 0x0769, 0x0077, 0x07E0, + 0x009C, 0x0857, 0x009C, 0x08F3, 0x009C, 0x098F, 0x009C, 0x0A2B, 0x009C, + 0x0AC7, 0x009C, 0x0B63, 0x009C, 0x0BFF, 0x009C, 0x0C9B, 0x009C, 0x0D37, + 0x0099, 0x0DD3, 0x0099, 0x0E6C, 0x0099, 0x0F05, 0x0001, 0x0F9E, 0x0001, + 0x0F9F, 0x0001, 0x0FA0, 0x0001, 0x0FA1, 0x0001, 0x0FA2, 0x0001, 0x0FA3, + 0x0001, 0x0FA4, 0x0001, 0x0FA5, 0x0001, 0x0FA6, 0x0001, 0x0FA7, 0x0001, + 0x0FA8, 0x0001, 0x0FA9, 0x0001, 0x0FAA, 0x0001, 0x0FAB, 0x0001, 0x0FAC, + 0x0001, 0x0FAD, 0x0001, 0x0FAE, 0x0001, 0x0FAF, 0x0001, 0x0FB0, 0x0001, + 0x0FB1, 0x0001, 0x0FB2, 0x0001, 0x0FB3, 0x0001, 0x0FB4, 0x0001, 0x0FB5, + }; static const s16 anim_0D_values[] = { 0xFFFC, 0x00BD, 0xFF9C, 0xFF97, 0x3FFF, 0x0068, 0x09A2, 0x0657, 0x4340, - 0x0AE1, 0x00CC, 0xF042, 0x9F6B, 0x9F69, 0x9F63, 0x9F58, 0x9F49, 0x9F36, - 0x9F1F, 0x9F02, 0x9EE2, 0x9EBD, 0x9E93, 0x9E65, 0x9E32, 0x9DFA, 0x9DBD, - 0x9D7C, 0x9D36, 0x9CEB, 0x9C9A, 0x9C45, 0x9BEB, 0x9B8B, 0x9B27, 0x9ABE, - 0x9A52, 0x99E3, 0x9972, 0x9900, 0x988E, 0x981C, 0x97AC, 0x973E, 0x96D3, - 0x966B, 0x9609, 0x95AC, 0x9555, 0x9505, 0x94BE, 0x947F, 0x944A, 0x941F, - 0x93FF, 0x93EC, 0x93E5, 0x93F0, 0x9411, 0x9446, 0x948C, 0x94E3, 0x9547, - 0x95B7, 0x9632, 0x96B4, 0x973D, 0x97CA, 0x9859, 0x98E9, 0x9978, 0x9A03, - 0x9A89, 0x9B08, 0x9B7E, 0x9BEC, 0x9C51, 0x9CAF, 0x9D05, 0x9D55, 0x9D9F, - 0x9DE4, 0x9E23, 0x9E5D, 0x9E93, 0x9EC6, 0x9EF5, 0x9F22, 0x9F4D, 0x9F75, - 0x9F9D, 0x9FC4, 0x9FEA, 0xA011, 0xA039, 0xA061, 0xA08C, 0xA0B9, 0xA0E8, - 0xA11B, 0xA151, 0xA189, 0xA1C3, 0xA1FD, 0xA236, 0xA26D, 0xA2A0, 0xA2CE, - 0xA2F7, 0xA319, 0xA333, 0xA343, 0xA348, 0xA341, 0xA32A, 0xA306, 0xA2D7, - 0xA29F, 0xA25F, 0xA219, 0xA1CE, 0xA181, 0xA133, 0xA0E6, 0xA09B, 0xA055, - 0xA015, 0x9FDC, 0x9FAD, 0x9F8A, 0x9F73, 0x9F6B, 0xF917, 0xF910, 0xF8FD, - 0xF8DF, 0xF8B8, 0xF887, 0xF850, 0xF813, 0xF7D1, 0xF78C, 0xF745, 0xF6FE, - 0xF6B7, 0xF672, 0xF630, 0xF5F3, 0xF5BC, 0xF58C, 0xF564, 0xF546, 0xF533, - 0xF52D, 0xF52D, 0xF52D, 0xF52F, 0xF533, 0xF539, 0xF542, 0xF54F, 0xF560, - 0xF576, 0xF592, 0xF5B3, 0xF5DC, 0xF60B, 0xF642, 0xF682, 0xF6CB, 0xF71E, - 0xF77B, 0xF7E3, 0xF857, 0xF8D7, 0xF963, 0xF9FD, 0xFAAA, 0xFB6B, 0xFC3E, - 0xFD1E, 0xFE07, 0xFEF4, 0xFFE2, 0x00CE, 0x01B2, 0x028A, 0x0352, 0x0407, - 0x04A4, 0x0525, 0x0586, 0x05C4, 0x05D9, 0x05D8, 0x05D6, 0x05D3, 0x05CE, - 0x05C6, 0x05BD, 0x05B1, 0x05A3, 0x0591, 0x057D, 0x0566, 0x054B, 0x052D, - 0x050A, 0x04E4, 0x04BA, 0x048B, 0x0457, 0x041F, 0x03E1, 0x039E, 0x0356, - 0x0308, 0x02B4, 0x025B, 0x01FA, 0x0194, 0x0128, 0x00B8, 0x0044, 0xFFCD, - 0xFF56, 0xFEDE, 0xFE67, 0xFDF2, 0xFD7F, 0xFD10, 0xFCA6, 0xFC42, 0xFBE5, - 0xFB8E, 0xFB3E, 0xFAF4, 0xFAB1, 0xFA73, 0xFA3B, 0xFA08, 0xF9DB, 0xF9B3, - 0xF991, 0xF973, 0xF959, 0xF944, 0xF933, 0xF927, 0xF91E, 0xF919, 0xF917, - 0xFAF6, 0xFAF5, 0xFAF2, 0xFAEC, 0xFAE4, 0xFAD9, 0xFACB, 0xFABB, 0xFAA8, - 0xFA91, 0xFA78, 0xFA5B, 0xFA3C, 0xFA18, 0xF9F2, 0xF9C7, 0xF999, 0xF968, - 0xF932, 0xF8F8, 0xF8BB, 0xF879, 0xF833, 0xF7E9, 0xF79C, 0xF74D, 0xF6FC, - 0xF6AA, 0xF658, 0xF606, 0xF5B4, 0xF564, 0xF516, 0xF4CA, 0xF482, 0xF43D, - 0xF3FD, 0xF3C3, 0xF38E, 0xF35F, 0xF338, 0xF318, 0xF301, 0xF2F2, 0xF2ED, - 0xF2F0, 0xF2FA, 0xF30A, 0xF31F, 0xF339, 0xF357, 0xF37A, 0xF3A0, 0xF3C9, - 0xF3F4, 0xF421, 0xF450, 0xF480, 0xF4B0, 0xF4E1, 0xF511, 0xF540, 0xF56E, - 0xF59A, 0xF5C6, 0xF5F0, 0xF619, 0xF642, 0xF66A, 0xF691, 0xF6B8, 0xF6DE, - 0xF704, 0xF72B, 0xF751, 0xF777, 0xF79E, 0xF7C4, 0xF7EC, 0xF814, 0xF83D, - 0xF866, 0xF891, 0xF8BD, 0xF8EA, 0xF918, 0xF948, 0xF979, 0xF9AC, 0xF9E0, - 0xFA14, 0xFA47, 0xFA78, 0xFAA6, 0xFAD2, 0xFAF8, 0xFB1A, 0xFB36, 0xFB4B, - 0xFB58, 0xFB5C, 0xFB5C, 0xFB59, 0xFB56, 0xFB51, 0xFB4B, 0xFB44, 0xFB3D, - 0xFB35, 0xFB2D, 0xFB25, 0xFB1D, 0xFB16, 0xFB0E, 0xFB08, 0xFB02, 0xFAFD, - 0xFAFA, 0xFAF7, 0xFAF6, 0x0001, 0xFFFE, 0xC170, 0x2D71, 0xFE8E, 0x8E3B, - 0xFFFF, 0xFFFF, 0xDBBD, 0xD314, 0xF0C1, 0xFB60, 0x0001, 0xFFFE, 0xC170, - 0xDA0C, 0x044C, 0x75BF, 0x0000, 0xFFFF, 0xE5EC, 0x217B, 0x07C2, 0x0F87, - 0x0000, 0xFFFF, 0xBF5E, 0x003D, 0x09C3, 0x83D1, 0xFFFF, 0xFFFF, 0x3700, - 0xECBE, 0x053D, 0xDC42, 0x0000, 0xFFFF, 0xBF5E, 0x10DE, 0x109D, 0x92F2, - 0x0000, 0xFFFF, 0x309F, 0x0E38, 0xFF8D, 0xD418, -}; + 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, + 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, + 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, + 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, + 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, + 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, + 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, 0x0AE1, + 0x0AE1, 0x0AE1, 0x0B10, 0x0B93, 0x0C60, 0x0D6A, 0x0EA5, 0x1004, 0x117B, + 0x12FE, 0x1482, 0x15F9, 0x1758, 0x1893, 0x199C, 0x1A69, 0x1AED, 0x1B1C, + 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, + 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, + 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, 0x1B1C, + 0x1B1C, 0x1B1C, 0x1B14, 0x1AFE, 0x1ADB, 0x1AAA, 0x1A6D, 0x1A25, 0x19D2, + 0x1974, 0x190E, 0x189F, 0x1828, 0x17AA, 0x1726, 0x169D, 0x160E, 0x157C, + 0x14E6, 0x144D, 0x13B3, 0x1318, 0x127C, 0x11E1, 0x1147, 0x10AF, 0x101A, + 0x0F88, 0x0EFB, 0x0E73, 0x0DF2, 0x0D77, 0x0D05, 0x0C9A, 0x0C3A, 0x0BE3, + 0x0B98, 0x0B58, 0x0B25, 0x0B00, 0x0AE9, 0x0AE1, 0x00CC, 0x00CC, 0x00CC, + 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, + 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, + 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, + 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, + 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, + 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, + 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00CC, 0x00AD, + 0x0054, 0xFFC9, 0xFF16, 0xFE42, 0xFD56, 0xFC59, 0xFB54, 0xFA4F, 0xF952, + 0xF866, 0xF792, 0xF6DF, 0xF655, 0xF5FC, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, + 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, + 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, + 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5DD, 0xF5F0, + 0xF629, 0xF682, 0xF6F9, 0xF789, 0xF82E, 0xF8E4, 0xF9A8, 0xFA76, 0xFB4A, + 0xFC1F, 0xFCF3, 0xFDC0, 0xFE84, 0xFF3B, 0xFFE0, 0x0071, 0x00E7, 0x0141, + 0x0179, 0x018D, 0x018B, 0x0187, 0x0180, 0x0177, 0x016C, 0x015F, 0x0152, + 0x0143, 0x0134, 0x0125, 0x0116, 0x0107, 0x00FA, 0x00ED, 0x00E2, 0x00D9, + 0x00D2, 0x00CE, 0x00CC, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, + 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, + 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, + 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, + 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, + 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, + 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, + 0xF042, 0xF042, 0xF042, 0xF042, 0xF042, 0xF026, 0xEFD5, 0xEF59, 0xEEB7, + 0xEDF8, 0xED22, 0xEC3E, 0xEB53, 0xEA67, 0xE983, 0xE8AD, 0xE7EE, 0xE74C, + 0xE6D0, 0xE67F, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, + 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, + 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, + 0xE663, 0xE663, 0xE663, 0xE663, 0xE663, 0xE665, 0xE66A, 0xE672, 0xE67F, + 0xE68F, 0xE6A3, 0xE6BB, 0xE6D7, 0xE6F8, 0xE71D, 0xE747, 0xE775, 0xE7A8, + 0xE7E0, 0xE81E, 0xE860, 0xE8A8, 0xE8F6, 0xE949, 0xE9A2, 0xEA01, 0xEA65, + 0xEACF, 0xEB3C, 0xEBAB, 0xEC1C, 0xEC8E, 0xECFE, 0xED6B, 0xEDD6, 0xEE3C, + 0xEE9C, 0xEEF5, 0xEF47, 0xEF8F, 0xEFCC, 0xEFFE, 0xF023, 0xF03A, 0xF042, + 0xC24A, 0xC173, 0xC022, 0xBE69, 0xBC58, 0xBA00, 0xB774, 0xB4C3, 0xB200, + 0xAF3B, 0xAC85, 0xA9F1, 0xA78E, 0xA56F, 0xA3A4, 0xA23F, 0xA151, 0xA0EA, + 0xA0D0, 0xA0BA, 0xA0A8, 0xA09A, 0xA08F, 0xA087, 0xA081, 0xA07D, 0xA07A, + 0xA079, 0xA078, 0xA078, 0xA085, 0xA0A8, 0xA0DE, 0xA123, 0xA172, 0xA1C9, + 0xA222, 0xA27B, 0xA2CF, 0xA31B, 0xA360, 0xA3A0, 0xA3DD, 0xA418, 0xA454, + 0xA491, 0xA4D2, 0xA519, 0xA568, 0xA5BF, 0xA622, 0xA691, 0xA70F, 0xA7A0, + 0xA84F, 0xA92A, 0xAA40, 0xAB9F, 0xAD55, 0xAF70, 0xB1FF, 0xB50E, 0xB8AD, + 0xBCEA, 0xC1D2, 0xC774, 0xCDDE, 0xD51E, 0xDD42, 0xE646, 0xEFDF, 0xF9AF, + 0x0359, 0x0C7D, 0x14BE, 0x1BC0, 0x2124, 0x248C, 0x269E, 0x2846, 0x2991, + 0x2A89, 0x2B3B, 0x2BB3, 0x2BFB, 0x2C20, 0x2C2E, 0x2C30, 0x2C30, 0x2C2F, + 0x2C2E, 0x2C2B, 0x2C27, 0x2C21, 0x2C18, 0x2C0C, 0x2BFD, 0x2BEA, 0x2BD3, + 0x2BB8, 0x2B95, 0x2B67, 0x2B2E, 0x2AEA, 0x2A9B, 0x2A41, 0x29DB, 0x296B, + 0x28EE, 0x2866, 0x27D2, 0x2731, 0x2685, 0x25CD, 0x2508, 0x2437, 0x2359, + 0x226E, 0x2177, 0x2074, 0x1F6D, 0x1E6C, 0x1D79, 0x1C9D, 0x1BE3, 0x1B52, + 0x1AF5, 0x1AD4, 0x1B25, 0x1BF7, 0x1D16, 0x1E50, 0x1F6F, 0x2041, 0x2092, + 0x1EF9, 0x1A70, 0x1360, 0x0A2F, 0xFF44, 0xF308, 0xE61C, 0xDA0C, 0xD09B, + 0xCB92, 0xC981, 0xC7C8, 0xC660, 0xC53F, 0xC45E, 0xC3B5, 0xC33B, 0xC2EA, + 0xC2B9, 0xC2A0, 0xC296, 0xEED9, 0xEF5B, 0xF028, 0xF134, 0xF275, 0xF3E2, + 0xF56E, 0xF711, 0xF8C0, 0xFA70, 0xFC16, 0xFDA9, 0xFF1E, 0x006C, 0x0186, + 0x0263, 0x02F8, 0x033B, 0x0350, 0x0361, 0x036F, 0x037A, 0x0383, 0x038A, + 0x038F, 0x0392, 0x0394, 0x0395, 0x0395, 0x0395, 0x038C, 0x0374, 0x0350, + 0x0327, 0x02FB, 0x02D1, 0x02AD, 0x0295, 0x028C, 0x0295, 0x02AE, 0x02D4, + 0x0305, 0x033D, 0x037C, 0x03BC, 0x03FD, 0x043B, 0x0474, 0x04A5, 0x04CB, + 0x04E4, 0x04ED, 0x04AE, 0x03FA, 0x02E4, 0x017A, 0xFFCE, 0xFDF0, 0xFBF2, + 0xF9E3, 0xF7D4, 0xF5D6, 0xF3F9, 0xF24D, 0xF0E4, 0xEFCD, 0xEF1A, 0xEEDA, + 0xEFD1, 0xF266, 0xF623, 0xFA91, 0xFF3B, 0x03AB, 0x0768, 0x09FC, 0x0AF3, + 0x0ABF, 0x0A31, 0x095F, 0x0861, 0x074C, 0x0637, 0x0538, 0x0467, 0x03D9, + 0x03A4, 0x03B5, 0x03E5, 0x042E, 0x048D, 0x04FB, 0x0575, 0x05F5, 0x0677, + 0x06F5, 0x076B, 0x07D3, 0x082A, 0x0872, 0x08B3, 0x08EC, 0x091F, 0x094B, + 0x0971, 0x0992, 0x09AE, 0x09C5, 0x09D8, 0x09E7, 0x09F3, 0x09FC, 0x0A03, + 0x0A07, 0x0A09, 0x0A0B, 0x0A0B, 0x0A0B, 0x0A07, 0x09FA, 0x09E6, 0x09CD, + 0x09B1, 0x0994, 0x0976, 0x095A, 0x0942, 0x092D, 0x0915, 0x08F2, 0x08BC, + 0x086C, 0x07F9, 0x075B, 0x068C, 0x058C, 0x045D, 0x02FE, 0x0173, 0xFFBC, + 0xFDDF, 0xFBEE, 0xFA00, 0xF82C, 0xF683, 0xF509, 0xF3BC, 0xF299, 0xF19F, + 0xF0CC, 0xF01E, 0xEF94, 0xEF2C, 0xEEE3, 0xEEB9, 0xFC48, 0xFC11, 0xFBBB, + 0xFB4B, 0xFAC4, 0xFA2C, 0xF986, 0xF8D7, 0xF824, 0xF770, 0xF6C2, 0xF61C, + 0xF583, 0xF4FC, 0xF48C, 0xF436, 0xF3FF, 0xF3EC, 0xF3F3, 0xF408, 0xF429, + 0xF455, 0xF48A, 0xF4C7, 0xF50A, 0xF553, 0xF5A0, 0xF5EF, 0xF63F, 0xF68E, + 0xF6DC, 0xF726, 0xF76C, 0xF7AB, 0xF7E2, 0xF810, 0xF832, 0xF848, 0xF84F, + 0xF84F, 0xF84E, 0xF84B, 0xF845, 0xF83A, 0xF82B, 0xF815, 0xF7F8, 0xF7D3, + 0xF7A5, 0xF76C, 0xF729, 0xF6D9, 0xF67B, 0xF60A, 0xF580, 0xF4E2, 0xF435, + 0xF37D, 0xF2BF, 0xF1FD, 0xF13E, 0xF085, 0xEFD7, 0xEF37, 0xEEAB, 0xEE36, + 0xEDDE, 0xEDA5, 0xED92, 0xEE86, 0xF116, 0xF4D0, 0xF945, 0xFE01, 0x0295, + 0x068D, 0x0979, 0x0AE8, 0x0B65, 0x0BC9, 0x0C17, 0x0C51, 0x0C7B, 0x0C97, + 0x0CA9, 0x0CB1, 0x0CB5, 0x0CB5, 0x0CB4, 0x0CB1, 0x0CAD, 0x0CA7, 0x0C9F, + 0x0C95, 0x0C8A, 0x0C7E, 0x0C70, 0x0C60, 0x0C4F, 0x0C3D, 0x0C29, 0x0C15, + 0x0BFF, 0x0BE9, 0x0BD2, 0x0BBC, 0x0BA5, 0x0B8E, 0x0B77, 0x0B62, 0x0B4D, + 0x0B39, 0x0B26, 0x0B14, 0x0B04, 0x0AF6, 0x0AEB, 0x0AE1, 0x0ADA, 0x0AD4, + 0x0ACA, 0x0AB7, 0x0A93, 0x0A59, 0x0A01, 0x0986, 0x08E2, 0x080D, 0x06FE, + 0x05BC, 0x0458, 0x02E6, 0x0179, 0x0023, 0xFEF5, 0xFE00, 0xFD3C, 0xFC9C, + 0xFC13, 0xFB96, 0xFB19, 0xFA94, 0xFA19, 0xF9BF, 0xF99B, 0xF9A9, 0xF9D0, + 0xFA09, 0xFA52, 0xFAA4, 0xFAFB, 0xFB53, 0xFBA5, 0xFBED, 0xFC27, 0xFC4E, + 0x0001, 0xFFFE, 0xC170, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, + 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, + 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, + 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, + 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, 0x2D71, + 0x2D71, 0x2D71, 0x2D6F, 0x2D61, 0x2D3D, 0x2CF6, 0x2C80, 0x2BD1, 0x2ADC, + 0x2997, 0x27F5, 0x25EB, 0x236E, 0x2071, 0x1CCA, 0x1869, 0x136E, 0x0DF8, + 0x0827, 0x0219, 0xFBEC, 0xF5C3, 0xEFBB, 0xE9F3, 0xE48C, 0xDFA3, 0xDB59, + 0xD7CC, 0xD51D, 0xD369, 0xD2D1, 0xD2F4, 0xD355, 0xD3EB, 0xD4AA, 0xD589, + 0xD67C, 0xD77A, 0xD878, 0xD96C, 0xDA4A, 0xDB0A, 0xDB9F, 0xDC01, 0xDC24, + 0xDC1F, 0xDC11, 0xDBFD, 0xDBE2, 0xDBC4, 0xDBA4, 0xDB83, 0xDB62, 0xDB44, + 0xDB2A, 0xDB15, 0xDB08, 0xDB03, 0xDB43, 0xDBFB, 0xDD1B, 0xDE97, 0xE060, + 0xE268, 0xE4A1, 0xE6FD, 0xE96E, 0xEBE6, 0xEE57, 0xF0B3, 0xF2EC, 0xF4F4, + 0xF6BD, 0xF839, 0xF959, 0xFA11, 0xFA51, 0xF9F7, 0xF903, 0xF79B, 0xF5E6, + 0xF40B, 0xF230, 0xF07B, 0xEF13, 0xEE1F, 0xEDC5, 0xEE1E, 0xEF42, 0xF155, + 0xF47C, 0xF8DB, 0xFE95, 0x05D1, 0x0EB1, 0x18FB, 0x22F0, 0x2A77, 0x2D71, + 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, + 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, + 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, + 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, + 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8E, 0xFE8C, + 0xFE83, 0xFE6D, 0xFE43, 0xFDFF, 0xFD9B, 0xFD12, 0xFC5C, 0xFB74, 0xFA54, + 0xF8F5, 0xF752, 0xF567, 0xF33D, 0xF0E0, 0xEE5D, 0xEBBE, 0xE911, 0xE660, + 0xE3B9, 0xE126, 0xDEB4, 0xDC6F, 0xDA62, 0xD89A, 0xD723, 0xD608, 0xD555, + 0xD517, 0xD55B, 0xD61B, 0xD741, 0xD8B9, 0xDA6F, 0xDC4E, 0xDE42, 0xE035, + 0xE214, 0xE3CA, 0xE542, 0xE668, 0xE728, 0xE76C, 0xE76C, 0xE76C, 0xE76C, + 0xE76C, 0xE76B, 0xE76A, 0xE769, 0xE768, 0xE767, 0xE765, 0xE762, 0xE75F, + 0xE75C, 0xE74F, 0xE733, 0xE709, 0xE6D2, 0xE692, 0xE649, 0xE5F9, 0xE5A5, + 0xE54F, 0xE4F8, 0xE4A1, 0xE44E, 0xE400, 0xE3B9, 0xE37A, 0xE346, 0xE31F, + 0xE306, 0xE2FD, 0xE32E, 0xE3B8, 0xE488, 0xE590, 0xE6BC, 0xE7FE, 0xE945, + 0xEA7F, 0xEB9C, 0xEC8B, 0xED44, 0xEDDD, 0xEE75, 0xEF29, 0xF019, 0xF164, + 0xF326, 0xF580, 0xF86D, 0xFB5F, 0xFDA5, 0xFE8E, 0x8E3B, 0x8E3B, 0x8E3B, + 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, + 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, + 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, + 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, + 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3B, 0x8E3D, 0x8E4B, 0x8E70, 0x8EB9, + 0x8F30, 0x8FE2, 0x90DB, 0x9226, 0x93CF, 0x95E2, 0x986A, 0x9B73, 0x9F31, + 0xA3B9, 0xA8EA, 0xAEA2, 0xB4BE, 0xBB1F, 0xC1A2, 0xC825, 0xCE87, 0xD4A7, + 0xDA63, 0xDF98, 0xE427, 0xE7ED, 0xEAC9, 0xEC98, 0xED3A, 0xED15, 0xECAF, + 0xEC12, 0xEB4A, 0xEA60, 0xE960, 0xE856, 0xE74B, 0xE64C, 0xE562, 0xE49A, + 0xE3FD, 0xE396, 0xE372, 0xE394, 0xE3F5, 0xE488, 0xE543, 0xE61C, 0xE707, + 0xE7F9, 0xE8E8, 0xE9CA, 0xEA92, 0xEB36, 0xEBAC, 0xEBE9, 0xEC03, 0xEC1B, + 0xEC30, 0xEC43, 0xEC54, 0xEC62, 0xEC6E, 0xEC78, 0xEC81, 0xEC88, 0xEC8D, + 0xEC92, 0xEC95, 0xEC97, 0xEC99, 0xEC9A, 0xEC9B, 0xEC9B, 0xEC9B, 0xEC5B, + 0xEBA3, 0xEA7F, 0xE8FC, 0xE727, 0xE50B, 0xE2B4, 0xE031, 0xDD8C, 0xDAD2, + 0xD803, 0xD4EF, 0xD15A, 0xCD06, 0xC7B9, 0xC134, 0xB93B, 0xAF93, 0xA46A, + 0x999D, 0x9175, 0x8E3B, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, 0xFFFF, 0x0000, + 0x0000, 0x0000, 0x0000, 0xFFFF, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, + 0xFFFF, 0x0000, 0x0007, 0x001D, 0x0041, 0x0071, 0x00AD, 0x00F4, 0x0145, + 0x019F, 0x0202, 0x026C, 0x02DC, 0x0352, 0x03CE, 0x044D, 0x04CF, 0x0554, + 0x05DA, 0x0660, 0x06E6, 0x076B, 0x07EE, 0x086F, 0x08EB, 0x0964, 0x09D7, + 0x0A44, 0x0AAB, 0x0B0A, 0x0B61, 0x0BAE, 0x0BF2, 0x0C2C, 0x0C5A, 0x0C7C, + 0x0C90, 0x0C98, 0x0C98, 0x0C97, 0x0C97, 0x0C97, 0x0C96, 0x0C94, 0x0C93, + 0x0C90, 0x0C8D, 0x0C89, 0x0C85, 0x0C7F, 0x0C78, 0x0C70, 0x0C67, 0x0C5D, + 0x0C51, 0x0C44, 0x0C35, 0x0C25, 0x0C13, 0x0BFF, 0x0BE9, 0x0BD2, 0x0BB8, + 0x0B9C, 0x0B06, 0x09AB, 0x07CE, 0x05B1, 0x0398, 0x01C5, 0x007D, 0x0000, + 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, 0x0000, + 0x0000, 0xFFFF, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, + 0x0000, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, 0x0000, 0xFFFF, + 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0xFFFF, 0xFFFF, 0x000B, 0x002C, 0x0061, + 0x00A9, 0x0102, 0x016B, 0x01E4, 0x026A, 0x02FC, 0x0399, 0x0440, 0x04EF, + 0x05A4, 0x0660, 0x0720, 0x07E2, 0x08A6, 0x096B, 0x0A2E, 0x0AF0, 0x0BAD, + 0x0C67, 0x0D1A, 0x0DC7, 0x0E6D, 0x0F09, 0x0F9C, 0x1024, 0x10A0, 0x110E, + 0x116F, 0x11C0, 0x1202, 0x1232, 0x124F, 0x1259, 0x1259, 0x1259, 0x1258, + 0x1256, 0x1252, 0x124E, 0x1247, 0x123E, 0x1232, 0x1223, 0x1212, 0x11FC, + 0x11E3, 0x11C6, 0x11A4, 0x117D, 0x1151, 0x1120, 0x10E9, 0x10AC, 0x1068, + 0x101D, 0x0FCC, 0x0F73, 0x0F12, 0x0EA9, 0x0DB5, 0x0BE4, 0x0986, 0x06E8, + 0x0457, 0x0222, 0x0095, 0x0000, 0x0000, 0xFFFF, 0x0000, 0x0000, 0x0000, + 0xFFFF, 0xFFFF, 0x0000, 0x0000, 0x0000, 0xFFFF, 0xFFFF, 0x0000, 0xDBBD, + 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, + 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, + 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, + 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, + 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, + 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, + 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBBD, 0xDBC0, 0xDBC8, + 0xDBD7, 0xDBED, 0xDC0B, 0xDC32, 0xDC62, 0xDC9C, 0xDCE0, 0xDD30, 0xDD8D, + 0xDDF6, 0xDE6C, 0xDEF1, 0xDF85, 0xE029, 0xE0DD, 0xE1A3, 0xE27A, 0xE363, + 0xE45A, 0xE55D, 0xE667, 0xE775, 0xE883, 0xE98D, 0xEA8F, 0xEB86, 0xEC6D, + 0xED42, 0xEE01, 0xEEA5, 0xEF2B, 0xEF90, 0xEFCF, 0xEFE5, 0xEFE5, 0xEFE5, + 0xEFE4, 0xEFE2, 0xEFDF, 0xEFDB, 0xEFD6, 0xEFCE, 0xEFC5, 0xEFB9, 0xEFAA, + 0xEF99, 0xEF85, 0xEF6D, 0xEF51, 0xEF31, 0xEF0D, 0xEEE5, 0xEEB8, 0xEE86, + 0xEE4F, 0xEE12, 0xEDCF, 0xED87, 0xED38, 0xECE2, 0xEBE1, 0xE9D0, 0xE70D, + 0xE3F7, 0xE0EB, 0xDE4A, 0xDC70, 0xDBBD, 0xD314, 0xD314, 0xD314, 0xD314, + 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, + 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, + 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, + 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, + 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, + 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, + 0xD314, 0xD314, 0xD314, 0xD314, 0xD314, 0xD344, 0xD3CD, 0xD4A7, 0xD5C8, + 0xD727, 0xD8BD, 0xDA7F, 0xDC64, 0xDE65, 0xE078, 0xE293, 0xE4AE, 0xE6C1, + 0xE8C1, 0xEAA7, 0xEC69, 0xEDFF, 0xEF5E, 0xF07F, 0xF159, 0xF1E2, 0xF212, + 0xF1FE, 0xF1C3, 0xF163, 0xF0E2, 0xF041, 0xEF84, 0xEEAB, 0xEDBB, 0xECB4, + 0xEB9B, 0xEA70, 0xE937, 0xE7F1, 0xE6A2, 0xE54C, 0xE3F1, 0xE293, 0xE135, + 0xDFDA, 0xDE84, 0xDD35, 0xDBEF, 0xDAB6, 0xD98B, 0xD872, 0xD76B, 0xD67B, + 0xD5A2, 0xD4E4, 0xD444, 0xD3C3, 0xD363, 0xD328, 0xD314, 0xF0C1, 0xF0C1, + 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, + 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, + 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, + 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, + 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, + 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, + 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C1, 0xF0C3, 0xF0C7, + 0xF0CE, 0xF0D8, 0xF0E3, 0xF0F1, 0xF0FF, 0xF10F, 0xF120, 0xF132, 0xF143, + 0xF155, 0xF167, 0xF177, 0xF187, 0xF196, 0xF1A3, 0xF1AF, 0xF1B8, 0xF1C0, + 0xF1C4, 0xF1C6, 0xF1C5, 0xF1C3, 0xF1C0, 0xF1BC, 0xF1B6, 0xF1B0, 0xF1A9, + 0xF1A1, 0xF199, 0xF18F, 0xF185, 0xF17B, 0xF171, 0xF166, 0xF15A, 0xF14F, + 0xF143, 0xF138, 0xF12C, 0xF121, 0xF116, 0xF10C, 0xF101, 0xF0F7, 0xF0EE, + 0xF0E6, 0xF0DE, 0xF0D7, 0xF0D0, 0xF0CB, 0xF0C7, 0xF0C4, 0xF0C2, 0xF0C1, + 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, + 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, + 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, + 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, + 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, + 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, + 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, 0xFB60, + 0xFB4E, 0xFB1B, 0xFAC9, 0xFA5C, 0xF9D8, 0xF940, 0xF897, 0xF7E1, 0xF720, + 0xF659, 0xF58E, 0xF4C4, 0xF3FC, 0xF33C, 0xF285, 0xF1DC, 0xF144, 0xF0C0, + 0xF053, 0xF002, 0xEFCE, 0xEFBC, 0xEFC4, 0xEFDA, 0xEFFE, 0xF02E, 0xF06B, + 0xF0B2, 0xF103, 0xF15E, 0xF1C0, 0xF22A, 0xF29A, 0xF310, 0xF38A, 0xF408, + 0xF488, 0xF50B, 0xF58E, 0xF611, 0xF694, 0xF714, 0xF792, 0xF80C, 0xF882, + 0xF8F2, 0xF95C, 0xF9BF, 0xFA19, 0xFA6A, 0xFAB2, 0xFAEE, 0xFB1F, 0xFB42, + 0xFB58, 0xFB60, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, + 0x000B, 0x0028, 0x0055, 0x0090, 0x00D7, 0x0127, 0x017F, 0x01DB, 0x0239, + 0x0297, 0x02F3, 0x034A, 0x039B, 0x03E2, 0x041D, 0x044A, 0x0467, 0x0471, + 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, + 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, + 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, 0x0471, + 0x0471, 0x0471, 0x0471, 0x0472, 0x0473, 0x0477, 0x047B, 0x0480, 0x0485, + 0x048C, 0x0493, 0x049A, 0x04A1, 0x04A9, 0x04B1, 0x04B8, 0x04BF, 0x04C6, + 0x04CD, 0x04D2, 0x04D7, 0x04DC, 0x04DF, 0x04E1, 0x04E1, 0x04DB, 0x04CB, + 0x04B0, 0x048C, 0x045F, 0x042C, 0x03F2, 0x03B4, 0x0370, 0x032A, 0x02E1, + 0x0297, 0x024C, 0x0201, 0x01B8, 0x0172, 0x012F, 0x00F0, 0x00B6, 0x0083, + 0x0057, 0x0033, 0x0018, 0x0007, 0x0001, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, + 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, + 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, + 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, + 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, + 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, + 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, 0xFFFE, + 0xFFFE, 0xFFFE, 0xFFFE, 0xFFBD, 0xFF05, 0xFDE4, 0xFC69, 0xFAA4, 0xF8A3, + 0xF675, 0xF429, 0xF1CE, 0xEF73, 0xED27, 0xEAF9, 0xE8F8, 0xE733, 0xE5B8, + 0xE497, 0xE3DF, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, + 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, + 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, + 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE39E, 0xE3AC, 0xE3D3, 0xE414, + 0xE46C, 0xE4D9, 0xE55A, 0xE5EE, 0xE692, 0xE746, 0xE808, 0xE8D6, 0xE9AF, + 0xEA91, 0xEB7B, 0xEC6B, 0xED5F, 0xEE57, 0xEF50, 0xF049, 0xF140, 0xF234, + 0xF323, 0xF40D, 0xF4F0, 0xF5CC, 0xF6A1, 0xF76E, 0xF835, 0xF8F3, 0xF9AA, + 0xFA58, 0xFAFD, 0xFB9A, 0xFC2D, 0xFCB8, 0xFD38, 0xFDAF, 0xFE1C, 0xFE7E, + 0xFED6, 0xFF23, 0xFF65, 0xFF9B, 0xFFC6, 0xFFE5, 0xFFF8, 0xFFFE, 0xC170, + 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, + 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, + 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, + 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, + 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, + 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, + 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC170, 0xC19C, 0xC219, 0xC2DD, + 0xC3DE, 0xC511, 0xC66D, 0xC7E7, 0xC976, 0xCB0E, 0xCCA7, 0xCE36, 0xCFB0, + 0xD10C, 0xD23F, 0xD340, 0xD404, 0xD481, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, + 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, + 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, + 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, 0xD4AD, + 0xD49F, 0xD478, 0xD439, 0xD3E5, 0xD37C, 0xD300, 0xD275, 0xD1DA, 0xD132, + 0xD080, 0xCFC3, 0xCF00, 0xCE36, 0xCD69, 0xCC99, 0xCBC9, 0xCAFB, 0xCA30, + 0xC969, 0xC8AA, 0xC7F3, 0xC747, 0xC6A7, 0xC612, 0xC589, 0xC50B, 0xC497, + 0xC42E, 0xC3CE, 0xC377, 0xC328, 0xC2E2, 0xC2A4, 0xC26D, 0xC23D, 0xC213, + 0xC1EF, 0xC1D1, 0xC1B8, 0xC1A3, 0xC193, 0xC187, 0xC17D, 0xC177, 0xC173, + 0xC171, 0xC170, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, + 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, + 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, + 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, + 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, + 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0C, 0xDA0B, 0xDA07, 0xDA01, 0xD9F8, + 0xD9EC, 0xD9DE, 0xD9CD, 0xD9B9, 0xD9A2, 0xD989, 0xD96D, 0xD94D, 0xD92B, + 0xD907, 0xD8DF, 0xD8B4, 0xD886, 0xD856, 0xD823, 0xD7EF, 0xD7B9, 0xD783, + 0xD74D, 0xD717, 0xD6E1, 0xD6AD, 0xD67A, 0xD649, 0xD61B, 0xD5EF, 0xD5C7, + 0xD5A3, 0xD583, 0xD568, 0xD552, 0xD542, 0xD538, 0xD534, 0xD536, 0xD539, + 0xD53F, 0xD547, 0xD551, 0xD55C, 0xD56A, 0xD578, 0xD588, 0xD599, 0xD5AB, + 0xD5BE, 0xD5D1, 0xD5E5, 0xD5F9, 0xD60E, 0xD622, 0xD636, 0xD64A, 0xD65E, + 0xD670, 0xD682, 0xD693, 0xD6A3, 0xD6B2, 0xD6BF, 0xD6CB, 0xD6D4, 0xD6DC, + 0xD6E2, 0xD6E6, 0xD6E7, 0xD6E4, 0xD6DB, 0xD6CD, 0xD6BB, 0xD6A6, 0xD68F, + 0xD677, 0xD660, 0xD649, 0xD634, 0xD622, 0xD614, 0xD60B, 0xD608, 0xD60D, + 0xD61C, 0xD634, 0xD654, 0xD67B, 0xD6A8, 0xD6DB, 0xD712, 0xD74D, 0xD78B, + 0xD7CA, 0xD80A, 0xD84A, 0xD889, 0xD8C7, 0xD902, 0xD939, 0xD96B, 0xD999, + 0xD9C0, 0xD9E0, 0xD9F8, 0xDA07, 0xDA0C, 0x044C, 0x044C, 0x044C, 0x044C, + 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, + 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, + 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, + 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, + 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x044C, 0x0443, + 0x042B, 0x0405, 0x03D4, 0x039A, 0x035A, 0x0315, 0x02CD, 0x0286, 0x0241, + 0x0200, 0x01C6, 0x0195, 0x016F, 0x0157, 0x014E, 0x0150, 0x0153, 0x0159, + 0x0161, 0x016A, 0x0175, 0x0181, 0x018E, 0x019C, 0x01AA, 0x01B9, 0x01C7, + 0x01D5, 0x01E3, 0x01F0, 0x01FC, 0x0207, 0x0210, 0x0218, 0x021E, 0x0221, + 0x0223, 0x0221, 0x021D, 0x0216, 0x020D, 0x0201, 0x01F4, 0x01E4, 0x01D3, + 0x01C0, 0x01AC, 0x0197, 0x0181, 0x016A, 0x0153, 0x013B, 0x0123, 0x010C, + 0x00F4, 0x00DC, 0x00C6, 0x00B0, 0x009B, 0x0087, 0x0074, 0x0063, 0x0053, + 0x0046, 0x003A, 0x0031, 0x002A, 0x0026, 0x0024, 0x0024, 0x0024, 0x0025, + 0x0027, 0x0029, 0x002C, 0x0031, 0x0037, 0x003F, 0x0049, 0x0056, 0x0064, + 0x0076, 0x008A, 0x00A3, 0x00C2, 0x00E6, 0x010E, 0x013A, 0x016A, 0x019D, + 0x01D1, 0x0207, 0x023E, 0x0276, 0x02AD, 0x02E3, 0x0317, 0x034A, 0x0379, + 0x03A6, 0x03CE, 0x03F2, 0x0411, 0x042A, 0x043C, 0x0448, 0x044C, 0x75BF, + 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, + 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, + 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, + 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, + 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, 0x75BF, + 0x75BF, 0x75BF, 0x75BB, 0x75B1, 0x75A1, 0x758C, 0x7573, 0x7558, 0x753B, + 0x751C, 0x74FE, 0x74E1, 0x74C6, 0x74AD, 0x7498, 0x7488, 0x747E, 0x747A, + 0x747F, 0x748B, 0x749F, 0x74B9, 0x74D8, 0x74FD, 0x7525, 0x7551, 0x757F, + 0x75AE, 0x75DF, 0x760F, 0x763F, 0x766D, 0x7699, 0x76C1, 0x76E6, 0x7705, + 0x771F, 0x7733, 0x773F, 0x7743, 0x7741, 0x773C, 0x7732, 0x7726, 0x7716, + 0x7704, 0x76EF, 0x76D8, 0x76BF, 0x76A4, 0x7688, 0x766B, 0x764C, 0x762D, + 0x760D, 0x75ED, 0x75CD, 0x75AD, 0x758E, 0x756F, 0x7551, 0x7535, 0x751A, + 0x7501, 0x74EA, 0x74D5, 0x74C3, 0x74B4, 0x74A7, 0x749E, 0x7498, 0x7496, + 0x749E, 0x74B5, 0x74D7, 0x7503, 0x7536, 0x756D, 0x75A8, 0x75E2, 0x761A, + 0x764D, 0x7678, 0x769B, 0x76B1, 0x76B9, 0x76B8, 0x76B4, 0x76AE, 0x76A6, + 0x769D, 0x7692, 0x7685, 0x7678, 0x766A, 0x765B, 0x764B, 0x763C, 0x762C, + 0x761D, 0x760E, 0x75FF, 0x75F2, 0x75E6, 0x75DB, 0x75D1, 0x75C9, 0x75C3, + 0x75C0, 0x75BF, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, + 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0xFFFF, 0x0000, 0xFFFB, 0xFFF1, + 0xFFDF, 0xFFC8, 0xFFAA, 0xFF88, 0xFF60, 0xFF35, 0xFF05, 0xFED2, 0xFE9B, + 0xFE62, 0xFE27, 0xFDEA, 0xFDAC, 0xFD6D, 0xFD2D, 0xFCEE, 0xFCAF, 0xFC71, + 0xFC34, 0xFBF9, 0xFBBF, 0xFB86, 0xFB4F, 0xFB19, 0xFAE4, 0xFAB1, 0xFA7F, + 0xFA4F, 0xFA1F, 0xF9F2, 0xF9C5, 0xF99A, 0xF971, 0xF949, 0xF922, 0xF8FD, + 0xF8D9, 0xF8B6, 0xF895, 0xF875, 0xF856, 0xF839, 0xF81E, 0xF804, 0xF7EB, + 0xF7D3, 0xF7BD, 0xF7A9, 0xF796, 0xF784, 0xF773, 0xF764, 0xF757, 0xF74B, + 0xF740, 0xF737, 0xF72F, 0xF728, 0xF723, 0xF720, 0xF71E, 0xF71D, 0xF721, + 0xF72B, 0xF73D, 0xF754, 0xF772, 0xF796, 0xF7BE, 0xF7EC, 0xF81E, 0xF855, + 0xF88F, 0xF8CD, 0xF90F, 0xF953, 0xF99A, 0xF9E3, 0xFA2E, 0xFA7B, 0xFAC9, + 0xFB17, 0xFB66, 0xFBB6, 0xFC05, 0xFC53, 0xFCA1, 0xFCEE, 0xFD39, 0xFD82, + 0xFDC9, 0xFE0D, 0xFE4F, 0xFE8D, 0xFEC7, 0xFEFE, 0xFF30, 0xFF5E, 0xFF87, + 0xFFAA, 0xFFC8, 0xFFDF, 0xFFF1, 0xFFFB, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, + 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0xFFFF, 0x0000, + 0x0000, 0x0001, 0x0005, 0x000B, 0x0013, 0x001D, 0x0028, 0x0034, 0x0042, + 0x0050, 0x005F, 0x006F, 0x007E, 0x008E, 0x009D, 0x00AC, 0x00BA, 0x00C7, + 0x00D3, 0x00DD, 0x00E6, 0x00EE, 0x00F5, 0x00FC, 0x0103, 0x0109, 0x010F, + 0x0115, 0x011B, 0x0120, 0x0125, 0x0129, 0x012E, 0x0132, 0x0136, 0x0139, + 0x013C, 0x0140, 0x0142, 0x0145, 0x0148, 0x014A, 0x014C, 0x014E, 0x0150, + 0x0151, 0x0152, 0x0154, 0x0155, 0x0156, 0x0157, 0x0157, 0x0158, 0x0159, + 0x0159, 0x0159, 0x015A, 0x015A, 0x015A, 0x015A, 0x015A, 0x015A, 0x015A, + 0x015A, 0x015A, 0x015A, 0x0158, 0x0156, 0x0152, 0x014D, 0x0148, 0x0142, + 0x013B, 0x0133, 0x012B, 0x0122, 0x0119, 0x010F, 0x0104, 0x00F9, 0x00EE, + 0x00E3, 0x00D7, 0x00CB, 0x00BF, 0x00B3, 0x00A7, 0x009B, 0x008F, 0x0083, + 0x0078, 0x006C, 0x0061, 0x0056, 0x004C, 0x0042, 0x0038, 0x002F, 0x0027, + 0x0020, 0x0019, 0x0012, 0x000D, 0x0008, 0x0005, 0x0002, 0x0001, 0xE5EC, + 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, + 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, + 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, + 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, + 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, + 0xE5EC, 0xE5EC, 0xE5EC, 0xE5EC, 0xE5ED, 0xE5F2, 0xE5F8, 0xE601, 0xE60D, + 0xE61B, 0xE62B, 0xE63D, 0xE651, 0xE666, 0xE67E, 0xE697, 0xE6B1, 0xE6CD, + 0xE6EA, 0xE708, 0xE727, 0xE747, 0xE767, 0xE789, 0xE7AB, 0xE7CD, 0xE7F0, + 0xE813, 0xE837, 0xE85B, 0xE87E, 0xE8A3, 0xE8C7, 0xE8EB, 0xE90F, 0xE933, + 0xE957, 0xE97A, 0xE99E, 0xE9C1, 0xE9E3, 0xEA05, 0xEA27, 0xEA48, 0xEA68, + 0xEA88, 0xEAA6, 0xEAC4, 0xEAE2, 0xEAFE, 0xEB19, 0xEB33, 0xEB4C, 0xEB64, + 0xEB7B, 0xEB90, 0xEBA4, 0xEBB6, 0xEBC7, 0xEBD7, 0xEBE5, 0xEBF1, 0xEBFB, + 0xEC04, 0xEC0B, 0xEC10, 0xEC13, 0xEC14, 0xEC11, 0xEC0A, 0xEBFE, 0xEBEE, + 0xEBD9, 0xEBC1, 0xEBA4, 0xEB85, 0xEB62, 0xEB3C, 0xEB13, 0xEAE8, 0xEABB, + 0xEA8C, 0xEA5A, 0xEA28, 0xE9F4, 0xE9BF, 0xE989, 0xE952, 0xE91C, 0xE8E5, + 0xE8AE, 0xE877, 0xE841, 0xE80C, 0xE7D8, 0xE7A6, 0xE774, 0xE745, 0xE718, + 0xE6ED, 0xE6C4, 0xE69E, 0xE67B, 0xE65C, 0xE640, 0xE627, 0xE612, 0xE602, + 0xE5F6, 0xE5EF, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, + 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, + 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, + 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, + 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x217B, 0x216F, 0x214F, 0x211B, + 0x20D7, 0x2084, 0x2025, 0x1FBB, 0x1F4A, 0x1ED3, 0x1E59, 0x1DDE, 0x1D64, + 0x1CED, 0x1C7C, 0x1C13, 0x1BB4, 0x1B61, 0x1B1C, 0x1AE9, 0x1AC8, 0x1ABD, + 0x1B13, 0x1C09, 0x1D8A, 0x1F83, 0x21DF, 0x248B, 0x2773, 0x2A83, 0x2DA6, + 0x30CA, 0x33DA, 0x36C1, 0x396D, 0x3BCA, 0x3DC3, 0x3F44, 0x403A, 0x4090, + 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, + 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, + 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, + 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4090, 0x4060, 0x3FD9, 0x3F09, + 0x3DFB, 0x3CBC, 0x3B5A, 0x39E2, 0x385F, 0x36DF, 0x356F, 0x341B, 0x32F1, + 0x31FD, 0x3148, 0x30C9, 0x3073, 0x3039, 0x3010, 0x2FE8, 0x2FB7, 0x2F6F, + 0x2F05, 0x2E7C, 0x2DD6, 0x2D19, 0x2C48, 0x2B68, 0x2A7B, 0x2987, 0x288F, + 0x2798, 0x26A5, 0x25BB, 0x24DD, 0x240F, 0x2356, 0x22B6, 0x2232, 0x21CF, + 0x2191, 0x217B, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, + 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, + 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, + 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, + 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C2, 0x07C1, 0x07BE, 0x07B9, + 0x07B2, 0x07AA, 0x07A1, 0x0796, 0x078B, 0x0780, 0x0774, 0x0768, 0x075C, + 0x0750, 0x0745, 0x073B, 0x0731, 0x0729, 0x0723, 0x071E, 0x071A, 0x0719, + 0x072A, 0x0758, 0x07A2, 0x0801, 0x0874, 0x08F6, 0x0983, 0x0A18, 0x0AB1, + 0x0B49, 0x0BDE, 0x0C6B, 0x0CED, 0x0D60, 0x0DC0, 0x0E09, 0x0E38, 0x0E48, + 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, + 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, + 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, + 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E48, 0x0E03, 0x0D43, 0x0C1E, + 0x0AAB, 0x08FF, 0x0732, 0x055A, 0x038D, 0x01E2, 0x006E, 0xFF48, 0xFE88, + 0xFE43, 0xFE49, 0xFE5A, 0xFE77, 0xFEA0, 0xFED4, 0xFF15, 0xFF61, 0xFFB9, + 0x001E, 0x008C, 0x0103, 0x0181, 0x0204, 0x028B, 0x0314, 0x039D, 0x0425, + 0x04A9, 0x0529, 0x05A3, 0x0615, 0x067D, 0x06D9, 0x0728, 0x0769, 0x0799, + 0x07B8, 0x07C2, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, + 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, + 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, + 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, + 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F87, 0x0F7A, 0x0F54, 0x0F18, + 0x0EC9, 0x0E69, 0x0DFA, 0x0D80, 0x0CFD, 0x0C74, 0x0BE6, 0x0B58, 0x0ACA, + 0x0A41, 0x09BD, 0x0943, 0x08D5, 0x0875, 0x0826, 0x07EA, 0x07C4, 0x07B7, + 0x07CC, 0x0807, 0x0865, 0x08DF, 0x0971, 0x0A17, 0x0ACB, 0x0B89, 0x0C4C, + 0x0D0F, 0x0DCD, 0x0E81, 0x0F26, 0x0FB9, 0x1033, 0x1091, 0x10CC, 0x10E1, + 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, + 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, + 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, + 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10E1, 0x10DC, 0x10CE, 0x10BA, + 0x109F, 0x1081, 0x1060, 0x103F, 0x101E, 0x1000, 0x0FE5, 0x0FD1, 0x0FC3, + 0x0FBE, 0x0FC8, 0x0FE1, 0x1006, 0x1030, 0x1059, 0x107E, 0x1097, 0x10A1, + 0x109F, 0x1099, 0x1090, 0x1084, 0x1075, 0x1064, 0x1052, 0x103E, 0x1029, + 0x1014, 0x0FFF, 0x0FEA, 0x0FD6, 0x0FC4, 0x0FB3, 0x0FA4, 0x0F98, 0x0F8F, + 0x0F89, 0x0F87, 0x0000, 0xFFFF, 0xBF5E, 0x003D, 0x09C3, 0x83D1, 0xFFFF, + 0xFFFF, 0x3700, 0xECBE, 0x053D, 0xDC42, 0x0000, 0xFFFF, 0xBF5E, 0x10DE, + 0x109D, 0x92F2, 0x0000, 0xFFFF, 0x309F, 0x0E38, 0xFF8D, 0xD418, +}; \ No newline at end of file diff --git a/include/config.h b/include/config.h index d6e2382a..852d093b 100644 --- a/include/config.h +++ b/include/config.h @@ -20,7 +20,7 @@ #define BORDER_HEIGHT 2 // POW Build -#define POWBUILD +//#define POWBUILD // Debug Build #define DEBUG diff --git a/include/model_ids.h b/include/model_ids.h index fc92ac7f..e8a99c91 100644 --- a/include/model_ids.h +++ b/include/model_ids.h @@ -388,7 +388,6 @@ #define MODEL_BOWSER_NO_SHADOW 0x69 // bowser_geo_no_shadow // group 13 -#define MODEL_BUB 0x64 // cheep_cheep_geo #define MODEL_TREASURE_CHEST_BASE 0x65 // treasure_chest_base_geo #define MODEL_TREASURE_CHEST_LID 0x66 // treasure_chest_lid_geo #define MODEL_CYAN_FISH 0x67 // cyan_fish_geo @@ -400,6 +399,7 @@ #define MODEL_WHOMP 0x67 // whomp_geo #define MODEL_KOOPA_WITH_SHELL 0x68 // koopa_with_shell_geo #define MODEL_METALLIC_BALL 0x65 // metallic_ball_geo +#define MODEL_BUB 0x69 // cheep_cheep_geo #define MODEL_CHAIN_CHOMP 0x66 // chain_chomp #define MODEL_KOOPA_FLAG 0x6A // koopa_flag_geo #define MODEL_WOODEN_POST 0x6B // wooden_post_geo diff --git a/include/types.h b/include/types.h index 2ebdafd8..2e7dcdb7 100644 --- a/include/types.h +++ b/include/types.h @@ -312,7 +312,6 @@ struct MarioState { /*0xC4*/ f32 gettingBlownGravity; u8 pretipTimer; u8 sleepTimer; - u8 isPushing; }; #endif // TYPES_H diff --git a/levels/castle_grounds/1.rgba16.png b/levels/castle_grounds/1.rgba16.png index dc99429e..7a25ff7e 100644 Binary files a/levels/castle_grounds/1.rgba16.png and b/levels/castle_grounds/1.rgba16.png differ diff --git a/levels/castle_grounds/2.rgba16.png b/levels/castle_grounds/2.rgba16.png index 35dcf14e..726f7ce7 100644 Binary files a/levels/castle_grounds/2.rgba16.png and b/levels/castle_grounds/2.rgba16.png differ diff --git a/levels/castle_grounds/5.rgba16.png b/levels/castle_grounds/5.rgba16.png index c185effc..c28926e6 100644 Binary files a/levels/castle_grounds/5.rgba16.png and b/levels/castle_grounds/5.rgba16.png differ diff --git a/levels/castle_grounds/7.rgba16.png b/levels/castle_grounds/7.rgba16.png index 06827149..06d0a57c 100644 Binary files a/levels/castle_grounds/7.rgba16.png and b/levels/castle_grounds/7.rgba16.png differ diff --git a/levels/castle_grounds/8.rgba16.png b/levels/castle_grounds/8.rgba16.png index ce2ce24f..b50b0958 100644 Binary files a/levels/castle_grounds/8.rgba16.png and b/levels/castle_grounds/8.rgba16.png differ diff --git a/levels/castle_grounds/9.rgba16.png b/levels/castle_grounds/9.rgba16.png deleted file mode 100644 index 2d21f954..00000000 Binary files a/levels/castle_grounds/9.rgba16.png and /dev/null differ diff --git a/levels/castle_grounds/areas/1/1/model.inc.c b/levels/castle_grounds/areas/1/1/model.inc.c index d305de13..35659ce6 100644 --- a/levels/castle_grounds/areas/1/1/model.inc.c +++ b/levels/castle_grounds/areas/1/1/model.inc.c @@ -1,156 +1,92 @@ -static const Vtx castle_grounds_1_dl_mesh_vtx_0[103] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_0[43] = { + {{ {7551, 36, 2256}, 0, {11462, 652}, {173, 83, 49, 255} }}, + {{ {8018, -101, 3280}, 0, {10808, 648}, {177, 95, 31, 255} }}, + {{ {8189, 1355, 1649}, 0, {11640, -232}, {163, 69, 52, 255} }}, {{ {4597, 405, -1016}, 0, {5915, -244}, {177, 92, 219, 255} }}, {{ {4596, -511, -1016}, 0, {5593, 1152}, {174, 94, 24, 255} }}, {{ {4791, 405, -485}, 0, {6500, -240}, {216, 98, 70, 255} }}, + {{ {5019, -1330, 140}, 0, {6598, 2000}, {196, 70, 87, 255} }}, + {{ {6236, -51, 823}, 0, {7368, 248}, {189, 87, 63, 255} }}, + {{ {6045, -1330, 1574}, 0, {7548, 1872}, {159, 52, 63, 255} }}, + {{ {6864, -1330, 2905}, 0, {8972, 1760}, {145, 59, 18, 255} }}, + {{ {7551, 36, 2256}, 0, {8578, 132}, {173, 83, 49, 255} }}, + {{ {6659, -1330, 4236}, 0, {10144, 1640}, {172, 93, 236, 255} }}, + {{ {8018, -101, 3280}, 0, {9206, 96}, {177, 95, 31, 255} }}, + {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, + {{ {5882, -1330, 5370}, 0, {11136, 1540}, {216, 57, 150, 255} }}, + {{ {6045, -554, 5617}, 0, {11084, 492}, {225, 71, 156, 255} }}, + {{ {6377, -101, 5989}, 0, {10990, -144}, {220, 88, 172, 255} }}, + {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, + {{ {6045, -554, 5617}, 0, {11084, 492}, {225, 71, 156, 255} }}, + {{ {7878, -101, 4665}, 0, {9938, -24}, {169, 85, 220, 255} }}, + {{ {8018, -101, 3280}, 0, {9206, 96}, {177, 95, 31, 255} }}, {{ {3361, -511, -567}, 0, {7547, 1066}, {45, 114, 221, 255} }}, {{ {3363, 343, -566}, 0, {7551, -201}, {47, 183, 163, 255} }}, {{ {3556, 405, -36}, 0, {7071, -198}, {73, 97, 37, 255} }}, {{ {3783, -1330, 590}, 0, {6457, 1618}, {98, 68, 44, 255} }}, - {{ {3361, -511, -567}, 0, {7547, 1066}, {45, 114, 221, 255} }}, - {{ {3362, 0, 725}, 0, {6421, 424}, {87, 79, 48, 255} }}, - {{ {3783, -1330, 590}, 0, {6457, 1618}, {98, 68, 44, 255} }}, - {{ {3556, 405, -36}, 0, {7071, -198}, {73, 97, 37, 255} }}, {{ {3362, 0, 725}, 0, {6421, 424}, {87, 79, 48, 255} }}, {{ {3399, -1330, 1892}, 0, {5478, 1452}, {117, 23, 45, 255} }}, - {{ {3783, -1330, 590}, 0, {6457, 1618}, {98, 68, 44, 255} }}, - {{ {3399, -1330, 1892}, 0, {5478, 1452}, {117, 23, 45, 255} }}, - {{ {3362, 0, 725}, 0, {6421, 424}, {87, 79, 48, 255} }}, - {{ {3238, -89, 1787}, 0, {5640, 399}, {90, 84, 31, 255} }}, - {{ {3399, -1330, 1892}, 0, {5478, 1452}, {117, 23, 45, 255} }}, {{ {3238, -89, 1787}, 0, {5640, 399}, {90, 84, 31, 255} }}, {{ {2601, -101, 2939}, 0, {4693, 223}, {72, 78, 70, 255} }}, {{ {2762, -1330, 3044}, 0, {4533, 1266}, {108, 49, 46, 255} }}, - {{ {3399, -1330, 1892}, 0, {5478, 1452}, {117, 23, 45, 255} }}, - {{ {2601, -101, 2939}, 0, {4693, 223}, {72, 78, 70, 255} }}, - {{ {2601, -101, 2939}, 0, {4693, 223}, {72, 78, 70, 255} }}, - {{ {1613, 89, 3404}, 0, {3808, -68}, {79, 99, 14, 255} }}, - {{ {2762, -1330, 3044}, 0, {4533, 1266}, {108, 49, 46, 255} }}, {{ {1613, 89, 3404}, 0, {3808, -68}, {79, 99, 14, 255} }}, {{ {2967, -1330, 5005}, 0, {2858, 1572}, {88, 62, 188, 255} }}, - {{ {2762, -1330, 3044}, 0, {4533, 1266}, {108, 49, 46, 255} }}, {{ {2967, -1330, 5005}, 0, {2858, 1572}, {88, 62, 188, 255} }}, {{ {1613, 89, 3404}, 0, {3808, -68}, {79, 99, 14, 255} }}, {{ {2816, -511, 5376}, 0, {2788, 456}, {79, 60, 177, 255} }}, - {{ {2816, -511, 5376}, 0, {2788, 456}, {79, 60, 177, 255} }}, - {{ {1613, 89, 3404}, 0, {3808, -68}, {79, 99, 14, 255} }}, - {{ {2049, 235, 5026}, 0, {3286, -480}, {93, 75, 212, 255} }}, {{ {2049, 235, 5026}, 0, {3286, -480}, {93, 75, 212, 255} }}, {{ {3452, -244, 6144}, 0, {2238, -312}, {32, 101, 186, 255} }}, - {{ {2816, -511, 5376}, 0, {2788, 456}, {79, 60, 177, 255} }}, - {{ {4403, -657, 5715}, 0, {1900, 620}, {1, 73, 152, 255} }}, - {{ {2816, -511, 5376}, 0, {2788, 456}, {79, 60, 177, 255} }}, - {{ {3452, -244, 6144}, 0, {2238, -312}, {32, 101, 186, 255} }}, {{ {4403, -657, 5715}, 0, {1900, 620}, {1, 73, 152, 255} }}, - {{ {3452, -244, 6144}, 0, {2238, -312}, {32, 101, 186, 255} }}, {{ {4302, -190, 6316}, 0, {1880, -52}, {253, 100, 178, 255} }}, {{ {6377, -101, 5989}, 0, {770, -144}, {220, 88, 172, 255} }}, - {{ {4403, -657, 5715}, 0, {1900, 620}, {1, 73, 152, 255} }}, - {{ {4302, -190, 6316}, 0, {1880, -52}, {253, 100, 178, 255} }}, - {{ {6377, -101, 5989}, 0, {770, -144}, {220, 88, 172, 255} }}, - {{ {6045, -554, 5617}, 0, {864, 492}, {225, 71, 156, 255} }}, - {{ {4403, -657, 5715}, 0, {1900, 620}, {1, 73, 152, 255} }}, {{ {6045, -554, 5617}, 0, {864, 492}, {225, 71, 156, 255} }}, {{ {5882, -1330, 5370}, 0, {916, 1540}, {216, 57, 150, 255} }}, - {{ {4403, -657, 5715}, 0, {1900, 620}, {1, 73, 152, 255} }}, - {{ {5882, -1330, 5370}, 0, {916, 1540}, {216, 57, 150, 255} }}, - {{ {3913, -1330, 5495}, 0, {2224, 1528}, {23, 36, 136, 255} }}, - {{ {2816, -511, 5376}, 0, {2788, 456}, {79, 60, 177, 255} }}, - {{ {4403, -657, 5715}, 0, {1900, 620}, {1, 73, 152, 255} }}, {{ {3913, -1330, 5495}, 0, {2224, 1528}, {23, 36, 136, 255} }}, - {{ {2967, -1330, 5005}, 0, {2858, 1572}, {88, 62, 188, 255} }}, - {{ {2816, -511, 5376}, 0, {2788, 456}, {79, 60, 177, 255} }}, - {{ {3913, -1330, 5495}, 0, {2224, 1528}, {23, 36, 136, 255} }}, - {{ {4791, 405, -485}, 0, {6500, -240}, {216, 98, 70, 255} }}, - {{ {4596, -511, -1016}, 0, {5593, 1152}, {174, 94, 24, 255} }}, - {{ {5019, -1330, 140}, 0, {6598, 2000}, {196, 70, 87, 255} }}, - {{ {5019, -1330, 140}, 0, {6598, 2000}, {196, 70, 87, 255} }}, - {{ {6236, -51, 823}, 0, {7368, 248}, {191, 88, 64, 255} }}, - {{ {4791, 405, -485}, 0, {6500, -240}, {216, 98, 70, 255} }}, - {{ {6236, -51, 823}, 0, {7368, 248}, {191, 88, 64, 255} }}, - {{ {5019, -1330, 140}, 0, {6598, 2000}, {196, 70, 87, 255} }}, - {{ {6045, -1330, 1574}, 0, {7548, 1872}, {159, 52, 63, 255} }}, - {{ {6045, -1330, 1574}, 0, {7548, 1872}, {159, 52, 63, 255} }}, - {{ {6864, -1330, 2905}, 0, {8972, 1760}, {147, 62, 18, 255} }}, - {{ {6236, -51, 823}, 0, {7368, 248}, {191, 88, 64, 255} }}, - {{ {6659, -1330, 4236}, 0, {10144, 1640}, {172, 93, 236, 255} }}, - {{ {5882, -1330, 5370}, 0, {11136, 1540}, {216, 57, 150, 255} }}, - {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, - {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, - {{ {5882, -1330, 5370}, 0, {11136, 1540}, {216, 57, 150, 255} }}, - {{ {6045, -554, 5617}, 0, {11084, 492}, {225, 71, 156, 255} }}, - {{ {6377, -101, 5989}, 0, {10990, -144}, {220, 88, 172, 255} }}, - {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, - {{ {6045, -554, 5617}, 0, {11084, 492}, {225, 71, 156, 255} }}, - {{ {6377, -101, 5989}, 0, {10990, -144}, {220, 88, 172, 255} }}, - {{ {7878, -101, 4665}, 0, {9938, -24}, {169, 85, 220, 255} }}, - {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, - {{ {7878, -101, 4665}, 0, {9938, -24}, {169, 85, 220, 255} }}, - {{ {8018, -101, 3280}, 0, {9206, 96}, {173, 93, 26, 255} }}, - {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, - {{ {7551, 36, 2256}, 0, {11462, 652}, {173, 83, 49, 255} }}, - {{ {8018, -101, 3280}, 0, {10808, 648}, {177, 95, 31, 255} }}, - {{ {8189, 1355, 1649}, 0, {11640, -232}, {163, 69, 52, 255} }}, - {{ {6236, -51, 823}, 0, {7368, 248}, {189, 87, 63, 255} }}, - {{ {6864, -1330, 2905}, 0, {8972, 1760}, {145, 59, 18, 255} }}, - {{ {7551, 36, 2256}, 0, {8578, 132}, {173, 83, 49, 255} }}, - {{ {6864, -1330, 2905}, 0, {8972, 1760}, {145, 59, 18, 255} }}, - {{ {6659, -1330, 4236}, 0, {10144, 1640}, {172, 93, 236, 255} }}, - {{ {7551, 36, 2256}, 0, {8578, 132}, {173, 83, 49, 255} }}, - {{ {7551, 36, 2256}, 0, {8578, 132}, {173, 83, 49, 255} }}, - {{ {6659, -1330, 4236}, 0, {10144, 1640}, {172, 93, 236, 255} }}, - {{ {8018, -101, 3280}, 0, {9206, 96}, {177, 95, 31, 255} }}, - {{ {7245, -702, 4780}, 0, {10192, 760}, {177, 85, 204, 255} }}, - {{ {8018, -101, 3280}, 0, {9206, 96}, {177, 95, 31, 255} }}, - {{ {6659, -1330, 4236}, 0, {10144, 1640}, {172, 93, 236, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_0[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 0, 14, 0), +static const Gfx castle_grounds_1_dl_mesh_tri_0[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(5, 4, 6, 0), gsSP1Triangle(6, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 14, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 29, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 44, 14, 0), + gsSP1Triangle(7, 6, 8, 0), + gsSP1Triangle(8, 9, 7, 0), + gsSP1Triangle(7, 9, 10, 0), + gsSP1Triangle(9, 11, 10, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(13, 12, 11, 0), + gsSP1Triangle(11, 14, 13, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(3, 4, 1, 0), gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 58, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 73, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 88, 15, 0), + gsSP1Triangle(8, 5, 7, 0), + gsSP1Triangle(9, 8, 7, 0), + gsSP1Triangle(9, 10, 8, 0), + gsSP1Triangle(10, 9, 11, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(13, 10, 12, 0), + gsSP1Triangle(12, 14, 13, 0), + gsSP1Triangle(14, 15, 13, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_0 + 32, 11, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(2, 1, 3, 0), + gsSP1Triangle(3, 4, 2, 0), + gsSP1Triangle(5, 2, 4, 0), + gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(7, 5, 6, 0), + gsSP1Triangle(7, 8, 5, 0), + gsSP1Triangle(5, 8, 9, 0), + gsSP1Triangle(5, 9, 10, 0), + gsSP1Triangle(2, 5, 10, 0), + gsSP1Triangle(0, 2, 10, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_1[97] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_1[94] = { {{ {-1521, 2196, -2432}, 0, {10157, 11734}, {244, 70, 105, 255} }}, {{ {-2047, 3028, -3050}, 0, {7706, 9858}, {244, 70, 105, 255} }}, {{ {-2485, 2514, -2756}, 0, {7246, 11734}, {244, 70, 105, 255} }}, @@ -160,9 +96,9 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_1[97] = { {{ {1025, 2484, -2129}, 0, {19985, 6199}, {0, 109, 65, 255} }}, {{ {1025, 3028, -3050}, 0, {19985, 3348}, {0, 109, 65, 255} }}, {{ {-1022, 3028, -3050}, 0, {14320, 3348}, {0, 109, 65, 255} }}, - {{ {1025, 2484, -2129}, 0, {19985, 6199}, {0, 109, 65, 255} }}, - {{ {-1022, 3028, -3050}, 0, {14320, 3348}, {0, 109, 65, 255} }}, - {{ {-1023, 2484, -2127}, 0, {14320, 6199}, {0, 109, 65, 255} }}, + {{ {1025, 2484, -2129}, 0, {19985, 6199}, {0, 109, 64, 255} }}, + {{ {-1022, 3028, -3050}, 0, {14320, 3348}, {0, 109, 64, 255} }}, + {{ {-1023, 2484, -2127}, 0, {14320, 6199}, {0, 109, 64, 255} }}, {{ {2049, 3028, -3050}, 0, {5379, 9858}, {0, 76, 102, 255} }}, {{ {1025, 3028, -3050}, 0, {2817, 8658}, {0, 76, 102, 255} }}, {{ {1525, 2196, -2432}, 0, {3235, 11740}, {0, 76, 102, 255} }}, @@ -190,23 +126,18 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_1[97] = { {{ {-1023, 2484, -2127}, 0, {14322, 6199}, {176, 85, 50, 255} }}, {{ {-1022, 3028, -3050}, 0, {14318, 3348}, {176, 85, 50, 255} }}, {{ {-1521, 2196, -2432}, 0, {12412, 5248}, {176, 85, 50, 255} }}, - {{ {3129, 3176, -2960}, 0, {28904, 2185}, {96, 45, 70, 255} }}, - {{ {3211, 2196, -2432}, 0, {27628, 5640}, {96, 45, 70, 255} }}, - {{ {3674, 2196, -3073}, 0, {29943, 5647}, {96, 45, 70, 255} }}, + {{ {3129, 3176, -2960}, 0, {28904, 2185}, {96, 45, 69, 255} }}, + {{ {3211, 2196, -2432}, 0, {27628, 5640}, {96, 45, 69, 255} }}, + {{ {3674, 2196, -3073}, 0, {29943, 5647}, {96, 45, 69, 255} }}, {{ {-2485, 2514, -2756}, 0, {9837, 3283}, {26, 58, 110, 255} }}, {{ {-3067, 3168, -2960}, 0, {8313, 44}, {26, 58, 110, 255} }}, {{ {-3148, 2196, -2432}, 0, {7403, 3254}, {26, 58, 110, 255} }}, {{ {-3067, 3168, -2960}, 0, {3992, 2185}, {154, 67, 222, 255} }}, {{ {-3468, 2198, -3685}, 0, {2502, 5655}, {154, 67, 222, 255} }}, {{ {-3672, 2196, -3073}, 0, {4585, 5646}, {154, 67, 222, 255} }}, - {{ {2487, 2514, -2756}, 0, {379, -13670}, {97, 82, 0, 255} }}, - {{ {2487, 2514, -6490}, 0, {10721, -13670}, {97, 82, 0, 255} }}, - {{ {2049, 3028, -3050}, 0, {1230, -15115}, {97, 82, 0, 255} }}, {{ {3482, 2201, -3663}, 0, {2862, -10224}, {38, 121, 0, 255} }}, {{ {2487, 2514, -6490}, 0, {10721, -13670}, {38, 121, 0, 255} }}, {{ {2487, 2514, -2756}, 0, {379, -13670}, {38, 121, 0, 255} }}, - {{ {2049, 3028, -3050}, 0, {1230, -15115}, {97, 82, 0, 255} }}, - {{ {2049, 3028, -6145}, 0, {9797, -15115}, {97, 82, 0, 255} }}, {{ {-2485, 2514, -6490}, 0, {2585, -29943}, {217, 121, 0, 255} }}, {{ {-3468, 2198, -3685}, 0, {10443, -26520}, {217, 121, 0, 255} }}, {{ {-2485, 2514, -2756}, 0, {12927, -29943}, {217, 121, 0, 255} }}, @@ -234,6 +165,10 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_1[97] = { {{ {-3468, 2203, -7274}, 0, {16308, -23988}, {0, 118, 209, 255} }}, {{ {2487, 2514, -6490}, 0, {-216, -25963}, {0, 118, 209, 255} }}, {{ {3483, 2201, -7276}, 0, {-2958, -23950}, {0, 118, 209, 255} }}, + {{ {2487, 2514, -2756}, 0, {379, -13670}, {97, 82, 0, 255} }}, + {{ {2487, 2514, -6490}, 0, {10721, -13670}, {97, 82, 0, 255} }}, + {{ {2049, 3028, -3050}, 0, {1230, -15115}, {97, 82, 0, 255} }}, + {{ {2049, 3028, -6145}, 0, {9797, -15115}, {97, 82, 0, 255} }}, {{ {-2047, 3028, -3050}, 0, {12075, -30364}, {159, 82, 0, 255} }}, {{ {-2047, 3028, -6145}, 0, {3509, -30364}, {159, 82, 0, 255} }}, {{ {-2485, 2514, -6490}, 0, {2585, -28919}, {159, 82, 0, 255} }}, @@ -241,8 +176,6 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_1[97] = { {{ {2049, 3028, -6145}, 0, {1008, -23950}, {0, 127, 0, 255} }}, {{ {-2047, 3028, -6145}, 0, {12344, -23950}, {0, 127, 0, 255} }}, {{ {2049, 3028, -3050}, 0, {1008, -15384}, {0, 127, 0, 255} }}, - {{ {2049, 3028, -3050}, 0, {1008, -15384}, {0, 127, 0, 255} }}, - {{ {-2047, 3028, -6145}, 0, {12344, -23950}, {0, 127, 0, 255} }}, {{ {-2047, 3028, -3050}, 0, {12344, -15384}, {0, 127, 0, 255} }}, {{ {-2047, 3028, -6145}, 0, {12342, -27118}, {0, 71, 151, 255} }}, {{ {2049, 3028, -6145}, 0, {1006, -27118}, {0, 71, 151, 255} }}, @@ -250,7 +183,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_1[97] = { {{ {2487, 2514, -6490}, 0, {-216, -25963}, {0, 71, 151, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_1[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_1[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), @@ -269,385 +202,220 @@ static const Gfx castle_grounds_1_dl_mesh_tri_1[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 45, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 4, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 59, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 45, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 74, 16, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 60, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 9, 11, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 90, 7, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 75, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(10, 7, 9, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(13, 12, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_1 + 90, 4, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(2, 1, 3, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_2[72] = { - {{ {-3906, -1330, -6149}, 0, {722, 2679}, {36, 10, 121, 255} }}, - {{ {-4369, 373, -6149}, 0, {872, 1883}, {223, 25, 120, 255} }}, - {{ {-4704, -1330, -5911}, 0, {344, 2483}, {26, 104, 68, 255} }}, - {{ {-4704, -1330, -5911}, 0, {344, 2483}, {26, 104, 68, 255} }}, - {{ {-4369, 373, -6149}, 0, {872, 1883}, {223, 25, 120, 255} }}, - {{ {-5631, 0, -6655}, 0, {420, 1773}, {30, 48, 114, 255} }}, - {{ {-5900, 533, -6711}, 0, {460, 1463}, {51, 42, 108, 255} }}, - {{ {-5631, 0, -6655}, 0, {420, 1773}, {30, 48, 114, 255} }}, - {{ {-4369, 373, -6149}, 0, {872, 1883}, {223, 25, 120, 255} }}, - {{ {-5900, 533, -6711}, 0, {460, 1463}, {51, 42, 108, 255} }}, - {{ {-6613, 203, -5005}, 0, {-380, 1784}, {111, 58, 235, 255} }}, - {{ {-5631, 0, -6655}, 0, {420, 1773}, {30, 48, 114, 255} }}, - {{ {-6613, 203, -5005}, 0, {-380, 1784}, {111, 58, 235, 255} }}, - {{ {-5900, 533, -6711}, 0, {460, 1463}, {51, 42, 108, 255} }}, - {{ {-7231, 1597, -5362}, 0, {-527, 947}, {106, 48, 52, 255} }}, - {{ {-5940, 1466, -6875}, 0, {740, 967}, {51, 39, 110, 255} }}, - {{ {-7231, 1597, -5362}, 0, {-527, 947}, {106, 48, 52, 255} }}, - {{ {-5900, 533, -6711}, 0, {460, 1463}, {51, 42, 108, 255} }}, - {{ {-7274, 2131, -5644}, 0, {-22, 410}, {84, 81, 50, 255} }}, - {{ {-7231, 1597, -5362}, 0, {-527, 947}, {106, 48, 52, 255} }}, - {{ {-5940, 1466, -6875}, 0, {740, 967}, {51, 39, 110, 255} }}, - {{ {-6230, 1949, -7009}, 0, {928, 642}, {48, 74, 91, 255} }}, - {{ {-7274, 2131, -5644}, 0, {-22, 410}, {84, 81, 50, 255} }}, - {{ {-5940, 1466, -6875}, 0, {740, 967}, {51, 39, 110, 255} }}, - {{ {-5940, 1466, -6875}, 0, {740, 967}, {51, 39, 110, 255} }}, - {{ {-5344, 1494, -6924}, 0, {1072, 1086}, {248, 39, 121, 255} }}, - {{ {-6230, 1949, -7009}, 0, {928, 642}, {48, 74, 91, 255} }}, - {{ {-5344, 1494, -6924}, 0, {1072, 1086}, {248, 39, 121, 255} }}, - {{ {-6922, 2865, -7377}, 0, {1189, -227}, {248, 43, 119, 255} }}, - {{ {-6230, 1949, -7009}, 0, {928, 642}, {48, 74, 91, 255} }}, - {{ {-6922, 2865, -7377}, 0, {1189, -227}, {248, 43, 119, 255} }}, - {{ {-7164, 2688, -7336}, 0, {1047, -208}, {19, 81, 96, 255} }}, - {{ {-6230, 1949, -7009}, 0, {928, 642}, {48, 74, 91, 255} }}, - {{ {-8191, 3079, -7570}, 0, {886, -529}, {58, 106, 39, 255} }}, - {{ {-7164, 2688, -7336}, 0, {1047, -208}, {19, 81, 96, 255} }}, - {{ {-6922, 2865, -7377}, 0, {1189, -227}, {248, 43, 119, 255} }}, - {{ {-7796, 2569, -6392}, 0, {185, 77}, {86, 93, 2, 255} }}, - {{ {-7164, 2688, -7336}, 0, {1047, -208}, {19, 81, 96, 255} }}, - {{ {-8191, 3079, -7570}, 0, {886, -529}, {58, 106, 39, 255} }}, - {{ {-8191, 3121, -6586}, 0, {73, -285}, {104, 72, 247, 255} }}, - {{ {-7796, 2569, -6392}, 0, {185, 77}, {86, 93, 2, 255} }}, - {{ {-8191, 3079, -7570}, 0, {886, -529}, {58, 106, 39, 255} }}, - {{ {-8191, 3121, -6586}, 0, {73, -285}, {104, 72, 247, 255} }}, - {{ {-7274, 2131, -5644}, 0, {-22, 410}, {84, 81, 50, 255} }}, - {{ {-7796, 2569, -6392}, 0, {185, 77}, {86, 93, 2, 255} }}, - {{ {-7274, 2131, -5644}, 0, {-22, 410}, {84, 81, 50, 255} }}, - {{ {-6230, 1949, -7009}, 0, {928, 642}, {48, 74, 91, 255} }}, - {{ {-7796, 2569, -6392}, 0, {185, 77}, {86, 93, 2, 255} }}, - {{ {-7164, 2688, -7336}, 0, {1047, -208}, {19, 81, 96, 255} }}, - {{ {-7796, 2569, -6392}, 0, {185, 77}, {86, 93, 2, 255} }}, - {{ {-6230, 1949, -7009}, 0, {928, 642}, {48, 74, 91, 255} }}, - {{ {-6479, 764, -4496}, 0, {-778, 1524}, {65, 94, 200, 255} }}, - {{ {-6613, 203, -5005}, 0, {-380, 1784}, {111, 58, 235, 255} }}, - {{ {-7231, 1597, -5362}, 0, {-527, 947}, {106, 48, 52, 255} }}, - {{ {-6613, 203, -5005}, 0, {-380, 1784}, {111, 58, 235, 255} }}, - {{ {-6479, 764, -4496}, 0, {-778, 1524}, {65, 94, 200, 255} }}, - {{ {-5784, 543, -4360}, 0, {-922, 1990}, {46, 90, 179, 255} }}, - {{ {-6613, 203, -5005}, 0, {-380, 1784}, {111, 58, 235, 255} }}, - {{ {-5784, 543, -4360}, 0, {-922, 1990}, {46, 90, 179, 255} }}, - {{ {-5786, -1330, -4362}, 0, {-339, 2661}, {66, 95, 203, 255} }}, - {{ {-5786, -1330, -4362}, 0, {-339, 2661}, {66, 94, 203, 255} }}, - {{ {-5631, 0, -6655}, 0, {420, 1773}, {30, 48, 114, 255} }}, - {{ {-6613, 203, -5005}, 0, {-380, 1784}, {111, 58, 235, 255} }}, - {{ {-4704, -1330, -5911}, 0, {344, 2483}, {26, 104, 68, 255} }}, - {{ {-5631, 0, -6655}, 0, {420, 1773}, {30, 48, 114, 255} }}, - {{ {-5786, -1330, -4362}, 0, {-339, 2661}, {66, 95, 203, 255} }}, - {{ {-5900, 533, -6711}, 0, {806, 964}, {51, 42, 108, 255} }}, - {{ {-4369, 373, -6149}, 0, {534, 1485}, {223, 25, 120, 255} }}, - {{ {-5344, 1494, -6924}, 0, {1353, 1428}, {248, 39, 121, 255} }}, - {{ {-5344, 1494, -6924}, 0, {1353, 1428}, {248, 39, 121, 255} }}, - {{ {-5940, 1466, -6875}, 0, {1364, 1076}, {51, 39, 110, 255} }}, - {{ {-5900, 533, -6711}, 0, {806, 964}, {51, 42, 108, 255} }}, +static const Vtx castle_grounds_1_dl_mesh_vtx_2[22] = { + {{ {-3906, -1330, -6149}, 0, {1091, 1935}, {36, 10, 121, 255} }}, + {{ {-4369, 373, -6149}, 0, {901, 1332}, {223, 25, 120, 255} }}, + {{ {-4704, -1330, -5911}, 0, {666, 1935}, {26, 104, 68, 255} }}, + {{ {-5631, 0, -6655}, 0, {591, 1505}, {30, 48, 114, 255} }}, + {{ {-5900, 533, -6711}, 0, {504, 1257}, {51, 42, 108, 255} }}, + {{ {-5344, 1494, -6924}, 0, {819, 812}, {248, 39, 121, 255} }}, + {{ {-5940, 1466, -6875}, 0, {554, 825}, {51, 39, 110, 255} }}, + {{ {-6230, 1949, -7009}, 0, {490, 601}, {48, 74, 91, 255} }}, + {{ {-7274, 2131, -5644}, 0, {-498, 517}, {84, 81, 50, 255} }}, + {{ {-7231, 1597, -5362}, 0, {-596, 764}, {106, 48, 52, 255} }}, + {{ {-6613, 203, -5005}, 0, {-489, 1410}, {111, 58, 235, 255} }}, + {{ {-6479, 764, -4496}, 0, {-1147, 1150}, {65, 94, 200, 255} }}, + {{ {-5784, 543, -4360}, 0, {-1147, 1410}, {46, 89, 179, 255} }}, + {{ {-5786, -1330, -4362}, 0, {-414, 1935}, {66, 95, 203, 255} }}, + {{ {-5344, 1494, -6924}, 0, {755, -429}, {248, 39, 121, 255} }}, + {{ {-6922, 2865, -7377}, 0, {551, -1479}, {248, 43, 119, 255} }}, + {{ {-6230, 1949, -7009}, 0, {464, -695}, {48, 74, 91, 255} }}, + {{ {-7164, 2688, -7336}, 0, {240, -1292}, {19, 81, 96, 255} }}, + {{ {-8191, 3079, -7570}, 0, {-53, -1887}, {58, 106, 39, 255} }}, + {{ {-7796, 2569, -6392}, 0, {-343, -1165}, {86, 93, 2, 255} }}, + {{ {-8191, 3121, -6586}, 0, {-417, -1932}, {104, 72, 247, 255} }}, + {{ {-7274, 2131, -5644}, 0, {-426, -695}, {84, 81, 50, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_2[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_2 + 0, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_2 + 15, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_2 + 30, 15, 0), +static const Gfx castle_grounds_1_dl_mesh_tri_2[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_2 + 0, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_2 + 45, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_2 + 60, 12, 0), + gsSP1Triangle(2, 1, 3, 0), + gsSP1Triangle(4, 3, 1, 0), + gsSP1Triangle(4, 1, 5, 0), + gsSP1Triangle(5, 6, 4, 0), + gsSP1Triangle(6, 5, 7, 0), + gsSP1Triangle(7, 8, 6, 0), + gsSP1Triangle(8, 9, 6, 0), + gsSP1Triangle(6, 9, 4, 0), + gsSP1Triangle(10, 4, 9, 0), + gsSP1Triangle(11, 10, 9, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(10, 12, 13, 0), + gsSP1Triangle(13, 3, 10, 0), + gsSP1Triangle(2, 3, 13, 0), + gsSP1Triangle(4, 10, 3, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_2 + 14, 8, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(1, 3, 2, 0), + gsSP1Triangle(4, 3, 1, 0), + gsSP1Triangle(5, 3, 4, 0), + gsSP1Triangle(6, 5, 4, 0), + gsSP1Triangle(6, 7, 5, 0), + gsSP1Triangle(7, 2, 5, 0), + gsSP1Triangle(3, 5, 2, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_3[168] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_3[64] = { {{ {3556, 405, -36}, 0, {7526, 3351}, {73, 97, 37, 255} }}, {{ {2317, 371, 683}, 0, {3761, 4567}, {30, 119, 34, 255} }}, {{ {3362, 0, 725}, 0, {6072, 5010}, {87, 79, 48, 255} }}, - {{ {-2047, 260, 5792}, 0, {-12936, 14685}, {31, 117, 219, 255} }}, - {{ {-3471, 260, 4623}, 0, {-14604, 11562}, {33, 118, 224, 255} }}, - {{ {-4866, 758, 5049}, 0, {-18330, 12061}, {17, 122, 224, 255} }}, - {{ {-4318, 260, 3323}, 0, {-14788, 8335}, {9, 126, 247, 255} }}, - {{ {-4866, 758, 5049}, 0, {-18330, 12061}, {17, 122, 224, 255} }}, - {{ {-3471, 260, 4623}, 0, {-14604, 11562}, {33, 118, 224, 255} }}, + {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, + {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, + {{ {91, 801, 1396}, 0, {-2232, 5440}, {13, 126, 9, 255} }}, + {{ {-1112, 801, 1396}, 0, {-4957, 5039}, {246, 127, 2, 255} }}, + {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, + {{ {-2317, 518, 929}, 0, {-7064, 3579}, {237, 125, 245, 255} }}, + {{ {-3360, 420, 1188}, 0, {-9771, 3817}, {239, 126, 3, 255} }}, + {{ {-3726, 260, 2048}, 0, {-11749, 5644}, {239, 126, 8, 255} }}, + {{ {-3372, 260, 2933}, 0, {-12126, 7768}, {245, 126, 9, 255} }}, + {{ {-2317, 260, 3579}, 0, {-10598, 9582}, {250, 122, 34, 255} }}, + {{ {-816, 260, 3370}, 0, {-6918, 9609}, {240, 122, 31, 255} }}, + {{ {513, 823, 3527}, 0, {-4118, 10406}, {13, 126, 2, 255} }}, + {{ {1650, 143, 2512}, 0, {-189, 8487}, {56, 113, 16, 255} }}, + {{ {1613, 89, 3404}, 0, {-1462, 10496}, {79, 99, 14, 255} }}, + {{ {1650, 143, 2512}, 0, {-189, 8487}, {56, 113, 16, 255} }}, + {{ {513, 823, 3527}, 0, {-4118, 10406}, {13, 126, 2, 255} }}, + {{ {2601, -101, 2939}, 0, {1396, 9772}, {72, 78, 70, 255} }}, + {{ {3238, -89, 1787}, 0, {4375, 7375}, {90, 84, 31, 255} }}, + {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, + {{ {3362, 0, 725}, 0, {6072, 5010}, {87, 79, 48, 255} }}, + {{ {-2047, 260, 5792}, 0, {-12936, 14685}, {31, 118, 219, 255} }}, + {{ {-3471, 260, 4623}, 0, {-14604, 11562}, {33, 119, 224, 255} }}, {{ {-4866, 758, 5049}, 0, {-18330, 12061}, {17, 122, 224, 255} }}, {{ {-4318, 260, 3323}, 0, {-14788, 8335}, {9, 126, 247, 255} }}, {{ {-6678, 590, 4409}, 0, {-21583, 10010}, {6, 125, 237, 255} }}, {{ {-4599, 260, 2299}, 0, {-14060, 5922}, {3, 127, 253, 255} }}, - {{ {-6678, 590, 4409}, 0, {-21583, 10010}, {6, 125, 237, 255} }}, - {{ {-4318, 260, 3323}, 0, {-14788, 8335}, {9, 126, 247, 255} }}, - {{ {-6678, 590, 4409}, 0, {-21583, 10010}, {6, 125, 237, 255} }}, - {{ {-4599, 260, 2299}, 0, {-14060, 5922}, {3, 127, 253, 255} }}, {{ {-7415, 508, 3183}, 0, {-21617, 6986}, {4, 125, 232, 255} }}, {{ {-7685, 260, 2269}, 0, {-21010, 4826}, {0, 126, 241, 255} }}, - {{ {-7415, 508, 3183}, 0, {-21617, 6986}, {4, 125, 232, 255} }}, - {{ {-4599, 260, 2299}, 0, {-14060, 5922}, {3, 127, 253, 255} }}, - {{ {-4599, 260, 2299}, 0, {-14060, 5922}, {3, 127, 253, 255} }}, {{ {-4666, 260, 1401}, 0, {-13015, 3865}, {251, 127, 6, 255} }}, - {{ {-7685, 260, 2269}, 0, {-21010, 4826}, {0, 126, 241, 255} }}, {{ {-7685, 260, 0}, 0, {-17985, -314}, {254, 127, 3, 255} }}, {{ {-7685, 260, 2269}, 0, {-21010, 4826}, {0, 126, 241, 255} }}, {{ {-4666, 260, 1401}, 0, {-13015, 3865}, {251, 127, 6, 255} }}, {{ {-4349, 371, 195}, 0, {-10688, 1240}, {249, 127, 4, 255} }}, - {{ {-7685, 260, 0}, 0, {-17985, -314}, {254, 127, 3, 255} }}, - {{ {-7685, 260, 0}, 0, {-17985, -314}, {254, 127, 3, 255} }}, - {{ {-4349, 371, 195}, 0, {-10688, 1240}, {249, 127, 4, 255} }}, {{ {-5686, 371, -1777}, 0, {-11088, -3673}, {252, 127, 4, 255} }}, - {{ {-7685, 260, 0}, 0, {-17985, -314}, {254, 127, 3, 255} }}, - {{ {-5686, 371, -1777}, 0, {-11088, -3673}, {252, 127, 4, 255} }}, - {{ {-6899, 371, -2048}, 0, {-13474, -4691}, {255, 127, 3, 255} }}, - {{ {-6641, 371, -3573}, 0, {-10856, -8060}, {242, 124, 26, 255} }}, {{ {-6899, 371, -2048}, 0, {-13474, -4691}, {255, 127, 3, 255} }}, - {{ {-5686, 371, -1777}, 0, {-11088, -3673}, {252, 127, 4, 255} }}, - {{ {-5272, 422, -2763}, 0, {-8835, -5770}, {250, 126, 11, 255} }}, {{ {-6641, 371, -3573}, 0, {-10856, -8060}, {242, 124, 26, 255} }}, {{ {-5272, 422, -2763}, 0, {-8835, -5770}, {250, 126, 11, 255} }}, {{ {-5863, 543, -3691}, 0, {-8938, -8067}, {250, 125, 21, 255} }}, - {{ {-6641, 371, -3573}, 0, {-10856, -8060}, {242, 124, 26, 255} }}, - {{ {-5863, 543, -3691}, 0, {-8938, -8067}, {250, 125, 21, 255} }}, - {{ {-5272, 422, -2763}, 0, {-8835, -5770}, {250, 126, 11, 255} }}, {{ {-5307, 543, -3479}, 0, {-7960, -7402}, {255, 126, 13, 255} }}, {{ {-6479, 764, -4496}, 0, {-9258, -10096}, {65, 94, 200, 255} }}, - {{ {-6641, 371, -3573}, 0, {-10856, -8060}, {242, 124, 26, 255} }}, - {{ {-5863, 543, -3691}, 0, {-8938, -8067}, {250, 125, 21, 255} }}, - {{ {-5863, 543, -3691}, 0, {-8938, -8067}, {250, 125, 21, 255} }}, - {{ {-5784, 543, -4360}, 0, {-7866, -9556}, {46, 90, 179, 255} }}, - {{ {-6479, 764, -4496}, 0, {-9258, -10096}, {65, 94, 200, 255} }}, - {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, - {{ {2317, 371, 683}, 0, {3761, 4567}, {30, 119, 34, 255} }}, - {{ {91, 801, 1396}, 0, {-2232, 5440}, {13, 126, 9, 255} }}, - {{ {91, 801, 1396}, 0, {-2232, 5440}, {13, 126, 9, 255} }}, - {{ {-1112, 801, 1396}, 0, {-4957, 5039}, {246, 127, 2, 255} }}, - {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, - {{ {-1112, 801, 1396}, 0, {-4957, 5039}, {246, 127, 2, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {-1112, 801, 1396}, 0, {-4957, 5039}, {246, 127, 2, 255} }}, - {{ {-2317, 518, 929}, 0, {-7064, 3579}, {237, 125, 245, 255} }}, - {{ {-2317, 518, 929}, 0, {-7064, 3579}, {237, 125, 245, 255} }}, - {{ {-3360, 420, 1188}, 0, {-9771, 3817}, {239, 126, 3, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {-3360, 420, 1188}, 0, {-9771, 3817}, {239, 126, 3, 255} }}, - {{ {-3726, 260, 2048}, 0, {-11749, 5644}, {239, 126, 8, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {-3372, 260, 2933}, 0, {-12126, 7768}, {245, 126, 9, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {-3726, 260, 2048}, 0, {-11749, 5644}, {239, 126, 8, 255} }}, - {{ {-3372, 260, 2933}, 0, {-12126, 7768}, {245, 126, 9, 255} }}, - {{ {-2317, 260, 3579}, 0, {-10598, 9582}, {250, 122, 34, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {-816, 260, 3370}, 0, {-6918, 9609}, {240, 122, 31, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {-2317, 260, 3579}, 0, {-10598, 9582}, {250, 122, 34, 255} }}, - {{ {-816, 260, 3370}, 0, {-6918, 9609}, {240, 122, 31, 255} }}, - {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, - {{ {-2317, 690, 2048}, 0, {-8557, 6114}, {239, 125, 12, 255} }}, - {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, - {{ {-816, 260, 3370}, 0, {-6918, 9609}, {240, 122, 31, 255} }}, - {{ {513, 823, 3527}, 0, {-4118, 10406}, {13, 126, 2, 255} }}, - {{ {513, 823, 3527}, 0, {-4118, 10406}, {13, 126, 2, 255} }}, - {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, - {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, - {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, - {{ {513, 823, 3527}, 0, {-4118, 10406}, {13, 126, 2, 255} }}, - {{ {1650, 143, 2512}, 0, {-189, 8487}, {55, 113, 16, 255} }}, - {{ {1613, 89, 3404}, 0, {-1462, 10496}, {79, 99, 14, 255} }}, - {{ {1650, 143, 2512}, 0, {-189, 8487}, {55, 113, 16, 255} }}, - {{ {513, 823, 3527}, 0, {-4118, 10406}, {13, 126, 2, 255} }}, - {{ {1613, 89, 3404}, 0, {-1462, 10496}, {79, 99, 14, 255} }}, - {{ {2601, -101, 2939}, 0, {1396, 9772}, {72, 78, 70, 255} }}, - {{ {1650, 143, 2512}, 0, {-189, 8487}, {55, 113, 16, 255} }}, - {{ {3238, -89, 1787}, 0, {4375, 7375}, {90, 84, 31, 255} }}, - {{ {1650, 143, 2512}, 0, {-189, 8487}, {55, 113, 16, 255} }}, - {{ {2601, -101, 2939}, 0, {1396, 9772}, {72, 78, 70, 255} }}, - {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, - {{ {1650, 143, 2512}, 0, {-189, 8487}, {55, 113, 16, 255} }}, - {{ {3238, -89, 1787}, 0, {4375, 7375}, {90, 84, 31, 255} }}, - {{ {3362, 0, 725}, 0, {6072, 5010}, {87, 79, 48, 255} }}, - {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, - {{ {3238, -89, 1787}, 0, {4375, 7375}, {90, 84, 31, 255} }}, - {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, - {{ {3362, 0, 725}, 0, {6072, 5010}, {87, 79, 48, 255} }}, - {{ {2317, 371, 683}, 0, {3761, 4567}, {30, 119, 34, 255} }}, - {{ {2317, 371, 683}, 0, {3761, 4567}, {30, 119, 34, 255} }}, - {{ {1, 727, 2146}, 0, {-3437, 7110}, {5, 126, 12, 255} }}, - {{ {2104, 89, 1305}, 0, {2451, 5904}, {38, 117, 33, 255} }}, + {{ {-5784, 543, -4360}, 0, {-7866, -9556}, {46, 89, 179, 255} }}, {{ {4988, 545, -7071}, 0, {20149, -12107}, {234, 125, 0, 255} }}, {{ {4369, 545, -7748}, 0, {19650, -13847}, {0, 127, 0, 255} }}, {{ {4064, 545, -7584}, 0, {18740, -13577}, {0, 127, 0, 255} }}, - {{ {4988, 545, -7071}, 0, {20149, -12107}, {234, 125, 0, 255} }}, {{ {4997, 545, -8085}, 0, {21522, -14401}, {236, 125, 0, 255} }}, {{ {5973, 910, -7190}, 0, {22539, -12048}, {216, 121, 2, 255} }}, {{ {4997, 545, -8085}, 0, {21522, -14401}, {236, 125, 0, 255} }}, {{ {4988, 545, -7071}, 0, {20149, -12107}, {234, 125, 0, 255} }}, - {{ {4988, 545, -7071}, 0, {20149, -12107}, {234, 125, 0, 255} }}, - {{ {5437, 704, -5678}, 0, {19309, -8802}, {222, 122, 5, 255} }}, - {{ {5973, 910, -7190}, 0, {22539, -12048}, {216, 121, 2, 255} }}, - {{ {5437, 704, -5678}, 0, {19309, -8802}, {222, 122, 5, 255} }}, - {{ {4988, 545, -7071}, 0, {20149, -12107}, {234, 125, 0, 255} }}, - {{ {4961, 544, -3761}, 0, {15676, -4618}, {249, 126, 9, 255} }}, - {{ {7304, 868, -4094}, 0, {21426, -4592}, {236, 125, 14, 255} }}, {{ {5437, 704, -5678}, 0, {19309, -8802}, {222, 122, 5, 255} }}, {{ {4961, 544, -3761}, 0, {15676, -4618}, {249, 126, 9, 255} }}, {{ {7304, 868, -4094}, 0, {21426, -4592}, {236, 125, 14, 255} }}, - {{ {4961, 544, -3761}, 0, {15676, -4618}, {249, 126, 9, 255} }}, {{ {5632, 371, -2046}, 0, {14908, -510}, {246, 126, 6, 255} }}, - {{ {7304, 868, -4094}, 0, {21426, -4592}, {236, 125, 14, 255} }}, - {{ {5632, 371, -2046}, 0, {14908, -510}, {246, 126, 6, 255} }}, - {{ {7201, 627, -1944}, 0, {18326, 243}, {237, 125, 9, 255} }}, {{ {7201, 627, -1944}, 0, {18326, 243}, {237, 125, 9, 255} }}, - {{ {5632, 371, -2046}, 0, {14908, -510}, {246, 126, 6, 255} }}, - {{ {6300, 474, -957}, 0, {14970, 2180}, {244, 126, 7, 255} }}, {{ {6300, 474, -957}, 0, {14970, 2180}, {244, 126, 7, 255} }}, - {{ {5632, 371, -2046}, 0, {14908, -510}, {246, 126, 6, 255} }}, - {{ {5247, 397, -636}, 0, {12157, 2556}, {0, 126, 14, 255} }}, - {{ {6620, 371, -2}, 0, {14421, 4449}, {233, 121, 32, 255} }}, - {{ {6300, 474, -957}, 0, {14970, 2180}, {244, 126, 7, 255} }}, - {{ {5247, 397, -636}, 0, {12157, 2556}, {0, 126, 14, 255} }}, - {{ {5247, 397, -636}, 0, {12157, 2556}, {0, 126, 14, 255} }}, - {{ {6236, -51, 823}, 0, {12451, 6190}, {191, 88, 64, 255} }}, - {{ {6620, 371, -2}, 0, {14421, 4449}, {233, 121, 32, 255} }}, - {{ {4791, 405, -485}, 0, {10922, 2746}, {216, 98, 70, 255} }}, - {{ {6236, -51, 823}, 0, {12451, 6190}, {191, 88, 64, 255} }}, {{ {5247, 397, -636}, 0, {12157, 2556}, {0, 126, 14, 255} }}, - {{ {7167, 474, 1}, 0, {15656, 4639}, {236, 123, 24, 255} }}, - {{ {6300, 474, -957}, 0, {14970, 2180}, {244, 126, 7, 255} }}, - {{ {6620, 371, -2}, 0, {14421, 4449}, {233, 121, 32, 255} }}, - {{ {7201, 627, -1944}, 0, {18326, 243}, {237, 125, 9, 255} }}, - {{ {6300, 474, -957}, 0, {14970, 2180}, {244, 126, 7, 255} }}, - {{ {7167, 474, 1}, 0, {15656, 4639}, {236, 123, 24, 255} }}, - {{ {7304, 868, -4094}, 0, {21426, -4592}, {236, 125, 14, 255} }}, - {{ {6787, 1022, -5677}, 0, {22366, -8350}, {227, 123, 16, 255} }}, - {{ {5437, 704, -5678}, 0, {19309, -8802}, {222, 122, 5, 255} }}, - {{ {6787, 1022, -5677}, 0, {22366, -8350}, {227, 123, 16, 255} }}, - {{ {5973, 910, -7190}, 0, {22539, -12048}, {216, 121, 2, 255} }}, - {{ {5437, 704, -5678}, 0, {19309, -8802}, {222, 122, 5, 255} }}, - {{ {7551, 36, 2256}, 0, {13519, 9875}, {173, 83, 49, 255} }}, {{ {6620, 371, -2}, 0, {14421, 4449}, {233, 121, 31, 255} }}, - {{ {6236, -51, 823}, 0, {12451, 6190}, {189, 87, 63, 255} }}, - {{ {7551, 36, 2256}, 0, {13519, 9875}, {173, 83, 49, 255} }}, - {{ {7167, 474, 1}, 0, {15656, 4639}, {236, 123, 22, 255} }}, - {{ {6620, 371, -2}, 0, {14421, 4449}, {233, 121, 31, 255} }}, -}; - -static const Gfx castle_grounds_1_dl_mesh_tri_3[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 0, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 15, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 7, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 29, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 4, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 43, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 58, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 73, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 88, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 103, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 117, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 132, 15, 0), + {{ {6236, -51, 823}, 0, {12451, 6190}, {189, 87, 63, 255} }}, + {{ {4791, 405, -485}, 0, {10922, 2746}, {216, 98, 70, 255} }}, + {{ {7551, 36, 2256}, 0, {13519, 9875}, {173, 83, 49, 255} }}, + {{ {7167, 474, 1}, 0, {15656, 4639}, {236, 123, 22, 255} }}, + {{ {6787, 1022, -5677}, 0, {22366, -8350}, {227, 123, 16, 255} }}, +}; + +static const Gfx castle_grounds_1_dl_mesh_tri_3[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 0, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 2, 1, 0), + gsSP1Triangle(1, 4, 3, 0), + gsSP1Triangle(4, 1, 5, 0), + gsSP1Triangle(5, 6, 4, 0), + gsSP1Triangle(6, 7, 4, 0), + gsSP1Triangle(7, 6, 8, 0), + gsSP1Triangle(8, 9, 7, 0), + gsSP1Triangle(9, 10, 7, 0), + gsSP1Triangle(11, 7, 10, 0), + gsSP1Triangle(11, 12, 7, 0), + gsSP1Triangle(13, 7, 12, 0), + gsSP1Triangle(13, 4, 7, 0), + gsSP1Triangle(4, 13, 14, 0), + gsSP1Triangle(14, 3, 4, 0), + gsSP1Triangle(3, 14, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 1, 3, 0), + gsSP1Triangle(5, 1, 4, 0), + gsSP1Triangle(6, 5, 4, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(10, 9, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 147, 15, 0), + gsSP1Triangle(12, 11, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(14, 13, 12, 0), + gsSP1Triangle(12, 15, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 32, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(0, 4, 5, 0), + gsSP1Triangle(6, 5, 4, 0), + gsSP1Triangle(7, 6, 4, 0), + gsSP1Triangle(7, 8, 6, 0), + gsSP1Triangle(8, 7, 9, 0), + gsSP1Triangle(10, 6, 8, 0), + gsSP1Triangle(8, 11, 10, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 162, 6, 0), + gsSP1Triangle(13, 12, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_3 + 48, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(2, 3, 0, 0), + gsSP1Triangle(3, 2, 4, 0), + gsSP1Triangle(5, 3, 4, 0), + gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(7, 6, 8, 0), + gsSP1Triangle(8, 6, 9, 0), + gsSP1Triangle(10, 8, 9, 0), + gsSP1Triangle(9, 11, 10, 0), + gsSP1Triangle(12, 11, 9, 0), + gsSP1Triangle(13, 10, 11, 0), + gsSP1Triangle(13, 14, 10, 0), + gsSP1Triangle(14, 8, 10, 0), + gsSP1Triangle(7, 8, 14, 0), + gsSP1Triangle(5, 15, 3, 0), + gsSP1Triangle(15, 0, 3, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_4[126] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_4[71] = { {{ {3482, 545, -5438}, 0, {12878, -16205}, {0, 127, 0, 255} }}, {{ {4988, 545, -7071}, 0, {17662, -22115}, {234, 125, 0, 255} }}, {{ {4064, 545, -7584}, 0, {14666, -24065}, {0, 127, 0, 255} }}, @@ -671,96 +439,41 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_4[126] = { {{ {4791, 405, -485}, 0, {17244, 1593}, {216, 98, 70, 255} }}, {{ {5247, 397, -636}, 0, {18713, 1081}, {0, 126, 14, 255} }}, {{ {4597, 405, -1016}, 0, {16604, -325}, {177, 92, 219, 255} }}, - {{ {5247, 397, -636}, 0, {18713, 1081}, {0, 126, 14, 255} }}, - {{ {5052, 371, -2053}, 0, {18034, -4018}, {179, 101, 3, 255} }}, - {{ {4597, 405, -1016}, 0, {16604, -325}, {177, 92, 219, 255} }}, - {{ {5247, 397, -636}, 0, {18713, 1081}, {0, 126, 14, 255} }}, - {{ {5632, 371, -2046}, 0, {19903, -3958}, {246, 126, 6, 255} }}, {{ {5052, 371, -2053}, 0, {18034, -4018}, {179, 101, 3, 255} }}, {{ {5632, 371, -2046}, 0, {19903, -3958}, {246, 126, 6, 255} }}, {{ {4961, 544, -3761}, 0, {17694, -10158}, {249, 126, 9, 255} }}, - {{ {5052, 371, -2053}, 0, {18034, -4018}, {179, 101, 3, 255} }}, - {{ {5052, 371, -2053}, 0, {18034, -4018}, {179, 101, 3, 255} }}, - {{ {4407, 545, -3689}, 0, {15908, -9931}, {165, 86, 21, 255} }}, {{ {4407, 545, -3689}, 0, {15908, -9931}, {165, 86, 21, 255} }}, - {{ {4961, 544, -3761}, 0, {17694, -10158}, {249, 126, 9, 255} }}, {{ {4409, 545, -5437}, 0, {15859, -16205}, {245, 125, 17, 255} }}, - {{ {4961, 544, -3761}, 0, {17694, -10158}, {249, 126, 9, 255} }}, {{ {4988, 545, -7071}, 0, {17667, -22031}, {234, 125, 0, 255} }}, - {{ {4409, 545, -5437}, 0, {15859, -16205}, {245, 125, 17, 255} }}, {{ {3556, 405, -36}, 0, {13287, 3125}, {73, 97, 37, 255} }}, {{ {3362, 405, -567}, 0, {12646, 1207}, {223, 90, 172, 255} }}, {{ {2314, 371, -162}, 0, {9288, 2593}, {249, 92, 168, 255} }}, {{ {2317, 371, 683}, 0, {9328, 5626}, {30, 119, 34, 255} }}, - {{ {3556, 405, -36}, 0, {13287, 3125}, {73, 97, 37, 255} }}, - {{ {2314, 371, -162}, 0, {9288, 2593}, {249, 92, 168, 255} }}, - {{ {2317, 371, 683}, 0, {9328, 5626}, {30, 119, 34, 255} }}, - {{ {2314, 371, -162}, 0, {9288, 2593}, {249, 92, 168, 255} }}, - {{ {554, 811, -162}, 0, {3628, 2480}, {77, 101, 3, 255} }}, - {{ {91, 801, 1396}, 0, {2188, 8042}, {13, 126, 9, 255} }}, - {{ {2317, 371, 683}, 0, {9328, 5626}, {30, 119, 34, 255} }}, {{ {554, 811, -162}, 0, {3628, 2480}, {77, 101, 3, 255} }}, {{ {91, 801, 1396}, 0, {2188, 8042}, {13, 126, 9, 255} }}, - {{ {554, 811, -162}, 0, {3628, 2480}, {77, 101, 3, 255} }}, - {{ {-1112, 801, 1396}, 0, {-1681, 7965}, {246, 127, 2, 255} }}, {{ {-1112, 801, 1396}, 0, {-1681, 7965}, {246, 127, 2, 255} }}, - {{ {554, 811, -162}, 0, {3628, 2480}, {77, 101, 3, 255} }}, - {{ {-553, 811, -162}, 0, {68, 2409}, {183, 104, 253, 255} }}, - {{ {-1112, 801, 1396}, 0, {-1681, 7965}, {246, 127, 2, 255} }}, - {{ {-553, 811, -162}, 0, {68, 2409}, {183, 104, 253, 255} }}, - {{ {-2317, 518, 929}, 0, {-5571, 6211}, {237, 125, 245, 255} }}, - {{ {-2317, 518, 929}, 0, {-5571, 6211}, {237, 125, 245, 255} }}, {{ {-553, 811, -162}, 0, {68, 2409}, {183, 104, 253, 255} }}, - {{ {-2047, 518, -137}, 0, {-4737, 2313}, {251, 89, 166, 255} }}, - {{ {-3360, 420, 1188}, 0, {-8917, 7070}, {239, 126, 3, 255} }}, {{ {-2317, 518, 929}, 0, {-5571, 6211}, {237, 125, 245, 255} }}, {{ {-2047, 518, -137}, 0, {-4737, 2313}, {251, 89, 166, 255} }}, {{ {-3360, 420, 1188}, 0, {-8917, 7070}, {239, 126, 3, 255} }}, - {{ {-2047, 518, -137}, 0, {-4737, 2313}, {251, 89, 166, 255} }}, - {{ {-4349, 371, 195}, 0, {-12173, 3660}, {249, 127, 4, 255} }}, - {{ {-4349, 371, 195}, 0, {-12173, 3660}, {249, 127, 4, 255} }}, - {{ {-2047, 518, -137}, 0, {-4737, 2313}, {251, 89, 166, 255} }}, - {{ {-4132, 371, -562}, 0, {-11456, 743}, {40, 102, 192, 255} }}, {{ {-4349, 371, 195}, 0, {-12173, 3660}, {249, 127, 4, 255} }}, {{ {-4132, 371, -562}, 0, {-11456, 743}, {40, 102, 192, 255} }}, {{ {-5686, 371, -1777}, 0, {-15686, -2787}, {252, 127, 4, 255} }}, - {{ {-4132, 371, -562}, 0, {-11456, 743}, {40, 102, 192, 255} }}, - {{ {-4796, 405, -1606}, 0, {-13624, -3047}, {73, 103, 245, 255} }}, - {{ {-5686, 371, -1777}, 0, {-15686, -2787}, {252, 127, 4, 255} }}, - {{ {-5686, 371, -1777}, 0, {-15686, -2787}, {252, 127, 4, 255} }}, - {{ {-4796, 405, -1606}, 0, {-13624, -3047}, {73, 103, 245, 255} }}, + {{ {-4796, 405, -1606}, 0, {-13624, -3047}, {73, 103, 244, 255} }}, {{ {-5272, 422, -2763}, 0, {-15024, -7159}, {250, 126, 11, 255} }}, - {{ {-4796, 405, -1606}, 0, {-13624, -3047}, {73, 103, 245, 255} }}, + {{ {-4796, 405, -1606}, 0, {-13624, -3047}, {73, 103, 244, 255} }}, {{ {-4671, 422, -2545}, 0, {-13252, -6409}, {92, 87, 9, 255} }}, {{ {-5272, 422, -2763}, 0, {-15024, -7159}, {250, 126, 11, 255} }}, - {{ {-4671, 422, -2545}, 0, {-13252, -6409}, {92, 87, 9, 255} }}, - {{ {-4700, 543, -3663}, 0, {-13381, -10424}, {92, 87, 241, 255} }}, - {{ {-5272, 422, -2763}, 0, {-15024, -7159}, {250, 126, 11, 255} }}, - {{ {-5272, 422, -2763}, 0, {-15024, -7159}, {250, 126, 11, 255} }}, {{ {-4700, 543, -3663}, 0, {-13381, -10424}, {92, 87, 241, 255} }}, {{ {-5307, 543, -3479}, 0, {-15327, -9803}, {255, 126, 13, 255} }}, - {{ {-5307, 543, -3479}, 0, {-15327, -9803}, {255, 126, 13, 255} }}, - {{ {-4700, 543, -3663}, 0, {-13381, -10424}, {92, 87, 241, 255} }}, {{ {-4928, 543, -4193}, 0, {-14131, -12341}, {63, 78, 178, 255} }}, - {{ {-5307, 543, -3479}, 0, {-15327, -9803}, {255, 126, 13, 255} }}, - {{ {-5863, 543, -3691}, 0, {-17125, -10592}, {250, 125, 21, 255} }}, {{ {-5863, 543, -3691}, 0, {-17125, -10592}, {250, 125, 21, 255} }}, - {{ {-4928, 543, -4193}, 0, {-14131, -12341}, {63, 78, 178, 255} }}, - {{ {-5784, 543, -4360}, 0, {-16889, -12994}, {46, 90, 179, 255} }}, + {{ {-5784, 543, -4360}, 0, {-16889, -12994}, {46, 89, 179, 255} }}, {{ {-3884, 260, 6005}, 0, {-10224, 24849}, {0, 127, 0, 255} }}, {{ {-3372, 260, 2933}, 0, {-9087, 16785}, {245, 126, 9, 255} }}, {{ {-4318, 260, 3323}, 0, {-11310, 17767}, {9, 126, 247, 255} }}, - {{ {-4318, 260, 3323}, 0, {-11310, 17767}, {9, 126, 247, 255} }}, - {{ {-3372, 260, 2933}, 0, {-9087, 16785}, {245, 126, 9, 255} }}, - {{ {-3726, 260, 2048}, 0, {-9945, 14438}, {239, 126, 8, 255} }}, - {{ {-4318, 260, 3323}, 0, {-11310, 17767}, {9, 126, 247, 255} }}, {{ {-3726, 260, 2048}, 0, {-9945, 14438}, {239, 126, 8, 255} }}, {{ {-4599, 260, 2299}, 0, {-11997, 15058}, {3, 127, 253, 255} }}, - {{ {-3726, 260, 2048}, 0, {-9945, 14438}, {239, 126, 8, 255} }}, - {{ {-4666, 260, 1401}, 0, {-12176, 12691}, {251, 127, 6, 255} }}, - {{ {-3360, 420, 1188}, 0, {-9100, 12189}, {239, 126, 3, 255} }}, - {{ {-4666, 260, 1401}, 0, {-12176, 12691}, {251, 127, 6, 255} }}, - {{ {-3726, 260, 2048}, 0, {-9945, 14438}, {239, 126, 8, 255} }}, {{ {-4666, 260, 1401}, 0, {-12176, 12691}, {251, 127, 6, 255} }}, {{ {-3360, 420, 1188}, 0, {-9100, 12189}, {239, 126, 3, 255} }}, {{ {-4349, 371, 195}, 0, {-11487, 9688}, {249, 127, 4, 255} }}, @@ -776,7 +489,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_4[126] = { {{ {-1409, 260, 2933}, 0, {-4456, 16878}, {0, 127, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_4[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_4[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 0, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 0, 0), @@ -787,45 +500,41 @@ static const Gfx castle_grounds_1_dl_mesh_tri_4[] = { gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 29, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 4, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 43, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 58, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 73, 15, 0), + gsSP1Triangle(7, 9, 8, 0), + gsSP1Triangle(7, 10, 9, 0), + gsSP1Triangle(10, 11, 9, 0), + gsSP1Triangle(9, 11, 12, 0), + gsSP1Triangle(12, 11, 13, 0), + gsSP1Triangle(11, 14, 13, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 29, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 0, 2, 0), + gsSP1Triangle(3, 2, 4, 0), + gsSP1Triangle(5, 3, 4, 0), + gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(6, 4, 7, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 88, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 5, 7, 0), - gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 7, 9, 0), + gsSP1Triangle(10, 8, 9, 0), + gsSP1Triangle(10, 9, 11, 0), + gsSP1Triangle(11, 9, 12, 0), gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 102, 14, 0), + gsSP1Triangle(12, 14, 13, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 45, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(1, 3, 2, 0), + gsSP1Triangle(2, 3, 4, 0), + gsSP1Triangle(4, 3, 5, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(6, 5, 7, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 116, 10, 0), + gsSP1Triangle(10, 9, 11, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(12, 11, 13, 0), + gsSP1Triangle(14, 13, 11, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_4 + 61, 10, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsSP1Triangle(4, 5, 6, 0), @@ -835,7 +544,7 @@ static const Gfx castle_grounds_1_dl_mesh_tri_4[] = { gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_5[58] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_5[57] = { {{ {451, 803, -2223}, 0, {6, -15036}, {0, 70, 150, 255} }}, {{ {554, 957, -2121}, 0, {736, -13705}, {0, 70, 150, 255} }}, {{ {554, 803, -2223}, 0, {739, -15027}, {0, 70, 150, 255} }}, @@ -857,8 +566,6 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_5[58] = { {{ {-553, 803, -2229}, 0, {6, -15036}, {0, 70, 150, 255} }}, {{ {-553, 957, -2127}, 0, {10, -13703}, {0, 70, 150, 255} }}, {{ {-450, 957, -2127}, 0, {736, -13705}, {0, 70, 150, 255} }}, - {{ {-553, 803, -2229}, 0, {6, -15036}, {0, 70, 150, 255} }}, - {{ {-450, 957, -2127}, 0, {736, -13705}, {0, 70, 150, 255} }}, {{ {-450, 803, -2229}, 0, {739, -15027}, {0, 70, 150, 255} }}, {{ {554, 964, -258}, 0, {736, -255}, {0, 67, 108, 255} }}, {{ {451, 964, -258}, 0, {10, -255}, {0, 67, 108, 255} }}, @@ -867,9 +574,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_5[58] = { {{ {-450, 803, -2229}, 0, {4112, -234}, {127, 0, 0, 255} }}, {{ {-450, 964, -264}, 0, {-5071, -951}, {127, 0, 0, 255} }}, {{ {-450, 811, -162}, 0, {-5545, -234}, {127, 0, 0, 255} }}, - {{ {-450, 803, -2229}, 0, {4112, -234}, {127, 0, 0, 255} }}, {{ {-450, 957, -2127}, 0, {3633, -952}, {127, 0, 0, 255} }}, - {{ {-450, 964, -264}, 0, {-5071, -951}, {127, 0, 0, 255} }}, {{ {-450, 811, -162}, 0, {736, 1073}, {0, 70, 106, 255} }}, {{ {-450, 964, -264}, 0, {736, -255}, {0, 70, 106, 255} }}, {{ {-553, 811, -162}, 0, {10, 1073}, {0, 70, 106, 255} }}, @@ -886,8 +591,11 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_5[58] = { {{ {-553, 604, -2127}, 0, {3642, 737}, {129, 0, 0, 255} }}, {{ {-553, 607, -162}, 0, {-5543, 737}, {129, 0, 0, 255} }}, {{ {-553, 964, -264}, 0, {-5065, -911}, {129, 0, 0, 255} }}, + {{ {-553, 607, -162}, 0, {-5543, 737}, {129, 0, 0, 255} }}, {{ {-553, 811, -162}, 0, {-5545, -194}, {129, 0, 0, 255} }}, + {{ {-553, 964, -264}, 0, {-5065, -911}, {129, 0, 0, 255} }}, {{ {-553, 957, -2127}, 0, {3639, -911}, {129, 0, 0, 255} }}, + {{ {-553, 803, -2229}, 0, {4112, -194}, {129, 0, 0, 255} }}, {{ {554, 605, -2127}, 0, {3642, 737}, {127, 0, 0, 255} }}, {{ {554, 803, -2223}, 0, {4112, -194}, {127, 0, 0, 255} }}, {{ {554, 957, -2121}, 0, {3639, -911}, {127, 0, 0, 255} }}, @@ -896,37 +604,37 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_5[58] = { {{ {554, 607, -162}, 0, {-5543, 737}, {127, 0, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_5[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_5[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_5 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_5 + 15, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 9, 11, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_5 + 31, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_5 + 15, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(4, 6, 5, 0), + gsSP1Triangle(3, 5, 6, 0), gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(7, 10, 8, 0), + gsSP1Triangle(10, 7, 9, 0), gsSP1Triangle(11, 12, 13, 0), gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_5 + 46, 12, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_5 + 30, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 3, 0, 0), - gsSP1Triangle(2, 4, 3, 0), - gsSP1Triangle(3, 5, 0, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(8, 9, 6, 0), - gsSP1Triangle(8, 10, 9, 0), - gsSP1Triangle(9, 11, 6, 0), + gsSP1Triangle(1, 3, 2, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 7, 5, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(14, 15, 12, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_5 + 46, 11, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(2, 3, 4, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(7, 8, 5, 0), + gsSP1Triangle(7, 9, 8, 0), + gsSP1Triangle(8, 10, 5, 0), gsSPEndDisplayList(), }; @@ -944,7 +652,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_6[11] = { {{ {83, -511, -162}, 0, {283, 8831}, {0, 127, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_6[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_6[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_6 + 0, 11, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), @@ -967,12 +675,12 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_7[51] = { {{ {-3514, 461, -3205}, 0, {-18092, 1702}, {130, 0, 244, 255} }}, {{ {-3468, 868, -3685}, 0, {-20502, -392}, {130, 0, 244, 255} }}, {{ {-3468, -1330, -3685}, 0, {-20506, 10562}, {130, 0, 244, 255} }}, - {{ {-3514, 461, -3205}, 0, {-18092, 1702}, {130, 0, 244, 255} }}, - {{ {-3468, -1330, -3685}, 0, {-20506, 10562}, {130, 0, 244, 255} }}, {{ {-3514, -511, -3205}, 0, {-18095, 6533}, {130, 0, 244, 255} }}, {{ {-3468, 2198, -3685}, 0, {-17928, -7024}, {136, 0, 216, 255} }}, {{ {-3468, 868, -3685}, 0, {-17928, -360}, {136, 0, 216, 255} }}, {{ {-3672, 868, -3073}, 0, {-14396, -360}, {136, 0, 216, 255} }}, + {{ {-3468, 2198, -3685}, 0, {-17928, -7024}, {136, 0, 216, 255} }}, + {{ {-3672, 868, -3073}, 0, {-14396, -360}, {136, 0, 216, 255} }}, {{ {-3672, 2196, -3073}, 0, {-14396, -7024}, {136, 0, 216, 255} }}, {{ {-3468, 2201, -6149}, 0, {-14791, -7008}, {0, 0, 127, 255} }}, {{ {-4369, 2201, -6149}, 0, {-18963, -7008}, {0, 0, 127, 255} }}, @@ -1008,22 +716,22 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_7[51] = { {{ {83, -511, -2127}, 0, {-11863, 6537}, {0, 0, 127, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_7[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_7 + 0, 15, 0), +static const Gfx castle_grounds_1_dl_mesh_tri_7[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_7 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_7 + 15, 16, 0), + gsSP1Triangle(9, 11, 12, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_7 + 16, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 5, 6, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 9, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 14, 12, 0), gsSPVertex(castle_grounds_1_dl_mesh_vtx_7 + 31, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), @@ -1047,13 +755,13 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_8[3] = { {{ {-1023, -511, -2127}, 0, {-17418, 6537}, {0, 0, 127, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_8[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_8[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_8 + 0, 3, 0), gsSP1Triangle(0, 1, 2, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_9[51] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_9[49] = { {{ {-3672, 868, -3073}, 0, {-10777, -344}, {140, 223, 217, 255} }}, {{ {-3468, 868, -3685}, 0, {-13905, -344}, {140, 223, 217, 255} }}, {{ {-3514, 461, -3205}, 0, {-11133, 2000}, {140, 223, 217, 255} }}, @@ -1081,8 +789,6 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_9[51] = { {{ {-1522, 868, -2430}, 0, {-8140, -320}, {0, 195, 111, 255} }}, {{ {-3149, 868, -2430}, 0, {-16357, -344}, {0, 195, 111, 255} }}, {{ {-2991, 461, -2655}, 0, {-15562, 1994}, {0, 195, 111, 255} }}, - {{ {-1522, 868, -2430}, 0, {-8140, -320}, {0, 195, 111, 255} }}, - {{ {-2991, 461, -2655}, 0, {-15562, 1994}, {0, 195, 111, 255} }}, {{ {-1522, 461, -2655}, 0, {-8141, 1997}, {0, 195, 111, 255} }}, {{ {3210, 868, -2430}, 0, {4386, -320}, {0, 195, 111, 255} }}, {{ {1524, 868, -2430}, 0, {-3821, -320}, {0, 195, 111, 255} }}, @@ -1107,58 +813,54 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_9[51] = { {{ {554, 1487, -3104}, 0, {194, -3473}, {129, 0, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_9[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_9[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_9 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_9 + 15, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_9 + 15, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_9 + 30, 14, 0), + gsSP1Triangle(9, 11, 12, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_9 + 31, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 7, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_9 + 44, 7, 0), + gsSP1Triangle(3, 6, 4, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 9, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(12, 14, 13, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_9 + 46, 3, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), - gsSP1Triangle(4, 5, 6, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_10[12] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_10[8] = { {{ {3362, 405, -567}, 0, {24, -305}, {223, 90, 172, 255} }}, {{ {3556, 405, -36}, 0, {24, 1257}, {73, 97, 37, 255} }}, {{ {4597, 405, -1016}, 0, {8080, -305}, {177, 92, 219, 255} }}, {{ {4791, 405, -485}, 0, {8080, 1257}, {216, 98, 70, 255} }}, - {{ {4597, 405, -1016}, 0, {8080, -305}, {177, 92, 219, 255} }}, - {{ {3556, 405, -36}, 0, {24, 1257}, {73, 97, 37, 255} }}, {{ {3363, 343, -566}, 0, {24, -302}, {47, 183, 163, 255} }}, {{ {4597, 343, -1016}, 0, {8080, -305}, {225, 166, 172, 255} }}, {{ {3555, 343, -37}, 0, {24, 1254}, {30, 165, 83, 255} }}, - {{ {3555, 343, -37}, 0, {24, 1254}, {30, 165, 83, 255} }}, - {{ {4597, 343, -1016}, 0, {8080, -305}, {225, 166, 172, 255} }}, {{ {4791, 343, -485}, 0, {8080, 1257}, {31, 166, 84, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_10[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_10 + 0, 12, 0), +Gfx castle_grounds_1_dl_mesh_tri_10[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_10 + 0, 8, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(3, 2, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(6, 5, 7, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_11[140] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_11[135] = { {{ {554, 1692, -2127}, 0, {-9542, -4500}, {0, 0, 127, 255} }}, {{ {349, 1692, -2127}, 0, {-10566, -4500}, {0, 0, 127, 255} }}, {{ {554, 1487, -2127}, 0, {-9542, -3461}, {0, 0, 127, 255} }}, @@ -1240,19 +942,14 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_11[140] = { {{ {1024, -511, -2127}, 0, {-7163, 6537}, {92, 0, 87, 255} }}, {{ {1524, -511, -2655}, 0, {-3820, 6537}, {92, 0, 87, 255} }}, {{ {1524, 461, -2655}, 0, {-3821, 1702}, {92, 0, 87, 255} }}, - {{ {1024, -511, -2127}, 0, {-7163, 6537}, {92, 0, 87, 255} }}, - {{ {1524, 461, -2655}, 0, {-3821, 1702}, {92, 0, 87, 255} }}, {{ {1024, 853, -2127}, 0, {-7157, -234}, {92, 0, 87, 255} }}, {{ {-2991, -512, -2655}, 0, {-14317, 6535}, {164, 0, 88, 255} }}, {{ {-2991, 461, -2655}, 0, {-14309, 1700}, {164, 0, 88, 255} }}, {{ {-3514, 461, -3205}, 0, {-18092, 1702}, {164, 0, 88, 255} }}, - {{ {-3514, 461, -3205}, 0, {-18092, 1702}, {164, 0, 88, 255} }}, {{ {-3514, -511, -3205}, 0, {-18095, 6533}, {164, 0, 88, 255} }}, {{ {3211, 2196, -2432}, 0, {4386, -7008}, {0, 0, 127, 255} }}, {{ {1525, 2196, -2432}, 0, {-3821, -7008}, {0, 0, 127, 255} }}, {{ {1524, 868, -2430}, 0, {-3821, -320}, {0, 0, 127, 255} }}, - {{ {3211, 2196, -2432}, 0, {4386, -7008}, {0, 0, 127, 255} }}, - {{ {1524, 868, -2430}, 0, {-3821, -320}, {0, 0, 127, 255} }}, {{ {3210, 868, -2430}, 0, {4386, -320}, {0, 0, 127, 255} }}, {{ {3483, 2201, -7276}, 0, {-1980, -2538}, {0, 127, 0, 255} }}, {{ {4370, 2201, -6149}, 0, {3174, 3146}, {0, 127, 0, 255} }}, @@ -1301,7 +998,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_11[140] = { {{ {554, 1487, -2127}, 0, {4945, -3473}, {129, 0, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_11[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_11[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), @@ -1332,51 +1029,44 @@ static const Gfx castle_grounds_1_dl_mesh_tri_11[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 75, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(9, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 89, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 75, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 7, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 103, 16, 0), + gsSP1Triangle(3, 5, 6, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 9, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 13, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 90, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(8, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 119, 16, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 106, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(7, 4, 6, 0), + gsSP1Triangle(4, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(8, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 135, 5, 0), + gsSP1Triangle(15, 12, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_11 + 122, 13, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 0, 0), - gsSP1Triangle(1, 3, 4, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(11, 9, 8, 0), + gsSP1Triangle(9, 11, 12, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_12[94] = { - {{ {3482, -511, -3663}, 0, {-374, 2032}, {2, 109, 66, 255} }}, - {{ {4407, -511, -3689}, 0, {650, 2009}, {2, 109, 66, 255} }}, - {{ {4409, 545, -5437}, 0, {650, 8}, {2, 109, 66, 255} }}, - {{ {3482, -511, -3663}, 0, {-374, 2032}, {0, 109, 65, 255} }}, - {{ {4409, 545, -5437}, 0, {650, 8}, {0, 109, 65, 255} }}, - {{ {3468, 545, -5438}, 0, {-392, 8}, {0, 109, 65, 255} }}, +static const Vtx castle_grounds_1_dl_mesh_vtx_12[83] = { {{ {4407, -511, -3689}, 0, {1515, 2033}, {129, 0, 0, 255} }}, {{ {4407, 545, -3689}, 0, {1522, 11}, {129, 0, 0, 255} }}, {{ {4409, 545, -5437}, 0, {-2674, 11}, {129, 0, 0, 255} }}, @@ -1410,6 +1100,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_12[94] = { {{ {-4929, -1330, -4194}, 0, {4811, 1262}, {117, 0, 206, 255} }}, {{ {-4928, -511, -4194}, 0, {4810, 2033}, {117, 0, 206, 255} }}, {{ {-4701, -511, -3663}, 0, {3369, 2033}, {117, 0, 206, 255} }}, + {{ {-4929, -1330, -4194}, 0, {4811, 1262}, {117, 0, 206, 255} }}, {{ {-4701, -511, -3663}, 0, {3369, 2033}, {117, 0, 206, 255} }}, {{ {-4702, -1330, -3663}, 0, {3369, 1262}, {117, 0, 206, 255} }}, {{ {-4928, 543, -4193}, 0, {4809, -3}, {24, 0, 131, 255} }}, @@ -1424,10 +1115,15 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_12[94] = { {{ {-4700, 543, -3663}, 0, {3317, -6}, {127, 0, 252, 255} }}, {{ {-4686, -511, -3205}, 0, {2674, 2106}, {127, 0, 252, 255} }}, {{ {-4701, -511, -3663}, 0, {3929, 2003}, {127, 0, 252, 255} }}, + {{ {-4671, -511, -2545}, 0, {494, 1893}, {127, 0, 253, 255} }}, + {{ {-4702, -1330, -3663}, 0, {3760, 1357}, {127, 0, 253, 255} }}, + {{ {-4701, -511, -3663}, 0, {3929, 2014}, {127, 0, 253, 255} }}, + {{ {-4671, -511, -2545}, 0, {494, 1893}, {0, 129, 0, 255} }}, + {{ {-4701, -511, -3663}, 0, {3929, 2014}, {0, 129, 0, 255} }}, + {{ {-4686, -511, -3205}, 0, {2674, 2088}, {0, 129, 0, 255} }}, {{ {5052, 371, -2053}, 0, {-24976, 11}, {138, 0, 47, 255} }}, {{ {4407, 545, -3689}, 0, {-29198, 11}, {138, 0, 47, 255} }}, {{ {4407, -511, -3689}, 0, {-29205, 2033}, {138, 0, 47, 255} }}, - {{ {5052, 371, -2053}, 0, {-24976, 11}, {138, 0, 47, 255} }}, {{ {5052, -511, -2053}, 0, {-24983, 2033}, {138, 0, 47, 255} }}, {{ {-4796, 405, -1606}, 0, {-1957, -4}, {107, 0, 188, 255} }}, {{ {-4132, 371, -562}, 0, {-5267, -4}, {107, 0, 188, 255} }}, @@ -1435,28 +1131,17 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_12[94] = { {{ {-4796, 405, -1606}, 0, {-1957, -4}, {107, 0, 188, 255} }}, {{ {-4132, -511, -562}, 0, {-5267, 2033}, {107, 0, 188, 255} }}, {{ {-4796, -511, -1606}, 0, {-1958, 2033}, {107, 0, 188, 255} }}, - {{ {-4671, -511, -2545}, 0, {494, 1893}, {127, 255, 253, 255} }}, - {{ {-4702, -1330, -3663}, 0, {3760, 1357}, {127, 255, 253, 255} }}, - {{ {-4701, -511, -3663}, 0, {3929, 2014}, {127, 255, 253, 255} }}, - {{ {-4671, -511, -2545}, 0, {494, 1893}, {127, 255, 253, 255} }}, - {{ {-4701, -511, -3663}, 0, {3929, 2014}, {127, 255, 253, 255} }}, - {{ {-4686, -511, -3205}, 0, {2674, 2088}, {127, 255, 253, 255} }}, {{ {-4132, 371, -562}, 0, {-5267, -4}, {25, 0, 132, 255} }}, {{ {-2047, 518, -137}, 0, {-10945, -4}, {25, 0, 132, 255} }}, {{ {-2047, -511, -137}, 0, {-10945, 2033}, {25, 0, 132, 255} }}, - {{ {-4132, 371, -562}, 0, {-5267, -4}, {25, 0, 132, 255} }}, - {{ {-2047, -511, -137}, 0, {-10945, 2033}, {25, 0, 132, 255} }}, {{ {-4132, -511, -562}, 0, {-5267, 2033}, {25, 0, 132, 255} }}, {{ {-4671, -511, -2545}, 0, {189, 1989}, {126, 0, 17, 255} }}, {{ {-4671, 422, -2545}, 0, {247, 10}, {126, 0, 17, 255} }}, {{ {-4796, 405, -1606}, 0, {-2704, 17}, {126, 0, 17, 255} }}, - {{ {-4671, -511, -2545}, 0, {189, 1989}, {126, 0, 17, 255} }}, {{ {-4796, -511, -1606}, 0, {-2706, 1989}, {126, 0, 17, 255} }}, {{ {-2047, 518, -137}, 0, {-10945, -4}, {254, 0, 129, 255} }}, {{ {-553, 811, -162}, 0, {-14472, -1}, {254, 0, 129, 255} }}, {{ {-553, -511, -162}, 0, {-14472, 2033}, {254, 0, 129, 255} }}, - {{ {-2047, 518, -137}, 0, {-10945, -4}, {254, 0, 129, 255} }}, - {{ {-553, -511, -162}, 0, {-14472, 2033}, {254, 0, 129, 255} }}, {{ {-2047, -511, -137}, 0, {-10945, 2033}, {254, 0, 129, 255} }}, {{ {554, -511, -162}, 0, {-16244, 2033}, {0, 0, 129, 255} }}, {{ {554, 811, -162}, 0, {-16244, 11}, {0, 0, 129, 255} }}, @@ -1467,7 +1152,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_12[94] = { {{ {-553, -511, -162}, 0, {-14472, 2033}, {0, 0, 129, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_12[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_12[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), @@ -1480,31 +1165,28 @@ static const Gfx castle_grounds_1_dl_mesh_tri_12[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 30, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 44, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 30, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 11, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 58, 15, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 45, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 73, 14, 0), + gsSP1Triangle(9, 11, 12, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 61, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 5, 7, 0), - gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(3, 5, 6, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 9, 10, 0), gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 87, 7, 0), + gsSP1Triangle(11, 13, 14, 0), + gsSPVertex(castle_grounds_1_dl_mesh_vtx_12 + 76, 7, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsSP1Triangle(4, 5, 0, 0), @@ -1538,7 +1220,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_13[23] = { {{ {83, -511, -162}, 0, {283, 8831}, {0, 127, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_13[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_13[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_13 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), @@ -1559,26 +1241,23 @@ static const Gfx castle_grounds_1_dl_mesh_tri_13[] = { gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_14[11] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_14[8] = { {{ {3555, 343, -37}, 0, {-16, 224}, {30, 165, 83, 255} }}, {{ {4791, 343, -485}, 0, {6502, 224}, {31, 166, 84, 255} }}, {{ {3556, 405, -36}, 0, {-16, -16}, {73, 97, 37, 255} }}, {{ {4791, 405, -485}, 0, {6504, -16}, {216, 98, 70, 255} }}, - {{ {4791, 343, -485}, 0, {6502, 224}, {31, 166, 84, 255} }}, {{ {3363, 343, -566}, 0, {-16, 224}, {47, 183, 163, 255} }}, {{ {3362, 405, -567}, 0, {-54, -16}, {223, 90, 172, 255} }}, {{ {4597, 343, -1016}, 0, {6542, 224}, {225, 166, 172, 255} }}, {{ {4597, 405, -1016}, 0, {6534, -16}, {177, 92, 219, 255} }}, - {{ {4597, 343, -1016}, 0, {6542, 224}, {225, 166, 172, 255} }}, - {{ {3362, 405, -567}, 0, {-54, -16}, {223, 90, 172, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_14[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_14 + 0, 11, 0), +static const Gfx castle_grounds_1_dl_mesh_tri_14[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_14 + 0, 8, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 2, 4, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(3, 2, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(7, 6, 5, 0), gsSPEndDisplayList(), }; @@ -1601,7 +1280,7 @@ static const Vtx castle_grounds_1_dl_mesh_vtx_15[16] = { {{ {-562, 803, -3718}, 0, {499, 87}, {127, 0, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_15[] = { +static const Gfx castle_grounds_1_dl_mesh_tri_15[] = { gsSPVertex(castle_grounds_1_dl_mesh_vtx_15 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), @@ -1614,57 +1293,61 @@ static const Gfx castle_grounds_1_dl_mesh_tri_15[] = { gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_16[16] = { +static const Vtx castle_grounds_1_dl_mesh_vtx_16[12] = { {{ {-450, 811, -162}, 0, {-19, 431}, {0, 126, 19, 255} }}, {{ {451, 906, -796}, 0, {1766, -813}, {0, 126, 19, 255} }}, {{ {-450, 906, -796}, 0, {-19, -813}, {0, 126, 19, 255} }}, - {{ {-450, 811, -162}, 0, {-19, 431}, {0, 126, 19, 255} }}, {{ {451, 811, -162}, 0, {1766, 431}, {0, 126, 19, 255} }}, - {{ {451, 906, -796}, 0, {1766, -813}, {0, 126, 19, 255} }}, {{ {451, 906, -1512}, 0, {1766, -2221}, {0, 125, 235, 255} }}, {{ {-450, 803, -2127}, 0, {-19, -3428}, {0, 125, 235, 255} }}, {{ {-450, 906, -1512}, 0, {-19, -2221}, {0, 125, 235, 255} }}, - {{ {451, 906, -1512}, 0, {1766, -2221}, {0, 125, 235, 255} }}, {{ {451, 803, -2127}, 0, {1766, -3428}, {0, 125, 235, 255} }}, - {{ {-450, 803, -2127}, 0, {-19, -3428}, {0, 125, 235, 255} }}, {{ {451, 906, -796}, 0, {1766, -813}, {0, 127, 0, 255} }}, {{ {451, 906, -1512}, 0, {1766, -2221}, {0, 127, 0, 255} }}, {{ {-450, 906, -1512}, 0, {-19, -2221}, {0, 127, 0, 255} }}, {{ {-450, 906, -796}, 0, {-19, -813}, {0, 127, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_16[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_16 + 0, 16, 0), +static const Gfx castle_grounds_1_dl_mesh_tri_16[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_16 + 0, 12, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 7, 5, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 10, 11, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_1_dl_mesh_vtx_17[10] = { - {{ {-3481, -1330, -6149}, 0, {3409, -5253}, {0, 127, 0, 255} }}, - {{ {-4369, -1330, -6149}, 0, {1172, -5253}, {0, 127, 0, 255} }}, - {{ {-4704, -1330, -5911}, 0, {328, -4054}, {0, 127, 0, 255} }}, - {{ {-3468, -1330, -3685}, 0, {3442, 7162}, {0, 127, 0, 255} }}, - {{ {-4702, -1330, -3663}, 0, {333, 7272}, {0, 127, 0, 255} }}, - {{ {-5786, -1330, -4362}, 0, {-2397, 3751}, {0, 127, 0, 255} }}, - {{ {2697, -1330, 6142}, 0, {5496, 18777}, {0, 127, 0, 255} }}, - {{ {7681, -1330, 140}, 0, {19905, 1423}, {0, 127, 0, 255} }}, - {{ {2697, -1330, 140}, 0, {5496, 1423}, {0, 127, 0, 255} }}, - {{ {7722, -1330, 5995}, 0, {20024, 18352}, {0, 127, 0, 255} }}, +static const Vtx castle_grounds_1_dl_mesh_vtx_17[16] = { + {{ {3482, -511, -3663}, 0, {-2138, 5616}, {2, 109, 66, 255} }}, + {{ {4407, -511, -3689}, 0, {3199, 5466}, {2, 109, 66, 255} }}, + {{ {4409, 545, -5437}, 0, {3210, -4618}, {2, 109, 66, 255} }}, + {{ {3482, -511, -3663}, 0, {-2138, 5616}, {0, 109, 65, 255} }}, + {{ {4409, 545, -5437}, 0, {3210, -4618}, {0, 109, 65, 255} }}, + {{ {3468, 545, -5438}, 0, {-2218, -4624}, {0, 109, 65, 255} }}, + {{ {-3481, -1330, -6149}, 0, {-9622, -13480}, {0, 127, 0, 255} }}, + {{ {-4369, -1330, -6149}, 0, {-11641, -13480}, {0, 127, 0, 255} }}, + {{ {-4704, -1330, -5911}, 0, {-12403, -12939}, {0, 127, 0, 255} }}, + {{ {-3468, -1330, -3685}, 0, {-9592, -7876}, {0, 127, 0, 255} }}, + {{ {-4702, -1330, -3663}, 0, {-12399, -7826}, {0, 127, 0, 255} }}, + {{ {-5786, -1330, -4362}, 0, {-14864, -9416}, {0, 127, 0, 255} }}, + {{ {2697, -1330, 6142}, 0, {4428, 14472}, {0, 127, 0, 255} }}, + {{ {7681, -1330, 140}, 0, {15763, 822}, {0, 127, 0, 255} }}, + {{ {2697, -1330, 140}, 0, {4428, 822}, {0, 127, 0, 255} }}, + {{ {7722, -1330, 5995}, 0, {15856, 14138}, {0, 127, 0, 255} }}, }; -static const Gfx castle_grounds_1_dl_mesh_tri_17[] = { - gsSPVertex(castle_grounds_1_dl_mesh_vtx_17 + 0, 10, 0), +static const Gfx castle_grounds_1_dl_mesh_tri_17[] = { + gsSPVertex(castle_grounds_1_dl_mesh_vtx_17 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 0, 2, 0), - gsSP1Triangle(4, 3, 2, 0), - gsSP1Triangle(2, 5, 4, 0), + gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 7, 0), + gsSP1Triangle(9, 6, 8, 0), + gsSP1Triangle(10, 9, 8, 0), + gsSP1Triangle(8, 11, 10, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(12, 15, 13, 0), gsSPEndDisplayList(), }; diff --git a/levels/castle_grounds/areas/1/4/model.inc.c b/levels/castle_grounds/areas/1/4/model.inc.c index fbd13417..19b7a3fb 100644 --- a/levels/castle_grounds/areas/1/4/model.inc.c +++ b/levels/castle_grounds/areas/1/4/model.inc.c @@ -1,24 +1,4 @@ -static const Vtx castle_grounds_4_dl_mesh_vtx_0[8] = { - {{ {3155, 3290, -2960}, 0, {495, 1010}, {0, 0, 129, 255} }}, - {{ {3155, 3175, -2960}, 0, {495, -12}, {0, 0, 129, 255} }}, - {{ {3103, 3175, -2960}, 0, {-15, -12}, {0, 0, 129, 255} }}, - {{ {3103, 3290, -2960}, 0, {-15, 1010}, {0, 0, 129, 255} }}, - {{ {-3042, 3282, -2958}, 0, {495, 1010}, {0, 0, 129, 255} }}, - {{ {-3042, 3167, -2958}, 0, {495, -12}, {0, 0, 129, 255} }}, - {{ {-3094, 3167, -2958}, 0, {-15, -12}, {0, 0, 129, 255} }}, - {{ {-3094, 3282, -2958}, 0, {-15, 1010}, {0, 0, 129, 255} }}, -}; - -static const Gfx castle_grounds_4_dl_mesh_tri_0[] = { - gsSPVertex(castle_grounds_4_dl_mesh_vtx_0 + 0, 8, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSPEndDisplayList(), -}; - -static const Vtx castle_grounds_4_dl_mesh_vtx_1[43] = { +static const Vtx castle_grounds_4_dl_mesh_vtx_0[46] = { {{ {5231, 387, -651}, 0, {-8222, 1968}, {216, 0, 135, 255} }}, {{ {4795, 394, -508}, 0, {940, 1968}, {216, 0, 135, 255} }}, {{ {4795, 497, -508}, 0, {974, -44}, {216, 0, 135, 255} }}, @@ -33,14 +13,17 @@ static const Vtx castle_grounds_4_dl_mesh_vtx_1[43] = { {{ {3224, -89, 1779}, 0, {15812, 1997}, {145, 0, 195, 255} }}, {{ {2587, 2, 2931}, 0, {-13288, 19}, {145, 0, 195, 255} }}, {{ {3224, 14, 1779}, 0, {15816, 19}, {145, 0, 195, 255} }}, + {{ {3224, -89, 1779}, 0, {15812, 1997}, {145, 0, 195, 255} }}, {{ {2587, -101, 2931}, 0, {-13292, 1997}, {145, 0, 195, 255} }}, {{ {3348, -3, 765}, 0, {9943, 1997}, {130, 0, 241, 255} }}, {{ {3224, 14, 1779}, 0, {-10804, 19}, {130, 0, 241, 255} }}, {{ {3348, 100, 765}, 0, {9946, 19}, {130, 0, 241, 255} }}, {{ {3224, -89, 1779}, 0, {-10808, 1997}, {130, 0, 241, 255} }}, + {{ {3224, 14, 1779}, 0, {-10804, 19}, {130, 0, 241, 255} }}, {{ {2587, -101, 2931}, 0, {15376, 1997}, {203, 0, 141, 255} }}, {{ {1613, 194, 3383}, 0, {-8938, 19}, {203, 0, 141, 255} }}, {{ {2587, 2, 2931}, 0, {15380, 19}, {203, 0, 141, 255} }}, + {{ {2587, -101, 2931}, 0, {15376, 1997}, {203, 0, 141, 255} }}, {{ {1613, 91, 3383}, 0, {-8942, 1997}, {203, 0, 141, 255} }}, {{ {-4816, 405, -1601}, 0, {18890, 1968}, {130, 0, 239, 255} }}, {{ {-4816, 508, -1601}, 0, {18856, -44}, {130, 0, 239, 255} }}, @@ -64,34 +47,34 @@ static const Vtx castle_grounds_4_dl_mesh_vtx_1[43] = { {{ {-4143, 473, -544}, 0, {94, -72}, {232, 0, 125, 255} }}, }; -static const Gfx castle_grounds_4_dl_mesh_tri_1[] = { - gsSPVertex(castle_grounds_4_dl_mesh_vtx_1 + 0, 15, 0), +static const Gfx castle_grounds_4_dl_mesh_tri_0[] = { + gsSPVertex(castle_grounds_4_dl_mesh_vtx_0 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(7, 9, 10, 0), gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_grounds_4_dl_mesh_vtx_1 + 15, 16, 0), + gsSP1Triangle(14, 15, 12, 0), + gsSPVertex(castle_grounds_4_dl_mesh_vtx_0 + 16, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 8, 10, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_grounds_4_dl_mesh_vtx_1 + 31, 12, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(8, 9, 6, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(13, 10, 12, 0), + gsSPVertex(castle_grounds_4_dl_mesh_vtx_0 + 30, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(12, 14, 15, 0), gsSPEndDisplayList(), }; -static const Vtx castle_grounds_4_dl_mesh_vtx_2[56] = { +static const Vtx castle_grounds_4_dl_mesh_vtx_1[56] = { {{ {2914, 1876, -2408}, 0, {1008, -16}, {0, 0, 127, 255} }}, {{ {2595, 1557, -2408}, 0, {-16, 1008}, {0, 0, 127, 255} }}, {{ {2914, 1557, -2408}, 0, {1008, 1008}, {0, 0, 127, 255} }}, @@ -150,8 +133,8 @@ static const Vtx castle_grounds_4_dl_mesh_vtx_2[56] = { {{ {3493, 1857, -4681}, 0, {-16, -16}, {127, 0, 0, 255} }}, }; -static const Gfx castle_grounds_4_dl_mesh_tri_2[] = { - gsSPVertex(castle_grounds_4_dl_mesh_vtx_2 + 0, 16, 0), +static const Gfx castle_grounds_4_dl_mesh_tri_1[] = { + gsSPVertex(castle_grounds_4_dl_mesh_vtx_1 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -160,7 +143,7 @@ static const Gfx castle_grounds_4_dl_mesh_tri_2[] = { gsSP1Triangle(8, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(castle_grounds_4_dl_mesh_vtx_2 + 16, 16, 0), + gsSPVertex(castle_grounds_4_dl_mesh_vtx_1 + 16, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 2, 3, 0), gsSP1Triangle(4, 5, 6, 0), @@ -169,7 +152,7 @@ static const Gfx castle_grounds_4_dl_mesh_tri_2[] = { gsSP1Triangle(8, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_grounds_4_dl_mesh_vtx_2 + 32, 16, 0), + gsSPVertex(castle_grounds_4_dl_mesh_vtx_1 + 32, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(2, 1, 3, 0), gsSP1Triangle(4, 5, 6, 0), @@ -178,7 +161,7 @@ static const Gfx castle_grounds_4_dl_mesh_tri_2[] = { gsSP1Triangle(10, 9, 11, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(castle_grounds_4_dl_mesh_vtx_2 + 48, 8, 0), + gsSPVertex(castle_grounds_4_dl_mesh_vtx_1 + 48, 8, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 1, 0, 0), gsSP1Triangle(4, 5, 6, 0), @@ -186,42 +169,35 @@ static const Gfx castle_grounds_4_dl_mesh_tri_2[] = { gsSPEndDisplayList(), }; -static const Vtx castle_grounds_4_dl_mesh_vtx_3[10] = { - {{ {-3070, 3282, -2958}, 0, {56, 781}, {0, 0, 129, 255} }}, - {{ {-2844, 3371, -2958}, 0, {809, 489}, {0, 0, 129, 255} }}, - {{ {-2756, 3282, -2958}, 0, {1100, 781}, {0, 0, 129, 255} }}, - {{ {-3070, 3461, -2958}, 0, {56, 196}, {0, 0, 129, 255} }}, - {{ {-2756, 3461, -2958}, 0, {1100, 196}, {0, 0, 129, 255} }}, - {{ {3127, 3290, -2960}, 0, {56, 781}, {0, 0, 129, 255} }}, - {{ {3353, 3379, -2960}, 0, {809, 489}, {0, 0, 129, 255} }}, - {{ {3441, 3290, -2960}, 0, {1100, 781}, {0, 0, 129, 255} }}, - {{ {3127, 3469, -2960}, 0, {56, 196}, {0, 0, 129, 255} }}, - {{ {3441, 3469, -2960}, 0, {1100, 196}, {0, 0, 129, 255} }}, +static const Vtx castle_grounds_4_dl_mesh_vtx_2[8] = { + {{ {-2659, 3559, -2960}, 0, {1008, -16}, {0, 0, 127, 255} }}, + {{ {-3093, 3559, -2960}, 0, {-16, -16}, {0, 0, 127, 255} }}, + {{ {-3093, 3125, -2960}, 0, {-16, 1008}, {0, 0, 127, 255} }}, + {{ {-2659, 3125, -2960}, 0, {1008, 1008}, {0, 0, 127, 255} }}, + {{ {3537, 3567, -2960}, 0, {1008, -16}, {0, 0, 127, 255} }}, + {{ {3103, 3567, -2960}, 0, {-16, -16}, {0, 0, 127, 255} }}, + {{ {3103, 3133, -2960}, 0, {-16, 1008}, {0, 0, 127, 255} }}, + {{ {3537, 3133, -2960}, 0, {1008, 1008}, {0, 0, 127, 255} }}, }; -static const Gfx castle_grounds_4_dl_mesh_tri_3[] = { - gsSPVertex(castle_grounds_4_dl_mesh_vtx_3 + 0, 10, 0), +static const Gfx castle_grounds_4_dl_mesh_tri_2[] = { + gsSPVertex(castle_grounds_4_dl_mesh_vtx_2 + 0, 8, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 0, 0), - gsSP1Triangle(4, 1, 3, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(8, 6, 5, 0), - gsSP1Triangle(9, 6, 8, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 6, 7, 0), gsSPEndDisplayList(), }; const Gfx castle_grounds_4_dl_mesh[] = { - gsSPDisplayList(mat_castle_grounds_FlagPoleMaterial), - gsSPDisplayList(castle_grounds_4_dl_mesh_tri_0), - gsSPDisplayList(mat_revert_castle_grounds_FlagPoleMaterial), gsSPDisplayList(mat_castle_grounds_FenceMaterial), - gsSPDisplayList(castle_grounds_4_dl_mesh_tri_1), + gsSPDisplayList(castle_grounds_4_dl_mesh_tri_0), gsSPDisplayList(mat_revert_castle_grounds_FenceMaterial), gsSPDisplayList(mat_castle_grounds_WindowMaterial), - gsSPDisplayList(castle_grounds_4_dl_mesh_tri_2), + gsSPDisplayList(castle_grounds_4_dl_mesh_tri_1), gsSPDisplayList(mat_revert_castle_grounds_WindowMaterial), gsSPDisplayList(mat_castle_grounds_FlagMaterial), - gsSPDisplayList(castle_grounds_4_dl_mesh_tri_3), + gsSPDisplayList(castle_grounds_4_dl_mesh_tri_2), gsSPDisplayList(mat_revert_castle_grounds_FlagMaterial), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), diff --git a/levels/castle_grounds/material.inc.c b/levels/castle_grounds/material.inc.c index 26f11f21..02016c8e 100644 --- a/levels/castle_grounds/material.inc.c +++ b/levels/castle_grounds/material.inc.c @@ -361,28 +361,6 @@ static const Gfx mat_castle_grounds_ClockTopMaterial[] = { gsSPEndDisplayList(), }; -static const Gfx mat_castle_grounds_FlagPoleMaterial[] = { - gsDPPipeSync(), - gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), - gsSPClearGeometryMode(G_CULL_BACK), - gsSPTexture(65535, 65535, 0, 0, 1), - gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, castle_grounds_seg7_texture_0700A800), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), - gsDPLoadSync(), - gsDPLoadBlock(7, 0, 0, 511, 512), - gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 4, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 4, 0), - gsDPSetTileSize(0, 0, 0, 60, 124), - gsSPEndDisplayList(), -}; - -static const Gfx mat_revert_castle_grounds_FlagPoleMaterial[] = { - gsDPPipeSync(), - gsSPSetGeometryMode(G_CULL_BACK), - gsSPEndDisplayList(), -}; - static const Gfx mat_castle_grounds_FenceMaterial[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), diff --git a/levels/castle_grounds/texture.inc.c b/levels/castle_grounds/texture.inc.c index b59dfa5a..748c95fd 100644 --- a/levels/castle_grounds/texture.inc.c +++ b/levels/castle_grounds/texture.inc.c @@ -46,11 +46,6 @@ ALIGNED8 static const u8 castle_grounds_seg7_texture_07009000[] = { #include "levels/castle_grounds/8.rgba16.inc.c" }; -// 0x0700A800 - 0x0700B800 -ALIGNED8 static const u8 castle_grounds_seg7_texture_0700A800[] = { -#include "levels/castle_grounds/9.rgba16.inc.c" -}; - ALIGNED8 static const u8 castle_grounds_seg7_texture_areamap_top[] = { #include "levels/castle_grounds/areamap_castle_grounds_top.rgba16.inc.c" }; diff --git a/levels/castle_inside/areas/1/bowser_hallway/model.inc.c b/levels/castle_inside/areas/1/bowser_hallway/model.inc.c index 01679f3f..9d1c0130 100644 --- a/levels/castle_inside/areas/1/bowser_hallway/model.inc.c +++ b/levels/castle_inside/areas/1/bowser_hallway/model.inc.c @@ -1,18 +1,14 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_0[50] = { - {{ {-358, 410, -5852}, 0, {-935, 2035}, {90, 0, 90, 255} }}, - {{ {-307, 1382, -5903}, 0, {-1100, -1835}, {90, 0, 90, 255} }}, - {{ {-358, 1434, -5852}, 0, {-935, -2039}, {90, 0, 90, 255} }}, - {{ {-358, 410, -5852}, 0, {-935, 2035}, {90, 0, 90, 255} }}, - {{ {-307, 410, -5903}, 0, {-1100, 2035}, {90, 0, 90, 255} }}, - {{ {-307, 1382, -5903}, 0, {-1100, -1835}, {90, 0, 90, 255} }}, - {{ {-358, 1434, -3113}, 0, {7165, -2031}, {0, 129, 0, 255} }}, - {{ {358, 1434, -5852}, 0, {-2039, -4929}, {0, 129, 0, 255} }}, - {{ {358, 1434, -3113}, 0, {7165, -4929}, {0, 129, 0, 255} }}, - {{ {-358, 1434, -5852}, 0, {-2039, -2031}, {0, 129, 0, 255} }}, {{ {358, 1434, -5852}, 0, {9190, -15}, {166, 0, 90, 255} }}, {{ {307, 614, -5903}, 0, {9114, 1632}, {166, 0, 90, 255} }}, {{ {358, 410, -5852}, 0, {9190, 2033}, {166, 0, 90, 255} }}, + {{ {358, 1434, -5852}, 0, {9190, -15}, {166, 0, 90, 255} }}, {{ {307, 1382, -5903}, 0, {9114, 88}, {166, 0, 90, 255} }}, + {{ {307, 614, -5903}, 0, {9114, 1632}, {166, 0, 90, 255} }}, + {{ {-358, 1434, -3113}, 0, {7165, -2031}, {0, 129, 0, 255} }}, + {{ {358, 1434, -5852}, 0, {-2039, -4929}, {0, 129, 0, 255} }}, + {{ {358, 1434, -3113}, 0, {7165, -4929}, {0, 129, 0, 255} }}, + {{ {-358, 1434, -5852}, 0, {-2039, -2031}, {0, 129, 0, 255} }}, {{ {358, 1434, -3113}, 0, {-827, -2039}, {129, 0, 0, 255} }}, {{ {358, 410, -5852}, 0, {8194, 2014}, {129, 0, 0, 255} }}, {{ {358, 410, -3113}, 0, {-827, 2014}, {129, 0, 0, 255} }}, @@ -33,6 +29,10 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_0[50] = { {{ {-307, 1382, -5903}, 0, {-2209, -2238}, {0, 166, 90, 255} }}, {{ {307, 1382, -5903}, 0, {-2209, -4722}, {0, 166, 90, 255} }}, {{ {-358, 1434, -5852}, 0, {-2039, -2031}, {0, 166, 90, 255} }}, + {{ {-358, 410, -5852}, 0, {-935, 2035}, {90, 0, 90, 255} }}, + {{ {-307, 1382, -5903}, 0, {-1100, -1835}, {90, 0, 90, 255} }}, + {{ {-358, 1434, -5852}, 0, {-935, -2039}, {90, 0, 90, 255} }}, + {{ {-307, 410, -5903}, 0, {-1100, 2035}, {90, 0, 90, 255} }}, {{ {358, 410, -3113}, 0, {-848, 2014}, {0, 0, 129, 255} }}, {{ {154, 410, -3113}, 0, {-59, 2014}, {0, 0, 129, 255} }}, {{ {154, 666, -3113}, 0, {-59, 1001}, {0, 0, 129, 255} }}, @@ -85,23 +85,17 @@ static const Gfx castle_inside_bowser_dl_mesh_tri_0[] = { gsSPEndDisplayList(), }; -static const Vtx castle_inside_bowser_dl_mesh_vtx_1[8] = { +static const Vtx castle_inside_bowser_dl_mesh_vtx_1[4] = { {{ {358, 410, -3829}, 0, {3547, -5639}, {0, 127, 0, 255} }}, {{ {-358, 410, -3113}, 0, {-3570, 1529}, {0, 127, 0, 255} }}, {{ {358, 410, -3113}, 0, {3547, 1529}, {0, 127, 0, 255} }}, {{ {-358, 410, -3829}, 0, {-3570, -5639}, {0, 127, 0, 255} }}, - {{ {154, 410, -3113}, 0, {-1033, -2612}, {0, 127, 0, 255} }}, - {{ {-154, 410, -3010}, 0, {2039, -1588}, {0, 127, 0, 255} }}, - {{ {154, 410, -3010}, 0, {-1033, -1588}, {0, 127, 0, 255} }}, - {{ {-154, 410, -3113}, 0, {2039, -2612}, {0, 127, 0, 255} }}, }; static const Gfx castle_inside_bowser_dl_mesh_tri_1[] = { - gsSPVertex(castle_inside_bowser_dl_mesh_vtx_1 + 0, 8, 0), + gsSPVertex(castle_inside_bowser_dl_mesh_vtx_1 + 0, 4, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), gsSPEndDisplayList(), }; @@ -244,13 +238,10 @@ static const Gfx castle_inside_bowser_dl_mesh_tri_2[] = { gsSPEndDisplayList(), }; -static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { +static const Vtx castle_inside_bowser_dl_mesh_vtx_3[200] = { {{ {307, 1382, -3983}, 0, {-615, -6494}, {129, 0, 0, 0} }}, {{ {307, 410, -3932}, 0, {-362, -34}, {129, 0, 0, 255} }}, {{ {307, 1382, -3932}, 0, {-362, -6494}, {129, 0, 0, 0} }}, - {{ {-307, 1382, -3932}, 0, {-594, 2770}, {0, 138, 208, 0} }}, - {{ {-307, 1382, -3983}, 0, {-834, 2770}, {0, 149, 188, 0} }}, - {{ {298, 1382, -3983}, 0, {-834, -647}, {0, 143, 197, 0} }}, {{ {358, 1434, -4034}, 0, {-16, 2032}, {0, 166, 166, 0} }}, {{ {307, 1382, -3983}, 0, {-16, 2032}, {0, 166, 166, 0} }}, {{ {298, 1382, -3983}, 0, {-8, 1907}, {0, 166, 166, 0} }}, @@ -260,9 +251,6 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { {{ {307, 1382, -4393}, 0, {-362, -6494}, {129, 0, 0, 0} }}, {{ {307, 410, -4444}, 0, {-615, -34}, {129, 0, 0, 255} }}, {{ {307, 410, -4393}, 0, {-362, -34}, {129, 0, 0, 255} }}, - {{ {-358, 410, -5417}, 0, {862, -56}, {90, 0, 166, 255} }}, - {{ {-307, 1382, -5365}, 0, {525, -6515}, {90, 0, 166, 0} }}, - {{ {-307, 410, -5365}, 0, {525, -56}, {90, 0, 166, 255} }}, {{ {-358, 410, -4034}, 0, {916, -34}, {90, 0, 166, 255} }}, {{ {-307, 1382, -3983}, 0, {559, -6494}, {90, 0, 166, 0} }}, {{ {-307, 410, -3983}, 0, {559, -34}, {90, 0, 166, 255} }}, @@ -275,30 +263,18 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { {{ {358, 410, -3420}, 0, {-5, -34}, {166, 0, 90, 255} }}, {{ {307, 1382, -3471}, 0, {-362, -6494}, {166, 0, 90, 0} }}, {{ {307, 410, -3471}, 0, {-362, -34}, {166, 0, 90, 255} }}, - {{ {307, 1382, -4905}, 0, {-615, -6494}, {166, 0, 166, 0} }}, - {{ {358, 410, -4956}, 0, {-972, -34}, {166, 0, 166, 255} }}, - {{ {307, 410, -4905}, 0, {-615, -34}, {166, 0, 166, 255} }}, {{ {307, 1382, -3983}, 0, {-615, -6494}, {129, 0, 0, 0} }}, {{ {307, 410, -3983}, 0, {-615, -34}, {129, 0, 0, 255} }}, {{ {307, 410, -3932}, 0, {-362, -34}, {129, 0, 0, 255} }}, - {{ {-307, 1382, -3932}, 0, {-594, 2770}, {48, 173, 83, 0} }}, - {{ {358, 1434, -3881}, 0, {-254, -986}, {0, 200, 114, 0} }}, - {{ {-358, 1434, -3881}, 0, {-254, 3059}, {0, 200, 114, 0} }}, - {{ {307, 1382, -3983}, 0, {-16, 2032}, {0, 149, 188, 0} }}, - {{ {307, 1382, -3932}, 0, {-16, 2032}, {226, 133, 248, 0} }}, - {{ {298, 1382, -3983}, 0, {-8, 1907}, {0, 143, 197, 0} }}, - {{ {307, 1382, -3932}, 0, {-594, -697}, {226, 133, 248, 0} }}, - {{ {-307, 1382, -3932}, 0, {-594, 2770}, {0, 138, 208, 0} }}, - {{ {298, 1382, -3983}, 0, {-834, -647}, {0, 143, 197, 0} }}, + {{ {307, 1382, -3983}, 0, {-16, 2032}, {0, 129, 0, 0} }}, + {{ {307, 1382, -3932}, 0, {-16, 2032}, {0, 129, 0, 0} }}, + {{ {298, 1382, -3983}, 0, {-8, 1907}, {0, 129, 0, 0} }}, {{ {358, 410, -4802}, 0, {-5, -34}, {166, 0, 90, 255} }}, {{ {358, 1434, -4802}, 0, {-5, -6834}, {166, 0, 90, 0} }}, {{ {307, 1382, -4853}, 0, {-362, -6494}, {166, 0, 90, 0} }}, {{ {307, 1382, -4393}, 0, {-362, -6494}, {129, 0, 0, 0} }}, {{ {307, 1382, -4444}, 0, {-615, -6494}, {129, 0, 0, 0} }}, {{ {307, 410, -4444}, 0, {-615, -34}, {129, 0, 0, 255} }}, - {{ {-358, 410, -5417}, 0, {862, -56}, {90, 0, 166, 255} }}, - {{ {-358, 1434, -5417}, 0, {862, -6855}, {90, 0, 166, 0} }}, - {{ {-307, 1382, -5365}, 0, {525, -6515}, {90, 0, 166, 0} }}, {{ {-358, 410, -4034}, 0, {916, -34}, {90, 0, 166, 255} }}, {{ {-358, 1434, -4034}, 0, {916, -6834}, {90, 0, 166, 0} }}, {{ {-307, 1382, -3983}, 0, {559, -6494}, {90, 0, 166, 0} }}, @@ -311,12 +287,6 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { {{ {358, 410, -3420}, 0, {-5, -34}, {166, 0, 90, 255} }}, {{ {358, 1434, -3420}, 0, {-5, -6834}, {166, 0, 90, 0} }}, {{ {307, 1382, -3471}, 0, {-362, -6494}, {166, 0, 90, 0} }}, - {{ {307, 1382, -4905}, 0, {-615, -6494}, {166, 0, 166, 0} }}, - {{ {358, 1434, -4956}, 0, {-972, -6834}, {166, 0, 166, 0} }}, - {{ {358, 410, -4956}, 0, {-972, -34}, {166, 0, 166, 255} }}, - {{ {-307, 1382, -3932}, 0, {-594, 2770}, {48, 173, 83, 0} }}, - {{ {307, 1382, -3932}, 0, {-594, -697}, {8, 190, 108, 0} }}, - {{ {358, 1434, -3881}, 0, {-254, -986}, {0, 200, 114, 0} }}, {{ {358, 410, -4341}, 0, {-5, -34}, {166, 0, 90, 255} }}, {{ {307, 1382, -4393}, 0, {-362, -6494}, {166, 0, 90, 0} }}, {{ {307, 410, -4393}, 0, {-362, -34}, {166, 0, 90, 255} }}, @@ -325,6 +295,10 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { {{ {307, 1382, -4905}, 0, {190, -697}, {0, 166, 166, 0} }}, {{ {-307, 1382, -4905}, 0, {190, 2770}, {0, 166, 166, 0} }}, {{ {358, 1434, -4956}, 0, {-150, -986}, {0, 166, 166, 0} }}, + {{ {-307, 1382, -3932}, 0, {-594, 2770}, {0, 129, 0, 0} }}, + {{ {-307, 1382, -3983}, 0, {-834, 2770}, {0, 129, 0, 0} }}, + {{ {298, 1382, -3983}, 0, {-834, -647}, {0, 129, 0, 0} }}, + {{ {307, 1382, -3932}, 0, {-594, -697}, {0, 129, 0, 0} }}, {{ {-307, 1382, -4905}, 0, {525, -6515}, {127, 0, 0, 0} }}, {{ {-307, 410, -4853}, 0, {287, -56}, {127, 0, 0, 255} }}, {{ {-307, 410, -4905}, 0, {525, -56}, {127, 0, 0, 255} }}, @@ -349,6 +323,10 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { {{ {358, 410, -3573}, 0, {-972, -34}, {166, 0, 166, 255} }}, {{ {307, 410, -3522}, 0, {-615, -34}, {166, 0, 166, 255} }}, {{ {358, 1434, -3573}, 0, {-972, -6834}, {166, 0, 166, 0} }}, + {{ {-358, 410, -5417}, 0, {862, -56}, {90, 0, 166, 255} }}, + {{ {-307, 1382, -5365}, 0, {525, -6515}, {90, 0, 166, 0} }}, + {{ {-307, 410, -5365}, 0, {525, -56}, {90, 0, 166, 255} }}, + {{ {-358, 1434, -5417}, 0, {862, -6855}, {90, 0, 166, 0} }}, {{ {-307, 1382, -3932}, 0, {307, -6494}, {90, 0, 90, 0} }}, {{ {-358, 410, -3881}, 0, {-50, -34}, {90, 0, 90, 255} }}, {{ {-307, 410, -3932}, 0, {307, -34}, {90, 0, 90, 255} }}, @@ -385,6 +363,10 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { {{ {-358, 1434, -3420}, 0, {-1303, 3059}, {0, 166, 90, 0} }}, {{ {-307, 1382, -3471}, 0, {-1643, 2770}, {0, 166, 90, 0} }}, {{ {358, 1434, -3420}, 0, {-1303, -986}, {0, 166, 90, 0} }}, + {{ {307, 1382, -4905}, 0, {-615, -6494}, {166, 0, 166, 0} }}, + {{ {358, 410, -4956}, 0, {-972, -34}, {166, 0, 166, 255} }}, + {{ {307, 410, -4905}, 0, {-615, -34}, {166, 0, 166, 255} }}, + {{ {358, 1434, -4956}, 0, {-972, -6834}, {166, 0, 166, 0} }}, {{ {-307, 1382, -4444}, 0, {1221, 2770}, {0, 129, 0, 0} }}, {{ {307, 1382, -4393}, 0, {1462, -697}, {0, 129, 0, 0} }}, {{ {-307, 1382, -4393}, 0, {1462, 2770}, {0, 129, 0, 0} }}, @@ -453,6 +435,10 @@ static const Vtx castle_inside_bowser_dl_mesh_vtx_3[208] = { {{ {307, 1382, -5314}, 0, {1454, -697}, {0, 129, 0, 0} }}, {{ {-307, 1382, -5314}, 0, {1454, 2770}, {0, 129, 0, 0} }}, {{ {307, 1382, -5365}, 0, {1213, -697}, {0, 129, 0, 0} }}, + {{ {-307, 1382, -3932}, 0, {-594, 2770}, {0, 166, 90, 0} }}, + {{ {358, 1434, -3881}, 0, {-254, -986}, {0, 166, 90, 0} }}, + {{ {-358, 1434, -3881}, 0, {-254, 3059}, {0, 166, 90, 0} }}, + {{ {307, 1382, -3932}, 0, {-594, -697}, {0, 166, 90, 0} }}, }; static const Gfx castle_inside_bowser_dl_mesh_tri_3[] = { @@ -477,14 +463,18 @@ static const Gfx castle_inside_bowser_dl_mesh_tri_3[] = { gsSPVertex(castle_inside_bowser_dl_mesh_vtx_3 + 45, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(3, 6, 4, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 10, 8, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(14, 11, 13, 0), gsSPVertex(castle_inside_bowser_dl_mesh_vtx_3 + 60, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 7, 5, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), gsSPVertex(castle_inside_bowser_dl_mesh_vtx_3 + 76, 16, 0), @@ -550,64 +540,13 @@ static const Gfx castle_inside_bowser_dl_mesh_tri_3[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_bowser_dl_mesh_vtx_3 + 188, 16, 0), + gsSPVertex(castle_inside_bowser_dl_mesh_vtx_3 + 188, 12, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_bowser_dl_mesh_vtx_3 + 204, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSPEndDisplayList(), -}; - -static const Vtx castle_inside_bowser_dl_mesh_vtx_4[12] = { - {{ {154, 666, -3113}, 0, {-2262, -633}, {0, 129, 0, 255} }}, - {{ {-154, 666, -3010}, 0, {-1346, -633}, {0, 129, 0, 255} }}, - {{ {-154, 666, -3113}, 0, {-1346, -633}, {0, 129, 0, 255} }}, - {{ {154, 666, -3010}, 0, {-2262, -633}, {0, 129, 0, 255} }}, - {{ {154, 512, -3113}, 0, {-2262, -32}, {129, 0, 0, 255} }}, - {{ {154, 666, -3010}, 0, {-2262, -633}, {129, 0, 0, 255} }}, - {{ {154, 666, -3113}, 0, {-2262, -633}, {129, 0, 0, 255} }}, - {{ {154, 512, -3010}, 0, {-2262, -32}, {129, 0, 0, 255} }}, - {{ {-154, 666, -3113}, 0, {-1346, -633}, {127, 0, 0, 255} }}, - {{ {-154, 512, -3010}, 0, {-1346, -32}, {127, 0, 0, 255} }}, - {{ {-154, 512, -3113}, 0, {-1346, -32}, {127, 0, 0, 255} }}, - {{ {-154, 666, -3010}, 0, {-1346, -633}, {127, 0, 0, 255} }}, -}; - -static const Gfx castle_inside_bowser_dl_mesh_tri_4[] = { - gsSPVertex(castle_inside_bowser_dl_mesh_vtx_4 + 0, 12, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSPEndDisplayList(), -}; - -static const Vtx castle_inside_bowser_dl_mesh_vtx_5[8] = { - {{ {-154, 512, -3113}, 0, {-1346, 32}, {127, 0, 0, 255} }}, - {{ {-154, 410, -3010}, 0, {-1346, 433}, {127, 0, 0, 255} }}, - {{ {-154, 410, -3113}, 0, {-1346, 433}, {127, 0, 0, 255} }}, - {{ {-154, 512, -3010}, 0, {-1346, 32}, {127, 0, 0, 255} }}, - {{ {154, 410, -3113}, 0, {-2262, 433}, {129, 0, 0, 255} }}, - {{ {154, 512, -3010}, 0, {-2262, 32}, {129, 0, 0, 255} }}, - {{ {154, 512, -3113}, 0, {-2262, 32}, {129, 0, 0, 255} }}, - {{ {154, 410, -3010}, 0, {-2262, 433}, {129, 0, 0, 255} }}, -}; - -static const Gfx castle_inside_bowser_dl_mesh_tri_5[] = { - gsSPVertex(castle_inside_bowser_dl_mesh_vtx_5 + 0, 8, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), gsSPEndDisplayList(), }; @@ -620,10 +559,6 @@ const Gfx castle_inside_bowser_dl_mesh[] = { gsSPDisplayList(castle_inside_bowser_dl_mesh_tri_2), gsSPDisplayList(mat_castle_inside_PillarMaterial), gsSPDisplayList(castle_inside_bowser_dl_mesh_tri_3), - gsSPDisplayList(mat_castle_inside_WallTopMaterial), - gsSPDisplayList(castle_inside_bowser_dl_mesh_tri_4), - gsSPDisplayList(mat_castle_inside_WallBottomMaterial), - gsSPDisplayList(castle_inside_bowser_dl_mesh_tri_5), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_TEXTURE_GEN), diff --git a/levels/castle_inside/areas/1/collision.inc.c b/levels/castle_inside/areas/1/collision.inc.c index 925275e9..51829854 100644 --- a/levels/castle_inside/areas/1/collision.inc.c +++ b/levels/castle_inside/areas/1/collision.inc.c @@ -1,6 +1,6 @@ const Collision castle_inside_collision[] = { COL_INIT(), - COL_VERTEX_INIT(1163), + COL_VERTEX_INIT(1155), COL_VERTEX(-3149, 205, -2217), COL_VERTEX(-3681, 205, -2422), COL_VERTEX(-3681, 205, -2217), @@ -156,11 +156,11 @@ const Collision castle_inside_collision[] = { COL_VERTEX(-3149, 205, -2626), COL_VERTEX(-1638, 205, -2242), COL_VERTEX(-3047, 410, -2626), - COL_VERTEX(205, 0, -2805), + COL_VERTEX(180, 0, -2781), COL_VERTEX(384, 0, -2985), COL_VERTEX(311, 0, -3057), COL_VERTEX(133, 0, -2877), - COL_VERTEX(-205, 0, -2806), + COL_VERTEX(-180, 0, -2781), COL_VERTEX(-133, 0, -2878), COL_VERTEX(-410, 0, -3010), COL_VERTEX(-337, 0, -3082), @@ -216,9 +216,8 @@ const Collision castle_inside_collision[] = { COL_VERTEX(256, 282, -5365), COL_VERTEX(256, -154, -3317), COL_VERTEX(410, 0, -3010), - COL_VERTEX(205, 333, -2805), - COL_VERTEX(-205, 0, -2805), - COL_VERTEX(-205, 333, -2805), + COL_VERTEX(180, 333, -2781), + COL_VERTEX(-180, 333, -2781), COL_VERTEX(205, 333, -3422), COL_VERTEX(186, 333, -3440), COL_VERTEX(155, 333, -3471), @@ -412,129 +411,109 @@ const Collision castle_inside_collision[] = { COL_VERTEX(1075, 1254, -2445), COL_VERTEX(1638, 896, -2037), COL_VERTEX(1075, 1254, -2189), - COL_VERTEX(490, 1357, -2189), COL_VERTEX(431, 1254, -1525), COL_VERTEX(768, 896, -1167), COL_VERTEX(-768, 896, -1167), COL_VERTEX(-427, 1254, -1525), - COL_VERTEX(-485, 1357, -2189), COL_VERTEX(-1075, 1254, -2189), COL_VERTEX(-1075, 1254, -2445), COL_VERTEX(-878, 1254, -2652), COL_VERTEX(-1229, 896, -3010), COL_VERTEX(-1638, 896, -2601), COL_VERTEX(-1638, 896, -2037), - COL_VERTEX(1331, 512, -2908), COL_VERTEX(1331, 998, -2908), - COL_VERTEX(1229, 998, -2908), COL_VERTEX(1229, 512, -2908), + COL_VERTEX(1331, 512, -2908), COL_VERTEX(-461, 512, -2908), - COL_VERTEX(-358, 512, -3010), COL_VERTEX(-358, 896, -3010), COL_VERTEX(-461, 998, -2908), - COL_VERTEX(-1331, 512, -2908), COL_VERTEX(-1229, 512, -2908), - COL_VERTEX(-1229, 998, -2908), COL_VERTEX(-1331, 998, -2908), + COL_VERTEX(-1331, 512, -2908), COL_VERTEX(768, 896, -3010), - COL_VERTEX(666, 998, -2908), COL_VERTEX(666, 512, -2908), COL_VERTEX(768, 512, -3010), - COL_VERTEX(461, 512, -2908), COL_VERTEX(461, 998, -2908), + COL_VERTEX(461, 512, -2908), COL_VERTEX(1126, 896, -3010), COL_VERTEX(1126, 512, -3010), COL_VERTEX(358, 896, -3010), - COL_VERTEX(358, 512, -3010), COL_VERTEX(-1126, 512, -3010), - COL_VERTEX(-768, 512, -3010), COL_VERTEX(-768, 896, -3010), COL_VERTEX(-1126, 896, -3010), + COL_VERTEX(-1229, 998, -2908), COL_VERTEX(-1331, 896, -2908), COL_VERTEX(-1638, 512, -2601), COL_VERTEX(-666, 512, -2908), COL_VERTEX(-666, 998, -2908), COL_VERTEX(-1638, 512, -2037), COL_VERTEX(154, 666, -3010), - COL_VERTEX(154, 512, -3010), - COL_VERTEX(-154, 512, -3010), - COL_VERTEX(-154, 666, -3010), COL_VERTEX(-154, 512, -3113), + COL_VERTEX(-154, 666, -3010), + COL_VERTEX(-154, 512, -3010), COL_VERTEX(-154, 666, -3113), COL_VERTEX(154, 666, -3113), - COL_VERTEX(154, 512, -3113), - COL_VERTEX(-563, 512, -1167), + COL_VERTEX(154, 512, -3010), COL_VERTEX(-563, 896, -1167), - COL_VERTEX(-461, 998, -1269), COL_VERTEX(-461, 512, -1269), - COL_VERTEX(154, 512, -1167), + COL_VERTEX(-563, 512, -1167), COL_VERTEX(154, 896, -1167), - COL_VERTEX(256, 998, -1269), COL_VERTEX(256, 512, -1269), + COL_VERTEX(154, 512, -1167), COL_VERTEX(461, 512, -1269), - COL_VERTEX(461, 998, -1269), COL_VERTEX(563, 896, -1167), COL_VERTEX(563, 512, -1167), COL_VERTEX(-768, 512, -1167), - COL_VERTEX(1638, 512, -2037), COL_VERTEX(1638, 512, -2601), - COL_VERTEX(-154, 512, -1167), + COL_VERTEX(1638, 512, -2037), COL_VERTEX(-154, 896, -1167), + COL_VERTEX(-154, 512, -1167), COL_VERTEX(768, 512, -1167), - COL_VERTEX(-256, 998, -1269), + COL_VERTEX(-461, 998, -1269), COL_VERTEX(-256, 512, -1269), - COL_VERTEX(1331, 896, -2908), - COL_VERTEX(-102, 0, -2498), + COL_VERTEX(256, 998, -1269), COL_VERTEX(-102, 256, -2498), - COL_VERTEX(-256, 256, -2601), COL_VERTEX(-256, 0, -2601), + COL_VERTEX(-102, 0, -2498), COL_VERTEX(256, 256, -2703), - COL_VERTEX(256, 410, -2703), COL_VERTEX(102, 410, -2601), COL_VERTEX(102, 256, -2601), - COL_VERTEX(-1229, 205, -2908), COL_VERTEX(-1331, 205, -2908), - COL_VERTEX(-1638, 205, -2601), - COL_VERTEX(-1638, 205, -2498), - COL_VERTEX(-1638, 205, -2037), - COL_VERTEX(-1638, 205, -2140), + COL_VERTEX(-1229, 205, -2908), COL_VERTEX(-256, 410, -2703), - COL_VERTEX(-256, 461, -2703), COL_VERTEX(-461, 461, -2908), COL_VERTEX(-461, 410, -2908), - COL_VERTEX(-358, 410, -3010), COL_VERTEX(-179, 410, -3010), - COL_VERTEX(-154, 410, -3010), + COL_VERTEX(-358, 512, -3010), COL_VERTEX(358, 410, -3010), - COL_VERTEX(461, 410, -2908), - COL_VERTEX(-256, 256, -2703), + COL_VERTEX(358, 512, -3010), COL_VERTEX(-102, 256, -2601), COL_VERTEX(-102, 410, -2601), COL_VERTEX(-768, 0, -3010), - COL_VERTEX(-666, 0, -2908), + COL_VERTEX(-768, 512, -3010), COL_VERTEX(666, 0, -2908), COL_VERTEX(1229, 0, -2908), COL_VERTEX(1126, 0, -3010), - COL_VERTEX(-425, 461, -2944), COL_VERTEX(-220, 461, -2739), - COL_VERTEX(-220, 410, -2739), COL_VERTEX(-425, 410, -2944), + COL_VERTEX(-425, 461, -2944), + COL_VERTEX(-256, 256, -2601), COL_VERTEX(-256, 0, -2703), - COL_VERTEX(154, 410, -3010), COL_VERTEX(179, 410, -3010), + COL_VERTEX(461, 410, -2908), + COL_VERTEX(256, 410, -2703), COL_VERTEX(220, 410, -2739), - COL_VERTEX(220, 461, -2739), COL_VERTEX(425, 461, -2944), COL_VERTEX(425, 410, -2944), + COL_VERTEX(-220, 410, -2739), + COL_VERTEX(-256, 461, -2703), COL_VERTEX(1024, 256, -3010), COL_VERTEX(870, 256, -3010), COL_VERTEX(768, 0, -3010), - COL_VERTEX(256, 0, -2601), COL_VERTEX(256, 256, -2601), - COL_VERTEX(102, 256, -2498), COL_VERTEX(102, 0, -2498), + COL_VERTEX(256, 0, -2601), COL_VERTEX(-1229, 0, -2037), - COL_VERTEX(-1229, 0, -2908), COL_VERTEX(-1229, 256, -2908), COL_VERTEX(-1229, 256, -2037), COL_VERTEX(1024, 0, -3010), @@ -545,147 +524,166 @@ const Collision castle_inside_collision[] = { COL_VERTEX(-1024, 256, -3010), COL_VERTEX(-1126, 0, -3010), COL_VERTEX(-870, 256, -3113), - COL_VERTEX(-870, 0, -3113), COL_VERTEX(-1024, 256, -3113), - COL_VERTEX(-1024, 0, -3113), COL_VERTEX(1331, 0, -2908), COL_VERTEX(461, 461, -2908), COL_VERTEX(256, 461, -2703), - COL_VERTEX(-563, 0, -1167), + COL_VERTEX(102, 256, -2498), + COL_VERTEX(-1229, 0, -2908), + COL_VERTEX(220, 461, -2739), COL_VERTEX(-768, 0, -1167), - COL_VERTEX(-461, 0, -1269), + COL_VERTEX(-563, 0, -1167), COL_VERTEX(-1638, 0, -2037), + COL_VERTEX(-1638, 205, -2037), + COL_VERTEX(-461, 0, -1269), COL_VERTEX(-256, 0, -1269), - COL_VERTEX(-154, 0, -1167), - COL_VERTEX(-154, 256, -1167), COL_VERTEX(154, 256, -1167), COL_VERTEX(0, 256, -1167), - COL_VERTEX(461, 0, -1269), COL_VERTEX(256, 0, -1269), COL_VERTEX(563, 0, -1167), + COL_VERTEX(461, 0, -1269), COL_VERTEX(768, 0, -1167), COL_VERTEX(1638, 0, -2037), - COL_VERTEX(1229, 0, -2037), + COL_VERTEX(768, 205, -1167), COL_VERTEX(1229, 256, -2037), - COL_VERTEX(1229, 256, -2908), - COL_VERTEX(1102, 0, -1911), + COL_VERTEX(1229, 0, -2037), COL_VERTEX(1102, 77, -1911), COL_VERTEX(1121, 77, -1891), - COL_VERTEX(1248, 256, -2018), COL_VERTEX(1121, 0, -1891), - COL_VERTEX(-1248, 256, -2018), + COL_VERTEX(1102, 0, -1911), COL_VERTEX(-1121, 77, -1891), COL_VERTEX(-1102, 77, -1911), COL_VERTEX(1331, 205, -2908), - COL_VERTEX(1638, 205, -2601), - COL_VERTEX(1638, 205, -2139), - COL_VERTEX(1638, 205, -2037), - COL_VERTEX(1638, 205, -2498), COL_VERTEX(154, 0, -1167), COL_VERTEX(-154, 410, -3113), - COL_VERTEX(154, 410, -3113), - COL_VERTEX(1280, 256, -2908), + COL_VERTEX(-154, 410, -3010), + COL_VERTEX(154, 512, -3113), + COL_VERTEX(154, 410, -3010), COL_VERTEX(1280, 256, -2050), - COL_VERTEX(1280, 205, -2050), COL_VERTEX(1280, 205, -2908), + COL_VERTEX(1280, 256, -2908), COL_VERTEX(1248, 0, -2018), + COL_VERTEX(1248, 256, -2018), COL_VERTEX(1280, 0, -2050), - COL_VERTEX(-1280, 256, -2050), COL_VERTEX(-1280, 256, -2908), - COL_VERTEX(-1280, 205, -2908), COL_VERTEX(-1280, 205, -2050), + COL_VERTEX(-1280, 256, -2050), COL_VERTEX(-1248, 0, -2018), - COL_VERTEX(-1121, 0, -1891), + COL_VERTEX(-1248, 256, -2018), COL_VERTEX(-1280, 0, -2050), + COL_VERTEX(-1121, 0, -1891), COL_VERTEX(-1102, 0, -1911), COL_VERTEX(1024, 256, -3113), - COL_VERTEX(1024, 0, -3113), COL_VERTEX(870, 256, -3113), COL_VERTEX(870, 0, -3113), - COL_VERTEX(179, 410, -2908), COL_VERTEX(-179, 410, -2908), COL_VERTEX(256, 486, -2739), COL_VERTEX(443, 486, -2926), COL_VERTEX(-256, 486, -2739), COL_VERTEX(-443, 486, -2926), - COL_VERTEX(1254, 282, -2908), + COL_VERTEX(1229, 256, -2908), COL_VERTEX(1254, 282, -2045), - COL_VERTEX(-1254, 282, -2908), + COL_VERTEX(1254, 282, -2908), COL_VERTEX(-1254, 282, -2045), - COL_VERTEX(1121, 26, -1891), - COL_VERTEX(1307, 0, -1706), + COL_VERTEX(-1254, 282, -2908), COL_VERTEX(1307, 26, -1706), + COL_VERTEX(1121, 26, -1891), COL_VERTEX(1434, 179, -1833), - COL_VERTEX(1248, 179, -2018), COL_VERTEX(1230, 179, -2000), COL_VERTEX(1415, 179, -1814), - COL_VERTEX(1230, 154, -2000), COL_VERTEX(1415, 154, -1814), - COL_VERTEX(1379, 128, -1778), COL_VERTEX(1194, 128, -1964), - COL_VERTEX(1194, 102, -1964), COL_VERTEX(1379, 102, -1778), - COL_VERTEX(1343, 77, -1742), + COL_VERTEX(1379, 128, -1778), COL_VERTEX(1157, 77, -1928), - COL_VERTEX(1157, 51, -1928), COL_VERTEX(1343, 51, -1742), - COL_VERTEX(1397, 154, -1796), + COL_VERTEX(1343, 77, -1742), COL_VERTEX(1212, 154, -1982), - COL_VERTEX(1212, 128, -1982), COL_VERTEX(1397, 128, -1796), - COL_VERTEX(1361, 102, -1760), + COL_VERTEX(1397, 154, -1796), COL_VERTEX(1176, 102, -1946), - COL_VERTEX(1176, 77, -1946), COL_VERTEX(1361, 77, -1760), - COL_VERTEX(1325, 51, -1724), + COL_VERTEX(1361, 102, -1760), COL_VERTEX(1139, 51, -1910), - COL_VERTEX(1139, 26, -1910), COL_VERTEX(1325, 26, -1724), - COL_VERTEX(1434, 205, -1833), + COL_VERTEX(1325, 51, -1724), + COL_VERTEX(1157, 51, -1928), COL_VERTEX(1248, 205, -2018), + COL_VERTEX(1434, 205, -1833), + COL_VERTEX(1212, 128, -1982), + COL_VERTEX(1176, 77, -1946), + COL_VERTEX(1139, 26, -1910), + COL_VERTEX(1230, 154, -2000), + COL_VERTEX(1194, 102, -1964), COL_VERTEX(1536, 205, -2139), COL_VERTEX(1536, 205, -2498), - COL_VERTEX(-1121, 26, -1891), + COL_VERTEX(1280, 205, -2050), COL_VERTEX(-1307, 26, -1706), - COL_VERTEX(-1307, 0, -1706), + COL_VERTEX(-1121, 26, -1891), COL_VERTEX(-1434, 179, -1833), - COL_VERTEX(-1415, 179, -1814), COL_VERTEX(-1230, 179, -2000), COL_VERTEX(-1248, 179, -2018), COL_VERTEX(-1415, 154, -1814), - COL_VERTEX(-1230, 154, -2000), - COL_VERTEX(-1379, 128, -1778), + COL_VERTEX(-1415, 179, -1814), COL_VERTEX(-1379, 102, -1778), - COL_VERTEX(-1194, 102, -1964), COL_VERTEX(-1194, 128, -1964), - COL_VERTEX(-1343, 77, -1742), + COL_VERTEX(-1379, 128, -1778), COL_VERTEX(-1343, 51, -1742), - COL_VERTEX(-1157, 51, -1928), COL_VERTEX(-1157, 77, -1928), - COL_VERTEX(-1397, 154, -1796), + COL_VERTEX(-1343, 77, -1742), COL_VERTEX(-1397, 128, -1796), - COL_VERTEX(-1212, 128, -1982), COL_VERTEX(-1212, 154, -1982), - COL_VERTEX(-1361, 102, -1760), + COL_VERTEX(-1397, 154, -1796), COL_VERTEX(-1361, 77, -1760), - COL_VERTEX(-1176, 77, -1946), COL_VERTEX(-1176, 102, -1946), - COL_VERTEX(-1325, 51, -1724), + COL_VERTEX(-1361, 102, -1760), COL_VERTEX(-1325, 26, -1724), - COL_VERTEX(-1139, 26, -1910), COL_VERTEX(-1139, 51, -1910), - COL_VERTEX(-1434, 205, -1833), + COL_VERTEX(-1325, 51, -1724), + COL_VERTEX(-1157, 51, -1928), COL_VERTEX(-1248, 205, -2018), - COL_VERTEX(-1536, 205, -2498), + COL_VERTEX(-1434, 205, -1833), + COL_VERTEX(-1212, 128, -1982), + COL_VERTEX(-1176, 77, -1946), + COL_VERTEX(-1139, 26, -1910), + COL_VERTEX(-1230, 154, -2000), + COL_VERTEX(-1194, 102, -1964), COL_VERTEX(-1536, 205, -2140), - COL_VERTEX(768, 0, -2908), - COL_VERTEX(1126, 0, -2908), - COL_VERTEX(-1126, 0, -2908), - COL_VERTEX(-768, 0, -2908), + COL_VERTEX(-666, 0, -2908), COL_VERTEX(307, 0, -1167), COL_VERTEX(-307, 0, -1167), COL_VERTEX(-307, 0, -143), COL_VERTEX(307, 0, -143), + COL_VERTEX(1229, 998, -2908), + COL_VERTEX(666, 998, -2908), + COL_VERTEX(461, 998, -1269), + COL_VERTEX(-256, 998, -1269), + COL_VERTEX(1331, 896, -2908), + COL_VERTEX(-1638, 205, -2601), + COL_VERTEX(-1638, 205, -2498), + COL_VERTEX(-1638, 205, -2140), + COL_VERTEX(-358, 410, -3010), + COL_VERTEX(-256, 256, -2703), + COL_VERTEX(-870, 0, -3113), + COL_VERTEX(-1024, 0, -3113), + COL_VERTEX(-154, 0, -1167), + COL_VERTEX(-154, 256, -1167), + COL_VERTEX(1638, 205, -2601), + COL_VERTEX(1638, 205, -2139), + COL_VERTEX(1638, 205, -2037), + COL_VERTEX(1638, 205, -2498), + COL_VERTEX(154, 410, -3113), + COL_VERTEX(-1280, 205, -2908), + COL_VERTEX(1024, 0, -3113), + COL_VERTEX(179, 410, -2908), + COL_VERTEX(1307, 0, -1706), + COL_VERTEX(1248, 179, -2018), + COL_VERTEX(-1307, 0, -1706), + COL_VERTEX(-1536, 205, -2498), + COL_VERTEX(768, 0, -2908), + COL_VERTEX(1126, 0, -2908), + COL_VERTEX(-1126, 0, -2908), + COL_VERTEX(-768, 0, -2908), COL_VERTEX(-768, 0, -3215), COL_VERTEX(-1126, 0, -3215), COL_VERTEX(-1126, 0, -3113), @@ -991,7 +989,8 @@ const Collision castle_inside_collision[] = { COL_VERTEX(512, -205, -4674), COL_VERTEX(1382, -205, -3855), COL_VERTEX(1382, -205, -4674), - COL_VERTEX(512, 0, -3113), + COL_VERTEX(512, 0, -3804), + COL_VERTEX(512, 0, -3348), COL_VERTEX(768, -205, -4085), COL_VERTEX(768, -128, -4034), COL_VERTEX(717, -128, -4034), @@ -1003,13 +1002,12 @@ const Collision castle_inside_collision[] = { COL_VERTEX(768, -128, -4085), COL_VERTEX(768, 51, -3804), COL_VERTEX(742, -102, -4060), - COL_VERTEX(1229, 0, -3113), COL_VERTEX(1229, 614, -3113), COL_VERTEX(717, -205, -3855), COL_VERTEX(512, 51, -3855), COL_VERTEX(717, 51, -3855), COL_VERTEX(512, 614, -4674), - COL_VERTEX(512, -205, -3266), + COL_VERTEX(512, -205, -3113), COL_VERTEX(1382, 0, -3804), COL_VERTEX(1126, 51, -3804), COL_VERTEX(1178, -128, -4034), @@ -1025,16 +1023,13 @@ const Collision castle_inside_collision[] = { COL_VERTEX(1152, -102, -4060), COL_VERTEX(1382, 51, -3855), COL_VERTEX(1178, -205, -3855), - COL_VERTEX(1382, -205, -3266), + COL_VERTEX(1382, -205, -3113), COL_VERTEX(1382, 614, -4674), COL_VERTEX(1331, -154, -4674), COL_VERTEX(1382, -154, -4674), - COL_VERTEX(666, 0, -3113), COL_VERTEX(666, 614, -3113), - COL_VERTEX(1229, 614, -3266), COL_VERTEX(1178, 51, -3804), COL_VERTEX(1382, 51, -3804), - COL_VERTEX(512, 0, -3804), COL_VERTEX(1382, 0, -3855), COL_VERTEX(717, 51, -3804), COL_VERTEX(512, 51, -3804), @@ -1052,25 +1047,18 @@ const Collision castle_inside_collision[] = { COL_VERTEX(640, 614, -4674), COL_VERTEX(1254, 614, -4674), COL_VERTEX(1331, 614, -4674), - COL_VERTEX(1331, 563, -3266), - COL_VERTEX(1331, 614, -3266), + COL_VERTEX(1331, 563, -3113), + COL_VERTEX(1331, 614, -3113), COL_VERTEX(1331, 563, -4674), - COL_VERTEX(1382, 563, -3266), + COL_VERTEX(1382, 563, -3113), COL_VERTEX(512, 563, -4674), - COL_VERTEX(563, 563, -3266), - COL_VERTEX(512, 563, -3266), + COL_VERTEX(563, 563, -3113), + COL_VERTEX(512, 563, -3113), COL_VERTEX(563, 563, -4674), - COL_VERTEX(563, 614, -3266), + COL_VERTEX(563, 614, -3113), COL_VERTEX(1254, 614, -4725), COL_VERTEX(640, 410, -4725), COL_VERTEX(1254, 410, -4725), - COL_VERTEX(1229, 0, -3266), - COL_VERTEX(1382, 614, -3266), - COL_VERTEX(1382, 0, -3266), - COL_VERTEX(512, 0, -3266), - COL_VERTEX(666, 614, -3266), - COL_VERTEX(666, 0, -3266), - COL_VERTEX(1382, 0, -3113), COL_VERTEX(1254, -205, -4777), COL_VERTEX(1254, 614, -4777), COL_VERTEX(1254, 410, -4777), @@ -1078,7 +1066,8 @@ const Collision castle_inside_collision[] = { COL_VERTEX(512, 614, -3113), COL_VERTEX(512, 614, -4777), COL_VERTEX(512, -205, -3855), - COL_VERTEX(512, 614, -3266), + COL_VERTEX(1382, 0, -3348), + COL_VERTEX(1382, 614, -3113), COL_VERTEX(1331, -205, -4674), COL_VERTEX(512, 0, -3855), COL_VERTEX(640, 614, -4777), @@ -1087,7 +1076,10 @@ const Collision castle_inside_collision[] = { COL_VERTEX(563, 614, -4674), COL_VERTEX(640, 614, -4725), COL_VERTEX(640, 410, -4777), - COL_VERTEX(1382, 614, -3113), + COL_VERTEX(1382, 0, -3113), + COL_VERTEX(512, 0, -3113), + COL_VERTEX(512, 256, -3113), + COL_VERTEX(1382, 256, -3113), COL_VERTEX(1638, 205, -2140), COL_VERTEX(1536, 205, -2140), COL_VERTEX(-3047, 410, -2422), @@ -1367,43 +1359,43 @@ const Collision castle_inside_collision[] = { COL_TRI(201, 190, 189), COL_TRI(201, 189, 207), COL_TRI(214, 211, 210), - COL_TRI(215, 216, 217), + COL_TRI(215, 159, 216), COL_TRI(187, 185, 215), - COL_TRI(205, 217, 183), + COL_TRI(205, 216, 183), + COL_TRI(207, 217, 218), + COL_TRI(216, 203, 201), COL_TRI(207, 218, 219), - COL_TRI(217, 203, 201), - COL_TRI(207, 219, 220), COL_TRI(211, 207, 209), - COL_TRI(215, 211, 221), - COL_TRI(211, 215, 218), - COL_TRI(211, 218, 207), + COL_TRI(215, 211, 220), + COL_TRI(211, 215, 217), + COL_TRI(211, 217, 207), COL_TRI(201, 203, 202), - COL_TRI(203, 217, 205), - COL_TRI(222, 223, 224), - COL_TRI(225, 226, 223), - COL_TRI(227, 228, 226), - COL_TRI(229, 230, 228), - COL_TRI(231, 232, 230), - COL_TRI(233, 234, 232), - COL_TRI(235, 236, 234), - COL_TRI(237, 238, 236), - COL_TRI(239, 240, 238), - COL_TRI(241, 242, 240), - COL_TRI(243, 244, 242), - COL_TRI(245, 246, 213), - COL_TRI(224, 195, 198), - COL_TRI(204, 247, 248), - COL_TRI(247, 249, 248), - COL_TRI(250, 251, 249), - COL_TRI(252, 253, 251), - COL_TRI(254, 255, 253), - COL_TRI(256, 257, 255), - COL_TRI(258, 259, 257), - COL_TRI(260, 261, 259), - COL_TRI(262, 263, 261), - COL_TRI(264, 265, 263), - COL_TRI(266, 267, 265), - COL_TRI(268, 198, 195), + COL_TRI(203, 216, 205), + COL_TRI(221, 222, 223), + COL_TRI(224, 225, 222), + COL_TRI(226, 227, 225), + COL_TRI(228, 229, 227), + COL_TRI(230, 231, 229), + COL_TRI(232, 233, 231), + COL_TRI(234, 235, 233), + COL_TRI(236, 237, 235), + COL_TRI(238, 239, 237), + COL_TRI(240, 241, 239), + COL_TRI(242, 243, 241), + COL_TRI(244, 245, 213), + COL_TRI(223, 195, 198), + COL_TRI(204, 246, 247), + COL_TRI(246, 248, 247), + COL_TRI(249, 250, 248), + COL_TRI(251, 252, 250), + COL_TRI(253, 254, 252), + COL_TRI(255, 256, 254), + COL_TRI(257, 258, 256), + COL_TRI(259, 260, 258), + COL_TRI(261, 262, 260), + COL_TRI(263, 264, 262), + COL_TRI(265, 266, 264), + COL_TRI(267, 198, 195), COL_TRI(179, 183, 180), COL_TRI(182, 174, 183), COL_TRI(180, 171, 173), @@ -1411,823 +1403,824 @@ const Collision castle_inside_collision[] = { COL_TRI(185, 187, 186), COL_TRI(187, 175, 188), COL_TRI(190, 193, 197), - COL_TRI(193, 269, 197), - COL_TRI(269, 198, 197), - COL_TRI(191, 195, 270), - COL_TRI(191, 270, 212), + COL_TRI(193, 268, 197), + COL_TRI(268, 198, 197), + COL_TRI(191, 195, 269), + COL_TRI(191, 269, 212), COL_TRI(190, 197, 191), COL_TRI(212, 189, 191), COL_TRI(190, 201, 192), - COL_TRI(194, 268, 195), + COL_TRI(194, 267, 195), COL_TRI(196, 199, 197), COL_TRI(199, 194, 191), - COL_TRI(192, 246, 200), + COL_TRI(192, 245, 200), COL_TRI(203, 206, 204), COL_TRI(205, 161, 206), - COL_TRI(209, 271, 210), - COL_TRI(212, 245, 213), + COL_TRI(209, 270, 210), + COL_TRI(212, 244, 213), COL_TRI(207, 189, 212), - COL_TRI(214, 221, 211), - COL_TRI(215, 155, 216), - COL_TRI(221, 214, 187), + COL_TRI(214, 220, 211), + COL_TRI(215, 155, 159), + COL_TRI(220, 214, 187), COL_TRI(214, 175, 187), COL_TRI(176, 155, 185), COL_TRI(155, 215, 185), - COL_TRI(221, 187, 215), - COL_TRI(217, 216, 180), - COL_TRI(216, 171, 180), + COL_TRI(220, 187, 215), + COL_TRI(216, 159, 180), + COL_TRI(159, 171, 180), COL_TRI(174, 161, 183), COL_TRI(161, 205, 183), - COL_TRI(217, 180, 183), - COL_TRI(214, 210, 271), + COL_TRI(216, 180, 183), + COL_TRI(214, 210, 270), COL_TRI(204, 206, 161), - COL_TRI(222, 225, 223), - COL_TRI(225, 227, 226), - COL_TRI(227, 229, 228), - COL_TRI(229, 231, 230), - COL_TRI(231, 233, 232), - COL_TRI(233, 235, 234), - COL_TRI(235, 237, 236), - COL_TRI(237, 239, 238), - COL_TRI(239, 241, 240), - COL_TRI(241, 243, 242), - COL_TRI(243, 272, 244), - COL_TRI(245, 200, 246), - COL_TRI(269, 222, 198), - COL_TRI(222, 224, 198), - COL_TRI(224, 270, 195), - COL_TRI(204, 271, 247), - COL_TRI(247, 250, 249), - COL_TRI(250, 252, 251), - COL_TRI(252, 254, 253), - COL_TRI(254, 256, 255), - COL_TRI(256, 258, 257), - COL_TRI(258, 260, 259), - COL_TRI(260, 262, 261), - COL_TRI(262, 264, 263), - COL_TRI(264, 266, 265), - COL_TRI(266, 273, 267), - COL_TRI(268, 196, 198), - COL_TRI(214, 271, 204), + COL_TRI(221, 224, 222), + COL_TRI(224, 226, 225), + COL_TRI(226, 228, 227), + COL_TRI(228, 230, 229), + COL_TRI(230, 232, 231), + COL_TRI(232, 234, 233), + COL_TRI(234, 236, 235), + COL_TRI(236, 238, 237), + COL_TRI(238, 240, 239), + COL_TRI(240, 242, 241), + COL_TRI(242, 271, 243), + COL_TRI(244, 200, 245), + COL_TRI(268, 221, 198), + COL_TRI(221, 223, 198), + COL_TRI(223, 269, 195), + COL_TRI(204, 270, 246), + COL_TRI(246, 249, 248), + COL_TRI(249, 251, 250), + COL_TRI(251, 253, 252), + COL_TRI(253, 255, 254), + COL_TRI(255, 257, 256), + COL_TRI(257, 259, 258), + COL_TRI(259, 261, 260), + COL_TRI(261, 263, 262), + COL_TRI(263, 265, 264), + COL_TRI(265, 272, 266), + COL_TRI(267, 196, 198), + COL_TRI(214, 270, 204), COL_TRI(204, 161, 162), - COL_TRI(160, 216, 155), + COL_TRI(160, 159, 155), COL_TRI(204, 162, 160), COL_TRI(157, 156, 214), COL_TRI(160, 155, 158), COL_TRI(157, 214, 204), COL_TRI(160, 158, 157), COL_TRI(204, 160, 157), - COL_TRI(219, 218, 215), - COL_TRI(219, 215, 217), - COL_TRI(220, 219, 217), - COL_TRI(220, 217, 201), - COL_TRI(274, 275, 276), - COL_TRI(274, 276, 277), - COL_TRI(278, 279, 280), - COL_TRI(281, 282, 283), - COL_TRI(284, 280, 279), - COL_TRI(285, 286, 287), - COL_TRI(288, 289, 290), - COL_TRI(291, 292, 293), - COL_TRI(294, 295, 296), - COL_TRI(297, 298, 299), - COL_TRI(300, 301, 302), - COL_TRI(303, 304, 305), - COL_TRI(306, 307, 308), - COL_TRI(308, 309, 310), - COL_TRI(310, 306, 308), - COL_TRI(278, 311, 312), - COL_TRI(313, 314, 311), - COL_TRI(315, 316, 317), - COL_TRI(312, 318, 278), - COL_TRI(319, 292, 301), - COL_TRI(320, 284, 321), - COL_TRI(286, 281, 283), - COL_TRI(322, 323, 324), - COL_TRI(325, 326, 327), - COL_TRI(328, 288, 329), - COL_TRI(330, 331, 332), - COL_TRI(333, 334, 335), - COL_TRI(308, 336, 337), - COL_TRI(338, 339, 310), - COL_TRI(288, 340, 329), - COL_TRI(341, 324, 296), - COL_TRI(342, 343, 306), - COL_TRI(344, 345, 330), - COL_TRI(278, 321, 279), - COL_TRI(346, 347, 348), - COL_TRI(322, 349, 323), - COL_TRI(350, 351, 352), - COL_TRI(353, 354, 355), - COL_TRI(356, 357, 358), - COL_TRI(359, 360, 361), - COL_TRI(289, 288, 335), - COL_TRI(334, 362, 289), - COL_TRI(335, 334, 289), - COL_TRI(363, 364, 282), - COL_TRI(364, 365, 282), - COL_TRI(321, 366, 319), - COL_TRI(366, 367, 319), - COL_TRI(281, 363, 282), - COL_TRI(287, 368, 369), - COL_TRI(369, 285, 287), - COL_TRI(330, 345, 331), - COL_TRI(312, 370, 318), - COL_TRI(287, 283, 282), - COL_TRI(363, 371, 372), - COL_TRI(300, 373, 301), - COL_TRI(301, 292, 302), - COL_TRI(316, 374, 317), - COL_TRI(287, 286, 283), - COL_TRI(375, 376, 377), - COL_TRI(372, 378, 379), - COL_TRI(343, 307, 306), - COL_TRI(278, 280, 311), - COL_TRI(347, 380, 348), - COL_TRI(320, 381, 284), - COL_TRI(381, 304, 284), - COL_TRI(284, 279, 321), - COL_TRI(375, 382, 376), - COL_TRI(383, 384, 374), - COL_TRI(325, 385, 326), - COL_TRI(327, 365, 325), - COL_TRI(365, 314, 325), - COL_TRI(341, 296, 290), - COL_TRI(319, 293, 292), - COL_TRI(310, 341, 306), - COL_TRI(297, 384, 298), - COL_TRI(343, 346, 307), - COL_TRI(310, 366, 386), - COL_TRI(377, 387, 388), - COL_TRI(289, 342, 306), - COL_TRI(316, 383, 374), - COL_TRI(341, 289, 306), - COL_TRI(284, 303, 280), - COL_TRI(389, 390, 391), - COL_TRI(370, 392, 393), - COL_TRI(314, 312, 311), - COL_TRI(323, 296, 324), - COL_TRI(392, 394, 315), - COL_TRI(314, 365, 312), - COL_TRI(395, 325, 313), - COL_TRI(389, 391, 396), - COL_TRI(320, 300, 309), - COL_TRI(396, 387, 389), - COL_TRI(367, 397, 398), - COL_TRI(392, 315, 393), - COL_TRI(377, 388, 375), - COL_TRI(378, 390, 379), - COL_TRI(319, 373, 321), - COL_TRI(367, 363, 397), - COL_TRI(365, 368, 287), - COL_TRI(347, 399, 380), - COL_TRI(370, 393, 318), - COL_TRI(323, 294, 296), - COL_TRI(396, 388, 387), - COL_TRI(395, 385, 325), - COL_TRI(310, 309, 366), - COL_TRI(286, 285, 281), - COL_TRI(372, 371, 378), - COL_TRI(320, 373, 300), - COL_TRI(319, 301, 373), - COL_TRI(365, 287, 282), - COL_TRI(382, 299, 376), - COL_TRI(342, 362, 344), - COL_TRI(303, 284, 304), - COL_TRI(313, 325, 314), - COL_TRI(363, 367, 371), - COL_TRI(342, 289, 362), - COL_TRI(294, 400, 295), - COL_TRI(291, 319, 367), - COL_TRI(341, 290, 289), - COL_TRI(339, 324, 341), - COL_TRI(315, 394, 316), - COL_TRI(296, 295, 329), - COL_TRI(383, 298, 384), - COL_TRI(382, 297, 299), - COL_TRI(291, 293, 319), - COL_TRI(335, 288, 328), - COL_TRI(328, 364, 333), - COL_TRI(328, 333, 335), - COL_TRI(291, 302, 292), - COL_TRI(338, 322, 324), - COL_TRI(386, 338, 310), - COL_TRI(340, 296, 329), - COL_TRI(378, 391, 390), - COL_TRI(310, 339, 341), - COL_TRI(290, 340, 288), - COL_TRI(339, 338, 324), - COL_TRI(340, 290, 296), - COL_TRI(368, 327, 334), - COL_TRI(334, 333, 369), - COL_TRI(334, 369, 368), - COL_TRI(401, 402, 330), - COL_TRI(401, 330, 403), - COL_TRI(402, 401, 347), - COL_TRI(402, 347, 404), - COL_TRI(403, 330, 332), - COL_TRI(347, 401, 399), - COL_TRI(405, 406, 407), - COL_TRI(406, 405, 408), - COL_TRI(409, 408, 405), - COL_TRI(410, 408, 409), - COL_TRI(408, 410, 411), - COL_TRI(410, 412, 411), - COL_TRI(409, 412, 410), - COL_TRI(412, 409, 413), - COL_TRI(413, 414, 412), - COL_TRI(415, 412, 414), - COL_TRI(412, 415, 416), - COL_TRI(412, 416, 411), - COL_TRI(417, 416, 415), - COL_TRI(418, 416, 417), - COL_TRI(419, 416, 418), - COL_TRI(419, 406, 411), - COL_TRI(419, 411, 416), - COL_TRI(419, 420, 406), - COL_TRI(419, 421, 420), - COL_TRI(421, 419, 418), - COL_TRI(418, 422, 421), - COL_TRI(418, 417, 422), - COL_TRI(415, 422, 417), - COL_TRI(422, 415, 414), - COL_TRI(407, 406, 420), - COL_TRI(406, 408, 411), + COL_TRI(218, 217, 215), + COL_TRI(218, 215, 216), + COL_TRI(219, 218, 216), + COL_TRI(219, 216, 201), + COL_TRI(273, 274, 275), + COL_TRI(273, 275, 276), + COL_TRI(277, 278, 279), + COL_TRI(280, 281, 282), + COL_TRI(283, 279, 278), + COL_TRI(284, 285, 286), + COL_TRI(287, 288, 289), + COL_TRI(290, 291, 292), + COL_TRI(293, 294, 295), + COL_TRI(296, 297, 298), + COL_TRI(299, 300, 301), + COL_TRI(302, 303, 304), + COL_TRI(305, 306, 307), + COL_TRI(307, 308, 309), + COL_TRI(309, 305, 307), + COL_TRI(277, 310, 311), + COL_TRI(312, 313, 310), + COL_TRI(314, 315, 316), + COL_TRI(311, 317, 277), + COL_TRI(318, 291, 300), + COL_TRI(319, 283, 320), + COL_TRI(285, 280, 282), + COL_TRI(321, 322, 323), + COL_TRI(324, 325, 326), + COL_TRI(327, 287, 328), + COL_TRI(329, 330, 331), + COL_TRI(332, 333, 334), + COL_TRI(307, 335, 336), + COL_TRI(337, 338, 309), + COL_TRI(287, 339, 328), + COL_TRI(340, 323, 295), + COL_TRI(341, 342, 305), + COL_TRI(343, 344, 329), + COL_TRI(277, 320, 278), + COL_TRI(345, 346, 347), + COL_TRI(321, 348, 322), + COL_TRI(349, 350, 351), + COL_TRI(352, 353, 354), + COL_TRI(355, 356, 357), + COL_TRI(358, 359, 360), + COL_TRI(288, 287, 334), + COL_TRI(333, 361, 288), + COL_TRI(334, 333, 288), + COL_TRI(362, 363, 281), + COL_TRI(363, 364, 281), + COL_TRI(320, 365, 318), + COL_TRI(365, 366, 318), + COL_TRI(280, 362, 281), + COL_TRI(286, 367, 368), + COL_TRI(368, 284, 286), + COL_TRI(329, 344, 330), + COL_TRI(311, 369, 317), + COL_TRI(286, 282, 281), + COL_TRI(362, 370, 371), + COL_TRI(299, 372, 300), + COL_TRI(300, 291, 301), + COL_TRI(315, 373, 316), + COL_TRI(286, 285, 282), + COL_TRI(374, 375, 376), + COL_TRI(371, 377, 378), + COL_TRI(342, 306, 305), + COL_TRI(277, 279, 310), + COL_TRI(346, 379, 347), + COL_TRI(319, 380, 283), + COL_TRI(380, 303, 283), + COL_TRI(283, 278, 320), + COL_TRI(374, 381, 375), + COL_TRI(382, 383, 373), + COL_TRI(324, 384, 325), + COL_TRI(326, 364, 324), + COL_TRI(364, 313, 324), + COL_TRI(340, 295, 289), + COL_TRI(318, 292, 291), + COL_TRI(309, 340, 305), + COL_TRI(296, 383, 297), + COL_TRI(342, 345, 306), + COL_TRI(309, 365, 385), + COL_TRI(376, 386, 387), + COL_TRI(288, 341, 305), + COL_TRI(315, 382, 373), + COL_TRI(340, 288, 305), + COL_TRI(283, 302, 279), + COL_TRI(388, 389, 390), + COL_TRI(369, 391, 392), + COL_TRI(313, 311, 310), + COL_TRI(322, 295, 323), + COL_TRI(391, 393, 314), + COL_TRI(313, 364, 311), + COL_TRI(394, 324, 312), + COL_TRI(388, 390, 395), + COL_TRI(319, 299, 308), + COL_TRI(395, 386, 388), + COL_TRI(366, 396, 397), + COL_TRI(391, 314, 392), + COL_TRI(376, 387, 374), + COL_TRI(377, 389, 378), + COL_TRI(318, 372, 320), + COL_TRI(366, 362, 396), + COL_TRI(364, 367, 286), + COL_TRI(346, 398, 379), + COL_TRI(369, 392, 317), + COL_TRI(322, 293, 295), + COL_TRI(395, 387, 386), + COL_TRI(394, 384, 324), + COL_TRI(309, 308, 365), + COL_TRI(285, 284, 280), + COL_TRI(371, 370, 377), + COL_TRI(319, 372, 299), + COL_TRI(318, 300, 372), + COL_TRI(364, 286, 281), + COL_TRI(381, 298, 375), + COL_TRI(341, 361, 343), + COL_TRI(302, 283, 303), + COL_TRI(312, 324, 313), + COL_TRI(362, 366, 370), + COL_TRI(341, 288, 361), + COL_TRI(293, 399, 294), + COL_TRI(290, 318, 366), + COL_TRI(340, 289, 288), + COL_TRI(338, 323, 340), + COL_TRI(314, 393, 315), + COL_TRI(295, 294, 328), + COL_TRI(382, 297, 383), + COL_TRI(381, 296, 298), + COL_TRI(290, 292, 318), + COL_TRI(334, 287, 327), + COL_TRI(327, 363, 332), + COL_TRI(327, 332, 334), + COL_TRI(290, 301, 291), + COL_TRI(337, 321, 323), + COL_TRI(385, 337, 309), + COL_TRI(339, 295, 328), + COL_TRI(377, 390, 389), + COL_TRI(309, 338, 340), + COL_TRI(289, 339, 287), + COL_TRI(338, 337, 323), + COL_TRI(339, 289, 295), + COL_TRI(367, 326, 333), + COL_TRI(333, 332, 368), + COL_TRI(333, 368, 367), + COL_TRI(400, 401, 329), + COL_TRI(400, 329, 402), + COL_TRI(401, 400, 346), + COL_TRI(401, 346, 403), + COL_TRI(402, 329, 331), + COL_TRI(346, 400, 398), + COL_TRI(404, 405, 406), + COL_TRI(405, 404, 407), + COL_TRI(408, 407, 404), + COL_TRI(409, 407, 408), + COL_TRI(409, 410, 407), + COL_TRI(408, 410, 409), + COL_TRI(410, 408, 411), + COL_TRI(411, 412, 410), + COL_TRI(413, 410, 412), + COL_TRI(413, 407, 410), + COL_TRI(414, 415, 413), + COL_TRI(405, 415, 416), + COL_TRI(416, 417, 405), + COL_TRI(416, 418, 417), + COL_TRI(418, 416, 415), + COL_TRI(415, 419, 418), + COL_TRI(415, 414, 419), + COL_TRI(413, 419, 414), + COL_TRI(419, 413, 412), + COL_TRI(406, 405, 417), + COL_TRI(420, 421, 422), COL_TRI(423, 424, 425), - COL_TRI(423, 425, 426), - COL_TRI(427, 428, 429), - COL_TRI(427, 429, 430), - COL_TRI(431, 432, 433), - COL_TRI(431, 433, 434), - COL_TRI(435, 436, 437), - COL_TRI(435, 437, 438), - COL_TRI(439, 437, 436), - COL_TRI(439, 436, 440), - COL_TRI(426, 425, 441), - COL_TRI(426, 441, 442), - COL_TRI(438, 442, 441), - COL_TRI(438, 441, 435), - COL_TRI(443, 444, 439), - COL_TRI(443, 439, 440), - COL_TRI(445, 446, 447), - COL_TRI(445, 447, 448), - COL_TRI(432, 445, 448), - COL_TRI(432, 448, 433), - COL_TRI(431, 449, 421), - COL_TRI(431, 421, 450), - COL_TRI(447, 446, 451), - COL_TRI(447, 451, 452), - COL_TRI(450, 421, 422), - COL_TRI(450, 422, 453), - COL_TRI(451, 427, 430), - COL_TRI(451, 430, 452), - COL_TRI(454, 455, 444), - COL_TRI(429, 428, 456), - COL_TRI(429, 456, 457), - COL_TRI(454, 444, 443), - COL_TRI(429, 457, 454), - COL_TRI(454, 443, 429), - COL_TRI(456, 458, 459), - COL_TRI(456, 459, 457), - COL_TRI(457, 459, 460), - COL_TRI(457, 460, 454), - COL_TRI(454, 460, 461), - COL_TRI(454, 461, 455), - COL_TRI(462, 463, 464), - COL_TRI(462, 464, 465), - COL_TRI(466, 467, 468), - COL_TRI(466, 468, 469), - COL_TRI(470, 471, 472), - COL_TRI(470, 472, 473), - COL_TRI(453, 422, 414), - COL_TRI(453, 414, 474), - COL_TRI(475, 409, 405), - COL_TRI(475, 405, 476), - COL_TRI(474, 414, 463), - COL_TRI(474, 463, 462), - COL_TRI(477, 478, 467), - COL_TRI(477, 467, 466), - COL_TRI(479, 413, 409), - COL_TRI(479, 409, 475), - COL_TRI(465, 464, 480), - COL_TRI(465, 480, 481), - COL_TRI(473, 472, 413), - COL_TRI(473, 413, 479), - COL_TRI(469, 468, 471), - COL_TRI(469, 471, 470), - COL_TRI(476, 405, 482), - COL_TRI(476, 482, 423), - COL_TRI(481, 480, 478), - COL_TRI(481, 478, 477), - COL_TRI(483, 484, 485), - COL_TRI(483, 485, 486), - COL_TRI(487, 488, 489), - COL_TRI(487, 489, 490), - COL_TRI(491, 432, 431), - COL_TRI(491, 431, 492), - COL_TRI(431, 450, 493), - COL_TRI(431, 493, 492), - COL_TRI(134, 133, 494), - COL_TRI(494, 493, 450), - COL_TRI(453, 495, 496), - COL_TRI(496, 153, 26), - COL_TRI(134, 494, 450), - COL_TRI(453, 496, 26), - COL_TRI(26, 134, 450), - COL_TRI(450, 453, 26), - COL_TRI(153, 87, 27), - COL_TRI(153, 27, 26), - COL_TRI(26, 27, 25), - COL_TRI(26, 25, 134), - COL_TRI(134, 25, 132), - COL_TRI(134, 132, 133), - COL_TRI(497, 498, 499), - COL_TRI(497, 499, 500), - COL_TRI(428, 501, 502), - COL_TRI(502, 503, 456), - COL_TRI(502, 456, 428), - COL_TRI(444, 504, 505), - COL_TRI(444, 505, 439), - COL_TRI(497, 506, 507), - COL_TRI(497, 507, 508), - COL_TRI(427, 451, 500), - COL_TRI(446, 509, 510), - COL_TRI(446, 510, 451), - COL_TRI(490, 489, 508), - COL_TRI(490, 508, 507), - COL_TRI(437, 439, 164), - COL_TRI(437, 164, 511), - COL_TRI(512, 426, 442), - COL_TRI(512, 442, 513), - COL_TRI(514, 515, 516), - COL_TRI(514, 516, 517), - COL_TRI(500, 501, 428), - COL_TRI(500, 428, 427), - COL_TRI(486, 485, 506), - COL_TRI(486, 506, 518), - COL_TRI(444, 455, 519), - COL_TRI(520, 504, 444), - COL_TRI(519, 520, 444), - COL_TRI(505, 186, 164), - COL_TRI(177, 184, 488), - COL_TRI(521, 522, 523), - COL_TRI(521, 523, 524), + COL_TRI(426, 427, 428), + COL_TRI(429, 430, 431), + COL_TRI(430, 432, 433), + COL_TRI(421, 434, 435), + COL_TRI(435, 429, 431), + COL_TRI(436, 433, 432), + COL_TRI(437, 438, 439), + COL_TRI(426, 439, 440), + COL_TRI(441, 442, 428), + COL_TRI(438, 443, 444), + COL_TRI(418, 445, 442), + COL_TRI(423, 444, 443), + COL_TRI(446, 436, 424), + COL_TRI(447, 448, 449), + COL_TRI(450, 446, 448), + COL_TRI(451, 452, 446), + COL_TRI(453, 454, 455), + COL_TRI(456, 457, 458), + COL_TRI(459, 460, 461), + COL_TRI(419, 462, 445), + COL_TRI(408, 463, 464), + COL_TRI(412, 455, 462), + COL_TRI(465, 458, 466), + COL_TRI(411, 464, 467), + COL_TRI(468, 469, 454), + COL_TRI(461, 411, 467), + COL_TRI(470, 459, 457), + COL_TRI(404, 422, 463), + COL_TRI(469, 465, 466), + COL_TRI(471, 472, 473), + COL_TRI(474, 475, 476), + COL_TRI(426, 477, 478), + COL_TRI(442, 477, 428), + COL_TRI(442, 445, 26), + COL_TRI(87, 26, 153), + COL_TRI(27, 134, 26), + COL_TRI(25, 133, 134), + COL_TRI(479, 480, 481), + COL_TRI(482, 449, 483), + COL_TRI(484, 433, 485), + COL_TRI(479, 486, 487), + COL_TRI(423, 443, 481), + COL_TRI(488, 443, 489), + COL_TRI(476, 487, 486), + COL_TRI(433, 490, 430), + COL_TRI(491, 435, 492), + COL_TRI(493, 494, 495), + COL_TRI(481, 483, 423), + COL_TRI(496, 497, 472), + COL_TRI(498, 484, 485), + COL_TRI(499, 186, 164), + COL_TRI(177, 184, 500), + COL_TRI(501, 502, 503), COL_TRI(164, 186, 188), - COL_TRI(166, 177, 488), - COL_TRI(505, 184, 186), - COL_TRI(505, 488, 184), - COL_TRI(516, 515, 498), - COL_TRI(516, 498, 497), - COL_TRI(525, 438, 526), - COL_TRI(527, 438, 437), - COL_TRI(527, 437, 511), - COL_TRI(528, 529, 530), - COL_TRI(528, 530, 531), - COL_TRI(529, 528, 166), - COL_TRI(529, 166, 487), - COL_TRI(500, 170, 179), - COL_TRI(173, 497, 181), - COL_TRI(532, 533, 534), - COL_TRI(532, 534, 535), + COL_TRI(166, 177, 500), + COL_TRI(499, 184, 186), + COL_TRI(499, 500, 184), + COL_TRI(504, 505, 479), + COL_TRI(506, 431, 507), + COL_TRI(508, 430, 490), + COL_TRI(509, 510, 511), + COL_TRI(511, 474, 509), + COL_TRI(481, 170, 179), + COL_TRI(173, 479, 181), + COL_TRI(512, 513, 514), COL_TRI(170, 182, 179), - COL_TRI(518, 497, 173), - COL_TRI(500, 179, 181), - COL_TRI(500, 181, 497), - COL_TRI(442, 525, 513), - COL_TRI(513, 525, 536), - COL_TRI(537, 526, 527), - COL_TRI(527, 526, 438), - COL_TRI(442, 438, 525), - COL_TRI(446, 538, 509), - COL_TRI(509, 538, 539), - COL_TRI(540, 541, 542), - COL_TRI(542, 541, 445), - COL_TRI(541, 538, 446), - COL_TRI(541, 446, 445), - COL_TRI(538, 543, 544), - COL_TRI(538, 544, 539), - COL_TRI(541, 545, 543), - COL_TRI(541, 543, 538), - COL_TRI(540, 546, 545), - COL_TRI(540, 545, 541), - COL_TRI(179, 183, 180), - COL_TRI(179, 180, 181), - COL_TRI(182, 174, 183), - COL_TRI(182, 183, 179), - COL_TRI(181, 180, 171), + COL_TRI(497, 479, 173), + COL_TRI(481, 179, 181), + COL_TRI(481, 181, 479), + COL_TRI(435, 506, 492), + COL_TRI(492, 506, 515), + COL_TRI(516, 507, 508), + COL_TRI(508, 507, 431), + COL_TRI(435, 431, 506), + COL_TRI(489, 517, 488), + COL_TRI(488, 517, 518), + COL_TRI(519, 520, 521), + COL_TRI(521, 520, 437), + COL_TRI(520, 517, 489), + COL_TRI(520, 489, 437), + COL_TRI(522, 518, 517), + COL_TRI(523, 517, 520), + COL_TRI(519, 523, 520), + COL_TRI(183, 181, 179), + COL_TRI(174, 179, 182), COL_TRI(181, 171, 173), - COL_TRI(177, 176, 185), COL_TRI(177, 185, 184), - COL_TRI(184, 185, 187), - COL_TRI(184, 187, 186), - COL_TRI(186, 187, 175), - COL_TRI(186, 175, 188), - COL_TRI(426, 512, 547), - COL_TRI(426, 547, 423), - COL_TRI(488, 505, 548), - COL_TRI(488, 548, 549), - COL_TRI(531, 530, 484), - COL_TRI(531, 484, 483), - COL_TRI(542, 445, 432), - COL_TRI(542, 432, 533), - COL_TRI(521, 488, 549), - COL_TRI(521, 549, 522), - COL_TRI(474, 462, 550), - COL_TRI(474, 550, 551), - COL_TRI(462, 465, 552), - COL_TRI(462, 552, 550), - COL_TRI(495, 453, 474), - COL_TRI(474, 551, 553), - COL_TRI(495, 474, 553), - COL_TRI(465, 481, 554), - COL_TRI(465, 554, 552), - COL_TRI(481, 477, 555), - COL_TRI(481, 555, 554), - COL_TRI(556, 477, 466), - COL_TRI(466, 557, 558), - COL_TRI(466, 558, 556), - COL_TRI(469, 470, 559), - COL_TRI(469, 559, 560), - COL_TRI(470, 473, 561), - COL_TRI(470, 561, 559), - COL_TRI(473, 479, 562), - COL_TRI(473, 562, 561), - COL_TRI(479, 475, 563), - COL_TRI(479, 563, 562), + COL_TRI(185, 186, 184), + COL_TRI(187, 188, 186), + COL_TRI(421, 524, 422), + COL_TRI(500, 525, 526), + COL_TRI(527, 473, 510), + COL_TRI(437, 528, 521), + COL_TRI(501, 526, 529), + COL_TRI(455, 530, 462), + COL_TRI(454, 531, 455), + COL_TRI(530, 532, 533), + COL_TRI(469, 534, 454), + COL_TRI(466, 535, 469), + COL_TRI(458, 536, 537), + COL_TRI(459, 538, 457), + COL_TRI(459, 539, 540), + COL_TRI(461, 541, 539), + COL_TRI(542, 543, 464), + COL_TRI(544, 491, 545), + COL_TRI(545, 546, 544), + COL_TRI(547, 544, 546), + COL_TRI(548, 546, 549), + COL_TRI(514, 550, 551), + COL_TRI(552, 463, 422), + COL_TRI(293, 464, 463), + COL_TRI(553, 457, 538), + COL_TRI(323, 348, 322), + COL_TRI(294, 293, 399), + COL_TRI(295, 322, 293), + COL_TRI(554, 449, 555), + COL_TRI(556, 557, 452), + COL_TRI(558, 559, 560), + COL_TRI(547, 561, 562), + COL_TRI(563, 562, 561), COL_TRI(564, 565, 566), - COL_TRI(564, 566, 512), - COL_TRI(565, 564, 567), - COL_TRI(565, 567, 568), - COL_TRI(568, 569, 570), - COL_TRI(568, 570, 565), - COL_TRI(567, 571, 569), - COL_TRI(567, 569, 568), - COL_TRI(535, 572, 573), - COL_TRI(535, 573, 574), - COL_TRI(423, 575, 576), - COL_TRI(423, 576, 476), - COL_TRI(323, 349, 577), - COL_TRI(577, 578, 475), - COL_TRI(476, 576, 579), - COL_TRI(579, 400, 294), - COL_TRI(323, 577, 475), - COL_TRI(476, 579, 294), - COL_TRI(294, 323, 475), - COL_TRI(294, 475, 476), - COL_TRI(560, 580, 466), - COL_TRI(560, 466, 469), - COL_TRI(323, 324, 322), - COL_TRI(323, 322, 349), - COL_TRI(400, 295, 296), - COL_TRI(400, 296, 294), - COL_TRI(294, 296, 324), - COL_TRI(294, 324, 323), - COL_TRI(503, 581, 458), - COL_TRI(503, 458, 456), - COL_TRI(455, 461, 582), - COL_TRI(455, 582, 519), - COL_TRI(583, 584, 585), - COL_TRI(583, 585, 586), - COL_TRI(570, 569, 571), - COL_TRI(570, 571, 587), - COL_TRI(587, 588, 584), - COL_TRI(587, 584, 570), - COL_TRI(589, 590, 591), - COL_TRI(589, 591, 592), - COL_TRI(572, 593, 594), - COL_TRI(572, 594, 573), - COL_TRI(593, 572, 589), - COL_TRI(593, 589, 595), - COL_TRI(535, 574, 596), - COL_TRI(535, 596, 532), - COL_TRI(574, 573, 594), - COL_TRI(574, 594, 596), - COL_TRI(525, 597, 598), - COL_TRI(525, 598, 536), - COL_TRI(526, 599, 597), - COL_TRI(526, 597, 525), - COL_TRI(537, 600, 599), - COL_TRI(537, 599, 526), - COL_TRI(508, 489, 488), - COL_TRI(488, 505, 504), - COL_TRI(504, 520, 601), - COL_TRI(602, 502, 501), - COL_TRI(488, 504, 601), - COL_TRI(602, 501, 500), - COL_TRI(488, 601, 602), - COL_TRI(497, 508, 488), - COL_TRI(602, 500, 497), - COL_TRI(488, 602, 497), - COL_TRI(484, 530, 529), - COL_TRI(529, 487, 490), - COL_TRI(507, 506, 485), - COL_TRI(484, 529, 490), - COL_TRI(507, 485, 484), - COL_TRI(490, 507, 484), - COL_TRI(523, 522, 603), - COL_TRI(523, 603, 604), - COL_TRI(498, 515, 605), - COL_TRI(603, 549, 548), - COL_TRI(603, 548, 604), - COL_TRI(522, 549, 603), - COL_TRI(605, 515, 514), - COL_TRI(605, 514, 606), - COL_TRI(499, 498, 605), - COL_TRI(499, 605, 606), - COL_TRI(607, 566, 565), - COL_TRI(607, 565, 608), - COL_TRI(583, 607, 608), - COL_TRI(583, 608, 584), - COL_TRI(608, 570, 584), - COL_TRI(608, 565, 570), - COL_TRI(609, 610, 535), - COL_TRI(609, 535, 534), - COL_TRI(590, 589, 610), - COL_TRI(590, 610, 609), - COL_TRI(610, 589, 572), - COL_TRI(610, 572, 535), - COL_TRI(611, 571, 612), - COL_TRI(611, 612, 613), + COL_TRI(567, 550, 568), + COL_TRI(568, 569, 567), + COL_TRI(551, 512, 514), + COL_TRI(551, 570, 571), + COL_TRI(572, 515, 506), + COL_TRI(573, 506, 507), + COL_TRI(574, 507, 516), + COL_TRI(575, 481, 479), + COL_TRI(476, 486, 471), + COL_TRI(502, 576, 577), + COL_TRI(505, 493, 578), + COL_TRI(576, 525, 577), + COL_TRI(529, 526, 576), + COL_TRI(578, 495, 579), + COL_TRI(480, 578, 579), + COL_TRI(580, 581, 582), + COL_TRI(582, 558, 560), + COL_TRI(581, 562, 558), + COL_TRI(581, 544, 562), + COL_TRI(583, 513, 584), + COL_TRI(566, 584, 564), + COL_TRI(583, 566, 568), + COL_TRI(583, 568, 514), + COL_TRI(548, 585, 586), + COL_TRI(587, 588, 589), + COL_TRI(588, 590, 589), + COL_TRI(591, 592, 593), + COL_TRI(594, 595, 596), + COL_TRI(597, 598, 599), + COL_TRI(600, 601, 602), + COL_TRI(603, 604, 605), + COL_TRI(606, 605, 595), + COL_TRI(607, 587, 608), + COL_TRI(609, 593, 598), + COL_TRI(610, 596, 601), + COL_TRI(611, 585, 604), + COL_TRI(612, 599, 590), + COL_TRI(613, 602, 592), COL_TRI(614, 615, 616), - COL_TRI(614, 616, 617), - COL_TRI(617, 616, 618), - COL_TRI(617, 618, 619), - COL_TRI(620, 621, 622), - COL_TRI(620, 622, 623), + COL_TRI(617, 570, 618), + COL_TRI(619, 620, 621), + COL_TRI(622, 620, 623), COL_TRI(624, 625, 626), - COL_TRI(624, 626, 627), - COL_TRI(628, 629, 630), - COL_TRI(628, 630, 631), - COL_TRI(632, 633, 634), - COL_TRI(632, 634, 635), + COL_TRI(627, 628, 629), + COL_TRI(630, 631, 632), + COL_TRI(633, 634, 635), COL_TRI(636, 637, 638), - COL_TRI(636, 638, 639), - COL_TRI(627, 626, 637), - COL_TRI(627, 637, 636), - COL_TRI(640, 641, 615), - COL_TRI(640, 615, 614), - COL_TRI(631, 630, 621), - COL_TRI(631, 621, 620), - COL_TRI(635, 634, 625), - COL_TRI(635, 625, 624), - COL_TRI(639, 638, 611), - COL_TRI(639, 611, 613), - COL_TRI(619, 618, 629), - COL_TRI(619, 629, 628), - COL_TRI(623, 622, 633), - COL_TRI(623, 633, 632), - COL_TRI(640, 578, 577), - COL_TRI(640, 577, 642), - COL_TRI(585, 641, 640), - COL_TRI(575, 586, 585), - COL_TRI(579, 576, 575), - COL_TRI(640, 642, 643), - COL_TRI(643, 579, 575), - COL_TRI(575, 585, 640), - COL_TRI(643, 575, 640), - COL_TRI(644, 645, 646), - COL_TRI(644, 646, 594), - COL_TRI(647, 648, 649), - COL_TRI(647, 649, 650), - COL_TRI(648, 651, 652), - COL_TRI(648, 652, 649), - COL_TRI(653, 654, 655), - COL_TRI(653, 655, 656), - COL_TRI(657, 658, 659), - COL_TRI(657, 659, 660), - COL_TRI(661, 662, 663), - COL_TRI(661, 663, 664), - COL_TRI(665, 666, 667), - COL_TRI(665, 667, 668), - COL_TRI(669, 670, 671), - COL_TRI(669, 671, 672), - COL_TRI(658, 669, 672), - COL_TRI(658, 672, 659), - COL_TRI(673, 647, 650), - COL_TRI(673, 650, 674), - COL_TRI(662, 653, 656), - COL_TRI(662, 656, 663), - COL_TRI(666, 657, 660), - COL_TRI(666, 660, 667), - COL_TRI(670, 645, 644), - COL_TRI(670, 644, 671), - COL_TRI(651, 661, 664), - COL_TRI(651, 664, 652), - COL_TRI(654, 665, 668), - COL_TRI(654, 668, 655), - COL_TRI(592, 591, 492), - COL_TRI(492, 493, 494), - COL_TRI(492, 494, 675), - COL_TRI(673, 674, 592), - COL_TRI(592, 492, 675), - COL_TRI(676, 496, 495), - COL_TRI(592, 675, 676), - COL_TRI(495, 673, 592), - COL_TRI(592, 676, 495), - COL_TRI(170, 451, 510), - COL_TRI(500, 451, 170), - COL_TRI(677, 527, 511), - COL_TRI(511, 164, 163), - COL_TRI(165, 166, 528), - COL_TRI(511, 163, 165), - COL_TRI(512, 513, 678), - COL_TRI(567, 564, 512), - COL_TRI(562, 612, 567), - COL_TRI(646, 551, 562), - COL_TRI(533, 532, 596), - COL_TRI(596, 646, 562), - COL_TRI(562, 567, 512), - COL_TRI(165, 528, 531), - COL_TRI(512, 511, 165), - COL_TRI(596, 562, 512), - COL_TRI(679, 542, 533), - COL_TRI(510, 509, 680), - COL_TRI(512, 165, 531), - COL_TRI(596, 512, 531), - COL_TRI(680, 533, 596), - COL_TRI(168, 170, 510), - COL_TRI(510, 680, 596), - COL_TRI(596, 531, 483), - COL_TRI(486, 518, 169), - COL_TRI(596, 483, 486), - COL_TRI(168, 510, 596), - COL_TRI(596, 486, 169), - COL_TRI(169, 168, 596), - COL_TRI(681, 682, 683), - COL_TRI(681, 683, 684), - COL_TRI(685, 686, 687), - COL_TRI(685, 687, 688), - COL_TRI(509, 679, 680), - COL_TRI(509, 542, 679), - COL_TRI(544, 546, 540), - COL_TRI(544, 540, 539), - COL_TRI(689, 690, 691), - COL_TRI(692, 693, 694), - COL_TRI(695, 696, 697), - COL_TRI(691, 693, 689), - COL_TRI(698, 699, 700), - COL_TRI(697, 701, 695), - COL_TRI(698, 701, 702), - COL_TRI(703, 699, 704), - COL_TRI(696, 689, 693), - COL_TRI(705, 706, 707), - COL_TRI(708, 709, 710), - COL_TRI(711, 712, 706), - COL_TRI(713, 714, 715), - COL_TRI(716, 709, 717), - COL_TRI(708, 718, 719), - COL_TRI(720, 721, 705), - COL_TRI(715, 708, 710), - COL_TRI(719, 718, 722), - COL_TRI(709, 719, 722), - COL_TRI(713, 722, 718), - COL_TRI(709, 722, 713), - COL_TRI(723, 543, 700), - COL_TRI(724, 712, 711), - COL_TRI(724, 713, 715), - COL_TRI(695, 725, 690), - COL_TRI(726, 727, 728), - COL_TRI(727, 729, 728), - COL_TRI(730, 731, 727), - COL_TRI(732, 733, 734), - COL_TRI(735, 736, 737), - COL_TRI(731, 732, 736), - COL_TRI(734, 738, 739), - COL_TRI(736, 738, 737), - COL_TRI(737, 733, 740), - COL_TRI(739, 741, 734), - COL_TRI(736, 741, 739), - COL_TRI(732, 734, 741), - COL_TRI(736, 732, 741), - COL_TRI(723, 699, 742), - COL_TRI(743, 744, 745), - COL_TRI(732, 744, 740), - COL_TRI(685, 746, 726), - COL_TRI(747, 692, 748), - COL_TRI(691, 725, 749), - COL_TRI(750, 545, 546), - COL_TRI(701, 543, 545), - COL_TRI(751, 701, 750), - COL_TRI(694, 748, 692), - COL_TRI(752, 687, 686), - COL_TRI(713, 717, 709), - COL_TRI(720, 707, 705), - COL_TRI(753, 728, 726), - COL_TRI(754, 755, 756), - COL_TRI(757, 758, 759), - COL_TRI(760, 761, 762), - COL_TRI(763, 764, 765), - COL_TRI(766, 767, 755), - COL_TRI(768, 769, 764), - COL_TRI(770, 771, 772), - COL_TRI(773, 762, 771), - COL_TRI(761, 720, 729), - COL_TRI(754, 774, 775), - COL_TRI(776, 759, 767), - COL_TRI(777, 772, 769), - COL_TRI(778, 765, 779), - COL_TRI(780, 779, 758), - COL_TRI(728, 720, 705), - COL_TRI(775, 737, 710), - COL_TRI(686, 728, 705), - COL_TRI(781, 782, 783), - COL_TRI(781, 748, 784), - COL_TRI(725, 782, 749), - COL_TRI(689, 696, 690), - COL_TRI(692, 703, 693), - COL_TRI(695, 690, 696), - COL_TRI(691, 694, 693), - COL_TRI(698, 704, 699), - COL_TRI(697, 702, 701), - COL_TRI(698, 700, 701), - COL_TRI(703, 692, 699), - COL_TRI(693, 703, 696), - COL_TRI(703, 704, 696), - COL_TRI(704, 698, 702), - COL_TRI(702, 697, 704), - COL_TRI(697, 696, 704), - COL_TRI(705, 721, 706), - COL_TRI(708, 719, 709), - COL_TRI(706, 721, 711), - COL_TRI(721, 717, 711), - COL_TRI(713, 718, 714), - COL_TRI(716, 710, 709), - COL_TRI(708, 714, 718), - COL_TRI(720, 717, 721), - COL_TRI(715, 714, 708), - COL_TRI(723, 544, 543), - COL_TRI(724, 783, 712), - COL_TRI(724, 711, 713), - COL_TRI(695, 785, 725), - COL_TRI(726, 786, 727), - COL_TRI(727, 731, 729), - COL_TRI(727, 786, 730), - COL_TRI(786, 743, 730), - COL_TRI(732, 740, 733), - COL_TRI(735, 731, 736), - COL_TRI(731, 745, 732), - COL_TRI(734, 733, 738), - COL_TRI(736, 739, 738), - COL_TRI(737, 738, 733), - COL_TRI(723, 700, 699), - COL_TRI(743, 787, 744), - COL_TRI(732, 745, 744), - COL_TRI(726, 728, 685), - COL_TRI(685, 688, 746), - COL_TRI(747, 699, 692), - COL_TRI(691, 690, 725), - COL_TRI(750, 701, 545), - COL_TRI(701, 700, 543), - COL_TRI(751, 695, 701), - COL_TRI(694, 784, 748), - COL_TRI(705, 707, 686), - COL_TRI(707, 752, 686), - COL_TRI(713, 711, 717), - COL_TRI(720, 788, 707), - COL_TRI(753, 729, 728), - COL_TRI(754, 766, 755), - COL_TRI(757, 780, 758), - COL_TRI(760, 789, 761), - COL_TRI(763, 768, 764), - COL_TRI(766, 776, 767), - COL_TRI(768, 777, 769), - COL_TRI(770, 773, 771), - COL_TRI(773, 760, 762), - COL_TRI(761, 789, 720), - COL_TRI(754, 756, 774), - COL_TRI(776, 757, 759), - COL_TRI(777, 770, 772), - COL_TRI(778, 763, 765), - COL_TRI(780, 778, 779), - COL_TRI(728, 729, 720), - COL_TRI(775, 774, 737), - COL_TRI(686, 685, 728), - COL_TRI(782, 725, 783), - COL_TRI(783, 787, 781), - COL_TRI(787, 748, 781), - COL_TRI(790, 791, 792), - COL_TRI(790, 792, 793), - COL_TRI(520, 602, 601), - COL_TRI(520, 502, 602), - COL_TRI(794, 795, 503), - COL_TRI(519, 794, 503), - COL_TRI(796, 797, 798), - COL_TRI(796, 799, 800), - COL_TRI(801, 799, 802), - COL_TRI(801, 803, 804), - COL_TRI(805, 799, 806), - COL_TRI(807, 800, 799), - COL_TRI(808, 800, 809), - COL_TRI(810, 809, 811), - COL_TRI(812, 805, 813), - COL_TRI(809, 812, 811), - COL_TRI(808, 460, 459), - COL_TRI(798, 814, 791), - COL_TRI(790, 815, 810), - COL_TRI(816, 798, 791), - COL_TRI(790, 810, 816), - COL_TRI(816, 791, 790), - COL_TRI(817, 818, 816), + COL_TRI(638, 639, 627), + COL_TRI(619, 640, 641), + COL_TRI(626, 642, 630), + COL_TRI(629, 643, 633), + COL_TRI(636, 618, 644), + COL_TRI(622, 631, 645), + COL_TRI(635, 646, 624), + COL_TRI(641, 565, 647), + COL_TRI(170, 443, 648), + COL_TRI(481, 443, 170), + COL_TRI(571, 472, 169), + COL_TRI(649, 650, 651), + COL_TRI(649, 651, 652), + COL_TRI(413, 415, 407), + COL_TRI(405, 407, 415), + COL_TRI(420, 653, 421), + COL_TRI(423, 483, 424), + COL_TRI(426, 440, 427), + COL_TRI(429, 654, 430), + COL_TRI(430, 654, 432), + COL_TRI(421, 653, 434), + COL_TRI(435, 434, 429), + COL_TRI(436, 485, 433), + COL_TRI(437, 489, 438), + COL_TRI(426, 437, 439), + COL_TRI(441, 418, 442), + COL_TRI(438, 489, 443), + COL_TRI(418, 419, 445), + COL_TRI(423, 425, 444), + COL_TRI(446, 452, 485), + COL_TRI(424, 483, 448), + COL_TRI(483, 449, 448), + COL_TRI(446, 485, 436), + COL_TRI(424, 448, 446), + COL_TRI(447, 450, 448), + COL_TRI(450, 451, 446), + COL_TRI(451, 556, 452), + COL_TRI(453, 468, 454), + COL_TRI(456, 470, 457), + COL_TRI(459, 655, 460), + COL_TRI(419, 412, 462), + COL_TRI(408, 404, 463), + COL_TRI(412, 453, 455), + COL_TRI(465, 456, 458), + COL_TRI(411, 408, 464), + COL_TRI(468, 656, 469), + COL_TRI(461, 460, 411), + COL_TRI(470, 655, 459), + COL_TRI(404, 657, 422), + COL_TRI(469, 656, 465), + COL_TRI(471, 496, 472), + COL_TRI(474, 500, 475), + COL_TRI(426, 428, 477), + COL_TRI(442, 658, 477), + COL_TRI(134, 133, 659), + COL_TRI(659, 658, 442), + COL_TRI(445, 533, 660), + COL_TRI(660, 153, 26), + COL_TRI(134, 659, 442), + COL_TRI(445, 660, 26), + COL_TRI(26, 134, 442), + COL_TRI(87, 27, 26), + COL_TRI(27, 25, 134), + COL_TRI(25, 132, 133), + COL_TRI(479, 505, 480), + COL_TRI(483, 661, 482), + COL_TRI(482, 555, 449), + COL_TRI(484, 499, 433), + COL_TRI(479, 662, 486), + COL_TRI(488, 648, 443), + COL_TRI(476, 475, 487), + COL_TRI(433, 164, 490), + COL_TRI(491, 421, 435), + COL_TRI(493, 504, 494), + COL_TRI(481, 661, 483), + COL_TRI(496, 662, 497), + COL_TRI(485, 452, 498), + COL_TRI(452, 557, 498), + COL_TRI(501, 529, 502), + COL_TRI(504, 493, 505), + COL_TRI(508, 431, 430), + COL_TRI(509, 527, 510), + COL_TRI(511, 166, 474), + COL_TRI(512, 528, 513), + COL_TRI(522, 663, 518), + COL_TRI(523, 522, 517), + COL_TRI(519, 664, 523), + COL_TRI(183, 180, 181), + COL_TRI(174, 183, 179), + COL_TRI(181, 180, 171), + COL_TRI(177, 176, 185), + COL_TRI(185, 187, 186), + COL_TRI(187, 175, 188), + COL_TRI(421, 491, 524), + COL_TRI(500, 499, 525), + COL_TRI(527, 471, 473), + COL_TRI(437, 426, 528), + COL_TRI(501, 500, 526), + COL_TRI(455, 531, 530), + COL_TRI(454, 534, 531), + COL_TRI(533, 445, 462), + COL_TRI(462, 530, 533), + COL_TRI(469, 535, 534), + COL_TRI(466, 665, 535), + COL_TRI(666, 466, 537), + COL_TRI(466, 458, 537), + COL_TRI(459, 540, 538), + COL_TRI(459, 461, 539), + COL_TRI(461, 467, 541), + COL_TRI(541, 543, 542), + COL_TRI(543, 467, 464), + COL_TRI(544, 580, 491), + COL_TRI(545, 549, 546), + COL_TRI(547, 562, 544), + COL_TRI(548, 547, 546), + COL_TRI(514, 568, 550), + COL_TRI(552, 667, 463), + COL_TRI(322, 348, 668), + COL_TRI(668, 669, 464), + COL_TRI(463, 667, 670), + COL_TRI(670, 399, 293), + COL_TRI(322, 668, 464), + COL_TRI(463, 670, 293), + COL_TRI(293, 322, 464), + COL_TRI(553, 458, 457), + COL_TRI(323, 321, 348), + COL_TRI(294, 295, 293), + COL_TRI(295, 323, 322), + COL_TRI(554, 447, 449), + COL_TRI(556, 671, 557), + COL_TRI(558, 616, 559), + COL_TRI(547, 548, 561), + COL_TRI(563, 558, 562), + COL_TRI(564, 672, 565), + COL_TRI(567, 570, 550), + COL_TRI(568, 566, 569), + COL_TRI(551, 571, 512), + COL_TRI(551, 550, 570), + COL_TRI(572, 673, 515), + COL_TRI(573, 572, 506), + COL_TRI(574, 573, 507), + COL_TRI(487, 475, 674), + COL_TRI(475, 500, 674), + COL_TRI(500, 499, 674), + COL_TRI(499, 484, 674), + COL_TRI(484, 498, 674), + COL_TRI(575, 482, 661), + COL_TRI(575, 661, 481), + COL_TRI(674, 575, 487), + COL_TRI(479, 487, 575), + COL_TRI(471, 527, 476), + COL_TRI(527, 509, 476), + COL_TRI(509, 474, 476), + COL_TRI(486, 662, 496), + COL_TRI(486, 496, 471), + COL_TRI(502, 529, 576), + COL_TRI(576, 526, 525), + COL_TRI(578, 493, 495), + COL_TRI(480, 505, 578), + COL_TRI(580, 544, 581), + COL_TRI(582, 581, 558), + COL_TRI(583, 514, 513), + COL_TRI(566, 583, 584), + COL_TRI(548, 675, 585), + COL_TRI(587, 676, 588), + COL_TRI(588, 612, 590), + COL_TRI(591, 613, 592), + COL_TRI(594, 606, 595), + COL_TRI(597, 609, 598), + COL_TRI(600, 610, 601), + COL_TRI(603, 611, 604), + COL_TRI(606, 603, 605), + COL_TRI(607, 676, 587), + COL_TRI(609, 591, 593), + COL_TRI(610, 594, 596), + COL_TRI(611, 586, 585), + COL_TRI(612, 597, 599), + COL_TRI(613, 600, 602), + COL_TRI(608, 669, 614), + COL_TRI(669, 668, 614), + COL_TRI(616, 607, 608), + COL_TRI(552, 559, 615), + COL_TRI(559, 616, 615), + COL_TRI(670, 667, 615), + COL_TRI(667, 552, 615), + COL_TRI(608, 614, 616), + COL_TRI(617, 677, 570), + COL_TRI(619, 623, 620), + COL_TRI(622, 645, 620), + COL_TRI(624, 646, 625), + COL_TRI(627, 639, 628), + COL_TRI(630, 642, 631), + COL_TRI(633, 643, 634), + COL_TRI(636, 644, 637), + COL_TRI(638, 637, 639), + COL_TRI(619, 621, 640), + COL_TRI(626, 625, 642), + COL_TRI(629, 628, 643), + COL_TRI(636, 617, 618), + COL_TRI(622, 632, 631), + COL_TRI(635, 634, 646), + COL_TRI(565, 672, 678), + COL_TRI(672, 477, 678), + COL_TRI(477, 658, 678), + COL_TRI(658, 659, 678), + COL_TRI(641, 640, 565), + COL_TRI(647, 660, 533), + COL_TRI(565, 678, 647), + COL_TRI(533, 641, 647), + COL_TRI(679, 508, 490), + COL_TRI(490, 164, 163), + COL_TRI(165, 166, 511), + COL_TRI(490, 163, 679), + COL_TRI(163, 165, 545), + COL_TRI(679, 163, 545), + COL_TRI(680, 679, 545), + COL_TRI(545, 165, 549), + COL_TRI(491, 492, 680), + COL_TRI(545, 491, 680), + COL_TRI(541, 675, 549), + COL_TRI(677, 530, 571), + COL_TRI(530, 541, 510), + COL_TRI(571, 530, 473), + COL_TRI(528, 512, 681), + COL_TRI(512, 571, 169), + COL_TRI(681, 512, 682), + COL_TRI(541, 549, 510), + COL_TRI(510, 549, 511), + COL_TRI(165, 511, 549), + COL_TRI(530, 510, 473), + COL_TRI(681, 521, 528), + COL_TRI(648, 488, 682), + COL_TRI(682, 512, 168), + COL_TRI(168, 512, 169), + COL_TRI(168, 170, 648), + COL_TRI(648, 682, 168), + COL_TRI(472, 497, 169), + COL_TRI(571, 473, 472), + COL_TRI(683, 684, 685), + COL_TRI(683, 685, 686), + COL_TRI(488, 681, 682), + COL_TRI(488, 521, 681), + COL_TRI(663, 664, 519), + COL_TRI(663, 519, 518), + COL_TRI(687, 688, 689), + COL_TRI(690, 691, 692), + COL_TRI(693, 694, 695), + COL_TRI(689, 691, 687), + COL_TRI(696, 697, 698), + COL_TRI(695, 699, 693), + COL_TRI(696, 699, 700), + COL_TRI(701, 697, 702), + COL_TRI(694, 687, 691), + COL_TRI(703, 704, 705), + COL_TRI(706, 707, 708), + COL_TRI(709, 710, 704), + COL_TRI(711, 712, 713), + COL_TRI(714, 707, 715), + COL_TRI(706, 716, 717), + COL_TRI(718, 719, 703), + COL_TRI(713, 706, 708), + COL_TRI(717, 716, 720), + COL_TRI(707, 717, 720), + COL_TRI(711, 720, 716), + COL_TRI(707, 720, 711), + COL_TRI(721, 522, 698), + COL_TRI(722, 710, 709), + COL_TRI(722, 711, 713), + COL_TRI(693, 723, 688), + COL_TRI(724, 725, 726), + COL_TRI(725, 727, 726), + COL_TRI(728, 729, 725), + COL_TRI(730, 731, 732), + COL_TRI(733, 734, 735), + COL_TRI(729, 730, 734), + COL_TRI(732, 736, 737), + COL_TRI(734, 736, 735), + COL_TRI(735, 731, 738), + COL_TRI(737, 739, 732), + COL_TRI(734, 739, 737), + COL_TRI(730, 732, 739), + COL_TRI(734, 730, 739), + COL_TRI(721, 697, 740), + COL_TRI(741, 742, 743), + COL_TRI(730, 742, 738), + COL_TRI(683, 744, 724), + COL_TRI(745, 690, 746), + COL_TRI(689, 723, 747), + COL_TRI(748, 523, 664), + COL_TRI(699, 522, 523), + COL_TRI(749, 699, 748), + COL_TRI(692, 746, 690), + COL_TRI(750, 685, 684), + COL_TRI(711, 715, 707), + COL_TRI(718, 705, 703), + COL_TRI(751, 726, 724), + COL_TRI(752, 753, 754), + COL_TRI(755, 756, 757), + COL_TRI(758, 759, 760), + COL_TRI(761, 762, 763), + COL_TRI(764, 765, 753), + COL_TRI(766, 767, 762), + COL_TRI(768, 769, 770), + COL_TRI(771, 760, 769), + COL_TRI(759, 718, 727), + COL_TRI(752, 772, 773), + COL_TRI(774, 757, 765), + COL_TRI(775, 770, 767), + COL_TRI(776, 763, 777), + COL_TRI(778, 777, 756), + COL_TRI(726, 718, 703), + COL_TRI(773, 735, 708), + COL_TRI(684, 726, 703), + COL_TRI(779, 780, 781), + COL_TRI(779, 746, 782), + COL_TRI(723, 780, 747), + COL_TRI(687, 694, 688), + COL_TRI(690, 701, 691), + COL_TRI(693, 688, 694), + COL_TRI(689, 692, 691), + COL_TRI(696, 702, 697), + COL_TRI(695, 700, 699), + COL_TRI(696, 698, 699), + COL_TRI(701, 690, 697), + COL_TRI(691, 701, 694), + COL_TRI(701, 702, 694), + COL_TRI(702, 696, 700), + COL_TRI(700, 695, 702), + COL_TRI(695, 694, 702), + COL_TRI(703, 719, 704), + COL_TRI(706, 717, 707), + COL_TRI(704, 719, 709), + COL_TRI(719, 715, 709), + COL_TRI(711, 716, 712), + COL_TRI(714, 708, 707), + COL_TRI(706, 712, 716), + COL_TRI(718, 715, 719), + COL_TRI(713, 712, 706), + COL_TRI(721, 663, 522), + COL_TRI(722, 781, 710), + COL_TRI(722, 709, 711), + COL_TRI(693, 783, 723), + COL_TRI(724, 784, 725), + COL_TRI(725, 729, 727), + COL_TRI(725, 784, 728), + COL_TRI(784, 741, 728), + COL_TRI(730, 738, 731), + COL_TRI(733, 729, 734), + COL_TRI(729, 743, 730), + COL_TRI(732, 731, 736), + COL_TRI(734, 737, 736), + COL_TRI(735, 736, 731), + COL_TRI(721, 698, 697), + COL_TRI(741, 785, 742), + COL_TRI(730, 743, 742), + COL_TRI(724, 726, 683), + COL_TRI(683, 686, 744), + COL_TRI(745, 697, 690), + COL_TRI(689, 688, 723), + COL_TRI(748, 699, 523), + COL_TRI(699, 698, 522), + COL_TRI(749, 693, 699), + COL_TRI(692, 782, 746), + COL_TRI(703, 705, 684), + COL_TRI(705, 750, 684), + COL_TRI(711, 709, 715), + COL_TRI(718, 786, 705), + COL_TRI(751, 727, 726), + COL_TRI(752, 764, 753), + COL_TRI(755, 778, 756), + COL_TRI(758, 787, 759), + COL_TRI(761, 766, 762), + COL_TRI(764, 774, 765), + COL_TRI(766, 775, 767), + COL_TRI(768, 771, 769), + COL_TRI(771, 758, 760), + COL_TRI(759, 787, 718), + COL_TRI(752, 754, 772), + COL_TRI(774, 755, 757), + COL_TRI(775, 768, 770), + COL_TRI(776, 761, 763), + COL_TRI(778, 776, 777), + COL_TRI(726, 727, 718), + COL_TRI(773, 772, 735), + COL_TRI(684, 683, 726), + COL_TRI(780, 723, 781), + COL_TRI(781, 785, 779), + COL_TRI(785, 746, 779), + COL_TRI(788, 789, 790), + COL_TRI(788, 790, 791), + COL_TRI(498, 575, 674), + COL_TRI(498, 482, 575), + COL_TRI(792, 793, 555), + COL_TRI(557, 792, 555), + COL_TRI(794, 795, 796), + COL_TRI(794, 797, 798), + COL_TRI(799, 797, 800), + COL_TRI(799, 801, 802), + COL_TRI(803, 797, 804), + COL_TRI(805, 798, 797), + COL_TRI(806, 798, 807), + COL_TRI(808, 807, 809), + COL_TRI(810, 803, 811), + COL_TRI(807, 810, 809), + COL_TRI(806, 451, 450), + COL_TRI(796, 812, 789), + COL_TRI(788, 813, 808), + COL_TRI(814, 796, 789), + COL_TRI(788, 808, 814), + COL_TRI(814, 789, 788), + COL_TRI(815, 816, 814), + COL_TRI(817, 818, 815), COL_TRI(819, 820, 817), COL_TRI(821, 822, 819), COL_TRI(823, 824, 821), @@ -2242,74 +2235,74 @@ const Collision castle_inside_collision[] = { COL_TRI(841, 842, 839), COL_TRI(843, 844, 841), COL_TRI(845, 846, 843), - COL_TRI(847, 848, 845), - COL_TRI(849, 850, 851), - COL_TRI(852, 851, 850), - COL_TRI(853, 854, 855), - COL_TRI(856, 857, 854), - COL_TRI(858, 859, 860), - COL_TRI(861, 858, 860), - COL_TRI(862, 863, 861), - COL_TRI(864, 865, 866), - COL_TRI(863, 867, 858), - COL_TRI(867, 868, 869), - COL_TRI(870, 871, 872), - COL_TRI(871, 873, 872), - COL_TRI(865, 874, 873), - COL_TRI(875, 876, 877), - COL_TRI(878, 875, 877), + COL_TRI(847, 848, 849), + COL_TRI(850, 849, 848), + COL_TRI(851, 852, 853), + COL_TRI(854, 855, 852), + COL_TRI(856, 857, 858), + COL_TRI(859, 856, 858), + COL_TRI(860, 861, 859), + COL_TRI(862, 863, 864), + COL_TRI(861, 865, 856), + COL_TRI(865, 866, 867), + COL_TRI(868, 869, 870), + COL_TRI(869, 871, 870), + COL_TRI(863, 872, 871), + COL_TRI(873, 874, 875), + COL_TRI(876, 873, 875), + COL_TRI(877, 878, 876), COL_TRI(879, 880, 878), - COL_TRI(881, 882, 880), - COL_TRI(882, 875, 880), - COL_TRI(883, 884, 875), - COL_TRI(885, 883, 886), - COL_TRI(883, 887, 886), - COL_TRI(882, 888, 887), + COL_TRI(880, 873, 878), + COL_TRI(881, 882, 873), + COL_TRI(883, 881, 884), + COL_TRI(881, 885, 884), + COL_TRI(880, 886, 885), + COL_TRI(887, 888, 889), COL_TRI(889, 890, 891), - COL_TRI(891, 892, 893), - COL_TRI(892, 894, 893), - COL_TRI(895, 892, 896), - COL_TRI(890, 897, 898), + COL_TRI(890, 892, 891), + COL_TRI(893, 890, 894), + COL_TRI(888, 895, 896), + COL_TRI(897, 898, 899), COL_TRI(899, 900, 901), - COL_TRI(901, 902, 903), - COL_TRI(902, 904, 903), - COL_TRI(905, 902, 906), - COL_TRI(902, 907, 906), - COL_TRI(900, 908, 907), - COL_TRI(909, 910, 911), - COL_TRI(912, 909, 911), + COL_TRI(900, 902, 901), + COL_TRI(903, 900, 904), + COL_TRI(900, 905, 904), + COL_TRI(898, 906, 905), + COL_TRI(907, 908, 909), + COL_TRI(910, 907, 909), + COL_TRI(911, 912, 910), COL_TRI(913, 914, 912), - COL_TRI(915, 916, 914), - COL_TRI(914, 917, 909), - COL_TRI(909, 918, 919), - COL_TRI(920, 917, 921), - COL_TRI(917, 922, 921), - COL_TRI(916, 923, 922), - COL_TRI(866, 871, 867), - COL_TRI(903, 924, 925), - COL_TRI(926, 903, 925), - COL_TRI(927, 901, 926), - COL_TRI(893, 928, 929), - COL_TRI(930, 931, 929), - COL_TRI(930, 929, 932), - COL_TRI(933, 891, 934), - COL_TRI(933, 934, 930), - COL_TRI(796, 800, 797), - COL_TRI(796, 935, 799), - COL_TRI(801, 806, 799), - COL_TRI(801, 813, 803), - COL_TRI(805, 807, 799), - COL_TRI(807, 809, 800), - COL_TRI(808, 797, 800), - COL_TRI(810, 808, 809), - COL_TRI(812, 807, 805), - COL_TRI(809, 807, 812), - COL_TRI(798, 797, 459), - COL_TRI(797, 808, 459), - COL_TRI(808, 810, 460), - COL_TRI(810, 582, 460), - COL_TRI(459, 581, 798), - COL_TRI(816, 818, 798), + COL_TRI(912, 915, 907), + COL_TRI(907, 916, 917), + COL_TRI(918, 915, 919), + COL_TRI(915, 920, 919), + COL_TRI(914, 921, 920), + COL_TRI(864, 869, 865), + COL_TRI(901, 922, 923), + COL_TRI(924, 901, 923), + COL_TRI(925, 899, 924), + COL_TRI(891, 926, 927), + COL_TRI(928, 929, 927), + COL_TRI(928, 927, 930), + COL_TRI(931, 889, 932), + COL_TRI(931, 932, 928), + COL_TRI(794, 798, 795), + COL_TRI(794, 933, 797), + COL_TRI(799, 804, 797), + COL_TRI(799, 811, 801), + COL_TRI(803, 805, 797), + COL_TRI(805, 807, 798), + COL_TRI(806, 795, 798), + COL_TRI(808, 806, 807), + COL_TRI(810, 805, 803), + COL_TRI(807, 805, 810), + COL_TRI(796, 795, 450), + COL_TRI(795, 806, 450), + COL_TRI(806, 808, 451), + COL_TRI(808, 671, 451), + COL_TRI(450, 554, 796), + COL_TRI(814, 816, 796), + COL_TRI(815, 818, 816), COL_TRI(817, 820, 818), COL_TRI(819, 822, 820), COL_TRI(821, 824, 822), @@ -2324,371 +2317,370 @@ const Collision castle_inside_collision[] = { COL_TRI(839, 842, 840), COL_TRI(841, 844, 842), COL_TRI(843, 846, 844), - COL_TRI(845, 848, 846), - COL_TRI(847, 936, 848), - COL_TRI(849, 853, 850), - COL_TRI(852, 857, 851), - COL_TRI(853, 849, 854), - COL_TRI(856, 937, 857), - COL_TRI(858, 869, 859), - COL_TRI(861, 863, 858), - COL_TRI(862, 938, 863), - COL_TRI(863, 938, 866), - COL_TRI(938, 864, 866), - COL_TRI(863, 866, 867), - COL_TRI(869, 858, 867), - COL_TRI(867, 871, 868), - COL_TRI(870, 868, 871), - COL_TRI(871, 865, 873), - COL_TRI(865, 864, 874), - COL_TRI(875, 884, 876), - COL_TRI(878, 880, 875), - COL_TRI(879, 881, 880), - COL_TRI(881, 939, 882), - COL_TRI(882, 883, 875), - COL_TRI(883, 940, 884), - COL_TRI(885, 940, 883), - COL_TRI(883, 882, 887), - COL_TRI(882, 939, 888), - COL_TRI(889, 941, 890), - COL_TRI(891, 890, 892), - COL_TRI(892, 942, 894), - COL_TRI(895, 942, 892), - COL_TRI(890, 941, 897), - COL_TRI(899, 943, 900), - COL_TRI(901, 900, 902), - COL_TRI(902, 944, 904), - COL_TRI(905, 944, 902), - COL_TRI(902, 900, 907), - COL_TRI(900, 943, 908), - COL_TRI(909, 919, 910), - COL_TRI(912, 914, 909), - COL_TRI(913, 915, 914), - COL_TRI(915, 945, 916), - COL_TRI(914, 916, 917), - COL_TRI(909, 917, 918), - COL_TRI(920, 918, 917), - COL_TRI(917, 916, 922), - COL_TRI(916, 945, 923), - COL_TRI(866, 865, 871), - COL_TRI(903, 904, 924), - COL_TRI(926, 901, 903), - COL_TRI(927, 899, 901), - COL_TRI(893, 894, 946), - COL_TRI(893, 946, 928), - COL_TRI(930, 934, 931), - COL_TRI(933, 889, 891), - COL_TRI(458, 457, 456), - COL_TRI(459, 454, 457), - COL_TRI(460, 455, 454), - COL_TRI(458, 459, 457), - COL_TRI(459, 460, 454), - COL_TRI(460, 461, 455), - COL_TRI(581, 456, 503), - COL_TRI(461, 519, 455), - COL_TRI(581, 458, 456), - COL_TRI(461, 582, 519), - COL_TRI(931, 934, 891), - COL_TRI(931, 891, 893), - COL_TRI(898, 892, 890), - COL_TRI(929, 931, 893), - COL_TRI(929, 928, 946), - COL_TRI(929, 946, 932), - COL_TRI(855, 852, 853), - COL_TRI(853, 852, 850), - COL_TRI(855, 947, 852), - COL_TRI(855, 948, 947), - COL_TRI(898, 896, 892), - COL_TRI(949, 950, 951), - COL_TRI(949, 951, 952), - COL_TRI(513, 677, 678), - COL_TRI(513, 527, 677), - COL_TRI(598, 600, 537), - COL_TRI(598, 537, 536), - COL_TRI(953, 954, 955), - COL_TRI(956, 957, 958), - COL_TRI(959, 960, 961), - COL_TRI(962, 963, 964), - COL_TRI(965, 966, 954), - COL_TRI(967, 968, 963), - COL_TRI(969, 970, 971), - COL_TRI(972, 961, 970), - COL_TRI(973, 974, 960), - COL_TRI(953, 975, 976), - COL_TRI(977, 958, 966), - COL_TRI(978, 971, 968), - COL_TRI(979, 964, 980), - COL_TRI(981, 980, 957), - COL_TRI(982, 983, 984), - COL_TRI(976, 985, 986), - COL_TRI(987, 988, 989), - COL_TRI(984, 990, 951), - COL_TRI(991, 992, 986), - COL_TRI(993, 994, 995), - COL_TRI(996, 992, 997), - COL_TRI(991, 998, 999), - COL_TRI(983, 1000, 984), - COL_TRI(995, 991, 986), - COL_TRI(999, 998, 1001), - COL_TRI(992, 999, 1001), - COL_TRI(993, 1001, 998), - COL_TRI(992, 1001, 993), - COL_TRI(1002, 597, 1003), - COL_TRI(1004, 1005, 1006), - COL_TRI(1004, 993, 995), - COL_TRI(1007, 1008, 987), - COL_TRI(1009, 1010, 982), - COL_TRI(1010, 974, 982), - COL_TRI(1011, 1012, 1013), - COL_TRI(1014, 1015, 985), - COL_TRI(1016, 1015, 1017), - COL_TRI(1013, 1018, 1019), - COL_TRI(1015, 1018, 985), - COL_TRI(1020, 1018, 1012), - COL_TRI(1019, 1021, 1013), - COL_TRI(1015, 1021, 1019), - COL_TRI(1011, 1013, 1021), - COL_TRI(1015, 1011, 1021), - COL_TRI(1022, 1023, 1016), - COL_TRI(1011, 1023, 1020), - COL_TRI(952, 1009, 982), - COL_TRI(1024, 1025, 989), - COL_TRI(989, 1026, 1027), - COL_TRI(1028, 599, 600), - COL_TRI(1029, 597, 599), - COL_TRI(1030, 1002, 1003), - COL_TRI(1022, 1031, 1032), - COL_TRI(993, 997, 992), - COL_TRI(983, 1033, 984), - COL_TRI(1034, 982, 1009), - COL_TRI(984, 1000, 1035), - COL_TRI(1006, 1036, 1035), - COL_TRI(1027, 1037, 1038), - COL_TRI(1026, 1039, 1037), - COL_TRI(1040, 1041, 1042), - COL_TRI(1040, 1043, 1044), - COL_TRI(1042, 1045, 1043), - COL_TRI(1046, 1007, 987), - COL_TRI(1047, 1048, 1046), - COL_TRI(1049, 989, 1025), + COL_TRI(845, 934, 846), + COL_TRI(847, 851, 848), + COL_TRI(850, 855, 849), + COL_TRI(851, 847, 852), + COL_TRI(854, 935, 855), + COL_TRI(856, 867, 857), + COL_TRI(859, 861, 856), + COL_TRI(860, 936, 861), + COL_TRI(861, 936, 864), + COL_TRI(936, 862, 864), + COL_TRI(861, 864, 865), + COL_TRI(867, 856, 865), + COL_TRI(865, 869, 866), + COL_TRI(868, 866, 869), + COL_TRI(869, 863, 871), + COL_TRI(863, 862, 872), + COL_TRI(873, 882, 874), + COL_TRI(876, 878, 873), + COL_TRI(877, 879, 878), + COL_TRI(879, 937, 880), + COL_TRI(880, 881, 873), + COL_TRI(881, 938, 882), + COL_TRI(883, 938, 881), + COL_TRI(881, 880, 885), + COL_TRI(880, 937, 886), + COL_TRI(887, 939, 888), + COL_TRI(889, 888, 890), + COL_TRI(890, 940, 892), + COL_TRI(893, 940, 890), + COL_TRI(888, 939, 895), + COL_TRI(897, 941, 898), + COL_TRI(899, 898, 900), + COL_TRI(900, 942, 902), + COL_TRI(903, 942, 900), + COL_TRI(900, 898, 905), + COL_TRI(898, 941, 906), + COL_TRI(907, 917, 908), + COL_TRI(910, 912, 907), + COL_TRI(911, 913, 912), + COL_TRI(913, 943, 914), + COL_TRI(912, 914, 915), + COL_TRI(907, 915, 916), + COL_TRI(918, 916, 915), + COL_TRI(915, 914, 920), + COL_TRI(914, 943, 921), + COL_TRI(864, 863, 869), + COL_TRI(901, 902, 922), + COL_TRI(924, 899, 901), + COL_TRI(925, 897, 899), + COL_TRI(891, 892, 926), + COL_TRI(892, 944, 926), + COL_TRI(928, 932, 929), + COL_TRI(931, 887, 889), + COL_TRI(447, 448, 449), + COL_TRI(450, 446, 448), + COL_TRI(451, 452, 446), + COL_TRI(447, 450, 448), + COL_TRI(450, 451, 446), + COL_TRI(451, 556, 452), + COL_TRI(554, 449, 555), + COL_TRI(556, 557, 452), + COL_TRI(554, 447, 449), + COL_TRI(556, 671, 557), + COL_TRI(929, 932, 889), + COL_TRI(929, 889, 891), + COL_TRI(896, 890, 888), + COL_TRI(927, 929, 891), + COL_TRI(927, 926, 944), + COL_TRI(927, 944, 930), + COL_TRI(853, 850, 851), + COL_TRI(851, 850, 848), + COL_TRI(853, 945, 850), + COL_TRI(853, 946, 945), + COL_TRI(896, 894, 890), + COL_TRI(947, 948, 949), + COL_TRI(947, 949, 950), + COL_TRI(492, 679, 680), + COL_TRI(492, 508, 679), + COL_TRI(673, 574, 516), + COL_TRI(673, 516, 515), + COL_TRI(951, 952, 953), + COL_TRI(954, 955, 956), + COL_TRI(957, 958, 959), + COL_TRI(960, 961, 962), + COL_TRI(963, 964, 952), + COL_TRI(965, 966, 961), + COL_TRI(967, 968, 969), + COL_TRI(970, 959, 968), + COL_TRI(971, 972, 958), + COL_TRI(951, 973, 974), + COL_TRI(975, 956, 964), + COL_TRI(976, 969, 966), + COL_TRI(977, 962, 978), + COL_TRI(979, 978, 955), + COL_TRI(980, 981, 982), + COL_TRI(974, 983, 984), + COL_TRI(985, 986, 987), + COL_TRI(988, 989, 982), + COL_TRI(990, 991, 984), + COL_TRI(992, 993, 994), + COL_TRI(995, 991, 996), + COL_TRI(990, 997, 998), + COL_TRI(981, 999, 982), + COL_TRI(994, 990, 984), + COL_TRI(998, 997, 1000), + COL_TRI(991, 998, 1000), + COL_TRI(992, 1000, 997), + COL_TRI(991, 1000, 992), + COL_TRI(950, 572, 1001), + COL_TRI(1002, 1003, 1004), + COL_TRI(1002, 992, 994), + COL_TRI(1005, 1006, 985), + COL_TRI(1007, 1008, 980), + COL_TRI(1008, 972, 980), + COL_TRI(1009, 1010, 1011), + COL_TRI(1012, 1013, 983), + COL_TRI(1014, 1013, 1015), + COL_TRI(1011, 1016, 1017), + COL_TRI(1013, 1016, 983), + COL_TRI(1018, 1016, 1010), + COL_TRI(1017, 1019, 1011), + COL_TRI(1013, 1019, 1017), + COL_TRI(1009, 1011, 1019), + COL_TRI(1013, 1009, 1019), + COL_TRI(1020, 1021, 1014), + COL_TRI(1009, 1021, 1018), + COL_TRI(1022, 1023, 987), + COL_TRI(987, 1024, 1025), + COL_TRI(949, 573, 574), + COL_TRI(1026, 572, 573), + COL_TRI(1020, 1027, 1028), + COL_TRI(992, 996, 991), + COL_TRI(981, 988, 982), + COL_TRI(1029, 980, 1007), + COL_TRI(982, 999, 1030), + COL_TRI(1004, 1031, 1030), + COL_TRI(1025, 1032, 1033), + COL_TRI(1024, 1034, 1032), + COL_TRI(1035, 1036, 1037), + COL_TRI(1035, 1038, 1039), + COL_TRI(1037, 1040, 1038), + COL_TRI(1041, 1005, 985), + COL_TRI(1042, 1043, 1041), + COL_TRI(1044, 987, 1023), + COL_TRI(1045, 1046, 1047), + COL_TRI(1048, 1049, 1046), COL_TRI(1050, 1051, 1052), COL_TRI(1053, 1054, 1051), COL_TRI(1055, 1056, 1057), - COL_TRI(1058, 1059, 1056), - COL_TRI(1060, 1061, 1062), - COL_TRI(1063, 1064, 1065), - COL_TRI(1066, 1067, 1068), - COL_TRI(1063, 1069, 1002), - COL_TRI(1068, 1029, 1028), - COL_TRI(990, 1068, 1028), - COL_TRI(1070, 1049, 1071), - COL_TRI(1061, 1072, 1062), - COL_TRI(1073, 1074, 1075), - COL_TRI(953, 965, 954), - COL_TRI(956, 981, 957), - COL_TRI(959, 973, 960), - COL_TRI(962, 967, 963), - COL_TRI(965, 977, 966), - COL_TRI(967, 978, 968), - COL_TRI(969, 972, 970), - COL_TRI(972, 959, 961), - COL_TRI(973, 983, 974), - COL_TRI(953, 955, 975), - COL_TRI(977, 956, 958), - COL_TRI(978, 969, 971), - COL_TRI(979, 962, 964), - COL_TRI(981, 979, 980), - COL_TRI(982, 974, 983), - COL_TRI(976, 975, 985), - COL_TRI(950, 949, 982), - COL_TRI(950, 982, 984), - COL_TRI(987, 1076, 988), - COL_TRI(984, 1033, 990), - COL_TRI(991, 999, 992), - COL_TRI(993, 998, 994), - COL_TRI(996, 986, 992), - COL_TRI(991, 994, 998), - COL_TRI(983, 997, 1000), - COL_TRI(995, 994, 991), - COL_TRI(1002, 598, 597), - COL_TRI(1004, 1076, 1005), - COL_TRI(1004, 1006, 993), - COL_TRI(1007, 1077, 1008), - COL_TRI(1009, 1032, 1010), - COL_TRI(1010, 1017, 974), - COL_TRI(1011, 1020, 1012), - COL_TRI(1014, 1017, 1015), - COL_TRI(1016, 1011, 1015), - COL_TRI(1013, 1012, 1018), - COL_TRI(1015, 1019, 1018), - COL_TRI(1020, 985, 1018), - COL_TRI(1022, 988, 1023), - COL_TRI(1011, 1016, 1023), - COL_TRI(952, 1069, 1009), - COL_TRI(1024, 1064, 1025), - COL_TRI(989, 1078, 1026), - COL_TRI(1028, 1029, 599), - COL_TRI(1029, 1003, 597), - COL_TRI(1030, 1063, 1002), - COL_TRI(1022, 1016, 1031), - COL_TRI(993, 1006, 997), - COL_TRI(983, 1079, 1033), - COL_TRI(1034, 974, 982), - COL_TRI(1035, 1036, 1033), - COL_TRI(1033, 984, 1035), - COL_TRI(1006, 1005, 1036), - COL_TRI(1027, 1026, 1037), - COL_TRI(1026, 1078, 1039), - COL_TRI(1040, 987, 1041), - COL_TRI(1040, 1042, 1043), - COL_TRI(1042, 1041, 1045), - COL_TRI(1046, 1048, 1007), - COL_TRI(1047, 1080, 1048), - COL_TRI(1049, 1081, 989), + COL_TRI(1058, 1044, 1059), + COL_TRI(1056, 1060, 1057), + COL_TRI(1061, 1062, 1063), + COL_TRI(951, 963, 952), + COL_TRI(954, 979, 955), + COL_TRI(957, 971, 958), + COL_TRI(960, 965, 961), + COL_TRI(963, 975, 964), + COL_TRI(965, 976, 966), + COL_TRI(967, 970, 968), + COL_TRI(970, 957, 959), + COL_TRI(971, 981, 972), + COL_TRI(951, 953, 973), + COL_TRI(975, 954, 956), + COL_TRI(976, 967, 969), + COL_TRI(977, 960, 962), + COL_TRI(979, 977, 978), + COL_TRI(980, 972, 981), + COL_TRI(974, 973, 983), + COL_TRI(947, 982, 948), + COL_TRI(985, 1064, 986), + COL_TRI(948, 982, 989), + COL_TRI(990, 998, 991), + COL_TRI(992, 997, 993), + COL_TRI(995, 984, 991), + COL_TRI(990, 993, 997), + COL_TRI(981, 996, 999), + COL_TRI(994, 993, 990), + COL_TRI(950, 673, 572), + COL_TRI(1002, 1064, 1003), + COL_TRI(1002, 1004, 992), + COL_TRI(1005, 1062, 1006), + COL_TRI(1007, 1028, 1008), + COL_TRI(1008, 1015, 972), + COL_TRI(1009, 1018, 1010), + COL_TRI(1012, 1015, 1013), + COL_TRI(1014, 1009, 1013), + COL_TRI(1011, 1010, 1016), + COL_TRI(1013, 1017, 1016), + COL_TRI(1018, 983, 1016), + COL_TRI(1020, 986, 1021), + COL_TRI(1009, 1014, 1021), + COL_TRI(947, 1065, 980), + COL_TRI(1022, 1066, 1023), + COL_TRI(987, 1067, 1024), + COL_TRI(949, 1026, 573), + COL_TRI(1026, 1001, 572), + COL_TRI(1020, 1014, 1027), + COL_TRI(992, 1004, 996), + COL_TRI(981, 1068, 988), + COL_TRI(1029, 972, 980), + COL_TRI(1030, 1031, 988), + COL_TRI(988, 982, 1030), + COL_TRI(1004, 1003, 1031), + COL_TRI(1025, 1024, 1032), + COL_TRI(1024, 1067, 1034), + COL_TRI(1035, 985, 1036), + COL_TRI(1035, 1037, 1038), + COL_TRI(1037, 1036, 1040), + COL_TRI(1041, 1043, 1005), + COL_TRI(1042, 1069, 1043), + COL_TRI(1044, 1070, 987), + COL_TRI(1045, 1048, 1046), + COL_TRI(1048, 1071, 1049), COL_TRI(1050, 1053, 1051), - COL_TRI(1053, 1082, 1054), - COL_TRI(1055, 1058, 1056), - COL_TRI(1058, 1083, 1059), - COL_TRI(1060, 1084, 1061), - COL_TRI(1063, 1030, 1064), - COL_TRI(1066, 1077, 1067), - COL_TRI(1063, 1065, 1069), - COL_TRI(1068, 1067, 1029), - COL_TRI(990, 1066, 1068), - COL_TRI(1070, 1081, 1049), - COL_TRI(1061, 1085, 1072), - COL_TRI(1073, 1086, 1074), - COL_TRI(597, 536, 525), - COL_TRI(599, 525, 526), - COL_TRI(600, 526, 537), - COL_TRI(597, 598, 536), - COL_TRI(599, 597, 525), - COL_TRI(600, 599, 526), - COL_TRI(398, 397, 328), - COL_TRI(398, 328, 386), - COL_TRI(1087, 643, 1088), - COL_TRI(1087, 579, 643), - COL_TRI(322, 295, 400), - COL_TRI(322, 400, 349), - COL_TRI(676, 675, 494), - COL_TRI(676, 494, 496), + COL_TRI(1053, 1072, 1054), + COL_TRI(1055, 1073, 1056), + COL_TRI(1058, 1070, 1044), + COL_TRI(1056, 1074, 1060), + COL_TRI(1061, 1066, 1062), + COL_TRI(572, 515, 506), + COL_TRI(573, 506, 507), + COL_TRI(574, 507, 516), + COL_TRI(572, 673, 515), + COL_TRI(573, 572, 506), + COL_TRI(574, 573, 507), + COL_TRI(1046, 1075, 950), + COL_TRI(1051, 1054, 1026), + COL_TRI(989, 949, 948), + COL_TRI(950, 1065, 947), + COL_TRI(947, 980, 982), + COL_TRI(950, 1001, 1046), + COL_TRI(1001, 1047, 1046), + COL_TRI(1046, 1049, 1075), + COL_TRI(1026, 949, 1051), + COL_TRI(949, 1076, 1051), + COL_TRI(1076, 1052, 1051), + COL_TRI(1077, 949, 989), + COL_TRI(1078, 1065, 950), + COL_TRI(980, 1065, 1007), + COL_TRI(397, 396, 327), + COL_TRI(397, 327, 385), + COL_TRI(1079, 615, 1080), + COL_TRI(1079, 670, 615), + COL_TRI(321, 294, 399), + COL_TRI(321, 399, 348), + COL_TRI(647, 678, 659), + COL_TRI(647, 659, 660), COL_TRI(149, 143, 44), COL_TRI(149, 105, 143), COL_TRI(153, 133, 132), COL_TRI(153, 132, 87), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_AA, 2), - COL_TRI(1089, 1090, 1091), - COL_TRI(1089, 1092, 1090), + COL_TRI(1081, 1082, 1083), + COL_TRI(1081, 1084, 1082), COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 44), - COL_TRI(1093, 93, 1094), - COL_TRI(1095, 66, 141), - COL_TRI(1096, 1094, 1097), - COL_TRI(1095, 1098, 1099), - COL_TRI(1096, 91, 140), + COL_TRI(1085, 93, 1086), + COL_TRI(1087, 66, 141), + COL_TRI(1088, 1086, 1089), + COL_TRI(1087, 1090, 1091), + COL_TRI(1088, 91, 140), COL_TRI(117, 141, 66), - COL_TRI(1100, 68, 1098), + COL_TRI(1092, 68, 1090), COL_TRI(92, 129, 119), - COL_TRI(1095, 1099, 66), - COL_TRI(1100, 67, 68), - COL_TRI(1095, 1100, 1098), + COL_TRI(1087, 1091, 66), + COL_TRI(1092, 67, 68), + COL_TRI(1087, 1092, 1090), COL_TRI(117, 150, 141), - COL_TRI(1096, 1097, 91), + COL_TRI(1088, 1089, 91), COL_TRI(92, 119, 93), - COL_TRI(1096, 1093, 1094), - COL_TRI(1093, 92, 93), - COL_TRI(1101, 1000, 997), - COL_TRI(1102, 1010, 1031), - COL_TRI(1103, 1031, 1016), - COL_TRI(1104, 1017, 1010), - COL_TRI(1105, 1016, 1017), - COL_TRI(1106, 1035, 1000), - COL_TRI(1107, 997, 1006), - COL_TRI(1108, 1006, 1035), - COL_TRI(1109, 1110, 1111), - COL_TRI(1112, 1113, 1109), - COL_TRI(1114, 1115, 1112), - COL_TRI(1116, 1117, 1118), - COL_TRI(1119, 1120, 1116), - COL_TRI(1121, 1122, 1119), - COL_TRI(1101, 1106, 1000), - COL_TRI(1102, 1104, 1010), - COL_TRI(1103, 1102, 1031), - COL_TRI(1104, 1105, 1017), - COL_TRI(1105, 1103, 1016), - COL_TRI(1106, 1108, 1035), - COL_TRI(1107, 1101, 997), - COL_TRI(1108, 1107, 1006), - COL_TRI(1109, 1113, 1110), - COL_TRI(1112, 1115, 1113), - COL_TRI(1114, 1123, 1115), - COL_TRI(1116, 1120, 1117), - COL_TRI(1119, 1122, 1120), - COL_TRI(1121, 1124, 1122), + COL_TRI(1088, 1085, 1086), + COL_TRI(1085, 92, 93), + COL_TRI(1093, 999, 996), + COL_TRI(1094, 1008, 1027), + COL_TRI(1095, 1027, 1014), + COL_TRI(1096, 1015, 1008), + COL_TRI(1097, 1014, 1015), + COL_TRI(1098, 1030, 999), + COL_TRI(1099, 996, 1004), + COL_TRI(1100, 1004, 1030), + COL_TRI(1101, 1102, 1103), + COL_TRI(1104, 1105, 1101), + COL_TRI(1106, 1107, 1104), + COL_TRI(1108, 1109, 1110), + COL_TRI(1111, 1112, 1108), + COL_TRI(1113, 1114, 1111), + COL_TRI(1093, 1098, 999), + COL_TRI(1094, 1096, 1008), + COL_TRI(1095, 1094, 1027), + COL_TRI(1096, 1097, 1015), + COL_TRI(1097, 1095, 1014), + COL_TRI(1098, 1100, 1030), + COL_TRI(1099, 1093, 996), + COL_TRI(1100, 1099, 1004), + COL_TRI(1101, 1105, 1102), + COL_TRI(1104, 1107, 1105), + COL_TRI(1106, 1115, 1107), + COL_TRI(1108, 1112, 1109), + COL_TRI(1111, 1114, 1112), + COL_TRI(1113, 1116, 1114), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_A9, 2), - COL_TRI(1091, 125, 148), - COL_TRI(1091, 1090, 125), + COL_TRI(1083, 125, 148), + COL_TRI(1083, 1082, 125), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_AB, 2), - COL_TRI(154, 1092, 1089), - COL_TRI(154, 8, 1092), + COL_TRI(154, 1084, 1081), + COL_TRI(154, 8, 1084), COL_TRI_INIT(SURFACE_PAINTING_WARP_D8, 2), - COL_TRI(3, 1125, 1), - COL_TRI(3, 152, 1125), + COL_TRI(3, 1117, 1), + COL_TRI(3, 152, 1117), COL_TRI_INIT(SURFACE_PAINTING_WARP_D6, 2), COL_TRI(142, 0, 2), - COL_TRI(142, 2, 1126), + COL_TRI(142, 2, 1118), COL_TRI_INIT(SURFACE_PAINTING_WARP_DE, 2), - COL_TRI(1127, 1128, 1129), - COL_TRI(1127, 1130, 1128), + COL_TRI(1119, 1120, 1121), + COL_TRI(1119, 1122, 1120), COL_TRI_INIT(SURFACE_PAINTING_WARP_DD, 4), - COL_TRI(1131, 1132, 1133), - COL_TRI(1134, 1133, 1127), - COL_TRI(1131, 1133, 1134), - COL_TRI(1134, 1127, 1129), + COL_TRI(1123, 1124, 1125), + COL_TRI(1126, 1125, 1119), + COL_TRI(1123, 1125, 1126), + COL_TRI(1126, 1119, 1121), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_AF, 2), - COL_TRI(1135, 344, 402), - COL_TRI(1135, 402, 1136), + COL_TRI(1127, 343, 401), + COL_TRI(1127, 401, 1128), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_B1, 2), - COL_TRI(346, 1137, 1138), - COL_TRI(346, 1138, 404), + COL_TRI(345, 1129, 1130), + COL_TRI(345, 1130, 403), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_B0, 2), - COL_TRI(1137, 1135, 1136), - COL_TRI(1137, 1136, 1138), + COL_TRI(1129, 1127, 1128), + COL_TRI(1129, 1128, 1130), COL_TRI_INIT(SURFACE_PAINTING_WARP_DB, 2), - COL_TRI(1139, 1140, 1141), - COL_TRI(1139, 1142, 1140), + COL_TRI(1131, 1132, 1133), + COL_TRI(1131, 1134, 1132), COL_TRI_INIT(SURFACE_PAINTING_WARP_D9, 2), - COL_TRI(1143, 1144, 1145), - COL_TRI(1143, 1146, 1144), + COL_TRI(1135, 1136, 1137), + COL_TRI(1135, 1138, 1136), COL_TRI_INIT(SURFACE_PAINTING_WARP_DA, 2), - COL_TRI(1139, 1146, 1143), - COL_TRI(1139, 1141, 1146), + COL_TRI(1131, 1138, 1135), + COL_TRI(1131, 1133, 1138), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_AC, 2), - COL_TRI(1147, 749, 782), - COL_TRI(1147, 782, 1148), + COL_TRI(1139, 747, 780), + COL_TRI(1139, 780, 1140), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_AD, 2), - COL_TRI(1149, 1147, 1148), - COL_TRI(1149, 1148, 1150), + COL_TRI(1141, 1139, 1140), + COL_TRI(1141, 1140, 1142), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_AE, 2), - COL_TRI(784, 1149, 1150), - COL_TRI(784, 1150, 781), + COL_TRI(782, 1141, 1142), + COL_TRI(782, 1142, 779), COL_TRI_INIT(SURFACE_PAINTING_WARP_E1, 2), - COL_TRI(1151, 1152, 1153), - COL_TRI(1151, 1154, 1152), + COL_TRI(1143, 1144, 1145), + COL_TRI(1143, 1146, 1144), COL_TRI_INIT(SURFACE_PAINTING_WARP_E0, 2), - COL_TRI(1155, 1154, 1151), - COL_TRI(1155, 1156, 1154), + COL_TRI(1147, 1146, 1143), + COL_TRI(1147, 1148, 1146), COL_TRI_INIT(SURFACE_PAINTING_WARP_DF, 2), - COL_TRI(1157, 1156, 1155), - COL_TRI(1157, 1158, 1156), + COL_TRI(1149, 1148, 1147), + COL_TRI(1149, 1150, 1148), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_B4, 2), - COL_TRI(1070, 1159, 1160), - COL_TRI(1070, 1160, 1081), + COL_TRI(1058, 1151, 1152), + COL_TRI(1058, 1152, 1070), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_B3, 2), - COL_TRI(1159, 1161, 1162), - COL_TRI(1159, 1162, 1160), + COL_TRI(1151, 1153, 1154), + COL_TRI(1151, 1154, 1152), COL_TRI_INIT(SURFACE_PAINTING_WOBBLE_B2, 2), - COL_TRI(1161, 1047, 1046), - COL_TRI(1161, 1046, 1162), + COL_TRI(1153, 1042, 1041), + COL_TRI(1153, 1041, 1154), COL_TRI_STOP(), COL_END() }; diff --git a/levels/castle_inside/areas/1/fire_bubble_room/model.inc.c b/levels/castle_inside/areas/1/fire_bubble_room/model.inc.c index 8dca67e1..eef45268 100644 --- a/levels/castle_inside/areas/1/fire_bubble_room/model.inc.c +++ b/levels/castle_inside/areas/1/fire_bubble_room/model.inc.c @@ -1,8 +1,10 @@ -static const Vtx castle_inside_fire_bubble_dl_mesh_vtx_0[74] = { +static const Vtx castle_inside_fire_bubble_dl_mesh_vtx_0[72] = { {{ {768, -26, -3855}, 0, {2288, -215}, {0, 0, 129, 255} }}, {{ {1126, 0, -3855}, 0, {-1296, -471}, {0, 0, 129, 255} }}, {{ {1126, -26, -3855}, 0, {-1296, -215}, {0, 0, 129, 255} }}, + {{ {768, -26, -3855}, 0, {2288, -215}, {0, 0, 129, 255} }}, {{ {768, 0, -3855}, 0, {2288, -471}, {0, 0, 129, 255} }}, + {{ {1126, 0, -3855}, 0, {-1296, -471}, {0, 0, 129, 255} }}, {{ {768, -179, -4009}, 0, {2288, 1321}, {0, 0, 129, 255} }}, {{ {1126, -154, -4009}, 0, {-1296, 1065}, {0, 0, 129, 255} }}, {{ {1126, -179, -4009}, 0, {-1296, 1321}, {0, 0, 129, 255} }}, @@ -69,15 +71,17 @@ static const Vtx castle_inside_fire_bubble_dl_mesh_vtx_0[74] = { {{ {768, 0, -3804}, 0, {2288, 1821}, {0, 127, 0, 255} }}, {{ {768, 0, -3113}, 0, {2288, 8733}, {0, 127, 0, 255} }}, {{ {1126, 0, -3113}, 0, {-1296, 8733}, {0, 127, 0, 255} }}, - {{ {1024, 0, -3010}, 0, {-9744, -10619}, {0, 127, 0, 250} }}, - {{ {870, 0, -3113}, 0, {-8208, -11643}, {0, 127, 0, 255} }}, - {{ {870, 0, -3010}, 0, {-8208, -10619}, {0, 127, 0, 250} }}, - {{ {1024, 0, -3113}, 0, {-9744, -11643}, {0, 127, 0, 255} }}, - }; static const Gfx castle_inside_fire_bubble_dl_mesh_tri_0[] = { - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 0, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 0, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(6, 9, 7, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(10, 13, 11, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 14, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -86,7 +90,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 16, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 30, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -95,7 +99,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 32, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 46, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -104,314 +108,306 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 48, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 62, 10, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_0 + 64, 10, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 0, 3, 0), - gsSP1Triangle(4, 5, 0, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 7, 0), + gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(8, 4, 7, 0), + gsSP1Triangle(8, 9, 4, 0), gsSPEndDisplayList(), }; -static const Vtx castle_inside_fire_bubble_dl_mesh_vtx_1[288] = { - {{ {768, -128, -4085}, 0, {-20, 1446}, {0, 88, 164, 255} }}, - {{ {717, -128, -4085}, 0, {-184, 1446}, {0, 88, 164, 255} }}, - {{ {742, -102, -4060}, 0, {-104, 1370}, {0, 88, 164, 255} }}, - {{ {768, -128, -4034}, 0, {-20, 401}, {90, 90, 0, 128} }}, - {{ {768, -128, -4085}, 0, {-20, 252}, {90, 90, 0, 128} }}, - {{ {742, -102, -4060}, 0, {-104, 325}, {90, 90, 0, 126} }}, - {{ {717, -128, -4034}, 0, {1868, 1446}, {164, 88, 0, 255} }}, - {{ {742, -102, -4060}, 0, {1951, 1370}, {164, 88, 0, 255} }}, - {{ {717, -128, -4085}, 0, {2032, 1446}, {164, 88, 0, 255} }}, - {{ {768, -128, -4034}, 0, {-20, 1446}, {0, 90, 90, 255} }}, - {{ {742, -102, -4060}, 0, {-104, 1370}, {0, 90, 90, 255} }}, - {{ {717, -128, -4034}, 0, {-184, 1446}, {0, 90, 90, 255} }}, - {{ {1126, -128, -4085}, 0, {1129, 1446}, {0, 88, 164, 255} }}, - {{ {1152, -102, -4060}, 0, {1213, 1370}, {0, 88, 164, 255} }}, - {{ {1178, -128, -4085}, 0, {1296, 1446}, {0, 88, 164, 255} }}, - {{ {1126, -128, -4034}, 0, {1129, 401}, {166, 90, 0, 128} }}, - {{ {1152, -102, -4060}, 0, {1213, 325}, {166, 90, 0, 126} }}, - {{ {1126, -128, -4085}, 0, {1129, 252}, {166, 90, 0, 128} }}, - {{ {1178, -128, -4034}, 0, {1296, 401}, {90, 90, 0, 255} }}, - {{ {1178, -128, -4085}, 0, {1296, 252}, {90, 90, 0, 255} }}, - {{ {1152, -102, -4060}, 0, {1213, 325}, {90, 90, 0, 255} }}, - {{ {1126, -128, -4034}, 0, {1129, 1446}, {0, 90, 90, 255} }}, - {{ {1178, -128, -4034}, 0, {1296, 1446}, {0, 90, 90, 255} }}, - {{ {1152, -102, -4060}, 0, {1213, 1370}, {0, 90, 90, 255} }}, - {{ {768, 0, -3855}, 0, {1343, 890}, {127, 0, 0, 255} }}, - {{ {768, 51, -3804}, 0, {1191, 584}, {127, 0, 0, 255} }}, - {{ {768, 0, -3804}, 0, {1191, 890}, {127, 0, 0, 255} }}, - {{ {768, 51, -3855}, 0, {1343, 584}, {127, 0, 0, 255} }}, - {{ {1126, 51, -3804}, 0, {23, 727}, {129, 0, 0, 255} }}, - {{ {1126, 0, -3855}, 0, {209, 1098}, {129, 0, 0, 255} }}, - {{ {1126, 0, -3804}, 0, {23, 1098}, {129, 0, 0, 255} }}, - {{ {1126, 51, -3804}, 0, {23, 727}, {129, 0, 0, 255} }}, - {{ {1126, 51, -3855}, 0, {209, 727}, {129, 0, 0, 255} }}, - {{ {1126, 0, -3855}, 0, {209, 1098}, {129, 0, 0, 255} }}, - {{ {1178, -128, -4085}, 0, {1296, 1446}, {0, 0, 129, 255} }}, - {{ {1126, -205, -4085}, 0, {1129, 1671}, {0, 0, 129, 255} }}, - {{ {1126, -128, -4085}, 0, {1129, 1446}, {0, 0, 129, 255} }}, - {{ {1178, -205, -4085}, 0, {1296, 1671}, {0, 0, 129, 255} }}, - {{ {1126, 614, -3804}, 0, {23, -918}, {129, 0, 0, 255} }}, - {{ {1126, 51, -3855}, 0, {210, 727}, {129, 0, 0, 255} }}, - {{ {1126, 614, -3855}, 0, {210, -918}, {129, 0, 0, 255} }}, - {{ {1178, -128, -4034}, 0, {1868, 1446}, {127, 0, 0, 255} }}, - {{ {1178, 51, -3855}, 0, {1293, 923}, {127, 0, 0, 255} }}, - {{ {1178, -205, -3855}, 0, {1293, 1671}, {127, 0, 0, 255} }}, - {{ {1178, -205, -4034}, 0, {1868, 1671}, {127, 0, 0, 255} }}, - {{ {1178, -205, -4085}, 0, {2032, 1671}, {127, 0, 0, 255} }}, - {{ {1178, -128, -4085}, 0, {2032, 1446}, {127, 0, 0, 255} }}, - {{ {768, 0, -3804}, 0, {1312, 1321}, {0, 127, 0, 255} }}, - {{ {512, 0, -3113}, 0, {586, 3433}, {0, 127, 0, 255} }}, - {{ {768, 0, -3113}, 0, {1312, 3433}, {0, 127, 0, 255} }}, - {{ {512, 0, -3804}, 0, {586, 1321}, {0, 127, 0, 255} }}, - {{ {768, -205, -4085}, 0, {2828, 2086}, {127, 0, 0, 255} }}, - {{ {768, -128, -4085}, 0, {2828, 1635}, {127, 0, 0, 255} }}, - {{ {768, -128, -4034}, 0, {2499, 1635}, {127, 0, 0, 255} }}, - {{ {768, -205, -4034}, 0, {2499, 2086}, {127, 0, 0, 255} }}, - {{ {768, -205, -3855}, 0, {1343, 2086}, {127, 0, 0, 255} }}, - {{ {768, 51, -3855}, 0, {1343, 584}, {127, 0, 0, 255} }}, - {{ {717, -128, -4034}, 0, {1868, 1446}, {129, 0, 0, 255} }}, - {{ {717, -128, -4085}, 0, {2032, 1446}, {129, 0, 0, 255} }}, - {{ {717, -205, -4085}, 0, {2032, 1671}, {129, 0, 0, 255} }}, - {{ {717, -205, -4034}, 0, {1868, 1671}, {129, 0, 0, 255} }}, - {{ {717, -205, -3855}, 0, {1293, 1671}, {129, 0, 0, 255} }}, - {{ {717, 51, -3855}, 0, {1293, 923}, {129, 0, 0, 255} }}, - {{ {768, -205, -4085}, 0, {-20, 1671}, {0, 0, 129, 255} }}, - {{ {717, -128, -4085}, 0, {-184, 1446}, {0, 0, 129, 255} }}, - {{ {768, -128, -4085}, 0, {-20, 1446}, {0, 0, 129, 255} }}, - {{ {717, -205, -4085}, 0, {-184, 1671}, {0, 0, 129, 255} }}, - {{ {717, -205, -4034}, 0, {-184, 401}, {0, 129, 0, 255} }}, - {{ {768, -205, -4085}, 0, {-20, 252}, {0, 129, 0, 255} }}, - {{ {768, -205, -4034}, 0, {-20, 401}, {0, 129, 0, 255} }}, - {{ {717, -205, -4085}, 0, {-184, 252}, {0, 129, 0, 255} }}, - {{ {1229, 0, -3113}, 0, {890, 923}, {0, 0, 129, 255} }}, - {{ {1024, 0, -3113}, 0, {451, 923}, {0, 0, 129, 255} }}, - {{ {1024, 256, -3113}, 0, {451, 543}, {0, 0, 129, 255} }}, - {{ {1229, 614, -3113}, 0, {890, 11}, {0, 0, 129, 255} }}, - {{ {666, 614, -3113}, 0, {-318, 11}, {0, 0, 129, 255} }}, - {{ {870, 256, -3113}, 0, {122, 543}, {0, 0, 129, 255} }}, - {{ {666, 0, -3113}, 0, {-318, 923}, {0, 0, 129, 255} }}, - {{ {870, 0, -3113}, 0, {122, 923}, {0, 0, 129, 255} }}, - {{ {717, -205, -3855}, 0, {-184, 1671}, {0, 0, 129, 255} }}, - {{ {512, 51, -3855}, 0, {-842, 923}, {0, 0, 129, 255} }}, - {{ {717, 51, -3855}, 0, {-184, 923}, {0, 0, 129, 255} }}, - {{ {512, -205, -3855}, 0, {-842, 1671}, {0, 0, 129, 255} }}, - {{ {512, 614, -4674}, 0, {373, -343}, {127, 0, 0, 255} }}, - {{ {512, -205, -3266}, 0, {-1935, 1107}, {127, 0, 0, 255} }}, - {{ {512, -205, -4674}, 0, {373, 931}, {127, 0, 0, 255} }}, - {{ {512, 614, -3266}, 0, {-1935, -167}, {127, 0, 0, 255} }}, - {{ {1382, 0, -3804}, 0, {-724, 876}, {0, 0, 127, 255} }}, - {{ {1126, 51, -3804}, 0, {210, 727}, {0, 0, 127, 255} }}, - {{ {1126, 0, -3804}, 0, {210, 876}, {0, 0, 127, 255} }}, - {{ {1382, 51, -3804}, 0, {-724, 727}, {0, 0, 127, 255} }}, - {{ {1178, 614, -3804}, 0, {23, -746}, {0, 0, 127, 255} }}, - {{ {1126, 51, -3804}, 0, {210, 600}, {0, 0, 127, 255} }}, - {{ {1178, 51, -3804}, 0, {23, 600}, {0, 0, 127, 255} }}, - {{ {1126, 614, -3804}, 0, {210, -746}, {0, 0, 127, 255} }}, - {{ {1126, -205, -3855}, 0, {209, 2551}, {129, 0, 0, 255} }}, - {{ {1126, 51, -3855}, 0, {209, 727}, {129, 0, 0, 255} }}, - {{ {1126, -128, -4034}, 0, {1613, 2002}, {129, 0, 0, 255} }}, - {{ {1126, -205, -4034}, 0, {1613, 2551}, {129, 0, 0, 255} }}, - {{ {1126, -205, -4085}, 0, {2012, 2551}, {129, 0, 0, 255} }}, - {{ {1126, -128, -4085}, 0, {2012, 2002}, {129, 0, 0, 255} }}, - {{ {1178, 51, -3855}, 0, {1296, 923}, {0, 90, 166, 255} }}, - {{ {1126, -128, -4034}, 0, {1129, 401}, {0, 90, 166, 255} }}, - {{ {1126, 51, -3855}, 0, {1129, 923}, {0, 90, 166, 255} }}, - {{ {1178, -128, -4034}, 0, {1296, 401}, {0, 90, 166, 255} }}, - {{ {1178, -205, -4034}, 0, {1296, 401}, {0, 129, 0, 255} }}, - {{ {1126, -205, -4085}, 0, {1129, 252}, {0, 129, 0, 255} }}, - {{ {1178, -205, -4085}, 0, {1296, 252}, {0, 129, 0, 255} }}, - {{ {1126, -205, -4034}, 0, {1129, 401}, {0, 129, 0, 255} }}, - {{ {1382, 51, -3855}, 0, {1951, 923}, {0, 0, 129, 255} }}, - {{ {1178, -205, -3855}, 0, {1296, 1671}, {0, 0, 129, 255} }}, - {{ {1178, 51, -3855}, 0, {1296, 923}, {0, 0, 129, 255} }}, - {{ {1382, -205, -3855}, 0, {1951, 1671}, {0, 0, 129, 255} }}, - {{ {1126, 0, -3113}, 0, {586, 3433}, {0, 127, 0, 255} }}, - {{ {1382, 0, -3804}, 0, {1320, 1321}, {0, 127, 0, 255} }}, - {{ {1126, 0, -3804}, 0, {586, 1321}, {0, 127, 0, 255} }}, - {{ {1382, 0, -3113}, 0, {1320, 3433}, {0, 127, 0, 255} }}, - {{ {1382, -205, -3266}, 0, {-3360, 1101}, {129, 0, 0, 255} }}, - {{ {1382, 614, -4674}, 0, {-950, -704}, {129, 0, 0, 255} }}, - {{ {1382, -205, -4674}, 0, {-950, 1101}, {129, 0, 0, 255} }}, - {{ {1382, 614, -3266}, 0, {-3360, -704}, {129, 0, 0, 255} }}, - {{ {1382, -205, -4674}, 0, {919, 1701}, {0, 0, 129, 255} }}, - {{ {1331, -154, -4674}, 0, {843, 1548}, {0, 0, 129, 255} }}, - {{ {1382, -154, -4674}, 0, {919, 1548}, {0, 0, 129, 255} }}, - {{ {1331, -205, -4674}, 0, {843, 1701}, {0, 0, 129, 255} }}, - {{ {1229, 614, -3266}, 0, {-482, 11}, {129, 0, 0, 255} }}, - {{ {1229, 0, -3113}, 0, {-812, 923}, {129, 0, 0, 255} }}, - {{ {1229, 614, -3113}, 0, {-812, 11}, {129, 0, 0, 255} }}, - {{ {1229, 0, -3266}, 0, {-482, 923}, {129, 0, 0, 255} }}, - {{ {1382, 51, -3855}, 0, {919, 940}, {0, 127, 0, 255} }}, - {{ {1178, 51, -3804}, 0, {615, 1092}, {0, 127, 0, 255} }}, - {{ {1382, 51, -3804}, 0, {919, 1092}, {0, 127, 0, 255} }}, - {{ {1178, 51, -3855}, 0, {615, 940}, {0, 127, 0, 255} }}, - {{ {717, -128, -4034}, 0, {-184, 401}, {0, 90, 166, 255} }}, - {{ {768, 51, -3855}, 0, {-20, 923}, {0, 90, 166, 255} }}, - {{ {768, -128, -4034}, 0, {-20, 401}, {0, 90, 166, 255} }}, - {{ {717, 51, -3855}, 0, {-184, 923}, {0, 90, 166, 255} }}, - {{ {768, 0, -3855}, 0, {7, 940}, {0, 127, 0, 255} }}, - {{ {512, 0, -3804}, 0, {-373, 1092}, {0, 127, 0, 255} }}, - {{ {768, 0, -3804}, 0, {7, 1092}, {0, 127, 0, 255} }}, - {{ {512, 0, -3855}, 0, {-373, 940}, {0, 127, 0, 255} }}, - {{ {1382, 0, -3855}, 0, {919, 940}, {0, 127, 0, 255} }}, - {{ {1126, 0, -3804}, 0, {539, 1092}, {0, 127, 0, 255} }}, - {{ {1382, 0, -3804}, 0, {919, 1092}, {0, 127, 0, 255} }}, - {{ {1126, 0, -3855}, 0, {539, 940}, {0, 127, 0, 255} }}, - {{ {717, 51, -3855}, 0, {-69, 940}, {0, 127, 0, 255} }}, - {{ {512, 51, -3804}, 0, {-373, 1092}, {0, 127, 0, 255} }}, - {{ {717, 51, -3804}, 0, {-69, 1092}, {0, 127, 0, 255} }}, - {{ {512, 51, -3855}, 0, {-373, 940}, {0, 127, 0, 255} }}, - {{ {1178, 614, -3855}, 0, {210, -918}, {127, 0, 0, 255} }}, - {{ {1178, 51, -3804}, 0, {23, 727}, {127, 0, 0, 255} }}, - {{ {1178, 51, -3855}, 0, {210, 727}, {127, 0, 0, 255} }}, - {{ {1178, 614, -3804}, 0, {23, -918}, {127, 0, 0, 255} }}, - {{ {1126, 614, -3855}, 0, {23, -918}, {0, 0, 129, 255} }}, - {{ {1178, 51, -3855}, 0, {210, 727}, {0, 0, 129, 255} }}, - {{ {1126, 51, -3855}, 0, {23, 727}, {0, 0, 129, 255} }}, - {{ {1178, 614, -3855}, 0, {210, -918}, {0, 0, 129, 255} }}, - {{ {717, 614, -3855}, 0, {1191, -694}, {0, 0, 129, 255} }}, - {{ {768, 51, -3855}, 0, {1346, 584}, {0, 0, 129, 255} }}, - {{ {717, 51, -3855}, 0, {1191, 584}, {0, 0, 129, 255} }}, - {{ {768, 614, -3855}, 0, {1346, -694}, {0, 0, 129, 255} }}, - {{ {717, 614, -3804}, 0, {1191, -694}, {129, 0, 0, 255} }}, - {{ {717, 51, -3855}, 0, {1347, 584}, {129, 0, 0, 255} }}, - {{ {717, 51, -3804}, 0, {1191, 584}, {129, 0, 0, 255} }}, - {{ {717, 614, -3855}, 0, {1347, -694}, {129, 0, 0, 255} }}, - {{ {1382, -154, -4674}, 0, {1239, 649}, {0, 127, 0, 255} }}, - {{ {1331, -154, -3855}, 0, {23, 611}, {0, 127, 0, 255} }}, - {{ {1382, -154, -3855}, 0, {23, 649}, {0, 127, 0, 255} }}, - {{ {1331, -154, -4674}, 0, {1239, 611}, {0, 127, 0, 255} }}, - {{ {1331, -154, -4674}, 0, {1239, 649}, {129, 0, 0, 255} }}, - {{ {1331, -205, -3855}, 0, {23, 695}, {129, 0, 0, 255} }}, - {{ {1331, -154, -3855}, 0, {23, 649}, {129, 0, 0, 255} }}, - {{ {1331, -205, -4674}, 0, {1239, 695}, {129, 0, 0, 255} }}, - {{ {563, -205, -4674}, 0, {-297, 1701}, {0, 0, 129, 255} }}, - {{ {512, -154, -4674}, 0, {-373, 1548}, {0, 0, 129, 255} }}, - {{ {563, -154, -4674}, 0, {-297, 1548}, {0, 0, 129, 255} }}, - {{ {512, -205, -4674}, 0, {-373, 1701}, {0, 0, 129, 255} }}, - {{ {563, -205, -4674}, 0, {959, 2051}, {127, 0, 0, 255} }}, - {{ {563, -154, -3855}, 0, {-64, 1924}, {127, 0, 0, 255} }}, - {{ {563, -205, -3855}, 0, {-64, 2051}, {127, 0, 0, 255} }}, - {{ {563, -154, -4674}, 0, {959, 1924}, {127, 0, 0, 255} }}, - {{ {563, -154, -4674}, 0, {959, 1924}, {0, 127, 0, 255} }}, - {{ {512, -154, -3855}, 0, {-64, 1779}, {0, 127, 0, 255} }}, - {{ {563, -154, -3855}, 0, {-64, 1924}, {0, 127, 0, 255} }}, - {{ {512, -154, -4674}, 0, {959, 1779}, {0, 127, 0, 255} }}, - {{ {640, -205, -4674}, 0, {-529, 2510}, {0, 0, 127, 255} }}, - {{ {512, 614, -4674}, 0, {-97, 390}, {0, 0, 127, 255} }}, - {{ {512, -205, -4674}, 0, {-97, 2510}, {0, 0, 127, 255} }}, - {{ {640, 614, -4674}, 0, {-529, 390}, {0, 0, 127, 255} }}, - {{ {640, -205, -4777}, 0, {164, 1908}, {127, 0, 0, 255} }}, - {{ {640, 614, -4674}, 0, {-49, 152}, {127, 0, 0, 255} }}, - {{ {640, -205, -4674}, 0, {-1, 1794}, {127, 0, 0, 255} }}, - {{ {640, 614, -4777}, 0, {116, 266}, {127, 0, 0, 255} }}, - {{ {1254, 614, -4674}, 0, {503, -704}, {0, 0, 127, 255} }}, - {{ {1382, -205, -4674}, 0, {122, 1101}, {0, 0, 127, 255} }}, - {{ {1382, 614, -4674}, 0, {122, -704}, {0, 0, 127, 255} }}, - {{ {1254, -205, -4674}, 0, {503, 1101}, {0, 0, 127, 255} }}, - {{ {1331, 614, -4674}, 0, {1832, -733}, {129, 0, 0, 255} }}, - {{ {1331, 563, -3266}, 0, {-259, -581}, {129, 0, 0, 255} }}, - {{ {1331, 614, -3266}, 0, {-259, -733}, {129, 0, 0, 255} }}, - {{ {1331, 563, -4674}, 0, {1832, -581}, {129, 0, 0, 255} }}, - {{ {1331, 563, -4674}, 0, {843, -1493}, {0, 129, 0, 255} }}, - {{ {1382, 563, -3266}, 0, {919, 2689}, {0, 129, 0, 255} }}, - {{ {1331, 563, -3266}, 0, {843, 2689}, {0, 129, 0, 255} }}, - {{ {1382, 563, -4674}, 0, {919, -1493}, {0, 129, 0, 255} }}, - {{ {512, 563, -4674}, 0, {-373, -1493}, {0, 129, 0, 255} }}, - {{ {563, 563, -3266}, 0, {-297, 2689}, {0, 129, 0, 255} }}, - {{ {512, 563, -3266}, 0, {-373, 2689}, {0, 129, 0, 255} }}, - {{ {563, 563, -4674}, 0, {-297, -1493}, {0, 129, 0, 255} }}, - {{ {563, 563, -4674}, 0, {1832, -581}, {127, 0, 0, 255} }}, - {{ {563, 614, -3266}, 0, {-259, -733}, {127, 0, 0, 255} }}, - {{ {563, 563, -3266}, 0, {-259, -581}, {127, 0, 0, 255} }}, - {{ {563, 614, -4674}, 0, {1832, -733}, {127, 0, 0, 255} }}, - {{ {1254, 614, -4725}, 0, {1067, 1967}, {0, 0, 127, 255} }}, - {{ {640, 410, -4725}, 0, {607, 226}, {0, 0, 127, 255} }}, - {{ {1254, 410, -4725}, 0, {607, 1967}, {0, 0, 127, 255} }}, - {{ {640, 614, -4725}, 0, {1067, 226}, {0, 0, 127, 255} }}, - {{ {1229, 0, -3266}, 0, {890, 923}, {0, 0, 129, 255} }}, - {{ {1382, 614, -3266}, 0, {1220, 11}, {0, 0, 129, 255} }}, - {{ {1382, 0, -3266}, 0, {1220, 923}, {0, 0, 129, 255} }}, - {{ {1229, 614, -3266}, 0, {890, 11}, {0, 0, 129, 255} }}, - {{ {512, 0, -3266}, 0, {-647, 923}, {0, 0, 129, 255} }}, - {{ {666, 614, -3266}, 0, {-318, 11}, {0, 0, 129, 255} }}, - {{ {666, 0, -3266}, 0, {-318, 923}, {0, 0, 129, 255} }}, - {{ {512, 614, -3266}, 0, {-647, 11}, {0, 0, 129, 255} }}, - {{ {1229, 0, -3266}, 0, {691, 2689}, {0, 129, 0, 255} }}, - {{ {1382, 0, -3113}, 0, {919, 3145}, {0, 129, 0, 255} }}, - {{ {1229, 0, -3113}, 0, {691, 3145}, {0, 129, 0, 255} }}, - {{ {1382, 0, -3266}, 0, {919, 2689}, {0, 129, 0, 255} }}, - {{ {666, 0, -3266}, 0, {-482, 923}, {127, 0, 0, 255} }}, - {{ {666, 614, -3113}, 0, {-812, 11}, {127, 0, 0, 255} }}, - {{ {666, 0, -3113}, 0, {-812, 923}, {127, 0, 0, 255} }}, - {{ {666, 614, -3266}, 0, {-482, 11}, {127, 0, 0, 255} }}, - {{ {512, 0, -3113}, 0, {-373, 3145}, {0, 129, 0, 255} }}, - {{ {666, 0, -3266}, 0, {-145, 2689}, {0, 129, 0, 255} }}, - {{ {666, 0, -3113}, 0, {-145, 3145}, {0, 129, 0, 255} }}, - {{ {512, 0, -3266}, 0, {-373, 2689}, {0, 129, 0, 255} }}, - {{ {1254, -205, -4777}, 0, {1984, 1701}, {129, 0, 0, 255} }}, - {{ {1254, 614, -4674}, 0, {1832, -733}, {129, 0, 0, 255} }}, - {{ {1254, 614, -4777}, 0, {1984, -733}, {129, 0, 0, 255} }}, - {{ {1254, -205, -4674}, 0, {1832, 1701}, {129, 0, 0, 255} }}, - {{ {614, -205, -4009}, 0, {596, 2616}, {0, 0, 127, 255} }}, - {{ {512, 614, -4009}, 0, {953, 324}, {0, 0, 127, 255} }}, - {{ {512, -205, -4009}, 0, {953, 2616}, {0, 0, 127, 255} }}, - {{ {614, 614, -4009}, 0, {596, 324}, {0, 0, 127, 255} }}, - {{ {614, -205, -4111}, 0, {596, 2616}, {127, 0, 0, 255} }}, - {{ {614, 614, -4009}, 0, {953, 324}, {127, 0, 0, 255} }}, - {{ {614, -205, -4009}, 0, {953, 2616}, {127, 0, 0, 255} }}, - {{ {614, 614, -4111}, 0, {596, 324}, {127, 0, 0, 255} }}, - {{ {512, -205, -4111}, 0, {953, 2616}, {0, 0, 129, 255} }}, - {{ {614, 614, -4111}, 0, {596, 324}, {0, 0, 129, 255} }}, - {{ {614, -205, -4111}, 0, {596, 2616}, {0, 0, 129, 255} }}, - {{ {512, 614, -4111}, 0, {953, 324}, {0, 0, 129, 255} }}, - {{ {1280, -205, -4111}, 0, {852, 2110}, {0, 0, 129, 255} }}, - {{ {1382, 614, -4111}, 0, {512, 430}, {0, 0, 129, 255} }}, - {{ {1382, -205, -4111}, 0, {512, 2110}, {0, 0, 129, 255} }}, - {{ {1280, 614, -4111}, 0, {852, 430}, {0, 0, 129, 255} }}, - {{ {1280, -205, -4009}, 0, {852, 2110}, {129, 0, 0, 255} }}, - {{ {1280, 614, -4111}, 0, {512, 430}, {129, 0, 0, 255} }}, - {{ {1280, -205, -4111}, 0, {512, 2110}, {129, 0, 0, 255} }}, - {{ {1280, 614, -4009}, 0, {852, 430}, {129, 0, 0, 255} }}, - {{ {1382, -205, -4009}, 0, {512, 2110}, {0, 0, 127, 255} }}, - {{ {1280, 614, -4009}, 0, {852, 430}, {0, 0, 127, 255} }}, - {{ {1280, -205, -4009}, 0, {852, 2110}, {0, 0, 127, 255} }}, - {{ {1382, 614, -4009}, 0, {512, 430}, {0, 0, 127, 255} }}, - {{ {640, 410, -4725}, 0, {607, 226}, {0, 129, 0, 255} }}, - {{ {1254, 410, -4777}, 0, {511, 1967}, {0, 129, 0, 255} }}, - {{ {1254, 410, -4725}, 0, {607, 1967}, {0, 129, 0, 255} }}, - {{ {640, 410, -4777}, 0, {511, 226}, {0, 129, 0, 255} }}, - {{ {1382, 614, -4777}, 0, {1007, 1929}, {0, 129, 0, 255} }}, - {{ {512, 614, -3113}, 0, {-16, -119}, {0, 129, 0, 255} }}, - {{ {512, 614, -4777}, 0, {-16, 1929}, {0, 129, 0, 255} }}, - {{ {1382, 614, -3113}, 0, {1007, -119}, {0, 129, 0, 255} }}, - {{ {768, 614, -3855}, 0, {1346, -694}, {127, 0, 0, 255} }}, - {{ {768, 614, -3804}, 0, {1191, -694}, {127, 0, 0, 255} }}, - {{ {768, 51, -3804}, 0, {1191, 584}, {127, 0, 0, 255} }}, - {{ {768, 51, -3855}, 0, {1346, 584}, {127, 0, 0, 255} }}, - {{ {717, 51, -3804}, 0, {1435, 584}, {0, 0, 127, 255} }}, - {{ {512, 51, -3804}, 0, {2016, 584}, {0, 0, 127, 255} }}, - {{ {512, 0, -3804}, 0, {2016, 700}, {0, 0, 127, 255} }}, - {{ {768, 0, -3804}, 0, {1280, 700}, {0, 0, 127, 255} }}, - {{ {768, 0, -3804}, 0, {1191, 700}, {0, 0, 127, 255} }}, - {{ {768, 51, -3804}, 0, {1191, 584}, {0, 0, 127, 255} }}, - {{ {717, 51, -3804}, 0, {1346, 584}, {0, 0, 127, 255} }}, - {{ {768, 614, -3804}, 0, {1191, -694}, {0, 0, 127, 255} }}, - {{ {768, 614, -3804}, 0, {1191, -694}, {0, 0, 127, 255} }}, - {{ {717, 614, -3804}, 0, {1346, -694}, {0, 0, 127, 255} }}, - {{ {717, 51, -3804}, 0, {1346, 584}, {0, 0, 127, 255} }}, +static const Vtx castle_inside_fire_bubble_dl_mesh_vtx_1[289] = { + {{ {768, 0, -3855}, 0, {1537, -375}, {127, 0, 0, 255} }}, + {{ {768, 51, -3804}, 0, {1665, -119}, {127, 0, 0, 255} }}, + {{ {768, 0, -3804}, 0, {1665, -375}, {127, 0, 0, 255} }}, + {{ {768, -128, -4085}, 0, {865, 1354}, {0, 90, 166, 255} }}, + {{ {717, -128, -4085}, 0, {736, 1354}, {0, 90, 166, 255} }}, + {{ {742, -102, -4060}, 0, {800, 1226}, {0, 90, 166, 255} }}, + {{ {768, -128, -4034}, 0, {1089, -1016}, {90, 90, 0, 128} }}, + {{ {768, -128, -4085}, 0, {961, -1016}, {90, 90, 0, 128} }}, + {{ {742, -102, -4060}, 0, {1025, -888}, {90, 90, 0, 126} }}, + {{ {717, -128, -4034}, 0, {736, 1098}, {166, 90, 0, 255} }}, + {{ {742, -102, -4060}, 0, {800, 1226}, {166, 90, 0, 255} }}, + {{ {717, -128, -4085}, 0, {736, 1354}, {166, 90, 0, 255} }}, + {{ {768, -128, -4034}, 0, {865, 1098}, {0, 90, 90, 255} }}, + {{ {742, -102, -4060}, 0, {800, 1226}, {0, 90, 90, 255} }}, + {{ {717, -128, -4034}, 0, {736, 1098}, {0, 90, 90, 255} }}, + {{ {1126, 51, -3804}, 0, {1665, -119}, {129, 0, 0, 255} }}, + {{ {1126, 0, -3855}, 0, {1537, -375}, {129, 0, 0, 255} }}, + {{ {1126, 0, -3804}, 0, {1665, -375}, {129, 0, 0, 255} }}, + {{ {1178, -128, -4085}, 0, {1889, -1016}, {0, 0, 129, 255} }}, + {{ {1126, -205, -4085}, 0, {1761, -1400}, {0, 0, 129, 255} }}, + {{ {1126, -128, -4085}, 0, {1761, -1016}, {0, 0, 129, 255} }}, + {{ {1126, -128, -4085}, 0, {1761, 1354}, {0, 90, 166, 255} }}, + {{ {1152, -102, -4060}, 0, {1825, 1226}, {0, 90, 166, 255} }}, + {{ {1178, -128, -4085}, 0, {1889, 1354}, {0, 90, 166, 255} }}, + {{ {1126, -128, -4034}, 0, {1089, -1016}, {166, 90, 0, 128} }}, + {{ {1152, -102, -4060}, 0, {1025, -888}, {166, 90, 0, 126} }}, + {{ {1126, -128, -4085}, 0, {961, -1016}, {166, 90, 0, 128} }}, + {{ {1178, -128, -4034}, 0, {1889, 1098}, {90, 90, 0, 255} }}, + {{ {1178, -128, -4085}, 0, {1889, 1354}, {90, 90, 0, 255} }}, + {{ {1152, -102, -4060}, 0, {1825, 1226}, {90, 90, 0, 255} }}, + {{ {1126, -128, -4034}, 0, {1761, 1098}, {0, 90, 90, 255} }}, + {{ {1178, -128, -4034}, 0, {1889, 1098}, {0, 90, 90, 255} }}, + {{ {1152, -102, -4060}, 0, {1825, 1226}, {0, 90, 90, 255} }}, + {{ {1178, -128, -4034}, 0, {1089, -1016}, {127, 0, 0, 255} }}, + {{ {1178, -205, -3855}, 0, {1537, -1400}, {127, 0, 0, 255} }}, + {{ {1178, -205, -4034}, 0, {1089, -1400}, {127, 0, 0, 255} }}, + {{ {1126, 614, -3804}, 0, {-269, -3371}, {129, 0, 0, 255} }}, + {{ {1126, 51, -3855}, 0, {-355, -1494}, {129, 0, 0, 255} }}, + {{ {1126, 51, -3804}, 0, {-269, -1494}, {129, 0, 0, 255} }}, + {{ {768, 0, -3855}, 0, {1537, -375}, {127, 0, 0, 255} }}, + {{ {768, 51, -3855}, 0, {1537, -119}, {127, 0, 0, 255} }}, + {{ {768, 51, -3804}, 0, {1665, -119}, {127, 0, 0, 255} }}, + {{ {1126, 51, -3804}, 0, {1665, -119}, {129, 0, 0, 255} }}, + {{ {1126, 51, -3855}, 0, {1537, -119}, {129, 0, 0, 255} }}, + {{ {1126, 0, -3855}, 0, {1537, -375}, {129, 0, 0, 255} }}, + {{ {1178, -128, -4085}, 0, {1889, -1016}, {0, 0, 129, 255} }}, + {{ {1178, -205, -4085}, 0, {1890, -1400}, {0, 0, 129, 255} }}, + {{ {1126, -205, -4085}, 0, {1761, -1400}, {0, 0, 129, 255} }}, + {{ {1178, -128, -4034}, 0, {1089, -1016}, {127, 0, 0, 255} }}, + {{ {1178, 51, -3855}, 0, {1537, -119}, {127, 0, 0, 255} }}, + {{ {1178, -205, -3855}, 0, {1537, -1400}, {127, 0, 0, 255} }}, + {{ {1126, 614, -3804}, 0, {-269, -3371}, {129, 0, 0, 255} }}, + {{ {1126, 614, -3855}, 0, {-355, -3371}, {129, 0, 0, 255} }}, + {{ {1126, 51, -3855}, 0, {-355, -1494}, {129, 0, 0, 255} }}, + {{ {768, 0, -3113}, 0, {2833, 725}, {71, 71, 179, 255} }}, + {{ {512, 0, -3348}, 0, {4632, 392}, {71, 71, 179, 255} }}, + {{ {512, 256, -3113}, 0, {4553, -1308}, {71, 71, 179, 255} }}, + {{ {1382, 0, -3348}, 0, {-1485, 1527}, {185, 71, 179, 255} }}, + {{ {1126, 0, -3113}, 0, {314, 1193}, {185, 71, 179, 255} }}, + {{ {1382, 256, -3113}, 0, {-1564, -173}, {185, 71, 179, 255} }}, + {{ {768, 0, -3804}, 0, {2224, 429}, {0, 127, 0, 255} }}, + {{ {512, 0, -3113}, 0, {597, 1634}, {0, 127, 0, 255} }}, + {{ {768, 0, -3113}, 0, {597, 429}, {0, 127, 0, 255} }}, + {{ {512, 0, -3804}, 0, {2224, 1634}, {0, 127, 0, 255} }}, + {{ {768, -205, -4085}, 0, {961, -1400}, {127, 0, 0, 255} }}, + {{ {768, -128, -4034}, 0, {1089, -1016}, {127, 0, 0, 255} }}, + {{ {768, -205, -4034}, 0, {1089, -1400}, {127, 0, 0, 255} }}, + {{ {768, -128, -4085}, 0, {961, -1016}, {127, 0, 0, 255} }}, + {{ {768, 614, -3855}, 0, {-355, -3371}, {127, 0, 0, 255} }}, + {{ {768, 51, -3804}, 0, {-269, -1494}, {127, 0, 0, 255} }}, + {{ {768, 51, -3855}, 0, {-355, -1494}, {127, 0, 0, 255} }}, + {{ {768, 614, -3804}, 0, {-269, -3371}, {127, 0, 0, 255} }}, + {{ {717, -128, -4034}, 0, {1089, -1016}, {129, 0, 0, 255} }}, + {{ {717, -205, -4085}, 0, {961, -1400}, {129, 0, 0, 255} }}, + {{ {717, -205, -4034}, 0, {1089, -1400}, {129, 0, 0, 255} }}, + {{ {717, -128, -4085}, 0, {961, -1016}, {129, 0, 0, 255} }}, + {{ {768, -205, -3855}, 0, {1537, -1400}, {127, 0, 0, 255} }}, + {{ {768, -128, -4034}, 0, {1089, -1016}, {127, 0, 0, 255} }}, + {{ {768, 51, -3855}, 0, {1537, -119}, {127, 0, 0, 255} }}, + {{ {768, -205, -4034}, 0, {1089, -1400}, {127, 0, 0, 255} }}, + {{ {768, -205, -4085}, 0, {865, -1400}, {0, 0, 129, 255} }}, + {{ {717, -128, -4085}, 0, {736, -1016}, {0, 0, 129, 255} }}, + {{ {768, -128, -4085}, 0, {865, -1016}, {0, 0, 129, 255} }}, + {{ {717, -205, -4085}, 0, {736, -1400}, {0, 0, 129, 255} }}, + {{ {717, -205, -4034}, 0, {736, 1098}, {0, 129, 0, 255} }}, + {{ {768, -205, -4085}, 0, {865, 1354}, {0, 129, 0, 255} }}, + {{ {768, -205, -4034}, 0, {865, 1098}, {0, 129, 0, 255} }}, + {{ {717, -205, -4085}, 0, {736, 1354}, {0, 129, 0, 255} }}, + {{ {1382, 0, -3113}, 0, {-832, 1968}, {0, 0, 129, 248} }}, + {{ {1024, 256, -3113}, 0, {433, 1114}, {0, 0, 129, 255} }}, + {{ {1382, 614, -3113}, 0, {-832, -80}, {0, 0, 129, 255} }}, + {{ {1024, 0, -3113}, 0, {433, 1968}, {0, 0, 129, 255} }}, + {{ {717, -205, -3855}, 0, {-819, 1672}, {0, 0, 129, 255} }}, + {{ {512, 51, -3855}, 0, {-2024, 1070}, {0, 0, 129, 255} }}, + {{ {717, 51, -3855}, 0, {-819, 1070}, {0, 0, 129, 255} }}, + {{ {512, -205, -3855}, 0, {-2024, 1672}, {0, 0, 129, 255} }}, + {{ {717, -205, -3855}, 0, {1537, -1400}, {129, 0, 0, 255} }}, + {{ {717, -128, -4034}, 0, {1089, -1016}, {129, 0, 0, 255} }}, + {{ {717, -205, -4034}, 0, {1089, -1400}, {129, 0, 0, 255} }}, + {{ {717, 51, -3855}, 0, {1537, -119}, {129, 0, 0, 255} }}, + {{ {512, 614, -4674}, 0, {3894, -240}, {127, 0, 0, 255} }}, + {{ {512, -205, -3113}, 0, {-800, 2718}, {127, 0, 0, 255} }}, + {{ {512, -205, -4674}, 0, {3894, 2718}, {127, 0, 0, 255} }}, + {{ {512, 614, -3113}, 0, {-800, -240}, {127, 0, 0, 255} }}, + {{ {1382, 0, -3804}, 0, {3096, 1190}, {0, 0, 127, 255} }}, + {{ {1126, 51, -3804}, 0, {1590, 1070}, {0, 0, 127, 255} }}, + {{ {1126, 0, -3804}, 0, {1590, 1190}, {0, 0, 127, 255} }}, + {{ {1382, 51, -3804}, 0, {3096, 1070}, {0, 0, 127, 255} }}, + {{ {1178, 614, -3804}, 0, {-948, -4077}, {0, 0, 127, 255} }}, + {{ {1126, 51, -3804}, 0, {-863, -2200}, {0, 0, 127, 255} }}, + {{ {1178, 51, -3804}, 0, {-948, -2200}, {0, 0, 127, 255} }}, + {{ {1126, 614, -3804}, 0, {-863, -4077}, {0, 0, 127, 255} }}, + {{ {1178, -128, -4034}, 0, {1089, -1016}, {127, 0, 0, 255} }}, + {{ {1178, -205, -4085}, 0, {961, -1400}, {127, 0, 0, 255} }}, + {{ {1178, -128, -4085}, 0, {961, -1016}, {127, 0, 0, 255} }}, + {{ {1178, -205, -4034}, 0, {1089, -1400}, {127, 0, 0, 255} }}, + {{ {1126, -205, -3855}, 0, {1537, -1400}, {129, 0, 0, 255} }}, + {{ {1126, -128, -4034}, 0, {1089, -1016}, {129, 0, 0, 255} }}, + {{ {1126, -205, -4034}, 0, {1089, -1400}, {129, 0, 0, 255} }}, + {{ {1126, 51, -3855}, 0, {1537, -119}, {129, 0, 0, 255} }}, + {{ {1178, 51, -3855}, 0, {1889, -119}, {0, 90, 166, 255} }}, + {{ {1126, -128, -4034}, 0, {1761, -1016}, {0, 90, 166, 255} }}, + {{ {1126, 51, -3855}, 0, {1761, -119}, {0, 90, 166, 255} }}, + {{ {1178, -128, -4034}, 0, {1889, -1016}, {0, 90, 166, 255} }}, + {{ {1126, -128, -4034}, 0, {1089, -1016}, {129, 0, 0, 255} }}, + {{ {1126, -205, -4085}, 0, {961, -1400}, {129, 0, 0, 255} }}, + {{ {1126, -205, -4034}, 0, {1089, -1400}, {129, 0, 0, 255} }}, + {{ {1126, -128, -4085}, 0, {961, -1016}, {129, 0, 0, 255} }}, + {{ {1178, -205, -4034}, 0, {1890, 1098}, {0, 129, 0, 255} }}, + {{ {1126, -205, -4085}, 0, {1761, 1354}, {0, 129, 0, 255} }}, + {{ {1178, -205, -4085}, 0, {1890, 1354}, {0, 129, 0, 255} }}, + {{ {1126, -205, -4034}, 0, {1761, 1098}, {0, 129, 0, 255} }}, + {{ {1382, 51, -3855}, 0, {3096, 1070}, {0, 0, 129, 255} }}, + {{ {1178, -205, -3855}, 0, {1892, 1672}, {0, 0, 129, 255} }}, + {{ {1178, 51, -3855}, 0, {1892, 1070}, {0, 0, 129, 255} }}, + {{ {1382, -205, -3855}, 0, {3096, 1672}, {0, 0, 129, 255} }}, + {{ {1126, 0, -3113}, 0, {2325, 2838}, {0, 127, 0, 255} }}, + {{ {1382, 0, -3804}, 0, {3951, 1634}, {0, 127, 0, 255} }}, + {{ {1126, 0, -3804}, 0, {3951, 2838}, {0, 127, 0, 255} }}, + {{ {1382, 0, -3113}, 0, {2325, 1634}, {0, 127, 0, 255} }}, + {{ {1382, -205, -3113}, 0, {-800, 2766}, {129, 0, 0, 255} }}, + {{ {1382, 614, -4674}, 0, {3894, 136}, {129, 0, 0, 255} }}, + {{ {1382, -205, -4674}, 0, {3894, 2766}, {129, 0, 0, 255} }}, + {{ {1382, 614, -3113}, 0, {-800, 136}, {129, 0, 0, 255} }}, + {{ {1382, -205, -4674}, 0, {2402, -1400}, {0, 0, 129, 255} }}, + {{ {1331, -154, -4674}, 0, {2274, -1144}, {0, 0, 129, 255} }}, + {{ {1382, -154, -4674}, 0, {2402, -1144}, {0, 0, 129, 255} }}, + {{ {1331, -205, -4674}, 0, {2274, -1400}, {0, 0, 129, 255} }}, + {{ {512, 0, -3113}, 0, {2240, 1968}, {0, 0, 129, 248} }}, + {{ {870, 256, -3113}, 0, {975, 1115}, {0, 0, 129, 255} }}, + {{ {870, 0, -3113}, 0, {975, 1968}, {0, 0, 129, 255} }}, + {{ {512, 614, -3113}, 0, {2240, -80}, {0, 0, 129, 255} }}, + {{ {1024, 256, -3113}, 0, {433, 1114}, {0, 0, 129, 255} }}, + {{ {1382, 614, -3113}, 0, {-832, -80}, {0, 0, 129, 255} }}, + {{ {1382, 51, -3855}, 0, {3096, 1311}, {0, 127, 0, 255} }}, + {{ {1178, 51, -3804}, 0, {1892, 1431}, {0, 127, 0, 255} }}, + {{ {1382, 51, -3804}, 0, {3096, 1431}, {0, 127, 0, 255} }}, + {{ {1178, 51, -3855}, 0, {1892, 1311}, {0, 127, 0, 255} }}, + {{ {717, -128, -4034}, 0, {736, -1016}, {0, 90, 166, 255} }}, + {{ {768, 51, -3855}, 0, {865, -119}, {0, 90, 166, 255} }}, + {{ {768, -128, -4034}, 0, {865, -1016}, {0, 90, 166, 255} }}, + {{ {717, 51, -3855}, 0, {736, -119}, {0, 90, 166, 255} }}, + {{ {768, 0, -3855}, 0, {865, 201}, {0, 127, 0, 255} }}, + {{ {512, 0, -3804}, 0, {224, -55}, {0, 127, 0, 255} }}, + {{ {768, 0, -3804}, 0, {865, -55}, {0, 127, 0, 255} }}, + {{ {512, 0, -3855}, 0, {224, 201}, {0, 127, 0, 255} }}, + {{ {1382, 0, -3855}, 0, {2402, 201}, {0, 127, 0, 255} }}, + {{ {1126, 0, -3804}, 0, {1761, -55}, {0, 127, 0, 255} }}, + {{ {1382, 0, -3804}, 0, {2402, -55}, {0, 127, 0, 255} }}, + {{ {1126, 0, -3855}, 0, {1761, 201}, {0, 127, 0, 255} }}, + {{ {768, 0, -3804}, 0, {-13, -1323}, {0, 0, 127, 255} }}, + {{ {768, 51, -3804}, 0, {-13, -1494}, {0, 0, 127, 255} }}, + {{ {717, 51, -3804}, 0, {72, -1494}, {0, 0, 127, 255} }}, + {{ {768, 614, -3804}, 0, {-13, -3371}, {0, 0, 127, 255} }}, + {{ {717, 614, -3804}, 0, {72, -3371}, {0, 0, 127, 255} }}, + {{ {717, 51, -3855}, 0, {-819, 1311}, {0, 127, 0, 255} }}, + {{ {512, 51, -3804}, 0, {-2024, 1431}, {0, 127, 0, 255} }}, + {{ {717, 51, -3804}, 0, {-819, 1431}, {0, 127, 0, 255} }}, + {{ {512, 51, -3855}, 0, {-2024, 1311}, {0, 127, 0, 255} }}, + {{ {1178, 614, -3855}, 0, {-355, -3371}, {127, 0, 0, 255} }}, + {{ {1178, 51, -3804}, 0, {-269, -1494}, {127, 0, 0, 255} }}, + {{ {1178, 51, -3855}, 0, {-355, -1494}, {127, 0, 0, 255} }}, + {{ {1178, 614, -3804}, 0, {-269, -3371}, {127, 0, 0, 255} }}, + {{ {1126, 614, -3855}, 0, {-369, -3371}, {0, 0, 129, 255} }}, + {{ {1178, 51, -3855}, 0, {-454, -1494}, {0, 0, 129, 255} }}, + {{ {1126, 51, -3855}, 0, {-369, -1494}, {0, 0, 129, 255} }}, + {{ {1126, 614, -3855}, 0, {-369, -3371}, {0, 0, 129, 255} }}, + {{ {1178, 614, -3855}, 0, {-454, -3371}, {0, 0, 129, 255} }}, + {{ {1178, 51, -3855}, 0, {-454, -1494}, {0, 0, 129, 255} }}, + {{ {717, 614, -3855}, 0, {72, -3371}, {0, 0, 129, 255} }}, + {{ {768, 51, -3855}, 0, {-13, -1494}, {0, 0, 129, 255} }}, + {{ {717, 51, -3855}, 0, {72, -1494}, {0, 0, 129, 255} }}, + {{ {768, 614, -3855}, 0, {-13, -3371}, {0, 0, 129, 255} }}, + {{ {717, 614, -3804}, 0, {-269, -3371}, {129, 0, 0, 255} }}, + {{ {717, 51, -3855}, 0, {-355, -1494}, {129, 0, 0, 255} }}, + {{ {717, 51, -3804}, 0, {-269, -1494}, {129, 0, 0, 255} }}, + {{ {717, 614, -3855}, 0, {-355, -3371}, {129, 0, 0, 255} }}, + {{ {1382, -154, -4674}, 0, {-1120, 2146}, {0, 127, 0, 255} }}, + {{ {1331, -154, -3855}, 0, {-991, -1984}, {0, 127, 0, 255} }}, + {{ {1382, -154, -3855}, 0, {-1120, -1984}, {0, 127, 0, 255} }}, + {{ {1331, -154, -4674}, 0, {-991, 2146}, {0, 127, 0, 255} }}, + {{ {1331, -154, -4674}, 0, {-829, 2009}, {129, 0, 0, 255} }}, + {{ {1331, -205, -3855}, 0, {-700, 345}, {129, 0, 0, 255} }}, + {{ {1331, -154, -3855}, 0, {-829, 345}, {129, 0, 0, 255} }}, + {{ {1331, -205, -4674}, 0, {-700, 2009}, {129, 0, 0, 255} }}, + {{ {563, -205, -4674}, 0, {352, -1400}, {0, 0, 129, 255} }}, + {{ {512, -154, -4674}, 0, {224, -1144}, {0, 0, 129, 255} }}, + {{ {563, -154, -4674}, 0, {352, -1144}, {0, 0, 129, 255} }}, + {{ {512, -205, -4674}, 0, {224, -1400}, {0, 0, 129, 255} }}, + {{ {563, -205, -4674}, 0, {-829, 2009}, {127, 0, 0, 255} }}, + {{ {563, -154, -3855}, 0, {-700, 345}, {127, 0, 0, 255} }}, + {{ {563, -205, -3855}, 0, {-829, 345}, {127, 0, 0, 255} }}, + {{ {563, -154, -4674}, 0, {-700, 2009}, {127, 0, 0, 255} }}, + {{ {563, -154, -4674}, 0, {-30, 2150}, {0, 127, 0, 255} }}, + {{ {512, -154, -3855}, 0, {99, -290}, {0, 127, 0, 255} }}, + {{ {563, -154, -3855}, 0, {-30, -290}, {0, 127, 0, 255} }}, + {{ {512, -154, -4674}, 0, {99, 2150}, {0, 127, 0, 255} }}, + {{ {640, -205, -4674}, 0, {507, 4582}, {0, 0, 127, 255} }}, + {{ {512, 614, -4674}, 0, {936, 2084}, {0, 0, 127, 255} }}, + {{ {512, -205, -4674}, 0, {936, 4582}, {0, 0, 127, 255} }}, + {{ {640, 614, -4674}, 0, {507, 2084}, {0, 0, 127, 255} }}, + {{ {640, -205, -4777}, 0, {-1129, -244}, {127, 0, 0, 255} }}, + {{ {640, 614, -4674}, 0, {490, -129}, {127, 0, 0, 255} }}, + {{ {640, -205, -4674}, 0, {-1129, -129}, {127, 0, 0, 255} }}, + {{ {640, 614, -4777}, 0, {490, -244}, {127, 0, 0, 255} }}, + {{ {1254, 614, -4674}, 0, {497, 1317}, {0, 0, 127, 255} }}, + {{ {1382, -205, -4674}, 0, {98, 3188}, {0, 0, 127, 255} }}, + {{ {1382, 614, -4674}, 0, {98, 1317}, {0, 0, 127, 255} }}, + {{ {1254, -205, -4674}, 0, {497, 3188}, {0, 0, 127, 255} }}, + {{ {1331, 614, -4674}, 0, {3568, 1136}, {129, 0, 0, 255} }}, + {{ {1331, 563, -3113}, 0, {-2576, 1203}, {129, 0, 0, 255} }}, + {{ {1331, 614, -3113}, 0, {-2576, 1136}, {129, 0, 0, 255} }}, + {{ {1331, 563, -4674}, 0, {3568, 1203}, {129, 0, 0, 255} }}, + {{ {1331, 563, -4674}, 0, {2007, 145}, {0, 129, 0, 255} }}, + {{ {1382, 563, -3113}, 0, {2208, 2193}, {0, 129, 0, 255} }}, + {{ {1331, 563, -3113}, 0, {2007, 2193}, {0, 129, 0, 255} }}, + {{ {1382, 563, -4674}, 0, {2208, 145}, {0, 129, 0, 255} }}, + {{ {512, 563, -4674}, 0, {-1216, 145}, {0, 129, 0, 255} }}, + {{ {563, 563, -3113}, 0, {-1015, 2193}, {0, 129, 0, 255} }}, + {{ {512, 563, -3113}, 0, {-1216, 2193}, {0, 129, 0, 255} }}, + {{ {563, 563, -4674}, 0, {-1015, 145}, {0, 129, 0, 255} }}, + {{ {563, 563, -4674}, 0, {3568, 1203}, {127, 0, 0, 255} }}, + {{ {563, 614, -3113}, 0, {-2576, 1136}, {127, 0, 0, 255} }}, + {{ {563, 563, -3113}, 0, {-2576, 1203}, {127, 0, 0, 255} }}, + {{ {563, 614, -4674}, 0, {3568, 1136}, {127, 0, 0, 255} }}, + {{ {1254, 614, -4725}, 0, {155, -29}, {0, 0, 127, 255} }}, + {{ {640, 410, -4725}, 0, {437, 2058}, {0, 0, 127, 255} }}, + {{ {1254, 410, -4725}, 0, {690, 84}, {0, 0, 127, 255} }}, + {{ {640, 614, -4725}, 0, {-98, 1945}, {0, 0, 127, 255} }}, + {{ {1254, -205, -4777}, 0, {642, 1065}, {129, 0, 0, 255} }}, + {{ {1254, 614, -4674}, 0, {2674, 494}, {129, 0, 0, 255} }}, + {{ {1254, 614, -4777}, 0, {2684, 749}, {129, 0, 0, 255} }}, + {{ {1254, -205, -4674}, 0, {633, 809}, {129, 0, 0, 255} }}, + {{ {614, -205, -4009}, 0, {2761, 2656}, {0, 0, 127, 255} }}, + {{ {512, 614, -4009}, 0, {3242, -1199}, {0, 0, 127, 255} }}, + {{ {512, -205, -4009}, 0, {3242, 2656}, {0, 0, 127, 255} }}, + {{ {614, 614, -4009}, 0, {2761, -1199}, {0, 0, 127, 255} }}, + {{ {614, -205, -4111}, 0, {556, 2432}, {127, 0, 0, 255} }}, + {{ {614, 614, -4009}, 0, {1062, -1037}, {127, 0, 0, 255} }}, + {{ {614, -205, -4009}, 0, {1062, 2432}, {127, 0, 0, 255} }}, + {{ {614, 614, -4111}, 0, {556, -1037}, {127, 0, 0, 255} }}, + {{ {512, -205, -4111}, 0, {3242, 2656}, {0, 0, 129, 255} }}, + {{ {614, 614, -4111}, 0, {2761, -1199}, {0, 0, 129, 255} }}, + {{ {614, -205, -4111}, 0, {2761, 2656}, {0, 0, 129, 255} }}, + {{ {512, 614, -4111}, 0, {3242, -1199}, {0, 0, 129, 255} }}, + {{ {1280, -205, -4111}, 0, {-44, 2656}, {0, 0, 129, 255} }}, + {{ {1382, 614, -4111}, 0, {-526, -1199}, {0, 0, 129, 255} }}, + {{ {1382, -205, -4111}, 0, {-526, 2656}, {0, 0, 129, 255} }}, + {{ {1280, 614, -4111}, 0, {-44, -1199}, {0, 0, 129, 255} }}, + {{ {1280, -205, -4009}, 0, {1062, 2432}, {129, 0, 0, 255} }}, + {{ {1280, 614, -4111}, 0, {556, -1037}, {129, 0, 0, 255} }}, + {{ {1280, -205, -4111}, 0, {556, 2432}, {129, 0, 0, 255} }}, + {{ {1280, 614, -4009}, 0, {1062, -1037}, {129, 0, 0, 255} }}, + {{ {1382, -205, -4009}, 0, {-854, 2656}, {0, 0, 127, 255} }}, + {{ {1280, 614, -4009}, 0, {-372, -1199}, {0, 0, 127, 255} }}, + {{ {1280, -205, -4009}, 0, {-372, 2656}, {0, 0, 127, 255} }}, + {{ {1382, 614, -4009}, 0, {-854, -1199}, {0, 0, 127, 255} }}, + {{ {640, 410, -4725}, 0, {653, 2096}, {0, 129, 0, 255} }}, + {{ {1254, 410, -4777}, 0, {690, 84}, {0, 129, 0, 255} }}, + {{ {1254, 410, -4725}, 0, {906, 122}, {0, 129, 0, 255} }}, + {{ {640, 410, -4777}, 0, {437, 2058}, {0, 129, 0, 255} }}, + {{ {1382, 614, -4777}, 0, {1323, 3056}, {0, 129, 0, 255} }}, + {{ {512, 614, -3113}, 0, {-819, -1040}, {0, 129, 0, 255} }}, + {{ {512, 614, -4777}, 0, {-819, 3056}, {0, 129, 0, 255} }}, + {{ {1382, 614, -3113}, 0, {1323, -1040}, {0, 129, 0, 255} }}, + {{ {717, 51, -3804}, 0, {-819, 1070}, {0, 0, 127, 255} }}, + {{ {512, 51, -3804}, 0, {-2024, 1070}, {0, 0, 127, 255} }}, + {{ {512, 0, -3804}, 0, {-2024, 1190}, {0, 0, 127, 255} }}, + {{ {768, 0, -3804}, 0, {-518, 1190}, {0, 0, 127, 255} }}, }; static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { @@ -421,46 +417,25 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 15, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 15, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(9, 12, 10, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 31, 16, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 30, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(3, 6, 4, 0), - gsSP1Triangle(7, 8, 0, 0), - gsSP1Triangle(7, 9, 8, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSP1Triangle(10, 13, 14, 0), - gsSP1Triangle(10, 14, 15, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 47, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 7, 6, 0), - gsSP1Triangle(8, 6, 9, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSP1Triangle(14, 10, 13, 0), - gsSP1Triangle(14, 15, 10, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 63, 16, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 45, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), - gsSP1Triangle(12, 11, 10, 0), - gsSP1Triangle(12, 10, 13, 0), - gsSP1Triangle(14, 12, 13, 0), - gsSP1Triangle(14, 13, 15, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 79, 16, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 60, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -469,16 +444,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 95, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(2, 4, 3, 0), - gsSP1Triangle(2, 5, 4, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 7, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 13, 11, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 109, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 76, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -487,7 +453,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 125, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 92, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -496,7 +462,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 141, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 108, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -505,7 +471,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 157, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 124, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -514,16 +480,16 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 173, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 140, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 189, 16, 0), + gsSP1Triangle(11, 12, 9, 0), + gsSP1Triangle(11, 13, 12, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 154, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -532,7 +498,24 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 205, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 170, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 2, 1, 0), + gsSP1Triangle(3, 4, 2, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(5, 8, 6, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 12, 10, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 186, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 6, 4, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 10, 8, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 14, 12, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 201, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -541,7 +524,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 221, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 217, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -550,7 +533,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 237, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 233, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -559,7 +542,7 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 253, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 249, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -568,43 +551,20 @@ static const Gfx castle_inside_fire_bubble_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 269, 16, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 265, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(10, 11, 8, 0), + gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(15, 14, 13, 0), - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 285, 3, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSPEndDisplayList(), -}; - -static const Vtx castle_inside_fire_bubble_dl_mesh_vtx_2[12] = { - {{ {870, 256, -3113}, 0, {511, 1026}, {0, 129, 0, 255} }}, - {{ {1024, 256, -3010}, 0, {-259, 1026}, {0, 129, 0, 255} }}, - {{ {870, 256, -3010}, 0, {511, 1026}, {0, 129, 0, 255} }}, - {{ {1024, 256, -3113}, 0, {-259, 1026}, {0, 129, 0, 255} }}, - {{ {1024, 256, -3113}, 0, {-259, 1026}, {129, 0, 0, 255} }}, - {{ {1024, 0, -3010}, 0, {-259, 2010}, {129, 0, 0, 255} }}, - {{ {1024, 256, -3010}, 0, {-259, 1026}, {129, 0, 0, 255} }}, - {{ {1024, 0, -3113}, 0, {-259, 2010}, {129, 0, 0, 255} }}, - {{ {870, 0, -3113}, 0, {511, 2010}, {127, 0, 0, 255} }}, - {{ {870, 256, -3010}, 0, {511, 1026}, {127, 0, 0, 255} }}, - {{ {870, 0, -3010}, 0, {511, 2010}, {127, 0, 0, 255} }}, - {{ {870, 256, -3113}, 0, {511, 1026}, {127, 0, 0, 255} }}, -}; - -static const Gfx castle_inside_fire_bubble_dl_mesh_tri_2[] = { - gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_2 + 0, 12, 0), + gsSP1Triangle(12, 15, 13, 0), + gsSPVertex(castle_inside_fire_bubble_dl_mesh_vtx_1 + 281, 8, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(6, 7, 4, 0), gsSPEndDisplayList(), }; @@ -628,8 +588,6 @@ const Gfx castle_inside_fire_bubble_dl_mesh[] = { gsSPDisplayList(castle_inside_fire_bubble_dl_mesh_tri_0), gsSPDisplayList(mat_castle_inside_MarbleWallMaterial), gsSPDisplayList(castle_inside_fire_bubble_dl_mesh_tri_1), - gsSPDisplayList(mat_castle_inside_WallBottomMaterial), - gsSPDisplayList(castle_inside_fire_bubble_dl_mesh_tri_2), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_TEXTURE_GEN), diff --git a/levels/castle_inside/areas/1/hallway/model.inc.c b/levels/castle_inside/areas/1/hallway/model.inc.c index a5683c36..cdbf4dac 100644 --- a/levels/castle_inside/areas/1/hallway/model.inc.c +++ b/levels/castle_inside/areas/1/hallway/model.inc.c @@ -1,142 +1,135 @@ -static const Vtx castle_inside_hallway_dl_mesh_vtx_0[138] = { - {{ {-205, 333, -3471}, 0, {-13, 17}, {0, 0, 127, 255} }}, - {{ {-256, 333, -3471}, 0, {-13, 17}, {0, 0, 127, 255} }}, - {{ {-256, 282, -3471}, 0, {-13, 17}, {0, 0, 127, 255} }}, - {{ {205, 333, -3471}, 0, {-13, 17}, {0, 0, 127, 255} }}, - {{ {256, 282, -3471}, 0, {-13, 17}, {0, 0, 127, 255} }}, - {{ {256, 333, -3471}, 0, {-13, 17}, {0, 0, 127, 255} }}, - {{ {205, 333, -2805}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {410, 333, -3317}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {410, 333, -3010}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-205, 333, -5365}, 0, {757, 268}, {0, 0, 127, 255} }}, - {{ {-256, 282, -5365}, 0, {1018, 450}, {0, 0, 127, 255} }}, - {{ {-77, 256, -5365}, 0, {104, 541}, {0, 0, 127, 255} }}, - {{ {256, 282, -5365}, 0, {-1593, 450}, {0, 0, 127, 255} }}, - {{ {205, 333, -5365}, 0, {-1332, 268}, {0, 0, 127, 255} }}, - {{ {77, 256, -5365}, 0, {-679, 541}, {0, 0, 127, 255} }}, - {{ {237, 0, -2838}, 0, {6227, 1453}, {166, 0, 166, 255} }}, - {{ {205, 0, -2805}, 0, {6068, 1453}, {166, 0, 166, 255} }}, - {{ {237, 256, -2838}, 0, {6227, 541}, {166, 0, 166, 255} }}, - {{ {205, 0, -2805}, 0, {6068, 1453}, {166, 0, 166, 255} }}, - {{ {205, 333, -2805}, 0, {6068, 268}, {166, 0, 166, 255} }}, - {{ {237, 256, -2838}, 0, {6227, 541}, {166, 0, 166, 255} }}, - {{ {-205, 333, -2805}, 0, {7201, 273}, {90, 0, 166, 255} }}, - {{ {-205, 0, -2805}, 0, {7201, 1459}, {90, 0, 166, 255} }}, - {{ {-237, 256, -2838}, 0, {7028, 547}, {90, 0, 166, 255} }}, - {{ {-205, 0, -2805}, 0, {7201, 1459}, {90, 0, 166, 255} }}, - {{ {-237, 0, -2838}, 0, {7028, 1459}, {90, 0, 166, 255} }}, - {{ {-237, 256, -2838}, 0, {7028, 547}, {90, 0, 166, 255} }}, - {{ {-205, 333, -2805}, 0, {7201, 273}, {90, 0, 166, 255} }}, - {{ {-237, 256, -2838}, 0, {7028, 547}, {90, 0, 166, 255} }}, - {{ {-346, 256, -2946}, 0, {6444, 547}, {90, 0, 166, 255} }}, - {{ {-422, 256, -2869}, 0, {9, 1041}, {0, 129, 0, 255} }}, - {{ {-237, 256, -2838}, 0, {-707, 1041}, {0, 129, 0, 255} }}, - {{ {-314, 256, -2761}, 0, {-707, 1041}, {0, 129, 0, 255} }}, - {{ {-346, 256, -2946}, 0, {9, 1041}, {0, 129, 0, 255} }}, - {{ {-422, 0, -2869}, 0, {87, 2030}, {90, 0, 90, 255} }}, - {{ {-346, 256, -2946}, 0, {87, 1041}, {90, 0, 90, 255} }}, - {{ {-422, 256, -2869}, 0, {87, 1041}, {90, 0, 90, 255} }}, - {{ {-346, 0, -2946}, 0, {87, 2030}, {90, 0, 90, 255} }}, - {{ {-237, 256, -2838}, 0, {-707, 1041}, {166, 0, 166, 255} }}, - {{ {-314, 0, -2761}, 0, {-707, 2016}, {166, 0, 166, 255} }}, - {{ {-314, 256, -2761}, 0, {-707, 1041}, {166, 0, 166, 255} }}, - {{ {-237, 0, -2838}, 0, {-707, 2016}, {166, 0, 166, 255} }}, - {{ {237, 0, -2838}, 0, {484, 2016}, {90, 0, 166, 255} }}, - {{ {314, 256, -2761}, 0, {484, 1041}, {90, 0, 166, 255} }}, - {{ {314, 0, -2761}, 0, {484, 2016}, {90, 0, 166, 255} }}, - {{ {237, 256, -2838}, 0, {484, 1041}, {90, 0, 166, 255} }}, - {{ {237, 256, -2838}, 0, {488, 1041}, {0, 129, 0, 255} }}, - {{ {422, 256, -2869}, 0, {-228, 1041}, {0, 129, 0, 255} }}, - {{ {314, 256, -2761}, 0, {488, 1041}, {0, 129, 0, 255} }}, - {{ {346, 256, -2946}, 0, {-228, 1041}, {0, 129, 0, 255} }}, - {{ {346, 256, -2946}, 0, {-228, 1041}, {166, 0, 90, 255} }}, - {{ {422, 0, -2869}, 0, {-228, 2030}, {166, 0, 90, 255} }}, - {{ {422, 256, -2869}, 0, {-228, 1041}, {166, 0, 90, 255} }}, - {{ {346, 0, -2946}, 0, {-228, 2030}, {166, 0, 90, 255} }}, - {{ {205, 333, -5365}, 0, {-1332, 268}, {0, 0, 127, 255} }}, - {{ {-205, 333, -5365}, 0, {757, 268}, {0, 0, 127, 255} }}, - {{ {77, 256, -5365}, 0, {-679, 541}, {0, 0, 127, 255} }}, - {{ {-77, 256, -5365}, 0, {104, 541}, {0, 0, 127, 255} }}, - {{ {-205, 333, -5365}, 0, {3607, 268}, {90, 166, 0, 255} }}, - {{ {-256, 282, -3471}, 0, {12730, 450}, {90, 166, 0, 255} }}, - {{ {-256, 282, -5365}, 0, {3607, 450}, {90, 166, 0, 255} }}, - {{ {-205, 333, -3471}, 0, {12730, 268}, {90, 166, 0, 255} }}, - {{ {77, 256, -5468}, 0, {-679, 541}, {129, 0, 0, 255} }}, - {{ {77, 0, -5365}, 0, {-679, 1453}, {129, 0, 0, 255} }}, - {{ {77, 256, -5365}, 0, {-679, 541}, {129, 0, 0, 255} }}, - {{ {77, 0, -5468}, 0, {-679, 1453}, {129, 0, 0, 255} }}, - {{ {-77, 0, -5468}, 0, {104, 1453}, {127, 0, 0, 255} }}, - {{ {-77, 256, -5365}, 0, {104, 541}, {127, 0, 0, 255} }}, - {{ {-77, 0, -5365}, 0, {104, 1453}, {127, 0, 0, 255} }}, - {{ {-77, 256, -5468}, 0, {104, 541}, {127, 0, 0, 255} }}, - {{ {-77, 256, -5468}, 0, {104, 541}, {0, 129, 0, 255} }}, - {{ {77, 256, -5365}, 0, {-679, 541}, {0, 129, 0, 255} }}, - {{ {-77, 256, -5365}, 0, {104, 541}, {0, 129, 0, 255} }}, - {{ {77, 256, -5468}, 0, {-679, 541}, {0, 129, 0, 255} }}, - {{ {-256, 282, -3471}, 0, {12730, 450}, {127, 0, 0, 255} }}, - {{ {-256, -154, -5365}, 0, {3607, 2000}, {127, 0, 0, 255} }}, - {{ {-256, 282, -5365}, 0, {3607, 450}, {127, 0, 0, 255} }}, - {{ {-256, -154, -3471}, 0, {12730, 2000}, {127, 0, 0, 255} }}, - {{ {-410, 333, -3317}, 0, {12763, 268}, {90, 0, 90, 255} }}, - {{ {-256, 0, -3471}, 0, {11718, 1453}, {90, 0, 90, 255} }}, - {{ {-256, 333, -3471}, 0, {11709, 268}, {90, 0, 90, 255} }}, - {{ {-410, 0, -3317}, 0, {12772, 1453}, {90, 0, 90, 255} }}, - {{ {-410, 333, -3010}, 0, {14302, 272}, {127, 0, 0, 255} }}, - {{ {-410, 0, -3317}, 0, {12847, 1453}, {127, 0, 0, 255} }}, - {{ {-410, 333, -3317}, 0, {12849, 271}, {127, 0, 0, 255} }}, - {{ {-410, 0, -3010}, 0, {14301, 1455}, {127, 0, 0, 255} }}, - {{ {256, 333, -3471}, 0, {9671, 268}, {166, 0, 90, 255} }}, - {{ {410, 0, -3317}, 0, {8618, 1453}, {166, 0, 90, 255} }}, - {{ {410, 333, -3317}, 0, {8618, 268}, {166, 0, 90, 255} }}, - {{ {256, 0, -3471}, 0, {9671, 1453}, {166, 0, 90, 255} }}, - {{ {256, 282, -5365}, 0, {9109, 450}, {129, 0, 0, 255} }}, - {{ {256, -154, -3471}, 0, {-459, 2000}, {129, 0, 0, 255} }}, - {{ {256, 282, -3471}, 0, {-459, 450}, {129, 0, 0, 255} }}, - {{ {256, -154, -5365}, 0, {9109, 2000}, {129, 0, 0, 255} }}, - {{ {205, 333, -3471}, 0, {-459, 268}, {166, 166, 0, 255} }}, - {{ {256, 282, -5365}, 0, {9109, 450}, {166, 166, 0, 255} }}, - {{ {256, 282, -3471}, 0, {-459, 450}, {166, 166, 0, 255} }}, - {{ {205, 333, -5365}, 0, {9109, 268}, {166, 166, 0, 255} }}, - {{ {-205, 333, -3471}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-205, 333, -5365}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {205, 333, -5365}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {205, 333, -3471}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-205, 333, -2805}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {205, 333, -2805}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {410, 333, -3317}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {256, 333, -3471}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {410, 0, -3010}, 0, {8111, 1453}, {129, 0, 0, 255} }}, - {{ {410, 333, -3317}, 0, {9634, 268}, {129, 0, 0, 255} }}, - {{ {410, 0, -3317}, 0, {9634, 1453}, {129, 0, 0, 255} }}, - {{ {410, 333, -3010}, 0, {8111, 268}, {129, 0, 0, 255} }}, - {{ {205, 333, -2805}, 0, {13209, 268}, {0, 0, 129, 255} }}, - {{ {-205, 0, -2805}, 0, {11293, 1455}, {0, 0, 129, 255} }}, - {{ {-205, 333, -2805}, 0, {11293, 272}, {0, 0, 129, 255} }}, - {{ {205, 0, -2805}, 0, {13209, 1453}, {0, 0, 129, 255} }}, - {{ {346, 256, -2946}, 0, {6763, 541}, {166, 0, 166, 255} }}, - {{ {237, 256, -2838}, 0, {6227, 541}, {166, 0, 166, 255} }}, - {{ {205, 333, -2805}, 0, {6068, 268}, {166, 0, 166, 255} }}, - {{ {410, 333, -3010}, 0, {7072, 268}, {166, 0, 166, 255} }}, - {{ {410, 0, -3010}, 0, {7072, 1453}, {166, 0, 166, 255} }}, - {{ {346, 0, -2946}, 0, {6763, 1453}, {166, 0, 166, 255} }}, - {{ {-410, 333, -3010}, 0, {6125, 273}, {90, 0, 166, 255} }}, - {{ {-205, 333, -2805}, 0, {7201, 273}, {90, 0, 166, 255} }}, - {{ {-346, 256, -2946}, 0, {6444, 547}, {90, 0, 166, 255} }}, - {{ {-410, 0, -3010}, 0, {6125, 1459}, {90, 0, 166, 255} }}, - {{ {-346, 0, -2946}, 0, {6444, 1459}, {90, 0, 166, 255} }}, - {{ {-205, 333, -3471}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-410, 333, -3317}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-256, 333, -3471}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-205, 333, -2805}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-410, 333, -3010}, 0, {-13, 17}, {0, 129, 0, 255} }}, - {{ {-256, 282, -5365}, 0, {1018, 450}, {0, 0, 127, 255} }}, - {{ {-256, 0, -5365}, 0, {1018, 1453}, {0, 0, 127, 255} }}, - {{ {-77, 256, -5365}, 0, {104, 541}, {0, 0, 127, 255} }}, - {{ {-77, 0, -5365}, 0, {104, 1453}, {0, 0, 127, 255} }}, - {{ {77, 256, -5365}, 0, {-679, 541}, {0, 0, 127, 255} }}, - {{ {77, 0, -5365}, 0, {-679, 1453}, {0, 0, 127, 255} }}, - {{ {256, 0, -5365}, 0, {-1593, 1453}, {0, 0, 127, 255} }}, - {{ {256, 282, -5365}, 0, {-1593, 450}, {0, 0, 127, 255} }}, +static const Vtx castle_inside_hallway_dl_mesh_vtx_0[131] = { + {{ {-205, 333, -3471}, 0, {-13, -87}, {0, 0, 127, 255} }}, + {{ {-256, 333, -3471}, 0, {-13, -87}, {0, 0, 127, 255} }}, + {{ {-256, 282, -3471}, 0, {-13, -87}, {0, 0, 127, 255} }}, + {{ {205, 333, -3471}, 0, {-13, -87}, {0, 0, 127, 255} }}, + {{ {256, 282, -3471}, 0, {-13, -87}, {0, 0, 127, 255} }}, + {{ {256, 333, -3471}, 0, {-13, -87}, {0, 0, 127, 255} }}, + {{ {180, 333, -2781}, 0, {12556, 179}, {0, 0, 129, 255} }}, + {{ {-180, 0, -2781}, 0, {10442, 1433}, {0, 0, 129, 255} }}, + {{ {-180, 333, -2781}, 0, {10441, 183}, {0, 0, 129, 255} }}, + {{ {346, 256, -2946}, 0, {6658, 467}, {166, 0, 166, 255} }}, + {{ {237, 256, -2838}, 0, {6052, 467}, {166, 0, 166, 255} }}, + {{ {180, 333, -2781}, 0, {5748, 180}, {166, 0, 166, 255} }}, + {{ {-410, 333, -3010}, 0, {5762, 184}, {90, 0, 166, 255} }}, + {{ {-180, 333, -2781}, 0, {6922, 186}, {90, 0, 166, 255} }}, + {{ {-346, 256, -2946}, 0, {6082, 473}, {90, 0, 166, 255} }}, + {{ {180, 333, -2781}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {410, 333, -3317}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {410, 333, -3010}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-410, 333, -3317}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-180, 333, -2781}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-410, 333, -3010}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-205, 333, -5365}, 0, {757, 191}, {0, 0, 127, 255} }}, + {{ {-256, 282, -5365}, 0, {1018, 382}, {0, 0, 127, 255} }}, + {{ {-77, 256, -5365}, 0, {104, 477}, {0, 0, 127, 255} }}, + {{ {256, 282, -5365}, 0, {-1593, 382}, {0, 0, 127, 255} }}, + {{ {205, 333, -5365}, 0, {-1332, 191}, {0, 0, 127, 255} }}, + {{ {77, 256, -5365}, 0, {-679, 477}, {0, 0, 127, 255} }}, + {{ {180, 333, -2781}, 0, {12556, 178}, {0, 0, 129, 255} }}, + {{ {180, 0, -2781}, 0, {12556, 1431}, {0, 0, 129, 255} }}, + {{ {-180, 0, -2781}, 0, {10442, 1433}, {0, 0, 129, 255} }}, + {{ {410, 333, -3010}, 0, {7007, 178}, {166, 0, 166, 255} }}, + {{ {410, 0, -3010}, 0, {7007, 1431}, {166, 0, 166, 255} }}, + {{ {346, 256, -2946}, 0, {6658, 467}, {166, 0, 166, 255} }}, + {{ {410, 0, -3010}, 0, {7007, 1431}, {166, 0, 166, 255} }}, + {{ {346, 0, -2946}, 0, {6658, 1431}, {166, 0, 166, 255} }}, + {{ {346, 256, -2946}, 0, {6658, 467}, {166, 0, 166, 255} }}, + {{ {410, 333, -3010}, 0, {7007, 178}, {166, 0, 166, 255} }}, + {{ {346, 256, -2946}, 0, {6658, 467}, {166, 0, 166, 255} }}, + {{ {180, 333, -2781}, 0, {5748, 180}, {166, 0, 166, 255} }}, + {{ {-180, 333, -2781}, 0, {6922, 186}, {90, 0, 166, 255} }}, + {{ {-180, 0, -2781}, 0, {6922, 1437}, {90, 0, 166, 255} }}, + {{ {-237, 256, -2838}, 0, {6666, 473}, {90, 0, 166, 255} }}, + {{ {-180, 0, -2781}, 0, {6922, 1437}, {90, 0, 166, 255} }}, + {{ {-237, 0, -2838}, 0, {6666, 1437}, {90, 0, 166, 255} }}, + {{ {-346, 0, -2946}, 0, {6082, 1437}, {90, 0, 166, 255} }}, + {{ {-410, 0, -3010}, 0, {5762, 1437}, {90, 0, 166, 255} }}, + {{ {-346, 256, -2946}, 0, {6082, 473}, {90, 0, 166, 255} }}, + {{ {-410, 0, -3010}, 0, {5762, 1437}, {90, 0, 166, 255} }}, + {{ {-410, 333, -3010}, 0, {5762, 184}, {90, 0, 166, 255} }}, + {{ {-346, 256, -2946}, 0, {6082, 473}, {90, 0, 166, 255} }}, + {{ {-180, 333, -2781}, 0, {6922, 186}, {90, 0, 166, 255} }}, + {{ {-237, 256, -2838}, 0, {6666, 473}, {90, 0, 166, 255} }}, + {{ {-346, 256, -2946}, 0, {6082, 473}, {90, 0, 166, 255} }}, + {{ {205, 333, -5365}, 0, {-1332, 191}, {0, 0, 127, 255} }}, + {{ {-205, 333, -5365}, 0, {757, 191}, {0, 0, 127, 255} }}, + {{ {77, 256, -5365}, 0, {-679, 477}, {0, 0, 127, 255} }}, + {{ {-77, 256, -5365}, 0, {104, 477}, {0, 0, 127, 255} }}, + {{ {-205, 333, -5365}, 0, {3607, 178}, {90, 166, 0, 255} }}, + {{ {-256, 282, -3471}, 0, {12730, 371}, {90, 166, 0, 255} }}, + {{ {-256, 282, -5365}, 0, {3607, 371}, {90, 166, 0, 255} }}, + {{ {-205, 333, -5365}, 0, {3607, 178}, {90, 166, 0, 255} }}, + {{ {-205, 333, -3471}, 0, {12730, 178}, {90, 166, 0, 255} }}, + {{ {-256, 282, -3471}, 0, {12730, 371}, {90, 166, 0, 255} }}, + {{ {77, 256, -5468}, 0, {-679, 477}, {129, 0, 0, 255} }}, + {{ {77, 0, -5365}, 0, {-679, 1431}, {129, 0, 0, 255} }}, + {{ {77, 256, -5365}, 0, {-679, 477}, {129, 0, 0, 255} }}, + {{ {77, 0, -5468}, 0, {-679, 1431}, {129, 0, 0, 255} }}, + {{ {-77, 0, -5468}, 0, {104, 1431}, {127, 0, 0, 255} }}, + {{ {-77, 256, -5365}, 0, {104, 477}, {127, 0, 0, 255} }}, + {{ {-77, 0, -5365}, 0, {104, 1431}, {127, 0, 0, 255} }}, + {{ {-77, 256, -5468}, 0, {104, 477}, {127, 0, 0, 255} }}, + {{ {-77, 256, -5468}, 0, {104, 477}, {0, 129, 0, 255} }}, + {{ {77, 256, -5365}, 0, {-679, 477}, {0, 129, 0, 255} }}, + {{ {-77, 256, -5365}, 0, {104, 477}, {0, 129, 0, 255} }}, + {{ {77, 256, -5468}, 0, {-679, 477}, {0, 129, 0, 255} }}, + {{ {-256, 282, -3471}, 0, {12730, 371}, {127, 0, 0, 255} }}, + {{ {-256, -154, -5365}, 0, {3607, 2009}, {127, 0, 0, 255} }}, + {{ {-256, 282, -5365}, 0, {3607, 371}, {127, 0, 0, 255} }}, + {{ {-256, -154, -3471}, 0, {12730, 2009}, {127, 0, 0, 255} }}, + {{ {-410, 333, -3317}, 0, {12763, 178}, {90, 0, 90, 255} }}, + {{ {-256, 0, -3471}, 0, {11718, 1431}, {90, 0, 90, 255} }}, + {{ {-256, 333, -3471}, 0, {11709, 178}, {90, 0, 90, 255} }}, + {{ {-410, 0, -3317}, 0, {12772, 1431}, {90, 0, 90, 255} }}, + {{ {-410, 333, -3010}, 0, {14302, 183}, {127, 0, 0, 255} }}, + {{ {-410, 0, -3317}, 0, {12847, 1431}, {127, 0, 0, 255} }}, + {{ {-410, 333, -3317}, 0, {12849, 182}, {127, 0, 0, 255} }}, + {{ {-410, 0, -3010}, 0, {14301, 1433}, {127, 0, 0, 255} }}, + {{ {256, 333, -3471}, 0, {9671, 178}, {166, 0, 90, 255} }}, + {{ {410, 0, -3317}, 0, {8618, 1431}, {166, 0, 90, 255} }}, + {{ {410, 333, -3317}, 0, {8618, 178}, {166, 0, 90, 255} }}, + {{ {256, 0, -3471}, 0, {9671, 1431}, {166, 0, 90, 255} }}, + {{ {256, 282, -5365}, 0, {9109, 371}, {129, 0, 0, 255} }}, + {{ {256, -154, -3471}, 0, {-459, 2009}, {129, 0, 0, 255} }}, + {{ {256, 282, -3471}, 0, {-459, 371}, {129, 0, 0, 255} }}, + {{ {256, -154, -5365}, 0, {9109, 2009}, {129, 0, 0, 255} }}, + {{ {205, 333, -3471}, 0, {-459, 178}, {166, 166, 0, 255} }}, + {{ {256, 282, -5365}, 0, {9109, 371}, {166, 166, 0, 255} }}, + {{ {256, 282, -3471}, 0, {-459, 371}, {166, 166, 0, 255} }}, + {{ {205, 333, -5365}, 0, {9109, 178}, {166, 166, 0, 255} }}, + {{ {-205, 333, -3471}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-205, 333, -5365}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {205, 333, -5365}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {205, 333, -3471}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-180, 333, -2781}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {410, 0, -3010}, 0, {8111, 1431}, {129, 0, 0, 255} }}, + {{ {410, 333, -3317}, 0, {9634, 178}, {129, 0, 0, 255} }}, + {{ {410, 0, -3317}, 0, {9634, 1431}, {129, 0, 0, 255} }}, + {{ {410, 0, -3010}, 0, {8111, 1431}, {129, 0, 0, 255} }}, + {{ {410, 333, -3010}, 0, {8111, 178}, {129, 0, 0, 255} }}, + {{ {410, 333, -3317}, 0, {9634, 178}, {129, 0, 0, 255} }}, + {{ {205, 333, -3471}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {180, 333, -2781}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-180, 333, -2781}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {410, 333, -3317}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {256, 333, -3471}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-180, 333, -2781}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-410, 333, -3317}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-205, 333, -3471}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-256, 333, -3471}, 0, {-13, -87}, {0, 129, 0, 255} }}, + {{ {-256, 282, -5365}, 0, {1018, 382}, {0, 0, 127, 255} }}, + {{ {-256, 0, -5365}, 0, {1018, 1431}, {0, 0, 127, 255} }}, + {{ {-77, 256, -5365}, 0, {104, 477}, {0, 0, 127, 255} }}, + {{ {-77, 0, -5365}, 0, {104, 1431}, {0, 0, 127, 255} }}, + {{ {77, 256, -5365}, 0, {-679, 477}, {0, 0, 127, 255} }}, + {{ {77, 0, -5365}, 0, {-679, 1431}, {0, 0, 127, 255} }}, + {{ {256, 0, -5365}, 0, {-1593, 1431}, {0, 0, 127, 255} }}, + {{ {256, 282, -5365}, 0, {-1593, 382}, {0, 0, 127, 255} }}, + {{ {237, 0, -2838}, 0, {6052, 1431}, {166, 0, 166, 255} }}, + {{ {180, 0, -2781}, 0, {5748, 1431}, {166, 0, 166, 255} }}, + {{ {237, 256, -2838}, 0, {6052, 467}, {166, 0, 166, 255} }}, + {{ {180, 333, -2781}, 0, {5748, 180}, {166, 0, 166, 255} }}, }; static const Gfx castle_inside_hallway_dl_mesh_tri_0[] = { @@ -152,25 +145,28 @@ static const Gfx castle_inside_hallway_dl_mesh_tri_0[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 30, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 30, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 46, 16, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 11, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 44, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(9, 11, 10, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 62, 16, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(10, 12, 11, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 60, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 6, 4, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 10, 8, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 14, 12, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 75, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -179,48 +175,36 @@ static const Gfx castle_inside_hallway_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 78, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 91, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 94, 16, 0), + gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(11, 12, 8, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 107, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(7, 8, 4, 0), - gsSP1Triangle(7, 9, 8, 0), - gsSP1Triangle(10, 9, 7, 0), - gsSP1Triangle(10, 7, 11, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 4, 3, 0), + gsSP1Triangle(6, 3, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(10, 9, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 110, 15, 0), + gsSP1Triangle(13, 15, 14, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 123, 8, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(0, 2, 3, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(7, 4, 6, 0), - gsSP1Triangle(7, 8, 4, 0), - gsSP1Triangle(8, 9, 4, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(13, 10, 12, 0), - gsSP1Triangle(14, 13, 12, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_0 + 125, 13, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 1, 0, 0), - gsSP1Triangle(1, 3, 4, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(6, 8, 7, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(9, 11, 12, 0), + gsSP1Triangle(5, 7, 6, 0), gsSPEndDisplayList(), }; static const Vtx castle_inside_hallway_dl_mesh_vtx_1[118] = { + {{ {-237, 0, -2838}, 0, {2890, 25485}, {0, 127, 0, 255} }}, + {{ {-180, 0, -2781}, 0, {2464, 26195}, {0, 127, 0, 255} }}, + {{ {180, 0, -2781}, 0, {-1140, 26195}, {0, 127, 0, 255} }}, {{ {-256, 0, -5109}, 0, {3160, -158}, {0, 0, 127, 255} }}, {{ {256, -26, -5109}, 0, {-1960, 98}, {0, 0, 127, 255} }}, {{ {256, 0, -5109}, 0, {-1960, -158}, {0, 0, 127, 255} }}, @@ -317,32 +301,37 @@ static const Vtx castle_inside_hallway_dl_mesh_vtx_1[118] = { {{ {-77, 0, -5365}, 0, {1368, -6113}, {0, 127, 0, 255} }}, {{ {77, 0, -5365}, 0, {-168, -6113}, {0, 127, 0, 255} }}, {{ {-77, 0, -5468}, 0, {1368, -7137}, {0, 127, 0, 255} }}, + {{ {-237, 0, -2838}, 0, {3051, 25485}, {0, 127, 0, 255} }}, {{ {410, 0, -3010}, 0, {-4008, 23327}, {0, 127, 0, 255} }}, - {{ {410, 0, -3317}, 0, {-4008, 18207}, {0, 127, 0, 255} }}, - {{ {256, 0, -3471}, 0, {-1960, 16159}, {0, 127, 0, 255} }}, {{ {-410, 0, -3010}, 0, {5208, 23327}, {0, 127, 0, 255} }}, + {{ {256, 0, -3471}, 0, {-1960, 16159}, {0, 127, 0, 255} }}, + {{ {410, 0, -3317}, 0, {-4008, 18207}, {0, 127, 0, 255} }}, {{ {-256, 0, -3471}, 0, {3160, 16159}, {0, 127, 0, 255} }}, {{ {-410, 0, -3317}, 0, {5208, 18207}, {0, 127, 0, 255} }}, - {{ {-205, 0, -2805}, 0, {2648, 25887}, {0, 127, 0, 255} }}, - {{ {205, 0, -2805}, 0, {-1448, 25887}, {0, 127, 0, 255} }}, {{ {-256, 0, -5365}, 0, {3160, -6113}, {0, 127, 0, 255} }}, {{ {-256, 0, -5109}, 0, {3160, -3553}, {0, 127, 0, 255} }}, {{ {-77, 0, -5365}, 0, {1368, -6113}, {0, 127, 0, 255} }}, {{ {256, 0, -5109}, 0, {-1960, -3553}, {0, 127, 0, 255} }}, {{ {77, 0, -5365}, 0, {-168, -6113}, {0, 127, 0, 255} }}, + {{ {256, 0, -5109}, 0, {-1960, -3553}, {0, 127, 0, 255} }}, {{ {256, 0, -5365}, 0, {-1960, -6113}, {0, 127, 0, 255} }}, - {{ {422, 0, -2869}, 0, {-3728, -9211}, {0, 127, 0, 242} }}, - {{ {346, 0, -2946}, 0, {-2960, -9979}, {0, 127, 0, 246} }}, - {{ {237, 0, -2838}, 0, {-1874, -8893}, {0, 127, 0, 240} }}, - {{ {314, 0, -2761}, 0, {-2642, -8125}, {0, 127, 0, 235} }}, - {{ {-237, 0, -2838}, 0, {2866, -8893}, {0, 127, 0, 240} }}, - {{ {-346, 0, -2946}, 0, {3952, -9979}, {0, 127, 0, 246} }}, - {{ {-314, 0, -2761}, 0, {3634, -8125}, {0, 127, 0, 235} }}, - {{ {-422, 0, -2869}, 0, {4720, -9211}, {0, 127, 0, 242} }}, + {{ {77, 0, -5365}, 0, {-168, -6113}, {0, 127, 0, 255} }}, + {{ {-237, 0, -2838}, 0, {2890, 25485}, {0, 127, 0, 255} }}, + {{ {237, 0, -2838}, 0, {-1850, 25485}, {0, 127, 0, 255} }}, + {{ {410, 0, -3010}, 0, {-4008, 23327}, {0, 127, 0, 255} }}, + {{ {180, 0, -2781}, 0, {-1140, 26195}, {0, 127, 0, 255} }}, }; static const Gfx castle_inside_hallway_dl_mesh_tri_1[] = { - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 0, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 0, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 6, 4, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 10, 8, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 14, 12, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 15, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -351,7 +340,7 @@ static const Gfx castle_inside_hallway_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 16, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 31, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -360,7 +349,7 @@ static const Gfx castle_inside_hallway_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 32, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 47, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -369,7 +358,7 @@ static const Gfx castle_inside_hallway_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 48, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 63, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -378,7 +367,7 @@ static const Gfx castle_inside_hallway_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 64, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 79, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -387,31 +376,21 @@ static const Gfx castle_inside_hallway_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 80, 16, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 95, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 96, 14, 0), + gsSP1Triangle(6, 5, 7, 0), + gsSP1Triangle(5, 8, 7, 0), + gsSP1Triangle(7, 9, 6, 0), + gsSP1Triangle(9, 10, 6, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(12, 14, 13, 0), + gsSP1Triangle(14, 15, 13, 0), + gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 111, 7, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 0, 2, 0), - gsSP1Triangle(2, 4, 3, 0), - gsSP1Triangle(4, 5, 3, 0), - gsSP1Triangle(6, 0, 3, 0), - gsSP1Triangle(6, 7, 0, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(9, 11, 10, 0), - gsSP1Triangle(11, 12, 10, 0), - gsSP1Triangle(11, 13, 12, 0), - gsSPVertex(castle_inside_hallway_dl_mesh_vtx_1 + 110, 8, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(5, 7, 6, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 6, 4, 0), gsSPEndDisplayList(), }; diff --git a/levels/castle_inside/areas/1/lobby/model.inc.c b/levels/castle_inside/areas/1/lobby/model.inc.c index c8146e26..5083bb93 100644 --- a/levels/castle_inside/areas/1/lobby/model.inc.c +++ b/levels/castle_inside/areas/1/lobby/model.inc.c @@ -1,4 +1,57 @@ -static const Vtx castle_inside_main_dl_mesh_vtx_0[128] = { +static const Vtx castle_inside_main_dl_mesh_vtx_0[181] = { + {{ {1638, 896, -2601}, 0, {475, 1101}, {204, 153, 52, 255} }}, + {{ {883, 1254, -2652}, 0, {468, 1102}, {204, 153, 52, 255} }}, + {{ {1229, 896, -3010}, 0, {471, 1109}, {204, 153, 52, 255} }}, + {{ {883, 1254, -2652}, 0, {468, 1102}, {203, 152, 49, 255} }}, + {{ {1638, 896, -2601}, 0, {475, 1101}, {203, 152, 49, 255} }}, + {{ {1075, 1254, -2445}, 0, {470, 1098}, {203, 152, 49, 255} }}, + {{ {1075, 1254, -2445}, 0, {470, 1098}, {0, 129, 0, 255} }}, + {{ {1075, 1254, -2189}, 0, {470, 1093}, {0, 129, 0, 255} }}, + {{ {431, 1254, -1525}, 0, {464, 1080}, {0, 129, 0, 255} }}, + {{ {1638, 896, -2037}, 0, {475, 1090}, {204, 152, 205, 255} }}, + {{ {431, 1254, -1525}, 0, {464, 1080}, {204, 152, 205, 255} }}, + {{ {1075, 1254, -2189}, 0, {470, 1093}, {204, 152, 205, 255} }}, + {{ {431, 1254, -1525}, 0, {464, 1080}, {203, 153, 203, 255} }}, + {{ {1638, 896, -2037}, 0, {475, 1090}, {203, 153, 203, 255} }}, + {{ {768, 896, -1167}, 0, {467, 1073}, {203, 153, 203, 255} }}, + {{ {-878, 1254, -2652}, 0, {451, 1102}, {52, 153, 52, 255} }}, + {{ {-1638, 896, -2601}, 0, {444, 1101}, {52, 153, 52, 255} }}, + {{ {-1229, 896, -3010}, 0, {448, 1109}, {52, 153, 52, 255} }}, + {{ {-1638, 896, -2601}, 0, {444, 1101}, {53, 152, 50, 255} }}, + {{ {-878, 1254, -2652}, 0, {451, 1102}, {53, 152, 50, 255} }}, + {{ {-1075, 1254, -2445}, 0, {449, 1098}, {53, 152, 50, 255} }}, + {{ {-427, 1254, -1525}, 0, {455, 1080}, {52, 152, 205, 255} }}, + {{ {-1638, 896, -2037}, 0, {444, 1090}, {52, 152, 205, 255} }}, + {{ {-1075, 1254, -2189}, 0, {449, 1093}, {52, 152, 205, 255} }}, + {{ {-1638, 896, -2037}, 0, {444, 1090}, {53, 153, 203, 255} }}, + {{ {-427, 1254, -1525}, 0, {455, 1080}, {53, 153, 203, 255} }}, + {{ {-768, 896, -1167}, 0, {452, 1073}, {53, 153, 203, 255} }}, + {{ {883, 1254, -2652}, 0, {468, 1102}, {0, 129, 0, 255} }}, + {{ {1075, 1254, -2445}, 0, {470, 1098}, {0, 129, 0, 255} }}, + {{ {431, 1254, -1525}, 0, {464, 1080}, {0, 129, 0, 255} }}, + {{ {1638, 896, -2037}, 0, {475, 1090}, {188, 149, 0, 255} }}, + {{ {1075, 1254, -2445}, 0, {470, 1098}, {188, 149, 0, 255} }}, + {{ {1638, 896, -2601}, 0, {475, 1101}, {188, 149, 0, 255} }}, + {{ {1075, 1254, -2189}, 0, {470, 1093}, {188, 149, 0, 255} }}, + {{ {768, 896, -1167}, 0, {467, 1073}, {0, 166, 166, 255} }}, + {{ {-768, 896, -1167}, 0, {452, 1073}, {0, 166, 166, 255} }}, + {{ {431, 1254, -1525}, 0, {464, 1080}, {0, 166, 166, 255} }}, + {{ {-427, 1254, -1525}, 0, {455, 1080}, {0, 166, 166, 255} }}, + {{ {-1075, 1254, -2445}, 0, {449, 1098}, {0, 129, 0, 255} }}, + {{ {-427, 1254, -1525}, 0, {455, 1080}, {0, 129, 0, 255} }}, + {{ {-1075, 1254, -2189}, 0, {449, 1093}, {0, 129, 0, 255} }}, + {{ {-878, 1254, -2652}, 0, {451, 1102}, {0, 129, 0, 255} }}, + {{ {883, 1254, -2652}, 0, {468, 1102}, {0, 129, 0, 255} }}, + {{ {-427, 1254, -1525}, 0, {455, 1080}, {0, 129, 0, 255} }}, + {{ {431, 1254, -1525}, 0, {464, 1080}, {0, 129, 0, 255} }}, + {{ {-878, 1254, -2652}, 0, {451, 1102}, {0, 166, 90, 255} }}, + {{ {-1229, 896, -3010}, 0, {448, 1109}, {0, 166, 90, 255} }}, + {{ {883, 1254, -2652}, 0, {468, 1102}, {0, 166, 90, 255} }}, + {{ {1229, 896, -3010}, 0, {471, 1109}, {0, 166, 90, 255} }}, + {{ {-1075, 1254, -2445}, 0, {449, 1098}, {68, 149, 0, 255} }}, + {{ {-1638, 896, -2037}, 0, {444, 1090}, {68, 149, 0, 255} }}, + {{ {-1638, 896, -2601}, 0, {444, 1101}, {68, 149, 0, 255} }}, + {{ {-1075, 1254, -2189}, 0, {449, 1093}, {68, 149, 0, 255} }}, {{ {1331, 998, -2908}, 0, {-794, -1942}, {0, 0, 127, 255} }}, {{ {1229, 512, -2908}, 0, {-254, -29}, {0, 0, 127, 255} }}, {{ {1331, 512, -2908}, 0, {-794, -29}, {0, 0, 127, 255} }}, @@ -130,16 +183,37 @@ static const Vtx castle_inside_main_dl_mesh_vtx_0[128] = { }; static const Gfx castle_inside_main_dl_mesh_tri_0[] = { - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 0, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 15, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 30, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(7, 6, 5, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(11, 9, 8, 0), + gsSP1Triangle(12, 13, 11, 0), + gsSP1Triangle(12, 14, 13, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 45, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 2, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 16, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 61, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -148,7 +222,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 32, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 77, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -157,7 +231,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 48, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 93, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -166,7 +240,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 64, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 109, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -175,7 +249,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 80, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 125, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -184,7 +258,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 96, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 141, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -193,17 +267,22 @@ static const Gfx castle_inside_main_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 112, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 157, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), - gsSP1Triangle(8, 11, 12, 0), - gsSP1Triangle(12, 13, 8, 0), - gsSP1Triangle(12, 14, 13, 0), - gsSP1Triangle(14, 15, 13, 0), + gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(12, 15, 13, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_0 + 173, 8, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(4, 5, 0, 0), + gsSP1Triangle(4, 6, 5, 0), + gsSP1Triangle(6, 7, 5, 0), gsSPEndDisplayList(), }; @@ -341,89 +420,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_2[] = { gsSPEndDisplayList(), }; -static const Vtx castle_inside_main_dl_mesh_vtx_3[46] = { - {{ {-878, 1254, -2652}, 0, {2153, -439}, {18, 143, 56, 255} }}, - {{ {-485, 1357, -2189}, 0, {2378, -987}, {8, 129, 1, 255} }}, - {{ {-1075, 1254, -2445}, 0, {1720, -396}, {45, 139, 20, 255} }}, - {{ {1638, 896, -2601}, 0, {-856, -93}, {194, 148, 24, 255} }}, - {{ {883, 1254, -2652}, 0, {-2110, -373}, {237, 143, 56, 255} }}, - {{ {1229, 896, -3010}, 0, {-2145, -108}, {223, 155, 69, 255} }}, - {{ {1075, 1254, -2445}, 0, {-1604, -373}, {211, 139, 19, 255} }}, - {{ {490, 1357, -2189}, 0, {-1858, -1007}, {248, 129, 1, 255} }}, - {{ {1638, 896, -2037}, 0, {-749, 1948}, {193, 148, 232, 255} }}, - {{ {1075, 1254, -2445}, 0, {-1687, 1675}, {211, 139, 19, 255} }}, - {{ {1638, 896, -2601}, 0, {-2052, 1929}, {194, 148, 24, 255} }}, - {{ {1075, 1254, -2189}, 0, {-1197, 1672}, {209, 140, 236, 255} }}, - {{ {490, 1357, -2189}, 0, {-1372, 1041}, {248, 129, 1, 255} }}, - {{ {1075, 1254, -2189}, 0, {-2819, 4721}, {209, 140, 236, 255} }}, - {{ {431, 1254, -1525}, 0, {-1263, 4708}, {239, 143, 200, 255} }}, - {{ {490, 1357, -2189}, 0, {-2193, 4144}, {248, 129, 1, 255} }}, - {{ {1638, 896, -2037}, 0, {-3417, 5013}, {193, 148, 232, 255} }}, - {{ {431, 1254, -1525}, 0, {-1263, 4708}, {239, 143, 200, 255} }}, - {{ {1075, 1254, -2189}, 0, {-2819, 4721}, {209, 140, 236, 255} }}, - {{ {768, 896, -1167}, 0, {-689, 4976}, {223, 155, 186, 255} }}, - {{ {768, 896, -1167}, 0, {-1387, 4972}, {223, 155, 186, 255} }}, - {{ {-768, 896, -1167}, 0, {1889, 5010}, {33, 155, 187, 255} }}, - {{ {431, 1254, -1525}, 0, {-584, 4720}, {239, 143, 200, 255} }}, - {{ {-427, 1254, -1525}, 0, {1127, 4711}, {17, 143, 200, 255} }}, - {{ {490, 1357, -2189}, 0, {-703, 4168}, {248, 129, 1, 255} }}, - {{ {-485, 1357, -2189}, 0, {1311, 4179}, {8, 129, 1, 255} }}, - {{ {-1075, 1254, -2189}, 0, {3179, 4735}, {47, 140, 236, 255} }}, - {{ {-485, 1357, -2189}, 0, {2555, 4119}, {8, 129, 1, 255} }}, - {{ {-427, 1254, -1525}, 0, {1403, 4735}, {17, 143, 200, 255} }}, - {{ {-1638, 896, -2037}, 0, {4001, 4974}, {62, 148, 232, 255} }}, - {{ {-768, 896, -1167}, 0, {1230, 4973}, {33, 155, 187, 255} }}, - {{ {-1075, 1254, -2445}, 0, {2542, 613}, {45, 139, 20, 255} }}, - {{ {-485, 1357, -2189}, 0, {2063, -6}, {8, 129, 1, 255} }}, - {{ {-1075, 1254, -2189}, 0, {2025, 613}, {47, 140, 236, 255} }}, - {{ {-1638, 896, -2037}, 0, {1635, 880}, {62, 148, 232, 255} }}, - {{ {-1638, 896, -2601}, 0, {3013, 870}, {62, 148, 24, 255} }}, - {{ {-878, 1254, -2652}, 0, {2157, -439}, {18, 143, 56, 255} }}, - {{ {-1638, 896, -2601}, 0, {1300, -149}, {62, 148, 24, 255} }}, - {{ {-1229, 896, -3010}, 0, {2665, -150}, {33, 155, 69, 255} }}, - {{ {-1075, 1254, -2445}, 0, {1720, -396}, {45, 139, 20, 255} }}, - {{ {1229, 896, -3010}, 0, {-2265, -98}, {223, 155, 69, 255} }}, - {{ {883, 1254, -2652}, 0, {-1452, -384}, {237, 143, 56, 255} }}, - {{ {-1229, 896, -3010}, 0, {2841, -98}, {33, 155, 69, 255} }}, - {{ {-878, 1254, -2652}, 0, {2135, -411}, {18, 143, 56, 255} }}, - {{ {-485, 1357, -2189}, 0, {1522, -980}, {8, 129, 1, 255} }}, - {{ {490, 1357, -2189}, 0, {-661, -980}, {248, 129, 1, 255} }}, -}; - -static const Gfx castle_inside_main_dl_mesh_tri_3[] = { - gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 0, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(4, 3, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 9, 8, 0), - gsSP1Triangle(9, 11, 12, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 16, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 0, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(7, 6, 5, 0), - gsSP1Triangle(7, 8, 6, 0), - gsSP1Triangle(7, 9, 8, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(12, 13, 10, 0), - gsSP1Triangle(13, 12, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 31, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(0, 3, 4, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(6, 5, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 11, 10, 0), - gsSP1Triangle(10, 13, 12, 0), - gsSP1Triangle(10, 14, 13, 0), - gsSPEndDisplayList(), -}; - -static const Vtx castle_inside_main_dl_mesh_vtx_4[204] = { +static const Vtx castle_inside_main_dl_mesh_vtx_3[204] = { {{ {1121, 0, -1891}, 0, {-10717, 1551}, {166, 0, 90, 0} }}, {{ {1307, 26, -1706}, 0, {-12573, 1295}, {166, 0, 90, 0} }}, {{ {1121, 26, -1891}, 0, {-10717, 1295}, {166, 0, 90, 0} }}, @@ -630,14 +627,14 @@ static const Vtx castle_inside_main_dl_mesh_vtx_4[204] = { {{ {1307, 0, -1706}, 0, {-12573, 2424}, {0, 127, 0, 144} }}, }; -static const Gfx castle_inside_main_dl_mesh_tri_4[] = { - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 0, 15, 0), +static const Gfx castle_inside_main_dl_mesh_tri_3[] = { + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 15, 15, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 15, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(3, 6, 4, 0), @@ -645,7 +642,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(7, 10, 8, 0), gsSP1Triangle(11, 12, 13, 0), gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 30, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 30, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -654,7 +651,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 46, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 46, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -663,7 +660,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 62, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 62, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -672,7 +669,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 78, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 78, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -681,7 +678,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 94, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 94, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -690,7 +687,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 110, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 110, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -699,7 +696,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 126, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 126, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 0, 2, 0), gsSP1Triangle(4, 3, 2, 0), @@ -712,7 +709,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(11, 12, 13, 0), gsSP1Triangle(14, 11, 13, 0), gsSP1Triangle(13, 15, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 142, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 142, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 0, 2, 0), gsSP1Triangle(4, 3, 2, 0), @@ -725,7 +722,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(10, 13, 12, 0), gsSP1Triangle(8, 11, 14, 0), gsSP1Triangle(11, 15, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 158, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 158, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 0, 2, 0), gsSP1Triangle(2, 4, 3, 0), @@ -740,7 +737,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(13, 12, 11, 0), gsSP1Triangle(11, 14, 13, 0), gsSP1Triangle(15, 13, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 174, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 174, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(1, 3, 2, 0), gsSP1Triangle(1, 4, 3, 0), @@ -755,7 +752,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSP1Triangle(3, 13, 12, 0), gsSP1Triangle(14, 11, 12, 0), gsSP1Triangle(15, 11, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 190, 14, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_3 + 190, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -767,7 +764,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_4[] = { gsSPEndDisplayList(), }; -static const Vtx castle_inside_main_dl_mesh_vtx_5[370] = { +static const Vtx castle_inside_main_dl_mesh_vtx_4[370] = { {{ {461, 410, -2908}, 0, {-510, 425}, {90, 0, 90, 255} }}, {{ {422, 256, -2869}, 0, {-233, 1034}, {90, 0, 90, 255} }}, {{ {461, 0, -2908}, 0, {-510, 2016}, {90, 0, 90, 255} }}, @@ -783,21 +780,21 @@ static const Vtx castle_inside_main_dl_mesh_vtx_5[370] = { {{ {1229, 512, -2908}, 0, {-254, 17}, {0, 0, 127, 255} }}, {{ {1331, 205, -2908}, 0, {-794, 1223}, {0, 0, 127, 255} }}, {{ {1331, 512, -2908}, 0, {-794, 17}, {0, 0, 127, 255} }}, - {{ {1121, 77, -1891}, 0, {4385, 1731}, {193, 90, 64, 255} }}, - {{ {1229, 256, -2037}, 0, {3839, 1043}, {193, 90, 64, 255} }}, - {{ {1102, 77, -1911}, 0, {4385, 1731}, {193, 90, 64, 255} }}, {{ {1121, 0, -1891}, 0, {785, 1504}, {166, 0, 90, 255} }}, {{ {1102, 77, -1911}, 0, {785, 1495}, {166, 0, 90, 255} }}, {{ {1102, 0, -1911}, 0, {785, 1504}, {166, 0, 90, 255} }}, + {{ {-1229, 256, -2037}, 0, {3758, 1043}, {63, 90, 63, 255} }}, + {{ {-1121, 77, -1891}, 0, {4318, 1731}, {63, 90, 63, 255} }}, + {{ {-1102, 77, -1911}, 0, {4318, 1731}, {63, 90, 63, 255} }}, {{ {1229, 512, -2908}, 0, {-254, 17}, {0, 0, 127, 255} }}, {{ {1229, 205, -2908}, 0, {-254, 1226}, {0, 0, 127, 255} }}, {{ {1331, 205, -2908}, 0, {-794, 1220}, {0, 0, 127, 255} }}, - {{ {1121, 77, -1891}, 0, {4385, 1731}, {193, 90, 63, 255} }}, - {{ {1248, 256, -2018}, 0, {3839, 1043}, {193, 90, 63, 255} }}, - {{ {1229, 256, -2037}, 0, {3839, 1043}, {193, 90, 63, 255} }}, {{ {1121, 0, -1891}, 0, {785, 1504}, {166, 0, 90, 255} }}, {{ {1121, 77, -1891}, 0, {785, 1495}, {166, 0, 90, 255} }}, {{ {1102, 77, -1911}, 0, {785, 1495}, {166, 0, 90, 255} }}, + {{ {-1229, 256, -2037}, 0, {3758, 1043}, {63, 90, 64, 255} }}, + {{ {-1248, 256, -2018}, 0, {3758, 1043}, {63, 90, 64, 255} }}, + {{ {-1121, 77, -1891}, 0, {4318, 1731}, {63, 90, 64, 255} }}, {{ {-102, 256, -2498}, 0, {516, 1017}, {186, 0, 106, 255} }}, {{ {-256, 0, -2601}, 0, {1439, 2025}, {186, 0, 106, 255} }}, {{ {-102, 0, -2498}, 0, {516, 2025}, {186, 0, 106, 255} }}, @@ -1023,10 +1020,10 @@ static const Vtx castle_inside_main_dl_mesh_vtx_5[370] = { {{ {1102, 77, -1911}, 0, {4324, 1731}, {166, 0, 166, 255} }}, {{ {1229, 256, -2037}, 0, {3839, 1043}, {166, 0, 166, 255} }}, {{ {1102, 0, -1911}, 0, {4324, 2025}, {166, 0, 166, 255} }}, - {{ {-1229, 256, -2037}, 0, {3758, 1043}, {63, 90, 63, 255} }}, - {{ {-1121, 77, -1891}, 0, {4318, 1731}, {63, 90, 63, 255} }}, - {{ {-1102, 77, -1911}, 0, {4318, 1731}, {63, 90, 63, 255} }}, - {{ {-1248, 256, -2018}, 0, {3758, 1043}, {63, 90, 63, 255} }}, + {{ {1121, 77, -1891}, 0, {4385, 1731}, {193, 90, 63, 255} }}, + {{ {1229, 256, -2037}, 0, {3839, 1043}, {193, 90, 63, 255} }}, + {{ {1102, 77, -1911}, 0, {4385, 1731}, {193, 90, 63, 255} }}, + {{ {1248, 256, -2018}, 0, {3839, 1043}, {193, 90, 63, 255} }}, {{ {1331, 205, -2908}, 0, {1584, 1235}, {166, 0, 90, 255} }}, {{ {1638, 512, -2601}, 0, {-500, 9}, {166, 0, 90, 255} }}, {{ {1331, 512, -2908}, 0, {1584, 9}, {166, 0, 90, 255} }}, @@ -1134,26 +1131,26 @@ static const Vtx castle_inside_main_dl_mesh_vtx_5[370] = { {{ {1638, 461, -2242}, 0, {-243, 216}, {0, 129, 0, 255} }}, {{ {1638, 461, -2396}, 0, {521, 216}, {0, 129, 0, 255} }}, {{ {1741, 461, -2242}, 0, {-243, 216}, {0, 129, 0, 255} }}, - {{ {1331, 512, -2908}, 0, {-794, 17}, {0, 0, 129, 255} }}, {{ {1331, 205, -2908}, 0, {-794, 1223}, {0, 0, 129, 255} }}, - {{ {1229, 205, -2908}, 0, {-512, 1240}, {0, 0, 129, 255} }}, {{ {1229, 256, -2908}, 0, {-512, 1043}, {0, 0, 129, 255} }}, + {{ {1331, 512, -2908}, 0, {-794, 17}, {0, 0, 129, 255} }}, + {{ {1229, 205, -2908}, 0, {-512, 1240}, {0, 0, 129, 255} }}, }; -static const Gfx castle_inside_main_dl_mesh_tri_5[] = { - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 0, 15, 0), +static const Gfx castle_inside_main_dl_mesh_tri_4[] = { + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 15, 15, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 15, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 30, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 30, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1162,7 +1159,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 46, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 46, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1171,7 +1168,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 62, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 62, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1180,7 +1177,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 78, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 78, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1189,7 +1186,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 94, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 94, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1198,7 +1195,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 110, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 110, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1209,7 +1206,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(6, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 126, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 126, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1218,7 +1215,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 142, 14, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 142, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(2, 1, 3, 0), gsSP1Triangle(4, 3, 1, 0), @@ -1229,7 +1226,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(7, 10, 11, 0), gsSP1Triangle(12, 11, 10, 0), gsSP1Triangle(13, 11, 12, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 156, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 156, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 1, 0, 0), gsSP1Triangle(4, 1, 3, 0), @@ -1240,7 +1237,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 172, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 172, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1249,7 +1246,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 188, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 188, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1258,7 +1255,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 204, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 204, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1267,7 +1264,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 220, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 220, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 0, 2, 0), gsSP1Triangle(2, 4, 3, 0), @@ -1276,7 +1273,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(9, 12, 10, 0), gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 236, 15, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 236, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(3, 6, 4, 0), @@ -1284,7 +1281,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(7, 10, 8, 0), gsSP1Triangle(11, 12, 13, 0), gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 251, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 251, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1293,7 +1290,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 267, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 267, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1302,7 +1299,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 283, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 283, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1311,7 +1308,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 299, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 299, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1322,7 +1319,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(10, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(13, 12, 15, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 315, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 315, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(2, 1, 3, 0), gsSP1Triangle(1, 4, 3, 0), @@ -1333,7 +1330,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(9, 11, 10, 0), gsSP1Triangle(11, 12, 10, 0), gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 331, 15, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 331, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 2, 1, 0), gsSP1Triangle(3, 4, 2, 0), @@ -1343,7 +1340,7 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 10, 9, 0), gsSP1Triangle(11, 12, 13, 0), gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 346, 16, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 346, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -1352,11 +1349,11 @@ static const Gfx castle_inside_main_dl_mesh_tri_5[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_main_dl_mesh_vtx_5 + 362, 8, 0), + gsSPVertex(castle_inside_main_dl_mesh_vtx_4 + 362, 8, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(4, 7, 5, 0), gsSPEndDisplayList(), }; @@ -1367,12 +1364,10 @@ const Gfx castle_inside_main_dl_mesh[] = { gsSPDisplayList(castle_inside_main_dl_mesh_tri_1), gsSPDisplayList(mat_castle_inside_RailingMaterial), gsSPDisplayList(castle_inside_main_dl_mesh_tri_2), - gsSPDisplayList(mat_castle_inside_CeilingMaterial), - gsSPDisplayList(castle_inside_main_dl_mesh_tri_3), gsSPDisplayList(mat_castle_inside_CarpetMaterial), - gsSPDisplayList(castle_inside_main_dl_mesh_tri_4), + gsSPDisplayList(castle_inside_main_dl_mesh_tri_3), gsSPDisplayList(mat_castle_inside_WallBottomMaterial), - gsSPDisplayList(castle_inside_main_dl_mesh_tri_5), + gsSPDisplayList(castle_inside_main_dl_mesh_tri_4), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_TEXTURE_GEN), @@ -1421,11 +1416,33 @@ static const Gfx castle_inside_decal_dl_mesh_tri_1[] = { gsSPEndDisplayList(), }; +static const Vtx castle_inside_decal_dl_mesh_vtx_2[8] = { + {{ {1638, 1136, -3010}, 0, {1517, -2376}, {0, 129, 0, 255} }}, + {{ {-1638, 1136, -2189}, 0, {50, 2743}, {0, 129, 0, 255} }}, + {{ {-1638, 1136, -3010}, 0, {1517, 2743}, {0, 129, 0, 255} }}, + {{ {1638, 1136, -2189}, 0, {50, -2376}, {0, 129, 0, 255} }}, + {{ {1638, 1136, -2189}, 0, {1275, 586}, {0, 129, 0, 255} }}, + {{ {-1638, 1136, -1368}, 0, {-191, -4533}, {0, 129, 0, 255} }}, + {{ {-1638, 1136, -2189}, 0, {1275, -4533}, {0, 129, 0, 255} }}, + {{ {1638, 1136, -1368}, 0, {-191, 586}, {0, 129, 0, 255} }}, +}; + +static const Gfx castle_inside_decal_dl_mesh_tri_2[] = { + gsSPVertex(castle_inside_decal_dl_mesh_vtx_2 + 0, 8, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 7, 5, 0), + gsSPEndDisplayList(), +}; + const Gfx castle_inside_decal_dl_mesh[] = { gsSPDisplayList(mat_castle_inside_MoonMaterial), gsSPDisplayList(castle_inside_decal_dl_mesh_tri_0), gsSPDisplayList(mat_castle_inside_StarMaterial), gsSPDisplayList(castle_inside_decal_dl_mesh_tri_1), + gsSPDisplayList(mat_castle_inside_CeilingMaterial), + gsSPDisplayList(castle_inside_decal_dl_mesh_tri_2), gsSPDisplayList(mat_revert_castle_inside_DecalMaterial), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), diff --git a/levels/castle_inside/areas/1/mountain_room/model.inc.c b/levels/castle_inside/areas/1/mountain_room/model.inc.c index 43d685ef..046b6495 100644 --- a/levels/castle_inside/areas/1/mountain_room/model.inc.c +++ b/levels/castle_inside/areas/1/mountain_room/model.inc.c @@ -70,52 +70,46 @@ static const Gfx castle_inside_mountain_dl_mesh_tri_0[] = { gsSPEndDisplayList(), }; -static const Vtx castle_inside_mountain_dl_mesh_vtx_1[179] = { - {{ {-1178, -128, -4034}, 0, {1657, -1191}, {129, 0, 0, 255} }}, - {{ {-1178, -205, -4085}, 0, {2155, -1952}, {129, 0, 0, 255} }}, - {{ {-1178, -205, -4034}, 0, {1657, -1952}, {129, 0, 0, 255} }}, +static const Vtx castle_inside_mountain_dl_mesh_vtx_1[175] = { {{ {-1126, -205, -4085}, 0, {-476, 982}, {0, 0, 129, 255} }}, {{ {-1178, -128, -4085}, 0, {-1092, 220}, {0, 0, 129, 255} }}, {{ {-1126, -128, -4085}, 0, {-476, 220}, {0, 0, 129, 255} }}, {{ {-1126, 0, -3855}, 0, {2252, -1072}, {127, 0, 0, 255} }}, {{ {-1126, 51, -3804}, 0, {2750, -1579}, {127, 0, 0, 255} }}, {{ {-1126, 0, -3804}, 0, {2750, -1072}, {127, 0, 0, 255} }}, - {{ {-1126, -128, -4085}, 0, {2635, -93}, {0, 90, 166, 255} }}, - {{ {-1178, -128, -4085}, 0, {3093, -93}, {0, 90, 166, 255} }}, - {{ {-1152, -102, -4060}, 0, {2864, -276}, {0, 90, 166, 255} }}, - {{ {-1126, -128, -4034}, 0, {2635, -460}, {90, 90, 0, 128} }}, - {{ {-1126, -128, -4085}, 0, {2635, -93}, {90, 90, 0, 128} }}, - {{ {-1152, -102, -4060}, 0, {2864, -276}, {90, 90, 0, 126} }}, - {{ {-1178, -128, -4034}, 0, {3093, -460}, {166, 90, 0, 255} }}, - {{ {-1152, -102, -4060}, 0, {2864, -276}, {166, 90, 0, 255} }}, - {{ {-1178, -128, -4085}, 0, {3093, -93}, {166, 90, 0, 255} }}, - {{ {-1126, -128, -4034}, 0, {2635, -460}, {0, 90, 90, 255} }}, - {{ {-1152, -102, -4060}, 0, {2864, -276}, {0, 90, 90, 255} }}, - {{ {-1178, -128, -4034}, 0, {3093, -460}, {0, 90, 90, 255} }}, + {{ {-1126, -128, -4085}, 0, {3622, -79}, {0, 90, 166, 255} }}, + {{ {-1178, -128, -4085}, 0, {3839, -79}, {0, 90, 166, 255} }}, + {{ {-1152, -102, -4060}, 0, {3731, -165}, {0, 90, 166, 255} }}, + {{ {-1126, -128, -4034}, 0, {3622, -252}, {90, 90, 0, 128} }}, + {{ {-1126, -128, -4085}, 0, {3622, -79}, {90, 90, 0, 128} }}, + {{ {-1152, -102, -4060}, 0, {3731, -165}, {90, 90, 0, 126} }}, + {{ {-1178, -128, -4034}, 0, {3839, -252}, {166, 90, 0, 255} }}, + {{ {-1152, -102, -4060}, 0, {3731, -165}, {166, 90, 0, 255} }}, + {{ {-1178, -128, -4085}, 0, {3839, -79}, {166, 90, 0, 255} }}, + {{ {-1126, -128, -4034}, 0, {3622, -252}, {0, 90, 90, 255} }}, + {{ {-1152, -102, -4060}, 0, {3731, -165}, {0, 90, 90, 255} }}, + {{ {-1178, -128, -4034}, 0, {3839, -252}, {0, 90, 90, 255} }}, {{ {-1178, -205, -3855}, 0, {-87, -1952}, {129, 0, 0, 255} }}, {{ {-1178, -128, -4034}, 0, {1657, -1191}, {129, 0, 0, 255} }}, {{ {-1178, -205, -4034}, 0, {1657, -1952}, {129, 0, 0, 255} }}, {{ {-717, -128, -4085}, 0, {4452, 220}, {0, 0, 129, 255} }}, {{ {-768, -205, -4085}, 0, {3836, 982}, {0, 0, 129, 255} }}, {{ {-768, -128, -4085}, 0, {3836, 220}, {0, 0, 129, 255} }}, - {{ {-768, -128, -4085}, 0, {3552, -93}, {0, 90, 166, 255} }}, - {{ {-742, -102, -4060}, 0, {3323, -276}, {0, 90, 166, 255} }}, - {{ {-717, -128, -4085}, 0, {3093, -93}, {0, 90, 166, 255} }}, - {{ {-768, -128, -4034}, 0, {3552, -460}, {166, 90, 0, 128} }}, - {{ {-742, -102, -4060}, 0, {3323, -276}, {166, 90, 0, 126} }}, - {{ {-768, -128, -4085}, 0, {3552, -93}, {166, 90, 0, 128} }}, - {{ {-717, -128, -4034}, 0, {3093, -460}, {90, 90, 0, 255} }}, - {{ {-717, -128, -4085}, 0, {3093, -93}, {90, 90, 0, 255} }}, - {{ {-742, -102, -4060}, 0, {3323, -276}, {90, 90, 0, 255} }}, - {{ {-768, -128, -4034}, 0, {3552, -460}, {0, 90, 90, 255} }}, - {{ {-717, -128, -4034}, 0, {3093, -460}, {0, 90, 90, 255} }}, - {{ {-742, -102, -4060}, 0, {3323, -276}, {0, 90, 90, 255} }}, + {{ {-768, -128, -4085}, 0, {3734, -79}, {0, 90, 166, 255} }}, + {{ {-742, -102, -4060}, 0, {3625, -165}, {0, 90, 166, 255} }}, + {{ {-717, -128, -4085}, 0, {3517, -79}, {0, 90, 166, 255} }}, + {{ {-768, -128, -4034}, 0, {3734, -252}, {166, 90, 0, 128} }}, + {{ {-742, -102, -4060}, 0, {3625, -165}, {166, 90, 0, 126} }}, + {{ {-768, -128, -4085}, 0, {3734, -79}, {166, 90, 0, 128} }}, + {{ {-717, -128, -4034}, 0, {3517, -252}, {90, 90, 0, 255} }}, + {{ {-717, -128, -4085}, 0, {3517, -79}, {90, 90, 0, 255} }}, + {{ {-742, -102, -4060}, 0, {3625, -165}, {90, 90, 0, 255} }}, + {{ {-768, -128, -4034}, 0, {3734, -252}, {0, 90, 90, 255} }}, + {{ {-717, -128, -4034}, 0, {3517, -252}, {0, 90, 90, 255} }}, + {{ {-742, -102, -4060}, 0, {3625, -165}, {0, 90, 90, 255} }}, {{ {-717, -128, -4034}, 0, {2925, 1157}, {127, 0, 0, 255} }}, {{ {-717, -205, -3855}, 0, {1291, 1836}, {127, 0, 0, 255} }}, {{ {-717, -205, -4034}, 0, {2925, 1836}, {127, 0, 0, 255} }}, - {{ {-1178, -128, -4034}, 0, {1657, -1191}, {129, 0, 0, 255} }}, - {{ {-1178, -128, -4085}, 0, {2155, -1191}, {129, 0, 0, 255} }}, - {{ {-1178, -205, -4085}, 0, {2155, -1952}, {129, 0, 0, 255} }}, {{ {-1126, -205, -4085}, 0, {-476, 982}, {0, 0, 129, 255} }}, {{ {-1178, -205, -4085}, 0, {-1093, 982}, {0, 0, 129, 255} }}, {{ {-1178, -128, -4085}, 0, {-1092, 220}, {0, 0, 129, 255} }}, @@ -138,18 +132,22 @@ static const Vtx castle_inside_mountain_dl_mesh_vtx_1[179] = { {{ {-1126, -205, -4085}, 0, {11, 957}, {127, 0, 0, 255} }}, {{ {-1126, -128, -4034}, 0, {509, 196}, {127, 0, 0, 255} }}, {{ {-1126, -205, -4034}, 0, {509, 957}, {127, 0, 0, 255} }}, + {{ {-1126, -205, -4085}, 0, {11, 957}, {127, 0, 0, 255} }}, {{ {-1126, -128, -4085}, 0, {11, 196}, {127, 0, 0, 255} }}, + {{ {-1126, -128, -4034}, 0, {509, 196}, {127, 0, 0, 255} }}, {{ {-1178, 51, -3855}, 0, {484, 996}, {0, 127, 0, 255} }}, {{ {-1382, 51, -3855}, 0, {2722, 996}, {0, 127, 0, 255} }}, {{ {-1382, 51, -3804}, 0, {2722, 484}, {0, 127, 0, 255} }}, {{ {-1126, 51, -3804}, 0, {-76, 484}, {0, 127, 0, 255} }}, {{ {-1126, 51, -3855}, 0, {-76, 996}, {0, 127, 0, 255} }}, + {{ {-1178, -128, -4034}, 0, {1657, -1191}, {129, 0, 0, 255} }}, + {{ {-1178, -205, -4085}, 0, {2155, -1952}, {129, 0, 0, 255} }}, + {{ {-1178, -205, -4034}, 0, {1657, -1952}, {129, 0, 0, 255} }}, + {{ {-1178, -128, -4085}, 0, {2155, -1191}, {129, 0, 0, 255} }}, {{ {-1126, -205, -3855}, 0, {2252, 957}, {127, 0, 0, 255} }}, {{ {-1126, -128, -4034}, 0, {509, 196}, {127, 0, 0, 255} }}, {{ {-1126, 51, -3855}, 0, {2252, -1579}, {127, 0, 0, 255} }}, - {{ {-1126, -205, -3855}, 0, {2252, 957}, {127, 0, 0, 255} }}, {{ {-1126, -205, -4034}, 0, {509, 957}, {127, 0, 0, 255} }}, - {{ {-1126, -128, -4034}, 0, {509, 196}, {127, 0, 0, 255} }}, {{ {-1178, -205, -4034}, 0, {-16, 1008}, {0, 129, 0, 255} }}, {{ {-1126, -205, -4085}, 0, {-16, 1008}, {0, 129, 0, 255} }}, {{ {-1126, -205, -4034}, 0, {-16, 1008}, {0, 129, 0, 255} }}, @@ -178,21 +176,21 @@ static const Vtx castle_inside_mountain_dl_mesh_vtx_1[179] = { {{ {-768, 51, -3855}, 0, {2596, 996}, {0, 127, 0, 255} }}, {{ {-768, 51, -3804}, 0, {2596, 484}, {0, 127, 0, 255} }}, {{ {-512, 51, -3804}, 0, {-202, 484}, {0, 127, 0, 255} }}, - {{ {-512, 51, -3804}, 0, {-202, 484}, {0, 127, 0, 255} }}, {{ {-512, 51, -3855}, 0, {-202, 996}, {0, 127, 0, 255} }}, - {{ {-563, 51, -3855}, 0, {357, 996}, {0, 127, 0, 255} }}, {{ {-717, -128, -4034}, 0, {2925, 1157}, {127, 0, 0, 255} }}, {{ {-717, -205, -4085}, 0, {3392, 1836}, {127, 0, 0, 255} }}, {{ {-717, -128, -4085}, 0, {3392, 1157}, {127, 0, 0, 255} }}, + {{ {-717, -128, -4034}, 0, {2925, 1157}, {127, 0, 0, 255} }}, {{ {-717, -205, -4034}, 0, {2925, 1836}, {127, 0, 0, 255} }}, + {{ {-717, -205, -4085}, 0, {3392, 1836}, {127, 0, 0, 255} }}, {{ {-768, -205, -3855}, 0, {-15, 957}, {129, 0, 0, 255} }}, {{ {-768, -128, -4034}, 0, {1728, 196}, {129, 0, 0, 255} }}, {{ {-768, -205, -4034}, 0, {1728, 957}, {129, 0, 0, 255} }}, {{ {-768, 51, -3855}, 0, {-15, -1579}, {129, 0, 0, 255} }}, - {{ {-768, 51, -3855}, 0, {2539, -918}, {0, 90, 166, 255} }}, - {{ {-717, -128, -4034}, 0, {2888, 1109}, {0, 90, 166, 255} }}, - {{ {-768, -128, -4034}, 0, {2539, 1109}, {0, 90, 166, 255} }}, - {{ {-717, 51, -3855}, 0, {2888, -918}, {0, 90, 166, 255} }}, + {{ {-768, 51, -3855}, 0, {2511, -918}, {0, 90, 166, 255} }}, + {{ {-717, -128, -4034}, 0, {2860, 1109}, {0, 90, 166, 255} }}, + {{ {-768, -128, -4034}, 0, {2511, 1109}, {0, 90, 166, 255} }}, + {{ {-717, 51, -3855}, 0, {2860, -918}, {0, 90, 166, 255} }}, {{ {-768, -128, -4034}, 0, {1728, 196}, {129, 0, 0, 255} }}, {{ {-768, -205, -4085}, 0, {2226, 957}, {129, 0, 0, 255} }}, {{ {-768, -205, -4034}, 0, {1728, 957}, {129, 0, 0, 255} }}, @@ -232,17 +230,15 @@ static const Vtx castle_inside_mountain_dl_mesh_vtx_1[179] = { {{ {-512, -205, -4649}, 0, {-10756, 4033}, {166, 0, 90, 255} }}, {{ {-512, 410, -4649}, 0, {-10756, -2061}, {166, 0, 90, 255} }}, {{ {-640, -205, -4777}, 0, {-12332, 4033}, {166, 0, 90, 255} }}, - {{ {-1126, -128, -4034}, 0, {2539, -1135}, {0, 90, 166, 255} }}, - {{ {-1178, 51, -3855}, 0, {2888, 927}, {0, 90, 166, 255} }}, - {{ {-1126, 51, -3855}, 0, {2539, 927}, {0, 90, 166, 255} }}, - {{ {-1178, -128, -4034}, 0, {2888, -1135}, {0, 90, 166, 255} }}, + {{ {-1126, -128, -4034}, 0, {2577, -1135}, {0, 90, 166, 255} }}, + {{ {-1178, 51, -3855}, 0, {2926, 927}, {0, 90, 166, 255} }}, + {{ {-1126, 51, -3855}, 0, {2577, 927}, {0, 90, 166, 255} }}, + {{ {-1178, -128, -4034}, 0, {2926, -1135}, {0, 90, 166, 255} }}, {{ {-768, 0, -3113}, 0, {-9283, -3367}, {0, 127, 0, 255} }}, {{ {-512, 0, -3113}, 0, {-11740, -3367}, {0, 127, 0, 255} }}, {{ {-512, 0, -3804}, 0, {-11740, 3586}, {0, 127, 0, 255} }}, {{ {-768, 0, -3804}, 0, {-9283, 3586}, {0, 127, 0, 255} }}, {{ {-512, 0, -3855}, 0, {-11740, 4101}, {0, 127, 0, 255} }}, - {{ {-768, 0, -3804}, 0, {-9283, 3586}, {0, 127, 0, 255} }}, - {{ {-512, 0, -3804}, 0, {-11740, 3586}, {0, 127, 0, 255} }}, {{ {-768, 0, -3855}, 0, {-9283, 4101}, {0, 127, 0, 255} }}, {{ {-1382, 0, -3113}, 0, {-2675, -3367}, {0, 127, 0, 255} }}, {{ {-1126, 0, -3113}, 0, {-5117, -3367}, {0, 127, 0, 255} }}, @@ -271,39 +267,41 @@ static const Gfx castle_inside_mountain_dl_mesh_tri_1[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 45, 15, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 45, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 12, 10, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 61, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(5, 6, 3, 0), + gsSP1Triangle(6, 7, 3, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 60, 16, 0), + gsSP1Triangle(12, 15, 13, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 77, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(10, 11, 8, 0), - gsSP1Triangle(11, 12, 8, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 76, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(3, 6, 4, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(7, 10, 8, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 91, 16, 0), + gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(12, 15, 13, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 93, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(14, 15, 12, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 107, 15, 0), + gsSP1Triangle(10, 11, 8, 0), + gsSP1Triangle(11, 12, 8, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 109, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(3, 6, 4, 0), @@ -311,7 +309,7 @@ static const Gfx castle_inside_mountain_dl_mesh_tri_1[] = { gsSP1Triangle(7, 10, 8, 0), gsSP1Triangle(11, 12, 13, 0), gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 122, 16, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 124, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -320,35 +318,33 @@ static const Gfx castle_inside_mountain_dl_mesh_tri_1[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 138, 15, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 140, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 10, 8, 0), gsSP1Triangle(11, 12, 13, 0), gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 153, 16, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 155, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 169, 10, 0), + gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(12, 11, 10, 0), + gsSP1Triangle(12, 13, 11, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_1 + 169, 6, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 7, 6, 0), - gsSP1Triangle(8, 9, 7, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(4, 3, 2, 0), + gsSP1Triangle(4, 5, 3, 0), gsSPEndDisplayList(), }; -static const Vtx castle_inside_mountain_dl_mesh_vtx_2[78] = { +static const Vtx castle_inside_mountain_dl_mesh_vtx_2[74] = { {{ {-768, -26, -3855}, 0, {-1296, -215}, {0, 0, 129, 255} }}, {{ {-1126, 0, -3855}, 0, {2288, -471}, {0, 0, 129, 255} }}, {{ {-768, 0, -3855}, 0, {-1296, -471}, {0, 0, 129, 255} }}, @@ -423,10 +419,6 @@ static const Vtx castle_inside_mountain_dl_mesh_vtx_2[78] = { {{ {-1126, 0, -3804}, 0, {2288, 1821}, {0, 127, 0, 255} }}, {{ {-1126, 0, -3113}, 0, {2288, 8733}, {0, 127, 0, 255} }}, {{ {-768, 0, -3113}, 0, {-1296, 8733}, {0, 127, 0, 255} }}, - {{ {-870, 0, -3010}, 0, {9200, -10619}, {0, 127, 0, 250} }}, - {{ {-1024, 0, -3113}, 0, {10736, -11643}, {0, 127, 0, 255} }}, - {{ {-1024, 0, -3010}, 0, {10736, -10619}, {0, 127, 0, 250} }}, - {{ {-870, 0, -3113}, 0, {9200, -11643}, {0, 127, 0, 255} }}, }; static const Gfx castle_inside_mountain_dl_mesh_tri_2[] = { @@ -464,7 +456,7 @@ static const Gfx castle_inside_mountain_dl_mesh_tri_2[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_2 + 62, 16, 0), + gsSPVertex(castle_inside_mountain_dl_mesh_vtx_2 + 62, 12, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(2, 3, 0, 0), gsSP1Triangle(3, 4, 0, 0), @@ -473,36 +465,6 @@ static const Gfx castle_inside_mountain_dl_mesh_tri_2[] = { gsSP1Triangle(6, 8, 9, 0), gsSP1Triangle(10, 6, 9, 0), gsSP1Triangle(10, 11, 6, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPEndDisplayList(), -}; - -static const Vtx castle_inside_mountain_dl_mesh_vtx_3[14] = { - {{ {-1024, 256, -3113}, 0, {773, 1026}, {0, 129, 0, 255} }}, - {{ {-870, 256, -3010}, 0, {-4, 1026}, {0, 129, 0, 255} }}, - {{ {-1024, 256, -3010}, 0, {773, 1026}, {0, 129, 0, 255} }}, - {{ {-1024, 256, -3113}, 0, {773, 1026}, {0, 129, 0, 255} }}, - {{ {-870, 256, -3113}, 0, {-4, 1026}, {0, 129, 0, 255} }}, - {{ {-870, 256, -3010}, 0, {-4, 1026}, {0, 129, 0, 255} }}, - {{ {-870, 256, -3113}, 0, {-4, 1026}, {129, 0, 0, 255} }}, - {{ {-870, 0, -3010}, 0, {-4, 2010}, {129, 0, 0, 255} }}, - {{ {-870, 256, -3010}, 0, {-4, 1026}, {129, 0, 0, 255} }}, - {{ {-870, 0, -3113}, 0, {-4, 2010}, {129, 0, 0, 255} }}, - {{ {-1024, 0, -3113}, 0, {773, 2010}, {127, 0, 0, 255} }}, - {{ {-1024, 256, -3010}, 0, {773, 1026}, {127, 0, 0, 255} }}, - {{ {-1024, 0, -3010}, 0, {773, 2010}, {127, 0, 0, 255} }}, - {{ {-1024, 256, -3113}, 0, {773, 1026}, {127, 0, 0, 255} }}, -}; - -static const Gfx castle_inside_mountain_dl_mesh_tri_3[] = { - gsSPVertex(castle_inside_mountain_dl_mesh_vtx_3 + 0, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 7, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 13, 11, 0), gsSPEndDisplayList(), }; @@ -513,8 +475,6 @@ const Gfx castle_inside_mountain_dl_mesh[] = { gsSPDisplayList(castle_inside_mountain_dl_mesh_tri_1), gsSPDisplayList(mat_castle_inside_CarpetMaterial), gsSPDisplayList(castle_inside_mountain_dl_mesh_tri_2), - gsSPDisplayList(mat_castle_inside_WallBottomMaterial), - gsSPDisplayList(castle_inside_mountain_dl_mesh_tri_3), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_TEXTURE_GEN), diff --git a/levels/castle_inside/areas/1/snow_slider_room/model.inc.c b/levels/castle_inside/areas/1/snow_slider_room/model.inc.c index 27e727a4..e49faf4a 100644 --- a/levels/castle_inside/areas/1/snow_slider_room/model.inc.c +++ b/levels/castle_inside/areas/1/snow_slider_room/model.inc.c @@ -1,22 +1,25 @@ -static const Vtx castle_inside_snow_slider_dl_mesh_vtx_0[269] = { +static const Vtx castle_inside_snow_slider_dl_mesh_vtx_0[268] = { {{ {-2278, 205, -2089}, 0, {1577, 780}, {0, 0, 127, 255} }}, {{ {-2278, 282, -2089}, 0, {1577, 610}, {0, 0, 127, 255} }}, {{ {-2355, 282, -2089}, 0, {1235, 610}, {0, 0, 127, 255} }}, {{ {-2534, 410, -2498}, 0, {2400, 277}, {0, 0, 127, 255} }}, {{ {-2586, 461, -2498}, 0, {2278, 130}, {0, 0, 127, 255} }}, {{ {-2586, 410, -2498}, 0, {2278, 277}, {0, 0, 127, 255} }}, - {{ {-2534, 205, -2549}, 0, {439, 780}, {244, 246, 130, 255} }}, - {{ {-2355, 282, -2549}, 0, {1235, 610}, {244, 246, 130, 255} }}, - {{ {-2278, 205, -2549}, 0, {1577, 780}, {244, 246, 130, 255} }}, + {{ {-2534, 205, -2549}, 0, {439, 780}, {0, 0, 129, 255} }}, + {{ {-2355, 282, -2549}, 0, {1235, 610}, {0, 0, 129, 255} }}, + {{ {-2278, 205, -2549}, 0, {1577, 780}, {0, 0, 129, 255} }}, {{ {-2534, 205, -1909}, 0, {917, 2637}, {166, 0, 166, 255} }}, {{ {-2586, 1024, -1858}, 0, {848, 1377}, {166, 0, 166, 255} }}, {{ {-2534, 1075, -1909}, 0, {917, 1410}, {166, 0, 166, 255} }}, {{ {-1792, 205, -2626}, 0, {1148, 960}, {0, 0, 127, 255} }}, {{ {-1741, 1024, -2626}, 0, {1229, 36}, {0, 0, 127, 255} }}, {{ {-1792, 1024, -2626}, 0, {1152, 16}, {0, 0, 127, 255} }}, - {{ {-1741, 205, -2012}, 0, {620, 1201}, {0, 0, 129, 255} }}, - {{ {-1792, 1024, -2012}, 0, {678, 32}, {0, 0, 129, 255} }}, - {{ {-1741, 1024, -2012}, 0, {590, 57}, {0, 0, 129, 255} }}, + {{ {-1741, 205, -2012}, 0, {1547, 1433}, {0, 0, 129, 255} }}, + {{ {-1792, 1024, -2012}, 0, {1605, 656}, {0, 0, 129, 255} }}, + {{ {-1741, 1024, -2012}, 0, {1517, 681}, {0, 0, 129, 255} }}, + {{ {-2586, 410, -2498}, 0, {2750, -1072}, {0, 0, 127, 255} }}, + {{ {-2534, 205, -2498}, 0, {2252, -1072}, {0, 0, 127, 255} }}, + {{ {-2534, 410, -2498}, 0, {2252, -1072}, {0, 0, 127, 255} }}, {{ {-2842, 1229, -2575}, 0, {135, 650}, {56, 157, 56, 255} }}, {{ {-3149, 1024, -2626}, 0, {-394, 746}, {56, 157, 56, 255} }}, {{ {-2995, 1024, -2780}, 0, {-129, 1035}, {56, 157, 56, 255} }}, @@ -32,36 +35,38 @@ static const Vtx castle_inside_snow_slider_dl_mesh_vtx_0[269] = { {{ {-2534, 410, -2498}, 0, {2400, 277}, {0, 0, 127, 255} }}, {{ {-2534, 461, -2498}, 0, {2400, 130}, {0, 0, 127, 255} }}, {{ {-2586, 461, -2498}, 0, {2278, 130}, {0, 0, 127, 255} }}, - {{ {-2534, 205, -2549}, 0, {439, 780}, {244, 246, 130, 255} }}, - {{ {-2534, 461, -2549}, 0, {439, 212}, {244, 246, 130, 255} }}, - {{ {-2355, 282, -2549}, 0, {1235, 610}, {244, 246, 130, 255} }}, - {{ {-2278, 282, -2549}, 0, {1577, 610}, {244, 246, 130, 255} }}, - {{ {-2278, 205, -2549}, 0, {1577, 780}, {244, 246, 130, 255} }}, + {{ {-2534, 205, -2549}, 0, {439, 780}, {0, 0, 129, 255} }}, + {{ {-2534, 461, -2549}, 0, {439, 212}, {0, 0, 129, 255} }}, + {{ {-2355, 282, -2549}, 0, {1235, 610}, {0, 0, 129, 255} }}, + {{ {-2355, 282, -2549}, 0, {1235, 610}, {0, 0, 129, 255} }}, + {{ {-2278, 282, -2549}, 0, {1577, 610}, {0, 0, 129, 255} }}, + {{ {-2278, 205, -2549}, 0, {1577, 780}, {0, 0, 129, 255} }}, {{ {-2534, 205, -1909}, 0, {917, 2637}, {166, 0, 166, 255} }}, {{ {-2586, 205, -1858}, 0, {848, 2547}, {166, 0, 166, 255} }}, {{ {-2586, 1024, -1858}, 0, {848, 1377}, {166, 0, 166, 255} }}, {{ {-1792, 205, -2626}, 0, {1148, 960}, {0, 0, 127, 255} }}, {{ {-1741, 205, -2626}, 0, {1223, 945}, {0, 0, 127, 255} }}, {{ {-1741, 1024, -2626}, 0, {1229, 36}, {0, 0, 127, 255} }}, - {{ {-1741, 205, -2012}, 0, {620, 1201}, {0, 0, 129, 255} }}, - {{ {-1792, 205, -2012}, 0, {703, 1220}, {0, 0, 129, 255} }}, - {{ {-1792, 1024, -2012}, 0, {678, 32}, {0, 0, 129, 255} }}, + {{ {-1741, 205, -2012}, 0, {1547, 1433}, {0, 0, 129, 255} }}, + {{ {-1792, 205, -2012}, 0, {1630, 1451}, {0, 0, 129, 255} }}, + {{ {-1792, 1024, -2012}, 0, {1605, 656}, {0, 0, 129, 255} }}, + {{ {-2586, 410, -2498}, 0, {2750, -1072}, {0, 0, 127, 255} }}, + {{ {-2586, 205, -2498}, 0, {2750, -1072}, {0, 0, 127, 255} }}, + {{ {-2534, 205, -2498}, 0, {2252, -1072}, {0, 0, 127, 255} }}, {{ {-2842, 1229, -2575}, 0, {135, 650}, {56, 157, 56, 255} }}, {{ {-2944, 1229, -2473}, 0, {-41, 457}, {56, 157, 56, 255} }}, {{ {-3149, 1024, -2626}, 0, {-394, 746}, {56, 157, 56, 255} }}, {{ {-1741, 1024, -2626}, 0, {2033, 746}, {200, 157, 56, 255} }}, {{ {-1946, 1229, -2473}, 0, {1680, 457}, {200, 157, 56, 255} }}, {{ {-2048, 1229, -2575}, 0, {1504, 650}, {200, 157, 56, 255} }}, - {{ {-2586, 461, -2729}, 0, {718, 463}, {129, 0, 0, 255} }}, - {{ {-2586, 410, -2498}, 0, {1581, 339}, {129, 0, 0, 255} }}, - {{ {-2586, 461, -2498}, 0, {1273, 185}, {129, 0, 0, 255} }}, - {{ {-2586, 410, -2729}, 0, {1025, 617}, {129, 0, 0, 255} }}, + {{ {-2586, 461, -2729}, 0, {-1399, 377}, {129, 0, 0, 255} }}, + {{ {-2586, 410, -2498}, 0, {-536, 254}, {129, 0, 0, 255} }}, + {{ {-2586, 461, -2498}, 0, {-843, 100}, {129, 0, 0, 255} }}, + {{ {-2586, 410, -2729}, 0, {-1091, 531}, {129, 0, 0, 255} }}, {{ {-2278, 205, -2498}, 0, {3010, 862}, {0, 0, 127, 255} }}, {{ {-2278, 282, -2498}, 0, {3010, 642}, {0, 0, 127, 255} }}, {{ {-2355, 282, -2498}, 0, {2827, 642}, {0, 0, 127, 255} }}, {{ {-2355, 205, -2498}, 0, {2827, 862}, {0, 0, 127, 255} }}, - {{ {-2278, 205, -2498}, 0, {3010, 862}, {0, 0, 127, 255} }}, - {{ {-2355, 282, -2498}, 0, {2827, 642}, {0, 0, 127, 255} }}, {{ {-2534, 205, -2498}, 0, {2400, 862}, {0, 0, 127, 255} }}, {{ {-2534, 461, -2498}, 0, {2400, 130}, {0, 0, 127, 255} }}, {{ {-2278, 205, -2498}, 0, {1669, 1524}, {127, 0, 0, 255} }}, @@ -75,29 +80,27 @@ static const Vtx castle_inside_snow_slider_dl_mesh_vtx_0[269] = { {{ {-2586, 461, -2140}, 0, {2278, 130}, {0, 0, 129, 255} }}, {{ {-2534, 410, -2140}, 0, {2400, 277}, {0, 0, 129, 255} }}, {{ {-2586, 410, -2140}, 0, {2278, 277}, {0, 0, 129, 255} }}, - {{ {-2586, 461, -2140}, 0, {2278, 130}, {0, 0, 129, 255} }}, {{ {-2534, 461, -2140}, 0, {2400, 130}, {0, 0, 129, 255} }}, - {{ {-2534, 410, -2140}, 0, {2400, 277}, {0, 0, 129, 255} }}, - {{ {-2534, 461, -2140}, 0, {-1332, 373}, {90, 90, 0, 255} }}, - {{ {-2355, 282, -2089}, 0, {-1586, 748}, {90, 90, 0, 255} }}, - {{ {-2355, 282, -2140}, 0, {-1332, 748}, {90, 90, 0, 255} }}, - {{ {-2534, 461, -2089}, 0, {-1586, 373}, {90, 90, 0, 255} }}, - {{ {-2278, 282, -2089}, 0, {1348, 604}, {127, 0, 0, 255} }}, - {{ {-2278, 205, -2140}, 0, {1689, 718}, {127, 0, 0, 255} }}, - {{ {-2278, 282, -2140}, 0, {1348, 718}, {127, 0, 0, 255} }}, - {{ {-2278, 205, -2089}, 0, {1689, 604}, {127, 0, 0, 255} }}, + {{ {-2534, 461, -2140}, 0, {1033, -544}, {90, 90, 0, 255} }}, + {{ {-2355, 282, -2089}, 0, {2410, -775}, {90, 90, 0, 255} }}, + {{ {-2355, 282, -2140}, 0, {2271, -616}, {90, 90, 0, 255} }}, + {{ {-2534, 461, -2089}, 0, {1172, -703}, {90, 90, 0, 255} }}, + {{ {-2278, 282, -2089}, 0, {1348, 601}, {127, 0, 0, 255} }}, + {{ {-2278, 205, -2140}, 0, {1689, 715}, {127, 0, 0, 255} }}, + {{ {-2278, 282, -2140}, 0, {1348, 715}, {127, 0, 0, 255} }}, + {{ {-2278, 205, -2089}, 0, {1689, 601}, {127, 0, 0, 255} }}, {{ {-2534, 461, -1858}, 0, {786, 2238}, {127, 0, 0, 255} }}, {{ {-2534, 205, -2089}, 0, {1442, 2928}, {127, 0, 0, 255} }}, {{ {-2534, 461, -2089}, 0, {1442, 2575}, {127, 0, 0, 255} }}, {{ {-2534, 205, -1858}, 0, {786, 2590}, {127, 0, 0, 255} }}, - {{ {-2278, 282, -2140}, 0, {1207, 960}, {0, 127, 0, 255} }}, - {{ {-2355, 282, -2089}, 0, {809, 1092}, {0, 127, 0, 255} }}, - {{ {-2278, 282, -2089}, 0, {1207, 1092}, {0, 127, 0, 255} }}, - {{ {-2355, 282, -2140}, 0, {809, 960}, {0, 127, 0, 255} }}, - {{ {-2355, 282, -2498}, 0, {809, 32}, {0, 127, 0, 255} }}, - {{ {-2278, 282, -2549}, 0, {1207, -100}, {0, 127, 0, 255} }}, - {{ {-2355, 282, -2549}, 0, {809, -100}, {0, 127, 0, 255} }}, - {{ {-2278, 282, -2498}, 0, {1207, 32}, {0, 127, 0, 255} }}, + {{ {-2278, 282, -2140}, 0, {2802, -647}, {0, 127, 0, 255} }}, + {{ {-2355, 282, -2089}, 0, {2410, -775}, {0, 127, 0, 255} }}, + {{ {-2278, 282, -2089}, 0, {2940, -806}, {0, 127, 0, 255} }}, + {{ {-2355, 282, -2140}, 0, {2271, -616}, {0, 127, 0, 255} }}, + {{ {-2355, 282, -2498}, 0, {2287, 1062}, {0, 127, 0, 255} }}, + {{ {-2278, 282, -2549}, 0, {2678, 1191}, {0, 127, 0, 255} }}, + {{ {-2355, 282, -2549}, 0, {2148, 1222}, {0, 127, 0, 255} }}, + {{ {-2278, 282, -2498}, 0, {2817, 1032}, {0, 127, 0, 255} }}, {{ {-3149, 410, -1909}, 0, {209, 782}, {0, 0, 129, 255} }}, {{ {-2586, 461, -1909}, 0, {2771, 666}, {0, 0, 129, 255} }}, {{ {-2586, 410, -1909}, 0, {2774, 768}, {0, 0, 129, 255} }}, @@ -110,10 +113,10 @@ static const Vtx castle_inside_snow_slider_dl_mesh_vtx_0[269] = { {{ {-2534, 205, -2549}, 0, {237, 955}, {127, 0, 0, 255} }}, {{ {-2534, 205, -2780}, 0, {1054, 955}, {127, 0, 0, 255} }}, {{ {-2534, 461, -2549}, 0, {237, 501}, {127, 0, 0, 255} }}, - {{ {-2534, 461, -2549}, 0, {699, 414}, {90, 90, 0, 255} }}, - {{ {-2355, 282, -2498}, 0, {445, 788}, {90, 90, 0, 255} }}, - {{ {-2355, 282, -2549}, 0, {699, 788}, {90, 90, 0, 255} }}, - {{ {-2534, 461, -2498}, 0, {445, 414}, {90, 90, 0, 255} }}, + {{ {-2534, 461, -2549}, 0, {-122, 721}, {90, 90, 0, 255} }}, + {{ {-2355, 282, -2498}, 0, {1255, 490}, {90, 90, 0, 255} }}, + {{ {-2355, 282, -2549}, 0, {1116, 649}, {90, 90, 0, 255} }}, + {{ {-2534, 461, -2498}, 0, {17, 562}, {90, 90, 0, 255} }}, {{ {-1741, 205, -2140}, 0, {2936, -649}, {0, 127, 0, 255} }}, {{ {-3149, 205, -1858}, 0, {-321, -51}, {0, 127, 0, 255} }}, {{ {-1741, 205, -1858}, 0, {2936, -51}, {0, 127, 0, 255} }}, @@ -146,30 +149,30 @@ static const Vtx castle_inside_snow_slider_dl_mesh_vtx_0[269] = { {{ {-2534, 1075, -1909}, 0, {917, 1410}, {0, 0, 129, 255} }}, {{ {-2330, 1075, -1909}, 0, {1239, 1565}, {0, 0, 129, 255} }}, {{ {-2534, 205, -1909}, 0, {917, 2637}, {0, 0, 129, 255} }}, - {{ {-2995, 1024, -1858}, 0, {995, -108}, {127, 0, 0, 255} }}, + {{ {-2995, 1024, -1858}, 0, {995, -118}, {127, 0, 0, 255} }}, {{ {-2995, 205, -1909}, 0, {845, 1616}, {127, 0, 0, 255} }}, - {{ {-2995, 1024, -1909}, 0, {836, -138}, {127, 0, 0, 255} }}, - {{ {-2995, 205, -1858}, 0, {1014, 1585}, {127, 0, 0, 255} }}, + {{ {-2995, 1024, -1909}, 0, {836, -148}, {127, 0, 0, 255} }}, + {{ {-2995, 205, -1858}, 0, {1014, 1584}, {127, 0, 0, 255} }}, {{ {-2995, 205, -1909}, 0, {845, 1616}, {90, 0, 166, 255} }}, - {{ {-3098, 1024, -2012}, 0, {243, -138}, {90, 0, 166, 255} }}, - {{ {-2995, 1024, -1909}, 0, {836, -138}, {90, 0, 166, 255} }}, - {{ {-3098, 205, -2012}, 0, {216, 1616}, {90, 0, 166, 255} }}, - {{ {-3098, 205, -2012}, 0, {216, 1616}, {0, 0, 129, 255} }}, - {{ {-3149, 1024, -2012}, 0, {139, -101}, {0, 0, 129, 255} }}, - {{ {-3098, 1024, -2012}, 0, {243, -138}, {0, 0, 129, 255} }}, - {{ {-3149, 205, -2012}, 0, {107, 1577}, {0, 0, 129, 255} }}, - {{ {-3149, 205, -2626}, 0, {332, 1163}, {0, 0, 127, 255} }}, - {{ {-3098, 1024, -2626}, 0, {414, -80}, {0, 0, 127, 255} }}, - {{ {-3149, 1024, -2626}, 0, {332, -62}, {0, 0, 127, 255} }}, - {{ {-3098, 205, -2626}, 0, {414, 1192}, {0, 0, 127, 255} }}, - {{ {-2995, 205, -2729}, 0, {773, 1308}, {90, 0, 90, 255} }}, - {{ {-3098, 1024, -2626}, 0, {414, -80}, {90, 0, 90, 255} }}, - {{ {-3098, 205, -2626}, 0, {414, 1192}, {90, 0, 90, 255} }}, - {{ {-2995, 1024, -2729}, 0, {773, 36}, {90, 0, 90, 255} }}, - {{ {-2995, 205, -2780}, 0, {850, 1279}, {127, 0, 0, 255} }}, - {{ {-2995, 1024, -2729}, 0, {773, 36}, {127, 0, 0, 255} }}, - {{ {-2995, 205, -2729}, 0, {773, 1308}, {127, 0, 0, 255} }}, - {{ {-2995, 1024, -2780}, 0, {850, 64}, {127, 0, 0, 255} }}, + {{ {-3098, 1024, -2012}, 0, {243, -156}, {90, 0, 166, 255} }}, + {{ {-2995, 1024, -1909}, 0, {836, -148}, {90, 0, 166, 255} }}, + {{ {-3098, 205, -2012}, 0, {216, 1608}, {90, 0, 166, 255} }}, + {{ {-3098, 205, -2012}, 0, {216, 1608}, {0, 0, 129, 255} }}, + {{ {-3149, 1024, -2012}, 0, {139, -119}, {0, 0, 129, 255} }}, + {{ {-3098, 1024, -2012}, 0, {243, -156}, {0, 0, 129, 255} }}, + {{ {-3149, 205, -2012}, 0, {107, 1569}, {0, 0, 129, 255} }}, + {{ {-3149, 205, -2626}, 0, {332, 1254}, {0, 0, 127, 255} }}, + {{ {-3098, 1024, -2626}, 0, {414, 96}, {0, 0, 127, 255} }}, + {{ {-3149, 1024, -2626}, 0, {332, 113}, {0, 0, 127, 255} }}, + {{ {-3098, 205, -2626}, 0, {414, 1280}, {0, 0, 127, 255} }}, + {{ {-2995, 205, -2729}, 0, {773, 1349}, {90, 0, 90, 255} }}, + {{ {-3098, 1024, -2626}, 0, {414, 96}, {90, 0, 90, 255} }}, + {{ {-3098, 205, -2626}, 0, {414, 1280}, {90, 0, 90, 255} }}, + {{ {-2995, 1024, -2729}, 0, {773, 165}, {90, 0, 90, 255} }}, + {{ {-2995, 205, -2780}, 0, {850, 1322}, {127, 0, 0, 255} }}, + {{ {-2995, 1024, -2729}, 0, {773, 165}, {127, 0, 0, 255} }}, + {{ {-2995, 205, -2729}, 0, {773, 1349}, {127, 0, 0, 255} }}, + {{ {-2995, 1024, -2780}, 0, {850, 191}, {127, 0, 0, 255} }}, {{ {-2534, 205, -2729}, 0, {899, 2605}, {166, 0, 90, 255} }}, {{ {-2586, 1024, -2780}, 0, {833, 1341}, {166, 0, 90, 255} }}, {{ {-2586, 205, -2780}, 0, {833, 2528}, {166, 0, 90, 255} }}, @@ -190,22 +193,18 @@ static const Vtx castle_inside_snow_slider_dl_mesh_vtx_0[269] = { {{ {-1792, 1024, -2626}, 0, {1152, 16}, {166, 0, 90, 255} }}, {{ {-1894, 1024, -2729}, 0, {814, 17}, {166, 0, 90, 255} }}, {{ {-1792, 205, -2626}, 0, {1148, 960}, {166, 0, 90, 255} }}, - {{ {-1792, 205, -2012}, 0, {703, 1220}, {166, 0, 166, 255} }}, - {{ {-1894, 1024, -1909}, 0, {1108, -234}, {166, 0, 166, 255} }}, - {{ {-1792, 1024, -2012}, 0, {678, 32}, {166, 0, 166, 255} }}, - {{ {-1894, 205, -1909}, 0, {1108, 953}, {166, 0, 166, 255} }}, - {{ {-1894, 205, -1858}, 0, {1205, 934}, {129, 0, 0, 255} }}, - {{ {-1894, 1024, -1909}, 0, {1108, -234}, {129, 0, 0, 255} }}, - {{ {-1894, 205, -1909}, 0, {1108, 953}, {129, 0, 0, 255} }}, - {{ {-1894, 1024, -1858}, 0, {1211, -209}, {129, 0, 0, 255} }}, + {{ {-1792, 205, -2012}, 0, {1630, 1451}, {166, 0, 166, 255} }}, + {{ {-1894, 1024, -1909}, 0, {1864, 503}, {166, 0, 166, 255} }}, + {{ {-1792, 1024, -2012}, 0, {1605, 656}, {166, 0, 166, 255} }}, + {{ {-1894, 205, -1909}, 0, {1864, 1352}, {166, 0, 166, 255} }}, + {{ {-1894, 205, -1858}, 0, {1961, 1334}, {129, 0, 0, 255} }}, + {{ {-1894, 1024, -1909}, 0, {1864, 503}, {129, 0, 0, 255} }}, + {{ {-1894, 205, -1909}, 0, {1864, 1352}, {129, 0, 0, 255} }}, + {{ {-1894, 1024, -1858}, 0, {1967, 528}, {129, 0, 0, 255} }}, {{ {-2534, 410, -2140}, 0, {-15, -1072}, {0, 0, 129, 255} }}, {{ {-2586, 205, -2140}, 0, {-513, -1072}, {0, 0, 129, 255} }}, {{ {-2586, 410, -2140}, 0, {-513, -1072}, {0, 0, 129, 255} }}, {{ {-2534, 205, -2140}, 0, {-15, -1072}, {0, 0, 129, 255} }}, - {{ {-2586, 410, -2498}, 0, {2750, -1072}, {0, 0, 127, 255} }}, - {{ {-2534, 205, -2498}, 0, {2252, -1072}, {0, 0, 127, 255} }}, - {{ {-2534, 410, -2498}, 0, {2252, -1072}, {0, 0, 127, 255} }}, - {{ {-2586, 205, -2498}, 0, {2750, -1072}, {0, 0, 127, 255} }}, {{ {-2944, 1229, -2165}, 0, {-41, -122}, {56, 157, 200, 255} }}, {{ {-2995, 1024, -1858}, 0, {-129, -700}, {56, 157, 200, 255} }}, {{ {-3149, 1024, -2012}, 0, {-394, -411}, {56, 157, 200, 255} }}, @@ -283,37 +282,28 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 30, 14, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 44, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 30, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(9, 12, 10, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 60, 16, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 45, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 0, 2, 0), - gsSP1Triangle(4, 3, 2, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(5, 8, 6, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(9, 12, 10, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 76, 15, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 60, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(3, 6, 4, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(7, 10, 8, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 91, 16, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(7, 4, 6, 0), + gsSP1Triangle(8, 7, 6, 0), + gsSP1Triangle(9, 8, 6, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(10, 13, 11, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 74, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -322,7 +312,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 107, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 90, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -331,18 +321,27 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 123, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 106, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), - gsSP1Triangle(3, 4, 2, 0), - gsSP1Triangle(3, 5, 4, 0), - gsSP1Triangle(5, 6, 4, 0), - gsSP1Triangle(6, 7, 4, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 139, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 122, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(5, 7, 6, 0), + gsSP1Triangle(7, 8, 6, 0), + gsSP1Triangle(7, 9, 8, 0), + gsSP1Triangle(9, 10, 8, 0), + gsSP1Triangle(10, 11, 8, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(12, 15, 13, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 138, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -351,7 +350,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 155, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 154, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -360,7 +359,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 171, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 170, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -369,7 +368,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 187, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 186, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -378,7 +377,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 203, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 202, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -387,7 +386,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 219, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 218, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), @@ -396,7 +395,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(14, 15, 12, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 235, 14, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 234, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 2, 1, 0), gsSP1Triangle(4, 3, 1, 0), @@ -405,7 +404,7 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(6, 9, 7, 0), gsSP1Triangle(10, 11, 12, 0), gsSP1Triangle(10, 13, 11, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 249, 16, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 248, 16, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 0, 2, 0), gsSP1Triangle(3, 2, 4, 0), @@ -416,13 +415,13 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 10, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 265, 4, 0), + gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_0 + 264, 4, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(1, 3, 2, 0), gsSPEndDisplayList(), }; -static const Vtx castle_inside_snow_slider_dl_mesh_vtx_1[80] = { +static const Vtx castle_inside_snow_slider_dl_mesh_vtx_1[76] = { {{ {-2534, 384, -2140}, 0, {-1296, -215}, {127, 0, 0, 255} }}, {{ {-2534, 410, -2498}, 0, {2288, -471}, {127, 0, 0, 255} }}, {{ {-2534, 410, -2140}, 0, {-1296, -471}, {127, 0, 0, 255} }}, @@ -499,10 +498,6 @@ static const Vtx castle_inside_snow_slider_dl_mesh_vtx_1[80] = { {{ {-3149, 410, -2626}, 0, {7406, -2576}, {0, 127, 0, 255} }}, {{ {-2586, 410, -2780}, 0, {1774, -4112}, {0, 127, 0, 255} }}, {{ {-3149, 410, -2780}, 0, {7406, -4112}, {0, 127, 0, 255} }}, - {{ {-1741, 205, -2396}, 0, {17904, -4475}, {0, 127, 0, 255} }}, - {{ {-1638, 205, -2242}, 0, {16880, -2939}, {0, 127, 0, 255} }}, - {{ {-1638, 205, -2396}, 0, {16880, -4475}, {0, 127, 0, 255} }}, - {{ {-1741, 205, -2242}, 0, {17904, -2939}, {0, 127, 0, 255} }}, }; static const Gfx castle_inside_snow_slider_dl_mesh_tri_1[] = { @@ -549,35 +544,6 @@ static const Gfx castle_inside_snow_slider_dl_mesh_tri_1[] = { gsSP1Triangle(11, 8, 10, 0), gsSP1Triangle(10, 12, 11, 0), gsSP1Triangle(12, 13, 11, 0), - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_1 + 76, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSPEndDisplayList(), -}; - -static const Vtx castle_inside_snow_slider_dl_mesh_vtx_2[12] = { - {{ {-1741, 205, -2242}, 0, {-252, 1218}, {0, 0, 129, 255} }}, - {{ {-1638, 461, -2242}, 0, {-252, 200}, {0, 0, 129, 255} }}, - {{ {-1638, 205, -2242}, 0, {-252, 1218}, {0, 0, 129, 255} }}, - {{ {-1741, 461, -2242}, 0, {-252, 200}, {0, 0, 129, 255} }}, - {{ {-1741, 461, -2242}, 0, {-252, 200}, {0, 129, 0, 255} }}, - {{ {-1638, 461, -2396}, 0, {509, 200}, {0, 129, 0, 255} }}, - {{ {-1638, 461, -2242}, 0, {-252, 200}, {0, 129, 0, 255} }}, - {{ {-1741, 461, -2396}, 0, {509, 200}, {0, 129, 0, 255} }}, - {{ {-1741, 461, -2396}, 0, {509, 200}, {0, 0, 127, 255} }}, - {{ {-1638, 205, -2396}, 0, {509, 1218}, {0, 0, 127, 255} }}, - {{ {-1638, 461, -2396}, 0, {509, 200}, {0, 0, 127, 255} }}, - {{ {-1741, 205, -2396}, 0, {509, 1218}, {0, 0, 127, 255} }}, -}; - -static const Gfx castle_inside_snow_slider_dl_mesh_tri_2[] = { - gsSPVertex(castle_inside_snow_slider_dl_mesh_vtx_2 + 0, 12, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), gsSPEndDisplayList(), }; @@ -586,8 +552,6 @@ const Gfx castle_inside_snow_slider_dl_mesh[] = { gsSPDisplayList(castle_inside_snow_slider_dl_mesh_tri_0), gsSPDisplayList(mat_castle_inside_CarpetMaterial), gsSPDisplayList(castle_inside_snow_slider_dl_mesh_tri_1), - gsSPDisplayList(mat_castle_inside_WallBottomMaterial), - gsSPDisplayList(castle_inside_snow_slider_dl_mesh_tri_2), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_TEXTURE_GEN), diff --git a/levels/castle_inside/areas/1/water_land_room/model.inc.c b/levels/castle_inside/areas/1/water_land_room/model.inc.c index e755b6bf..26664d95 100644 --- a/levels/castle_inside/areas/1/water_land_room/model.inc.c +++ b/levels/castle_inside/areas/1/water_land_room/model.inc.c @@ -1,14 +1,10 @@ -static const Vtx castle_inside_water_land_dl_mesh_vtx_0[82] = { +static const Vtx castle_inside_water_land_dl_mesh_vtx_0[76] = { {{ {2534, 384, -2140}, 0, {2288, -215}, {129, 0, 0, 255} }}, {{ {2534, 410, -2498}, 0, {-1296, -471}, {129, 0, 0, 255} }}, {{ {2534, 384, -2498}, 0, {-1296, -215}, {129, 0, 0, 255} }}, {{ {2534, 384, -2140}, 0, {2288, -215}, {129, 0, 0, 255} }}, {{ {2534, 410, -2140}, 0, {2288, -471}, {129, 0, 0, 255} }}, {{ {2534, 410, -2498}, 0, {-1296, -471}, {129, 0, 0, 255} }}, - {{ {1741, 205, -2242}, 0, {-16912, -2939}, {0, 127, 0, 255} }}, - {{ {1638, 205, -2396}, 0, {-15888, -4475}, {0, 127, 0, 255} }}, - {{ {1638, 205, -2242}, 0, {-15888, -2939}, {0, 127, 0, 255} }}, - {{ {1741, 205, -2396}, 0, {-16912, -4475}, {0, 127, 0, 255} }}, {{ {2381, 230, -2140}, 0, {2288, 1321}, {129, 0, 0, 255} }}, {{ {2381, 256, -2498}, 0, {-1296, 1065}, {129, 0, 0, 255} }}, {{ {2381, 230, -2498}, 0, {-1296, 1321}, {129, 0, 0, 255} }}, @@ -77,9 +73,7 @@ static const Vtx castle_inside_water_land_dl_mesh_vtx_0[82] = { {{ {3149, 410, -2780}, 0, {7406, 5104}, {0, 127, 0, 255} }}, {{ {2586, 410, -2780}, 0, {1774, 5104}, {0, 127, 0, 255} }}, {{ {3149, 410, -2012}, 0, {7406, -2576}, {0, 127, 0, 255} }}, - {{ {2586, 410, -2780}, 0, {1774, 5104}, {0, 127, 0, 255} }}, {{ {2586, 410, -1858}, 0, {1774, -4112}, {0, 127, 0, 255} }}, - {{ {3149, 410, -2012}, 0, {7406, -2576}, {0, 127, 0, 255} }}, {{ {3149, 410, -1858}, 0, {7406, -4112}, {0, 127, 0, 255} }}, }; @@ -118,129 +112,126 @@ static const Gfx castle_inside_water_land_dl_mesh_tri_0[] = { gsSP1Triangle(8, 11, 9, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(castle_inside_water_land_dl_mesh_vtx_0 + 62, 16, 0), + gsSPVertex(castle_inside_water_land_dl_mesh_vtx_0 + 62, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 7, 5, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(15, 12, 14, 0), - gsSPVertex(castle_inside_water_land_dl_mesh_vtx_0 + 78, 4, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), + gsSP1Triangle(11, 8, 10, 0), + gsSP1Triangle(10, 12, 11, 0), + gsSP1Triangle(12, 13, 11, 0), gsSPEndDisplayList(), }; static const Vtx castle_inside_water_land_dl_mesh_vtx_1[190] = { - {{ {2278, 205, -2549}, 0, {1136, 1296}, {0, 0, 129, 255} }}, - {{ {2278, 282, -2549}, 0, {1136, 1139}, {0, 0, 129, 255} }}, - {{ {2355, 282, -2549}, 0, {1292, 1139}, {0, 0, 129, 255} }}, - {{ {2534, 410, -2140}, 0, {1657, 375}, {0, 0, 129, 255} }}, - {{ {2586, 461, -2140}, 0, {1762, 271}, {0, 0, 129, 255} }}, - {{ {2586, 410, -2140}, 0, {1762, 375}, {0, 0, 129, 255} }}, - {{ {2534, 205, -2089}, 0, {1657, 1296}, {12, 246, 126, 255} }}, - {{ {2355, 282, -2089}, 0, {1292, 1139}, {12, 246, 126, 255} }}, - {{ {2278, 205, -2089}, 0, {1136, 1296}, {12, 246, 126, 255} }}, + {{ {2278, 205, -2549}, 0, {2049, 1398}, {0, 0, 129, 255} }}, + {{ {2278, 282, -2549}, 0, {2049, 1180}, {0, 0, 129, 255} }}, + {{ {2355, 282, -2549}, 0, {2267, 1180}, {0, 0, 129, 255} }}, + {{ {2534, 410, -2140}, 0, {689, 1018}, {0, 0, 129, 255} }}, + {{ {2586, 461, -2140}, 0, {805, 903}, {0, 0, 129, 255} }}, + {{ {2586, 410, -2140}, 0, {805, 1018}, {0, 0, 129, 255} }}, + {{ {2534, 205, -2089}, 0, {2776, 1398}, {0, 0, 127, 255} }}, + {{ {2355, 282, -2089}, 0, {2267, 1180}, {0, 0, 127, 255} }}, + {{ {2278, 205, -2089}, 0, {2049, 1398}, {0, 0, 127, 255} }}, {{ {2534, 205, -2575}, 0, {284, 941}, {183, 73, 73, 255} }}, {{ {2534, 410, -2780}, 0, {-210, 423}, {183, 73, 73, 255} }}, {{ {2330, 205, -2780}, 0, {-210, 941}, {183, 73, 73, 255} }}, {{ {2534, 410, -1858}, 0, {2012, 423}, {183, 73, 183, 255} }}, {{ {2534, 205, -2063}, 0, {1518, 941}, {183, 73, 183, 255} }}, {{ {2330, 205, -1858}, 0, {2012, 941}, {183, 73, 183, 255} }}, - {{ {1741, 205, -2063}, 0, {-283, 943}, {73, 73, 183, 255} }}, - {{ {1741, 410, -1858}, 0, {-310, 449}, {73, 73, 183, 255} }}, - {{ {1946, 205, -1858}, 0, {-684, 849}, {73, 73, 183, 255} }}, - {{ {1946, 205, -2780}, 0, {1119, 1270}, {73, 73, 73, 255} }}, - {{ {1741, 410, -2780}, 0, {1493, 869}, {73, 73, 73, 255} }}, - {{ {1741, 205, -2575}, 0, {719, 1176}, {73, 73, 73, 255} }}, - {{ {3149, 410, -2626}, 0, {109, 1119}, {0, 0, 127, 255} }}, - {{ {3149, 563, -2626}, 0, {-83, 760}, {0, 0, 127, 255} }}, - {{ {2995, 410, -2626}, 0, {109, 1119}, {0, 0, 127, 255} }}, - {{ {3149, 410, -2012}, 0, {1545, 927}, {0, 0, 129, 255} }}, - {{ {2995, 410, -2012}, 0, {1545, 927}, {0, 0, 129, 255} }}, - {{ {3149, 563, -2012}, 0, {1353, 568}, {0, 0, 129, 255} }}, - {{ {3149, 1126, -2575}, 0, {-669, -572}, {183, 183, 73, 255} }}, - {{ {2944, 1126, -2780}, 0, {-1147, -508}, {183, 183, 73, 255} }}, - {{ {3149, 922, -2780}, 0, {-891, -29}, {183, 183, 73, 255} }}, + {{ {1741, 205, -2063}, 0, {1514, 116}, {73, 73, 183, 255} }}, + {{ {1741, 410, -1858}, 0, {2005, 769}, {73, 73, 183, 255} }}, + {{ {1946, 205, -1858}, 0, {1706, 992}, {73, 73, 183, 255} }}, + {{ {1946, 205, -2780}, 0, {893, 1841}, {73, 73, 73, 255} }}, + {{ {1741, 410, -2780}, 0, {1203, 1067}, {73, 73, 73, 255} }}, + {{ {1741, 205, -2575}, 0, {496, 2052}, {73, 73, 73, 255} }}, + {{ {3149, 410, -2626}, 0, {2367, 961}, {0, 0, 127, 255} }}, + {{ {3149, 563, -2626}, 0, {2367, 674}, {0, 0, 127, 255} }}, + {{ {2995, 410, -2626}, 0, {2081, 961}, {0, 0, 127, 255} }}, + {{ {3149, 410, -2012}, 0, {2305, -156}, {0, 0, 129, 255} }}, + {{ {2995, 410, -2012}, 0, {2305, -156}, {0, 0, 129, 255} }}, + {{ {3149, 563, -2012}, 0, {3129, 222}, {0, 0, 129, 255} }}, + {{ {3149, 1126, -2575}, 0, {2367, -377}, {183, 183, 73, 255} }}, + {{ {2944, 1126, -2780}, 0, {1985, -377}, {183, 183, 73, 255} }}, + {{ {3149, 922, -2780}, 0, {2367, 5}, {183, 183, 73, 255} }}, {{ {2944, 1126, -1858}, 0, {1006, -796}, {183, 183, 183, 255} }}, {{ {3149, 1126, -2063}, 0, {528, -732}, {183, 183, 183, 255} }}, {{ {3149, 922, -1858}, 0, {1263, -318}, {183, 183, 183, 255} }}, - {{ {1741, 1126, -2575}, 0, {2400, -627}, {73, 183, 73, 255} }}, - {{ {1741, 922, -2780}, 0, {2427, -133}, {73, 183, 73, 255} }}, - {{ {1946, 1126, -2780}, 0, {2800, -533}, {73, 183, 73, 255} }}, - {{ {1946, 1126, -1858}, 0, {998, -953}, {73, 183, 183, 255} }}, - {{ {1741, 922, -1858}, 0, {624, -553}, {73, 183, 183, 255} }}, - {{ {1741, 1126, -2063}, 0, {1398, -860}, {73, 183, 183, 255} }}, - {{ {1741, 205, -1858}, 0, {111, 1083}, {247, 129, 0, 255} }}, - {{ {1741, 205, -2396}, 0, {111, 398}, {247, 129, 0, 255} }}, - {{ {1741, 205, -2242}, 0, {111, 594}, {247, 129, 0, 255} }}, - {{ {2355, 282, -2549}, 0, {1292, 1139}, {0, 0, 129, 255} }}, - {{ {2534, 461, -2549}, 0, {1657, 774}, {0, 0, 129, 255} }}, - {{ {2534, 205, -2549}, 0, {1657, 1296}, {0, 0, 129, 255} }}, - {{ {2534, 205, -2549}, 0, {1657, 1296}, {0, 0, 129, 255} }}, - {{ {2278, 205, -2549}, 0, {1136, 1296}, {0, 0, 129, 255} }}, - {{ {2355, 282, -2549}, 0, {1292, 1139}, {0, 0, 129, 255} }}, - {{ {2534, 410, -2140}, 0, {1657, 375}, {0, 0, 129, 255} }}, - {{ {2534, 461, -2140}, 0, {1657, 271}, {0, 0, 129, 255} }}, - {{ {2586, 461, -2140}, 0, {1762, 271}, {0, 0, 129, 255} }}, - {{ {2534, 205, -2089}, 0, {1657, 1296}, {12, 246, 126, 255} }}, - {{ {2534, 461, -2089}, 0, {1657, 774}, {12, 246, 126, 255} }}, - {{ {2355, 282, -2089}, 0, {1292, 1139}, {12, 246, 126, 255} }}, - {{ {2355, 282, -2089}, 0, {1292, 1139}, {12, 246, 126, 255} }}, - {{ {2278, 282, -2089}, 0, {1136, 1139}, {12, 246, 126, 255} }}, - {{ {2278, 205, -2089}, 0, {1136, 1296}, {12, 246, 126, 255} }}, - {{ {3149, 1126, -2780}, 0, {-1147, -508}, {129, 0, 0, 255} }}, - {{ {3149, 1024, -2626}, 0, {-660, -317}, {129, 0, 0, 255} }}, - {{ {3149, 1126, -1858}, 0, {1006, -796}, {129, 0, 0, 255} }}, - {{ {1741, 205, -1858}, 0, {111, 1083}, {243, 130, 0, 255} }}, - {{ {1741, 205, -2780}, 0, {111, -91}, {243, 130, 0, 255} }}, - {{ {1741, 205, -2396}, 0, {111, 398}, {243, 130, 0, 255} }}, + {{ {1741, 1126, -2575}, 0, {333, 595}, {73, 183, 73, 255} }}, + {{ {1741, 922, -2780}, 0, {690, 1036}, {73, 183, 73, 255} }}, + {{ {1946, 1126, -2780}, 0, {186, 987}, {73, 183, 73, 255} }}, + {{ {1946, 1126, -1858}, 0, {845, -780}, {73, 183, 183, 255} }}, + {{ {1741, 922, -1858}, 0, {1349, -731}, {73, 183, 183, 255} }}, + {{ {1741, 1126, -2063}, 0, {699, -387}, {73, 183, 183, 255} }}, + {{ {1741, 205, -1858}, 0, {111, 1083}, {244, 126, 0, 255} }}, + {{ {1741, 205, -2396}, 0, {111, 398}, {244, 126, 0, 255} }}, + {{ {1741, 205, -2242}, 0, {111, 594}, {244, 126, 0, 255} }}, + {{ {2355, 282, -2549}, 0, {2267, 1180}, {0, 0, 129, 255} }}, + {{ {2534, 461, -2549}, 0, {2776, 672}, {0, 0, 129, 255} }}, + {{ {2534, 205, -2549}, 0, {2776, 1398}, {0, 0, 129, 255} }}, + {{ {2534, 205, -2549}, 0, {2776, 1398}, {0, 0, 129, 255} }}, + {{ {2278, 205, -2549}, 0, {2049, 1398}, {0, 0, 129, 255} }}, + {{ {2355, 282, -2549}, 0, {2267, 1180}, {0, 0, 129, 255} }}, + {{ {2534, 410, -2140}, 0, {689, 1018}, {0, 0, 129, 255} }}, + {{ {2534, 461, -2140}, 0, {689, 903}, {0, 0, 129, 255} }}, + {{ {2586, 461, -2140}, 0, {805, 903}, {0, 0, 129, 255} }}, + {{ {2534, 205, -2089}, 0, {2776, 1398}, {0, 0, 127, 255} }}, + {{ {2534, 461, -2089}, 0, {2776, 672}, {0, 0, 127, 255} }}, + {{ {2355, 282, -2089}, 0, {2267, 1180}, {0, 0, 127, 255} }}, + {{ {2355, 282, -2089}, 0, {2267, 1180}, {0, 0, 127, 255} }}, + {{ {2278, 282, -2089}, 0, {2049, 1180}, {0, 0, 127, 255} }}, + {{ {2278, 205, -2089}, 0, {2049, 1398}, {0, 0, 127, 255} }}, + {{ {3149, 1126, -2780}, 0, {2753, 799}, {129, 0, 0, 255} }}, + {{ {3149, 1024, -2626}, 0, {2558, 1279}, {129, 0, 0, 255} }}, + {{ {3149, 1126, -1858}, 0, {2753, 3680}, {129, 0, 0, 255} }}, + {{ {1741, 205, -1858}, 0, {111, 1083}, {2, 129, 0, 255} }}, + {{ {1741, 205, -2780}, 0, {111, -91}, {2, 129, 0, 255} }}, + {{ {1741, 205, -2396}, 0, {111, 398}, {2, 129, 0, 255} }}, {{ {2586, 461, -1909}, 0, {1308, 1190}, {127, 0, 0, 255} }}, {{ {2586, 410, -2140}, 0, {1590, 1275}, {127, 0, 0, 255} }}, {{ {2586, 461, -2140}, 0, {1590, 1190}, {127, 0, 0, 255} }}, {{ {2586, 410, -1909}, 0, {1308, 1275}, {127, 0, 0, 255} }}, - {{ {2278, 205, -2140}, 0, {1136, 792}, {0, 0, 129, 255} }}, - {{ {2278, 282, -2140}, 0, {1136, 635}, {0, 0, 129, 255} }}, - {{ {2355, 282, -2140}, 0, {1292, 635}, {0, 0, 129, 255} }}, - {{ {2355, 205, -2140}, 0, {1292, 792}, {0, 0, 129, 255} }}, - {{ {2534, 205, -2140}, 0, {1657, 792}, {0, 0, 129, 255} }}, - {{ {2534, 461, -2140}, 0, {1657, 271}, {0, 0, 129, 255} }}, - {{ {2278, 205, -2140}, 0, {577, 1270}, {129, 0, 0, 255} }}, - {{ {2278, 282, -2089}, 0, {472, 1114}, {129, 0, 0, 255} }}, - {{ {2278, 282, -2140}, 0, {577, 1114}, {129, 0, 0, 255} }}, - {{ {2278, 205, -2140}, 0, {577, 1270}, {129, 0, 0, 255} }}, - {{ {2278, 205, -2089}, 0, {472, 1270}, {129, 0, 0, 255} }}, - {{ {2278, 282, -2089}, 0, {472, 1114}, {129, 0, 0, 255} }}, + {{ {2278, 205, -2140}, 0, {112, 1480}, {0, 0, 129, 255} }}, + {{ {2278, 282, -2140}, 0, {112, 1307}, {0, 0, 129, 255} }}, + {{ {2355, 282, -2140}, 0, {285, 1307}, {0, 0, 129, 255} }}, + {{ {2355, 205, -2140}, 0, {285, 1480}, {0, 0, 129, 255} }}, + {{ {2534, 205, -2140}, 0, {689, 1480}, {0, 0, 129, 255} }}, + {{ {2534, 461, -2140}, 0, {689, 903}, {0, 0, 129, 255} }}, + {{ {2278, 205, -2140}, 0, {1870, 1263}, {129, 0, 0, 255} }}, + {{ {2278, 282, -2089}, 0, {1488, 690}, {129, 0, 0, 255} }}, + {{ {2278, 282, -2140}, 0, {1870, 690}, {129, 0, 0, 255} }}, + {{ {2278, 205, -2140}, 0, {1870, 1263}, {129, 0, 0, 255} }}, + {{ {2278, 205, -2089}, 0, {1487, 1263}, {129, 0, 0, 255} }}, + {{ {2278, 282, -2089}, 0, {1488, 690}, {129, 0, 0, 255} }}, {{ {2586, 410, -2729}, 0, {2312, 1275}, {127, 0, 0, 255} }}, {{ {2586, 461, -2498}, 0, {2030, 1190}, {127, 0, 0, 255} }}, {{ {2586, 410, -2498}, 0, {2030, 1275}, {127, 0, 0, 255} }}, {{ {2586, 461, -2729}, 0, {2312, 1190}, {127, 0, 0, 255} }}, - {{ {2586, 461, -2498}, 0, {1762, 271}, {0, 0, 127, 255} }}, - {{ {2534, 410, -2498}, 0, {1657, 375}, {0, 0, 127, 255} }}, - {{ {2586, 410, -2498}, 0, {1762, 375}, {0, 0, 127, 255} }}, - {{ {2534, 461, -2498}, 0, {1657, 271}, {0, 0, 127, 255} }}, - {{ {2534, 461, -2498}, 0, {1924, -584}, {166, 90, 0, 255} }}, - {{ {2355, 282, -2549}, 0, {1442, -373}, {166, 90, 0, 255} }}, - {{ {2355, 282, -2498}, 0, {1442, -584}, {166, 90, 0, 255} }}, - {{ {2534, 461, -2549}, 0, {1924, -373}, {166, 90, 0, 255} }}, - {{ {2278, 282, -2549}, 0, {1411, 1114}, {129, 0, 0, 255} }}, - {{ {2278, 205, -2498}, 0, {1306, 1270}, {129, 0, 0, 255} }}, - {{ {2278, 282, -2498}, 0, {1306, 1114}, {129, 0, 0, 255} }}, - {{ {2278, 205, -2549}, 0, {1411, 1270}, {129, 0, 0, 255} }}, - {{ {2534, 461, -2780}, 0, {-210, 294}, {129, 0, 0, 255} }}, - {{ {2534, 205, -2549}, 0, {346, 941}, {129, 0, 0, 255} }}, - {{ {2534, 461, -2549}, 0, {346, 294}, {129, 0, 0, 255} }}, - {{ {2534, 205, -2780}, 0, {-210, 941}, {129, 0, 0, 255} }}, - {{ {2278, 282, -2498}, 0, {726, -176}, {0, 127, 0, 255} }}, - {{ {2355, 282, -2549}, 0, {955, -328}, {0, 127, 0, 255} }}, - {{ {2278, 282, -2549}, 0, {726, -328}, {0, 127, 0, 255} }}, - {{ {2355, 282, -2498}, 0, {955, -176}, {0, 127, 0, 255} }}, - {{ {2355, 282, -2140}, 0, {955, 891}, {0, 127, 0, 255} }}, - {{ {2278, 282, -2089}, 0, {726, 1043}, {0, 127, 0, 255} }}, - {{ {2355, 282, -2089}, 0, {955, 1043}, {0, 127, 0, 255} }}, - {{ {2278, 282, -2140}, 0, {726, 891}, {0, 127, 0, 255} }}, + {{ {2586, 461, -2498}, 0, {805, 903}, {0, 0, 127, 255} }}, + {{ {2534, 410, -2498}, 0, {689, 1018}, {0, 0, 127, 255} }}, + {{ {2586, 410, -2498}, 0, {805, 1018}, {0, 0, 127, 255} }}, + {{ {2534, 461, -2498}, 0, {689, 903}, {0, 0, 127, 255} }}, + {{ {2534, 461, -2498}, 0, {-998, -1110}, {166, 90, 0, 255} }}, + {{ {2355, 282, -2549}, 0, {-422, -857}, {166, 90, 0, 255} }}, + {{ {2355, 282, -2498}, 0, {-422, -1110}, {166, 90, 0, 255} }}, + {{ {2534, 461, -2549}, 0, {-998, -857}, {166, 90, 0, 255} }}, + {{ {2278, 282, -2549}, 0, {3812, 690}, {129, 0, 0, 255} }}, + {{ {2278, 205, -2498}, 0, {3430, 1263}, {129, 0, 0, 255} }}, + {{ {2278, 282, -2498}, 0, {3430, 690}, {129, 0, 0, 255} }}, + {{ {2278, 205, -2549}, 0, {3813, 1263}, {129, 0, 0, 255} }}, + {{ {2534, 461, -2780}, 0, {1544, 294}, {129, 0, 0, 255} }}, + {{ {2534, 205, -2549}, 0, {2099, 941}, {129, 0, 0, 255} }}, + {{ {2534, 461, -2549}, 0, {2099, 294}, {129, 0, 0, 255} }}, + {{ {2534, 205, -2780}, 0, {1544, 941}, {129, 0, 0, 255} }}, + {{ {2278, 282, -2498}, 0, {434, -622}, {0, 127, 0, 255} }}, + {{ {2355, 282, -2549}, 0, {161, -804}, {0, 127, 0, 255} }}, + {{ {2278, 282, -2549}, 0, {434, -804}, {0, 127, 0, 255} }}, + {{ {2355, 282, -2498}, 0, {161, -622}, {0, 127, 0, 255} }}, + {{ {2355, 282, -2140}, 0, {710, 1016}, {0, 127, 0, 255} }}, + {{ {2278, 282, -2089}, 0, {437, 1198}, {0, 127, 0, 255} }}, + {{ {2355, 282, -2089}, 0, {710, 1198}, {0, 127, 0, 255} }}, + {{ {2278, 282, -2140}, 0, {437, 1016}, {0, 127, 0, 255} }}, {{ {3149, 410, -2729}, 0, {2673, 1275}, {0, 0, 127, 255} }}, {{ {2586, 461, -2729}, 0, {1983, 1190}, {0, 0, 127, 255} }}, {{ {2586, 410, -2729}, 0, {1983, 1275}, {0, 0, 127, 255} }}, @@ -253,77 +244,77 @@ static const Vtx castle_inside_water_land_dl_mesh_vtx_1[190] = { {{ {2534, 205, -2089}, 0, {1457, 941}, {129, 0, 0, 255} }}, {{ {2534, 205, -1858}, 0, {2012, 941}, {129, 0, 0, 255} }}, {{ {2534, 461, -2089}, 0, {1456, 294}, {129, 0, 0, 255} }}, - {{ {2534, 461, -2089}, 0, {839, 1348}, {166, 90, 0, 255} }}, - {{ {2355, 282, -2140}, 0, {281, 1136}, {166, 90, 0, 255} }}, - {{ {2355, 282, -2089}, 0, {281, 1348}, {166, 90, 0, 255} }}, - {{ {2534, 461, -2140}, 0, {839, 1136}, {166, 90, 0, 255} }}, - {{ {1741, 205, -2498}, 0, {111, 268}, {0, 127, 0, 255} }}, - {{ {3149, 205, -2780}, 0, {1905, -91}, {0, 127, 0, 255} }}, - {{ {1741, 205, -2780}, 0, {111, -91}, {0, 127, 0, 255} }}, - {{ {3149, 205, -2498}, 0, {1905, 268}, {0, 127, 0, 255} }}, - {{ {3149, 205, -2140}, 0, {1905, 724}, {0, 127, 0, 255} }}, - {{ {1741, 205, -1858}, 0, {111, 1083}, {0, 127, 0, 255} }}, - {{ {3149, 205, -1858}, 0, {1905, 1083}, {0, 127, 0, 255} }}, - {{ {1741, 205, -2140}, 0, {111, 724}, {0, 127, 0, 255} }}, - {{ {3149, 1126, -1858}, 0, {1492, -277}, {0, 0, 129, 255} }}, - {{ {1741, 205, -1858}, 0, {364, 1525}, {0, 0, 129, 255} }}, - {{ {1741, 1126, -1858}, 0, {-662, 115}, {0, 0, 129, 255} }}, - {{ {3149, 205, -1858}, 0, {2518, 1133}, {0, 0, 129, 255} }}, - {{ {3149, 1024, -2626}, 0, {-660, -317}, {129, 0, 0, 255} }}, - {{ {3149, 1024, -2012}, 0, {776, -509}, {129, 0, 0, 255} }}, - {{ {3149, 1126, -1858}, 0, {1006, -796}, {129, 0, 0, 255} }}, - {{ {3149, 410, -1858}, 0, {1904, 879}, {129, 0, 0, 255} }}, - {{ {3149, 410, -2012}, 0, {1545, 927}, {129, 0, 0, 255} }}, - {{ {3149, 410, -1858}, 0, {1904, 879}, {129, 0, 0, 255} }}, - {{ {3149, 1024, -2012}, 0, {776, -509}, {129, 0, 0, 255} }}, - {{ {3149, 1126, -2780}, 0, {3584, 590}, {0, 0, 127, 255} }}, - {{ {1741, 205, -2780}, 0, {768, 1037}, {0, 0, 127, 255} }}, - {{ {3149, 205, -2780}, 0, {2238, 1552}, {0, 0, 127, 255} }}, - {{ {1741, 1126, -2780}, 0, {2115, 75}, {0, 0, 127, 255} }}, - {{ {3149, 717, -2780}, 0, {-634, 449}, {183, 73, 73, 255} }}, - {{ {2995, 410, -2626}, 0, {109, 1119}, {183, 73, 73, 255} }}, - {{ {3149, 563, -2626}, 0, {-83, 760}, {183, 73, 73, 255} }}, - {{ {2842, 410, -2780}, 0, {-250, 1167}, {183, 73, 73, 255} }}, - {{ {2995, 410, -2012}, 0, {1545, 927}, {183, 73, 183, 255} }}, - {{ {3149, 717, -1858}, 0, {1519, 161}, {183, 73, 183, 255} }}, - {{ {3149, 563, -2012}, 0, {1353, 568}, {183, 73, 183, 255} }}, - {{ {2842, 410, -1858}, 0, {1904, 879}, {183, 73, 183, 255} }}, - {{ {1741, 1126, -1858}, 0, {111, 1083}, {0, 129, 0, 255} }}, - {{ {3149, 1126, -2780}, 0, {1905, -91}, {0, 129, 0, 255} }}, - {{ {3149, 1126, -1858}, 0, {1905, 1083}, {0, 129, 0, 255} }}, - {{ {1741, 1126, -2780}, 0, {111, -91}, {0, 129, 0, 255} }}, - {{ {2534, 205, -2498}, 0, {1657, 792}, {0, 0, 127, 255} }}, - {{ {2534, 461, -2498}, 0, {1657, 271}, {0, 0, 127, 255} }}, - {{ {2355, 282, -2498}, 0, {1292, 635}, {0, 0, 127, 255} }}, - {{ {2355, 205, -2498}, 0, {1292, 792}, {0, 0, 127, 255} }}, - {{ {2278, 205, -2498}, 0, {1136, 792}, {0, 0, 127, 255} }}, - {{ {2278, 282, -2498}, 0, {1136, 635}, {0, 0, 127, 255} }}, - {{ {3149, 461, -1858}, 0, {1894, 987}, {0, 127, 0, 255} }}, - {{ {3149, 461, -1909}, 0, {1894, 914}, {0, 127, 0, 255} }}, - {{ {2586, 461, -1909}, 0, {1092, 914}, {0, 127, 0, 255} }}, - {{ {2534, 461, -1858}, 0, {1019, 987}, {0, 127, 0, 255} }}, - {{ {2534, 461, -2140}, 0, {1019, 586}, {0, 127, 0, 255} }}, - {{ {2586, 461, -2140}, 0, {1092, 586}, {0, 127, 0, 255} }}, - {{ {2586, 461, -2729}, 0, {1092, -252}, {0, 127, 0, 255} }}, - {{ {3149, 461, -2729}, 0, {1894, -252}, {0, 127, 0, 255} }}, - {{ {3149, 461, -2780}, 0, {1894, -325}, {0, 127, 0, 255} }}, - {{ {2534, 461, -2780}, 0, {1019, -325}, {0, 127, 0, 255} }}, - {{ {2534, 461, -2498}, 0, {1019, 76}, {0, 127, 0, 255} }}, - {{ {2586, 461, -2498}, 0, {1092, 76}, {0, 127, 0, 255} }}, - {{ {3149, 1126, -2780}, 0, {-1147, -508}, {129, 0, 0, 255} }}, - {{ {3149, 410, -2780}, 0, {-250, 1167}, {129, 0, 0, 255} }}, - {{ {3149, 1024, -2626}, 0, {-660, -317}, {129, 0, 0, 255} }}, - {{ {3149, 410, -2626}, 0, {109, 1119}, {129, 0, 0, 255} }}, - {{ {1741, 205, -1858}, 0, {-684, 849}, {127, 0, 0, 255} }}, - {{ {1741, 205, -2242}, 0, {68, 1024}, {127, 0, 0, 255} }}, - {{ {1741, 461, -2242}, 0, {535, 524}, {127, 0, 0, 255} }}, - {{ {1741, 1126, -1858}, 0, {998, -953}, {127, 0, 0, 255} }}, - {{ {1741, 461, -2396}, 0, {835, 594}, {127, 0, 0, 255} }}, - {{ {1741, 1126, -2780}, 0, {2800, -533}, {127, 0, 0, 255} }}, - {{ {1741, 205, -2780}, 0, {1119, 1270}, {127, 0, 0, 255} }}, - {{ {1741, 1126, -2780}, 0, {2800, -533}, {127, 0, 0, 255} }}, - {{ {1741, 461, -2396}, 0, {835, 594}, {127, 0, 0, 255} }}, - {{ {1741, 205, -2396}, 0, {368, 1094}, {127, 0, 0, 255} }}, + {{ {2534, 461, -2089}, 0, {572, 1562}, {166, 90, 0, 255} }}, + {{ {2355, 282, -2140}, 0, {-96, 1309}, {166, 90, 0, 255} }}, + {{ {2355, 282, -2089}, 0, {-96, 1562}, {166, 90, 0, 255} }}, + {{ {2534, 461, -2140}, 0, {572, 1309}, {166, 90, 0, 255} }}, + {{ {1741, 205, -2498}, 0, {-778, -1528}, {0, 127, 0, 255} }}, + {{ {3149, 205, -2780}, 0, {-127, 4197}, {0, 127, 0, 255} }}, + {{ {1741, 205, -2780}, 0, {-127, -1528}, {0, 127, 0, 255} }}, + {{ {3149, 205, -2498}, 0, {-778, 4197}, {0, 127, 0, 255} }}, + {{ {3149, 205, -2140}, 0, {-67, -1246}, {0, 127, 0, 255} }}, + {{ {1741, 205, -1858}, 0, {-718, 4479}, {0, 127, 0, 255} }}, + {{ {3149, 205, -1858}, 0, {-718, -1246}, {0, 127, 0, 255} }}, + {{ {1741, 205, -2140}, 0, {-67, 4479}, {0, 127, 0, 255} }}, + {{ {3149, 1126, -1858}, 0, {1462, -948}, {0, 0, 129, 255} }}, + {{ {1741, 205, -1858}, 0, {-64, 993}, {0, 0, 129, 255} }}, + {{ {1741, 1126, -1858}, 0, {1462, 993}, {0, 0, 129, 255} }}, + {{ {3149, 205, -1858}, 0, {-64, -948}, {0, 0, 129, 255} }}, + {{ {3149, 1024, -2626}, 0, {2558, 1279}, {129, 0, 0, 255} }}, + {{ {3149, 1024, -2012}, 0, {2558, 3200}, {129, 0, 0, 255} }}, + {{ {3149, 1126, -1858}, 0, {2753, 3680}, {129, 0, 0, 255} }}, + {{ {3149, 410, -1858}, 0, {1388, 3680}, {129, 0, 0, 255} }}, + {{ {3149, 410, -2012}, 0, {1388, 3200}, {129, 0, 0, 255} }}, + {{ {3149, 410, -1858}, 0, {1388, 3680}, {129, 0, 0, 255} }}, + {{ {3149, 1024, -2012}, 0, {2558, 3200}, {129, 0, 0, 255} }}, + {{ {3149, 1126, -2780}, 0, {-245, -256}, {0, 0, 127, 255} }}, + {{ {1741, 205, -2780}, 0, {1104, -1942}, {0, 0, 127, 255} }}, + {{ {3149, 205, -2780}, 0, {1104, -256}, {0, 0, 127, 255} }}, + {{ {1741, 1126, -2780}, 0, {-245, -1942}, {0, 0, 127, 255} }}, + {{ {3149, 717, -2780}, 0, {2367, 388}, {183, 73, 73, 255} }}, + {{ {2995, 410, -2626}, 0, {2081, 961}, {183, 73, 73, 255} }}, + {{ {3149, 563, -2626}, 0, {2367, 674}, {183, 73, 73, 255} }}, + {{ {2842, 410, -2780}, 0, {1794, 961}, {183, 73, 73, 255} }}, + {{ {2995, 410, -2012}, 0, {2305, -156}, {183, 73, 183, 255} }}, + {{ {3149, 717, -1858}, 0, {3129, 446}, {183, 73, 183, 255} }}, + {{ {3149, 563, -2012}, 0, {3129, 222}, {183, 73, 183, 255} }}, + {{ {2842, 410, -1858}, 0, {1927, 50}, {183, 73, 183, 255} }}, + {{ {1741, 1126, -1858}, 0, {-131, 1325}, {0, 129, 0, 255} }}, + {{ {3149, 1126, -2780}, 0, {1663, 151}, {0, 129, 0, 255} }}, + {{ {3149, 1126, -1858}, 0, {1663, 1325}, {0, 129, 0, 255} }}, + {{ {1741, 1126, -2780}, 0, {-131, 151}, {0, 129, 0, 255} }}, + {{ {2534, 205, -2498}, 0, {689, 1480}, {0, 0, 127, 255} }}, + {{ {2534, 461, -2498}, 0, {689, 903}, {0, 0, 127, 255} }}, + {{ {2355, 282, -2498}, 0, {285, 1307}, {0, 0, 127, 255} }}, + {{ {2355, 205, -2498}, 0, {285, 1480}, {0, 0, 127, 255} }}, + {{ {2278, 205, -2498}, 0, {112, 1480}, {0, 0, 127, 255} }}, + {{ {2278, 282, -2498}, 0, {112, 1307}, {0, 0, 127, 255} }}, + {{ {3149, 461, -1858}, 0, {1833, 1131}, {0, 127, 0, 255} }}, + {{ {3149, 461, -1909}, 0, {1833, 1044}, {0, 127, 0, 255} }}, + {{ {2586, 461, -1909}, 0, {874, 1044}, {0, 127, 0, 255} }}, + {{ {2534, 461, -1858}, 0, {787, 1131}, {0, 127, 0, 255} }}, + {{ {2534, 461, -2140}, 0, {787, 651}, {0, 127, 0, 255} }}, + {{ {2586, 461, -2140}, 0, {874, 651}, {0, 127, 0, 255} }}, + {{ {2586, 461, -2729}, 0, {-3, -713}, {0, 127, 0, 255} }}, + {{ {3149, 461, -2729}, 0, {-962, -713}, {0, 127, 0, 255} }}, + {{ {3149, 461, -2780}, 0, {-962, -800}, {0, 127, 0, 255} }}, + {{ {2534, 461, -2780}, 0, {84, -800}, {0, 127, 0, 255} }}, + {{ {2534, 461, -2498}, 0, {84, -321}, {0, 127, 0, 255} }}, + {{ {2586, 461, -2498}, 0, {-3, -321}, {0, 127, 0, 255} }}, + {{ {3149, 1126, -2780}, 0, {2753, 799}, {129, 0, 0, 255} }}, + {{ {3149, 410, -2780}, 0, {1388, 799}, {129, 0, 0, 255} }}, + {{ {3149, 1024, -2626}, 0, {2558, 1279}, {129, 0, 0, 255} }}, + {{ {3149, 410, -2626}, 0, {1388, 1279}, {129, 0, 0, 255} }}, + {{ {1741, 205, -1858}, 0, {-1400, 1789}, {127, 0, 0, 255} }}, + {{ {1741, 205, -2242}, 0, {-148, 2396}, {127, 0, 0, 255} }}, + {{ {1741, 461, -2242}, 0, {184, 1241}, {127, 0, 0, 255} }}, + {{ {1741, 1126, -1858}, 0, {417, -665}, {127, 0, 0, 255} }}, + {{ {1741, 461, -2396}, 0, {481, 1274}, {127, 0, 0, 255} }}, + {{ {1741, 1126, -2780}, 0, {3319, -2023}, {127, 0, 0, 255} }}, + {{ {1741, 205, -2780}, 0, {825, 1673}, {127, 0, 0, 255} }}, + {{ {1741, 1126, -2780}, 0, {3319, -2023}, {127, 0, 0, 255} }}, + {{ {1741, 461, -2396}, 0, {481, 1274}, {127, 0, 0, 255} }}, + {{ {1741, 205, -2396}, 0, {253, 2165}, {127, 0, 0, 255} }}, }; static const Gfx castle_inside_water_land_dl_mesh_tri_1[] = { @@ -431,39 +422,11 @@ static const Gfx castle_inside_water_land_dl_mesh_tri_1[] = { gsSPEndDisplayList(), }; -static const Vtx castle_inside_water_land_dl_mesh_vtx_2[12] = { - {{ {1741, 461, -2242}, 0, {-243, 200}, {0, 0, 129, 255} }}, - {{ {1638, 205, -2242}, 0, {-243, 1218}, {0, 0, 129, 255} }}, - {{ {1638, 461, -2242}, 0, {-243, 200}, {0, 0, 129, 255} }}, - {{ {1741, 205, -2242}, 0, {-243, 1218}, {0, 0, 129, 255} }}, - {{ {1741, 205, -2396}, 0, {521, 1218}, {0, 0, 127, 255} }}, - {{ {1638, 461, -2396}, 0, {521, 200}, {0, 0, 127, 255} }}, - {{ {1638, 205, -2396}, 0, {521, 1218}, {0, 0, 127, 255} }}, - {{ {1741, 461, -2396}, 0, {521, 200}, {0, 0, 127, 255} }}, - {{ {1741, 461, -2396}, 0, {521, 200}, {0, 129, 0, 255} }}, - {{ {1638, 461, -2242}, 0, {-243, 200}, {0, 129, 0, 255} }}, - {{ {1638, 461, -2396}, 0, {521, 200}, {0, 129, 0, 255} }}, - {{ {1741, 461, -2242}, 0, {-243, 200}, {0, 129, 0, 255} }}, -}; - -static const Gfx castle_inside_water_land_dl_mesh_tri_2[] = { - gsSPVertex(castle_inside_water_land_dl_mesh_vtx_2 + 0, 12, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSPEndDisplayList(), -}; - const Gfx castle_inside_water_land_dl_mesh[] = { gsSPDisplayList(mat_castle_inside_CarpetMaterial), gsSPDisplayList(castle_inside_water_land_dl_mesh_tri_0), gsSPDisplayList(mat_castle_inside_PurpleWallMaterial), gsSPDisplayList(castle_inside_water_land_dl_mesh_tri_1), - gsSPDisplayList(mat_castle_inside_WallBottomMaterial), - gsSPDisplayList(castle_inside_water_land_dl_mesh_tri_2), gsDPPipeSync(), gsSPSetGeometryMode(G_LIGHTING), gsSPClearGeometryMode(G_TEXTURE_GEN), diff --git a/levels/castle_inside/material.inc.c b/levels/castle_inside/material.inc.c index b2abf933..53595a95 100644 --- a/levels/castle_inside/material.inc.c +++ b/levels/castle_inside/material.inc.c @@ -104,40 +104,40 @@ static const Gfx mat_castle_inside_StarMaterial[] = { gsSPEndDisplayList(), }; -static const Gfx mat_revert_castle_inside_DecalMaterial[] = { - gsDPPipeSync(), - gsSPSetGeometryMode(G_CULL_BACK), - gsDPSetEnvColor(255, 255, 255, 255), - gsSPEndDisplayList(), -}; - -static const Gfx mat_castle_inside_RailingMaterial[] = { +static const Gfx mat_castle_inside_CeilingMaterial[] = { gsDPPipeSync(), - gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), + gsDPSetCombineMode(G_CC_DECALRGBA, G_CC_DECALRGBA), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, inside_09009800), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, inside_09009000), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 1023, 256), gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0), gsDPSetTileSize(0, 0, 0, 124, 124), gsSPSetLights1(castle_inside_lights_main), gsSPEndDisplayList(), }; -static const Gfx mat_castle_inside_CeilingMaterial[] = { +static const Gfx mat_revert_castle_inside_DecalMaterial[] = { + gsDPPipeSync(), + gsSPSetGeometryMode(G_CULL_BACK), + gsDPSetEnvColor(255, 255, 255, 255), + gsSPEndDisplayList(), +}; + +static const Gfx mat_castle_inside_RailingMaterial[] = { gsDPPipeSync(), gsDPSetCombineMode(G_CC_MODULATERGB, G_CC_MODULATERGB), gsSPTexture(65535, 65535, 0, 0, 1), gsDPTileSync(), - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, inside_09009000), + gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 1, inside_09009800), gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b_LOAD_BLOCK, 0, 0, 7, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 0, 0), gsDPLoadSync(), gsDPLoadBlock(7, 0, 0, 1023, 256), gsDPPipeSync(), - gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0), + gsDPSetTile(G_IM_FMT_RGBA, G_IM_SIZ_16b, 8, 0, 0, 0, G_TX_CLAMP | G_TX_NOMIRROR, 5, 0, G_TX_WRAP | G_TX_NOMIRROR, 5, 0), gsDPSetTileSize(0, 0, 0, 124, 124), gsSPSetLights1(castle_inside_lights_main), gsSPEndDisplayList(), diff --git a/levels/ddd/7.rgba16.png b/levels/ddd/7.rgba16.png index d8a5ef13..0b152be8 100644 Binary files a/levels/ddd/7.rgba16.png and b/levels/ddd/7.rgba16.png differ diff --git a/levels/ddd/areas/2/1/model.inc.c b/levels/ddd/areas/2/1/model.inc.c index 9c0a6b9b..bd11ef0c 100644 --- a/levels/ddd/areas/2/1/model.inc.c +++ b/levels/ddd/areas/2/1/model.inc.c @@ -1,153 +1,206 @@ -static const Vtx water_land_3_dl_mesh_vtx_0[12] = { - {{ {1233, 110, 3470}, 0, {79, 4129}, {54, 35, 147, 255} }}, - {{ {2319, 110, 4556}, 0, {79, -4319}, {109, 35, 202, 255} }}, - {{ {2391, -196, 3759}, 0, {4178, -1501}, {105, 55, 210, 255} }}, - {{ {2029, -196, 3397}, 0, {4178, 1311}, {46, 55, 151, 255} }}, - {{ {3818, 213, 4158}, 0, {-5527, 2523}, {166, 90, 0, 255} }}, - {{ {3818, 213, 5768}, 0, {2194, 2523}, {183, 73, 73, 255} }}, - {{ {4023, 213, 5768}, 0, {2194, 1514}, {73, 73, 73, 255} }}, - {{ {4023, 213, 4158}, 0, {-5527, 1514}, {90, 90, 0, 255} }}, - {{ {6601, 110, 3470}, 0, {79, -3379}, {202, 35, 147, 255} }}, - {{ {5443, -196, 3759}, 0, {4178, 2251}, {151, 55, 210, 255} }}, - {{ {5515, 110, 4556}, 0, {79, 5068}, {147, 35, 202, 255} }}, - {{ {5805, -196, 3397}, 0, {4178, -562}, {210, 55, 151, 255} }}, +static const Vtx water_land_3_dl_mesh_vtx_0[18] = { + {{ {1233, 110, 3470}, 0, {103, 4129}, {54, 35, 147, 255} }}, + {{ {2319, 110, 4556}, 0, {103, -4319}, {109, 35, 202, 255} }}, + {{ {2391, -196, 3759}, 0, {3947, -1501}, {105, 55, 210, 255} }}, + {{ {1233, 110, 3470}, 0, {103, 4129}, {54, 35, 147, 255} }}, + {{ {2391, -196, 3759}, 0, {3947, -1501}, {105, 55, 210, 255} }}, + {{ {2029, -196, 3397}, 0, {3947, 1311}, {46, 55, 151, 255} }}, + {{ {3818, 213, 4158}, 0, {-1485, 1514}, {166, 90, 0, 255} }}, + {{ {3818, 213, 5768}, 0, {-9290, 1514}, {183, 73, 73, 255} }}, + {{ {4023, 213, 5768}, 0, {-9290, 2523}, {73, 73, 73, 255} }}, + {{ {3818, 213, 4158}, 0, {-1485, 1514}, {166, 90, 0, 255} }}, + {{ {4023, 213, 5768}, 0, {-9290, 2523}, {73, 73, 73, 255} }}, + {{ {4023, 213, 4158}, 0, {-1485, 2523}, {90, 90, 0, 255} }}, + {{ {6601, 110, 3470}, 0, {103, -3379}, {202, 35, 147, 255} }}, + {{ {5443, -196, 3759}, 0, {3947, 2251}, {151, 55, 210, 255} }}, + {{ {5515, 110, 4556}, 0, {103, 5068}, {147, 35, 202, 255} }}, + {{ {6601, 110, 3470}, 0, {103, -3379}, {202, 35, 147, 255} }}, + {{ {5805, -196, 3397}, 0, {3947, -562}, {210, 55, 151, 255} }}, + {{ {5443, -196, 3759}, 0, {3947, 2251}, {151, 55, 210, 255} }}, }; static const Gfx water_land_3_dl_mesh_tri_0[] = { - gsSPVertex(water_land_3_dl_mesh_vtx_0 + 0, 12, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_0 + 0, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_0 + 15, 3, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_1[39] = { +static const Vtx water_land_3_dl_mesh_vtx_1[61] = { {{ {3405, -1427, 5642}, 0, {2004, -1070}, {49, 0, 139, 255} }}, {{ {3405, -4087, 5642}, 0, {-8, -1070}, {49, 0, 139, 255} }}, {{ {845, -4087, 3082}, 0, {-8, -4145}, {117, 0, 207, 255} }}, + {{ {3405, -1427, 5642}, 0, {2004, -1070}, {49, 0, 139, 255} }}, + {{ {845, -4087, 3082}, 0, {-8, -4145}, {117, 0, 207, 255} }}, {{ {845, -1427, 3082}, 0, {2004, -4145}, {110, 0, 192, 255} }}, {{ {845, -1427, -2040}, 0, {2004, -2294}, {117, 0, 49, 255} }}, {{ {845, -4087, -2040}, 0, {-8, -2294}, {117, 0, 49, 255} }}, {{ {2893, -4087, -4088}, 0, {-8, 974}, {49, 0, 117, 255} }}, + {{ {845, -1427, -2040}, 0, {2004, -2294}, {117, 0, 49, 255} }}, + {{ {2893, -4087, -4088}, 0, {-8, 974}, {49, 0, 117, 255} }}, {{ {2893, -1427, -4088}, 0, {2004, 974}, {49, 0, 117, 255} }}, {{ {4429, -1427, 5642}, 0, {2004, -209}, {207, 0, 139, 255} }}, {{ {3405, -4087, 5642}, 0, {-8, 974}, {49, 0, 139, 255} }}, {{ {3405, -1427, 5642}, 0, {2004, 974}, {49, 0, 139, 255} }}, + {{ {4429, -1427, 5642}, 0, {2004, -209}, {207, 0, 139, 255} }}, {{ {4429, -4087, 5642}, 0, {-8, -209}, {207, 0, 139, 255} }}, + {{ {3405, -4087, 5642}, 0, {-8, 974}, {49, 0, 139, 255} }}, {{ {6989, -4087, -2040}, 0, {-8, 17}, {139, 0, 49, 255} }}, {{ {6989, -4087, 3082}, 0, {-8, 5098}, {139, 0, 207, 255} }}, {{ {6989, -1427, 3082}, 0, {2004, 5098}, {146, 0, 192, 255} }}, + {{ {6989, -4087, -2040}, 0, {-8, 17}, {139, 0, 49, 255} }}, + {{ {6989, -1427, 3082}, 0, {2004, 5098}, {146, 0, 192, 255} }}, {{ {6989, -1427, -2040}, 0, {2004, 17}, {139, 0, 49, 255} }}, {{ {4941, -1427, -4088}, 0, {2004, -2102}, {207, 0, 117, 255} }}, {{ {4941, -4087, -4088}, 0, {-8, -2102}, {207, 0, 117, 255} }}, {{ {6989, -4087, -2040}, 0, {-8, 974}, {139, 0, 49, 255} }}, + {{ {4941, -1427, -4088}, 0, {2004, -2102}, {207, 0, 117, 255} }}, + {{ {6989, -4087, -2040}, 0, {-8, 974}, {139, 0, 49, 255} }}, {{ {6989, -1427, -2040}, 0, {2004, 974}, {139, 0, 49, 255} }}, {{ {6989, -1427, 3082}, 0, {2000, -2062}, {146, 0, 192, 255} }}, {{ {4429, -4087, 5642}, 0, {-8, 731}, {207, 0, 139, 255} }}, {{ {4429, -1427, 5642}, 0, {2004, 731}, {207, 0, 139, 255} }}, + {{ {6989, -1427, 3082}, 0, {2000, -2062}, {146, 0, 192, 255} }}, {{ {6989, -4087, 3082}, 0, {-12, -2062}, {139, 0, 207, 255} }}, + {{ {4429, -4087, 5642}, 0, {-8, 731}, {207, 0, 139, 255} }}, {{ {4941, -1427, -4088}, 0, {2004, 974}, {207, 0, 117, 255} }}, {{ {2893, -1427, -4088}, 0, {2004, -1066}, {49, 0, 117, 255} }}, {{ {2893, -4087, -4088}, 0, {-8, -1066}, {49, 0, 117, 255} }}, + {{ {4941, -1427, -4088}, 0, {2004, 974}, {207, 0, 117, 255} }}, + {{ {2893, -4087, -4088}, 0, {-8, -1066}, {49, 0, 117, 255} }}, {{ {4941, -4087, -4088}, 0, {-8, 974}, {207, 0, 117, 255} }}, {{ {845, -1427, -2040}, 0, {2004, 232}, {117, 0, 49, 255} }}, {{ {845, -1690, -504}, 0, {1807, 1683}, {115, 218, 38, 255} }}, {{ {845, -2714, -504}, 0, {1027, 1683}, {115, 38, 38, 255} }}, {{ {845, -1690, 519}, 0, {1807, 2652}, {115, 218, 218, 255} }}, - {{ {845, -1690, 519}, 0, {1807, 2652}, {115, 218, 218, 255} }}, + {{ {845, -1690, -504}, 0, {1807, 1683}, {115, 218, 38, 255} }}, + {{ {845, -1427, -2040}, 0, {2004, 232}, {117, 0, 49, 255} }}, {{ {845, -1427, -2040}, 0, {2004, 232}, {117, 0, 49, 255} }}, {{ {845, -1427, 3082}, 0, {2004, 5072}, {110, 0, 192, 255} }}, + {{ {845, -1690, 519}, 0, {1807, 2652}, {115, 218, 218, 255} }}, + {{ {845, -4087, 3082}, 0, {-8, 5072}, {117, 0, 207, 255} }}, + {{ {845, -1690, 519}, 0, {1807, 2652}, {115, 218, 218, 255} }}, {{ {845, -4087, 3082}, 0, {-8, 5072}, {117, 0, 207, 255} }}, {{ {845, -2714, 519}, 0, {1027, 2652}, {115, 38, 218, 255} }}, + {{ {845, -2714, 519}, 0, {1027, 2652}, {115, 38, 218, 255} }}, {{ {845, -4087, -2040}, 0, {-8, 232}, {117, 0, 49, 255} }}, + {{ {845, -4087, -2040}, 0, {-8, 232}, {117, 0, 49, 255} }}, + {{ {845, -2714, -504}, 0, {1027, 1683}, {115, 38, 38, 255} }}, + {{ {845, -1427, -2040}, 0, {2004, 232}, {117, 0, 49, 255} }}, {{ {845, -2714, -504}, 0, {1027, 1683}, {115, 38, 38, 255} }}, }; static const Gfx water_land_3_dl_mesh_tri_1[] = { - gsSPVertex(water_land_3_dl_mesh_vtx_1 + 0, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_1 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_1 + 16, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_1 + 15, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(15, 13, 12, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_1 + 32, 7, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_1 + 30, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_1 + 45, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), gsSP1Triangle(0, 3, 4, 0), - gsSP1Triangle(4, 3, 5, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(1, 6, 5, 0), + gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(10, 6, 11, 0), + gsSP1Triangle(9, 12, 13, 0), + gsSP1Triangle(14, 15, 11, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_2[56] = { +static const Vtx water_land_3_dl_mesh_vtx_2[79] = { {{ {2319, -401, 4556}, 0, {707, 738}, {104, 237, 185, 255} }}, {{ {2319, 110, 4556}, 0, {1063, 738}, {109, 35, 202, 255} }}, {{ {3405, 110, 5642}, 0, {1063, 2041}, {29, 102, 186, 255} }}, + {{ {2319, -401, 4556}, 0, {707, 738}, {104, 237, 185, 255} }}, + {{ {3405, 110, 5642}, 0, {1063, 2041}, {29, 102, 186, 255} }}, {{ {3405, -1427, 5642}, 0, {-16, 2041}, {49, 0, 139, 255} }}, {{ {1233, -401, 3470}, 0, {707, -595}, {71, 237, 152, 255} }}, - {{ {845, -1427, 3082}, 0, {-16, -1071}, {110, 0, 192, 255} }}, + {{ {2319, -401, 4556}, 0, {707, 738}, {104, 237, 185, 255} }}, + {{ {3405, -1427, 5642}, 0, {-16, 2041}, {49, 0, 139, 255} }}, {{ {845, 110, 3082}, 0, {1063, -1071}, {80, 57, 176, 255} }}, {{ {1233, 110, 3470}, 0, {1063, -595}, {54, 35, 147, 255} }}, + {{ {1233, -401, 3470}, 0, {707, -595}, {71, 237, 152, 255} }}, {{ {4429, -1427, 5642}, 0, {-12, 793}, {207, 0, 139, 255} }}, {{ {4429, 110, 5642}, 0, {1069, 793}, {227, 102, 186, 255} }}, {{ {5515, 110, 4556}, 0, {1069, -416}, {147, 35, 202, 255} }}, + {{ {4429, -1427, 5642}, 0, {-12, 793}, {207, 0, 139, 255} }}, + {{ {5515, 110, 4556}, 0, {1069, -416}, {147, 35, 202, 255} }}, {{ {5515, -401, 4556}, 0, {705, -416}, {152, 237, 185, 255} }}, + {{ {4429, -1427, 5642}, 0, {-12, 793}, {207, 0, 139, 255} }}, + {{ {6989, -1427, 3082}, 0, {-12, -2061}, {146, 0, 192, 255} }}, + {{ {5515, -401, 4556}, 0, {705, -416}, {152, 237, 185, 255} }}, + {{ {6601, -401, 3470}, 0, {705, -1628}, {185, 237, 152, 255} }}, {{ {6989, -1427, 3082}, 0, {-12, -2061}, {146, 0, 192, 255} }}, {{ {6601, -401, 3470}, 0, {705, -1628}, {185, 237, 152, 255} }}, {{ {6989, 110, 3082}, 0, {1069, -2061}, {176, 57, 176, 255} }}, + {{ {6601, -401, 3470}, 0, {705, -1628}, {185, 237, 152, 255} }}, {{ {6601, 110, 3470}, 0, {1069, -1628}, {202, 35, 147, 255} }}, - {{ {2893, 1544, 6151}, 0, {1996, -2084}, {49, 0, 139, 255} }}, - {{ {2893, 8, 6151}, 0, {956, -2084}, {49, 0, 139, 255} }}, - {{ {845, 8, 4103}, 0, {956, 974}, {90, 0, 166, 255} }}, - {{ {845, 1544, 4103}, 0, {1996, 974}, {117, 0, 207, 255} }}, - {{ {845, 1544, -2040}, 0, {1996, -2292}, {117, 0, 49, 255} }}, - {{ {2893, -1427, -4088}, 0, {-16, 974}, {49, 0, 117, 255} }}, - {{ {2893, 1544, -4088}, 0, {1996, 974}, {49, 0, 117, 255} }}, - {{ {845, -1427, -2040}, 0, {-16, -2292}, {117, 0, 49, 255} }}, - {{ {845, 1544, 4103}, 0, {1996, 6082}, {117, 0, 207, 255} }}, - {{ {845, -1427, -2040}, 0, {-16, 198}, {117, 0, 49, 255} }}, - {{ {845, 1544, -2040}, 0, {1996, 198}, {117, 0, 49, 255} }}, - {{ {845, -1427, 4103}, 0, {-16, 6082}, {127, 0, 0, 255} }}, - {{ {6989, 1544, -2040}, 0, {1996, 27}, {139, 0, 49, 255} }}, - {{ {6989, -1427, -2040}, 0, {-16, 27}, {139, 0, 49, 255} }}, - {{ {6989, -1427, 4103}, 0, {-16, 6125}, {129, 0, 0, 255} }}, - {{ {6989, 1544, 4103}, 0, {1996, 6125}, {139, 0, 207, 255} }}, - {{ {2893, 8, 6151}, 0, {956, 974}, {49, 0, 139, 255} }}, - {{ {2893, 1544, 6151}, 0, {1996, 974}, {49, 0, 139, 255} }}, - {{ {4941, 1544, 6151}, 0, {1996, -1070}, {207, 0, 139, 255} }}, - {{ {4941, 8, 6151}, 0, {956, -1070}, {207, 0, 139, 255} }}, - {{ {4941, -1427, -4088}, 0, {-16, 974}, {207, 0, 117, 255} }}, - {{ {4941, 1544, -4088}, 0, {1996, 974}, {207, 0, 117, 255} }}, - {{ {2893, 1544, -4088}, 0, {1996, -1070}, {49, 0, 117, 255} }}, - {{ {2893, -1427, -4088}, 0, {-16, -1070}, {49, 0, 117, 255} }}, - {{ {4941, 1544, -4088}, 0, {1996, -2084}, {207, 0, 117, 255} }}, - {{ {4941, -1427, -4088}, 0, {-16, -2084}, {207, 0, 117, 255} }}, - {{ {6989, -1427, -2040}, 0, {-16, 974}, {139, 0, 49, 255} }}, - {{ {6989, 1544, -2040}, 0, {1996, 974}, {139, 0, 49, 255} }}, + {{ {6989, 110, 3082}, 0, {1069, -2061}, {176, 57, 176, 255} }}, + {{ {2893, 1544, 6151}, 0, {2035, 974}, {49, 0, 139, 255} }}, + {{ {2893, 8, 6151}, 0, {980, 974}, {49, 0, 139, 255} }}, + {{ {845, 8, 4103}, 0, {980, -2084}, {90, 0, 166, 255} }}, + {{ {2893, 1544, 6151}, 0, {2035, 974}, {49, 0, 139, 255} }}, + {{ {845, 8, 4103}, 0, {980, -2084}, {90, 0, 166, 255} }}, + {{ {845, 1544, 4103}, 0, {2035, -2084}, {117, 0, 207, 255} }}, + {{ {4941, -1427, -4088}, 0, {-5, 974}, {207, 0, 117, 255} }}, + {{ {4941, 1544, -4088}, 0, {2035, 974}, {207, 0, 117, 255} }}, + {{ {2893, 1544, -4088}, 0, {2035, -1070}, {49, 0, 117, 255} }}, + {{ {4941, -1427, -4088}, 0, {-5, 974}, {207, 0, 117, 255} }}, + {{ {2893, 1544, -4088}, 0, {2035, -1070}, {49, 0, 117, 255} }}, + {{ {2893, -1427, -4088}, 0, {-5, -1070}, {49, 0, 117, 255} }}, {{ {4429, 110, 5642}, 0, {1066, -209}, {227, 102, 186, 255} }}, {{ {3405, -1427, 5642}, 0, {-16, 974}, {49, 0, 139, 255} }}, {{ {3405, 110, 5642}, 0, {1066, 974}, {29, 102, 186, 255} }}, + {{ {4429, 110, 5642}, 0, {1066, -209}, {227, 102, 186, 255} }}, {{ {4429, -1427, 5642}, 0, {-16, -209}, {207, 0, 139, 255} }}, - {{ {6989, 1544, 4103}, 0, {1996, -2084}, {139, 0, 207, 255} }}, - {{ {4941, 8, 6151}, 0, {956, 974}, {207, 0, 139, 255} }}, - {{ {4941, 1544, 6151}, 0, {1996, 974}, {207, 0, 139, 255} }}, - {{ {6989, 8, 4103}, 0, {956, -2084}, {166, 0, 166, 255} }}, + {{ {6989, 1544, 4103}, 0, {2035, -2084}, {139, 0, 207, 255} }}, + {{ {4941, 8, 6151}, 0, {980, 974}, {207, 0, 139, 255} }}, + {{ {4941, 1544, 6151}, 0, {2035, 974}, {207, 0, 139, 255} }}, + {{ {6989, 1544, 4103}, 0, {2035, -2084}, {139, 0, 207, 255} }}, + {{ {6989, 8, 4103}, 0, {980, -2084}, {166, 0, 166, 255} }}, + {{ {4941, 8, 6151}, 0, {980, 974}, {207, 0, 139, 255} }}, + {{ {845, 1544, -2040}, 0, {2035, -2292}, {117, 0, 49, 255} }}, + {{ {2893, -1427, -4088}, 0, {-5, 974}, {49, 0, 117, 255} }}, + {{ {2893, 1544, -4088}, 0, {2035, 974}, {49, 0, 117, 255} }}, + {{ {845, -1427, -2040}, 0, {-5, -2292}, {117, 0, 49, 255} }}, + {{ {845, -1427, 3082}, 0, {-16, -1071}, {110, 0, 192, 255} }}, + {{ {1233, -401, 3470}, 0, {707, -595}, {71, 237, 152, 255} }}, + {{ {3405, -1427, 5642}, 0, {-16, 2041}, {49, 0, 139, 255} }}, + {{ {845, 110, 3082}, 0, {1063, -1071}, {80, 57, 176, 255} }}, + {{ {845, 1544, 4103}, 0, {2035, 6082}, {117, 0, 207, 255} }}, + {{ {845, -1427, -2040}, 0, {-5, 198}, {117, 0, 49, 255} }}, + {{ {845, 1544, -2040}, 0, {2035, 198}, {117, 0, 49, 255} }}, + {{ {845, -1427, 4103}, 0, {-5, 6082}, {127, 0, 0, 255} }}, + {{ {6989, 1544, -2040}, 0, {2035, 14}, {139, 0, 49, 255} }}, + {{ {6989, -1427, -2040}, 0, {-5, 14}, {139, 0, 49, 255} }}, + {{ {6989, -1427, 4103}, 0, {-5, 6088}, {129, 0, 0, 255} }}, + {{ {6989, 1544, 4103}, 0, {2035, 6088}, {139, 0, 207, 255} }}, + {{ {2893, 8, 6151}, 0, {980, -1070}, {49, 0, 139, 255} }}, + {{ {2893, 1544, 6151}, 0, {2035, -1070}, {49, 0, 139, 255} }}, + {{ {4941, 1544, 6151}, 0, {2035, 974}, {207, 0, 139, 255} }}, + {{ {4941, 8, 6151}, 0, {980, 974}, {207, 0, 139, 255} }}, + {{ {4941, 1544, -4088}, 0, {2035, -2084}, {207, 0, 117, 255} }}, + {{ {4941, -1427, -4088}, 0, {-5, -2084}, {207, 0, 117, 255} }}, + {{ {6989, -1427, -2040}, 0, {-5, 974}, {139, 0, 49, 255} }}, + {{ {6989, 1544, -2040}, 0, {2035, 974}, {139, 0, 49, 255} }}, {{ {845, 1544, 6151}, 0, {1992, 1008}, {0, 129, 0, 255} }}, {{ {845, 1544, -4088}, 0, {1992, -16}, {0, 129, 0, 255} }}, {{ {6989, 1544, -4088}, 0, {1992, -16}, {0, 129, 0, 255} }}, @@ -155,46 +208,48 @@ static const Vtx water_land_3_dl_mesh_vtx_2[56] = { }; static const Gfx water_land_3_dl_mesh_tri_2[] = { - gsSPVertex(water_land_3_dl_mesh_vtx_2 + 0, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 0, 3, 0), - gsSP1Triangle(5, 4, 3, 0), - gsSP1Triangle(5, 6, 4, 0), - gsSP1Triangle(6, 7, 4, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), - gsSP1Triangle(8, 11, 12, 0), - gsSP1Triangle(11, 13, 12, 0), - gsSP1Triangle(13, 14, 12, 0), - gsSP1Triangle(13, 15, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_2 + 16, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_2 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_2 + 32, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_2 + 15, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(3, 2, 4, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(8, 9, 4, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_2 + 31, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 10, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_2 + 45, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(6, 9, 7, 0), + gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(10, 13, 11, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_2 + 59, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 1, 0), gsSP1Triangle(4, 5, 6, 0), gsSP1Triangle(4, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(8, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 15, 13, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_2 + 48, 8, 0), + gsSP1Triangle(12, 14, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_2 + 75, 4, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(0, 2, 3, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_3[184] = { +static const Vtx water_land_3_dl_mesh_vtx_3[302] = { {{ {-6751, -3419, 519}, 0, {2267, 483}, {46, 251, 138, 255} }}, {{ {-6751, -3000, 519}, 0, {1657, 483}, {49, 0, 139, 255} }}, {{ {-6327, -3000, 519}, 0, {1657, 1504}, {207, 0, 139, 255} }}, @@ -203,16 +258,19 @@ static const Vtx water_land_3_dl_mesh_vtx_3[184] = { {{ {-7050, -3419, -204}, 0, {2267, 1500}, {118, 253, 46, 255} }}, {{ {-7050, -3000, -204}, 0, {1657, 1500}, {117, 0, 49, 255} }}, {{ {-7050, -3000, 220}, 0, {1657, 480}, {117, 0, 207, 255} }}, + {{ {-7050, -3419, -204}, 0, {2267, 1500}, {118, 253, 46, 255} }}, {{ {-7050, -3000, 220}, 0, {1657, 480}, {117, 0, 207, 255} }}, {{ {-7050, -3419, 220}, 0, {2267, 480}, {117, 0, 207, 255} }}, {{ {-6751, -3419, -504}, 0, {2267, 1500}, {45, 251, 119, 255} }}, {{ {-6751, -3000, -504}, 0, {1657, 1500}, {49, 0, 117, 255} }}, {{ {-7050, -3000, -204}, 0, {1657, 480}, {117, 0, 49, 255} }}, + {{ {-6751, -3419, -504}, 0, {2267, 1500}, {45, 251, 119, 255} }}, {{ {-7050, -3000, -204}, 0, {1657, 480}, {117, 0, 49, 255} }}, {{ {-7050, -3419, -204}, 0, {2267, 480}, {118, 253, 46, 255} }}, {{ {-7050, -3419, 220}, 0, {2267, 483}, {117, 0, 207, 255} }}, {{ {-7050, -3000, 220}, 0, {1657, 483}, {117, 0, 207, 255} }}, {{ {-6751, -3000, 519}, 0, {1657, 1504}, {49, 0, 139, 255} }}, + {{ {-7050, -3419, 220}, 0, {2267, 483}, {117, 0, 207, 255} }}, {{ {-6751, -3000, 519}, 0, {1657, 1510}, {49, 0, 139, 255} }}, {{ {-6751, -3419, 519}, 0, {2267, 1511}, {46, 251, 138, 255} }}, {{ {-6327, -3419, -504}, 0, {2267, 1500}, {203, 10, 115, 255} }}, @@ -223,114 +281,204 @@ static const Vtx water_land_3_dl_mesh_vtx_3[184] = { {{ {-6027, -3419, 220}, 0, {2249, 487}, {139, 19, 210, 255} }}, {{ {-6027, -3000, 220}, 0, {1644, 487}, {139, 0, 207, 255} }}, {{ {-6027, -3000, -204}, 0, {1644, 1498}, {139, 0, 49, 255} }}, + {{ {-6027, -3419, 220}, 0, {2249, 487}, {139, 19, 210, 255} }}, {{ {-6027, -3000, -204}, 0, {1644, 1496}, {139, 0, 49, 255} }}, {{ {-6027, -3419, -204}, 0, {2249, 1495}, {139, 19, 47, 255} }}, {{ {3405, -3575, -504}, 0, {-616, -3644}, {0, 127, 0, 255} }}, {{ {3610, -3268, -94}, 0, {-688, -3428}, {252, 127, 248, 255} }}, {{ {3814, -3268, -299}, 0, {-400, -3428}, {255, 127, 250, 255} }}, {{ {4655, -3626, 717}, 0, {-524, -2118}, {28, 123, 15, 255} }}, + {{ {3814, -3268, -299}, 0, {-400, -3428}, {255, 127, 250, 255} }}, + {{ {3610, -3268, -94}, 0, {-688, -3428}, {252, 127, 248, 255} }}, + {{ {4655, -3626, 717}, 0, {-524, -2118}, {28, 123, 15, 255} }}, + {{ {3610, -3268, -94}, 0, {-688, -3428}, {252, 127, 248, 255} }}, {{ {3931, -3626, 1441}, 0, {-1548, -2118}, {6, 125, 23, 255} }}, + {{ {3931, -3626, 1441}, 0, {-1548, -2118}, {6, 125, 23, 255} }}, + {{ {3610, -3268, -94}, 0, {-688, -3428}, {252, 127, 248, 255} }}, {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, + {{ {3610, -3268, -94}, 0, {-688, -3428}, {252, 127, 248, 255} }}, + {{ {3200, -3268, -94}, 0, {-980, -3718}, {2, 127, 250, 255} }}, + {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, + {{ {3405, -3575, -504}, 0, {-760, -3790}, {0, 127, 0, 255} }}, + {{ {3200, -3268, -94}, 0, {-980, -3718}, {2, 127, 250, 255} }}, + {{ {3610, -3268, -94}, 0, {-688, -3428}, {252, 127, 248, 255} }}, + {{ {2995, -3268, -299}, 0, {-980, -4006}, {242, 126, 252, 255} }}, {{ {3200, -3268, -94}, 0, {-980, -3718}, {2, 127, 250, 255} }}, {{ {3405, -3575, -504}, 0, {-760, -3790}, {0, 127, 0, 255} }}, + {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, + {{ {3200, -3268, -94}, 0, {-980, -3718}, {2, 127, 250, 255} }}, + {{ {2995, -3268, -299}, 0, {-980, -4006}, {242, 126, 252, 255} }}, + {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, {{ {2995, -3268, -299}, 0, {-980, -4006}, {242, 126, 252, 255} }}, {{ {2483, -3626, -94}, 0, {-1484, -4224}, {197, 113, 2, 255} }}, + {{ {2483, -3626, -94}, 0, {-1484, -4224}, {197, 113, 2, 255} }}, + {{ {2995, -3268, -299}, 0, {-980, -4006}, {242, 126, 252, 255} }}, + {{ {2995, -3268, -709}, 0, {-688, -4296}, {226, 122, 238, 255} }}, + {{ {2995, -3268, -299}, 0, {-980, -4006}, {242, 126, 252, 255} }}, + {{ {3405, -3575, -504}, 0, {-616, -4078}, {0, 127, 0, 255} }}, + {{ {2995, -3268, -709}, 0, {-688, -4296}, {226, 122, 238, 255} }}, + {{ {3200, -3268, -914}, 0, {-400, -4296}, {242, 125, 238, 255} }}, {{ {2995, -3268, -709}, 0, {-688, -4296}, {226, 122, 238, 255} }}, {{ {3405, -3575, -504}, 0, {-616, -4078}, {0, 127, 0, 255} }}, {{ {3200, -3268, -914}, 0, {-400, -4296}, {242, 125, 238, 255} }}, {{ {3207, -3626, -1455}, 0, {-12, -4672}, {231, 116, 210, 255} }}, + {{ {3207, -3626, -1455}, 0, {-12, -4672}, {231, 116, 210, 255} }}, + {{ {3200, -3268, -914}, 0, {-400, -4296}, {242, 125, 238, 255} }}, {{ {3931, -3626, -1455}, 0, {496, -4162}, {6, 119, 213, 255} }}, + {{ {3200, -3268, -914}, 0, {-400, -4296}, {242, 125, 238, 255} }}, {{ {3610, -3268, -914}, 0, {-112, -4006}, {3, 126, 244, 255} }}, + {{ {3931, -3626, -1455}, 0, {496, -4162}, {6, 119, 213, 255} }}, {{ {3200, -3268, -914}, 0, {-400, -4296}, {242, 125, 238, 255} }}, {{ {3405, -3575, -504}, 0, {-328, -3934}, {0, 127, 0, 255} }}, {{ {3610, -3268, -914}, 0, {-112, -4006}, {3, 126, 244, 255} }}, + {{ {3610, -3268, -914}, 0, {-112, -4006}, {3, 126, 244, 255} }}, {{ {3814, -3268, -709}, 0, {-112, -3718}, {253, 127, 252, 255} }}, {{ {3931, -3626, -1455}, 0, {496, -4162}, {6, 119, 213, 255} }}, {{ {3405, -3575, -504}, 0, {-328, -3790}, {0, 127, 0, 255} }}, + {{ {3814, -3268, -709}, 0, {-112, -3718}, {253, 127, 252, 255} }}, + {{ {3610, -3268, -914}, 0, {-112, -4006}, {3, 126, 244, 255} }}, + {{ {3814, -3268, -709}, 0, {-112, -3718}, {253, 127, 252, 255} }}, {{ {5026, -3626, -1149}, 0, {1052, -3172}, {32, 122, 241, 255} }}, - {{ {4655, -3626, 717}, 0, {-524, -2118}, {28, 123, 15, 255} }}, - {{ {3814, -3268, -299}, 0, {-400, -3428}, {255, 127, 250, 255} }}, + {{ {3931, -3626, -1455}, 0, {496, -4162}, {6, 119, 213, 255} }}, {{ {3405, -3575, -504}, 0, {-472, -3644}, {0, 127, 0, 255} }}, + {{ {3814, -3268, -299}, 0, {-400, -3428}, {255, 127, 250, 255} }}, + {{ {5026, -3626, -1149}, 0, {1052, -3172}, {32, 122, 241, 255} }}, + {{ {4655, -3626, 717}, 0, {-524, -2118}, {28, 123, 15, 255} }}, {{ {6477, -4087, 1031}, 0, {540, -610}, {33, 122, 9, 255} }}, + {{ {6477, -4087, 1031}, 0, {540, -610}, {33, 122, 9, 255} }}, + {{ {4655, -3626, 717}, 0, {-524, -2118}, {28, 123, 15, 255} }}, + {{ {4429, -4087, 4103}, 0, {-3076, 112}, {5, 125, 23, 255} }}, + {{ {4655, -3626, 717}, 0, {-524, -2118}, {28, 123, 15, 255} }}, + {{ {3931, -3626, 1441}, 0, {-1548, -2118}, {6, 125, 23, 255} }}, {{ {4429, -4087, 4103}, 0, {-3076, 112}, {5, 125, 23, 255} }}, {{ {3931, -3626, 1441}, 0, {-1548, -2118}, {6, 125, 23, 255} }}, {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, + {{ {4429, -4087, 4103}, 0, {-3076, 112}, {5, 125, 23, 255} }}, + {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, + {{ {1869, -4087, 2567}, 0, {-3792, -2778}, {230, 123, 21, 255} }}, {{ {1869, -4087, 2567}, 0, {-3792, -2778}, {230, 123, 21, 255} }}, + {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, {{ {1357, -4087, 7}, 0, {-2352, -4946}, {209, 118, 0, 255} }}, {{ {2845, -3626, 1079}, 0, {-2056, -3140}, {228, 122, 22, 255} }}, {{ {2483, -3626, -94}, 0, {-1484, -4224}, {197, 113, 2, 255} }}, {{ {1357, -4087, 7}, 0, {-2352, -4946}, {209, 118, 0, 255} }}, + {{ {2483, -3626, -94}, 0, {-1484, -4224}, {197, 113, 2, 255} }}, + {{ {1664, -4087, -1221}, 0, {-1268, -5596}, {213, 118, 236, 255} }}, + {{ {2483, -3626, -94}, 0, {-1484, -4224}, {197, 113, 2, 255} }}, + {{ {2734, -3626, -769}, 0, {-832, -4522}, {188, 102, 221, 255} }}, {{ {1664, -4087, -1221}, 0, {-1268, -5596}, {213, 118, 236, 255} }}, + {{ {2483, -3626, -94}, 0, {-1484, -4224}, {197, 113, 2, 255} }}, + {{ {2995, -3268, -709}, 0, {-688, -4296}, {226, 122, 238, 255} }}, {{ {2734, -3626, -769}, 0, {-832, -4522}, {188, 102, 221, 255} }}, {{ {2995, -3268, -709}, 0, {-688, -4296}, {226, 122, 238, 255} }}, {{ {3207, -3626, -1455}, 0, {-12, -4672}, {231, 116, 210, 255} }}, + {{ {2734, -3626, -769}, 0, {-832, -4522}, {188, 102, 221, 255} }}, + {{ {1664, -4087, -1221}, 0, {-1268, -5596}, {213, 118, 236, 255} }}, + {{ {2734, -3626, -769}, 0, {-832, -4522}, {188, 102, 221, 255} }}, + {{ {3207, -3626, -1455}, 0, {-12, -4672}, {231, 116, 210, 255} }}, + {{ {1664, -4087, -1221}, 0, {-1268, -5596}, {213, 118, 236, 255} }}, + {{ {2893, -4087, -3064}, 0, {900, -6030}, {239, 122, 226, 255} }}, + {{ {2893, -4087, -3064}, 0, {900, -6030}, {239, 122, 226, 255} }}, + {{ {3207, -3626, -1455}, 0, {-12, -4672}, {231, 116, 210, 255} }}, + {{ {3931, -3626, -1455}, 0, {496, -4162}, {6, 119, 213, 255} }}, {{ {2893, -4087, -3064}, 0, {900, -6030}, {239, 122, 226, 255} }}, {{ {3931, -3626, -1455}, 0, {496, -4162}, {6, 119, 213, 255} }}, {{ {4941, -4087, -3576}, 0, {2708, -4946}, {10, 124, 229, 255} }}, + {{ {3931, -3626, -1455}, 0, {496, -4162}, {6, 119, 213, 255} }}, + {{ {5026, -3626, -1149}, 0, {1052, -3172}, {32, 122, 241, 255} }}, + {{ {4941, -4087, -3576}, 0, {2708, -4946}, {10, 124, 229, 255} }}, {{ {5026, -3626, -1149}, 0, {1052, -3172}, {32, 122, 241, 255} }}, {{ {6067, -4087, -1528}, 0, {2056, -2706}, {46, 117, 240, 255} }}, + {{ {4941, -4087, -3576}, 0, {2708, -4946}, {10, 124, 229, 255} }}, + {{ {5026, -3626, -1149}, 0, {1052, -3172}, {32, 122, 241, 255} }}, {{ {6477, -4087, 1031}, 0, {540, -610}, {33, 122, 9, 255} }}, - {{ {6989, -4087, 5659}, 0, {-2368, 3016}, {0, 127, 0, 255} }}, - {{ {845, -4087, -4088}, 0, {176, -8198}, {0, 127, 0, 255} }}, - {{ {845, -4087, 5659}, 0, {-6696, -1318}, {0, 127, 0, 255} }}, - {{ {6989, -4087, 5659}, 0, {-2368, 3016}, {0, 127, 0, 255} }}, - {{ {6989, -4087, -4088}, 0, {4512, -3862}, {0, 127, 0, 255} }}, - {{ {845, -4087, -4088}, 0, {176, -8198}, {0, 127, 0, 255} }}, + {{ {6067, -4087, -1528}, 0, {2056, -2706}, {46, 117, 240, 255} }}, {{ {-7148, -3884, -504}, 0, {9, 1497}, {8, 213, 119, 255} }}, {{ {-7148, -3584, -204}, 0, {9, 485}, {22, 141, 50, 255} }}, {{ {-8850, -3584, -204}, 0, {1761, 485}, {0, 139, 49, 255} }}, + {{ {-7148, -3884, -504}, 0, {9, 1497}, {8, 213, 119, 255} }}, + {{ {-8850, -3584, -204}, 0, {1761, 485}, {0, 139, 49, 255} }}, {{ {-8850, -3884, -504}, 0, {1761, 1497}, {0, 207, 117, 255} }}, {{ {-7148, -4307, -504}, 0, {9, 1497}, {245, 53, 115, 255} }}, {{ {-7148, -3884, -504}, 0, {9, 485}, {8, 213, 119, 255} }}, {{ {-8850, -3884, -504}, 0, {1761, 485}, {0, 207, 117, 255} }}, + {{ {-7148, -4307, -504}, 0, {9, 1497}, {245, 53, 115, 255} }}, + {{ {-8850, -3884, -504}, 0, {1761, 485}, {0, 207, 117, 255} }}, {{ {-8850, -4307, -504}, 0, {1761, 1497}, {0, 49, 117, 255} }}, {{ {-7148, -4607, -204}, 0, {9, 1497}, {234, 116, 46, 255} }}, {{ {-7148, -4307, -504}, 0, {9, 485}, {245, 53, 115, 255} }}, {{ {-8850, -4307, -504}, 0, {1761, 485}, {0, 49, 117, 255} }}, + {{ {-7148, -4607, -204}, 0, {9, 1497}, {234, 116, 46, 255} }}, + {{ {-8850, -4307, -504}, 0, {1761, 485}, {0, 49, 117, 255} }}, {{ {-8850, -4607, -204}, 0, {1761, 1497}, {0, 117, 49, 255} }}, {{ {-7148, -4607, 220}, 0, {9, 487}, {234, 116, 210, 255} }}, {{ {-7148, -4607, -204}, 0, {9, 1498}, {234, 116, 46, 255} }}, {{ {-8850, -4607, -204}, 0, {1761, 1498}, {0, 117, 49, 255} }}, + {{ {-7148, -4607, 220}, 0, {9, 487}, {234, 116, 210, 255} }}, + {{ {-8850, -4607, -204}, 0, {1761, 1498}, {0, 117, 49, 255} }}, {{ {-8850, -4607, 220}, 0, {1761, 487}, {0, 117, 207, 255} }}, {{ {-7148, -4307, 519}, 0, {4, 483}, {245, 53, 141, 255} }}, {{ {-7148, -4607, 220}, 0, {4, 1504}, {234, 116, 210, 255} }}, {{ {-8850, -4607, 220}, 0, {1771, 1511}, {0, 117, 207, 255} }}, + {{ {-7148, -4307, 519}, 0, {4, 483}, {245, 53, 141, 255} }}, + {{ {-8850, -4607, 220}, 0, {1771, 1511}, {0, 117, 207, 255} }}, {{ {-8850, -4307, 519}, 0, {1771, 483}, {0, 49, 139, 255} }}, {{ {-7148, -3884, 519}, 0, {4, 483}, {8, 213, 137, 255} }}, {{ {-7148, -4307, 519}, 0, {4, 1504}, {245, 53, 141, 255} }}, {{ {-8850, -4307, 519}, 0, {1771, 1504}, {0, 49, 139, 255} }}, + {{ {-7148, -3884, 519}, 0, {4, 483}, {8, 213, 137, 255} }}, + {{ {-8850, -4307, 519}, 0, {1771, 1504}, {0, 49, 139, 255} }}, {{ {-8850, -3884, 519}, 0, {1771, 483}, {0, 207, 139, 255} }}, {{ {-7148, -3584, 220}, 0, {4, 483}, {22, 141, 206, 255} }}, {{ {-7148, -3884, 519}, 0, {4, 1504}, {8, 213, 137, 255} }}, {{ {-8850, -3884, 519}, 0, {1771, 1504}, {0, 207, 139, 255} }}, + {{ {-7148, -3584, 220}, 0, {4, 483}, {22, 141, 206, 255} }}, + {{ {-8850, -3884, 519}, 0, {1771, 1504}, {0, 207, 139, 255} }}, {{ {-8850, -3584, 220}, 0, {1771, 483}, {0, 139, 207, 255} }}, {{ {-7148, -3584, -204}, 0, {4, 1500}, {22, 141, 50, 255} }}, {{ {-7148, -3584, 220}, 0, {4, 480}, {22, 141, 206, 255} }}, {{ {-8850, -3584, 220}, 0, {1771, 480}, {0, 139, 207, 255} }}, + {{ {-7148, -3584, -204}, 0, {4, 1500}, {22, 141, 50, 255} }}, + {{ {-8850, -3584, 220}, 0, {1771, 480}, {0, 139, 207, 255} }}, {{ {-8850, -3584, -204}, 0, {1771, 1500}, {0, 139, 49, 255} }}, {{ {-7148, -4307, 519}, 0, {1830, 492}, {245, 53, 141, 255} }}, {{ {-6538, -4058, 519}, 0, {1326, 491}, {213, 40, 143, 255} }}, {{ {-6327, -4270, 220}, 0, {1323, 1498}, {170, 82, 211, 255} }}, + {{ {-7148, -4307, 519}, 0, {1830, 492}, {245, 53, 141, 255} }}, + {{ {-6327, -4270, 220}, 0, {1323, 1498}, {170, 82, 211, 255} }}, {{ {-7148, -4607, 220}, 0, {1830, 1500}, {234, 116, 210, 255} }}, {{ {-7148, -4307, -504}, 0, {1826, 1498}, {245, 53, 115, 255} }}, {{ {-6538, -4058, -504}, 0, {1323, 1498}, {212, 40, 112, 255} }}, {{ {-6838, -3759, -504}, 0, {1327, 485}, {26, 234, 122, 255} }}, + {{ {-7148, -4307, -504}, 0, {1826, 1498}, {245, 53, 115, 255} }}, + {{ {-6838, -3759, -504}, 0, {1327, 485}, {26, 234, 122, 255} }}, {{ {-7148, -3884, -504}, 0, {1826, 485}, {8, 213, 119, 255} }}, {{ {-7148, -3584, 220}, 0, {1824, 484}, {22, 141, 206, 255} }}, {{ {-7050, -3547, 220}, 0, {1323, 485}, {91, 191, 196, 255} }}, {{ {-6838, -3759, 519}, 0, {1323, 1497}, {26, 233, 134, 255} }}, + {{ {-7148, -3584, 220}, 0, {1824, 484}, {22, 141, 206, 255} }}, + {{ {-6838, -3759, 519}, 0, {1323, 1497}, {26, 233, 134, 255} }}, {{ {-7148, -3884, 519}, 0, {1824, 1497}, {8, 213, 137, 255} }}, {{ {-7148, -4607, 220}, 0, {1827, 483}, {234, 116, 210, 255} }}, {{ {-6327, -4270, -204}, 0, {1326, 1495}, {170, 82, 45, 255} }}, {{ {-7148, -4607, -204}, 0, {1827, 1495}, {234, 116, 46, 255} }}, + {{ {-7148, -4607, 220}, 0, {1827, 483}, {234, 116, 210, 255} }}, + {{ {-6327, -4270, 220}, 0, {1326, 483}, {170, 82, 211, 255} }}, + {{ {-6327, -4270, -204}, 0, {1326, 1495}, {170, 82, 45, 255} }}, {{ {-6327, -4270, 220}, 0, {1326, 483}, {170, 82, 211, 255} }}, {{ {-6027, -3419, -204}, 0, {211, 1495}, {139, 19, 47, 255} }}, + {{ {-6327, -4270, -204}, 0, {1326, 1495}, {170, 82, 45, 255} }}, {{ {-6027, -3419, 220}, 0, {211, 483}, {139, 19, 210, 255} }}, + {{ {-6027, -3419, -204}, 0, {211, 1495}, {139, 19, 47, 255} }}, {{ {-7148, -3884, -504}, 0, {1824, 1499}, {8, 213, 119, 255} }}, {{ {-6838, -3759, -504}, 0, {1323, 1499}, {26, 234, 122, 255} }}, {{ {-7050, -3547, -204}, 0, {1323, 488}, {97, 195, 55, 255} }}, + {{ {-7050, -3547, -204}, 0, {1323, 488}, {97, 195, 55, 255} }}, {{ {-7148, -3584, -204}, 0, {1824, 486}, {22, 141, 50, 255} }}, {{ {-7148, -3584, -204}, 0, {1824, 488}, {22, 141, 50, 255} }}, + {{ {-7050, -3547, -204}, 0, {1323, 488}, {97, 195, 55, 255} }}, + {{ {-7050, -3547, 220}, 0, {1323, -526}, {91, 191, 196, 255} }}, + {{ {-7148, -3584, -204}, 0, {1824, 488}, {22, 141, 50, 255} }}, {{ {-7050, -3547, 220}, 0, {1323, -526}, {91, 191, 196, 255} }}, {{ {-7148, -3584, 220}, 0, {1824, -526}, {22, 141, 206, 255} }}, {{ {-7148, -3884, 519}, 0, {1826, 485}, {8, 213, 137, 255} }}, @@ -342,490 +490,628 @@ static const Vtx water_land_3_dl_mesh_vtx_3[184] = { {{ {-7148, -4607, -204}, 0, {1830, 1494}, {234, 116, 46, 255} }}, {{ {-6327, -4270, -204}, 0, {1323, 1492}, {170, 82, 45, 255} }}, {{ {-6538, -4058, -504}, 0, {1323, 483}, {212, 40, 112, 255} }}, + {{ {-7148, -4607, -204}, 0, {1830, 1494}, {234, 116, 46, 255} }}, + {{ {-6538, -4058, -504}, 0, {1323, 483}, {212, 40, 112, 255} }}, {{ {-7148, -4307, -504}, 0, {1830, 486}, {245, 53, 115, 255} }}, {{ {-6838, -3759, -504}, 0, {1323, 1495}, {26, 234, 122, 255} }}, {{ {-6751, -3419, -504}, 0, {201, 1495}, {45, 251, 119, 255} }}, {{ {-7050, -3419, -204}, 0, {201, 484}, {118, 253, 46, 255} }}, + {{ {-6838, -3759, -504}, 0, {1323, 1495}, {26, 234, 122, 255} }}, + {{ {-7050, -3419, -204}, 0, {201, 484}, {118, 253, 46, 255} }}, {{ {-7050, -3547, -204}, 0, {1323, 482}, {97, 195, 55, 255} }}, {{ {-6327, -4270, -204}, 0, {1319, 1500}, {170, 82, 45, 255} }}, {{ {-6027, -3419, -204}, 0, {201, 1502}, {139, 19, 47, 255} }}, {{ {-6327, -3419, -504}, 0, {201, 485}, {203, 10, 115, 255} }}, + {{ {-6327, -4270, -204}, 0, {1319, 1500}, {170, 82, 45, 255} }}, + {{ {-6327, -3419, -504}, 0, {201, 485}, {203, 10, 115, 255} }}, {{ {-6538, -4058, -504}, 0, {1311, 483}, {212, 40, 112, 255} }}, {{ {-6538, -4058, 519}, 0, {1311, 481}, {213, 40, 143, 255} }}, {{ {-6327, -3419, 519}, 0, {201, 483}, {204, 9, 141, 255} }}, {{ {-6027, -3419, 220}, 0, {201, 1500}, {139, 19, 210, 255} }}, + {{ {-6538, -4058, 519}, 0, {1311, 481}, {213, 40, 143, 255} }}, {{ {-6327, -4270, 220}, 0, {1319, 1498}, {170, 82, 211, 255} }}, {{ {-7050, -3547, 220}, 0, {1323, 488}, {91, 191, 196, 255} }}, {{ {-7050, -3419, 220}, 0, {201, 489}, {117, 0, 207, 255} }}, {{ {-6751, -3419, 519}, 0, {201, 1500}, {46, 251, 138, 255} }}, + {{ {-7050, -3547, 220}, 0, {1323, 488}, {91, 191, 196, 255} }}, + {{ {-6751, -3419, 519}, 0, {201, 1500}, {46, 251, 138, 255} }}, {{ {-6838, -3759, 519}, 0, {1323, 1500}, {26, 233, 134, 255} }}, {{ {-6538, -4058, -504}, 0, {1328, 1496}, {212, 40, 112, 255} }}, {{ {-6327, -3419, -504}, 0, {201, 1496}, {203, 10, 115, 255} }}, {{ {-6751, -3419, -504}, 0, {201, 483}, {45, 251, 119, 255} }}, + {{ {-6538, -4058, -504}, 0, {1328, 1496}, {212, 40, 112, 255} }}, + {{ {-6751, -3419, -504}, 0, {201, 483}, {45, 251, 119, 255} }}, {{ {-6838, -3759, -504}, 0, {1328, 483}, {26, 234, 122, 255} }}, {{ {-6838, -3759, 519}, 0, {1328, 487}, {26, 233, 134, 255} }}, {{ {-6751, -3419, 519}, 0, {201, 487}, {46, 251, 138, 255} }}, {{ {-6327, -3419, 519}, 0, {201, 1500}, {204, 9, 141, 255} }}, + {{ {-6327, -3419, 519}, 0, {201, 1500}, {204, 9, 141, 255} }}, {{ {-6538, -4058, 519}, 0, {1328, 1500}, {213, 40, 143, 255} }}, {{ {-7050, -3547, -204}, 0, {1319, 488}, {97, 195, 55, 255} }}, {{ {-7050, -3419, -204}, 0, {204, 488}, {118, 253, 46, 255} }}, {{ {-7050, -3419, 220}, 0, {204, -526}, {117, 0, 207, 255} }}, + {{ {-7050, -3547, -204}, 0, {1319, 488}, {97, 195, 55, 255} }}, + {{ {-7050, -3419, 220}, 0, {204, -526}, {117, 0, 207, 255} }}, {{ {-7050, -3547, 220}, 0, {1319, -526}, {91, 191, 196, 255} }}, {{ {-6027, -3419, -204}, 0, {2249, 1500}, {139, 19, 47, 255} }}, {{ {-6027, -3000, -204}, 0, {1644, 1499}, {139, 0, 49, 255} }}, {{ {-6327, -3000, -504}, 0, {1644, 487}, {207, 0, 117, 255} }}, + {{ {-6027, -3419, -204}, 0, {2249, 1500}, {139, 19, 47, 255} }}, {{ {-6327, -3419, -504}, 0, {2249, 488}, {203, 10, 115, 255} }}, {{ {-6327, -3419, 519}, 0, {2272, 483}, {204, 9, 141, 255} }}, {{ {-6327, -3000, 519}, 0, {1662, 483}, {207, 0, 139, 255} }}, {{ {-6027, -3000, 220}, 0, {1662, 1500}, {139, 0, 207, 255} }}, + {{ {-6327, -3419, 519}, 0, {2272, 483}, {204, 9, 141, 255} }}, + {{ {-6027, -3000, 220}, 0, {1662, 1500}, {139, 0, 207, 255} }}, {{ {-6027, -3419, 220}, 0, {2272, 1500}, {139, 19, 210, 255} }}, + {{ {5026, -3626, -1149}, 0, {1052, -3172}, {32, 122, 241, 255} }}, + {{ {3814, -3268, -709}, 0, {-112, -3718}, {253, 127, 252, 255} }}, + {{ {4655, -3626, 717}, 0, {-524, -2118}, {28, 123, 15, 255} }}, + {{ {3814, -3268, -299}, 0, {-400, -3428}, {255, 127, 250, 255} }}, + {{ {6989, -4087, 5659}, 0, {-2368, 3016}, {0, 127, 0, 255} }}, + {{ {845, -4087, -4088}, 0, {176, -8198}, {0, 127, 0, 255} }}, + {{ {845, -4087, 5659}, 0, {-6696, -1318}, {0, 127, 0, 255} }}, + {{ {6989, -4087, -4088}, 0, {4512, -3862}, {0, 127, 0, 255} }}, }; static const Gfx water_land_3_dl_mesh_tri_3[] = { - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 0, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 0, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(0, 3, 4, 0), gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(5, 8, 9, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 13, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 15, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 4, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(5, 8, 9, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 13, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 30, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 2, 1, 0), - gsSP1Triangle(3, 1, 4, 0), - gsSP1Triangle(4, 1, 5, 0), - gsSP1Triangle(1, 6, 5, 0), - gsSP1Triangle(7, 6, 1, 0), - gsSP1Triangle(8, 6, 7, 0), - gsSP1Triangle(5, 6, 8, 0), - gsSP1Triangle(5, 8, 9, 0), - gsSP1Triangle(9, 8, 10, 0), - gsSP1Triangle(8, 11, 10, 0), - gsSP1Triangle(12, 10, 11, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSP1Triangle(13, 12, 14, 0), - gsSP1Triangle(12, 15, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 46, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 3, 4, 0), - gsSP1Triangle(5, 3, 2, 0), - gsSP1Triangle(3, 6, 4, 0), - gsSP1Triangle(6, 3, 7, 0), - gsSP1Triangle(3, 8, 7, 0), - gsSP1Triangle(3, 9, 8, 0), - gsSP1Triangle(6, 7, 10, 0), - gsSP1Triangle(10, 7, 11, 0), - gsSP1Triangle(7, 12, 11, 0), + gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 13, 14, 0), - gsSP1Triangle(14, 13, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 62, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 14, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 1, 3, 0), - gsSP1Triangle(1, 4, 3, 0), - gsSP1Triangle(1, 5, 4, 0), - gsSP1Triangle(5, 6, 4, 0), - gsSP1Triangle(3, 4, 6, 0), - gsSP1Triangle(3, 6, 7, 0), - gsSP1Triangle(7, 6, 8, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(8, 10, 9, 0), - gsSP1Triangle(10, 11, 9, 0), - gsSP1Triangle(10, 12, 11, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 78, 15, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 28, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(3, 5, 6, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(7, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 13, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 93, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 109, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 43, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 125, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 58, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(3, 4, 1, 0), - gsSP1Triangle(3, 5, 4, 0), + gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 8, 9, 0), - gsSP1Triangle(10, 8, 11, 0), - gsSP1Triangle(10, 11, 12, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(8, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 72, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 87, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(11, 12, 10, 0), gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 141, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 103, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(3, 5, 6, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(7, 9, 10, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(5, 9, 10, 0), gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 13, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 156, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 117, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 8, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 131, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_3 + 172, 12, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 146, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 161, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 176, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 191, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 206, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 220, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(5, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 234, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 249, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 8, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 263, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 277, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 8, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_3 + 291, 11, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(4, 6, 5, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(7, 10, 8, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_4[54] = { - {{ {3405, 110, 5642}, 0, {1515, -610}, {29, 102, 186, 255} }}, - {{ {845, 110, 3082}, 0, {1515, 6617}, {80, 57, 176, 255} }}, - {{ {845, 110, 6666}, 0, {6573, 1559}, {0, 127, 0, 255} }}, - {{ {6989, 110, 6666}, 0, {-2099, -7114}, {0, 127, 0, 255} }}, - {{ {4429, 110, 5642}, 0, {69, -2055}, {227, 102, 186, 255} }}, - {{ {6989, 110, 3082}, 0, {-7159, -2055}, {176, 57, 176, 255} }}, +static const Vtx water_land_3_dl_mesh_vtx_4[78] = { + {{ {3405, 110, 5642}, 0, {1446, -625}, {29, 102, 186, 255} }}, + {{ {845, 110, 3082}, 0, {1446, 6679}, {80, 57, 176, 255} }}, + {{ {845, 110, 6666}, 0, {6606, 1567}, {0, 127, 0, 255} }}, + {{ {3405, 110, 5642}, 0, {1446, -625}, {29, 102, 186, 255} }}, + {{ {6989, 110, 6666}, 0, {-2242, -7198}, {0, 127, 0, 255} }}, + {{ {4429, 110, 5642}, 0, {-30, -2085}, {227, 102, 186, 255} }}, + {{ {3405, 110, 5642}, 0, {1446, -625}, {29, 102, 186, 255} }}, + {{ {6989, 110, 3082}, 0, {-7404, -2085}, {176, 57, 176, 255} }}, + {{ {4429, 110, 5642}, 0, {-30, -2085}, {227, 102, 186, 255} }}, {{ {2029, -196, 3397}, 0, {4563, -574}, {46, 55, 151, 255} }}, {{ {2391, -196, 3759}, 0, {1827, -574}, {105, 55, 210, 255} }}, {{ {2391, -298, 3759}, 0, {1827, -67}, {98, 185, 217, 255} }}, + {{ {2391, -298, 3759}, 0, {1827, -67}, {98, 185, 217, 255} }}, {{ {2029, -298, 3397}, 0, {4563, -67}, {39, 185, 158, 255} }}, {{ {2319, -401, 4556}, 0, {4563, 439}, {104, 237, 185, 255} }}, {{ {2391, -298, 3759}, 0, {1242, -67}, {98, 185, 217, 255} }}, {{ {2319, 110, 4556}, 0, {4563, -2100}, {109, 35, 202, 255} }}, {{ {2391, -196, 3759}, 0, {1242, -576}, {105, 55, 210, 255} }}, + {{ {2319, 110, 4556}, 0, {4563, -2100}, {109, 35, 202, 255} }}, {{ {1233, 110, 3470}, 0, {4563, -2100}, {54, 35, 147, 255} }}, {{ {2029, -196, 3397}, 0, {1242, -576}, {46, 55, 151, 255} }}, {{ {1233, -401, 3470}, 0, {4563, 441}, {71, 237, 152, 255} }}, + {{ {2029, -196, 3397}, 0, {1242, -576}, {46, 55, 151, 255} }}, {{ {2029, -298, 3397}, 0, {1242, -67}, {39, 185, 158, 255} }}, + {{ {1233, -401, 3470}, 0, {4563, 441}, {71, 237, 152, 255} }}, {{ {2029, -298, 3397}, 0, {4008, -3116}, {39, 185, 158, 255} }}, {{ {2391, -298, 3759}, 0, {1242, -3116}, {98, 185, 217, 255} }}, {{ {2319, -401, 4556}, 0, {-1529, -27}, {104, 237, 185, 255} }}, + {{ {2029, -298, 3397}, 0, {4008, -3116}, {39, 185, 158, 255} }}, + {{ {2319, -401, 4556}, 0, {-1529, -27}, {104, 237, 185, 255} }}, {{ {1233, -401, 3470}, 0, {6779, -27}, {71, 237, 152, 255} }}, {{ {3818, 110, 4158}, 0, {2384, -5829}, {166, 166, 0, 255} }}, {{ {4023, 110, 4158}, 0, {1537, -5829}, {90, 166, 0, 255} }}, {{ {4023, 110, 5768}, 0, {1537, 599}, {73, 183, 73, 255} }}, + {{ {3818, 110, 4158}, 0, {2384, -5829}, {166, 166, 0, 255} }}, + {{ {4023, 110, 5768}, 0, {1537, 599}, {73, 183, 73, 255} }}, {{ {3818, 110, 5768}, 0, {2384, 599}, {183, 183, 73, 255} }}, {{ {4023, 213, 5768}, 0, {-3762, -17}, {73, 73, 73, 255} }}, {{ {4023, 110, 5768}, 0, {-3762, 372}, {73, 183, 73, 255} }}, {{ {4023, 110, 4158}, 0, {2889, 372}, {90, 166, 0, 255} }}, + {{ {4023, 213, 5768}, 0, {-3762, -17}, {73, 73, 73, 255} }}, + {{ {4023, 110, 4158}, 0, {2889, 372}, {90, 166, 0, 255} }}, {{ {4023, 213, 4158}, 0, {2889, -17}, {90, 90, 0, 255} }}, {{ {3818, 213, 5768}, 0, {494, 478}, {183, 73, 73, 255} }}, {{ {3818, 110, 5768}, 0, {494, 936}, {183, 183, 73, 255} }}, {{ {4023, 110, 5768}, 0, {1492, 936}, {73, 183, 73, 255} }}, + {{ {3818, 213, 5768}, 0, {494, 478}, {183, 73, 73, 255} }}, + {{ {4023, 110, 5768}, 0, {1492, 936}, {73, 183, 73, 255} }}, {{ {4023, 213, 5768}, 0, {1492, 478}, {73, 73, 73, 255} }}, - {{ {3818, 213, 4158}, 0, {8838, 987}, {166, 90, 0, 255} }}, - {{ {3818, 110, 4158}, 0, {8838, 504}, {166, 166, 0, 255} }}, - {{ {3818, 110, 5768}, 0, {2384, 504}, {183, 183, 73, 255} }}, - {{ {3818, 213, 5768}, 0, {2384, 987}, {183, 73, 73, 255} }}, + {{ {3818, 213, 4158}, 0, {9439, 987}, {166, 90, 0, 255} }}, + {{ {3818, 110, 4158}, 0, {9439, 504}, {166, 166, 0, 255} }}, + {{ {3818, 110, 5768}, 0, {2365, 504}, {183, 183, 73, 255} }}, + {{ {3818, 213, 4158}, 0, {9439, 987}, {166, 90, 0, 255} }}, + {{ {3818, 110, 5768}, 0, {2365, 504}, {183, 183, 73, 255} }}, + {{ {3818, 213, 5768}, 0, {2365, 987}, {183, 73, 73, 255} }}, {{ {5805, -196, 3397}, 0, {4563, -574}, {210, 55, 151, 255} }}, {{ {5443, -298, 3759}, 0, {1827, -67}, {158, 185, 217, 255} }}, {{ {5443, -196, 3759}, 0, {1827, -574}, {151, 55, 210, 255} }}, + {{ {5805, -196, 3397}, 0, {4563, -574}, {210, 55, 151, 255} }}, {{ {5805, -298, 3397}, 0, {4563, -67}, {217, 185, 158, 255} }}, + {{ {5443, -298, 3759}, 0, {1827, -67}, {158, 185, 217, 255} }}, {{ {5515, -401, 4556}, 0, {4563, 439}, {152, 237, 185, 255} }}, {{ {5515, 110, 4556}, 0, {4563, -2100}, {147, 35, 202, 255} }}, {{ {5443, -298, 3759}, 0, {1242, -67}, {158, 185, 217, 255} }}, + {{ {5515, 110, 4556}, 0, {4563, -2100}, {147, 35, 202, 255} }}, {{ {5443, -196, 3759}, 0, {1242, -576}, {151, 55, 210, 255} }}, {{ {6601, 110, 3470}, 0, {4563, -2100}, {202, 35, 147, 255} }}, {{ {6601, -401, 3470}, 0, {4563, 441}, {185, 237, 152, 255} }}, {{ {5805, -196, 3397}, 0, {1242, -576}, {210, 55, 151, 255} }}, + {{ {5805, -196, 3397}, 0, {1242, -576}, {210, 55, 151, 255} }}, + {{ {6601, -401, 3470}, 0, {4563, 441}, {185, 237, 152, 255} }}, {{ {5805, -298, 3397}, 0, {1242, -67}, {217, 185, 158, 255} }}, {{ {5805, -298, 3397}, 0, {4008, -3116}, {217, 185, 158, 255} }}, {{ {5515, -401, 4556}, 0, {-1529, -27}, {152, 237, 185, 255} }}, {{ {5443, -298, 3759}, 0, {1242, -3116}, {158, 185, 217, 255} }}, + {{ {5805, -298, 3397}, 0, {4008, -3116}, {217, 185, 158, 255} }}, {{ {6601, -401, 3470}, 0, {6779, -27}, {185, 237, 152, 255} }}, + {{ {5515, -401, 4556}, 0, {-1529, -27}, {152, 237, 185, 255} }}, }; static const Gfx water_land_3_dl_mesh_tri_4[] = { gsSPVertex(water_land_3_dl_mesh_vtx_4 + 0, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(3, 4, 0, 0), - gsSP1Triangle(3, 5, 4, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 8, 9, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(11, 13, 12, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_4 + 14, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), + gsSP1Triangle(3, 2, 4, 0), gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(4, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_4 + 14, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(1, 3, 4, 0), + gsSP1Triangle(5, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_4 + 28, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_4 + 30, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_4 + 43, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(14, 13, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_4 + 46, 8, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_4 + 58, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 1, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_4 + 72, 6, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_5[92] = { +static const Vtx water_land_3_dl_mesh_vtx_5[152] = { {{ {-3775, 294, 519}, 0, {2025, 990}, {167, 166, 0, 255} }}, {{ {-3874, 392, 519}, 0, {2025, 1220}, {219, 165, 176, 255} }}, {{ {-3874, 392, -504}, 0, {78, 1224}, {219, 165, 80, 255} }}, + {{ {-3775, 294, 519}, 0, {2025, 990}, {167, 166, 0, 255} }}, + {{ {-3874, 392, -504}, 0, {78, 1224}, {219, 165, 80, 255} }}, {{ {-3775, 294, -504}, 0, {77, 990}, {167, 166, 0, 255} }}, - {{ {-3145, -333, 519}, 0, {876, 581}, {166, 166, 0, 255} }}, - {{ {-3775, 294, 519}, 0, {876, -38}, {167, 166, 0, 255} }}, - {{ {-3775, 294, -504}, 0, {-36, -38}, {167, 166, 0, 255} }}, - {{ {-3145, -333, -504}, 0, {-34, 581}, {166, 166, 0, 255} }}, {{ {-3874, -691, -504}, 0, {2025, 4018}, {39, 38, 115, 255} }}, {{ {-3874, -1445, 519}, 0, {77, 5454}, {91, 38, 176, 255} }}, {{ {-3874, -1445, -504}, 0, {2025, 5454}, {91, 38, 80, 255} }}, + {{ {-3874, -691, -504}, 0, {2025, 4018}, {39, 38, 115, 255} }}, + {{ {-3874, -691, 519}, 0, {77, 4018}, {39, 38, 141, 255} }}, + {{ {-3874, -1445, 519}, 0, {77, 5454}, {91, 38, 176, 255} }}, + {{ {-5867, -691, -204}, 0, {1455, 382}, {207, 107, 47, 255} }}, {{ {-3874, -691, 519}, 0, {77, 4018}, {39, 38, 141, 255} }}, + {{ {-3874, -691, -504}, 0, {2025, 4018}, {39, 38, 115, 255} }}, {{ {-5867, -691, -204}, 0, {1455, 382}, {207, 107, 47, 255} }}, {{ {-5867, -691, 220}, 0, {648, 382}, {212, 107, 203, 255} }}, + {{ {-3874, -691, 519}, 0, {77, 4018}, {39, 38, 141, 255} }}, {{ {-3874, -1445, -504}, 0, {2025, -3645}, {91, 38, 80, 255} }}, {{ {-3874, -1445, 519}, 0, {77, -3645}, {91, 38, 176, 255} }}, {{ {-2603, -2714, 519}, 0, {77, 113}, {38, 91, 176, 255} }}, + {{ {-3874, -1445, -504}, 0, {2025, -3645}, {91, 38, 80, 255} }}, + {{ {-2603, -2714, 519}, 0, {77, 113}, {38, 91, 176, 255} }}, + {{ {-2603, -2714, -504}, 0, {2025, 113}, {38, 91, 80, 255} }}, {{ {-2603, -2714, -504}, 0, {2025, 113}, {38, 91, 80, 255} }}, {{ {-2498, -2714, 519}, 0, {77, 346}, {0, 127, 0, 255} }}, + {{ {-2603, -2714, -504}, 0, {2025, 113}, {38, 91, 80, 255} }}, {{ {-2498, -2714, -504}, 0, {2025, 346}, {0, 127, 0, 255} }}, - {{ {-2498, -2714, -504}, 0, {872, -33}, {0, 127, 0, 255} }}, - {{ {-2498, -2714, 519}, 0, {-57, -33}, {0, 127, 0, 255} }}, - {{ {-1546, -2714, 519}, 0, {-57, 580}, {0, 127, 0, 255} }}, - {{ {-1546, -2714, -504}, 0, {872, 580}, {0, 127, 0, 255} }}, {{ {845, -2714, 519}, 0, {77, 7151}, {115, 38, 218, 255} }}, {{ {845, -2714, -504}, 0, {2025, 7151}, {115, 38, 38, 255} }}, {{ {-1546, -2714, -504}, 0, {2025, 2450}, {0, 127, 0, 255} }}, + {{ {845, -2714, 519}, 0, {77, 7151}, {115, 38, 218, 255} }}, + {{ {-1546, -2714, -504}, 0, {2025, 2450}, {0, 127, 0, 255} }}, {{ {-1546, -2714, 519}, 0, {77, 2450}, {0, 127, 0, 255} }}, {{ {-3874, 392, -504}, 0, {168, -997}, {219, 165, 80, 255} }}, {{ {-3874, -691, -504}, 0, {168, 978}, {39, 38, 115, 255} }}, {{ {-2603, -872, -504}, 0, {-2151, 1307}, {165, 218, 80, 255} }}, + {{ {-2603, -872, -504}, 0, {-2151, 1307}, {165, 218, 80, 255} }}, + {{ {-3874, -691, -504}, 0, {168, 978}, {39, 38, 115, 255} }}, + {{ {-3874, -1445, -504}, 0, {168, 2354}, {91, 38, 80, 255} }}, + {{ {-2603, -872, -504}, 0, {-2151, 1307}, {165, 218, 80, 255} }}, {{ {-3874, -1445, -504}, 0, {168, 2354}, {91, 38, 80, 255} }}, {{ {-2603, -1692, -504}, 0, {-2151, 2805}, {179, 233, 99, 255} }}, + {{ {-2603, -1692, -504}, 0, {-2151, 2805}, {179, 233, 99, 255} }}, {{ {-2603, -2714, -504}, 0, {-2151, 4671}, {38, 91, 80, 255} }}, + {{ {-2603, -1692, -504}, 0, {-2151, 2805}, {179, 233, 99, 255} }}, {{ {-2285, -2185, -504}, 0, {-2733, 3705}, {222, 194, 106, 255} }}, + {{ {-2285, -2185, -504}, 0, {-2733, 3705}, {222, 194, 106, 255} }}, + {{ {-2603, -2714, -504}, 0, {-2151, 4671}, {38, 91, 80, 255} }}, {{ {-1173, -2714, -504}, 0, {-4739, 4671}, {0, 0, 127, 255} }}, + {{ {-2285, -2185, -504}, 0, {-2733, 3705}, {222, 194, 106, 255} }}, {{ {-1173, -2185, -504}, 0, {-4739, 3705}, {34, 194, 106, 255} }}, {{ {845, -1690, -504}, 0, {-8276, 2778}, {115, 218, 38, 255} }}, + {{ {-1173, -2185, -504}, 0, {-4739, 3705}, {34, 194, 106, 255} }}, {{ {845, -2714, -504}, 0, {-8276, 4671}, {115, 38, 38, 255} }}, + {{ {845, -1690, -504}, 0, {-8276, 2778}, {115, 218, 38, 255} }}, + {{ {845, -1690, -504}, 0, {-8276, 2778}, {115, 218, 38, 255} }}, {{ {-854, -1692, -504}, 0, {-5302, 2778}, {48, 168, 78, 255} }}, + {{ {-1173, -2185, -504}, 0, {-4739, 3705}, {34, 194, 106, 255} }}, {{ {-3874, 392, 519}, 0, {168, -1000}, {219, 165, 176, 255} }}, {{ {-2603, -872, 519}, 0, {-2151, 1307}, {165, 218, 176, 255} }}, {{ {-3874, -691, 519}, 0, {168, 978}, {39, 38, 141, 255} }}, + {{ {-2603, -872, 519}, 0, {-2151, 1307}, {165, 218, 176, 255} }}, {{ {-3874, -1445, 519}, 0, {168, 2354}, {91, 38, 176, 255} }}, + {{ {-3874, -691, 519}, 0, {168, 978}, {39, 38, 141, 255} }}, {{ {-2603, -872, 519}, 0, {-2151, 1307}, {165, 218, 176, 255} }}, {{ {-2603, -1692, 519}, 0, {-2151, 2805}, {179, 233, 157, 255} }}, {{ {-3874, -1445, 519}, 0, {168, 2354}, {91, 38, 176, 255} }}, + {{ {-2603, -1692, 519}, 0, {-2151, 2805}, {179, 233, 157, 255} }}, {{ {-2603, -2714, 519}, 0, {-2151, 4671}, {38, 91, 176, 255} }}, + {{ {-2603, -1692, 519}, 0, {-2151, 2805}, {179, 233, 157, 255} }}, + {{ {-2285, -2185, 519}, 0, {-2733, 3705}, {222, 194, 150, 255} }}, {{ {-2285, -2185, 519}, 0, {-2733, 3705}, {222, 194, 150, 255} }}, {{ {-1173, -2714, 519}, 0, {-4739, 4671}, {0, 0, 129, 255} }}, + {{ {-2603, -2714, 519}, 0, {-2151, 4671}, {38, 91, 176, 255} }}, + {{ {-1173, -2185, 519}, 0, {-4739, 3705}, {34, 194, 150, 255} }}, {{ {-1173, -2185, 519}, 0, {-4739, 3705}, {34, 194, 150, 255} }}, {{ {-854, -1692, 519}, 0, {-5302, 2778}, {48, 168, 178, 255} }}, + {{ {-1173, -2714, 519}, 0, {-4739, 4671}, {0, 0, 129, 255} }}, + {{ {-854, -1692, 519}, 0, {-5302, 2778}, {48, 168, 178, 255} }}, + {{ {845, -1690, 519}, 0, {-8276, 2778}, {115, 218, 218, 255} }}, {{ {845, -1690, 519}, 0, {-8276, 2778}, {115, 218, 218, 255} }}, {{ {845, -2714, 519}, 0, {-8276, 4671}, {115, 38, 218, 255} }}, {{ {-2285, -2185, -504}, 0, {2022, 379}, {222, 194, 106, 255} }}, {{ {-2285, -2185, 519}, 0, {77, 379}, {222, 194, 150, 255} }}, {{ {-2603, -1692, 519}, 0, {77, 1478}, {179, 233, 157, 255} }}, + {{ {-2285, -2185, -504}, 0, {2022, 379}, {222, 194, 106, 255} }}, + {{ {-2603, -1692, 519}, 0, {77, 1478}, {179, 233, 157, 255} }}, + {{ {-2603, -1692, -504}, 0, {2022, 1478}, {179, 233, 99, 255} }}, + {{ {-2603, -1692, -504}, 0, {2022, 1478}, {179, 233, 99, 255} }}, + {{ {-2603, -1692, 519}, 0, {77, 1478}, {179, 233, 157, 255} }}, + {{ {-2603, -872, 519}, 0, {77, 3038}, {165, 218, 176, 255} }}, {{ {-2603, -1692, -504}, 0, {2022, 1478}, {179, 233, 99, 255} }}, {{ {-2603, -872, 519}, 0, {77, 3038}, {165, 218, 176, 255} }}, {{ {-2603, -872, -504}, 0, {2022, 3038}, {165, 218, 80, 255} }}, {{ {-1173, -2185, -504}, 0, {2027, -2299}, {34, 194, 106, 255} }}, {{ {-1173, -2185, 519}, 0, {77, -2299}, {34, 194, 150, 255} }}, {{ {-2285, -2185, 519}, 0, {77, 379}, {222, 194, 150, 255} }}, + {{ {-1173, -2185, -504}, 0, {2027, -2299}, {34, 194, 106, 255} }}, + {{ {-2285, -2185, 519}, 0, {77, 379}, {222, 194, 150, 255} }}, {{ {-2285, -2185, -504}, 0, {2027, 379}, {222, 194, 106, 255} }}, {{ {845, -1690, 519}, 0, {77, -3430}, {115, 218, 218, 255} }}, {{ {-854, -1692, 519}, 0, {77, -652}, {48, 168, 178, 255} }}, {{ {-854, -1692, -504}, 0, {2026, -652}, {48, 168, 78, 255} }}, + {{ {-854, -1692, -504}, 0, {2026, -652}, {48, 168, 78, 255} }}, {{ {845, -1690, -504}, 0, {2026, -3430}, {115, 218, 38, 255} }}, {{ {-1173, -2185, -504}, 0, {2022, 1795}, {34, 194, 106, 255} }}, {{ {-854, -1692, -504}, 0, {2022, 696}, {48, 168, 78, 255} }}, {{ {-854, -1692, 519}, 0, {77, 696}, {48, 168, 178, 255} }}, + {{ {-1173, -2185, -504}, 0, {2022, 1795}, {34, 194, 106, 255} }}, + {{ {-854, -1692, 519}, 0, {77, 696}, {48, 168, 178, 255} }}, {{ {-1173, -2185, 519}, 0, {77, 1795}, {34, 194, 150, 255} }}, {{ {-2603, -872, 519}, 0, {77, -1052}, {165, 218, 176, 255} }}, {{ {-3145, -333, 519}, 0, {77, 246}, {166, 166, 0, 255} }}, {{ {-3145, -333, -504}, 0, {2023, 246}, {166, 166, 0, 255} }}, + {{ {-2603, -872, 519}, 0, {77, -1052}, {165, 218, 176, 255} }}, {{ {-2603, -872, -504}, 0, {2022, -1052}, {165, 218, 80, 255} }}, {{ {-5867, -391, -504}, 0, {3807, 431}, {248, 36, 121, 255} }}, {{ {-5867, -691, -204}, 0, {3807, 978}, {207, 107, 47, 255} }}, {{ {-3874, -691, -504}, 0, {168, 978}, {39, 38, 115, 255} }}, {{ {-5867, 32, -504}, 0, {3807, -343}, {18, 210, 117, 255} }}, + {{ {-5867, -391, -504}, 0, {3807, 431}, {248, 36, 121, 255} }}, + {{ {-3874, -691, -504}, 0, {168, 978}, {39, 38, 115, 255} }}, + {{ {-5867, 32, -504}, 0, {3807, -343}, {18, 210, 117, 255} }}, + {{ {-3874, -691, -504}, 0, {168, 978}, {39, 38, 115, 255} }}, {{ {-3874, 392, -504}, 0, {166, -989}, {219, 165, 80, 255} }}, {{ {-5867, 392, -204}, 0, {3800, -942}, {33, 143, 47, 255} }}, + {{ {-5867, 32, -504}, 0, {3807, -343}, {18, 210, 117, 255} }}, + {{ {-3874, 392, -504}, 0, {166, -989}, {219, 165, 80, 255} }}, {{ {-5867, -391, 519}, 0, {3807, 431}, {249, 38, 135, 255} }}, {{ {-3874, -691, 519}, 0, {168, 978}, {39, 38, 141, 255} }}, {{ {-5867, -691, 220}, 0, {3807, 978}, {212, 107, 203, 255} }}, {{ {-5867, 32, 519}, 0, {3807, -343}, {19, 210, 139, 255} }}, + {{ {-3874, -691, 519}, 0, {168, 978}, {39, 38, 141, 255} }}, {{ {-3874, 392, 519}, 0, {166, -989}, {219, 165, 176, 255} }}, + {{ {-3874, -691, 519}, 0, {168, 978}, {39, 38, 141, 255} }}, {{ {-5867, 392, 220}, 0, {3800, -942}, {33, 143, 209, 255} }}, + {{ {-3874, 392, 519}, 0, {166, -989}, {219, 165, 176, 255} }}, + {{ {-5867, 32, 519}, 0, {3807, -343}, {19, 210, 139, 255} }}, {{ {-3874, 392, -504}, 0, {2025, 1199}, {219, 165, 80, 255} }}, {{ {-3874, 392, 519}, 0, {77, 1199}, {219, 165, 176, 255} }}, {{ {-5867, 392, 220}, 0, {648, 4835}, {33, 143, 209, 255} }}, + {{ {-5867, 392, 220}, 0, {648, 4835}, {33, 143, 209, 255} }}, {{ {-5867, 392, -204}, 0, {1455, 4835}, {33, 143, 47, 255} }}, + {{ {-3145, -333, 519}, 0, {876, 581}, {166, 166, 0, 255} }}, + {{ {-3775, 294, 519}, 0, {876, -38}, {167, 166, 0, 255} }}, + {{ {-3775, 294, -504}, 0, {-36, -38}, {167, 166, 0, 255} }}, + {{ {-3145, -333, -504}, 0, {-34, 581}, {166, 166, 0, 255} }}, + {{ {-2498, -2714, -504}, 0, {872, -33}, {0, 127, 0, 255} }}, + {{ {-2498, -2714, 519}, 0, {-57, -33}, {0, 127, 0, 255} }}, + {{ {-1546, -2714, 519}, 0, {-57, 580}, {0, 127, 0, 255} }}, + {{ {-1546, -2714, -504}, 0, {872, 580}, {0, 127, 0, 255} }}, }; static const Gfx water_land_3_dl_mesh_tri_5[] = { - gsSPVertex(water_land_3_dl_mesh_vtx_5 + 0, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 11, 8, 0), - gsSP1Triangle(12, 13, 11, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_5 + 14, 14, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 15, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(3, 2, 4, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 8, 9, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_5 + 28, 16, 0), + gsSP1Triangle(9, 7, 10, 0), + gsSP1Triangle(11, 10, 12, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 31, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(2, 1, 3, 0), - gsSP1Triangle(2, 3, 4, 0), - gsSP1Triangle(4, 3, 5, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(6, 5, 7, 0), + gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 8, 7, 0), - gsSP1Triangle(7, 10, 9, 0), - gsSP1Triangle(9, 11, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 10, 13, 0), + gsSP1Triangle(14, 13, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 47, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 2, 4, 0), + gsSP1Triangle(5, 6, 2, 0), + gsSP1Triangle(2, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(13, 15, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_5 + 44, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 62, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), - gsSP1Triangle(1, 4, 3, 0), - gsSP1Triangle(4, 5, 3, 0), - gsSP1Triangle(4, 6, 5, 0), - gsSP1Triangle(5, 6, 7, 0), - gsSP1Triangle(5, 7, 8, 0), - gsSP1Triangle(8, 9, 5, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 5, 0), + gsSP1Triangle(8, 9, 7, 0), gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSP1Triangle(13, 12, 14, 0), - gsSP1Triangle(13, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_5 + 60, 16, 0), + gsSP1Triangle(9, 13, 11, 0), + gsSP1Triangle(11, 14, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 78, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(3, 4, 0, 0), + gsSP1Triangle(5, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_5 + 76, 16, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 92, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 0, 2, 0), - gsSP1Triangle(3, 2, 4, 0), - gsSP1Triangle(5, 3, 4, 0), + gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 7, 6, 0), - gsSP1Triangle(9, 10, 7, 0), - gsSP1Triangle(11, 10, 9, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 106, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 8, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 120, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 9, 0), + gsSP1Triangle(12, 14, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_5 + 136, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(12, 14, 15, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_6[32] = { +static const Vtx water_land_3_dl_mesh_vtx_6[45] = { {{ {-6006, -844, 220}, 0, {-86, 483}, {150, 46, 204, 255} }}, {{ {-5867, -691, 220}, 0, {-591, 483}, {212, 107, 203, 255} }}, {{ {-5867, -691, -204}, 0, {-591, 1495}, {207, 107, 47, 255} }}, + {{ {-6006, -844, 220}, 0, {-86, 483}, {150, 46, 204, 255} }}, + {{ {-5867, -691, -204}, 0, {-591, 1495}, {207, 107, 47, 255} }}, {{ {-6006, -844, -204}, 0, {-86, 1495}, {148, 48, 47, 255} }}, {{ {-6517, -333, 519}, 0, {-86, 483}, {45, 220, 143, 255} }}, {{ {-5867, 32, 519}, 0, {-591, 483}, {19, 210, 139, 255} }}, {{ {-5867, -391, 519}, 0, {-591, 1495}, {249, 38, 135, 255} }}, + {{ {-6517, -333, 519}, 0, {-86, 483}, {45, 220, 143, 255} }}, {{ {-6218, -632, 519}, 0, {-86, 1495}, {223, 23, 136, 255} }}, {{ {-6517, -333, -504}, 0, {-86, 1500}, {46, 221, 113, 255} }}, {{ {-5867, 32, -504}, 0, {-591, 1500}, {18, 210, 117, 255} }}, {{ {-5867, 392, -204}, 0, {-591, 489}, {33, 143, 47, 255} }}, + {{ {-5867, 392, -204}, 0, {-591, 489}, {33, 143, 47, 255} }}, {{ {-6729, -121, -204}, 0, {-86, 489}, {92, 181, 45, 255} }}, {{ {-6006, -844, -204}, 0, {-86, 1500}, {148, 48, 47, 255} }}, {{ {-5867, -691, -204}, 0, {-591, 1500}, {207, 107, 47, 255} }}, {{ {-5867, -391, -504}, 0, {-591, 489}, {248, 36, 121, 255} }}, + {{ {-6006, -844, -204}, 0, {-86, 1500}, {148, 48, 47, 255} }}, + {{ {-5867, -391, -504}, 0, {-591, 489}, {248, 36, 121, 255} }}, {{ {-6218, -632, -504}, 0, {-86, 489}, {225, 22, 121, 255} }}, {{ {-6218, -632, 519}, 0, {-86, 483}, {223, 23, 136, 255} }}, {{ {-5867, -391, 519}, 0, {-591, 483}, {249, 38, 135, 255} }}, {{ {-5867, -691, 220}, 0, {-591, 1495}, {212, 107, 203, 255} }}, + {{ {-6218, -632, 519}, 0, {-86, 483}, {223, 23, 136, 255} }}, + {{ {-5867, -691, 220}, 0, {-591, 1495}, {212, 107, 203, 255} }}, {{ {-6006, -844, 220}, 0, {-86, 1495}, {150, 46, 204, 255} }}, {{ {-6218, -632, -504}, 0, {-86, 1500}, {225, 22, 121, 255} }}, {{ {-5867, -391, -504}, 0, {-591, 1500}, {248, 36, 121, 255} }}, {{ {-5867, 32, -504}, 0, {-591, 489}, {18, 210, 117, 255} }}, + {{ {-6218, -632, -504}, 0, {-86, 1500}, {225, 22, 121, 255} }}, + {{ {-5867, 32, -504}, 0, {-591, 489}, {18, 210, 117, 255} }}, {{ {-6517, -333, -504}, 0, {-86, 489}, {46, 221, 113, 255} }}, {{ {-6729, -121, -204}, 0, {-591, 489}, {92, 181, 45, 255} }}, {{ {-5867, 392, -204}, 0, {-86, 489}, {33, 143, 47, 255} }}, {{ {-5867, 392, 220}, 0, {-86, 1500}, {33, 143, 209, 255} }}, + {{ {-5867, 392, 220}, 0, {-86, 1500}, {33, 143, 209, 255} }}, {{ {-6729, -121, 220}, 0, {-591, 1500}, {92, 181, 211, 255} }}, {{ {-6729, -121, 220}, 0, {-86, 483}, {92, 181, 211, 255} }}, {{ {-5867, 392, 220}, 0, {-591, 483}, {33, 143, 209, 255} }}, {{ {-5867, 32, 519}, 0, {-591, 1495}, {19, 210, 139, 255} }}, + {{ {-6729, -121, 220}, 0, {-86, 483}, {92, 181, 211, 255} }}, + {{ {-5867, 32, 519}, 0, {-591, 1495}, {19, 210, 139, 255} }}, {{ {-6517, -333, 519}, 0, {-86, 1495}, {45, 220, 143, 255} }}, }; static const Gfx water_land_3_dl_mesh_tri_6[] = { gsSPVertex(water_land_3_dl_mesh_vtx_6 + 0, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 8, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 14, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_6 + 16, 15, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_6 + 16, 16, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_6 + 31, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(3, 6, 7, 0), gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), + gsSP1Triangle(11, 12, 13, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_7[77] = { +static const Vtx water_land_3_dl_mesh_vtx_7[90] = { {{ {-6751, -3000, 519}, 0, {1636, 483}, {49, 0, 139, 255} }}, {{ {-6751, -1062, 519}, 0, {-1161, 483}, {52, 247, 141, 255} }}, {{ {-6327, -1062, 519}, 0, {-1161, 1504}, {210, 4, 138, 255} }}, {{ {-6751, -3000, 519}, 0, {1636, 482}, {49, 0, 139, 255} }}, - {{ {-6327, -1062, 519}, 0, {-1161, 1504}, {210, 4, 138, 255} }}, {{ {-6327, -3000, 519}, 0, {1636, 1510}, {207, 0, 139, 255} }}, {{ {-7050, -3000, -204}, 0, {1636, 1500}, {117, 0, 49, 255} }}, {{ {-7050, -1062, -204}, 0, {-1161, 1500}, {117, 237, 46, 255} }}, {{ {-7050, -1062, 220}, 0, {-1161, 480}, {117, 237, 210, 255} }}, + {{ {-7050, -3000, -204}, 0, {1636, 1500}, {117, 0, 49, 255} }}, {{ {-7050, -1062, 220}, 0, {-1161, 480}, {117, 237, 210, 255} }}, {{ {-7050, -3000, 220}, 0, {1636, 480}, {117, 0, 207, 255} }}, {{ {-6751, -3000, -504}, 0, {1636, 1500}, {49, 0, 117, 255} }}, @@ -838,7 +1124,6 @@ static const Vtx water_land_3_dl_mesh_vtx_7[77] = { {{ {-6027, -1062, -204}, 0, {-1152, 1497}, {138, 8, 47, 255} }}, {{ {-6327, -1062, -504}, 0, {-1152, 485}, {211, 5, 119, 255} }}, {{ {-6027, -3000, -204}, 0, {1623, 1499}, {139, 0, 49, 255} }}, - {{ {-6327, -1062, -504}, 0, {-1152, 485}, {211, 5, 119, 255} }}, {{ {-6327, -3000, -504}, 0, {1623, 487}, {207, 0, 117, 255} }}, {{ {-6327, -3000, 519}, 0, {1641, 483}, {207, 0, 139, 255} }}, {{ {-6327, -1062, 519}, 0, {-1156, 483}, {210, 4, 138, 255} }}, @@ -854,6 +1139,7 @@ static const Vtx water_land_3_dl_mesh_vtx_7[77] = { {{ {-6327, -3000, -504}, 0, {1636, 1500}, {207, 0, 117, 255} }}, {{ {-6327, -1062, -504}, 0, {-1161, 1500}, {211, 5, 119, 255} }}, {{ {-6751, -1062, -504}, 0, {-1161, 480}, {53, 247, 115, 255} }}, + {{ {-6327, -3000, -504}, 0, {1636, 1500}, {207, 0, 117, 255} }}, {{ {-6751, -1062, -504}, 0, {-1161, 480}, {53, 247, 115, 255} }}, {{ {-6751, -3000, -504}, 0, {1636, 480}, {49, 0, 117, 255} }}, {{ {-6027, -3000, 220}, 0, {1623, 487}, {139, 0, 207, 255} }}, @@ -865,104 +1151,133 @@ static const Vtx water_land_3_dl_mesh_vtx_7[77] = { {{ {-6027, -1062, 220}, 0, {859, 483}, {139, 6, 207, 255} }}, {{ {-6006, -844, -204}, 0, {-157, 1495}, {148, 48, 47, 255} }}, {{ {-6027, -1062, -204}, 0, {859, 1495}, {138, 8, 47, 255} }}, + {{ {-6027, -1062, 220}, 0, {859, 483}, {139, 6, 207, 255} }}, {{ {-6006, -844, 220}, 0, {-157, 483}, {150, 46, 204, 255} }}, - {{ {-6751, -1062, 519}, 0, {859, 483}, {52, 247, 141, 255} }}, - {{ {-6218, -632, 519}, 0, {-157, 1495}, {223, 23, 136, 255} }}, - {{ {-6327, -1062, 519}, 0, {859, 1495}, {210, 4, 138, 255} }}, - {{ {-6517, -333, 519}, 0, {-157, 483}, {45, 220, 143, 255} }}, + {{ {-6006, -844, -204}, 0, {-157, 1495}, {148, 48, 47, 255} }}, {{ {-7050, -1062, -204}, 0, {859, 1500}, {117, 237, 46, 255} }}, {{ {-6729, -121, -204}, 0, {-157, 1500}, {92, 181, 45, 255} }}, {{ {-6729, -121, 220}, 0, {-157, 489}, {92, 181, 211, 255} }}, + {{ {-7050, -1062, -204}, 0, {859, 1500}, {117, 237, 46, 255} }}, + {{ {-6729, -121, 220}, 0, {-157, 489}, {92, 181, 211, 255} }}, {{ {-7050, -1062, 220}, 0, {859, 489}, {117, 237, 210, 255} }}, {{ {-6751, -1062, -504}, 0, {859, 1500}, {53, 247, 115, 255} }}, {{ {-6729, -121, -204}, 0, {-157, 489}, {92, 181, 45, 255} }}, {{ {-7050, -1062, -204}, 0, {859, 489}, {117, 237, 46, 255} }}, + {{ {-6751, -1062, -504}, 0, {859, 1500}, {53, 247, 115, 255} }}, {{ {-6517, -333, -504}, 0, {-157, 1500}, {46, 221, 113, 255} }}, + {{ {-6729, -121, -204}, 0, {-157, 489}, {92, 181, 45, 255} }}, {{ {-6027, -1062, -204}, 0, {859, 1500}, {138, 8, 47, 255} }}, {{ {-6218, -632, -504}, 0, {-157, 489}, {225, 22, 121, 255} }}, {{ {-6327, -1062, -504}, 0, {859, 489}, {211, 5, 119, 255} }}, + {{ {-6027, -1062, -204}, 0, {859, 1500}, {138, 8, 47, 255} }}, {{ {-6006, -844, -204}, 0, {-157, 1500}, {148, 48, 47, 255} }}, + {{ {-6218, -632, -504}, 0, {-157, 489}, {225, 22, 121, 255} }}, {{ {-6327, -1062, 519}, 0, {859, 483}, {210, 4, 138, 255} }}, {{ {-6006, -844, 220}, 0, {-157, 1495}, {150, 46, 204, 255} }}, {{ {-6027, -1062, 220}, 0, {859, 1495}, {139, 6, 207, 255} }}, + {{ {-6327, -1062, 519}, 0, {859, 483}, {210, 4, 138, 255} }}, {{ {-6218, -632, 519}, 0, {-157, 483}, {223, 23, 136, 255} }}, + {{ {-6006, -844, 220}, 0, {-157, 1495}, {150, 46, 204, 255} }}, {{ {-7050, -1062, 220}, 0, {859, 483}, {117, 237, 210, 255} }}, {{ {-6729, -121, 220}, 0, {-157, 483}, {92, 181, 211, 255} }}, {{ {-6517, -333, 519}, 0, {-157, 1495}, {45, 220, 143, 255} }}, + {{ {-6517, -333, 519}, 0, {-157, 1495}, {45, 220, 143, 255} }}, {{ {-6751, -1062, 519}, 0, {859, 1495}, {52, 247, 141, 255} }}, {{ {-6327, -1062, -504}, 0, {859, 1500}, {211, 5, 119, 255} }}, {{ {-6517, -333, -504}, 0, {-157, 489}, {46, 221, 113, 255} }}, {{ {-6751, -1062, -504}, 0, {859, 489}, {53, 247, 115, 255} }}, + {{ {-6327, -1062, -504}, 0, {859, 1500}, {211, 5, 119, 255} }}, {{ {-6218, -632, -504}, 0, {-157, 1500}, {225, 22, 121, 255} }}, + {{ {-6517, -333, -504}, 0, {-157, 489}, {46, 221, 113, 255} }}, + {{ {-6751, -1062, 519}, 0, {859, 483}, {52, 247, 141, 255} }}, + {{ {-6218, -632, 519}, 0, {-157, 1495}, {223, 23, 136, 255} }}, + {{ {-6327, -1062, 519}, 0, {859, 1495}, {210, 4, 138, 255} }}, + {{ {-6517, -333, 519}, 0, {-157, 483}, {45, 220, 143, 255} }}, }; static const Gfx water_land_3_dl_mesh_tri_7[] = { gsSPVertex(water_land_3_dl_mesh_vtx_7 + 0, 14, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 10, 0), + gsSP1Triangle(3, 2, 4, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_7 + 14, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_7 + 14, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 5, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(11, 10, 12, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_7 + 30, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 11, 13, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_7 + 28, 14, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_7 + 45, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 9, 10, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_7 + 42, 15, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_7 + 60, 15, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), - gsSP1Triangle(3, 6, 4, 0), - gsSP1Triangle(7, 8, 9, 0), - gsSP1Triangle(7, 10, 8, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 13, 14, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_7 + 57, 16, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 7, 5, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(12, 14, 15, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_7 + 73, 4, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_7 + 75, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), + gsSP1Triangle(0, 3, 4, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 14, 12, 0), gsSPEndDisplayList(), }; -static const Vtx water_land_3_dl_mesh_vtx_8[28] = { +static const Vtx water_land_3_dl_mesh_vtx_8[44] = { {{ {-8850, -3584, -204}, 0, {1761, 1497}, {0, 139, 49, 255} }}, {{ {-9113, -3584, 220}, 0, {2033, 482}, {0, 139, 207, 255} }}, {{ {-9113, -3584, -204}, 0, {2033, 1497}, {0, 139, 49, 255} }}, + {{ {-8850, -3584, -204}, 0, {1761, 1497}, {0, 139, 49, 255} }}, + {{ {-8850, -3584, 220}, 0, {1761, 482}, {0, 139, 207, 255} }}, + {{ {-9113, -3584, 220}, 0, {2033, 482}, {0, 139, 207, 255} }}, {{ {-8850, -3584, 220}, 0, {1761, 482}, {0, 139, 207, 255} }}, {{ {-9113, -3884, 519}, 0, {2033, 1497}, {0, 207, 139, 255} }}, + {{ {-9113, -3584, 220}, 0, {2033, 482}, {0, 139, 207, 255} }}, + {{ {-8850, -3584, 220}, 0, {1761, 482}, {0, 139, 207, 255} }}, {{ {-8850, -3884, 519}, 0, {1761, 1497}, {0, 207, 139, 255} }}, + {{ {-9113, -3884, 519}, 0, {2033, 1497}, {0, 207, 139, 255} }}, {{ {-8850, -3884, 519}, 0, {1761, 482}, {0, 207, 139, 255} }}, {{ {-8850, -4307, 519}, 0, {1761, 1497}, {0, 49, 139, 255} }}, {{ {-9113, -4307, 519}, 0, {2033, 1497}, {0, 49, 139, 255} }}, + {{ {-8850, -3884, 519}, 0, {1761, 482}, {0, 207, 139, 255} }}, + {{ {-9113, -4307, 519}, 0, {2033, 1497}, {0, 49, 139, 255} }}, {{ {-9113, -3884, 519}, 0, {2033, 482}, {0, 207, 139, 255} }}, {{ {-8850, -4307, 519}, 0, {1761, 482}, {0, 49, 139, 255} }}, {{ {-8850, -4607, 220}, 0, {1761, 1497}, {0, 117, 207, 255} }}, {{ {-9113, -4607, 220}, 0, {2033, 1497}, {0, 117, 207, 255} }}, + {{ {-8850, -4307, 519}, 0, {1761, 482}, {0, 49, 139, 255} }}, + {{ {-9113, -4607, 220}, 0, {2033, 1497}, {0, 117, 207, 255} }}, {{ {-9113, -4307, 519}, 0, {2033, 482}, {0, 49, 139, 255} }}, {{ {-8850, -4607, 220}, 0, {1761, 482}, {0, 117, 207, 255} }}, {{ {-9113, -4607, -204}, 0, {2033, 1497}, {0, 117, 49, 255} }}, {{ {-9113, -4607, 220}, 0, {2033, 482}, {0, 117, 207, 255} }}, + {{ {-8850, -4607, 220}, 0, {1761, 482}, {0, 117, 207, 255} }}, {{ {-8850, -4607, -204}, 0, {1761, 1497}, {0, 117, 49, 255} }}, - {{ {-9113, -4307, -504}, 0, {2033, 482}, {0, 49, 117, 255} }}, - {{ {-8850, -4307, -504}, 0, {1761, 482}, {0, 49, 117, 255} }}, + {{ {-9113, -4607, -204}, 0, {2033, 1497}, {0, 117, 49, 255} }}, {{ {-8850, -4307, -504}, 0, {1761, 1497}, {0, 49, 117, 255} }}, {{ {-8850, -3884, -504}, 0, {1761, 482}, {0, 207, 117, 255} }}, {{ {-9113, -3884, -504}, 0, {2033, 482}, {0, 207, 117, 255} }}, + {{ {-8850, -4307, -504}, 0, {1761, 1497}, {0, 49, 117, 255} }}, + {{ {-9113, -3884, -504}, 0, {2033, 482}, {0, 207, 117, 255} }}, {{ {-9113, -4307, -504}, 0, {2033, 1497}, {0, 49, 117, 255} }}, + {{ {-8850, -4607, -204}, 0, {1761, 1497}, {0, 117, 49, 255} }}, + {{ {-9113, -4307, -504}, 0, {2033, 482}, {0, 49, 117, 255} }}, + {{ {-9113, -4607, -204}, 0, {2033, 1497}, {0, 117, 49, 255} }}, + {{ {-8850, -4307, -504}, 0, {1761, 482}, {0, 49, 117, 255} }}, {{ {-8850, -3884, -504}, 0, {1761, 1497}, {0, 207, 117, 255} }}, {{ {-8850, -3584, -204}, 0, {1761, 482}, {0, 139, 49, 255} }}, {{ {-9113, -3584, -204}, 0, {2033, 482}, {0, 139, 49, 255} }}, @@ -970,22 +1285,23 @@ static const Vtx water_land_3_dl_mesh_vtx_8[28] = { }; static const Gfx water_land_3_dl_mesh_tri_8[] = { - gsSPVertex(water_land_3_dl_mesh_vtx_8 + 0, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_8 + 0, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(3, 4, 1, 0), - gsSP1Triangle(3, 5, 4, 0), + gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 8, 9, 0), - gsSP1Triangle(10, 11, 12, 0), - gsSP1Triangle(10, 12, 13, 0), - gsSPVertex(water_land_3_dl_mesh_vtx_8 + 14, 14, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_8 + 15, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 3, 1, 0), - gsSP1Triangle(3, 4, 1, 0), - gsSP1Triangle(3, 5, 4, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSPVertex(water_land_3_dl_mesh_vtx_8 + 30, 14, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(6, 8, 9, 0), + gsSP1Triangle(6, 9, 7, 0), gsSP1Triangle(10, 11, 12, 0), gsSP1Triangle(10, 12, 13, 0), gsSPEndDisplayList(), diff --git a/levels/ddd/script.c b/levels/ddd/script.c index f2539daa..483afdda 100644 --- a/levels/ddd/script.c +++ b/levels/ddd/script.c @@ -35,14 +35,14 @@ static const LevelScript script_func_local_3[] = { static const LevelScript script_func_local_4[] = { OBJECT(/*model*/ MODEL_NONE, /*pos*/ 3404, -3319, -489, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvJetStream), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 4685, -75, 4021, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 4542, -262, 4455, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 4638, -448, 3471, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 3851, -788, 3913, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 3366, -1293, 3416, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 2755, -1201, 3431, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 3647, -617, 4865, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), - OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 3398, -115, 5395, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 2789, -705, 3081, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 3494, -942, 3855, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 3165, -155, 4437, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 3572, -293, 4761, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 4477, -1034, 4162, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 4916, -149, 4007, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 4329, -624, 5452, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), + OBJECT(/*model*/ MODEL_WATER_MINE, /*pos*/ 4124, -986, 3776, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvBowserBomb), RETURN(), }; @@ -72,7 +72,7 @@ const LevelScript level_ddd_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_DDD_BOWSER_SUB, water_land_submarine_geo), AREA(/*index*/ 1, water_land_area_1_geo), - OBJECT(/*model*/ MODEL_NONE, /*pos*/ -2400, 3000, 125, /*angle*/ 0, 7, 0, /*bhvParam*/ BPARAM2(WARP_NODE_0A), /*bhv*/ bhvSpinAirborneWarp), + OBJECT(/*model*/ MODEL_NONE, /*pos*/ -3320, 3000, -320, /*angle*/ 0, 7, 0, /*bhvParam*/ BPARAM2(WARP_NODE_0A), /*bhv*/ bhvSpinAirborneWarp), WARP_NODE(/*id*/ WARP_NODE_0A, /*destLevel*/ LEVEL_DDD, /*destArea*/ 1, /*destNode*/ WARP_NODE_0A, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ WARP_NODE_SUCCESS, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 1, /*destNode*/ WARP_NODE_35, /*flags*/ WARP_NO_CHECKPOINT), WARP_NODE(/*id*/ WARP_NODE_DEATH, /*destLevel*/ LEVEL_CASTLE, /*destArea*/ 1, /*destNode*/ WARP_NODE_67, /*flags*/ WARP_NO_CHECKPOINT), @@ -99,7 +99,7 @@ const LevelScript level_ddd_entry[] = { END_AREA(), FREE_LEVEL_POOL(), - MARIO_POS(/*area*/ 1, /*yaw*/ 180, /*pos*/ -3071, 3000, 500), + MARIO_POS(/*area*/ 1, /*yaw*/ 180, /*pos*/ -3320, 3000, -320), CALL(/*arg*/ 0, /*func*/ lvl_init_or_update), CALL_LOOP(/*arg*/ 1, /*func*/ lvl_init_or_update), CLEAR_LEVEL(), diff --git a/levels/scripts.c b/levels/scripts.c index 1a49ef68..88d29746 100644 --- a/levels/scripts.c +++ b/levels/scripts.c @@ -78,6 +78,7 @@ const LevelScript level_main_scripts_entry[] = { LOAD_MODEL_FROM_GEO(MODEL_PURPLE_MARBLE, purple_marble_geo), LOAD_MODEL_FROM_GEO(MODEL_FISH, fish_geo), LOAD_MODEL_FROM_GEO(MODEL_FISH_SHADOW, fish_shadow_geo), + LOAD_MODEL_FROM_GEO(MODEL_BUB, bub_geo), LOAD_MODEL_FROM_GEO(MODEL_SPARKLES_ANIMATION, sparkles_animation_geo), LOAD_MODEL_FROM_DL (MODEL_SAND_DUST, sand_seg3_dl_0302BCD0, LAYER_ALPHA), LOAD_MODEL_FROM_GEO(MODEL_BURN_SMOKE_UNUSED, burn_smoke_geo), @@ -212,7 +213,6 @@ const LevelScript script_func_global_13[] = { }; const LevelScript script_func_global_14[] = { - LOAD_MODEL_FROM_GEO(MODEL_BUB, bub_geo), LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_BASE, treasure_chest_base_geo), LOAD_MODEL_FROM_GEO(MODEL_TREASURE_CHEST_LID, treasure_chest_lid_geo), LOAD_MODEL_FROM_GEO(MODEL_CYAN_FISH, cyan_fish_geo), diff --git a/levels/wf/9.rgba16.png b/levels/wf/9.rgba16.png index fd649245..6aa7de2e 100644 Binary files a/levels/wf/9.rgba16.png and b/levels/wf/9.rgba16.png differ diff --git a/levels/wf/areas/1/1/model.inc.c b/levels/wf/areas/1/1/model.inc.c index 3a89dbf0..d338f5e2 100644 --- a/levels/wf/areas/1/1/model.inc.c +++ b/levels/wf/areas/1/1/model.inc.c @@ -54,19 +54,19 @@ static const Gfx mountain_1_dl_mesh_tri_2[] = { }; static const Vtx mountain_1_dl_mesh_vtx_3[23] = { - {{ {-2559, 2560, -1023}, 0, {20711, -16336}, {0, 127, 0, 255} }}, - {{ {-3071, 2560, -1023}, 0, {22746, -16336}, {0, 127, 0, 255} }}, - {{ {-3071, 2560, 512}, 0, {22746, -10228}, {0, 127, 0, 255} }}, - {{ {-2559, 2560, 512}, 0, {20710, -10228}, {0, 127, 0, 255} }}, - {{ {-1023, 2560, 1536}, 0, {14324, -6164}, {0, 127, 0, 255} }}, - {{ {-1535, 2560, 2560}, 0, {16372, -2068}, {0, 127, 0, 255} }}, - {{ {-1023, 2560, 3072}, 0, {14324, -20}, {0, 127, 0, 255} }}, - {{ {-1023, 2560, -511}, 0, {14324, -14352}, {0, 127, 0, 255} }}, - {{ {-1535, 2560, -2047}, 0, {16372, -20496}, {0, 127, 0, 255} }}, - {{ {1, 2560, -1536}, 0, {10232, -18448}, {0, 127, 0, 255} }}, - {{ {513, 2560, -2048}, 0, {8184, -20496}, {0, 127, 0, 255} }}, - {{ {1024, 2560, -511}, 0, {6136, -14352}, {0, 127, 0, 255} }}, - {{ {1536, 2560, -1023}, 0, {4088, -16400}, {0, 127, 0, 255} }}, + {{ {-2559, 2560, -1023}, 0, {7610, -5548}, {0, 127, 0, 255} }}, + {{ {-3071, 2560, -1023}, 0, {9618, -5548}, {0, 127, 0, 255} }}, + {{ {-3071, 2560, 512}, 0, {9618, 549}, {0, 127, 0, 255} }}, + {{ {-2559, 2560, 512}, 0, {7610, 549}, {0, 127, 0, 255} }}, + {{ {-1023, 2560, 1536}, 0, {1586, 4616}, {0, 127, 0, 255} }}, + {{ {-1535, 2560, 2560}, 0, {3594, 8684}, {0, 127, 0, 255} }}, + {{ {-1023, 2560, 3072}, 0, {1586, 10717}, {0, 127, 0, 255} }}, + {{ {-1023, 2560, -511}, 0, {1586, -3515}, {0, 127, 0, 255} }}, + {{ {-1535, 2560, -2047}, 0, {3594, -9616}, {0, 127, 0, 255} }}, + {{ {1, 2560, -1536}, 0, {-2431, -7586}, {0, 127, 0, 255} }}, + {{ {513, 2560, -2048}, 0, {-4439, -9620}, {0, 127, 0, 255} }}, + {{ {1024, 2560, -511}, 0, {-6443, -3515}, {0, 127, 0, 255} }}, + {{ {1536, 2560, -1023}, 0, {-8451, -5548}, {0, 127, 0, 255} }}, {{ {1024, 2560, 1536}, 0, {6168, -6164}, {0, 127, 0, 255} }}, {{ {512, 2560, 1536}, 0, {8216, -6164}, {0, 127, 0, 255} }}, {{ {1024, 2560, 1664}, 0, {6168, -5652}, {0, 127, 0, 255} }}, @@ -120,53 +120,61 @@ static const Gfx mountain_1_dl_mesh_tri_4[] = { gsSPEndDisplayList(), }; -static const Vtx mountain_1_dl_mesh_vtx_5[46] = { - {{ {-255, 2816, 1536}, 0, {5194, 7679}, {112, 55, 25, 255} }}, - {{ {-255, 2559, 2099}, 0, {3316, 8567}, {112, 55, 25, 255} }}, - {{ {-127, 2559, 1536}, 0, {5291, 8567}, {112, 55, 25, 255} }}, - {{ {-255, 2816, 1536}, 0, {5194, 7688}, {144, 55, 25, 255} }}, - {{ {-383, 2559, 1536}, 0, {5291, 8663}, {144, 55, 25, 255} }}, - {{ {-255, 2559, 2099}, 0, {3316, 8663}, {144, 55, 25, 255} }}, - {{ {-255, 2559, 2099}, 0, {6717, 10262}, {0, 129, 0, 255} }}, - {{ {-383, 2559, 1536}, 0, {6277, 12197}, {0, 129, 0, 255} }}, - {{ {-127, 2559, 1536}, 0, {7157, 12197}, {0, 129, 0, 255} }}, - {{ {1536, 3584, -1023}, 0, {4310, -4119}, {85, 42, 85, 255} }}, - {{ {1536, 2560, -511}, 0, {2862, -30}, {85, 42, 85, 255} }}, - {{ {2048, 2560, -1023}, 0, {5758, -30}, {85, 42, 85, 255} }}, - {{ {1536, 3584, -1023}, 0, {-12108, -2078}, {0, 0, 129, 255} }}, - {{ {2048, 2560, -1023}, 0, {-14156, 2018}, {0, 0, 129, 255} }}, - {{ {1536, 2560, -1023}, 0, {-12108, 2018}, {0, 0, 129, 255} }}, - {{ {1, 3584, -1536}, 0, {-1023, -2078}, {90, 0, 166, 255} }}, - {{ {1024, 3584, -511}, 0, {-9212, -2078}, {90, 0, 166, 255} }}, - {{ {1, 2560, -1536}, 0, {-1024, 2018}, {90, 0, 166, 255} }}, - {{ {1024, 2560, -511}, 0, {-9212, 2018}, {90, 0, 166, 255} }}, - {{ {512, 2560, 1536}, 0, {-8016, -30}, {0, 0, 127, 255} }}, - {{ {1024, 2560, 1536}, 0, {-5968, -30}, {0, 0, 127, 255} }}, - {{ {1024, 3584, 1536}, 0, {-5968, -4126}, {0, 0, 127, 255} }}, - {{ {-1023, 3584, 1536}, 0, {-14156, -4126}, {0, 0, 127, 255} }}, - {{ {-1023, 2560, 1536}, 0, {-14156, -30}, {0, 0, 127, 255} }}, - {{ {-1023, 2025, 1536}, 0, {-14156, 2110}, {0, 0, 127, 255} }}, - {{ {512, 2025, 1536}, 0, {-8016, 2110}, {0, 0, 127, 255} }}, - {{ {1, 3584, -1536}, 0, {-28613, -4126}, {166, 0, 166, 255} }}, - {{ {-1023, 2560, -511}, 0, {-22344, -30}, {166, 0, 166, 255} }}, - {{ {-1023, 3584, -511}, 0, {-22344, -4126}, {166, 0, 166, 255} }}, - {{ {1, 2560, -1536}, 0, {-28613, -30}, {166, 0, 166, 255} }}, - {{ {1024, 3584, 1536}, 0, {-5968, -4126}, {90, 0, 90, 255} }}, - {{ {1024, 2560, 1536}, 0, {-5968, -30}, {90, 0, 90, 255} }}, - {{ {1536, 2560, 1024}, 0, {-3072, -30}, {90, 0, 90, 255} }}, - {{ {1536, 3584, 1024}, 0, {-3072, -4126}, {90, 0, 90, 255} }}, - {{ {1536, 3584, 1024}, 0, {-3072, -4126}, {127, 0, 0, 255} }}, - {{ {1536, 2560, 1024}, 0, {-3072, -30}, {127, 0, 0, 255} }}, - {{ {1536, 2560, -511}, 0, {3068, -30}, {127, 0, 0, 255} }}, - {{ {1536, 3584, -1023}, 0, {5116, -4126}, {127, 0, 0, 255} }}, - {{ {1024, 3584, -511}, 0, {-9212, -2078}, {166, 0, 166, 255} }}, - {{ {1536, 3584, -1023}, 0, {-12108, -2078}, {166, 0, 166, 255} }}, - {{ {1024, 2560, -511}, 0, {-9212, 2018}, {166, 0, 166, 255} }}, - {{ {1536, 2560, -1023}, 0, {-12108, 2018}, {166, 0, 166, 255} }}, - {{ {-1023, 3584, -511}, 0, {-22344, -4126}, {129, 0, 0, 255} }}, - {{ {-1023, 2560, -511}, 0, {-22344, -30}, {129, 0, 0, 255} }}, - {{ {-1023, 2560, 1536}, 0, {-14156, -30}, {129, 0, 0, 255} }}, - {{ {-1023, 3584, 1536}, 0, {-14156, -4126}, {129, 0, 0, 255} }}, +static const Vtx mountain_1_dl_mesh_vtx_5[54] = { + {{ {-255, 2816, 1536}, 0, {4944, 7674}, {112, 55, 25, 255} }}, + {{ {-255, 2559, 2099}, 0, {3069, 8561}, {112, 55, 25, 255} }}, + {{ {-127, 2559, 1536}, 0, {5041, 8561}, {112, 55, 25, 255} }}, + {{ {-255, 2816, 1536}, 0, {4944, 7683}, {144, 55, 25, 255} }}, + {{ {-383, 2559, 1536}, 0, {5041, 8657}, {144, 55, 25, 255} }}, + {{ {-255, 2559, 2099}, 0, {3069, 8657}, {144, 55, 25, 255} }}, + {{ {-255, 2559, 2099}, 0, {6465, 10254}, {0, 129, 0, 255} }}, + {{ {-383, 2559, 1536}, 0, {6026, 12186}, {0, 129, 0, 255} }}, + {{ {-127, 2559, 1536}, 0, {6905, 12186}, {0, 129, 0, 255} }}, + {{ {1536, 3584, -1023}, 0, {4062, -4108}, {85, 42, 85, 255} }}, + {{ {1536, 2560, -511}, 0, {2615, -25}, {85, 42, 85, 255} }}, + {{ {2048, 2560, -1023}, 0, {5508, -25}, {85, 42, 85, 255} }}, + {{ {1536, 3584, -1023}, 0, {-12335, -2070}, {0, 0, 129, 255} }}, + {{ {2048, 2560, -1023}, 0, {-14380, 2021}, {0, 0, 129, 255} }}, + {{ {1536, 2560, -1023}, 0, {-12335, 2021}, {0, 0, 129, 255} }}, + {{ {1, 3584, -1536}, 0, {-1264, -2070}, {90, 0, 166, 255} }}, + {{ {1024, 3584, -511}, 0, {-9443, -2070}, {90, 0, 166, 255} }}, + {{ {1, 2560, -1536}, 0, {-1265, 2021}, {90, 0, 166, 255} }}, + {{ {1024, 3584, -511}, 0, {-9443, -2070}, {90, 0, 166, 255} }}, + {{ {1024, 2560, -511}, 0, {-9443, 2021}, {90, 0, 166, 255} }}, + {{ {1, 2560, -1536}, 0, {-1265, 2021}, {90, 0, 166, 255} }}, + {{ {1, 3584, -1536}, 0, {-28818, -4115}, {166, 0, 166, 255} }}, + {{ {-1023, 2560, -511}, 0, {-22557, -25}, {166, 0, 166, 255} }}, + {{ {-1023, 3584, -511}, 0, {-22557, -4115}, {166, 0, 166, 255} }}, + {{ {1, 3584, -1536}, 0, {-28818, -4115}, {166, 0, 166, 255} }}, + {{ {1, 2560, -1536}, 0, {-28818, -25}, {166, 0, 166, 255} }}, + {{ {-1023, 2560, -511}, 0, {-22557, -25}, {166, 0, 166, 255} }}, + {{ {512, 2560, 1536}, 0, {-8248, -25}, {0, 0, 127, 255} }}, + {{ {1024, 2560, 1536}, 0, {-6203, -25}, {0, 0, 127, 255} }}, + {{ {1024, 3584, 1536}, 0, {-6203, -4115}, {0, 0, 127, 255} }}, + {{ {-1023, 3584, 1536}, 0, {-14380, -4115}, {0, 0, 127, 255} }}, + {{ {-1023, 2560, 1536}, 0, {-14380, -25}, {0, 0, 127, 255} }}, + {{ {512, 2560, 1536}, 0, {-8248, -25}, {0, 0, 127, 255} }}, + {{ {-1023, 3584, 1536}, 0, {-14380, -4115}, {0, 0, 127, 255} }}, + {{ {-1023, 2025, 1536}, 0, {-14380, 2113}, {0, 0, 127, 255} }}, + {{ {512, 2025, 1536}, 0, {-8248, 2113}, {0, 0, 127, 255} }}, + {{ {1024, 3584, 1536}, 0, {-6203, -4115}, {90, 0, 90, 255} }}, + {{ {1024, 2560, 1536}, 0, {-6203, -25}, {90, 0, 90, 255} }}, + {{ {1536, 2560, 1024}, 0, {-3311, -25}, {90, 0, 90, 255} }}, + {{ {1536, 3584, 1024}, 0, {-3311, -4115}, {90, 0, 90, 255} }}, + {{ {1536, 3584, 1024}, 0, {-3311, -4115}, {127, 0, 0, 255} }}, + {{ {1536, 2560, 1024}, 0, {-3311, -25}, {127, 0, 0, 255} }}, + {{ {1536, 2560, -511}, 0, {2821, -25}, {127, 0, 0, 255} }}, + {{ {1536, 3584, -1023}, 0, {4866, -4115}, {127, 0, 0, 255} }}, + {{ {1024, 3584, -511}, 0, {-9443, -2070}, {166, 0, 166, 255} }}, + {{ {1536, 3584, -1023}, 0, {-12335, -2070}, {166, 0, 166, 255} }}, + {{ {1024, 2560, -511}, 0, {-9443, 2021}, {166, 0, 166, 255} }}, + {{ {1536, 3584, -1023}, 0, {-12335, -2070}, {166, 0, 166, 255} }}, + {{ {1536, 2560, -1023}, 0, {-12335, 2021}, {166, 0, 166, 255} }}, + {{ {1024, 2560, -511}, 0, {-9443, 2021}, {166, 0, 166, 255} }}, + {{ {-1023, 3584, -511}, 0, {-22557, -4115}, {129, 0, 0, 255} }}, + {{ {-1023, 2560, -511}, 0, {-22557, -25}, {129, 0, 0, 255} }}, + {{ {-1023, 2560, 1536}, 0, {-14380, -25}, {129, 0, 0, 255} }}, + {{ {-1023, 3584, 1536}, 0, {-14380, -4115}, {129, 0, 0, 255} }}, }; static const Gfx mountain_1_dl_mesh_tri_5[] = { @@ -176,25 +184,26 @@ static const Gfx mountain_1_dl_mesh_tri_5[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(mountain_1_dl_mesh_vtx_5 + 15, 15, 0), - gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(7, 4, 6, 0), - gsSP1Triangle(8, 4, 7, 0), - gsSP1Triangle(9, 4, 8, 0), - gsSP1Triangle(9, 10, 4, 0), - gsSP1Triangle(11, 12, 13, 0), - gsSP1Triangle(11, 14, 12, 0), - gsSPVertex(mountain_1_dl_mesh_vtx_5 + 30, 16, 0), + gsSPVertex(mountain_1_dl_mesh_vtx_5 + 15, 16, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(0, 2, 3, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(4, 6, 7, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(9, 11, 10, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), gsSP1Triangle(15, 12, 14, 0), + gsSPVertex(mountain_1_dl_mesh_vtx_5 + 31, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 1, 0, 0), + gsSP1Triangle(3, 4, 1, 0), + gsSP1Triangle(5, 6, 7, 0), + gsSP1Triangle(5, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(9, 11, 12, 0), + gsSP1Triangle(13, 14, 15, 0), + gsSPVertex(mountain_1_dl_mesh_vtx_5 + 47, 7, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 3, 5, 0), gsSPEndDisplayList(), }; @@ -402,28 +411,28 @@ static const Vtx mountain_1_dl_mesh_vtx_11[68] = { {{ {2560, 2304, -511}, 0, {-2010, 30684}, {57, 114, 0, 255} }}, {{ {2048, 2560, -1023}, 0, {-203, 28454}, {57, 114, 0, 255} }}, {{ {2048, 2560, -511}, 0, {-2060, 28514}, {57, 114, 0, 255} }}, - {{ {2560, 2304, 0}, 0, {-4134, 30661}, {57, 114, 0, 255} }}, - {{ {2048, 2560, 0}, 0, {-4152, 28504}, {57, 114, 0, 255} }}, - {{ {2048, 2560, 1024}, 0, {-8273, 28412}, {57, 114, 0, 255} }}, - {{ {3584, 1939, -1271}, 0, {-81, 5526}, {127, 0, 0, 255} }}, - {{ {3584, 2122, -1271}, 0, {-79, 4800}, {127, 0, 0, 255} }}, - {{ {3584, 2122, -891}, 0, {-1596, 4800}, {127, 0, 0, 255} }}, - {{ {3584, 2304, -891}, 0, {-1594, 4072}, {127, 0, 0, 255} }}, - {{ {3584, 2304, -511}, 0, {-3108, 4072}, {127, 0, 0, 255} }}, - {{ {3584, 1757, -1651}, 0, {1432, 6254}, {127, 0, 0, 255} }}, - {{ {3584, 1939, -1651}, 0, {1434, 5526}, {127, 0, 0, 255} }}, - {{ {3584, 1576, -2030}, 0, {2945, 6982}, {127, 0, 0, 255} }}, - {{ {3584, 1757, -2030}, 0, {2947, 6254}, {127, 0, 0, 255} }}, - {{ {3584, 1585, -2411}, 0, {4464, 6946}, {127, 0, 0, 255} }}, - {{ {3584, 1576, -2030}, 0, {2945, 6982}, {127, 0, 0, 255} }}, - {{ {3584, 1393, -2411}, 0, {4464, 7712}, {127, 0, 0, 255} }}, + {{ {2560, 2304, 0}, 0, {-4128, 30677}, {57, 114, 0, 255} }}, + {{ {2048, 2560, 0}, 0, {-4146, 28520}, {57, 114, 0, 255} }}, + {{ {2048, 2560, 1024}, 0, {-8267, 28428}, {57, 114, 0, 255} }}, + {{ {3584, 1939, -1271}, 0, {-83, 5526}, {127, 0, 0, 255} }}, + {{ {3584, 2122, -1271}, 0, {-81, 4800}, {127, 0, 0, 255} }}, + {{ {3584, 2122, -891}, 0, {-1598, 4800}, {127, 0, 0, 255} }}, + {{ {3584, 2304, -891}, 0, {-1596, 4072}, {127, 0, 0, 255} }}, + {{ {3584, 2304, -511}, 0, {-3110, 4072}, {127, 0, 0, 255} }}, + {{ {3584, 1757, -1651}, 0, {1431, 6254}, {127, 0, 0, 255} }}, + {{ {3584, 1939, -1651}, 0, {1433, 5526}, {127, 0, 0, 255} }}, + {{ {3584, 1576, -2030}, 0, {2944, 6982}, {127, 0, 0, 255} }}, + {{ {3584, 1757, -2030}, 0, {2946, 6254}, {127, 0, 0, 255} }}, + {{ {3584, 1585, -2411}, 0, {4463, 6946}, {127, 0, 0, 255} }}, + {{ {3584, 1576, -2030}, 0, {2944, 6982}, {127, 0, 0, 255} }}, + {{ {3584, 1393, -2411}, 0, {4463, 7712}, {127, 0, 0, 255} }}, {{ {3584, 1397, -2601}, 0, {5223, 7694}, {127, 0, 0, 255} }}, {{ {3584, 1075, -3071}, 0, {7093, 8976}, {127, 0, 0, 255} }}, - {{ {3584, 512, 3840}, 0, {-20562, 11209}, {127, 0, 0, 255} }}, - {{ {3584, 1075, 1536}, 0, {-11328, 9203}, {127, 0, 0, 255} }}, - {{ {3584, 1024, 3635}, 0, {-19695, 9201}, {127, 0, 0, 255} }}, - {{ {3584, 1024, 3635}, 0, {-19694, 9196}, {127, 0, 0, 255} }}, - {{ {3584, 1024, 3840}, 0, {-20480, 9218}, {127, 0, 0, 255} }}, + {{ {3584, 512, 3840}, 0, {-20568, 11209}, {127, 0, 0, 255} }}, + {{ {3584, 1075, 1536}, 0, {-11332, 9203}, {127, 0, 0, 255} }}, + {{ {3584, 1024, 3635}, 0, {-19701, 9201}, {127, 0, 0, 255} }}, + {{ {3584, 1024, 3635}, 0, {-19700, 9196}, {127, 0, 0, 255} }}, + {{ {3584, 1024, 3840}, 0, {-20486, 9218}, {127, 0, 0, 255} }}, {{ {2509, 2304, 0}, 0, {-1739, 731}, {0, 0, 129, 255} }}, {{ {2048, 2534, 0}, 0, {2010, -1023}, {0, 0, 129, 255} }}, {{ {2048, 2560, 0}, 0, {2010, -1266}, {0, 0, 129, 255} }}, @@ -433,14 +442,14 @@ static const Vtx mountain_1_dl_mesh_vtx_11[68] = { {{ {2048, 2534, -511}, 0, {2009, -1024}, {0, 0, 127, 255} }}, {{ {2048, 2560, -511}, 0, {2009, -1265}, {0, 0, 127, 255} }}, {{ {3584, 1075, -3071}, 0, {7093, 8976}, {127, 0, 0, 255} }}, - {{ {3584, 2304, -511}, 0, {-3108, 4072}, {127, 0, 0, 255} }}, - {{ {3584, 2304, 0}, 0, {-5148, 4072}, {127, 0, 0, 255} }}, - {{ {3584, 1075, 1536}, 0, {-11282, 8976}, {127, 0, 0, 255} }}, - {{ {3584, 1024, 3635}, 0, {-19633, 9180}, {127, 0, 0, 255} }}, - {{ {3584, 1075, -3071}, 0, {2962, 11037}, {127, 0, 0, 255} }}, - {{ {3584, 0, -511}, 0, {-7237, 15329}, {127, 0, 0, 255} }}, - {{ {3584, 0, -3071}, 0, {2962, 15329}, {127, 0, 0, 255} }}, - {{ {3584, 1075, -511}, 0, {-7237, 11037}, {127, 0, 0, 255} }}, + {{ {3584, 2304, -511}, 0, {-3110, 4072}, {127, 0, 0, 255} }}, + {{ {3584, 2304, 0}, 0, {-5151, 4072}, {127, 0, 0, 255} }}, + {{ {3584, 1075, 1536}, 0, {-11286, 8976}, {127, 0, 0, 255} }}, + {{ {3584, 1024, 3635}, 0, {-19639, 9180}, {127, 0, 0, 255} }}, + {{ {3584, 1075, -3071}, 0, {2961, 11037}, {127, 0, 0, 255} }}, + {{ {3584, 0, -511}, 0, {-7240, 15329}, {127, 0, 0, 255} }}, + {{ {3584, 0, -3071}, 0, {2961, 15329}, {127, 0, 0, 255} }}, + {{ {3584, 1075, -511}, 0, {-7240, 11037}, {127, 0, 0, 255} }}, {{ {3584, 512, 3840}, 0, {-20527, 10876}, {0, 0, 127, 255} }}, {{ {3226, 1024, 3840}, 0, {-21718, 9215}, {0, 0, 127, 255} }}, {{ {3226, 512, 3840}, 0, {-21718, 10876}, {0, 0, 127, 255} }}, @@ -523,13 +532,13 @@ static const Gfx mountain_1_dl_mesh_tri_12[] = { gsSPEndDisplayList(), }; -static const Vtx mountain_1_dl_mesh_vtx_13[62] = { +static const Vtx mountain_1_dl_mesh_vtx_13[63] = { {{ {2560, 1024, 2048}, 0, {3423, 5992}, {0, 108, 67, 255} }}, {{ {3226, 2304, 0}, 0, {5044, -4}, {0, 108, 67, 255} }}, {{ {2560, 2304, 0}, 0, {3436, -4}, {0, 108, 67, 255} }}, - {{ {-1535, 2560, 2560}, 0, {8204, 496}, {0, 40, 120, 255} }}, - {{ {-2047, 1024, 3072}, 0, {6092, 7152}, {0, 40, 120, 255} }}, - {{ {-1023, 1024, 3072}, 0, {10176, 7152}, {0, 40, 120, 255} }}, + {{ {-1535, 2560, 2560}, 0, {8179, 692}, {0, 40, 120, 255} }}, + {{ {-2047, 1024, 3072}, 0, {6074, 7152}, {0, 40, 120, 255} }}, + {{ {-1023, 1024, 3072}, 0, {10145, 7152}, {0, 40, 120, 255} }}, {{ {2048, 2560, 1024}, 0, {18476, 20}, {0, 0, 127, 255} }}, {{ {1664, 2560, 1024}, 0, {16860, 20}, {0, 0, 127, 255} }}, {{ {1664, 1024, 1024}, 0, {16860, 6076}, {0, 0, 127, 255} }}, @@ -542,38 +551,39 @@ static const Vtx mountain_1_dl_mesh_vtx_13[62] = { {{ {3226, 1024, 3635}, 0, {8056, 5992}, {177, 94, 33, 255} }}, {{ {3226, 2304, 0}, 0, {-2447, -4}, {177, 94, 33, 255} }}, {{ {2560, 1024, 2048}, 0, {2596, 5992}, {177, 94, 33, 255} }}, - {{ {-1535, 2560, 2560}, 0, {8944, 496}, {166, 0, 90, 255} }}, - {{ {-1023, 1024, 3072}, 0, {12144, 7152}, {166, 0, 90, 255} }}, - {{ {-1023, 2560, 3072}, 0, {12144, 496}, {166, 0, 90, 255} }}, + {{ {-1535, 2560, 2560}, 0, {9118, 692}, {166, 0, 90, 255} }}, + {{ {-1023, 1024, 3072}, 0, {12171, 7139}, {166, 0, 90, 255} }}, + {{ {-1023, 2560, 3072}, 0, {12171, 692}, {166, 0, 90, 255} }}, {{ {-2047, 0, 4096}, 0, {14624, 11632}, {162, 63, 58, 255} }}, - {{ {-2559, 2560, 512}, 0, {-1884, 496}, {162, 63, 58, 255} }}, + {{ {-2559, 2560, 512}, 0, {-1884, 547}, {162, 63, 58, 255} }}, {{ {-3960, 0, 1021}, 0, {654, 11632}, {162, 63, 58, 255} }}, - {{ {-2559, 2560, 512}, 0, {-1884, 496}, {0, 25, 125, 255} }}, - {{ {-3071, 2560, 512}, 0, {983, 496}, {0, 25, 125, 255} }}, + {{ {-2559, 2560, 512}, 0, {-1884, 547}, {0, 25, 125, 255} }}, + {{ {-3071, 2560, 512}, 0, {983, 547}, {0, 25, 125, 255} }}, {{ {-3960, 0, 1021}, 0, {654, 11632}, {0, 25, 125, 255} }}, - {{ {-3071, 2560, -1023}, 0, {-12033, 496}, {0, 0, 129, 255} }}, - {{ {-2559, 2560, -1023}, 0, {-9180, 496}, {0, 0, 129, 255} }}, + {{ {-3071, 2560, -1023}, 0, {-12033, 547}, {0, 0, 129, 255} }}, + {{ {-2559, 2560, -1023}, 0, {-9180, 547}, {0, 0, 129, 255} }}, {{ {-3960, 0, -1023}, 0, {-9180, 11632}, {0, 0, 129, 255} }}, - {{ {-2559, 2560, -1023}, 0, {-9180, 496}, {172, 46, 172, 255} }}, - {{ {-1535, 2560, -2047}, 0, {-14353, 496}, {172, 46, 172, 255} }}, + {{ {-2559, 2560, -1023}, 0, {-9180, 547}, {172, 46, 172, 255} }}, + {{ {-1535, 2560, -2047}, 0, {-14353, 547}, {172, 46, 172, 255} }}, {{ {-3960, 0, -1023}, 0, {-9180, 11632}, {172, 46, 172, 255} }}, - {{ {-2424, 0, -3327}, 0, {-19160, 11378}, {164, 63, 195, 255} }}, + {{ {-2424, 0, -3327}, 0, {-19160, 11379}, {164, 63, 195, 255} }}, {{ {-3960, 0, -1023}, 0, {-9180, 11632}, {164, 63, 195, 255} }}, - {{ {-1535, 2560, -2047}, 0, {-14353, 496}, {164, 63, 195, 255} }}, + {{ {-1535, 2560, -2047}, 0, {-14353, 547}, {164, 63, 195, 255} }}, {{ {-3960, 0, -1023}, 0, {-9180, 11632}, {136, 42, 0, 255} }}, - {{ {-3071, 2560, 512}, 0, {-1884, 593}, {136, 42, 0, 255} }}, - {{ {-3071, 2560, -1023}, 0, {-9180, 593}, {136, 42, 0, 255} }}, + {{ {-3071, 2560, 512}, 0, {-1884, 644}, {136, 42, 0, 255} }}, + {{ {-3071, 2560, -1023}, 0, {-9180, 644}, {136, 42, 0, 255} }}, {{ {-3960, 0, 1021}, 0, {654, 11632}, {136, 42, 0, 255} }}, - {{ {-3071, 2560, 512}, 0, {-1883, 593}, {136, 42, 0, 255} }}, - {{ {-3960, 0, -1023}, 0, {-9180, 11632}, {136, 42, 0, 255} }}, - {{ {-1535, 2560, 2560}, 0, {8740, 496}, {152, 52, 52, 255} }}, - {{ {-2559, 2560, 512}, 0, {-1884, 496}, {152, 52, 52, 255} }}, - {{ {-2047, 1024, 3072}, 0, {10720, 7152}, {152, 52, 52, 255} }}, - {{ {-2047, 0, 4096}, 0, {14624, 11632}, {152, 52, 52, 255} }}, + {{ {-3071, 2560, 512}, 0, {-1883, 644}, {136, 42, 0, 255} }}, {{ {512, 1024, 3072}, 0, {7266, 6036}, {119, 0, 43, 255} }}, {{ {1024, 1024, 1664}, 0, {13252, 6036}, {119, 0, 43, 255} }}, {{ {512, 2560, 3072}, 0, {7266, -20}, {119, 0, 43, 255} }}, + {{ {1024, 1024, 1664}, 0, {13252, 6036}, {119, 0, 43, 255} }}, {{ {1024, 2560, 1664}, 0, {13252, -20}, {119, 0, 43, 255} }}, + {{ {512, 2560, 3072}, 0, {7266, -20}, {119, 0, 43, 255} }}, + {{ {-1535, 2560, 2560}, 0, {8740, 547}, {152, 52, 52, 255} }}, + {{ {-2559, 2560, 512}, 0, {-1884, 547}, {152, 52, 52, 255} }}, + {{ {-2047, 1024, 3072}, 0, {10720, 7173}, {152, 52, 52, 255} }}, + {{ {-2047, 0, 4096}, 0, {14624, 11632}, {152, 52, 52, 255} }}, {{ {512, 1024, 3072}, 0, {7114, 6076}, {129, 0, 0, 255} }}, {{ {512, 2560, 3072}, 0, {7114, 20}, {129, 0, 0, 255} }}, {{ {512, 2025, 1536}, 0, {998, 2088}, {129, 0, 0, 255} }}, @@ -601,22 +611,23 @@ static const Gfx mountain_1_dl_mesh_tri_13[] = { gsSP1Triangle(6, 7, 8, 0), gsSP1Triangle(9, 10, 11, 0), gsSP1Triangle(12, 13, 14, 0), - gsSPVertex(mountain_1_dl_mesh_vtx_13 + 30, 16, 0), + gsSPVertex(mountain_1_dl_mesh_vtx_13 + 30, 14, 0), gsSP1Triangle(0, 1, 2, 0), gsSP1Triangle(3, 4, 5, 0), gsSP1Triangle(6, 7, 8, 0), - gsSP1Triangle(9, 10, 11, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(14, 13, 15, 0), - gsSPVertex(mountain_1_dl_mesh_vtx_13 + 46, 16, 0), + gsSP1Triangle(9, 10, 6, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSPVertex(mountain_1_dl_mesh_vtx_13 + 44, 15, 0), gsSP1Triangle(0, 1, 2, 0), - gsSP1Triangle(1, 3, 2, 0), - gsSP1Triangle(4, 5, 6, 0), - gsSP1Triangle(5, 7, 6, 0), - gsSP1Triangle(8, 9, 10, 0), - gsSP1Triangle(8, 11, 9, 0), - gsSP1Triangle(12, 13, 14, 0), - gsSP1Triangle(14, 13, 15, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(5, 4, 6, 0), + gsSP1Triangle(7, 8, 9, 0), + gsSP1Triangle(8, 10, 9, 0), + gsSP1Triangle(11, 12, 13, 0), + gsSP1Triangle(11, 14, 12, 0), + gsSPVertex(mountain_1_dl_mesh_vtx_13 + 59, 4, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(2, 1, 3, 0), gsSPEndDisplayList(), }; @@ -672,7 +683,7 @@ static const Gfx mountain_1_dl_mesh_tri_15[] = { gsSPEndDisplayList(), }; -static const Vtx mountain_1_dl_mesh_vtx_16[11] = { +Vtx mountain_1_dl_mesh_vtx_16[11] = { {{ {-2047, 1024, 4096}, 0, {4525, -16}, {129, 0, 0, 255} }}, {{ {-2047, 1024, 3072}, 0, {365, -16}, {129, 0, 0, 255} }}, {{ {-2047, 0, 4096}, 0, {4525, 4016}, {129, 0, 0, 255} }}, @@ -738,6 +749,7 @@ const Gfx mountain_1_dl_mesh[] = { gsSPTexture(65535, 65535, 0, 0, 0), gsSPEndDisplayList(), }; + #else Vtx mountain_1_dl_mesh_vtx_0[4] = { {{ {4096, 512, 3840}, 0, {16280, -2827}, {0, 127, 0, 255} }}, diff --git a/levels/wf/areas/1/14/model.inc.c b/levels/wf/areas/1/14/model.inc.c index 3494726e..3ec78a11 100644 --- a/levels/wf/areas/1/14/model.inc.c +++ b/levels/wf/areas/1/14/model.inc.c @@ -4,54 +4,43 @@ static const Lights1 wf_seg7_lights_07009E30 = gdSPDefLights1( 0xff, 0xff, 0xff, 0x28, 0x28, 0x28 ); -// 0x07009E48 - 0x07009F48 -static const Vtx wf_seg7_vertex_07009E48[] = { - {{{ 15, 0, 0}, 0, { 1502, 990}, {0x6f, 0x00, 0x3c, 0xff}}}, - {{{ 8, 1350, 13}, 0, { 990, -19223}, {0x6f, 0x00, 0x3c, 0xff}}}, - {{{ 8, 0, 13}, 0, { 990, 990}, {0x6f, 0x00, 0x3c, 0xff}}}, - {{{ -7, 1350, -12}, 0, { 156, 1020}, {0x00, 0x7f, 0x00, 0xff}}}, - {{{ -14, 1350, 0}, 0, { 768, 1020}, {0x00, 0x7f, 0x00, 0xff}}}, - {{{ -7, 1350, 13}, 0, { 1076, 490}, {0x00, 0x7f, 0x00, 0xff}}}, - {{{ 8, 1350, 13}, 0, { 768, -40}, {0x00, 0x7f, 0x00, 0xff}}}, - {{{ 15, 1350, 0}, 0, { 156, -40}, {0x00, 0x7f, 0x00, 0xff}}}, - {{{ 8, 1350, -12}, 0, { -150, 490}, {0x00, 0x7f, 0x00, 0xff}}}, - {{{ 8, 0, 13}, 0, { 990, 990}, {0x00, 0x00, 0x7f, 0xff}}}, - {{{ -7, 1350, 13}, 0, { 480, -19223}, {0x00, 0x00, 0x7f, 0xff}}}, - {{{ -7, 0, 13}, 0, { 480, 990}, {0x00, 0x00, 0x7f, 0xff}}}, - {{{ -7, 0, 13}, 0, { 480, 990}, {0x91, 0x00, 0x3c, 0xff}}}, - {{{ -14, 1350, 0}, 0, { 0, -19223}, {0x91, 0x00, 0x3c, 0xff}}}, - {{{ -14, 0, 0}, 0, { 0, 990}, {0x91, 0x00, 0x3c, 0xff}}}, - {{{ -7, 1350, 13}, 0, { 480, -19223}, {0x91, 0x00, 0x3c, 0xff}}}, -}; - -// 0x07009F48 - 0x0700A048 -static const Vtx wf_seg7_vertex_07009F48[] = { - {{{ 8, 0, 13}, 0, { 990, 990}, {0x00, 0x00, 0x7f, 0xff}}}, - {{{ 8, 1350, 13}, 0, { 990, -19223}, {0x00, 0x00, 0x7f, 0xff}}}, - {{{ -7, 1350, 13}, 0, { 480, -19223}, {0x00, 0x00, 0x7f, 0xff}}}, - {{{ -14, 0, 0}, 0, { 3034, 990}, {0x93, 0x00, 0xc1, 0xff}}}, - {{{ -14, 1350, 0}, 0, { 3034, -19223}, {0x93, 0x00, 0xc1, 0xff}}}, - {{{ -7, 1350, -12}, 0, { 2524, -19223}, {0x93, 0x00, 0xc1, 0xff}}}, - {{{ 15, 0, 0}, 0, { 1502, 990}, {0x6f, 0x00, 0x3c, 0xff}}}, - {{{ 15, 1350, 0}, 0, { 1502, -19223}, {0x6f, 0x00, 0x3c, 0xff}}}, - {{{ 8, 1350, 13}, 0, { 990, -19223}, {0x6f, 0x00, 0x3c, 0xff}}}, - {{{ 8, 0, -12}, 0, { 2012, 990}, {0x6d, 0x00, 0xc1, 0xff}}}, - {{{ 15, 1350, 0}, 0, { 1502, -19223}, {0x6d, 0x00, 0xc1, 0xff}}}, - {{{ 15, 0, 0}, 0, { 1502, 990}, {0x6d, 0x00, 0xc1, 0xff}}}, - {{{ 8, 1350, -12}, 0, { 2012, -19223}, {0x6d, 0x00, 0xc1, 0xff}}}, - {{{ -7, 0, -12}, 0, { 2524, 990}, {0x00, 0x00, 0x81, 0xff}}}, - {{{ 8, 1350, -12}, 0, { 2012, -19223}, {0x00, 0x00, 0x81, 0xff}}}, - {{{ 8, 0, -12}, 0, { 2012, 990}, {0x00, 0x00, 0x81, 0xff}}}, -}; - -// 0x0700A048 - 0x0700A0A8 -static const Vtx wf_seg7_vertex_0700A048[] = { - {{{ -7, 0, -12}, 0, { 2524, 990}, {0x00, 0x00, 0x81, 0xff}}}, - {{{ -7, 1350, -12}, 0, { 2524, -19223}, {0x00, 0x00, 0x81, 0xff}}}, - {{{ 8, 1350, -12}, 0, { 2012, -19223}, {0x00, 0x00, 0x81, 0xff}}}, - {{{ -14, 0, 0}, 0, { 3034, 990}, {0x93, 0x00, 0xc1, 0xff}}}, - {{{ -7, 1350, -12}, 0, { 2524, -19223}, {0x93, 0x00, 0xc1, 0xff}}}, - {{{ -7, 0, -12}, 0, { 2524, 990}, {0x93, 0x00, 0xc1, 0xff}}}, +Vtx pole_vtxs[36] = { + {{ {15, 0, 0}, 0, {1532, 921}, {112, 0, 60, 255} }}, + {{ {8, 1350, 13}, 0, {764, -25642}, {112, 0, 60, 255} }}, + {{ {8, 0, 13}, 0, {764, 921}, {112, 0, 60, 255} }}, + {{ {-7, 0, 13}, 0, {-1, 921}, {144, 0, 60, 255} }}, + {{ {-14, 1350, 0}, 0, {-721, -25642}, {144, 0, 60, 255} }}, + {{ {-14, 0, 0}, 0, {-721, 921}, {144, 0, 60, 255} }}, + {{ {-7, 0, 13}, 0, {-1, 921}, {144, 0, 60, 255} }}, + {{ {-7, 1350, 13}, 0, {-1, -25642}, {144, 0, 60, 255} }}, + {{ {-14, 1350, 0}, 0, {-721, -25642}, {144, 0, 60, 255} }}, + {{ {15, 0, 0}, 0, {1532, 921}, {112, 0, 60, 255} }}, + {{ {15, 1350, 0}, 0, {1532, -25642}, {112, 0, 60, 255} }}, + {{ {8, 1350, 13}, 0, {764, -25642}, {112, 0, 60, 255} }}, + {{ {-7, 1350, -12}, 0, {-487, 960}, {0, 127, 0, 255} }}, + {{ {-14, 1350, 0}, 0, {431, 960}, {0, 127, 0, 255} }}, + {{ {-7, 1350, 13}, 0, {893, 264}, {0, 127, 0, 255} }}, + {{ {8, 1350, 13}, 0, {431, -433}, {0, 127, 0, 255} }}, + {{ {-7, 1350, -12}, 0, {-487, 960}, {0, 127, 0, 255} }}, + {{ {8, 1350, 13}, 0, {431, -433}, {0, 127, 0, 255} }}, + {{ {15, 1350, 0}, 0, {-487, -433}, {0, 127, 0, 255} }}, + {{ {8, 1350, -12}, 0, {-946, 264}, {0, 127, 0, 255} }}, + {{ {8, 0, 13}, 0, {764, 921}, {0, 0, 127, 255} }}, + {{ {-7, 1350, 13}, 0, {-1, -25642}, {0, 0, 127, 255} }}, + {{ {-7, 0, 13}, 0, {-1, 921}, {0, 0, 127, 255} }}, + {{ {8, 1350, 13}, 0, {764, -25642}, {0, 0, 127, 255} }}, + {{ {-14, 0, 0}, 0, {3830, 921}, {146, 0, 192, 255} }}, + {{ {-14, 1350, 0}, 0, {3830, -25642}, {146, 0, 192, 255} }}, + {{ {-7, 1350, -12}, 0, {3065, -25642}, {146, 0, 192, 255} }}, + {{ {-7, 0, -12}, 0, {3065, 921}, {146, 0, 192, 255} }}, + {{ {8, 0, -12}, 0, {2297, 921}, {110, 0, 192, 255} }}, + {{ {15, 1350, 0}, 0, {1532, -25642}, {110, 0, 192, 255} }}, + {{ {15, 0, 0}, 0, {1532, 921}, {110, 0, 192, 255} }}, + {{ {8, 1350, -12}, 0, {2297, -25642}, {110, 0, 192, 255} }}, + {{ {-7, 0, -12}, 0, {3065, 921}, {0, 0, 129, 255} }}, + {{ {8, 1350, -12}, 0, {2297, -25642}, {0, 0, 129, 255} }}, + {{ {8, 0, -12}, 0, {2297, 921}, {0, 0, 129, 255} }}, + {{ {-7, 1350, -12}, 0, {3065, -25642}, {0, 0, 129, 255} }}, }; // 0x0700A0A8 - 0x0700A170 @@ -61,18 +50,26 @@ static const Gfx wf_seg7_dl_0700A0A8[] = { gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), gsSPLight(&wf_seg7_lights_07009E30.l, 1), gsSPLight(&wf_seg7_lights_07009E30.a, 2), - gsSPVertex(wf_seg7_vertex_07009E48, 16, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 5, 6, 0x0, 3, 6, 7, 0x0), - gsSP2Triangles( 3, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSP2Triangles(12, 13, 14, 0x0, 12, 15, 13, 0x0), - gsSPVertex(wf_seg7_vertex_07009F48, 16, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSP2Triangles( 9, 12, 10, 0x0, 13, 14, 15, 0x0), - gsSPVertex(wf_seg7_vertex_0700A048, 6, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSPEndDisplayList(), + gsSPVertex(pole_vtxs + 0, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(3, 4, 5, 0), + gsSP1Triangle(6, 7, 8, 0), + gsSP1Triangle(9, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(12, 14, 15, 0), + gsSPVertex(pole_vtxs + 16, 16, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 2, 3, 0), + gsSP1Triangle(4, 5, 6, 0), + gsSP1Triangle(4, 7, 5, 0), + gsSP1Triangle(8, 9, 10, 0), + gsSP1Triangle(8, 10, 11, 0), + gsSP1Triangle(12, 13, 14, 0), + gsSP1Triangle(12, 15, 13, 0), + gsSPVertex(pole_vtxs + 32, 4, 0), + gsSP1Triangle(0, 1, 2, 0), + gsSP1Triangle(0, 3, 1, 0), + gsSPEndDisplayList(), }; // 0x0700A170 - 0x0700A1E0 diff --git a/levels/wf/beta_extending_platform/collision.inc.c b/levels/wf/beta_extending_platform/collision.inc.c index 1d5177f9..28ea993b 100644 --- a/levels/wf/beta_extending_platform/collision.inc.c +++ b/levels/wf/beta_extending_platform/collision.inc.c @@ -1,26 +1,26 @@ // 0x0700FB1C - 0x0700FB94 const Collision wf_seg7_collision_trapezoid[] = { COL_INIT(), - COL_VERTEX_INIT(8), - COL_VERTEX(375, -5, 204), - COL_VERTEX(-214, 0, -204), - COL_VERTEX(215, 0, -204), + COL_VERTEX_INIT(8), COL_VERTEX(-214, 102, -204), - COL_VERTEX(-375, -5, 204), - COL_VERTEX(-375, 107, 204), - COL_VERTEX(375, 107, 204), + COL_VERTEX(-214, 0, -204), + COL_VERTEX(-414, 0, 205), + COL_VERTEX(-414, 102, 205), COL_VERTEX(215, 102, -204), + COL_VERTEX(415, 0, 205), + COL_VERTEX(415, 102, 205), + COL_VERTEX(215, 0, -204), COL_TRI_INIT(SURFACE_DEFAULT, 10), COL_TRI(0, 1, 2), - COL_TRI(3, 1, 4), - COL_TRI(3, 4, 5), - COL_TRI(5, 4, 0), - COL_TRI(5, 0, 6), - COL_TRI(7, 3, 5), - COL_TRI(7, 5, 6), - COL_TRI(6, 2, 7), - COL_TRI(0, 4, 1), - COL_TRI(6, 0, 2), + COL_TRI(0, 2, 3), + COL_TRI(4, 0, 3), + COL_TRI(5, 2, 1), + COL_TRI(3, 2, 5), + COL_TRI(3, 5, 6), + COL_TRI(4, 3, 6), + COL_TRI(5, 1, 7), + COL_TRI(6, 5, 7), + COL_TRI(6, 7, 4), COL_TRI_STOP(), - COL_END(), + COL_END() }; diff --git a/levels/wf/beta_extending_platform/model.inc.c b/levels/wf/beta_extending_platform/model.inc.c index ba1720bc..de373cf7 100644 --- a/levels/wf/beta_extending_platform/model.inc.c +++ b/levels/wf/beta_extending_platform/model.inc.c @@ -1,24 +1,24 @@ static const Vtx beta_extending_platform_dl_mesh_vtx_0[20] = { - {{{375, -5, 204},0, {-578, 976},{0x0, 0x81, 0xFE, 0xFF}}}, - {{{-214, 0, -204},0, {1010, -16},{0x0, 0x81, 0xFE, 0xFF}}}, - {{{215, 0, -204},0, {-129, -16},{0x0, 0x81, 0xFE, 0xFF}}}, - {{{-375, -5, 204},0, {1506, 976},{0x0, 0x81, 0xFE, 0xFF}}}, - {{{-214, 102, -204},0, {-16, -16},{0x8A, 0x0, 0xD1, 0xFF}}}, - {{{-214, 0, -204},0, {-16, 462},{0x8A, 0x0, 0xD1, 0xFF}}}, - {{{-375, -5, 204},0, {1996, 462},{0x8A, 0x0, 0xD1, 0xFF}}}, - {{{-375, 107, 204},0, {1996, -16},{0x8A, 0x0, 0xD1, 0xFF}}}, - {{{-375, 107, 204},0, {-16, -16},{0x0, 0x0, 0x7F, 0xFF}}}, - {{{-375, -5, 204},0, {-16, 462},{0x0, 0x0, 0x7F, 0xFF}}}, - {{{375, -5, 204},0, {1996, 462},{0x0, 0x0, 0x7F, 0xFF}}}, - {{{375, 107, 204},0, {1996, -16},{0x0, 0x0, 0x7F, 0xFF}}}, - {{{215, 102, -204},0, {1599, -16},{0x0, 0x7F, 0xFE, 0xFF}}}, - {{{-214, 102, -204},0, {423, -16},{0x0, 0x7F, 0xFE, 0xFF}}}, - {{{-375, 107, 204},0, {-68, 976},{0x0, 0x7F, 0xFE, 0xFF}}}, - {{{375, 107, 204},0, {2018, 976},{0x0, 0x7F, 0xFE, 0xFF}}}, - {{{375, 107, 204},0, {-16, -16},{0x76, 0x0, 0xD1, 0xFF}}}, - {{{215, 0, -204},0, {1996, 462},{0x76, 0x0, 0xD1, 0xFF}}}, - {{{215, 102, -204},0, {1996, -16},{0x76, 0x0, 0xD1, 0xFF}}}, - {{{375, -5, 204},0, {-16, 462},{0x76, 0x0, 0xD1, 0xFF}}}, + {{ {415, 0, 205}, 0, {-562, 992}, {0, 129, 0, 255} }}, + {{ {-214, 0, -204}, 0, {990, 0}, {0, 129, 0, 255} }}, + {{ {215, 0, -204}, 0, {0, 0}, {0, 129, 0, 255} }}, + {{ {-414, 0, 205}, 0, {1522, 992}, {0, 129, 0, 255} }}, + {{ {-214, 102, -204}, 0, {0, 0}, {141, 0, 202, 255} }}, + {{ {-214, 0, -204}, 0, {0, 478}, {141, 0, 202, 255} }}, + {{ {-414, 0, 205}, 0, {2012, 478}, {141, 0, 202, 255} }}, + {{ {-414, 102, 205}, 0, {2012, 0}, {141, 0, 202, 255} }}, + {{ {-414, 102, 205}, 0, {0, 0}, {0, 0, 127, 255} }}, + {{ {-414, 0, 205}, 0, {0, 478}, {0, 0, 127, 255} }}, + {{ {415, 0, 205}, 0, {2012, 478}, {0, 0, 127, 255} }}, + {{ {415, 102, 205}, 0, {2012, 0}, {0, 0, 127, 255} }}, + {{ {215, 102, -204}, 0, {1502, 0}, {0, 127, 0, 255} }}, + {{ {-214, 102, -204}, 0, {480, 0}, {0, 127, 0, 255} }}, + {{ {-414, 102, 205}, 0, {-52, 992}, {0, 127, 0, 255} }}, + {{ {415, 102, 205}, 0, {2034, 992}, {0, 127, 0, 255} }}, + {{ {415, 102, 205}, 0, {0, 0}, {115, 0, 202, 255} }}, + {{ {215, 0, -204}, 0, {2012, 478}, {115, 0, 202, 255} }}, + {{ {215, 102, -204}, 0, {2012, 0}, {115, 0, 202, 255} }}, + {{ {415, 0, 205}, 0, {0, 478}, {115, 0, 202, 255} }}, }; const Gfx beta_extending_platform_dl_mesh_tri_0[] = { diff --git a/levels/wf/script.c b/levels/wf/script.c index 735f0af4..dc734a1e 100644 --- a/levels/wf/script.c +++ b/levels/wf/script.c @@ -27,7 +27,7 @@ static const LevelScript script_func_local_1[] = { OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_07, /*pos*/ 0, 3450, -2800, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvStaticObject), OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0A, /*pos*/ 3840, 794, 2688, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvStaticObject), OBJECT(/*model*/ MODEL_LEVEL_GEOMETRY_0C, /*pos*/ 1408, 2522, 2431, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvStaticObject), - OBJECT(/*model*/ MODEL_WF_GIANT_POLE, /*pos*/ -1500, 2560, 2512, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvGiantPole), + OBJECT(/*model*/ MODEL_WF_GIANT_POLE, /*pos*/ -1498, 2560, 2510, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvGiantPole), OBJECT(/*model*/ MODEL_WF_GIANT_POLE, /*pos*/ 1128, 2500, -1024, /*angle*/ 0, 0, 0, /*bhvParam*/ 0x00000000, /*bhv*/ bhvGiantPole), RETURN(), }; diff --git a/sound/samples/instruments/0E_hihat_closed.aiff b/sound/samples/instruments/0E_hihat_closed.aiff index 9c0dce48..69bceab7 100644 Binary files a/sound/samples/instruments/0E_hihat_closed.aiff and b/sound/samples/instruments/0E_hihat_closed.aiff differ diff --git a/sound/samples/instruments/49.aiff b/sound/samples/instruments/49.aiff index 80f3ae84..fb509d64 100644 Binary files a/sound/samples/instruments/49.aiff and b/sound/samples/instruments/49.aiff differ diff --git a/sound/samples/sfx_5/01.aiff b/sound/samples/sfx_5/01.aiff index 16dcae80..175542ff 100644 Binary files a/sound/samples/sfx_5/01.aiff and b/sound/samples/sfx_5/01.aiff differ diff --git a/sound/samples/sfx_5/02.aiff b/sound/samples/sfx_5/02.aiff index 4fd253ee..0378ba9d 100644 Binary files a/sound/samples/sfx_5/02.aiff and b/sound/samples/sfx_5/02.aiff differ diff --git a/sound/samples/sfx_5/0D.aiff b/sound/samples/sfx_5/0D.aiff index f26dc756..5b56174e 100644 Binary files a/sound/samples/sfx_5/0D.aiff and b/sound/samples/sfx_5/0D.aiff differ diff --git a/sound/samples/sfx_6/01.aiff b/sound/samples/sfx_6/01.aiff index b03e33f4..d55c6ff8 100644 Binary files a/sound/samples/sfx_6/01.aiff and b/sound/samples/sfx_6/01.aiff differ diff --git a/sound/samples/sfx_6/03.aiff b/sound/samples/sfx_6/03.aiff index 8fa5e5b4..4c220654 100644 Binary files a/sound/samples/sfx_6/03.aiff and b/sound/samples/sfx_6/03.aiff differ diff --git a/sound/samples/sfx_6/05.aiff b/sound/samples/sfx_6/05.aiff index 44e3a2ee..e2e1adcb 100644 Binary files a/sound/samples/sfx_6/05.aiff and b/sound/samples/sfx_6/05.aiff differ diff --git a/sound/samples/sfx_6/09.aiff b/sound/samples/sfx_6/09.aiff index ff734e25..66ef095c 100644 Binary files a/sound/samples/sfx_6/09.aiff and b/sound/samples/sfx_6/09.aiff differ diff --git a/sound/samples/sfx_6/0A.aiff b/sound/samples/sfx_6/0A.aiff index c5a8fecc..28eb3a27 100644 Binary files a/sound/samples/sfx_6/0A.aiff and b/sound/samples/sfx_6/0A.aiff differ diff --git a/sound/samples/sfx_6/0B.aiff b/sound/samples/sfx_6/0B.aiff index a63ba086..1d539232 100644 Binary files a/sound/samples/sfx_6/0B.aiff and b/sound/samples/sfx_6/0B.aiff differ diff --git a/sound/samples/sfx_7/04.aiff b/sound/samples/sfx_7/04.aiff index 6d2ecc76..d67f9508 100644 Binary files a/sound/samples/sfx_7/04.aiff and b/sound/samples/sfx_7/04.aiff differ diff --git a/sound/samples/sfx_terrain/04_step_snow.aiff b/sound/samples/sfx_terrain/04_step_snow.aiff index a6e6d625..d6c9463a 100644 Binary files a/sound/samples/sfx_terrain/04_step_snow.aiff and b/sound/samples/sfx_terrain/04_step_snow.aiff differ diff --git a/sound/samples/sfx_terrain/08_land_default.aiff b/sound/samples/sfx_terrain/08_land_default.aiff new file mode 100644 index 00000000..b33f521e Binary files /dev/null and b/sound/samples/sfx_terrain/08_land_default.aiff differ diff --git a/sound/sequences/00_sound_player.s b/sound/sequences/00_sound_player.s index 89cf28e6..66691588 100644 --- a/sound/sequences/00_sound_player.s +++ b/sound/sequences/00_sound_player.s @@ -437,12 +437,12 @@ layer_end .sound_action_landing_default: chan_setbank 1 -chan_setinstr 0 +chan_setinstr 9 chan_setlayer 0, .layer_2AE chan_end .layer_2AE: -layer_note1 46, 0x18, 255 +layer_note1 39, 0x18, 90 layer_end .sound_action_landing_grass: @@ -1504,7 +1504,7 @@ chan_end .layer_96E: layer_somethingon .layer_96F: -layer_note1 40, 0x8, 105 +layer_note1 40, 0x8, 86 layer_jump .layer_96F layer_end @@ -4546,7 +4546,6 @@ chan_setlayer 0, .layer_2061 chan_end .layer_2061: -layer_portamento 0x81, 38, 255 layer_note1 39, 0xd2, 127 layer_end diff --git a/sound/sequences/jp/03_level_grass.m64 b/sound/sequences/jp/03_level_grass.m64 index 01433f09..796e11ee 100644 Binary files a/sound/sequences/jp/03_level_grass.m64 and b/sound/sequences/jp/03_level_grass.m64 differ diff --git a/sound/sequences/jp/23_bowser_hallway_scream_left.m64 b/sound/sequences/jp/23_bowser_hallway_scream_left.m64 index 26350c35..fa8feb17 100644 Binary files a/sound/sequences/jp/23_bowser_hallway_scream_left.m64 and b/sound/sequences/jp/23_bowser_hallway_scream_left.m64 differ diff --git a/sound/sequences/jp/24_bowser_hallway_scream_right.m64 b/sound/sequences/jp/24_bowser_hallway_scream_right.m64 index 041fc5b9..b253b5a5 100644 Binary files a/sound/sequences/jp/24_bowser_hallway_scream_right.m64 and b/sound/sequences/jp/24_bowser_hallway_scream_right.m64 differ diff --git a/sound/sound_banks/01_terrain.json b/sound/sound_banks/01_terrain.json index 5d233ac6..ab447f9a 100644 --- a/sound/sound_banks/01_terrain.json +++ b/sound/sound_banks/01_terrain.json @@ -55,6 +55,11 @@ "release_rate": 208, "envelope": "envelope0", "sound": "07_step_sand" + }, + "inst8": { + "release_rate": 208, + "envelope": "envelope0", + "sound": "08_land_default" } }, "instrument_list": [ @@ -66,6 +71,7 @@ "inst4", "inst5", "inst6", - "inst7" + "inst7", + "inst8" ] } diff --git a/sound/sound_banks/22.json b/sound/sound_banks/22.json index 587998b2..565659fd 100644 --- a/sound/sound_banks/22.json +++ b/sound/sound_banks/22.json @@ -28,14 +28,12 @@ ], "envelope4": [ [1, 32700], - [1, 32700], - [32700, 29430], "hang" ], "envelope5": [ [2, 32700], - [1, 32700], - [32700, 29430], + [25, 28000], + [200, 0], "stop" ], "envelope6": [ @@ -47,7 +45,7 @@ }, "instruments": { "inst0": { - "release_rate": 208, + "release_rate": 188, "envelope": "envelope0", "sound": "19_brass_Eb3" }, @@ -84,56 +82,56 @@ {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.65178125}}, {"release_rate": 70, "pan": 62, "envelope": "envelope4", "sound": {"sample": "06_kick_drum_1", "tuning": 1.75}}, {"release_rate": 60, "pan": 57, "envelope": "envelope4", "sound": "07_rimshot"}, - {"release_rate": 70, "pan": 65, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 2.310964}}, - {"release_rate": 70, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.700731375}}, - {"release_rate": 70, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.7883341}}, - {"release_rate": 10, "pan": 6, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.471937}}, - {"release_rate": 10, "pan": 6, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.5}}, - {"release_rate": 10, "pan": 27, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.66742}}, - {"release_rate": 10, "pan": 27, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.707107}}, - {"release_rate": 10, "pan": 45, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.793701}}, - {"release_rate": 10, "pan": 45, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.840897}}, - {"release_rate": 10, "pan": 53, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.0}}, - {"release_rate": 10, "pan": 53, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.059463}}, - {"release_rate": 10, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.189207}}, - {"release_rate": 10, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.259921}}, - {"release_rate": 10, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.33484}}, - {"release_rate": 10, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.414214}}, - {"release_rate": 10, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.498307}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.189207}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.259921}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.33484}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.414214}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.498307}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.587401}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.681793}}, - {"release_rate": 10, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.781798}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.5469096}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.5794306}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.61388505}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.65038884}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.6890625}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.7300362}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.77344644}}, - {"release_rate": 10, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.81943786}}, - {"release_rate": 10, "pan": 70, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 1.5468929}}, - {"release_rate": 10, "pan": 70, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 1.6388757}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.793701}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.840897}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.890899}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.943875}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.0}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.059463}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.122462}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.189207}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.259921}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.33484}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.414214}}, - {"release_rate": 10, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.498307}}, - {"release_rate": 10, "pan": 128, "envelope": "envelope4", "sound": "0D_clave"} + {"release_rate": 50, "pan": 65, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 2.310964}}, + {"release_rate": 50, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.700731375}}, + {"release_rate": 50, "pan": 66, "envelope": "envelope4", "sound": {"sample": "08", "tuning": 1.7883341}}, + {"release_rate": 60, "pan": 6, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.471937}}, + {"release_rate": 60, "pan": 6, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.5}}, + {"release_rate": 60, "pan": 27, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.66742}}, + {"release_rate": 60, "pan": 27, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.707107}}, + {"release_rate": 60, "pan": 45, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.793701}}, + {"release_rate": 60, "pan": 45, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 0.840897}}, + {"release_rate": 60, "pan": 53, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.0}}, + {"release_rate": 60, "pan": 53, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.059463}}, + {"release_rate": 60, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.189207}}, + {"release_rate": 60, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.259921}}, + {"release_rate": 60, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.33484}}, + {"release_rate": 60, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.414214}}, + {"release_rate": 60, "pan": 83, "envelope": "envelope4", "sound": {"sample": "09", "tuning": 1.498307}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.189207}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.259921}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.33484}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.414214}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.498307}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.587401}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.681793}}, + {"release_rate": 60, "pan": 35, "envelope": "envelope4", "sound": {"sample": "0A_tambourine", "tuning": 1.781798}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.5469096}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.5794306}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.61388505}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.65038884}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.6890625}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.7300362}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.77344644}}, + {"release_rate": 60, "pan": 54, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 0.81943786}}, + {"release_rate": 60, "pan": 70, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 1.5468929}}, + {"release_rate": 60, "pan": 70, "envelope": "envelope4", "sound": {"sample": "0B", "tuning": 1.6388757}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.793701}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.840897}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.890899}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 0.943875}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.0}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.059463}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.122462}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.189207}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.259921}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.33484}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.414214}}, + {"release_rate": 60, "pan": 82, "envelope": "envelope4", "sound": {"sample": "0C_log_drum", "tuning": 1.498307}}, + {"release_rate": 60, "pan": 128, "envelope": "envelope4", "sound": "0D_clave"} ], "inst4": { - "release_rate": 208, + "release_rate":208, "normal_range_lo": 24, "envelope": "envelope5", "sound_lo": "0E_hihat_closed", diff --git a/src/game/behaviors/beta_fish_splash_spawner.inc.c b/src/game/behaviors/beta_fish_splash_spawner.inc.c index 1fef8c1a..72fd4d3d 100644 --- a/src/game/behaviors/beta_fish_splash_spawner.inc.c +++ b/src/game/behaviors/beta_fish_splash_spawner.inc.c @@ -32,6 +32,11 @@ void bhv_beta_fish_splash_spawner_loop(void) { if ((random_u16() & 0x1F) == 0) { stratp = spawn_object(o, MODEL_FISH, bhvWaterDroplet); obj_init_animation_with_sound(stratp, blue_fish_seg3_anims_0301C2B0, 0); + } + else if ((random_u16() & 0x3F) == 0) { + stratp = spawn_object(o, MODEL_BUB, bhvWaterDroplet); + obj_init_animation_with_sound(stratp, bub_seg6_anims_06012354, 0); + } else { stratp = spawn_object(o, MODEL_WHITE_PARTICLE_SMALL, bhvWaterDroplet); sc = random_float() * 1 + 0.5; diff --git a/src/game/behaviors/cannon.inc.c b/src/game/behaviors/cannon.inc.c index 4a2ab3a6..4757c85d 100644 --- a/src/game/behaviors/cannon.inc.c +++ b/src/game/behaviors/cannon.inc.c @@ -18,7 +18,7 @@ void opened_cannon_act_0(void) { cur_obj_become_tangible(); } - if (o->oDistanceToMario < 500.0f) { + if (o->oDistanceToMario < 400.0f) { cur_obj_become_tangible(); cur_obj_enable_rendering(); if ((o->oInteractStatus & INT_STATUS_INTERACTED) diff --git a/src/game/behaviors/water_splashes_and_waves.inc.c b/src/game/behaviors/water_splashes_and_waves.inc.c index 81798277..9735be95 100644 --- a/src/game/behaviors/water_splashes_and_waves.inc.c +++ b/src/game/behaviors/water_splashes_and_waves.inc.c @@ -79,7 +79,7 @@ void bhv_water_droplet_loop(void) { f32 waterLevel = find_water_level(o->oPosX, o->oPosZ); if (o->oTimer == 0) { - if (cur_obj_has_model(MODEL_FISH)) { + if (cur_obj_has_model(MODEL_FISH) || cur_obj_has_model(MODEL_BUB)) { o->header.gfx.node.flags &= ~GRAPH_RENDER_BILLBOARD; } else { o->header.gfx.node.flags |= GRAPH_RENDER_BILLBOARD; diff --git a/src/game/camera.c b/src/game/camera.c index a8b00fb2..2f478e27 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -788,18 +788,19 @@ void radial_camera_move(struct Camera *c) { f32 areaDistZ = sMarioCamState->pos[2] - c->areaCenZ; UNUSED s32 filler; - // The angle from the camera to the pivot subtracted from mario's angle - s16 turnYaw = gMarioState->faceAngle[1] - atan2s(areaDistZ, areaDistX); - // How much the camera's yaw changed - s16 yawOffset = calculate_yaw(sMarioCamState->pos, c->pos) - atan2s(areaDistZ, areaDistX); + // The angle from the camera to the pivot subtracted from mario's moving angle + s16 turnYaw = atan2s(gMarioState->vel[2], gMarioState->vel[0]) - atan2s(areaDistZ, areaDistX); - if (yawOffset > maxAreaYaw) { + // Difference between current yaw and area-center-to-mario angle + //s16 yawOffset = calculate_yaw(sMarioCamState->pos, c->pos) - atan2s(areaDistZ, areaDistX); + + /*if (yawOffset > maxAreaYaw) { yawOffset = maxAreaYaw; } if (yawOffset < minAreaYaw) { yawOffset = minAreaYaw; - } + }*/ // Check if mario stepped on a surface that rotates the camera. For example, when mario enters the // gate in BoB, the camera turns right to face up the hill path @@ -818,11 +819,6 @@ void radial_camera_move(struct Camera *c) { } } - if (gCameraMovementFlags & CAM_MOVE_ENTERED_ROTATE_SURFACE) { - rotateSpeed = 0x6F; - maxAreaYaw = DEGREES(25); // causes the camera to stop sooner when entering snow slider - } - if (c->mode == CAMERA_MODE_OUTWARD_RADIAL) { areaDistX = -areaDistX; areaDistZ = -areaDistZ; @@ -898,26 +894,24 @@ void radial_camera_move(struct Camera *c) { } else { // sModeOffsetYaw only updates when mario is moving if (c->mode == CAMERA_MODE_RADIAL) { - /* - rotateSpeed is based on the direction and velocity of mario. if you are moving - parallel to the angle from the camera to the pivot, the camera will NOT turn. - if you are moving adjacent to it, the camera WILL turn. - - 01/12/26 edit: the rotation speed peaks when mario runs diagonally (45 degrees) - relative to the camera pivot. the speed decreases as mario runs more perpendicular, - or at least that's kind of how this is supposed to work - - the cam's rotatespeed is SUPPOSED to peak at 1024 when mario runs diagonally (as seen - in footage) but i cannot get that to be the case without completely screwing up the - wf and lll spawn camera angles...... xd. - - so for now it'll have fuckass coefficients tuned to match them. - */ - rotateSpeed = 1024.f * sins(turnYaw) * (0.52f + 0.48f * coss(turnYaw)); - camera_approach_s16_symmetric_bool(&sModeOffsetYaw, yawOffset, rotateSpeed); - } - if (c->mode == CAMERA_MODE_OUTWARD_RADIAL) { - sModeOffsetYaw = offset_yaw_outward_radial(c, atan2s(areaDistZ, areaDistX)); + rotateSpeed = 0x80; + if (gCameraMovementFlags & CAM_FLAG_SPAWN) { + if (gCurrLevelArea == AREA_CCM_OUTSIDE) { + rotateSpeed = 0xA8; + } else if (gCurrLevelNum == LEVEL_WF) { + rotateSpeed = 0x3A; + } else if (gCurrLevelNum == LEVEL_LLL) { + rotateSpeed = 0x10; + } + } + // turning logic, i + if (gMarioStates->forwardVel != 0) { + if (turnYaw < 0) { + camera_approach_s16_symmetric_bool(&sModeOffsetYaw, maxAreaYaw, absf(sins(turnYaw) * rotateSpeed)); + } else if (turnYaw > 0) { + camera_approach_s16_symmetric_bool(&sModeOffsetYaw, minAreaYaw, absf(sins(turnYaw) * rotateSpeed)); + } + } } } } @@ -1529,10 +1523,7 @@ s32 update_behind_mario_camera(struct Camera *c, Vec3f focus, Vec3f pos) { s16 yaw; s16 goalPitch = -sMarioCamState->faceAngle[0]; s16 marioYaw = sMarioCamState->faceAngle[1] + DEGREES(180); - s16 yawSpeed = 192; - s16 pitchInc = 384; UNUSED u8 unused[12]; - f32 maxDist = 1000.f; f32 focYOff = 125.f; // Focus on mario @@ -1542,13 +1533,19 @@ s32 update_behind_mario_camera(struct Camera *c, Vec3f focus, Vec3f pos) { dist = calc_abs_dist(focus, pos); //! @bug unnecessary pitch = calculate_pitch(focus, pos); - vec3f_get_dist_and_angle(focus, pos, &dist, &pitch, &yaw); - if (dist > maxDist) { - dist = maxDist; - } + vec3f_get_dist_and_angle(focus, pos, &dist, &pitch, &yaw); + camera_approach_s16_symmetric_bool(&yaw, marioYaw, 192); - camera_approach_s16_symmetric_bool(&yaw, marioYaw, yawSpeed); - camera_approach_s16_symmetric_bool(&pitch, goalPitch, pitchInc); + if (c->mode == CAMERA_MODE_WATER_SURFACE) { + if (c->pos[1] > gMarioStates->waterLevel + 120) { + dist -= 32.0f * (dist / 1000); + } else { + if (dist > 1000) dist = 1000; + } + camera_approach_s16_symmetric_bool(&pitch, goalPitch, 128); + } else { + if (dist > 1000) dist = 1000; + camera_approach_s16_symmetric_bool(&pitch, goalPitch, 384); if (dist < 300.f) { dist = 300.f; } @@ -1567,7 +1564,6 @@ s32 mode_behind_mario(struct Camera *c) { //! @bug oldPos is unused, see resolve_geometry_collisions Vec3f oldPos; f32 waterHeight; - f32 floorHeight; s16 yaw; vec3f_copy(oldPos, c->pos); @@ -1579,13 +1575,9 @@ s32 mode_behind_mario(struct Camera *c) { // Keep the camera above the water surface if swimming if (c->mode == CAMERA_MODE_WATER_SURFACE) { - floorHeight = find_floor(c->pos[0], c->pos[1], c->pos[2], &floor); newPos[1] = marioState->waterLevel + 120; - if (newPos[1] < (floorHeight += 120.f)) { - newPos[1] = floorHeight; - } } - approach_camera_height(c, newPos[1], 42.f); + approach_camera_height(c, newPos[1], 32.f); waterHeight = find_water_level(c->pos[0], c->pos[2]) + 100.f; if (c->pos[1] <= waterHeight) { gCameraMovementFlags |= CAM_MOVE_SUBMERGED; @@ -1746,7 +1738,7 @@ s16 update_default_camera(struct Camera *c) { handle_c_button_movement(c); vec3f_get_dist_and_angle(sMarioCamState->pos, c->pos, &dist, &pitch, &yaw); - if (gCameraMovementFlags & CAM_MOVE_ZOOMED_OUT && c->mode == CAMERA_MODE_CLOSE) { + if (gCameraMovementFlags & CAM_MOVE_ZOOMED_OUT) { zoomDist = gCameraZoomDist + 400; } else { zoomDist = gCameraZoomDist; @@ -1760,16 +1752,16 @@ s16 update_default_camera(struct Camera *c) { } } } else { - if ((sZoomAmount -= 30.f) < 0.f) { + if ((sZoomAmount -= 10.f) < 0.f) { sZoomAmount = 0.f; } if (dist > zoomDist) { - if ((dist -= 30.f) < zoomDist) { + if ((dist -= 10.f) < zoomDist) { dist = zoomDist; } } if (dist < zoomDist) { - if ((dist += 30.f) > zoomDist) { + if ((dist += 10.f) > zoomDist) { dist = zoomDist; } } @@ -1891,14 +1883,11 @@ s16 update_default_camera(struct Camera *c) { } posHeight = 0.f; - if (c->mode == CAMERA_MODE_FREE_ROAM) { if (gCameraMovementFlags & CAM_MOVE_ZOOMED_OUT) { - posHeight = 375.f; - } else { - posHeight = 100.f; + posHeight = 500.f; } - } - + +// intro cutscene camera behavior,, seems a little hacky? if (xzDist < 180.f && sMarioCamState->unused == 1) { c->pos[1] = marioFloorHeight + (300 - xzDist); } else if ((xzDist > 300.f && sMarioCamState->unused != 0) @@ -1952,12 +1941,10 @@ s16 update_default_camera(struct Camera *c) { } } - if (c->mode != CAMERA_MODE_CLOSE) { - lakitu_zoom(400.f, 0x600); - vec3f_set_dist_and_angle(c->pos, c->pos, sLakituDist, sLakituPitch + 0x1000, yaw); + if (!(gCameraMovementFlags & CAM_MOVE_ZOOMED_OUT)) { + set_camera_height(c, c->pos[1] - 125.0f); } - set_camera_height(c, c->pos[1] - 125.0f); return yaw; } #pragma GCC diagnostic pop @@ -2846,9 +2833,6 @@ void init_camera(struct Camera *c) { gCameraMovementFlags |= CAM_MOVE_ZOOMED_OUT; } switch (gCurrLevelArea) { - case AREA_CCM_OUTSIDE: - gCameraMovementFlags |= (CAM_MOVE_ROTATE_RIGHT | CAM_MOVE_ENTERED_ROTATE_SURFACE); - break; case AREA_CCM_SLIDE: vec3f_set(marioOffset, 0.f, 0.f, 475.f); break; @@ -6398,9 +6382,9 @@ BAD_RETURN(s32) cutscene_door_move_behind_mario(struct Camera *c) { vec3f_set(camOffset, 0.f, 125.f, 250.f); if (doorRotation == 0) { // pulling door - camOffset[0] = 120.f; + camOffset[0] = 125.f; camOffset[1] = 40.f; - camOffset[2] = 195.f; // used to be 280.f + camOffset[2] = 240.f; // used to be 280.f } else { // pushing door camOffset[0] = -85.f; camOffset[1] = 30.f; @@ -6415,11 +6399,11 @@ BAD_RETURN(s32) cutscene_door_follow_mario(struct Camera *c) { s16 pitch, yaw; f32 dist; - set_focus_rel_mario(c, 0.f, 125.f, 0.f, 0); + set_focus_rel_mario(c, 0.f, 125.f, 0.f, 0.f); vec3f_get_dist_and_angle(c->focus, c->pos, &dist, &pitch, &yaw); - camera_approach_f32_symmetric_bool(&dist, 225.f, 10); - camera_approach_s16_symmetric_bool(&pitch, 0, 96); + camera_approach_f32_symmetric_bool(&dist, 215.f, 14.f); + camera_approach_s16_symmetric_bool(&pitch, 0, 128.f); // camera_approach_s16_symmetric_bool(&yaw, 0, 16); vec3f_set_dist_and_angle(c->focus, c->pos, dist, pitch, yaw); @@ -6851,7 +6835,7 @@ void fov_default(struct MarioState *m) { } // Nintendo is dumb - if ((gCurrLevelNum == LEVEL_CCM) || (gCurrLevelNum == LEVEL_DDD)) { + if ((gCurrLevelNum == LEVEL_WF) || (gCurrLevelNum == LEVEL_CCM) || (gCurrLevelNum == LEVEL_DDD)) { sFOVState.fov = 45.f; } } diff --git a/src/game/camera.h b/src/game/camera.h index df55d55f..52734c29 100644 --- a/src/game/camera.h +++ b/src/game/camera.h @@ -138,7 +138,7 @@ #define CAM_FLAG_CCM_SLIDE_SHORTCUT 0x0010 #define CAM_FLAG_CAM_NEAR_WALL 0x0020 #define CAM_FLAG_SLEEPING 0x0040 -#define CAM_FLAG_UNUSED_7 0x0080 +#define CAM_FLAG_SPAWN 0x0080 #define CAM_FLAG_UNUSED_8 0x0100 #define CAM_FLAG_COLLIDED_WITH_WALL 0x0200 #define CAM_FLAG_START_TRANSITION 0x0400 diff --git a/src/game/interaction.c b/src/game/interaction.c index f1bf262c..65d29aff 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -758,7 +758,7 @@ u32 interact_warp_door(struct MarioState *m, UNUSED u32 interactType, struct Obj u32 doorAction = 0; u32 actionArg; - if (m->action == ACT_WALKING || m->isPushing == 1) { + if (m->action == ACT_WALKING) { actionArg = should_push_or_pull_door(m, o) + 0x00000004; if (doorAction == 0) { @@ -821,7 +821,7 @@ u32 interact_door(struct MarioState *m, UNUSED u32 interactType, struct Object * s16 requiredNumStars = o->oBhvParams >> 24; s16 numStars = save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1); - if (m->action == ACT_WALKING || m->isPushing == 1) { + if (m->action == ACT_WALKING ||) { if (numStars >= requiredNumStars) { u32 actionArg = should_push_or_pull_door(m, o); u32 enterDoorAction; @@ -1185,11 +1185,14 @@ u32 interact_pole(struct MarioState *m, UNUSED u32 interactType, struct Object * s32 actionId = m->action & ACT_ID_MASK; if (actionId >= 0x080 && actionId < 0x0A0) { if (!(m->prevAction & ACT_FLAG_ON_POLE) || m->usedObj != o) { - u32 lowSpeed = (m->forwardVel <= 10.0f); + f32 velConv = m->forwardVel; struct Object *marioObj = m->marioObj; + u32 lowSpeed; mario_stop_riding_and_holding(m); + lowSpeed = (velConv <= 10.0f); + m->interactObj = o; m->usedObj = o; m->vel[1] = 0.0f; @@ -1205,7 +1208,7 @@ u32 interact_pole(struct MarioState *m, UNUSED u32 interactType, struct Object * //! @bug Using m->forwardVel here is assumed to be 0.0f due to the set from earlier. // This is fixed in the Shindou version. - marioObj->oMarioPoleYawVel = (s32) (m->forwardVel * 0x100 + 0x1000); + marioObj->oMarioPoleYawVel = (s32)(velConv * 0x100 + 0x1000); reset_mario_pitch(m); return set_mario_action(m, ACT_GRAB_POLE_FAST, 0); } diff --git a/src/game/level_update.c b/src/game/level_update.c index 4cb5914e..dc5e6129 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -169,7 +169,7 @@ void set_mario_initial_action(struct MarioState *m, u32 spawnType, u32 actionArg set_mario_action(m, ACT_IDLE, 0); break; case MARIO_SPAWN_AIRBORNE: - set_mario_action(m, ACT_SPAWN_NO_SPIN_AIRBORNE, 0); + set_mario_action(m, ACT_IDLE, 0); break; case MARIO_SPAWN_HARD_AIR_KNOCKBACK: set_mario_action(m, ACT_HARD_BACKWARD_AIR_KB, 0); diff --git a/src/game/mario.c b/src/game/mario.c index 189198d7..c3160a37 100644 --- a/src/game/mario.c +++ b/src/game/mario.c @@ -781,9 +781,6 @@ static u32 set_mario_action_airborne(struct MarioState *m, u32 action, u32 actio case ACT_HOLD_JUMP: m->marioObj->header.gfx.animInfo.animID = -1; set_mario_y_vel_based_on_fspeed(m, 42.0f, 0.25f); - if (m->actionState != 0 && m->wall != NULL) { - m->forwardVel = m->intendedMag; - } m->forwardVel *= 0.8f; break; @@ -948,7 +945,6 @@ u32 set_mario_action(struct MarioState *m, u32 action, u32 actionArg) { m->actionArg = actionArg; m->actionState = 0; m->actionTimer = 0; - m->isPushing = 0; return TRUE; } diff --git a/src/game/mario_actions_airborne.c b/src/game/mario_actions_airborne.c index b6ba9cb0..b91cf7da 100644 --- a/src/game/mario_actions_airborne.c +++ b/src/game/mario_actions_airborne.c @@ -237,7 +237,7 @@ void update_flying_yaw(struct MarioState *m) { } void update_flying_pitch(struct MarioState *m) { - s16 targetPitchVel = -(s16) (m->controller->stickY * (m->forwardVel / 5.0f)); + s16 targetPitchVel = -(s16)(m->controller->stickY * (m->forwardVel / 5.0f)); if (targetPitchVel > 0) { if (m->angleVel[0] < 0) { @@ -279,9 +279,9 @@ void update_flying(struct MarioState *m) { m->faceAngle[0] += (m->forwardVel - 32.0f) * 6.0f; } else if (m->forwardVel > 4.0f) { m->faceAngle[0] += (m->forwardVel - 32.0f) * 10.0f; - } else { - m->faceAngle[0] -= 0x400; } + else + m->faceAngle[0] -= 0x400; m->faceAngle[0] += m->angleVel[0]; @@ -1243,8 +1243,6 @@ s32 act_shot_from_cannon(struct MarioState *m) { mario_set_forward_vel(m, m->forwardVel); - m->actionTimer++; - play_sound_if_no_flag(m, SOUND_MARIO_YAHOO, MARIO_MARIO_SOUND_PLAYED); switch (perform_air_step(m, 0)) { @@ -1277,21 +1275,16 @@ s32 act_shot_from_cannon(struct MarioState *m) { break; } - m->vel[1] -= 1.15f; - - if (m->actionTimer == 45) { + if (m->vel[1] < 0.0f) { set_mario_action(m, ACT_FLYING, 0); } - if ((m->forwardVel -= 0.05) < 10.0f) { - mario_set_forward_vel(m, 10.0f); - } +m->forwardVel -= 0.2; return FALSE; } s32 act_flying(struct MarioState *m) { - s16 startPitch = m->faceAngle[0]; if (m->input & INPUT_Z_PRESSED) { if (m->area->camera->mode == CAMERA_MODE_BEHIND_MARIO) { @@ -1347,6 +1340,7 @@ s32 act_flying(struct MarioState *m) { case AIR_STEP_HIT_WALL: if (m->wall != NULL) { mario_set_forward_vel(m, -16.0f); + set_mario_animation(m, MARIO_ANIM_DIVE); m->faceAngle[0] = 0; if (m->vel[1] > 0.0f) { @@ -1355,7 +1349,6 @@ s32 act_flying(struct MarioState *m) { set_mario_action(m, ACT_BACKWARD_AIR_KB, 0); set_camera_mode(m->area->camera, m->area->camera->defMode, 1); } else { - if (m->actionTimer == 30) { m->actionTimer = 0; } @@ -1379,8 +1372,6 @@ s32 act_flying(struct MarioState *m) { m->particleFlags |= PARTICLE_DUST; } - if (startPitch <= 0 && m->faceAngle[0] > 0 && m->forwardVel >= 48.0f) { - } return FALSE; } @@ -1408,7 +1399,7 @@ s32 act_riding_hoot(struct MarioState *m) { } } - vec3f_set(m->vel, 0.0f, 0.0f, 0.0f); + //vec3f_set(m->vel, 0.0f, 0.0f, 0.0f); vec3f_set(m->marioObj->header.gfx.pos, m->pos[0], m->pos[1], m->pos[2]); vec3s_set(m->marioObj->header.gfx.angle, 0, 0x4000 - m->faceAngle[1], 0); return FALSE; diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c index 481ed0b6..b615b858 100644 --- a/src/game/mario_actions_automatic.c +++ b/src/game/mario_actions_automatic.c @@ -121,11 +121,6 @@ s32 act_holding_pole(struct MarioState *m) { return set_mario_action(m, ACT_SOFT_BONK, 0); } - if (m->actionTimer <= 12) { - anim = MARIO_ANIM_JUST_GRABBED_POLE; - m->actionTimer++; - } - if (m->controller->stickY > 16.0f) { f32 poleTop = m->usedObj->hitboxHeight - 100.0f; diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c index 61460b75..b187c38e 100644 --- a/src/game/mario_actions_cutscene.c +++ b/src/game/mario_actions_cutscene.c @@ -618,8 +618,10 @@ s32 act_emerge_from_pipe(struct MarioState *m) { } s32 act_spawn_spin_airborne(struct MarioState *m) { + gCameraMovementFlags |= CAM_FLAG_SPAWN; // entered water, exit action if (m->pos[1] < m->waterLevel - 100) { + gCameraMovementFlags &= ~CAM_FLAG_SPAWN; load_level_init_text(0); return set_water_plunge_action(m); } @@ -634,6 +636,7 @@ s32 act_spawn_spin_airborne(struct MarioState *m) { if (m->actionState++ == 0) { m->vel[1] = 36.0f; } else { + gCameraMovementFlags &= ~CAM_FLAG_SPAWN; set_mario_action(m, ACT_SPAWN_SPIN_LANDING, 0); } break; diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index cfccb36a..1b670292 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -640,21 +640,14 @@ void push_or_sidle_wall(struct MarioState *m, Vec3f startPos) { f32 dz = m->pos[2] - startPos[2]; f32 movedDistance = sqrtf(dx * dx + dz * dz); //! (Speed Crash) If a wall is after moving 16384 distance, this crashes. - s32 val04 = (s32) (movedDistance * 2.0f * 0x10000); + s32 val04 = (s32)(movedDistance * 2.0f * 0x10000); if (m->wall != NULL) { wallAngle = atan2s(m->wall->normal.z, m->wall->normal.x); dWallAngle = wallAngle - m->faceAngle[1]; } - if ((dWallAngle <= -29128 && dWallAngle >= -31000) - || (dWallAngle >= 29128 && dWallAngle <= 31000)) { - if (m->forwardVel > 6.0f) { - mario_set_forward_vel(m, 6.0f); - } - } - - if (m->wall == NULL || dWallAngle <= -29128 || dWallAngle >= 29128) { + if (m->wall == NULL || dWallAngle <= -0x71C8 || dWallAngle >= 0x71C8) { m->flags |= MARIO_UNKNOWN_31; set_mario_animation(m, MARIO_ANIM_PUSHING); play_step_sound(m, 6, 18); @@ -665,14 +658,10 @@ void push_or_sidle_wall(struct MarioState *m, Vec3f startPos) { set_mario_anim_with_accel(m, MARIO_ANIM_SIDESTEP_LEFT, val04); } - if (m->forwardVel < 4.0f) { + if (m->forwardVel < 16.0f) { m->particleFlags |= PARTICLE_DUST; } - if (m->forwardVel > 6.0f) { - mario_set_forward_vel(m, 6.0f); - } - m->actionState = 1; m->actionArg = wallAngle + 0x8000; m->marioObj->header.gfx.angle[1] = wallAngle + 0x8000; @@ -712,15 +701,11 @@ s32 act_walking(struct MarioState *m) { if (m->input & INPUT_Z_PRESSED) { return set_mario_action(m, ACT_CROUCH_SLIDE, 0); } + m->actionState = 0; vec3f_copy(startPos, m->pos); update_walking_speed(m); - if (m->actionState != 0 && (m->forwardVel < m->intendedMag)) - m->forwardVel = m->intendedMag; - - m->actionState = 0; - switch (perform_ground_step(m)) { case GROUND_STEP_LEFT_GROUND: set_mario_action(m, ACT_FREEFALL, 0); @@ -1412,15 +1397,6 @@ s32 act_death_exit_land(struct MarioState *m) { u32 common_landing_action(struct MarioState *m, s16 animation, u32 airAction) { u32 stepResult; - s16 wallAngle; - s16 dWallAngle; - - m->isPushing = 0; - - if (m->wall != NULL) { - wallAngle = atan2s(m->wall->normal.z, m->wall->normal.x); - dWallAngle = wallAngle - m->faceAngle[1]; - } if (m->input & INPUT_NONZERO_ANALOG) { apply_landing_accel(m, 0.98f); @@ -1433,12 +1409,6 @@ u32 common_landing_action(struct MarioState *m, s16 animation, u32 airAction) { m->vel[1] = 0.0f; } - if (m->forwardVel > 16.0f) { - m->particleFlags |= PARTICLE_DUST; - } - - play_mario_landing_sound_once(m, SOUND_ACTION_TERRAIN_LANDING); - stepResult = perform_ground_step(m); switch (stepResult) { case GROUND_STEP_LEFT_GROUND: @@ -1446,29 +1416,25 @@ u32 common_landing_action(struct MarioState *m, s16 animation, u32 airAction) { break; case GROUND_STEP_HIT_WALL: - set_mario_animation(m, MARIO_ANIM_PUSHING); - if (m->wall == NULL || dWallAngle <= -27128 || dWallAngle >= 27128) { - m->isPushing = 1; - update_walking_speed(m); - if (m->forwardVel > 6.0f) { - mario_set_forward_vel(m, 6.0f); - } + if (m->actionTimer == 1) { + set_mario_animation(m, MARIO_ANIM_PUSHING); + } else if (m->intendedMag != 0) { + set_mario_animation(m, MARIO_ANIM_PUSHING); } else { - m->isPushing = 2; - if (is_anim_past_frame(m, 1)) { - set_mario_animation(m, animation); - if (m->intendedMag != 0) { - m->isPushing = 3; - } - } + set_mario_animation(m, animation); } break; - default: set_mario_animation(m, animation); break; } + if (m->forwardVel > 16.0f) { + m->particleFlags |= PARTICLE_DUST; + } + + play_mario_landing_sound_once(m, SOUND_ACTION_TERRAIN_LANDING); + return stepResult; } @@ -1488,12 +1454,6 @@ s32 common_landing_cancels(struct MarioState *m, struct LandingAction *landingAc } if (++m->actionTimer >= landingAction->numFrames) { - if (!(m->intendedMag != 0 && m->isPushing == 1)) { - return set_mario_action(m, landingAction->endAction, 0); - } - } - if ((m->intendedMag == 0 && m->isPushing == 2) || m->isPushing == 3) { - m->isPushing = 0; return set_mario_action(m, landingAction->endAction, 0); } @@ -1509,11 +1469,6 @@ s32 common_landing_cancels(struct MarioState *m, struct LandingAction *landingAc } s32 act_jump_land(struct MarioState *m) { - if (m->isPushing == 1 && m->actionTimer > 2 && (m->input & INPUT_A_PRESSED)) { - set_mario_action(m, ACT_JUMP, 0); - return TRUE; - } - if (common_landing_cancels(m, &sJumpLandAction, set_jumping_action)) { return TRUE; } diff --git a/src/game/mario_step.c b/src/game/mario_step.c index 98aca1a9..2dde0916 100644 --- a/src/game/mario_step.c +++ b/src/game/mario_step.c @@ -228,7 +228,11 @@ static s32 perform_ground_quarter_step(struct MarioState *m, Vec3f nextPos) { return GROUND_STEP_NONE; } - return GROUND_STEP_HIT_WALL_CONTINUE_QSTEPS; + if (lowerWall != NULL) { // if a wall is too low (such as the castle inside stairs) + return GROUND_STEP_HIT_WALL_CONTINUE_QSTEPS; // allow mario to continue walking + } + + return GROUND_STEP_HIT_WALL_STOP_QSTEPS; // otherwise, slow him down } return GROUND_STEP_NONE; @@ -441,6 +445,7 @@ void apply_gravity(struct MarioState *m) { if (m->action == ACT_TWIRLING && m->vel[1] < 0.0f) { apply_twirl_gravity(m); } else if (m->action == ACT_SHOT_FROM_CANNON) { + m->vel[1] -= 1.3f; if (m->vel[1] < -75.0f) { m->vel[1] = -75.0f; } diff --git a/src/game/moving_texture.c b/src/game/moving_texture.c index 85d0d5d5..da11a384 100644 --- a/src/game/moving_texture.c +++ b/src/game/moving_texture.c @@ -235,13 +235,13 @@ Gfx *geo_wdw_set_initial_water_level(s32 callContext, UNUSED struct GraphNode *n * This ensures water / sand flow stops when the game pauses. */ Gfx *geo_movtex_pause_control(s32 callContext, UNUSED struct GraphNode *node, UNUSED Mat4 mtx) { - if (callContext != GEO_CONTEXT_RENDER) { + /* if (callContext != GEO_CONTEXT_RENDER) { gMovtexCounterPrev = gAreaUpdateCounter - 1; gMovtexCounter = gAreaUpdateCounter; } else { gMovtexCounterPrev = gMovtexCounter; gMovtexCounter = gAreaUpdateCounter; - } + }*/ return NULL; } diff --git a/textures/inside/inside_castle_textures.05800.rgba16.png b/textures/inside/inside_castle_textures.05800.rgba16.png index b1d6af0b..fd7874a3 100644 Binary files a/textures/inside/inside_castle_textures.05800.rgba16.png and b/textures/inside/inside_castle_textures.05800.rgba16.png differ diff --git a/textures/inside/inside_castle_textures.09000.rgba16.png b/textures/inside/inside_castle_textures.09000.rgba16.png index 549c2c89..c722ce9d 100644 Binary files a/textures/inside/inside_castle_textures.09000.rgba16.png and b/textures/inside/inside_castle_textures.09000.rgba16.png differ diff --git a/textures/outside/castle_grounds_textures.03800.rgba16.png b/textures/outside/castle_grounds_textures.03800.rgba16.png index 6d5ee6d2..281ad628 100644 Binary files a/textures/outside/castle_grounds_textures.03800.rgba16.png and b/textures/outside/castle_grounds_textures.03800.rgba16.png differ diff --git a/textures/outside/castle_grounds_textures.05800.rgba16.png b/textures/outside/castle_grounds_textures.05800.rgba16.png index 3de332a1..088550bd 100644 Binary files a/textures/outside/castle_grounds_textures.05800.rgba16.png and b/textures/outside/castle_grounds_textures.05800.rgba16.png differ diff --git a/textures/segment2/segment2.00000.rgba16.png b/textures/segment2/segment2.00000.rgba16.png index 42a008fe..f899fbc5 100644 Binary files a/textures/segment2/segment2.00000.rgba16.png and b/textures/segment2/segment2.00000.rgba16.png differ diff --git a/textures/segment2/segment2.00200.rgba16.png b/textures/segment2/segment2.00200.rgba16.png index 9f6b9b12..3d817462 100644 Binary files a/textures/segment2/segment2.00200.rgba16.png and b/textures/segment2/segment2.00200.rgba16.png differ diff --git a/textures/segment2/segment2.00400.rgba16.png b/textures/segment2/segment2.00400.rgba16.png index f8b9d928..96a31d01 100644 Binary files a/textures/segment2/segment2.00400.rgba16.png and b/textures/segment2/segment2.00400.rgba16.png differ diff --git a/textures/segment2/segment2.00600.rgba16.png b/textures/segment2/segment2.00600.rgba16.png index e4872e42..7db0a702 100644 Binary files a/textures/segment2/segment2.00600.rgba16.png and b/textures/segment2/segment2.00600.rgba16.png differ diff --git a/textures/segment2/segment2.00800.rgba16.png b/textures/segment2/segment2.00800.rgba16.png index 05300e10..80bcf659 100644 Binary files a/textures/segment2/segment2.00800.rgba16.png and b/textures/segment2/segment2.00800.rgba16.png differ diff --git a/textures/segment2/segment2.01000.rgba16.png b/textures/segment2/segment2.01000.rgba16.png index 4b437449..fcce8355 100644 Binary files a/textures/segment2/segment2.01000.rgba16.png and b/textures/segment2/segment2.01000.rgba16.png differ diff --git a/textures/skyboxes/water.png b/textures/skyboxes/water.png index 7379920d..78e06fbd 100644 Binary files a/textures/skyboxes/water.png and b/textures/skyboxes/water.png differ diff --git a/textures/water/jrb_textures.0A000.rgba16.png b/textures/water/jrb_textures.0A000.rgba16.png index d5173d0d..b611bb49 100644 Binary files a/textures/water/jrb_textures.0A000.rgba16.png and b/textures/water/jrb_textures.0A000.rgba16.png differ