[Rando] Large Scale Update

.github/workflows/linux.yml

@@ -34,7 +34,7 @@ jobs:
           sudo make install
       - name: Build
         run: |
-          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Debug
+          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
           cmake --build build-cmake -j
       - name: Create Package
         run: |

.github/workflows/main.yml

@@ -179,8 +179,8 @@ jobs:
           path: ./build-cmake
       - name: Build
         run: |
-          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Debug
-          cmake --build build-cmake --config Debug -j3
+          cmake -H. -Bbuild-cmake -GNinja -DCMAKE_BUILD_TYPE=Release
+          cmake --build build-cmake --config Release -j3
           (cd build-cmake && cpack -G External)
           wget -O gamecontrollerdb.txt https://raw.githubusercontent.com/mdqinc/SDL_GameControllerDB/refs/heads/master/gamecontrollerdb.txt
           mv README.md readme.txt

.gitignore

@@ -52,6 +52,7 @@ build/*
 *.sav
 *.o2r
 *.map
+default.sav.bak
 .assets-local.txt
 
 build/
@@ -96,3 +97,6 @@ modding/
 node_modules
 /src/port/build.c
 /properties.h
+!/src/port/mods/
+mods/
+saves/

CMakeLists.txt

@@ -137,9 +137,9 @@ set(CMAKE_CXX_FLAGS_DEBUG "-g -ffast-math -DDEBUG")
 set(CMAKE_C_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE "-O3 -ffast-math -DNDEBUG")
 else()
-set(CMAKE_C_FLAGS_RELEASE "-O2 -DNDEBUG")
-set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
-set(CMAKE_OBJCXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+set(CMAKE_C_FLAGS_RELEASE "-O1 -DNDEBUG")
+set(CMAKE_CXX_FLAGS_RELEASE "-O1 -DNDEBUG")
+set(CMAKE_OBJCXX_FLAGS_RELEASE "-O1 -DNDEBUG")
 endif()
 
 # Set game compilation version
@@ -153,6 +153,7 @@ add_compile_definitions(
     ENABLE_RUMBLE=1
     F3D_OLD=1
     F3D_GBI=1
+    USE_GBI_TRACE=1
     GBI_FLOATS=1
     _LANGUAGE_C
     _USE_MATH_DEFINES

README.md

@@ -87,6 +87,7 @@ If you want to playtest a continuous integration build, you can find them at the
 
 # Special Thanks:
 
+* [Kenix3](https://github.com/Kenix3) : for helping with the Engine development that were brought into other ports.
 * [HM64 Team](https://github.com/harbourMasters) : for creating Libultraship and helping with various issues.
 * [garrettjoecox](https://github.com/garrettjoecox) : for contributing with fixes to this port.
 * [inspectredc](https://github.com/inspectredc) : for contributing to the extraction of the game's assets.

include/macro_presets.h

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

src/engine/behavior_script.c

@@ -1,4 +1,5 @@
 #include <libultraship.h>
+#include "port/hooks/list/PlayerEvent.h"
 
 #include "sm64.h"
 #include "behavior_data.h"
@@ -984,20 +985,22 @@ 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)) {
+                // 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;
+                }
             }
         }
     }

src/engine/level_script.c

@@ -444,9 +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);
-        if (model == MODEL_STAR) {
-            int hi = 122;
-        }
+
         spawnInfo = alloc_only_pool_alloc(sLevelPool, sizeof(struct SpawnInfo));
 
         spawnInfo->startPos[0] = CMD_GET(s16, 4);

src/game/behaviors/hidden_star.inc.c

@@ -55,7 +55,9 @@ void bhv_hidden_star_trigger_loop(void) {
 }
 
 void bhv_bowser_course_red_coin_star_loop(void) {
-    gRedCoinsCollected = o->oHiddenStarTriggerCounter;
+    CALL_CANCELLABLE_EVENT(ModifyRedCoinCount, &gRedCoinsCollected) {
+        gRedCoinsCollected = o->oHiddenStarTriggerCounter;
+    }
 
     switch (o->oAction) {
         case 0:

src/game/behaviors/spawn_star.inc.c

@@ -30,9 +30,11 @@ void bhv_collect_star_init(void) {
 void bhv_collect_star_loop(void) {
     o->oFaceAngleYaw += 0x800;
 
-    if (o->oInteractStatus & INT_STATUS_INTERACTED) {
-        mark_obj_for_deletion(o);
-        o->oInteractStatus = 0;
+    CALL_CANCELLABLE_EVENT(ModifyObjectBehavior, o, MODEL_STAR) {
+        if (o->oInteractStatus & INT_STATUS_INTERACTED) {
+            mark_obj_for_deletion(o);
+            o->oInteractStatus = 0;
+        }
     }
 }
 
@@ -167,7 +169,9 @@ void bhv_hidden_red_coin_star_init(void) {
 }
 
 void bhv_hidden_red_coin_star_loop(void) {
-    gRedCoinsCollected = o->oHiddenStarTriggerCounter;
+    CALL_CANCELLABLE_EVENT(ModifyRedCoinCount, &gRedCoinsCollected) {
+        gRedCoinsCollected = o->oHiddenStarTriggerCounter;
+    }
 
     switch (o->oAction) {
         case 0:
@@ -184,5 +188,4 @@ void bhv_hidden_red_coin_star_loop(void) {
             }
             break;
     }
-    //CALL_CANCELLABLE_EVENT(ModifyObjectBehavior, o, MODEL_STAR);
 }

src/game/level_update.c

@@ -31,6 +31,7 @@
 
 #include "port/ui/cvar_prefixes.h"
 #include "port/hooks/list/EngineEvent.h"
+#include "port/hooks/list/PlayerEvent.h"
 #include "port/mods/PortEnhancements.h"
 
 #define PLAY_MODE_NORMAL 0
@@ -662,6 +663,7 @@ void initiate_painting_warp(void) {
             if (gMarioState->action & ACT_FLAG_INTANGIBLE) {
                 play_painting_eject_sound();
             } else if (pWarpNode->id != 0) {
+                CALL_EVENT(ChangeLevel, 0, pWarpNode, 0);
                 warpNode = *pWarpNode;
 
                 if (!(warpNode.destLevel & 0x80)) {
@@ -869,11 +871,13 @@ void initiate_delayed_warp(void) {
 
                 default:
                     warpNode = area_get_warp_node(sSourceWarpNodeId);
-
-                    initiate_warp(warpNode->node.destLevel & 0x7F, warpNode->node.destArea,
-                                  warpNode->node.destNode, sDelayedWarpArg);
+
+                    CALL_EVENT(ChangeLevel, sSourceWarpNodeId, &warpNode->node, &sDelayedWarpArg);
+                    initiate_warp(warpNode->node.destLevel & 0x7F, warpNode->node.destArea, warpNode->node.destNode,
+                                      sDelayedWarpArg);
 
                     check_if_should_set_warp_checkpoint(&warpNode->node);
+
                     if (sWarpDest.type != WARP_TYPE_CHANGE_LEVEL) {
                         level_set_transition(2, NULL);
                     }

src/game/object_helpers.c

@@ -1,4 +1,5 @@
 #include <libultra/types.h>
+#include "port/hooks/list/PlayerEvent.h"
 
 #include "sm64.h"
 #include "area.h"
@@ -2317,7 +2318,7 @@ void cur_obj_call_action_function(void (*actionFunctions[])(void)) {
 }
 
 static struct Object *spawn_star_with_no_lvl_exit(s32 sp20, s32 sp24) {
-    struct Object *sp1C = spawn_object(o, MODEL_STAR, bhvSpawnedStarNoLevelExit);
+    struct Object* sp1C = spawn_object(o, MODEL_STAR, bhvSpawnedStarNoLevelExit);
     sp1C->oSparkleSpawnUnk1B0 = sp24;
     sp1C->oBehParams = o->oBehParams;
     sp1C->oBehParams2ndByte = sp20;

src/game/save_file.c

@@ -11,14 +11,16 @@
 #include "level_table.h"
 #include "course_table.h"
 #include "rumble_init.h"
+#include "port/data/Saves.h"
 
 #include "port/hooks/list/PlayerEvent.h"
 #include "port/mods/PortEnhancements.h"
 
 #define MENU_DATA_MAGIC 0x4849
 #define SAVE_FILE_MAGIC 0x4441
 
-STATIC_ASSERT(sizeof(struct SaveBuffer) == EEPROM_SIZE, "eeprom buffer size must match");
+// @port: Disabled because save files are gonna be bigger soon
+// STATIC_ASSERT(sizeof(struct SaveBuffer) == EEPROM_SIZE, "eeprom buffer size must match");
 
 extern struct SaveBuffer gSaveBuffer;
 
@@ -151,6 +153,8 @@ static void add_save_block_signature(void *buffer, s32 size, u16 magic) {
  * Copy main menu data from one backup slot to the other slot.
  */
 static void restore_main_menu_data(s32 srcSlot) {
+    CALL(RestoreMainMenuData, srcSlot);
+
     s32 destSlot = srcSlot ^ 1;
 
     // Compute checksum on source data
@@ -164,6 +168,8 @@ static void restore_main_menu_data(s32 srcSlot) {
 }
 
 static void save_main_menu_data(void) {
+    CALL(SaveMainMenuData);
+
     if (gMainMenuDataModified) {
         // Compute checksum
         add_save_block_signature(&gSaveBuffer.menuData[0], sizeof(gSaveBuffer.menuData[0]), MENU_DATA_MAGIC);
@@ -237,6 +243,8 @@ static void touch_high_score_ages(s32 fileIndex) {
  * Copy save file data from one backup slot to the other slot.
  */
 static void restore_save_file_data(s32 fileIndex, s32 srcSlot) {
+    CALL(RestoreSaveFileData, fileIndex, srcSlot);
+
     s32 destSlot = srcSlot ^ 1;
 
     // Compute checksum on source data
@@ -253,6 +261,8 @@ static void restore_save_file_data(s32 fileIndex, s32 srcSlot) {
 }
 
 void save_file_do_save(s32 fileIndex) {
+    CALL(SaveFileDoSave, fileIndex);
+
     CALL_EVENT(OnGameFileSave, fileIndex);
     if (gSaveFileModified) {
         // Compute checksum
@@ -300,40 +310,45 @@ void save_file_load_all(void) {
     gSaveFileModified = FALSE;
 
     bzero(&gSaveBuffer, sizeof(gSaveBuffer));
-    read_eeprom_data(&gSaveBuffer, sizeof(gSaveBuffer));
-
-    // Verify the main menu data and create a backup copy if only one of the slots is valid.
-    validSlots = verify_save_block_signature(&gSaveBuffer.menuData[0], sizeof(gSaveBuffer.menuData[0]), MENU_DATA_MAGIC);
-    validSlots |= verify_save_block_signature(&gSaveBuffer.menuData[1], sizeof(gSaveBuffer.menuData[1]),MENU_DATA_MAGIC) << 1;
-    switch (validSlots) {
-        case 0: // Neither copy is correct
-            wipe_main_menu_data();
-            break;
-        case 1: // Slot 0 is correct and slot 1 is incorrect
-            restore_main_menu_data(0);
-            break;
-        case 2: // Slot 1 is correct and slot 0 is incorrect
-            restore_main_menu_data(1);
-            break;
-    }
 
-    for (file = 0; file < NUM_SAVE_FILES; file++) {
-        // Verify the save file and create a backup copy if only one of the slots is valid.
-        validSlots = verify_save_block_signature(&gSaveBuffer.files[file][0], sizeof(gSaveBuffer.files[file][0]), SAVE_FILE_MAGIC);
-        validSlots |= verify_save_block_signature(&gSaveBuffer.files[file][1], sizeof(gSaveBuffer.files[file][1]), SAVE_FILE_MAGIC) << 1;
+    if(ShouldLoadOldSaveFile()) {
+        read_eeprom_data(&gSaveBuffer, EEPROM_SIZE);
+
+        // Verify the main menu data and create a backup copy if only one of the slots is valid.
+        validSlots = verify_save_block_signature(&gSaveBuffer.menuData[0], MENU_SAVE_DATA_SIZE, MENU_DATA_MAGIC);
+        validSlots |= verify_save_block_signature(&gSaveBuffer.menuData[1], MENU_SAVE_DATA_SIZE, MENU_DATA_MAGIC) << 1;
         switch (validSlots) {
             case 0: // Neither copy is correct
-                save_file_erase(file);
+                wipe_main_menu_data();
                 break;
             case 1: // Slot 0 is correct and slot 1 is incorrect
-                restore_save_file_data(file, 0);
+                restore_main_menu_data(0);
                 break;
             case 2: // Slot 1 is correct and slot 0 is incorrect
-                restore_save_file_data(file, 1);
+                restore_main_menu_data(1);
                 break;
         }
+
+        for (file = 0; file < NUM_SAVE_FILES; file++) {
+            // Verify the save file and create a backup copy if only one of the slots is valid.
+            validSlots = verify_save_block_signature(&gSaveBuffer.files[file][0], SAVE_FILE_SIZE, SAVE_FILE_MAGIC);
+            validSlots |= verify_save_block_signature(&gSaveBuffer.files[file][1], SAVE_FILE_SIZE, SAVE_FILE_MAGIC) << 1;
+            switch (validSlots) {
+                case 0: // Neither copy is correct
+                    save_file_erase(file);
+                    break;
+                case 1: // Slot 0 is correct and slot 1 is incorrect
+                    restore_save_file_data(file, 0);
+                    break;
+                case 2: // Slot 1 is correct and slot 0 is incorrect
+                    restore_save_file_data(file, 1);
+                    break;
+            }
+        }
     }
 
+    CALL(SaveFileLoadAll);
+
     stub_save_file_1();
 }