Big event pass

Author: KiritoDv

src/engine/behavior_script.c

@@ -910,6 +910,8 @@ BhvCommandProc BehaviorCmdTable[] = {
 void cur_obj_update(void) {
     UNUSED u8 filler[4];
 
+    CALL_EVENT(BehaviorTick, gCurrentObject);
+
     s16 objFlags = gCurrentObject->oFlags;
     f32 distanceFromMario;
     BhvCommandProc bhvCmdProc;

src/engine/geo_layout.c

@@ -268,9 +268,13 @@ void geo_layout_cmd_node_perspective(void) {
         gGeoLayoutCommand += 4 << CMD_SIZE_SHIFT;
     }
 
-    graphNode = init_graph_node_perspective(gGraphNodePool, NULL, (f32) fov, near, far, frustumFunc, 0);
-
-    register_scene_graph_node(&graphNode->fnNode.node);
+    {
+        f32 fovF = (f32) fov;
+        CALL_CANCELLABLE_EVENT(GeoLayoutNodePerspective, &fovF, &near, &far, &frustumFunc) {
+            graphNode = init_graph_node_perspective(gGraphNodePool, NULL, fovF, near, far, frustumFunc, 0);
+            register_scene_graph_node(&graphNode->fnNode.node);
+        }
+    }
 
     gGeoLayoutCommand += 0x08 << CMD_SIZE_SHIFT;
 }
@@ -335,16 +339,14 @@ void geo_layout_cmd_node_level_of_detail(void) {
   Used for animating coins, blinking, color selection, etc.
 */
 void geo_layout_cmd_node_switch_case(void) {
-    struct GraphNodeSwitchCase *graphNode;
+    s16 initialCase = cur_geo_cmd_s16(0x02);
+    GraphNodeFunc func = (GraphNodeFunc) cur_geo_cmd_ptr(0x04);
 
-    graphNode =
-        init_graph_node_switch_case(gGraphNodePool, NULL,
-                                    cur_geo_cmd_s16(0x02), // case which is initially selected
-                                    0,
-                                    (GraphNodeFunc) cur_geo_cmd_ptr(0x04), // case update function
-                                    0);
-
-    register_scene_graph_node(&graphNode->fnNode.node);
+    CALL_CANCELLABLE_EVENT(GeoLayoutNodeSwitchCase, &initialCase, &func) {
+        struct GraphNodeSwitchCase *graphNode =
+            init_graph_node_switch_case(gGraphNodePool, NULL, initialCase, 0, func, 0);
+        register_scene_graph_node(&graphNode->fnNode.node);
+    }
 
     gGeoLayoutCommand += 0x08 << CMD_SIZE_SHIFT;
 }
@@ -361,20 +363,21 @@ void geo_layout_cmd_node_switch_case(void) {
   cmd+0x10: GraphNodeFunc func
 */
 void geo_layout_cmd_node_camera(void) {
-    struct GraphNodeCamera *graphNode;
-    s16 *cmdPos = (s16 *) &gGeoLayoutCommand[4];
-
+    s16 type = cur_geo_cmd_s16(0x02);
     Vec3f pos, focus;
+    s16 *cmdPos = (s16 *) &gGeoLayoutCommand[4];
 
     cmdPos = read_vec3s_to_vec3f(pos, cmdPos);
     cmdPos = read_vec3s_to_vec3f(focus, cmdPos);
 
-    graphNode = init_graph_node_camera(gGraphNodePool, NULL, pos, focus,
-                                       (GraphNodeFunc) cur_geo_cmd_ptr(0x10), cur_geo_cmd_s16(0x02));
-
-    register_scene_graph_node(&graphNode->fnNode.node);
+    GraphNodeFunc func = (GraphNodeFunc) cur_geo_cmd_ptr(0x10);
 
-    gGeoViews[0] = &graphNode->fnNode.node;
+    CALL_CANCELLABLE_EVENT(GeoLayoutNodeCamera, &type, pos, focus, &func) {
+        struct GraphNodeCamera *graphNode =
+            init_graph_node_camera(gGraphNodePool, NULL, pos, focus, func, type);
+        register_scene_graph_node(&graphNode->fnNode.node);
+        gGeoViews[0] = &graphNode->fnNode.node;
+    }
 
     gGeoLayoutCommand += 0x14 << CMD_SIZE_SHIFT;
 }
@@ -537,8 +540,6 @@ void geo_layout_cmd_node_rotation(void) {
   [cmd+0x08: void *displayList]
 */
 void geo_layout_cmd_node_scale(void) {
-    struct GraphNodeScale *graphNode;
-
     s16 drawingLayer = 0;
     s16 params = cur_geo_cmd_u8(0x01);
     f32 scale = cur_geo_cmd_u32(0x04) / 65536.0f;
@@ -550,9 +551,11 @@ void geo_layout_cmd_node_scale(void) {
         gGeoLayoutCommand += 4 << CMD_SIZE_SHIFT;
     }
 
-    graphNode = init_graph_node_scale(gGraphNodePool, NULL, drawingLayer, displayList, scale);
-
-    register_scene_graph_node(&graphNode->node);
+    CALL_CANCELLABLE_EVENT(GeoLayoutNodeScale, &drawingLayer, &scale, &displayList) {
+        struct GraphNodeScale *graphNode =
+            init_graph_node_scale(gGraphNodePool, NULL, drawingLayer, displayList, scale);
+        register_scene_graph_node(&graphNode->node);
+    }
 
     gGeoLayoutCommand += 0x08 << CMD_SIZE_SHIFT;
 }
@@ -626,13 +629,14 @@ void geo_layout_cmd_node_billboard(void) {
    cmd+0x04: void *displayList
 */
 void geo_layout_cmd_node_display_list(void) {
-    struct GraphNodeDisplayList *graphNode;
     s32 drawingLayer = cur_geo_cmd_u8(0x01);
     void *displayList = cur_geo_cmd_ptr(0x04);
 
-    graphNode = init_graph_node_display_list(gGraphNodePool, NULL, drawingLayer, displayList);
-
-    register_scene_graph_node(&graphNode->node);
+    CALL_CANCELLABLE_EVENT(GeoLayoutNodeDisplayList, &drawingLayer, &displayList) {
+        struct GraphNodeDisplayList *graphNode =
+            init_graph_node_display_list(gGraphNodePool, NULL, drawingLayer, displayList);
+        register_scene_graph_node(&graphNode->node);
+    }
 
     gGeoLayoutCommand += 0x08 << CMD_SIZE_SHIFT;
 }
@@ -644,14 +648,15 @@ void geo_layout_cmd_node_display_list(void) {
    cmd+0x06: s16 shadowScale
 */
 void geo_layout_cmd_node_shadow(void) {
-    struct GraphNodeShadow *graphNode;
-    u8 shadowType = cur_geo_cmd_s16(0x02);
-    u8 shadowSolidity = cur_geo_cmd_s16(0x04);
+    u8 shadowType = (u8) cur_geo_cmd_s16(0x02);
+    u8 shadowSolidity = (u8) cur_geo_cmd_s16(0x04);
     s16 shadowScale = cur_geo_cmd_s16(0x06);
 
-    graphNode = init_graph_node_shadow(gGraphNodePool, NULL, shadowScale, shadowSolidity, shadowType);
-
-    register_scene_graph_node(&graphNode->node);
+    CALL_CANCELLABLE_EVENT(GeoLayoutNodeShadow, &shadowType, &shadowSolidity, &shadowScale) {
+        struct GraphNodeShadow *graphNode =
+            init_graph_node_shadow(gGraphNodePool, NULL, shadowScale, shadowSolidity, shadowType);
+        register_scene_graph_node(&graphNode->node);
+    }
 
     gGeoLayoutCommand += 0x08 << CMD_SIZE_SHIFT;
 }
@@ -673,13 +678,13 @@ void geo_layout_cmd_node_object_parent(void) {
    cmd+0x04: GraphNodeFunc func
 */
 void geo_layout_cmd_node_generated(void) {
-    struct GraphNodeGenerated *graphNode;
+    GraphNodeFunc func = (GraphNodeFunc) cur_geo_cmd_ptr(0x04);
+    s16 param = cur_geo_cmd_s16(0x02);
 
-    graphNode = init_graph_node_generated(gGraphNodePool, NULL,
-                                          (GraphNodeFunc) cur_geo_cmd_ptr(0x04), // asm function
-                                          cur_geo_cmd_s16(0x02));                // parameter
-
-    register_scene_graph_node(&graphNode->fnNode.node);
+    CALL_CANCELLABLE_EVENT(GeoLayoutCallASM, &func, &param) {
+        struct GraphNodeGenerated *graphNode = init_graph_node_generated(gGraphNodePool, NULL, func, param);
+        register_scene_graph_node(&graphNode->fnNode.node);
+    }
 
     gGeoLayoutCommand += 0x08 << CMD_SIZE_SHIFT;
 }
@@ -690,15 +695,14 @@ void geo_layout_cmd_node_generated(void) {
    cmd+0x04: GraphNodeFunc backgroundFunc
 */
 void geo_layout_cmd_node_background(void) {
-    struct GraphNodeBackground *graphNode;
-
-    graphNode = init_graph_node_background(
-        gGraphNodePool, NULL,
-        cur_geo_cmd_s16(0x02), // background ID, or RGBA5551 color if asm function is null
-        (GraphNodeFunc) cur_geo_cmd_ptr(0x04), // asm function
-        0);
+    GraphNodeFunc func = (GraphNodeFunc) cur_geo_cmd_ptr(0x04);
+    s16 param = cur_geo_cmd_s16(0x02);
 
-    register_scene_graph_node(&graphNode->fnNode.node);
+    CALL_CANCELLABLE_EVENT(GeoLayoutCallASM, &func, &param) {
+        struct GraphNodeBackground *graphNode = init_graph_node_background(
+            gGraphNodePool, NULL, param, func, 0);
+        register_scene_graph_node(&graphNode->fnNode.node);
+    }
 
     gGeoLayoutCommand += 0x08 << CMD_SIZE_SHIFT;
 }
@@ -787,6 +791,8 @@ struct GraphNode *process_geo_layout(struct AllocOnlyPool *pool, void *segptr) {
     gGeoLayoutStack[0] = 0;
     gGeoLayoutStack[1] = 0;
 
+    CALL_EVENT(GeoLayoutBegin, segptr);
+
     if(GameEngine_OTRSigCheck(segptr) == 1){
         GeoLayoutExecute(segptr);
     } else {
@@ -798,5 +804,6 @@ struct GraphNode *process_geo_layout(struct AllocOnlyPool *pool, void *segptr) {
         }
     }
 
+    CALL_EVENT(GeoLayoutEnd, gCurRootGraphNode);
     return gCurRootGraphNode;
 }

src/engine/level_script.c

@@ -836,8 +836,9 @@ struct LevelCommand *level_script_execute(struct LevelCommand *cmd) {
     sCurrentCmd = cmd;
 
     while (sScriptStatus == SCRIPT_RUNNING) {
-        LevelScriptJumpTable[sCurrentCmd->type]();
-        CALL_EVENT(LevelScriptExecute, sCurrentCmd->type);
+        CALL_CANCELLABLE_EVENT(LevelScriptExecute, &sCurrentCmd) {
+            LevelScriptJumpTable[sCurrentCmd->type]();
+        }
     }
 
     profiler_log_thread5_time(LEVEL_SCRIPT_EXECUTE);

src/game/game_init.c

@@ -700,7 +700,9 @@ void thread5_game_loop(void) {
     save_file_load_all();
 
     // Point address to the entry point into the level script data.
-    addr = segmented_to_virtual(level_script_entry);
+    CALL_CANCELLABLE_EVENT(LevelScriptEntry, &addr) {
+        addr = segmented_to_virtual(level_script_entry);
+    }
 
     play_music(SEQ_PLAYER_SFX, SEQUENCE_ARGS(0, SEQ_SOUND_PLAYER), 0);
     set_sound_mode(save_file_get_sound_mode());

src/game/hud.c

@@ -436,21 +436,27 @@ void render_hud(void) {
         }
 
         if (hudDisplayFlags & HUD_DISPLAY_FLAG_LIVES) {
-            FrameInterpolation_RecordOpenChild("render_hud_mario_lives", (uintptr_t)&gHudDisplay.lives);
-            render_hud_mario_lives();
-            FrameInterpolation_RecordCloseChild();
+            CALL_CANCELLABLE_EVENT(RenderHudLives, gHudDisplay.lives) {
+                FrameInterpolation_RecordOpenChild("render_hud_mario_lives", (uintptr_t)&gHudDisplay.lives);
+                render_hud_mario_lives();
+                FrameInterpolation_RecordCloseChild();
+            }
         }
 
         if (hudDisplayFlags & HUD_DISPLAY_FLAG_COIN_COUNT) {
-            FrameInterpolation_RecordOpenChild("render_hud_coins", (uintptr_t)&gHudDisplay.coins);
-            render_hud_coins();
-            FrameInterpolation_RecordCloseChild();
+            CALL_CANCELLABLE_EVENT(RenderHudCoins, gHudDisplay.coins) {
+                FrameInterpolation_RecordOpenChild("render_hud_coins", (uintptr_t)&gHudDisplay.coins);
+                render_hud_coins();
+                FrameInterpolation_RecordCloseChild();
+            }
         }
 
         if (hudDisplayFlags & HUD_DISPLAY_FLAG_STAR_COUNT) {
-            FrameInterpolation_RecordOpenChild("render_hud_stars", (uintptr_t)&gHudDisplay.stars);
-            render_hud_stars();
-            FrameInterpolation_RecordCloseChild();
+            CALL_CANCELLABLE_EVENT(RenderHudStars, gHudDisplay.stars) {
+                FrameInterpolation_RecordOpenChild("render_hud_stars", (uintptr_t)&gHudDisplay.stars);
+                render_hud_stars();
+                FrameInterpolation_RecordCloseChild();
+            }
         }
 
         if (hudDisplayFlags & HUD_DISPLAY_FLAG_KEYS) {
@@ -460,18 +466,24 @@ void render_hud(void) {
         }
 
         if (hudDisplayFlags & HUD_DISPLAY_FLAG_CAMERA_AND_POWER) {
-            FrameInterpolation_RecordOpenChild("render_hud_power_meter", (uintptr_t)&sPowerMeterHUD.animation);
-            render_hud_power_meter();
-            FrameInterpolation_RecordCloseChild();
-            FrameInterpolation_RecordOpenChild("render_hud_camera_status", (uintptr_t)&sCameraHUD.status);
-            render_hud_camera_status();
-            FrameInterpolation_RecordCloseChild();
+            CALL_CANCELLABLE_EVENT(RenderHudPowerMeter, gHudDisplay.wedges) {
+                FrameInterpolation_RecordOpenChild("render_hud_power_meter", (uintptr_t)&sPowerMeterHUD.animation);
+                render_hud_power_meter();
+                FrameInterpolation_RecordCloseChild();
+            }
+            CALL_CANCELLABLE_EVENT(RenderHudCameraStatus, sCameraHUD.status) {
+                FrameInterpolation_RecordOpenChild("render_hud_camera_status", (uintptr_t)&sCameraHUD.status);
+                render_hud_camera_status();
+                FrameInterpolation_RecordCloseChild();
+            }
         }
 
         if (hudDisplayFlags & HUD_DISPLAY_FLAG_TIMER) {
-            FrameInterpolation_RecordOpenChild("render_hud_timer", (uintptr_t)&gHudDisplay.timer);
-            render_hud_timer();
-            FrameInterpolation_RecordCloseChild();
+            CALL_CANCELLABLE_EVENT(RenderHudTimer, gHudDisplay.timer) {
+                FrameInterpolation_RecordOpenChild("render_hud_timer", (uintptr_t)&gHudDisplay.timer);
+                render_hud_timer();
+                FrameInterpolation_RecordCloseChild();
+            }
         }
         FrameInterpolation_RecordCloseChild();
     }

src/game/ingame_menu.c

@@ -1471,6 +1471,11 @@ s8 gDialogCourseActNum = 1;
 #define DIAG_VAL4 (ROM_JP ? 4 : 5)
 
 void render_dialog_entries(void) {
+    CALL_CANCELLABLE_EVENT(DialogOverride, gDialogID) {}
+    if (DialogOverride_.Event.Cancelled) {
+        return;
+    }
+
 #ifdef VERSION_EU
     s8 lowerBound;
 #endif
@@ -2290,6 +2295,11 @@ s8 gHudFlash = 0;
 s16 render_pause_courses_and_castle(void) {
     s16 index;
 
+    CALL_CANCELLABLE_EVENT(PauseMenuOverride, gMenuMode) {}
+    if (PauseMenuOverride_.Event.Cancelled) {
+        return MENU_OPT_NONE;
+    }
+
 #ifdef VERSION_EU
     gInGameLanguage = eu_get_language();
 #endif
@@ -2643,6 +2653,12 @@ void render_save_confirmation(s16 x, s16 y, s8 *index, s16 yOffset)
 
 s16 render_course_complete_screen(void) {
     s16 index;
+
+    CALL_CANCELLABLE_EVENT(CourseCompleteOverride, gCurrCourseNum) {}
+    if (CourseCompleteOverride_.Event.Cancelled) {
+        return MENU_OPT_NONE;
+    }
+
 #ifdef VERSION_EU
     gInGameLanguage = eu_get_language();
 #endif