Updated to latest lus among issues with the c mods

Author: KiritoDv

include/sm64.h

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

libultraship

@@ -11,6 +11,7 @@ set(INCLUDE_DIRS
     ${PARENT_DIR}
     ${PARENT_DIR}/include
     ${PARENT_DIR}/src
+    ${PARENT_DIR}/libultraship/src
     ${PARENT_DIR}/libultraship/include
     ${PARENT_DIR}/libultraship/include/libultraship
 )

mod-src/CMakeLists.txt

@@ -0,0 +1,88 @@
+# **Harbour Masters C Mod Template**
+
+A streamlined template for creating C-based mods for games utilizing the libultraship engine (e.g., Super Mario 64 PC ports).
+
+This template utilizes a Unity Build (amalgamation) pipeline. It allows you to write clean, modular C code organized across multiple directories, and automatically compiles them down into a single, portable mod.c file. This single-file output is perfectly formatted for dynamic compilation and loading via TCC (Tiny C Compiler) or for easy distribution.
+
+## **🌟 Features**
+
+* **Automated Amalgamation:** Uses a custom Python script hooked into CMake to safely merge all your .c and .h files, preventing redefinition errors.  
+* **Cross-Platform Exports:** Includes HM_API macros to handle the exact ABI export rules so the engine's dynamic linker can always find your ModInit function.  
+* **Event Hooking:** Includes a working boilerplate for tapping into the engine's event system (e.g., GameFrameUpdate, RenderGamePost).
+
+## **📂 Directory Structure**
+
+```
+├── CMakeLists.txt        # The build configuration  
+├── tools/  
+│   └── merge.py           # The Python script that amalgamates the source code  
+├── include/  
+│   └── mod.h              # Core macros (MOD_INIT, MOD_EXIT, HM_API)  
+├── src/  
+│   └── demo.c             # Your actual mod logic and event listeners  
+└── output/  
+    ├── mod.c             # (Generated) The final, single-file amalgamated mod  
+    └── manifest.json      # Metadata for the mod loader
+```
+
+## **🚀 Getting Started**
+
+### **Prerequisites**
+
+* **CMake** (3.10 or higher)  
+* **Python 3** (used for the amalgamation step)  
+* The libultraship source headers available in your parent directory structure.
+
+### **Building the Mod**
+
+We use an out-of-source build to keep the working directory clean. The CMake script will automatically grab all files in the src/ directory and generate the single mod.c in the output/ folder.
+
+1. Open your terminal in the project root.  
+2. Create a build directory and configure the project:  
+   ```Bash  
+   mkdir build  
+   cd build  
+   cmake ..
+   ```
+
+3. Run the build process:  
+   ```Bash
+   cmake --build .
+   ```
+
+4. Your fully amalgamated mod will be available at output/mod.c, ready to be packaged alongside manifest.json.
+
+## **🛠️ Writing Your Mod**
+
+### **The Entry and Exit Points**
+
+Every mod requires an entry point so the engine knows how to initialize it. Use the provided macros from mod.h:
+
+```C
+#include "mod.h"
+
+MOD_INIT() {  
+    // Called when the mod is dynamically loaded.  
+    // Register your engine listeners here.  
+}
+
+MOD_EXIT() {  
+    // Called when the mod is unloaded or the game closes.  
+    // Unregister your listeners and free memory here.  
+}
+```
+
+### **Hooking into Engine Events**
+
+The template includes a demo.c file showing how to hook into the engine's game loop.
+
+* **GameFrameUpdate**: Ideal for gameplay logic (e.g., modifying gMarioState).  
+* **RenderGamePost**: Ideal for drawing custom UI (e.g., using print_text_centered).
+
+Make sure to store your ListenerIDs globally so you can properly unregister them in MOD_EXIT().
+
+### **⚠️ Important Note on Unity Builds (Amalgamation)**
+
+Because all of your .c files are ultimately merged into a single mod.c file, everything shares the same global scope.
+
+* **Use static:** If you write a helper function that should only be used internally, **always** prefix it with static. This ensures it won't accidentally collide with functions of the same name in the game engine or other mods once loaded into memory.

mod-src/README.md

@@ -1,6 +1,6 @@
 #include "mod.h"
 
-#include "port/hooks/Events.h"
+#include "port/events/Events.h"
 #include "game/level_update.h"
 #include "sm64.h"
 #include "game/print.h"

mod-src/src/demo.c

@@ -1,5 +1,5 @@
 #include <libultraship.h>
-#include "port/hooks/list/PlayerEvent.h"
+#include "port/events/list/PlayerEvent.h"
 
 #include "sm64.h"
 #include "behavior_data.h"

src/engine/behavior_script.c

@@ -1,6 +1,6 @@
 #include <libultraship.h>
 #include <string.h>
-#include "port/hooks/list/PlayerEvent.h"
+#include "port/events/list/PlayerEvent.h"
 
 #include "sm64.h"
 #include "audio/external.h"
@@ -24,7 +24,7 @@
 #include "surface_collision.h"
 #include "surface_load.h"
 #include "seq_ids.h"
-#include "port/hooks/Events.h"
+#include "port/events/Events.h"
 
 #define CMD_GET(type, offset) (*(type *) (CMD_PROCESS_OFFSET(offset) + (u8 *) sCurrentCmd))
 

src/engine/level_script.c

@@ -44,7 +44,7 @@
 #include "spawn_object.h"
 #include "spawn_sound.h"
 #include "rumble_init.h"
-#include "port/hooks/Events.h"
+#include "port/events/Events.h"
 
 #define o gCurrentObject
 

src/game/behavior_actions.c

@@ -3,7 +3,7 @@
  * bhvHiddenBlueCoin are the stationary blue coins that appear when
  * you press a blue coin switch (a.k.a. bhvBlueCoinSwitch).
  */
-#include "port/hooks/list/PlayerEvent.h"
+#include "port/events/list/PlayerEvent.h"
 
 /**
  * Update function for bhvHiddenBlueCoin.

src/game/behaviors/blue_coin.inc.c

@@ -1,5 +1,5 @@
 // exclamation_box.inc.c
-#include "port/hooks/list/PlayerEvent.h"
+#include "port/events/list/PlayerEvent.h"
 
 struct ObjectHitbox sExclamationBoxHitbox = {
     /* interactType:      */ INTERACT_BREAKABLE,