thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-07-12 17:31:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

oop

Browse source 
add delay to bubble exit
TODO: solve extra life loss
This commit is contained in:
Cooliokid956 2026-06-04 02:48:33 -05:00
parent 82c6c9c487
commit d07818b6f1
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/game/mario.c
View file

@ -2207,7 +2207,6 @@ void init_single_mario(struct MarioState* m) {
u16 playerIndex = m->playerIndex;
struct SpawnInfo* spawnInfo = &gPlayerSpawnInfos[playerIndex];
unused80339F10 = 0;
m->freeze = 0;

1
src/game/mario.h
View file

@ -6,7 +6,6 @@
#include "macros.h"
#include "types.h"
extern u16 gLocalBubbleCounter;
struct WallCollisionData;
/* |description|

9
src/game/mario_actions_automatic.c
View file

@ -1064,7 +1064,7 @@ s32 act_bubbled(struct MarioState* m) {
s32 pitchToPlayer = obj_pitch_to_object(m->marioObj, target);
s32 distanceToPlayer = dist_between_objects(m->marioObj, target);
// trigger warp if all are bubbled
// trigger warp if all are bubbled long enough
if (m->playerIndex == 0) {
u8 allInBubble = TRUE;
for (s32 i = 0; i < MAX_PLAYERS; i++) {
@ -1076,9 +1076,10 @@ s32 act_bubbled(struct MarioState* m) {
}
}
if (allInBubble) {
level_trigger_warp(m, WARP_OP_DEATH);
return FALSE;
}
if (m->actionState++ == 60) {
level_trigger_warp(m, WARP_OP_DEATH);
}
} else { m->actionState = 0; }
}
// create bubble