From cee416cfba54e06f615837a68dd1601cafb0d8db Mon Sep 17 00:00:00 2001 From: intra0 Date: Fri, 13 Dec 2024 18:36:16 -0600 Subject: [PATCH 1/8] Update MK8 mods adds v1 support to 60fps and resolution pack adds new course unlock pack and vehicle unlock pack --- .../CourseUnlock/patch_CourseUnlock.asm | 19 +++ src/MarioKart8/Cheats/CourseUnlock/rules.txt | 7 + .../patch_UnlockVehicle.asm | 21 +++ .../Cheats/UnlockVehicleParts/rules.txt | 18 +++ .../e90feef2bca6cb2e_00000000000003c9_ps.txt | 129 ++++++++++++++++++ src/MarioKart8/Enhancements/Bloom/rules.txt | 26 ++++ .../998a9f67e353657b_0000000000001e51_ps.txt | 20 +-- .../Enhancements/Contrasty/rules.txt | 1 + .../Enhancements/Debanding/output.glsl | 12 +- .../Enhancements/Debanding/rules.txt | 15 +- .../RemoveMKTVWatermark/rules.txt | 1 + .../2e78a0d0a0aa66bb_0000000000000000_vs.txt | 6 +- .../408a66d9721b1cec_0000000000000000_vs.txt | 6 +- .../74126253134563de_0000000000000000_vs.txt | 6 +- .../8e1337dde42fd224_00000000000003c9_ps.txt | 4 +- .../ad3014302e0e49bf_0000000000000000_vs.txt | 6 +- .../be99d80628d31127_00000000000003c9_ps.txt | 6 +- .../c673c0d44f779fc9_0000000000000000_vs.txt | 6 +- .../d5d751973ea3d3b4_0000000000000000_vs.txt | 6 +- .../dd7a19be01b7b1aa_0000000000000000_vs.txt | 6 +- .../e90feef2bca6cb2e_00000000000003c9_ps.txt | 4 +- .../f5274bda2b5e1e9f_0000000000000000_vs.txt | 6 +- .../fdf33c607cd1d737_0000000000000079_ps.txt | 8 +- src/MarioKart8/Graphics/patch_AspectRatio.asm | 45 ++---- src/MarioKart8/Graphics/patch_DisableFXAA.asm | 15 +- .../Graphics/patch_LevelOfDetail.asm | 9 +- src/MarioKart8/Graphics/rules.txt | 10 +- .../60FPSMultiplayer/patch_60FPSFullDraw.asm | 15 +- .../Mods/60FPSMultiplayer/rules.txt | 1 + .../0039902b839f2863_00000000000003c9_ps.txt | 4 +- .../005826125bfe150a_0000000000000079_ps.txt | 4 +- .../03c0659aacda420a_00000000000003c9_ps.txt | 4 +- .../2940f7a0fb8ea817_0000000000000079_ps.txt | 4 +- .../440c49859973a955_00000000000003c9_ps.txt | 4 +- .../50612bab4e50d820_0000000000001e49_ps.txt | 4 +- .../96440241cc1bf8a4_000000000000007d_ps.txt | 4 +- .../a6981858d5437cf7_00000000000003c9_ps.txt | 4 +- src/MarioKart8/Mods/NoHUD/rules.txt | 1 + src/MarioKart8/NetworkPort/patch_port.asm | 9 +- 39 files changed, 346 insertions(+), 130 deletions(-) create mode 100644 src/MarioKart8/Cheats/CourseUnlock/patch_CourseUnlock.asm create mode 100644 src/MarioKart8/Cheats/CourseUnlock/rules.txt create mode 100644 src/MarioKart8/Cheats/UnlockVehicleParts/patch_UnlockVehicle.asm create mode 100644 src/MarioKart8/Cheats/UnlockVehicleParts/rules.txt create mode 100644 src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt create mode 100644 src/MarioKart8/Enhancements/Bloom/rules.txt diff --git a/src/MarioKart8/Cheats/CourseUnlock/patch_CourseUnlock.asm b/src/MarioKart8/Cheats/CourseUnlock/patch_CourseUnlock.asm new file mode 100644 index 000000000..25ce50241 --- /dev/null +++ b/src/MarioKart8/Cheats/CourseUnlock/patch_CourseUnlock.asm @@ -0,0 +1,19 @@ +[MarioKart8_CourseUnlock] +moduleMatches = 0x9F0A90B7, 0xD09700CE ; v4.2(EU/NA/JP), v4.1(EU/NA/JP) +.origin = codecave +UnlockCourses: +lis r30, 0x0303 +ori r30, r30, 0x0303 +stw r30, 0(r11) +stw r30, 4(r11) +lbzx r30, r11, r0 +blr + +[MarioKart8_CourseUnlock_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +;this mod makes every byte at 0x2e6b6668 = 3 +0x024D74CC = bla UnlockCourses + +[MarioKart8_CourseUnlock_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) +0x024D7148 = bla UnlockCourses diff --git a/src/MarioKart8/Cheats/CourseUnlock/rules.txt b/src/MarioKart8/Cheats/CourseUnlock/rules.txt new file mode 100644 index 000000000..e9fa605fc --- /dev/null +++ b/src/MarioKart8/Cheats/CourseUnlock/rules.txt @@ -0,0 +1,7 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Course Unlock +path = "Mario Kart 8/Cheats/Course Unlock" +description = Unlock Every Course + Mirror Mode! +#Credits: Intra +version = 7 diff --git a/src/MarioKart8/Cheats/UnlockVehicleParts/patch_UnlockVehicle.asm b/src/MarioKart8/Cheats/UnlockVehicleParts/patch_UnlockVehicle.asm new file mode 100644 index 000000000..dcec41ae2 --- /dev/null +++ b/src/MarioKart8/Cheats/UnlockVehicleParts/patch_UnlockVehicle.asm @@ -0,0 +1,21 @@ +[MarioKart8_UnlockVehicle] +moduleMatches = 0x9F0A90B7, 0xD09700CE ; v4.2(EU/NA/JP), v4.1(EU/NA/JP) +.origin = codecave + +CheckandChangeCoinAmmount: +lwz r0, 0x14e0(r26) +cmpwi r0, $coinammount +bge CheckandChangeCoinAmmount_Exit +li r0, $coinammount +stw r0, 0x14e0(r26) +CheckandChangeCoinAmmount_Exit: +blr + +[MarioKart8_UnlockVehicle_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +;this mod makes 0x2e6b6128 = $coinammount +0x025A4038 = bla CheckandChangeCoinAmmount + +[MarioKart8_UnlockVehicle_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) +0x025A3E84 = bla CheckandChangeCoinAmmount diff --git a/src/MarioKart8/Cheats/UnlockVehicleParts/rules.txt b/src/MarioKart8/Cheats/UnlockVehicleParts/rules.txt new file mode 100644 index 000000000..f85534588 --- /dev/null +++ b/src/MarioKart8/Cheats/UnlockVehicleParts/rules.txt @@ -0,0 +1,18 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Unlock Vehicle Parts! +path = "Mario Kart 8/Mods/Unlock Vehicle Parts" +description = Unlock every non-golden vehicle part!|Must activate by pressing (-) on the main menu to view your playstats.|Then do a race to save the new value. +#Credits: Intra +version = 7 + +[Default] +$coinammount = 0 + +[Preset] +name = Unlock all non-golden parts (sets coins to 2800) +$coinammount = 2800 + +[Preset] +name = Unlock Golden Glider (sets coins to 10000) +$coinammount = 10000 diff --git a/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt b/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt new file mode 100644 index 000000000..034b863f6 --- /dev/null +++ b/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt @@ -0,0 +1,129 @@ +#version 450 +#extension GL_ARB_texture_gather : enable +#ifdef VULKAN +#define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(set = __vkSet, binding = __vkLocation, std140) +#define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(set = __vkSet, binding = __vkLocation) +#define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 +#define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale.xy,gl_FragCoord.zw) +#define gl_VertexID gl_VertexIndex +#define gl_InstanceID gl_InstanceIndex +#else +#define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) +#define SET_POSITION(_v) gl_Position = _v +#define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) +#endif +// This shaders was auto-converted from OpenGL to Cemu. + +// shader e90feef2bca6cb2e +const float bloomFactor = $bloom; + +#ifdef VULKAN +layout(set = 1, binding = 2) uniform ufBlock +{ +uniform ivec4 uf_remappedPS[4]; +uniform vec4 uf_fragCoordScale; +}; +#else +uniform ivec4 uf_remappedPS[4]; +uniform vec2 uf_fragCoordScale; +#endif +TEXTURE_LAYOUT(0, 1, 0) uniform sampler2D textureUnitPS0; +TEXTURE_LAYOUT(1, 1, 1) uniform sampler2D textureUnitPS1; +layout(location = 0) in vec4 passParameterSem0; +layout(location = 1) in vec4 passParameterSem1; +layout(location = 2) in vec4 passParameterSem2; +layout(location = 0) out vec4 passPixelColor0; +// uf_fragCoordScale was moved to the ufBlock +int clampFI32(int v) +{ +if( v == 0x7FFFFFFF ) + return floatBitsToInt(1.0); +else if( v == 0xFFFFFFFF ) + return floatBitsToInt(0.0); +return floatBitsToInt(clamp(intBitsToFloat(v), 0.0, 1.0)); +} +float mul_nonIEEE(float a, float b){ if( a == 0.0 || b == 0.0 ) return 0.0; return a*b; } +void main() +{ +vec4 R0f = vec4(0.0); +vec4 R1f = vec4(0.0); +vec4 R2f = vec4(0.0); +vec4 R3f = vec4(0.0); +vec4 R4f = vec4(0.0); +vec4 R123f = vec4(0.0); +vec4 R126f = vec4(0.0); +vec4 R127f = vec4(0.0); +float backupReg0f, backupReg1f, backupReg2f, backupReg3f, backupReg4f; +vec4 PV0f = vec4(0.0), PV1f = vec4(0.0); +float PS0f = 0.0, PS1f = 0.0; +vec4 tempf = vec4(0.0); +float tempResultf; +int tempResulti; +ivec4 ARi = ivec4(0); +bool predResult = true; +vec3 cubeMapSTM; +int cubeMapFaceId; +R0f = passParameterSem0; +R1f = passParameterSem1; +R2f = passParameterSem2; +R3f.xyzw = (texture(textureUnitPS0, R1f.xy).xyzw); +R1f.xyzw = (texture(textureUnitPS0, R1f.zw).xyzw); +R4f.xyzw = (texture(textureUnitPS0, R2f.xy).xyzw); +R0f.x = (texture(textureUnitPS1, R0f.xy).x); +R2f.xyzw = (texture(textureUnitPS0, R2f.zw).xyzw); +// 0 +backupReg0f = R0f.x; +PV0f.x = R3f.y + R1f.y; +PV0f.x /= 2.0; +PV0f.y = R3f.x + R1f.x; +PV0f.y /= 2.0; +PV0f.z = R3f.w + R1f.w; +PV0f.z /= 2.0; +PV0f.w = R3f.z + R1f.z; +PV0f.w /= 2.0; +R127f.w = (backupReg0f * intBitsToFloat(uf_remappedPS[0].z) + intBitsToFloat(uf_remappedPS[0].w)); +R127f.w = clamp(R127f.w, 0.0, 1.0); +PS0f = R127f.w; +// 1 +R123f.x = (R4f.y * 0.5 + PV0f.x); +PV1f.x = R123f.x; +R123f.y = (R4f.x * 0.5 + PV0f.y); +PV1f.y = R123f.y; +R123f.z = (R4f.w * 0.5 + PV0f.z); +PV1f.z = R123f.z; +R123f.w = (R4f.z * 0.5 + PV0f.w); +PV1f.w = R123f.w; +R127f.z = mul_nonIEEE(PS0f, intBitsToFloat(uf_remappedPS[1].z)); +PS1f = R127f.z; +// 2 +R127f.x = (R2f.x * 0.5 + PV1f.y)/2.0; +PV0f.x = R127f.x; +R127f.y = (R2f.y * 0.5 + PV1f.x)/2.0; +PV0f.y = R127f.y; +R126f.z = (R2f.z * 0.5 + PV1f.w)/2.0; +PV0f.z = R126f.z; +R126f.w = (R2f.w * 0.5 + PV1f.z)/2.0; +PV0f.w = R126f.w; +// 3 +tempf.x = dot(vec4(PV0f.x,PV0f.y,PV0f.z,PV0f.w),vec4(intBitsToFloat(uf_remappedPS[2].x),intBitsToFloat(uf_remappedPS[2].y),intBitsToFloat(uf_remappedPS[2].z),intBitsToFloat(uf_remappedPS[2].w))); +tempf.x = clamp(tempf.x, 0.0, 1.0); +PV1f.x = tempf.x; +PV1f.y = tempf.x; +PV1f.z = tempf.x; +PV1f.w = tempf.x; +// 4 +R123f.y = (R127f.w * R127f.z + PV1f.x); +PV0f.y = R123f.y; +// 5 +PV1f.x = mul_nonIEEE(PV0f.y, intBitsToFloat(uf_remappedPS[3].z)); +// 6 +R2f.x = mul_nonIEEE(R127f.x, PV1f.x * bloomFactor); +R2f.y = mul_nonIEEE(R127f.y, PV1f.x * bloomFactor); +R2f.z = mul_nonIEEE(R126f.z, PV1f.x * bloomFactor); +R2f.w = mul_nonIEEE(R126f.w, PV1f.x * bloomFactor); +// export +passPixelColor0 = vec4(R2f.x, R2f.y, R2f.z, R2f.w); +} diff --git a/src/MarioKart8/Enhancements/Bloom/rules.txt b/src/MarioKart8/Enhancements/Bloom/rules.txt new file mode 100644 index 000000000..eee5a0fdd --- /dev/null +++ b/src/MarioKart8/Enhancements/Bloom/rules.txt @@ -0,0 +1,26 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Bloom Adjustment +path = "Mario Kart 8/Enhancements/Bloom Adjustment" +description = Allows you to adjust how strong the bloom is. Full amount is the default intensity of bloom. +#Credits: M&&M +version = 6 + +[Default] +$bloom = 1.0 + +[Preset] +name = Full Amount (Default) +default = 1 + +[Preset] +name = Half Amount +$bloom = 0.5 + +[Preset] +name = Quarter Amount +$bloom = 0.25 + +[Preset] +name = Disabled +$bloom = 0.0 diff --git a/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt b/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt index 134c17559..f722e7fd6 100644 --- a/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt +++ b/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) @@ -34,8 +34,8 @@ const float hazeFactor = 0.1; const float gamma = $gamma; // 1.0 is neutral Botw is already colour graded at this stage const float exposure = $exposure; // 1.0 is neutral -const float vibrance = $vibrance; // 0.0 is neutral -const float crushContrast = $crushContrast; // 0.0 is neutral. Use small increments, loss of shadow detail +const float vibrance = $vibrance; // 0.0 is neutral +const float crushContrast = $crushContrast; // 0.0 is neutral. Use small increments, loss of shadow detail const float contrastCurve = $contrastCurve; @@ -44,18 +44,18 @@ vec3 RGB_Gamma = vec3($redMid ,$greenMid, $blueMid); // [0.000 to 2.000] Adju vec3 RGB_Gain = vec3($redHilight, $greenHilight, $blueHilight); // [0.000 to 2.000] Adjust highlights for Red, Green and Blue //lumasharpen const float sharp_mix = $sharp_mix; -const float sharp_strength = 2.0; +const float sharp_strength = 2.0; const float sharp_clamp = 0.75; const float offset_bias = 1.0; float Sigmoid (float x) { - return 1.0 / (1.0 + (exp(-(x - 0.5) * 5.5))); + return 1.0 / (1.0 + (exp(-(x - 0.5) * 5.5))); } #define px (1.0/1920.0*uf_fragCoordScale.x) #define py (1.0/1080.0*uf_fragCoordScale.y) -#define CoefLuma vec3(0.2126, 0.7152, 0.0722) +#define CoefLuma vec3(0.2126, 0.7152, 0.0722) float lumasharping(sampler2D tex, vec2 pos) { vec4 colorInput = texture(tex, pos); @@ -93,8 +93,8 @@ vec3 LiftGammaGainPass(vec3 colorInput) { //reshade BSD https://reshade.me , Alexkiri port vec3 color = colorInput; color = color * (1.5 - 0.5 * RGB_Lift) + 0.5 * RGB_Lift - 0.5; - color = clamp(color, 0.0, 1.0); - color *= RGB_Gain; + color = clamp(color, 0.0, 1.0); + color *= RGB_Gain; color = pow(color, 1.0 / RGB_Gamma); return clamp(color, 0.0, 1.0); } @@ -102,7 +102,7 @@ vec3 LiftGammaGainPass(vec3 colorInput) vec3 contrasty(vec3 colour){ vec3 fColour = (colour.xyz); //fColour = LiftGammaGainPass(fColour); - + fColour = clamp(exposure * fColour, 0.0, 1.0); fColour = pow(fColour, vec3(1.0 / gamma)); float luminance = fColour.r*0.299 + fColour.g*0.587 + fColour.b*0.114; diff --git a/src/MarioKart8/Enhancements/Contrasty/rules.txt b/src/MarioKart8/Enhancements/Contrasty/rules.txt index 0e9ace554..aefa5758a 100644 --- a/src/MarioKart8/Enhancements/Contrasty/rules.txt +++ b/src/MarioKart8/Enhancements/Contrasty/rules.txt @@ -3,6 +3,7 @@ titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 name = Contrasty path = "Mario Kart 8/Enhancements/Contrasty" description = This pack tweaks the colors and contrast to whatever preset you set it as.|You can also make your own preset by editing the Default preset in the Contrasty folder from the game's graphic packs.|Made by getdls. +#Credits: getdls version = 6 [Default] diff --git a/src/MarioKart8/Enhancements/Debanding/output.glsl b/src/MarioKart8/Enhancements/Debanding/output.glsl index 48835e770..ea0c29395 100644 --- a/src/MarioKart8/Enhancements/Debanding/output.glsl +++ b/src/MarioKart8/Enhancements/Debanding/output.glsl @@ -1,4 +1,4 @@ -#version 420 +#version 450 #ifdef VULKAN layout(location = 0) in vec2 passUV; @@ -14,9 +14,9 @@ ivec2 resolution = textureSize(textureSrc,0); // Retrieve Texture Dimensions precision highp float; vec2 RcpFrame = vec2(1.0 / float(resolution.x), 1.0 / float(resolution.y)); -/* +/* https://github.com/haasn/gentoo-conf/blob/xor/home/nand/.mpv/shaders/LICENSE - + Copyright (c) 2015 Niklas Haas Permission is hereby granted, free of charge, to any person obtaining a copy @@ -38,7 +38,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* +/* Ordered dithering reshade https://github.com/crosire/reshade/blob/master/LICENSE.md @@ -121,8 +121,8 @@ vec4 getreader(sampler2D tex, vec2 pos, vec2 tex_size) } // Ordered dithering of output - const float dither_bit = 8.0; //WiiU backbuffer RGBA_8, if used in shader, check if depth is RBG_16_A2 - + const float dither_bit = 8.0; //WiiU backbuffer RGBA_8, if used in shader, check if depth is RBG_16_A2 + float grid_position = fract(dot(passUV, (resolution * vec2(1.0 / 16.0, 10.0 / 36.0)) + 0.25)); float dither_shift = 0.25 * (1.0 / (pow(2, dither_bit) - 1.0)); vec3 dither_shift_RGB = vec3(dither_shift, -dither_shift, dither_shift); //Shift the individual colors, subpixel dithering diff --git a/src/MarioKart8/Enhancements/Debanding/rules.txt b/src/MarioKart8/Enhancements/Debanding/rules.txt index a6c425c34..f2f81f62d 100644 --- a/src/MarioKart8/Enhancements/Debanding/rules.txt +++ b/src/MarioKart8/Enhancements/Debanding/rules.txt @@ -1,8 +1,9 @@ [Definition] -titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = Debanding path = "Mario Kart 8/Enhancements/Debanding" description = Adds a debanding post processing shader to the game.|This pack can only be used with OpenGL.|Made by getdls. +#Credits: getdls version = 6 rendererFilter = opengl @@ -34,29 +35,29 @@ $Range:int = 16 $Iterations:int = 8 $Grain:int = 90 -# Original by N Haas GPL +# Original by N Haas GPL # Order dither converted from reshade Crosire et al. # -# Works better when applied to a shader (sky, video..) -# instead of as a post filter. Both for performance and fixing quantization errors. +# Works better when applied to a shader (sky, video..) +# instead of as a post filter. Both for performance and fixing quantization errors. # The threshold of difference below which a pixel is considered to be part of # a gradient. Higher = more debanding, but setting it too high diminishes image # details. # THRESHOLD 64 -# +# # The range (in source pixels) at which to sample for neighbours. Higher values # will find more gradients, but lower values will deband more aggressively. # RANGE 8 -# +# # The number of debanding iterations to perform. Each iteration samples from # random positions, so increasing the number of iterations is likely to # increase the debanding quality. Conversely, it slows the shader down. # (Each iteration will use a multiple of the configured RANGE, and a # successively lower THRESHOLD - so setting it much higher has little effect) # ITERATIONS 4 -# +# # (Optional) Add some extra noise to the image. This significantly helps cover # up remaining banding and blocking artifacts, at comparatively little visual # quality. Higher = more grain. Setting it to 1 disables the effect. diff --git a/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt b/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt index aede27613..def81cca3 100644 --- a/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt +++ b/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt @@ -3,6 +3,7 @@ titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 name = Remove MKTV Watermark path = "Mario Kart 8/Enhancements/Remove MKTV Watermark" description = Removes the MKTV watermark in the replays or highlight reel.|Made by Crementif. +#Credits: Crementif version = 6 [TextureRedefine] diff --git a/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt b/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt index 8c6b3ff61..96cec256e 100644 --- a/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) @@ -20,7 +20,7 @@ // shader 2e78a0d0a0aa66bb // Used for: Horizontal (Menu) Bloom Blur -const float resScale = float($width)/float($gameWidth); +const float resScale = float($width)/float($gameWidth); #ifdef VULKAN layout(set = 0, binding = 0) uniform ufBlock diff --git a/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt b/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt index 2454f97a0..2fa60b342 100644 --- a/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader 408a66d9721b1cec //Lava bowser castle, point light offset @@ -12,7 +12,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif @@ -48,7 +48,7 @@ layout(location = 3) out vec4 passParameterSem4; layout(location = 4) out vec4 passParameterSem6; layout(location = 5) out vec4 passParameterSem10; // end of shader inputs/outputs -const float resScale = float($width)/float($gameWidth); +const float resScale = float($width)/float($gameWidth); int clampFI32(int v) { if( v == 0x7FFFFFFF ) diff --git a/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt b/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt index 7c3b19c0f..e084efe9f 100644 --- a/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader 74126253134563de @@ -14,7 +14,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif @@ -33,7 +33,7 @@ out gl_PerVertex }; layout(location = 0) out vec4 passParameterSem0; // end of shader inputs/outputs -const float resScale = float($height)/float($gameHeight); +const float resScale = float($height)/float($gameHeight); int clampFI32(int v) { if( v == 0x7FFFFFFF ) diff --git a/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt index 62bb90231..ba3d87839 100644 --- a/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader 8e1337dde42fd224 @@ -14,7 +14,7 @@ const float resYScale = float($height)/float($gameHeight); #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale.xy,gl_FragCoord.zw) #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) #endif diff --git a/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt b/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt index 57bc1b743..8539d2d74 100644 --- a/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) @@ -20,7 +20,7 @@ // shader ad3014302e0e49bf // Used for: Stage Select & Menu Background Horizontal Blur -const float resScale = float($width)/float($gameWidth); +const float resScale = float($width)/float($gameWidth); #ifdef VULKAN layout(set = 0, binding = 0) uniform ufBlock diff --git a/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt index b3e955bf9..2fa428f4c 100644 --- a/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader be99d80628d31127 @@ -14,7 +14,7 @@ const float resYScale = float($height)/float($gameHeight); #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale.xy,gl_FragCoord.zw) #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) #endif @@ -219,4 +219,4 @@ activeMaskStackC[1] = activeMaskStack[0] == true && activeMaskStackC[0] == true; // export passPixelColor0 = vec4(R4f.x, R4f.y, R4f.z, R4f.w); } -#endif \ No newline at end of file +#endif diff --git a/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt b/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt index 07263b168..237e63c95 100644 --- a/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader c673c0d44f779fc9 // replay DOF box blur @@ -12,7 +12,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif @@ -32,7 +32,7 @@ out gl_PerVertex }; layout(location = 0) out vec4 passParameterSem3; // end of shader inputs/outputs -const float resScale = float($height)/float($gameHeight); +const float resScale = float($height)/float($gameHeight); int clampFI32(int v) { if( v == 0x7FFFFFFF ) diff --git a/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt b/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt index 4ddbb3892..ae0150b48 100644 --- a/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader d5d751973ea3d3b4 // menu background box blur, initial downscaling. @@ -12,7 +12,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif @@ -32,7 +32,7 @@ out gl_PerVertex layout(location = 0) out vec4 passParameterSem1; layout(location = 1) out vec4 passParameterSem3; // end of shader inputs/outputs -const float resScale = float($height)/float($gameHeight); +const float resScale = float($height)/float($gameHeight); int clampFI32(int v) { if( v == 0x7FFFFFFF ) diff --git a/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt b/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt index 830a3496e..d5c3e0ce9 100644 --- a/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) @@ -20,7 +20,7 @@ // shader dd7a19be01b7b1aa // Used for: Vertical (Menu) Bloom Blur -const float resScale = float($height)/float($gameHeight); +const float resScale = float($height)/float($gameHeight); #ifdef VULKAN layout(set = 0, binding = 0) uniform ufBlock diff --git a/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt index d347c0675..034b863f6 100644 --- a/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #ifdef VULKAN #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location) @@ -10,7 +10,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt b/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt index d048c3a0f..0b776ec40 100644 --- a/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt @@ -1,10 +1,10 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader f5274bda2b5e1e9f // start of shader inputs/outputs, predetermined by Cemu. Do not touch // Used for: reflection highlights -const float resScale = float($width)/float($gameWidth); +const float resScale = float($width)/float($gameWidth); #ifdef VULKAN #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location) @@ -15,7 +15,7 @@ const float resScale = float($width)/float($gameWidth); #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif diff --git a/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt b/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt index aa15dc78c..825e06a83 100644 --- a/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt +++ b/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt @@ -1,4 +1,4 @@ -#version 430 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader fdf33c607cd1d737 //Radial blur replacement @@ -10,7 +10,7 @@ #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale.xy,gl_FragCoord.zw) #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) #endif @@ -69,12 +69,12 @@ R0f = passParameterSem0; R1f = passParameterSem1; R2f = passParameterSem2; R3f = passParameterSem3; -vec2 coord = -1.0 + R0f.xy; +vec2 coord = -1.0 + R0f.xy; vec2 ps = vec2(1.0)*uf_fragCoordScale.xy / textureSize(textureUnitPS0, 0); vec2 uv = gl_FragCoord.xy *2.0 / textureSize(textureUnitPS0, 0); //Simle radial blur jcant0n, shadertoy.com uv -= center; -float precompute = blurWidth * (1.0 / float(nsamples - 1)); +float precompute = blurWidth * (1.0 / float(nsamples - 1)); for(int i = 0; i < nsamples; i++) { float scale = blurStart + (float(i)* precompute); diff --git a/src/MarioKart8/Graphics/patch_AspectRatio.asm b/src/MarioKart8/Graphics/patch_AspectRatio.asm index 362ada980..0311158e1 100644 --- a/src/MarioKart8/Graphics/patch_AspectRatio.asm +++ b/src/MarioKart8/Graphics/patch_AspectRatio.asm @@ -1,6 +1,5 @@ -[MK8_AspectRatio_Shared] +[MarioKart8_AspectRatio] moduleMatches = 0x9F0A90B7,0xD09700CE,0x1D398493,0xBA6B1E20,0x62A5F023,0x2A2DC82C - .origin = codecave aspectRatio: @@ -13,56 +12,38 @@ lfs f12, aspectRatio@l(r7) fmuls f7, f9, f12 blr - -[MK8_AspectRatio_V42] -moduleMatches = 0x9F0A90B7 - +[MarioKart8_AspectRatio_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) 0x024AEF70 = bla scaleAspectRatioCalc - 0x100C359C = .float ($width/$height) 0x10121E30 = .float ($width/$height) - -[MK8_AspectRatio_V41] -moduleMatches = 0xD09700CE - +[MarioKart8_AspectRatio_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) 0x024AEBEC = bla scaleAspectRatioCalc - 0x100C359C = .float ($width/$height) 0x10121E30 = .float ($width/$height) - -[MK8_AspectRatio_V4] -moduleMatches = 0x1D398493 - +[MarioKart8_AspectRatio_v4] +moduleMatches = 0x1D398493 ; v4.0(EU/NA/JP) 0x024AEBEC = bla scaleAspectRatioCalc - 0x100C359C = .float ($width/$height) 0x10121D30 = .float ($width/$height) - -[MK8_AspectRatio_V3] -moduleMatches = 0xBA6B1E20 - +[MarioKart8_AspectRatio_v3] +moduleMatches = 0xBA6B1E20 ; v3.0(EU/NA/JP) 0x024642E8 = bla scaleAspectRatioCalc - 0x100AC25C = .float ($width/$height) 0x1010A730 = .float ($width/$height) - -[MK8_AspectRatio_V2] -moduleMatches = 0x62A5F023 - +[MarioKart8_AspectRatio_v2] +moduleMatches = 0x62A5F023 ; v2.0(EU/NA/JP) 0x024376D4 = bla scaleAspectRatioCalc - 0x1009E9DC = .float ($width/$height) 0x100FC030 = .float ($width/$height) - -[MK8_AspectRatio_V1] -moduleMatches = 0x2A2DC82C - +[MarioKart8_AspectRatio_v1] +moduleMatches = 0x2A2DC82C ; v1.0(EU/NA/JP) 0x02416760 = bla scaleAspectRatioCalc - 0x10097D94 = .float ($width/$height) 0x100F3430 = .float ($width/$height) diff --git a/src/MarioKart8/Graphics/patch_DisableFXAA.asm b/src/MarioKart8/Graphics/patch_DisableFXAA.asm index 4c4ac62cd..a0e68fb39 100644 --- a/src/MarioKart8/Graphics/patch_DisableFXAA.asm +++ b/src/MarioKart8/Graphics/patch_DisableFXAA.asm @@ -1,10 +1,11 @@ -[MK8_DisableFXAA_V42] -moduleMatches = 0x9F0A90B7 - +[MarioKart8_DisableFXAA_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) 0x027DF528 = blr - -[MK8_DisableFXAA_V41] -moduleMatches = 0xD09700CE - +[MarioKart8_DisableFXAA_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) 0x027DF2F4 = blr + +[MarioKart8_DisableFXAA_v1] +moduleMatches = 0x2A2DC82C ; v1.0(EU/NA/JP) +0x0271DE0C = blr diff --git a/src/MarioKart8/Graphics/patch_LevelOfDetail.asm b/src/MarioKart8/Graphics/patch_LevelOfDetail.asm index c3d78dec5..7848dbf10 100644 --- a/src/MarioKart8/Graphics/patch_LevelOfDetail.asm +++ b/src/MarioKart8/Graphics/patch_LevelOfDetail.asm @@ -1,4 +1,7 @@ -[MK8_LevelOfDetail_V42_V41] -moduleMatches = 0x9F0A90B7,0xD09700CE +[MarioKart8_LevelOfDetail_v42_v41] +moduleMatches = 0x9F0A90B7, 0xD09700CE ; v4.2(EU/NA/JP), v4.1(EU/NA/JP) +0x10121DF0 = .float $levelOfDetail -0x10121DF0 = .float $levelOfDetail \ No newline at end of file +[MarioKart8_LevelOfDetail_v1] +moduleMatches = 0x2A2DC82C ; v1.0(EU/NA/JP) +0x100F33F0 = .float $levelOfDetail diff --git a/src/MarioKart8/Graphics/rules.txt b/src/MarioKart8/Graphics/rules.txt index 260ec4bad..e76298e71 100644 --- a/src/MarioKart8/Graphics/rules.txt +++ b/src/MarioKart8/Graphics/rules.txt @@ -1,8 +1,9 @@ [Definition] -titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = Graphic Options path = "Mario Kart 8/Graphics" -description = Allows you to change the game's TV resolution, gamepad resolution, shadow quality, anti-aliasing, bloom intensity, motion blur quality, level of detail and anisotropic filtering quality.|Made by Crementif, theboy181 and M&&M. +description = Allows you to change the game's TV resolution, gamepad resolution, shadow quality, anti-aliasing, bloom intensity, motion blur quality, level of detail and anisotropic filtering quality.|Made by Crementif, theboy181, and M&&M. +#Credits: Crementif, theboy181, M&&M version = 6 [Default] @@ -855,6 +856,11 @@ name = 16x category = Anisotropic Filtering $anisotropy = 16 +[Preset] +name = 32x +category = Anisotropic Filtering +$anisotropy = 32 + # Advanced Options diff --git a/src/MarioKart8/Mods/60FPSMultiplayer/patch_60FPSFullDraw.asm b/src/MarioKart8/Mods/60FPSMultiplayer/patch_60FPSFullDraw.asm index c6e5cba32..c1c2c11f8 100644 --- a/src/MarioKart8/Mods/60FPSMultiplayer/patch_60FPSFullDraw.asm +++ b/src/MarioKart8/Mods/60FPSMultiplayer/patch_60FPSFullDraw.asm @@ -1,10 +1,11 @@ -[MK8_60FPSFullDraw_V42] -moduleMatches = 0x9F0A90B7 - +[MarioKart8_60FPSFullDraw_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) 0x024AF384 = b .+0x54 - -[MK8_60FPSFullDraw_V41] -moduleMatches = 0xD09700CE - +[MarioKart8_60FPSFullDraw_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) 0x024AF000 = b .+0x54 + +[MarioKart8_60FPSFullDraw_v1] +moduleMatches = 0x2A2DC82C ; v1.0(EU/NA/JP) +0x02416B74 = b .+0x54 diff --git a/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt b/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt index 7c69fa02f..840944083 100644 --- a/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt +++ b/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt @@ -3,4 +3,5 @@ titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 name = 60FPS for 3/4 Player Splitscreen path = "Mario Kart 8/Mods/60FPS Splitscreen" description = Forces the game to run at 60FPS instead of 30FPS in 3/4 player splitscreen.|In those splitscreen modes, it normally alternates which screen is being updated each frame. This mod forces it to draw all the screens every frame instead.|Made by theboy181 and Xalphenos. +#Credits: theboy181, Xalphenos version = 6 diff --git a/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt index 5dfed7d4f..76e5f915f 100644 --- a/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt b/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt index 060d992e0..760a9950d 100644 --- a/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt index b5824ef9f..4288ce85a 100644 --- a/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt b/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt index 9f1f840bf..a97739f07 100644 --- a/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt index ed06cf798..b57d809f8 100644 --- a/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt b/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt index 517bcd17e..bdf8072c5 100644 --- a/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt b/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt index 0d99e0fae..241ba18f6 100644 --- a/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt index 5bbb2842f..72b992f34 100644 --- a/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 420 +#version 450 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/rules.txt b/src/MarioKart8/Mods/NoHUD/rules.txt index b7e371c23..c00b61d27 100644 --- a/src/MarioKart8/Mods/NoHUD/rules.txt +++ b/src/MarioKart8/Mods/NoHUD/rules.txt @@ -3,4 +3,5 @@ titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 name = Remove All HUD Elements path = "Mario Kart 8/Mods/No HUD (breaks menus)" description = Disables any HUD while racing.|Breaks many of the menu's so don't use this if you just want to play the game.||Made by Crementif. +#Credits: Crementif version = 6 diff --git a/src/MarioKart8/NetworkPort/patch_port.asm b/src/MarioKart8/NetworkPort/patch_port.asm index eaa0516ef..a92383197 100644 --- a/src/MarioKart8/NetworkPort/patch_port.asm +++ b/src/MarioKart8/NetworkPort/patch_port.asm @@ -1,7 +1,6 @@ -[MarioKart8_ForceMultiplayerPortNumber_v81] -moduleMatches = 0x9F0A90B7 - -# min port range +[MarioKart8_ForceMultiplayerPortNumber_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +; min port range 0x101a9a52 = .short $port -# max port range +; max port range 0x101a9a54 = .short $port From 5299462b7eb6bbb21b2717022077072dee42fb32 Mon Sep 17 00:00:00 2001 From: intra0 Date: Fri, 13 Dec 2024 18:58:35 -0600 Subject: [PATCH 2/8] Capitalize Title ID's --- src/MarioKart8/Enhancements/Contrasty/rules.txt | 2 +- src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt | 2 +- src/MarioKart8/Mods/60FPSMultiplayer/rules.txt | 2 +- src/MarioKart8/Mods/NoHUD/rules.txt | 2 +- src/MarioKart8/NetworkPort/rules.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/MarioKart8/Enhancements/Contrasty/rules.txt b/src/MarioKart8/Enhancements/Contrasty/rules.txt index aefa5758a..0fc79f276 100644 --- a/src/MarioKart8/Enhancements/Contrasty/rules.txt +++ b/src/MarioKart8/Enhancements/Contrasty/rules.txt @@ -1,5 +1,5 @@ [Definition] -titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = Contrasty path = "Mario Kart 8/Enhancements/Contrasty" description = This pack tweaks the colors and contrast to whatever preset you set it as.|You can also make your own preset by editing the Default preset in the Contrasty folder from the game's graphic packs.|Made by getdls. diff --git a/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt b/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt index def81cca3..d96be4536 100644 --- a/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt +++ b/src/MarioKart8/Enhancements/RemoveMKTVWatermark/rules.txt @@ -1,5 +1,5 @@ [Definition] -titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = Remove MKTV Watermark path = "Mario Kart 8/Enhancements/Remove MKTV Watermark" description = Removes the MKTV watermark in the replays or highlight reel.|Made by Crementif. diff --git a/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt b/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt index 840944083..cda40c6b3 100644 --- a/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt +++ b/src/MarioKart8/Mods/60FPSMultiplayer/rules.txt @@ -1,5 +1,5 @@ [Definition] -titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = 60FPS for 3/4 Player Splitscreen path = "Mario Kart 8/Mods/60FPS Splitscreen" description = Forces the game to run at 60FPS instead of 30FPS in 3/4 player splitscreen.|In those splitscreen modes, it normally alternates which screen is being updated each frame. This mod forces it to draw all the screens every frame instead.|Made by theboy181 and Xalphenos. diff --git a/src/MarioKart8/Mods/NoHUD/rules.txt b/src/MarioKart8/Mods/NoHUD/rules.txt index c00b61d27..d432ea81a 100644 --- a/src/MarioKart8/Mods/NoHUD/rules.txt +++ b/src/MarioKart8/Mods/NoHUD/rules.txt @@ -1,5 +1,5 @@ [Definition] -titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = Remove All HUD Elements path = "Mario Kart 8/Mods/No HUD (breaks menus)" description = Disables any HUD while racing.|Breaks many of the menu's so don't use this if you just want to play the game.||Made by Crementif. diff --git a/src/MarioKart8/NetworkPort/rules.txt b/src/MarioKart8/NetworkPort/rules.txt index d0abd54d9..1e95755c9 100644 --- a/src/MarioKart8/NetworkPort/rules.txt +++ b/src/MarioKart8/NetworkPort/rules.txt @@ -1,5 +1,5 @@ [Definition] -titleIds = 000500001010ec00,000500001010ed00,000500001010eb00 +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = Multiplayer network port path = "Mario Kart 8/Workarounds/Multiplayer network port" description = Forces peer-to-peer multiplayer to use a certain network port number, so that you can port forward it in your router.||This might help with connecting to online services, or with some 118-XXXX errors. From 0927e13f0ad03b7f12685d381c85fe5140027b77 Mon Sep 17 00:00:00 2001 From: intra0 Date: Fri, 13 Dec 2024 19:03:48 -0600 Subject: [PATCH 3/8] And almost forgot a Credits Comment --- src/MarioKart8/NetworkPort/rules.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/MarioKart8/NetworkPort/rules.txt b/src/MarioKart8/NetworkPort/rules.txt index 1e95755c9..ef0a7e029 100644 --- a/src/MarioKart8/NetworkPort/rules.txt +++ b/src/MarioKart8/NetworkPort/rules.txt @@ -3,6 +3,7 @@ titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 name = Multiplayer network port path = "Mario Kart 8/Workarounds/Multiplayer network port" description = Forces peer-to-peer multiplayer to use a certain network port number, so that you can port forward it in your router.||This might help with connecting to online services, or with some 118-XXXX errors. +#Credits: ashquarky version = 6 [Default] From 9d539b0a1a42eb41a508376803a58b71547e3c95 Mon Sep 17 00:00:00 2001 From: intra0 Date: Fri, 13 Dec 2024 20:04:37 -0600 Subject: [PATCH 4/8] Add new Save File Mods --- .../patch_OnlineBattleRating.asm | 10 + .../Cheats/OnlineBattleRating/rules.txt | 35 ++++ .../patch_OnlineRaceRating.asm | 10 + .../Cheats/OnlineRaceRating/rules.txt | 50 +++++ .../Cheats/TrophyCheat/patch_TrophyCheat.asm | 94 ++++++++++ src/MarioKart8/Cheats/TrophyCheat/rules.txt | 171 ++++++++++++++++++ .../patch_UnlockCharacter.asm | 26 +++ .../Cheats/UnlockCharacters/rules.txt | 7 + .../UnlockStamps/patch_UnlockStamps.asm | 24 +++ src/MarioKart8/Cheats/UnlockStamps/rules.txt | 7 + 10 files changed, 434 insertions(+) create mode 100644 src/MarioKart8/Cheats/OnlineBattleRating/patch_OnlineBattleRating.asm create mode 100644 src/MarioKart8/Cheats/OnlineBattleRating/rules.txt create mode 100644 src/MarioKart8/Cheats/OnlineRaceRating/patch_OnlineRaceRating.asm create mode 100644 src/MarioKart8/Cheats/OnlineRaceRating/rules.txt create mode 100644 src/MarioKart8/Cheats/TrophyCheat/patch_TrophyCheat.asm create mode 100644 src/MarioKart8/Cheats/TrophyCheat/rules.txt create mode 100644 src/MarioKart8/Cheats/UnlockCharacters/patch_UnlockCharacter.asm create mode 100644 src/MarioKart8/Cheats/UnlockCharacters/rules.txt create mode 100644 src/MarioKart8/Cheats/UnlockStamps/patch_UnlockStamps.asm create mode 100644 src/MarioKart8/Cheats/UnlockStamps/rules.txt diff --git a/src/MarioKart8/Cheats/OnlineBattleRating/patch_OnlineBattleRating.asm b/src/MarioKart8/Cheats/OnlineBattleRating/patch_OnlineBattleRating.asm new file mode 100644 index 000000000..b1954f4db --- /dev/null +++ b/src/MarioKart8/Cheats/OnlineBattleRating/patch_OnlineBattleRating.asm @@ -0,0 +1,10 @@ +[MarioKart8_OnlineBattleRating_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +.origin = codecave +ChangeOnlineBattleRating: +li r10, $battlevr +stw r10, 0x1a24(r29) +blr + +;this mod makes 0x2e6b6664 = $battlevr +0x024DCE58 = bla ChangeOnlineBattleRating diff --git a/src/MarioKart8/Cheats/OnlineBattleRating/rules.txt b/src/MarioKart8/Cheats/OnlineBattleRating/rules.txt new file mode 100644 index 000000000..4b890ec14 --- /dev/null +++ b/src/MarioKart8/Cheats/OnlineBattleRating/rules.txt @@ -0,0 +1,35 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Change Online Battle Rating +path = "Mario Kart 8/Cheats/Online Battle Rating" +description = Change Your Online Battle Rating! +#Credits: Intra +version = 7 + +[Default] +$battlevr = 1000 + +[Preset] +category = Battle Rating: +name = 1 +$battlevr = 1 + +[Preset] +category = Battle Rating: +name = 1000 +Default = 1 + +[Preset] +category = Battle Rating: +name = 2000 +$battlevr = 2000 + +[Preset] +category = Battle Rating: +name = 3000 +$battlevr = 3000 + +[Preset] +category = Battle Rating: +name = 4000 +$battlevr = 4000 diff --git a/src/MarioKart8/Cheats/OnlineRaceRating/patch_OnlineRaceRating.asm b/src/MarioKart8/Cheats/OnlineRaceRating/patch_OnlineRaceRating.asm new file mode 100644 index 000000000..89a17bfa3 --- /dev/null +++ b/src/MarioKart8/Cheats/OnlineRaceRating/patch_OnlineRaceRating.asm @@ -0,0 +1,10 @@ +[MarioKart8_OnlineRaceRating_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +.origin = codecave +ChangeOnlineRaceRating: +li r8, $racevr +stw r8, 0x1a20(r29) +blr + +;this mod makes 0x2e6b6660 = $racevr +0x024DCE2C = bla ChangeOnlineRaceRating diff --git a/src/MarioKart8/Cheats/OnlineRaceRating/rules.txt b/src/MarioKart8/Cheats/OnlineRaceRating/rules.txt new file mode 100644 index 000000000..20ff480ca --- /dev/null +++ b/src/MarioKart8/Cheats/OnlineRaceRating/rules.txt @@ -0,0 +1,50 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Change Online Race Rating +path = "Mario Kart 8/Cheats/Online Race Rating" +description = Change Your Online Race Rating!|150cc lobbies start happening at 5000vr. +#Credits: Intra +version = 7 + +[Default] +$racevr = 1000 + +[Preset] +category = Race Rating: +name = 1 +$racevr = 1 + +[Preset] +category = Race Rating: +name = 1000 +Default = 1 + +[Preset] +category = Race Rating: +name = 2000 +$racevr = 2000 + +[Preset] +category = Race Rating: +name = 3000 +$racevr = 3000 + +[Preset] +category = Race Rating: +name = 4000 +$racevr = 4000 + +[Preset] +category = Race Rating: +name = 5000 +$racevr = 5000 + +[Preset] +category = Race Rating: +name = 6000 +$racevr = 6000 + +[Preset] +category = Race Rating: +name = 7000 +$racevr = 7000 diff --git a/src/MarioKart8/Cheats/TrophyCheat/patch_TrophyCheat.asm b/src/MarioKart8/Cheats/TrophyCheat/patch_TrophyCheat.asm new file mode 100644 index 000000000..ab7973b68 --- /dev/null +++ b/src/MarioKart8/Cheats/TrophyCheat/patch_TrophyCheat.asm @@ -0,0 +1,94 @@ +[MarioKart8_GoldTrophy] +moduleMatches = 0x9F0A90B7, 0xD09700CE ; v4.2(EU/NA/JP), v4.1(EU/NA/JP) +.origin = codecave + +WriteTrophies: +addi r11, r11, -1 +mtctr r12 +_forloopWriteTrophies: + stbu r8, 1(r11) + bdnz _forloopWriteTrophies +blr + +CheckandChangeTrophies: +mflr r0 +;check cheat +li r8, $cheattype +cmpwi r8, 3 +beq Cheat3StarEVERYTHING +cmpwi r8, 2 +beq CheatEntireEngineClass +cmpwi r8, 1 +beq CheatSpecificCup +b CheckandChangeTrophies_Exit + +CheatSpecificCup: +li r8, $trophy +addi r11, r7, 0x5c4+$addroffset +stb r8, $cup(r11) +li r8, $stars +addi r11, r7, 0x5c4+$addroffset-0x100 +stb r8, $cup(r11) +b CheckandChangeTrophies_Exit + +CheatEntireEngineClass: +li r12, 12 +li r8, $trophy +addi r11, r7, 0x5c4+$addroffset +bl WriteTrophies +li r8, $stars +addi r11, r7, 0x5c4+$addroffset-0x100 +bl WriteTrophies +b CheckandChangeTrophies_Exit + +Cheat3StarEVERYTHING: +li r12, 12 +;50cc +li r8, $trophy +addi r11, r7, 0x5c4 +bl WriteTrophies +li r8, $stars +addi r11, r7, 0x5c4-0x100 +bl WriteTrophies +;100cc +li r8, $trophy +addi r11, r7, 0x5c4+0x20 +bl WriteTrophies +li r8, $stars +addi r11, r7, 0x5c4+0x20-0x100 +bl WriteTrophies +;150cc +li r8, $trophy +addi r11, r7, 0x5c4+0x40 +bl WriteTrophies +li r8, $stars +addi r11, r7, 0x5c4+0x40-0x100 +bl WriteTrophies +;Mirror +li r8, $trophy +addi r11, r7, 0x5c4+0x80 +bl WriteTrophies +li r8, $stars +addi r11, r7, 0x5c4+0x80-0x100 +bl WriteTrophies +;200cc +li r8, $trophy +addi r11, r7, 0x5c4+0x60 +bl WriteTrophies +li r8, $stars +addi r11, r7, 0x5c4+0x60-0x100 +bl WriteTrophies + +CheckandChangeTrophies_Exit: +mtlr r0 +lwz r8, 0(r29) +blr + +[MarioKart8_GoldTrophy_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +;modifies near 0x2E6B520C +0x024D97F8 = bla CheckandChangeTrophies + +[MarioKart8_GoldTrophy_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) +0x024d9474 = bla CheckandChangeTrophies diff --git a/src/MarioKart8/Cheats/TrophyCheat/rules.txt b/src/MarioKart8/Cheats/TrophyCheat/rules.txt new file mode 100644 index 000000000..5f4cf7a08 --- /dev/null +++ b/src/MarioKart8/Cheats/TrophyCheat/rules.txt @@ -0,0 +1,171 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Gold Trophy / 3 stars +path = "Mario Kart 8/Cheats/Grand Prix Trophies" +description = Cheat in Grand Prix Trohpies!|Must complete or quit a Grand Prix to save changes. +#Credits: Intra +version = 7 + +[Default] +$addroffset = 0 +$cup = 0 +$cheattype = 1 +$trophy = 0 +$stars = 0 + +[Preset] +category = Cheat Type +name = Change EVERYTHING (200/mirror/150/100/50) +$cheattype = 3 + +[Preset] +category = Cheat Type +name = Change Entire Engine Class +$cheattype = 2 + +[Preset] +category = Cheat Type +name = Change Specific Cup (activates by cursor moving onto 50cc) +$cheattype = 1 + +[Preset] +category = Engine Class +condition = $cheattype != 3 +name = 50cc +$addroffset = 0 + +[Preset] +category = Engine Class +condition = $cheattype != 3 +name = 100cc +$addroffset = 0x20 + +[Preset] +category = Engine Class +condition = $cheattype != 3 +name = 150cc +$addroffset = 0x40 + +[Preset] +category = Engine Class +condition = $cheattype != 3 +name = Mirror +$addroffset = 0x80 + +[Preset] +category = Engine Class +condition = $cheattype != 3 +name = 200cc +$addroffset = 0x60 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Mushroom Cup +$cup = 0 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Flower Cup +$cup = 1 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Star Cup +$cup = 2 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Special Cup +$cup = 3 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Shell Cup +$cup = 4 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Banana Cup +$cup = 5 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Leaf Cup +$cup = 6 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Lightning Cup +$cup = 7 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Egg Cup +$cup = 8 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Triforce Cup +$cup = 9 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Crossing Cup +$cup = 10 + +[Preset] +category = Course +condition = $cheattype == 1 +name = Bell Cup +$cup = 11 + +[Preset] +category = Trophy +name = Gold +$trophy = 3 + +[Preset] +category = Trophy +name = Silver +$trophy = 2 + +[Preset] +category = Trophy +name = Bronze +$trophy = 1 + +[Preset] +category = Trophy +name = None +$trophy = 0 + +[Preset] +category = Stars +name = 3 +$stars = 3 + +[Preset] +category = Stars +name = 2 +$stars = 2 + +[Preset] +category = Stars +name = 1 +$stars = 1 + +[Preset] +category = Stars +name = 0 +$stars = 0 diff --git a/src/MarioKart8/Cheats/UnlockCharacters/patch_UnlockCharacter.asm b/src/MarioKart8/Cheats/UnlockCharacters/patch_UnlockCharacter.asm new file mode 100644 index 000000000..595eb1c7f --- /dev/null +++ b/src/MarioKart8/Cheats/UnlockCharacters/patch_UnlockCharacter.asm @@ -0,0 +1,26 @@ +[MarioKart8_UnlockCharacter] +moduleMatches = 0x9F0A90B7, 0xD09700CE ; v4.2(EU/NA/JP), v4.1(EU/NA/JP) +.origin = codecave + +UnlockCharactersMod: +;r11 == 0x2e6b6690 +lis r30, 0x0303 +ori r30, r30, 0x0303 +stw r30, 0x0(r11) +stw r30, 0x4(r11) +stw r30, 0x8(r11) +stw r30, 0xC(r11) +stw r30, 0x10(r11) +stw r30, 0x14(r11) +stw r30, 0x18(r11) +sth r30, 0x1C(r11) +lbzx r30, r11, r0 +blr + +[MarioKart8_UnlockCharacter_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +0x024D76AC = bla UnlockCharactersMod + +[MarioKart8_UnlockCharacter_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) +0x024D7328 = bla UnlockCharactersMod diff --git a/src/MarioKart8/Cheats/UnlockCharacters/rules.txt b/src/MarioKart8/Cheats/UnlockCharacters/rules.txt new file mode 100644 index 000000000..fe03e083b --- /dev/null +++ b/src/MarioKart8/Cheats/UnlockCharacters/rules.txt @@ -0,0 +1,7 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Unlock Characters! +path = "Mario Kart 8/Cheats/Unlock Characters" +description = Unlock Every Character! +#Credits: Intra +version = 7 diff --git a/src/MarioKart8/Cheats/UnlockStamps/patch_UnlockStamps.asm b/src/MarioKart8/Cheats/UnlockStamps/patch_UnlockStamps.asm new file mode 100644 index 000000000..654ad9297 --- /dev/null +++ b/src/MarioKart8/Cheats/UnlockStamps/patch_UnlockStamps.asm @@ -0,0 +1,24 @@ +[MarioKart8_UnlockCharacter] +moduleMatches = 0x9F0A90B7, 0xD09700CE ; v4.2(EU/NA/JP), v4.1(EU/NA/JP) +.origin = codecave + +UnlockStamps: +;r11 == 0x2e6b6790 +li r12, 3 ;; +li r30, 90 +mtctr r30 +addi r30, r11, 10-1 +_forloopUnlockStamps: + stbu r12, 1(r30) + bdnz _forloopUnlockStamps + +lbzx r30,r11,r0 +blr + +[MarioKart8_UnlockCharacter_v42] +moduleMatches = 0x9F0A90B7 ; v4.2(EU/NA/JP) +0x024D7A6C = bla UnlockStamps + +[MarioKart8_UnlockCharacter_v41] +moduleMatches = 0xD09700CE ; v4.1(EU/NA/JP) +0x024D76E8 = bla UnlockStamps diff --git a/src/MarioKart8/Cheats/UnlockStamps/rules.txt b/src/MarioKart8/Cheats/UnlockStamps/rules.txt new file mode 100644 index 000000000..04aee1df8 --- /dev/null +++ b/src/MarioKart8/Cheats/UnlockStamps/rules.txt @@ -0,0 +1,7 @@ +[Definition] +titleIds = 000500001010EC00,000500001010ED00,000500001010EB00 +name = Unlock Stamps! +path = "Mario Kart 8/Cheats/Unlock Stamps" +description = Unlock All 100 Stamps! +#Credits: Intra +version = 7 From 15069426a54ee456e138c89bd69f4142b326ce42 Mon Sep 17 00:00:00 2001 From: intra0 Date: Fri, 13 Dec 2024 22:21:11 -0600 Subject: [PATCH 5/8] Ansiotropic Labeling to be consistent with other mods --- src/MarioKart8/Graphics/rules.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MarioKart8/Graphics/rules.txt b/src/MarioKart8/Graphics/rules.txt index e76298e71..5a33e6ed3 100644 --- a/src/MarioKart8/Graphics/rules.txt +++ b/src/MarioKart8/Graphics/rules.txt @@ -852,12 +852,12 @@ category = Anisotropic Filtering $anisotropy = 8 [Preset] -name = 16x +name = 16x (Recommended) category = Anisotropic Filtering $anisotropy = 16 [Preset] -name = 32x +name = 32x (Overkill) category = Anisotropic Filtering $anisotropy = 32 From 2d5384b0e288cb45629139b46a1027563bcb9354 Mon Sep 17 00:00:00 2001 From: intra0 Date: Tue, 17 Dec 2024 14:02:01 -0600 Subject: [PATCH 6/8] glsl to v430 --- .../Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt | 2 +- .../Contrasty/998a9f67e353657b_0000000000001e51_ps.txt | 2 +- src/MarioKart8/Enhancements/Debanding/output.glsl | 2 +- .../Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt | 2 +- .../Graphics/408a66d9721b1cec_0000000000000000_vs.txt | 2 +- .../Graphics/74126253134563de_0000000000000000_vs.txt | 2 +- .../Graphics/8e1337dde42fd224_00000000000003c9_ps.txt | 2 +- .../Graphics/ad3014302e0e49bf_0000000000000000_vs.txt | 2 +- .../Graphics/be99d80628d31127_00000000000003c9_ps.txt | 2 +- .../Graphics/c673c0d44f779fc9_0000000000000000_vs.txt | 2 +- .../Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt | 2 +- .../Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt | 2 +- .../Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt | 2 +- .../Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt | 2 +- .../Graphics/fdf33c607cd1d737_0000000000000079_ps.txt | 2 +- .../Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt | 2 +- .../Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt | 2 +- .../Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt | 2 +- .../Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt | 2 +- .../Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt | 2 +- .../Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt | 2 +- .../Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt | 2 +- .../Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt b/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt index 034b863f6..d7c0bc0f5 100644 --- a/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt +++ b/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #ifdef VULKAN #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location) diff --git a/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt b/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt index f722e7fd6..e36872089 100644 --- a/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt +++ b/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Enhancements/Debanding/output.glsl b/src/MarioKart8/Enhancements/Debanding/output.glsl index ea0c29395..82bd585b5 100644 --- a/src/MarioKart8/Enhancements/Debanding/output.glsl +++ b/src/MarioKart8/Enhancements/Debanding/output.glsl @@ -1,4 +1,4 @@ -#version 450 +#version 430 #ifdef VULKAN layout(location = 0) in vec2 passUV; diff --git a/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt b/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt index 96cec256e..87d959392 100644 --- a/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt b/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt index 2fa60b342..f097baad1 100644 --- a/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader 408a66d9721b1cec //Lava bowser castle, point light offset diff --git a/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt b/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt index e084efe9f..f7af81783 100644 --- a/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader 74126253134563de diff --git a/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt index ba3d87839..823f9b0ee 100644 --- a/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader 8e1337dde42fd224 diff --git a/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt b/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt index 8539d2d74..8dd8373ba 100644 --- a/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt index 2fa428f4c..0147c89f6 100644 --- a/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader be99d80628d31127 diff --git a/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt b/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt index 237e63c95..0ca0c46f7 100644 --- a/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader c673c0d44f779fc9 // replay DOF box blur diff --git a/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt b/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt index ae0150b48..ccf739d14 100644 --- a/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader d5d751973ea3d3b4 // menu background box blur, initial downscaling. diff --git a/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt b/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt index d5c3e0ce9..56acd31d5 100644 --- a/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt index 034b863f6..d7c0bc0f5 100644 --- a/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #ifdef VULKAN #define ATTR_LAYOUT(__vkSet, __location) layout(set = __vkSet, location = __location) diff --git a/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt b/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt index 0b776ec40..5be8e5d11 100644 --- a/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader f5274bda2b5e1e9f diff --git a/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt b/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt index 825e06a83..babfe4ecc 100644 --- a/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt +++ b/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable // shader fdf33c607cd1d737 //Radial blur replacement diff --git a/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt index 76e5f915f..f50ea251b 100644 --- a/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt b/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt index 760a9950d..bdd77c193 100644 --- a/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt index 4288ce85a..0fdd4653a 100644 --- a/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt b/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt index a97739f07..52a766e54 100644 --- a/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt index b57d809f8..ecb38ab7b 100644 --- a/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt b/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt index bdf8072c5..c393af36b 100644 --- a/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt b/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt index 241ba18f6..0810d0f09 100644 --- a/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN diff --git a/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt index 72b992f34..4ed16b638 100644 --- a/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt @@ -1,4 +1,4 @@ -#version 450 +#version 430 #extension GL_ARB_texture_gather : enable #extension GL_ARB_separate_shader_objects : enable #ifdef VULKAN From 5af7f815bcbc1bf1ef3ffab6784bcc404cd7d019 Mon Sep 17 00:00:00 2001 From: intra0 Date: Tue, 17 Dec 2024 15:02:06 -0600 Subject: [PATCH 7/8] Remove "advance options" preset It only hid 3 categories made the mod harder to use (imo) and if someone doesn't know what to do with an option there's a (Default) that already serves the purpose of them just not messing with the setting --- src/MarioKart8/Graphics/rules.txt | 50 +++++++------------------------ 1 file changed, 10 insertions(+), 40 deletions(-) diff --git a/src/MarioKart8/Graphics/rules.txt b/src/MarioKart8/Graphics/rules.txt index 5a33e6ed3..7df2d6d52 100644 --- a/src/MarioKart8/Graphics/rules.txt +++ b/src/MarioKart8/Graphics/rules.txt @@ -17,15 +17,14 @@ $padWidth = 854 $padHeight = 480 $gamePadWidth = 854 $gamePadHeight = 480 -$shadowQuality = 1 +$shadowQuality = 1.0 $anisotropy = 1 $fxaa:int = 1 -$bloom = 1 +$bloom = 1.0 $nrOfPasses:int = 8 $blurStart = 0.975 $blurWidth = 0.025 $levelOfDetail = 1 -$advancedOpt = 0 # Aspect Ratio @@ -816,17 +815,17 @@ default = 1 [Preset] name = High (200%) category = Shadows -$shadowQuality = 2 +$shadowQuality = 2.0 [Preset] name = Ultra (300%) category = Shadows -$shadowQuality = 3 +$shadowQuality = 3.0 [Preset] name = Extreme (400%) category = Shadows -$shadowQuality = 4 +$shadowQuality = 4.0 # Anisotropic Filtering @@ -864,62 +863,43 @@ $anisotropy = 32 # Advanced Options -[Preset] -name = Disabled -category = Advanced Options -default = 1 - -[Preset] -name = Enabled -category = Advanced Options -$advancedOpt = 1 - - # Anti-Aliasing [Preset] -name = Off +name = On (Only affects character select) category = Anti-Aliasing -condition = $advancedOpt == 1 -$fxaa:int = 0 +default = 1 [Preset] -name = On (Default) +name = Off category = Anti-Aliasing -condition = $advancedOpt == 1 -default = 1 - +$fxaa:int = 0 # Bloom [Preset] name = 0% category = Bloom Intensity -condition = $advancedOpt == 1 -$bloom = 0 +$bloom = 0.0 [Preset] name = 50% category = Bloom Intensity -condition = $advancedOpt == 1 $bloom = 0.5 [Preset] name = 100% (Default) category = Bloom Intensity -condition = $advancedOpt == 1 default = 1 [Preset] name = 125% category = Bloom Intensity -condition = $advancedOpt == 1 $bloom = 1.25 [Preset] name = 150% category = Bloom Intensity -condition = $advancedOpt == 1 $bloom = 1.5 @@ -928,25 +908,21 @@ $bloom = 1.5 [Preset] name = Off category = Motion Blur Quality -condition = $advancedOpt == 1 $nrOfPasses:int = 0 [Preset] name = Low category = Motion Blur Quality -condition = $advancedOpt == 1 $nrOfPasses:int = 4 [Preset] name = Normal (Default) category = Motion Blur Quality -condition = $advancedOpt == 1 default = 1 [Preset] name = High category = Motion Blur Quality -condition = $advancedOpt == 1 $nrOfPasses:int = 16 $blurStart = 0.93 $blurWidth = 0.1 @@ -954,7 +930,6 @@ $blurWidth = 0.1 [Preset] name = Ultra category = Motion Blur Quality -condition = $advancedOpt == 1 $nrOfPasses:int = 24 $blurStart = 0.93 $blurWidth = 0.1 @@ -962,7 +937,6 @@ $blurWidth = 0.1 [Preset] name = Extreme category = Motion Blur Quality -condition = $advancedOpt == 1 $nrOfPasses:int = 32 $blurStart = 0.93 $blurWidth = 0.1 @@ -973,25 +947,21 @@ $blurWidth = 0.1 [Preset] name = Low category = Level of Detail -condition = $advancedOpt == 1 $levelOfDetail = 0.5 [Preset] name = Normal (Default) category = Level of Detail -condition = $advancedOpt == 1 default = 1 [Preset] name = High category = Level of Detail -condition = $advancedOpt == 1 $levelOfDetail = 2 [Preset] name = Ultra category = Level of Detail -condition = $advancedOpt == 1 $levelOfDetail = 3 From cdd1f7327bd02cc01545f69edde0a5eb09c27121 Mon Sep 17 00:00:00 2001 From: Intra Date: Wed, 1 Jan 2025 17:19:37 -0600 Subject: [PATCH 8/8] add back trailing white space in preprocessor statement --- .../Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt | 2 +- .../Contrasty/998a9f67e353657b_0000000000001e51_ps.txt | 2 +- .../Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt | 2 +- .../Graphics/408a66d9721b1cec_0000000000000000_vs.txt | 2 +- .../Graphics/74126253134563de_0000000000000000_vs.txt | 2 +- .../Graphics/8e1337dde42fd224_00000000000003c9_ps.txt | 2 +- .../Graphics/ad3014302e0e49bf_0000000000000000_vs.txt | 2 +- .../Graphics/be99d80628d31127_00000000000003c9_ps.txt | 2 +- .../Graphics/c673c0d44f779fc9_0000000000000000_vs.txt | 2 +- .../Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt | 2 +- .../Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt | 2 +- .../Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt | 2 +- .../Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt | 2 +- .../Graphics/fdf33c607cd1d737_0000000000000079_ps.txt | 2 +- .../Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt | 2 +- .../Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt | 2 +- .../Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt | 2 +- .../Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt | 2 +- .../Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt | 2 +- .../Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt | 2 +- .../Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt | 2 +- .../Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt | 2 +- 22 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt b/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt index d7c0bc0f5..358ba61f1 100644 --- a/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt +++ b/src/MarioKart8/Enhancements/Bloom/e90feef2bca6cb2e_00000000000003c9_ps.txt @@ -10,7 +10,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt b/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt index e36872089..a42809184 100644 --- a/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt +++ b/src/MarioKart8/Enhancements/Contrasty/998a9f67e353657b_0000000000001e51_ps.txt @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt b/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt index 87d959392..5a48b5257 100644 --- a/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/2e78a0d0a0aa66bb_0000000000000000_vs.txt @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt b/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt index f097baad1..8095992f7 100644 --- a/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/408a66d9721b1cec_0000000000000000_vs.txt @@ -12,7 +12,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif diff --git a/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt b/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt index f7af81783..1ced557bd 100644 --- a/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/74126253134563de_0000000000000000_vs.txt @@ -14,7 +14,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif diff --git a/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt index 823f9b0ee..62bb90231 100644 --- a/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/8e1337dde42fd224_00000000000003c9_ps.txt @@ -14,7 +14,7 @@ const float resYScale = float($height)/float($gameHeight); #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale.xy,gl_FragCoord.zw) #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) #endif diff --git a/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt b/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt index 8dd8373ba..81b998629 100644 --- a/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/ad3014302e0e49bf_0000000000000000_vs.txt @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt index 0147c89f6..58bc68312 100644 --- a/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/be99d80628d31127_00000000000003c9_ps.txt @@ -14,7 +14,7 @@ const float resYScale = float($height)/float($gameHeight); #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale.xy,gl_FragCoord.zw) #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) #endif diff --git a/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt b/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt index 0ca0c46f7..61d5c0198 100644 --- a/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/c673c0d44f779fc9_0000000000000000_vs.txt @@ -12,7 +12,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif diff --git a/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt b/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt index ccf739d14..3e09dba8e 100644 --- a/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/d5d751973ea3d3b4_0000000000000000_vs.txt @@ -12,7 +12,7 @@ #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif diff --git a/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt b/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt index 56acd31d5..56d017c75 100644 --- a/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/dd7a19be01b7b1aa_0000000000000000_vs.txt @@ -11,7 +11,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt b/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt index d7c0bc0f5..358ba61f1 100644 --- a/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt +++ b/src/MarioKart8/Graphics/e90feef2bca6cb2e_00000000000003c9_ps.txt @@ -10,7 +10,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt b/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt index 5be8e5d11..2a6f7f620 100644 --- a/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt +++ b/src/MarioKart8/Graphics/f5274bda2b5e1e9f_0000000000000000_vs.txt @@ -15,7 +15,7 @@ const float resScale = float($width)/float($gameWidth); #define SET_POSITION(_v) gl_Position = _v; gl_Position.z = (gl_Position.z + gl_Position.w) / 2.0 #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #endif diff --git a/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt b/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt index babfe4ecc..cc8cf36e7 100644 --- a/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt +++ b/src/MarioKart8/Graphics/fdf33c607cd1d737_0000000000000079_ps.txt @@ -10,7 +10,7 @@ #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale.xy,gl_FragCoord.zw) #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) #endif diff --git a/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt index f50ea251b..8cbcd8c35 100644 --- a/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/0039902b839f2863_00000000000003c9_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt b/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt index bdd77c193..ae1f7a562 100644 --- a/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/005826125bfe150a_0000000000000079_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt index 0fdd4653a..cc8d0fdaa 100644 --- a/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/03c0659aacda420a_00000000000003c9_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt b/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt index 52a766e54..92617daec 100644 --- a/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/2940f7a0fb8ea817_0000000000000079_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt index ecb38ab7b..e8ca14480 100644 --- a/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/440c49859973a955_00000000000003c9_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt b/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt index c393af36b..a0932e9ea 100644 --- a/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/50612bab4e50d820_0000000000001e49_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt b/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt index 0810d0f09..44b16bade 100644 --- a/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/96440241cc1bf8a4_000000000000007d_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw) diff --git a/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt b/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt index 4ed16b638..615086395 100644 --- a/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt +++ b/src/MarioKart8/Mods/NoHUD/a6981858d5437cf7_00000000000003c9_ps.txt @@ -14,7 +14,7 @@ #define gl_InstanceID gl_InstanceIndex #else #define ATTR_LAYOUT(__vkSet, __location) layout(location = __location) -#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) +#define UNIFORM_BUFFER_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation, std140) #define TEXTURE_LAYOUT(__glLocation, __vkSet, __vkLocation) layout(binding = __glLocation) #define SET_POSITION(_v) gl_Position = _v #define GET_FRAGCOORD() vec4(gl_FragCoord.xy*uf_fragCoordScale,gl_FragCoord.zw)