From ec23d5d0e960892b9aff890a7c9fd16c231d2c83 Mon Sep 17 00:00:00 2001 From: chipjpg <81572989+chipjpg@users.noreply.github.com> Date: Thu, 28 Apr 2022 20:36:45 +1000 Subject: [PATCH 1/2] Fix joaat mixup for RemoveCurrentRise Changed joaat from 0x7DBCEF6F to 0x45268B6F. 0x7DBCEF6F was used to reset the rise counter to 0 on console. afaik it's not available on new builds. --- WATER/RemoveCurrentRise.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/WATER/RemoveCurrentRise.md b/WATER/RemoveCurrentRise.md index e8552bb66..a01d6a072 100644 --- a/WATER/RemoveCurrentRise.md +++ b/WATER/RemoveCurrentRise.md @@ -5,14 +5,14 @@ aliases: ["0xB1252E3E59A82AAF"] ## _REMOVE_CURRENT_RISE ```c -// 0xB1252E3E59A82AAF 0x7DBCEF6F -void _REMOVE_CURRENT_RISE(int p0); +// 0xB1252E3E59A82AAF 0x45268B6F +void _REMOVE_CURRENT_RISE(int riseIndex); ``` -``` -p0 is the handle returned from _0xFDBF4CDBC07E1706 -``` +Caution: This function is unsafe when used incorrectly. +Make sure your parameter is from 0-7 (inclusive). Using any other value will result in undefined behaviour (game crashes, etc). +_ADD_CURRENT_RISE returns -1 when it fails, so make sure you're not trying to remove -1 as this could break something. ## Parameters -* **p0**: +* **riseIndex**: The value returned from 0xFDBF4CDBC07E1706 (not including -1). Value must be in range [0,7] otherwise game bugs will occur. From 0418e82b293c51e87e04c97b535a47ff0ef23ddf Mon Sep 17 00:00:00 2001 From: chipjpg <81572989+chipjpg@users.noreply.github.com> Date: Thu, 28 Apr 2022 21:01:58 +1000 Subject: [PATCH 2/2] Update and rename RemoveCurrentRise.md to RemoveExtraCalmingQuad.md --- WATER/RemoveCurrentRise.md | 18 ------------------ WATER/RemoveExtraCalmingQuad.md | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 18 deletions(-) delete mode 100644 WATER/RemoveCurrentRise.md create mode 100644 WATER/RemoveExtraCalmingQuad.md diff --git a/WATER/RemoveCurrentRise.md b/WATER/RemoveCurrentRise.md deleted file mode 100644 index a01d6a072..000000000 --- a/WATER/RemoveCurrentRise.md +++ /dev/null @@ -1,18 +0,0 @@ ---- -ns: WATER -aliases: ["0xB1252E3E59A82AAF"] ---- -## _REMOVE_CURRENT_RISE - -```c -// 0xB1252E3E59A82AAF 0x45268B6F -void _REMOVE_CURRENT_RISE(int riseIndex); -``` - -Caution: This function is unsafe when used incorrectly. -Make sure your parameter is from 0-7 (inclusive). Using any other value will result in undefined behaviour (game crashes, etc). -_ADD_CURRENT_RISE returns -1 when it fails, so make sure you're not trying to remove -1 as this could break something. - -## Parameters -* **riseIndex**: The value returned from 0xFDBF4CDBC07E1706 (not including -1). Value must be in range [0,7] otherwise game bugs will occur. - diff --git a/WATER/RemoveExtraCalmingQuad.md b/WATER/RemoveExtraCalmingQuad.md new file mode 100644 index 000000000..532a4dc38 --- /dev/null +++ b/WATER/RemoveExtraCalmingQuad.md @@ -0,0 +1,18 @@ +--- +ns: WATER +aliases: ["0xB1252E3E59A82AAF", "_REMOVE_CURRENT_RISE"] +--- +## REMOVE_EXTRA_CALMING_QUAD + +```c +// 0xB1252E3E59A82AAF 0x45268B6F +void REMOVE_EXTRA_CALMING_QUAD(int extraQuad); +``` + +Caution: This function is unsafe when used incorrectly. +Make sure your parameter is from 0-7 (inclusive). Using any other value will result in undefined behaviour (game crashes, etc). +ADD_EXTRA_CALMING_QUAD returns -1 when it fails, so make sure you're not trying to remove -1 as this could break something. + +## Parameters +* **extraQuad**: The value returned from ADD_EXTRA_CALMING_QUAD (not including -1). Value must be in range [0,7] otherwise game bugs will occur. +