Skip to content

1.10 from dev #63

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

Merged
SolarCookies merged 5 commits into from
May 2, 2026
Merged

1.10 from dev #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3556cbd
Merge pull request #61 from SolarCookies/main
SolarCookies May 1, 2026
d5ccbb2
Added Optimal Water Levels Toggle
SolarCookies May 2, 2026
6bd4f0f
Added Disable Ruffians Toggle
SolarCookies May 2, 2026
1ba24da
Update SpawnMenu.cpp
SolarCookies May 2, 2026
f414f08
1.10
SolarCookies May 2, 2026
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@ build_log.txt
*.bak
*.log1
ReShade.ini
*.png
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ set(RETIP_SOURCES
src/tip_engine/Overlays/TiPTools/GraphicsMenu.cpp
src/tip_engine/Overlays/TiPTools/SettingsMenu.cpp
src/tip_engine/Overlays/TiPTools/PinataMenu.cpp
src/tip_engine/Overlays/TiPTools/PlantMenu.cpp
src/tip_engine/Overlays/TiPTools/RuffianMenu.cpp
src/tip_engine/SleepHooks.cpp

# Vendor sources
Expand Down
9 changes: 6 additions & 3 deletions config/retip_hooked.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,16 @@
0x82558D28 = {name = "rex_supportPinataActorIsOnSurfaceWithPreference_82558D28"}
0x82247408 = {name = "rex_mlMtxPerspective_82247408"}
0x8228BE08 = {name = "rex_supportFrustumConstructClippingFrustum_8228BE08"}
#0x822C1E88 = {name = "rex_cursorCameraTick_822C1E88"}
0x822C1E88 = {name = "rex_cursorCameraTick_822C1E88"}
#0x822C4260 = {name = "rex_cursorInstLocksIsLockSet_822C4260"}
0x822C1CE0 = {name = "rex_meCursorCamCalculateZoom_822C1CE0"}
0x822C1B18 = {name = "rex_meCursorCamCalculateYaw_822C1B18"}
#0x821EBE28 = {name = "rex_meCursorCamCalculatePos_821EBE28"}
0x821EBE28 = {name = "rex_meCursorCamCalculatePos_821EBE28"}
0x822C1C00 = {name = "rex_meCursorCamCalculatePitch_822C1C00"}
0x821F0F30 = {name = "rex_meUpdateOutputViewport_821F0F30"}
0x82B0A740 = {name = "rex_XInputGetKeystroke_82B0A740"}
0x826B2DE0 = {name = "rex_XuiProcessInput_826B2DE0"}
0x8229A968 = {name = "rex_CXuiModule__ProcessInput_8229A968"}
0x8229A968 = {name = "rex_CXuiModule__ProcessInput_8229A968"}
0x82250578 = {name = "rex_objMsgInit_82250578"}
0x822BEB40 = {name = "rex_bifWatermeterSetLevel_822BEB40"}
0x823F89E0 = {name = "rex_meCreateRuffianActor_823F89E0"}
10 changes: 5 additions & 5 deletions generated/retip_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ PPCFuncMapping PPCFuncMappings[] = {
{ 0x821EBD00, sub_821EBD00 },
{ 0x821EBD58, sub_821EBD58 },
{ 0x821EBDC0, sub_821EBDC0 },
{ 0x821EBE28, sub_821EBE28 },
{ 0x821EBE28, rex_meCursorCamCalculatePos_821EBE28 },
{ 0x821EBF30, sub_821EBF30 },
{ 0x821EBFB0, sub_821EBFB0 },
{ 0x821EC048, sub_821EC048 },
Expand Down Expand Up @@ -2419,7 +2419,7 @@ PPCFuncMapping PPCFuncMappings[] = {
{ 0x82250310, sub_82250310 },
{ 0x82250368, sub_82250368 },
{ 0x82250520, sub_82250520 },
{ 0x82250578, sub_82250578 },
{ 0x82250578, rex_objMsgInit_82250578 },
{ 0x82250618, sub_82250618 },
{ 0x822506D0, sub_822506D0 },
{ 0x82250800, sub_82250800 },
Expand Down Expand Up @@ -3809,7 +3809,7 @@ PPCFuncMapping PPCFuncMappings[] = {
{ 0x822BE980, sub_822BE980 },
{ 0x822BE9F8, sub_822BE9F8 },
{ 0x822BEAE0, sub_822BEAE0 },
{ 0x822BEB40, sub_822BEB40 },
{ 0x822BEB40, rex_bifWatermeterSetLevel_822BEB40 },
{ 0x822BEC50, sub_822BEC50 },
{ 0x822BEDD8, sub_822BEDD8 },
{ 0x822BEEF8, sub_822BEEF8 },
Expand Down Expand Up @@ -3846,7 +3846,7 @@ PPCFuncMapping PPCFuncMappings[] = {
{ 0x822C1B18, rex_meCursorCamCalculateYaw_822C1B18 },
{ 0x822C1C00, rex_meCursorCamCalculatePitch_822C1C00 },
{ 0x822C1CE0, rex_meCursorCamCalculateZoom_822C1CE0 },
{ 0x822C1E88, sub_822C1E88 },
{ 0x822C1E88, rex_cursorCameraTick_822C1E88 },
{ 0x822C2048, sub_822C2048 },
{ 0x822C23C8, sub_822C23C8 },
{ 0x822C24A8, sub_822C24A8 },
Expand Down Expand Up @@ -6625,7 +6625,7 @@ PPCFuncMapping PPCFuncMappings[] = {
{ 0x823F8690, sub_823F8690 },
{ 0x823F8748, sub_823F8748 },
{ 0x823F8838, sub_823F8838 },
{ 0x823F89E0, sub_823F89E0 },
{ 0x823F89E0, rex_meCreateRuffianActor_823F89E0 },
{ 0x823F8C08, sub_823F8C08 },
{ 0x823F8D18, sub_823F8D18 },
{ 0x823F8E48, sub_823F8E48 },
Expand Down
10 changes: 5 additions & 5 deletions generated/retip_init.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1024,7 +1024,7 @@ PPC_EXTERN_IMPORT(sub_821EBCA0);
PPC_EXTERN_IMPORT(sub_821EBD00);
PPC_EXTERN_IMPORT(sub_821EBD58);
PPC_EXTERN_IMPORT(sub_821EBDC0);
PPC_EXTERN_IMPORT(sub_821EBE28);
PPC_EXTERN_IMPORT(rex_meCursorCamCalculatePos_821EBE28);
PPC_EXTERN_IMPORT(sub_821EBF30);
PPC_EXTERN_IMPORT(sub_821EBFB0);
PPC_EXTERN_IMPORT(sub_821EC048);
Expand Down Expand Up @@ -2418,7 +2418,7 @@ PPC_EXTERN_IMPORT(sub_82250170);
PPC_EXTERN_IMPORT(sub_82250310);
PPC_EXTERN_IMPORT(sub_82250368);
PPC_EXTERN_IMPORT(sub_82250520);
PPC_EXTERN_IMPORT(sub_82250578);
PPC_EXTERN_IMPORT(rex_objMsgInit_82250578);
PPC_EXTERN_IMPORT(sub_82250618);
PPC_EXTERN_IMPORT(sub_822506D0);
PPC_EXTERN_IMPORT(sub_82250800);
Expand Down Expand Up @@ -3808,7 +3808,7 @@ PPC_EXTERN_IMPORT(sub_822BE838);
PPC_EXTERN_IMPORT(sub_822BE980);
PPC_EXTERN_IMPORT(sub_822BE9F8);
PPC_EXTERN_IMPORT(sub_822BEAE0);
PPC_EXTERN_IMPORT(sub_822BEB40);
PPC_EXTERN_IMPORT(rex_bifWatermeterSetLevel_822BEB40);
PPC_EXTERN_IMPORT(sub_822BEC50);
PPC_EXTERN_IMPORT(sub_822BEDD8);
PPC_EXTERN_IMPORT(sub_822BEEF8);
Expand Down Expand Up @@ -3845,7 +3845,7 @@ PPC_EXTERN_IMPORT(sub_822C1750);
PPC_EXTERN_IMPORT(rex_meCursorCamCalculateYaw_822C1B18);
PPC_EXTERN_IMPORT(rex_meCursorCamCalculatePitch_822C1C00);
PPC_EXTERN_IMPORT(rex_meCursorCamCalculateZoom_822C1CE0);
PPC_EXTERN_IMPORT(sub_822C1E88);
PPC_EXTERN_IMPORT(rex_cursorCameraTick_822C1E88);
PPC_EXTERN_IMPORT(sub_822C2048);
PPC_EXTERN_IMPORT(sub_822C23C8);
PPC_EXTERN_IMPORT(sub_822C24A8);
Expand Down Expand Up @@ -6624,7 +6624,7 @@ PPC_EXTERN_IMPORT(sub_823F85D0);
PPC_EXTERN_IMPORT(sub_823F8690);
PPC_EXTERN_IMPORT(sub_823F8748);
PPC_EXTERN_IMPORT(sub_823F8838);
PPC_EXTERN_IMPORT(sub_823F89E0);
PPC_EXTERN_IMPORT(rex_meCreateRuffianActor_823F89E0);
PPC_EXTERN_IMPORT(sub_823F8C08);
PPC_EXTERN_IMPORT(sub_823F8D18);
PPC_EXTERN_IMPORT(sub_823F8E48);
Expand Down
48 changes: 24 additions & 24 deletions generated/retip_recomp.0.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2932,7 +2932,7 @@ PPC_FUNC_IMPL(__imp__sub_821A12B0) {
ctx.f31.f64 = ctx.f1.f64;
// bl 0x82250578
ctx.lr = 0x821A12FC;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,104(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 104);
// stw r28,84(r1)
Expand Down Expand Up @@ -4095,7 +4095,7 @@ PPC_FUNC_IMPL(__imp__sub_821A1A78) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821A1AAC;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,0(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 0);
// addi r4,r1,80
Expand Down Expand Up @@ -14213,7 +14213,7 @@ PPC_FUNC_IMPL(__imp__sub_821A5DD8) {
ctx.r3.s64 = ctx.r1.s64 + 88;
// bl 0x82250578
ctx.lr = 0x821A5E98;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// stw r29,92(r1)
PPC_STORE_U32(ctx.r1.u32 + 92, ctx.r29.u32);
// lwz r11,0(r31)
Expand Down Expand Up @@ -14663,7 +14663,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6158) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821A6198;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r3,2412(r31)
ctx.r3.u64 = PPC_LOAD_U32(ctx.r31.u32 + 2412);
// addi r4,r1,80
Expand Down Expand Up @@ -14752,7 +14752,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6158) {
ctx.r3.s64 = ctx.r1.s64 + 88;
// bl 0x82250578
ctx.lr = 0x821A6238;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,248(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 248);
// li r4,163
Expand All @@ -14763,7 +14763,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6158) {
PPC_STORE_U32(ctx.r1.u32 + 92, ctx.r11.u32);
// bl 0x82250578
ctx.lr = 0x821A624C;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r3,2412(r31)
ctx.r3.u64 = PPC_LOAD_U32(ctx.r31.u32 + 2412);
// addi r4,r1,88
Expand Down Expand Up @@ -14867,7 +14867,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6288) {
ctx.r3.s64 = ctx.r1.s64 + 88;
// bl 0x82250578
ctx.lr = 0x821A6300;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,248(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 248);
// li r4,163
Expand All @@ -14878,7 +14878,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6288) {
PPC_STORE_U32(ctx.r1.u32 + 92, ctx.r11.u32);
// bl 0x82250578
ctx.lr = 0x821A6314;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r3,2412(r31)
ctx.r3.u64 = PPC_LOAD_U32(ctx.r31.u32 + 2412);
// addi r4,r1,88
Expand Down Expand Up @@ -15038,7 +15038,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6360) {
ctx.r3.s64 = ctx.r1.s64 + 88;
// bl 0x82250578
ctx.lr = 0x821A6430;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,248(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 248);
// li r4,163
Expand All @@ -15049,7 +15049,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6360) {
PPC_STORE_U32(ctx.r1.u32 + 92, ctx.r11.u32);
// bl 0x82250578
ctx.lr = 0x821A6444;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r3,2408(r31)
ctx.r3.u64 = PPC_LOAD_U32(ctx.r31.u32 + 2408);
// addi r4,r1,88
Expand Down Expand Up @@ -15138,7 +15138,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6490) {
ctx.r3.s64 = ctx.r1.s64 + 88;
// bl 0x82250578
ctx.lr = 0x821A64E0;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,248(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 248);
// li r4,163
Expand All @@ -15149,7 +15149,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6490) {
PPC_STORE_U32(ctx.r1.u32 + 92, ctx.r11.u32);
// bl 0x82250578
ctx.lr = 0x821A64F4;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r3,2408(r31)
ctx.r3.u64 = PPC_LOAD_U32(ctx.r31.u32 + 2408);
// addi r4,r1,88
Expand Down Expand Up @@ -16057,7 +16057,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6A98) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821A6B38;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,0(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 0);
// addi r4,r1,80
Expand Down Expand Up @@ -16491,7 +16491,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6B68) {
ctx.r3.s64 = ctx.r1.s64 + 144;
// bl 0x82250578
ctx.lr = 0x821A6E74;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lhz r11,32(r27)
ctx.r11.u64 = PPC_LOAD_U16(ctx.r27.u32 + 32);
// lwz r10,36(r27)
Expand Down Expand Up @@ -16561,7 +16561,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6B68) {
ctx.r3.s64 = ctx.r1.s64 + 88;
// bl 0x82250578
ctx.lr = 0x821A6EE0;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,4(r27)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r27.u32 + 4);
// lwz r10,0(r31)
Expand Down Expand Up @@ -16607,7 +16607,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6B68) {
ctx.r3.s64 = ctx.r1.s64 + 104;
// bl 0x82250578
ctx.lr = 0x821A6F34;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,4(r27)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r27.u32 + 4);
// lwz r10,0(r31)
Expand Down Expand Up @@ -16767,7 +16767,7 @@ PPC_FUNC_IMPL(__imp__sub_821A6B68) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821A703C;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// stw r31,84(r1)
PPC_STORE_U32(ctx.r1.u32 + 84, ctx.r31.u32);
// addi r4,r1,80
Expand Down Expand Up @@ -17740,7 +17740,7 @@ PPC_FUNC_IMPL(__imp__sub_821A7450) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821A76F0;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,0(r28)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r28.u32 + 0);
// addi r4,r1,80
Expand Down Expand Up @@ -17830,7 +17830,7 @@ PPC_FUNC_IMPL(__imp__sub_821A7450) {
ctx.r3.s64 = ctx.r1.s64 + 88;
// bl 0x82250578
ctx.lr = 0x821A7790;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lbz r11,20(r31)
ctx.r11.u64 = PPC_LOAD_U8(ctx.r31.u32 + 20);
// addi r4,r31,20
Expand Down Expand Up @@ -69749,7 +69749,7 @@ PPC_FUNC_IMPL(__imp__sub_821BD7D0) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821BD828;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r9,0(r31)
ctx.r9.u64 = PPC_LOAD_U32(ctx.r31.u32 + 0);
// li r10,0
Expand Down Expand Up @@ -71138,7 +71138,7 @@ PPC_FUNC_IMPL(__imp__sub_821BE170) {
ctx.r6.u64 = ctx.r3.u64;
// bl 0x821ebe28
ctx.lr = 0x821BE184;
sub_821EBE28(ctx, base);
rex_meCursorCamCalculatePos_821EBE28(ctx, base);
// lwz r11,2416(r6)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r6.u32 + 2416);
// cmplwi cr6,r11,0
Expand Down Expand Up @@ -71340,7 +71340,7 @@ PPC_FUNC_IMPL(__imp__sub_821BE1E0) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821BE2D8;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,0(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 0);
// addi r4,r1,80
Expand Down Expand Up @@ -74094,7 +74094,7 @@ PPC_FUNC_IMPL(__imp__sub_821BF158) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821BF5CC;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,0(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 0);
// addi r4,r1,80
Expand Down Expand Up @@ -74810,7 +74810,7 @@ PPC_FUNC_IMPL(__imp__sub_821BF660) {
ctx.r3.s64 = ctx.r1.s64 + 80;
// bl 0x82250578
ctx.lr = 0x821BFA84;
sub_82250578(ctx, base);
rex_objMsgInit_82250578(ctx, base);
// lwz r11,0(r31)
ctx.r11.u64 = PPC_LOAD_U32(ctx.r31.u32 + 0);
// addi r4,r1,80
Expand Down
Loading
Loading