Merge branch 'develop-khan' into khan-to-dev

2023-04-01 14:19:41 -04:00
parent c9c7fc7df6 f5bcc6dccf
commit 2a0a31ae7e
13 changed files with 105 additions and 41 deletions
--- a/soh/src/code/z_parameter.c
+++ b/soh/src/code/z_parameter.c
@@ -3023,7 +3023,11 @@ s32 Health_ChangeBy(PlayState* play, s16 healthChange) {
 }

 void Rupees_ChangeBy(s16 rupeeChange) {
-    gSaveContext.rupeeAccumulator += rupeeChange;
+    if (gPlayState == NULL) {
+        gSaveContext.rupees += rupeeChange;
+    } else {
+        gSaveContext.rupeeAccumulator += rupeeChange;
+    }

    if (rupeeChange > 0) {
        gSaveContext.sohStats.count[COUNT_RUPEES_COLLECTED] += rupeeChange;