Add Freestanding/Pot/Crate/Beehive Shuffle. Pot/Crate textures match …

…contents
fenhl · Sep 12, 2022 · 84f24e8 · 84f24e8
1 parent afca419
commit 84f24e8
Show file tree

Hide file tree

Showing 107 changed files with 34,123 additions and 24,337 deletions.
diff --git a/ASM/build/asm_symbols.txt b/ASM/build/asm_symbols.txt
diff --git a/ASM/build/bundle.o b/ASM/build/bundle.o
diff --git a/ASM/build/c_symbols.txt b/ASM/build/c_symbols.txt
diff --git a/ASM/c/actor.c b/ASM/c/actor.c
@@ -0,0 +1,22 @@
+#include "z64.h"
+
+#define BG_HAKA_TUBO        0x00BB
+#define BG_SPOT18_BASKET    0x015C
+#define OBJ_COMB            0x19E
+#define OBJ_MURE3           0x1AB
+
+void Actor_SetWorldToHome_End(z64_actor_t* actor)
+{
+    //Reset z rotation to 0 for any actors that we use it as flag space
+    //bg_haka_tubo          0xBB
+    //bg_spot18_basket      0x15C
+    //obj_comb              0x19E
+    //obj_mure3             0x1AB
+    if(actor->actor_id == BG_HAKA_TUBO || 
+        actor->actor_id == BG_SPOT18_BASKET ||
+        actor->actor_id == OBJ_COMB ||
+        actor->actor_id == OBJ_MURE3 )
+    {
+        actor->rot_world.z = 0;
+    }
+}
diff --git a/ASM/c/file_icons.c b/ASM/c/file_icons.c
@@ -589,7 +589,7 @@ void draw_file_icons(z64_disp_buf_t* db, const z64_menudata_t* menu_data) {
         if ((menu_data->menu_transition == 0x00 && menu_data->menu_depth == 0x02)
                 || menu_data->alt_transition == 0x05
                 || menu_data->alt_transition == 0x16) {
-            read_file_data(&menu_data->sram_buffer->primary_saves[menu_data->selected_file]);
+            read_file_data(&menu_data->sram_buffer->primary_saves[menu_data->selected_file].original_save);
             return;
         }
     }