Merge branch 'cemu-project:master' into master

This commit is contained in:
Flextape05 2025-02-23 18:29:11 +01:00 committed by GitHub
commit fa4443e50a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 29 additions and 6 deletions

View file

@ -0,0 +1,21 @@
[SI_FixInfiniteFall]
moduleMatches = 0xc683642e, 0x39e9ebc6 ; 1.0.0, 1.1.0
.origin = codecave
const_stuckFallingDistanceThreshold:
.float 20*30/$targetFPS
_getStuckFallingDistanceThreshold:
lis r3, const_stuckFallingDistanceThreshold@ha
lfs f13, const_stuckFallingDistanceThreshold@l(r3)
blr
[SI_FixInfiniteFall_V1]
moduleMatches = 0xc683642e ; 1.0.0
0x022c434c = bla _getStuckFallingDistanceThreshold
[SI_FixInfiniteFall_V16]
moduleMatches = 0x39e9ebc6 ; 1.1.0
0x022c4eb0 = bla _getStuckFallingDistanceThreshold

View file

@ -2,7 +2,7 @@
titleIds = 00050000101F4D00,00050000101FB100
name = FPS
path = "Skylanders Imaginators/Mods/FPS"
description = Changes the game's dynamic FPS target. Might have bugs, especially when going above 120 FPS.||Made by Mew00.
description = Changes the game's dynamic FPS target.||Needs to be disabled during certain sections, as it makes them impossible to complete:|- Sky Fortress: wrecking ball minigame (enemies are barely pushed)|- Golden Arcade: target shooting minigame (projectiles despawn before being able to reach some targets)|- Enchanted Elven Forest: water cannon near end of level (the splash is unable to put out the most distant fire)||Other minor issues:|- General: jump height is a little shorter, making some vertical jumps inconsistent|-Selfie mode: camera controls are too fast|- Cradle of Creation: hamster wheel rotates too fast||Made by Mew00. Fall respawn fix by SuperSamus and Winner Nombre.
version = 6
[Default]

View file

@ -8,8 +8,9 @@ divw r4, r31, r4
blr
_mult_or_divide:
cmpwi r0, $multOrDivision
bne- _divide_dmg
li r4, $multOrDivision
cmpwi r4, 0
bne _divide_dmg
mulli r4, r31, $mult
blr

View file

@ -40,7 +40,7 @@ li r12, 0
cmpwi r0, 2
beq _unlockunusedarts
cmpwi r0, 3
beq _whileLoopUseSpecificCharactersArts
beq UseSpecificCharactersArts
cmpwi r0, 4
beq _unlockIndividualArts
@ -84,9 +84,10 @@ li r16, $arts
addi r17, r31, $memoffset-1
b _unlockIndividualArts
_whileLoopUseSpecificCharactersArts:
UseSpecificCharactersArts:
addi r31, r31, $memoffset+0x9B
li r12, 0
_whileLoopUseSpecificCharactersArts:
stbu r12, 1(r17)
cmpw r17, r31
blt+ _whileLoopUseSpecificCharactersArts