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

Merge branch 'level-scripts' of github.com:sm64ex-coop-dev/sm64ex-coop into level-scripts

This commit is contained in:
MysterD 2022-04-08 00:54:44 -07:00
parent 6500173464 87c7deca7f
commit c1f88f2dff
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/behaviors/bully.inc.c
View File

@ -340,7 +340,11 @@ void bhv_big_bully_with_minions_init(void) {
void big_bully_spawn_star(void) { void big_bully_spawn_star(void) {
if (obj_lava_death() == 1) { if (obj_lava_death() == 1) {
spawn_mist_particles(); spawn_mist_particles();
<<<<<<< HEAD
f32* starPos = gStarPositions.BigBullyStarPos; f32* starPos = gStarPositions.BigBullyStarPos;
=======
f32* starPos = gStarPositions.BigBullyTrioStarPos;
>>>>>>> 5eb6122af28ea24721350109b0e0bf2affa0650a
spawn_default_star(starPos[0], starPos[1], starPos[2]); spawn_default_star(starPos[0], starPos[1], starPos[2]);
} }
} }