kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'mr-origin-84'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-26 19:28:18 -05:00
parent 6ce93c3cd2 2e10d1803c
commit 5fd7e7f3cc
83 changed files with 428 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/BGS/ch/code_8A60.c
View File

@@ -26,7 +26,7 @@ void func_8038EE50(void){
if(nodeProp_findPositionFromActorId(0x14d, sp24)){
jiggy_spawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2])
@@ -69,7 +69,7 @@ void func_8038F018(void){
if(nodeProp_findPositionFromActorId(0x1fc, sp24)){
jiggy_spawn(JIGGY_25_BGS_MAZE, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2])

8
src/BGS/ch/mudhut.c
View File

@@ -8,7 +8,7 @@ extern void player_stateTimer_set(enum state_timer_e, f32);
extern f32 player_stateTimer_get(enum state_timer_e);
void func_802C4218(u32,f32,f32,f32);
void spawnQueue_bundle_f32(u32,f32,f32,f32);
void subaddie_set_state(Actor *, u32);
/* local declarations */
@@ -61,8 +61,8 @@ void func_8038EB4C(ActorMarker *this){
Actor *thisActor;
thisActor = marker_getActor(this);
thisActor = spawn_actor_f32(ACTOR_D_WOOD_DEMOLISHED, thisActor->position, NULL);
thisActor = spawn_actor_f32(ACTOR_4D_STEAM_2, thisActor->position, NULL);
thisActor = actor_spawnWithYaw_f32(ACTOR_D_WOOD_DEMOLISHED, thisActor->position, NULL);
thisActor = actor_spawnWithYaw_f32(ACTOR_4D_STEAM_2, thisActor->position, NULL);
if(this);
}
@@ -105,7 +105,7 @@ void chmudhut_update(Actor *this){
}
__spawnQueue_add_1((GenFunction_1)func_8038EB4C, reinterpret_cast(s32, this->marker));
if(tmp < 5){
__spawnQueue_add_4((GenFunction_4)func_802C4218, D_80390B50[tmp],
__spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, D_80390B50[tmp],
reinterpret_cast(s32, diffPos[0]),
reinterpret_cast(s32, diffPos[1]),
reinterpret_cast(s32, diffPos[2])

4
src/BGS/ch/tanktup.c
View File

@@ -46,7 +46,7 @@ void func_8038F470(ActorMarker *this, s32 arg1, enum chtanktup_leg_e leg_id){
sp18[2] = thisActor->position_z;
sp18[1] += 50.0f;
leg = spawn_actor_f32(leg_id + ACTOR_E9_TANKTUP_LEG_FL, sp18, (s32)thisActor->yaw);
leg = actor_spawnWithYaw_f32(leg_id + ACTOR_E9_TANKTUP_LEG_FL, sp18, (s32)thisActor->yaw);
subaddie_set_state_with_direction(leg, arg1 + 1, 0, -1);
leg->unk10_12 = leg_id;
}
@@ -205,7 +205,7 @@ void func_8038F6A4(Actor *this)
{
f32 sp34[3];
func_8034A174(this->marker->unk44, 6, sp34);
func_802C8F70(this->yaw);
bundle_setYaw(this->yaw);
sp34[1] -= 125.0f;
jiggy_spawn(JIGGY_26_BGS_TANKTUP, sp34);
}

12
src/BGS/code_3420.c
View File

@@ -5,7 +5,7 @@
extern f32 func_80256AB4(f32, f32, f32, f32);
extern f32 func_8025715C(f32, f32);
extern f32 *chVile_getPostion(ActorMarker *);
extern void func_802C8F7C(f32);
extern void bundle_setRandomVelocity(f32);
extern void func_802FDCB8(s32);
enum chvilegame_piece_type_e {
@@ -140,7 +140,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
sp94[0] = vile->position[0] + sp7C[0];
sp94[1] = vile->position[1] + sp7C[1];
sp94[2] = vile->position[2] + sp7C[2];
func_802C8F70(vile->yaw);
bundle_setYaw(vile->yaw);
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
} else {
sp7C[0] = 0.0f - vile->position[0];
@@ -151,7 +151,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
sp94[0] = vile->position[0] + sp7C[0];
sp94[1] = vile->position[1] + sp7C[1];
sp94[2] = vile->position[2] + sp7C[2];
func_802C8F70(func_8025715C(sp7C[0], sp7C[2]));
bundle_setYaw(func_8025715C(sp7C[0], sp7C[2]));
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
}
}
@@ -302,9 +302,9 @@ void func_80389F08(ActorMarker *marker) {
}
for(i = 0; i < 3; i++){
if (var_s2 < 3) {
func_802C8F70(vile->yaw + (f32) (i * 30));
func_802C8F7C(2.0f);
func_802C937C(6, vile->position);
bundle_setYaw(vile->yaw + (f32) (i * 30));
bundle_setRandomVelocity(2.0f);
bundle_spawn_f32(6, vile->position);
var_s2 += 1;
} else {
item_inc(ITEM_16_LIFE);