Merge 'Fix ice trap chests lacking smoke by object loading' (#2568)

# Conflicts:
#	ASM/build/asm_symbols.txt
#	ASM/build/bundle.o
#	ASM/build/c_symbols.txt
#	ASM/ootSymbols.ld
#	ASM/src/build.asm
#	ASM/src/hacks.asm
#	data/generated/patch_symbols.json
#	data/generated/rom_patch.txt
#	data/generated/symbols.json

Author: fenhl

ASM/build/asm_symbols.txt

@@ -17,7 +17,7 @@ typedef void (*EnBoxActionFunc)(struct EnBox*, z64_game_t*);
 typedef struct EnBox
 {
     /* 0x0000 */ DynaPolyActor dyna;
-    /* 0x0154 */ uint8_t skelanime[0x44];
+    /* 0x0154 */ SkelAnime skelAnime;
     /* 0x0198 */ int32_t unk_198; // related to animation delays for types 3 and 8
     /* 0x019C */ int32_t sub_cam_id;
     /* 0x01A0 */ float unk_1A0; // 0-1, rotation-related, apparently unused (in z_en_box.c at least)

ASM/build/bundle.o

@@ -680,7 +680,7 @@ void draw_debug_menu(z64_disp_buf_t* db) {
                     }
                     if (current_menu_indexes.sub_menu_index == 2) {
                         uint8_t nbActors = 0;
-                        z64_actor_t* actor = z64_game.actor_list[current_menu_indexes.actor_index].first;
+                        z64_actor_t* actor = z64_game.actorLists[current_menu_indexes.actor_index].head;
                         while (actor != NULL) {
                             nbActors++;
                             actor = actor->next;
@@ -993,7 +993,7 @@ void draw_debug_menu(z64_disp_buf_t* db) {
                     }
                     else {
                         uint8_t nbActors = 0;
-                        z64_actor_t* actor = z64_game.actor_list[current_menu_indexes.actor_index].first;
+                        z64_actor_t* actor = z64_game.actorLists[current_menu_indexes.actor_index].head;
                         uint8_t currentActorPage = current_menu_indexes.specific_actor_index / 10;
                         // Display actor list in 10 by 10 pages.
                         while (actor != NULL) {

ASM/build/c_symbols.txt

@@ -0,0 +1,31 @@
+#include "z64.h"
+#include "chests.h"
+#include "object.h"
+#include "get_items.h"
+#include "debug.h"
+
+// Macro for original get item id + if opened or not
+#define ENBOX_GET_GET_ITEM_ID(thisx) ((thisx).variable >> 5) & ((1 << 7) - 1)
+#define ENBOX_GET_TREASURE_FLAG(thisx) ((thisx).variable >> 0) & ((1 << 5) - 1)
+
+#define OBJECT_FZ 0x114
+
+// Get this chest's new randomized GI id
+int16_t EnBox_GetNewGetItemId(EnBox* this, z64_game_t* play) {
+    int16_t oldId = ENBOX_GET_GET_ITEM_ID(this->dyna.actor);
+    override_t override = lookup_override(&this->dyna.actor, z64_game.scene_index, ABS(oldId));
+
+    return override.value.base.item_id;
+}
+
+// Load the necessary extra object if new GI id is a trap
+void EnBox_LoadObject(EnBox* this, z64_game_t* play) {
+    int16_t giId = EnBox_GetNewGetItemId(this, play);
+    bool opened = Flags_GetTreasure(play, ENBOX_GET_TREASURE_FLAG(this->dyna.actor));
+
+    if(!opened) {
+        if (giId == GI_ICE_TRAP) {
+            Object_LoadExtra(play, OBJECT_FZ, 0);  // Freezard object
+        }
+    }
+}

ASM/c/chests.h

@@ -234,7 +234,7 @@ void open_gate_and_mask_shop(z64_file_t* save, int16_t arg1, int16_t arg2) {
         // Check if we're in kak and actually open the gate
         if (z64_game.scene_index == 82) {
             // Loop through the actors looking for the gate
-            z64_actor_t* curr = z64_game.actor_list[7].first;
+            z64_actor_t* curr = z64_game.actorLists[7].head;
             while (curr != NULL) {
                 if (curr->actor_id == 0x100) { // Check for BG_GATE_SHUTTER
                     // Set the openingState so it starts to open

ASM/c/debug.c

@@ -98,7 +98,7 @@ void update_bombchu_trail_colors()
     colorRGB8_t rainbow_color_outer_start = get_rainbow_color(frames, BOMBCHU_CYCLE_FRAMES_OUTER);
     colorRGB8_t rainbow_color_outer_end = get_rainbow_color(frames + 2 * BOMBCHU_CYCLE_FRAMES_OUTER, BOMBCHU_CYCLE_FRAMES_OUTER);
 
-    z64_actor_t* explosive = z64_game.actor_list[ACTORTYPE_EXPLOSIVES].first;
+    z64_actor_t* explosive = z64_game.actorLists[ACTORTYPE_EXPLOSIVES].head;
     while (explosive != NULL)
     {
         if (explosive->main_proc != NULL && explosive->actor_id == 0xDA) // En_Bom_Chu

ASM/c/en_box.c

@@ -0,0 +1,74 @@
+#include "z64.h"
+#include "object.h"
+
+// Function that adds an object to an object slot and sets up data for the object
+// to be loaded by Object_UpdateEntries() (which is run every frame).
+extern void* func_800982FC(z64_obj_ctxt_t* objectCtx, int32_t slot, int16_t objectId);
+extern int32_t DmaMgr_RequestSync(void* ram, uintptr_t vrom, size_t size);
+
+/**
+ * Loads an extra object that no previously loaded actor has a dependency on.
+ * Will get deloaded upon room/scene change, as it is not part of the room object list.
+ * @param syncDma true if the object should be synchronously DMA transferred this frame.
+ * Otherwise, it is loaded asynchronously on next frame by Object_UpdateEntries.
+ * @return: Slot number (if already loaded, or loaded into a new slot), else -1
+ * NOTE:
+ * - Crash risk if trying to sync DMA during En_Holl room transition, if an actor
+ * in the previous room depends on object data that will be overwritten by the DMA
+ * before the actor is properly deleted (see: GTG Lava room to Chest maze with SoT block).
+ * Async DMA is OK because of the extra frame delay.
+ * - Objects are otherwise not unloaded/loaded on demand, so extra loading is OK.
+ * - If crashing, if async DMA ensure that the object is loaded before the actor
+ * is trying to draw (try sync DMA). Ensure that there is actually object slot and space
+ * available for new object before drawing or doing anything else that requires object.
+ *
+ */
+int16_t Object_LoadExtra(z64_game_t* play, int16_t objectId, uint8_t syncDma) {
+    uint8_t i;
+    int16_t slot = -1;
+
+    // Check if object is already loaded, and for first available slot
+    for (i = 0; i < ARRAY_COUNT(play->obj_ctxt.objects); i++) {
+
+        // Already loaded (abs is needed - negative id if object not yet DMA:ed)
+        if (ABS((play->obj_ctxt.objects[i].id)) == objectId) {
+            return i;
+
+        } else if (slot == -1 && play->obj_ctxt.objects[i].id == 0) {
+            slot = i;
+            break;
+        }
+    }
+
+    if (slot != -1) {
+        // Take the found slot
+        z64_mem_obj_t* newEntry = &play->obj_ctxt.objects[slot];    // The new object
+        z64_mem_obj_t* lastEntry = &play->obj_ctxt.objects[play->obj_ctxt.n_objects-1]; // Previous last added object
+        RomFile* lastObjectFile = &gObjectTable[ABS(lastEntry->id)];    // Get previous object start pointer and size
+        uint32_t lastSize = lastObjectFile->vromEnd - lastObjectFile->vromStart;
+        newEntry->data = (void*)ALIGN16((uintptr_t)lastEntry->data + lastSize); // Gives pointer to start for the new object data
+
+        // Set up data for adding the object to the slot on next update or now
+        if (func_800982FC(&play->obj_ctxt, slot, objectId) != NULL) {
+            play->obj_ctxt.n_objects++;
+
+            if (syncDma) {
+                play->obj_ctxt.objects[slot].id = objectId;    // Uninvert the id because it will get loaded now
+                RomFile* objectFile = &gObjectTable[objectId];    // Get object start pointer and size
+                uint32_t size = objectFile->vromEnd - objectFile->vromStart;
+                DmaMgr_RequestSync(newEntry->data, objectFile->vromStart, size);
+            }
+
+        } else { // Loading new object would exceed object space
+            #ifdef DEBUG_MODE
+                char msg[256];
+                sprintf(msg, "Obj %d slot %d", objectId, slot);
+                Fault_AddHungupAndCrashImpl("Object_LoadExtra: No memory", msg);
+            #endif
+
+            return -1;  // Don't crash non-debug mode for now but this should not happen!
+        }
+    }
+
+    return slot;
+}

ASM/c/item_effects.c

@@ -0,0 +1,16 @@
+#ifndef OBJECT_H
+#define OBJECT_H
+
+#define ALIGN16(x) (((x) + 0xF) & ~0xF)
+#define ARRAY_COUNT(arr) (int32_t)(sizeof(arr) / sizeof(arr[0]))
+
+typedef struct RomFile {
+    /* 0x00 */ uintptr_t vromStart;
+    /* 0x04 */ uintptr_t vromEnd;
+} RomFile; // size = 0x8
+
+extern RomFile gObjectTable[];
+
+int16_t Object_LoadExtra(z64_game_t* play, int16_t objectId, uint8_t syncDma);
+
+#endif