Rob and Kirox's Extended Save Context Adventure

Author: GSKirox

ASM/build/asm_symbols.txt

@@ -4,6 +4,7 @@
 #include "hud_colors.h"
 #include "triforce.h"
 #include "ocarina_buttons.h"
+#include "save.h"
 
 #define ICON_SIZE    0x0C
 #define MUSIC_WIDTH  0x06
@@ -172,6 +173,7 @@ static const variable_tile_data_t variable_tile_positions[NUM_VARIABLE] = {
     {0, {0x4E, 0x2A}}, // Strength
     {0, {0x5A, 0x2A}}, // Scale
 };
+static uint8_t bronze_scale_marker = 0;
 
 typedef struct {
     colorRGB8_t color;
@@ -380,8 +382,9 @@ static void populate_child_trade(const z64_file_t* file, variable_tile_t* tile);
 static void populate_adult_trade(const z64_file_t* file, variable_tile_t* tile);
 static void populate_magic(const z64_file_t* file, variable_tile_t* tile);
 static void populate_upgrade_equip(const z64_file_t* file, variable_tile_t* tile, uint8_t value, uint8_t max, uint8_t base_tile);
+static void populate_upgrade_scale(const z64_file_t* file, variable_tile_t* tile, uint8_t value, uint8_t base_tile);
 
-static void populate_variable(const z64_file_t* file, variable_tile_info_t* info) {
+void populate_variable(const z64_file_t* file, variable_tile_info_t* info) {
     variable_tile_t* tile = info->tiles;
 
     populate_upgrade_item( file, tile++, Z64_SLOT_OCARINA, Z64_ITEM_FAIRY_OCARINA);
@@ -390,7 +393,8 @@ static void populate_variable(const z64_file_t* file, variable_tile_info_t* info
     populate_adult_trade(  file, tile++);
     populate_magic(        file, tile++);
     populate_upgrade_equip(file, tile++, file->strength_upgrade, 3, Z64_ITEM_GORONS_BRACELET);
-    populate_upgrade_equip(file, tile++, file->diving_upgrade,   2, Z64_ITEM_SILVER_SCALE);
+    extended_savecontext_static_t* extended = &(((extended_sram_file_t*)file)->additional_save_data.extended);
+    populate_upgrade_scale(file, tile++, extended->extended_scale, Z64_ITEM_SILVER_SCALE);
 }
 
 
@@ -519,6 +523,11 @@ static void draw_variable(z64_disp_buf_t* db, const variable_tile_info_t* info,
         color = WHITE;
         color.a = color_product(color.a, alpha);
     }
+    if (bronze_scale_marker) {
+        sprite_load(db, &item_digit_sprite, 0, 1);
+        sprite_draw(db, &item_digit_sprite, 0, get_left(variable_tile_positions[NUM_VARIABLE - 1].pos) + 4,
+            get_top(variable_tile_positions[NUM_VARIABLE - 1].pos) + 3, 6, 6);
+    }
 }
 
 
@@ -935,3 +944,22 @@ static void populate_upgrade_equip(const z64_file_t* file, variable_tile_t* tile
         tile->tile_index = base_tile + (value - 1);
     }
 }
+
+static void populate_upgrade_scale(const z64_file_t* file, variable_tile_t* tile, uint8_t value, uint8_t base_tile) {
+    tile->tile_index = base_tile;
+    bronze_scale_marker = 0;
+    if (value == 0) {
+        bronze_scale_marker = 1;
+        tile->enabled = 0;
+    }
+    if (value == 1) {
+        tile->enabled = 0;
+    }
+    if (value == 2) {
+        tile->enabled = 1;
+    }
+    if (value == 3) {
+        tile->enabled = 1;
+        tile->tile_index++;
+    }
+}

ASM/build/bundle.o

@@ -271,14 +271,14 @@ void unlock_ocarina_note(z64_file_t* save, int16_t arg1, int16_t arg2) {
 void give_progressive_scale(z64_file_t* save, int16_t arg1, int16_t arg2) {
     switch(arg1) {
         case 0: // Bronze scale
-            extended_savectx.extended_scale[0] = 1;
+            extended_savectx.extended_scale = 1;
             break;
         case 1:
-            extended_savectx.extended_scale[0] = 2;
+            extended_savectx.extended_scale = 2;
             save->diving_upgrade = 1;
             break;
         case 2:
-            extended_savectx.extended_scale[0] = 3;
+            extended_savectx.extended_scale = 3;
             save->diving_upgrade = 2;
             break;
     }

ASM/build/c_symbols.txt

@@ -83,7 +83,7 @@ uint16_t wallet_upgrade(z64_file_t* save, override_t override) {
 }
 
 uint16_t scale_upgrade(z64_file_t* save, override_t override) {
-    switch ((override.value.base.player == PLAYER_ID || !MW_PROGRESSIVE_ITEMS_ENABLE) ? extended_savectx.extended_scale[0] : MW_PROGRESSIVE_ITEMS_STATE[override.value.base.player].scale) {
+    switch ((override.value.base.player == PLAYER_ID || !MW_PROGRESSIVE_ITEMS_ENABLE) ? extended_savectx.extended_scale : MW_PROGRESSIVE_ITEMS_STATE[override.value.base.player].scale) {
         case 0: return 0x119; // Bronze Scale
         case 1: return 0x37; // Silver Scale
         default: return 0x38; // Gold Scale

ASM/c/file_icons.c

@@ -6,7 +6,8 @@
 // Struct for storing additional data in SRAM. This has to always be a multiple of 2 bytes long supposedly.
 typedef struct {
     uint8_t silver_rupee_counts[0x16];
-    uint8_t extended_scale[0x2];
+    uint8_t extended_scale;
+    uint8_t pad;
 } extended_savecontext_static_t __attribute__ ((aligned (8)));
 
 

ASM/c/item_effects.c

@@ -52,7 +52,7 @@ void set_new_respawn() {
 void manage_swim() {
 
     // We found the first scale.
-    if (extended_savectx.extended_scale[0] > 0) {
+    if (extended_savectx.extended_scale > 0) {
         return;
     }
 
@@ -62,11 +62,14 @@ void manage_swim() {
     }
 
     // Always allow to swim out of water temple to avoid softlocks.
-    if (z64_game.scene_index == 5 && z64_link.common.pos_world.z > 700.0) {
+    if (z64_game.scene_index == 5 &&
+        z64_game.room_index == 0 &&
+        z64_link.common.pos_world.z > 700.0) {
         return;
     }
 
     if (z64_link.state_flags_1 & 0x08000000) { // Swimming state flag.
+        PlaySFX(0x28CD); // NA_SE_EV_WATER_CONVECTION
         set_new_respawn();
     }
 }

ASM/c/item_upgrades.c

@@ -5,6 +5,7 @@
 #include "z64_math.h"
 #include "color.h"
 #include "z64collision_check.h"
+#include "save.h"
 
 #define Z64_OOT10             0x00
 #define Z64_OOT11             0x01
@@ -796,7 +797,10 @@ typedef struct {
 } SramContext; // size = 0x4
 
 typedef struct {
-  uint8_t data[0xBA8];
+  union {
+    uint8_t data[0xBA8];
+    extended_savecontext_static_t extended;
+  };
 } extended_save_data_t;
 
 typedef struct {