print_n_panic/Microtransactions64
0
0
Fork 0
mirror of https://github.com/Print-and-Panic/Microtransactions64.git synced 2026-01-21 10:17:19 -08:00
Code Issues Packages Projects Releases Wiki Activity

Dynamic collision fixes + actual OR_LONG (#648)

Browse Source 
* Dynamic collision fixes + actual OR_LONG

Dynamic collision will now check Mario´s vertical distance seperately, this is done to implement a check for when mario is above an object, in which case the collision distance is expanded by 2000 units to avoid shadows not appearing.
Or long works correctly now, replaces the behaviour command NOP_1.

* Micro optimzation

Avoids sqrtf by using the squared lateral distance and squaring the the collision distance for the comparison.

* Requested changes

* minor change

* Re ordering

* How
This commit is contained in:
Lilaa3
2023-06-29 23:25:54 +01:00
committed by GitHub
parent 4dc17a32a2
commit 7c32cf8b63
3 changed files with 56 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
data/behavior_data.c
View File

@@ -86,15 +86,15 @@ enum BehaviorCommands {
/*0x0F*/ BHV_CMD_ADD_INT,
/*0x10*/ BHV_CMD_SET_INT,
/*0x11*/ BHV_CMD_OR_INT,
/*0x12*/ BHV_CMD_BIT_CLEAR,
/*0x13*/ BHV_CMD_SET_INT_RAND_RSHIFT,
/*0x14*/ BHV_CMD_SET_RANDOM_FLOAT,
/*0x15*/ BHV_CMD_SET_RANDOM_INT,
/*0x16*/ BHV_CMD_ADD_RANDOM_FLOAT,
/*0x17*/ BHV_CMD_ADD_INT_RAND_RSHIFT,
/*0x18*/ BHV_CMD_NOP_1,
/*0x19*/ BHV_CMD_NOP_2,
/*0x1A*/ BHV_CMD_NOP_3,
/*0x12*/ BHV_CMD_OR_LONG,
/*0x13*/ BHV_CMD_BIT_CLEAR,
/*0x14*/ BHV_CMD_SET_INT_RAND_RSHIFT,
/*0x15*/ BHV_CMD_SET_RANDOM_FLOAT,
/*0x16*/ BHV_CMD_SET_RANDOM_INT,
/*0x17*/ BHV_CMD_ADD_RANDOM_FLOAT,
/*0x18*/ BHV_CMD_ADD_INT_RAND_RSHIFT,
/*0x19*/ BHV_CMD_NOP_1,
/*0x1A*/ BHV_CMD_NOP_2,
/*0x1B*/ BHV_CMD_SET_MODEL,
/*0x1C*/ BHV_CMD_SPAWN_CHILD,
/*0x1D*/ BHV_CMD_DEACTIVATE,
@@ -204,6 +204,12 @@ enum BehaviorCommands {
#define OR_INT(field, value) \
BC_BBH(BHV_CMD_OR_INT, field, value)
// Performs a bitwise OR with the specified field and the given (32 bit) integer.
// Usually used to set an object's flags which use values above 16 bits.
#define OR_LONG(field, value) \
BC_BB(BHV_CMD_OR_LONG, field), \
BC_W(value)
// Performs a bit clear with the specified short. Unused in favor of the 32-bit version.
#define BIT_CLEAR(field, value) \
BC_BBH(BHV_CMD_BIT_CLEAR, field, value)
@@ -243,10 +249,6 @@ enum BehaviorCommands {
#define CMD_NOP_2(field) \
BC_BB(BHV_CMD_NOP_2, field)
// No operation. Unused.
#define CMD_NOP_3(field) \
BC_BB(BHV_CMD_NOP_3, field)
// Sets the current model ID of the object.
#define SET_MODEL(modelID) \
BC_B0H(BHV_CMD_SET_MODEL, modelID)
@@ -300,8 +302,6 @@ enum BehaviorCommands {
#define BEGIN_REPEAT_UNUSED(count) \
BC_BB(BHV_CMD_BEGIN_REPEAT_UNUSED, count)
#define OR_LONG(field, value) LOAD_ANIMATIONS(field, value)
// Loads the animations for the object. <field> is always set to oAnimations.
#define LOAD_ANIMATIONS(field, anims) \
BC_BB(BHV_CMD_LOAD_ANIMATIONS, field), \