Rebase and use new model for pots drops

Author: GSKirox

ASM/build/asm_symbols.txt

@@ -926,6 +926,11 @@ uint8_t item_give_collectible(uint8_t item, z64_link_t* link, z64_actor_t* from_
         uint16_t resolved_item_id = resolve_upgrades(collectible_override);
         item_row_t* item_row = get_item_row(resolved_item_id);
 
+        // If we picked an ice trap, show the ice model instead of the fake item model.
+        if (item_id == GI_ICE_TRAP) {
+            pItem->model.graphic_id = 0xA4;
+        }
+
         // Set the collectible flag
         Set_NewFlag(&flag);
         //if (item == ITEM00_HEART_PIECE || item == ITEM00_SMALL_KEY) { // Don't allow heart pieces or small keys to be collected a second time. This is really just for the "Drop" types.

ASM/build/bundle.o

@@ -52,12 +52,9 @@ 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);
-<<<<<<< HEAD
 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);
-=======
 void draw_ice_trap(z64_game_t* game, uint32_t draw_id);
->>>>>>> 04e5195c (Ice trap model)
 
 #endif

ASM/build/c_symbols.txt

@@ -174,17 +174,12 @@ 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,             {} },
-<<<<<<< HEAD
     [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
+    [0xA3] = { draw_ice_trap,               { 0x04034380 } }, // Ice trap
 };
-=======
-    [0x9F] = { draw_gi_magic_meter,         { 0x06000000, 0x060007B0, 0x06000FD8, 0x060009F8, 0x06001438, 0x286428FF, 0x000000FF } },  // Magic Meter Scroll
-    [0xA0] = { draw_ice_trap,               { 0x04034380 } }, // Ice trap
-    };
->>>>>>> 04e5195c (Ice trap model)
 
 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/get_items.c

@@ -154,7 +154,7 @@ item_row_t item_table[GI_RANDO_MAX] = {
     [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, 0xA1, no_upgrade, ice_trap_effect, -1, -1, NULL), // Ice Trap
+    [GI_ICE_TRAP]                                               = ITEM_ROW(0x53,      GILDED_CHEST, 0x41, -1, 0x9002, 0x0000, 0xA4, no_upgrade, ice_trap_effect, -1, -1, NULL), // Ice Trap
 
     [GI_CAPPED_PIECE_OF_HEART]                                  = ITEM_ROW(0x3E, HEART_CHEST_SMALL, 0x41, -1, 0x90C2, 0x00BD, 0x14, no_upgrade, full_heal, -1, -1, NULL), // Capped Piece of Heart
     [GI_CAPPED_HEART_CONTAINER]                                 = ITEM_ROW(0x3E, HEART_CHEST_SMALL, 0x41, -1, 0x90C6, 0x00BD, 0x13, no_upgrade, full_heal, -1, -1, NULL), // Capped Heart Container