Bronze scale

Rob and Kirox's Extended Save Context Adventure
Move item ID to 0x130
Merge Dev
Update to main dev and address reviews
Add GV child entrance when getting thrown by guards

Fix presets

Improve debug menu
Bronze scale
Rob and Kirox's Extended Save Context Adventure
Move item ID to 0x130
Merge Dev
Update to main dev and address reviews
Fix presets

add advanced logic and review

botw mq fixes

fix vanilla botw

deku tree fixes

jabu fixes and ice typo

Remove debug/z64 unrelated changes and add new special respawns
Add third scale to starting items

Rebase squash and add hyrule field respawn

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 bool bronze_scale_marker = false;
 
 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);
+    }
 }
 
 
@@ -934,3 +943,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 = false;
+    if (value == 0) {
+        bronze_scale_marker = true;
+        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

@@ -292,6 +292,38 @@ void draw_gi_magic_spells(z64_game_t* game, uint32_t draw_id) {
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[1].dlist);
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
 }
+static Gfx gGiBronzeScaleWaterColorDL[] = {
+    gsDPPipeSync(),
+    gsDPSetPrimColor(0, 0x60, 255, 255, 255, 255),
+    gsDPSetEnvColor(255, 123, 0, 255),
+    gsSPEndDisplayList(),
+};
+
+static Gfx gGiBronzeScaleColorDL[] = {
+    gsDPPipeSync(),
+    gsDPSetPrimColor(0, 0x80, 255, 255, 255, 255),
+    gsDPSetEnvColor(91, 51, 18, 255),
+    gsSPEndDisplayList(),
+};
+
+void draw_bronze_scale(z64_game_t* game, uint32_t draw_id) {
+
+    z64_gfx_t* gfx = game->common.gfx;
+
+    append_setup_dl_25_to_xlu(gfx);
+    gSPSegment(gfx->poly_xlu.p++, 0x08,
+               gen_double_tile(gfx,
+                               0, game->common.state_frames * 2, -(game->common.state_frames * 2), 64, 64,
+                               1, game->common.state_frames * 4, -(game->common.state_frames * 4), 32, 32));
+
+
+    gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
+
+    gSPDisplayList(gfx->poly_xlu.p++, (Gfx*)gGiBronzeScaleColorDL);
+    gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[3].dlist);
+    gSPDisplayList(gfx->poly_xlu.p++, (Gfx*)gGiBronzeScaleWaterColorDL);
+    gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[0].dlist);
+}
 
 void draw_gi_scales(z64_game_t* game, uint32_t draw_id) {
     z64_gfx_t* gfx = game->common.gfx;

ASM/build/c_symbols.txt

@@ -56,5 +56,6 @@ void draw_gi_flame(z64_disp_buf_t* dl, z64_game_t *game, colorRGBA8_t prim, colo
 void draw_gi_xlu_with_flame(z64_game_t *game, uint32_t draw_id);
 void draw_gi_deku_nut_with_flame(z64_game_t* game, uint32_t draw_id);
 void draw_ice_trap(z64_game_t* game, uint32_t draw_id);
+void draw_bronze_scale(z64_game_t* game, uint32_t draw_id);
 
 #endif

ASM/c/file_icons.c

@@ -179,6 +179,7 @@ item_draw_table_entry_t item_draw_table[] = {
     [0xA1] = { draw_gi_deku_nut_with_flame, { 0x06000E90, 0xC0C0C0FF, 0xC0C0C0FF } }, // Deku Nut Upgrade w/ Smoke Effect
     [0xA2] = { draw_gi_magic_meter,         { 0x06000000, 0x06000CC0, 0x06000F08, 0x060014E8, 0x286428FF, 0x000000FF } },  // Magic Meter Scroll 2
     [0xA3] = { draw_ice_trap,               { 0x04034380 } }, // Ice trap
+    [0xA4] = { draw_bronze_scale,           { 0x06000AA0, 0x06000A40, 0x06000A80, 0x06000CC8 } }, // Bronze scale
 };
 
 void base_draw_gi_model(z64_game_t* game, uint32_t draw_id) {

ASM/c/item_draw_functions.c

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

ASM/c/item_draw_functions.h

@@ -31,6 +31,7 @@ void give_bombchus(z64_file_t* save, int16_t arg1, int16_t arg2);
 void trade_quest_upgrade(z64_file_t* save, int16_t item_id, int16_t arg2);
 extern uint8_t KEYRING_BOSSKEY_CONDITION;
 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);
 
 typedef enum dungeon {
     DEKU_ID       = 0,

ASM/c/item_draw_table.c

@@ -84,8 +84,8 @@ item_row_t item_table[GI_RANDO_MAX] = {
     [GI_BOMB_BAG_40]                                            = ITEM_ROW(0x53,      GILDED_CHEST, 0x4F, -1, 0x005A, 0x00BF, 0x1A, no_upgrade, no_effect, -1, -1, NULL), // Biggest Bomb Bag
     [GI_SILVER_GAUNTLETS]                                       = ITEM_ROW(0x53,      GILDED_CHEST, 0x51, -1, 0x005B, 0x012D, 0x49, no_upgrade, no_effect, -1, -1, NULL), // Silver Gauntlets
     [GI_GOLD_GAUNTLETS]                                         = ITEM_ROW(0x53,      GILDED_CHEST, 0x52, -1, 0x005C, 0x012D, 0x4A, no_upgrade, no_effect, -1, -1, NULL), // Golden Gauntlets
-    [GI_SCALE_SILVER]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x53, -1, 0x00CD, 0x00DB, 0x2A, no_upgrade, no_effect, -1, -1, NULL), // Silver Scale
-    [GI_SCALE_GOLDEN]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x54, -1, 0x00CE, 0x00DB, 0x2B, no_upgrade, no_effect, -1, -1, NULL), // Golden Scale
+    [GI_SCALE_SILVER]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x53, -1, 0x00CD, 0x00DB, 0x2A, no_upgrade, give_progressive_scale, 1, -1, NULL), // Silver Scale
+    [GI_SCALE_GOLDEN]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x54, -1, 0x00CE, 0x00DB, 0x2B, no_upgrade, give_progressive_scale, 2, -1, NULL), // Golden Scale
     [GI_STONE_OF_AGONY]                                         = ITEM_ROW(0x53,      GILDED_CHEST, 0x6F, -1, 0x0068, 0x00C8, 0x21, no_upgrade, no_effect, -1, -1, NULL), // Stone of Agony
     [GI_GERUDOS_CARD]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x70, -1, 0x007B, 0x00D7, 0x24, no_upgrade, no_effect, -1, -1, NULL), // Gerudo Membership Card
 
@@ -347,6 +347,8 @@ item_row_t item_table[GI_RANDO_MAX] = {
     [GI_WATER_MEDALLION]                                        = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x003D, 0x01B1, 0x98, no_upgrade, give_quest_item,  2, -1, NULL), // Water Medallion
     [GI_SHADOW_MEDALLION]                                       = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x0041, 0x01B2, 0x99, no_upgrade, give_quest_item,  4, -1, NULL), // Shadow Medallion
     [GI_SPIRIT_MEDALLION]                                       = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x003F, 0x01B3, 0x9A, no_upgrade, give_quest_item,  3, -1, NULL), // Spirit Medallion
+
+    [GI_SCALE_BRONZE]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x54, -1, 0x90B6, 0x00DB, 0xA5, no_upgrade, give_progressive_scale, 0, -1, NULL), // Golden Scale
 };
 
 /*  Determine which message to display based on the number of silver rupees collected.