From 7666a8f9eb21cbb38efac9eb94e9c78adc2d424e Mon Sep 17 00:00:00 2001 From: PeachyPeachSM64 <72323920+PeachyPeachSM64@users.noreply.github.com> Date: Fri, 10 Apr 2026 01:16:03 +0200 Subject: [PATCH] Revert "Re-add my own coop cafe pipe model rendition :)" This reverts commit e22d85b1193a1469d8c17c39989dea0e59b53895. Lack of PR. Built-in DynOS packs have barely any utility in the coopdx build, specifically if it's private jokes/references. Coop Cafe is a private community associated with coopdx, not a core part of it. This pack should be distributed as a separate mod instead. --- data/dynos_mgr_builtin.cpp | 1 - dynos/packs/Coop Cafe Pipe/warp_pipe_geo.bin | Bin 20997 -> 0 bytes src/game/object_helpers.c | 15 --------------- src/game/object_helpers.h | 1 - 4 files changed, 17 deletions(-) delete mode 100644 dynos/packs/Coop Cafe Pipe/warp_pipe_geo.bin diff --git a/data/dynos_mgr_builtin.cpp b/data/dynos_mgr_builtin.cpp index f5ecde10e..b750cd060 100644 --- a/data/dynos_mgr_builtin.cpp +++ b/data/dynos_mgr_builtin.cpp @@ -2037,7 +2037,6 @@ static const DynosBuiltinFunction sDynosBuiltinFuncs[] = { define_builtin_function(bhv_ambient_light_update, FUNCTION_BHV), define_builtin_function(bhv_point_light_init, FUNCTION_BHV), define_builtin_function(bhv_point_light_loop, FUNCTION_BHV), - define_builtin_function(geo_switch_character_type_ext, FUNCTION_GEO), }; static const char *sDynosBuiltinFuncTypeNames[] = { diff --git a/dynos/packs/Coop Cafe Pipe/warp_pipe_geo.bin b/dynos/packs/Coop Cafe Pipe/warp_pipe_geo.bin deleted file mode 100644 index 6e88dc161cced9be2037380504f4990e3b6650eb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 20997 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 EA>R5y?*IS* diff --git a/src/game/object_helpers.c b/src/game/object_helpers.c index f48aa1f43..ff35fe280 100644 --- a/src/game/object_helpers.c +++ b/src/game/object_helpers.c @@ -187,21 +187,6 @@ Gfx *geo_switch_anim_state(s32 callContext, struct GraphNode *node) { return NULL; } -Gfx *geo_switch_character_type_ext(s32 callContext, struct GraphNode *node, UNUSED void *context) { - struct GraphNodeSwitchCase *switchCase; - - if (callContext == GEO_CONTEXT_RENDER) { - // move to a local var because GraphNodes are passed in all geo functions. - // cast the pointer. - switchCase = (struct GraphNodeSwitchCase *) node; - - // assign the case number for execution. - switchCase->selectedCase = gMarioState->character->type; - } - - return NULL; -} - s16 gRoomOverride = -1; /* |description|Overrides the current room Mario is in. Set to -1 to reset override|descriptionEnd| */ diff --git a/src/game/object_helpers.h b/src/game/object_helpers.h index 9e8ef665c..d004ecbeb 100644 --- a/src/game/object_helpers.h +++ b/src/game/object_helpers.h @@ -71,7 +71,6 @@ Gfx *geo_switch_area(s32 callContext, struct GraphNode *node, UNUSED void *conte Gfx *geo_switch_anim_state(s32 callContext, struct GraphNode *node); Gfx *geo_switch_area(s32 callContext, struct GraphNode *node); #endif -Gfx *geo_switch_character_type_ext(s32 callContext, struct GraphNode *node, UNUSED void *context); Gfx *geo_choose_area_ext(s32 callContext, UNUSED struct GraphNode *node, Mat4 mtx); void obj_update_pos_from_parent_transformation(Mat4 a0, struct Object *a1); void obj_apply_scale_to_matrix(struct Object *obj, VEC_OUT Mat4 dst, Mat4 src);