diff --git a/Source/BreathOfTheWild/patches.txt b/Source/BreathOfTheWild/patches.txt index 8262a4d3..84ffc7e8 100644 --- a/Source/BreathOfTheWild/patches.txt +++ b/Source/BreathOfTheWild/patches.txt @@ -103,4 +103,4 @@ _aspectAddr = 0x1019F9A8 # 3d aspect (calculated every frame) 0x03726E18 = lis r28, ha16(_aspectAddr) -0x03726E1C = lfs f12, _aspectAddr(r28) \ No newline at end of file +0x03726E1C = lfs f12, _aspectAddr(r28) diff --git a/Source/HyruleWarriors/rules.txt b/Source/HyruleWarriors/rules.txt index de7d7f4e..be02305e 100644 --- a/Source/HyruleWarriors/rules.txt +++ b/Source/HyruleWarriors/rules.txt @@ -84,4 +84,4 @@ overwriteHeight = #height = 1 #formats = 0x005 #overwriteWidth = -#overwriteHeight = \ No newline at end of file +#overwriteHeight = diff --git a/Source/KirbyRainbowCurse/rules.txt b/Source/KirbyRainbowCurse/rules.txt index f17cb008..e8e1c847 100644 --- a/Source/KirbyRainbowCurse/rules.txt +++ b/Source/KirbyRainbowCurse/rules.txt @@ -73,4 +73,4 @@ overwriteHeight = width = 213 height = 120 overwriteWidth = -overwriteHeight = \ No newline at end of file +overwriteHeight = diff --git a/Source/MarioKart8/rules.txt b/Source/MarioKart8/rules.txt index 32b6b07a..6d228d55 100644 --- a/Source/MarioKart8/rules.txt +++ b/Source/MarioKart8/rules.txt @@ -90,4 +90,4 @@ width = 240 height = 134 formatsExcluded = 0x41A # exclude obvious textures overwriteWidth = -overwriteHeight = \ No newline at end of file +overwriteHeight = diff --git a/Source/SonicLostWorld/7658289ba65cb755_00000000000003c9_ps.txt b/Source/SonicLostWorld/7658289ba65cb755_00000000000003c9_ps.txt new file mode 100644 index 00000000..d1f5d4f1 --- /dev/null +++ b/Source/SonicLostWorld/7658289ba65cb755_00000000000003c9_ps.txt @@ -0,0 +1,58 @@ +#version 420 +#extension GL_ARB_texture_gather : enable +const float bloomFactor = 1.75; +// shader 7658289ba65cb755 +uniform ivec4 uf_remappedPS[1]; +layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4520000 res 1280x720x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 0 +layout(binding = 4) uniform sampler2D textureUnitPS4;// Tex4 addr 0x171f8800 res 1x1x1 dim 1 tm: 2 format 0806 compSel: 3 0 1 2 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler4 ClampX/Y/Z: 2 2 2 border: 0 +layout(location = 0) in vec4 passParameterSem137; +layout(location = 0) out vec4 passPixelColor0; +uniform vec2 uf_fragCoordScale; +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); +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 = passParameterSem137; +R1f.xyz = (texture(textureUnitPS0, R0f.xy).xyz * bloomFactor); +// 0 +R0f.y = intBitsToFloat(0x3f000000); +R2f.w = 1.0; +R0f.x = (texture(textureUnitPS4, R0f.yy).x); +// 0 +backupReg0f = R0f.x; +PV0f.x = backupReg0f + intBitsToFloat(0x3a83126f); +// 1 +PS1f = 1.0 / PV0f.x; +// 2 +PV0f.z = PS1f * intBitsToFloat(uf_remappedPS[0].x); +// 3 +PV1f.y = max(PV0f.z, intBitsToFloat(0x3d800000)); +// 4 +PV0f.x = min(PV1f.y, intBitsToFloat(0x41800000)); +// 5 +R2f.x = mul_nonIEEE(R1f.x, PV0f.x); +R2f.y = mul_nonIEEE(R1f.y, PV0f.x); +R2f.z = mul_nonIEEE(R1f.z, PV0f.x); +// export +passPixelColor0 = vec4(R2f.x, R2f.y, R2f.z, R2f.w); +} diff --git a/Source/SonicLostWorld/971a39bb79e32fd1_0000000000001e71_ps.txt b/Source/SonicLostWorld/971a39bb79e32fd1_0000000000001e71_ps.txt new file mode 100644 index 00000000..2cfd22c3 --- /dev/null +++ b/Source/SonicLostWorld/971a39bb79e32fd1_0000000000001e71_ps.txt @@ -0,0 +1,116 @@ +#version 420 +#extension GL_ARB_texture_gather : enable +const float bloomFactor = 1.75; +// shader 971a39bb79e32fd1 +uniform ivec4 uf_remappedPS[8]; +layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4520000 res 1280x720x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 0 +layout(binding = 1) uniform sampler2D textureUnitPS1;// Tex1 addr 0xf48a8000 res 1280x720x1 dim 6 tm: 4 format 0011 compSel: 0 0 0 0 mipView: 0x0 (num 0x2) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 0 +layout(binding = 4) uniform sampler2D textureUnitPS4;// Tex4 addr 0x171f8800 res 1x1x1 dim 1 tm: 2 format 0806 compSel: 3 0 1 2 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler4 ClampX/Y/Z: 2 2 2 border: 0 +layout(location = 0) in vec4 passParameterSem136; +layout(location = 1) in vec4 passParameterSem137; +layout(location = 0) out vec4 passPixelColor0; +uniform vec2 uf_fragCoordScale; +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 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 = passParameterSem136; +R1f = passParameterSem137; +R2f.x = (texture(textureUnitPS1, R1f.xy).x); +R3f.xyz = (texture(textureUnitPS0, R1f.xy).xyz * bloomFactor); +// 0 +R1f.x = intBitsToFloat(0x3f000000); +PV0f.y = intBitsToFloat(uf_remappedPS[0].w) * 1.0; +PV0f.z = intBitsToFloat(uf_remappedPS[0].z) * 1.0; +PV0f.w = R2f.x + -(1.0); +// 1 +R123f.x = (mul_nonIEEE(R2f.x,intBitsToFloat(uf_remappedPS[1].w)) + PV0f.y); +PV1f.x = R123f.x; +R1f.z = intBitsToFloat(((PV0f.w >= 0.0)?(floatBitsToInt(1.0)):(0))); +R123f.w = (mul_nonIEEE(R2f.x,intBitsToFloat(uf_remappedPS[1].z)) + PV0f.z); +PV1f.w = R123f.w; +// 2 +R123f.y = (mul_nonIEEE(R0f.y,intBitsToFloat(uf_remappedPS[2].w)) + PV1f.x); +PV0f.y = R123f.y; +R123f.z = (mul_nonIEEE(R0f.y,intBitsToFloat(uf_remappedPS[2].z)) + PV1f.w); +PV0f.z = R123f.z; +// 3 +R123f.x = (mul_nonIEEE(R0f.x,intBitsToFloat(uf_remappedPS[3].w)) + PV0f.y); +PV1f.x = R123f.x; +R0f.w = (mul_nonIEEE(R0f.x,intBitsToFloat(uf_remappedPS[3].z)) + PV0f.z); +// 4 +R1f.w = intBitsToFloat(uf_remappedPS[4].x) + intBitsToFloat(uf_remappedPS[4].w); +R0f.z = 1.0 / PV1f.x; +PS0f = R0f.z; +R1f.x = (texture(textureUnitPS4, R1f.xx).x); +// 0 +PV0f.x = -(R1f.w) + intBitsToFloat(uf_remappedPS[4].z); +PV0f.y = R0f.w * R0f.z; +R127f.z = R1f.x + intBitsToFloat(0x3a83126f); +// 1 +PV1f.y = -(PV0f.y) + -(R1f.w); +PS1f = 1.0 / PV0f.x; +// 2 +R127f.w = mul_nonIEEE(PS1f, PV1f.y); +R127f.w = clamp(R127f.w, 0.0, 1.0); +PV0f.w = R127f.w; +R126f.w = 1.0 / R127f.z; +PS0f = R126f.w; +// 3 +R123f.x = (mul_nonIEEE(PV0f.w,intBitsToFloat(uf_remappedPS[5].y)) + intBitsToFloat(uf_remappedPS[6].y)); +R123f.x = clamp(R123f.x, 0.0, 1.0); +PV1f.x = R123f.x; +// 4 +R127f.y = (mul_nonIEEE(R127f.w,intBitsToFloat(uf_remappedPS[5].w)) + intBitsToFloat(uf_remappedPS[6].w)); +R127f.y = clamp(R127f.y, 0.0, 1.0); +R123f.z = (mul_nonIEEE(R127f.w,intBitsToFloat(uf_remappedPS[5].z)) + intBitsToFloat(uf_remappedPS[6].z)); +R123f.z = clamp(R123f.z, 0.0, 1.0); +PV0f.z = R123f.z; +PV0f.w = -(PV1f.x) + 1.0; +// 5 +PV1f.x = min(PV0f.z, PV0f.w); +PV1f.z = R126f.w * intBitsToFloat(uf_remappedPS[7].x); +// 6 +PV0f.y = max(PV1f.z, intBitsToFloat(0x3d800000)); +PV0f.z = R127f.y + PV1f.x; +// 7 +PV1f.x = min(PV0f.y, intBitsToFloat(0x41800000)); +R127f.y = min(PV0f.z, intBitsToFloat(0x3f7efeff)); +PV1f.y = R127f.y; +// 8 +backupReg0f = R3f.x; +backupReg1f = R3f.y; +backupReg2f = R3f.z; +R3f.x = mul_nonIEEE(backupReg0f, PV1f.x); +R3f.y = mul_nonIEEE(backupReg1f, PV1f.x); +R3f.z = mul_nonIEEE(backupReg2f, PV1f.x); +PV0f.w = -(PV1f.y) + 1.0; +// 9 +R3f.w = (mul_nonIEEE(PV0f.w,R1f.z) + R127f.y); +// export +passPixelColor0 = vec4(R3f.x, R3f.y, R3f.z, R3f.w); +} diff --git a/Source/SonicLostWorld/e1d2a971c93cd82a_0000000000001e71_ps.txt b/Source/SonicLostWorld/e1d2a971c93cd82a_0000000000001e71_ps.txt new file mode 100644 index 00000000..318b6f8a --- /dev/null +++ b/Source/SonicLostWorld/e1d2a971c93cd82a_0000000000001e71_ps.txt @@ -0,0 +1,102 @@ +#version 420 +#extension GL_ARB_texture_gather : enable +const float bloomFactor = 1.75; +// shader e1d2a971c93cd82a +uniform ivec4 uf_remappedPS[8]; +layout(binding = 0) uniform sampler2D textureUnitPS0;// Tex0 addr 0xf4520000 res 1280x720x1 dim 1 tm: 4 format 0816 compSel: 0 1 2 3 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler0 ClampX/Y/Z: 2 2 2 border: 0 +layout(binding = 1) uniform sampler2D textureUnitPS1;// Tex1 addr 0xf48a8000 res 1280x720x1 dim 6 tm: 4 format 0011 compSel: 0 0 0 0 mipView: 0x0 (num 0x2) sliceView: 0x0 (num 0x1) Sampler1 ClampX/Y/Z: 2 2 2 border: 0 +layout(binding = 4) uniform sampler2D textureUnitPS4;// Tex4 addr 0x171f8800 res 1x1x1 dim 1 tm: 2 format 0806 compSel: 3 0 1 2 mipView: 0x0 (num 0x1) sliceView: 0x0 (num 0x1) Sampler4 ClampX/Y/Z: 2 2 2 border: 0 +layout(location = 0) in vec4 passParameterSem136; +layout(location = 1) in vec4 passParameterSem137; +layout(location = 0) out vec4 passPixelColor0; +uniform vec2 uf_fragCoordScale; +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 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 = passParameterSem136; +R1f = passParameterSem137; +R0f.z = (texture(textureUnitPS1, R1f.xy).x); +R2f.xyz = (texture(textureUnitPS0, R1f.xy).xyz * bloomFactor); +// 0 +R1f.x = intBitsToFloat(0x3f000000); +PV0f.y = intBitsToFloat(uf_remappedPS[0].z) * 1.0; +PV0f.w = intBitsToFloat(uf_remappedPS[0].w) * 1.0; +// 1 +R123f.x = (mul_nonIEEE(R0f.z,intBitsToFloat(uf_remappedPS[1].z)) + PV0f.y); +PV1f.x = R123f.x; +R123f.z = (mul_nonIEEE(R0f.z,intBitsToFloat(uf_remappedPS[1].w)) + PV0f.w); +PV1f.z = R123f.z; +// 2 +R1f.y = (mul_nonIEEE(R0f.y,intBitsToFloat(uf_remappedPS[2].z)) + PV1f.x); +R0f.w = (mul_nonIEEE(R0f.y,intBitsToFloat(uf_remappedPS[2].w)) + PV1f.z); +R1f.x = (texture(textureUnitPS4, R1f.xx).x); +// 0 +R127f.x = (mul_nonIEEE(R0f.x,intBitsToFloat(uf_remappedPS[3].z)) + R1f.y); +R127f.y = R1f.x + intBitsToFloat(0x3a83126f); +R123f.z = (mul_nonIEEE(R0f.x,intBitsToFloat(uf_remappedPS[3].w)) + R0f.w); +PV0f.z = R123f.z; +// 1 +R126f.x = intBitsToFloat(uf_remappedPS[4].x) + intBitsToFloat(uf_remappedPS[4].w); +PV1f.x = R126f.x; +PS1f = 1.0 / PV0f.z; +// 2 +PV0f.z = -(PV1f.x) + intBitsToFloat(uf_remappedPS[4].z); +PV0f.w = R127f.x * PS1f; +PS0f = 1.0 / R127f.y; +// 3 +PV1f.z = PS0f * intBitsToFloat(uf_remappedPS[5].x); +PV1f.w = -(PV0f.w) + -(R126f.x); +PS1f = 1.0 / PV0f.z; +// 4 +R126f.x = mul_nonIEEE(PS1f, PV1f.w); +R126f.x = clamp(R126f.x, 0.0, 1.0); +PV0f.x = R126f.x; +PV0f.y = max(PV1f.z, intBitsToFloat(0x3d800000)); +// 5 +R127f.x = min(PV0f.y, intBitsToFloat(0x41800000)); +PV1f.x = R127f.x; +R123f.z = (mul_nonIEEE(PV0f.x,intBitsToFloat(uf_remappedPS[6].y)) + intBitsToFloat(uf_remappedPS[7].y)); +R123f.z = clamp(R123f.z, 0.0, 1.0); +PV1f.z = R123f.z; +// 6 +R0f.x = mul_nonIEEE(R2f.x, PV1f.x); +R123f.y = (mul_nonIEEE(R126f.x,intBitsToFloat(uf_remappedPS[6].z)) + intBitsToFloat(uf_remappedPS[7].z)); +R123f.y = clamp(R123f.y, 0.0, 1.0); +PV0f.y = R123f.y; +PV0f.z = -(PV1f.z) + 1.0; +R127f.w = (mul_nonIEEE(R126f.x,intBitsToFloat(uf_remappedPS[6].w)) + intBitsToFloat(uf_remappedPS[7].w)); +R127f.w = clamp(R127f.w, 0.0, 1.0); +R0f.y = mul_nonIEEE(R2f.y, PV1f.x); +PS0f = R0f.y; +// 7 +R0f.z = mul_nonIEEE(R2f.z, R127f.x); +PV1f.w = min(PV0f.y, PV0f.z); +// 8 +R0f.w = R127f.w + PV1f.w; +// export +passPixelColor0 = vec4(R0f.x, R0f.y, R0f.z, R0f.w); +} diff --git a/Source/SonicLostWorld/patches.txt b/Source/SonicLostWorld/patches.txt new file mode 100644 index 00000000..175c5b95 --- /dev/null +++ b/Source/SonicLostWorld/patches.txt @@ -0,0 +1,18 @@ + +[sonic2013] +moduleMatches = 0x7FE07429, 0xC5691A40 +0x100057B0 = .float + +[sonic2013_trial] +moduleMatches = 0xCA1DA800 +0x10004B68 = .float diff --git a/Source/SonicLostWorld/rules.txt b/Source/SonicLostWorld/rules.txt new file mode 100644 index 00000000..a5ba3b6b --- /dev/null +++ b/Source/SonicLostWorld/rules.txt @@ -0,0 +1,51 @@ + +[Definition] +titleIds = 0005000010135700,000500001012B100,0005000010128F00,0005000210128F01 +name = "Sonic Lost World - " +version = 2 + +[TextureRedefine] +width = 1280 +height = 720 +tileModesExcluded = 0x001 +overwriteWidth = +overwriteHeight = + +[TextureRedefine] +width = 640 +height = 360 +tileModesExcluded = 0x001 +overwriteWidth = +overwriteHeight = + +[TextureRedefine] +width = 320 +height = 180 +overwriteWidth = +overwriteHeight = + +[TextureRedefine] +width = 160 +height = 90 +overwriteWidth = +overwriteHeight = + +[TextureRedefine] +width = 854 +height = 480 +overwriteWidth = +overwriteHeight = + +[TextureRedefine] +width = 560 +height = 315 +overwriteWidth = +overwriteHeight = diff --git a/Source/Splatoon/patches.txt b/Source/Splatoon/patches.txt index 6b4570da..3dfb2dd4 100644 --- a/Source/Splatoon/patches.txt +++ b/Source/Splatoon/patches.txt @@ -57,4 +57,4 @@ _aspectAddr = 0x1003C670 0x020153A4 = lfs f9, _aspectAddr@l(r4) 0x02015178 = lis r4, _aspectAddr@ha ;Transition frames -0x02015180 = lfs f9, _aspectAddr@l(r4) \ No newline at end of file +0x02015180 = lfs f9, _aspectAddr@l(r4) diff --git a/build.sh b/build.sh index a56192a1..a9121171 100644 --- a/build.sh +++ b/build.sh @@ -118,6 +118,19 @@ build_dir "Source/MarioKart8" "Quality/MarioKart8_1800p" 3200 1800 build_dir "Source/MarioKart8" "Quality/MarioKart8_2160p" 3840 2160 build_dir "Source/MarioKart8" "Quality/MarioKart8_2160p219" 5120 2160 build_dir "Source/MarioKart8" "Quality/MarioKart8_900p" 1600 900 +build_dir "Source/SonicLostWorld" "Enthusiast/SonicLostWorld_2880p" 5120 2880 +build_dir "Source/SonicLostWorld" "Enthusiast/SonicLostWorld_4320p" 7680 4320 +build_dir "Source/SonicLostWorld" "Enthusiast/SonicLostWorld_5760p" 10240 5760 +build_dir "Source/SonicLostWorld" "Performance/SonicLostWorld_360p" 640 360 +build_dir "Source/SonicLostWorld" "Performance/SonicLostWorld_540p" 960 540 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_1080p" 1920 1080 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_1080p219" 2560 1080 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_1440p" 2560 1440 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_1440p219" 3440 1440 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_1800p" 3200 1800 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_2160p" 3840 2160 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_2160p219" 5120 2160 +build_dir "Source/SonicLostWorld" "Quality/SonicLostWorld_900p" 1600 900 build_dir "Source/Splatoon" "Enthusiast/Splatoon_2880p" 5120 2880 build_dir "Source/Splatoon" "Enthusiast/Splatoon_4320p" 7680 4320 build_dir "Source/Splatoon" "Enthusiast/Splatoon_5760p" 10240 5760