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

2
src/core2/ch/badShad.c
View File

@@ -114,7 +114,7 @@ void func_802D71A0(s32 this, s32 arg1){
sp2C[0] = (s32) D_8037DE10[0];
sp2C[1] = (s32) D_8037DE10[1];
sp2C[2] = (s32) D_8037DE10[2];
sp3C = spawn_actor(0x108, sp2C, (s32)sp38->yaw);
sp3C = __actor_spawnWithYaw_s32(0x108, sp2C, (s32)sp38->yaw);
if(sp3C){
marker_getActor(marker)->unk104 = sp3C->marker;
sp3C->unk104 = marker;

4
src/core2/ch/beehive.c
View File

@@ -31,8 +31,8 @@ void chBeehive_die(ActorMarker *this, ActorMarker *other){
actor_playAnimationOnce(actor);
this->collidable = FALSE;
actor->unk138_27 = 3;
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
actor->marker->propPtr->unk8_3 = 0;
func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET);
func_803115C4(ASSET_DA6_TEXT_BEEHIVE_WITH_BEES);

2
src/core2/ch/bottlesbonus.c
View File

@@ -548,7 +548,7 @@ void chBottlesBonus_update(Actor *this) {
void __chBottlesBonus_spawn(void){
Actor *actor;
if(chBottlesBonusMarker == NULL){
actor = spawn_actor_f32(0x1E0, D_803682C4, 0);
actor = actor_spawnWithYaw_f32(0x1E0, D_803682C4, 0);
chBottlesBonusMarker = actor->marker;
chBottlesBonusCursor_spawn();
func_802DF270();

2
src/core2/ch/bottlesbonuscursor.c
View File

@@ -170,7 +170,7 @@ void chBottlesBonusCursor_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
}
ActorMarker *chBottlesBonusCursor_spawn(void){
Actor *this = spawn_actor_f32(0x2B4, D_80368400, 0);
Actor *this = actor_spawnWithYaw_f32(0x2B4, D_80368400, 0);
chBottlesBonusCursorMarker = this->marker;
return chBottlesBonusCursorMarker;
}

2
src/core2/ch/crab.c
View File

@@ -179,7 +179,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){
is_black_snippet = this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET;
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 32750, this->position, 950, 1900);
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 28000, this->position, 950, 1900);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
this->lifetime_value = 5.0f;
marker->collidable = FALSE;
this->unk138_27 = 1;

2
src/core2/ch/gameSelect.c
View File

@@ -287,7 +287,7 @@ void func_802C4BB4(ActorMarker *marker){
sp20 = marker->id - 0xe4;
this = marker_getActor(marker);
sp18 = this->scale;
other = spawn_actor_f32(sp20 + 0x198, this->position, (s32)this->yaw);
other = actor_spawnWithYaw_f32(sp20 + 0x198, this->position, (s32)this->yaw);
other->scale = sp18;
}

2
src/core2/ch/gloop.c
View File

@@ -38,7 +38,7 @@ void chgloop_spawnBubble(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
sp1C[0] = reinterpret_cast(f32, arg0);
sp1C[1] = reinterpret_cast(f32, arg1);
sp1C[2] = reinterpret_cast(f32, arg2);
spawn_actor_f32(ACTOR_E7_GLOOP_BUBBLE, sp1C, (s32)reinterpret_cast(f32, arg3));
actor_spawnWithYaw_f32(ACTOR_E7_GLOOP_BUBBLE, sp1C, (s32)reinterpret_cast(f32, arg3));
}
void chgloop_update(Actor *this){

6
src/core2/ch/icecube.c
View File

@@ -5,7 +5,7 @@
#define _HorzDist3v(v1, v2) ((v1[0]-v2[0])*(v1[0]-v2[0]) + (v1[2]-v2[2])*(v1[2]-v2[2]))
extern void func_802D729C(Actor *, f32);
extern f32 func_80257204(f32, f32, f32, f32);
extern Actor *func_802C937C(enum actor_e, f32[3]);
extern Actor *bundle_spawn_f32(enum actor_e, f32[3]);
void chicecube_update(Actor *this);
Actor *chicecube_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -201,8 +201,8 @@ void __chicecube_spawnHalfCubes(ActorMarker *marker){
sp54[2] = actor->position[2];
sp54[1] += 100.0f;
for(i = 0; i < 2; i++){//L8035A7FC
func_802C8F70((i & 1)? actor->yaw : actor->yaw + 180.0f);
other = func_802C937C(0x21, sp54);
bundle_setYaw((i & 1)? actor->yaw : actor->yaw + 180.0f);
other = bundle_spawn_f32(0x21, sp54);
other->unkF4_8 = 1; //don't spawn more
other->scale = randf2(0.5f, 0.6f)*actor->scale;
actor->yaw = randi2(0, 359);

6
src/core2/ch/jiggy.c
View File

@@ -13,7 +13,7 @@ typedef struct chjiggy_s{
u32 index;
} ActorLocal_Jiggy;
Actor *func_802C41D8(f32, f32, f32);
Actor *spawnQueue_actor_s32(f32, f32, f32);
void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3);
Actor *chjiggy_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3);
void func_802C7D98(Actor * arg0);
@@ -63,8 +63,8 @@ void func_802C7AB0(ActorMarker * arg0, u32 arg1){
}
void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3){
__spawnQueue_add_4((GenFunction_4)func_802C41D8, ACTOR_4C_STEAM, x, y, z);
__spawnQueue_add_4((GenFunction_4)func_802C41D8, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s32, ACTOR_4C_STEAM, x, y, z);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s32, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
mapSpecificFlags_set(arg3, 1);
}

2
src/core2/ch/overlaycopyright.c
View File

@@ -34,7 +34,7 @@ void chOverlayCopyright_update(Actor *this){
void __chOverlayCopyright_spawn(void) {
Actor *actor;
if (chOverlayCopyrightMarker == 0) {
actor = spawn_actor_f32(ACTOR_1DD_COPYRIGHT_OVERLAY, D_803680D0, 0);
actor = actor_spawnWithYaw_f32(ACTOR_1DD_COPYRIGHT_OVERLAY, D_803680D0, 0);
chOverlayCopyrightMarker = actor->marker;
}
}

4
src/core2/ch/overlaynocontroller.c
View File

@@ -5,7 +5,7 @@
#include <core1/viewport.h>
extern Actor *spawn_actor_f32(enum actor_e, f32[3], s32);
extern Actor *actor_spawnWithYaw_f32(enum actor_e, f32[3], s32);
extern void actor_postdrawMethod(ActorMarker *marker);
Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -76,7 +76,7 @@ void chOverlayNoController_update(Actor *this) {
void __chOverlayNoController_spawn(void){
if(chOverlayNoController_marker == NULL){
chOverlayNoController_marker = spawn_actor_f32(ACTOR_1DF_NO_CONTROLLER_OVERLAY, D_80368168, 0)->marker;
chOverlayNoController_marker = actor_spawnWithYaw_f32(ACTOR_1DF_NO_CONTROLLER_OVERLAY, D_80368168, 0)->marker;
}
}

4
src/core2/ch/overlaypressstart.c
View File

@@ -8,7 +8,7 @@
extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
extern void actor_predrawMethod(Actor *);
extern void actor_postdrawMethod(ActorMarker *);
extern Actor *spawn_actor_f32(enum actor_e id, f32[3], s32);
extern Actor *actor_spawnWithYaw_f32(enum actor_e id, f32[3], s32);
Actor *chOverlayPressStart_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -88,7 +88,7 @@ void chOverlayPressStart_update(Actor *this){
void __chOverlayPressStart_spawn(void){
if(D_8037DE80 == NULL){
D_8037DE80 = spawn_actor_f32(ACTOR_1DE_PRESS_START_OVERLAY, D_80368118, 0)->marker;
D_8037DE80 = actor_spawnWithYaw_f32(ACTOR_1DE_PRESS_START_OVERLAY, D_80368118, 0)->marker;
}
}

2
src/core2/ch/shrapnel.c
View File

@@ -50,7 +50,7 @@ void chShrapnel_func_802D0AB8(Actor *this) {
void chShrapnel_spawnExplodeActor(s32 arg0){
Actor *this = reinterpret_cast(Actor *, arg0);
spawn_actor_f32(0xF3, this->unk1C, 0);
actor_spawnWithYaw_f32(0xF3, this->unk1C, 0);
}
void chShrapnel_emitExplosion(Actor *this) {

2
src/core2/ch/snacker.c
View File

@@ -359,7 +359,7 @@ void chSnacker_spawn(void) {
}
}
snacker = spawn_actor_f32(ACTOR_68_SNACKER, spawn_position, 0);
snacker = actor_spawnWithYaw_f32(ACTOR_68_SNACKER, spawn_position, 0);
s_chSnacker_marker = snacker->marker;
local = (ChSnackerLocal *)&snacker->local;

2
src/core2/ch/soundsource.c
View File

@@ -110,7 +110,7 @@ void func_802D096C(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
sp1C[0] = reinterpret_cast(f32, arg0);
sp1C[1] = reinterpret_cast(f32, arg1);
sp1C[2] = reinterpret_cast(f32, arg2);
spawn_actor_f32(0x28B, sp1C, arg3);
actor_spawnWithYaw_f32(0x28B, sp1C, arg3);
}