Merge pull request HarbourMasters#152 from HarbourMasters/develop-rando

[Rando] Implement Randomizer Framework

Author: KiritoDv

include/behavior_data.h

@@ -3,6 +3,10 @@
 
 #include "types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern const BehaviorScript bhvStarDoor[];
 extern const BehaviorScript bhvMrI[];
 extern const BehaviorScript bhvMrIBody[];
@@ -543,4 +547,8 @@ extern const BehaviorScript bhvEndBirds2[];
 extern const BehaviorScript bhvIntroScene[];
 extern const BehaviorScript bhvUnusedFakeStar[];
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif // BEHAVIOR_DATA_H

include/macro_presets.h

@@ -11,7 +11,7 @@ struct MacroPreset {
     /*0x06*/ s16 param;
 };
 
-struct MacroPreset MacroObjectPresets[] = {
+static struct MacroPreset MacroObjectPresets[] = {
     {bhvYellowCoin, MODEL_YELLOW_COIN, 0},
     {bhvOneCoin, MODEL_YELLOW_COIN, 0},
     {bhvMovingBlueCoin, MODEL_BLUE_COIN, 0},

include/sm64.h

@@ -6,6 +6,7 @@
 #include <PR/gu.h>
 #include <PR/ucode.h>
 #include "port/Engine.h"
+#include "port/hooks/Events.h"
 #include <libultra/os.h>
 #include "variables.h"
 

include/types.h

@@ -208,6 +208,8 @@ struct Object {
     /*0x218*/ void *collisionData;
     /*0x21C*/ Mat4 transform;
     /*0x25C*/ void *respawnInfo;
+    /*0x260*/ u32 modelId;
+    /*0x264*/ bool custom;
 };
 
 struct ObjectHitbox {

libultraship

@@ -681,7 +681,7 @@ u64 *synthesis_process_notes(s16 *aiBuf, s32 bufLen, u64 *cmd) {
         if (IS_BANK_LOAD_COMPLETE(note->bankId) == FALSE) {
 #endif
             gAudioErrorFlags = (note->bankId << 8) + noteIndex + 0x1000000;
-        } else if (note->enabled == TRUE) {
+        } else if (note->enabled == TRUE && note->synthesisBuffers != NULL) {
 #else
         if (note->noteSubEu.enabled == FALSE) {
             return cmd;
@@ -1196,14 +1196,16 @@ u64 *load_wave_samples(u64 *cmd, struct NoteSubEu *noteSubEu, struct NoteSynthes
 u64 *load_wave_samples(u64 *cmd, struct Note *note, s32 nSamplesToLoad) {
     s32 a3;
     s32 i;
-    aSetBuffer(cmd++, /*flags*/ 0, /*dmemin*/ DMEM_ADDR_UNCOMPRESSED_NOTE, /*dmemout*/ 0,
+    if (note->synthesisBuffers != NULL) {
+        aSetBuffer(cmd++, /*flags*/ 0, /*dmemin*/ DMEM_ADDR_UNCOMPRESSED_NOTE, /*dmemout*/ 0,
                /*count*/ sizeof(note->synthesisBuffers->samples));
-    aLoadBuffer(cmd++, VIRTUAL_TO_PHYSICAL2(note->synthesisBuffers->samples));
-    note->samplePosInt &= (note->sampleCount - 1);
-    a3 = 64 - note->samplePosInt;
-    if (a3 < nSamplesToLoad) {
-        for (i = 0; i <= (nSamplesToLoad - a3 + 63) / 64 - 1; i++) {
-            aDMEMMove(cmd++, /*dmemin*/ DMEM_ADDR_UNCOMPRESSED_NOTE, /*dmemout*/ DMEM_ADDR_UNCOMPRESSED_NOTE + (1 + i) * sizeof(note->synthesisBuffers->samples), /*count*/ sizeof(note->synthesisBuffers->samples));
+        aLoadBuffer(cmd++, VIRTUAL_TO_PHYSICAL2(note->synthesisBuffers->samples));
+        note->samplePosInt &= (note->sampleCount - 1);
+        a3 = 64 - note->samplePosInt;
+        if (a3 < nSamplesToLoad) {
+            for (i = 0; i <= (nSamplesToLoad - a3 + 63) / 64 - 1; i++) {
+                aDMEMMove(cmd++, /*dmemin*/ DMEM_ADDR_UNCOMPRESSED_NOTE, /*dmemout*/ DMEM_ADDR_UNCOMPRESSED_NOTE + (1 + i) * sizeof(note->synthesisBuffers->samples), /*count*/ sizeof(note->synthesisBuffers->samples));
+            }
         }
     }
     return cmd;

src/audio/synthesis.c

@@ -1,4 +1,5 @@
 #include <libultraship.h>
+#include "port/hooks/list/PlayerEvent.h"
 
 #include "sm64.h"
 #include "behavior_data.h"
@@ -984,20 +985,26 @@ void cur_obj_update(void) {
     }
 
     // Handle visibility of object
-    if (gCurrentObject->oRoom != -1) {
-        // If the object is in a room, only show it when Mario is in the room.
-        cur_obj_enable_rendering_if_mario_in_room();
-    } else if ((objFlags & OBJ_FLAG_COMPUTE_DIST_TO_MARIO) && gCurrentObject->collisionData == NULL) {
-        if (!(objFlags & OBJ_FLAG_ACTIVE_FROM_AFAR)) {
-            // If the object has a render distance, check if it should be shown.
-            if (distanceFromMario > gCurrentObject->oDrawingDistance) {
-                // Out of render distance, hide the object.
-                gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
-                gCurrentObject->activeFlags |= ACTIVE_FLAG_FAR_AWAY;
-            } else if (gCurrentObject->oHeldState == HELD_FREE) {
-                // In render distance (and not being held), show the object.
-                gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;
-                gCurrentObject->activeFlags &= ~ACTIVE_FLAG_FAR_AWAY;
+    CALL_CANCELLABLE_EVENT(ModifyObjectVisibility, &gCurrentObject) {
+        if (gCurrentObject->oRoom != -1) {
+            // If the object is in a room, only show it when Mario is in the room.
+            cur_obj_enable_rendering_if_mario_in_room();
+        } else if ((objFlags & OBJ_FLAG_COMPUTE_DIST_TO_MARIO) && gCurrentObject->collisionData == NULL) {
+            if (!(objFlags & OBJ_FLAG_ACTIVE_FROM_AFAR)) {
+                bool visible = distanceFromMario <= gCurrentObject->oDrawingDistance;
+
+                CALL_CANCELLABLE_EVENT(EntityDistanceRender, &visible) {
+                    // If the object has a render distance, check if it should be shown.
+                    if (!visible) {
+                        // Out of render distance, hide the object.
+                        gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
+                        gCurrentObject->activeFlags |= ACTIVE_FLAG_FAR_AWAY;
+                    } else if (gCurrentObject->oHeldState == HELD_FREE) {
+                        // In render distance (and not being held), show the object.
+                        gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;
+                        gCurrentObject->activeFlags &= ~ACTIVE_FLAG_FAR_AWAY;
+                    }
+                }
             }
         }
     }

src/engine/behavior_script.c

@@ -20,6 +20,7 @@
 #define GRAPH_RENDER_Z_BUFFER       (1 << 3)
 #define GRAPH_RENDER_INVISIBLE      (1 << 4)
 #define GRAPH_RENDER_HAS_ANIMATION  (1 << 5)
+#define GRAPH_RENDER_DRAW_DEBUG     (1 << 6)
 
 // Whether the node type has a function pointer of type GraphNodeFunc
 #define GRAPH_NODE_TYPE_FUNCTIONAL            0x100

src/engine/graph_node.h

@@ -1,5 +1,6 @@
 #include <libultraship.h>
 #include <string.h>
+#include "port/hooks/list/PlayerEvent.h"
 
 #include "sm64.h"
 #include "audio/external.h"
@@ -443,6 +444,7 @@ static void level_cmd_place_object(void) {
 
     if (sCurrAreaIndex != -1 && ((CMD_GET(u8, 2) & val7) || CMD_GET(u8, 2) == 0x1F)) {
         model = CMD_GET(u8, 3);
+
         spawnInfo = alloc_only_pool_alloc(sLevelPool, sizeof(struct SpawnInfo));
 
         spawnInfo->startPos[0] = CMD_GET(s16, 4);
@@ -457,11 +459,17 @@ static void level_cmd_place_object(void) {
         spawnInfo->activeAreaIndex = sCurrAreaIndex;
 
         spawnInfo->behaviorArg = CMD_GET(u32, 16);
-        spawnInfo->behaviorScript = CMD_GET(void *, 20);
+        spawnInfo->behaviorScript = CMD_GET(void*, 20);
+    
         spawnInfo->model = gLoadedGraphNodes[model];
+        spawnInfo->modelId = model;
+
         spawnInfo->next = gAreas[sCurrAreaIndex].objectSpawnInfos;
 
-        gAreas[sCurrAreaIndex].objectSpawnInfos = spawnInfo;
+        CALL_CANCELLABLE_EVENT(SpawnStar, &model, spawnInfo->startPos[0], spawnInfo->startPos[1],
+                               spawnInfo->startPos[2]) {
+            gAreas[sCurrAreaIndex].objectSpawnInfos = spawnInfo;
+        }
     }
 
     sCurrentCmd = CMD_NEXT;
@@ -821,6 +829,7 @@ struct LevelCommand *level_script_execute(struct LevelCommand *cmd) {
 
     while (sScriptStatus == SCRIPT_RUNNING) {
         LevelScriptJumpTable[sCurrentCmd->type]();
+        CALL_EVENT(LevelScriptExecute, sCurrentCmd->type);
     }
 
     profiler_log_thread5_time(LEVEL_SCRIPT_EXECUTE);
@@ -831,3 +840,12 @@ struct LevelCommand *level_script_execute(struct LevelCommand *cmd) {
 
     return sCurrentCmd;
 }
+
+// TODO: Move these elsewhere
+s16 get_current_area_index(void) {
+    return sCurrAreaIndex;
+}
+
+struct AllocOnlyPool* get_level_pool(void) {
+    return sLevelPool;
+}

src/engine/level_script.c

@@ -789,9 +789,13 @@ void load_object_collision_model(void) {
         }
     }
 
-    if (marioDist < gCurrentObject->oDrawingDistance) {
-        gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;
-    } else {
-        gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
-    }
+    bool visible = (marioDist < gCurrentObject->oDrawingDistance);
+
+    CALL_CANCELLABLE_EVENT(EntityDistanceLoad, &visible) {
+        if (visible) {
+            gCurrentObject->header.gfx.node.flags |= GRAPH_RENDER_ACTIVE;
+        } else {
+            gCurrentObject->header.gfx.node.flags &= ~GRAPH_RENDER_ACTIVE;
+        }
+    };
 }