Merge branch 'Dev' into rc

# Conflicts:
#	version.py

Author: fenhl

ASM/build/asm_symbols.txt

@@ -13,6 +13,7 @@
 extern uint8_t PLAYER_ID;
 extern uint8_t PLAYER_NAME_ID;
 extern bool REWARDS_AS_ITEMS;
+extern uint8_t MW_SEND_OWN_ITEMS;
 
 // Original function copied over
 int32_t DoorWarp1_PlayerInRange(z64_actor_t* actor, z64_game_t* game) {
@@ -39,6 +40,10 @@ int32_t DoorWarp1_PlayerInRange_Overwrite(z64_actor_t* actor, z64_game_t* game)
                 override_t override = lookup_override_by_key(override_key);
                 uint16_t resolved_item_id = resolve_upgrades(override);
                 item_row_t* item_row = get_item_row(resolved_item_id);
+                if (MW_SEND_OWN_ITEMS) {
+                    // Also send to multiworld plugin for informational purposes if requested
+                    push_outgoing_override(&override);
+                }
                 call_effect_function(item_row);
                 PLAYER_NAME_ID = override.value.base.player;
                 z64_DisplayTextbox(&z64_game, resolve_item_text_id(item_row, PLAYER_NAME_ID != PLAYER_ID), 0);

ASM/build/bundle.o

@@ -13,6 +13,7 @@ void item_overrides_init();
 void handle_pending_items();
 void push_delayed_item(uint8_t flag);
 void pop_pending_item();
+void push_outgoing_override(override_t* override);
 enum override_type {
     OVR_BASE_ITEM = 0,
     OVR_CHEST = 1,

ASM/build/c_symbols.txt

@@ -3,6 +3,7 @@
 #include "z64.h"
 #include "item_draw_table.h"
 #include "sys_matrix.h"
+#include "rainbow.h"
 
 typedef Gfx* (*append_setup_dl_fn)(Gfx* gfx, uint32_t dl_index);
 typedef void (*append_setup_dl_26_to_opa_fn)(z64_gfx_t* gfx);
@@ -18,6 +19,7 @@ typedef Gfx* (*gen_double_tile_fn)(z64_gfx_t* gfx, int32_t tile1, uint32_t x1, u
 #define gen_double_tile ((gen_double_tile_fn)0x8007EB84)
 
 extern z64_actor_t* curr_drawn_actor;
+extern Gfx sSetupDL[71][6];
 
 void draw_gi_bombchu_and_masks(z64_game_t* game, uint32_t draw_id) {
     z64_gfx_t* gfx = game->common.gfx;
@@ -114,6 +116,13 @@ void draw_gi_silver_rupee_pouch(z64_game_t* game, uint32_t draw_id) {
     gSPDisplayList(gfx->poly_opa.p++, item_draw_table[draw_id].args[6].dlist);  // gGiAdultWalletRupeeInnerColorDL
     gSPDisplayList(gfx->poly_opa.p++, item_draw_table[draw_id].args[7].dlist);  // gGiWalletRupeeInnerDL
 }
+void draw_gi_various_xlu0(z64_game_t* game, uint32_t draw_id) {
+    z64_gfx_t* gfx = game->common.gfx;
+
+    append_setup_dl_25_to_xlu(gfx);
+    gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
+    gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[0].dlist);
+}
 
 void draw_gi_various_xlu01(z64_game_t* game, uint32_t draw_id) {
     z64_gfx_t* gfx = game->common.gfx;
@@ -365,7 +374,7 @@ void draw_gi_blue_fire_candle(z64_game_t* game, uint32_t draw_id) {
                                1, game->common.state_frames * 1, -(game->common.state_frames * 8), 16, 32));
     duplicate_sys_matrix();
     translate_sys_matrix(-8.0f, -2.0f, 0.0f, 1);
-    update_sys_matrix(game->mf_11DA0);
+    update_sys_matrix(game->billboard_mtx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[1].dlist);
     pop_sys_matrix();
@@ -386,7 +395,7 @@ void draw_gi_fairy_lantern(z64_game_t* game, uint32_t draw_id) {
                                0, 0, 0, 32, 32,
                                1, game->common.state_frames, -(game->common.state_frames * 6), 32, 32));
     duplicate_sys_matrix();
-    update_sys_matrix(game->mf_11DA0);
+    update_sys_matrix(game->billboard_mtx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
     pop_sys_matrix();
@@ -401,7 +410,7 @@ void draw_gi_fairy(z64_game_t* game, uint32_t draw_id) {
                                0, 0, 0, 32, 32,
                                1, game->common.state_frames, -(game->common.state_frames * 6), 32, 32));
     duplicate_sys_matrix();
-    update_sys_matrix(game->mf_11DA0);
+    update_sys_matrix(game->billboard_mtx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
     // Not sure how much of this is required but these are called from the bottle DL. Not including them causes it to draw weird
     gDPSetRenderMode(gfx->poly_xlu.p++, G_RM_PASS, G_RM_AA_ZB_XLU_SURF2);
@@ -428,7 +437,7 @@ void draw_gi_poe_bottles(z64_game_t* game, uint32_t draw_id) {
                                0, 0, 0, 16, 32,
                                1, game->common.state_frames * 1, -(game->common.state_frames * 6), 16, 32));
     duplicate_sys_matrix();
-    update_sys_matrix(game->mf_11DA0);
+    update_sys_matrix(game->billboard_mtx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[3].dlist);
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
@@ -721,13 +730,13 @@ void draw_gi_magic_meter(z64_game_t* game, uint32_t draw_id) {
     z64_gfx_t *gfx = game->common.gfx;
 
     // Magic
-    colorRGBA8_t prim_color = item_draw_table[draw_id].args[5].color;
+    colorRGBA8_t prim_color = item_draw_table[draw_id].args[4].color;
     if (CFG_CORRECT_MODEL_COLORS) {
         prim_color.r = CFG_MAGIC_COLOR.r;
         prim_color.g = CFG_MAGIC_COLOR.g;
         prim_color.b = CFG_MAGIC_COLOR.b;
     }
-    colorRGBA8_t env_color = item_draw_table[draw_id].args[6].color;
+    colorRGBA8_t env_color = item_draw_table[draw_id].args[5].color;
 
     uint8_t alpha = 0x80;
     if (curr_drawn_actor != NULL && curr_drawn_actor->actor_id == 21) {// En_Item00
@@ -736,28 +745,87 @@ void draw_gi_magic_meter(z64_game_t* game, uint32_t draw_id) {
         }
     }
 
-    // Writing
+    // Rainbow smoke effect
+    colorRGBA8_t rainbow_color;
+    rainbow_color.a = 0xFF;
+    rainbow_color.color = get_rainbow_color(game->gameplay_frames, 10);
+    z64_xyzf_t translation = { .x = 0.0, .y = -35.0f, .z = 0.0f };
+    z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
+    draw_gi_flame(&gfx->poly_xlu, game, rainbow_color, rainbow_color, translation, scale);
+
+    // Parchment
     append_setup_dl_25_to_xlu(gfx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
-    gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[4].dlist);
-    // Shine
+    gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
+
+    // Writing
     append_setup_dl_25_to_xlu(gfx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
-    gDPSetPrimColor(gfx->poly_xlu.p++, 0, 0x80, prim_color.r, prim_color.g, prim_color.b, alpha);
-    gDPSetEnvColor(gfx->poly_xlu.p++, env_color.r, env_color.g, env_color.b, env_color.a);
-    gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[2].dlist);
+    gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[3].dlist);
+
     // Jar
     append_setup_dl_25_to_xlu(gfx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
     gDPSetPrimColor(gfx->poly_xlu.p++, 0, 0x80, prim_color.r, prim_color.g, prim_color.b, alpha);
     gDPSetEnvColor(gfx->poly_xlu.p++, env_color.r, env_color.g, env_color.b, env_color.a);
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[0].dlist);
+
     // Label
     append_setup_dl_25_to_xlu(gfx);
     gSPMatrix(gfx->poly_xlu.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
     gSPDisplayList(gfx->poly_xlu.p++, item_draw_table[draw_id].args[1].dlist);
-    // Parchment
-    append_setup_dl_25_to_opa(gfx);
-    gSPMatrix(gfx->poly_opa.p++, append_sys_matrix(gfx), G_MTX_MODELVIEW | G_MTX_LOAD | G_MTX_NOPUSH);
-    gSPDisplayList(gfx->poly_opa.p++, item_draw_table[draw_id].args[3].dlist);
+}
+
+void draw_gi_flame(z64_disp_buf_t* dl, z64_game_t *game, colorRGBA8_t prim, colorRGBA8_t env, z64_xyzf_t translation, z64_xyzf_t scale) {
+    z64_gfx_t *gfx = game->common.gfx;
+    static const uint32_t kFlameDlist = 0x52a10; // Offset of gEffFire1DL in gameplay_keep
+    duplicate_sys_matrix(); // Push the matrix stack. Do this so we can apply the smoke before the rest of the model
+    update_sys_matrix(game->billboard_mtx); // Set the rotation to use the billboard matrix
+    translate_sys_matrix(translation.x, translation.y, translation.z, 1); // Translate by the amount specified
+    scale_sys_matrix(scale.x, scale.y, scale.z, 1); // Scale by the amount specified
+    gSPMatrix(dl->p++, append_sys_matrix(gfx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW); // Apply the matrix
+
+    // Draw the flame effect
+    gSPDisplayList(dl->p++, sSetupDL[25]);
+    gDPSetEnvColor(dl->p++, env.r, env.g, env.b, 0);
+    gDPSetPrimColor(dl->p++, 0x0, 0x80, prim.r, prim.g, prim.b, 255);
+
+    gSPSegment(dl->p++, 0x08,
+        gen_double_tile(gfx, G_TX_RENDERTILE, 0, 0, 0x20, 0x40, 1, 0,
+            (-game->gameplay_frames & 0x7F) << 2, 0x20, 0x80));
+
+    gSPDisplayList(dl->p++, 0x04000000 | kFlameDlist);
+    pop_sys_matrix(); // Pop the matrix stack
+}
+
+/*  void draw_gi_opa_with_rainbow_flame(z64_game_t* game, uint32_t draw_id) {
+    draw_gi_various_xlu01(game, draw_id);
+    colorRGBA8_t rainbow_color;
+    rainbow_color.a = 0xFF;
+    rainbow_color.color = get_rainbow_color(game->gameplay_frames, 10);
+
+    z64_xyzf_t translation = { .x = 0, .y = -35.0f, .z = -10.0f };
+    z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
+    draw_gi_flame(game, rainbow_color, rainbow_color, translation, scale);
+}
+*/
+
+void draw_gi_xlu_with_flame(z64_game_t* game, uint32_t draw_id) {
+    z64_gfx_t *gfx = game->common.gfx;
+
+    z64_xyzf_t translation = { .x = 0, .y = -35.0f, .z = 0.0f };
+    z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
+    draw_gi_flame(&gfx->poly_xlu, game, item_draw_table[draw_id].args[1].color, item_draw_table[draw_id].args[2].color, translation, scale);
+
+    draw_gi_various_xlu0(game, draw_id);
+}
+
+void draw_gi_deku_nut_with_flame(z64_game_t* game, uint32_t draw_id) {
+    z64_gfx_t *gfx = game->common.gfx;
+
+    z64_xyzf_t translation = { .x = 0, .y = -35.0f, .z = -10.0f };
+    z64_xyzf_t scale = { .x = .0125f, .y = .0075f, .z = .01f };
+    draw_gi_flame(&gfx->poly_xlu, game, item_draw_table[draw_id].args[1].color, item_draw_table[draw_id].args[2].color, translation, scale);
+
+    draw_gi_deku_nut(game, draw_id);
 }

ASM/c/blue_warp.c

@@ -52,5 +52,8 @@ void draw_gi_nothing(z64_game_t* game, uint32_t draw_id);
 void draw_gi_medallions(z64_game_t* game, uint32_t draw_id);
 void draw_gi_stones(z64_game_t* game, uint32_t draw_id);
 void draw_gi_magic_meter(z64_game_t* game, uint32_t draw_id);
+void draw_gi_flame(z64_disp_buf_t* dl, z64_game_t *game, colorRGBA8_t prim, colorRGBA8_t env, z64_xyzf_t translation, z64_xyzf_t scale);
+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);
 
 #endif

ASM/c/get_items.h

@@ -42,8 +42,8 @@ item_draw_table_entry_t item_draw_table[] = {
     [0x1A] = { draw_gi_various_opa0,        { 0x060004D0 } }, // Deku Stick
     [0x1B] = { draw_gi_various_opa0,        { 0x060003C0 } }, // Map
     [0x1C] = { draw_gi_various_opa0,        { 0x06000A50 } }, // Deku Shield
-    [0x1D] = { draw_gi_various_opa0,        { 0x06000580 } }, // Small Magic Jar
-    [0x1E] = { draw_gi_various_opa0,        { 0x06000EE0 } }, // Large Magic Jar
+    [0x1D] = { draw_gi_various_opa0,        { 0x06000580, 0xe0d4ffFF, 0xd4ffe2FF } }, // Small Magic Jar
+    [0x1E] = { draw_gi_various_opa0,        { 0x06000EE0, 0xe0d4ffFF, 0xd4ffe2FF } }, // Large Magic Jar
     [0x1F] = { draw_gi_various_opa0,        { 0x060009A0 } }, // Bomb
     [0x20] = { draw_gi_various_opa0,        { 0x06000B70 } }, // Stone of Agony
     [0x21] = { draw_gi_wallets,             { 0x06001850, 0x06001750, 0x06001790, 0x060019A0, 0x060017B0, 0x06001A28, 0x060017D0, 0x06001AD8 } }, // Adult's Wallet
@@ -174,8 +174,11 @@ item_draw_table_entry_t item_draw_table[] = {
     [0x9C] = { draw_gi_stones,              { 0x06000b00, 0x060012f0, 0x32ffffff, 0x320096ff } }, // Zora Sapphire
     [0x9D] = { draw_gi_fairy,               { 0x06000EF0 } }, // Fairy (not in a bottle but uses the fairy from the bottle)
     [0x9E] = { draw_gi_nothing,             {} },
-    [0x9F] = { draw_gi_magic_meter,         { 0x06000000, 0x060007B0, 0x06000FD8, 0x060009F8, 0x06001438, 0x286428FF, 0x000000FF } },  // Magic Meter Scroll
-    };
+    [0x9F] = { draw_gi_magic_meter,         { 0x06000000, 0x060007B0, 0x060009F8, 0x06000FD8, 0x286428FF, 0x000000FF } },  // Magic Meter Scroll
+    [0xA0] = { draw_gi_xlu_with_flame,      { 0x060004D0, 0xC0C0C0FF, 0xC0C0C0FF } }, // Deku Stick Upgrade w/ Smoke Effect
+    [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
+};
 
 void base_draw_gi_model(z64_game_t* game, uint32_t draw_id) {
     item_draw_table[draw_id].draw_func(game, draw_id);

ASM/c/item_draw_functions.c

@@ -149,10 +149,10 @@ item_row_t item_table[GI_RANDO_MAX] = {
     [GI_RUPEE_RED_LOSE]                                         = ITEM_ROW(0x4D,       BROWN_CHEST, 0x86, -1, 0x00F6, 0x017F, 0x6F, no_upgrade, no_effect, -1, -1, NULL), // Red Rupee (Chest Game)
     [GI_RUPEE_PURPLE_LOSE]                                      = ITEM_ROW(0x4D,       BROWN_CHEST, 0x87, -1, 0x00F7, 0x017F, 0x71, no_upgrade, no_effect, -1, -1, NULL), // Purple Rupee (Chest Game)
     [GI_HEART_PIECE_WIN]                                        = ITEM_ROW(0x53, HEART_CHEST_SMALL, 0x7A, -1, 0x00FA, 0x00BD, 0x14, health_upgrade_cap, full_heal, -1, -1, NULL), // Piece of Heart (Chest Game)
-    [GI_DEKU_STICK_UPGRADE_20]                                  = ITEM_ROW(0x53,       BROWN_CHEST, 0x98, -1, 0x0090, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (20)
-    [GI_DEKU_STICK_UPGRADE_30]                                  = ITEM_ROW(0x53,       BROWN_CHEST, 0x99, -1, 0x0091, 0x00C7, 0x1B, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (30)
-    [GI_DEKU_NUT_UPGRADE_30]                                    = ITEM_ROW(0x53,       BROWN_CHEST, 0x9A, -1, 0x00A7, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (30)
-    [GI_DEKU_NUT_UPGRADE_40]                                    = ITEM_ROW(0x53,       BROWN_CHEST, 0x9B, -1, 0x00A8, 0x00BB, 0x12, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (40)
+    [GI_DEKU_STICK_UPGRADE_20]                                  = ITEM_ROW(0x53,       BROWN_CHEST, 0x98, -1, 0x0090, 0x00C7, 0xA1, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (20)
+    [GI_DEKU_STICK_UPGRADE_30]                                  = ITEM_ROW(0x53,       BROWN_CHEST, 0x99, -1, 0x0091, 0x00C7, 0xA1, no_upgrade, no_effect, -1, -1, NULL), // Deku Stick Upgrade (30)
+    [GI_DEKU_NUT_UPGRADE_30]                                    = ITEM_ROW(0x53,       BROWN_CHEST, 0x9A, -1, 0x00A7, 0x00BB, 0xA2, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (30)
+    [GI_DEKU_NUT_UPGRADE_40]                                    = ITEM_ROW(0x53,       BROWN_CHEST, 0x9B, -1, 0x00A8, 0x00BB, 0xA2, no_upgrade, no_effect, -1, -1, NULL), // Deku Nut Upgrade (40)
     [GI_BULLET_BAG_50]                                          = ITEM_ROW(0x53,      GILDED_CHEST, 0x49, -1, 0x006C, 0x017B, 0x73, no_upgrade, no_effect, -1, -1, NULL), // Bullet Bag (50)
     [GI_ICE_TRAP]                                               = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x9002, 0x0000, 0x00, no_upgrade, ice_trap_effect, -1, -1, NULL), // Ice Trap
 
@@ -167,8 +167,8 @@ item_row_t item_table[GI_RANDO_MAX] = {
     [GI_PROGRESSIVE_SLINGSHOT]                                  = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00E7, 0x33, slingshot_upgrade, no_effect, -1, -1, NULL), // Progressive Slingshot
     [GI_PROGRESSIVE_WALLET]                                     = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00D1, 0x22, wallet_upgrade,    no_effect, -1, -1, NULL), // Progressive Wallet
     [GI_PROGRESSIVE_SCALE]                                      = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00DB, 0x2A, scale_upgrade,     no_effect, -1, -1, NULL), // Progressive Scale
-    [GI_PROGRESSIVE_NUT_CAPACITY]                               = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,     -1, 0x00BB, 0x12, nut_upgrade,       no_effect, -1, -1, NULL), // Progressive Nut Capacity
-    [GI_PROGRESSIVE_STICK_CAPACITY]                             = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,     -1, 0x00C7, 0x1B, stick_upgrade,     no_effect, -1, -1, NULL), // Progressive Stick Capacity
+    [GI_PROGRESSIVE_NUT_CAPACITY]                               = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,     -1, 0x00BB, 0xA2, nut_upgrade,       no_effect, -1, -1, NULL), // Progressive Nut Capacity
+    [GI_PROGRESSIVE_STICK_CAPACITY]                             = ITEM_ROW(  -1,       BROWN_CHEST,   -1, -1,     -1, 0x00C7, 0xA1, stick_upgrade,     no_effect, -1, -1, NULL), // Progressive Stick Capacity
     [GI_PROGRESSIVE_BOMBCHUS]                                   = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00D9, 0x28, bombchu_upgrade,   no_effect, -1, -1, NULL), // Progressive Bombchus
     [GI_PROGRESSIVE_MAGIC_METER]                                = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x00CD, 0x1E, magic_upgrade,     no_effect, -1, -1, NULL), // Progressive Magic Meter
     [GI_PROGRESSIVE_OCARINA]                                    = ITEM_ROW(  -1,      GILDED_CHEST,   -1, -1,     -1, 0x010E, 0x46, ocarina_upgrade,   no_effect, -1, -1, NULL), // Progressive Ocarina
@@ -224,7 +224,7 @@ item_row_t item_table[GI_RANDO_MAX] = {
 
     [GI_DOUBLE_DEFENSE]                                         = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x00E9, 0x0194, 0x13, no_upgrade, give_defense,      -1, -1, NULL), // Double Defense
     [GI_MAGIC_METER]                                            = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x00E4, 0x01B4, 0xA0, no_upgrade, give_magic,        -1, -1, NULL), // Magic Meter
-    [GI_DOUBLE_MAGIC]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x00E8, 0x01B4, 0xA0, no_upgrade, give_double_magic, -1, -1, NULL), // Double Magic
+    [GI_DOUBLE_MAGIC]                                           = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x00E8, 0x01B5, 0xA3, no_upgrade, give_double_magic, -1, -1, NULL), // Double Magic
 
     [GI_MINUET_OF_FOREST]                                       = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x9091, 0x0196, 0x78, no_upgrade, give_quest_item,  6, -1, NULL), // Minuet of Forest
     [GI_BOLERO_OF_FIRE]                                         = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x9092, 0x0196, 0x79, no_upgrade, give_quest_item,  7, -1, NULL), // Bolero of Fire