Fix conflicts

Camera.c do be almost 100KB smaller now 😳

Makefile

@@ -430,7 +430,7 @@ DEF_INC_CFLAGS := $(foreach i,$(INCLUDE_DIRS),-I$(i)) $(C_DEFINES)
 # C compiler options
 CFLAGS = -G 0 $(OPT_FLAGS) $(TARGET_CFLAGS) $(MIPSISET) $(DEF_INC_CFLAGS)
 ifeq ($(COMPILER),gcc)
-  CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-missing-braces
+  CFLAGS += -mno-shared -march=vr4300 -mfix4300 -mabi=32 -mhard-float -mdivide-breaks -fno-stack-protector -fno-common -fno-zero-initialized-in-bss -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-missing-braces -fno-jump-tables -Werror=implicit-function-declaration
 else ifeq ($(COMPILER),clang)
   CFLAGS += -target mips -mabi=32 -G 0 -mhard-float -fomit-frame-pointer -fno-stack-protector -fno-common -I include -I src/ -I $(BUILD_DIR)/include -fno-PIC -mno-abicalls -fno-strict-aliasing -fno-inline-functions -ffreestanding -fwrapv -Wall -Wextra -Wno-missing-braces -fno-jump-tables
 else

actors/common0_geo.c

@@ -27,3 +27,30 @@
 #include "metal_box/geo.inc.c"
 #include "exclamation_box_outline/geo.inc.c"
 #include "koopa_shell/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/blue_coin.inc.c"
+#include "game/behaviors/amp.inc.c"
+#include "game/behaviors/cannon_door.inc.c"
+#include "game/behaviors/cannon.inc.c"
+#include "game/behaviors/switch_hidden_objects.inc.c"
+#include "game/behaviors/breakable_box.inc.c"
+#include "game/behaviors/breakable_box_small.inc.c"
+#include "game/behaviors/recovery_heart.inc.c"
+#include "game/behaviors/purple_switch.inc.c"
+#include "game/behaviors/checkerboard_platform.inc.c"
+#include "game/behaviors/bowling_ball.inc.c"
+#include "game/behaviors/exclamation_box.inc.c"
+#include "game/behaviors/koopa_shell.inc.c"
+#include "game/behaviors/koopa_shell_underwater.inc.c"
+#include "game/behaviors/corkbox.inc.c"
+#include "game/behaviors/unused_poundable_platform.inc.c"
+#include "game/behaviors/jumping_box.inc.c"
+#include "game/behaviors/fly_guy.inc.c"
+#include "game/behaviors/fire_spitter.inc.c"
+#include "game/behaviors/chuckya.inc.c"
+#include "game/behaviors/bobomb.inc.c"
+#include "game/behaviors/metal_box.inc.c"
+#include "game/behaviors/goomba.inc.c"
+

actors/common1_geo.c

@@ -25,3 +25,31 @@
 #include "white_particle/geo.inc.c"
 #include "wooden_signpost/geo.inc.c"
 #include "tree/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/water_mist_particle.inc.c"
+#include "game/behaviors/water_mist.inc.c"
+#include "game/behaviors/explosion.inc.c"
+#include "game/behaviors/butterfly.inc.c"
+#include "game/behaviors/coin.inc.c"
+#include "game/behaviors/moving_coin.inc.c"
+#include "game/behaviors/red_coin.inc.c"
+#include "game/behaviors/door.inc.c"
+#include "game/behaviors/blue_fish.inc.c"
+#include "game/behaviors/tree_particles.inc.c"
+#include "game/behaviors/cap.inc.c"
+#include "game/behaviors/orange_number.inc.c"
+#include "game/behaviors/mushroom_1up.inc.c"
+#include "game/behaviors/spawn_star_exit.inc.c"
+#include "game/behaviors/celebration_star.inc.c"
+#include "game/behaviors/flame.inc.c"
+#include "game/behaviors/spawn_star.inc.c"
+#include "game/behaviors/hidden_star.inc.c"
+#include "game/behaviors/reds_star_marker.inc.c"
+#include "game/behaviors/triplet_butterfly.inc.c"
+
+#include "game/behaviors/beta_fish_splash_spawner.inc.c"
+#include "game/behaviors/collide_particles.inc.c"
+#include "game/behaviors/square_platform_cycle.inc.c"
+#include "game/behaviors/unused_particle_spawn.inc.c"

actors/group0_geo.c

@@ -16,3 +16,57 @@
 #include "water_splash/geo.inc.c"
 #include "sparkle_animation/geo.inc.c"
 #include "mario/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/sparkle_spawn.inc.c"
+#include "game/behaviors/bubble.inc.c"
+#include "game/behaviors/water_splashes_and_waves.inc.c"
+#include "game/behaviors/white_puff.inc.c"
+#include "game/behaviors/pole.inc.c"
+#include "game/behaviors/warp.inc.c"
+#include "game/behaviors/water_objs.inc.c"
+#include "game/behaviors/flame_mario.inc.c"
+//#include "game/behaviors/sparkle_spawn_star.inc.c"
+
+#include "game/behaviors/sound_spawner.inc.c"
+#include "game/behaviors/sound_waterfall.inc.c"
+#include "game/behaviors/sound_volcano.inc.c"
+#include "game/behaviors/sound_birds.inc.c"
+#include "game/behaviors/sound_ambient.inc.c"
+#include "game/behaviors/sound_sand.inc.c"
+#include "game/behaviors/cloud.inc.c"
+#include "game/behaviors/white_puff_explode.inc.c"
+#include "game/behaviors/water_wave.inc.c"
+
+//Temp stuff that's here because the behaviours are heavily shared, or have no visible link.
+#include "game/behaviors/bully.inc.c"
+#include "game/behaviors/express_elevator.inc.c"
+#include "game/behaviors/elevator.inc.c"
+#include "game/behaviors/tumbling_bridge.inc.c"
+#include "game/behaviors/flamethrower.inc.c"
+#include "game/behaviors/bouncing_fireball.inc.c"
+#include "game/behaviors/rotating_platform.inc.c"
+#include "game/behaviors/bowser_key_cutscene.inc.c"
+#include "game/behaviors/sparkle_spawn_star.inc.c" //group0
+#ifndef VERSION_JP
+#include "game/behaviors/music_touch.inc.c"
+#endif
+#include "game/behaviors/pole_base.inc.c"
+#include "game/behaviors/strong_wind_particle.inc.c"
+#include "game/behaviors/seesaw_platform.inc.c"
+#include "game/behaviors/sliding_platform_2.inc.c"
+#include "game/behaviors/animated_floor_switch.inc.c"
+#include "game/behaviors/activated_bf_plat.inc.c" //Used in numerous stages.
+#include "game/behaviors/ferris_wheel.inc.c" //Used in two bowser stages
+#include "game/behaviors/beta_holdable_object.inc.c"
+#include "game/behaviors/falling_rising_platform.inc.c" //Used in numerous levels
+#include "game/behaviors/grill_door.inc.c" //Used in both BoB and HMC
+#include "game/behaviors/rotating_octagonal_plat.inc.c" //Used in RR and BitS
+#include "game/behaviors/tilting_inverted_pyramid.inc.c" //Used in numerous levels
+#include "game/behaviors/rolling_log.inc.c" //Used in LLL and TTM
+#include "game/behaviors/sliding_platform.inc.c" //Used in BitDW and BitFS
+#include "game/behaviors/platform_on_track.inc.c" //Used in numerous courses.
+#include "game/behaviors/fish.inc.c" //Dude honestly.
+#include "game/behaviors/static_checkered_platform.inc.c" //Unused
+#include "game/behaviors/floating_platform.inc.c" //Used in JRB and WDW

actors/group10_geo.c

@@ -10,3 +10,13 @@
 #include "bird/geo.inc.c"
 #include "peach/geo.inc.c"
 #include "yoshi/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/bird.inc.c"
+#include "game/behaviors/yoshi.inc.c"
+#include "game/behaviors/intro_peach.inc.c"
+#include "game/behaviors/intro_lakitu.inc.c"
+#include "game/behaviors/end_birds_1.inc.c"
+#include "game/behaviors/end_birds_2.inc.c"
+#include "game/behaviors/intro_scene.inc.c"

actors/group11_geo.c

@@ -13,3 +13,10 @@
 #include "lakitu_enemy/geo.inc.c"
 #include "spiny_egg/geo.inc.c"
 #include "spiny/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/bubba.inc.c"
+#include "game/behaviors/spiny.inc.c"
+#include "game/behaviors/enemy_lakitu.inc.c"
+#include "game/behaviors/wiggler.inc.c"

actors/group12_geo.c

@@ -13,3 +13,15 @@
 #include "bowser/geo.inc.c"
 #include "bomb/geo.inc.c"
 #include "impact_smoke/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/grand_star.inc.c"
+#include "game/behaviors/bowser_key.inc.c"
+#include "game/behaviors/bowser_falling_platform.inc.c"
+#include "game/behaviors/bowser_flame.inc.c"
+#include "game/behaviors/shock_wave.inc.c"
+#include "game/behaviors/beta_bowser_anchor.inc.c"
+#include "game/behaviors/bowser_bomb.inc.c"
+#include "game/behaviors/bowser.inc.c"
+#include "game/behaviors/bowser_camera.inc.c"

actors/group13_geo.c

@@ -14,3 +14,12 @@
 #include "bub/geo.inc.c"
 #include "water_ring/geo.inc.c"
 #include "treasure_chest/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/skeeter.inc.c"
+#include "game/behaviors/seaweed.inc.c"
+#include "game/behaviors/bub.inc.c"
+#include "game/behaviors/water_ring.inc.c"
+#include "game/behaviors/beta_chest.inc.c"
+#include "game/behaviors/treasure_chest.inc.c"

actors/group14_geo.c

@@ -14,3 +14,13 @@
 #include "whomp/geo.inc.c"
 #include "chain_ball/geo.inc.c"
 #include "chain_chomp/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+//#include "game/behaviors/koopa.inc.c" // TODO: Text arg field name
+#include "game/behaviors/chain_chomp.inc.c" // TODO: chain_chomp_sub_act_lunge documentation
+#include "game/behaviors/whomp.inc.c"
+#include "game/behaviors/piranha_plant.inc.c"
+#include "game/behaviors/piranha_bubbles.inc.c"
+#include "game/behaviors/fire_piranha_plant.inc.c"
+#include "game/behaviors/koopa.inc.c"

actors/group15_geo.c

@@ -11,3 +11,10 @@
 #include "toad/geo.inc.c"
 #include "mips/geo.inc.c"
 #include "boo_castle/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/camera_lakitu.inc.c" // TODO: 104 label, follow cam documentation
+#include "game/behaviors/mips.inc.c"
+#include "game/behaviors/toad.inc.c"
+#include "game/behaviors/castle_boo.inc.c"

actors/group16_geo.c

@@ -9,3 +9,7 @@
 
 #include "chillychief/geo.inc.c"
 #include "moneybag/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/moneybag.inc.c"

actors/group17_geo.c

@@ -13,3 +13,11 @@
 #include "snufit/geo.inc.c"
 #include "dorrie/geo.inc.c"
 #include "scuttlebug/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/mr_i.inc.c"
+#include "game/behaviors/swoop.inc.c"
+#include "game/behaviors/snufit.inc.c"
+#include "game/behaviors/dorrie.inc.c"
+#include "game/behaviors/scuttlebug.inc.c" // :scuttleeyes:

actors/group1_geo.c

@@ -13,3 +13,10 @@
 #include "thwomp/geo.inc.c"
 #include "bullet_bill/geo.inc.c"
 #include "heave_ho/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/hoot.inc.c"
+#include "game/behaviors/thwomp.inc.c"
+#include "game/behaviors/bullet_bill.inc.c"
+#include "game/behaviors/heave_ho.inc.c"

actors/group2_geo.c

@@ -9,3 +9,4 @@
 
 #include "bully/geo.inc.c"
 #include "blargg/geo.inc.c"
+

actors/group3_geo.c

@@ -9,3 +9,9 @@
 
 #include "king_bobomb/geo.inc.c"
 #include "water_bubble/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/king_bobomb.inc.c"
+#include "game/behaviors/water_bomb_cannon.inc.c"
+#include "game/behaviors/water_bomb.inc.c" // TODO: Shadow position

actors/group4_geo.c

@@ -11,3 +11,10 @@
 #include "manta/geo.inc.c"
 #include "sushi/geo.inc.c"
 #include "unagi/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/clam.inc.c"
+#include "game/behaviors/manta_ray.inc.c"
+#include "game/behaviors/sushi.inc.c"
+#include "game/behaviors/unagi.inc.c"

actors/group5_geo.c

@@ -10,3 +10,9 @@
 #include "klepto/geo.inc.c"
 #include "eyerok/geo.inc.c"
 #include "pokey/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/eyerok.inc.c"
+#include "game/behaviors/pokey.inc.c"
+#include "game/behaviors/klepto.inc.c"

actors/group6_geo.c

@@ -10,3 +10,10 @@
 #include "monty_mole/geo.inc.c"
 #include "ukiki/geo.inc.c"
 #include "fwoosh/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/monty_mole.inc.c"    // TODO
+#include "game/behaviors/ukiki.inc.c"
+
+#include "game/behaviors/ukiki_cage.inc.c"

actors/group7_geo.c

@@ -10,3 +10,14 @@
 #include "spindrift/geo.inc.c"
 #include "penguin/geo.inc.c"
 #include "snowman/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/spindrift.inc.c"
+#include "game/behaviors/sl_walking_penguin.inc.c"
+#include "game/behaviors/tuxie.inc.c"
+#include "game/behaviors/racing_penguin.inc.c"
+#include "game/behaviors/sl_snowman_wind.inc.c"
+#include "game/behaviors/snowman.inc.c"
+#include "game/behaviors/snow_mound.inc.c"
+#include "game/behaviors/mr_blizzard.inc.c"

actors/group8_geo.c

@@ -9,3 +9,8 @@
 
 #include "springboard/geo.inc.c"
 #include "capswitch/geo.inc.c"
+
+#include "game/farcall_helpers.h"
+
+#include "game/behaviors/capswitch.inc.c"
+#include "game/behaviors/beta_trampoline.inc.c"