thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-26 20:11:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

dynos behaviors: adding missing fields and small bug fix
Some checks failed
Build coop / build-linux (push) Has been cancelled
Details
Build coop / build-steamos (push) Has been cancelled
Details
Build coop / build-windows-opengl (push) Has been cancelled
Details
Build coop / build-windows-directx (push) Has been cancelled
Details
Build coop / build-macos-arm (push) Has been cancelled
Details
Build coop / build-macos-intel (push) Has been cancelled
Details

Browse source
This commit is contained in:
PeachyPeachSM64 2025-07-29 16:33:22 +02:00
parent e01e4f3dbc
commit f0a0a10544
2 changed files with 26 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
data/dynos_bin_behavior.cpp
View file

@ -874,6 +874,25 @@ s64 DynOS_Bhv_ParseBehaviorScriptConstants(const String &_Arg, bool *found) {
bhv_constant(oMacroUnk10C);
bhv_constant(oMacroUnk110);
/* Mario */
bhv_constant(oMarioParticleFlags);
bhv_constant(oMarioPoleUnk108);
bhv_constant(oMarioReadingSignDYaw);
bhv_constant(oMarioPoleYawVel);
bhv_constant(oMarioCannonObjectYaw);
bhv_constant(oMarioTornadoYawVel);
bhv_constant(oMarioReadingSignDPosX);
bhv_constant(oMarioPolePos);
bhv_constant(oMarioCannonInputYaw);
bhv_constant(oMarioTornadoPosY);
bhv_constant(oMarioReadingSignDPosZ);
bhv_constant(oMarioWhirlpoolPosY);
bhv_constant(oMarioJumboStarCutscenePosZ);
bhv_constant(oMarioBurnTimer);
bhv_constant(oMarioLongJumpIsSlow);
bhv_constant(oMarioSteepJumpYaw);
bhv_constant(oMarioWalkingPitch);
/* 1-UpHidden */
bhv_constant(o1UpHiddenUnkF4);
bhv_constant(o1UpForceSpawn);
@ -1912,6 +1931,11 @@ static BehaviorScript ParseBehaviorScriptSymbolArgInternal(GfxData *aGfxData, Da
u64 _ModelIdentifier = aNode->mModelIdentifier;
*found = true;
// Remove (de-)referencing
if (_Arg.Length() > 0 && (_Arg[0] == '&' || _Arg[0] == '*')) {
_Arg.Remove(0);
}
// Built-in functions
const void *_FunctionPtr = DynOS_Builtin_Func_GetFromName(_Arg.begin());
if (_FunctionPtr != NULL) {
@ -2107,6 +2131,7 @@ static void ParseBehaviorScriptSymbol(GfxData *aGfxData, DataNode<BehaviorScript
bhv_symbol_3(SET_INT_RAND_RSHIFT, 0, 0, 0);
bhv_symbol_3(SET_RANDOM_INT, 0, 0, 0);
bhv_symbol_3(SET_RANDOM_FLOAT, 0, 0, 0);
bhv_symbol_3(ADD_RANDOM_FLOAT, 0, 0, 0);
bhv_symbol_3(ADD_INT_RAND_RSHIFT, 0, 0, 0);
bhv_symbol_3(SUM_FLOAT, 0, 0, 0);

1
data/dynos_mgr_builtin.cpp
View file

@ -1358,6 +1358,7 @@ static const void* sDynosBuiltinAnims[] = {
define_builtin_ptr(dorrie_seg6_anims_0600F638),
define_builtin_ptr(scuttlebug_seg6_anims_06015064),
define_builtin_ptr(swoop_seg6_anims_060070D0),
define_builtin_ptr(castle_grounds_seg7_anims_flags),
};
const Animation *DynOS_Builtin_Anim_GetFromName(const char *aDataName) {