Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DKC Tropical Freeze] merge mods into src and update to v6 #660

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

[DKC Tropical Freeze] merge mods into src and update to v6 #660

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
aa38183
Delete Resolutions/DKCTropicalFreeze
intra0 Dec 12, 2024
19fbd37
Delete Enhancements/DKCTropicalFreeze
intra0 Dec 12, 2024
3542212
Move resollutions and AAremoval into src
intra0 Dec 12, 2024
8335e07
Update description in Anti-aliasing mod
intra0 Dec 13, 2024
15d3829
glsl to v430
intra0 Dec 17, 2024
d8bad7a
fix trailing white space in preprocessor statments
intra0 Jan 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions Enhancements/DonkeyKongTropicalFreeze_!AARemoval/rules.txt
View file
Open in desktop

This file was deleted.

220 changes: 0 additions & 220 deletions Resolutions/DonkeyKongTropicalFreeze_Resolution/rules.txt
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions src/DKCTropicalFreeze/Cheats/DKC_BananaMult/patch_infbanana.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[DKCTF_MultBanana]
moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; (EU/NA/JP)v16, (EU/NA/JP)v2
moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; v16(EU/NA/JP), v2(EU/NA/JP)
.origin = codecave

_addBananaMultCheat:
Expand All @@ -17,9 +17,9 @@ or r4, r29, r29
blr

[DKCTF_MultBanana_v16]
moduleMatches = 0xA37C99E1 ; (EU/NA/JP)v16
moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
0x020A5974 = bla _addBananaMultCheat

[DKCTF_MultBanana_v2]
moduleMatches = 0x4FF15DD2 ; (EU/NA/JP)v2
moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
0x020A5908 = bla _addBananaMultCheat
6 changes: 3 additions & 3 deletions src/DKCTropicalFreeze/Cheats/DKC_CoinMult/patch_infcoins.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[DKCTF_MultCoins]
moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; (EU/NA/JP)v16, (EU/NA/JP)v2
moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; v16(EU/NA/JP), v2(EU/NA/JP)
.origin = codecave

_addCoinsMultCheat:
Expand All @@ -14,9 +14,9 @@ _addCoinsMultCheatExit:
blr

[DKCTF_MultCoins_v16]
moduleMatches = 0xA37C99E1 ; (EU/NA/JP)v16
moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
0x020A5970 = bla _addCoinsMultCheat

[DKCTF_MultCoins_v2]
moduleMatches = 0x4FF15DD2 ; (EU/NA/JP)v2
moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
0x020A5904 = bla _addCoinsMultCheat
6 changes: 3 additions & 3 deletions src/DKCTropicalFreeze/Cheats/DKC_LivesMult/patch_inflives.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[DKCTF_MultLives]
moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; (EU/NA/JP)v16, (EU/NA/JP)v2
moduleMatches = 0xA37C99E1, 0x4FF15DD2 ; v16(EU/NA/JP), v2(EU/NA/JP)
.origin = codecave

_addLivesMultCheat:
Expand All @@ -15,9 +15,9 @@ or r3, r27, r27
blr

[DKCTF_MultLives_NAv16]
moduleMatches = 0xA37C99E1 ; (EU/NA/JP)v16
moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
0x020A5978 = bla _addLivesMultCheat

[DKCTF_MultLives_NAv2]
moduleMatches = 0x4FF15DD2 ; (EU/NA/JP)v2
moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
0x020A590C = bla _addLivesMultCheat
9 changes: 7 additions & 2 deletions .../10ccf0cc1234d069_00000000000003c9_ps.txt → .../10ccf0cc1234d069_00000000000003c9_ps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand All @@ -28,6 +28,11 @@ uniform vec4 uf_fragCoordScale;
uniform ivec4 uf_remappedPS[2];
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;
Expand Down
10 changes: 7 additions & 3 deletions .../bafe6c9c37bfca4d_00000000000003c9_ps.txt → .../bafe6c9c37bfca4d_00000000000003c9_ps.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand All @@ -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)
Expand All @@ -28,6 +28,11 @@ uniform vec4 uf_fragCoordScale;
uniform ivec4 uf_remappedPS[2];
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;
Expand Down Expand Up @@ -75,5 +80,4 @@ activeMaskStackC[0] = true;
activeMaskStackC[1] = true;
vec3 cubeMapSTM;
int cubeMapFaceId;

}
7 changes: 7 additions & 0 deletions src/DKCTropicalFreeze/Enhancements/AARemoval/rules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[Definition]
titleIds = 0005000010137F00,0005000010138300,0005000010144800
name = Remove Anti-Aliasing
path = "Donkey Kong Country: Tropical Freeze/Enhancements/Remove AA"
description = Dissable the game's native AA.
#Credits: Skalfate
version = 6
14 changes: 7 additions & 7 deletions ...KongTropicalFreeze_Resolution/patches.txt → ...picalFreeze/Graphics/patch_resolution.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[DKTropicalFreeze2]
moduleMatches = 0x4FF15DD2
0x10018498 = .float $width/$height
0x10094758 = .float $width/$height

[DKTropicalFreeze16]
moduleMatches = 0xA37C99E1
[DKCTF_Resolution_v16]
moduleMatches = 0xA37C99E1 ; v16(EU/NA/JP)
0x100184A8 = .float $width/$height
0x100946F8 = .float $width/$height

[DKCTF_Resolution_v2]
moduleMatches = 0x4FF15DD2 ; v2(EU/NA/JP)
0x10018498 = .float $width/$height
0x10094758 = .float $width/$height
Loading