Separate behavior files into standalone C files

Makefile

@@ -382,7 +382,7 @@ ACTOR_DIR      := actors
 LEVEL_DIRS     := $(patsubst levels/%,%,$(dir $(wildcard levels/*/header.h)))
 
 # Directories containing source files
-SRC_DIRS += src src/boot src/game src/engine src/audio src/menu src/buffers actors levels bin data assets asm lib sound
+SRC_DIRS += src src/boot src/game src/game/behaviors src/engine src/audio src/menu src/buffers actors levels bin data assets asm lib sound
 LIBZ_SRC_DIRS := src/libz
 GODDARD_SRC_DIRS := src/goddard src/goddard/dynlists
 BIN_DIRS := bin bin/$(VERSION)

data/behavior_data.c

@@ -7,7 +7,7 @@
 #include "game/interaction.h"
 #include "game/behavior_actions.h"
 #include "game/mario_actions_cutscene.h"
-#include "game/mario_misc.h"
+#include "game/mario_geo.h"
 #include "game/object_helpers.h"
 #include "game/debug.h"
 #include "menu/file_select.h"

include/geo_commands.h

@@ -7,7 +7,7 @@
 #include "game/object_helpers.h"
 #include "game/behavior_actions.h"
 #include "game/segment2.h"
-#include "game/mario_misc.h"
+#include "game/mario_geo.h"
 #include "game/mario_actions_cutscene.h"
 
 // sky background params

include/sm64.h

@@ -5,7 +5,7 @@
 
 #include "types.h"
 #include "config.h"
-#include "object_fields.h"
+#include "global_object_fields.h"
 #include "object_constants.h"
 #include "sounds.h"
 #include "model_ids.h"

sm64.ld

@@ -239,8 +239,7 @@ SECTIONS
    BEGIN_SEG(engine, .)
    {
       BUILD_DIR/src/game*.o(.text*);
-      BUILD_DIR/src/game/behavior_actions.o(.text*);
-      BUILD_DIR/src/game/obj_behaviors_2.o(.text*);
+      BUILD_DIR/src/game/behaviors*.o(.text*);
       BUILD_DIR/src/game/obj_behaviors.o(.text*);
       BUILD_DIR/src/game/object_helpers.o(.text*);
       BUILD_DIR/src/game/rendering_graph_node.o(.text*);

src/engine/behavior_script.c

@@ -8,7 +8,6 @@
 #include "game/game_init.h"
 #include "game/mario.h"
 #include "game/memory.h"
-#include "game/obj_behaviors_2.h"
 #include "game/object_helpers.h"
 #include "game/object_list_processor.h"
 #include "math_util.h"

src/game/behavior_actions.h

@@ -15,6 +15,8 @@ void tox_box_move(f32 forwardVel, f32 a1, s16 deltaPitch, s16 deltaRoll);
 void play_penguin_walking_sound(s32 walk);
 s32 update_angle_from_move_flags(s32 *angle);
 void cur_obj_spawn_strong_wind_particles(s32 windSpread, f32 scale, f32 relPosX, f32 relPosY, f32 relPosZ);
+void spawn_sparkle_particles(s32 n, s32 radius, s32 height, s32 r);
+void set_obj_anim_with_accel_and_sound(s16 frame1, s16 frame2, s32 sound);
 
 //! Lots of these are duplicates
 void bhv_cap_switch_loop(void);
@@ -550,6 +552,10 @@ void bhv_intro_scene_loop(void);
 void bhv_dust_smoke_loop(void);
 void bhv_yoshi_loop(void);
 void bhv_volcano_trap_loop(void);
+void bhv_toad_message_loop(void);
+void bhv_toad_message_init(void);
+void bhv_unlock_door_star_init(void);
+void bhv_unlock_door_star_loop(void);
 
 Gfx *geo_move_mario_part_from_parent(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx);
 

src/game/behaviors/activated_bf_plat.inc.c → src/game/behaviors/activated_bf_plat.c

@@ -1,3 +1,8 @@
+#include <ultra64.h>
+#include "global_object_fields.h"
+#include "game/object_helpers.h"
+#include "levels/bitfs/header.h"
+#include "levels/bits/header.h"
 
 /**
  * Behavior for bhvActivatedBackAndForthPlatform.
@@ -6,6 +11,15 @@
  * Note: The filename is abbreviated to avoid compiler seg fault on long paths
  */
 
+/* Activated Back and Forth Platform */
+#define /*0x0F4*/ oActivatedBackAndForthPlatformMaxOffset    OBJECT_FIELD_F32(0x1B)
+#define /*0x0F8*/ oActivatedBackAndForthPlatformOffset       OBJECT_FIELD_F32(0x1C)
+#define /*0x0FC*/ oActivatedBackAndForthPlatformVel          OBJECT_FIELD_F32(0x1D)
+#define /*0x100*/ oActivatedBackAndForthPlatformCountdown    OBJECT_FIELD_S32(0x1E)
+#define /*0x104*/ oActivatedBackAndForthPlatformStartYaw     OBJECT_FIELD_S32(0x1F)
+#define /*0x108*/ oActivatedBackAndForthPlatformVertical     OBJECT_FIELD_S32(0x20)
+#define /*0x10C*/ oActivatedBackAndForthPlatformFlipRotation OBJECT_FIELD_S32(0x21)
+
 /**
  * Table of activated back-and-forth platform collision models.
  * The second entry is unused. It corresponds to the mesh platform

src/game/behaviors/amp.inc.c → src/game/behaviors/amp.c

@@ -1,3 +1,9 @@
+#include <ultra64.h>
+#include "global_object_fields.h"
+#include "game/interaction.h"
+#include "engine/math_util.h"
+#include "game/object_helpers.h"
+#include "game/spawn_sound.h"
 
 /**
  * Behavior for bhvHomingAmp and bhvCirclingAmp.
@@ -6,6 +12,14 @@
  * of 200, 300, 400, or 0 (stationary).
  */
 
+/* Amp */
+#define /*0x0F4*/ oAmpRadiusOfRotation OBJECT_FIELD_F32(0x1B)
+#define /*0x0F8*/ oAmpYPhase           OBJECT_FIELD_S32(0x1C)
+
+/* Homing Amp */
+#define /*0x0F4*/ oHomingAmpLockedOn OBJECT_FIELD_S32(0x1B)
+#define /*0x0FC*/ oHomingAmpAvgY     OBJECT_FIELD_F32(0x1D)
+
 static struct ObjectHitbox sAmpHitbox = {
     /* interactType:      */ INTERACT_SHOCK,
     /* downOffset:        */ 40,

src/game/behaviors/animated_floor_switch.inc.c → src/game/behaviors/animated_floor_switch.c

@@ -1,4 +1,17 @@
-// animated_floor_switch.inc.c
+#include <ultra64.h>
+#include "behavior_data.h"
+#include "global_object_fields.h"
+#include "game/object_helpers.h"
+#include "game/spawn_sound.h"
+#include "levels/bitdw/header.h"
+#include "levels/bits/header.h"
+#include "levels/rr/header.h"
+
+/* Floor Switch Press Animation */
+#define /*0x0F4*/ oFloorSwitchPressAnimationTickTimer        OBJECT_FIELD_S32(0x1B)
+#define /*0x0F8*/ oFloorSwitchPressAnimationDoubleFrame      OBJECT_FIELD_S32(0x1C)
+#define /*0x0FC*/ oFloorSwitchPressAnimationDoResetTime      OBJECT_FIELD_S32(0x1D)
+#define /*0x100*/ oFloorSwitchPressAnimationSwitchNotTicking OBJECT_FIELD_S32(0x1E)
 
 struct FloorSwitchTriggeredAnimationFrame {
     const Collision *collision;

src/game/behaviors/arrow_lift.inc.c → src/game/behaviors/arrow_lift.c

@@ -1,3 +1,8 @@
+#include <ultra64.h>
+#include "global_object_fields.h"
+#include "game/object_helpers.h"
+
+#define /*0x0F4*/ oArrowLiftDisplacement OBJECT_FIELD_F32(0x1B)
 
 /**
  * Behavior for WDW arrow lifts.