Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Force hidden 1up triggers to be invisible and E_MODEL_NONE

This commit is contained in:
MysterD 2023-10-26 16:53:50 -07:00
parent 52727ee4bb
commit f05c147d92
3 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/behavior_data.c
View File

@ -4984,6 +4984,7 @@ const BehaviorScript bhvHidden1upTrigger[] = {
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
SET_HITBOX(/*Radius*/ 100, /*Height*/ 100), SET_HITBOX(/*Radius*/ 100, /*Height*/ 100),
SET_INT(oIntangibleTimer, 0), SET_INT(oIntangibleTimer, 0),
CALL_NATIVE(bhv_1up_trigger_init),
BEGIN_LOOP(), BEGIN_LOOP(),
CALL_NATIVE(bhv_1up_hidden_trigger_loop), CALL_NATIVE(bhv_1up_hidden_trigger_loop),
END_LOOP(), END_LOOP(),
@ -5009,6 +5010,7 @@ const BehaviorScript bhvHidden1upInPoleTrigger[] = {
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
SET_HITBOX(/*Radius*/ 100, /*Height*/ 100), SET_HITBOX(/*Radius*/ 100, /*Height*/ 100),
SET_INT(oIntangibleTimer, 0), SET_INT(oIntangibleTimer, 0),
CALL_NATIVE(bhv_1up_trigger_init),
BEGIN_LOOP(), BEGIN_LOOP(),
CALL_NATIVE(bhv_1up_hidden_in_pole_trigger_loop), CALL_NATIVE(bhv_1up_hidden_in_pole_trigger_loop),
END_LOOP(), END_LOOP(),
@ -5018,6 +5020,7 @@ const BehaviorScript bhvHidden1upInPoleSpawner[] = {
BEGIN(OBJ_LIST_LEVEL), BEGIN(OBJ_LIST_LEVEL),
ID(id_bhvHidden1upInPoleSpawner), ID(id_bhvHidden1upInPoleSpawner),
OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE), OR_INT(oFlags, OBJ_FLAG_UPDATE_GFX_POS_AND_ANGLE),
CALL_NATIVE(bhv_1up_trigger_init),
BEGIN_LOOP(), BEGIN_LOOP(),
CALL_NATIVE(bhv_1up_hidden_in_pole_spawner_loop), CALL_NATIVE(bhv_1up_hidden_in_pole_spawner_loop),
END_LOOP(), END_LOOP(),

1
src/game/behavior_actions.h
View File

@ -409,6 +409,7 @@ void bhv_hidden_star_trigger_loop(void);
void bhv_ttm_rolling_log_init(void); void bhv_ttm_rolling_log_init(void);
void bhv_rolling_log_loop(void); void bhv_rolling_log_loop(void);
void bhv_lll_rolling_log_init(void); void bhv_lll_rolling_log_init(void);
void bhv_1up_trigger_init(void);
void bhv_1up_common_init(void); void bhv_1up_common_init(void);
void bhv_1up_walking_loop(void); void bhv_1up_walking_loop(void);
void bhv_1up_running_away_loop(void); void bhv_1up_running_away_loop(void);

5
src/game/behaviors/mushroom_1up.inc.c
View File

@ -19,6 +19,11 @@ void bhv_1up_interact(void) {
} }
} }
void bhv_1up_trigger_init(void) {
obj_set_model_extended(o, E_MODEL_NONE);
cur_obj_hide();
}
void bhv_1up_common_init(void) { void bhv_1up_common_init(void) {
o->oMoveAnglePitch = -0x4000; o->oMoveAnglePitch = -0x4000;
o->oGravity = 3.0f; o->oGravity = 3.0f;