Game-Decompilation/banjo-kazooie
1
0
Fork 0
mirror of https://github.com/n64decomp/banjo-kazooie.git synced 2025-02-10 23:09:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

correct RBB warnings

Browse Source
This commit is contained in:
Banjo Kazooie 2024-11-03 14:07:56 -06:00
parent 23b8510eb4
commit e8be0b8651
25 changed files with 149 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/core2/lighting.h
View File

@ -16,4 +16,4 @@ typedef struct {
void lighting_free();
void lighting_init();
#endif
#endif

10
src/CC/code_530.c
View File

@ -51,7 +51,7 @@ void CC_func_80386920(Actor *this, s32 next_state){
if(next_state == 2 || next_state == 4){
func_8025A6EC(COMUSIC_2B_DING_B, 0x7fff);
player_getPosition(&sp28);
player_getPosition(sp28);
TUPLE_COPY(sp20, sp28);
fxSparkle_giantGoldFeather(&sp20);
}
@ -68,7 +68,7 @@ void CC_func_80386920(Actor *this, s32 next_state){
}
void func_80386AD0(ActorMarker *arg0, s32 arg1) {
void func_80386AD0(ActorMarker *arg0, ActorMarker *arg1) {
Actor *actor = marker_getActor(arg0);
ActorLocal_CC_530 *local = (ActorLocal_CC_530 *)&actor->local;
local-> unk1 = 1;
@ -99,7 +99,7 @@ void func_80386B28(Actor *this){
local->unk2 = 0;
local->unk10 = this->pitch;
local->unk14 = 0.0f;
player_getPosition(&local->unk4);
player_getPosition(local->unk4);
local->unk3 = 3;
marker->actorFreeFunc = func_80386AF8;
marker->propPtr->unk8_3 = 1;
@ -115,12 +115,12 @@ void func_80386B28(Actor *this){
}
else{//L80386C40
local->unk14 += tick;
player_getPosition(&sp58);
player_getPosition(sp58);
if(local->unk1 && ! local->unk2){
sp38[0] = 0.0f;
sp38[1] = 0.0f;
sp38[2] = -200.0f;
ml_vec3f_pitch_rotate_copy(&sp38, &sp38, this->pitch);
ml_vec3f_pitch_rotate_copy(sp38, sp38, this->pitch);
sp44[0] = local->unk4[0] - D_80389AF4[0];
sp44[1] = local->unk4[1] - D_80389AF4[1];

6
src/CC/code_BF0.c
View File

@ -87,7 +87,7 @@ void func_803870F8(Actor *this){
CC_func_80386FE0(this, 3);
}
}//L803871D8
player_getPosition(&sp70);
player_getPosition(sp70);
local->unk8 += sp68;
if(this->state == 2){
temp_f2 = local->unk8/1;
@ -113,7 +113,7 @@ void func_803870F8(Actor *this){
TUPLE_COPY(this->position, sp5C);
if(this->state == 1)
func_8028E668(&this->position, 290.0f, -10.0f, 150.0f);
func_8028E668(this->position, 290.0f, -10.0f, 150.0f);
if(this->state == 1 && D_80389F80 == local->unk0){
D_80389F80 = 0;
@ -136,7 +136,7 @@ void func_803870F8(Actor *this){
sp3C[0] = this->position_x;
sp3C[1] = this->position_y + 100;
sp3C[2] = this->position_z;
if(ml_vec3f_distance(&sp3C, &sp70) < 120.0f){
if(ml_vec3f_distance(sp3C, sp70) < 120.0f){
func_8031D04C(MAP_22_CC_INSIDE_CLANKER, (local->unk0 == 1)? 7 : 6);
}
}//L80387500

4
src/RBB/ch/anchorctrl.c
View File

@ -27,11 +27,11 @@ void func_8038C058(void){
func_8030E760(SFX_7F_HEAVYDOOR_SLAM, 1.0f, 0x55f0);
}
void __chAnchorCtrl_spawnJiggy(ActorMarker *marker, s32 arg1, s32 arg2){
void __chAnchorCtrl_spawnJiggy(ActorMarker *marker, enum asset_e id, s32 arg2){
static f32 D_80390B34[3] = {-5100.0f, -2550.0f, 1470.0f};
Actor *actor = marker_getActor(marker);
jiggy_spawn(JIGGY_53_RBB_SNORKEL, &D_80390B34);
jiggy_spawn(JIGGY_53_RBB_SNORKEL, D_80390B34);
timed_setStaticCameraToNode(0.5f, 0xb);
__chAnchorCtrl_setState(actor, 3);
}

52
src/RBB/ch/boombox.c
View File

@ -23,7 +23,7 @@ typedef struct {
}ActorLocal_RBB_8520;
void func_8038F190(Actor *this, s32 arg1);
Actor *func_8038F4B0(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3);
Actor *func_8038F4B0(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3);
void func_8038F618(Actor *this);
@ -44,7 +44,7 @@ ActorInfo D_80390DAC = {
s32 RBB_D_80390DD0[3] = {0xDE, 0xA7, 0x71};
s32 D_80390DDC[4] = {0xFF, 0xFF, 0xFF, 0xFF};
s32 D_80390DEC[4] = {0,0,0,0};
f32 D_80390DEC[4] = {0.0f, 0.0f , 0.0f, 0.0f};
/* .bss */
f32 D_803912A0[3];
@ -114,7 +114,7 @@ void func_8038EC14(Actor *this){
particleEmitter_setFinalScaleRange(other, 2.0f, 3.0f);
particleEmitter_setSpawnPositionRange(other, -75.0f, 25.0f, -75.0f, 75.0f, 75.0f, 75.0f);
particleEmitter_setParticleVelocityRange(other, -70.0f, 50.0f, -70.0f, 70.0f, 100.0f, 70.0f);
particleEmitter_setRGB(other, &RBB_D_80390DD0);
particleEmitter_setRGB(other, RBB_D_80390DD0);
particleEmitter_setParticleLifeTimeRange(other, 3.0f, 4.0f);
particleEmitter_emitN(other, 6);
}
@ -152,7 +152,7 @@ int func_8038EE90(Actor *this){
return func_803342AC(&sp2C, &sp20, 100.0f);
}
int func_8038EF08(Actor *this, f32 (*position)[3], f32 arg2){
int func_8038EF08(Actor *this, f32 position[3], f32 arg2){
f32 sp54[3];
int sp50;
ActorLocal_RBB_8520 *local = (ActorLocal_RBB_8520 *)&this->local;
@ -161,17 +161,17 @@ int func_8038EF08(Actor *this, f32 (*position)[3], f32 arg2){
f32 sp30[3];
sp54[0] = (*position)[0] - this->position_x;
sp54[1] = (*position)[1] - this->position_y;
sp54[2] = (*position)[2] - this->position_z;
sp54[0] = position[0] - this->position_x;
sp54[1] = position[1] - this->position_y;
sp54[2] = position[2] - this->position_z;
if(180.0 < LENGTH_VEC3F(sp54))
ml_vec3f_set_length(&sp54, 150.0f);
ml_vec3f_set_length(sp54, 150.0f);
local->unk20[0] = sp54[0] + this->position_x;
local->unk20[1] = sp54[1] + this->position_y;
local->unk20[2] = sp54[2] + this->position_z;
local->unk20[1] = mapModel_getFloorY(&local->unk20);
local->unk20[1] = mapModel_getFloorY(local->unk20);
sp40[0] = local->unk20[0];
sp40[1] = local->unk20[1] + this->scale*100.0f;
@ -210,10 +210,10 @@ int func_8038EF08(Actor *this, f32 (*position)[3], f32 arg2){
}
void func_8038F190(Actor *this, s32 arg1){
f32 sp44[3];
f32 player_position[3];
ActorLocal_RBB_8520 *local = (ActorLocal_RBB_8520 *)&this->local;
player_getPosition(&sp44);
player_getPosition(player_position);
if(local->unk34){
func_803343F8(local->unk34);
@ -227,25 +227,25 @@ void func_8038F190(Actor *this, s32 arg1){
if(arg1 == 2){
int sp3C = 0;
if(func_80329210(this, &sp44)){
if(func_80329210(this, &player_position)){
local->unk4 += 0.3;
if(*local->unk0 < local->unk4)
local->unk4 = *local->unk0;
sp3C = func_8038EF08(this, &sp44, local->unk4);
sp3C = func_8038EF08(this, player_position, local->unk4);
}//L8038F28C
if(!sp3C){
func_8038E920(this);
local->unk4 -= 0.5;
if(local->unk4 < 0.5)
local->unk4 = 0.5f;
func_8038EF08(this, &local->unk8, local->unk4);
func_8038EF08(this, local->unk8, local->unk4);
}
}//L8038F2FC
if(arg1 == 3){
func_8038FB6C();
actor_collisionOff(this);
func_80324D54(0.0f, SFX_1B_EXPLOSION_1, 1.0f, 0x7d00, &this->position, 1000.0f, 2000.0f);
func_80324D54(0.0f, SFX_1B_EXPLOSION_1, 1.0f, 0x7d00, this->position, 1000.0f, 2000.0f);
skeletalAnim_set(this->unk148, ASSET_148_ANIM_BOOMBOX_DIE, 0.2f, 1.0f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
func_8038EAB4(this);
@ -262,26 +262,26 @@ void func_8038F190(Actor *this, s32 arg1){
}
void func_8038F3F0(ActorMarker *marker, s32 arg1){
void func_8038F3F0(ActorMarker *marker, ActorMarker *arg1){
Actor* actor = marker_getActor(marker);
if(actor->state < 3){
func_8038F190(actor, 3);
}
}
void func_8038F430(ActorMarker *marker, s32 arg1){
void func_8038F430(ActorMarker *marker, ActorMarker *arg1){
Actor* actor = marker_getActor(marker);
f32 sp18[3];
if(actor->state < 3){
player_getPosition(&sp18);
if(ml_vec3f_distance(&actor->position, &sp18) < 300.0f)
player_getPosition(sp18);
if(ml_vec3f_distance(actor->position, sp18) < 300.0f)
func_8028F55C(5, actor->marker);
func_8038F190(actor, 3);
}//L8038F4A4
}
Actor * func_8038F4B0(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
Actor * func_8038F4B0(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor *actor;
ActorLocal_RBB_8520 *local;
s32 sp28[4];
@ -306,7 +306,7 @@ Actor * func_8038F4B0(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
D_803912A0[0] = actor->pitch;
D_803912A0[1] = actor->yaw;
D_803912A0[2] = actor->roll;
modelRender_setPrimAndEnvColors(sp28, &D_80390DDC);
modelRender_setPrimAndEnvColors(sp28, D_80390DDC);
}//L8038F5F8
return actor_draw(marker, gdl, mptr, arg3);
}
@ -335,7 +335,7 @@ void func_8038F618(Actor *this){
local->unk38 = 0;
local->unk39 = 0;
local->unk0 = &D_80390D80[(this->modelCacheIndex == 0x30d)? 1 : 0];
local->unk2C = mapModel_getFloorY(&this->position);
local->unk2C = mapModel_getFloorY(this->position);
local->unk34 = 0;
local->unk4 = 0.5f;
local->unk30 = 0.0f;
@ -352,7 +352,7 @@ void func_8038F618(Actor *this){
}
func_8038E92C(this);
if(this->state == 1){
if(sp78 && ml_vec3f_distance(&this->position, &sp7C) < 500.0f){
if(sp78 && ml_vec3f_distance(this->position, sp7C) < 500.0f){
func_8038F190(this, 2);
}
}//L8038F7A0
@ -371,7 +371,7 @@ void func_8038F618(Actor *this){
skeletalAnim_getProgressRange(this->unk148, &sp6C, &sp68);
if(0.1 <= sp68 && sp68 <= 0.6)
ml_vec3f_interpolate_fast(this->position, &local->unk14, &local->unk20, (sp68 - 0.1) /0.5 );
ml_vec3f_interpolate_fast(this->position, local->unk14, local->unk20, (sp68 - 0.1) /0.5 );
if(sp6C < 0.6 && 0.6 <= sp68)
func_8030E878(SFX_6C_LOCKUP_CLOSING, 1.1 + randf2(-0.05f, 0.05f), 20000, this->position, 500.0f, 1000.0f);
@ -382,11 +382,11 @@ void func_8038F618(Actor *this){
sp50[1] = local->unk20[1] - local->unk14[1];
sp50[2] = local->unk20[2] - local->unk14[2];
func_80258A4C(&D_80390DEC,this->yaw - 90.0f, &sp50, &sp4C, &sp48, &sp44);
func_80258A4C(D_80390DEC, this->yaw - 90.0f, sp50, &sp4C, &sp48, &sp44);
this->yaw += (sp44*400.0f)*sp70;
if(skeletalAnim_getLoopCount(this->unk148) > 0){
if(ml_vec3f_distance(&this->position, &local->unk8) < 10.0f){
if(ml_vec3f_distance(this->position, local->unk8) < 10.0f){
func_8038F190(this, 1);
}else{
func_8038F190(this, 2);

30
src/RBB/ch/bossboombox.c
View File

@ -35,7 +35,7 @@ typedef struct{
void RBB_func_8038CC9C(Actor *this, s32 new_state);
void func_8038D7E8(ActorMarker *marker, s32 arg1);
Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3);
Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, Vtx **arg3);
void func_8038D8BC(Actor *this);
/* .data */
@ -136,7 +136,7 @@ void RBB_func_8038C538(Actor *this){
-70.0f, 50.0f, -70.0f,
70.0f, 100.0f, 70.0f
);
particleEmitter_setRGB(other, &D_80390C60);
particleEmitter_setRGB(other, D_80390C60);
particleEmitter_setParticleLifeTimeRange(other, 3.0f, 4.0f);
particleEmitter_emitN(other, 3*local->unk0->unkE);
@ -173,7 +173,7 @@ void func_8038C8A8(Actor * this){
f32 sp24[3];
player_getPosition(&sp24);
player_getPosition(sp24);
sp24[1] += 50.0f;
particleEmitter_setSprite(other, ASSET_70E_SPRITE_SMOKE_2);
@ -185,7 +185,7 @@ void func_8038C8A8(Actor * this){
particleEmitter_setFinalScaleRange(other, local->unk0->unk4*3.0f, local->unk0->unk4*6.0f);
particleEmitter_setVelocityAccelerationAndPositionRanges(other, &D_80390CA8);
particleEmitter_setParticleLifeTimeRange(other, 1.0f, 2.0f);
particleEmitter_setRGB(other, &D_80390C9C);
particleEmitter_setRGB(other, D_80390C9C);
particleEmitter_emitN(other, 5);
}
@ -197,7 +197,7 @@ void chbossboombox_respawnJiggy(s32 position_x, s32 position_y, s32 position_z){
D_80391288[0] = (f32)position_x;
D_80391288[1] = (f32)(position_y + 0x28);
D_80391288[2] = (f32)position_z;
jiggy_spawn(JIGGY_56_RBB_BOSS_BOOM_BOX, &D_80391288);
jiggy_spawn(JIGGY_56_RBB_BOSS_BOOM_BOX, D_80391288);
}
void func_8038CA70(Actor *this, f32(*arg1)[3]){
@ -220,15 +220,15 @@ void func_8038CA70(Actor *this, f32(*arg1)[3]){
}
void func_8038CB34(ActorMarker *marker, s32 arg1, s32 arg2){
void func_8038CB34(ActorMarker *marker, enum asset_e arg1, s32 arg2){
comusic_8025AB44(COMUSIC_62_RBB_BOOMBOX, -1, 0x12C);
}
void func_8038CB68(ActorMarker *marker, s32 arg1, s32 arg2){
void func_8038CB68(ActorMarker *marker, enum asset_e arg1, s32 arg2){
Actor *actor = marker_getActor(marker);
timed_exitStaticCamera(0.0f);
func_80324E38(0.0f, 0);
timedFunc_set_2(0.0f, (GenFunction_2)RBB_func_8038C370, actor->marker, 3);
timedFunc_set_2(0.0f, (GenFunction_2)RBB_func_8038C370, (s32)actor->marker, 3);
}
void chbossboombox_hideJiggy(void){
@ -270,7 +270,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
player_getPosition(&sp8C);
player_getPosition(sp8C);
sp8C[1] = 0.0f;
@ -327,7 +327,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
}//L8038CF60
if(this->state == 3 || this->state == 4){
func_8030E878(0x3f2, local->unk0->unk14, 0x6d60, &this->position, 500.0f, 1000.0f);
func_8030E878(0x3f2, local->unk0->unk14, 0x6d60, this->position, 500.0f, 1000.0f);
skeletalAnim_set(this->unk148, ASSET_147_ANIM_BOOMBOX_MOVE, 0.2f, (1.0/(local->unk0->unk8)*randf2(1.0f, 1.1f)));
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_2_ONCE);
ml_vec3f_set_length(sp80, (this->state == 4)? -0x32*(2 + func_80326218()) : 300.0f/local->unk0->unk8);
@ -421,7 +421,7 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
}//L8038D4DC
if(this->state == 3){
func_80258A4C(&this->position, this->yaw - 90.0f, &sp8C, &sp60, &sp5C, &sp58);
func_80258A4C(this->position, this->yaw - 90.0f, sp8C, &sp60, &sp5C, &sp58);
if(0.7 < sp58)
local->unk28 += 90.0f;
else if(sp58 < -0.7){
@ -430,12 +430,12 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
}
}
void func_8038D590(ActorMarker *marker, s32 arg1){
void func_8038D590(ActorMarker *marker, ActorMarker *arg1){
Actor *actor = marker_getActor(marker);
RBB_func_8038CC9C(actor, 4);
}
void func_8038D5BC(ActorMarker *marker, s32 arg1){
void func_8038D5BC(ActorMarker *marker, ActorMarker *arg1){
Actor *actor = marker_getActor(marker);
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &actor->local;
@ -448,9 +448,9 @@ void func_8038D608(ActorMarker *marker, ActorMarker *other){
func_8038D7E8(marker, other->id == 1);
}
Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, s32 arg3){
Actor *func_8038D638(ActorMarker *marker, Gfx **gdl, Mtx ** mptr, Vtx **arg3){
f32 sp3C[3];
Actor *actor = marker_getActorAndRotation(marker, &sp3C);
Actor *actor = marker_getActorAndRotation(marker, sp3C);
ActorLocal_RBB_5F80 *local = (ActorLocal_RBB_5F80 *) &actor->local;
func_8033A45C(1, local->unk0->unkD);
if(local->unk0->unkD == 1){

4
src/RBB/ch/cog.c
View File

@ -53,7 +53,7 @@ void func_80388C20(Actor *this){
if(this->modelCacheIndex == 0x17B){
local->sfxsourceIdx = sfxsource_createSfxsourceAndReturnIndex();
sfxsource_set_fade_distances(local->sfxsourceIdx, 1000.0f, 2000.0f);
sfxsource_set_position(local->sfxsourceIdx, &this->position);
sfxsource_set_position(local->sfxsourceIdx, this->position);
sfxsource_playSfxAtVolume(local->sfxsourceIdx, 0.5f);
sfxsource_setSfxId(local->sfxsourceIdx, SFX_9F_GENERATOR_RUNNING);
func_8030DD14(local->sfxsourceIdx, 3);
@ -78,7 +78,7 @@ void func_80388C20(Actor *this){
if(360.0f <= this->roll)
this->roll -= 360.0f;
if(this->modelCacheIndex == 0x17B){
func_8030DB04(local->sfxsourceIdx, 25000, &this->position, 1000.0f, 2000.0f);
func_8030DB04(local->sfxsourceIdx, 25000, this->position, 1000.0f, 2000.0f);
}
}
}

4
src/RBB/ch/dolphin.c
View File

@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern s32 func_802EDD8C(f32 (*)[3], f32, f32);
ParticleEmitter *func_802EDD8C(f32 [3], f32, f32);
void func_8038B900(Actor *this);
@ -53,7 +53,7 @@ void func_8038B900(Actor *this){
)
){//L8038BB24
func_8034A174(this->marker->unk44, 5, sp48);
other = func_802EDD8C(&sp48, 0.0f, -1300.0f);
other = func_802EDD8C(sp48, 0.0f, -1300.0f);
particleEmitter_setStartingScaleRange(other, 0.04f, 0.04f);
particleEmitter_setFinalScaleRange(other, 0.18f, 0.18f);
particleEmitter_setSpawnPositionRange(other, -10.0f, 0.0f, -10.0f, 10.0f, 20.0f, 10.0f);

8
src/RBB/ch/eggtoll1.c
View File

@ -76,11 +76,11 @@ void RBB_func_803863F0(Actor *actor, s32 arg1){
}
if(arg1){
func_8034DDF0(temp_a0, &sp3C, &sp30, D_80390074[local->unk4].unk4, 1);
func_8034DDF0(temp_a0, sp3C, sp30, D_80390074[local->unk4].unk4, 1);
func_8034E174(temp_a0);
}
else{
func_8034DDF0(temp_a0, &sp3C, &sp30, 0.0f, 1);
func_8034DDF0(temp_a0, sp3C, sp30, 0.0f, 1);
}
}
}
@ -94,7 +94,7 @@ void func_803865D0(ActorMarker *marker){
ActorLocal_RBB_0 * local = (ActorLocal_RBB_0 *) &actor->local;
RBB_func_803863F0(actor, 1);
timed_setStaticCameraToNode(0.0f, D_80390074[local->unk4].unk0);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (GenFunction_2) func_803865A4, actor->marker, 4);
timedFunc_set_2(0.75*D_80390074[local->unk4].unk4, (GenFunction_2) func_803865A4, (s32)actor->marker, 4);
timed_exitStaticCamera(0.75*D_80390074[local->unk4].unk4);
func_80324E38(0.75*D_80390074[local->unk4].unk4, 0);
timed_playSfx(D_80390074[local->unk4].unk4, SFX_7F_HEAVYDOOR_SLAM, 0.8f, 0x7fd0);
@ -114,7 +114,7 @@ void func_803866F4(Actor *this, s32 arg1){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
func_80324E38(0.0f, 3);
timedFunc_set_2(0.5f, (GenFunction_2) func_8025A6EC, COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
timedFunc_set_1(1.0f, (GenFunction_1) func_803865D0, this->marker);
timedFunc_set_1(1.0f, (GenFunction_1) func_803865D0, (s32)this->marker);
}//L803867D4
if(arg1 == 4){
if(local->unk8 == 1 && D_80390074[local->unk4].unk2 > 0){

18
src/RBB/ch/enginefan.c
View File

@ -94,25 +94,25 @@ void func_803892D8(Actor *this, s32 arg1){
local->unk0[2] = 0.0f;
local->unk0[1] = 0.0f;
local->unk0[0] = 0.0f;
ml_vec3f_copy(&local->unk10, &local->unkC->unk1C);
ml_vec3f_copy(&local->unk1C, &local->unkC->unk1C);
ml_vec3f_copy(local->unk10, local->unkC->unk1C);
ml_vec3f_copy(local->unk1C, local->unkC->unk1C);
}//L8038935C
if(this->state == 2){
ml_vec3f_copy(&local->unk0, &local->unkC->unk28);
ml_vec3f_copy(&local->unk1C, &local->unkC->unk10);
ml_vec3f_copy(local->unk0, local->unkC->unk28);
ml_vec3f_copy(local->unk1C, local->unkC->unk10);
local->unk28 = local->unkC->unk40;
}//L803893A8
if(this->state == 3){
ml_vec3f_copy(&local->unk0, &local->unkC->unk28);
ml_vec3f_copy(&local->unk1C, &local->unkC->unk1C);
ml_vec3f_copy(local->unk0, local->unkC->unk28);
ml_vec3f_copy(local->unk1C, local->unkC->unk1C);
local->unk28 = local->unkC->unk40;
}//L803893F4
if(this->state == 4){
ml_vec3f_copy(&local->unk0, &local->unkC->unk34);
ml_vec3f_copy(&local->unk10, &local->unkC->unk1C);
ml_vec3f_copy(local->unk0, local->unkC->unk34);
ml_vec3f_copy(local->unk10, local->unkC->unk1C);
local->unk1C[2] = 0.0f;
local->unk1C[1] = 0.0f;
local->unk1C[0] = 0.0f;
@ -133,7 +133,7 @@ void func_8038944C(Actor *this){
this->volatile_initialized = TRUE;
local->unkC = func_80389280(this);
if(this->state == 0){
ml_vec3f_copy(&this->position, &local->unkC->unk4);
ml_vec3f_copy(this->position, local->unkC->unk4);
local->unk0[0] = local->unk0[1] = local->unk0[2] = 0.0f;
local->unk10[0] = local->unk10[1] = local->unk10[2] = 0.0f;
local->unk1C[0] = local->unk1C[1] = local->unk1C[2] = 0.0f;

2
src/RBB/ch/enginefanswitch.c
View File

@ -29,7 +29,7 @@ void chEngineFanSwitch_setState(Actor * this, s32 arg1){
}
}
void __chEngineFanSwitch_pressCallback(ActorMarker *marker, s32 arg1){
void __chEngineFanSwitch_pressCallback(ActorMarker *marker, ActorMarker *arg1){
Actor *actor = marker_getActor(marker);
if(actor->state == 1){
chEngineFanSwitch_setState(actor, 2);

2
src/RBB/ch/grimlet.c
View File

@ -46,7 +46,7 @@ void RBB_func_80388430(ActorMarker * marker, ActorMarker *other_marker){
Actor *func_8038846C(ActorMarker * marker, Gfx **gdl, Mtx **mptr, Vtx **vtx){
Actor *actor = marker_getActor(marker);
ActorLocal_RBB_1FC0 *local = (ActorLocal_RBB_1FC0 *) &actor->local;
s32 sp5C;
BoneTransformList *sp5C;
f32 pad58;
f32 sp4C[3];
f32 sp40[3];

2
src/RBB/ch/propellor.c
View File

@ -113,7 +113,7 @@ void chPropellor_update(Actor *this){
func_8030E760(SFX_2_CLAW_SWIPE, 0.4f, 20000);
}
else {
func_8030E988(SFX_2_CLAW_SWIPE, 0.4f, 20000, &this->position, 500.0f, 1000.0f);
func_8030E988(SFX_2_CLAW_SWIPE, 0.4f, 20000, this->position, 500.0f, 1000.0f);
}
}//L80389F94
if(this->pitch < 0.0f)

12
src/RBB/ch/propellorswitch.c
View File

@ -19,7 +19,7 @@ typedef struct {
}ActorLocal_RBB_3CB0;
void chPropellorSwitch_update(Actor *this);
Actor *chPropellorSwitch_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3);
Actor *chPropellorSwitch_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3);
/* .data */
Struct_RBB_3CB0 D_80390720[2] = {
@ -58,7 +58,7 @@ void __chPropellorSwitch_setState(Actor *this, s32 arg1){
this->state = arg1;
}
void func_8038A1C8(ActorMarker *marker, s32 arg1){
void func_8038A1C8(ActorMarker *marker, ActorMarker *arg1){
Actor *actor = marker_getActor(marker);
if(actor->state == 1){
__chPropellorSwitch_setState(actor, 2);
@ -68,7 +68,7 @@ void func_8038A1C8(ActorMarker *marker, s32 arg1){
}
}
Actor *chPropellorSwitch_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
Actor *chPropellorSwitch_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor *actor = marker_getActor(marker);
ActorLocal_RBB_3CB0 *local = (ActorLocal_RBB_3CB0 *)&actor->local;
@ -76,12 +76,12 @@ Actor *chPropellorSwitch_draw(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 ar
return actor;
}
modelRender_preDraw(actor_predrawMethod, actor);
modelRender_preDraw((GenFunction_1)actor_predrawMethod, (s32)actor);
if(local->unk4){
modelRender_draw(gdl, mptr, &actor->position, NULL, 1.0f, NULL, local->unk4);
modelRender_draw(gdl, mptr, actor->position, NULL, 1.0f, NULL, local->unk4);
}
else{
modelRender_draw(gdl, mptr, &actor->position, NULL, 1.0f, NULL, marker_loadModelBin(marker));
modelRender_draw(gdl, mptr, actor->position, NULL, 1.0f, NULL, marker_loadModelBin(marker));
}
return actor;
}

4
src/RBB/ch/rowboat.c
View File

@ -57,11 +57,11 @@ void func_8038E3D8(Actor *this){
if(ml_timer_update(&local->unk2C, sp5C)){
local->unk2C = randf2(3.5f, 5.5f);
func_8030E878(SFX_69_WHIPCRACK_CREAKING, randf2(1.1f, 1.2f), 22000, &this->position, 500.0f, 1500.0f);
func_8030E878(SFX_69_WHIPCRACK_CREAKING, randf2(1.1f, 1.2f), 22000, this->position, 500.0f, 1500.0f);
}//L8038E544
if(func_8032DCAC() == (int)this->marker && func_8028F20C()){
player_getPosition(&sp44);
player_getPosition(sp44);
if(sp44[0] < this->position_x - 10.0f && local->unk4[2] < 3.0f)
local->unk4[2] += 5.0f*sp5C;

10
src/RBB/ch/whistle.c
View File

@ -17,7 +17,7 @@ typedef struct {
f32 unk4[3];
}ActorLocal_RBB_4C70;
Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3);
Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, Vtx **arg3);
void func_8038B340(Actor *this);
/* .data */
@ -96,7 +96,7 @@ void RBB_func_8038B0B8(Actor *this, s32 arg1){
}
}
Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3){
Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, Vtx **arg3){
Actor *actor = marker_getActor(marker);
ActorLocal_RBB_4C70 *local = (ActorLocal_RBB_4C70 *)&actor->local;
f32 sp3C[3];
@ -111,10 +111,10 @@ Actor *func_8038B230(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3){
sp3C[0] = actor->pitch;
sp3C[1] = actor->yaw;
sp3C[2] = actor->roll;
modelRender_preDraw(&actor_predrawMethod, actor);
modelRender_preDraw((GenFunction_1)actor_predrawMethod, (s32)actor);
func_8033A450(func_80329934());
modelRender_draw(gdl, mptr, &actor->position, &sp3C, actor->scale, NULL, marker_loadModelBin(marker));
func_8034A174(func_80329934(), 5, &local->unk4);
modelRender_draw(gdl, mptr, actor->position, sp3C, actor->scale, NULL, marker_loadModelBin(marker));
func_8034A174(func_80329934(), 5, local->unk4);
local->unk4[0] -= 60.0f;
return actor;
}

2
src/RBB/ch/whistlectrl.c
View File

@ -66,7 +66,7 @@ s32 chWhistleCtrl_newEvent(Actor *this, s32 whistle_id, Actor *other){
}
}
else{ //wrong
timedFunc_set_1(1.0f, __chWhistleCtrl_wrong, other->marker);
timedFunc_set_1(1.0f, (GenFunction_1)__chWhistleCtrl_wrong, (s32)other->marker);
local->unk0 = 0;
return 2;
}

17
src/RBB/ch/whistleswitch.c
View File

@ -2,7 +2,8 @@
#include "functions.h"
#include "variables.h"
extern void vtxList_tint(s32, s32 (*)[3], f32, BKVertexList*);
void vtxList_tint(BKVertexList *dst, s32 target_color[3], f32 amount, BKVertexList *src);
BKVertexList *vtxList_clone(BKVertexList *);
/* typedefs and declarations */
typedef struct {
@ -17,10 +18,10 @@ typedef struct {
u8 pad1[3];
Struct_RBB_47D0 *unk4;
f32 unk8;
s32 unkC;
BKVertexList *unkC;
}ActorLocal_RBB_47D0;
Actor *func_8038AD9C(ActorMarker *marker, Gfx** gdl, Mtx** mptr, s32 arg3);
Actor *func_8038AD9C(ActorMarker *marker, Gfx** gdl, Mtx** mptr, Vtx **arg3);
void func_8038AEB8(Actor *this);
@ -89,7 +90,7 @@ void func_8038AC18(Actor *this, s32 new_state){
this->state = new_state;
}
void func_8038AD3C(ActorMarker *marker, s32 arg1){
void func_8038AD3C(ActorMarker *marker, ActorMarker *arg1){
Actor *actor = marker_getActor(marker);
if(actor->state == 1)
func_8038AC18(actor, 2);
@ -99,12 +100,12 @@ void func_8038AD7C(Actor *this){
func_8038AC18(this, 0);
}
Actor *func_8038AD9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
Actor *func_8038AD9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor * actor = marker_getActor(marker);
ActorLocal_RBB_47D0 *local = (ActorLocal_RBB_47D0 *)&actor->local;
s32 temp_v0;
BKModelBin *temp_v0;
f32 pad0;
s32 (*sp1C)[3];
s32 *sp1C;
if(actor->state == 0)
@ -114,7 +115,7 @@ Actor *func_8038AD9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
&& local->unk0 != 0
){
temp_v0 = marker_loadModelBin(marker);
sp1C = (local->unk0 == 2) ? &D_80390938 : &D_8039092C;
sp1C = (local->unk0 == 2) ? D_80390938 : D_8039092C;
vtxList_tint(local->unkC, sp1C,
(local->unk4->unk4[1] - actor->position_y)/30.0,
model_getVtxList(temp_v0)

38
src/RBB/code_1570.c
View File

@ -55,69 +55,69 @@ void RBB_func_80387960(f32 arg0){
sp24[2] = -40.0f;
if(temp_v0 = func_8034C528(0x19e)){
func_8034DDF0(temp_v0, &sp34, &sp24, arg0, 1);
func_8034DDF0(temp_v0, sp34, sp24, arg0, 1);
}
if(temp_v0 = func_8034C528(0x19f)){
func_8034DDF0(temp_v0, &sp34, &sp24, arg0, 1);
func_8034DDF0(temp_v0, sp34, sp24, arg0, 1);
}
}
void func_803879F0(void){
s32 temp_v0 = func_8034C528(0x19b);
Struct6Ds *temp_v0 = &func_8034C528(0x19b)->type_6D;
f32 sp30[3];
f32 sp24[3];
if(temp_v0){
TUPLE_ASSIGN(sp30, 0.0f, 0.0f, 0.0f);
TUPLE_ASSIGN(sp24, 0.0f, -1000.0f, 0.0f);
func_8034DC08(temp_v0, &sp30, &sp24, 1.5f, 1);
func_8034DC08(temp_v0, sp30, sp24, 1.5f, 1);
}
}
void func_80387A54(void){
s32 temp_v0 = func_8034C528(0x19b);
Struct6Ds *temp_v0 = &func_8034C528(0x19b)->type_6D;
f32 sp30[3];
f32 sp24[3];
if(temp_v0){
TUPLE_ASSIGN(sp30, 0.0f, -1000.0f, 0.0f);
TUPLE_ASSIGN(sp24, 0.0f, -2000.0f, 0.0f);
func_8034DDF0(temp_v0, &sp30, &sp24, 1.0f, 1);
func_8034DDF0(temp_v0, sp30, sp24, 1.0f, 1);
}
}
void func_80387AC0(void){
s32 temp_v0 = func_8034C528(0x19b);
Struct6Ds *temp_v0 = &func_8034C528(0x19b)->type_6D;
f32 sp30[3];
f32 sp24[3];
if(temp_v0){
TUPLE_ASSIGN(sp30, 0.0f, 0.0f, 0.0f);
TUPLE_ASSIGN(sp24, 0.0f, -2000.0f, 0.0f);
func_8034DDF0(temp_v0, &sp30, &sp24, 0.0f, 1);
func_8034DDF0(temp_v0, sp30, sp24, 0.0f, 1);
}
}
void func_80387B24(void){
s32 temp_v0 = func_8034C528(0x1a0);
Struct6Ds *temp_v0 = &func_8034C528(0x1a0)->type_6D;
f32 sp30[3];
f32 sp24[3];
if(temp_v0){
TUPLE_ASSIGN(sp30, 0.0f, 0.0f, 0.0f);
TUPLE_ASSIGN(sp24, 0.0f, -500.0f, 0.0f);
func_8034DDF0(temp_v0, &sp30, &sp24, 0.1f, 1);
func_8034DDF0(temp_v0, sp30, sp24, 0.1f, 1);
}
}
void func_80387B8C(s32 arg0, s32 arg1){
s32 v0 = func_8034C528(arg0);
Struct6Ds *v0 = &func_8034C528(arg0)->type_6D;
if(v0){
func_8034DFB0(v0, &D_80390294, &D_803902A4, (f64)arg1/1000.0);
func_8034DFB0(v0, D_80390294, D_803902A4, (f64)arg1/1000.0);
}
}
void func_80387BEC(s32 arg0, s32 arg1){
s32 v0;
Struct6Ds *v0;
func_8030E6D4(SFX_90_SWITCH_PRESS);
if(v0 = func_8034C528(arg0)){
func_8034DFB0(v0, &D_803902B4, &D_803902C4, (f64)arg1/1000.0);
if(v0 = &func_8034C528(arg0)->type_6D){
func_8034DFB0(v0, D_803902B4, D_803902C4, (f64)arg1/1000.0);
}
}
@ -135,7 +135,7 @@ void func_80387C5C(void){
particleEmitter_setFinalScaleRange(actor, 15.0f, 20.0f);
particleEmitter_setParticleLifeTimeRange(actor, 4.0f, 4.0f);
particleEmitter_setParticleVelocityRange(actor, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f);
particleEmitter_emitInVolume(actor, &D_803902D4, &D_803902E0, 1);
particleEmitter_emitInVolume(actor, D_803902D4, D_803902E0, 1);
}
void func_80387D80(void){
@ -144,7 +144,7 @@ void func_80387D80(void){
particleEmitter_setStartingFrameRange(actor, 0, 7);
particleEmitter_setScaleAndLifetimeRanges(actor, &D_80390304);
particleEmitter_setParticleVelocityRange(actor, 0.0f, 100.0f, 0.0f, 0.0f, 200.0f ,0.0f);
particleEmitter_emitInVolume(actor, &D_803902EC, &D_803902F8, 3);
particleEmitter_emitInVolume(actor, D_803902EC, D_803902F8, 3);
}
void func_80387E20(void){
@ -157,7 +157,7 @@ void func_80387E20(void){
particleEmitter_setSpawnIntervalRange(actor, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(actor, 10.0f, 10.0f);
particleEmitter_setVelocityAndAccelerationRanges(actor, &D_80390344);
particleEmitter_emitInVolume(actor, &D_8039032C, &D_80390338, 0x19);
particleEmitter_emitInVolume(actor, D_8039032C, D_80390338, 0x19);
}
void RBB_func_80387F18(ActorMarker *marker, s32 arg1){
@ -214,7 +214,7 @@ void func_803881E8(Actor *this, s32 arg1){
}
}
void func_803882B4(ActorMarker *marker, s32 arg1){
void func_803882B4(ActorMarker *marker, ActorMarker *arg1){
Actor *actor = marker_getActor(marker);
if(actor->state == 1)
func_803881E8(actor, 2);

16
src/RBB/code_640.c
View File

@ -65,7 +65,7 @@ extern void func_802D3D54(Actor *);
void func_80386A7C(Actor *);
void func_80386BF8(Actor *arg0);
Actor *func_80386B9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3);
Actor *func_80386B9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3);
/* .data */
@ -126,12 +126,12 @@ ActorInfo D_803901DC = {
/* .code */
s32 func_80386A30(f32 (*arg0)[3]){
s32 func_80386A30(f32 arg0[3]){
s32 r;
r = ((*arg0)[0] < 0.0f)? 0 : 1;
r = (arg0[0] < 0.0f)? 0 : 1;
return (((*arg0)[2] < 0.0f)? 0 : 2) + r;
return ((arg0[2] < 0.0f)? 0 : 2) + r;
}
void func_80386A7C(Actor *this){
@ -141,9 +141,9 @@ void func_80386A7C(Actor *this){
func_802D3D74(this);
this->depth_mode = 1;
viewport_getPosition_vec3f(&viewport);
sp28 = func_80386A30(&this->position);
temp_v0 = func_80386A30(&viewport);
viewport_getPosition_vec3f(viewport);
sp28 = func_80386A30(this->position);
temp_v0 = func_80386A30(viewport);
this->unk38_0 = 0;
if(viewport[0] + 8000.0f < this->position_x || this->position_x < viewport[0] - 8000.0f)
return;
@ -158,7 +158,7 @@ void func_80386A7C(Actor *this){
}
}
Actor *func_80386B9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, s32 arg3){
Actor *func_80386B9C(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor *actor = marker_getActor(marker);
return (actor->unk38_0) ? actor_drawFullDepth(marker, gdl, mptr, arg3): NULL;

40
src/RBB/code_CA0.c
View File

@ -27,18 +27,18 @@ void func_80387090(ActorMarker *marker, s32 arg1){
}
void func_803870BC(s32 arg0, s32 arg1){
s32 temp_v0;
Struct6Ds *temp_v0;
if(temp_v0 = func_8034C528(arg0))
func_8034DFB0(temp_v0, &D_80390224, &D_80390234, (f64)arg1/1000.0);
if(temp_v0 = &func_8034C528(arg0)->type_6D)
func_8034DFB0(temp_v0, D_80390224, D_80390234, (f64)arg1/1000.0);
}
void func_8038711C(s32 arg0, s32 arg1){
s32 temp_v0;
Struct6Ds *temp_v0;
func_8030E6D4(SFX_90_SWITCH_PRESS);
if(temp_v0 = func_8034C528(arg0))
func_8034DFB0(temp_v0, &D_80390244, &D_80390254, (f64)arg1/1000.0);
if(temp_v0 = &func_8034C528(arg0)->type_6D)
func_8034DFB0(temp_v0, D_80390244, D_80390254, (f64)arg1/1000.0);
}
void func_8038718C(ActorMarker *marker){
@ -51,7 +51,7 @@ void func_8038718C(ActorMarker *marker){
sp2C[0] = 0.0f;
sp2C[2] = 0.0f;
sp2C[1] = 450.0f;
func_8034DDF0(sp44, &sp38, &sp2C, 4.0f, 1);
func_8034DDF0(sp44, sp38, sp2C, 4.0f, 1);
func_8034E1A4(sp44, SFX_D8_CRANE, 1.0f, 1.0f);
}
timed_setStaticCameraToNode(0.0f, 4);
@ -76,7 +76,7 @@ void func_80387308(ActorMarker *marker){
if(sp40 = func_8034C528(0x19a)){
TUPLE_ASSIGN(sp34, 0.0f,200.0f,0.0f);
TUPLE_ASSIGN(sp28, 0.0f, 0.0f, 0.0f);
func_8034DDF0(sp40, &sp34, &sp28, 0.5f, 1);
func_8034DDF0(sp40, sp34, sp28, 0.5f, 1);
func_8034E1A4(sp40, SFX_D8_CRANE, 1.0f, 1.0f);
}//L80387394
@ -98,10 +98,10 @@ void func_80387488(ActorMarker *marker){
f32 sp1C[3];
Actor *actor = marker_getActor(marker);
player_getPosition(&sp1C);
player_getPosition(sp1C);
if(-50.0f < sp1C[1] && sp1C[1] < 600.0f){
sp1C[1] = 0;
if(ml_vec3f_distance(&sp1C, &D_80390264) < 500.0f){
if(ml_vec3f_distance(sp1C, D_80390264) < 500.0f){
timedFunc_set_1(1.0f, (GenFunction_1) func_80387488, (s32)actor->marker);
return;
}
@ -130,10 +130,10 @@ void func_8038756C(Actor *this, s32 arg1){
sp60[0] = sp60[1] = sp60[2] = 0.0f;
if(temp_v0 = func_8034C528(0x19C))
func_8034DDF0(temp_v0, &sp6C, &sp60, 0.1f, 1);
func_8034DDF0(temp_v0, sp6C, sp60, 0.1f, 1);
if(temp_v0 = func_8034C528(0x19D))
func_8034DDF0(temp_v0, &sp6C, &sp60, 0.1f, 1);
func_8034DDF0(temp_v0, sp6C, sp60, 0.1f, 1);
}
}//L80387610
@ -144,15 +144,15 @@ void func_8038756C(Actor *this, s32 arg1){
sp44[2] = -40.0f;
if(temp_v0 = func_8034C528(0x19C))
func_8034DDF0(temp_v0, &sp50, &sp44, 0.1f, 1);
func_8034DDF0(temp_v0, sp50, sp44, 0.1f, 1);
if(temp_v0 = func_8034C528(0x19D))
func_8034DDF0(temp_v0, &sp50, &sp44, 0.1f, 1);
func_8034DDF0(temp_v0, sp50, sp44, 0.1f, 1);
timedFunc_set_2(0.1f, func_8038711C, 0x19d, 0x1f4);
timedFunc_set_2(0.1f, func_8025A6EC, COMUSIC_2B_DING_B, 28000);
timedFunc_set_2(0.1f, (GenFunction_2)func_8038711C, 0x19d, 0x1f4);
timedFunc_set_2(0.1f, (GenFunction_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_80324E38(0.2f, 3);
timedFunc_set_1(1.1f, func_8038718C, this->marker);
timedFunc_set_1(1.1f, (GenFunction_1)func_8038718C, (s32)this->marker);
}//L80387704
if(arg1 == 3){
@ -175,18 +175,18 @@ void func_8038756C(Actor *this, s32 arg1){
sp24[2] = 0.0f;
func_8034DDF0(sp3C, &sp30, &sp24, 3.0f, 1);
func_8034DDF0(sp3C, sp30, sp24, 3.0f, 1);
func_8034E1A4(sp3C, SFX_D8_CRANE, 1.0f, 1.0f);
}//L803877D4
timed_playSfx(3.0f, SFX_7F_HEAVYDOOR_SLAM, 0.5f, 25000);
timed_playSfx(3.0f, SFX_7F_HEAVYDOOR_SLAM, 0.6f, 25000);
timedFunc_set_1(4.0f, func_80387488, this->marker);
timedFunc_set_1(4.0f, (GenFunction_1)func_80387488, (s32)this->marker);
}//L80387828
this->state = arg1;
}
void func_80387850(ActorMarker *marker, s32 arg1){
void func_80387850(ActorMarker *marker, ActorMarker *arg1){
Actor *actor = marker_getActor(marker);
if(actor->state == 1){
func_8038756C(actor, 2);

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

@ -49,7 +49,7 @@ void func_80359A40(f32 position[3], struct_core2_D2AB0 *arg1, s32 cnt){
particleEmitter_emitN(pCtrl, cnt);
}
void __chdrips_particleCallback(ParticleScaleAndLifetimeRanges *pCtrl, f32 position[3]){
void __chdrips_particleCallback(ParticleEmitter *pCtrl, f32 position[3]){
if(func_8024549C(position, 4.0f)){
position[1] += 2.0f;
func_80359A40(position, &D_80372AF0, 1);

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

@ -204,7 +204,7 @@ void func_8035C6F0(ActorMarker *this_marker, ActorMarker *other_marker){
Actor* func_8035C71C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
Actor *this = marker_getActor(marker); //sp64
ActorLocal_Core2_D50F0 *local = (ActorLocal_Core2_D50F0 *)&this->local; //sp60
s32 sp5C;
BoneTransformList *sp5C;
s32 pad58;
f32 sp4C[3];
f32 sp40[3];
@ -215,7 +215,7 @@ Actor* func_8035C71C(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(this->state == 8){
sp5C = skeletalAnim_getBoneTransformList(this->unk148);
if(sp5C){
if(sp5C != NULL){
sp40[0] = 0.0f;
sp40[1] = 0.0f;
sp40[2] = local->unk0 * -2200.0f;

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

@ -396,7 +396,7 @@ void func_802C4C14(Actor *this){
}
subaddie_set_state(this, 2);
func_8031877C(chGameSelectTopZoombox);
gczoombox_setStrings(chGameSelectTopZoombox, 2, &D_8037DCE0);
gczoombox_setStrings(chGameSelectTopZoombox, 2, (char **)&D_8037DCE0);
D_8037DD34 = 0.0f;
}
break;
@ -522,7 +522,7 @@ void func_802C4C14(Actor *this){
D_8037DD34 += sp50;
if(20.0 < D_8037DD34){
func_8031877C(chGameSelectTopZoombox);
gczoombox_setStrings(chGameSelectTopZoombox, 2, &D_8037DCE0);
gczoombox_setStrings(chGameSelectTopZoombox, 2, (char **)&D_8037DCE0);
D_8037DD34 = 0.0f;
}
}
@ -563,7 +563,7 @@ void func_802C5740(Actor * this){
if(chGameSelectTopZoombox == NULL){
chGameSelectTopZoombox = gczoombox_new(0xA, ZOOMBOX_SPRITE_D_KAZOOIE_1, 2, 1, func_802C44D0);
gczoombox_setStrings(chGameSelectTopZoombox, 2, &D_8037DCE0);
gczoombox_setStrings(chGameSelectTopZoombox, 2, (char **)&D_8037DCE0);
gczoombox_open(chGameSelectTopZoombox);
gczoombox_maximize(chGameSelectTopZoombox);
}//L802C5860

2
src/core2/code_B3A80.c
View File

@ -533,7 +533,7 @@ s32 code_B3A80_func_8033BDAC(enum asset_e id, void *dst, s32 size) {
}
}
comp_size = assetSectionRomMetaList[id].offset + D_80383CCC;
piMgr_read(comp_ptr, comp_size, sp34);
piMgr_read((void *)comp_ptr, comp_size, sp34);
if (assetSectionRomMetaList[id].compFlag & 1) {
rarezip_inflate(comp_ptr, dst);
osWritebackDCache(dst, assetCacheCurrentSize);