diff --git a/actors/bowser/geo.inc.c b/actors/bowser/geo.inc.c index b59e23a6..3e592110 100644 --- a/actors/bowser/geo.inc.c +++ b/actors/bowser/geo.inc.c @@ -110,11 +110,7 @@ const GeoLayout bowser_geo_0000D8[] = { const GeoLayout bowser_geo_000424[] = { GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0x9B, 400), GEO_OPEN_NODE(), -#if BUGFIX_BOWSER_FADING_OUT GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040358), -#else - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040210), -#endif GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, -89, -2, -18, NULL), GEO_OPEN_NODE(), @@ -200,11 +196,7 @@ const GeoLayout bowser_geo_000424[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603A4E8), GEO_CLOSE_NODE(), -#if BUGFIX_BOWSER_FADING_OUT GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B948), -#else - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B8D0), -#endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -226,11 +218,7 @@ const GeoLayout bowser_geo_000424[] = { const GeoLayout bowser_geo_000770[] = { GEO_NODE_START(), GEO_OPEN_NODE(), -#if BUGFIX_BOWSER_FADING_OUT GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040358), -#else - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_06040210), -#endif GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, -89, -2, -18, NULL), GEO_OPEN_NODE(), @@ -316,11 +304,7 @@ const GeoLayout bowser_geo_000770[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603A4E8), GEO_CLOSE_NODE(), -#if BUGFIX_BOWSER_FADING_OUT GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B948), -#else - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, bowser_seg6_dl_0603B8D0), -#endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -338,24 +322,18 @@ const GeoLayout bowser_geo_000770[] = { GEO_RETURN(), }; -#ifndef VERSION_JP // 0x0D000AB8 const GeoLayout bowser_shadow_geo[] = { GEO_SHADOW(SHADOW_CIRCLE_9_VERTS, 0x9B, 400), GEO_RETURN(), }; -#endif // 0x0D000AB8 / 0AC4 const GeoLayout bowser_geo[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ASM(0, geo_update_layer_transparency), -#ifndef VERSION_JP GEO_SWITCH_CASE(3, geo_switch_anim_state), -#else - GEO_SWITCH_CASE(2, geo_switch_anim_state), -#endif GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), @@ -369,13 +347,11 @@ const GeoLayout bowser_geo[] = { GEO_BRANCH(1, bowser_geo_000424), GEO_CLOSE_NODE(), -#ifndef VERSION_JP GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ASM(0, geo_bits_bowser_coloring), GEO_BRANCH(1, bowser_shadow_geo), GEO_CLOSE_NODE(), -#endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), @@ -387,11 +363,7 @@ const GeoLayout bowser_geo_no_shadow[] = { GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ASM(0, geo_update_layer_transparency), -#ifndef VERSION_JP GEO_SWITCH_CASE(3, geo_switch_anim_state), -#else - GEO_SWITCH_CASE(2, geo_switch_anim_state), -#endif GEO_OPEN_NODE(), GEO_NODE_START(), GEO_OPEN_NODE(), @@ -405,13 +377,11 @@ const GeoLayout bowser_geo_no_shadow[] = { GEO_BRANCH(1, bowser_geo_000770), GEO_CLOSE_NODE(), -#ifndef VERSION_JP GEO_NODE_START(), GEO_OPEN_NODE(), GEO_ASM(0, geo_bits_bowser_coloring), GEO_BRANCH(1, bowser_shadow_geo), GEO_CLOSE_NODE(), -#endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/actors/bowser/model.inc.c b/actors/bowser/model.inc.c index 66d7a843..1d7899bd 100644 --- a/actors/bowser/model.inc.c +++ b/actors/bowser/model.inc.c @@ -1184,7 +1184,6 @@ const Gfx bowser_seg6_dl_0603B8D0[] = { gsSPEndDisplayList(), }; -#if BUGFIX_BOWSER_FADING_OUT // 0x0603B948 - 0x0603B9C8 const Gfx bowser_seg6_dl_0603B948[] = { gsDPPipeSync(), @@ -1204,7 +1203,6 @@ const Gfx bowser_seg6_dl_0603B948[] = { gsSPSetGeometryMode(G_LIGHTING), gsSPEndDisplayList(), }; -#endif // 0x0603B948 static const Vtx bowser_seg6_vertex_0603B948[] = { @@ -2870,7 +2868,6 @@ const Gfx bowser_seg6_dl_06040210[] = { gsSPEndDisplayList(), }; -#if BUGFIX_BOWSER_FADING_OUT // 0x06040358 - 0x06040428 const Gfx bowser_seg6_dl_06040358[] = { gsDPPipeSync(), @@ -2900,7 +2897,6 @@ const Gfx bowser_seg6_dl_06040358[] = { gsSPDisplayList(bowser_seg6_dl_060401F0), gsSPEndDisplayList(), }; -#endif // 0x060402D8 static const Vtx bowser_seg6_vertex_060402D8[] = { diff --git a/actors/peach/geo.inc.c b/actors/peach/geo.inc.c index 7a625276..53e9a8db 100644 --- a/actors/peach/geo.inc.c +++ b/actors/peach/geo.inc.c @@ -68,11 +68,7 @@ const GeoLayout peach_geo_000254[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, NULL), GEO_OPEN_NODE(), -#ifdef VERSION_JP - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_dl_05007230), -#else GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_us_dl_05007288), -#endif GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 78, 0, 0, peach_seg5_dl_05006A18), GEO_OPEN_NODE(), @@ -122,11 +118,7 @@ const GeoLayout peach_geo_000254[] = { GEO_ANIMATED_PART(LAYER_TRANSPARENT, 78, 0, 0, peach_seg5_dl_050060E0), GEO_ANIMATED_PART(LAYER_TRANSPARENT, -23, -1, 0, NULL), GEO_OPEN_NODE(), -#ifdef VERSION_JP - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_dl_0500A0A8), -#else GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, peach_seg5_us_dl_0500A188), -#endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/actors/peach/model.inc.c b/actors/peach/model.inc.c index 05ad2cba..6bc3448e 100644 --- a/actors/peach/model.inc.c +++ b/actors/peach/model.inc.c @@ -1087,7 +1087,6 @@ const Gfx peach_seg5_dl_05007230[] = { gsSPEndDisplayList(), }; -#ifndef VERSION_JP // 0x05007288 - 0x050072E8 const Gfx peach_seg5_us_dl_05007288[] = { gsDPPipeSync(), @@ -1103,7 +1102,6 @@ const Gfx peach_seg5_us_dl_05007288[] = { gsDPPipeSync(), gsSPEndDisplayList(), }; -#endif // 0x05007288 static const Lights1 peach_seg5_lights_05007288 = gdSPDefLights1( @@ -2219,7 +2217,6 @@ const Gfx peach_seg5_dl_0500A0A8[] = { gsSPEndDisplayList(), }; -#ifndef VERSION_JP // 0x0500A188 - 0x0500A210 const Gfx peach_seg5_us_dl_0500A188[] = { gsDPPipeSync(), @@ -2240,4 +2237,3 @@ const Gfx peach_seg5_us_dl_0500A188[] = { gsDPSetAlphaCompare(G_AC_NONE), gsSPEndDisplayList(), }; -#endif diff --git a/actors/toad/geo.inc.c b/actors/toad/geo.inc.c index d275b2ee..8692a2ea 100644 --- a/actors/toad/geo.inc.c +++ b/actors/toad/geo.inc.c @@ -62,17 +62,9 @@ const GeoLayout toad_geo_00027C[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 83, 0, 0, NULL), GEO_OPEN_NODE(), -#ifdef VERSION_JP - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 126, -37, 0, toad_seg6_dl_06007710), -#else GEO_ANIMATED_PART(LAYER_TRANSPARENT, 126, -37, 0, toad_seg6_us_dl_06007788), -#endif GEO_CLOSE_NODE(), -#ifdef VERSION_JP - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 25, 8, 0, toad_seg6_dl_06007A48), -#else GEO_ANIMATED_PART(LAYER_TRANSPARENT, 25, 8, 0, toad_seg6_us_dl_06007B00), -#endif GEO_ANIMATED_PART(LAYER_TRANSPARENT, 34, 8, 0, toad_seg6_dl_06007EB0), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 4, 7, 38, NULL), GEO_OPEN_NODE(), @@ -105,11 +97,7 @@ const GeoLayout toad_geo_00027C[] = { GEO_OPEN_NODE(), GEO_ANIMATED_PART(LAYER_TRANSPARENT, 0, 0, 0, NULL), GEO_OPEN_NODE(), -#ifdef VERSION_JP - GEO_ANIMATED_PART(LAYER_TRANSPARENT, 17, 0, -4, toad_seg6_dl_06008520), -#else GEO_ANIMATED_PART(LAYER_TRANSPARENT, 17, 0, -4, toad_seg6_us_dl_06008608), -#endif GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), GEO_CLOSE_NODE(), diff --git a/actors/toad/model.inc.c b/actors/toad/model.inc.c index d58b7400..b9c0ddd3 100644 --- a/actors/toad/model.inc.c +++ b/actors/toad/model.inc.c @@ -327,7 +327,6 @@ const Gfx toad_seg6_dl_06007710[] = { gsSPEndDisplayList(), }; -#ifndef VERSION_JP // 0x06007788 - 0x06007808 const Gfx toad_seg6_us_dl_06007788[] = { gsDPPipeSync(), @@ -347,7 +346,6 @@ const Gfx toad_seg6_us_dl_06007788[] = { gsDPPipeSync(), gsSPEndDisplayList(), }; -#endif // 0x06007788 static const Lights1 toad_seg6_lights_06007788 = gdSPDefLights1( @@ -423,7 +421,6 @@ const Gfx toad_seg6_dl_06007A48[] = { gsSPEndDisplayList(), }; -#ifndef VERSION_JP // 0x06007B00 - 0x06007B28 const Gfx toad_seg6_us_dl_06007B00[] = { gsDPPipeSync(), @@ -432,7 +429,6 @@ const Gfx toad_seg6_us_dl_06007B00[] = { gsDPPipeSync(), gsSPEndDisplayList(), }; -#endif // 0x06007A80 static const Lights1 toad_seg6_lights_06007A80 = gdSPDefLights1( @@ -698,7 +694,6 @@ const Gfx toad_seg6_dl_06008520[] = { }; // US: 8608 -#ifndef VERSION_JP // 0x06008608 - 0x06008650 const Gfx toad_seg6_us_dl_06008608[] = { gsDPPipeSync(), @@ -711,7 +706,6 @@ const Gfx toad_seg6_us_dl_06008608[] = { gsDPSetRenderMode(G_RM_AA_ZB_XLU_SURF, G_RM_NOOP2), gsSPEndDisplayList(), }; -#endif // 0x06008560 static const Lights1 toad_seg6_lights_06008560 = gdSPDefLights1( diff --git a/actors/whomp/collision.inc.c b/actors/whomp/collision.inc.c index 342720e1..2d0b52ae 100644 --- a/actors/whomp/collision.inc.c +++ b/actors/whomp/collision.inc.c @@ -2,18 +2,6 @@ // 0x06020A0C - 0x06020A90 const Collision whomp_seg6_collision_06020A0C[] = { -#ifdef VERSION_JP - COL_INIT(), - COL_VERTEX_INIT(0x8), - COL_VERTEX(-200, 50, -100), - COL_VERTEX(150, 50, -100), - COL_VERTEX(150, 430, -100), - COL_VERTEX(-200, 430, -100), - COL_VERTEX(-200, 50, -3), - COL_VERTEX(150, 430, -3), - COL_VERTEX(150, 50, -3), - COL_VERTEX(-200, 430, -3), -#else COL_INIT(), COL_VERTEX_INIT(0x8), COL_VERTEX(-150, 50, -100), @@ -24,7 +12,6 @@ const Collision whomp_seg6_collision_06020A0C[] = { COL_VERTEX(150, 430, -3), COL_VERTEX(150, 50, -3), COL_VERTEX(-150, 430, -3), -#endif COL_TRI_INIT(SURFACE_NO_CAM_COLLISION, 12), COL_TRI(2, 1, 0), diff --git a/bin/title_screen_bg.c b/bin/title_screen_bg.c index d6deb092..dd87b622 100644 --- a/bin/title_screen_bg.c +++ b/bin/title_screen_bg.c @@ -24,7 +24,7 @@ static const Vtx title_screen_bg_vertex_0A000000[] = { }; // 0x0A000100 - 0x0A000118 -const Gfx title_screen_bg_dl_0A000100[] = { +const Gfx title_screen_bg_dl_start[] = { gsDPSetCombineMode(G_CC_DECALRGB, G_CC_DECALRGB), gsDPSetRenderMode(G_RM_AA_OPA_SURF, G_RM_AA_OPA_SURF2), gsSPEndDisplayList(), @@ -62,7 +62,7 @@ const Gfx title_screen_bg_dl_0A000178[] = { }; // 0x0A000190 - 0x0A0001C0 -const Gfx title_screen_bg_dl_0A000190[] = { +const Gfx title_screen_bg_dl_end[] = { gsDPPipeSync(), gsSPTexture(0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_OFF), gsSPSetGeometryMode(G_LIGHTING), @@ -72,59 +72,57 @@ const Gfx title_screen_bg_dl_0A000190[] = { }; // 0x0A0001C0 -ALIGNED8 static const Texture title_texture_0A0001C0[] = { +ALIGNED8 static const Texture title_texture_title_0[] = { #include "textures/title_screen_bg/title_screen_bg.001C0.rgba16.inc.c" }; // 0x0A000E40 -ALIGNED8 static const Texture title_texture_0A000E40[] = { +ALIGNED8 static const Texture title_texture_title_1[] = { #include "textures/title_screen_bg/title_screen_bg.00E40.rgba16.inc.c" }; // 0x0A001AC0 -ALIGNED8 static const Texture title_texture_0A001AC0[] = { +ALIGNED8 static const Texture title_texture_title_2[] = { #include "textures/title_screen_bg/title_screen_bg.01AC0.rgba16.inc.c" }; // 0x0A002740 -ALIGNED8 static const Texture title_texture_0A002740[] = { +ALIGNED8 static const Texture title_texture_title_3[] = { #include "textures/title_screen_bg/title_screen_bg.02740.rgba16.inc.c" }; // 0x0A0033C0 -ALIGNED8 static const Texture title_texture_0A0033C0[] = { +ALIGNED8 static const Texture title_texture_game_over_0[] = { #include "textures/title_screen_bg/title_screen_bg.033C0.rgba16.inc.c" }; // 0x0A004040 -ALIGNED8 static const Texture title_texture_0A004040[] = { +ALIGNED8 static const Texture title_texture_game_over_1[] = { #include "textures/title_screen_bg/title_screen_bg.04040.rgba16.inc.c" }; // 0x0A004CC0 -ALIGNED8 static const Texture title_texture_0A004CC0[] = { +ALIGNED8 static const Texture title_texture_game_over_2[] = { #include "textures/title_screen_bg/title_screen_bg.04CC0.rgba16.inc.c" }; // 0x0A005940 -ALIGNED8 static const Texture title_texture_0A005940[] = { +ALIGNED8 static const Texture title_texture_game_over_3[] = { #include "textures/title_screen_bg/title_screen_bg.05940.rgba16.inc.c" }; // 0x0A0065C0 const Texture *const mario_title_texture_table[] = { - title_texture_0A0001C0, title_texture_0A000E40, title_texture_0A001AC0, title_texture_0A002740, + title_texture_title_0, title_texture_title_1, title_texture_title_2, title_texture_title_3, }; // 0x0A0065D0 const Texture *const game_over_texture_table[] = { - title_texture_0A0033C0, title_texture_0A004040, title_texture_0A004CC0, title_texture_0A005940, + title_texture_game_over_0, title_texture_game_over_1, title_texture_game_over_2, title_texture_game_over_3, }; -UNUSED static const u64 title_screen_bg_unused_0 = 0; - -#ifdef VERSION_SH -const Gfx title_screen_bg_dl_0A0065E8[] = { +#ifdef GODDARD_EASTER_EGG +const Gfx title_screen_bg_dl_face_easter_egg_begin[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_COPY), gsDPSetTexturePersp(G_TP_NONE), @@ -133,7 +131,7 @@ const Gfx title_screen_bg_dl_0A0065E8[] = { gsSPEndDisplayList(), }; -const Gfx title_screen_bg_dl_0A006618[] = { +const Gfx title_screen_bg_dl_face_easter_egg_end[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_1CYCLE), gsDPSetTexturePersp(G_TP_PERSP), @@ -145,8 +143,10 @@ const Gfx title_screen_bg_dl_0A006618[] = { ALIGNED8 static const u8 title_texture_rumble_pak[] = { #include "textures/title_screen_bg/title_screen_bg.06648.rgba16.inc.c" }; +#endif -const Gfx title_screen_bg_dl_0A007548[] = { +#if ENABLE_RUMBLE +const Gfx title_screen_bg_dl_rumble_pak[] = { gsDPPipeSync(), gsDPSetCycleType(G_CYC_COPY), gsDPSetTexturePersp(G_TP_NONE), diff --git a/data/behavior_data.c b/data/behavior_data.c index 0d537900..720b7d7e 100644 --- a/data/behavior_data.c +++ b/data/behavior_data.c @@ -3058,7 +3058,6 @@ const BehaviorScript bhvMerryGoRound[] = { END_LOOP(), }; -#ifndef VERSION_JP const BehaviorScript bhvPlaysMusicTrackWhenTouched[] = { BEGIN(OBJ_LIST_DEFAULT), OR_INT(oFlags, (OBJ_FLAG_COMPUTE_DIST_TO_MARIO | OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE)), @@ -3066,7 +3065,6 @@ const BehaviorScript bhvPlaysMusicTrackWhenTouched[] = { CALL_NATIVE(bhv_play_music_track_when_touched_loop), END_LOOP(), }; -#endif const BehaviorScript bhvBetaBowserAnchor[] = { BEGIN(OBJ_LIST_DESTRUCTIVE), diff --git a/include/config.h b/include/config.h index bb47c503..cbb768cf 100644 --- a/include/config.h +++ b/include/config.h @@ -1,154 +1,80 @@ -#ifndef CONFIG_H -#define CONFIG_H -// HACKERSM64 CONFIG DEFINES NEAR BOTTOM +#pragma once /** * @file config.h - * A catch-all file for configuring various bugfixes and other settings (maybe eventually) in SM64 + * A catch-all file for configuring various bugfixes and other settings in SM64 */ -// Bug Fixes -// --| Post-JP Version Nintendo Bug Fixes -/// Fixes bug where obtaining over 999 coins sets the number of lives to 999 (or -25) -#define BUGFIX_MAX_LIVES (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug where the Boss music won't fade out after defeating King Bob-omb -#define BUGFIX_KING_BOB_OMB_FADE_MUSIC (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug in Bob-Omb Battlefield where entering a warp stops the Koopa race music -#define BUGFIX_KOOPA_RACE_MUSIC (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug where Piranha Plants do not reset their action state when the -/// player exits their activation radius. -#define BUGFIX_PIRANHA_PLANT_STATE_RESET (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug where sleeping Piranha Plants damage players that bump into them -#define BUGFIX_PIRANHA_PLANT_SLEEP_DAMAGE (0 || VERSION_US || VERSION_SH) -/// Fixes bug where it shows a star when you grab a key in bowser battle stages -#define BUGFIX_STAR_BOWSER_KEY (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug that enables Mario in time stop even if is not ready to speak -#define BUGFIX_DIALOG_TIME_STOP (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug that causes Mario to still collide with Bowser in BITS after his defeat -#define BUGFIX_BOWSER_COLLIDE_BITS_DEAD (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug where Bowser wouldn't reset his speed when fallen off (and adds missing checks) -#define BUGFIX_BOWSER_FALLEN_OFF_STAGE (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Fixes bug where Bowser would look weird while fading out -#define BUGFIX_BOWSER_FADING_OUT (0 || VERSION_US || VERSION_EU || VERSION_SH) -/// Removes multi-language cake screen -#define EU_CUSTOM_CAKE_FIX 1 - +// -- ROM SETTINGS -- +// Internal ROM name. NEEDS TO BE **EXACTLY** 20 CHARACTERS. Can't be 19 characters, can't be 21 characters. You can fill it with spaces. +// The end quote should be here: " +#define INTERNAL_ROM_NAME "SUPERMARIO64 " // Support Rumble Pak // Currently not recommended, as it may cause random crashes. //#define ENABLE_RUMBLE (1 || VERSION_SH) - // Clear RAM on boot #define CLEARRAM 1 - // Screen Size Defines #define SCREEN_WIDTH 320 #define SCREEN_HEIGHT 240 - // Border Height Define for NTSC Versions -#ifdef TARGET_N64 +#ifdef TARGET_N64 // safeguard // Size of the black border at the top and bottom of the screen. You can set it to different values for console and emulator. // There is generally no reason to have a value other than 0 for emulator. As for console, it provides a (small) performance boost. #define BORDER_HEIGHT_CONSOLE 0 #define BORDER_HEIGHT_EMULATOR 0 +#endif // TARGET_N64 -#endif - -// -- HackerSM64 specific settings -- - -// TEST LEVEL -// Uncomment this define and set a test level in order to boot straight into said level. -// This allows you to quickly test the level you're working on. -// If you want the game to boot normally, just comment out the define again. -//#define TEST_LEVEL LEVEL_BOB - -// COMMON HACK CHANGES -// Internal ROM name. NEEDS TO BE **EXACTLY** 20 CHARACTERS. Can't be 19 characters, can't be 21 characters. You can fill it with spaces. -// The end quote should be here: " -#define INTERNAL_ROM_NAME "SUPERMARIO64 " +// -- GAME SETTINGS -- // Disable lives and hide the lives counter #define DISABLE_LIVES -// Skip peach letter cutscene -#define PEACH_SKIP -// Fixes the castle music sometimes triggering after getting a dialog -#define CASTLE_MUSIC_FIX -// Remove course specific camera processing -#define CAMERA_FIX +// Number of coins to spawn the "100 coin" star. If you remove the define altogether, then there won't be a 100 coin star at all. +#define X_COIN_STAR 100 +// Stars don't kick you out of the level +//#define NON_STOP_STARS +// Uncomment this if you want global star IDs (useful for creating an open world hack ala MVC) +//#define GLOBAL_STAR_IDS +// Number of possible unique model ID's (keep it higher than 256) +#define MODEL_ID_COUNT 256 +// Number of supported areas per level. +#define AREA_COUNT 8 +/// Removes multi-language cake screen +#define EU_CUSTOM_CAKE_FIX 1 +// Adds multiple languages to the game. Just a placeholder for the most part, because it only works with EU, and must be enabled with EU. +#define MULTILANG (0 || VERSION_EU) + +// -- EXIT COURSE SETTINGS -- +// Disable exit course +//#define DISABLE_EXIT_COURSE +#ifndef DISABLE_EXIT_COURSE // safeguard +// Decides whether you can exit course while moving (has no effect if you disable exit course) +// #define EXIT_COURSE_WHILE_MOVING +// Decides which level "exit course" takes you to (has no effect if you disable exit course) +#define EXIT_COURSE_LEVEL LEVEL_CASTLE +// Decides the area node "exit course" takes you to (has no effect if you disable exit course) +#define EXIT_COURSE_AREA 0x01 +// Decides the warp node "exit course" takes you to (has no effect if you disable exit course) +#define EXIT_COURSE_NODE 0x1F +#endif // DISABLE_EXIT_COURSE + +// -- MOVEMENT SETTINGS -- // Change the movement speed when hanging from a ceiling (the vanilla value is 4.f) #define HANGING_SPEED 12.f // Makes Mario face the direction of the analog stick directly while hanging from a ceiling, without doing "semicircles" #define TIGHTER_HANGING_CONTROLS // Fixes Mario's turn radius by making it dependent on forward speed. #define FIX_GROUND_TURN_RADIUS -// Makes Mario turn around instantly when moving on the ground -//#define SUPER_RESPONSIVE_CONTROLS // Disables fall damage #define NO_FALL_DAMAGE // Disables the scream that mario makes when falling off a great height (this is separate from actual fall damage) //#define NO_FALL_DAMAGE_SOUND // Disables Mario getting stuck in snow and sand when falling //#define NO_GETTING_BURIED -// Number of coins to spawn the "100 coin" star. If you remove the define altogether, then there won't be a 100 coin star at all. -#define X_COIN_STAR 100 // Platform displacement 2 also known as momentum patch. Makes Mario keep the momemtum from moving platforms. Doesn't break treadmills anymore! #define PLATFORM_DISPLACEMENT_2 -// Stars don't kick you out of the level -//#define NON_STOP_STARS -// Uncomment this if you want global star IDs (useful for creating an open world hack ala MVC) -//#define GLOBAL_STAR_IDS -// Uncomment this if you want to skip the title screen (Super Mario 64 logo) -//#define SKIP_TITLE_SCREEN -// Uncomment this if you want to keep the mario head and not skip it -//#define KEEP_MARIO_HEAD -// Disables the demo that plays when idle on the start screen (Arceveti) -#define DISABLE_DEMO -// Enables "parallel lakitu camera" or "aglab cam" which lets you move the camera smoothly with the dpad -#define PARALLEL_LAKITU_CAM // Allows Mario to ledgegrab sloped floors #define NO_FALSE_LEDGEGRABS -// Adds multiple languages to the game. Just a placeholder for the most part, because it only works with EU, and must be enabled with EU. -#define MULTILANG (0 || VERSION_EU) -// Enables Puppy Camera 2, a rewritten camera that can be freely configured and modified. -//#define PUPPYCAM -// Allows Mario's shadow to be transparent on top of transparent surfaces, such as water, lava, and ice -#define FIX_SHADOW_TRANSPARENCY -// Fixes the game reading the ia8 burn smoke texture as an rgba16 -#define BURN_SMOKE_FIX -// Disable the fix to Koopa's unshelled model -#define KOOPA_KEEP_PINK_SHORTS -// Automatically calculate the optimal collision distance for an object based on its vertices. -#define AUTO_COLLISION_DISTANCE - - -// HACKER QOL -// Increase the maximum pole length (it will treat bparam1 and bparam2 as a single value) -#define LONGER_POLES -// Number of possible unique model ID's (keep it higher than 256) -#define MODEL_ID_COUNT 256 -// Increase audio heap size to allow for more concurrent notes to be played and for more custom sequences/banks to be imported (not supported for SH) -#define EXPAND_AUDIO_HEAP -// Allow all surfaces types to have force, (doesn't require setting force, just allows it to be optional). -#define ALL_SURFACES_HAVE_FORCE -// Custom debug mode. Press DPAD left to show the debug UI. Press DPAD right to enter the noclip mode. -//#define CUSTOM_DEBUG -// Include Puppyprint, a display library for text and large images. Also includes a custom, enhanced performance profiler. -//#define PUPPYPRINT -#define PUPPYPRINT_DEBUG 0 -// Visual debug enables some collision visuals. Tapping Right on the dpad will cycle between visual hitboxes, visual surfaces, both, and neither. -// If puppyprint is enabled, then this can be cycled only while the screen is active. -//#define VISUAL_DEBUG -// Number of supported areas per level. -#define AREA_COUNT 8 -// Number of walls that can push Mario at once. -#define MAX_REFEREMCED_WALLS 4 -// Lightweight directional lighting engine by Fazana. Intended for giving proximity and positional pointlights to small objects. -//#define PUPPYLIGHTS -// Open all courses and doors. Used for debugging purposes to unlock all content. -//#define UNLOCK_ALL - -// BUG/GAME QOL FIXES -// Fix instant warp offset not working when warping across different areas -#define INSTANT_WARP_OFFSET_FIX -// Whether a tree uses snow particles or not is decided via the model IDs instead of the course number -#define TREE_PARTICLE_FIX +// Use Shindou's pole behavior +//#define SHINDOU_POLES // Allows Mario to jump kick on steep surfaces that are set to be non slippery, instead of being forced to dive #define JUMP_KICK_FIX // Allow Mario to grab hangable ceilings from any state @@ -160,19 +86,43 @@ // Disable BLJs and crush SimpleFlips's dreams //#define DISABLE_BLJ -// RELATING TO EXIT COURSE -// Disable exit course -//#define DISABLE_EXIT_COURSE -// Decides whether you can exit course while moving (has no effect if you disable exit course) -//#define EXIT_COURSE_WHILE_MOVING -// Decides which level "exit course" takes you to (has no effect if you disable exit course) -#define EXIT_COURSE_LEVEL LEVEL_CASTLE -// Decides the area node "exit course" takes you to (has no effect if you disable exit course) -#define EXIT_COURSE_AREA 0x01 -// Decides the warp node "exit course" takes you to (has no effect if you disable exit course) -#define EXIT_COURSE_NODE 0x1F +// -- COLLISION SETTINGS -- +// Automatically calculate the optimal collision distance for an object based on its vertices. +#define AUTO_COLLISION_DISTANCE +// Allow all surfaces types to have force, (doesn't require setting force, just allows it to be optional). +#define ALL_SURFACES_HAVE_FORCE +// Number of walls that can push Mario at once. +#define MAX_REFEREMCED_WALLS 4 +// Collision data is the type that the collision system uses. All data by default is stored as an s16, but you may change it to s32. +// Naturally, that would double the size of all collision data, but would allow you to use 32 bit values instead of 16. +// Rooms are s8 in vanilla, but if you somehow have more than 255 rooms, you may raise this number. +// Currently, they *must* say as s8, because the room tables generated by literally anything are explicitly u8 and don't use a macro, making this currently infeasable. +#define COLLISION_DATA_TYPE s16 +#define ROOM_DATA_TYPE s8 -// OTHER ENHANCEMENTS +// -- CUTSCENE SKIPS -- +// Skip peach letter cutscene +#define PEACH_SKIP +// Uncomment this if you want to skip the title screen (Super Mario 64 logo) +//#define SKIP_TITLE_SCREEN +// Uncomment this if you want to keep the mario head and not skip it +//#define KEEP_MARIO_HEAD +#ifdef KEEP_MARIO_HEAD // safeguard +//Goddard easter egg from Shindou (has no effect if KEEP_MARIO_HEAD is disabled) +#define GODDARD_EASTER_EGG +// Disables the demo that plays when idle on the start screen (has no effect if KEEP_MARIO_HEAD is disabled) +#define DISABLE_DEMO +#endif // KEEP_MARIO_HEAD + +// -- CAMERA SETTINGS -- +// Remove course specific camera processing +#define CAMERA_FIX +// Enables "parallel lakitu camera" or "aglab cam" which lets you move the camera smoothly with the dpad +#define PARALLEL_LAKITU_CAM +// Enables Puppy Camera 2, a rewritten camera that can be freely configured and modified. +//#define PUPPYCAM + +// -- GRAPHICS SETTINGS -- // Enable widescreen (16:9) support #define WIDE // Skybox size modifier, changing this will add support for larger skybox images. NOTE: Vanilla skyboxes may break if you change this option. Be sure to rescale them accordingly. @@ -191,18 +141,40 @@ // Also enables new render layers, such as LAYER_ALPHA_DECAL. // The number is the intensity of the silhouette, from 0-255. // NOTE: The overlap between Mario's model parts is visible on certain HLE plugins. -// Also, this also disables anti-aliasing on Mario, and the outermost pixel edges of the silhouette are slightly visible on Mario's normal model at lower resolutions. +// Also, this also disables anti-aliasing on Mario. #define SILHOUETTE 127 +// Fixes the game reading the ia8 burn smoke texture as an rgba16 +#define BURN_SMOKE_FIX +// Disable the fix to Koopa's unshelled model +#define KOOPA_KEEP_PINK_SHORTS +// Lightweight directional lighting engine by Fazana. Intended for giving proximity and positional pointlights to small objects. +// NOTE: Stil breaks occasionally, and PUPPYLIGHT_NODE doesn't work in areas that aren't area 1. +//#define PUPPYLIGHTS + +// -- AUDIO SETTINGS -- +// Fixes the castle music sometimes triggering after getting a dialog +#define CASTLE_MUSIC_FIX +// Increase audio heap size to allow for more concurrent notes to be played and for more custom sequences/banks to be imported (not supported for SH) +#define EXPAND_AUDIO_HEAP // Use a much better implementation of reverb over vanilla's fake echo reverb. Great for caves or eerie levels, as well as just a better audio experience in general. // Reverb parameters can be configured in audio/synthesis.c to meet desired aesthetic/performance needs. Currently US/JP only. //#define BETTER_REVERB -// Collision data is the type that the collision system uses. All data by default is stored as an s16, but you may change it to s32. -// Naturally, that would double the size of all collision data, but would allow you to use 32 bit values instead of 16. -// Rooms are s8 in vanilla, but if you somehow have more than 255 rooms, you may raise this number. -// Currently, they *must* say as s8, because the room tables generated by literally anything are explicitly u8 and don't use a macro, making this currently infeasable. -#define COLLISION_DATA_TYPE s16 -#define ROOM_DATA_TYPE s8 + +// -- DEBUG SETTINGS -- +// TEST LEVEL +// Uncomment this define and set a test level in order to boot straight into said level. +// This allows you to quickly test the level you're working on. +// If you want the game to boot normally, just comment out the define again. +//#define TEST_LEVEL LEVEL_BOB +// Custom debug mode. Press DPAD left to show the debug UI. Press DPAD right to enter the noclip mode. +//#define CUSTOM_DEBUG +// Include Puppyprint, a display library for text and large images. Also includes a custom, enhanced performance profiler. +//#define PUPPYPRINT +#define PUPPYPRINT_DEBUG 0 +// Visual debug enables some collision visuals. Tapping Right on the dpad will cycle between visual hitboxes, visual surfaces, both, and neither. +// If puppyprint is enabled, then this can be cycled only while the screen is active. +//#define VISUAL_DEBUG +// Open all courses and doors. Used for debugging purposes to unlock all content. +//#define UNLOCK_ALL // If you want to change the extended boundaries mode, go to engine/extended_bounds.h and change EXTENDED_BOUNDS_MODE - -#endif // CONFIG_H diff --git a/include/object_fields.h b/include/object_fields.h index 99f0e719..d1a7f90d 100644 --- a/include/object_fields.h +++ b/include/object_fields.h @@ -462,9 +462,7 @@ #define /*0x0F4*/ oCoinRespawnBits OBJECT_FIELD_S32(0x1B) #define /*0x0F8*/ oCoinSnapToGround OBJECT_FIELD_S32(0x1C) #define /*0x110*/ oCoinBaseYVel OBJECT_FIELD_F32(0x22) -#ifndef VERSION_JP #define /*0x1B0*/ oCoinBounceTimer OBJECT_FIELD_S32(0x4A) -#endif /* Collision Particle */ #define /*0x0F4*/ oCollisionParticleScale OBJECT_FIELD_F32(0x1B) @@ -702,9 +700,7 @@ #define /*0x0F8*/ oCameraLakituSpeed OBJECT_FIELD_F32(0x1C) #define /*0x0FC*/ oCameraLakituCircleRadius OBJECT_FIELD_F32(0x1D) #define /*0x100*/ oCameraLakituFinishedDialog OBJECT_FIELD_S32(0x1E) -#ifndef VERSION_JP #define /*0x104*/ oCameraLakituIntroMusicPlayed OBJECT_FIELD_S32(0x1F) -#endif #define /*0x1AC*/ oCameraLakituPitchVel OBJECT_FIELD_S16(0x49, 0) #define /*0x1AE*/ oCameraLakituYawVel OBJECT_FIELD_S16(0x49, + 1) diff --git a/include/sounds.h b/include/sounds.h index f3a5f555..f40759ca 100644 --- a/include/sounds.h +++ b/include/sounds.h @@ -282,11 +282,7 @@ #define SOUND_GENERAL_UNKNOWN1_2 /* 0x32250080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x25, 0x00, SOUND_VIBRATO | SOUND_DISCRETE) // unverified #define SOUND_GENERAL_CLAM_SHELL2 /* 0x30264080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x26, 0x40, SOUND_DISCRETE) // unverified #define SOUND_GENERAL_CLAM_SHELL3 /* 0x30274080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x27, 0x40, SOUND_DISCRETE) // unverified -#ifdef VERSION_JP -#define SOUND_GENERAL_PAINTING_EJECT /* 0x38280080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x28, 0x00, SOUND_CONSTANT_FREQUENCY | SOUND_DISCRETE) -#else #define SOUND_GENERAL_PAINTING_EJECT /* 0x39280080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x28, 0x00, SOUND_NO_VOLUME_LOSS | SOUND_CONSTANT_FREQUENCY | SOUND_DISCRETE) -#endif #define SOUND_GENERAL_LEVEL_SELECT_CHANGE /* 0x302B0080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x2B, 0x00, SOUND_DISCRETE) #define SOUND_GENERAL_PLATFORM /* 0x302D8080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x2D, 0x80, SOUND_DISCRETE) // unverified #define SOUND_GENERAL_DONUT_PLATFORM_EXPLOSION /* 0x302E2080 */ SOUND_ARG_LOAD(SOUND_BANK_GENERAL, 0x2E, 0x20, SOUND_DISCRETE) diff --git a/include/textures.h b/include/textures.h index a3205ae5..4df137cb 100644 --- a/include/textures.h +++ b/include/textures.h @@ -268,13 +268,13 @@ extern const Gfx tiny_bubble_dl_0B006D38[]; extern const Gfx tiny_bubble_dl_0B006D68[]; // title_screen_bg -extern const Gfx title_screen_bg_dl_0A000100[]; +extern const Gfx title_screen_bg_dl_start[]; extern const Gfx title_screen_bg_dl_0A000118[]; extern const Gfx title_screen_bg_dl_0A000130[]; extern const Gfx title_screen_bg_dl_0A000148[]; extern const Gfx title_screen_bg_dl_0A000160[]; extern const Gfx title_screen_bg_dl_0A000178[]; -extern const Gfx title_screen_bg_dl_0A000190[]; +extern const Gfx title_screen_bg_dl_end[]; extern const u8 *const mario_title_texture_table[]; extern const u8 *const game_over_texture_table[]; diff --git a/levels/bits/areas/1/19/model.inc.c b/levels/bits/areas/1/19/model.inc.c index 2738aff7..c5b0be56 100644 --- a/levels/bits/areas/1/19/model.inc.c +++ b/levels/bits/areas/1/19/model.inc.c @@ -126,23 +126,6 @@ static const Vtx bits_seg7_vertex_07010208[] = { // 0x07010308 - 0x070103F8 static const Vtx bits_seg7_vertex_07010308[] = { -#ifdef VERSION_JP - {{{ -921, -229, -434}, 0, { 308, 650}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -306, -383, -434}, 0, { 1076, 1924}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -921, -383, -434}, 0, { 54, 904}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -306, -229, -434}, 0, { 1330, 1670}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 922, -383, -434}, 0, { 3120, 3968}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 307, -383, -434}, 0, { 2098, 2946}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 307, -229, -434}, 0, { 2352, 2692}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 922, -229, -434}, 0, { 3374, 3714}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 922, -383, -741}, 0, { 3546, -1564}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 296, -383, -741}, 0, { 2504, -524}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 296, -383, -434}, 0, { 1992, -1034}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 205, -25, -434}, 0, { -1222, 478}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 205, -229, -434}, 0, { -882, 138}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 205, -229, -332}, 0, { -712, 308}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 205, -25, -332}, 0, { -1052, 650}, {0x96, 0x96, 0x96, 0xff}}}, -#else {{{ -921, -229, -434}, 0, { 308, 650}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -306, -383, -434}, 0, { 1076, 1924}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -921, -383, -434}, 0, { 54, 904}, {0x64, 0x64, 0x64, 0xff}}}, @@ -158,7 +141,6 @@ static const Vtx bits_seg7_vertex_07010308[] = { {{{ 205, -229, -434}, 0, { -882, 138}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 205, -229, -332}, 0, { -712, 308}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 205, -25, -332}, 0, { -1052, 650}, {0x96, 0x96, 0x96, 0xff}}}, -#endif }; // 0x070103F8 - 0x070104D8 @@ -220,22 +202,6 @@ static const Vtx bits_seg7_vertex_070105C8[] = { // 0x070106C8 - 0x070107A8 static const Vtx bits_seg7_vertex_070106C8[] = { -#ifdef VERSION_JP - {{{ 922, -434, -434}, 0, { -3096, -2758}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 922, -229, -434}, 0, { -3436, -2416}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 922, -229, 1613}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -921, -434, 1613}, 0, { 308, 650}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -921, -229, 1613}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -921, -229, -434}, 0, { -3436, -2416}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -921, -434, -434}, 0, { -3096, -2758}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 307, -229, -434}, 0, { -882, 138}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 307, -25, -1049}, 0, { -2244, -544}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 307, 179, -1049}, 0, { -2584, -202}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 307, -25, -434}, 0, { -1222, 478}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -517, 179, -1759}, 0, { -252, 1788}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -517, 282, -1759}, 0, { 0, 1532}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -517, 282, -2190}, 0, { 1076, 2608}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ 922, -434, -434}, 0, { -3096, -2758}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 922, -229, -434}, 0, { -3436, -2416}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 922, -229, 1613}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -250,27 +216,10 @@ static const Vtx bits_seg7_vertex_070106C8[] = { {{{ -517, 179, -1759}, 0, { -252, 1788}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -517, 282, -1759}, 0, { 0, 1532}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -517, 282, -2190}, 0, { 1076, 2608}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x070107A8 - 0x07010888 static const Vtx bits_seg7_vertex_070107A8[] = { -#ifdef VERSION_JP - {{{ -204, -229, -434}, 0, { 3374, 4394}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -204, 77, -1049}, 0, { 4908, 4906}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -204, 179, -1049}, 0, { 5078, 4736}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -306, -229, -434}, 0, { -882, 138}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -306, -25, -434}, 0, { -1222, 478}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -306, -25, -1049}, 0, { -2244, -544}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -306, 179, -1049}, 0, { -2584, -202}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 205, -229, -434}, 0, { -882, 138}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 205, -25, -434}, 0, { -1222, 478}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 205, 77, -1049}, 0, { -2414, -372}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 205, 179, -1049}, 0, { -2584, -202}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -517, 179, -1759}, 0, { -252, 1788}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -517, 282, -2190}, 0, { 1076, 2608}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -517, 179, -2190}, 0, { 820, 2862}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ -204, -229, -434}, 0, { 3374, 4394}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -204, 77, -1049}, 0, { 4908, 4906}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -204, 179, -1049}, 0, { 5078, 4736}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -285,28 +234,10 @@ static const Vtx bits_seg7_vertex_070107A8[] = { {{{ -517, 179, -1759}, 0, { -252, 1788}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -517, 282, -2190}, 0, { 1076, 2608}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -517, 179, -2190}, 0, { 820, 2862}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x07010888 - 0x07010978 static const Vtx bits_seg7_vertex_07010888[] = { -#ifdef VERSION_JP - {{{ -921, -229, -332}, 0, { -712, 308}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -921, -25, -434}, 0, { -1222, 478}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -921, -229, -434}, 0, { -882, 138}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 522, 179, -2190}, 0, { 820, 2862}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 524, 282, -1757}, 0, { -4, 1528}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 524, 179, -1757}, 0, { -258, 1782}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 522, 282, -2190}, 0, { 1076, 2608}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -328, 282, -1837}, 0, { 196, 1728}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -328, 384, -2112}, 0, { 1136, 2156}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -328, 282, -2112}, 0, { 880, 2412}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -328, 384, -1837}, 0, { 452, 1472}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 333, 282, -2112}, 0, { 880, 2412}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 333, 384, -2112}, 0, { 1136, 2156}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 333, 384, -1837}, 0, { 1136, 2156}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 333, 282, -1837}, 0, { 880, 2412}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ -921, -229, -332}, 0, { -712, 308}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -921, -25, -434}, 0, { -1222, 478}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -921, -229, -434}, 0, { -882, 138}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -322,7 +253,6 @@ static const Vtx bits_seg7_vertex_07010888[] = { {{{ 333, 384, -2112}, 0, { 60, 570}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 333, 384, -1837}, 0, { -624, -114}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 333, 282, -1837}, 0, { -878, 142}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x07010978 - 0x07010A68 @@ -384,23 +314,6 @@ static const Vtx bits_seg7_vertex_07010B58[] = { // 0x07010C48 - 0x07010D38 static const Vtx bits_seg7_vertex_07010C48[] = { -#ifdef VERSION_JP - {{{ 922, -434, -434}, 0, { -116, 1074}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 922, -383, -741}, 0, { 480, 1500}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 922, -383, -434}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 922, -434, -741}, 0, { 394, 1584}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 200, 77, 1096}, 0, { -132, 2692}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 415, 77, 1311}, 0, { 752, 2692}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 200, 77, 1311}, 0, { 308, 2248}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 307, -25, -1049}, 0, { 2352, -5482}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 307, -229, -434}, 0, { 1330, -4460}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -306, -229, -434}, 0, { 2352, -3438}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -306, -25, -1049}, 0, { 3374, -4460}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -721, 179, 379}, 0, { -1836, 3372}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -506, 179, 594}, 0, { -950, 3372}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -721, 179, 594}, 0, { -1392, 2930}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -506, 179, 379}, 0, { -1392, 3816}, {0x44, 0x44, 0x44, 0xff}}}, -#else {{{ 922, -434, -434}, 0, { -116, 1074}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 922, -383, -741}, 0, { 480, 1500}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 922, -383, -434}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -416,7 +329,6 @@ static const Vtx bits_seg7_vertex_07010C48[] = { {{{ -506, 179, 594}, 0, { -950, 3372}, {0x44, 0x44, 0x44, 0xff}}}, {{{ -721, 179, 594}, 0, { -1392, 2930}, {0x44, 0x44, 0x44, 0xff}}}, {{{ -506, 179, 379}, 0, { -1392, 3816}, {0x44, 0x44, 0x44, 0xff}}}, -#endif }; // 0x07010D38 - 0x07010E18 @@ -439,22 +351,6 @@ static const Vtx bits_seg7_vertex_07010D38[] = { // 0x07010E18 - 0x07010EF8 static const Vtx bits_seg7_vertex_07010E18[] = { -#ifdef VERSION_JP - {{{ 307, -383, -434}, 0, { 2098, 2946}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -306, -229, -434}, 0, { 1330, 1670}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 307, -229, -434}, 0, { 2352, 2692}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -306, -383, -434}, 0, { 1076, 1924}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -511, -434, 2022}, 0, { -7014, -1224}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -921, -434, 1613}, 0, { -7014, 138}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -921, -434, -741}, 0, { -3096, 4054}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 922, -434, -741}, 0, { 0, 990}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 922, -434, 1613}, 0, { -3948, -2928}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 512, -434, 2022}, 0, { -5310, -2928}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 296, -383, -741}, 0, { 2504, -524}, {0x50, 0x50, 0x50, 0xff}}}, - {{{ -313, -383, -741}, 0, { 1490, 490}, {0x50, 0x50, 0x50, 0xff}}}, - {{{ -313, -383, -434}, 0, { 978, -20}, {0x50, 0x50, 0x50, 0xff}}}, - {{{ 296, -383, -434}, 0, { 1992, -1034}, {0x50, 0x50, 0x50, 0xff}}}, -#else {{{ 307, -383, -434}, 0, { 2098, 2946}, {0x44, 0x44, 0x44, 0xff}}}, {{{ -306, -240, -434}, 0, { 1330, 1670}, {0x44, 0x44, 0x44, 0xff}}}, {{{ 307, -240, -434}, 0, { 2352, 2692}, {0x44, 0x44, 0x44, 0xff}}}, @@ -469,7 +365,6 @@ static const Vtx bits_seg7_vertex_07010E18[] = { {{{ -313, -383, -741}, 0, { 1490, 490}, {0x50, 0x50, 0x50, 0xff}}}, {{{ -313, -383, -434}, 0, { 978, -20}, {0x50, 0x50, 0x50, 0xff}}}, {{{ 296, -383, -434}, 0, { 1992, -1034}, {0x50, 0x50, 0x50, 0xff}}}, -#endif }; // 0x07010EF8 - 0x07010FE8 @@ -567,23 +462,6 @@ static const Vtx bits_seg7_vertex_07011298[] = { // 0x07011388 - 0x07011478 static const Vtx bits_seg7_vertex_07011388[] = { -#ifdef VERSION_JP - {{{ 512, -434, 2022}, 0, { -2756, 3032}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -511, -229, 2022}, 0, { -712, 1670}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -511, -434, 2022}, 0, { -1052, 1328}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 512, -229, 2022}, 0, { -2414, 3372}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -212, 179, -2495}, 0, { -736, 1304}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 218, 282, -2495}, 0, { 592, 2124}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 218, 179, -2495}, 0, { 336, 2378}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -212, 282, -2495}, 0, { -482, 1048}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 218, 179, -1454}, 0, { 336, 2378}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -212, 282, -1454}, 0, { -482, 1048}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -212, 179, -1454}, 0, { -736, 1304}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 218, 282, -1454}, 0, { 592, 2124}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -921, -25, -434}, 0, { 650, 308}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -306, -229, -434}, 0, { 1330, 1670}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -921, -229, -434}, 0, { 308, 650}, {0x64, 0x64, 0x64, 0xff}}}, -#else {{{ 512, -434, 2022}, 0, { -2756, 3032}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -511, -229, 2022}, 0, { -712, 1670}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -511, -434, 2022}, 0, { -1052, 1328}, {0x64, 0x64, 0x64, 0xff}}}, @@ -599,27 +477,10 @@ static const Vtx bits_seg7_vertex_07011388[] = { {{{ -921, -25, -434}, 0, { 650, 308}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -306, -240, -434}, 0, { 1330, 1670}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -921, -229, -434}, 0, { 308, 650}, {0x64, 0x64, 0x64, 0xff}}}, -#endif }; // 0x07011478 - 0x07011558 static const Vtx bits_seg7_vertex_07011478[] = { -#ifdef VERSION_JP - {{{ -134, 282, -2306}, 0, { -286, 1244}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -134, 384, -2306}, 0, { 0, 990}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 139, 384, -2306}, 0, { 652, 1672}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 139, 282, -1643}, 0, { 396, 1928}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 139, 384, -1643}, 0, { 652, 1672}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -134, 384, -1643}, 0, { 0, 990}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -134, 282, -1643}, 0, { -286, 1244}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 307, -25, -434}, 0, { 2694, 2350}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 922, -25, -434}, 0, { 3716, 3372}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 922, -229, -434}, 0, { 3374, 3714}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ 307, -229, -434}, 0, { 2352, 2692}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -921, -25, -434}, 0, { 650, 308}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -306, -25, -434}, 0, { 1672, 1328}, {0x64, 0x64, 0x64, 0xff}}}, - {{{ -306, -229, -434}, 0, { 1330, 1670}, {0x64, 0x64, 0x64, 0xff}}}, -#else {{{ -134, 282, -2306}, 0, { -286, 1244}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -134, 384, -2306}, 0, { 0, 990}, {0x64, 0x64, 0x64, 0xff}}}, {{{ 139, 384, -2306}, 0, { 652, 1672}, {0x64, 0x64, 0x64, 0xff}}}, @@ -634,7 +495,6 @@ static const Vtx bits_seg7_vertex_07011478[] = { {{{ -921, -25, -434}, 0, { 650, 308}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -306, -25, -434}, 0, { 1672, 1328}, {0x64, 0x64, 0x64, 0xff}}}, {{{ -306, -240, -434}, 0, { 1330, 1670}, {0x64, 0x64, 0x64, 0xff}}}, -#endif }; // 0x07011558 - 0x07011648 diff --git a/levels/ccm/script.c b/levels/ccm/script.c index e57d33c4..f98b3186 100644 --- a/levels/ccm/script.c +++ b/levels/ccm/script.c @@ -43,9 +43,7 @@ static const LevelScript script_func_local_4[] = { OBJECT_WITH_ACTS(/*model*/ MODEL_PENGUIN, /*pos*/ -4952, 6656, -6075, /*angle*/ 0, 270, 0, /*behParam*/ 0x02000000, /*beh*/ bhvRacingPenguin, /*acts*/ ACT_2 | ACT_3 | ACT_4 | ACT_5 | ACT_6), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6500, -5836, -6400, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvPenguinRaceFinishLine), OBJECT(/*model*/ MODEL_NONE, /*pos*/ -6393, -716, 7503, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvPenguinRaceShortcutCheck), -#ifndef VERSION_JP OBJECT(/*model*/ MODEL_NONE, /*pos*/ -4943, 1321, 667, /*angle*/ 0, 0, 0, /*behParam*/ 0x00000000, /*beh*/ bhvPlaysMusicTrackWhenTouched), -#endif RETURN(), }; diff --git a/levels/hmc/areas/1/grill_door/collision.inc.c b/levels/hmc/areas/1/grill_door/collision.inc.c index cc5f62ae..87046ae3 100644 --- a/levels/hmc/areas/1/grill_door/collision.inc.c +++ b/levels/hmc/areas/1/grill_door/collision.inc.c @@ -1,32 +1,5 @@ // 0x0702B65C - 0x0702B6E0 const Collision hmc_seg7_collision_0702B65C[] = { -#ifdef VERSION_JP - COL_INIT(), - COL_VERTEX_INIT(0x8), - COL_VERTEX(410, 0, 51), - COL_VERTEX(410, 819, -50), - COL_VERTEX(410, 819, 51), - COL_VERTEX(0, 819, 51), - COL_VERTEX(0, 0, 51), - COL_VERTEX(0, 819, -50), - COL_VERTEX(410, 0, -50), - COL_VERTEX(0, 0, -50), - COL_TRI_INIT(SURFACE_DEFAULT, 12), - COL_TRI(0, 1, 2), - COL_TRI(2, 3, 4), - COL_TRI(2, 4, 0), - COL_TRI(2, 1, 5), - COL_TRI(2, 5, 3), - COL_TRI(6, 5, 1), - COL_TRI(0, 6, 1), - COL_TRI(6, 7, 5), - COL_TRI(3, 5, 7), - COL_TRI(3, 7, 4), - COL_TRI(4, 7, 6), - COL_TRI(4, 6, 0), - COL_TRI_STOP(), - COL_END(), -#else COL_INIT(), COL_VERTEX_INIT(0x8), COL_VERTEX(410, 0, 51), @@ -52,5 +25,4 @@ const Collision hmc_seg7_collision_0702B65C[] = { COL_TRI(4, 6, 0), COL_TRI_STOP(), COL_END(), -#endif }; diff --git a/levels/intro/geo.c b/levels/intro/geo.c index c64670bb..13f8e511 100644 --- a/levels/intro/geo.c +++ b/levels/intro/geo.c @@ -55,7 +55,7 @@ const GeoLayout intro_geo_mario_head_regular[] = { GEO_NODE_ORTHO(100), GEO_OPEN_NODE(), GEO_ASM(0, geo_intro_regular_backdrop), -#ifdef VERSION_SH +#ifdef GODDARD_EASTER_EGG GEO_ASM(0, geo_intro_face_easter_egg), #endif GEO_CLOSE_NODE(), @@ -69,7 +69,7 @@ const GeoLayout intro_geo_mario_head_regular[] = { GEO_CLOSE_NODE(), #endif GEO_CLOSE_NODE(), -#ifdef VERSION_SH +#if ENABLE_RUMBLE GEO_ZBUFFER(0), GEO_OPEN_NODE(), GEO_ASM(0, geo_intro_rumble_pak_graphic), @@ -88,7 +88,7 @@ const GeoLayout intro_geo_mario_head_dizzy[] = { GEO_NODE_ORTHO(100), GEO_OPEN_NODE(), GEO_ASM(0, geo_intro_gameover_backdrop), -#ifdef VERSION_SH +#ifdef GODDARD_EASTER_EGG GEO_ASM(0, geo_intro_face_easter_egg), #endif GEO_CLOSE_NODE(), @@ -102,7 +102,7 @@ const GeoLayout intro_geo_mario_head_dizzy[] = { GEO_CLOSE_NODE(), #endif GEO_CLOSE_NODE(), -#ifdef VERSION_SH +#if ENABLE_RUMBLE GEO_ZBUFFER(0), GEO_OPEN_NODE(), GEO_ASM(1, geo_intro_rumble_pak_graphic), diff --git a/levels/level_defines.h b/levels/level_defines.h index ae67f569..77febed0 100644 --- a/levels/level_defines.h +++ b/levels/level_defines.h @@ -1,9 +1,3 @@ -#ifdef VERSION_JP -#define VAL_DIFF 25000 -#else -#define VAL_DIFF 60000 -#endif - // Define lists for list of level for macros. Each of the following fields are described: // Argument 1: Internal ROM name of the level. // Argument 2: Level enumerator for enum used to identify the level ID. @@ -19,41 +13,41 @@ // TODO: Figure something out for sZoomOutAreaMasks? // Reworked internal names, non-level name abbreviations used from quad64 bc that was prob the best idea. - send all complaints to pyro jay -STUB_LEVEL( "", LEVEL_UNKNOWN_1, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) -STUB_LEVEL( "", LEVEL_UNKNOWN_2, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) -STUB_LEVEL( "", LEVEL_UNKNOWN_3, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) -DEFINE_LEVEL("COURSE 5 BBH", LEVEL_BBH, COURSE_BBH, bbh, spooky, 28000, 0x28, 0x28, 0x28, sDynBbh, sCamBBH) -DEFINE_LEVEL("COURSE 4 CCM", LEVEL_CCM, COURSE_CCM, ccm, snow, 17000, 0x10, 0x38, 0x38, _, sCamCCM) -DEFINE_LEVEL("OW2 IN CASTLE", LEVEL_CASTLE, COURSE_NONE, castle_inside, inside, 20000, 0x20, 0x20, 0x30, _, sCamCastle) -DEFINE_LEVEL("COURSE 6 HMC", LEVEL_HMC, COURSE_HMC, hmc, cave, 16000, 0x28, 0x28, 0x28, sDynHmc, sCamHMC) -DEFINE_LEVEL("COURSE 8 SSL", LEVEL_SSL, COURSE_SSL, ssl, generic, 15000, 0x08, 0x30, 0x30, _, sCamSSL) -DEFINE_LEVEL("COURSE 1 BOB", LEVEL_BOB, COURSE_BOB, bob, generic, 15000, 0x08, 0x08, 0x08, _, _) -DEFINE_LEVEL("COURSE 10 SL", LEVEL_SL, COURSE_SL, sl, snow, 14000, 0x10, 0x28, 0x28, _, sCamSL) -DEFINE_LEVEL("COURSE 11 WDW", LEVEL_WDW, COURSE_WDW, wdw, grass, 17000, 0x10, 0x18, 0x18, sDynWdw, _) -DEFINE_LEVEL("COURSE 3 JRB", LEVEL_JRB, COURSE_JRB, jrb, water, 20000, 0x10, 0x18, 0x18, sDynJrb, _) -DEFINE_LEVEL("COURSE 13 THI", LEVEL_THI, COURSE_THI, thi, grass, 20000, 0x0c, 0x0c, 0x20, _, sCamTHI) -DEFINE_LEVEL("COURSE 14 TTC", LEVEL_TTC, COURSE_TTC, ttc, machine, 18000, 0x18, 0x18, 0x18, _, _) -DEFINE_LEVEL("COURSE 15 RR", LEVEL_RR, COURSE_RR, rr, sky, 20000, 0x20, 0x20, 0x20, _, sCamRR) -DEFINE_LEVEL("OW1 C GROUNDS", LEVEL_CASTLE_GROUNDS, COURSE_NONE, castle_grounds, outside, 25000, 0x08, 0x08, 0x08, _, _) -DEFINE_LEVEL("BC1 BITDW", LEVEL_BITDW, COURSE_BITDW, bitdw, sky, 16000, 0x28, 0x28, 0x28, _, _) -DEFINE_LEVEL("VCL VCUTM", LEVEL_VCUTM, COURSE_VCUTM, vcutm, outside, 30000, 0x28, 0x28, 0x28, _, _) -DEFINE_LEVEL("BC2 BITFS", LEVEL_BITFS, COURSE_BITFS, bitfs, sky, 16000, 0x28, 0x28, 0x28, _, _) -DEFINE_LEVEL("SC1 SEC AQUA", LEVEL_SA, COURSE_SA, sa, inside, 20000, 0x10, 0x10, 0x10, _, _) -DEFINE_LEVEL("BC3 BITS", LEVEL_BITS, COURSE_BITS, bits, sky, 16000, 0x28, 0x28, 0x28, _, _) -DEFINE_LEVEL("COURSE 7 LLL", LEVEL_LLL, COURSE_LLL, lll, fire, 22000, 0x08, 0x30, 0x30, _, _) -DEFINE_LEVEL("COURSE 9 DDD", LEVEL_DDD, COURSE_DDD, ddd, water, 17000, 0x10, 0x20, 0x20, sDynDdd, _) -DEFINE_LEVEL("COURSE 2 WF", LEVEL_WF, COURSE_WF, wf, grass, 13000, 0x08, 0x08, 0x08, _, _) -DEFINE_LEVEL("END CAKE", LEVEL_ENDING, COURSE_CAKE_END, ending, generic, 20000, 0x00, 0x00, 0x00, _, _) -DEFINE_LEVEL("OW3 C COURTYD", LEVEL_CASTLE_COURTYARD, COURSE_NONE, castle_courtyard, outside, 20000, 0x08, 0x08, 0x08, _, _) -DEFINE_LEVEL("SIC P SEC SLID", LEVEL_PSS, COURSE_PSS, pss, mountain, 20000, 0x28, 0x28, 0x28, _, _) -DEFINE_LEVEL("MCL COTMC", LEVEL_COTMC, COURSE_COTMC, cotmc, cave, 18000, 0x28, 0x28, 0x28, _, sCamCotMC) -DEFINE_LEVEL("WCL TOTWC", LEVEL_TOTWC, COURSE_TOTWC, totwc, sky, 20000, 0x20, 0x20, 0x20, _, _) -DEFINE_LEVEL("B BATTLE1", LEVEL_BOWSER_1, COURSE_BITDW, bowser_1, generic, VAL_DIFF, 0x40, 0x40, 0x40, _, _) -DEFINE_LEVEL("SC2 WMOTR", LEVEL_WMOTR, COURSE_WMOTR, wmotr, generic, 20000, 0x28, 0x28, 0x28, _, _) -STUB_LEVEL( "", LEVEL_UNKNOWN_32, COURSE_NONE, 20000, 0x70, 0x00, 0x00, _, _) -DEFINE_LEVEL("B BATTLE2", LEVEL_BOWSER_2, COURSE_BITFS, bowser_2, fire, VAL_DIFF, 0x40, 0x40, 0x40, _, _) -DEFINE_LEVEL("B BATTLE3", LEVEL_BOWSER_3, COURSE_BITS, bowser_3, generic, VAL_DIFF, 0x40, 0x40, 0x40, _, _) -STUB_LEVEL( "", LEVEL_UNKNOWN_35, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) -DEFINE_LEVEL("COURSE 12 TTM", LEVEL_TTM, COURSE_TTM, ttm, mountain, 15000, 0x08, 0x08, 0x08, _, _) -STUB_LEVEL( "", LEVEL_UNKNOWN_37, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) -STUB_LEVEL( "", LEVEL_UNKNOWN_38, COURSE_NONE, 20000, 0x00, 0x00, 0x00, sDynUnk38, _) +STUB_LEVEL( "", LEVEL_UNKNOWN_1, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) +STUB_LEVEL( "", LEVEL_UNKNOWN_2, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) +STUB_LEVEL( "", LEVEL_UNKNOWN_3, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) +DEFINE_LEVEL("COURSE 5 BBH", LEVEL_BBH, COURSE_BBH, bbh, spooky, 28000, 0x28, 0x28, 0x28, sDynBbh, sCamBBH) +DEFINE_LEVEL("COURSE 4 CCM", LEVEL_CCM, COURSE_CCM, ccm, snow, 17000, 0x10, 0x38, 0x38, _, sCamCCM) +DEFINE_LEVEL("OW2 IN CASTLE", LEVEL_CASTLE, COURSE_NONE, castle_inside, inside, 20000, 0x20, 0x20, 0x30, _, sCamCastle) +DEFINE_LEVEL("COURSE 6 HMC", LEVEL_HMC, COURSE_HMC, hmc, cave, 16000, 0x28, 0x28, 0x28, sDynHmc, sCamHMC) +DEFINE_LEVEL("COURSE 8 SSL", LEVEL_SSL, COURSE_SSL, ssl, generic, 15000, 0x08, 0x30, 0x30, _, sCamSSL) +DEFINE_LEVEL("COURSE 1 BOB", LEVEL_BOB, COURSE_BOB, bob, generic, 15000, 0x08, 0x08, 0x08, _, _) +DEFINE_LEVEL("COURSE 10 SL", LEVEL_SL, COURSE_SL, sl, snow, 14000, 0x10, 0x28, 0x28, _, sCamSL) +DEFINE_LEVEL("COURSE 11 WDW", LEVEL_WDW, COURSE_WDW, wdw, grass, 17000, 0x10, 0x18, 0x18, sDynWdw, _) +DEFINE_LEVEL("COURSE 3 JRB", LEVEL_JRB, COURSE_JRB, jrb, water, 20000, 0x10, 0x18, 0x18, sDynJrb, _) +DEFINE_LEVEL("COURSE 13 THI", LEVEL_THI, COURSE_THI, thi, grass, 20000, 0x0c, 0x0c, 0x20, _, sCamTHI) +DEFINE_LEVEL("COURSE 14 TTC", LEVEL_TTC, COURSE_TTC, ttc, machine, 18000, 0x18, 0x18, 0x18, _, _) +DEFINE_LEVEL("COURSE 15 RR", LEVEL_RR, COURSE_RR, rr, sky, 20000, 0x20, 0x20, 0x20, _, sCamRR) +DEFINE_LEVEL("OW1 C GROUNDS", LEVEL_CASTLE_GROUNDS, COURSE_NONE, castle_grounds, outside, 25000, 0x08, 0x08, 0x08, _, _) +DEFINE_LEVEL("BC1 BITDW", LEVEL_BITDW, COURSE_BITDW, bitdw, sky, 16000, 0x28, 0x28, 0x28, _, _) +DEFINE_LEVEL("VCL VCUTM", LEVEL_VCUTM, COURSE_VCUTM, vcutm, outside, 30000, 0x28, 0x28, 0x28, _, _) +DEFINE_LEVEL("BC2 BITFS", LEVEL_BITFS, COURSE_BITFS, bitfs, sky, 16000, 0x28, 0x28, 0x28, _, _) +DEFINE_LEVEL("SC1 SEC AQUA", LEVEL_SA, COURSE_SA, sa, inside, 20000, 0x10, 0x10, 0x10, _, _) +DEFINE_LEVEL("BC3 BITS", LEVEL_BITS, COURSE_BITS, bits, sky, 16000, 0x28, 0x28, 0x28, _, _) +DEFINE_LEVEL("COURSE 7 LLL", LEVEL_LLL, COURSE_LLL, lll, fire, 22000, 0x08, 0x30, 0x30, _, _) +DEFINE_LEVEL("COURSE 9 DDD", LEVEL_DDD, COURSE_DDD, ddd, water, 17000, 0x10, 0x20, 0x20, sDynDdd, _) +DEFINE_LEVEL("COURSE 2 WF", LEVEL_WF, COURSE_WF, wf, grass, 13000, 0x08, 0x08, 0x08, _, _) +DEFINE_LEVEL("END CAKE", LEVEL_ENDING, COURSE_CAKE_END, ending, generic, 20000, 0x00, 0x00, 0x00, _, _) +DEFINE_LEVEL("OW3 C COURTYD", LEVEL_CASTLE_COURTYARD, COURSE_NONE, castle_courtyard, outside, 20000, 0x08, 0x08, 0x08, _, _) +DEFINE_LEVEL("SIC P SEC SLID", LEVEL_PSS, COURSE_PSS, pss, mountain, 20000, 0x28, 0x28, 0x28, _, _) +DEFINE_LEVEL("MCL COTMC", LEVEL_COTMC, COURSE_COTMC, cotmc, cave, 18000, 0x28, 0x28, 0x28, _, sCamCotMC) +DEFINE_LEVEL("WCL TOTWC", LEVEL_TOTWC, COURSE_TOTWC, totwc, sky, 20000, 0x20, 0x20, 0x20, _, _) +DEFINE_LEVEL("B BATTLE1", LEVEL_BOWSER_1, COURSE_BITDW, bowser_1, generic, 60000, 0x40, 0x40, 0x40, _, _) +DEFINE_LEVEL("SC2 WMOTR", LEVEL_WMOTR, COURSE_WMOTR, wmotr, generic, 20000, 0x28, 0x28, 0x28, _, _) +STUB_LEVEL( "", LEVEL_UNKNOWN_32, COURSE_NONE, 20000, 0x70, 0x00, 0x00, _, _) +DEFINE_LEVEL("B BATTLE2", LEVEL_BOWSER_2, COURSE_BITFS, bowser_2, fire, 60000, 0x40, 0x40, 0x40, _, _) +DEFINE_LEVEL("B BATTLE3", LEVEL_BOWSER_3, COURSE_BITS, bowser_3, generic, 60000, 0x40, 0x40, 0x40, _, _) +STUB_LEVEL( "", LEVEL_UNKNOWN_35, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) +DEFINE_LEVEL("COURSE 12 TTM", LEVEL_TTM, COURSE_TTM, ttm, mountain, 15000, 0x08, 0x08, 0x08, _, _) +STUB_LEVEL( "", LEVEL_UNKNOWN_37, COURSE_NONE, 20000, 0x00, 0x00, 0x00, _, _) +STUB_LEVEL( "", LEVEL_UNKNOWN_38, COURSE_NONE, 20000, 0x00, 0x00, 0x00, sDynUnk38, _) diff --git a/levels/lll/areas/1/collision.inc.c b/levels/lll/areas/1/collision.inc.c index ce5e107d..1fb1874c 100644 --- a/levels/lll/areas/1/collision.inc.c +++ b/levels/lll/areas/1/collision.inc.c @@ -1,1384 +1,5 @@ // 0x0701ADE8 - 0x0701CE18 const Collision lll_seg7_area_1_collision[] = { -#ifdef VERSION_JP - COL_INIT(), - COL_VERTEX_INIT(0x21B), - COL_VERTEX(2816, 1280, 4608), - COL_VERTEX(2775, 1280, 8192), - COL_VERTEX(2816, 1280, 8192), - COL_VERTEX(2775, 1280, 4567), - COL_VERTEX(5888, 1280, 4608), - COL_VERTEX(4352, 563, 4608), - COL_VERTEX(2816, 563, 4608), - COL_VERTEX(2816, 563, 5504), - COL_VERTEX(5888, 0, 4608), - COL_VERTEX(4352, 0, 4608), - COL_VERTEX(5888, 0, 4567), - COL_VERTEX(5888, 1280, 4567), - COL_VERTEX(2816, 256, 8192), - COL_VERTEX(2816, 256, 7552), - COL_VERTEX(-76, 563, 6093), - COL_VERTEX(-153, 486, 6093), - COL_VERTEX(-229, 486, 6246), - COL_VERTEX(-153, 154, 6093), - COL_VERTEX(230, 486, 6093), - COL_VERTEX(154, 154, 6093), - COL_VERTEX(154, 486, 6246), - COL_VERTEX(154, 486, 6093), - COL_VERTEX(77, 563, 6246), - COL_VERTEX(77, 563, 6093), - COL_VERTEX(-76, 640, 6246), - COL_VERTEX(77, 640, 6093), - COL_VERTEX(-229, 154, 6093), - COL_VERTEX(-229, 486, 6093), - COL_VERTEX(-76, 640, 6093), - COL_VERTEX(640, 0, -383), - COL_VERTEX(640, 0, 384), - COL_VERTEX(335, 282, 194), - COL_VERTEX(186, 512, 108), - COL_VERTEX(325, 282, -210), - COL_VERTEX(186, 512, -107), - COL_VERTEX(0, 0, 768), - COL_VERTEX(0, 282, 387), - COL_VERTEX(0, 0, -767), - COL_VERTEX(-639, 0, -383), - COL_VERTEX(-324, 282, -210), - COL_VERTEX(0, 282, -386), - COL_VERTEX(-639, 0, 384), - COL_VERTEX(-334, 282, 194), - COL_VERTEX(0, 512, 215), - COL_VERTEX(-185, 512, 108), - COL_VERTEX(-185, 512, -107), - COL_VERTEX(0, 512, -214), - COL_VERTEX(0, 102, -214), - COL_VERTEX(-3071, 10, 3584), - COL_VERTEX(-3327, 10, 3584), - COL_VERTEX(-3071, 10, 3328), - COL_VERTEX(-3327, 10, 3328), - COL_VERTEX(2775, 0, 4567), - COL_VERTEX(-153, 486, 6246), - COL_VERTEX(-153, 154, 6246), - COL_VERTEX(-229, 154, 6246), - COL_VERTEX(-76, 563, 6246), - COL_VERTEX(230, 154, 6093), - COL_VERTEX(154, 154, 6246), - COL_VERTEX(77, 640, 6246), - COL_VERTEX(230, 486, 6246), - COL_VERTEX(230, 154, 6246), - COL_VERTEX(-185, 102, 108), - COL_VERTEX(-185, 102, -107), - COL_VERTEX(0, 102, 215), - COL_VERTEX(186, 102, -107), - COL_VERTEX(186, 102, 108), - COL_VERTEX(-3071, 307, 3328), - COL_VERTEX(-3071, 307, 3584), - COL_VERTEX(-3327, 307, 3584), - COL_VERTEX(-3327, 307, 3328), - COL_VERTEX(2775, 0, 8192), - COL_VERTEX(-2318, 0, 134), - COL_VERTEX(0, 0, 8192), - COL_VERTEX(0, 0, -8191), - COL_VERTEX(-8191, 0, 0), - COL_VERTEX(-2805, 0, 292), - COL_VERTEX(-1844, 0, 1595), - COL_VERTEX(-2331, 0, 1753), - COL_VERTEX(-5222, 0, 7040), - COL_VERTEX(-5887, 0, 7424), - COL_VERTEX(-5222, 0, 6272), - COL_VERTEX(-5637, 0, 4982), - COL_VERTEX(-8191, 0, 8192), - COL_VERTEX(8192, 0, 8192), - COL_VERTEX(8192, 0, 0), - COL_VERTEX(6656, 0, -2303), - COL_VERTEX(7321, 0, -2687), - COL_VERTEX(5991, 0, -2687), - COL_VERTEX(-5871, 0, -6578), - COL_VERTEX(-2053, 0, -2429), - COL_VERTEX(-6151, 0, -7175), - COL_VERTEX(6656, 0, -3839), - COL_VERTEX(5954, 0, -7301), - COL_VERTEX(-5637, 0, -7037), - COL_VERTEX(5991, 0, -3455), - COL_VERTEX(7040, 0, -6215), - COL_VERTEX(8192, 0, -8191), - COL_VERTEX(6678, 0, -5853), - COL_VERTEX(-6552, 0, 7040), - COL_VERTEX(-6552, 0, 6272), - COL_VERTEX(-5887, 0, 5888), - COL_VERTEX(-7042, 0, 3578), - COL_VERTEX(-2567, 0, -2053), - COL_VERTEX(-2287, 0, -1970), - COL_VERTEX(-2824, 0, -1984), - COL_VERTEX(-3012, 0, -1796), - COL_VERTEX(-3081, 0, -1539), - COL_VERTEX(-3012, 0, -1282), - COL_VERTEX(-3458, 0, -1025), - COL_VERTEX(-7179, 0, 4092), - COL_VERTEX(-7042, 0, -5633), - COL_VERTEX(-3595, 0, -1539), - COL_VERTEX(-6596, 0, 4349), - COL_VERTEX(-6665, 0, 4092), - COL_VERTEX(-6408, 0, -6592), - COL_VERTEX(-6151, 0, -6661), - COL_VERTEX(-3081, 0, -2429), - COL_VERTEX(-3458, 0, -2053), - COL_VERTEX(-2567, 0, -2567), - COL_VERTEX(-7179, 0, -6147), - COL_VERTEX(-7042, 0, -6661), - COL_VERTEX(-6665, 0, -7037), - COL_VERTEX(7321, 0, -3455), - COL_VERTEX(-8191, 0, -8191), - COL_VERTEX(5592, 0, -6939), - COL_VERTEX(-7042, 0, 4606), - COL_VERTEX(-6665, 0, 4982), - COL_VERTEX(-6151, 0, 5120), - COL_VERTEX(-6151, 0, 4606), - COL_VERTEX(-6408, 0, 4537), - COL_VERTEX(-6596, 0, -6404), - COL_VERTEX(-6665, 0, -6147), - COL_VERTEX(-6596, 0, -5890), - COL_VERTEX(-127, 0, -1919), - COL_VERTEX(-127, 307, -2175), - COL_VERTEX(-127, 0, -2175), - COL_VERTEX(128, 307, -2175), - COL_VERTEX(128, 0, -2175), - COL_VERTEX(128, 307, -1919), - COL_VERTEX(128, 0, -1919), - COL_VERTEX(-127, 307, -1919), - COL_VERTEX(-4607, 0, -1023), - COL_VERTEX(-4607, 307, -1023), - COL_VERTEX(-4607, 307, -639), - COL_VERTEX(-4607, 154, -383), - COL_VERTEX(-4607, 0, 0), - COL_VERTEX(-5631, 0, -1023), - COL_VERTEX(-5631, 307, -639), - COL_VERTEX(-5631, 307, -1023), - COL_VERTEX(-5631, 154, -383), - COL_VERTEX(-5631, 0, 0), - COL_VERTEX(-4095, 0, 3968), - COL_VERTEX(-4095, 0, 2944), - COL_VERTEX(-4095, 307, 2944), - COL_VERTEX(-4479, 307, 2944), - COL_VERTEX(-4735, 154, 3968), - COL_VERTEX(-4735, 154, 2944), - COL_VERTEX(-5119, 0, 2944), - COL_VERTEX(-5119, 0, 3968), - COL_VERTEX(1536, 0, 3968), - COL_VERTEX(2560, 0, 3968), - COL_VERTEX(2560, 307, 3584), - COL_VERTEX(1536, 307, 3584), - COL_VERTEX(2560, 154, 3328), - COL_VERTEX(1536, 154, 3328), - COL_VERTEX(2560, 0, 2944), - COL_VERTEX(1536, 0, 2944), - COL_VERTEX(6144, 0, 896), - COL_VERTEX(6144, 0, 1920), - COL_VERTEX(6144, 307, 896), - COL_VERTEX(5760, 307, 896), - COL_VERTEX(5504, 154, 896), - COL_VERTEX(5504, 154, 1920), - COL_VERTEX(5120, 0, 896), - COL_VERTEX(5120, 0, 1920), - COL_VERTEX(-255, 154, 6016), - COL_VERTEX(-255, 0, 6016), - COL_VERTEX(-383, 0, 6144), - COL_VERTEX(256, 0, 6016), - COL_VERTEX(384, 0, 6144), - COL_VERTEX(384, 154, 6144), - COL_VERTEX(256, 0, 4224), - COL_VERTEX(384, 0, 6400), - COL_VERTEX(256, 0, 6528), - COL_VERTEX(-255, 0, 6528), - COL_VERTEX(-1151, 154, 6528), - COL_VERTEX(-1151, 0, 6528), - COL_VERTEX(640, 0, 6400), - COL_VERTEX(-5375, 307, -3071), - COL_VERTEX(-5503, 0, -2943), - COL_VERTEX(-5375, 0, -3071), - COL_VERTEX(-4735, 0, -2943), - COL_VERTEX(-4863, 0, -3071), - COL_VERTEX(-4735, 0, -1151), - COL_VERTEX(-5375, 0, -1023), - COL_VERTEX(-5503, 0, -1151), - COL_VERTEX(-2559, 0, 4224), - COL_VERTEX(-3839, 0, 2688), - COL_VERTEX(-2559, 0, 2688), - COL_VERTEX(-3071, 307, 2688), - COL_VERTEX(-3839, 0, 4224), - COL_VERTEX(-3839, 307, 4224), - COL_VERTEX(-3327, 307, 4224), - COL_VERTEX(-2559, 0, 3840), - COL_VERTEX(-2380, 410, 3840), - COL_VERTEX(-2303, 0, 3840), - COL_VERTEX(-2303, 307, 3840), - COL_VERTEX(-2559, 307, 3968), - COL_VERTEX(-2303, 307, 3328), - COL_VERTEX(-2559, 0, 3328), - COL_VERTEX(-2303, 0, 3328), - COL_VERTEX(-2380, 410, 3328), - COL_VERTEX(-2559, 307, 3456), - COL_VERTEX(-1458, 410, 3840), - COL_VERTEX(-1279, 307, 3840), - COL_VERTEX(-1535, 0, 3840), - COL_VERTEX(-1535, 0, 3968), - COL_VERTEX(-1535, 307, 3456), - COL_VERTEX(-1535, 0, 3456), - COL_VERTEX(-1458, 410, 3328), - COL_VERTEX(-1279, 0, 3456), - COL_VERTEX(-1279, 0, 3968), - COL_VERTEX(-1023, 307, 3328), - COL_VERTEX(-1279, 307, 3328), - COL_VERTEX(-1535, 307, 3968), - COL_VERTEX(-1023, 0, 4096), - COL_VERTEX(-1279, 0, 3328), - COL_VERTEX(-1023, 0, 3328), - COL_VERTEX(1280, 0, 3456), - COL_VERTEX(1024, 0, 3328), - COL_VERTEX(1280, 0, 3968), - COL_VERTEX(1024, 0, 4096), - COL_VERTEX(6400, 0, 1152), - COL_VERTEX(6912, 0, 640), - COL_VERTEX(6912, 307, 640), - COL_VERTEX(7424, 0, 640), - COL_VERTEX(7936, 0, 1152), - COL_VERTEX(7936, 0, 1664), - COL_VERTEX(7424, 0, 2176), - COL_VERTEX(6912, 0, 2176), - COL_VERTEX(6400, 0, 1664), - COL_VERTEX(4608, 154, -767), - COL_VERTEX(4864, 0, 0), - COL_VERTEX(4608, 0, -767), - COL_VERTEX(5248, 154, -1279), - COL_VERTEX(4992, 154, -895), - COL_VERTEX(4992, 0, -767), - COL_VERTEX(4992, 0, -895), - COL_VERTEX(5632, 0, -1151), - COL_VERTEX(5120, 0, -383), - COL_VERTEX(5888, 154, 128), - COL_VERTEX(5504, 154, 128), - COL_VERTEX(5248, 0, 384), - COL_VERTEX(5504, 0, 128), - COL_VERTEX(5248, 0, -1279), - COL_VERTEX(4608, 0, -1151), - COL_VERTEX(5632, 154, -1663), - COL_VERTEX(4352, 0, -2047), - COL_VERTEX(5632, 0, -1663), - COL_VERTEX(5248, 154, 384), - COL_VERTEX(5504, 0, -383), - COL_VERTEX(5888, 0, 128), - COL_VERTEX(4096, 0, 384), - COL_VERTEX(5248, 0, -1535), - COL_VERTEX(4352, 154, -2047), - COL_VERTEX(4096, 0, -2047), - COL_VERTEX(5504, 0, 640), - COL_VERTEX(4096, 0, 768), - COL_VERTEX(5248, 0, 0), - COL_VERTEX(4480, 0, -1663), - COL_VERTEX(4096, 0, -1663), - COL_VERTEX(2688, 0, -5247), - COL_VERTEX(2688, 0, -6015), - COL_VERTEX(3072, 307, -6399), - COL_VERTEX(3072, 0, -6399), - COL_VERTEX(4992, 0, -6015), - COL_VERTEX(4608, 0, -6399), - COL_VERTEX(4992, 0, -5247), - COL_VERTEX(4608, 0, -4863), - COL_VERTEX(3072, 0, -4863), - COL_VERTEX(-3839, 307, 3328), - COL_VERTEX(6656, 153, 7552), - COL_VERTEX(6912, 0, 7552), - COL_VERTEX(6272, 512, 7552), - COL_VERTEX(6016, 0, 7552), - COL_VERTEX(6016, 0, 7040), - COL_VERTEX(6912, 0, 7040), - COL_VERTEX(6656, 153, 7040), - COL_VERTEX(3072, 256, 7552), - COL_VERTEX(3328, 0, 7552), - COL_VERTEX(3328, 256, 7552), - COL_VERTEX(3328, 0, 8192), - COL_VERTEX(2816, 0, 8192), - COL_VERTEX(2816, 0, 4608), - COL_VERTEX(3712, 563, 4992), - COL_VERTEX(4352, 0, 4992), - COL_VERTEX(3712, 0, 4992), - COL_VERTEX(3072, 563, 5504), - COL_VERTEX(3712, 563, 5504), - COL_VERTEX(768, 0, -5055), - COL_VERTEX(-767, 0, -5055), - COL_VERTEX(-767, 307, -3647), - COL_VERTEX(768, 0, -3647), - COL_VERTEX(-767, 0, -3647), - COL_VERTEX(384, 0, -6207), - COL_VERTEX(384, 768, -6207), - COL_VERTEX(-383, 768, -7231), - COL_VERTEX(-511, 0, -6335), - COL_VERTEX(-511, 768, -6335), - COL_VERTEX(512, 0, -7103), - COL_VERTEX(512, 768, -7103), - COL_VERTEX(-383, 0, -7231), - COL_VERTEX(-3583, 154, 6528), - COL_VERTEX(-2303, 0, 6528), - COL_VERTEX(-4095, 154, 6528), - COL_VERTEX(-3583, 0, 6528), - COL_VERTEX(-2303, 154, 6016), - COL_VERTEX(-3583, 0, 6016), - COL_VERTEX(-4095, 0, 6016), - COL_VERTEX(-4095, 0, 6528), - COL_VERTEX(256, 154, 4096), - COL_VERTEX(-255, 230, 4224), - COL_VERTEX(256, 154, 4224), - COL_VERTEX(-255, 154, 4224), - COL_VERTEX(-1663, 0, 6016), - COL_VERTEX(-1663, 154, 6528), - COL_VERTEX(-4115, 154, 0), - COL_VERTEX(-4607, 154, 492), - COL_VERTEX(-4115, 154, 492), - COL_VERTEX(-4607, 154, 0), - COL_VERTEX(3840, -50, 6912), - COL_VERTEX(3840, -50, 7040), - COL_VERTEX(3840, 51, 6976), - COL_VERTEX(6400, -50, 6912), - COL_VERTEX(3840, -50, 5120), - COL_VERTEX(3840, 51, 5056), - COL_VERTEX(6400, -50, 4992), - COL_VERTEX(1280, 154, 6656), - COL_VERTEX(1280, 0, 6656), - COL_VERTEX(896, 154, 5760), - COL_VERTEX(1536, 0, 6400), - COL_VERTEX(1536, 0, 6016), - COL_VERTEX(896, 154, 6656), - COL_VERTEX(640, 0, 6144), - COL_VERTEX(640, 154, 6144), - COL_VERTEX(640, 0, 6016), - COL_VERTEX(896, 0, 5760), - COL_VERTEX(1280, 0, 5760), - COL_VERTEX(-5887, 154, 6224), - COL_VERTEX(-5513, 154, 6872), - COL_VERTEX(7030, 154, -3287), - COL_VERTEX(6656, 154, -3503), - COL_VERTEX(7030, 154, -2855), - COL_VERTEX(6282, 154, -3287), - COL_VERTEX(-2759, 166, 435), - COL_VERTEX(-2722, 403, 550), - COL_VERTEX(-2667, 554, 718), - COL_VERTEX(-2568, 640, 1023), - COL_VERTEX(-2469, 554, 1327), - COL_VERTEX(-2408, 376, 1515), - COL_VERTEX(-2377, 166, 1611), - COL_VERTEX(-2081, 640, 864), - COL_VERTEX(-7179, 129, 4092), - COL_VERTEX(-6665, 257, 4982), - COL_VERTEX(-7042, 257, 4606), - COL_VERTEX(-6151, 129, 5120), - COL_VERTEX(-6151, 129, -7175), - COL_VERTEX(-7042, 257, -6661), - COL_VERTEX(-6665, 257, -7037), - COL_VERTEX(-7179, 129, -6147), - COL_VERTEX(-2567, 129, -2567), - COL_VERTEX(-3458, 257, -2053), - COL_VERTEX(-3081, 257, -2429), - COL_VERTEX(-3595, 129, -1539), - COL_VERTEX(5698, 166, -6833), - COL_VERTEX(5784, 403, -6748), - COL_VERTEX(5909, 554, -6622), - COL_VERTEX(6135, 640, -6396), - COL_VERTEX(6362, 554, -6170), - COL_VERTEX(6501, 376, -6030), - COL_VERTEX(6572, 166, -5959), - COL_VERTEX(6497, 640, -6758), - COL_VERTEX(-5631, 154, 0), - COL_VERTEX(-4479, 307, 3968), - COL_VERTEX(-4095, 307, 3968), - COL_VERTEX(-5119, 154, 3968), - COL_VERTEX(-5119, 154, 2944), - COL_VERTEX(1536, 307, 3968), - COL_VERTEX(1280, 307, 3840), - COL_VERTEX(1280, 307, 3584), - COL_VERTEX(1536, 154, 2944), - COL_VERTEX(1536, 307, 3840), - COL_VERTEX(2560, 154, 2944), - COL_VERTEX(2560, 307, 3968), - COL_VERTEX(6144, 307, 1920), - COL_VERTEX(5760, 307, 1920), - COL_VERTEX(5120, 154, 1920), - COL_VERTEX(5120, 154, 896), - COL_VERTEX(256, 154, 6016), - COL_VERTEX(-255, 154, 6528), - COL_VERTEX(256, 154, 6528), - COL_VERTEX(-383, 154, 6400), - COL_VERTEX(-383, 154, 6144), - COL_VERTEX(384, 154, 6400), - COL_VERTEX(-255, 0, 4224), - COL_VERTEX(256, 230, 4224), - COL_VERTEX(-255, 230, 4096), - COL_VERTEX(-383, 0, 6400), - COL_VERTEX(-1151, 154, 6016), - COL_VERTEX(-1151, 0, 6016), - COL_VERTEX(640, 154, 6016), - COL_VERTEX(-5503, 307, -2943), - COL_VERTEX(-5503, 307, -1151), - COL_VERTEX(-4735, 307, -1151), - COL_VERTEX(-4735, 307, -2943), - COL_VERTEX(-4863, 307, -1023), - COL_VERTEX(-5375, 307, -1023), - COL_VERTEX(-4863, 307, -3071), - COL_VERTEX(640, 154, 6400), - COL_VERTEX(-4863, 0, -1023), - COL_VERTEX(-2559, 307, 4224), - COL_VERTEX(-3839, 307, 2688), - COL_VERTEX(-2559, 307, 2688), - COL_VERTEX(-3071, 307, 4224), - COL_VERTEX(-3327, 307, 2688), - COL_VERTEX(-2559, 307, 3840), - COL_VERTEX(-2303, 307, 3968), - COL_VERTEX(-2380, 410, 3968), - COL_VERTEX(-2303, 0, 3968), - COL_VERTEX(-2559, 0, 3968), - COL_VERTEX(-2380, 410, 3456), - COL_VERTEX(-2303, 307, 3456), - COL_VERTEX(-2559, 307, 3328), - COL_VERTEX(-2303, 0, 3456), - COL_VERTEX(-2559, 0, 3456), - COL_VERTEX(-1535, 307, 3840), - COL_VERTEX(-1458, 410, 3968), - COL_VERTEX(-1279, 0, 3840), - COL_VERTEX(-1279, 307, 3968), - COL_VERTEX(-1279, 307, 3456), - COL_VERTEX(-1458, 410, 3456), - COL_VERTEX(-1535, 307, 3328), - COL_VERTEX(-1535, 0, 3328), - COL_VERTEX(-1023, 307, 4096), - COL_VERTEX(1024, 307, 4096), - COL_VERTEX(1280, 307, 3968), - COL_VERTEX(1280, 307, 3456), - COL_VERTEX(1024, 307, 3328), - COL_VERTEX(6400, 307, 1152), - COL_VERTEX(7424, 307, 640), - COL_VERTEX(6912, 307, 2176), - COL_VERTEX(7424, 307, 2176), - COL_VERTEX(6400, 307, 1664), - COL_VERTEX(7936, 307, 1664), - COL_VERTEX(7936, 307, 1152), - COL_VERTEX(5120, 154, -383), - COL_VERTEX(4992, 154, -767), - COL_VERTEX(4864, 154, 0), - COL_VERTEX(4608, 154, -1151), - COL_VERTEX(5248, 154, 0), - COL_VERTEX(5632, 154, -1151), - COL_VERTEX(5504, 154, -383), - COL_VERTEX(5248, 154, -1535), - COL_VERTEX(5504, 154, 640), - COL_VERTEX(4096, 154, 768), - COL_VERTEX(4096, 154, 384), - COL_VERTEX(4480, 154, -1663), - COL_VERTEX(4096, 154, -1663), - COL_VERTEX(4096, 154, -2047), - COL_VERTEX(2688, 307, -6015), - COL_VERTEX(2688, 307, -5247), - COL_VERTEX(4608, 307, -6399), - COL_VERTEX(3072, 307, -4863), - COL_VERTEX(4992, 307, -6015), - COL_VERTEX(4992, 307, -5247), - COL_VERTEX(4608, 307, -4863), - COL_VERTEX(-4095, 307, 3584), - COL_VERTEX(-3839, 307, 3584), - COL_VERTEX(-4095, 307, 3328), - COL_VERTEX(6016, 512, 7552), - COL_VERTEX(6016, 512, 7040), - COL_VERTEX(6272, 512, 7040), - COL_VERTEX(6912, 154, 7552), - COL_VERTEX(6912, 154, 7040), - COL_VERTEX(3072, 0, 7552), - COL_VERTEX(3328, 256, 8192), - COL_VERTEX(4352, 563, 4992), - COL_VERTEX(3712, 0, 5504), - COL_VERTEX(3072, 0, 5504), - COL_VERTEX(768, 307, -5055), - COL_VERTEX(768, 307, -3647), - COL_VERTEX(-767, 307, -5055), - COL_VERTEX(512, 768, -6335), - COL_VERTEX(-383, 768, -6207), - COL_VERTEX(-383, 0, -6207), - COL_VERTEX(512, 0, -6335), - COL_VERTEX(-511, 0, -7103), - COL_VERTEX(-511, 768, -7103), - COL_VERTEX(384, 768, -7231), - COL_VERTEX(384, 0, -7231), - COL_VERTEX(-2303, 154, 6528), - COL_VERTEX(-3583, 154, 6016), - COL_VERTEX(-2303, 0, 6016), - COL_VERTEX(-4095, 154, 6016), - COL_VERTEX(256, 230, 4096), - COL_VERTEX(-255, 154, 4096), - COL_VERTEX(-1663, 154, 6016), - COL_VERTEX(-1663, 0, 6528), - COL_VERTEX(-4115, 0, 492), - COL_VERTEX(-4115, 0, 0), - COL_VERTEX(-4607, 0, 492), - COL_VERTEX(6400, 51, 6976), - COL_VERTEX(6400, -50, 7040), - COL_VERTEX(3840, -50, 4992), - COL_VERTEX(6400, -50, 5120), - COL_VERTEX(6400, 51, 5056), - COL_VERTEX(1536, 154, 6400), - COL_VERTEX(896, 0, 6656), - COL_VERTEX(1536, 154, 6016), - COL_VERTEX(1280, 154, 5760), - COL_VERTEX(-5513, 154, 6440), - COL_VERTEX(-5887, 154, 7088), - COL_VERTEX(-6261, 154, 6872), - COL_VERTEX(-6261, 154, 6440), - COL_VERTEX(6656, 154, -2639), - COL_VERTEX(6282, 154, -2855), - COL_VERTEX(-2272, 166, 276), - COL_VERTEX(-2235, 403, 391), - COL_VERTEX(-2180, 554, 560), - COL_VERTEX(-1982, 554, 1169), - COL_VERTEX(-1921, 376, 1357), - COL_VERTEX(-1890, 166, 1452), - COL_VERTEX(6060, 166, -7195), - COL_VERTEX(6146, 403, -7110), - COL_VERTEX(6271, 554, -6984), - COL_VERTEX(6724, 554, -6532), - COL_VERTEX(6863, 376, -6392), - COL_VERTEX(6934, 166, -6321), - COL_TRI_INIT(SURFACE_DEFAULT, 634), - COL_TRI(142, 143, 144), - COL_TRI(49, 48, 50), - COL_TRI(49, 50, 51), - COL_TRI(134, 135, 136), - COL_TRI(136, 137, 138), - COL_TRI(136, 135, 137), - COL_TRI(135, 139, 137), - COL_TRI(138, 137, 139), - COL_TRI(138, 139, 140), - COL_TRI(135, 141, 139), - COL_TRI(134, 141, 135), - COL_TRI(140, 139, 141), - COL_TRI(140, 141, 134), - COL_TRI(142, 145, 146), - COL_TRI(142, 144, 145), - COL_TRI(148, 145, 144), - COL_TRI(149, 144, 143), - COL_TRI(149, 148, 144), - COL_TRI(148, 150, 145), - COL_TRI(150, 330, 145), - COL_TRI(145, 330, 146), - COL_TRI(150, 383, 330), - COL_TRI(151, 383, 150), - COL_TRI(151, 150, 147), - COL_TRI(150, 148, 147), - COL_TRI(148, 149, 147), - COL_TRI(147, 149, 143), - COL_TRI(147, 143, 142), - COL_TRI(146, 330, 383), - COL_TRI(146, 383, 151), - COL_TRI(152, 384, 156), - COL_TRI(152, 156, 159), - COL_TRI(153, 385, 152), - COL_TRI(152, 385, 384), - COL_TRI(154, 384, 385), - COL_TRI(154, 155, 384), - COL_TRI(155, 156, 384), - COL_TRI(156, 386, 159), - COL_TRI(155, 157, 156), - COL_TRI(157, 386, 156), - COL_TRI(157, 155, 153), - COL_TRI(158, 387, 157), - COL_TRI(158, 157, 153), - COL_TRI(157, 387, 386), - COL_TRI(155, 154, 153), - COL_TRI(153, 154, 385), - COL_TRI(159, 386, 387), - COL_TRI(159, 387, 158), - COL_TRI(160, 163, 165), - COL_TRI(161, 388, 160), - COL_TRI(160, 388, 163), - COL_TRI(162, 165, 163), - COL_TRI(162, 163, 388), - COL_TRI(163, 389, 392), - COL_TRI(163, 390, 389), - COL_TRI(162, 164, 165), - COL_TRI(164, 391, 165), - COL_TRI(165, 391, 167), - COL_TRI(160, 165, 167), - COL_TRI(164, 393, 391), - COL_TRI(164, 162, 161), - COL_TRI(166, 393, 164), - COL_TRI(166, 164, 161), - COL_TRI(167, 391, 393), - COL_TRI(167, 393, 166), - COL_TRI(162, 388, 394), - COL_TRI(162, 394, 161), - COL_TRI(161, 394, 388), - COL_TRI(168, 395, 169), - COL_TRI(169, 395, 396), - COL_TRI(169, 396, 173), - COL_TRI(169, 173, 175), - COL_TRI(170, 396, 395), - COL_TRI(170, 171, 396), - COL_TRI(171, 173, 396), - COL_TRI(171, 172, 173), - COL_TRI(172, 397, 173), - COL_TRI(173, 397, 175), - COL_TRI(172, 171, 168), - COL_TRI(171, 170, 168), - COL_TRI(168, 170, 395), - COL_TRI(176, 403, 402), - COL_TRI(174, 172, 168), - COL_TRI(172, 398, 397), - COL_TRI(175, 397, 398), - COL_TRI(175, 398, 174), - COL_TRI(174, 398, 172), - COL_TRI(176, 399, 323), - COL_TRI(176, 323, 324), - COL_TRI(177, 176, 324), - COL_TRI(176, 400, 401), - COL_TRI(176, 402, 400), - COL_TRI(179, 181, 180), - COL_TRI(176, 181, 399), - COL_TRI(176, 404, 181), - COL_TRI(179, 399, 181), - COL_TRI(180, 181, 183), - COL_TRI(181, 404, 183), - COL_TRI(182, 323, 399), - COL_TRI(182, 399, 179), - COL_TRI(176, 401, 404), - COL_TRI(183, 404, 401), - COL_TRI(183, 401, 184), - COL_TRI(184, 401, 400), - COL_TRI(185, 400, 402), - COL_TRI(184, 400, 185), - COL_TRI(180, 181, 345), - COL_TRI(186, 402, 403), - COL_TRI(187, 408, 402), - COL_TRI(187, 402, 186), - COL_TRI(185, 402, 408), - COL_TRI(186, 403, 409), - COL_TRI(178, 409, 403), - COL_TRI(178, 403, 176), - COL_TRI(180, 345, 344), - COL_TRI(188, 404, 183), - COL_TRI(178, 410, 409), - COL_TRI(178, 176, 177), - COL_TRI(177, 324, 405), - COL_TRI(189, 412, 413), - COL_TRI(189, 414, 415), - COL_TRI(195, 417, 413), - COL_TRI(189, 416, 414), - COL_TRI(189, 417, 416), - COL_TRI(189, 413, 417), - COL_TRI(192, 415, 414), - COL_TRI(193, 418, 415), - COL_TRI(193, 415, 192), - COL_TRI(189, 415, 418), - COL_TRI(191, 418, 193), - COL_TRI(191, 189, 418), - COL_TRI(192, 414, 194), - COL_TRI(194, 414, 416), - COL_TRI(194, 416, 420), - COL_TRI(198, 423, 199), - COL_TRI(195, 413, 196), - COL_TRI(196, 413, 412), - COL_TRI(196, 412, 190), - COL_TRI(190, 412, 189), - COL_TRI(190, 189, 191), - COL_TRI(197, 421, 202), - COL_TRI(197, 202, 201), - COL_TRI(198, 422, 423), - COL_TRI(199, 421, 197), - COL_TRI(199, 423, 421), - COL_TRI(200, 421, 423), - COL_TRI(200, 424, 421), - COL_TRI(201, 202, 422), - COL_TRI(201, 422, 198), - COL_TRI(202, 203, 425), - COL_TRI(202, 425, 422), - COL_TRI(70, 67, 200), - COL_TRI(70, 200, 425), - COL_TRI(208, 429, 427), - COL_TRI(203, 424, 68), - COL_TRI(203, 68, 69), - COL_TRI(204, 207, 206), - COL_TRI(204, 426, 207), - COL_TRI(205, 207, 426), - COL_TRI(205, 426, 208), - COL_TRI(206, 207, 427), - COL_TRI(207, 205, 428), - COL_TRI(207, 428, 427), - COL_TRI(206, 427, 429), - COL_TRI(205, 208, 428), - COL_TRI(208, 427, 428), - COL_TRI(213, 435, 434), - COL_TRI(208, 430, 429), - COL_TRI(209, 212, 431), - COL_TRI(209, 431, 432), - COL_TRI(210, 433, 209), - COL_TRI(210, 209, 211), - COL_TRI(211, 209, 432), - COL_TRI(212, 209, 433), - COL_TRI(212, 433, 213), - COL_TRI(212, 213, 431), - COL_TRI(213, 432, 431), - COL_TRI(213, 434, 432), - COL_TRI(211, 432, 434), - COL_TRI(214, 215, 436), - COL_TRI(215, 214, 437), - COL_TRI(214, 225, 437), - COL_TRI(214, 436, 225), - COL_TRI(216, 215, 438), - COL_TRI(216, 436, 215), - COL_TRI(215, 437, 439), - COL_TRI(217, 436, 216), - COL_TRI(217, 225, 436), - COL_TRI(218, 440, 441), - COL_TRI(219, 218, 442), - COL_TRI(218, 221, 440), - COL_TRI(218, 219, 221), - COL_TRI(225, 439, 437), - COL_TRI(227, 443, 442), - COL_TRI(221, 224, 440), - COL_TRI(222, 440, 221), - COL_TRI(223, 440, 439), - COL_TRI(224, 441, 440), - COL_TRI(222, 439, 440), - COL_TRI(221, 440, 223), - COL_TRI(224, 220, 441), - COL_TRI(220, 218, 441), - COL_TRI(221, 227, 224), - COL_TRI(221, 223, 228), - COL_TRI(219, 442, 443), - COL_TRI(227, 220, 224), - COL_TRI(227, 442, 220), - COL_TRI(220, 442, 218), - COL_TRI(225, 217, 222), - COL_TRI(225, 222, 439), - COL_TRI(223, 439, 444), - COL_TRI(226, 439, 222), - COL_TRI(226, 444, 439), - COL_TRI(223, 444, 445), - COL_TRI(223, 445, 446), - COL_TRI(223, 446, 447), - COL_TRI(223, 447, 448), - COL_TRI(228, 223, 448), - COL_TRI(229, 447, 446), - COL_TRI(230, 447, 229), - COL_TRI(230, 448, 447), - COL_TRI(228, 448, 230), - COL_TRI(235, 449, 453), - COL_TRI(231, 446, 445), - COL_TRI(229, 446, 231), - COL_TRI(231, 445, 232), - COL_TRI(232, 445, 444), - COL_TRI(232, 444, 226), - COL_TRI(233, 449, 235), - COL_TRI(234, 235, 450), - COL_TRI(233, 235, 234), - COL_TRI(235, 451, 452), - COL_TRI(235, 453, 451), - COL_TRI(239, 451, 240), - COL_TRI(236, 455, 237), - COL_TRI(236, 450, 455), - COL_TRI(235, 455, 450), - COL_TRI(235, 454, 455), - COL_TRI(237, 455, 454), - COL_TRI(234, 450, 236), - COL_TRI(238, 454, 452), - COL_TRI(235, 452, 454), - COL_TRI(237, 454, 238), - COL_TRI(239, 452, 451), - COL_TRI(238, 452, 239), - COL_TRI(240, 451, 453), - COL_TRI(242, 252, 456), - COL_TRI(240, 453, 241), - COL_TRI(241, 453, 449), - COL_TRI(241, 449, 233), - COL_TRI(242, 456, 457), - COL_TRI(243, 242, 244), - COL_TRI(243, 458, 242), - COL_TRI(244, 242, 459), - COL_TRI(245, 459, 242), - COL_TRI(242, 460, 252), - COL_TRI(242, 458, 460), - COL_TRI(252, 251, 456), - COL_TRI(247, 457, 456), - COL_TRI(248, 246, 457), - COL_TRI(248, 457, 247), - COL_TRI(242, 457, 246), - COL_TRI(249, 246, 248), - COL_TRI(249, 461, 246), - COL_TRI(246, 461, 257), - COL_TRI(246, 245, 242), - COL_TRI(246, 257, 245), - COL_TRI(247, 456, 250), - COL_TRI(250, 456, 462), - COL_TRI(251, 462, 456), - COL_TRI(257, 265, 463), - COL_TRI(253, 260, 252), - COL_TRI(254, 252, 460), - COL_TRI(253, 252, 254), - COL_TRI(252, 260, 251), - COL_TRI(255, 245, 463), - COL_TRI(256, 459, 245), - COL_TRI(256, 245, 255), - COL_TRI(257, 463, 245), - COL_TRI(258, 257, 259), - COL_TRI(258, 265, 257), - COL_TRI(265, 467, 463), - COL_TRI(260, 464, 251), - COL_TRI(261, 251, 262), - COL_TRI(261, 462, 251), - COL_TRI(262, 251, 464), - COL_TRI(260, 465, 464), - COL_TRI(260, 466, 465), - COL_TRI(263, 260, 253), - COL_TRI(263, 466, 260), - COL_TRI(255, 463, 264), - COL_TRI(264, 463, 467), - COL_TRI(250, 462, 261), - COL_TRI(259, 257, 461), - COL_TRI(266, 265, 258), - COL_TRI(266, 469, 265), - COL_TRI(265, 468, 467), - COL_TRI(265, 469, 468), - COL_TRI(259, 461, 249), - COL_TRI(244, 459, 256), - COL_TRI(267, 464, 465), - COL_TRI(262, 464, 267), - COL_TRI(267, 465, 268), - COL_TRI(268, 465, 466), - COL_TRI(268, 466, 263), - COL_TRI(269, 460, 458), - COL_TRI(254, 460, 269), - COL_TRI(269, 458, 243), - COL_TRI(264, 467, 270), - COL_TRI(270, 467, 468), - COL_TRI(271, 468, 469), - COL_TRI(270, 468, 271), - COL_TRI(271, 469, 266), - COL_TRI(272, 470, 273), - COL_TRI(273, 470, 274), - COL_TRI(273, 274, 275), - COL_TRI(274, 470, 471), - COL_TRI(275, 274, 472), - COL_TRI(274, 471, 473), - COL_TRI(272, 471, 470), - COL_TRI(274, 474, 472), - COL_TRI(274, 475, 474), - COL_TRI(274, 476, 475), - COL_TRI(275, 472, 277), - COL_TRI(276, 474, 475), - COL_TRI(277, 472, 474), - COL_TRI(277, 474, 276), - COL_TRI(276, 475, 278), - COL_TRI(278, 475, 476), - COL_TRI(278, 476, 279), - COL_TRI(279, 476, 473), - COL_TRI(274, 473, 476), - COL_TRI(279, 473, 280), - COL_TRI(280, 473, 471), - COL_TRI(280, 471, 272), - COL_TRI(281, 477, 478), - COL_TRI(281, 479, 477), - COL_TRI(282, 284, 285), - COL_TRI(283, 282, 285), - COL_TRI(284, 480, 285), - COL_TRI(285, 480, 481), - COL_TRI(285, 481, 286), - COL_TRI(289, 290, 485), - COL_TRI(286, 481, 482), - COL_TRI(286, 482, 288), - COL_TRI(286, 288, 287), - COL_TRI(287, 484, 483), - COL_TRI(287, 483, 283), - COL_TRI(288, 484, 287), - COL_TRI(283, 483, 282), - COL_TRI(289, 291, 290), - COL_TRI(9, 5, 487), - COL_TRI(290, 291, 486), - COL_TRI(291, 12, 486), - COL_TRI(291, 13, 12), - COL_TRI(290, 486, 292), - COL_TRI(292, 486, 12), - COL_TRI(292, 12, 293), - COL_TRI(293, 12, 13), - COL_TRI(293, 13, 294), - COL_TRI(294, 5, 9), - COL_TRI(9, 487, 296), - COL_TRI(7, 6, 294), - COL_TRI(295, 5, 7), - COL_TRI(294, 6, 5), - COL_TRI(295, 487, 5), - COL_TRI(5, 6, 7), - COL_TRI(296, 487, 295), - COL_TRI(296, 295, 297), - COL_TRI(297, 295, 299), - COL_TRI(7, 299, 295), - COL_TRI(297, 299, 488), - COL_TRI(298, 289, 485), - COL_TRI(298, 485, 489), - COL_TRI(299, 298, 489), - COL_TRI(7, 289, 298), - COL_TRI(299, 489, 488), - COL_TRI(305, 493, 306), - COL_TRI(7, 13, 289), - COL_TRI(13, 7, 294), - COL_TRI(300, 490, 491), - COL_TRI(300, 491, 303), - COL_TRI(301, 490, 300), - COL_TRI(301, 492, 490), - COL_TRI(302, 491, 490), - COL_TRI(302, 490, 492), - COL_TRI(303, 491, 302), - COL_TRI(303, 302, 304), - COL_TRI(304, 492, 301), - COL_TRI(304, 302, 492), - COL_TRI(306, 494, 495), - COL_TRI(306, 495, 305), - COL_TRI(307, 494, 306), - COL_TRI(308, 495, 494), - COL_TRI(308, 494, 309), - COL_TRI(307, 309, 494), - COL_TRI(305, 496, 493), - COL_TRI(309, 497, 308), - COL_TRI(309, 498, 497), - COL_TRI(307, 498, 309), - COL_TRI(310, 499, 311), - COL_TRI(307, 493, 311), - COL_TRI(307, 311, 499), - COL_TRI(311, 493, 496), - COL_TRI(311, 496, 310), - COL_TRI(307, 306, 493), - COL_TRI(310, 500, 499), - COL_TRI(312, 498, 307), - COL_TRI(307, 499, 500), - COL_TRI(307, 500, 312), - COL_TRI(312, 497, 498), - COL_TRI(313, 501, 317), - COL_TRI(313, 317, 502), - COL_TRI(314, 501, 313), - COL_TRI(314, 313, 316), - COL_TRI(315, 313, 502), - COL_TRI(316, 313, 315), - COL_TRI(317, 501, 314), - COL_TRI(321, 505, 406), - COL_TRI(318, 502, 317), - COL_TRI(317, 314, 503), - COL_TRI(318, 317, 503), - COL_TRI(315, 502, 504), - COL_TRI(319, 504, 502), - COL_TRI(319, 502, 318), - COL_TRI(316, 315, 320), - COL_TRI(320, 315, 504), - COL_TRI(320, 504, 319), - COL_TRI(321, 406, 323), - COL_TRI(326, 409, 507), - COL_TRI(322, 505, 407), - COL_TRI(322, 406, 505), - COL_TRI(323, 406, 322), - COL_TRI(324, 322, 407), - COL_TRI(324, 407, 506), - COL_TRI(323, 322, 324), - COL_TRI(325, 507, 409), - COL_TRI(325, 409, 410), - COL_TRI(325, 326, 507), - COL_TRI(325, 508, 326), - COL_TRI(330, 146, 511), - COL_TRI(187, 326, 508), - COL_TRI(187, 186, 326), - COL_TRI(326, 186, 409), - COL_TRI(327, 328, 329), - COL_TRI(328, 509, 329), - COL_TRI(329, 509, 510), - COL_TRI(329, 510, 327), - COL_TRI(328, 511, 509), - COL_TRI(327, 510, 146), - COL_TRI(327, 146, 330), - COL_TRI(327, 330, 328), - COL_TRI(330, 511, 328), - COL_TRI(338, 339, 341), - COL_TRI(331, 333, 512), - COL_TRI(332, 333, 331), - COL_TRI(333, 513, 512), - COL_TRI(333, 332, 513), - COL_TRI(334, 512, 513), - COL_TRI(331, 512, 334), - COL_TRI(335, 336, 514), - COL_TRI(336, 335, 515), - COL_TRI(336, 516, 337), - COL_TRI(336, 337, 514), - COL_TRI(336, 515, 516), - COL_TRI(337, 516, 515), - COL_TRI(340, 338, 517), - COL_TRI(339, 338, 343), - COL_TRI(340, 343, 338), - COL_TRI(341, 517, 338), - COL_TRI(339, 343, 518), - COL_TRI(342, 517, 341), - COL_TRI(343, 188, 518), - COL_TRI(343, 419, 188), - COL_TRI(340, 419, 343), - COL_TRI(188, 419, 404), - COL_TRI(344, 345, 411), - COL_TRI(345, 404, 419), - COL_TRI(340, 411, 419), - COL_TRI(342, 519, 517), - COL_TRI(344, 411, 346), - COL_TRI(345, 181, 404), - COL_TRI(346, 411, 340), - COL_TRI(346, 340, 347), - COL_TRI(347, 340, 520), - COL_TRI(340, 517, 519), - COL_TRI(347, 520, 348), - COL_TRI(348, 520, 519), - COL_TRI(340, 519, 520), - COL_TRI(348, 519, 342), - COL_TRI(123, 351, 87), - COL_TRI(101, 521, 81), - COL_TRI(81, 350, 79), - COL_TRI(81, 521, 350), - COL_TRI(349, 350, 521), - COL_TRI(101, 349, 521), - COL_TRI(350, 522, 80), - COL_TRI(79, 350, 80), - COL_TRI(349, 522, 350), - COL_TRI(80, 522, 523), - COL_TRI(349, 523, 522), - COL_TRI(80, 523, 99), - COL_TRI(349, 524, 523), - COL_TRI(99, 523, 524), - COL_TRI(99, 524, 100), - COL_TRI(100, 524, 349), - COL_TRI(100, 349, 101), - COL_TRI(351, 353, 87), - COL_TRI(352, 353, 351), - COL_TRI(92, 352, 351), - COL_TRI(353, 525, 86), - COL_TRI(87, 353, 86), - COL_TRI(352, 525, 353), - COL_TRI(92, 351, 123), - COL_TRI(86, 525, 526), - COL_TRI(352, 526, 525), - COL_TRI(86, 526, 88), - COL_TRI(88, 526, 354), - COL_TRI(352, 354, 526), - COL_TRI(88, 354, 95), - COL_TRI(354, 352, 92), - COL_TRI(95, 354, 92), - COL_TRI(355, 76, 78), - COL_TRI(355, 72, 76), - COL_TRI(355, 357, 356), - COL_TRI(355, 358, 357), - COL_TRI(355, 78, 361), - COL_TRI(355, 361, 360), - COL_TRI(355, 360, 359), - COL_TRI(355, 359, 358), - COL_TRI(356, 527, 355), - COL_TRI(355, 527, 72), - COL_TRI(361, 532, 531), - COL_TRI(356, 528, 527), - COL_TRI(357, 528, 356), - COL_TRI(357, 529, 528), - COL_TRI(358, 529, 357), - COL_TRI(358, 362, 529), - COL_TRI(359, 362, 358), - COL_TRI(359, 530, 362), - COL_TRI(360, 530, 359), - COL_TRI(360, 531, 530), - COL_TRI(361, 531, 360), - COL_TRI(362, 531, 532), - COL_TRI(78, 532, 361), - COL_TRI(78, 77, 532), - COL_TRI(77, 529, 362), - COL_TRI(362, 532, 77), - COL_TRI(77, 528, 529), - COL_TRI(77, 72, 527), - COL_TRI(77, 527, 528), - COL_TRI(362, 530, 531), - COL_TRI(102, 363, 114), - COL_TRI(102, 110, 363), - COL_TRI(363, 110, 126), - COL_TRI(363, 126, 365), - COL_TRI(363, 365, 114), - COL_TRI(364, 365, 126), - COL_TRI(364, 126, 127), - COL_TRI(365, 364, 113), - COL_TRI(365, 113, 114), - COL_TRI(364, 366, 129), - COL_TRI(366, 364, 127), - COL_TRI(364, 129, 130), - COL_TRI(364, 130, 113), - COL_TRI(366, 127, 128), - COL_TRI(366, 128, 82), - COL_TRI(366, 82, 129), - COL_TRI(89, 94, 367), - COL_TRI(94, 91, 367), - COL_TRI(367, 91, 122), - COL_TRI(367, 369, 116), - COL_TRI(89, 367, 116), - COL_TRI(367, 122, 369), - COL_TRI(368, 122, 121), - COL_TRI(368, 369, 122), - COL_TRI(369, 368, 131), - COL_TRI(369, 131, 115), - COL_TRI(369, 115, 116), - COL_TRI(368, 370, 132), - COL_TRI(368, 132, 131), - COL_TRI(370, 368, 121), - COL_TRI(370, 121, 120), - COL_TRI(370, 133, 132), - COL_TRI(370, 120, 111), - COL_TRI(370, 111, 133), - COL_TRI(90, 119, 371), - COL_TRI(104, 90, 371), - COL_TRI(374, 118, 112), - COL_TRI(371, 119, 117), - COL_TRI(371, 117, 373), - COL_TRI(371, 373, 103), - COL_TRI(104, 371, 103), - COL_TRI(372, 373, 117), - COL_TRI(372, 117, 118), - COL_TRI(373, 372, 106), - COL_TRI(373, 106, 105), - COL_TRI(373, 105, 103), - COL_TRI(374, 372, 118), - COL_TRI(372, 107, 106), - COL_TRI(372, 374, 107), - COL_TRI(374, 112, 109), - COL_TRI(374, 109, 108), - COL_TRI(374, 108, 107), - COL_TRI(375, 379, 378), - COL_TRI(375, 378, 377), - COL_TRI(375, 377, 376), - COL_TRI(375, 380, 379), - COL_TRI(375, 125, 98), - COL_TRI(375, 98, 381), - COL_TRI(375, 381, 380), - COL_TRI(380, 536, 379), - COL_TRI(376, 533, 375), - COL_TRI(375, 93, 125), - COL_TRI(375, 533, 93), - COL_TRI(376, 534, 533), - COL_TRI(377, 534, 376), - COL_TRI(377, 535, 534), - COL_TRI(378, 535, 377), - COL_TRI(378, 382, 535), - COL_TRI(379, 382, 378), - COL_TRI(379, 536, 382), - COL_TRI(380, 537, 536), - COL_TRI(381, 537, 380), - COL_TRI(381, 538, 537), - COL_TRI(98, 538, 381), - COL_TRI(98, 96, 538), - COL_TRI(382, 538, 96), - COL_TRI(96, 533, 534), - COL_TRI(96, 534, 535), - COL_TRI(96, 535, 382), - COL_TRI(96, 93, 533), - COL_TRI(382, 537, 538), - COL_TRI(382, 536, 537), - COL_TRI_INIT(SURFACE_BURNING, 82), - COL_TRI(41, 38, 72), - COL_TRI(73, 35, 41), - COL_TRI(74, 38, 37), - COL_TRI(72, 38, 75), - COL_TRI(76, 72, 75), - COL_TRI(77, 41, 72), - COL_TRI(73, 78, 75), - COL_TRI(79, 80, 73), - COL_TRI(77, 73, 41), - COL_TRI(78, 76, 75), - COL_TRI(74, 37, 29), - COL_TRI(30, 73, 84), - COL_TRI(73, 30, 35), - COL_TRI(85, 29, 30), - COL_TRI(86, 29, 85), - COL_TRI(87, 86, 85), - COL_TRI(85, 30, 84), - COL_TRI(85, 97, 123), - COL_TRI(85, 123, 87), - COL_TRI(95, 92, 74), - COL_TRI(88, 74, 29), - COL_TRI(89, 90, 74), - COL_TRI(90, 38, 74), - COL_TRI(91, 94, 74), - COL_TRI(91, 74, 124), - COL_TRI(88, 95, 74), - COL_TRI(92, 125, 74), - COL_TRI(93, 74, 125), - COL_TRI(93, 97, 74), - COL_TRI(94, 89, 74), - COL_TRI(73, 80, 83), - COL_TRI(96, 98, 123), - COL_TRI(97, 96, 123), - COL_TRI(98, 92, 123), - COL_TRI(92, 98, 125), - COL_TRI(93, 96, 97), - COL_TRI(86, 88, 29), - COL_TRI(80, 99, 83), - COL_TRI(81, 79, 73), - COL_TRI(81, 73, 82), - COL_TRI(83, 82, 128), - COL_TRI(100, 82, 83), - COL_TRI(99, 100, 83), - COL_TRI(83, 110, 75), - COL_TRI(83, 126, 110), - COL_TRI(83, 127, 126), - COL_TRI(83, 128, 127), - COL_TRI(101, 81, 82), - COL_TRI(100, 101, 82), - COL_TRI(82, 73, 75), - COL_TRI(102, 82, 75), - COL_TRI(73, 77, 78), - COL_TRI(103, 105, 38), - COL_TRI(104, 103, 38), - COL_TRI(90, 104, 38), - COL_TRI(105, 106, 38), - COL_TRI(106, 107, 38), - COL_TRI(107, 108, 38), - COL_TRI(108, 109, 38), - COL_TRI(109, 75, 38), - COL_TRI(110, 102, 75), - COL_TRI(111, 124, 75), - COL_TRI(112, 75, 109), - COL_TRI(112, 111, 75), - COL_TRI(102, 129, 82), - COL_TRI(102, 114, 129), - COL_TRI(113, 130, 129), - COL_TRI(114, 113, 129), - COL_TRI(115, 131, 132), - COL_TRI(115, 132, 133), - COL_TRI(116, 115, 133), - COL_TRI(117, 116, 133), - COL_TRI(118, 117, 133), - COL_TRI(118, 133, 111), - COL_TRI(117, 119, 116), - COL_TRI(119, 89, 116), - COL_TRI(119, 90, 89), - COL_TRI(112, 118, 111), - COL_TRI(111, 120, 124), - COL_TRI(122, 91, 124), - COL_TRI(120, 121, 124), - COL_TRI(121, 122, 124), - COL_TRI_INIT(SURFACE_NOT_SLIPPERY, 6), - COL_TRI(484, 288, 282), - COL_TRI(484, 282, 483), - COL_TRI(288, 482, 284), - COL_TRI(288, 284, 282), - COL_TRI(482, 481, 480), - COL_TRI(482, 480, 284), - COL_TRI_INIT(SURFACE_WALL_MISC, 106), - COL_TRI(0, 1, 2), - COL_TRI(0, 3, 1), - COL_TRI(3, 0, 4), - COL_TRI(5, 4, 0), - COL_TRI(0, 6, 5), - COL_TRI(2, 7, 0), - COL_TRI(7, 6, 0), - COL_TRI(5, 8, 4), - COL_TRI(5, 9, 8), - COL_TRI(8, 10, 11), - COL_TRI(8, 11, 4), - COL_TRI(3, 4, 11), - COL_TRI(2, 12, 13), - COL_TRI(2, 13, 7), - COL_TRI(10, 3, 11), - COL_TRI(26, 55, 16), - COL_TRI(14, 15, 28), - COL_TRI(15, 27, 28), - COL_TRI(15, 17, 27), - COL_TRI(14, 53, 15), - COL_TRI(15, 54, 17), - COL_TRI(15, 53, 54), - COL_TRI(16, 54, 53), - COL_TRI(16, 55, 54), - COL_TRI(17, 26, 27), - COL_TRI(16, 53, 56), - COL_TRI(14, 56, 53), - COL_TRI(18, 19, 21), - COL_TRI(18, 57, 19), - COL_TRI(26, 16, 27), - COL_TRI(20, 61, 60), - COL_TRI(20, 58, 61), - COL_TRI(20, 60, 59), - COL_TRI(21, 20, 22), - COL_TRI(19, 20, 21), - COL_TRI(19, 58, 20), - COL_TRI(22, 20, 59), - COL_TRI(18, 21, 23), - COL_TRI(21, 22, 23), - COL_TRI(23, 22, 56), - COL_TRI(22, 59, 24), - COL_TRI(24, 56, 22), - COL_TRI(25, 23, 14), - COL_TRI(25, 18, 23), - COL_TRI(23, 56, 14), - COL_TRI(25, 59, 60), - COL_TRI(25, 60, 18), - COL_TRI(18, 60, 61), - COL_TRI(30, 31, 35), - COL_TRI(24, 16, 56), - COL_TRI(14, 28, 25), - COL_TRI(27, 16, 24), - COL_TRI(27, 24, 28), - COL_TRI(28, 24, 59), - COL_TRI(28, 59, 25), - COL_TRI(18, 61, 57), - COL_TRI(29, 31, 30), - COL_TRI(29, 33, 31), - COL_TRI(31, 36, 35), - COL_TRI(32, 36, 31), - COL_TRI(33, 34, 31), - COL_TRI(34, 32, 31), - COL_TRI(35, 42, 41), - COL_TRI(35, 36, 42), - COL_TRI(32, 43, 36), - COL_TRI(36, 44, 42), - COL_TRI(36, 43, 44), - COL_TRI(37, 33, 29), - COL_TRI(37, 40, 33), - COL_TRI(33, 46, 34), - COL_TRI(33, 40, 46), - COL_TRI(32, 64, 43), - COL_TRI(38, 39, 37), - COL_TRI(39, 40, 37), - COL_TRI(40, 39, 46), - COL_TRI(41, 42, 38), - COL_TRI(42, 39, 38), - COL_TRI(39, 45, 46), - COL_TRI(42, 45, 39), - COL_TRI(42, 44, 45), - COL_TRI(43, 62, 44), - COL_TRI(44, 63, 45), - COL_TRI(44, 62, 63), - COL_TRI(43, 64, 62), - COL_TRI(45, 47, 46), - COL_TRI(45, 63, 47), - COL_TRI(46, 47, 65), - COL_TRI(46, 65, 34), - COL_TRI(32, 66, 64), - COL_TRI(34, 66, 32), - COL_TRI(34, 65, 66), - COL_TRI(47, 66, 65), - COL_TRI(47, 64, 66), - COL_TRI(47, 62, 64), - COL_TRI(47, 63, 62), - COL_TRI(48, 67, 50), - COL_TRI(49, 68, 48), - COL_TRI(48, 68, 67), - COL_TRI(49, 69, 68), - COL_TRI(50, 67, 70), - COL_TRI(50, 70, 51), - COL_TRI(51, 70, 69), - COL_TRI(51, 69, 49), - COL_TRI(1, 3, 52), - COL_TRI(1, 52, 71), - COL_TRI(10, 52, 3), - COL_TRI_STOP(), - COL_SPECIAL_INIT(1), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -3839, 154, 6272, /*yaw*/ 64), // unused, probably an early way to set intial position - COL_END(), -#else COL_INIT(), COL_VERTEX_INIT(0x20F), COL_VERTEX(2775, 1280, 4567), @@ -2732,5 +1353,4 @@ const Collision lll_seg7_area_1_collision[] = { COL_SPECIAL_INIT(1), SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ -3839, 154, 6272, /*yaw*/ 64), // unused, probably an early way to set intial position COL_END(), -#endif }; diff --git a/levels/rr/areas/1/15/model.inc.c b/levels/rr/areas/1/15/model.inc.c index d3eb2110..dc29c313 100644 --- a/levels/rr/areas/1/15/model.inc.c +++ b/levels/rr/areas/1/15/model.inc.c @@ -1,22 +1,5 @@ // 0x070127E8 - 0x070128D8 static const Vtx rr_seg7_vertex_070127E8[] = { -#ifdef VERSION_JP - {{{ 768, -869, -2252}, 0, { 4056, -1054}, {0x8c, 0x8c, 0x8c, 0xff}}}, - {{{ 358, -869, -1842}, 0, { 2012, -1054}, {0x8c, 0x8c, 0x8c, 0xff}}}, - {{{ 768, -869, -1842}, 0, { 3034, -2076}, {0x8c, 0x8c, 0x8c, 0xff}}}, - {{{ 358, -869, -2252}, 0, { 3034, 0}, {0x8c, 0x8c, 0x8c, 0xff}}}, - {{{ 358, -460, -2252}, 0, { 96, 862}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1178, -460, -2252}, 0, { 2140, 2904}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1178, -511, -2252}, 0, { 2012, 3032}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -153, -869, -2252}, 0, { -2840, -288}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 768, -921, -2252}, 0, { 96, 2904}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -153, -921, -2252}, 0, { -2968, -160}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 768, -869, -2252}, 0, { 224, 2776}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -153, -921, -1842}, 0, { -2968, -160}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 768, -869, -1842}, 0, { 224, 2776}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -153, -869, -1842}, 0, { -2840, -288}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 768, -921, -1842}, 0, { 96, 2904}, {0x96, 0x96, 0x96, 0xff}}}, -#else {{{ 768, -869, -2252}, 0, { 4056, -1054}, {0x8c, 0x8c, 0x8c, 0xff}}}, {{{ 358, -869, -1842}, 0, { 2012, -1054}, {0x8c, 0x8c, 0x8c, 0xff}}}, {{{ 768, -869, -1842}, 0, { 3034, -2076}, {0x8c, 0x8c, 0x8c, 0xff}}}, @@ -32,27 +15,10 @@ static const Vtx rr_seg7_vertex_070127E8[] = { {{{ 768, -869, -1842}, 0, { 224, 2776}, {0x96, 0x96, 0x96, 0xff}}}, {{{ -153, -869, -1842}, 0, { -2840, -288}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 768, -921, -1842}, 0, { 96, 2904}, {0x96, 0x96, 0x96, 0xff}}}, -#endif }; // 0x070128D8 - 0x070129B8 static const Vtx rr_seg7_vertex_070128D8[] = { -#ifdef VERSION_JP - {{{ 358, -511, -1842}, 0, { 0, 990}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1178, -511, -1842}, 0, { 2012, 3032}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1178, -460, -1842}, 0, { 2140, 2904}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 358, -460, -1842}, 0, { 96, 862}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 154, 1126, 2107}, 0, { -2586, -1566}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1485, 1126, 2107}, 0, { 480, 1498}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1485, 1178, 2107}, 0, { 606, 1372}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 358, -460, -2252}, 0, { 96, 862}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1178, -511, -2252}, 0, { 2012, 3032}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 358, -511, -2252}, 0, { 0, 990}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -2321, -1177, -2269}, 0, { -4118, 5076}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -2321, -972, -2269}, 0, { -3606, 5586}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -1706, -972, -2269}, 0, { -3606, 5586}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -1706, -1177, -2269}, 0, { -4118, 5076}, {0x96, 0x96, 0x96, 0xff}}}, -#else {{{ 358, -511, -1842}, 0, { 0, 990}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 1178, -460, -1842}, 0, { 2140, 2904}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 358, -460, -1842}, 0, { 96, 862}, {0x96, 0x96, 0x96, 0xff}}}, @@ -67,28 +33,10 @@ static const Vtx rr_seg7_vertex_070128D8[] = { {{{ -2321, -972, -631}, 0, { 3800, -9486}, {0x96, 0x96, 0x96, 0xff}}}, {{{ -2321, -1177, -631}, 0, { 3290, -8974}, {0x96, 0x96, 0x96, 0xff}}}, {{{ -1706, -972, -631}, 0, { 5334, -7952}, {0x96, 0x96, 0x96, 0xff}}}, -#endif }; // 0x070129B8 - 0x07012AA8 static const Vtx rr_seg7_vertex_070129B8[] = { -#ifdef VERSION_JP - {{{ -1706, -1177, -631}, 0, { 4822, -7442}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -1706, -972, -631}, 0, { 5334, -7952}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -2321, -972, -631}, 0, { 3800, -9486}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -2321, -1177, -631}, 0, { 3290, -8974}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 154, 1126, 2107}, 0, { -2586, -1566}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1485, 1178, 2107}, 0, { 606, 1372}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 154, 1178, 2107}, 0, { -2458, -1692}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 154, 1126, 673}, 0, { -2586, -1566}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 461, 1178, 673}, 0, { -1690, -926}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 461, 1126, 673}, 0, { -1818, -798}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 154, 1178, 673}, 0, { -2458, -1692}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1485, 1126, 1697}, 0, { 480, 1498}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 461, 1178, 1697}, 0, { -1690, -926}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1485, 1178, 1697}, 0, { 606, 1372}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 461, 1126, 1697}, 0, { -1818, -798}, {0x96, 0x96, 0x96, 0xff}}}, -#else {{{ 154, 1126, 2107}, 0, { -2586, -1566}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 1485, 1178, 2107}, 0, { 606, 1372}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 154, 1178, 2107}, 0, { -2458, -1692}, {0x96, 0x96, 0x96, 0xff}}}, @@ -104,28 +52,10 @@ static const Vtx rr_seg7_vertex_070129B8[] = { {{{ -2321, -972, -2269}, 0, { 3800, -9486}, {0x96, 0x96, 0x96, 0xff}}}, {{{ -1706, -1177, -2269}, 0, { 4822, -7442}, {0x96, 0x96, 0x96, 0xff}}}, {{{ -1706, -972, -2269}, 0, { 5334, -7952}, {0x96, 0x96, 0x96, 0xff}}}, -#endif }; // 0x07012AA8 - 0x07012B98 static const Vtx rr_seg7_vertex_07012AA8[] = { -#ifdef VERSION_JP - {{{ 358, -460, -2252}, 0, { 808, 1828}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1178, -460, -1842}, 0, { 1830, -1236}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1178, -460, -2252}, 0, { 2852, -214}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 973, 1126, -248}, 0, { 4822, -1820}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1382, 1126, 161}, 0, { 4822, -3864}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1382, 1126, -248}, 0, { 5844, -2842}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 973, 1126, 161}, 0, { 3800, -2842}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1382, 1024, -248}, 0, { 5844, -2842}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1382, 1024, 161}, 0, { 4822, -3864}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1587, 1024, 161}, 0, { 5334, -4376}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1587, 1024, -248}, 0, { 6356, -3354}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -562, 1178, -248}, 0, { 990, 2010}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 461, 1178, 161}, 0, { 2524, -1564}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 461, 1178, -248}, 0, { 3546, -544}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -562, 1178, 161}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, -#else {{{ 358, -460, -2252}, 0, { 808, 1828}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ 358, -460, -1842}, 0, { -212, 808}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ 1178, -460, -1842}, 0, { 1830, -1236}, {0xc8, 0xc8, 0xc8, 0xff}}}, @@ -141,29 +71,10 @@ static const Vtx rr_seg7_vertex_07012AA8[] = { {{{ -562, 1178, 161}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ 461, 1178, 161}, 0, { 2524, -1564}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ 461, 1178, -248}, 0, { 3546, -544}, {0xc8, 0xc8, 0xc8, 0xff}}}, -#endif }; // 0x07012B98 - 0x07012C98 static const Vtx rr_seg7_vertex_07012B98[] = { -#ifdef VERSION_JP - {{{ 1485, 1178, 2107}, 0, { 3290, -2332}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1485, 1178, 1697}, 0, { 4312, -1310}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 461, 1178, 1697}, 0, { 1756, 1244}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 358, -460, -2252}, 0, { 808, 1828}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 358, -460, -1842}, 0, { -212, 808}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1178, -460, -1842}, 0, { 1830, -1236}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -2321, -972, -631}, 0, { 13962, 14982}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -1706, -972, -631}, 0, { 15494, 13448}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -1706, -972, -2269}, 0, { 19582, 17536}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -2321, -972, -2269}, 0, { 18050, 19070}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 154, 1178, 2107}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 461, 1178, 673}, 0, { 4312, 3798}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 154, 1178, 673}, 0, { 3544, 4564}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 358, -869, -2252}, 0, { 2268, 734}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -153, -869, -2252}, 0, { 990, 2010}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -153, -869, -1842}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, -#else {{{ 1485, 1178, 2107}, 0, { 3290, -2332}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ 1485, 1178, 1697}, 0, { 4312, -1310}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ 461, 1178, 1697}, 0, { 1756, 1244}, {0xc8, 0xc8, 0xc8, 0xff}}}, @@ -180,27 +91,10 @@ static const Vtx rr_seg7_vertex_07012B98[] = { {{{ 358, -869, -2252}, 0, { 2268, 734}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ -153, -869, -2252}, 0, { 990, 2010}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ -153, -869, -1842}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, -#endif }; // 0x07012C98 - 0x07012D78 static const Vtx rr_seg7_vertex_07012C98[] = { -#ifdef VERSION_JP - {{{ 358, -869, -2252}, 0, { 2268, 734}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -153, -869, -1842}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 358, -869, -1842}, 0, { 1246, -288}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1485, -50, -2252}, 0, {-13168, 5752}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 1178, -50, -1842}, 0, {-12226, 5472}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 1178, -50, -2252}, 0, {-12226, 5472}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 1485, -50, -1842}, 0, {-13168, 5752}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 614, 102, -2252}, 0, { -3134, 2778}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 614, 102, -1842}, 0, { -3134, 2778}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 461, 102, -1842}, 0, { -2192, 2500}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 461, 102, -2252}, 0, { -2192, 2500}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 461, 102, -1842}, 0, { -2192, 2500}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 614, 102, -1842}, 0, { -3134, 2778}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 614, 256, -1842}, 0, { -2854, 2640}, {0x58, 0x87, 0xb9, 0xff}}}, -#else {{{ 358, -869, -2252}, 0, { 2268, 734}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ -153, -869, -1842}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ 358, -869, -1842}, 0, { 1246, -288}, {0xc8, 0xc8, 0xc8, 0xff}}}, @@ -215,28 +109,10 @@ static const Vtx rr_seg7_vertex_07012C98[] = { {{{ 461, 102, -1842}, 0, { -2192, 2500}, {0x58, 0x87, 0xb9, 0xff}}}, {{{ 614, 256, -1842}, 0, { -2854, 2640}, {0x58, 0x87, 0xb9, 0xff}}}, {{{ 461, 256, -1842}, 0, { -1914, 2360}, {0x58, 0x87, 0xb9, 0xff}}}, -#endif }; // 0x07012D78 - 0x07012E68 static const Vtx rr_seg7_vertex_07012D78[] = { -#ifdef VERSION_JP - {{{ 1178, -50, -1842}, 0, {-12226, 5472}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 1485, 102, -1842}, 0, {-12888, 5612}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 1178, 102, -1842}, 0, {-11948, 5334}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 1485, -50, -1842}, 0, {-13168, 5752}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 1178, 102, -2252}, 0, {-11948, 5334}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 1485, 102, -2252}, 0, {-12888, 5612}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 1485, -50, -2252}, 0, {-13168, 5752}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 1178, -50, -2252}, 0, {-12226, 5472}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 461, 256, -2252}, 0, { -1914, 2360}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 614, 256, -2252}, 0, { -2854, 2640}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 614, 102, -2252}, 0, { -3134, 2778}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 461, 102, -2252}, 0, { -2192, 2500}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 461, 102, -1842}, 0, { -2192, 2500}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 614, 256, -1842}, 0, { -2854, 2640}, {0x58, 0x87, 0xb9, 0xff}}}, - {{{ 461, 256, -1842}, 0, { -1914, 2360}, {0x58, 0x87, 0xb9, 0xff}}}, -#else {{{ 1178, -50, -1842}, 0, {-12226, 5472}, {0x58, 0x87, 0xb9, 0xff}}}, {{{ 1485, -50, -1842}, 0, {-13168, 5752}, {0x58, 0x87, 0xb9, 0xff}}}, {{{ 1485, 102, -1842}, 0, {-12888, 5612}, {0x58, 0x87, 0xb9, 0xff}}}, @@ -252,28 +128,10 @@ static const Vtx rr_seg7_vertex_07012D78[] = { {{{ 461, 102, -1842}, 0, { -2192, 2500}, {0x58, 0x87, 0xb9, 0xff}}}, {{{ 614, 102, -1842}, 0, { -3134, 2778}, {0x58, 0x87, 0xb9, 0xff}}}, {{{ 614, 256, -1842}, 0, { -2854, 2640}, {0x58, 0x87, 0xb9, 0xff}}}, -#endif }; // 0x07012E68 - 0x07012F58 static const Vtx rr_seg7_vertex_07012E68[] = { -#ifdef VERSION_JP - {{{ 1178, 102, -2252}, 0, {-11948, 5334}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 1485, 102, -1842}, 0, {-12888, 5612}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 1485, 102, -2252}, 0, {-12888, 5612}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 1178, 102, -1842}, 0, {-11948, 5334}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 461, 256, -2252}, 0, { -1914, 2360}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 614, 256, -1842}, 0, { -2854, 2640}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 614, 256, -2252}, 0, { -2854, 2640}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 461, 256, -1842}, 0, { -1914, 2360}, {0x97, 0xb2, 0xcd, 0xff}}}, - {{{ 614, 256, -2252}, 0, { -2854, 2640}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 614, 256, -1842}, 0, { -2854, 2640}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 614, 102, -1842}, 0, { -3134, 2778}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 1485, 102, -2252}, 0, {-12888, 5612}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 1485, -50, -1842}, 0, {-13168, 5752}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 1485, -50, -2252}, 0, {-13168, 5752}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 1485, 102, -1842}, 0, {-12888, 5612}, {0x52, 0x7f, 0xac, 0xff}}}, -#else {{{ 1178, 102, -2252}, 0, {-11948, 5334}, {0x97, 0xb2, 0xcd, 0xff}}}, {{{ 1178, 102, -1842}, 0, {-11948, 5334}, {0x97, 0xb2, 0xcd, 0xff}}}, {{{ 1485, 102, -1842}, 0, {-12888, 5612}, {0x97, 0xb2, 0xcd, 0xff}}}, @@ -289,27 +147,10 @@ static const Vtx rr_seg7_vertex_07012E68[] = { {{{ 1485, 102, -1842}, 0, {-12888, 5612}, {0x52, 0x7f, 0xac, 0xff}}}, {{{ 1485, -50, -1842}, 0, {-13168, 5752}, {0x52, 0x7f, 0xac, 0xff}}}, {{{ 1485, -50, -2252}, 0, {-13168, 5752}, {0x52, 0x7f, 0xac, 0xff}}}, -#endif }; // 0x07012F58 - 0x07013038 static const Vtx rr_seg7_vertex_07012F58[] = { -#ifdef VERSION_JP - {{{ 1178, -50, -2252}, 0, {-12226, 5472}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 1178, -50, -1842}, 0, {-12226, 5472}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 1178, 102, -1842}, 0, {-11948, 5334}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 1178, 102, -2252}, 0, {-11948, 5334}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 461, 102, -2252}, 0, { -2192, 2500}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 461, 256, -1842}, 0, { -1914, 2360}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 461, 256, -2252}, 0, { -1914, 2360}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 461, 102, -1842}, 0, { -2192, 2500}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 614, 256, -2252}, 0, { -2854, 2640}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 614, 102, -1842}, 0, { -3134, 2778}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 614, 102, -2252}, 0, { -3134, 2778}, {0x52, 0x7f, 0xac, 0xff}}}, - {{{ 461, 1178, -248}, 0, { 2012, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1126, -248}, 0, { 2012, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ 1178, -50, -2252}, 0, {-12226, 5472}, {0x52, 0x7f, 0xac, 0xff}}}, {{{ 1178, 102, -1842}, 0, {-11948, 5334}, {0x52, 0x7f, 0xac, 0xff}}}, {{{ 1178, 102, -2252}, 0, {-11948, 5334}, {0x52, 0x7f, 0xac, 0xff}}}, @@ -324,28 +165,10 @@ static const Vtx rr_seg7_vertex_07012F58[] = { {{{ 461, 1178, -248}, 0, { 2012, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 461, 1178, 161}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 461, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x07013038 - 0x07013128 static const Vtx rr_seg7_vertex_07013038[] = { -#ifdef VERSION_JP - {{{ 1382, 1126, -248}, 0, { 2012, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1382, 1024, 161}, 0, { 0, 1754}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1382, 1024, -248}, 0, { 2012, 1754}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1382, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 973, 1075, -248}, 0, { 2012, 1498}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 973, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 973, 1126, -248}, 0, { 2012, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 973, 1075, 161}, 0, { 0, 1500}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1587, 1024, -248}, 0, { 2012, 1754}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1587, 922, 161}, 0, { 0, 2266}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1587, 922, -248}, 0, { 2012, 2266}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1587, 1024, 161}, 0, { 0, 1754}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 768, -869, -2252}, 0, { 1118, 1882}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 768, -869, -1842}, 0, { 96, 862}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 768, -921, -1842}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ 1382, 1126, -248}, 0, { 2012, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 1382, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 1382, 1024, 161}, 0, { 0, 1754}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -361,27 +184,10 @@ static const Vtx rr_seg7_vertex_07013038[] = { {{{ 768, -869, -2252}, 0, { 1118, 1882}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 768, -921, -1842}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 768, -921, -2252}, 0, { 990, 2010}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x07013128 - 0x07013208 static const Vtx rr_seg7_vertex_07013128[] = { -#ifdef VERSION_JP - {{{ 461, 1178, -248}, 0, { 2012, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1178, 161}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -562, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -562, 1178, 161}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -562, 1178, -248}, 0, { 2012, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -562, 1126, -248}, 0, { 2012, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -153, -921, -1842}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -153, -869, -2252}, 0, { 1118, 1882}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -153, -921, -2252}, 0, { 990, 2010}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -153, -869, -1842}, 0, { 96, 862}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 768, -869, -2252}, 0, { 1118, 1882}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 768, -921, -1842}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 768, -921, -2252}, 0, { 990, 2010}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ 461, 1178, -248}, 0, { 2012, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 461, 1126, 161}, 0, { 0, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 461, 1126, -248}, 0, { 2012, 1244}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -396,28 +202,10 @@ static const Vtx rr_seg7_vertex_07013128[] = { {{{ 768, -869, -2252}, 0, { 1118, 1882}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 768, -869, -1842}, 0, { 96, 862}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 768, -921, -1842}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x07013208 - 0x070132F8 static const Vtx rr_seg7_vertex_07013208[] = { -#ifdef VERSION_JP - {{{ -1706, -1177, -2269}, 0, { -4118, 5076}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1706, -972, -631}, 0, { 478, 1498}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1706, -1177, -631}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1178, -460, -2252}, 0, { 2012, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1178, -511, -1842}, 0, { 862, 96}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1178, -511, -2252}, 0, { 1884, 1116}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1178, -460, -1842}, 0, { 990, 0}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 358, -511, -1842}, 0, { 862, 96}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 358, -460, -2252}, 0, { 2012, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 358, -511, -2252}, 0, { 1884, 1116}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 358, -460, -1842}, 0, { 990, 0}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -2321, -1177, -631}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -2321, -972, -2269}, 0, { -3606, 5586}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -2321, -1177, -2269}, 0, { -4118, 5076}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -2321, -972, -631}, 0, { 478, 1498}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ -1706, -1177, -2269}, 0, { -4118, 5076}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -1706, -972, -2269}, 0, { -3606, 5586}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -1706, -972, -631}, 0, { 478, 1498}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -433,28 +221,10 @@ static const Vtx rr_seg7_vertex_07013208[] = { {{{ -2321, -972, -2269}, 0, { -3606, 5586}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -2321, -1177, -2269}, 0, { -4118, 5076}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -2321, -972, -631}, 0, { 478, 1498}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x070132F8 - 0x070133E8 static const Vtx rr_seg7_vertex_070132F8[] = { -#ifdef VERSION_JP - {{{ 154, 1126, 2107}, 0, { 990, 0}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 154, 1178, 673}, 0, { -3224, 4438}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 154, 1126, 673}, 0, { -3352, 4310}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1706, -1177, -2269}, 0, { -4118, 5076}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1706, -972, -2269}, 0, { -3606, 5586}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1706, -972, -631}, 0, { 478, 1498}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1485, 1178, 1697}, 0, { 96, 1116}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1485, 1126, 2107}, 0, { 990, 0}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1485, 1126, 1697}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1485, 1178, 2107}, 0, { 1118, 96}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1126, 673}, 0, { -3352, 4310}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1178, 673}, 0, { -3224, 4438}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1178, 1697}, 0, { 96, 1116}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 461, 1126, 1697}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 154, 1178, 2107}, 0, { 1118, 96}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ 154, 1126, 2107}, 0, { 990, 0}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 154, 1178, 2107}, 0, { 1118, 96}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 154, 1178, 673}, 0, { -3224, 4438}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -470,27 +240,10 @@ static const Vtx rr_seg7_vertex_070132F8[] = { {{{ 461, 1126, 1697}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 461, 1178, 673}, 0, { -3224, 4438}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ 154, 1126, 673}, 0, { -3352, 4310}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x070133E8 - 0x070134C8 static const Vtx rr_seg7_vertex_070133E8[] = { -#ifdef VERSION_JP - {{{ 461, 1126, 1697}, 0, { 1756, 1244}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 1485, 1126, 2107}, 0, { 3290, -2332}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 154, 1126, 2107}, 0, { 0, 990}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 1587, 922, -248}, 0, { 6356, -3354}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 1331, 922, 161}, 0, { 4694, -3736}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 1331, 922, -248}, 0, { 5716, -2714}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 1587, 922, 161}, 0, { 5334, -4376}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -562, 1126, -248}, 0, { 990, 2010}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 461, 1126, -248}, 0, { 3546, -544}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 461, 1126, 161}, 0, { 2524, -1566}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ -562, 1126, 161}, 0, { 0, 990}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 154, 1126, 673}, 0, { 3544, 4564}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 461, 1126, 673}, 0, { 4312, 3798}, {0x44, 0x44, 0x44, 0xff}}}, - {{{ 1485, 1126, 1697}, 0, { 4312, -1310}, {0x44, 0x44, 0x44, 0xff}}}, -#else {{{ 461, 1126, 1697}, 0, { 1756, 1244}, {0x44, 0x44, 0x44, 0xff}}}, {{{ 1485, 1126, 2107}, 0, { 3290, -2332}, {0x44, 0x44, 0x44, 0xff}}}, {{{ 154, 1126, 2107}, 0, { 0, 990}, {0x44, 0x44, 0x44, 0xff}}}, @@ -505,29 +258,10 @@ static const Vtx rr_seg7_vertex_070133E8[] = { {{{ 154, 1126, 673}, 0, { 3544, 4564}, {0x44, 0x44, 0x44, 0xff}}}, {{{ 461, 1126, 673}, 0, { 4312, 3798}, {0x44, 0x44, 0x44, 0xff}}}, {{{ 1485, 1126, 1697}, 0, { 4312, -1310}, {0x44, 0x44, 0x44, 0xff}}}, -#endif }; // 0x070134C8 - 0x070135C8 static const Vtx rr_seg7_vertex_070134C8[] = { -#ifdef VERSION_JP - {{{ 1331, 922, -248}, 0, { 5716, -2714}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 1331, 922, 161}, 0, { 4694, -3736}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 973, 1075, 161}, 0, { 3800, -2842}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 973, 1075, -248}, 0, { 4822, -1820}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 358, -511, -2252}, 0, { 808, 1828}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 1178, -511, -1842}, 0, { 1830, -1236}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 358, -511, -1842}, 0, { -212, 808}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 1178, -511, -2252}, 0, { 2852, -214}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -2321, -1177, -2269}, 0, { 18050, 19070}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -1706, -1177, -631}, 0, { 15494, 13448}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -2321, -1177, -631}, 0, { 13962, 14982}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -1706, -1177, -2269}, 0, { 19582, 17536}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -153, -921, -2252}, 0, { 990, 2010}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 768, -921, -1842}, 0, { 2268, -1310}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -153, -921, -1842}, 0, { 0, 990}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 768, -921, -2252}, 0, { 3290, -288}, {0x55, 0x55, 0x55, 0xff}}}, -#else {{{ 1331, 922, -248}, 0, { 5716, -2714}, {0x55, 0x55, 0x55, 0xff}}}, {{{ 973, 1075, 161}, 0, { 3800, -2842}, {0x55, 0x55, 0x55, 0xff}}}, {{{ 973, 1075, -248}, 0, { 4822, -1820}, {0x55, 0x55, 0x55, 0xff}}}, @@ -544,27 +278,10 @@ static const Vtx rr_seg7_vertex_070134C8[] = { {{{ 768, -921, -1842}, 0, { 2268, -1310}, {0x55, 0x55, 0x55, 0xff}}}, {{{ -153, -921, -1842}, 0, { 0, 990}, {0x55, 0x55, 0x55, 0xff}}}, {{{ 768, -921, -2252}, 0, { 3290, -288}, {0x55, 0x55, 0x55, 0xff}}}, -#endif }; // 0x070135C8 - 0x070136A8 static const Vtx rr_seg7_vertex_070135C8[] = { -#ifdef VERSION_JP - {{{ 973, 1075, -248}, 0, { 3672, 4948}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 973, 1126, -248}, 0, { 3800, 4820}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1382, 1126, -248}, 0, { 4822, 5842}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1382, 1024, -248}, 0, { 4568, 6098}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1331, 922, -248}, 0, { 4184, 6226}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1587, 1024, -248}, 0, { 5078, 6610}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1587, 922, -248}, 0, { 4822, 6864}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1382, 1126, 161}, 0, { 4822, 5842}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 973, 1126, 161}, 0, { 3800, 4820}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 973, 1075, 161}, 0, { 3672, 4948}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1331, 922, 161}, 0, { 4184, 6226}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1382, 1024, 161}, 0, { 4568, 6098}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1587, 1024, 161}, 0, { 5078, 6610}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 1587, 922, 161}, 0, { 4822, 6864}, {0x91, 0x91, 0x91, 0xff}}}, -#else {{{ 973, 1075, -248}, 0, { 3672, 4948}, {0x91, 0x91, 0x91, 0xff}}}, {{{ 973, 1126, -248}, 0, { 3800, 4820}, {0x91, 0x91, 0x91, 0xff}}}, {{{ 1382, 1126, -248}, 0, { 4822, 5842}, {0x91, 0x91, 0x91, 0xff}}}, @@ -579,21 +296,10 @@ static const Vtx rr_seg7_vertex_070135C8[] = { {{{ 973, 1126, 161}, 0, { 3800, 4820}, {0x91, 0x91, 0x91, 0xff}}}, {{{ 1587, 922, 161}, 0, { 4822, 6864}, {0x91, 0x91, 0x91, 0xff}}}, {{{ 1587, 1024, 161}, 0, { 5078, 6610}, {0x91, 0x91, 0x91, 0xff}}}, -#endif }; // 0x070136A8 - 0x07013728 static const Vtx rr_seg7_vertex_070136A8[] = { -#ifdef VERSION_JP - {{{ -562, 1126, 161}, 0, { 0, 990}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 461, 1178, 161}, 0, { 2650, 3416}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ -562, 1178, 161}, 0, { 96, 862}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 461, 1126, 161}, 0, { 2524, 3544}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ -562, 1178, -248}, 0, { 96, 862}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 461, 1126, -248}, 0, { 2524, 3544}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ -562, 1126, -248}, 0, { 0, 990}, {0x91, 0x91, 0x91, 0xff}}}, - {{{ 461, 1178, -248}, 0, { 2650, 3416}, {0x91, 0x91, 0x91, 0xff}}}, -#else {{{ -562, 1126, 161}, 0, { 0, 990}, {0x91, 0x91, 0x91, 0xff}}}, {{{ 461, 1178, 161}, 0, { 2650, 3416}, {0x91, 0x91, 0x91, 0xff}}}, {{{ -562, 1178, 161}, 0, { 96, 862}, {0x91, 0x91, 0x91, 0xff}}}, @@ -602,29 +308,10 @@ static const Vtx rr_seg7_vertex_070136A8[] = { {{{ 461, 1178, -248}, 0, { 2650, 3416}, {0x91, 0x91, 0x91, 0xff}}}, {{{ 461, 1126, -248}, 0, { 2524, 3544}, {0x91, 0x91, 0x91, 0xff}}}, {{{ -562, 1126, -248}, 0, { 0, 990}, {0x91, 0x91, 0x91, 0xff}}}, -#endif }; // 0x07013728 - 0x07013828 static const Vtx rr_seg7_vertex_07013728[] = { -#ifdef VERSION_JP - {{{ 461, 307, 1697}, 0, { 0, -784}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ 461, 358, 2107}, 0, { 2012, -850}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ 461, 307, 2107}, 0, { 2012, -784}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ 461, 358, 1697}, 0, { 0, -850}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ -204, -255, 1697}, 0, { 0, 956}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ -204, -204, 2107}, 0, { 2012, 890}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ -204, -204, 1697}, 0, { 0, 890}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ -204, -255, 2107}, 0, { 2012, 956}, {0x38, 0x84, 0x95, 0xff}}}, - {{{ 461, 307, 1697}, 0, { 0, -460}, {0x32, 0x61, 0x77, 0xff}}}, - {{{ -204, -255, 1697}, 0, { 0, 990}, {0x32, 0x61, 0x77, 0xff}}}, - {{{ -204, -204, 1697}, 0, { -420, 934}, {0x32, 0x61, 0x77, 0xff}}}, - {{{ 461, 358, 1697}, 0, { -420, -516}, {0x32, 0x61, 0x77, 0xff}}}, - {{{ 461, 358, 2107}, 0, { -420, -516}, {0x32, 0x61, 0x77, 0xff}}}, - {{{ -204, -204, 2107}, 0, { -420, 934}, {0x32, 0x61, 0x77, 0xff}}}, - {{{ -204, -255, 2107}, 0, { 0, 990}, {0x32, 0x61, 0x77, 0xff}}}, - {{{ 461, 307, 2107}, 0, { 0, -460}, {0x32, 0x61, 0x77, 0xff}}}, -#else {{{ 461, 307, 1697}, 0, { 0, -784}, {0x38, 0x84, 0x95, 0xff}}}, {{{ 461, 358, 1697}, 0, { 0, -850}, {0x38, 0x84, 0x95, 0xff}}}, {{{ 461, 358, 2107}, 0, { 2012, -850}, {0x38, 0x84, 0x95, 0xff}}}, @@ -641,21 +328,10 @@ static const Vtx rr_seg7_vertex_07013728[] = { {{{ -204, -204, 2107}, 0, { -420, 934}, {0x32, 0x61, 0x77, 0xff}}}, {{{ -204, -255, 2107}, 0, { 0, 990}, {0x32, 0x61, 0x77, 0xff}}}, {{{ 461, 307, 2107}, 0, { 0, -460}, {0x32, 0x61, 0x77, 0xff}}}, -#endif }; // 0x07013828 - 0x070138A8 static const Vtx rr_seg7_vertex_07013828[] = { -#ifdef VERSION_JP - {{{ 461, 307, 2107}, 0, { 2012, -784}, {0x27, 0x4a, 0x5a, 0xff}}}, - {{{ -204, -255, 2107}, 0, { 2012, 956}, {0x27, 0x4a, 0x5a, 0xff}}}, - {{{ -204, -255, 1697}, 0, { 0, 956}, {0x27, 0x4a, 0x5a, 0xff}}}, - {{{ 461, 307, 1697}, 0, { 0, -784}, {0x27, 0x4a, 0x5a, 0xff}}}, - {{{ -204, -204, 1697}, 0, { 0, 890}, {0xff, 0xe5, 0x43, 0xff}}}, - {{{ 461, 358, 2107}, 0, { 2012, -850}, {0xff, 0xe5, 0x43, 0xff}}}, - {{{ 461, 358, 1697}, 0, { 0, -850}, {0xff, 0xe5, 0x43, 0xff}}}, - {{{ -204, -204, 2107}, 0, { 2012, 890}, {0xff, 0xe5, 0x43, 0xff}}}, -#else {{{ 461, 307, 2107}, 0, { 2012, -784}, {0x27, 0x4a, 0x5a, 0xff}}}, {{{ -204, -255, 1697}, 0, { 0, 956}, {0x27, 0x4a, 0x5a, 0xff}}}, {{{ 461, 307, 1697}, 0, { 0, -784}, {0x27, 0x4a, 0x5a, 0xff}}}, @@ -664,28 +340,10 @@ static const Vtx rr_seg7_vertex_07013828[] = { {{{ -204, -204, 2107}, 0, { 2012, 890}, {0xff, 0xe5, 0x43, 0xff}}}, {{{ 461, 358, 2107}, 0, { 2012, -850}, {0xff, 0xe5, 0x43, 0xff}}}, {{{ 461, 358, 1697}, 0, { 0, -850}, {0xff, 0xe5, 0x43, 0xff}}}, -#endif }; // 0x070138A8 - 0x07013998 static const Vtx rr_seg7_vertex_070138A8[] = { -#ifdef VERSION_JP - {{{ 41, 1341, 1893}, 0, {-11836, 3862}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 33, 1341, 1907}, 0, {-11912, 3882}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 41, 1341, 1920}, 0, {-11836, 3862}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 64, 1341, 1907}, 0, {-11606, 3806}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 56, 1341, 1893}, 0, {-11682, 3824}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 56, 1341, 1920}, 0, {-11682, 3824}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 1167, 2161, 1893}, 0, { -3660, 798}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 1190, 2161, 1907}, 0, { -3430, 742}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 1183, 2161, 1893}, 0, { -3506, 760}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 1167, 2161, 1920}, 0, { -3660, 798}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 1183, 2161, 1920}, 0, { -3506, 760}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 1160, 2161, 1907}, 0, { -3736, 818}, {0xb4, 0xd5, 0xe7, 0xff}}}, - {{{ 1178, 1178, 1902}, 0, { 1348, 772}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1160, 2161, 1907}, 0, { -3736, 818}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1167, 2161, 1893}, 0, { -3660, 798}, {0x97, 0xa9, 0xcd, 0xff}}}, -#else {{{ 41, 1341, 1893}, 0, {-11836, 3862}, {0xb4, 0xd5, 0xe7, 0xff}}}, {{{ 56, 1341, 1920}, 0, {-11682, 3824}, {0xb4, 0xd5, 0xe7, 0xff}}}, {{{ 64, 1341, 1907}, 0, {-11606, 3806}, {0xb4, 0xd5, 0xe7, 0xff}}}, @@ -701,28 +359,10 @@ static const Vtx rr_seg7_vertex_070138A8[] = { {{{ 1178, 1178, 1902}, 0, { 1348, 772}, {0x97, 0xa9, 0xcd, 0xff}}}, {{{ 1160, 2161, 1907}, 0, { -3736, 818}, {0x97, 0xa9, 0xcd, 0xff}}}, {{{ 1167, 2161, 1893}, 0, { -3660, 798}, {0x97, 0xa9, 0xcd, 0xff}}}, -#endif }; // 0x07013998 - 0x07013A88 static const Vtx rr_seg7_vertex_07013998[] = { -#ifdef VERSION_JP - {{{ 51, 358, 1902}, 0, { -6826, 3836}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 33, 1341, 1907}, 0, {-11912, 3882}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 41, 1341, 1893}, 0, {-11836, 3862}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 59, 358, 1889}, 0, { -6750, 3818}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 82, 358, 1902}, 0, { -6520, 3760}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 64, 1341, 1907}, 0, {-11606, 3806}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 56, 1341, 1920}, 0, {-11682, 3824}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 74, 358, 1915}, 0, { -6596, 3780}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1208, 1178, 1902}, 0, { 1654, 696}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1190, 2161, 1907}, 0, { -3430, 742}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1183, 2161, 1920}, 0, { -3506, 760}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1201, 1178, 1915}, 0, { 1578, 716}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1178, 1178, 1902}, 0, { 1348, 772}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1167, 2161, 1893}, 0, { -3660, 798}, {0x97, 0xa9, 0xcd, 0xff}}}, - {{{ 1185, 1178, 1889}, 0, { 1424, 754}, {0x97, 0xa9, 0xcd, 0xff}}}, -#else {{{ 51, 358, 1902}, 0, { -6826, 3836}, {0x97, 0xa9, 0xcd, 0xff}}}, {{{ 41, 1341, 1893}, 0, {-11836, 3862}, {0x97, 0xa9, 0xcd, 0xff}}}, {{{ 59, 358, 1889}, 0, { -6750, 3818}, {0x97, 0xa9, 0xcd, 0xff}}}, @@ -738,29 +378,10 @@ static const Vtx rr_seg7_vertex_07013998[] = { {{{ 1178, 1178, 1902}, 0, { 1348, 772}, {0x97, 0xa9, 0xcd, 0xff}}}, {{{ 1167, 2161, 1893}, 0, { -3660, 798}, {0x97, 0xa9, 0xcd, 0xff}}}, {{{ 1185, 1178, 1889}, 0, { 1424, 754}, {0x97, 0xa9, 0xcd, 0xff}}}, -#endif }; // 0x07013A88 - 0x07013B88 static const Vtx rr_seg7_vertex_07013A88[] = { -#ifdef VERSION_JP - {{{ 1185, 1178, 1889}, 0, { 1424, 754}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 1167, 2161, 1893}, 0, { -3660, 798}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 1183, 2161, 1893}, 0, { -3506, 760}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 59, 358, 1889}, 0, { -6750, 3818}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 56, 1341, 1893}, 0, {-11682, 3824}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 74, 358, 1889}, 0, { -6596, 3780}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 41, 1341, 1893}, 0, {-11836, 3862}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 74, 358, 1915}, 0, { -6596, 3780}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 41, 1341, 1920}, 0, {-11836, 3862}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 59, 358, 1915}, 0, { -6750, 3818}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 56, 1341, 1920}, 0, {-11682, 3824}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 1201, 1178, 1915}, 0, { 1578, 716}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 1167, 2161, 1920}, 0, { -3660, 798}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 1185, 1178, 1915}, 0, { 1424, 754}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 1183, 2161, 1920}, 0, { -3506, 760}, {0x52, 0x70, 0xac, 0xff}}}, - {{{ 1201, 1178, 1889}, 0, { 1578, 716}, {0x52, 0x70, 0xac, 0xff}}}, -#else {{{ 1185, 1178, 1889}, 0, { 1424, 754}, {0x52, 0x70, 0xac, 0xff}}}, {{{ 1183, 2161, 1893}, 0, { -3506, 760}, {0x52, 0x70, 0xac, 0xff}}}, {{{ 1201, 1178, 1889}, 0, { 1578, 716}, {0x52, 0x70, 0xac, 0xff}}}, @@ -777,29 +398,10 @@ static const Vtx rr_seg7_vertex_07013A88[] = { {{{ 1167, 2161, 1920}, 0, { -3660, 798}, {0x52, 0x70, 0xac, 0xff}}}, {{{ 1185, 1178, 1915}, 0, { 1424, 754}, {0x52, 0x70, 0xac, 0xff}}}, {{{ 1167, 2161, 1893}, 0, { -3660, 798}, {0x52, 0x70, 0xac, 0xff}}}, -#endif }; // 0x07013B88 - 0x07013C88 static const Vtx rr_seg7_vertex_07013B88[] = { -#ifdef VERSION_JP - {{{ 1201, 1178, 1889}, 0, { 1578, 716}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 1183, 2161, 1893}, 0, { -3506, 760}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 1190, 2161, 1907}, 0, { -3430, 742}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 74, 358, 1889}, 0, { -6596, 3780}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 64, 1341, 1907}, 0, {-11606, 3806}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 82, 358, 1902}, 0, { -6520, 3760}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 56, 1341, 1893}, 0, {-11682, 3824}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 59, 358, 1915}, 0, { -6750, 3818}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 41, 1341, 1920}, 0, {-11836, 3862}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 33, 1341, 1907}, 0, {-11912, 3882}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 51, 358, 1902}, 0, { -6826, 3836}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 1185, 1178, 1915}, 0, { 1424, 754}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 1167, 2161, 1920}, 0, { -3660, 798}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 1160, 2161, 1907}, 0, { -3736, 818}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 1178, 1178, 1902}, 0, { 1348, 772}, {0x79, 0x8c, 0xeb, 0xff}}}, - {{{ 1208, 1178, 1902}, 0, { 1654, 696}, {0x79, 0x8c, 0xeb, 0xff}}}, -#else {{{ 1201, 1178, 1889}, 0, { 1578, 716}, {0x79, 0x8c, 0xeb, 0xff}}}, {{{ 1190, 2161, 1907}, 0, { -3430, 742}, {0x79, 0x8c, 0xeb, 0xff}}}, {{{ 1208, 1178, 1902}, 0, { 1654, 696}, {0x79, 0x8c, 0xeb, 0xff}}}, @@ -816,147 +418,20 @@ static const Vtx rr_seg7_vertex_07013B88[] = { {{{ 1178, 1178, 1902}, 0, { 1348, 772}, {0x79, 0x8c, 0xeb, 0xff}}}, {{{ 1167, 2161, 1920}, 0, { -3660, 798}, {0x79, 0x8c, 0xeb, 0xff}}}, {{{ 1183, 2161, 1893}, 0, { -3506, 760}, {0x79, 0x8c, 0xeb, 0xff}}}, -#endif }; // 0x07013C88 - 0x07013D78 static const Vtx rr_seg7_vertex_07013C88[] = { -#ifdef VERSION_JP - {{{ 59, 358, 1915}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 82, 358, 1902}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 74, 358, 1915}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 59, 358, 1889}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 74, 358, 1889}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 51, 358, 1902}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, - {{{ 77, 1198, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 25, 1198, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 51, 1198, 1983}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1395, 2074, 1907}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1216, 2074, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1216, 2074, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1177, 2074, 1830}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1152, 2074, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1203, 2074, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, -#else// this list is shorter in non-JP versions. {{{ 59, 358, 1915}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, {{{ 82, 358, 1902}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, {{{ 74, 358, 1915}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, {{{ 74, 358, 1889}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, {{{ 59, 358, 1889}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, {{{ 51, 358, 1902}, 0, { 0, 0}, {0x38, 0x5e, 0x96, 0xff}}}, -#endif }; -// this list doesn't exist in non-JP versions. -#ifdef VERSION_JP -// 0x07013D78 - 0x07013E68 -static const Vtx rr_seg7_vertex_07013D78[] = { - {{{ 1203, 2074, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1152, 2074, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1177, 2074, 1983}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1062, 2074, 1907}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1139, 2074, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 1139, 2074, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ -60, 1198, 1907}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 13, 1198, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 13, 1198, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 169, 1198, 1907}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 89, 1198, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 89, 1198, 1932}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 51, 1198, 1830}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 25, 1198, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, - {{{ 77, 1198, 1881}, 0, { 0, 0}, {0x00, 0x96, 0x96, 0xff}}}, -}; -#endif - // 0x07013E68 - 0x070142C0 static const Gfx rr_seg7_dl_07013E68[] = { -#ifdef VERSION_JP - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09007000), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(rr_seg7_vertex_070127E8, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), - gsSP1Triangle(11, 14, 12, 0x0), - gsSPVertex(rr_seg7_vertex_070128D8, 14, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), - gsSPVertex(rr_seg7_vertex_070129B8, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), - gsSP1Triangle(11, 14, 12, 0x0), - gsSPVertex(rr_seg7_vertex_07012AA8, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), - gsSP1Triangle(11, 14, 12, 0x0), - gsSPVertex(rr_seg7_vertex_07012B98, 16, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 6, 7, 8, 0x0, 6, 8, 9, 0x0), - gsSP2Triangles(10, 2, 11, 0x0, 10, 11, 12, 0x0), - gsSP2Triangles( 0, 2, 10, 0x0, 13, 14, 15, 0x0), - gsSPVertex(rr_seg7_vertex_07012C98, 14, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), - gsSPVertex(rr_seg7_vertex_07012D78, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSP1Triangle(12, 13, 14, 0x0), - gsSPVertex(rr_seg7_vertex_07012E68, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), - gsSP1Triangle(11, 14, 12, 0x0), - gsSPVertex(rr_seg7_vertex_07012F58, 14, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), - gsSPVertex(rr_seg7_vertex_07013038, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSP1Triangle(12, 13, 14, 0x0), - gsSPVertex(rr_seg7_vertex_07013128, 14, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 5, 6, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), - gsSPVertex(rr_seg7_vertex_07013208, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), - gsSP1Triangle(11, 14, 12, 0x0), - gsSPVertex(rr_seg7_vertex_070132F8, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 7, 0x0), - gsSP2Triangles(10, 11, 12, 0x0, 10, 12, 13, 0x0), - gsSP1Triangle( 0, 14, 1, 0x0), - gsSPVertex(rr_seg7_vertex_070133E8, 14, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 9, 10, 0x0, 11, 0, 2, 0x0), - gsSP2Triangles(11, 12, 0, 0x0, 0, 13, 1, 0x0), - gsSPVertex(rr_seg7_vertex_070134C8, 16, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSP2Triangles(12, 13, 14, 0x0, 12, 15, 13, 0x0), - gsSPVertex(rr_seg7_vertex_070135C8, 14, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 3, 4, 0, 0x0, 3, 5, 6, 0x0), - gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 9, 10, 0x0, 10, 11, 7, 0x0), - gsSP2Triangles(10, 12, 11, 0x0, 10, 13, 12, 0x0), - gsSPVertex(rr_seg7_vertex_070136A8, 8, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPEndDisplayList(), -#else gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09007000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), @@ -1041,25 +516,10 @@ static const Gfx rr_seg7_dl_07013E68[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSPEndDisplayList(), -#endif }; // 0x070142C0 - 0x07014350 static const Gfx rr_seg7_dl_070142C0[] = { -#ifdef VERSION_JP - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09000800), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(rr_seg7_vertex_07013728, 16, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSP2Triangles(12, 13, 14, 0x0, 12, 14, 15, 0x0), - gsSPVertex(rr_seg7_vertex_07013828, 8, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSPEndDisplayList(), -#else gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09000800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), @@ -1072,38 +532,10 @@ static const Gfx rr_seg7_dl_070142C0[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), gsSPEndDisplayList(), -#endif }; // 0x07014350 - 0x07014490 static const Gfx rr_seg7_dl_07014350[] = { -#ifdef VERSION_JP - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09008000), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(rr_seg7_vertex_070138A8, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), - gsSP2Triangles( 0, 2, 5, 0x0, 0, 5, 3, 0x0), - gsSP2Triangles( 6, 7, 8, 0x0, 6, 9, 10, 0x0), - gsSP2Triangles( 6, 10, 7, 0x0, 6, 11, 9, 0x0), - gsSP1Triangle(12, 13, 14, 0x0), - gsSPVertex(rr_seg7_vertex_07013998, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 8, 10, 11, 0x0), - gsSP1Triangle(12, 13, 14, 0x0), - gsSPVertex(rr_seg7_vertex_07013A88, 16, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 10, 8, 0x0, 11, 12, 13, 0x0), - gsSP2Triangles(11, 14, 12, 0x0, 0, 2, 15, 0x0), - gsSPVertex(rr_seg7_vertex_07013B88, 16, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 3, 6, 4, 0x0, 7, 8, 9, 0x0), - gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), - gsSP2Triangles(11, 13, 14, 0x0, 0, 2, 15, 0x0), - gsSPEndDisplayList(), -#else gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09008000), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), @@ -1129,28 +561,14 @@ static const Gfx rr_seg7_dl_07014350[] = { gsSP2Triangles( 7, 9, 10, 0x0, 11, 12, 13, 0x0), gsSP2Triangles(11, 14, 12, 0x0, 0, 15, 1, 0x0), gsSPEndDisplayList(), -#endif }; // 0x07014490 - 0x07014508 static const Gfx rr_seg7_dl_07014490[] = { -#ifdef VERSION_JP - gsSPVertex(rr_seg7_vertex_07013C88, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 4, 0x0), - gsSP2Triangles( 0, 5, 3, 0x0, 0, 4, 1, 0x0), - gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSP1Triangle(12, 13, 14, 0x0), - gsSPVertex(rr_seg7_vertex_07013D78, 15, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 3, 4, 5, 0x0), - gsSP2Triangles( 6, 7, 8, 0x0, 9, 10, 11, 0x0), - gsSP1Triangle(12, 13, 14, 0x0), - gsSPEndDisplayList(), -#else gsSPVertex(rr_seg7_vertex_07013C88, 6, 0), gsSP2Triangles( 0, 1, 2, 0x0, 0, 3, 1, 0x0), gsSP2Triangles( 0, 4, 3, 0x0, 0, 5, 4, 0x0), gsSPEndDisplayList(), -#endif }; // 0x07014508 - 0x07014590 diff --git a/levels/rr/areas/1/2/model.inc.c b/levels/rr/areas/1/2/model.inc.c index 97f4a18e..86965136 100644 --- a/levels/rr/areas/1/2/model.inc.c +++ b/levels/rr/areas/1/2/model.inc.c @@ -106,24 +106,6 @@ static const Vtx rr_seg7_vertex_07002688[] = { // 0x070026F8 - 0x070027F8 static const Vtx rr_seg7_vertex_070026F8[] = { -#ifdef VERSION_JP - {{{ 1636, 512, -792}, 0, { 2694, 3714}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 817, 717, -792}, 0, { 650, 308}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 817, 512, -792}, 0, { 0, 990}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -1595, 512, 1072}, 0, { 3290, -8974}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -1595, 717, 1072}, 0, { 3800, -9486}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -980, 717, 1072}, 0, { 5334, -7952}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -980, 512, 1072}, 0, { 4822, -7442}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -980, 717, 2301}, 0, { 5334, -7952}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -1595, 512, 2301}, 0, { 3290, -8974}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -980, 512, 2301}, 0, { 4822, -7442}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ -1595, 717, 2301}, 0, { 3800, -9486}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 817, 512, -1406}, 0, { 0, 990}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 817, 717, -1406}, 0, { 650, 308}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1636, 717, -1406}, 0, { 3374, 3032}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1636, 512, -1406}, 0, { 2694, 3714}, {0x96, 0x96, 0x96, 0xff}}}, - {{{ 1636, 717, -792}, 0, { 3374, 3032}, {0x96, 0x96, 0x96, 0xff}}}, -#else {{{ 1636, 512, -792}, 0, { 2694, 3714}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 817, 717, -792}, 0, { 650, 308}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 817, 512, -792}, 0, { 0, 990}, {0x96, 0x96, 0x96, 0xff}}}, @@ -140,28 +122,10 @@ static const Vtx rr_seg7_vertex_070026F8[] = { {{{ 1636, 717, -1406}, 0, { 3374, 3032}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 1636, 512, -1406}, 0, { 2694, 3714}, {0x96, 0x96, 0x96, 0xff}}}, {{{ 1636, 717, -792}, 0, { 3374, 3032}, {0x96, 0x96, 0x96, 0xff}}}, -#endif }; // 0x070027F8 - 0x070028E8 static const Vtx rr_seg7_vertex_070027F8[] = { -#ifdef VERSION_JP - {{{ -1595, 717, 2301}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -980, 717, 1072}, 0, { 4566, 2522}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -1595, 717, 1072}, 0, { 3034, 4054}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ -980, 717, 2301}, 0, { 1502, -542}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1636, 717, -1406}, 0, { 4702, 344}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 817, 717, -792}, 0, { -64, 1022}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1636, 717, -792}, 0, { 2658, -1700}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 817, 717, -1406}, 0, { 1978, 3066}, {0xc8, 0xc8, 0xc8, 0xff}}}, - {{{ 1636, 512, -1406}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1636, 717, -792}, 0, { 2694, -372}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1636, 512, -792}, 0, { 2012, -1054}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -980, 512, 1072}, 0, { -540, 478}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -980, 717, 2301}, 0, { 3034, -2076}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -980, 512, 2301}, 0, { 2524, -2588}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -980, 717, 1072}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#else {{{ -1595, 717, 2301}, 0, { 0, 990}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ -980, 717, 1072}, 0, { 4566, 2522}, {0xc8, 0xc8, 0xc8, 0xff}}}, {{{ -1595, 717, 1072}, 0, { 3034, 4054}, {0xc8, 0xc8, 0xc8, 0xff}}}, @@ -177,28 +141,10 @@ static const Vtx rr_seg7_vertex_070027F8[] = { {{{ -980, 717, 2301}, 0, { 4056, -1054}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -980, 512, 2199}, 0, { 3290, -1310}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -980, 717, 1072}, 0, { 990, 2010}, {0x7d, 0x7d, 0x7d, 0xff}}}, -#endif }; // 0x070028E8 - 0x070029D8 static const Vtx rr_seg7_vertex_070028E8[] = { -#ifdef VERSION_JP - {{{ -1595, 512, 2301}, 0, { 2524, -2588}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1595, 717, 2301}, 0, { 3034, -2076}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1595, 717, 1072}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ -1595, 512, 1072}, 0, { -540, 478}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 817, 512, -792}, 0, { 2012, -1054}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 817, 717, -792}, 0, { 2694, -372}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 817, 717, -1406}, 0, { 650, 1670}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 817, 512, -1406}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1636, 512, -1406}, 0, { 0, 990}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1636, 717, -1406}, 0, { 650, 1670}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 1636, 717, -792}, 0, { 2694, -372}, {0x7d, 0x7d, 0x7d, 0xff}}}, - {{{ 817, 512, -1406}, 0, { 1978, 3066}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 1636, 512, -792}, 0, { 2658, -1700}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 817, 512, -792}, 0, { -64, 1022}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ 1636, 512, -1406}, 0, { 4702, 344}, {0x55, 0x55, 0x55, 0xff}}}, -#else {{{ -1595, 512, 2199}, 0, { -2330, -2332}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -1595, 717, 2301}, 0, { -2074, -3098}, {0x7d, 0x7d, 0x7d, 0xff}}}, {{{ -1595, 717, 1072}, 0, { 990, 0}, {0x7d, 0x7d, 0x7d, 0xff}}}, @@ -214,22 +160,14 @@ static const Vtx rr_seg7_vertex_070028E8[] = { {{{ 1636, 512, -792}, 0, { 2658, -1700}, {0x55, 0x55, 0x55, 0xff}}}, {{{ 817, 512, -792}, 0, { -64, 1022}, {0x55, 0x55, 0x55, 0xff}}}, {{{ 1636, 512, -1406}, 0, { 4702, 344}, {0x55, 0x55, 0x55, 0xff}}}, -#endif }; // 0x070029D8 - 0x07002A18 static const Vtx rr_seg7_vertex_070029D8[] = { -#ifdef VERSION_JP - {{{ -1595, 512, 1072}, 0, { 3034, 4054}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -980, 512, 1072}, 0, { 4566, 2522}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -980, 512, 2301}, 0, { 1502, -542}, {0x55, 0x55, 0x55, 0xff}}}, - {{{ -1595, 512, 2301}, 0, { 0, 990}, {0x55, 0x55, 0x55, 0xff}}}, -#else {{{ -1595, 512, 1072}, 0, { 3034, 4054}, {0x55, 0x55, 0x55, 0xff}}}, {{{ -980, 512, 1072}, 0, { 4566, 2522}, {0x55, 0x55, 0x55, 0xff}}}, {{{ -980, 512, 2199}, 0, { 1502, -542}, {0x55, 0x55, 0x55, 0xff}}}, {{{ -1595, 512, 2199}, 0, { 0, 990}, {0x55, 0x55, 0x55, 0xff}}}, -#endif }; // 0x07002A18 - 0x07002BC8 diff --git a/levels/rr/areas/1/collision.inc.c b/levels/rr/areas/1/collision.inc.c index aa0a8487..c27a43ec 100644 --- a/levels/rr/areas/1/collision.inc.c +++ b/levels/rr/areas/1/collision.inc.c @@ -1,2724 +1,5 @@ // 0x0702A9A8 - 0x0702E9D8 const Collision rr_seg7_collision_level[] = { -#ifdef VERSION_JP - COL_INIT(), - COL_VERTEX_INIT(0x454), - COL_VERTEX(-6677, -1782, 270), - COL_VERTEX(-6677, 1443, 270), - COL_VERTEX(-6677, 1443, -343), - COL_VERTEX(-6063, 1443, 270), - COL_VERTEX(-6063, -1116, 270), - COL_VERTEX(-6677, -1782, -445), - COL_VERTEX(-6063, 1648, 270), - COL_VERTEX(-6472, 1443, 270), - COL_VERTEX(-2888, 1648, 270), - COL_VERTEX(-3093, 1443, 270), - COL_VERTEX(-7394, 2364, -445), - COL_VERTEX(-7394, 2364, 270), - COL_VERTEX(-2274, 2364, 270), - COL_VERTEX(-2274, 2364, -445), - COL_VERTEX(2881, 2872, -2858), - COL_VERTEX(2881, 2872, -1834), - COL_VERTEX(4622, 2923, -1834), - COL_VERTEX(4622, 2923, -2858), - COL_VERTEX(5117, 2954, -1934), - COL_VERTEX(5117, 2954, -2753), - COL_VERTEX(1867, 2957, -2689), - COL_VERTEX(1875, 2956, -2001), - COL_VERTEX(5953, 3333, -2038), - COL_VERTEX(5117, 3322, -1729), - COL_VERTEX(5441, 3333, -2448), - COL_VERTEX(5117, 3322, -2958), - COL_VERTEX(5117, 3322, -1934), - COL_VERTEX(5117, 3322, -2753), - COL_VERTEX(4622, 3077, -3062), - COL_VERTEX(4622, 3077, -1834), - COL_VERTEX(1653, 3128, -2858), - COL_VERTEX(1038, 3231, -2448), - COL_VERTEX(1653, 3128, -2653), - COL_VERTEX(2881, 3026, -1834), - COL_VERTEX(5441, 3333, -2243), - COL_VERTEX(5646, 3333, -2243), - COL_VERTEX(5646, 3333, -2448), - COL_VERTEX(5953, 3333, -2653), - COL_VERTEX(4622, 3077, -2858), - COL_VERTEX(4622, 3077, -1629), - COL_VERTEX(2881, 3026, -2858), - COL_VERTEX(2881, 3026, -3062), - COL_VERTEX(2881, 3026, -1629), - COL_VERTEX(1653, 3128, -1834), - COL_VERTEX(1653, 3128, -2038), - COL_VERTEX(1038, 3231, -2243), - COL_VERTEX(-190, 3538, -2294), - COL_VERTEX(-190, 3538, -2397), - COL_VERTEX(-1509, -1280, 5438), - COL_VERTEX(-1304, -1270, 5438), - COL_VERTEX(-1304, -1280, 5438), - COL_VERTEX(-1509, -1270, 5438), - COL_VERTEX(2424, -348, 85), - COL_VERTEX(2424, -348, 494), - COL_VERTEX(3089, 214, 494), - COL_VERTEX(3089, 214, 85), - COL_VERTEX(-4339, 3098, -6450), - COL_VERTEX(-4032, 3098, -6450), - COL_VERTEX(-4032, 3098, -6655), - COL_VERTEX(-4339, 3098, -6655), - COL_VERTEX(-4339, 3098, -6604), - COL_VERTEX(-4032, 3507, -6604), - COL_VERTEX(-4339, 3507, -6604), - COL_VERTEX(-4032, 3098, -6604), - COL_VERTEX(1180, 2878, -340), - COL_VERTEX(1180, 3083, 274), - COL_VERTEX(1180, 2878, 274), - COL_VERTEX(1180, 3083, -340), - COL_VERTEX(2613, 2878, -340), - COL_VERTEX(2613, 3083, -340), - COL_VERTEX(975, 2878, 274), - COL_VERTEX(-3298, -451, 270), - COL_VERTEX(-3093, -297, 270), - COL_VERTEX(-3093, 316, 270), - COL_VERTEX(-3298, 316, 270), - COL_VERTEX(-3298, -297, 270), - COL_VERTEX(-3093, -758, 270), - COL_VERTEX(-3093, -758, -343), - COL_VERTEX(-3093, 316, -343), - COL_VERTEX(-3093, -1116, -343), - COL_VERTEX(-6370, -1782, -343), - COL_VERTEX(-3093, -1782, -445), - COL_VERTEX(-2888, 1648, -445), - COL_VERTEX(-6677, -1116, -445), - COL_VERTEX(-2479, -1321, 270), - COL_VERTEX(-2479, -1321, -343), - COL_VERTEX(-2274, -1321, 270), - COL_VERTEX(-2274, -1321, -343), - COL_VERTEX(-1455, -1321, -343), - COL_VERTEX(-1455, -1321, 270), - COL_VERTEX(-1864, -1321, 270), - COL_VERTEX(-1864, -1321, -343), - COL_VERTEX(-7394, -1116, -445), - COL_VERTEX(-3093, -297, -445), - COL_VERTEX(-2888, 1648, -343), - COL_VERTEX(-2786, -297, -445), - COL_VERTEX(-2888, 726, -445), - COL_VERTEX(-2274, 1648, -445), - COL_VERTEX(-7189, -1116, 270), - COL_VERTEX(-6677, -1116, -343), - COL_VERTEX(-7189, 2160, -343), - COL_VERTEX(-2479, 1648, -343), - COL_VERTEX(-2479, 2160, -343), - COL_VERTEX(-4629, -1782, 270), - COL_VERTEX(-4629, -1782, -343), - COL_VERTEX(-5039, 521, -343), - COL_VERTEX(-4936, 521, -343), - COL_VERTEX(-5039, 521, 270), - COL_VERTEX(-4936, 726, -343), - COL_VERTEX(-2786, -451, 270), - COL_VERTEX(-2786, -297, 270), - COL_VERTEX(-3298, -758, 270), - COL_VERTEX(-3298, -758, -343), - COL_VERTEX(-3605, -451, 270), - COL_VERTEX(-3605, -451, -343), - COL_VERTEX(-3605, -297, 270), - COL_VERTEX(-3298, -297, -343), - COL_VERTEX(-4117, -143, -343), - COL_VERTEX(-4117, 112, 270), - COL_VERTEX(-3912, -41, 270), - COL_VERTEX(-4117, -143, 270), - COL_VERTEX(-3605, 112, -343), - COL_VERTEX(-3605, -41, -343), - COL_VERTEX(-4117, -707, 270), - COL_VERTEX(-3912, -41, -343), - COL_VERTEX(-3605, -707, -343), - COL_VERTEX(-4322, -860, 270), - COL_VERTEX(-3605, -860, -343), - COL_VERTEX(-4322, -860, -343), - COL_VERTEX(-4117, -707, -343), - COL_VERTEX(-4117, -297, -343), - COL_VERTEX(-4322, -297, -343), - COL_VERTEX(-4424, 572, -343), - COL_VERTEX(-3810, 419, 270), - COL_VERTEX(-4220, 982, -343), - COL_VERTEX(-3810, 572, -343), - COL_VERTEX(-4629, 572, 270), - COL_VERTEX(-3810, 419, -343), - COL_VERTEX(-4629, 419, -343), - COL_VERTEX(-4936, 214, -343), - COL_VERTEX(-5141, -195, 270), - COL_VERTEX(-4834, 112, -343), - COL_VERTEX(-4629, 9, -343), - COL_VERTEX(-4629, -195, -343), - COL_VERTEX(-5141, -195, -343), - COL_VERTEX(-2479, 2160, 270), - COL_VERTEX(-3093, 726, -343), - COL_VERTEX(-3093, 1443, -343), - COL_VERTEX(-6063, -1116, -343), - COL_VERTEX(-5653, 931, -343), - COL_VERTEX(-6063, -195, 270), - COL_VERTEX(-5448, 214, -343), - COL_VERTEX(-5448, -195, -343), - COL_VERTEX(-4527, -502, -343), - COL_VERTEX(-4527, -655, -343), - COL_VERTEX(-6063, -655, 270), - COL_VERTEX(-5653, -1116, -343), - COL_VERTEX(-2274, -1987, 885), - COL_VERTEX(-7087, -1987, 885), - COL_VERTEX(-1864, -1987, 680), - COL_VERTEX(-2274, -1782, -445), - COL_VERTEX(-7087, -1782, -445), - COL_VERTEX(-7087, -1782, 885), - COL_VERTEX(-7496, -1782, 680), - COL_VERTEX(-7087, -1987, -445), - COL_VERTEX(3393, -2089, 2359), - COL_VERTEX(3393, -2089, 1780), - COL_VERTEX(2886, -1833, 1273), - COL_VERTEX(2307, -1833, 1273), - COL_VERTEX(1800, -2089, 1780), - COL_VERTEX(2307, -1833, 2866), - COL_VERTEX(2886, -1833, 2866), - COL_VERTEX(-3300, -3625, 6257), - COL_VERTEX(-3300, -3625, 6871), - COL_VERTEX(-3709, -2755, 6871), - COL_VERTEX(-4068, -3625, 6871), - COL_VERTEX(-5809, -2140, 6257), - COL_VERTEX(-5809, -2140, 6871), - COL_VERTEX(-4887, -2140, 6871), - COL_VERTEX(-4887, -1935, 6257), - COL_VERTEX(-5757, -1731, 5591), - COL_VERTEX(-5962, -1935, 5489), - COL_VERTEX(-5655, -1935, 5489), - COL_VERTEX(-5860, -1731, 5694), - COL_VERTEX(-5706, -1935, 5847), - COL_VERTEX(-5911, -1935, 5847), - COL_VERTEX(-6065, -2729, 6989), - COL_VERTEX(-5962, -2729, 6887), - COL_VERTEX(-6116, -2811, 6887), - COL_VERTEX(-6065, -2893, 6129), - COL_VERTEX(-5911, -2811, 6231), - COL_VERTEX(-5962, -2729, 6231), - COL_VERTEX(-6065, -2729, 6231), - COL_VERTEX(-6065, -2893, 6887), - COL_VERTEX(-6013, -2893, 6989), - COL_VERTEX(-5962, -2893, 6887), - COL_VERTEX(-5962, -3456, 6887), - COL_VERTEX(-6013, -3558, 6989), - COL_VERTEX(-5962, -2893, 6231), - COL_VERTEX(-6065, -2893, 6231), - COL_VERTEX(-5962, -3456, 6231), - COL_VERTEX(-6013, -2893, 6129), - COL_VERTEX(-6065, -3558, 6231), - COL_VERTEX(-3968, -3558, 6129), - COL_VERTEX(-3865, -3558, 6887), - COL_VERTEX(-4068, -3625, 6257), - COL_VERTEX(-2482, -1321, 4619), - COL_VERTEX(-1816, -1321, 5233), - COL_VERTEX(-2482, -1321, 5233), - COL_VERTEX(-4786, -911, 3953), - COL_VERTEX(-6269, -1321, 5233), - COL_VERTEX(-4632, -1321, 4619), - COL_VERTEX(-5860, -1116, 5438), - COL_VERTEX(-5860, -1321, 4414), - COL_VERTEX(-5451, -1321, 4619), - COL_VERTEX(-4632, -1321, 5233), - COL_VERTEX(-5451, -1116, 5233), - COL_VERTEX(-4888, -1270, 4055), - COL_VERTEX(-4991, -1116, 3851), - COL_VERTEX(-4735, -1116, 4209), - COL_VERTEX(-4786, -911, 4055), - COL_VERTEX(-4888, -911, 3953), - COL_VERTEX(-4939, -1116, 4209), - COL_VERTEX(-4888, -911, 4055), - COL_VERTEX(307, -2857, 3364), - COL_VERTEX(921, -3676, 3364), - COL_VERTEX(307, -3062, 4286), - COL_VERTEX(307, -3676, 6129), - COL_VERTEX(307, -3267, 5207), - COL_VERTEX(-690, -2140, 6871), - COL_VERTEX(-690, -1935, 6257), - COL_VERTEX(-1816, -2140, 6871), - COL_VERTEX(-1202, -2140, 6257), - COL_VERTEX(-1202, -1321, 4619), - COL_VERTEX(-1509, -1412, 5603), - COL_VERTEX(-1509, -1238, 5603), - COL_VERTEX(-1304, -1412, 5603), - COL_VERTEX(-1304, -1248, 5398), - COL_VERTEX(-1304, -1782, 6065), - COL_VERTEX(-1509, -1750, 6217), - COL_VERTEX(-1304, -1903, 6217), - COL_VERTEX(-1509, -1903, 6217), - COL_VERTEX(-1304, -1750, 6025), - COL_VERTEX(-1714, -1658, 5910), - COL_VERTEX(-1714, -1494, 5910), - COL_VERTEX(-1509, -1658, 5910), - COL_VERTEX(-1509, -1494, 5705), - COL_VERTEX(-1816, -1935, 6257), - COL_VERTEX(-1816, -2140, 6257), - COL_VERTEX(1653, 2975, -2038), - COL_VERTEX(921, -3676, 6129), - COL_VERTEX(921, -2857, 4286), - COL_VERTEX(921, -3062, 5207), - COL_VERTEX(-358, -3625, 6257), - COL_VERTEX(-358, -3625, 6871), - COL_VERTEX(-1126, -3625, 6871), - COL_VERTEX(-1126, -3625, 6257), - COL_VERTEX(825, -4700, 6440), - COL_VERTEX(825, -4700, 7566), - COL_VERTEX(415, -4700, 7566), - COL_VERTEX(415, -4700, 6747), - COL_VERTEX(716, -3553, 6231), - COL_VERTEX(665, -3471, 6231), - COL_VERTEX(563, -3471, 6231), - COL_VERTEX(563, -3635, 6887), - COL_VERTEX(665, -3635, 6887), - COL_VERTEX(614, -3635, 6989), - COL_VERTEX(563, -3471, 6989), - COL_VERTEX(665, -3471, 6887), - COL_VERTEX(512, -3553, 6887), - COL_VERTEX(-377, -4700, 6440), - COL_VERTEX(921, -3267, 5207), - COL_VERTEX(921, -2857, 3364), - COL_VERTEX(921, -3062, 4286), - COL_VERTEX(921, -3267, 6129), - COL_VERTEX(5646, -2038, 2241), - COL_VERTEX(5646, -2038, 1831), - COL_VERTEX(5031, -2038, 2241), - COL_VERTEX(5031, -2038, 1831), - COL_VERTEX(332, -1935, 6257), - COL_VERTEX(1254, -1935, 6257), - COL_VERTEX(742, -1526, 6257), - COL_VERTEX(844, -1526, 6257), - COL_VERTEX(1254, -1935, 6871), - COL_VERTEX(-5600, -4803, 7259), - COL_VERTEX(-787, -4803, 7259), - COL_VERTEX(-377, -4803, 7054), - COL_VERTEX(-5600, -4598, 5928), - COL_VERTEX(-787, -4598, 5928), - COL_VERTEX(-5600, -4598, 7259), - COL_VERTEX(-6009, -4598, 7054), - COL_VERTEX(-5600, -4803, 5928), - COL_VERTEX(7084, -1295, 1094), - COL_VERTEX(7084, -1295, 660), - COL_VERTEX(5889, -1295, 660), - COL_VERTEX(6778, -1091, 1674), - COL_VERTEX(6199, -1091, 1674), - COL_VERTEX(6823, -653, -733), - COL_VERTEX(6618, -858, -836), - COL_VERTEX(6925, -858, -836), - COL_VERTEX(6721, -653, -631), - COL_VERTEX(6874, -858, -477), - COL_VERTEX(6669, -858, -477), - COL_VERTEX(6107, -1219, 1831), - COL_VERTEX(6107, -1372, 1831), - COL_VERTEX(6260, -1219, 1831), - COL_VERTEX(6260, -1372, 1831), - COL_VERTEX(6107, -1372, 2241), - COL_VERTEX(6721, -1012, -631), - COL_VERTEX(5646, 2821, -2448), - COL_VERTEX(2881, 2514, -3062), - COL_VERTEX(1653, 2616, -2755), - COL_VERTEX(1857, 2104, -2346), - COL_VERTEX(1038, 3026, -2346), - COL_VERTEX(4139, 2568, -1627), - COL_VERTEX(4417, 1695, -2346), - COL_VERTEX(2881, 2514, -1629), - COL_VERTEX(5237, 2002, -2346), - COL_VERTEX(5117, 2606, -1729), - COL_VERTEX(5117, 2657, -2958), - COL_VERTEX(2881, 1695, -2346), - COL_VERTEX(1653, 2616, -1936), - COL_VERTEX(-5938, 2867, -4095), - COL_VERTEX(-5324, 2867, -3378), - COL_VERTEX(-5938, 2867, -6143), - COL_VERTEX(-6165, 5939, -6637), - COL_VERTEX(-5938, 5939, -6143), - COL_VERTEX(-5938, 5939, -4095), - COL_VERTEX(-5324, 5939, -3378), - COL_VERTEX(-3071, 5939, -3378), - COL_VERTEX(-3071, 2867, -3378), - COL_VERTEX(-2457, 2867, -4095), - COL_VERTEX(-5817, 5939, -3196), - COL_VERTEX(-2457, 5939, -6143), - COL_VERTEX(-2486, 2831, -6138), - COL_VERTEX(-2457, 3379, -5938), - COL_VERTEX(-2457, 3379, -5119), - COL_VERTEX(-2457, 3994, -5119), - COL_VERTEX(-2457, 5939, -4095), - COL_VERTEX(-2457, 4198, -5324), - COL_VERTEX(-2457, 4198, -5733), - COL_VERTEX(-3071, 2867, -6860), - COL_VERTEX(-3071, 5939, -6860), - COL_VERTEX(-5324, 2867, -6860), - COL_VERTEX(-5847, 2838, -7037), - COL_VERTEX(-5324, 5939, -6860), - COL_VERTEX(-4607, 3379, -3378), - COL_VERTEX(-4607, 3379, -3583), - COL_VERTEX(-4402, 4198, -3583), - COL_VERTEX(-3788, 3379, -3583), - COL_VERTEX(-5426, 3072, -3583), - COL_VERTEX(-3788, 3994, -3583), - COL_VERTEX(-3993, 4198, -3583), - COL_VERTEX(-2661, 5939, -4044), - COL_VERTEX(-2661, 5939, -6194), - COL_VERTEX(-2661, 3994, -5938), - COL_VERTEX(-2661, 4198, -5733), - COL_VERTEX(-2661, 4198, -5324), - COL_VERTEX(-2661, 3379, -5119), - COL_VERTEX(-2661, 3072, -4044), - COL_VERTEX(-2661, 3072, -6194), - COL_VERTEX(-2661, 3379, -5938), - COL_VERTEX(-5938, 4506, -5631), - COL_VERTEX(-5733, 4506, -5631), - COL_VERTEX(-5733, 5325, -5426), - COL_VERTEX(-5733, 4506, -4812), - COL_VERTEX(-5733, 3072, -6245), - COL_VERTEX(-5733, 5120, -4812), - COL_VERTEX(-5733, 5325, -5017), - COL_VERTEX(-5733, 5939, -6245), - COL_VERTEX(-6165, 2867, -3601), - COL_VERTEX(-2577, 5939, -3196), - COL_VERTEX(-5817, 5939, -7042), - COL_VERTEX(-2880, 7203, -6570), - COL_VERTEX(-2230, 5939, -6637), - COL_VERTEX(-5017, 3379, -3378), - COL_VERTEX(-5017, 3482, -3378), - COL_VERTEX(-4607, 3482, -2764), - COL_VERTEX(-5017, 3482, -3122), - COL_VERTEX(-3378, 3482, -3378), - COL_VERTEX(-3378, 3482, -3122), - COL_VERTEX(-3788, 3482, -2764), - COL_VERTEX(-5053, 3328, -3086), - COL_VERTEX(-5053, 3482, -3086), - COL_VERTEX(-4610, 3482, -2766), - COL_VERTEX(-5068, 3328, -3378), - COL_VERTEX(-5324, 6451, -6245), - COL_VERTEX(-3342, 3328, -3086), - COL_VERTEX(-3327, 3328, -3378), - COL_VERTEX(-3788, 3482, -2713), - COL_VERTEX(-4607, 3328, -2713), - COL_VERTEX(-3788, 3328, -2713), - COL_VERTEX(-3890, 3072, -2815), - COL_VERTEX(-3788, 3381, -2764), - COL_VERTEX(-3788, 3379, -2713), - COL_VERTEX(-3552, 2970, -3378), - COL_VERTEX(-5938, 2970, -3378), - COL_VERTEX(-3071, 6451, -3993), - COL_VERTEX(-4607, 6451, -5426), - COL_VERTEX(-2230, 5939, -3601), - COL_VERTEX(-3788, 6451, -4812), - COL_VERTEX(-3071, 6451, -6245), - COL_VERTEX(-3788, 6246, -5426), - COL_VERTEX(-3071, 6246, -6245), - COL_VERTEX(-3788, 6246, -4812), - COL_VERTEX(-4607, 6246, -5426), - COL_VERTEX(-4607, 6246, -4812), - COL_VERTEX(-5324, 6246, -3993), - COL_VERTEX(-3071, 6246, -3993), - COL_VERTEX(-2805, 5939, -3972), - COL_VERTEX(-2969, 5939, -3583), - COL_VERTEX(-2969, 5939, -6655), - COL_VERTEX(-2989, 5939, -6512), - COL_VERTEX(-5324, 6246, -6245), - COL_VERTEX(-5406, 3072, -3726), - COL_VERTEX(-5590, 3072, -3972), - COL_VERTEX(-5733, 5939, -3993), - COL_VERTEX(-2989, 5939, -3726), - COL_VERTEX(-2989, 3072, -6512), - COL_VERTEX(-5406, 5939, -6512), - COL_VERTEX(-5426, 5939, -6655), - COL_VERTEX(-2969, 3072, -6655), - COL_VERTEX(-5426, 3072, -6655), - COL_VERTEX(-5426, 5939, -3583), - COL_VERTEX(-5324, 6451, -3993), - COL_VERTEX(-5515, 7203, -3668), - COL_VERTEX(-3071, 3068, -4402), - COL_VERTEX(-3071, 3068, -5733), - COL_VERTEX(-3583, 3068, -4402), - COL_VERTEX(-3583, 3068, -5733), - COL_VERTEX(-3788, 3072, -3583), - COL_VERTEX(-4607, 3072, -3583), - COL_VERTEX(-3788, 3072, -4351), - COL_VERTEX(-4607, 3174, -4351), - COL_VERTEX(-4607, 3379, -3839), - COL_VERTEX(-4607, 3277, -4095), - COL_VERTEX(-3827, 3482, -6655), - COL_VERTEX(-4032, 3686, -6655), - COL_VERTEX(-4032, 3123, -6450), - COL_VERTEX(-3827, 3482, -6450), - COL_VERTEX(-4032, 3328, -6450), - COL_VERTEX(-4339, 3686, -6655), - COL_VERTEX(-4032, 3686, -6450), - COL_VERTEX(-4544, 3482, -6655), - COL_VERTEX(-4237, 3430, -6450), - COL_VERTEX(-4544, 3123, -6655), - COL_VERTEX(-4339, 3328, -6450), - COL_VERTEX(-4237, 3430, -6655), - COL_VERTEX(-4339, 3328, -6655), - COL_VERTEX(-4134, 3430, -6655), - COL_VERTEX(-4032, 3328, -6655), - COL_VERTEX(-4032, 3072, -6655), - COL_VERTEX(-4646, 3072, -6348), - COL_VERTEX(-3725, 3072, -6655), - COL_VERTEX(-4262, 3686, -6501), - COL_VERTEX(-4262, 3686, -6655), - COL_VERTEX(-4109, 5939, -6655), - COL_VERTEX(-4262, 5939, -6655), - COL_VERTEX(4212, -1720, 1831), - COL_VERTEX(4212, -1946, 2241), - COL_VERTEX(3393, -1946, 2241), - COL_VERTEX(921, -1116, 3364), - COL_VERTEX(307, -1321, 2135), - COL_VERTEX(921, -1321, 2135), - COL_VERTEX(307, -1321, 3364), - COL_VERTEX(307, -1116, 3364), - COL_VERTEX(307, -963, 3364), - COL_VERTEX(921, -963, 3364), - COL_VERTEX(921, -963, 3979), - COL_VERTEX(921, -1167, 3979), - COL_VERTEX(307, -963, 3979), - COL_VERTEX(307, -1167, 3364), - COL_VERTEX(512, -1147, 3774), - COL_VERTEX(307, -1147, 3979), - COL_VERTEX(512, -1147, 3569), - COL_VERTEX(716, -1147, 3774), - COL_VERTEX(921, -1147, 3979), - COL_VERTEX(307, -1147, 3364), - COL_VERTEX(921, -1147, 3364), - COL_VERTEX(716, -1116, 3569), - COL_VERTEX(921, -973, 3354), - COL_VERTEX(307, -973, 3354), - COL_VERTEX(3861, 4245, -2653), - COL_VERTEX(3452, 4245, -2448), - COL_VERTEX(3247, 4245, -2653), - COL_VERTEX(3656, 4276, -2448), - COL_VERTEX(3656, 4245, -2243), - COL_VERTEX(3247, 4245, -2038), - COL_VERTEX(3452, 4245, -2243), - COL_VERTEX(3861, 4245, -2038), - COL_VERTEX(3247, 4225, -2653), - COL_VERTEX(3247, 4430, -2653), - COL_VERTEX(3247, 4430, -2038), - COL_VERTEX(3861, 4225, -2038), - COL_VERTEX(3861, 4430, -2038), - COL_VERTEX(-7173, 3584, -2387), - COL_VERTEX(-6292, 3584, -1770), - COL_VERTEX(-6821, 3584, -2890), - COL_VERTEX(-5940, 3584, -2273), - COL_VERTEX(-8049, 3891, -4426), - COL_VERTEX(-8049, 3891, -3351), - COL_VERTEX(-7435, 3891, -4426), - COL_VERTEX(-7435, 3891, -3351), - COL_VERTEX(2204, 3083, -1773), - COL_VERTEX(2357, 3109, -1773), - COL_VERTEX(2204, 3109, -1773), - COL_VERTEX(2204, 3109, -852), - COL_VERTEX(2357, 3109, -852), - COL_VERTEX(1180, 2878, -954), - COL_VERTEX(2613, 2878, -954), - COL_VERTEX(975, 3083, -954), - COL_VERTEX(3332, 2468, -124), - COL_VERTEX(3486, 2314, -124), - COL_VERTEX(3486, 2468, -124), - COL_VERTEX(3332, 2314, 285), - COL_VERTEX(3332, 2314, -124), - COL_VERTEX(3844, 2519, -124), - COL_VERTEX(3844, 2314, -124), - COL_VERTEX(3998, 2519, -124), - COL_VERTEX(3998, 2314, -124), - COL_VERTEX(3844, 2314, 285), - COL_VERTEX(2820, 2314, -124), - COL_VERTEX(2820, 2570, -124), - COL_VERTEX(2974, 2570, -124), - COL_VERTEX(2974, 2314, -124), - COL_VERTEX(2820, 2314, 285), - COL_VERTEX(2075, 2509, -130), - COL_VERTEX(1921, 2509, -130), - COL_VERTEX(1998, 2714, -130), - COL_VERTEX(2075, 2612, -130), - COL_VERTEX(1921, 2612, 279), - COL_VERTEX(-1040, 1690, 133), - COL_VERTEX(-1040, 922, -480), - COL_VERTEX(-630, 922, -480), - COL_VERTEX(-630, 1690, 133), - COL_VERTEX(-630, 1690, -480), - COL_VERTEX(-1626, 3120, 119), - COL_VERTEX(-2036, 3120, 119), - COL_VERTEX(-1626, 3120, -494), - COL_VERTEX(-1626, 1843, 119), - COL_VERTEX(-2036, 3120, -494), - COL_VERTEX(7602, -2396, 5950), - COL_VERTEX(7602, -2396, 7179), - COL_VERTEX(4838, -2396, 7179), - COL_VERTEX(4838, -2396, 5950), - COL_VERTEX(3609, -2089, 6257), - COL_VERTEX(4838, -2089, 6257), - COL_VERTEX(3609, -2089, 6871), - COL_VERTEX(4838, -2089, 6871), - COL_VERTEX(3712, -937, 6052), - COL_VERTEX(4121, -937, 6257), - COL_VERTEX(3303, -937, 6871), - COL_VERTEX(3712, -732, 7076), - COL_VERTEX(4121, -732, 6871), - COL_VERTEX(4735, -937, 6871), - COL_VERTEX(4735, -937, 6257), - COL_VERTEX(3455, -1935, 5387), - COL_VERTEX(3404, -1935, 5745), - COL_VERTEX(3199, -1935, 5745), - COL_VERTEX(3148, -1935, 5387), - COL_VERTEX(3353, -1731, 5489), - COL_VERTEX(3250, -1731, 5591), - COL_VERTEX(6230, 3675, 4524), - COL_VERTEX(5565, 3819, 5189), - COL_VERTEX(4624, 3819, 5189), - COL_VERTEX(4624, 3675, 2919), - COL_VERTEX(3959, 3675, 3584), - COL_VERTEX(4527, 2999, 3819), - COL_VERTEX(6230, 3675, 3584), - COL_VERTEX(5565, 3819, 2919), - COL_VERTEX(4624, 3819, 2919), - COL_VERTEX(5565, 3675, 2919), - COL_VERTEX(4838, -1935, 5950), - COL_VERTEX(4838, -1935, 6257), - COL_VERTEX(2475, -1014, -3864), - COL_VERTEX(2475, -1065, -3454), - COL_VERTEX(3396, -1014, -3864), - COL_VERTEX(3806, -604, -3864), - COL_VERTEX(2987, -604, -3864), - COL_VERTEX(2987, -655, -3454), - COL_VERTEX(2987, -655, -3864), - COL_VERTEX(3089, 163, 85), - COL_VERTEX(2424, -399, 85), - COL_VERTEX(2782, 982, 494), - COL_VERTEX(4113, 1033, 85), - COL_VERTEX(3089, 982, 85), - COL_VERTEX(4113, 982, 85), - COL_VERTEX(3089, 982, -938), - COL_VERTEX(2782, 982, -938), - COL_VERTEX(2719, -1321, -343), - COL_VERTEX(3538, -1321, -343), - COL_VERTEX(3538, -1321, 270), - COL_VERTEX(2719, -1321, 270), - COL_VERTEX(307, -1321, -2243), - COL_VERTEX(921, -1321, -2243), - COL_VERTEX(307, -1321, -3882), - COL_VERTEX(921, -1321, -3882), - COL_VERTEX(4113, -195, -3864), - COL_VERTEX(4113, -41, -3864), - COL_VERTEX(3806, -41, -3864), - COL_VERTEX(3806, -195, -3454), - COL_VERTEX(3806, -195, -3864), - COL_VERTEX(3089, -41, -3864), - COL_VERTEX(3089, 112, -3864), - COL_VERTEX(3243, 112, -3864), - COL_VERTEX(3243, -41, -3864), - COL_VERTEX(3089, -41, -3454), - COL_VERTEX(4011, 880, -1860), - COL_VERTEX(3601, 931, -1860), - COL_VERTEX(4011, 982, -1860), - COL_VERTEX(4216, 880, -1860), - COL_VERTEX(4216, 777, -1860), - COL_VERTEX(3960, 777, -1860), - COL_VERTEX(3960, 777, -1450), - COL_VERTEX(4011, 982, -1450), - COL_VERTEX(3089, 1033, -1860), - COL_VERTEX(2065, 1033, -1860), - COL_VERTEX(2065, 982, -1450), - COL_VERTEX(2065, 982, -1860), - COL_VERTEX(-6860, 3021, -2713), - COL_VERTEX(-4197, 3021, -2405), - COL_VERTEX(-4197, 3021, -2713), - COL_VERTEX(-6860, 3021, -2405), - COL_VERTEX(975, 3083, 274), - COL_VERTEX(-3093, -1116, 270), - COL_VERTEX(-3093, -1782, 270), - COL_VERTEX(-3093, -1782, -343), - COL_VERTEX(-3093, 726, -445), - COL_VERTEX(-6370, 1443, -343), - COL_VERTEX(-2479, -1116, -343), - COL_VERTEX(-2274, -1116, -343), - COL_VERTEX(-2479, -1116, 270), - COL_VERTEX(-2274, -1116, 270), - COL_VERTEX(-2786, -451, -445), - COL_VERTEX(-3093, 726, 270), - COL_VERTEX(-2888, 726, 270), - COL_VERTEX(-1455, -1116, 270), - COL_VERTEX(-1864, -1116, 270), - COL_VERTEX(-1864, -1116, -343), - COL_VERTEX(-1455, -1116, -343), - COL_VERTEX(-2274, 1648, 270), - COL_VERTEX(-7189, -1116, -343), - COL_VERTEX(-3093, -451, -445), - COL_VERTEX(-2479, 1648, 270), - COL_VERTEX(-7394, -1116, 270), - COL_VERTEX(-7189, 2160, 270), - COL_VERTEX(-4629, -1116, 270), - COL_VERTEX(-4629, -1116, -343), - COL_VERTEX(-5141, 726, 270), - COL_VERTEX(-5141, 726, -343), - COL_VERTEX(-4936, 726, 270), - COL_VERTEX(-4936, 521, 270), - COL_VERTEX(-3605, -451, -445), - COL_VERTEX(-3093, -451, 270), - COL_VERTEX(-3298, -451, -343), - COL_VERTEX(-3605, -297, -343), - COL_VERTEX(-3298, 316, -343), - COL_VERTEX(-4117, 112, -343), - COL_VERTEX(-3605, 112, 270), - COL_VERTEX(-4322, -297, 270), - COL_VERTEX(-4117, -297, 270), - COL_VERTEX(-4322, -143, 270), - COL_VERTEX(-3605, -41, 270), - COL_VERTEX(-3912, -707, 270), - COL_VERTEX(-3912, -707, -343), - COL_VERTEX(-3605, -860, 270), - COL_VERTEX(-3605, -707, 270), - COL_VERTEX(-4322, -707, 270), - COL_VERTEX(-4322, -707, -343), - COL_VERTEX(-4322, -143, -343), - COL_VERTEX(-4424, 572, 270), - COL_VERTEX(-4424, 982, 270), - COL_VERTEX(-4424, 982, -343), - COL_VERTEX(-4220, 982, 270), - COL_VERTEX(-3810, 572, 270), - COL_VERTEX(-4629, 419, 270), - COL_VERTEX(-4629, 572, -343), - COL_VERTEX(-4936, 214, 270), - COL_VERTEX(-4936, 112, 270), - COL_VERTEX(-4936, 112, -343), - COL_VERTEX(-4834, 112, 270), - COL_VERTEX(-5141, 214, 270), - COL_VERTEX(-4834, 9, 270), - COL_VERTEX(-4834, 9, -343), - COL_VERTEX(-4629, 9, 270), - COL_VERTEX(-4629, -195, 270), - COL_VERTEX(-5141, 214, -343), - COL_VERTEX(-6063, 1443, -343), - COL_VERTEX(-5653, 214, 270), - COL_VERTEX(-5653, 214, -343), - COL_VERTEX(-5653, 931, 270), - COL_VERTEX(-5448, 214, 270), - COL_VERTEX(-5756, 1033, 270), - COL_VERTEX(-5448, -195, 270), - COL_VERTEX(-6063, -195, -343), - COL_VERTEX(-6063, 1033, 270), - COL_VERTEX(-4527, -502, 270), - COL_VERTEX(-4527, -655, 270), - COL_VERTEX(-6063, -655, -343), - COL_VERTEX(-6063, -502, 270), - COL_VERTEX(-5653, -1116, 270), - COL_VERTEX(-5653, -1782, 270), - COL_VERTEX(-5653, -1782, -343), - COL_VERTEX(-1864, -1782, 680), - COL_VERTEX(-2274, -1782, 885), - COL_VERTEX(-1864, -1782, -241), - COL_VERTEX(-1864, -1987, -241), - COL_VERTEX(-2274, -1987, -445), - COL_VERTEX(-7496, -1987, 680), - COL_VERTEX(-7496, -1782, -241), - COL_VERTEX(-7496, -1987, -241), - COL_VERTEX(3393, -1833, 1780), - COL_VERTEX(3393, -1833, 2359), - COL_VERTEX(2886, -2089, 2866), - COL_VERTEX(2886, -2089, 1273), - COL_VERTEX(2307, -2089, 2866), - COL_VERTEX(2307, -2089, 1273), - COL_VERTEX(1800, -1833, 1780), - COL_VERTEX(1800, -2089, 2359), - COL_VERTEX(1800, -1833, 2359), - COL_VERTEX(-3300, -2959, 6871), - COL_VERTEX(-3505, -2959, 6871), - COL_VERTEX(-4068, -2755, 6257), - COL_VERTEX(-4068, -2755, 6871), - COL_VERTEX(-3300, -2959, 6257), - COL_VERTEX(-5809, -1935, 6257), - COL_VERTEX(-4887, -2140, 6257), - COL_VERTEX(-5809, -1935, 6871), - COL_VERTEX(-4887, -1935, 6871), - COL_VERTEX(-5860, -1731, 5591), - COL_VERTEX(-5757, -1731, 5694), - COL_VERTEX(-5962, -2729, 6989), - COL_VERTEX(-6065, -2729, 6887), - COL_VERTEX(-5911, -2811, 6989), - COL_VERTEX(-5911, -2811, 6887), - COL_VERTEX(-5962, -2893, 6989), - COL_VERTEX(-6116, -2811, 6989), - COL_VERTEX(-6065, -2893, 6989), - COL_VERTEX(-6065, -2729, 6129), - COL_VERTEX(-5962, -2729, 6129), - COL_VERTEX(-5911, -2811, 6129), - COL_VERTEX(-5962, -2893, 6129), - COL_VERTEX(-6116, -2811, 6129), - COL_VERTEX(-6116, -2811, 6231), - COL_VERTEX(-6065, -3558, 6887), - COL_VERTEX(-3903, -3456, 6887), - COL_VERTEX(-3967, -3558, 6989), - COL_VERTEX(-6013, -3558, 6129), - COL_VERTEX(-3904, -3456, 6231), - COL_VERTEX(-3866, -3558, 6231), - COL_VERTEX(-3709, -2755, 6257), - COL_VERTEX(-3505, -2959, 6257), - COL_VERTEX(-2482, -1116, 4619), - COL_VERTEX(-1202, -1116, 4619), - COL_VERTEX(-1202, -1321, 5233), - COL_VERTEX(-2482, -1116, 5233), - COL_VERTEX(-1816, -1116, 5233), - COL_VERTEX(-5860, -1321, 5438), - COL_VERTEX(-6269, -1321, 4619), - COL_VERTEX(-6269, -1116, 5233), - COL_VERTEX(-6269, -1116, 4619), - COL_VERTEX(-5860, -1116, 4414), - COL_VERTEX(-5451, -1116, 4619), - COL_VERTEX(-4632, -1116, 4619), - COL_VERTEX(-5451, -1321, 5233), - COL_VERTEX(-4632, -1116, 5233), - COL_VERTEX(-4786, -1270, 4055), - COL_VERTEX(-4683, -1116, 3851), - COL_VERTEX(307, -3676, 3364), - COL_VERTEX(307, -2857, 4286), - COL_VERTEX(307, -3267, 6129), - COL_VERTEX(307, -3062, 5207), - COL_VERTEX(-690, -2140, 6257), - COL_VERTEX(-690, -1935, 6871), - COL_VERTEX(-1816, -1935, 6871), - COL_VERTEX(-1202, -1935, 6257), - COL_VERTEX(-1202, -1116, 5233), - COL_VERTEX(-1509, -1248, 5398), - COL_VERTEX(-1509, -1238, 5398), - COL_VERTEX(-1304, -1238, 5603), - COL_VERTEX(-1304, -1238, 5398), - COL_VERTEX(-1509, -1782, 6052), - COL_VERTEX(-1509, -1782, 6065), - COL_VERTEX(-1304, -1782, 6052), - COL_VERTEX(-1304, -1750, 6217), - COL_VERTEX(-1509, -1750, 6025), - COL_VERTEX(-1714, -1494, 5705), - COL_VERTEX(-1509, -1494, 5910), - COL_VERTEX(1653, 2975, -2653), - COL_VERTEX(-358, -2959, 6871), - COL_VERTEX(-1126, -2959, 6871), - COL_VERTEX(-1126, -2959, 6257), - COL_VERTEX(-358, -2959, 6257), - COL_VERTEX(825, -4598, 7566), - COL_VERTEX(415, -4598, 7566), - COL_VERTEX(825, -4598, 6440), - COL_VERTEX(415, -4598, 6747), - COL_VERTEX(-377, -4598, 6747), - COL_VERTEX(-377, -4700, 6747), - COL_VERTEX(716, -3553, 6129), - COL_VERTEX(665, -3471, 6129), - COL_VERTEX(563, -3471, 6129), - COL_VERTEX(512, -3553, 6129), - COL_VERTEX(512, -3553, 6231), - COL_VERTEX(605, -4598, 6970), - COL_VERTEX(614, -4598, 6989), - COL_VERTEX(563, -4598, 6887), - COL_VERTEX(582, -4598, 6887), - COL_VERTEX(660, -4598, 6897), - COL_VERTEX(665, -4598, 6887), - COL_VERTEX(716, -3553, 6887), - COL_VERTEX(563, -3471, 6887), - COL_VERTEX(665, -3471, 6989), - COL_VERTEX(716, -3553, 6989), - COL_VERTEX(512, -3553, 6989), - COL_VERTEX(665, -3635, 6989), - COL_VERTEX(563, -3635, 6989), - COL_VERTEX(-377, -4598, 6440), - COL_VERTEX(5031, -1884, 2241), - COL_VERTEX(5646, -1884, 2241), - COL_VERTEX(5646, -1884, 1831), - COL_VERTEX(5031, -1884, 1831), - COL_VERTEX(332, -1935, 6871), - COL_VERTEX(742, -1526, 6871), - COL_VERTEX(844, -1526, 6871), - COL_VERTEX(-787, -4598, 7259), - COL_VERTEX(-377, -4598, 7054), - COL_VERTEX(-377, -4803, 6133), - COL_VERTEX(-377, -4598, 6133), - COL_VERTEX(-787, -4803, 5928), - COL_VERTEX(-6009, -4803, 7054), - COL_VERTEX(-6009, -4803, 6133), - COL_VERTEX(-6009, -4598, 6133), - COL_VERTEX(7285, -1091, 1167), - COL_VERTEX(6704, -1295, 1474), - COL_VERTEX(7285, -1091, 588), - COL_VERTEX(6778, -1091, 81), - COL_VERTEX(6269, -1295, 1474), - COL_VERTEX(5889, -1295, 1094), - COL_VERTEX(5692, -1091, 1167), - COL_VERTEX(5692, -1091, 588), - COL_VERTEX(6199, -1091, 81), - COL_VERTEX(6721, -653, -733), - COL_VERTEX(6823, -653, -631), - COL_VERTEX(6107, -1219, 2241), - COL_VERTEX(6260, -1372, 2241), - COL_VERTEX(6260, -1219, 2241), - COL_VERTEX(6823, -1012, -631), - COL_VERTEX(5646, 2821, -2243), - COL_VERTEX(5441, 2821, -2243), - COL_VERTEX(5441, 2821, -2448), - COL_VERTEX(5953, 2923, -2038), - COL_VERTEX(5953, 2923, -2653), - COL_VERTEX(4036, 2567, -3062), - COL_VERTEX(-5938, 4506, -4812), - COL_VERTEX(-5938, 5120, -4812), - COL_VERTEX(-6165, 5939, -3601), - COL_VERTEX(-5938, 5120, -5631), - COL_VERTEX(-5938, 5325, -5426), - COL_VERTEX(-5938, 5325, -5017), - COL_VERTEX(-4607, 3998, -3378), - COL_VERTEX(-4607, 3383, -3378), - COL_VERTEX(-5817, 2867, -3196), - COL_VERTEX(-6195, 2838, -6632), - COL_VERTEX(-4402, 4202, -3378), - COL_VERTEX(-3993, 4202, -3378), - COL_VERTEX(-3788, 3998, -3378), - COL_VERTEX(-3788, 3383, -3378), - COL_VERTEX(-4690, 3324, -3378), - COL_VERTEX(-3704, 3320, -3378), - COL_VERTEX(-2577, 2867, -3196), - COL_VERTEX(-2230, 2867, -3601), - COL_VERTEX(-2457, 3994, -5938), - COL_VERTEX(-2607, 2838, -7037), - COL_VERTEX(-2577, 5939, -7042), - COL_VERTEX(-2259, 2838, -6632), - COL_VERTEX(-4607, 3994, -3378), - COL_VERTEX(-4607, 3994, -3583), - COL_VERTEX(-4402, 4198, -3378), - COL_VERTEX(-2969, 3072, -3583), - COL_VERTEX(-3788, 3994, -3378), - COL_VERTEX(-3788, 3379, -3378), - COL_VERTEX(-3993, 4198, -3378), - COL_VERTEX(-5406, 5939, -3726), - COL_VERTEX(-2989, 3072, -3726), - COL_VERTEX(-2661, 3994, -5119), - COL_VERTEX(-2805, 5939, -6266), - COL_VERTEX(-2805, 3072, -6266), - COL_VERTEX(-2805, 3072, -3972), - COL_VERTEX(-5733, 5120, -5631), - COL_VERTEX(-5733, 3072, -3993), - COL_VERTEX(-5590, 5939, -3972), - COL_VERTEX(-5515, 7203, -6570), - COL_VERTEX(-5017, 3379, -3122), - COL_VERTEX(-5068, 3482, -3378), - COL_VERTEX(-4607, 3482, -2713), - COL_VERTEX(-4607, 3379, -2764), - COL_VERTEX(-3378, 3379, -3122), - COL_VERTEX(-3378, 3379, -3378), - COL_VERTEX(-3327, 3482, -3378), - COL_VERTEX(-3342, 3482, -3086), - COL_VERTEX(-3788, 3379, -2764), - COL_VERTEX(-4505, 3072, -2815), - COL_VERTEX(-4843, 2959, -3378), - COL_VERTEX(-4607, 3379, -2713), - COL_VERTEX(-4610, 3379, -2766), - COL_VERTEX(-2457, 2970, -6860), - COL_VERTEX(-2457, 2970, -3378), - COL_VERTEX(-5938, 2970, -6860), - COL_VERTEX(-2880, 7203, -3668), - COL_VERTEX(-4607, 6451, -4812), - COL_VERTEX(-3788, 6451, -5426), - COL_VERTEX(-5590, 5939, -6266), - COL_VERTEX(-5590, 3072, -6266), - COL_VERTEX(-5406, 3072, -6512), - COL_VERTEX(-3583, 3222, -4402), - COL_VERTEX(-3071, 3222, -4402), - COL_VERTEX(-3071, 3222, -5733), - COL_VERTEX(-3583, 3222, -5733), - COL_VERTEX(-3788, 3174, -4351), - COL_VERTEX(-3788, 3174, -4095), - COL_VERTEX(-3788, 3379, -3839), - COL_VERTEX(-3788, 3277, -3839), - COL_VERTEX(-3788, 3277, -4095), - COL_VERTEX(-4607, 3174, -4095), - COL_VERTEX(-4607, 3072, -4351), - COL_VERTEX(-4607, 3277, -3839), - COL_VERTEX(-3827, 3123, -6450), - COL_VERTEX(-3827, 3123, -6655), - COL_VERTEX(-4134, 3430, -6450), - COL_VERTEX(-4339, 3686, -6450), - COL_VERTEX(-4544, 3482, -6450), - COL_VERTEX(-4544, 3123, -6450), - COL_VERTEX(-4339, 3123, -6450), - COL_VERTEX(-4339, 3072, -6450), - COL_VERTEX(-4339, 3072, -6655), - COL_VERTEX(-4032, 3072, -6450), - COL_VERTEX(-4646, 3123, -6655), - COL_VERTEX(-4646, 3072, -6655), - COL_VERTEX(-4646, 3123, -6348), - COL_VERTEX(-3725, 3123, -6348), - COL_VERTEX(-3725, 3072, -6348), - COL_VERTEX(-3725, 3123, -6655), - COL_VERTEX(-4109, 5837, -6501), - COL_VERTEX(-4262, 5837, -6501), - COL_VERTEX(-4109, 3686, -6501), - COL_VERTEX(-4109, 3686, -6655), - COL_VERTEX(3396, -1716, 1831), - COL_VERTEX(3393, -1946, 1831), - COL_VERTEX(4212, -1946, 1831), - COL_VERTEX(4212, -1720, 2241), - COL_VERTEX(3396, -1716, 2241), - COL_VERTEX(921, -1321, 3364), - COL_VERTEX(307, -1116, 2135), - COL_VERTEX(921, -1116, 2135), - COL_VERTEX(307, -1116, 3354), - COL_VERTEX(921, -1116, 3354), - COL_VERTEX(307, -1167, 3979), - COL_VERTEX(921, -1167, 3364), - COL_VERTEX(512, -1116, 3774), - COL_VERTEX(716, -1116, 3774), - COL_VERTEX(512, -1116, 3569), - COL_VERTEX(716, -1147, 3569), - COL_VERTEX(3656, 4245, -2448), - COL_VERTEX(3452, 4276, -2448), - COL_VERTEX(3452, 4276, -2243), - COL_VERTEX(3656, 4276, -2243), - COL_VERTEX(3247, 4225, -2038), - COL_VERTEX(3861, 4430, -2653), - COL_VERTEX(3861, 4225, -2653), - COL_VERTEX(-7173, 3942, -2387), - COL_VERTEX(-6821, 3942, -2890), - COL_VERTEX(-5940, 3942, -2273), - COL_VERTEX(-6292, 3942, -1770), - COL_VERTEX(-7435, 4352, -4426), - COL_VERTEX(-8049, 4352, -4426), - COL_VERTEX(-7435, 4352, -3351), - COL_VERTEX(-8049, 4352, -3351), - COL_VERTEX(2357, 3083, -1773), - COL_VERTEX(2357, 3083, -852), - COL_VERTEX(2204, 3083, -852), - COL_VERTEX(2613, 3083, -954), - COL_VERTEX(3486, 2314, 285), - COL_VERTEX(3486, 2468, 285), - COL_VERTEX(3332, 2468, 285), - COL_VERTEX(3844, 2519, 285), - COL_VERTEX(3998, 2314, 285), - COL_VERTEX(3998, 2519, 285), - COL_VERTEX(2820, 2570, 285), - COL_VERTEX(2974, 2314, 285), - COL_VERTEX(2974, 2570, 285), - COL_VERTEX(1921, 2509, 279), - COL_VERTEX(1921, 2612, -130), - COL_VERTEX(2075, 2509, 279), - COL_VERTEX(2075, 2612, 279), - COL_VERTEX(1998, 2714, 279), - COL_VERTEX(-1040, 922, 133), - COL_VERTEX(-630, 922, 133), - COL_VERTEX(-1040, 1690, -480), - COL_VERTEX(-1626, 1843, -494), - COL_VERTEX(-2036, 1843, -494), - COL_VERTEX(-2036, 1843, 119), - COL_VERTEX(7602, -2243, 7179), - COL_VERTEX(4838, -2243, 7179), - COL_VERTEX(4838, -2243, 5950), - COL_VERTEX(7602, -2243, 5950), - COL_VERTEX(4838, -1935, 6871), - COL_VERTEX(3609, -1935, 6257), - COL_VERTEX(3609, -1935, 6871), - COL_VERTEX(3303, -937, 6257), - COL_VERTEX(3303, -732, 6257), - COL_VERTEX(3712, -732, 6052), - COL_VERTEX(3303, -732, 6871), - COL_VERTEX(4121, -732, 6257), - COL_VERTEX(3712, -937, 7076), - COL_VERTEX(4121, -937, 6871), - COL_VERTEX(4940, -732, 6257), - COL_VERTEX(4940, -732, 6871), - COL_VERTEX(3250, -2089, 5591), - COL_VERTEX(3353, -2089, 5591), - COL_VERTEX(3353, -1731, 5591), - COL_VERTEX(3250, -1731, 5489), - COL_VERTEX(6230, 3819, 3584), - COL_VERTEX(6230, 3819, 4524), - COL_VERTEX(5565, 3675, 5189), - COL_VERTEX(4624, 3675, 5189), - COL_VERTEX(5330, 2999, 3486), - COL_VERTEX(5662, 2999, 3819), - COL_VERTEX(3959, 3675, 4524), - COL_VERTEX(3959, 3819, 4524), - COL_VERTEX(3959, 3819, 3584), - COL_VERTEX(4527, 2999, 4289), - COL_VERTEX(4860, 2999, 3486), - COL_VERTEX(4735, -1935, 5950), - COL_VERTEX(4735, -1935, 6257), - COL_VERTEX(4838, -2038, 6257), - COL_VERTEX(4838, -2038, 5950), - COL_VERTEX(3396, -1065, -3864), - COL_VERTEX(2475, -1065, -3864), - COL_VERTEX(3396, -1014, -3454), - COL_VERTEX(3396, -1065, -3454), - COL_VERTEX(2475, -1014, -3454), - COL_VERTEX(3806, -655, -3454), - COL_VERTEX(3806, -655, -3864), - COL_VERTEX(3806, -604, -3454), - COL_VERTEX(2987, -604, -3454), - COL_VERTEX(3089, 163, 494), - COL_VERTEX(2424, -399, 494), - COL_VERTEX(4113, 982, 494), - COL_VERTEX(4113, 1033, 494), - COL_VERTEX(2782, 1033, 494), - COL_VERTEX(3089, 1033, 85), - COL_VERTEX(2782, 1033, -938), - COL_VERTEX(3089, 1033, -938), - COL_VERTEX(3538, -1116, -343), - COL_VERTEX(3538, -1116, 270), - COL_VERTEX(2719, -1116, -343), - COL_VERTEX(2719, -1116, 270), - COL_VERTEX(307, -1116, -3882), - COL_VERTEX(307, -1116, -2243), - COL_VERTEX(921, -1116, -2243), - COL_VERTEX(921, -1116, -3882), - COL_VERTEX(4113, -195, -3454), - COL_VERTEX(4113, -41, -3454), - COL_VERTEX(3806, -41, -3454), - COL_VERTEX(3089, 112, -3454), - COL_VERTEX(3243, -41, -3454), - COL_VERTEX(3243, 112, -3454), - COL_VERTEX(3601, 982, -1860), - COL_VERTEX(4011, 880, -1450), - COL_VERTEX(4216, 777, -1450), - COL_VERTEX(4216, 880, -1450), - COL_VERTEX(3601, 931, -1450), - COL_VERTEX(3601, 982, -1450), - COL_VERTEX(3089, 982, -1450), - COL_VERTEX(3089, 982, -1860), - COL_VERTEX(3089, 1033, -1450), - COL_VERTEX(2065, 1033, -1450), - COL_VERTEX(-4197, 3123, -2405), - COL_VERTEX(-6860, 3123, -2405), - COL_VERTEX(-6860, 3123, -2713), - COL_VERTEX(-4197, 3123, -2713), - COL_VERTEX(975, 2878, -954), - COL_VERTEX(-8191, -8191, 8192), - COL_VERTEX(8192, -8191, 8192), - COL_VERTEX(8192, -8191, -8191), - COL_VERTEX(-8191, -8191, -8191), - COL_VERTEX(-6063, 1033, -343), - COL_VERTEX(-5756, 1033, -343), - COL_VERTEX(-6063, -502, -343), - COL_VERTEX(-2661, 3072, -6655), - COL_VERTEX(3393, -1833, 1831), - COL_VERTEX(921, -1116, 3979), - COL_VERTEX(3861, 4276, -2653), - COL_VERTEX(3861, 4276, -2038), - COL_VERTEX(3247, 4276, -2653), - COL_VERTEX(-6472, 1443, -343), - COL_VERTEX(-3605, -297, -445), - COL_VERTEX(-5733, 3072, -3583), - COL_VERTEX(-2661, 3072, -3583), - COL_VERTEX(-5733, 3072, -6655), - COL_VERTEX(4212, -1833, 2241), - COL_VERTEX(4212, -1833, 1831), - COL_VERTEX(3393, -1833, 2241), - COL_VERTEX(307, -1116, 3979), - COL_VERTEX(3247, 4276, -2038), - COL_VERTEX(1180, 3083, -954), - COL_VERTEX(-6063, 1648, -343), - COL_TRI_INIT(SURFACE_DEFAULT, 1324), - COL_TRI(3, 9, 8), - COL_TRI(0, 1, 2), - COL_TRI(3, 1, 4), - COL_TRI(1, 0, 4), - COL_TRI(0, 2, 5), - COL_TRI(3, 6, 7), - COL_TRI(3, 8, 6), - COL_TRI(48, 49, 50), - COL_TRI(48, 51, 49), - COL_TRI(64, 65, 66), - COL_TRI(64, 67, 65), - COL_TRI(67, 68, 69), - COL_TRI(67, 64, 68), - COL_TRI(65, 70, 66), - COL_TRI(71, 72, 73), - COL_TRI(73, 74, 75), - COL_TRI(75, 71, 73), - COL_TRI(77, 111, 112), - COL_TRI(77, 76, 111), - COL_TRI(73, 76, 77), - COL_TRI(73, 77, 78), - COL_TRI(79, 624, 625), - COL_TRI(79, 625, 626), - COL_TRI(80, 626, 147), - COL_TRI(81, 146, 626), - COL_TRI(85, 86, 84), - COL_TRI(81, 627, 146), - COL_TRI(82, 96, 627), - COL_TRI(83, 82, 627), - COL_TRI(83, 627, 93), - COL_TRI(84, 629, 85), - COL_TRI(85, 629, 630), - COL_TRI(85, 630, 87), - COL_TRI(85, 87, 86), - COL_TRI(86, 631, 84), - COL_TRI(87, 632, 86), - COL_TRI(86, 632, 631), - COL_TRI(84, 631, 629), - COL_TRI(87, 630, 632), - COL_TRI(88, 636, 89), - COL_TRI(89, 90, 91), - COL_TRI(89, 91, 88), - COL_TRI(89, 636, 637), - COL_TRI(89, 637, 90), - COL_TRI(93, 5, 83), - COL_TRI(90, 638, 91), - COL_TRI(91, 639, 88), - COL_TRI(91, 638, 639), - COL_TRI(88, 639, 636), - COL_TRI(90, 637, 638), - COL_TRI(83, 10, 13), - COL_TRI(92, 83, 99), - COL_TRI(83, 92, 10), - COL_TRI(93, 95, 633), - COL_TRI(93, 633, 642), - COL_TRI(93, 81, 5), - COL_TRI(94, 82, 97), - COL_TRI(13, 97, 82), - COL_TRI(83, 13, 82), - COL_TRI(13, 12, 640), - COL_TRI(13, 640, 97), - COL_TRI(95, 110, 109), - COL_TRI(95, 109, 633), - COL_TRI(96, 82, 94), - COL_TRI(96, 94, 8), - COL_TRI(96, 8, 635), - COL_TRI(96, 634, 627), - COL_TRI(96, 635, 634), - COL_TRI(97, 643, 101), - COL_TRI(97, 101, 94), - COL_TRI(92, 644, 11), - COL_TRI(92, 11, 10), - COL_TRI(98, 644, 92), - COL_TRI(92, 99, 641), - COL_TRI(92, 641, 98), - COL_TRI(99, 100, 641), - COL_TRI(11, 644, 98), - COL_TRI(11, 98, 645), - COL_TRI(100, 645, 98), - COL_TRI(100, 98, 641), - COL_TRI(99, 628, 100), - COL_TRI(97, 640, 643), - COL_TRI(101, 102, 94), - COL_TRI(102, 100, 628), - COL_TRI(94, 102, 628), - COL_TRI(9, 635, 8), - COL_TRI(9, 634, 635), - COL_TRI(103, 624, 646), - COL_TRI(103, 625, 624), - COL_TRI(104, 646, 647), - COL_TRI(104, 103, 646), - COL_TRI(105, 107, 648), - COL_TRI(105, 648, 649), - COL_TRI(106, 107, 105), - COL_TRI(107, 650, 648), - COL_TRI(107, 651, 650), - COL_TRI(106, 651, 107), - COL_TRI(112, 111, 71), - COL_TRI(108, 651, 106), - COL_TRI(108, 650, 651), - COL_TRI(71, 109, 110), - COL_TRI(109, 652, 633), - COL_TRI(71, 110, 72), - COL_TRI(71, 111, 76), - COL_TRI(116, 74, 656), - COL_TRI(71, 76, 653), - COL_TRI(112, 71, 654), - COL_TRI(75, 113, 71), - COL_TRI(114, 113, 115), - COL_TRI(114, 115, 655), - COL_TRI(75, 115, 113), - COL_TRI(109, 113, 652), - COL_TRI(116, 75, 74), - COL_TRI(117, 120, 118), - COL_TRI(117, 118, 657), - COL_TRI(118, 123, 119), - COL_TRI(119, 658, 118), - COL_TRI(120, 659, 660), - COL_TRI(120, 661, 659), - COL_TRI(121, 662, 122), - COL_TRI(121, 658, 662), - COL_TRI(119, 662, 658), - COL_TRI(122, 662, 119), - COL_TRI(127, 126, 128), - COL_TRI(122, 119, 124), - COL_TRI(123, 663, 119), - COL_TRI(124, 119, 663), - COL_TRI(124, 663, 664), - COL_TRI(125, 665, 127), - COL_TRI(125, 666, 665), - COL_TRI(126, 665, 666), - COL_TRI(127, 665, 126), - COL_TRI(131, 661, 669), - COL_TRI(126, 666, 667), - COL_TRI(128, 126, 667), - COL_TRI(128, 667, 668), - COL_TRI(129, 123, 660), - COL_TRI(129, 660, 130), - COL_TRI(130, 660, 659), - COL_TRI(130, 659, 131), - COL_TRI(131, 659, 661), - COL_TRI(132, 670, 671), - COL_TRI(132, 671, 672), - COL_TRI(133, 673, 671), - COL_TRI(133, 671, 670), - COL_TRI(133, 670, 136), - COL_TRI(134, 673, 674), - COL_TRI(134, 674, 135), - COL_TRI(133, 674, 673), - COL_TRI(135, 674, 133), - COL_TRI(135, 133, 137), - COL_TRI(136, 675, 133), - COL_TRI(137, 133, 675), - COL_TRI(137, 675, 138), - COL_TRI(138, 675, 136), - COL_TRI(140, 682, 680), - COL_TRI(138, 136, 676), - COL_TRI(139, 677, 678), - COL_TRI(139, 678, 679), - COL_TRI(140, 680, 678), - COL_TRI(140, 678, 677), - COL_TRI(140, 677, 681), - COL_TRI(141, 680, 682), - COL_TRI(141, 682, 683), - COL_TRI(140, 684, 682), - COL_TRI(142, 685, 143), - COL_TRI(142, 684, 685), - COL_TRI(140, 685, 684), - COL_TRI(143, 685, 140), - COL_TRI(143, 140, 144), - COL_TRI(144, 140, 681), - COL_TRI(144, 681, 686), - COL_TRI(145, 643, 640), - COL_TRI(145, 640, 12), - COL_TRI(147, 9, 3), - COL_TRI(145, 12, 11), - COL_TRI(101, 643, 145), - COL_TRI(101, 145, 102), - COL_TRI(11, 645, 145), - COL_TRI(102, 145, 645), - COL_TRI(102, 645, 100), - COL_TRI(146, 634, 9), - COL_TRI(146, 9, 147), - COL_TRI(147, 3, 687), - COL_TRI(148, 687, 3), - COL_TRI(148, 3, 4), - COL_TRI(149, 688, 689), - COL_TRI(149, 690, 688), - COL_TRI(150, 688, 690), - COL_TRI(150, 691, 688), - COL_TRI(150, 690, 692), - COL_TRI(151, 691, 693), - COL_TRI(151, 693, 152), - COL_TRI(152, 693, 150), - COL_TRI(150, 693, 691), - COL_TRI(156, 700, 701), - COL_TRI(152, 150, 694), - COL_TRI(150, 692, 695), - COL_TRI(153, 696, 697), - COL_TRI(153, 697, 154), - COL_TRI(154, 697, 155), - COL_TRI(155, 697, 696), - COL_TRI(154, 155, 698), - COL_TRI(155, 696, 699), - COL_TRI(156, 701, 702), - COL_TRI(0, 701, 700), - COL_TRI(0, 700, 4), - COL_TRI(157, 703, 704), - COL_TRI(157, 159, 703), - COL_TRI(158, 157, 704), - COL_TRI(159, 705, 703), - COL_TRI(159, 706, 705), - COL_TRI(162, 163, 708), - COL_TRI(158, 704, 162), - COL_TRI(160, 705, 706), - COL_TRI(160, 706, 707), - COL_TRI(161, 160, 707), - COL_TRI(161, 707, 164), - COL_TRI(162, 708, 158), - COL_TRI(163, 709, 710), - COL_TRI(163, 710, 708), - COL_TRI(164, 709, 161), - COL_TRI(164, 710, 709), - COL_TRI(80, 147, 628), - COL_TRI(165, 711, 712), - COL_TRI(165, 166, 711), - COL_TRI(165, 712, 171), - COL_TRI(166, 714, 167), - COL_TRI(166, 167, 711), - COL_TRI(167, 714, 716), - COL_TRI(168, 167, 716), - COL_TRI(169, 717, 168), - COL_TRI(169, 168, 716), - COL_TRI(169, 718, 719), - COL_TRI(169, 719, 717), - COL_TRI(174, 175, 173), - COL_TRI(170, 718, 715), - COL_TRI(170, 719, 718), - COL_TRI(171, 170, 715), - COL_TRI(171, 715, 713), - COL_TRI(165, 171, 713), - COL_TRI(172, 720, 173), - COL_TRI(173, 205, 172), - COL_TRI(173, 175, 205), - COL_TRI(173, 721, 174), - COL_TRI(173, 720, 721), - COL_TRI(175, 722, 205), - COL_TRI(175, 723, 722), - COL_TRI(174, 723, 175), - COL_TRI(172, 724, 720), - COL_TRI(176, 725, 179), - COL_TRI(177, 725, 176), - COL_TRI(176, 179, 726), - COL_TRI(178, 176, 726), - COL_TRI(178, 177, 176), - COL_TRI(179, 178, 726), - COL_TRI(177, 727, 725), - COL_TRI(179, 728, 178), - COL_TRI(178, 727, 177), - COL_TRI(178, 728, 727), - COL_TRI(180, 729, 183), - COL_TRI(180, 183, 730), - COL_TRI(181, 729, 180), - COL_TRI(182, 180, 730), - COL_TRI(181, 180, 182), - COL_TRI(183, 729, 181), - COL_TRI(184, 730, 183), - COL_TRI(185, 183, 181), - COL_TRI(184, 183, 185), - COL_TRI(182, 730, 184), - COL_TRI(189, 738, 739), - COL_TRI(186, 731, 187), - COL_TRI(186, 187, 732), - COL_TRI(187, 731, 733), - COL_TRI(187, 733, 734), - COL_TRI(186, 735, 733), - COL_TRI(186, 733, 731), - COL_TRI(188, 186, 732), - COL_TRI(188, 736, 186), - COL_TRI(186, 736, 737), - COL_TRI(186, 737, 735), - COL_TRI(189, 739, 740), - COL_TRI(189, 740, 741), - COL_TRI(190, 740, 739), - COL_TRI(191, 739, 738), - COL_TRI(190, 739, 191), - COL_TRI(189, 742, 738), - COL_TRI(192, 738, 742), - COL_TRI(191, 738, 192), - COL_TRI(192, 742, 743), - COL_TRI(192, 190, 191), - COL_TRI(192, 199, 198), - COL_TRI(192, 198, 190), - COL_TRI(192, 743, 199), - COL_TRI(193, 188, 732), - COL_TRI(193, 732, 187), - COL_TRI(193, 187, 734), - COL_TRI(193, 734, 195), - COL_TRI(194, 196, 195), - COL_TRI(195, 196, 744), - COL_TRI(195, 744, 193), - COL_TRI(196, 204, 744), - COL_TRI(193, 744, 197), - COL_TRI(193, 197, 194), - COL_TRI(197, 745, 196), - COL_TRI(196, 745, 204), - COL_TRI(194, 197, 196), - COL_TRI(204, 745, 746), - COL_TRI(197, 746, 745), - COL_TRI(198, 747, 201), - COL_TRI(199, 200, 198), - COL_TRI(198, 200, 747), - COL_TRI(200, 203, 747), - COL_TRI(201, 747, 202), - COL_TRI(201, 202, 199), - COL_TRI(202, 748, 200), - COL_TRI(200, 748, 203), - COL_TRI(199, 202, 200), - COL_TRI(202, 749, 748), - COL_TRI(203, 748, 749), - COL_TRI(205, 722, 750), - COL_TRI(205, 724, 172), - COL_TRI(205, 751, 724), - COL_TRI(205, 750, 751), - COL_TRI(206, 752, 753), - COL_TRI(206, 753, 233), - COL_TRI(206, 233, 754), - COL_TRI(207, 755, 208), - COL_TRI(207, 756, 755), - COL_TRI(208, 752, 206), - COL_TRI(208, 755, 752), - COL_TRI(206, 754, 208), - COL_TRI(209, 223, 220), - COL_TRI(209, 221, 223), - COL_TRI(210, 214, 211), - COL_TRI(210, 213, 214), - COL_TRI(211, 757, 210), - COL_TRI(210, 758, 213), - COL_TRI(212, 210, 757), - COL_TRI(212, 759, 210), - COL_TRI(210, 759, 760), - COL_TRI(210, 760, 758), - COL_TRI(213, 758, 760), - COL_TRI(213, 760, 761), - COL_TRI(214, 213, 761), - COL_TRI(214, 762, 763), - COL_TRI(214, 761, 762), - COL_TRI(214, 763, 211), - COL_TRI(211, 764, 757), - COL_TRI(211, 215, 764), - COL_TRI(211, 765, 215), - COL_TRI(211, 763, 765), - COL_TRI(215, 216, 764), - COL_TRI(215, 765, 216), - COL_TRI(216, 757, 764), - COL_TRI(216, 212, 757), - COL_TRI(217, 766, 219), - COL_TRI(217, 219, 222), - COL_TRI(218, 766, 217), - COL_TRI(218, 217, 222), - COL_TRI(218, 767, 766), - COL_TRI(219, 766, 767), - COL_TRI(219, 220, 223), - COL_TRI(209, 220, 767), - COL_TRI(220, 219, 767), - COL_TRI(219, 223, 222), - COL_TRI(221, 209, 767), - COL_TRI(221, 767, 218), - COL_TRI(222, 223, 218), - COL_TRI(223, 221, 218), - COL_TRI(224, 768, 227), - COL_TRI(225, 224, 272), - COL_TRI(225, 768, 224), - COL_TRI(226, 224, 227), - COL_TRI(227, 770, 228), - COL_TRI(226, 227, 228), - COL_TRI(228, 771, 226), - COL_TRI(226, 769, 224), - COL_TRI(229, 248, 772), - COL_TRI(229, 231, 248), - COL_TRI(230, 773, 229), - COL_TRI(230, 229, 772), - COL_TRI(229, 773, 774), - COL_TRI(229, 774, 231), - COL_TRI(235, 778, 777), - COL_TRI(231, 247, 248), - COL_TRI(231, 774, 247), - COL_TRI(232, 230, 772), - COL_TRI(232, 775, 230), - COL_TRI(233, 776, 754), - COL_TRI(234, 235, 777), - COL_TRI(236, 235, 234), - COL_TRI(235, 779, 780), - COL_TRI(235, 780, 778), - COL_TRI(237, 780, 779), - COL_TRI(237, 779, 236), - COL_TRI(236, 779, 235), - COL_TRI(238, 781, 782), - COL_TRI(238, 783, 781), - COL_TRI(239, 784, 242), - COL_TRI(239, 242, 785), - COL_TRI(240, 784, 239), - COL_TRI(242, 784, 240), - COL_TRI(241, 239, 785), - COL_TRI(240, 239, 241), - COL_TRI(243, 244, 786), - COL_TRI(244, 246, 786), - COL_TRI(244, 787, 246), - COL_TRI(245, 787, 244), - COL_TRI(245, 244, 243), - COL_TRI(246, 787, 245), - COL_TRI(233, 753, 776), - COL_TRI(247, 775, 776), - COL_TRI(247, 776, 756), - COL_TRI(248, 247, 756), - COL_TRI(248, 756, 207), - COL_TRI(232, 754, 776), - COL_TRI(232, 776, 775), - COL_TRI(252, 228, 271), - COL_TRI(249, 20, 788), - COL_TRI(249, 21, 20), - COL_TRI(250, 225, 272), - COL_TRI(251, 226, 273), - COL_TRI(251, 769, 226), - COL_TRI(252, 771, 228), - COL_TRI(258, 793, 794), - COL_TRI(253, 255, 254), - COL_TRI(253, 789, 254), - COL_TRI(254, 790, 255), - COL_TRI(254, 789, 790), - COL_TRI(254, 255, 256), - COL_TRI(254, 256, 253), - COL_TRI(253, 256, 255), - COL_TRI(255, 790, 791), - COL_TRI(255, 791, 256), - COL_TRI(256, 792, 253), - COL_TRI(256, 791, 792), - COL_TRI(253, 792, 789), - COL_TRI(257, 793, 258), - COL_TRI(258, 794, 259), - COL_TRI(261, 800, 262), - COL_TRI(257, 795, 793), - COL_TRI(259, 794, 796), - COL_TRI(259, 796, 260), - COL_TRI(260, 797, 798), - COL_TRI(260, 796, 797), - COL_TRI(261, 799, 800), - COL_TRI(262, 800, 801), - COL_TRI(261, 262, 263), - COL_TRI(262, 801, 263), - COL_TRI(263, 802, 803), - COL_TRI(261, 263, 803), - COL_TRI(263, 801, 802), - COL_TRI(264, 804, 805), - COL_TRI(264, 806, 804), - COL_TRI(264, 805, 266), - COL_TRI(265, 806, 264), - COL_TRI(264, 269, 811), - COL_TRI(265, 807, 806), - COL_TRI(266, 805, 808), - COL_TRI(266, 809, 265), - COL_TRI(266, 808, 809), - COL_TRI(265, 809, 807), - COL_TRI(264, 810, 265), - COL_TRI(264, 268, 810), - COL_TRI(264, 811, 268), - COL_TRI(270, 795, 257), - COL_TRI(267, 268, 811), - COL_TRI(267, 812, 268), - COL_TRI(268, 813, 810), - COL_TRI(268, 812, 813), - COL_TRI(269, 267, 811), - COL_TRI(269, 814, 267), - COL_TRI(267, 813, 812), - COL_TRI(267, 815, 813), - COL_TRI(267, 816, 815), - COL_TRI(267, 814, 816), - COL_TRI(270, 817, 795), - COL_TRI(250, 273, 271), - COL_TRI(250, 272, 273), - COL_TRI(271, 274, 250), - COL_TRI(272, 251, 273), - COL_TRI(273, 252, 271), - COL_TRI(274, 227, 250), - COL_TRI(274, 770, 227), - COL_TRI(279, 822, 823), - COL_TRI(275, 278, 276), - COL_TRI(275, 277, 278), - COL_TRI(275, 818, 277), - COL_TRI(275, 819, 818), - COL_TRI(276, 819, 275), - COL_TRI(276, 820, 819), - COL_TRI(277, 818, 821), - COL_TRI(277, 821, 278), - COL_TRI(278, 820, 276), - COL_TRI(278, 821, 820), - COL_TRI(279, 281, 282), - COL_TRI(279, 282, 280), - COL_TRI(280, 822, 279), - COL_TRI(279, 823, 281), - COL_TRI(281, 823, 824), - COL_TRI(281, 824, 282), - COL_TRI(282, 283, 280), - COL_TRI(282, 824, 283), - COL_TRI(280, 283, 822), - COL_TRI(283, 823, 822), - COL_TRI(283, 824, 823), - COL_TRI(284, 285, 825), - COL_TRI(285, 826, 825), - COL_TRI(285, 286, 826), - COL_TRI(286, 827, 828), - COL_TRI(286, 828, 826), - COL_TRI(289, 290, 830), - COL_TRI(284, 825, 289), - COL_TRI(287, 288, 829), - COL_TRI(288, 827, 829), - COL_TRI(288, 828, 827), - COL_TRI(287, 829, 291), - COL_TRI(289, 830, 284), - COL_TRI(293, 836, 835), - COL_TRI(290, 831, 830), - COL_TRI(290, 832, 831), - COL_TRI(291, 831, 832), - COL_TRI(291, 832, 287), - COL_TRI(292, 833, 295), - COL_TRI(292, 295, 834), - COL_TRI(292, 835, 833), - COL_TRI(292, 293, 835), - COL_TRI(300, 842, 298), - COL_TRI(294, 838, 839), - COL_TRI(294, 839, 840), - COL_TRI(294, 840, 841), - COL_TRI(295, 296, 837), - COL_TRI(296, 839, 838), - COL_TRI(296, 838, 837), - COL_TRI(295, 837, 834), - COL_TRI(297, 842, 300), - COL_TRI(297, 300, 843), - COL_TRI(298, 297, 299), - COL_TRI(298, 842, 297), - COL_TRI(299, 297, 843), - COL_TRI(305, 846, 845), - COL_TRI(301, 843, 300), - COL_TRI(302, 300, 298), - COL_TRI(301, 300, 302), - COL_TRI(299, 843, 301), - COL_TRI(303, 306, 304), - COL_TRI(303, 305, 306), - COL_TRI(304, 844, 303), - COL_TRI(305, 845, 306), - COL_TRI(301, 847, 299), - COL_TRI(306, 307, 304), - COL_TRI(306, 845, 307), - COL_TRI(304, 307, 844), - COL_TRI(307, 846, 844), - COL_TRI(307, 845, 846), - COL_TRI(298, 308, 302), - COL_TRI(308, 301, 302), - COL_TRI(308, 847, 301), - COL_TRI(298, 847, 308), - COL_TRI(298, 299, 847), - COL_TRI(38, 19, 27), - COL_TRI(24, 309, 36), - COL_TRI(36, 309, 848), - COL_TRI(36, 848, 35), - COL_TRI(309, 849, 848), - COL_TRI(35, 848, 849), - COL_TRI(35, 849, 34), - COL_TRI(309, 850, 849), - COL_TRI(24, 850, 309), - COL_TRI(34, 849, 850), - COL_TRI(34, 850, 24), - COL_TRI(27, 18, 26), - COL_TRI(27, 19, 18), - COL_TRI(18, 16, 29), - COL_TRI(26, 18, 29), - COL_TRI(38, 17, 19), - COL_TRI(29, 16, 15), - COL_TRI(29, 15, 33), - COL_TRI(40, 17, 38), - COL_TRI(40, 14, 17), - COL_TRI(32, 14, 40), - COL_TRI(33, 15, 44), - COL_TRI(44, 249, 788), - COL_TRI(44, 788, 32), - COL_TRI(15, 249, 44), - COL_TRI(32, 788, 14), - COL_TRI(41, 310, 30), - COL_TRI(310, 311, 30), - COL_TRI(30, 311, 31), - COL_TRI(311, 313, 31), - COL_TRI(311, 310, 312), - COL_TRI(312, 313, 311), - COL_TRI(31, 313, 47), - COL_TRI(45, 313, 321), - COL_TRI(313, 312, 321), - COL_TRI(314, 318, 39), - COL_TRI(315, 318, 314), - COL_TRI(314, 39, 42), - COL_TRI(316, 314, 42), - COL_TRI(321, 312, 316), - COL_TRI(317, 851, 318), - COL_TRI(23, 318, 851), - COL_TRI(315, 317, 318), - COL_TRI(318, 23, 39), - COL_TRI(23, 851, 22), - COL_TRI(317, 852, 851), - COL_TRI(37, 852, 319), - COL_TRI(37, 319, 25), - COL_TRI(319, 853, 28), - COL_TRI(319, 28, 25), - COL_TRI(22, 851, 852), - COL_TRI(22, 852, 37), - COL_TRI(43, 316, 42), - COL_TRI(41, 28, 853), - COL_TRI(41, 853, 310), - COL_TRI(312, 320, 316), - COL_TRI(320, 315, 316), - COL_TRI(315, 314, 316), - COL_TRI(43, 321, 316), - COL_TRI(322, 370, 856), - COL_TRI(45, 321, 43), - COL_TRI(46, 313, 45), - COL_TRI(46, 47, 313), - COL_TRI(322, 362, 324), - COL_TRI(322, 854, 362), - COL_TRI(322, 327, 855), - COL_TRI(322, 855, 854), - COL_TRI(323, 370, 322), - COL_TRI(323, 860, 328), - COL_TRI(324, 362, 857), - COL_TRI(324, 857, 326), - COL_TRI(325, 863, 324), - COL_TRI(326, 325, 324), - COL_TRI(326, 857, 858), - COL_TRI(327, 326, 858), - COL_TRI(327, 858, 859), - COL_TRI(327, 859, 855), - COL_TRI(328, 860, 864), - COL_TRI(329, 328, 864), - COL_TRI(323, 861, 860), - COL_TRI(329, 864, 865), - COL_TRI(330, 329, 866), - COL_TRI(329, 865, 866), - COL_TRI(330, 371, 329), - COL_TRI(330, 866, 867), - COL_TRI(330, 868, 323), - COL_TRI(330, 869, 868), - COL_TRI(330, 870, 371), - COL_TRI(331, 870, 330), - COL_TRI(328, 332, 323), - COL_TRI(332, 862, 323), - COL_TRI(323, 862, 370), - COL_TRI(333, 335, 334), - COL_TRI(333, 872, 335), - COL_TRI(334, 335, 331), - COL_TRI(335, 336, 331), - COL_TRI(336, 337, 331), - COL_TRI(337, 338, 331), - COL_TRI(338, 871, 331), - COL_TRI(331, 871, 870), - COL_TRI(370, 862, 332), - COL_TRI(342, 873, 341), - COL_TRI(339, 340, 333), - COL_TRI(340, 872, 333), - COL_TRI(339, 333, 338), - COL_TRI(334, 374, 333), - COL_TRI(337, 339, 338), - COL_TRI(338, 399, 871), - COL_TRI(341, 345, 342), - COL_TRI(341, 343, 345), - COL_TRI(343, 344, 345), - COL_TRI(344, 372, 345), - COL_TRI(345, 401, 342), - COL_TRI(342, 874, 873), - COL_TRI(346, 347, 876), - COL_TRI(347, 877, 876), - COL_TRI(348, 876, 877), - COL_TRI(348, 878, 876), - COL_TRI(349, 410, 879), - COL_TRI(349, 351, 410), - COL_TRI(350, 349, 879), - COL_TRI(350, 347, 349), - COL_TRI(349, 880, 351), - COL_TRI(349, 881, 880), - COL_TRI(351, 880, 882), - COL_TRI(351, 882, 352), - COL_TRI(352, 882, 878), - COL_TRI(351, 352, 410), - COL_TRI(352, 423, 410), - COL_TRI(352, 348, 423), - COL_TRI(352, 878, 348), - COL_TRI(353, 356, 357), - COL_TRI(353, 354, 356), - COL_TRI(354, 355, 356), - COL_TRI(359, 353, 885), - COL_TRI(355, 872, 340), - COL_TRI(355, 340, 356), - COL_TRI(356, 340, 339), - COL_TRI(357, 339, 337), - COL_TRI(356, 339, 357), - COL_TRI(353, 357, 885), - COL_TRI(357, 337, 885), - COL_TRI(336, 358, 337), - COL_TRI(358, 885, 337), - COL_TRI(359, 885, 358), - COL_TRI(360, 361, 355), - COL_TRI(359, 361, 360), - COL_TRI(359, 358, 361), - COL_TRI(361, 872, 355), - COL_TRI(361, 335, 872), - COL_TRI(360, 355, 354), - COL_TRI(362, 363, 857), - COL_TRI(363, 889, 857), - COL_TRI(364, 858, 857), - COL_TRI(364, 857, 889), - COL_TRI(365, 416, 890), - COL_TRI(365, 367, 416), - COL_TRI(366, 365, 890), - COL_TRI(366, 363, 365), - COL_TRI(365, 855, 367), - COL_TRI(365, 854, 855), - COL_TRI(367, 855, 859), - COL_TRI(367, 368, 416), - COL_TRI(367, 859, 368), - COL_TRI(368, 859, 858), - COL_TRI(368, 369, 416), - COL_TRI(368, 364, 369), - COL_TRI(368, 858, 364), - COL_TRI(369, 363, 366), - COL_TRI(344, 863, 325), - COL_TRI(364, 889, 369), - COL_TRI(369, 889, 363), - COL_TRI(370, 332, 856), - COL_TRI(371, 871, 399), - COL_TRI(371, 870, 871), - COL_TRI(344, 325, 372), - COL_TRI(373, 874, 342), - COL_TRI(372, 325, 892), - COL_TRI(325, 326, 892), - COL_TRI(345, 372, 892), - COL_TRI(373, 374, 874), - COL_TRI(373, 333, 374), - COL_TRI(374, 873, 874), - COL_TRI(374, 875, 873), - COL_TRI(334, 875, 374), - COL_TRI(380, 899, 379), - COL_TRI(375, 378, 893), - COL_TRI(375, 376, 378), - COL_TRI(376, 894, 383), - COL_TRI(376, 383, 378), - COL_TRI(377, 893, 378), - COL_TRI(378, 895, 377), - COL_TRI(378, 383, 895), - COL_TRI(377, 896, 893), - COL_TRI(379, 897, 380), - COL_TRI(379, 898, 897), - COL_TRI(381, 380, 897), - COL_TRI(380, 900, 899), - COL_TRI(381, 900, 380), - COL_TRI(381, 897, 901), - COL_TRI(382, 894, 385), - COL_TRI(382, 383, 894), - COL_TRI(383, 382, 390), - COL_TRI(383, 390, 895), - COL_TRI(386, 326, 327), - COL_TRI(384, 895, 904), - COL_TRI(382, 902, 390), - COL_TRI(382, 903, 902), - COL_TRI(385, 903, 382), - COL_TRI(322, 856, 327), - COL_TRI(386, 327, 424), - COL_TRI(387, 395, 388), - COL_TRI(388, 899, 900), - COL_TRI(388, 900, 387), - COL_TRI(389, 387, 900), - COL_TRI(389, 391, 387), - COL_TRI(390, 392, 391), - COL_TRI(390, 391, 394), - COL_TRI(391, 392, 387), - COL_TRI(392, 395, 387), - COL_TRI(381, 389, 900), - COL_TRI(392, 902, 903), - COL_TRI(390, 394, 904), - COL_TRI(390, 902, 392), - COL_TRI(393, 394, 381), - COL_TRI(394, 389, 381), - COL_TRI(384, 904, 905), - COL_TRI(395, 392, 903), - COL_TRI(397, 909, 338), - COL_TRI(396, 906, 907), - COL_TRI(396, 908, 906), - COL_TRI(329, 424, 328), - COL_TRI(329, 397, 424), - COL_TRI(329, 909, 397), - COL_TRI(329, 371, 909), - COL_TRI(333, 401, 397), - COL_TRI(333, 397, 338), - COL_TRI(400, 397, 401), - COL_TRI(397, 910, 424), - COL_TRI(398, 424, 910), - COL_TRI(398, 386, 424), - COL_TRI(345, 386, 401), - COL_TRI(399, 338, 909), - COL_TRI(397, 400, 910), - COL_TRI(402, 403, 408), - COL_TRI(400, 401, 911), - COL_TRI(333, 373, 401), - COL_TRI(401, 373, 342), - COL_TRI(386, 398, 401), - COL_TRI(398, 911, 401), - COL_TRI(402, 398, 405), - COL_TRI(403, 402, 405), - COL_TRI(402, 408, 404), - COL_TRI(402, 911, 398), - COL_TRI(404, 911, 402), - COL_TRI(404, 400, 911), - COL_TRI(405, 398, 910), - COL_TRI(405, 910, 406), - COL_TRI(406, 910, 400), - COL_TRI(406, 400, 404), - COL_TRI(371, 399, 909), - COL_TRI(406, 413, 405), - COL_TRI(406, 407, 413), - COL_TRI(408, 423, 407), - COL_TRI(407, 423, 883), - COL_TRI(407, 416, 369), - COL_TRI(407, 369, 413), - COL_TRI(407, 891, 416), - COL_TRI(407, 406, 404), - COL_TRI(407, 404, 408), - COL_TRI(403, 353, 408), - COL_TRI(408, 410, 423), - COL_TRI(409, 417, 408), - COL_TRI(410, 408, 417), - COL_TRI(353, 409, 408), - COL_TRI(407, 883, 891), - COL_TRI(403, 354, 353), - COL_TRI(411, 403, 413), - COL_TRI(412, 886, 403), - COL_TRI(411, 412, 403), - COL_TRI(403, 886, 354), - COL_TRI(403, 405, 413), - COL_TRI(411, 413, 420), - COL_TRI(413, 912, 419), - COL_TRI(413, 419, 420), - COL_TRI(413, 369, 912), - COL_TRI(350, 883, 423), - COL_TRI(350, 414, 883), - COL_TRI(414, 415, 883), - COL_TRI(415, 891, 883), - COL_TRI(416, 891, 415), - COL_TRI(359, 409, 353), - COL_TRI(359, 888, 409), - COL_TRI(417, 409, 888), - COL_TRI(410, 417, 884), - COL_TRI(417, 888, 884), - COL_TRI(420, 419, 914), - COL_TRI(418, 886, 412), - COL_TRI(418, 412, 411), - COL_TRI(354, 886, 887), - COL_TRI(418, 887, 886), - COL_TRI(419, 912, 913), - COL_TRI(366, 912, 369), - COL_TRI(366, 913, 912), - COL_TRI(419, 913, 914), - COL_TRI(410, 884, 879), - COL_TRI(421, 418, 411), - COL_TRI(420, 914, 422), - COL_TRI(422, 411, 420), - COL_TRI(354, 887, 360), - COL_TRI(327, 425, 424), - COL_TRI(423, 877, 347), - COL_TRI(348, 877, 423), - COL_TRI(423, 347, 350), - COL_TRI(416, 415, 890), - COL_TRI(424, 425, 328), - COL_TRI(425, 332, 328), - COL_TRI(425, 327, 856), - COL_TRI(425, 856, 332), - COL_TRI(430, 432, 919), - COL_TRI(386, 892, 326), - COL_TRI(345, 892, 386), - COL_TRI(426, 915, 428), - COL_TRI(426, 916, 915), - COL_TRI(427, 916, 426), - COL_TRI(427, 917, 916), - COL_TRI(428, 915, 918), - COL_TRI(428, 918, 429), - COL_TRI(429, 917, 427), - COL_TRI(429, 918, 917), - COL_TRI(433, 925, 431), - COL_TRI(430, 919, 920), - COL_TRI(430, 921, 349), - COL_TRI(430, 922, 921), - COL_TRI(430, 923, 922), - COL_TRI(430, 920, 923), - COL_TRI(431, 924, 433), - COL_TRI(432, 433, 919), - COL_TRI(432, 925, 433), - COL_TRI(437, 439, 436), - COL_TRI(431, 435, 924), - COL_TRI(431, 926, 435), - COL_TRI(431, 434, 926), - COL_TRI(431, 347, 434), - COL_TRI(434, 922, 926), - COL_TRI(434, 921, 922), - COL_TRI(435, 920, 924), - COL_TRI(435, 923, 920), - COL_TRI(436, 927, 928), - COL_TRI(436, 439, 927), - COL_TRI(445, 931, 443), - COL_TRI(437, 442, 439), - COL_TRI(438, 439, 440), - COL_TRI(438, 927, 439), - COL_TRI(439, 442, 929), - COL_TRI(440, 439, 929), - COL_TRI(441, 442, 437), - COL_TRI(441, 930, 442), - COL_TRI(442, 444, 929), - COL_TRI(442, 930, 444), - COL_TRI(443, 930, 441), - COL_TRI(443, 931, 930), - COL_TRI(444, 930, 931), - COL_TRI(450, 929, 449), - COL_TRI(445, 932, 931), - COL_TRI(446, 931, 932), - COL_TRI(444, 931, 446), - COL_TRI(446, 932, 933), - COL_TRI(447, 446, 448), - COL_TRI(448, 934, 935), - COL_TRI(448, 446, 934), - COL_TRI(447, 444, 446), - COL_TRI(449, 444, 447), - COL_TRI(449, 929, 444), - COL_TRI(450, 440, 929), - COL_TRI(451, 440, 450), - COL_TRI(451, 936, 440), - COL_TRI(452, 937, 938), - COL_TRI(452, 939, 937), - COL_TRI(452, 940, 939), - COL_TRI(452, 941, 940), - COL_TRI(453, 940, 941), - COL_TRI(453, 942, 940), - COL_TRI(454, 943, 944), - COL_TRI(454, 945, 943), - COL_TRI(455, 454, 944), - COL_TRI(456, 945, 946), - COL_TRI(456, 943, 945), - COL_TRI(457, 943, 456), - COL_TRI(457, 944, 943), - COL_TRI(455, 944, 457), - COL_TRI(422, 421, 411), - COL_TRI(458, 947, 948), - COL_TRI(458, 948, 949), - COL_TRI(459, 460, 950), - COL_TRI(460, 951, 950), - COL_TRI(461, 465, 464), - COL_TRI(461, 464, 952), - COL_TRI(462, 952, 464), - COL_TRI(462, 463, 952), - COL_TRI(466, 955, 465), - COL_TRI(464, 465, 953), - COL_TRI(464, 953, 462), - COL_TRI(462, 953, 954), - COL_TRI(462, 954, 463), - COL_TRI(463, 954, 461), - COL_TRI(463, 461, 952), - COL_TRI(465, 467, 466), - COL_TRI(465, 461, 467), - COL_TRI(481, 480, 955), - COL_TRI(461, 956, 480), - COL_TRI(461, 480, 467), - COL_TRI(467, 480, 481), - COL_TRI(467, 481, 466), - COL_TRI(466, 481, 955), - COL_TRI(468, 469, 957), - COL_TRI(469, 467, 958), - COL_TRI(469, 468, 467), - COL_TRI(475, 472, 959), - COL_TRI(470, 468, 957), - COL_TRI(471, 466, 957), - COL_TRI(466, 470, 957), - COL_TRI(472, 473, 477), - COL_TRI(473, 472, 476), - COL_TRI(472, 475, 476), - COL_TRI(474, 472, 477), - COL_TRI(474, 959, 472), - COL_TRI(476, 475, 478), - COL_TRI(477, 478, 474), - COL_TRI(475, 959, 960), - COL_TRI(475, 960, 479), - COL_TRI(475, 479, 962), - COL_TRI(478, 962, 474), - COL_TRI(479, 474, 962), - COL_TRI(479, 961, 474), - COL_TRI(474, 961, 959), - COL_TRI(480, 956, 955), - COL_TRI(490, 491, 967), - COL_TRI(482, 963, 483), - COL_TRI(483, 964, 965), - COL_TRI(483, 965, 488), - COL_TRI(484, 482, 483), - COL_TRI(483, 488, 484), - COL_TRI(485, 964, 483), - COL_TRI(485, 483, 963), - COL_TRI(486, 965, 966), - COL_TRI(486, 488, 965), - COL_TRI(487, 488, 489), - COL_TRI(488, 487, 484), - COL_TRI(488, 486, 489), - COL_TRI(489, 486, 482), - COL_TRI(486, 963, 482), - COL_TRI(486, 966, 485), - COL_TRI(486, 485, 963), - COL_TRI(495, 971, 497), - COL_TRI(491, 492, 967), - COL_TRI(492, 494, 967), - COL_TRI(493, 494, 968), - COL_TRI(494, 493, 967), - COL_TRI(493, 968, 969), - COL_TRI(490, 969, 968), - COL_TRI(490, 968, 491), - COL_TRI(495, 970, 971), - COL_TRI(500, 975, 499), - COL_TRI(496, 970, 495), - COL_TRI(496, 973, 970), - COL_TRI(497, 971, 972), - COL_TRI(497, 972, 498), - COL_TRI(495, 497, 498), - COL_TRI(498, 973, 496), - COL_TRI(495, 498, 496), - COL_TRI(498, 972, 973), - COL_TRI(499, 974, 501), - COL_TRI(499, 502, 500), - COL_TRI(499, 501, 502), - COL_TRI(499, 975, 974), - COL_TRI(501, 974, 976), - COL_TRI(501, 976, 502), - COL_TRI(502, 977, 500), - COL_TRI(502, 976, 977), - COL_TRI(500, 977, 975), - COL_TRI(503, 978, 979), - COL_TRI(503, 979, 980), - COL_TRI(504, 978, 503), - COL_TRI(504, 503, 505), - COL_TRI(505, 503, 980), - COL_TRI(69, 509, 981), - COL_TRI(506, 980, 979), - COL_TRI(506, 979, 507), - COL_TRI(507, 979, 978), - COL_TRI(505, 980, 506), - COL_TRI(507, 978, 504), - COL_TRI(68, 64, 508), - COL_TRI(68, 508, 509), - COL_TRI(69, 68, 509), - COL_TRI(516, 518, 519), - COL_TRI(510, 981, 509), - COL_TRI(511, 512, 515), - COL_TRI(511, 513, 512), - COL_TRI(512, 982, 514), - COL_TRI(512, 514, 515), - COL_TRI(513, 982, 512), - COL_TRI(513, 983, 982), - COL_TRI(514, 982, 983), - COL_TRI(515, 514, 984), - COL_TRI(514, 983, 984), - COL_TRI(515, 984, 511), - COL_TRI(516, 519, 517), - COL_TRI(522, 523, 524), - COL_TRI(518, 986, 519), - COL_TRI(518, 987, 986), - COL_TRI(519, 986, 520), - COL_TRI(519, 520, 517), - COL_TRI(517, 520, 985), - COL_TRI(517, 985, 516), - COL_TRI(520, 987, 985), - COL_TRI(520, 986, 987), - COL_TRI(521, 988, 522), - COL_TRI(522, 524, 521), - COL_TRI(526, 993, 991), - COL_TRI(523, 989, 524), - COL_TRI(523, 990, 989), - COL_TRI(524, 989, 525), - COL_TRI(524, 525, 521), - COL_TRI(521, 525, 988), - COL_TRI(525, 990, 988), - COL_TRI(525, 989, 990), - COL_TRI(526, 991, 527), - COL_TRI(527, 530, 992), - COL_TRI(527, 991, 530), - COL_TRI(526, 528, 529), - COL_TRI(528, 994, 529), - COL_TRI(529, 993, 526), - COL_TRI(529, 994, 993), - COL_TRI(526, 992, 528), - COL_TRI(526, 527, 992), - COL_TRI(528, 992, 530), - COL_TRI(528, 995, 994), - COL_TRI(528, 530, 995), - COL_TRI(530, 994, 995), - COL_TRI(530, 993, 994), - COL_TRI(530, 991, 993), - COL_TRI(537, 539, 536), - COL_TRI(531, 532, 996), - COL_TRI(532, 533, 997), - COL_TRI(532, 997, 996), - COL_TRI(533, 532, 998), - COL_TRI(531, 998, 532), - COL_TRI(531, 997, 534), - COL_TRI(531, 996, 997), - COL_TRI(534, 997, 533), - COL_TRI(534, 533, 535), - COL_TRI(535, 533, 998), - COL_TRI(536, 539, 999), - COL_TRI(536, 999, 538), - COL_TRI(543, 1003, 1004), - COL_TRI(538, 999, 1000), - COL_TRI(539, 1000, 999), - COL_TRI(538, 1000, 540), - COL_TRI(539, 1001, 1000), - COL_TRI(537, 1001, 539), - COL_TRI(540, 1000, 1001), - COL_TRI(540, 1001, 537), - COL_TRI(541, 1002, 542), - COL_TRI(542, 1002, 1003), - COL_TRI(542, 1003, 543), - COL_TRI(543, 1004, 544), - COL_TRI(541, 1005, 1002), - COL_TRI(544, 1005, 541), - COL_TRI(544, 1004, 1005), - COL_TRI(545, 573, 546), - COL_TRI(546, 548, 547), - COL_TRI(546, 547, 545), - COL_TRI(546, 573, 1006), - COL_TRI(546, 1006, 548), - COL_TRI(547, 1007, 545), - COL_TRI(548, 1008, 547), - COL_TRI(547, 1008, 1007), - COL_TRI(545, 1007, 573), - COL_TRI(548, 1006, 1008), - COL_TRI(554, 553, 1015), - COL_TRI(549, 1009, 1010), - COL_TRI(549, 1010, 1011), - COL_TRI(550, 549, 1011), - COL_TRI(551, 1012, 1010), - COL_TRI(551, 1010, 1009), - COL_TRI(550, 1011, 1013), - COL_TRI(552, 1012, 551), - COL_TRI(552, 551, 1014), - COL_TRI(553, 552, 1014), - COL_TRI(553, 1014, 1015), - COL_TRI(554, 550, 555), - COL_TRI(554, 1015, 550), - COL_TRI(550, 1013, 1016), - COL_TRI(550, 1016, 555), - COL_TRI(556, 560, 1020), - COL_TRI(554, 1017, 553), - COL_TRI(555, 1016, 1017), - COL_TRI(555, 1017, 554), - COL_TRI(556, 1018, 559), - COL_TRI(557, 1019, 556), - COL_TRI(556, 1019, 1018), - COL_TRI(558, 1018, 1019), - COL_TRI(559, 1018, 558), - COL_TRI(558, 1019, 557), - COL_TRI(556, 1020, 557), - COL_TRI(557, 1020, 561), - COL_TRI(560, 561, 1020), - COL_TRI(557, 561, 558), - COL_TRI(559, 560, 556), - COL_TRI(560, 1021, 561), - COL_TRI(559, 1021, 560), - COL_TRI(561, 1021, 559), - COL_TRI(558, 561, 559), - COL_TRI(562, 1022, 1023), - COL_TRI(562, 568, 1022), - COL_TRI(562, 563, 1024), - COL_TRI(562, 1023, 563), - COL_TRI(563, 1025, 1024), - COL_TRI(563, 564, 1025), - COL_TRI(564, 1028, 1025), - COL_TRI(564, 1029, 1028), - COL_TRI(565, 567, 566), - COL_TRI(566, 567, 1028), - COL_TRI(566, 1029, 1030), - COL_TRI(566, 1028, 1029), - COL_TRI(566, 570, 565), - COL_TRI(566, 1030, 570), - COL_TRI(567, 1031, 1028), - COL_TRI(568, 569, 1022), - COL_TRI(568, 571, 569), - COL_TRI(569, 571, 565), - COL_TRI(570, 569, 565), - COL_TRI(568, 1026, 571), - COL_TRI(568, 1027, 1026), - COL_TRI(571, 1032, 565), - COL_TRI(565, 1032, 567), - COL_TRI(571, 1026, 1032), - COL_TRI(572, 1033, 1034), - COL_TRI(572, 1034, 573), - COL_TRI(573, 1035, 1036), - COL_TRI(573, 1036, 572), - COL_TRI(574, 576, 1037), - COL_TRI(574, 1037, 1038), - COL_TRI(575, 574, 1038), - COL_TRI(576, 1039, 1040), - COL_TRI(576, 1040, 1037), - COL_TRI(575, 1040, 1039), - COL_TRI(579, 1044, 1045), - COL_TRI(575, 1039, 1041), - COL_TRI(575, 1041, 574), - COL_TRI(577, 1042, 1043), - COL_TRI(577, 1044, 1042), - COL_TRI(578, 577, 1043), - COL_TRI(579, 1042, 1044), - COL_TRI(582, 53, 52), - COL_TRI(579, 1045, 578), - COL_TRI(579, 578, 580), - COL_TRI(580, 1042, 579), - COL_TRI(578, 579, 1045), - COL_TRI(578, 580, 579), - COL_TRI(578, 1043, 580), - COL_TRI(580, 1043, 1042), - COL_TRI(581, 55, 54), - COL_TRI(581, 54, 1046), - COL_TRI(582, 1047, 53), - COL_TRI(583, 1048, 1049), - COL_TRI(583, 1049, 1050), - COL_TRI(584, 1049, 1048), - COL_TRI(584, 1048, 586), - COL_TRI(585, 1048, 583), - COL_TRI(585, 586, 1048), - COL_TRI(586, 585, 1051), - COL_TRI(586, 1051, 584), - COL_TRI(590, 1054, 1055), - COL_TRI(587, 1053, 1051), - COL_TRI(587, 1051, 585), - COL_TRI(588, 1053, 587), - COL_TRI(588, 587, 585), - COL_TRI(588, 585, 583), - COL_TRI(588, 1052, 1053), - COL_TRI(583, 1050, 1052), - COL_TRI(583, 1052, 588), - COL_TRI(589, 1054, 590), - COL_TRI(590, 1055, 591), - COL_TRI(594, 1060, 1059), - COL_TRI(589, 1056, 1054), - COL_TRI(591, 1055, 1057), - COL_TRI(591, 1057, 592), - COL_TRI(592, 1057, 1056), - COL_TRI(592, 1056, 589), - COL_TRI(593, 1058, 595), - COL_TRI(593, 1059, 1058), - COL_TRI(594, 1059, 593), - COL_TRI(600, 1062, 1063), - COL_TRI(595, 1058, 1061), - COL_TRI(595, 1061, 596), - COL_TRI(596, 1061, 1060), - COL_TRI(596, 1060, 594), - COL_TRI(597, 1062, 600), - COL_TRI(598, 1062, 597), - COL_TRI(597, 600, 601), - COL_TRI(599, 597, 601), - COL_TRI(599, 598, 597), - COL_TRI(598, 1063, 1062), - COL_TRI(606, 1066, 1067), - COL_TRI(600, 1063, 1064), - COL_TRI(601, 600, 1064), - COL_TRI(601, 1064, 599), - COL_TRI(602, 1065, 603), - COL_TRI(603, 605, 602), - COL_TRI(603, 604, 605), - COL_TRI(604, 1066, 605), - COL_TRI(604, 1067, 1066), - COL_TRI(605, 1066, 606), - COL_TRI(605, 606, 602), - COL_TRI(602, 606, 1065), - COL_TRI(606, 1067, 1065), - COL_TRI(607, 612, 608), - COL_TRI(608, 609, 607), - COL_TRI(608, 1068, 609), - COL_TRI(609, 1069, 607), - COL_TRI(607, 611, 612), - COL_TRI(607, 610, 611), - COL_TRI(610, 1070, 611), - COL_TRI(610, 1071, 1070), - COL_TRI(611, 613, 612), - COL_TRI(611, 1070, 613), - COL_TRI(612, 1072, 608), - COL_TRI(612, 613, 1072), - COL_TRI(615, 1074, 1075), - COL_TRI(613, 1069, 614), - COL_TRI(614, 1072, 613), - COL_TRI(614, 1073, 1072), - COL_TRI(608, 1073, 1068), - COL_TRI(608, 1072, 1073), - COL_TRI(613, 1071, 1069), - COL_TRI(613, 1070, 1071), - COL_TRI(609, 614, 1069), - COL_TRI(619, 621, 620), - COL_TRI(615, 1076, 1074), - COL_TRI(617, 1074, 1076), - COL_TRI(617, 1076, 1077), - COL_TRI(617, 616, 618), - COL_TRI(617, 1077, 616), - COL_TRI(618, 1074, 617), - COL_TRI(616, 1075, 618), - COL_TRI(618, 1075, 1074), - COL_TRI(616, 615, 1075), - COL_TRI(619, 620, 622), - COL_TRI(70, 510, 1082), - COL_TRI(620, 1078, 1079), - COL_TRI(621, 1078, 620), - COL_TRI(621, 1081, 1078), - COL_TRI(622, 1079, 1080), - COL_TRI(620, 1079, 622), - COL_TRI(622, 1080, 619), - COL_TRI(619, 1081, 621), - COL_TRI(619, 1080, 1081), - COL_TRI(65, 623, 70), - COL_TRI(70, 623, 510), - COL_TRI(508, 1082, 510), - COL_TRI(510, 509, 508), - COL_TRI_INIT(SURFACE_BURNING, 4), - COL_TRI(56, 57, 58), - COL_TRI(56, 58, 59), - COL_TRI(60, 61, 62), - COL_TRI(60, 63, 61), - COL_TRI_INIT(SURFACE_DEATH_PLANE, 2), - COL_TRI(1083, 1084, 1085), - COL_TRI(1083, 1085, 1086), - COL_TRI_INIT(SURFACE_VERY_SLIPPERY, 2), - COL_TRI(52, 53, 54), - COL_TRI(52, 54, 55), - COL_TRI_INIT(SURFACE_NOT_SLIPPERY, 209), - COL_TRI(649, 650, 108), - COL_TRI(630, 629, 631), - COL_TRI(630, 631, 632), - COL_TRI(639, 638, 637), - COL_TRI(639, 637, 636), - COL_TRI(647, 646, 624), - COL_TRI(647, 624, 79), - COL_TRI(669, 661, 120), - COL_TRI(649, 648, 650), - COL_TRI(656, 74, 73), - COL_TRI(656, 73, 78), - COL_TRI(657, 118, 658), - COL_TRI(657, 658, 121), - COL_TRI(669, 120, 117), - COL_TRI(683, 682, 684), - COL_TRI(676, 670, 132), - COL_TRI(676, 136, 670), - COL_TRI(672, 671, 673), - COL_TRI(672, 673, 134), - COL_TRI(679, 678, 680), - COL_TRI(679, 680, 141), - COL_TRI(1088, 690, 149), - COL_TRI(683, 684, 142), - COL_TRI(686, 677, 139), - COL_TRI(686, 681, 677), - COL_TRI(1087, 692, 1088), - COL_TRI(1087, 695, 692), - COL_TRI(1088, 692, 690), - COL_TRI(161, 704, 703), - COL_TRI(689, 688, 691), - COL_TRI(689, 691, 151), - COL_TRI(1089, 696, 153), - COL_TRI(1089, 699, 696), - COL_TRI(148, 4, 700), - COL_TRI(148, 700, 156), - COL_TRI(161, 162, 704), - COL_TRI(161, 163, 162), - COL_TRI(161, 709, 163), - COL_TRI(161, 703, 705), - COL_TRI(161, 705, 160), - COL_TRI(115, 110, 95), - COL_TRI(115, 95, 1097), - COL_TRI(667, 125, 668), - COL_TRI(167, 171, 712), - COL_TRI(667, 666, 125), - COL_TRI(1090, 1098, 1099), - COL_TRI(1090, 1100, 1098), - COL_TRI(167, 717, 719), - COL_TRI(167, 168, 717), - COL_TRI(167, 719, 170), - COL_TRI(167, 712, 711), - COL_TRI(167, 170, 171), - COL_TRI(723, 174, 750), - COL_TRI(723, 750, 722), - COL_TRI(750, 174, 721), - COL_TRI(750, 721, 751), - COL_TRI(724, 751, 721), - COL_TRI(724, 721, 720), - COL_TRI(725, 727, 728), - COL_TRI(725, 728, 179), - COL_TRI(755, 753, 752), - COL_TRI(765, 762, 761), - COL_TRI(761, 216, 765), - COL_TRI(761, 212, 216), - COL_TRI(761, 759, 212), - COL_TRI(761, 760, 759), - COL_TRI(765, 763, 762), - COL_TRI(247, 773, 230), - COL_TRI(247, 774, 773), - COL_TRI(770, 271, 228), - COL_TRI(755, 776, 753), - COL_TRI(273, 771, 252), - COL_TRI(273, 226, 771), - COL_TRI(769, 251, 272), - COL_TRI(769, 272, 224), - COL_TRI(770, 274, 271), - COL_TRI(792, 790, 789), - COL_TRI(792, 791, 790), - COL_TRI(795, 797, 796), - COL_TRI(795, 796, 794), - COL_TRI(795, 794, 793), - COL_TRI(795, 817, 797), - COL_TRI(818, 819, 820), - COL_TRI(818, 820, 821), - COL_TRI(836, 840, 839), - COL_TRI(287, 825, 826), - COL_TRI(287, 289, 825), - COL_TRI(287, 826, 828), - COL_TRI(287, 828, 288), - COL_TRI(287, 290, 289), - COL_TRI(287, 832, 290), - COL_TRI(836, 841, 840), - COL_TRI(836, 295, 833), - COL_TRI(836, 296, 295), - COL_TRI(836, 839, 296), - COL_TRI(363, 362, 854), - COL_TRI(836, 833, 835), - COL_TRI(303, 844, 846), - COL_TRI(303, 846, 305), - COL_TRI(358, 335, 361), - COL_TRI(358, 336, 335), - COL_TRI(363, 854, 365), - COL_TRI(924, 920, 919), - COL_TRI(375, 898, 349), - COL_TRI(375, 897, 898), - COL_TRI(375, 394, 897), - COL_TRI(375, 904, 394), - COL_TRI(375, 893, 904), - COL_TRI(375, 349, 347), - COL_TRI(915, 916, 917), - COL_TRI(915, 917, 918), - COL_TRI(940, 927, 932), - COL_TRI(924, 919, 433), - COL_TRI(926, 922, 923), - COL_TRI(926, 923, 435), - COL_TRI(347, 349, 921), - COL_TRI(347, 921, 434), - COL_TRI(940, 928, 927), - COL_TRI(932, 445, 937), - COL_TRI(932, 937, 939), - COL_TRI(940, 932, 939), - COL_TRI(940, 942, 928), - COL_TRI(1091, 1101, 1102), - COL_TRI(1091, 1103, 1101), - COL_TRI(465, 461, 954), - COL_TRI(465, 954, 953), - COL_TRI(964, 1093, 1095), - COL_TRI(961, 479, 461), - COL_TRI(961, 461, 465), - COL_TRI(465, 959, 961), - COL_TRI(461, 479, 960), - COL_TRI(461, 960, 1092), - COL_TRI(465, 1104, 959), - COL_TRI(1092, 959, 1104), - COL_TRI(1092, 960, 959), - COL_TRI(475, 962, 478), - COL_TRI(964, 485, 1093), - COL_TRI(974, 977, 976), - COL_TRI(1093, 966, 1094), - COL_TRI(1093, 485, 966), - COL_TRI(1094, 966, 965), - COL_TRI(1094, 965, 1105), - COL_TRI(1095, 965, 964), - COL_TRI(1095, 1105, 965), - COL_TRI(971, 973, 972), - COL_TRI(971, 970, 973), - COL_TRI(511, 983, 513), - COL_TRI(974, 975, 977), - COL_TRI(981, 1106, 67), - COL_TRI(981, 67, 69), - COL_TRI(506, 507, 504), - COL_TRI(506, 504, 505), - COL_TRI(511, 984, 983), - COL_TRI(535, 998, 531), - COL_TRI(516, 985, 987), - COL_TRI(516, 987, 518), - COL_TRI(522, 990, 523), - COL_TRI(522, 988, 990), - COL_TRI(623, 65, 1106), - COL_TRI(623, 1106, 510), - COL_TRI(1007, 1008, 1006), - COL_TRI(535, 531, 534), - COL_TRI(538, 537, 536), - COL_TRI(538, 540, 537), - COL_TRI(1003, 1002, 1005), - COL_TRI(1003, 1005, 1004), - COL_TRI(1007, 1006, 573), - COL_TRI(569, 1030, 1029), - COL_TRI(1011, 553, 1017), - COL_TRI(1017, 1016, 1013), - COL_TRI(1017, 1013, 1011), - COL_TRI(1011, 1012, 552), - COL_TRI(1011, 1010, 1012), - COL_TRI(1011, 552, 553), - COL_TRI(569, 564, 563), - COL_TRI(569, 563, 1023), - COL_TRI(569, 1023, 1022), - COL_TRI(569, 1029, 564), - COL_TRI(1050, 1051, 1053), - COL_TRI(569, 570, 1030), - COL_TRI(1041, 1039, 576), - COL_TRI(1041, 576, 574), - COL_TRI(578, 1044, 577), - COL_TRI(578, 1045, 1044), - COL_TRI(1049, 1051, 1050), - COL_TRI(1050, 1053, 1052), - COL_TRI(1049, 584, 1051), - COL_TRI(1054, 1057, 1055), - COL_TRI(1054, 1056, 1057), - COL_TRI(1059, 1060, 1061), - COL_TRI(1059, 1061, 1058), - COL_TRI(607, 1071, 610), - COL_TRI(599, 1064, 1063), - COL_TRI(599, 1063, 598), - COL_TRI(603, 1065, 1067), - COL_TRI(603, 1067, 604), - COL_TRI(1068, 1073, 614), - COL_TRI(1068, 614, 609), - COL_TRI(1, 7, 1096), - COL_TRI(607, 1069, 1071), - COL_TRI(616, 1076, 615), - COL_TRI(616, 1077, 1076), - COL_TRI(1079, 1078, 1081), - COL_TRI(1079, 1081, 1080), - COL_TRI(1, 1096, 2), - COL_TRI(1096, 7, 6), - COL_TRI(1096, 6, 1107), - COL_TRI(6, 8, 82), - COL_TRI(6, 82, 1107), - COL_TRI_INIT(SURFACE_HORIZONTAL_WIND, 34), - COL_TRI_SPECIAL(10, 11, 12, 0x100), - COL_TRI_SPECIAL(10, 12, 13, 0x100), - COL_TRI_SPECIAL(14, 15, 16, 0x140), - COL_TRI_SPECIAL(17, 14, 16, 0x140), - COL_TRI_SPECIAL(17, 16, 18, 0x140), - COL_TRI_SPECIAL(17, 18, 19, 0x140), - COL_TRI_SPECIAL(20, 15, 14, 0x140), - COL_TRI_SPECIAL(20, 21, 15, 0x140), - COL_TRI_SPECIAL(22, 34, 26, 0x140), - COL_TRI_SPECIAL(23, 22, 26, 0x140), - COL_TRI_SPECIAL(22, 35, 34, 0x140), - COL_TRI_SPECIAL(22, 36, 35, 0x140), - COL_TRI_SPECIAL(22, 37, 36, 0x140), - COL_TRI_SPECIAL(24, 36, 37, 0x140), - COL_TRI_SPECIAL(25, 24, 37, 0x140), - COL_TRI_SPECIAL(26, 34, 24, 0x140), - COL_TRI_SPECIAL(25, 27, 24, 0x140), - COL_TRI_SPECIAL(26, 24, 27, 0x140), - COL_TRI_SPECIAL(27, 25, 38, 0x140), - COL_TRI_SPECIAL(25, 28, 38, 0x140), - COL_TRI_SPECIAL(23, 26, 29, 0x140), - COL_TRI_SPECIAL(23, 29, 39, 0x140), - COL_TRI_SPECIAL(33, 43, 42, 0x140), - COL_TRI_SPECIAL(28, 40, 38, 0x140), - COL_TRI_SPECIAL(28, 41, 40, 0x140), - COL_TRI_SPECIAL(29, 42, 39, 0x140), - COL_TRI_SPECIAL(29, 33, 42, 0x140), - COL_TRI_SPECIAL(30, 32, 41, 0x140), - COL_TRI_SPECIAL(31, 43, 30, 0x140), - COL_TRI_SPECIAL(32, 40, 41, 0x140), - COL_TRI_SPECIAL(33, 44, 43, 0x140), - COL_TRI_SPECIAL(31, 47, 46, 0x140), - COL_TRI_SPECIAL(31, 45, 43, 0x140), - COL_TRI_SPECIAL(31, 46, 45, 0x140), - COL_TRI_STOP(), - COL_SPECIAL_INIT(23), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_null_start, /*pos*/ 2599, -1833, 2071, /*yaw*/ 64), // unused, probably an early way to set intial position - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_03, /*pos*/ 1902, -1833, 1063, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_04, /*pos*/ 3803, -1833, 2036, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_05, /*pos*/ -4888, -2550, 5847, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_06, /*pos*/ 5324, -2038, 6155, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_07, /*pos*/ -409, -3164, 5207, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_08, /*pos*/ -4680, -1910, 296, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_08, /*pos*/ -3193, -4726, 6670, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_09, /*pos*/ 6506, -1295, 762, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0A, /*pos*/ -4629, 137, -113, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0B, /*pos*/ 2639, 2724, -622, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0C, /*pos*/ 3577, 2486, -2346, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0D, /*pos*/ 3554, 4276, -2346, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0D, /*pos*/ 614, -1116, 3671, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0E, /*pos*/ 5280, 4937, 603, /*yaw*/ 128), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_0F, /*pos*/ -4197, 4608, -5119, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_10, /*pos*/ 2628, -143, -1611, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_11, /*pos*/ 5094, 3440, 4029, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_12, /*pos*/ -3708, 2006, 270, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_13, /*pos*/ 5994, -988, 1341, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_14, /*pos*/ 3917, 624, -1133, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_15, /*pos*/ -3981, 3328, -2736, /*yaw*/ 0), - SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_16, /*pos*/ -6053, 4096, -3197, /*yaw*/ 0), - COL_END(), -#else COL_INIT(), COL_VERTEX_INIT(0x454), COL_VERTEX(-6677, 1443, 270), @@ -5443,5 +2724,4 @@ const Collision rr_seg7_collision_level[] = { SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_15, /*pos*/ -3981, 3328, -2736, /*yaw*/ 0), SPECIAL_OBJECT_WITH_YAW(/*preset*/ special_level_geo_16, /*pos*/ -6053, 4096, -3197, /*yaw*/ 0), COL_END(), -#endif }; diff --git a/levels/rr/seesaw_platform/model.inc.c b/levels/rr/seesaw_platform/model.inc.c index 5389452a..576dc4ae 100644 --- a/levels/rr/seesaw_platform/model.inc.c +++ b/levels/rr/seesaw_platform/model.inc.c @@ -1,22 +1,6 @@ // US: 0x0701B0C8 // 0x0701B290 - 0x0701B370 static const Vtx rr_seg7_vertex_0701B290[] = { -#ifdef VERSION_JP - {{{ -306, 102, -818}, 0, { 3716, -714}, {0xaf, 0xcf, 0xc1, 0xff}}}, - {{{ -306, 102, 819}, 0, { 990, 2010}, {0xaf, 0xcf, 0xc1, 0xff}}}, - {{{ 307, 102, 819}, 0, { 0, 990}, {0xaf, 0xcf, 0xc1, 0xff}}}, - {{{ 307, 102, -818}, 0, { 2694, -1736}, {0xaf, 0xcf, 0xc1, 0xff}}}, - {{{ 307, 0, -767}, 0, { 2608, -1650}, {0x53, 0x73, 0x76, 0xff}}}, - {{{ -306, 0, 768}, 0, { 1076, 1924}, {0x53, 0x73, 0x76, 0xff}}}, - {{{ -306, 0, -767}, 0, { 3630, -628}, {0x53, 0x73, 0x76, 0xff}}}, - {{{ 307, 0, 768}, 0, { 54, 904}, {0x53, 0x73, 0x76, 0xff}}}, - {{{ -306, 102, -818}, 0, { 2694, 3714}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ -306, 0, 768}, 0, { -116, 1244}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ -306, 102, 819}, 0, { 0, 990}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ -306, 102, -818}, 0, { 3716, -714}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ -306, 0, -767}, 0, { 3630, -628}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ -306, 0, 768}, 0, { 1076, 1924}, {0x63, 0x80, 0x88, 0xff}}}, -#else// increase from 14 to 16 {{{ -306, 102, -818}, 0, { 3716, -714}, {0xaf, 0xcf, 0xc1, 0xff}}}, {{{ -306, 102, 819}, 0, { 990, 2010}, {0xaf, 0xcf, 0xc1, 0xff}}}, {{{ 307, 102, 819}, 0, { 0, 990}, {0xaf, 0xcf, 0xc1, 0xff}}}, @@ -33,26 +17,11 @@ static const Vtx rr_seg7_vertex_0701B290[] = { {{{ 307, 0, 768}, 0, { -116, 734}, {0x63, 0x80, 0x88, 0xff}}}, {{{ 307, 0, -767}, 0, { 2438, -1820}, {0x63, 0x80, 0x88, 0xff}}}, {{{ 307, 102, -818}, 0, { 2694, -1736}, {0x63, 0x80, 0x88, 0xff}}}, -#endif }; // US: 0x0701B1C8 // 0x0701B370 - 0x0701B430 static const Vtx rr_seg7_vertex_0701B370[] = { -#ifdef VERSION_JP - {{{ 307, 102, 819}, 0, { 0, 990}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ 307, 0, 768}, 0, { -116, 1244}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ 307, 0, -767}, 0, { 2438, 3798}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ 307, 102, -818}, 0, { 2694, 3714}, {0x63, 0x80, 0x88, 0xff}}}, - {{{ 307, 102, -818}, 0, { 2694, -1736}, {0x79, 0x9c, 0x9f, 0xff}}}, - {{{ 307, 0, -767}, 0, { 2608, -1650}, {0x79, 0x9c, 0x9f, 0xff}}}, - {{{ -306, 0, -767}, 0, { 3630, -628}, {0x79, 0x9c, 0x9f, 0xff}}}, - {{{ -306, 102, -818}, 0, { 3716, -714}, {0x79, 0x9c, 0x9f, 0xff}}}, - {{{ -306, 102, 819}, 0, { 990, 2010}, {0x79, 0x9c, 0x9f, 0xff}}}, - {{{ 307, 0, 768}, 0, { 54, 904}, {0x79, 0x9c, 0x9f, 0xff}}}, - {{{ 307, 102, 819}, 0, { 0, 990}, {0x79, 0x9c, 0x9f, 0xff}}}, - {{{ -306, 0, 768}, 0, { 1076, 1924}, {0x79, 0x9c, 0x9f, 0xff}}}, -#else// reduced from 12 to 8 {{{ 307, 102, -818}, 0, { 2694, -1736}, {0x79, 0x9c, 0x9f, 0xff}}}, {{{ 307, 0, -767}, 0, { 2884, -1926}, {0x79, 0x9c, 0x9f, 0xff}}}, {{{ -306, 0, -767}, 0, { 3906, -904}, {0x79, 0x9c, 0x9f, 0xff}}}, @@ -61,25 +30,10 @@ static const Vtx rr_seg7_vertex_0701B370[] = { {{{ 307, 0, 768}, 0, { -220, 1178}, {0x79, 0x9c, 0x9f, 0xff}}}, {{{ 307, 102, 819}, 0, { 0, 990}, {0x79, 0x9c, 0x9f, 0xff}}}, {{{ -306, 0, 768}, 0, { 800, 2200}, {0x79, 0x9c, 0x9f, 0xff}}}, -#endif }; // 0x0701B430 - 0x0701B4C0 static const Gfx rr_seg7_dl_0701B430[] = { -#ifdef VERSION_JP - gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09001800), - gsDPLoadSync(), - gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), - gsSPVertex(rr_seg7_vertex_0701B290, 14, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 11, 12, 13, 0x0), - gsSPVertex(rr_seg7_vertex_0701B370, 12, 0), - gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), - gsSP2Triangles( 4, 5, 6, 0x0, 4, 6, 7, 0x0), - gsSP2Triangles( 8, 9, 10, 0x0, 8, 11, 9, 0x0), - gsSPEndDisplayList(), -#else gsDPSetTextureImage(G_IM_FMT_RGBA, G_IM_SIZ_16b, 1, sky_09001800), gsDPLoadSync(), gsDPLoadBlock(G_TX_LOADTILE, 0, 0, 32 * 32 - 1, CALC_DXT(32, G_IM_SIZ_16b_BYTES)), @@ -92,7 +46,6 @@ static const Gfx rr_seg7_dl_0701B430[] = { gsSP2Triangles( 0, 1, 2, 0x0, 0, 2, 3, 0x0), gsSP2Triangles( 4, 5, 6, 0x0, 4, 7, 5, 0x0), gsSPEndDisplayList(), -#endif }; // 0x0701B4C0 - 0x0701B530 diff --git a/src/boot/main.c b/src/boot/main.c index 9ad04463..6a500dc2 100644 --- a/src/boot/main.c +++ b/src/boot/main.c @@ -211,15 +211,9 @@ void pretend_audio_sptask_done(void) { void handle_vblank(void) { gNumVblanks++; -#ifdef VERSION_SH if (gResetTimer > 0 && gResetTimer < 100) { gResetTimer++; } -#else - if (gResetTimer > 0) { - gResetTimer++; - } -#endif receive_new_tasks(); diff --git a/src/game/behavior_actions.c b/src/game/behavior_actions.c index 4a4cb087..800dc193 100644 --- a/src/game/behavior_actions.c +++ b/src/game/behavior_actions.c @@ -264,9 +264,7 @@ s32 set_obj_anim_with_accel_and_sound(s16 frame1, s16 frame2, s32 sound) { #include "behaviors/bbh_merry_go_round.inc.c" #include "behaviors/static_checkered_platform.inc.c" #include "behaviors/beta_bowser_anchor.inc.c" -#ifndef VERSION_JP #include "behaviors/music_touch.inc.c" -#endif #include "behaviors/castle_floor_trap.inc.c" #include "behaviors/pole_base.inc.c" #include "behaviors/sparkle_spawn.inc.c" diff --git a/src/game/behaviors/bbh_tilting_trap.inc.c b/src/game/behaviors/bbh_tilting_trap.inc.c index 95395751..d2657bb4 100644 --- a/src/game/behaviors/bbh_tilting_trap.inc.c +++ b/src/game/behaviors/bbh_tilting_trap.inc.c @@ -12,7 +12,6 @@ void bhv_bbh_tilting_trap_platform_loop(void) { // if statement, while immediately setting it over here. // This was done so that Mario leaving or getting on the platform // resets oTimer to 0. -#ifndef VERSION_JP if (gMarioObject->platform == o) { o->oAction = BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_ON; } else { @@ -20,13 +19,9 @@ void bhv_bbh_tilting_trap_platform_loop(void) { } if (o->oAction == BBH_TILTING_TRAP_PLATFORM_ACT_MARIO_ON) { -#else - if (gMarioObject->platform == o) { -#endif o->oAngleVelPitch = (s32)(o->oDistanceToMario * coss(o->oAngleToMario)); o->oFaceAnglePitch += o->oAngleVelPitch; } else -#ifndef VERSION_JP // In the US version, if the platform has tilted more than 3000 angle units // in less than 16 frames since Mario got on it, and he has stepped off, // this code will not run, so it will continue to rotate with the same @@ -34,9 +29,7 @@ void bhv_bbh_tilting_trap_platform_loop(void) { // the platform more dangerous. This code will not work correctly // without the oAction changes above, since oTimer will not ever // reset to 0 without them. - if ((absi(o->oFaceAnglePitch) < 3000) || (o->oTimer >= 16)) -#endif - { + if ((absi(o->oFaceAnglePitch) < 3000) || (o->oTimer >= 16)) { // Make the platform return to the horizontal at a speed of // 200 angle units/frame, and clamp it to 0 if it's within 200 units of 0. o->oAngleVelPitch = 0; diff --git a/src/game/behaviors/boo.inc.c b/src/game/behaviors/boo.inc.c index 16e81808..55fbe184 100644 --- a/src/game/behaviors/boo.inc.c +++ b/src/game/behaviors/boo.inc.c @@ -282,13 +282,9 @@ static s32 boo_update_during_death(void) { if (o->oBooParentBigBoo != NULL) { parentBigBoo = o->oBooParentBigBoo; -#ifndef VERSION_JP if (!cur_obj_has_behavior(bhvBoo)) { parentBigBoo->oBigBooNumMinionBoosKilled++; } -#else - parentBigBoo->oBigBooNumMinionBoosKilled++; -#endif } return TRUE; @@ -512,11 +508,7 @@ static void big_boo_act_0(void) { o->oBooParentBigBoo = NULL; -#ifndef VERSION_JP if (boo_should_be_active() && gDebugInfo[5][0] + 5 <= o->oBigBooNumMinionBoosKilled) { -#else - if (boo_should_be_active() && o->oBigBooNumMinionBoosKilled >= 5) { -#endif o->oAction = 1; cur_obj_set_pos_to_home(); @@ -636,9 +628,7 @@ static void big_boo_act_3(void) { } static void big_boo_act_4(void) { -#ifndef VERSION_JP boo_stop(); -#endif if (o->oBehParams2ndByte == 0) { obj_set_pos(o, 973, 0, 626); diff --git a/src/game/behaviors/bowser.inc.c b/src/game/behaviors/bowser.inc.c index 164e769b..a042f8bc 100644 --- a/src/game/behaviors/bowser.inc.c +++ b/src/game/behaviors/bowser.inc.c @@ -125,7 +125,6 @@ void bhv_bowser_body_anchor_loop(void) { // If Bowser is dead, set interaction type to text // so that he can be ready to speak his dialog if (o->parentObj->oAction == BOWSER_ACT_DEAD) { -#if BUGFIX_BOWSER_COLLIDE_BITS_DEAD // Clear interaction type at the last sub action in BITS // Fixes collision coliding after defeating him if (o->parentObj->oSubAction == BOWSER_SUB_ACT_DEAD_FINAL_END_OVER) { @@ -133,9 +132,6 @@ void bhv_bowser_body_anchor_loop(void) { } else { o->oInteractType = INTERACT_TEXT; } -#else - o->oInteractType = INTERACT_TEXT; -#endif } else { // Do damage if Mario touches Bowser o->oInteractType = INTERACT_DAMAGE; @@ -447,7 +443,6 @@ void bowser_bits_actions(void) { /** * Reset Bowser position and speed if he wasn't able to land properly on stage */ -#if BUGFIX_BOWSER_FALLEN_OFF_STAGE void bowser_reset_fallen_off_stage(void) { if (o->oVelY < 0 && o->oPosY < (o->oHomeY - 300.0f)) { o->oPosX = o->oPosZ = 0; @@ -456,7 +451,6 @@ void bowser_reset_fallen_off_stage(void) { o->oForwardVel = 0; } } -#endif /** * Unused, makes Bowser be in idle and after it returns to default action @@ -740,12 +734,10 @@ void bowser_act_big_jump(void) { o->oSubAction++; } } else if (o->oSubAction == 1) { -#if BUGFIX_BOWSER_FALLEN_OFF_STAGE // Reset Bowser back on stage in BITS if he doesn't land properly if (o->oBehParams2ndByte == BOWSER_BP_BITS && o->oBowserStatus & BOWSER_STATUS_BIG_JUMP) { bowser_reset_fallen_off_stage(); } -#endif // Land on stage, reset status jump and velocity if (bowser_land()) { o->oBowserStatus &= ~BOWSER_STATUS_BIG_JUMP; @@ -1094,15 +1086,7 @@ void bowser_act_jump_onto_stage(void) { } // Reset him back on stage if he still didn't landed yet // Post-JP made this check as a separate function -#if BUGFIX_BOWSER_FALLEN_OFF_STAGE bowser_reset_fallen_off_stage(); -#else - if (o->oVelY < 0.0f && o->oPosY < o->oHomeY - 300.0f) { - o->oPosZ = 0.0f, o->oPosX = o->oPosZ; - o->oPosY = o->oHomeY + 2000.0f; - o->oVelY = 0.0f; - } -#endif break; // Bowser landed, so reset action after he's done jumping case BOWSER_SUB_ACT_JUMP_ON_STAGE_STOP: diff --git a/src/game/behaviors/bully.inc.c b/src/game/behaviors/bully.inc.c index 550cdd45..d4b40781 100644 --- a/src/game/behaviors/bully.inc.c +++ b/src/game/behaviors/bully.inc.c @@ -52,11 +52,7 @@ void bhv_big_bully_init(void) { } void bully_check_mario_collision(void) { - if ( -#ifdef VERSION_SH - o->oAction != BULLY_ACT_LAVA_DEATH && o->oAction != BULLY_ACT_DEATH_PLANE_DEATH && -#endif - o->oInteractStatus & INT_STATUS_INTERACTED) { + if (o->oAction != BULLY_ACT_LAVA_DEATH && o->oAction != BULLY_ACT_DEATH_PLANE_DEATH && o->oInteractStatus & INT_STATUS_INTERACTED) { if (o->oBehParams2ndByte == BULLY_BP_SIZE_SMALL) cur_obj_play_sound_2(SOUND_OBJ2_BULLY_ATTACKED); else diff --git a/src/game/behaviors/celebration_star.inc.c b/src/game/behaviors/celebration_star.inc.c index 8706adb6..b7b57dbe 100644 --- a/src/game/behaviors/celebration_star.inc.c +++ b/src/game/behaviors/celebration_star.inc.c @@ -6,7 +6,6 @@ void bhv_celebration_star_init(void) { o->oHomeZ = gMarioObject->header.gfx.pos[2]; o->oMoveAngleYaw = gMarioObject->header.gfx.angle[1] + 0x8000; o->oCelebStarDiameterOfRotation = 100; -#if BUGFIX_STAR_BOWSER_KEY if (gCurrLevelNum == LEVEL_BOWSER_1 || gCurrLevelNum == LEVEL_BOWSER_2) { o->header.gfx.sharedChild = gLoadedGraphNodes[MODEL_BOWSER_KEY]; o->oFaceAnglePitch = 0; @@ -20,12 +19,6 @@ void bhv_celebration_star_init(void) { cur_obj_scale(0.4f); o->oCelebStarIsBowserKey = 0; } -#else - o->header.gfx.sharedChild = gLoadedGraphNodes[MODEL_STAR]; - cur_obj_scale(0.4f); - o->oFaceAnglePitch = 0; - o->oFaceAngleRoll = 0; -#endif } void celeb_star_act_spin_around_mario(void) { @@ -47,15 +40,11 @@ void celeb_star_act_spin_around_mario(void) { void celeb_star_act_face_camera(void) { if (o->oTimer < 10) { -#if BUGFIX_STAR_BOWSER_KEY if (o->oCelebStarIsBowserKey == 0) { cur_obj_scale((f32) o->oTimer / 10.0); } else { cur_obj_scale((f32) o->oTimer / 30.0); } -#else - cur_obj_scale((f32) o->oTimer / 10.0); -#endif o->oFaceAngleYaw += 0x1000; } else { o->oFaceAngleYaw = gMarioObject->header.gfx.angle[1]; diff --git a/src/game/behaviors/coin.inc.c b/src/game/behaviors/coin.inc.c index 1620de1c..35a1cdc8 100644 --- a/src/game/behaviors/coin.inc.c +++ b/src/game/behaviors/coin.inc.c @@ -85,23 +85,14 @@ void bhv_coin_loop(void) { if (o->oVelY < 0) cur_obj_become_tangible(); if (o->oMoveFlags & OBJ_MOVE_LANDED) { -#ifndef VERSION_JP if (o->oMoveFlags & (OBJ_MOVE_ABOVE_DEATH_BARRIER | OBJ_MOVE_ABOVE_LAVA)) -#else - if (o->oMoveFlags & OBJ_MOVE_ABOVE_LAVA) -#endif obj_mark_for_deletion(o); } -#ifndef VERSION_JP if (o->oMoveFlags & OBJ_MOVE_BOUNCE) { if (o->oCoinBounceTimer < 5) cur_obj_play_sound_2(SOUND_GENERAL_COIN_DROP); o->oCoinBounceTimer++; } -#else - if (o->oMoveFlags & OBJ_MOVE_BOUNCE) - cur_obj_play_sound_2(SOUND_GENERAL_COIN_DROP); -#endif if (cur_obj_wait_then_blink(400, 20)) obj_mark_for_deletion(o); bhv_coin_sparkles_init(); diff --git a/src/game/behaviors/controllable_platform.inc.c b/src/game/behaviors/controllable_platform.inc.c index b453402e..5d385b5b 100644 --- a/src/game/behaviors/controllable_platform.inc.c +++ b/src/game/behaviors/controllable_platform.inc.c @@ -29,9 +29,7 @@ void bhv_controllable_platform_sub_loop(void) { if (gMarioObject->platform == o) { sControllablePlatformDirectionState = o->oBehParams2ndByte; -#ifdef VERSION_SH o->parentObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE; -#endif o->oAction = 1; cur_obj_play_sound_2(SOUND_GENERAL_MOVING_PLATFORM_SWITCH); } diff --git a/src/game/behaviors/cruiser.inc.c b/src/game/behaviors/cruiser.inc.c index 0d336695..666c9f2e 100644 --- a/src/game/behaviors/cruiser.inc.c +++ b/src/game/behaviors/cruiser.inc.c @@ -13,10 +13,8 @@ void bhv_rr_cruiser_wing_loop(void) { o->oFaceAngleYaw = o->oRRCruiserWingInitYaw - sins(o->oTimer * 0x400) * 8192.0f; o->oFaceAnglePitch = o->oRRCruiserWingInitPitch + coss(o->oTimer * 0x400) * 2048.0f; } -#ifndef VERSION_JP if (o->oTimer == 64) { cur_obj_play_sound_2(SOUND_GENERAL_BOAT_ROCK); o->oTimer = 0; } -#endif } diff --git a/src/game/behaviors/dorrie.inc.c b/src/game/behaviors/dorrie.inc.c index c4ff79be..adc6b669 100644 --- a/src/game/behaviors/dorrie.inc.c +++ b/src/game/behaviors/dorrie.inc.c @@ -64,18 +64,6 @@ void dorrie_act_lower_head(void) { if (cur_obj_init_anim_check_frame(2, 35)) { cur_obj_reverse_animation(); -#ifdef VERSION_JP - if (o->oTimer > 150) { - dorrie_begin_head_raise(FALSE); - } else if (gMarioObject->platform == o) { - if (o->oDorrieForwardDistToMario > 830.0f - && set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) { - dorrie_begin_head_raise(TRUE); - } else if (o->oDorrieForwardDistToMario > 320.0f) { - o->oTimer = 0; - } - } -#else if (gMarioObject->platform == o) { if (o->oDorrieOffsetY == -17.0f && o->oDorrieForwardDistToMario > 780.0f && set_mario_npc_dialog(MARIO_DIALOG_LOOK_UP) == MARIO_DIALOG_STATUS_START) { @@ -86,7 +74,6 @@ void dorrie_act_lower_head(void) { } else if (o->oTimer > 150) { dorrie_begin_head_raise(FALSE); } -#endif } else { o->oDorrieNeckAngle += 0x115; diff --git a/src/game/behaviors/king_bobomb.inc.c b/src/game/behaviors/king_bobomb.inc.c index 6920522b..199a1cb6 100644 --- a/src/game/behaviors/king_bobomb.inc.c +++ b/src/game/behaviors/king_bobomb.inc.c @@ -21,10 +21,8 @@ void bhv_bobomb_anchor_mario_loop(void) { } void king_bobomb_act_0(void) { -#ifndef VERSION_JP o->oForwardVel = 0.0f; o->oVelY = 0.0f; -#endif if (o->oSubAction == 0) { cur_obj_become_intangible(); gSecondCameraFocus = o; @@ -179,12 +177,7 @@ void king_bobomb_act_7(void) { spawn_mist_particles_variable(0, 0, 200.0f); spawn_triangle_break_particles(20, MODEL_DIRT_ANIMATION, 3.0f, 4); cur_obj_shake_screen(SHAKE_POS_SMALL); -#ifndef VERSION_JP cur_obj_spawn_star_at_y_offset(2000.0f, 4500.0f, -4500.0f, 200.0f); -#else - o->oPosY += 100.0f; - spawn_default_star(2000.0f, 4500.0f, -4500.0f); -#endif o->oAction = 8; } } diff --git a/src/game/behaviors/mips.inc.c b/src/game/behaviors/mips.inc.c index 4a42ca80..6d10bc5a 100644 --- a/src/game/behaviors/mips.inc.c +++ b/src/game/behaviors/mips.inc.c @@ -14,17 +14,12 @@ void bhv_mips_init(void) { if (save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1) >= 15 && !(starFlags & SAVE_FLAG_TO_STAR_FLAG(SAVE_FLAG_COLLECTED_MIPS_STAR_1))) { o->oBehParams2ndByte = 0; -#ifndef VERSION_JP o->oMipsForwardVelocity = 40.0f; -#endif - } // If the player has >= 50 stars and hasn't collected second MIPS star... - else if (save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1) >= 50 + } else if (save_file_get_total_star_count(gCurrSaveFileNum - 1, COURSE_MIN - 1, COURSE_MAX - 1) >= 50 && !(starFlags & SAVE_FLAG_TO_STAR_FLAG(SAVE_FLAG_COLLECTED_MIPS_STAR_2))) { o->oBehParams2ndByte = 1; -#ifndef VERSION_JP o->oMipsForwardVelocity = 45.0f; -#endif } else { // No MIPS stars are available, hide MIPS. o->activeFlags = ACTIVE_FLAG_DEACTIVATED; @@ -32,11 +27,7 @@ void bhv_mips_init(void) { o->oInteractionSubtype = INT_SUBTYPE_HOLDABLE_NPC; -#ifndef VERSION_JP o->oGravity = 15.0f; -#else - o->oGravity = 2.5f; -#endif o->oFriction = 0.89f; o->oBuoyancy = 1.2f; @@ -123,11 +114,7 @@ void bhv_mips_act_follow_path(void) { followStatus = cur_obj_follow_path(followStatus); // Update velocity and angle and do movement. -#ifndef VERSION_JP o->oForwardVel = o->oMipsForwardVelocity; -#else - o->oForwardVel = 45.0f; -#endif o->oMoveAngleYaw = o->oPathedTargetYaw; collisionFlags = object_step(); diff --git a/src/game/behaviors/mr_i.inc.c b/src/game/behaviors/mr_i.inc.c index e100756b..e4a3f177 100644 --- a/src/game/behaviors/mr_i.inc.c +++ b/src/game/behaviors/mr_i.inc.c @@ -211,13 +211,7 @@ void mr_i_act_1(void) { } void mr_i_act_0(void) { -#ifndef VERSION_JP obj_set_angle(o, 0, 0, 0); -#else - o->oMoveAnglePitch = 0; - o->oMoveAngleYaw = 0; - o->oMoveAngleRoll = 0; -#endif cur_obj_scale(o->oBehParams2ndByte + 1); o->oGraphYOffset = 100.0f * o->header.gfx.scale[1]; if (o->oTimer == 0) diff --git a/src/game/behaviors/piranha_plant.inc.c b/src/game/behaviors/piranha_plant.inc.c index 17f298dd..6a8f692a 100644 --- a/src/game/behaviors/piranha_plant.inc.c +++ b/src/game/behaviors/piranha_plant.inc.c @@ -13,14 +13,12 @@ void piranha_plant_act_idle(void) { cur_obj_become_intangible(); cur_obj_init_animation_with_sound(8); -#if BUGFIX_PIRANHA_PLANT_STATE_RESET /** * This call is necessary because a Piranha Plant may enter this state * with a scale below 1, which would cause it to appear shrunken. See * documentation for, and calls to, piranha_plant_reset_when_far(). */ cur_obj_scale(1); -#endif if (o->oDistanceToMario < 1200.0f) { o->oAction = PIRANHA_PLANT_ACT_SLEEPING; @@ -75,17 +73,10 @@ void piranha_plant_act_sleeping(void) { cur_obj_set_hitbox_radius_and_height(250.0f, 200.0f); cur_obj_set_hurtbox_radius_and_height(150.0f, 100.0f); -#if BUGFIX_PIRANHA_PLANT_SLEEP_DAMAGE /** * Make Piranha Plants harmless, but tangible, while they sleep. */ o->oDamageOrCoinValue = 0; -#elif defined(VERSION_EU) - /** - * Make Piranha Plants harmful when sleeping - but do it explicitly. - */ - o->oDamageOrCoinValue = 3; -#endif if (o->oDistanceToMario < 400.0f) { if (mario_moving_fast_enough_to_make_piranha_plant_bite()) { @@ -106,14 +97,10 @@ void piranha_plant_act_sleeping(void) { * to the biting state. */ void piranha_plant_act_woken_up(void) { -#if BUGFIX_PIRANHA_PLANT_SLEEP_DAMAGE || defined(VERSION_EU) /** - * Make Piranha Plants damage the player while awake. This call is only - * necessary in the US version because it is set to 3 by default and is - * never changed in the JP version. + * Make Piranha Plants damage the player while awake. */ o->oDamageOrCoinValue = 3; -#endif if (o->oTimer == 0) func_80321080(50); @@ -122,7 +109,6 @@ void piranha_plant_act_woken_up(void) { o->oAction = PIRANHA_PLANT_ACT_BITING; } -#if BUGFIX_PIRANHA_PLANT_STATE_RESET /** * If the Piranha Plant is far from the player, move it to the idle state. * @@ -143,7 +129,6 @@ void piranha_plant_reset_when_far(void) { o->oAction = PIRANHA_PLANT_ACT_IDLE; } } -#endif /** * Make the Piranha Plant play a falling-over animation and move to the dying @@ -155,9 +140,7 @@ void piranha_plant_attacked(void) { o->oInteractStatus = 0; if (cur_obj_check_if_near_animation_end()) o->oAction = PIRANHA_PLANT_ACT_SHRINK_AND_DIE; -#if BUGFIX_PIRANHA_PLANT_STATE_RESET piranha_plant_reset_when_far(); // see this function's comment -#endif } /** @@ -187,9 +170,7 @@ void piranha_plant_act_shrink_and_die(void) { cur_obj_scale(o->oPiranhaPlantScale); -#if BUGFIX_PIRANHA_PLANT_STATE_RESET piranha_plant_reset_when_far(); // see this function's comment -#endif } /** diff --git a/src/game/behaviors/pole.inc.c b/src/game/behaviors/pole.inc.c index 9b52b542..9306a3f9 100644 --- a/src/game/behaviors/pole.inc.c +++ b/src/game/behaviors/pole.inc.c @@ -18,12 +18,8 @@ void bhv_pole_init(void) { * `spawn_objects_from_info`. */ -#ifdef LONGER_POLES + // This treats bparam1 and bparam2 as a single value o->hitboxHeight = ((o->oBehParams & 0xFFFF0000) >> 16) * 10; -#else - s32 tenthHitboxHeight = o->oBehParams >> 0x10 & 0xFF; - o->hitboxHeight = tenthHitboxHeight * 10; -#endif } /** diff --git a/src/game/behaviors/racing_penguin.inc.c b/src/game/behaviors/racing_penguin.inc.c index 74a86cc7..7da0ddbf 100644 --- a/src/game/behaviors/racing_penguin.inc.c +++ b/src/game/behaviors/racing_penguin.inc.c @@ -149,11 +149,7 @@ static void racing_penguin_act_show_final_text(void) { o->oTimer = 0; } } else if (o->oRacingPenguinMarioWon) { -#ifdef VERSION_JP - spawn_default_star(-7339.0f, -5700.0f, -6774.0f); -#else cur_obj_spawn_star_at_y_offset(-7339.0f, -5700.0f, -6774.0f, 200.0f); -#endif o->oRacingPenguinMarioWon = FALSE; } } diff --git a/src/game/behaviors/tree_particles.inc.c b/src/game/behaviors/tree_particles.inc.c index a01c4ffa..8c13cc09 100644 --- a/src/game/behaviors/tree_particles.inc.c +++ b/src/game/behaviors/tree_particles.inc.c @@ -34,22 +34,12 @@ void bhv_tree_snow_or_leaf_loop(void) { void bhv_snow_leaf_particle_spawn_init(void) { struct Object *obj; // Either snow or leaf -#ifdef TREE_PARTICLE_FIX struct Object *nearestTree = NULL; -#endif - s32 isSnow; f32 scale; gMarioObject->oActiveParticleFlags &= ~0x2000; -#ifdef TREE_PARTICLE_FIX + // Whether a tree uses snow particles or not is decided via the model IDs instead of the course number nearestTree = cur_obj_nearest_object_with_behavior(bhvTree); - isSnow = (nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_CCM_SNOW_TREE] || nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_SL_SNOW_TREE]); -#else - if (gCurrLevelNum == LEVEL_CCM || gCurrLevelNum == LEVEL_SL) - isSnow = 1; - else - isSnow = 0; -#endif - if (isSnow) { + if (nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_CCM_SNOW_TREE] || nearestTree->header.gfx.sharedChild == gLoadedGraphNodes[MODEL_SL_SNOW_TREE]) { if (random_float() < 0.5) { obj = spawn_object(o, MODEL_WHITE_PARTICLE_DL, bhvTreeSnow); scale = random_float(); diff --git a/src/game/behaviors/tuxie.inc.c b/src/game/behaviors/tuxie.inc.c index 57fdf9e1..f77fb605 100644 --- a/src/game/behaviors/tuxie.inc.c +++ b/src/game/behaviors/tuxie.inc.c @@ -75,11 +75,7 @@ void tuxies_mother_act_1(void) { // or 1, which is not affected by the bitwise AND. o->prevObj->OBJECT_FIELD_S32(o->oInteractionSubtype) &= ~INT_SUBTYPE_DROP_IMMEDIATELY; obj_set_behavior(o->prevObj, bhvSmallPenguinReturned); -#ifndef VERSION_JP cur_obj_spawn_star_at_y_offset(3167.0f, -4300.0f, 5108.0f, 200.0f); -#else - spawn_default_star(3500.0f, -4300.0f, 4650.0f); -#endif o->oAction = 2; } break; diff --git a/src/game/ingame_menu.c b/src/game/ingame_menu.c index d8daa65e..fe8a92f4 100644 --- a/src/game/ingame_menu.c +++ b/src/game/ingame_menu.c @@ -1083,13 +1083,7 @@ void handle_special_dialog_text(s16 dialogID) { // dialog ID tables, in order // Red Switch, Green Switch, Blue Switch, 100 coins star, Bowser Red Coin Star s16 dialogStarSound[] = { DIALOG_010, DIALOG_011, DIALOG_012, DIALOG_013, DIALOG_014 }; // King Bob-omb (Start), Whomp (Defeated), King Bob-omb (Defeated, missing in JP), Eyerock (Defeated), Wiggler (Defeated) -#if BUGFIX_KING_BOB_OMB_FADE_MUSIC s16 dialogBossStop[] = { DIALOG_017, DIALOG_115, DIALOG_116, DIALOG_118, DIALOG_152 }; -#else - //! @bug JP misses King Bob-omb defeated DIALOG_116, meaning that the boss music will still - //! play after King Bob-omb is defeated until BOB loads it's music after the star cutscene - s16 dialogBossStop[] = { DIALOG_017, DIALOG_115, DIALOG_118, DIALOG_152 }; -#endif s16 i; for (i = 0; i < (s16) ARRAY_COUNT(dialogBossStart); i++) { diff --git a/src/game/interaction.c b/src/game/interaction.c index 5997b100..9c9feef8 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -1522,7 +1522,7 @@ 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) { -#ifdef VERSION_SH +#if defined(VERSION_SH) || defined(SHINDOU_POLES) f32 velConv = m->forwardVel; // conserve the velocity. struct Object *marioObj = m->marioObj; u32 lowSpeed; @@ -1533,7 +1533,7 @@ u32 interact_pole(struct MarioState *m, UNUSED u32 interactType, struct Object * mario_stop_riding_and_holding(m); -#ifdef VERSION_SH +#if defined(VERSION_SH) || defined(SHINDOU_POLES) lowSpeed = (velConv <= 10.0f); #endif @@ -1554,7 +1554,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. -#ifdef VERSION_SH +#if defined(VERSION_SH) || defined(SHINDOU_POLES) marioObj->oMarioPoleYawVel = (s32)(velConv * 0x100 + 0x1000); #else marioObj->oMarioPoleYawVel = (s32)(m->forwardVel * 0x100 + 0x1000); diff --git a/src/game/level_update.c b/src/game/level_update.c index 15ece932..b535342e 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -445,13 +445,7 @@ void init_mario_after_warp(void) { } #endif - if (sWarpDest.levelNum == LEVEL_CASTLE && sWarpDest.areaIdx == 1 -#ifndef VERSION_JP - && (sWarpDest.nodeId == 31 || sWarpDest.nodeId == 32) -#else - && sWarpDest.nodeId == 31 -#endif - ) + if (sWarpDest.levelNum == LEVEL_CASTLE && sWarpDest.areaIdx == 1 && (sWarpDest.nodeId == 31 || sWarpDest.nodeId == 32)) play_sound(SOUND_MENU_MARIO_CASTLE_WARP, gGlobalSoundSource); #ifndef VERSION_JP if (sWarpDest.levelNum == LEVEL_CASTLE_GROUNDS && sWarpDest.areaIdx == 1 @@ -558,11 +552,10 @@ void check_instant_warp(void) { gMarioState->marioObj->oPosX = gMarioState->pos[0]; gMarioState->marioObj->oPosY = gMarioState->pos[1]; gMarioState->marioObj->oPosZ = gMarioState->pos[2]; - #ifdef INSTANT_WARP_OFFSET_FIX + // Fix instant warp offset not working when warping across different areas gMarioObject->header.gfx.pos[0] = gMarioState->pos[0]; gMarioObject->header.gfx.pos[1] = gMarioState->pos[1]; gMarioObject->header.gfx.pos[2] = gMarioState->pos[2]; - #endif cameraAngle = gMarioState->area->camera->yaw; change_area(warp->area); @@ -580,8 +573,6 @@ s16 music_unchanged_through_warp(s16 arg) { struct ObjectWarpNode *warpNode = area_get_warp_node(arg); s16 levelNum = warpNode->node.destLevel & 0x7F; -#if BUGFIX_KOOPA_RACE_MUSIC - s16 destArea = warpNode->node.destArea; s16 unchanged = TRUE; s16 currBgMusic; @@ -604,21 +595,6 @@ s16 music_unchanged_through_warp(s16 arg) { } } return unchanged; - -#else - - u16 destParam1 = gAreas[warpNode->node.destArea].musicParam; - u16 destParam2 = gAreas[warpNode->node.destArea].musicParam2; - - s16 unchanged = levelNum == gCurrLevelNum && destParam1 == gCurrentArea->musicParam - && destParam2 == gCurrentArea->musicParam2; - - if (get_current_background_music() != destParam2) { - unchanged = FALSE; - } - return unchanged; - -#endif } /** @@ -957,7 +933,6 @@ void update_hud_values(void) { gMarioState->numLives = 100; } -#if BUGFIX_MAX_LIVES if (gMarioState->numCoins > 999) { gMarioState->numCoins = 999; } @@ -965,11 +940,6 @@ void update_hud_values(void) { if (gHudDisplay.coins > 999) { gHudDisplay.coins = 999; } -#else - if (gMarioState->numCoins > 999) { - gMarioState->numLives = (s8) 999; //! Wrong variable - } -#endif gHudDisplay.stars = gMarioState->numStars; gHudDisplay.lives = gMarioState->numLives; diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c index 6c5748e6..c23cc7c3 100644 --- a/src/game/mario_actions_automatic.c +++ b/src/game/mario_actions_automatic.c @@ -114,19 +114,6 @@ s32 set_pole_position(struct MarioState *m, f32 offsetY) { s32 act_holding_pole(struct MarioState *m) { struct Object *marioObj = m->marioObj; -#ifdef VERSION_JP - if (m->input & INPUT_A_PRESSED) { - add_tree_leaf_particles(m); - m->faceAngle[1] += 0x8000; - return set_mario_action(m, ACT_WALL_KICK_AIR, 0); - } - - if (m->input & INPUT_Z_PRESSED) { - add_tree_leaf_particles(m); - m->forwardVel = -2.0f; - return set_mario_action(m, ACT_SOFT_BONK, 0); - } -#else if ((m->input & INPUT_Z_PRESSED) || m->health < 0x100) { add_tree_leaf_particles(m); m->forwardVel = -2.0f; @@ -138,7 +125,6 @@ s32 act_holding_pole(struct MarioState *m) { m->faceAngle[1] += 0x8000; return set_mario_action(m, ACT_WALL_KICK_AIR, 0); } -#endif if (m->controller->stickY > 16.0f) { f32 poleTop = m->usedObj->hitboxHeight - 100.0f; @@ -191,13 +177,11 @@ s32 act_climbing_pole(struct MarioState *m) { struct Object *marioObj = m->marioObj; s16 cameraAngle = m->area->camera->yaw; -#ifndef VERSION_JP if (m->health < 0x100) { add_tree_leaf_particles(m); m->forwardVel = -2.0f; return set_mario_action(m, ACT_SOFT_BONK, 0); } -#endif if (m->input & INPUT_A_PRESSED) { add_tree_leaf_particles(m); diff --git a/src/game/mario_actions_cutscene.c b/src/game/mario_actions_cutscene.c index 45ffa280..122344a8 100644 --- a/src/game/mario_actions_cutscene.c +++ b/src/game/mario_actions_cutscene.c @@ -253,7 +253,6 @@ void handle_save_menu(struct MarioState *m) { save_file_do_save(gCurrSaveFileNum - 1); if (gSaveOptSelectIndex == MENU_OPT_SAVE_AND_QUIT) { - //! crashes fade_into_special_warp(WARP_SPECIAL_MARIO_HEAD_REGULAR, 0); // reset game } } diff --git a/src/game/mario_actions_moving.c b/src/game/mario_actions_moving.c index bbb0e753..a00c2265 100644 --- a/src/game/mario_actions_moving.c +++ b/src/game/mario_actions_moving.c @@ -488,8 +488,6 @@ void update_walking_speed(struct MarioState *m) { m->faceAngle[1] = m->intendedYaw - approach_s32((s16)(m->intendedYaw - m->faceAngle[1]), 0, 0x800, 0x800); } -#elif SUPER_RESPONSIVE_CONTROLS - m->faceAngle[1] = m->intendedYaw; #else m->faceAngle[1] = m->intendedYaw - approach_s32((s16)(m->intendedYaw - m->faceAngle[1]), 0, 0x800, 0x800); @@ -1407,13 +1405,9 @@ void common_slide_action(struct MarioState *m, u32 endAction, u32 airAction, s32 case GROUND_STEP_HIT_WALL: if (!mario_floor_is_slippery(m)) { -#ifdef VERSION_JP - m->particleFlags |= PARTICLE_VERTICAL_STAR; -#else if (m->forwardVel > 16.0f) { m->particleFlags |= PARTICLE_VERTICAL_STAR; } -#endif slide_bonk(m, ACT_GROUND_BONK, endAction); } else if (m->wall != NULL) { s16 wallAngle = atan2s(m->wall->normal.z, m->wall->normal.x); diff --git a/src/game/mario_actions_stationary.c b/src/game/mario_actions_stationary.c index 1d9aa8b9..48eb14d4 100644 --- a/src/game/mario_actions_stationary.c +++ b/src/game/mario_actions_stationary.c @@ -179,9 +179,7 @@ void play_anim_sound(struct MarioState *m, u32 actionState, s32 animFrame, u32 s } s32 act_start_sleeping(struct MarioState *m) { -#ifndef VERSION_JP s32 animFrame = 0; -#endif if (check_common_idle_cancels(m)) { return TRUE; @@ -197,32 +195,20 @@ s32 act_start_sleeping(struct MarioState *m) { switch (m->actionState) { case 0: -#ifndef VERSION_JP - animFrame = -#endif - set_mario_animation(m, MARIO_ANIM_START_SLEEP_IDLE); + animFrame = set_mario_animation(m, MARIO_ANIM_START_SLEEP_IDLE); break; case 1: -#ifndef VERSION_JP - animFrame = -#endif - set_mario_animation(m, MARIO_ANIM_START_SLEEP_SCRATCH); + animFrame = set_mario_animation(m, MARIO_ANIM_START_SLEEP_SCRATCH); break; case 2: -#ifndef VERSION_JP - animFrame = -#endif - set_mario_animation(m, MARIO_ANIM_START_SLEEP_YAWN); + animFrame = set_mario_animation(m, MARIO_ANIM_START_SLEEP_YAWN); m->marioBodyState->eyeState = MARIO_EYES_HALF_CLOSED; break; case 3: -#ifndef VERSION_JP - animFrame = -#endif - set_mario_animation(m, MARIO_ANIM_START_SLEEP_SITTING); + animFrame = set_mario_animation(m, MARIO_ANIM_START_SLEEP_SITTING); m->marioBodyState->eyeState = MARIO_EYES_HALF_CLOSED; break; } diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index 5fcd99f1..6f2e6af6 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -1709,12 +1709,10 @@ static void cur_obj_update_floor(void) { if (floor->type == SURFACE_BURNING) { o->oMoveFlags |= OBJ_MOVE_ABOVE_LAVA; } -#ifndef VERSION_JP else if (floor->type == SURFACE_DEATH_PLANE) { //! This misses SURFACE_VERTICAL_WIND (and maybe SURFACE_WARP) o->oMoveFlags |= OBJ_MOVE_ABOVE_DEATH_BARRIER; } -#endif o->oFloorType = floor->type; o->oFloorRoom = floor->room; @@ -1725,11 +1723,7 @@ static void cur_obj_update_floor(void) { } static void cur_obj_update_floor_and_resolve_wall_collisions(s16 steepSlopeDegrees) { -#ifdef VERSION_JP - o->oMoveFlags &= ~OBJ_MOVE_ABOVE_LAVA; -#else o->oMoveFlags &= ~(OBJ_MOVE_ABOVE_LAVA | OBJ_MOVE_ABOVE_DEATH_BARRIER); -#endif if (o->activeFlags & (ACTIVE_FLAG_FAR_AWAY | ACTIVE_FLAG_IN_DIFFERENT_ROOM)) { cur_obj_update_floor(); @@ -2539,7 +2533,6 @@ s32 cur_obj_update_dialog(s32 actionArg, s32 dialogFlags, s32 dialogID, UNUSED s UNUSED s32 doneTurning = TRUE; switch (o->oDialogState) { -#if BUGFIX_DIALOG_TIME_STOP case DIALOG_STATUS_ENABLE_TIME_STOP: // Patched :( // Wait for Mario to be ready to speak, and then enable time stop @@ -2552,18 +2545,6 @@ s32 cur_obj_update_dialog(s32 actionArg, s32 dialogFlags, s32 dialogID, UNUSED s } // Fall through so that Mario's action is interrupted immediately // after time is stopped -#else - case DIALOG_STATUS_ENABLE_TIME_STOP: - //! We enable time stop even if Mario is not ready to speak. This - // allows us to move during time stop as long as Mario never enters - // an action that can be interrupted with text. - if (gMarioState->health >= 0x100) { - gTimeStopState |= TIME_STOP_ENABLED; - o->activeFlags |= ACTIVE_FLAG_INITIATED_TIME_STOP; - o->oDialogState++; - } - break; -#endif case DIALOG_STATUS_INTERRUPT: // Interrupt until Mario is actually speaking with the NPC if (set_mario_npc_dialog(actionArg) == MARIO_DIALOG_STATUS_SPEAK) { @@ -2624,7 +2605,6 @@ s32 cur_obj_update_dialog_with_cutscene(s32 actionArg, s32 dialogFlags, s32 cuts s32 doneTurning = TRUE; switch (o->oDialogState) { -#if BUGFIX_DIALOG_TIME_STOP case DIALOG_STATUS_ENABLE_TIME_STOP: // Wait for Mario to be ready to speak, and then enable time stop if (mario_ready_to_speak() || gMarioState->action == ACT_READING_NPC_DIALOG) { @@ -2637,19 +2617,6 @@ s32 cur_obj_update_dialog_with_cutscene(s32 actionArg, s32 dialogFlags, s32 cuts } // Fall through so that Mario's action is interrupted immediately // after time is stopped -#else - case DIALOG_STATUS_ENABLE_TIME_STOP: - //! We enable time stop even if Mario is not ready to speak. This - // allows us to move during time stop as long as Mario never enters - // an action that can be interrupted with text. - if (gMarioState->health >= 0x0100) { - gTimeStopState |= TIME_STOP_ENABLED; - o->activeFlags |= ACTIVE_FLAG_INITIATED_TIME_STOP; - o->oDialogState++; - o->oDialogResponse = DIALOG_RESPONSE_NONE; - } - break; -#endif case DIALOG_STATUS_INTERRUPT: // Additional flag that makes the NPC rotate towards to Mario if (dialogFlags & DIALOG_FLAG_TURN_TO_MARIO) { @@ -2869,14 +2836,12 @@ void cur_obj_spawn_loot_blue_coin(void) { } } -#ifndef VERSION_JP void cur_obj_spawn_star_at_y_offset(f32 targetX, f32 targetY, f32 targetZ, f32 offsetY) { f32 objectPosY = o->oPosY; o->oPosY += offsetY + gDebugInfo[5][0]; spawn_default_star(targetX, targetY, targetZ); o->oPosY = objectPosY; } -#endif // Extra functions for HackerSM64 void obj_set_model(struct Object *obj, s32 modelID) { diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h index f021d640..e9a59552 100644 --- a/src/game/object_helpers.h +++ b/src/game/object_helpers.h @@ -279,9 +279,7 @@ void disable_time_stop_including_mario(void); s32 cur_obj_check_interacted(void); void cur_obj_spawn_loot_blue_coin(void); -#ifndef VERSION_JP void cur_obj_spawn_star_at_y_offset(f32 targetX, f32 targetY, f32 targetZ, f32 offsetY); -#endif // Extra functions for HackerSM64 void obj_set_model(struct Object *obj, s32 modelID); diff --git a/src/game/object_list_processor.c b/src/game/object_list_processor.c index 1cd4e268..0c9bc844 100644 --- a/src/game/object_list_processor.c +++ b/src/game/object_list_processor.c @@ -460,12 +460,7 @@ void spawn_objects_from_info(UNUSED s32 unused, struct SpawnInfo *spawnInfo) { gWDWWaterLevelChanging = FALSE; gMarioOnMerryGoRound = FALSE; - //! (Spawning Displacement) On the Japanese version, Mario's platform object - // isn't cleared when transitioning between areas. This can cause Mario to - // receive displacement after spawning. -#ifndef VERSION_JP clear_mario_platform(); -#endif if (gCurrAreaIndex == 2) { gCCMEnteredSlide |= 1; diff --git a/src/game/platform_displacement.c b/src/game/platform_displacement.c index 715ad614..39599038 100644 --- a/src/game/platform_displacement.c +++ b/src/game/platform_displacement.c @@ -312,12 +312,9 @@ void apply_mario_platform_displacement(void) { } #endif - -#ifndef VERSION_JP /** * Set Mario's platform to NULL. */ void clear_mario_platform(void) { gMarioPlatform = NULL; } -#endif diff --git a/src/game/platform_displacement.h b/src/game/platform_displacement.h index 6b41c978..5eef98d9 100644 --- a/src/game/platform_displacement.h +++ b/src/game/platform_displacement.h @@ -25,8 +25,6 @@ void set_mario_pos(f32 x, f32 y, f32 z); void apply_platform_displacement(u32 isMario, struct Object *platform); #endif void apply_mario_platform_displacement(void); -#ifndef VERSION_JP void clear_mario_platform(void); -#endif #endif // PLATFORM_DISPLACEMENT_H diff --git a/src/game/rendering_graph_node.c b/src/game/rendering_graph_node.c index 10dc3f6d..236d4dbd 100644 --- a/src/game/rendering_graph_node.c +++ b/src/game/rendering_graph_node.c @@ -980,17 +980,7 @@ static void geo_process_shadow(struct GraphNodeShadow *node) { mtxf_mul(gMatStack[gMatStackIndex], mtxf, *gCurGraphNodeCamera->matrixPtr); mtxf_to_mtx(mtx, gMatStack[gMatStackIndex]); gMatStackFixed[gMatStackIndex] = mtx; -#ifdef FIX_SHADOW_TRANSPARENCY geo_append_display_list((void *) VIRTUAL_TO_PHYSICAL(shadowList), ((gShadowAboveWaterOrLava || gShadowAboveCustomWater || gMarioOnIceOrCarpet) ? LAYER_TRANSPARENT : LAYER_TRANSPARENT_DECAL)); -#else - if (gShadowAboveWaterOrLava == TRUE) { - geo_append_display_list((void *) VIRTUAL_TO_PHYSICAL(shadowList), LAYER_ALPHA); - } else if (gMarioOnIceOrCarpet == TRUE || gShadowAboveCustomWater == TRUE) { - geo_append_display_list((void *) VIRTUAL_TO_PHYSICAL(shadowList), LAYER_TRANSPARENT); - } else { - geo_append_display_list((void *) VIRTUAL_TO_PHYSICAL(shadowList), LAYER_TRANSPARENT_DECAL); - } -#endif gMatStackIndex--; } } diff --git a/src/menu/intro_geo.c b/src/menu/intro_geo.c index 8f6ca65f..debb2fd0 100644 --- a/src/menu/intro_geo.c +++ b/src/menu/intro_geo.c @@ -204,11 +204,11 @@ Gfx *geo_intro_regular_backdrop(s32 state, struct GraphNode *node, UNUSED void * dlIter = dl; SET_GRAPH_NODE_LAYER(graphNode->node.flags, LAYER_OPAQUE); gSPDisplayList(dlIter++, &dl_proj_mtx_fullscreen); - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000100); + gSPDisplayList(dlIter++, &title_screen_bg_dl_start); for (i = 0; i < 12; ++i) { gSPDisplayList(dlIter++, intro_backdrop_one_image(i, backgroundTable)); } - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000190); + gSPDisplayList(dlIter++, &title_screen_bg_dl_end); gSPEndDisplayList(dlIter); } return dl; @@ -262,19 +262,21 @@ Gfx *geo_intro_gameover_backdrop(s32 state, struct GraphNode *node, UNUSED void // draw all the tiles gSPDisplayList(dlIter++, &dl_proj_mtx_fullscreen); - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000100); + gSPDisplayList(dlIter++, &title_screen_bg_dl_start); for (j = 0; j < ARRAY_COUNT(gameOverBackgroundTable); ++j) gSPDisplayList(dlIter++, intro_backdrop_one_image(j, gameOverBackgroundTable)); - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A000190); + gSPDisplayList(dlIter++, &title_screen_bg_dl_end); gSPEndDisplayList(dlIter); } return dl; } -#ifdef VERSION_SH -extern Gfx title_screen_bg_dl_0A0065E8[]; -extern Gfx title_screen_bg_dl_0A006618[]; -extern Gfx title_screen_bg_dl_0A007548[]; +#if ENABLE_RUMBLE +extern Gfx title_screen_bg_dl_rumble_pak[]; +#endif +#ifdef GODDARD_EASTER_EGG +extern Gfx title_screen_bg_dl_face_easter_egg_begin[]; +extern Gfx title_screen_bg_dl_face_easter_egg_end[]; //Data s8 sFaceVisible[] = { @@ -296,8 +298,7 @@ s8 sFaceToggleOrder[] = { s8 sFaceCounter = 0; -void intro_gen_face_texrect(Gfx **dlIter) -{ +void intro_gen_face_texrect(Gfx **dlIter) { s32 x; s32 y; @@ -311,8 +312,7 @@ void intro_gen_face_texrect(Gfx **dlIter) } } -Gfx *intro_draw_face(u16 *image, s32 imageW, s32 imageH) -{ +Gfx *intro_draw_face(u16 *image, s32 imageW, s32 imageH) { Gfx *dl; Gfx *dlIter; @@ -324,13 +324,13 @@ Gfx *intro_draw_face(u16 *image, s32 imageW, s32 imageH) dlIter = dl; } - gSPDisplayList(dlIter++, title_screen_bg_dl_0A0065E8); + gSPDisplayList(dlIter++, title_screen_bg_dl_face_easter_egg_begin); gDPLoadTextureBlock(dlIter++, VIRTUAL_TO_PHYSICAL(image), G_IM_FMT_RGBA, G_IM_SIZ_16b, imageW, imageH, 0, G_TX_CLAMP | G_TX_NOMIRROR, G_TX_CLAMP | G_TX_NOMIRROR, 6, 6, G_TX_NOLOD, G_TX_NOLOD); intro_gen_face_texrect(&dlIter); - gSPDisplayList(dlIter++, title_screen_bg_dl_0A006618); + gSPDisplayList(dlIter++, title_screen_bg_dl_face_easter_egg_end); gSPEndDisplayList(dlIter++); @@ -348,7 +348,7 @@ u16 *intro_sample_frame_buffer(s32 imageW, s32 imageH, s32 sampleW, s32 sampleH) s32 xOffset = 120; s32 yOffset = 80; - fb = sFrameBuffers[sRenderingFrameBuffer]; + fb = gFrameBuffers[sRenderingFrameBuffer]; image = alloc_display_list(imageW * imageH * sizeof(u16)); if (image == NULL) { @@ -398,10 +398,6 @@ Gfx *geo_intro_face_easter_egg(s32 state, struct GraphNode *node, UNUSED void *c s32 i; if (state != 1) { - sFrameBuffers[0] = gFrameBuffer0; - sFrameBuffers[1] = gFrameBuffer1; - sFrameBuffers[2] = gFrameBuffer2; - for (i = 0; i < 48; i++) { sFaceVisible[i] = 0; } @@ -432,7 +428,9 @@ Gfx *geo_intro_face_easter_egg(s32 state, struct GraphNode *node, UNUSED void *c return dl; } +#endif +#if ENABLE_RUMBLE Gfx *geo_intro_rumble_pak_graphic(s32 state, struct GraphNode *node, UNUSED void *context) { struct GraphNodeGenerated *genNode = (struct GraphNodeGenerated *)node; Gfx *dlIter; @@ -454,7 +452,7 @@ Gfx *geo_intro_rumble_pak_graphic(s32 state, struct GraphNode *node, UNUSED void dl = alloc_display_list(3 * sizeof(*dl)); if (dl != NULL) { dlIter = dl; - gSPDisplayList(dlIter++, &title_screen_bg_dl_0A007548); + gSPDisplayList(dlIter++, &title_screen_bg_dl_rumble_pak); gSPEndDisplayList(dlIter); } } else { diff --git a/src/menu/intro_geo.h b/src/menu/intro_geo.h index f45afd60..3f882621 100644 --- a/src/menu/intro_geo.h +++ b/src/menu/intro_geo.h @@ -12,8 +12,10 @@ Gfx *geo_intro_tm_copyright(s32 state, struct GraphNode *node, UNUSED void *cont Gfx *geo_intro_regular_backdrop(s32 state, struct GraphNode *node, UNUSED void *context); Gfx *geo_intro_gameover_backdrop(s32 state, struct GraphNode *node, UNUSED void *context); -#ifdef VERSION_SH +#ifdef GODDARD_EASTER_EGG Gfx *geo_intro_face_easter_egg(s32 state, struct GraphNode *node, UNUSED void *context); +#endif +#if ENABLE_RUMBLE Gfx *geo_intro_rumble_pak_graphic(s32 state, struct GraphNode *node, UNUSED void *context); #endif