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

Merge branch 'mr-origin-80'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-26 19:10:37 -05:00
parent e8eed5ecb9 249f5a7329
commit 8a312a3e64
170 changed files with 1495 additions and 1305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/core2/abilityprogress.c
View File

@@ -30,45 +30,49 @@ void ability_use(s32 arg0){
break;
case 0x3://L8029569C //
if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){
sp2C = 0xDFC;
sp2C = ASSET_DFC_TEXT_UNKNOWN;
}
break;
case 0x4://L802956B8 //
if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){
sp2C = 0xE02;
sp2C = ASSET_E02_TEXT_UNKNOWN;
}
break;
case 0x5://L802956D4 //barge
if(map_get() == MAP_1_SM_SPIRAL_MOUNTAIN){
sp2C = 0xE05;
sp2C = ASSET_E05_TEXT_UNKNOWN;
}
break;
case 0x6://L802956F0 //slide
sp28 = 0;
if(!ability_isUnlocked(ABILITY_10_TALON_TROT)){
if(map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){
sp2C = 0xB4D;
if (!ability_isUnlocked(ABILITY_10_TALON_TROT)) {
if (map_get() == MAP_2_MM_MUMBOS_MOUNTAIN) {
sp2C = ASSET_B4D_TEXT_UNKNOWN;
}
else
else {
return;
}
}
else{
else {
abilityprogress_usedAbilities |= (1 << arg0);
}
break;
case 0x8://L80295738 //fly
sp2C = 0xA26;
sp2C = ASSET_A26_DIALOG_NEED_RED_FEATHERS_TO_FLY;
break;
case 0x7://L80295740 //egg
case 0x9://L80295740 //shock
break;
}//L80295744
if(sp28)
if (sp28) {
comusic_playTrack(COMUSIC_2B_DING_B);
if(sp2C)
func_80311480(sp2C, 4, NULL, NULL, NULL, 0);
}
if (sp2C) {
gcdialog_showText(sp2C, 4, NULL, NULL, NULL, 0);
}
abilityprogress_usedAbilities |= (1 << arg0);
}
@@ -77,7 +81,7 @@ int ability_hasUsed(enum ability_e move){
}
void ability_setHasUsed(enum ability_e move){
abilityprogress_usedAbilities |= (1 << move);
abilityprogress_usedAbilities |= (1 << move);
}
int ability_hasLearned(enum ability_e move){
@@ -97,9 +101,9 @@ void ability_clearAll(void){
void ability_setLearned(s32 move, s32 val){
if(val){
abilityprogress_learnedAbilities |= (1 << move);
abilityprogress_learnedAbilities |= (1 << move);
}else{
abilityprogress_learnedAbilities &= ~(1 << move);
abilityprogress_learnedAbilities &= ~(1 << move);
}
}

8
src/core2/ba/marker.c
View File

@@ -123,7 +123,7 @@ void __baMarker_8028B848(void){
if(player_getTransformation() == TRANSFORM_1_BANJO){
__baMarker_8028B7F4();
}
func_80311480(s0, 0x2A, NULL, NULL, NULL, 0);
gcdialog_showText(s0, 0x2A, NULL, NULL, NULL, 0);
}
}
@@ -321,7 +321,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case 0x28: //L8028BF74
if( plyr_hitbox_type == HITBOX_6_WONDERWING){
func_8030E484(SFX_20_METAL_CLANK_1);
sfxsource_playHighPriority(SFX_20_METAL_CLANK_1);
}
else{
func_8030E6D4(SFX_65_METALLIC_SCRATCH);
@@ -717,7 +717,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
miscFlag_set(MISC_FLAG_2_ON_SPRING_PAD);
}else{
if(!volatileFlag_getAndSet(VOLATILE_FLAG_C_HAS_SEEN_SPRING_PAD, 1)){
func_80311480(ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED, 4, 0, 0, 0, 0);
gcdialog_showText(ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED, 4, 0, 0, 0, 0);
}
}
break;
@@ -729,7 +729,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
miscFlag_set(MISC_FLAG_1_ON_FLIGHT_PAD);
}
else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D_HAS_SEEN_FLIGHT_PAD, 1)){
func_80311480(ASSET_A25_DIALOG_FLY_DISC_DISCOVERED, 4, 0, 0, 0, 0);
gcdialog_showText(ASSET_A25_DIALOG_FLY_DISC_DISCOVERED, 4, 0, 0, 0, 0);
}
break;

2
src/core2/bs/bFly.c
View File

@@ -513,7 +513,7 @@ void func_802A4664(void){
func_80299E90();
next_state = bs_getNextState();
if(next_state == BS_20_LANDING || next_state == BS_24_FLY || next_state == BS_2D_SWIM_IDLE){
func_8030E484(SFX_3EA_UNKNOWN);
sfxsource_playHighPriority(SFX_3EA_UNKNOWN);
}
func_802A34C8();
func_8029E070(0);

2
src/core2/bs/bLongLeg.c
View File

@@ -58,7 +58,7 @@ int bslongleg_inSet(s32 move_indx){
void func_802A531C(void){
func_80299650(stateTimer_getPrevious(STATE_TIMER_2_LONGLEG), stateTimer_get(STATE_TIMER_2_LONGLEG));
if(stateTimer_isAt(STATE_TIMER_2_LONGLEG, 0.01f))
func_8030E484(SFX_3EB_UNKNOWN);
sfxsource_playHighPriority(SFX_3EB_UNKNOWN);
}
void func_802A5374(void){

4
src/core2/bs/bShock.c
View File

@@ -145,7 +145,7 @@ void bsbshock_init(void){
baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
baphysics_set_vertical_velocity(D_80364A70);
baphysics_set_gravity(D_80364A74);
func_8030E484(SFX_E_SHOCKSPRING_BOING);
sfxsource_playHighPriority(SFX_E_SHOCKSPRING_BOING);
func_8029E064(1);
func_8029E070(1);
ability_use(9);
@@ -162,7 +162,7 @@ void bsbshock_update(void){
func_802B6FA8();
baphysics_get_velocity(sp20);
if(animctrl_isAt(aCtrl, 0.7f))
func_8030E484(SFX_53_BANJO_HUIII);
sfxsource_playHighPriority(SFX_53_BANJO_HUIII);
if(button_released(BUTTON_A) && 0.0f < sp20[1])
baphysics_reset_gravity();

2
src/core2/bs/bSwim.c
View File

@@ -384,7 +384,7 @@ void func_802A7F4C(void){
}
void func_802A7F6C(void) {
D_8037D394 = (bs_getPrevState() == BS_41_DIE) ? TRUE : FALSE;
D_8037D394 = BOOL(bs_getPrevState() == BS_41_DIE);
if (D_8037D394 || level_get() == LEVEL_9_RUSTY_BUCKET_BAY || map_get() == MAP_46_CCW_WINTER) {
D_8037D395 = 0;

4
src/core2/bs/bTrot.c
View File

@@ -123,7 +123,7 @@ void func_802A8AD8(void){
if(func_8029DFE0()){
func_8029E0DC(0);
if(miscFlag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE))
func_8030E484(0x3eb);
sfxsource_playHighPriority(0x3eb);
func_803219F4(1);
}
}else{
@@ -365,7 +365,7 @@ void bsbtrot_jump_init(void){
baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
baphysics_set_vertical_velocity(D_80364ABC);
baphysics_set_gravity(D_80364AC0);
func_8030E484(SFX_48_KAZOOIE_RUUH);
sfxsource_playHighPriority(SFX_48_KAZOOIE_RUUH);
D_8037D3A4 = 0;
}

2
src/core2/bs/croc.c
View File

@@ -581,7 +581,7 @@ void bscroc_eat_bad_update(void){
}
if(animctrl_isAt(aCtrl, 0.6671f)){
func_8030E484(SFX_C6_SHAKING_MOUTH);
sfxsource_playHighPriority(SFX_C6_SHAKING_MOUTH);
}
if(animctrl_isStopped(aCtrl)){

4
src/core2/bs/jig.c
View File

@@ -71,7 +71,7 @@ void bsjig_jiggy_update(void){
}
if(animctrl_isAt(aCtrl, 0.94f))
func_8030E484(0x3ea);
sfxsource_playHighPriority(0x3ea);
if(animctrl_isStopped(aCtrl)){
if(D_8037D4B1)
@@ -134,7 +134,7 @@ void bsjig_jiggy_end(void){
}
}//L802B0E88
if(sp2C != 0){
func_80311480(sp2C, sp28, 0, 0, 0, 0);
gcdialog_showText(sp2C, sp28, 0, 0, 0, 0);
}
}//L802B0EA4
func_80298A64();

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

@@ -52,7 +52,7 @@ Actor *chBadShad_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
if(other)
modelRender_setAlpha(other->alpha_124_19);
sp40 = ml_map_f(this->unk28, 0.0f , 800.0f, 0.53f, 0.18f)*this->unk1C[1];
sp40 = ml_map_f(this->actor_specific_1_f, 0.0f , 800.0f, 0.53f, 0.18f)*this->unk1C[1];
modelRender_setDepthMode(MODEL_RENDER_DEPTH_COMPARE);
modelRender_draw(gfx, mtx, this->position, sp44, sp40, NULL, marker_loadModelBin(marker));
return this;
@@ -120,7 +120,7 @@ void func_802D71A0(s32 this, s32 arg1){
sp3C->unk104 = marker;
sp3C->unk1C[0] = globalTimer_getTime();
sp3C->unk1C[1] = sp40;
sp3C->unk28 = sp28;
sp3C->actor_specific_1_f = sp28;
}
}
}
@@ -148,7 +148,7 @@ void func_802D729C(Actor *actor, f32 arg1){
return;
if(!((globalTimer_getTime() ^ actor->marker->actrArrayIdx) & 0x7)){
sp1C->unk28 = func_802D7038(actor);
sp1C->actor_specific_1_f = func_802D7038(actor);
sp1C->position_x = D_8037DE10[0];
sp1C->position_y = D_8037DE10[1] + 6.0f;
sp1C->position_z = D_8037DE10[2];

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

@@ -62,7 +62,7 @@ void chBeehive_update(Actor *this){
){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if( player_getTransformation() == TRANSFORM_1_BANJO
&& func_80311480(ASSET_D96_DIALOG_BEEHIVE_MEET, 0, NULL, NULL, NULL, 0)
&& gcdialog_showText(ASSET_D96_DIALOG_BEEHIVE_MEET, 0, NULL, NULL, NULL, 0)
){
fileProgressFlag_set(FILEPROG_D_BEEHIVE_TEXT, 1);
}

23
src/core2/ch/bigbutt.c
View File

@@ -40,7 +40,7 @@ ActorInfo D_803660B4 = {0x9, ACTOR_E_BULL_INTRO, ASSET_354_MODEL_BULL_INTRO,
/* .code */
void func_802C5E80(Actor *this){
this->unk28 = randf2(3.5f, 4.9f);
this->actor_specific_1_f = randf2(3.5f, 4.9f);
}
void func_802C5EB8(Actor *this){
@@ -83,7 +83,7 @@ void func_802C5FF8(Actor *this){
void func_802C60AC(ActorMarker *marker, ActorMarker *other_marker){
Actor *actor = marker_getActor(marker);
if( actor->state == 4
&& 5.0 <= actor->unk28
&& 5.0 <= actor->actor_specific_1_f
&& func_803294F0(actor, 80, func_80329784(actor))
){
animctrl_setPlaybackType(actor->animctrl, ANIMCTRL_ONCE);
@@ -121,7 +121,7 @@ void func_802C6240(Actor *this){
this->marker->dieFunc = func_802C61C0;
this->marker->collisionFunc = func_802C60AC;
this->marker->collision2Func = func_802C6150;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->unk16C_0 = 1;
this->initialized = TRUE;
return;
@@ -171,7 +171,7 @@ void func_802C6240(Actor *this){
&& func_80329078(this, (s32)this->yaw_ideal, 150)
&& subaddie_maybe_set_state(this, 3, 0.13f)
){
this->unk28 = randf2(7.1f, 8.4f);
this->actor_specific_1_f = randf2(7.1f, 8.4f);
}
func_802C5EB8(this);
break;
@@ -212,7 +212,7 @@ void func_802C6240(Actor *this){
if(this->unk10_12 == 0 || (this->unk10_12 < 3 && func_80329530(this, 300))){
subaddie_set_state(this, 9);
this->unk28 = 13.0f;
this->actor_specific_1_f = 13.0f;
}
break;
@@ -220,9 +220,10 @@ void func_802C6240(Actor *this){
if(actor_animationIsAt(this, 0.35f))
func_8030E58C(SFX_2E_BIGBUTT_RUNNING, 1.0f);
this->unk28 += 0.15;
if(30.0f < this->unk28)
this->unk28 = 30.0f;
this->actor_specific_1_f += 0.15;
if (30.0f < this->actor_specific_1_f) {
this->actor_specific_1_f = 30.0f;
}
this->yaw_ideal = (f32)func_80329784(this);
func_80328FB0(this, 9.0f);
@@ -233,7 +234,7 @@ void func_802C6240(Actor *this){
if(func_80329078(this, (s32)this->yaw_ideal,200)){
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
subaddie_set_state(this, 4);
this->unk28 += 5.7;
this->actor_specific_1_f += 5.7;
tmp_a0 = this->unk44_31;
if(this->unk44_31 == 0){
this->unk44_31 = sfxsource_createSfxsourceAndReturnIndex();
@@ -259,12 +260,12 @@ void func_802C6240(Actor *this){
func_8030E2C4(this->unk44_31);
if(0.99 <= animctrl_getAnimTimer(this->animctrl)){
func_80329878(this, func_80329530(this, 250)? 0.8: 1.2);
if(0.0f == this->unk28){
if (0.0f == this->actor_specific_1_f) {
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_LOOP);
subaddie_set_state_with_direction(this, 1, 0.65f, 1);
func_8030DA44(this->unk44_31);
this->unk44_31 = 0;
func_8030E484(SFX_19_BANJO_LANDING_08);
sfxsource_playHighPriority(SFX_19_BANJO_LANDING_08);
}
}//L802C6B1C
break;

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

@@ -405,7 +405,7 @@ void chBottlesBonus_lose(u8 *arg0, enum asset_e text_id) {
*arg0 = 1;
timedFunc_set_0(2.0f, chBottlesBonusCursor_func_802DF99C);
func_80311714(0);
func_80311480(text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_func_802DE224, NULL);
gcdialog_showText(text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_func_802DE224, NULL);
func_80311714(1);
}
else{
@@ -424,7 +424,7 @@ void chBottlesBonus_completedPuzzle(void) {
actor = marker_getActor(chBottlesBonusMarker);
D_8037DCC0[chBottleBonusPuzzleIndex] = TRUE;
func_80311714(0);
func_80311480(D_803681A0[chBottleBonusPuzzleIndex + 1].text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_IncrementPuzzle, NULL);
gcdialog_showText(D_803681A0[chBottleBonusPuzzleIndex + 1].text_id, 0x86, actor->position, chBottlesBonusMarker, chBottlesBonus_IncrementPuzzle, NULL);
func_80311714(1);
}
@@ -521,7 +521,7 @@ void chBottlesBonus_update(Actor *this) {
func_8025A7DC(COMUSIC_98_BBONUS_PIECES_SHUFFLE);
if (D_8037DCC7 == 0) {
func_80311714(0);
func_80311480(0xE24, 0x87, this->position, chBottlesBonusMarker, chBottlesBonus_startTimer, NULL);
gcdialog_showText(ASSET_E24_TEXT_UNKNOWN, 0x87, this->position, chBottlesBonusMarker, chBottlesBonus_startTimer, NULL);
func_80311714(1);
D_8037DCC7 = 1;
}

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

@@ -320,7 +320,7 @@ void chBottlesBonusCursor_update(Actor *this) {
held_piece = &D_8037E248[D_8037E5C0.unk0];
held_piece->state = 2;
chBottlesBonusCursor_func_802DF928(D_8037E5C0.unk0);
func_8030E484(SFX_112_TINKER_ATTENTION);
sfxsource_playHighPriority(SFX_112_TINKER_ATTENTION);
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
}
}

18
src/core2/ch/collectible.c
View File

@@ -38,7 +38,7 @@ void chCollectible_setState(Actor *arg0, s32 next_state){
default:
break;
case 1:
arg0->unk28 = 0.0f;
arg0->actor_specific_1_f = 0.0f;
//fall-through
case 3:
actor_collisionOff(arg0);
@@ -122,13 +122,13 @@ void chCollectible_collectGoldFeather(ActorProp *arg0){
Actor *chCollectible_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor *thisActor = marker_getActor(this);
if(thisActor->unk28 != 0.0f){
if (thisActor->actor_specific_1_f != 0.0f) {
if(thisActor->unk38_0){
func_80344C2C(1);
if(thisActor->unk28 == 255.0f){
if (thisActor->actor_specific_1_f == 255.0f) {
func_803262B8(thisActor);
} else{
actor_setOpacity(thisActor, thisActor->unk28);
actor_setOpacity(thisActor, thisActor->actor_specific_1_f);
}
}
return func_80325934(this, gdl, mptr, arg3);
@@ -148,7 +148,7 @@ void chCollectible_update(Actor *this) {
}
this->unk10_12 = -1;
this->unk38_0 = (map_get() == MAP_90_GL_BATTLEMENTS);
this->unk28 = this->unk38_0 ? 0.0f: 255.0f;
this->actor_specific_1_f = this->unk38_0 ? 0.0f : 255.0f;
this->initialized = TRUE;
}
if(!this->unk38_0)
@@ -167,13 +167,13 @@ void chCollectible_update(Actor *this) {
}
/* fallthrough */
case 3:
if (this->unk28 > 0) {
this->unk28 = MAX(this->unk28 - 8, 0);
if (this->actor_specific_1_f > 0) {
this->actor_specific_1_f = MAX(this->actor_specific_1_f - 8, 0);
}
break;
case 2:
if (this->unk28 < 255) {
this->unk28 = MIN(this->unk28 + 8, 255);
if (this->actor_specific_1_f < 255) {
this->actor_specific_1_f = MIN(this->actor_specific_1_f + 8, 255);
}
break;
}

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

@@ -33,7 +33,7 @@ ActorAnimationInfo chCrabMutantAnimations[] = {
/* .code */
void __chCrab_802CB040(Actor *this) {
this->unk28 = randf2(1.5f, 2.3f);
this->actor_specific_1_f = randf2(1.5f, 2.3f);
}
void __chCrab_802CB078(Actor *this) {
@@ -49,7 +49,7 @@ void __chCrab_802CB078(Actor *this) {
if( func_80329530(this, 1500)
&& ( (this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET) || func_803292E0(this))
) {
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
subaddie_set_state(this, 3U);
}
}
@@ -239,7 +239,7 @@ void chCrab_update(Actor *this) {
marker_setCollisionScripts(this->marker, __chCrab_touch, __chCrab_ow, __chCrab_die);
func_803300C0(this->marker, &__chCrab_802CB76C);
this->unk124_0 = this->unk138_31 = FALSE;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->volatile_initialized = TRUE;
animctrl_setTransitionDuration(this->animctrl, 0.25f);
if (map_get() == MAP_A_TTC_SANDCASTLE) {
@@ -270,10 +270,10 @@ void chCrab_update(Actor *this) {
&& !func_8028ECAC()
) {
if ((this->state != 6) && (this->state != 5)) {
func_80311480(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL);
gcdialog_showText(ASSET_D32_DIALOG_MUTANT_CRAB_MEET, 0xF, this->position, NULL, __chCrab_mutantTextCallback, NULL);
mapSpecificFlags_set(0, TRUE);
levelSpecificFlags_set(0xE, TRUE);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
if (map_get() == MAP_A_TTC_SANDCASTLE) {
@@ -283,17 +283,17 @@ void chCrab_update(Actor *this) {
&& !jiggyscore_isCollected(JIGGY_10_TTC_SANDCASTLE)
&& func_80329530(this, 1600)
) {
func_80311480(0xA12, 4, this->position, NULL, NULL, NULL);
gcdialog_showText(0xA12, 4, this->position, NULL, NULL, NULL);
mapSpecificFlags_set(0, TRUE);
} else if (mapSpecificFlags_get(1)) {
func_80311480(0xA13, 4, this->position, NULL, NULL, NULL);
gcdialog_showText(0xA13, 4, this->position, NULL, NULL, NULL);
mapSpecificFlags_set(1, FALSE);
}
}
if (levelSpecificFlags_get(0xE)) {
if ((this->state != 8) && (this->state != 9)) {
subaddie_set_state_with_direction(this, (this->is_first_encounter) ? 8 : 9, 0.0f, 1);
this->is_first_encounter = FALSE;
subaddie_set_state_with_direction(this, (this->has_met_before) ? 8 : 9, 0.0f, 1);
this->has_met_before = FALSE;
}
}
@@ -327,7 +327,7 @@ void chCrab_update(Actor *this) {
func_80328FB0(this, 4.0f);
if (func_80329480(this)) {
subaddie_set_state(this, 4);
this->unk28 = 12.0f;
this->actor_specific_1_f = 12.0f;
}
break;
@@ -336,7 +336,7 @@ void chCrab_update(Actor *this) {
func_80328FB0(this, 4.0f);
if (func_80329480(this)) {
subaddie_set_state(this, 9);
this->unk28 = 12.0f;
this->actor_specific_1_f = 12.0f;
} else if (!levelSpecificFlags_get(0xE)) {
subaddie_set_state_with_direction(this, 3, 0.0f, 1);
}

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

@@ -79,7 +79,7 @@ ActorInfo D_80365F00 = { 0xE6, 0x197, 0x532, 0x1, D_80365ED0, func_802C4C14, fun
/* .bss */
s32 D_8037DCB0;
s32 mm_hut_smash_count;
u32 D_8037DCB4;
struct FF_StorageStruct* D_8037DCB8;
s32 D_8037DCBC;
@@ -454,7 +454,7 @@ void func_802C4C14(Actor *this){
break;
case 2://L802C5364
timedFunc_set_2(0.15f, (GenFunction_2)sfxsource_play, SFX_32_BANJO_EGHEE, 28000);
sfxsource_play(SFX_3F6_UNKNOWN, 28000);
sfxsource_play(SFX_3F6_RUBBING, 28000);
func_8030E540(SFX_8F_SNOWBALL_FLYING);
break;
}//L802C5394
@@ -462,7 +462,7 @@ void func_802C4C14(Actor *this){
levelSpecificFlags_set(sp84 + 0x35, 1);
}
else{//L802C53B4
func_8030E484(SFX_3EA_UNKNOWN);
sfxsource_playHighPriority(SFX_3EA_UNKNOWN);
subaddie_set_state(this, 3);
}
}else{//L802C53D0

8
src/core2/ch/ghost.c
View File

@@ -169,14 +169,14 @@ void func_8035B674(Actor *this){
void func_8035B6CC(Actor *this){
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_playAnimationOnce(this);
this->unk28 = 1.0f;
this->actor_specific_1_f = 1.0f;
func_8030E878(0x3F4, randf2(1.0f, 1.2f), 32000, this->position, this->scale*400.0f, this->scale*1800.0f);
}
void func_8035B75C(Actor *this){
subaddie_set_state_with_direction(this, 3, 0.01f, 1);
actor_loopAnimation(this);
this->unk28 = volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0.0 : 12.0;
this->actor_specific_1_f = volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) ? 0.0 : 12.0;
func_8030E878(0x3F4, randf2(1.0f, 1.2f), 32000, this->position, this->scale*400.0f, this->scale*1800.0f);
}
@@ -186,10 +186,8 @@ void func_8035B824(Actor *this){
subaddie_set_state_with_direction(this, 4, 0.01f, 1);
actor_loopAnimation(this);
func_80328CEC(this, (s32)this->yaw_ideal, 0xA, 0x1E);
this->unk28 = 4.0f;
this->actor_specific_1_f = 4.0f;
local->unk4 = randf2(2.0f, 4.5f);
}
void func_8035B8A8(Actor *this){

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

@@ -60,7 +60,7 @@ void chgloop_update(Actor *this){
if( !mapSpecificFlags_get(2)
&& func_80329530(this, 350)
&& func_80311480(ASSET_D34_TEXT_GLOOP_MEET, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(ASSET_D34_TEXT_GLOOP_MEET, 0, NULL, NULL, NULL, NULL)
){
mapSpecificFlags_set(2, TRUE);
}

14
src/core2/ch/gravestone.c
View File

@@ -99,14 +99,14 @@ void func_8035EE48(Actor *this){
void func_8035EE80(Actor *this){
subaddie_set_state(this, 3);
actor_loopAnimation(this);
this->unk28 = 10.5f;
this->actor_specific_1_f = 10.5f;
func_8035EE48(this);
}
void func_8035EEC0(Actor *this){
subaddie_set_state(this, 4);
actor_loopAnimation(this);
this->unk28 = 9.0f;
this->actor_specific_1_f = 9.0f;
func_8035EE48(this);
}
@@ -192,7 +192,7 @@ void func_8035F138(Actor *this) {
marker_setCollisionScripts(this->marker, func_8035F0E8, func_8035F048, func_8035EF9C);
local->unk0 = 1;
this->unk1C[0] = this->position[0];
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
this->velocity[1] = 0.0f;
this->unk1C[2] = this->position[2];
this->velocity[0] = this->yaw;
@@ -237,8 +237,8 @@ void func_8035F138(Actor *this) {
break;
}
if (((this->unk28 + 0.28) <= 18.0) && ( 0.36 <= animctrl_getDuration(this->animctrl) - 0.0056000000000000008)) {
this->unk28 += 0.28;
if (((this->actor_specific_1_f + 0.28) <= 18.0) && ( 0.36 <= animctrl_getDuration(this->animctrl) - 0.0056000000000000008)) {
this->actor_specific_1_f += 0.28;
animctrl_setDuration(this->animctrl, animctrl_getDuration(this->animctrl) - 0.0056000000000000008);
}
break;
@@ -253,7 +253,7 @@ void func_8035F138(Actor *this) {
if (func_8035ED60(this)) {
subaddie_set_state_with_direction(this, 5, 0.99f, 0);
actor_playAnimationOnce(this);
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
this->unk1C[1] = 1.9f;
this->unk44_31 = func_8030ED2C(SFX_2C_PULLING_NOISE, 3);
break;
@@ -277,7 +277,7 @@ void func_8035F138(Actor *this) {
if (animctrl_getAnimTimer(this->animctrl) <= 0.02) {
subaddie_set_state_with_direction(this, 1, 0.02f, 1);
actor_playAnimationOnce(this);
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
func_8035EE48(this);
break;
}

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

@@ -176,7 +176,7 @@ void func_8035A694(Actor *this){
f32 sp28[3];
sp3C = this->yaw;
sp38 = this->unk28*1.5 + 1.0;
sp38 = this->actor_specific_1_f * 1.5 + 1.0;
tmp_v0 = globalTimer_getTime();
this->yaw += sp38;
if(360.0f < this->yaw)
@@ -215,7 +215,7 @@ void __chicecube_ow(ActorMarker *marker, ActorMarker *other_marker){
Actor *actor = marker_getActor(marker);
FUNC_8030E8B4(SFX_1D_HITTING_AN_ENEMY_1, 0.9f, 22000, actor->position, 1500, 3000);
actor->velocity[1] = 0.8f;
actor->unk28 = 0.0f;
actor->actor_specific_1_f = 0.0f;
}
//__chicecube_die
@@ -241,7 +241,7 @@ void func_8035A9E0(Actor *this){
subaddie_set_state_with_direction(this, 3, animctrl_getAnimTimer(this->animctrl), 1);
actor_loopAnimation(this);
this->unk38_31 = 1;
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
}
void func_8035AA40(Actor *this){
@@ -322,11 +322,11 @@ void chicecube_update(Actor *this){
break;
case 3: // L8035AD88
animctrl_setAnimTimer(this->animctrl, 0.999f);
if(this->unk28 + 0.28 < 18.0){
this->unk28 = this->unk28 + 0.28;
if (this->actor_specific_1_f + 0.28 < 18.0) {
this->actor_specific_1_f = this->actor_specific_1_f + 0.28;
}
else{
this->unk28 = 18.0f;
else {
this->actor_specific_1_f = 18.0f;
}
func_8035A694(this);
if(!func_80359DF4(this, 1300)){
@@ -343,10 +343,14 @@ void chicecube_update(Actor *this){
break;
case 4: // L8035AE64
animctrl_setAnimTimer(this->animctrl, 0.999f);
if(this->unk28 - 0.28 > 8.0)
this->unk28 = this->unk28 - 0.28;
else
this->unk28 = 8.0f;
if (this->actor_specific_1_f - 0.28 > 8.0) {
this->actor_specific_1_f = this->actor_specific_1_f - 0.28;
}
else {
this->actor_specific_1_f = 8.0f;
}
func_8035A694(this);
if(func_80359DF4(this, 900)){
func_8035A9E0(this);

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

@@ -46,7 +46,7 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){
if(actorPtr->state < 5){
if(!fileProgressFlag_get(FILEPROG_E_JINJO_TEXT)){
func_80311480(__chJinjo_getMeetDialogId(actorPtr->marker->id), 4, 0, 0, 0, 0);
gcdialog_showText(__chJinjo_getMeetDialogId(actorPtr->marker->id), 4, 0, 0, 0, 0);
fileProgressFlag_set(FILEPROG_E_JINJO_TEXT, 1);
}
subaddie_set_state_with_direction(actorPtr, 6, 0.0f , -1);

18
src/core2/ch/mole.c
View File

@@ -157,15 +157,15 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){
if( arg1 == moleTable[actor->unkF4_8-9].learn_text
&& item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)
){
func_80311480(ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions);
gcdialog_showText(ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions);
}//L802D9738
else if(arg1 == moleTable[actor->unkF4_8-9].learn_text || arg1 == ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH){
func_80311480(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL);
gcdialog_showText(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL);
}
else{//L802D97BC
if(actor->is_first_encounter){
if(actor->has_met_before){
func_80347A14(1);
actor->is_first_encounter = FALSE;
actor->has_met_before = FALSE;
}
timed_exitStaticCamera(0.0f);
if(actor->state == 5){
@@ -229,7 +229,7 @@ int chmole_learnAbility(Actor *this){
// New Ability: Learn Dialog & Misc Actions
else{
func_80347A14(0);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
sp2C = moleTable[this->unkF4_8-9].learn_text;
ability_unlock(moleTable[this->unkF4_8-9].ability);
switch(moleTable[this->unkF4_8-9].ability){
@@ -242,7 +242,7 @@ int chmole_learnAbility(Actor *this){
break;
}
}//L802D9A9C
func_80311480(sp2C, sp28, this->position, this->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions);
gcdialog_showText(sp2C, sp28, this->position, this->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions);
return TRUE;
}
@@ -368,11 +368,11 @@ void chmole_update(Actor *this){
this->velocity[0] = this->position[0];
this->velocity[1] = this->position[1];
this->velocity[2] = this->position[2];
this->unk28 = 500.0f;
this->actor_specific_1_f = 500.0f;
}
else{ //L802D9F08
nodeprop_getPosition(node_prop, this->velocity);
this->unk28 = 2*nodeprop_getRadius(node_prop);
this->actor_specific_1_f = 2 * nodeprop_getRadius(node_prop);
}
}
}//L802D9F34
@@ -387,7 +387,7 @@ void chmole_update(Actor *this){
&& (func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT)
){
player_getPosition(sp34);
if(ml_distance_vec3f(sp34, this->velocity) < this->unk28){
if (ml_distance_vec3f(sp34, this->velocity) < this->actor_specific_1_f) {
chmole_startingDialog(this);
}
}

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

@@ -26,7 +26,7 @@ ActorAnimationInfo chShrapnelAnimations[] = {
/* .code */
void chShrapnel_func_802D0A00(Actor *this) {
this->unk28 = randf2(1.5f, 2.3f);
this->actor_specific_1_f = randf2(1.5f, 2.3f);
}
void chShrapnel_func_802D0A38(Actor *this){
@@ -35,7 +35,7 @@ void chShrapnel_func_802D0A38(Actor *this){
}
else{
if(func_80329530(this, 600) && func_803292E0(this)){
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
subaddie_set_state_with_direction(this, 2, 0.0f, 1);
}
}
@@ -123,7 +123,7 @@ void chShrapnel_explode(ActorMarker *marker, ActorMarker *other_marker) {
void chShrapnel_func_802D0FC8(Actor *this) {
this->unk4C += time_getDelta();
if (MAX(0.25, (12.0 - this->unk28) / 12.0) < this->unk4C) {
if (MAX(0.25, (12.0 - this->actor_specific_1_f) / 12.0) < this->unk4C) {
*(s32 *)(&this->local) = NOT(*(s32 *)(&this->local));
this->unk4C = 0.0f;
if (*(s32 *)(&this->local)) {
@@ -170,15 +170,15 @@ void chshrapnel_update(Actor *this) {
subaddie_set_state(this, 3);
actor_loopAnimation(this);
FUNC_8030E8B4(SFX_C4_TWINKLY_MUNCHER_GRR, 0.6f, 32750, this->position, 1250, 2500);
this->unk28 = 4.0f;
this->actor_specific_1_f = 4.0f;
}
}
break;
case 3:
this->yaw_ideal = (f32) func_80329784(this);
func_80328FB0(this, this->unk28 / 2);
this->unk28 = MIN( 50.0, (this->unk28 + tick));
func_80328FB0(this, this->actor_specific_1_f / 2);
this->actor_specific_1_f = MIN(50.0, (this->actor_specific_1_f + tick));
if ((250.0 <= ABS(player_position[1] - this->unk1C[1])) || !func_80329054(this, 0)) {
chShrapnel_func_802D0AB8(this);
}

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

@@ -65,7 +65,7 @@ s32 D_8037E630;
/* .code */
void func_802E0CD0(Actor *this){
this->unk28 = 4.0f;
this->actor_specific_1_f = 4.0f;
}
static void __chsnacker_start_dialog(Actor *this) {
@@ -76,15 +76,15 @@ static void __chsnacker_start_dialog(Actor *this) {
this->unk38_31--;
}
else{
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
if (level_get() == LEVEL_2_TREASURE_TROVE_COVE) {
text_index = mapSpecificFlags_getN(8, 3);
if( !this->is_first_encounter ) {
if( !this->has_met_before ) {
if(text_index < 4) {
if(func_80311480(0xA1B + text_index, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showText(0xA1B + text_index, 0, NULL, NULL, NULL, NULL)){
text_index++;
mapSpecificFlags_setN(8, text_index, 3);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
}
@@ -103,7 +103,7 @@ bool func_802E0DC0(f32 snacker_position[3]){
}
void func_802E0E88(Actor *this){
this->unk28 = 2.0f;
this->actor_specific_1_f = 2.0f;
subaddie_set_state_with_direction(this, 5, 0.0f, -1);
actor_playAnimationOnce(this);
}
@@ -156,8 +156,8 @@ static void __chsnacker_ow(ActorMarker *marker, ActorMarker *other){
Actor *this;
this = marker_getActor(marker);
if(level_get() == LEVEL_2_TREASURE_TROVE_COVE && !func_8028F22C()){
func_80311480(0xA29, 0, NULL, NULL, NULL, NULL);
if(level_get() == LEVEL_2_TREASURE_TROVE_COVE && !player_isDead()){
gcdialog_showText(0xA29, 0, NULL, NULL, NULL, NULL);
}//L802E10A4
if(this->state == 4){
@@ -235,7 +235,7 @@ void chsnacker_update(Actor *this) {
func_80328FF0(this, 3.0f);
if (func_80329480(this)) {
subaddie_set_state_with_direction(this, 4, 0.0f, 1);
this->unk28 = 9.0f;
this->actor_specific_1_f = 9.0f;
}
break;
@@ -243,9 +243,9 @@ void chsnacker_update(Actor *this) {
func_803297FC(this, &sp44, &sp40);
this->yaw_ideal = sp40;
this->unk6C = func_802E10F0(sp44);
func_80328FB0(this, this->unk28 / 2);
func_80328FF0(this, this->unk28 / 2);
this->unk28 = MIN(50.0, this->unk28 + dt);
func_80328FB0(this, this->actor_specific_1_f / 2);
func_80328FF0(this, this->actor_specific_1_f / 2);
this->actor_specific_1_f = MIN(50.0, this->actor_specific_1_f + dt);
func_8032CA80(this, (s_chSnacker_inRbb) ? 15 : 9);
break;

28
src/core2/ch/termite.c
View File

@@ -25,12 +25,14 @@ void __chTermite_updateRandomSpeed(Actor *this) {
}
void __chTermite_updateAnimationSpeed(Actor *this) {
if ((this->velocity[0] - 0.1 <= this->unk28) && (this->unk28 <= this->velocity[0] + 0.1)) {
this->unk28 = this->velocity[0];
} else {
this->unk28 += (this->velocity[0] < this->unk28)? -0.2 : 0.2;
if ((this->velocity[0] - 0.1 <= this->actor_specific_1_f) && (this->actor_specific_1_f <= this->velocity[0] + 0.1)) {
this->actor_specific_1_f = this->velocity[0];
}
animctrl_setDuration(this->animctrl, ml_map_f(this->unk28, 5.0f, 12.0f, 0.54f, 0.36f));
else {
this->actor_specific_1_f += (this->velocity[0] < this->actor_specific_1_f) ? -0.2 : 0.2;
}
animctrl_setDuration(this->animctrl, ml_map_f(this->actor_specific_1_f, 5.0f, 12.0f, 0.54f, 0.36f));
}
void __chTermite_updateRandomRotationSpeed(Actor *this) {
@@ -144,7 +146,7 @@ void __chTermite_testCallback(ActorMarker *caller, enum asset_e text_id, s32 arg
Actor *this;
this = marker_getActor(caller);
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
levelSpecificFlags_set(0xd, FALSE);
}
@@ -157,7 +159,7 @@ void chTermite_update(Actor *this) {
if (!this->volatile_initialized) {
marker_setCollisionScripts(this->marker, NULL, __chTermite_ow, __chTermite_die);
this->unk124_0 = this->unk138_31 = FALSE;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->unk16C_0 = TRUE;
this->volatile_initialized = TRUE;
}
@@ -168,10 +170,10 @@ void chTermite_update(Actor *this) {
&& func_8028ECAC() == 0
&& player_getTransformation() == TRANSFORM_1_BANJO
) {
func_80311480(ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR, 7, this->position, this->marker, __chTermite_testCallback, NULL);
gcdialog_showText(ASSET_B43_DIALOG_TERMITE_MEET_AS_BEAR, 7, this->position, this->marker, __chTermite_testCallback, NULL);
mapSpecificFlags_set(0, TRUE);
levelSpecificFlags_set(0xD, TRUE);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
if( func_80329530(this, 300)
@@ -180,11 +182,11 @@ void chTermite_update(Actor *this) {
&& player_getTransformation() == TRANSFORM_2_TERMITE
) {
if (!levelSpecificFlags_get(0xB)) {
if (func_80311480(ASSET_B41_DIALOG_TERMITE_COOL_SHORTS, 0, NULL, NULL, NULL, NULL)) {
if (gcdialog_showText(ASSET_B41_DIALOG_TERMITE_COOL_SHORTS, 0, NULL, NULL, NULL, NULL)) {
levelSpecificFlags_set(0xB, TRUE);
this->unk138_23 = TRUE;
}
} else if (!levelSpecificFlags_get(0xC) && !this->unk138_23 && (func_80311480(ASSET_B42_DIALOG_TERMITE_COOL_BACKPACK, 0, NULL, NULL, NULL, NULL))) {
} else if (!levelSpecificFlags_get(0xC) && !this->unk138_23 && (gcdialog_showText(ASSET_B42_DIALOG_TERMITE_COOL_BACKPACK, 0, NULL, NULL, NULL, NULL))) {
levelSpecificFlags_set(0xC, TRUE);
}
}
@@ -193,7 +195,7 @@ void chTermite_update(Actor *this) {
if (subaddie_maybe_set_state_position_direction(this, 2, 0.0f, 1, 0.06f)) {
__chTermite_updateRandomRotationSpeed(this);
__chTermite_updateRandomSpeed(this);
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
return;
}
return;
@@ -216,7 +218,7 @@ void chTermite_update(Actor *this) {
if (func_8034A6FC(0.73f, 0.76f) && func_80329078(this, (s32) this->yaw, 750) ) {
this->yaw_ideal = this->yaw;
this->velocity[0] = 35.0f;
this->unk28 = 19.4444447f;
this->actor_specific_1_f = 19.4444447f;
this->unk38_31 = 0x3A;
}
if ((sp34 & 0x1F) == 3 && 0.58 < (f64) randf()) {

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

@@ -81,7 +81,7 @@ void chtrainers_update(Actor *this){
&& !volatileFlag_get(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES)
&& player_getTransformation() == TRANSFORM_1_BANJO
){
if(func_80311480(0xda4, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showText(0xda4, 0, NULL, NULL, NULL, NULL)){
volatileFlag_set(VOLATILE_FLAG_F_HAS_MEET_TURBO_SHOES, TRUE);
}
}//L802CA620

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

@@ -69,7 +69,7 @@ void chwadingboots_update(Actor *this){
if(!func_80329530(this, 250)) break;
if(player_getTransformation() != TRANSFORM_1_BANJO) break;
if(func_80311480(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showText(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){
volatileFlag_set(VOLATILE_FLAG_10_HAS_MEET_WADING_BOOTS, TRUE);
}

2
src/core2/code_14420.c
View File

@@ -342,7 +342,7 @@ void func_8029B890(void){
func_8029B62C();
return;
}
func_80311480(0xf81, 7, NULL, NULL, func_8029B85C, NULL);
gcdialog_showText(0xf81, 7, NULL, NULL, func_8029B85C, NULL);
fileProgressFlag_set(FILEPROG_A8_HAS_DIED, TRUE);
}
else{

2
src/core2/code_16010.c
View File

@@ -232,7 +232,7 @@ bool func_8029D7B4(void){
&& func_8028EC04() < 1U
&& func_80297C6C() != 3
&& bs_getState() != BS_3D_FALL_TUMBLING
&& func_8028F22C() < 1U
&& player_isDead() < 1U
;
}
return 0;

2
src/core2/code_33C30.c
View File

@@ -26,7 +26,7 @@ void func_802BAC10(void){
}
bool func_802BAC1C(void) {
return (func_80320EB0(D_8037D810, 100.0f, 1) != NULL) ? TRUE : FALSE;
return BOOL(func_80320EB0(D_8037D810, 100.0f, 1) != NULL);
}
void func_802BAC58(void) {

4
src/core2/code_33F90.c
View File

@@ -481,8 +481,8 @@ void func_802BB22C(void){
}
}
bool func_802BB270(void){
return (!D_80364E00) ? TRUE : FALSE;
bool func_802BB270(void) {
return BOOL(!D_80364E00);
}
s32 func_802BB294(void){

45
src/core2/code_41FB0.c
View File

@@ -134,45 +134,46 @@ void func_802C8F7C(f32 arg0){
Actor *func_802C8F88(s32 arg0, s32 arg1[3]){
f32 sp1C[3];
sp1C[0] = arg1[0];
sp1C[1] = arg1[1];
sp1C[2] = arg1[2];
TUPLE_COPY(sp1C, arg1)
return func_802C937C(arg0, sp1C);
}
Actor *func_802C8FE4(s32 arg0, f32 position[3], Actor *arg2){
Actor *func_802C8FE4(s32 index, f32 position[3], Actor *arg2) {
static f32 D_80366C4C = 400.0f;
struct41FB0s * sp74; //s2
Actor *actor; //s3
struct41FB0s *sp74 = D_80366460 + index;
Actor *actor = NULL; //s3
s32 i;
struct41FB0s_1 *s0;
sp74 = D_80366460 + arg0;
actor = NULL;
for(i = 0; i < sp74->count; i++){//L802C90B0
D_8037DDB4 += 360.0/sp74->count;
while(360.0 <= D_8037DDB4){ D_8037DDB4 -= 360.0;}
for (i = 0; i < sp74->count; i++) {//L802C90B0
D_8037DDB4 += 360.0 / sp74->count;
while (360.0 <= D_8037DDB4) { D_8037DDB4 -= 360.0; }
//L802C9114
actor =(i == 0 && arg2) ? arg2 : spawn_actor_f32(sp74->actor_id, position, 0);
actor = (i == 0 && arg2) ? arg2 : spawn_actor_f32(sp74->actor_id, position, 0);
actor->unk10_0 = 1;
s0 = (struct41FB0s_1 *) &actor->unkBC;
s0->unk0 = arg0;
s0->unk0 = index;
s0->unk2F = 1;
s0->unk6 = 1;
ml_vec3f_copy(s0->unk8, actor->position);
ml_vec3f_copy(actor->position, s0->unk8);
if(D_8037DDB8 != 1.0f){
s0->unk14[0] = sp74->unk14*D_8037DDB8;
if (D_8037DDB8 != 1.0f) {
s0->unk14[0] = sp74->unk14 * D_8037DDB8;
s0->unk14[1] = sp74->unk1C + randf2(0.0f, sp74->unk20);
s0->unk14[2] = sp74->unk24*D_8037DDB8;
s0->unk14[2] = sp74->unk24 * D_8037DDB8;
D_8037DDB8 = 1.0f;
}
else{//L802C91CC
else {//L802C91CC
s0->unk14[0] = sp74->unk14 + randf2(0.0f, sp74->unk18);
s0->unk14[1] = sp74->unk1C + randf2(0.0f, sp74->unk20);
s0->unk14[2] = sp74->unk24 + randf2(0.0f, sp74->unk28);
}//L802C9210
ml_vec3f_yaw_rotate_copy(s0->unk14, s0->unk14, D_8037DDB4);
s0->unk24 = D_80366C4C *= -1;
actor->yaw = s0->unk20 = (sp74->unk0 & 0x20) ? sp74->unk30 : randf2(0.0f, 360.0f);
@@ -180,11 +181,13 @@ Actor *func_802C8FE4(s32 arg0, f32 position[3], Actor *arg2){
s0->unk2C = 0;
s0->unk2D = 1;
s0->unk4 = sp74->unk0;
s0->unk2E = (sp74->unk0 & 0x1) ? (0.5 < randf()) : 0 ;
if(sp74->unk0 & 0x200){
s0->unk2E = (sp74->unk0 & 0x1) ? (0.5 < randf()) : 0;
if (sp74->unk0 & 0x200) {
actor->unk5C = s0->unk8[1];
}
}//L802C92E8
return actor;
}
@@ -194,7 +197,7 @@ Actor *func_802C9334(s32 arg0, Actor * arg1){
}
Actor *func_802C937C(s32 arg0, f32 position[3]){
return func_802C8FE4(arg0, position, 0);
return func_802C8FE4(arg0, position, NULL);
}
bool func_802C939C(Actor *actor, f32 arg1[3], f32 arg2[3], f32 arg3[3], bool arg4) {

10
src/core2/code_47BD0.c
View File

@@ -153,7 +153,7 @@ void func_802CEF54(Actor *this, f32 arg1[3], f32 arg2){
phi_v1 = (this->state == 5) ? 200 : 50;
phi_v0 = (this->state == 5) ? 200 : 100;
func_802CEDE4(sp34, this->unk1C, arg2, &this->unk28, (f32) phi_v1, (f32) phi_v0);
func_802CEDE4(sp34, this->unk1C, arg2, &this->actor_specific_1_f, (f32) phi_v1, (f32) phi_v0);
this->unk1C[0] = this->unk1C[0] + arg1[0];
this->unk1C[1] = this->unk1C[1] + arg1[1];
this->unk1C[2] = this->unk1C[2] + arg1[2];
@@ -418,7 +418,7 @@ void chBeeSwarm_update(Actor *this) {
subaddie_set_state(this, 6);
}
}
chBeeSwarm_802CF1C8(this->unk1C, this->position, this->velocity, this->unk28, 100.0f, 0, &spA0);
chBeeSwarm_802CF1C8(this->unk1C, this->position, this->velocity, this->actor_specific_1_f, 100.0f, 0, &spA0);
}
if (map_get() == MAP_78_GL_RBB_AND_MMM_PUZZLE) {
if (this->unk38_31++ == 0x1E) {
@@ -448,7 +448,7 @@ void chBeeSwarm_update(Actor *this) {
if (!fileProgressFlag_get(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE) && subaddie_playerIsWithinCylinder(this, 250, 300)
&& ((func_8028ECAC() == 0) || (func_8028ECAC() == BSGROUP_8_TROT))
&& (player_getTransformation() == TRANSFORM_1_BANJO)
&& (func_80311480(0xDA6, 0, NULL, NULL, NULL, NULL) != 0)
&& (gcdialog_showText(0xDA6, 0, NULL, NULL, NULL, NULL) != 0)
) {
fileProgressFlag_set(FILEPROG_8F_MET_BEE_INFESTED_BEEHIVE, TRUE);
}
@@ -470,7 +470,7 @@ void chBeeSwarm_update(Actor *this) {
this->unk1C[1] = spB4[1];
this->unk1C[2] = spB4[2];
this->unk1C[1] += 50.0f;
this->unk28 = 400.0f;
this->actor_specific_1_f = 400.0f;
if (ml_distance_vec3f(this->position, this->unk1C) < 100.0f) {
func_802CEF54(this, spB4, 50.0f);
subaddie_set_state(this, 4);
@@ -547,7 +547,7 @@ void chBeeSwarm_update(Actor *this) {
sfxsource_set_fade_distances(this->unk44_31, 500.0f, 1500.0f);
sfxsource_set_position(this->unk44_31, this->position);
func_8030E2C4(this->unk44_31);
sfxsource_setSampleRate(this->unk44_31, (s32)(((gu_sqrtf(this->velocity[0]*this->velocity[0] + this->velocity[1]*this->velocity[1] + this->velocity[2]*this->velocity[2])/ this->unk28) * 8000.0f) + 2000.0f));
sfxsource_setSampleRate(this->unk44_31, (s32)(((gu_sqrtf(this->velocity[0] * this->velocity[0] + this->velocity[1] * this->velocity[1] + this->velocity[2] * this->velocity[2]) / this->actor_specific_1_f) * 8000.0f) + 2000.0f));
}
}
}

46
src/core2/code_4A6F0.c
View File

@@ -105,7 +105,7 @@ bool chMumbo_withinHorzDistToPlayer(s32 x, s32 z, s32 dist) {
bool chMumbo_func_802D181C(s32 arg0) {
s32 search_start_cube[3] = D_80367504;
return (cubeList_findNodePropByActorId(arg0, search_start_cube))? TRUE : FALSE;
return BOOL(cubeList_findNodePropByActorId(arg0, search_start_cube));
}
void chMumbo_func_802D186C(Actor *this) {
@@ -144,12 +144,12 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
this = marker_getActor(caller);
switch(text_id){
case ASSET_D8F_DIALOG_MUMBO_MEET: //L802D1A04
func_80311480((this->unk38_0) ? ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS : ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xe, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText((this->unk38_0) ? ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS : ASSET_DAB_DIALOG_MUMBO_NOT_ENOUGH_TOKENS, 0xe, this->position, this->marker, __chMumbo_textCallback, NULL);
return;
case ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR: //L802D1A40
fileProgressFlag_set(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE);
func_80311480(ASSET_D8F_DIALOG_MUMBO_MEET + D_8037DDF0, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_D8F_DIALOG_MUMBO_MEET + D_8037DDF0, 4, NULL, NULL, NULL, NULL);
gcpausemenu_80314AC8(1);
break;
@@ -160,7 +160,7 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
break;
case ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE: //L802D1A98
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
if(this->unk38_31 != 0){
func_8025A6EC(COMUSIC_2B_DING_B, 28000);
item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31);
@@ -192,16 +192,16 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) {
if (this->unk10_12 != 0) {
func_80311480(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(fileProgressFlag_getN(FILEPROG_BB_MUMBO_MISTAKE_INDEX, 2) + ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
return;
}
if (fileProgressFlag_get(FILEPROG_12_HAS_TRANSFORMED_BEFORE)) {
if (this->velocity[0] == 0.0f) {
func_80311480(transform_id + ASSET_D8F_DIALOG_MUMBO_MEET, 6, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(transform_id + ASSET_D8F_DIALOG_MUMBO_MEET, 6, this->position, this->marker, __chMumbo_textCallback, NULL);
return;
}
if (map_get() == MAP_7A_GL_CRYPT && transform_id == TRANSFORM_3_PUMPKIN && !fileProgressFlag_get(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT)) {
func_80311480(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 6, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(ASSET_DAD_DIALOG_MUMBO_XFORM_IN_CRYPT, 6, this->position, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_F7_HAS_TRANSFORMED_IN_CRYPT, TRUE);
return;
}
@@ -209,7 +209,7 @@ void chMumbo_func_802D1B8C(Actor *this, enum transformation_e transform_id) {
subaddie_set_state(this, 4U);
return;
}
func_80311480(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(ASSET_D90_DIALOG_MUMBO_MAGIC_PAID_FOR, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
}
void chMumbo_update(Actor *this) {
@@ -249,7 +249,7 @@ void chMumbo_update(Actor *this) {
}
this->unk38_0 = (item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unk38_31);
this->unk10_12 = 0;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->volatile_initialized = TRUE;
}
@@ -273,7 +273,7 @@ void chMumbo_update(Actor *this) {
case 2: //L802D1F90
if (actor_animationIsAt(this, 0.25f) != 0) {
func_8030E484(0x41);
sfxsource_playHighPriority(0x41);
}
actor_playAnimationOnce(this);
if (actor_animationIsAt(this, 0.999f)) {
@@ -282,7 +282,7 @@ void chMumbo_update(Actor *this) {
&& !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)
) {
subaddie_set_state(this, 3);
func_80311480(ASSET_D8F_DIALOG_MUMBO_MEET, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(ASSET_D8F_DIALOG_MUMBO_MEET, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_11_HAS_MET_MUMBO, TRUE);
break;
}
@@ -293,7 +293,7 @@ void chMumbo_update(Actor *this) {
&& this->unk38_0
){
subaddie_set_state(this, 3);
func_80311480(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(ASSET_DAA_DIALOG_MUMBO_HAS_ENOUGH_TOKENS, 0xE, this->position, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_DC_HAS_HAD_ENOUGH_TOKENS_BEFORE, TRUE);
break;
}
@@ -331,9 +331,9 @@ void chMumbo_update(Actor *this) {
&& randf() < 0.01
&& sp48
) {
func_80311480(ASSET_DAE_DIALOG_MUMBO_TREX_START, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(ASSET_DAE_DIALOG_MUMBO_TREX_START, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
fileProgressFlag_set(FILEPROG_BA_HAS_SEEN_TREX_TEXT, 1);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
subaddie_set_state(this, 3);
} else if (
sp44
@@ -360,7 +360,7 @@ void chMumbo_update(Actor *this) {
break;
}
func_8025A6EC(COMUSIC_2C_BUZZER, 22000);
if ((levelSpecificFlags_get(0x3E) == 0) && (func_80311480(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0, NULL, NULL, NULL, NULL) != 0)) {
if ((levelSpecificFlags_get(0x3E) == 0) && (gcdialog_showText(ASSET_DAC_DIALOG_MUMBO_FAIL_TO_BUY, 0, NULL, NULL, NULL, NULL) != 0)) {
levelSpecificFlags_set(0x3E, 1);
}
}
@@ -385,7 +385,7 @@ void chMumbo_update(Actor *this) {
}
if (actor_animationIsAt(this, 0.01f)) {
if ( this->is_first_encounter
if ( this->has_met_before
|| (this->unk10_12 == 0
&& (player_getTransformation() != TRANSFORM_1_BANJO)
&& (player_getTransformation() != TRANSFORM_7_WISHWASHY))
@@ -407,7 +407,7 @@ void chMumbo_update(Actor *this) {
func_8025A58C(-1, 1000);
}
if (actor_animationIsAt(this, 0.999f)) {
if (!this->is_first_encounter) {
if (!this->has_met_before) {
func_8028F918(0);
}
func_8025A7DC(COMUSIC_1D_MUMBO_TRANSFORMATION);
@@ -416,9 +416,9 @@ void chMumbo_update(Actor *this) {
chMumbo_func_802D1B8C(this, D_8037DDF0);
break;
}
if (this->is_first_encounter) {
if (this->has_met_before) {
subaddie_set_state(this, 3);
func_80311480(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
gcdialog_showText(ASSET_DAF_DIALOG_MUMBO_TREX_MISTAKE, 6, NULL, this->marker, __chMumbo_textCallback, NULL);
break;
}
gcpausemenu_80314AC8(1);
@@ -435,7 +435,7 @@ void chMumbo_update(Actor *this) {
sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC);
}
if (sp48 != 0) {
func_80311480(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 7, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_DA7_DIALOG_MUMBO_CCW_SUMMER, 7, NULL, NULL, NULL, NULL);
volatileFlag_set(FILEPROG_11_HAS_MET_MUMBO, TRUE);
}
}
@@ -451,7 +451,7 @@ void chMumbo_update(Actor *this) {
sp48 = chMumbo_withinHorzDistToPlayer(0, -0x6B, 0xBC);
}
if (sp48 != 0) {
func_80311480(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 7, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_DA8_DIALOG_MUMBO_CCW_AUTUMN, 7, NULL, NULL, NULL, NULL);
volatileFlag_set(FILEPROG_12_HAS_TRANSFORMED_BEFORE, TRUE);
}
}
@@ -512,7 +512,7 @@ void chMumbo_detransformWarn(s32 this, s32 arg1){
if(D_8037DDF3)
return;
func_80311480(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV : ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xe, NULL, NULL, NULL, NULL);
gcdialog_showText(fileProgressFlag_getAndSet(FILEPROG_83_MAGIC_GET_WEAK_TEXT, TRUE) ? ASSET_F5C_DIALOG_MUMBO_MAGIC_GET_WEAK_ABREV : ASSET_F5B_DIALOG_MUMBO_MAGIC_GET_WEAK_FULL, 0xe, NULL, NULL, NULL, NULL);
}
void chMumbo_detransformTrigger(s32 this, s32 arg1){
@@ -520,7 +520,7 @@ void chMumbo_detransformTrigger(s32 this, s32 arg1){
xform = player_getTransformation();
if(xform == TRANSFORM_1_BANJO || xform == TRANSFORM_7_WISHWASHY || D_8037DDF1)
return;
func_80311480(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV: ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xe, NULL, NULL, NULL, NULL);
gcdialog_showText(fileProgressFlag_getAndSet(FILEPROG_84_MAGIC_ALL_GONE_TEXT, TRUE) ? ASSET_F5E_DIALOG_MUMBO_MAGIC_RUN_OUT_ABREV: ASSET_F5D_DIALOG_MUMBO_MAGIC_RUN_OUT_FULL, 0xe, NULL, NULL, NULL, NULL);
D_8037DDF1++;
func_8028FB88(TRANSFORM_1_BANJO);
}

6
src/core2/code_4C020.c
View File

@@ -505,7 +505,7 @@ bool func_802D42F8(Actor *this) {
void func_802D4388(Actor *this){
func_802D3CE8(this);
this->unk38_0 = ( map_get() == MAP_7A_GL_CRYPT || item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unkF4_8 || func_802D42F8(this)) ? TRUE : FALSE;
this->unk38_0 = BOOL(map_get() == MAP_7A_GL_CRYPT || item_getCount(ITEM_1C_MUMBO_TOKEN) >= this->unkF4_8 || func_802D42F8(this));
mapSpecificFlags_set(0x1F, (func_8028F20C() && func_8028FB48(0x78000000)) || func_8028ECAC() == BSGROUP_D_TRANSFORMING);
switch(this->state){
case 0x12: //L802D4468
@@ -1057,7 +1057,7 @@ void func_802D5628(void){
}//L802D5F1C
if(volatileFlag_get(VOLATILE_FLAG_22)){
if(func_80311480(0xF82, 4, NULL, NULL, NULL, NULL)){
if(gcdialog_showText(0xF82, 4, NULL, NULL, NULL, NULL)){
fileProgressFlag_set(FILEPROG_C1_BADDIES_ESCAPE_TEXT, TRUE);
volatileFlag_set(VOLATILE_FLAG_22, 0);
D_8037DE04 = 0.0f;
@@ -1067,7 +1067,7 @@ void func_802D5628(void){
}
}
else{//L802D5FCC
if(func_80311480(D_8037DE00, 0, NULL, NULL, NULL, NULL)){
if(gcdialog_showText(D_8037DE00, 0, NULL, NULL, NULL, NULL)){
D_8037DE00++;
if(!(D_8037DE00 < sp4C)){
D_8037DE00 = 0xF86;

10
src/core2/code_509D0.c
View File

@@ -6,7 +6,7 @@ extern void func_8028F7D4(f32, f32);
void chLevelCollectible_update(Actor *this);
extern void func_80329904(ActorMarker *, s32, f32*);
extern ActorMarker *func_8028E86C(void);
extern void func_803252D0(f32, s32);
extern void timed_mapSpecificFlags_setTrue(f32, s32);
extern void func_8035646C(s32);
ActorAnimationInfo D_80367B50[] = {
@@ -107,8 +107,10 @@ void __chLevelCollectible_collide(ActorMarker *marker, ActorMarker *other_marker
sp18[2] = this->position[2];
switch (marker->id) {
case MARKER_36_ORANGE_COLLECTIBLE:
if (mapSpecificFlags_get(1))
if (mapSpecificFlags_get(MM_SPECIFIC_FLAG_1_ORANGE_HAS_BEEN_COLLECTED)) {
return;
}
func_8035646C(FILEPROG_8_ORANGE_TEXT);
func_8030E6D4(SFX_B3_ORANGE_TALKING);
dialog_id = 0;
@@ -234,7 +236,7 @@ void __chLevelCollectible_returnObj(Actor *this) {
case MARKER_37_GOLD_BULLION:
break;
case MARKER_36_ORANGE_COLLECTIBLE:
func_803252D0(1.7f, 2);
timed_mapSpecificFlags_setTrue(1.7f, MM_SPECIFIC_FLAG_2_ORANGE_HAS_BEEN_RETURNED);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
break;
case MARKER_1FD_BLUE_PRESENT_COLLECTIBLE:
@@ -363,7 +365,7 @@ void chLevelCollectible_update(Actor *this){
func_802D83EC(this);
break;
case MARKER_36_ORANGE_COLLECTIBLE: //L802D86DC
if(mapSpecificFlags_get(3) && map_get() == MAP_2_MM_MUMBOS_MOUNTAIN){
if (mapSpecificFlags_get(MM_SPECIFIC_FLAG_3_CHIMPY_HAS_LEAVED) && map_get() == MAP_2_MM_MUMBOS_MOUNTAIN) {
marker_despawn(this->marker);
}
break;

2
src/core2/code_51950.c
View File

@@ -83,7 +83,7 @@ void func_802D8B20(enum actor_e actor_id){
temp_v0 = (randf() > 0.5) ? 0x1E : -0x1E;
feather = spawn_actor_f32(actor_id, plyr_pos, (s32) (temp2 + temp_v0));
func_8032AA58(feather, 0.45f);
feather->unk28 = 22.0f;
feather->actor_specific_1_f = 22.0f;
feather->unk1C[1] = 48.0f;
feather->lifetime_value = 1.2f;
}

6
src/core2/code_53A10.c
View File

@@ -67,7 +67,7 @@ void func_802DAA14(Actor *this){
return;
}
if(!this->is_first_encounter){
if(!this->has_met_before){
if(level_get() == LEVEL_A_MAD_MONSTER_MANSION){
text_id = 0xadc;
}
@@ -78,7 +78,7 @@ void func_802DAA14(Actor *this){
tmp = 0xf67;
text_id = tmp;
}
func_80311480(text_id, 4, NULL, this->marker, func_802DA9A0, NULL);
this->is_first_encounter = TRUE;
gcdialog_showText(text_id, 4, NULL, this->marker, func_802DA9A0, NULL);
this->has_met_before = TRUE;
}
}

10
src/core2/code_53C10.c
View File

@@ -84,7 +84,7 @@ void func_802DAE10(Actor *this){
ActorLocal_core2_53C10 *local;
local = (ActorLocal_core2_53C10 *)&this->local;
this->unk28 = randf2(local->unk0, local->unk4);
this->actor_specific_1_f = randf2(local->unk0, local->unk4);
}
void func_802DAE40(Actor *this) {
@@ -132,7 +132,7 @@ bool func_802DAFBC(Actor *this) {
func_8032C9E0(sp38);
sp34 = func_80257248(sp38, this->position);
if (((globalTimer_getTime() - local->unk38) == 0x1E) && ((sp34 - this->yaw_ideal < 15.0f) && (sp34 - this->yaw_ideal > -15.0f))) {
func_802DAF2C(this->position, this->yaw, this->unk28);
func_802DAF2C(this->position, this->yaw, this->actor_specific_1_f);
} else {
func_80328CEC(this, (s32) sp34, 0, 0xF);
}
@@ -208,7 +208,7 @@ void func_802DB440(ActorMarker *marker, ActorMarker *other_marker) {
this = marker_getActor(marker);
if( this->state == 7
&& this->unk28 >= 3.0
&& this->actor_specific_1_f >= 3.0
&& func_803294F0(this, 0x50, func_80329784(this))
) {
FUNC_8030E8B4(SFX_1F_HITTING_AN_ENEMY_3, 1.0f, 20000, this->position, 1250, 2500);
@@ -294,7 +294,7 @@ void func_802DB5A0(Actor *this) {
&& func_80329078(this, (s32) this->yaw_ideal, 0x96)
) {
if (subaddie_maybe_set_state(this, 3, 0.13f) != 0) {
this->unk28 = randf2((f32)local->unk8, (f32)local->unk9);
this->actor_specific_1_f = randf2((f32)local->unk8, (f32)local->unk9);
}
}
func_802DB220(this);
@@ -341,7 +341,7 @@ void func_802DB5A0(Actor *this) {
|| (this->unk10_12 < local->unkC_31 && func_80329530(this, 0xFA))
) {
subaddie_set_state(this, 7);
this->unk28 = (f32)local->unkA;
this->actor_specific_1_f = (f32) local->unkA;
this->unk38_31 = 0;
}
if(!func_80329078(this, (s32) this->yaw, 0x14)) {

2
src/core2/code_581D0.c
View File

@@ -70,7 +70,7 @@ void func_802DF2C4(Actor *this) {
for( i = 0; i < 20; i++){
prev_val = D_8037E008[i];
temp_v0 = func_8034C2C4(this->marker, i + 0x190);
D_8037E008[i] = (i == temp_fp) ? TRUE : FALSE;
D_8037E008[i] = BOOL(i == temp_fp);
if (prev_val != D_8037E008[i] ) {
val = D_8037E008[i];
switch(val){

4
src/core2/code_5BEB0.c
View File

@@ -83,8 +83,6 @@ void mapSavestate_save(enum map_e map)
D_8037E650[map] = actors_appendToSavestate(D_8037E650[map], ((u32 *) D_8037E650[map]) + (4 * ((iBit + 0x7F) >> 7)));
}
#define AS_BOOL(expr) ((expr)? TRUE : FALSE)
void mapSavestate_apply(enum map_e map_id) {
s32 iBit = 0;
u32* flag_ptr;
@@ -102,7 +100,7 @@ void mapSavestate_apply(enum map_e map_id) {
func_803083B0(-1);
while (
bit_value = AS_BOOL((((u32*)D_8037E650[map_id])[iBit >> 5] & (1 << (iBit & 0x1f)))),
bit_value = BOOL(((u32*)D_8037E650[map_id])[iBit >> 5] & (1 << (iBit & 0x1f))),
func_803083B0(bit_value) != -1
) {
iBit++;

28
src/core2/code_5C870.c
View File

@@ -174,7 +174,7 @@ void func_802E3BF0(void){
}
//_set_game_mode
void func_802E3BF8(enum game_mode_e next_mode, s32 arg1){
void game_setMode(enum game_mode_e next_mode, s32 arg1){
s32 prev_mode = D_8037E8E0.game_mode;
s32 sp20;
s32 sp1C;
@@ -261,7 +261,7 @@ void func_802E3E7C(enum game_mode_e mode){
map = D_8037E8E0.map;
sp28 = D_8037E8E0.exit;
prev_mode = D_8037E8E0.unk0;
func_802E3BF8(GAME_MODE_2_UNKNOWN, 0);
game_setMode(GAME_MODE_2_UNKNOWN, 0);
if(!volatileFlag_getAndSet(VOLATILE_FLAG_21, 0) || map_getLevel(map_get()) == map_getLevel(D_8037E8E0.map)){
if(!volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE))
mapSavestate_save(map_get());
@@ -270,7 +270,7 @@ void func_802E3E7C(enum game_mode_e mode){
func_802E38E8(map, sp28, sp34);
mapSavestate_apply(map);
D_8037E8E0.unk0 = prev_mode;
func_802E3BF8(mode, sp30);
game_setMode(mode, sp30);
jiggylist_map_actors();
func_80346CA8();
}
@@ -357,7 +357,7 @@ void func_802E412C(s32 arg0, s32 arg1){
}
void func_802E4170(void){
func_802E3BF8(GAME_MODE_2_UNKNOWN,0);
game_setMode(GAME_MODE_2_UNKNOWN,0);
defragManager_free();
func_802E5F68();
if(!func_802E4A08())
@@ -405,7 +405,7 @@ void func_802E4214(enum map_e map_id){
func_8033DC70();
func_8033DC04();
func_8031FBA0();
D_8037E8E0.game_mode = 2;
D_8037E8E0.game_mode = GAME_MODE_2_UNKNOWN;
D_8037E8E0.unk8 = 0.0f;
func_8033DC9C(0.0f);
func_8033DD04(0);
@@ -414,7 +414,7 @@ void func_802E4214(enum map_e map_id){
func_802E3854();
func_802E38E8(map_id, 0, 0);
D_8037E8E0.unk0 = 0;
func_802E3BF8(GAME_MODE_3_NORMAL,1);
game_setMode(GAME_MODE_3_NORMAL,1);
}
void func_802E4384(void){
@@ -512,7 +512,7 @@ bool func_802E4424(void) {
}
}
if (D_8037E8E0.unk1A != 0) {
func_802E3BF8(D_8037E8E0.unk1A - 1, D_8037E8E0.unk1B);
game_setMode(D_8037E8E0.unk1A - 1, D_8037E8E0.unk1B);
D_8037E8E0.unk1A = 0;
}
sp1C = func_80334ECC();
@@ -528,7 +528,7 @@ bool func_802E4424(void) {
case GAME_MODE_9_BANJO_AND_KAZOOIE:
func_8034BB90();
if ((controller_getStartButton(0) == 1) && (D_8037E8E0.unk0 != 0)) {
func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U);
game_setMode(GAME_MODE_1_UNKNOWN, 0U);
}
break;
case GAME_MODE_3_NORMAL: /* switch 2 */
@@ -541,16 +541,16 @@ bool func_802E4424(void) {
&& (level_get() != 0)
&& (0.6 < D_8037E8E0.unk10)
&& gcpausemenu_80314B00()
&& !func_8028F22C()
&& !player_isDead()
&& func_8032056C()
&& levelSpecificFlags_validateCRC1()
&& dummy_func_80320248()
) {
func_802E3BF8(GAME_MODE_4_PAUSED, 0U);
game_setMode(GAME_MODE_4_PAUSED, 0U);
} else if ((controller_getStartButton(0) == 1) && (D_8037E8E0.unk0 != 0)) {
func_802E3BF8(GAME_MODE_1_UNKNOWN, 0U);
game_setMode(GAME_MODE_1_UNKNOWN, 0U);
} else if (sp1C == 0) {
func_802E3BF8(GAME_MODE_3_NORMAL, 1U);
game_setMode(GAME_MODE_3_NORMAL, 1U);
}
break;
@@ -561,7 +561,7 @@ bool func_802E4424(void) {
func_8025A430(-1, 2000, 3);
func_8025A2B0();
func_80335128(1);
func_802E3BF8(GAME_MODE_3_NORMAL, 0U);
game_setMode(GAME_MODE_3_NORMAL, 0U);
}
break;
}
@@ -577,7 +577,7 @@ bool func_802E4424(void) {
}
void func_802E48B8(enum game_mode_e mode, s32 arg1){
func_802E3BF8(mode, arg1);
game_setMode(mode, arg1);
}
s32 game_defrag(void){

2
src/core2/code_6B30.c
View File

@@ -89,7 +89,7 @@ enum hitbox_e hitbox_getHitboxForActor(ActorMarker *arg0){
}
// break ?? //
bool func_8028DD60(enum actor_e actor_id, Actor **arg1){
bool player_setCarryObjectPose(enum actor_e actor_id, Actor **arg1){
ActorMarker *m1;
ActorMarker *m2;
Actor *actor;

16
src/core2/code_7060.c
View File

@@ -631,7 +631,7 @@ bool func_8028F20C(void){
return player_isStable();
}
bool func_8028F22C(void){
bool player_isDead(void){
if(bs_getState() == BS_41_DIE){
return TRUE;
}
@@ -660,9 +660,9 @@ bool func_8028F2FC(void){
}
//sets carry actor if player is within a horizantal radius around a point
bool func_8028F31C(f32 position[3], f32 radius, enum actor_e actor_id, Actor **arg3){
if(player_isInHorizontalRadius(position, radius)){
return func_8028DD60(actor_id, arg3);
bool player_setCarryObjectPoseInHorizontalRadius(f32 position[3], f32 radius, enum actor_e actor_id, Actor **arg3){
if (player_isInHorizontalRadius(position, radius)) {
return player_setCarryObjectPose(actor_id, arg3);
}
return FALSE;
}
@@ -670,7 +670,7 @@ bool func_8028F31C(f32 position[3], f32 radius, enum actor_e actor_id, Actor **a
//sets carry actor if player is within a cylinder around a point
bool func_8028F364(f32 position[3], f32 radius, f32 vert_range, enum actor_e actor_id, Actor **arg4) {
if (player_isInVerticalRange(position, vert_range)) {
return func_8028F31C(position, radius, actor_id, arg4);
return player_setCarryObjectPoseInHorizontalRadius(position, radius, actor_id, arg4);
}
return FALSE;
}
@@ -933,9 +933,11 @@ bool func_8028FBD4(f32 arg0[3]) {
return bs_checkInterrupt(BS_INTR_8) == 2;
}
bool func_8028FC34(void){
if (func_8028E86C() && bscarry_inSet(bs_getState()))
bool player_throwCarriedObject(void){
if (func_8028E86C() && bscarry_inSet(bs_getState())) {
return bs_checkInterrupt(BS_INTR_16_THROW_CARRIED_OBJ) == 2;
}
return FALSE;
}

6
src/core2/code_7AF80.c
View File

@@ -1384,8 +1384,8 @@ void func_80305CD8(s32 arg0, s32 arg1){
}
}
bool func_80305D14(void){
return (D_8036ABA4 != NULL) ? TRUE : FALSE;
bool func_80305D14(void) {
return BOOL(D_8036ABA4 != NULL);
}
void func_80305D38(void){
@@ -2435,5 +2435,5 @@ void func_80308F0C(Cube *cube) {
}
bool func_80308F54(s32 cube_index) {
return D_803821E0[cube_index >> 5] & (1 << (cube_index & 0x1F))? TRUE: FALSE;
return BOOL(D_803821E0[cube_index >> 5] & (1 << (cube_index & 0x1F)));
}

2
src/core2/code_85800.c
View File

@@ -838,7 +838,7 @@ int func_8030E3FC(u8 indx){
}
}
void func_8030E484(enum sfx_e uid){
void sfxsource_playHighPriority(enum sfx_e uid){
func_8030D6C4(uid, 1.0f, 22000, 0, 2);
}

6
src/core2/code_91E10.c
View File

@@ -402,9 +402,11 @@ void func_803197AC(s32 arg0){
item_set(ITEM_6_HOURGLASS, TRUE);
D_803830E0->unk15 = 0;
D_803830E0->unk13 = 1U;
for(i = 1; i < 4; i++){
func_80319758(i, (i == D_803830E0->unk13) ? TRUE : FALSE);
for (i = 1; i < 4; i++) {
func_80319758(i, BOOL(i == D_803830E0->unk13));
}
break;
case 7: //80319C0C

6
src/core2/code_935F0.c
View File

@@ -104,7 +104,7 @@ void func_8031A678(Actor *this){
void __chMinigame_textCallback1(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(marker);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
void __chMinigame_transformToCroc(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -164,7 +164,7 @@ void chMinigame_update(Actor *this){
func_8028FAB0(this->position);
this->unk1C[0] = 0.0f; this->unk1C[1] = this->yaw; this->unk1C[2] = 0.0f;
func_8028FAEC(this->unk1C);
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
if(this->unk10_12 >= 7){
marker_despawn(this->marker);
return;
@@ -177,7 +177,7 @@ void chMinigame_update(Actor *this){
if(volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
switch(this->state){
case MINIGAME_STATE_1_INTRODUCE_GAME://L8031AB2C
if(this->is_first_encounter)
if(this->has_met_before)
__chMinigame_setState(this, MINIGAME_STATE_2_IN_PROGESS);
break;
case MINIGAME_STATE_2_IN_PROGESS://L8031AB50

2
src/core2/code_956B0.c
View File

@@ -201,7 +201,7 @@ void func_8031CE70(f32 *arg0, s32 arg1, s32 arg2) {
NodeProp *phi_s0;
f32 phi_f2;
if ((D_80383190 == 0) && (getGameMode() != 8) && (getGameMode() != 7)) {
if ((D_80383190 == 0) && (getGameMode() != GAME_MODE_8_BOTTLES_BONUS) && (getGameMode() != GAME_MODE_7_ATTRACT_DEMO)) {
if (arg0 != 0) {
phi_s0 = func_80304ED0(&D_8036DDD0[1], arg0);
} else {

5
src/core2/code_9B180.c
View File

@@ -175,7 +175,6 @@ void func_803224FC(void) {
}
}
void func_803225B0(s32 arg0, s32 arg1){
D_80383330 =(arg1 == 2) ? TRUE : FALSE;
void func_803225B0(s32 arg0, s32 arg1) {
D_80383330 = BOOL(arg1 == 2);
}

21
src/core2/code_9E370.c
View File

@@ -791,7 +791,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
suLastBaddie->pitch = 0.0f;
suLastBaddie->roll = 0.0f;
suLastBaddie->unk6C = 0.0f;
suLastBaddie->unk28 = 0.0f;
suLastBaddie->actor_specific_1_f = 0.0f;
suLastBaddie->unk10_12 = 0;
suLastBaddie->unk38_0 = 0;
suLastBaddie->unk38_31 = 0;
@@ -884,7 +884,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
suLastBaddie->unk14C[0] = NULL;
suLastBaddie->unk14C[1] = NULL;
suLastBaddie->unk138_27 = 0;
suLastBaddie->is_first_encounter = FALSE;
suLastBaddie->has_met_before = FALSE;
suLastBaddie->unk138_23 = 0;
suLastBaddie->unk138_22 = 0;
suLastBaddie->unk138_21 = 0;
@@ -1319,15 +1319,15 @@ void subaddie_set_state_with_direction(Actor * this, s32 myAnimId, f32 arg2, s32
func_803289EC(this, arg2, direction);
}
int subaddie_maybe_set_state_position_direction(Actor * this, s32 myAnimId, f32 start_position, s32 direction, f32 probability){
if(randf() < probability){
if(__subaddie_set_state(this, myAnimId) && this->animctrl){
bool subaddie_maybe_set_state_position_direction(Actor *this, s32 myAnimId, f32 start_position, s32 direction, f32 probability) {
if (randf() < probability) {
if (__subaddie_set_state(this, myAnimId) && this->animctrl) {
func_803285E8(this, start_position, direction);
animctrl_start(this->animctrl, "subaddie.c", 0x705);
}
return 1;
return TRUE;
}
return 0;
return FALSE;
}
void subaddie_set_ideal_yaw(Actor * this, int arg1){
@@ -1605,9 +1605,10 @@ void func_803297FC(Actor *arg0, f32 *o1, f32 *o2){
}
void func_80329878(Actor *arg0, f32 arg1){
arg0->unk28 -= arg1;
if(arg0->unk28 < 0.0f){
arg0->unk28 = 0.0f;
arg0->actor_specific_1_f -= arg1;
if (arg0->actor_specific_1_f < 0.0f) {
arg0->actor_specific_1_f = 0.0f;
}
}

146
src/core2/code_A4D00.c
View File

@@ -3,15 +3,22 @@
#include "variables.h"
#include "structs.h"
extern s32 func_80244E54(f32[3], f32[3], f32 [3], u32, f32, f32);
extern s32 func_80244E54(f32[3], f32[3], f32 [3], u32, f32, f32);
extern void func_80244F00(f32[3], f32, f32, s32, s32);
extern s32 func_80320DB0(f32[3], f32, f32[3], u32);
extern s32 func_80320DB0(f32[3], f32, f32[3], u32);
extern void func_80320ED8(ActorMarker *, f32, s32);
extern f32 func_8033229C(ActorMarker *marker);
extern f32 func_80309B24(f32 [3]);
extern f32 ml_dotProduct_vec3f(f32[3], f32[3]);
extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]);
extern f32 func_8033229C(ActorMarker *marker);
extern f32 func_80309B24(f32 [3]);
extern f32 ml_dotProduct_vec3f(f32[3], f32[3]);
extern f32 ml_distanceSquared_vec3f(f32[3], f32[3]);
extern BKCollisionTri *func_80320C94(f32 arg0[3], f32 arg1[3], f32 arg2, f32 arg3[3], s32 arg4, u32 arg5);
/* .h */
@@ -20,7 +27,7 @@ typedef bool (*method_core2_A4D00_0)(Actor *, f32[3], s32, s32);
typedef struct {
f32 unk0[3];
f32 unkC[3];
BKCollisionTri * unk18;
BKCollisionTri *unk18;
f32 unk1C[3];
f32 unk28[3];
f32 unk34[3];
@@ -28,43 +35,54 @@ typedef struct {
f32 unk44[3];
u8 pad50[0x3C];
s32 unk8C;
}Struct_A4D00;
} Struct_A4D00;
bool func_8032BC90(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C280(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C2F0(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C404(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C4AC(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C660(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C6E0(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C79C(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C99C(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032C9C0(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3);
bool func_8032CA40(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3);
/* .data */
method_core2_A4D00_0 D_8036E5D0[][6] = {
{func_8032C404, func_8032C4AC, NULL, func_8032C280, NULL, func_8032C79C},
{func_8032C404, func_8032C4AC, NULL, func_8032BD88, NULL, NULL},
{func_8032C404, func_8032C4AC, NULL, NULL, NULL, func_8032C79C},
{func_8032C404, func_8032C4AC, NULL, NULL, NULL, NULL},
{func_8032C404, NULL, NULL, func_8032C280, NULL, func_8032C79C},
{func_8032C404, NULL, NULL, func_8032BD88, NULL, NULL},
{func_8032C404, NULL, NULL, NULL, NULL, func_8032C79C},
{func_8032C404, NULL, NULL, NULL, NULL, NULL},
{func_8032C2F0, func_8032C660, NULL, func_8032C280, NULL, func_8032C79C},
{func_8032C2F0, func_8032C660, NULL, func_8032BD88, NULL, NULL},
{func_8032C2F0, func_8032C660, NULL, func_8032C280, func_8032CA40, func_8032C79C},
{func_8032C2F0, func_8032C660, NULL, func_8032BD88, func_8032CA40, NULL},
{ NULL, NULL, NULL, func_8032BC90, NULL, NULL},
{func_8032C2F0, func_8032C4AC, NULL, func_8032C280, NULL, func_8032C6E0},
{func_8032C2F0, func_8032C660, NULL, NULL, NULL, func_8032C6E0},
{func_8032C2F0, func_8032C660, NULL, func_8032BD88, NULL, func_8032C6E0},
{ NULL, NULL, NULL, func_8032BC90, NULL, func_8032C6E0},
{func_8032C404, func_8032C4AC, func_8032C9C0, func_8032C280, NULL, func_8032C79C},
{func_8032C404, func_8032C4AC, func_8032C99C, func_8032C280, NULL, func_8032C79C},
{func_8032C404, NULL, NULL, NULL, NULL, func_8032C6E0}
{func_8032C404, func_8032C4AC, NULL, func_8032C280, NULL, func_8032C79C},
{func_8032C404, func_8032C4AC, NULL, func_8032BD88, NULL, NULL},
{func_8032C404, func_8032C4AC, NULL, NULL, NULL, func_8032C79C},
{func_8032C404, func_8032C4AC, NULL, NULL, NULL, NULL},
{func_8032C404, NULL, NULL, func_8032C280, NULL, func_8032C79C},
{func_8032C404, NULL, NULL, func_8032BD88, NULL, NULL},
{func_8032C404, NULL, NULL, NULL, NULL, func_8032C79C},
{func_8032C404, NULL, NULL, NULL, NULL, NULL},
{func_8032C2F0, func_8032C660, NULL, func_8032C280, NULL, func_8032C79C},
{func_8032C2F0, func_8032C660, NULL, func_8032BD88, NULL, NULL},
{func_8032C2F0, func_8032C660, NULL, func_8032C280, func_8032CA40, func_8032C79C},
{func_8032C2F0, func_8032C660, NULL, func_8032BD88, func_8032CA40, NULL},
{NULL, NULL, NULL, func_8032BC90, NULL, NULL},
{func_8032C2F0, func_8032C4AC, NULL, func_8032C280, NULL, func_8032C6E0},
{func_8032C2F0, func_8032C660, NULL, NULL, NULL, func_8032C6E0},
{func_8032C2F0, func_8032C660, NULL, func_8032BD88, NULL, func_8032C6E0},
{NULL, NULL, NULL, func_8032BC90, NULL, func_8032C6E0},
{func_8032C404, func_8032C4AC, func_8032C9C0, func_8032C280, NULL, func_8032C79C},
{func_8032C404, func_8032C4AC, func_8032C99C, func_8032C280, NULL, func_8032C79C},
{func_8032C404, NULL, NULL, NULL, NULL, func_8032C6E0}
};
/* .bss */
@@ -89,14 +107,14 @@ bool func_8032BC90(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3) {
}
actor->marker->propPtr->unk8_3 = sp40;
return (phi_v0)? 1 : 0;
return (phi_v0) ? 1 : 0;
}
void func_8032BD64(f32 arg0[3]){
void func_8032BD64(f32 arg0[3]) {
ml_vec3f_copy(arg0, D_803833D8);
}
bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3){
bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
s32 i;
s32 temp_s7;
Struct_A4D00 *var_fp;
@@ -117,7 +135,7 @@ bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3){
temp_s7 = arg0->unk154;
var_f24 = func_8033229C(arg0->marker);
var_fp = NULL;
sp290 = arg0->marker->propPtr->unk8_3;
sp290 = arg0->marker->propPtr->unk8_3;
arg0->marker->propPtr->unk8_3 = 0;
ml_vec3f_diff_copy(sp278, arg0->position, arg1);
sp284[0] = arg1[0] - arg0->position[0];
@@ -127,22 +145,24 @@ bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3){
sp29C = TRUE;
var_f24 = var_f24 * 0.6;
var_f22 = MAX(arg0->marker->unk38[1], var_f24 * 1.25);
} else {
if (!spBC[i].unk44){}
}
else {
if (!spBC[i].unk44) {}
sp29C = FALSE;
var_f24 = var_f24 * 0.5;
var_f22 = arg0->marker->unk38[1];
}
func_80244F00(arg1, var_f24, var_f22, sp29C, temp_s7);
sp88 = ((var_f24 * 2) - 4);
sp84 = sp88* sp88;
sp84 = sp88 * sp88;
for(i = 0; i < 3; i++){
for (i = 0; i < 3; i++) {
var_s2 = (i != 0) ? &spBC[i - 1] : NULL;
if (i != 0) {
ml_vec3f_copy(spBC[i].unk0, var_s2->unk0);
ml_vec3f_copy(spBC[i].unkC, var_s2->unkC);
} else {
}
else {
ml_vec3f_copy(spBC[i].unk0, arg0->position);
ml_vec3f_copy(spBC[i].unkC, arg1);
}
@@ -154,10 +174,11 @@ bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3){
spBC[i].unk0[1] = temp_f20;
}
}
} else {
}
else {
spBC[i].unk40 = 0;
}
spBC[i].unk8C = sp29C;
spBC[i].unk34[0] = spBC[i].unkC[0];\
spBC[i].unk34[1] = spBC[i].unkC[1] + var_f22;\
@@ -169,7 +190,7 @@ bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3){
spBC[i].unk18 = func_80320C94(spBC[i].unk34, spBC[i].unk28, var_f24, spBC[i].unk1C, 3, temp_s7);
if(spBC[i].unk18 == NULL)
if (spBC[i].unk18 == NULL)
break;
var_fp = &spBC[i];
@@ -186,7 +207,8 @@ bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3){
if (i == 3) {
ml_vec3f_copy(arg0->position, arg1);
} else if (var_fp != NULL) {
}
else if (var_fp != NULL) {
temp_f20 = gu_sqrtf((sp284[0] * sp284[0]) + (sp284[1] * sp284[1]) + (sp284[2] * sp284[2]));
arg0->position[0] = var_fp->unk0[0];
arg0->position[1] = var_fp->unk0[1];
@@ -199,7 +221,8 @@ bool func_8032BD88(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3){
if (var_fp != NULL) {
ml_vec3f_copy(D_803833D8, var_fp->unk1C);
}
return (var_fp != NULL) ? TRUE : FALSE;
return BOOL(var_fp != NULL);
}
bool func_8032C280(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
@@ -214,13 +237,13 @@ bool func_8032C2F0(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
f32 sp60[3];
f32 sp20[4][4];
sp6C[0] = arg0->unk28;
sp6C[0] = arg0->actor_specific_1_f;
sp6C[1] = 0.0f;
sp6C[2] = 0.0f;
guRotateRPYF(sp20[0], arg0->roll, 90.0f - arg0->yaw, arg0->pitch);
sp60[0] = (sp20[0][0]*sp6C[0]) + (sp20[0][1]*sp6C[1]) + (sp20[0][2]*sp6C[2]);
sp60[1] = (sp20[1][0]*sp6C[0]) + (sp20[1][1]*sp6C[1]) + (sp20[1][2]*sp6C[2]);
sp60[2] = (sp20[2][0]*sp6C[0]) + (sp20[2][1]*sp6C[1]) + (sp20[2][2]*sp6C[2]);
sp60[0] = (sp20[0][0] * sp6C[0]) + (sp20[0][1] * sp6C[1]) + (sp20[0][2] * sp6C[2]);
sp60[1] = (sp20[1][0] * sp6C[0]) + (sp20[1][1] * sp6C[1]) + (sp20[1][2] * sp6C[2]);
sp60[2] = (sp20[2][0] * sp6C[0]) + (sp20[2][1] * sp6C[1]) + (sp20[2][2] * sp6C[2]);
arg0->position[0] += sp60[0];
arg0->position[1] += sp60[1];
arg0->position[2] += sp60[2];
@@ -230,7 +253,7 @@ bool func_8032C2F0(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
bool func_8032C404(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
f32 sp1C[3];
sp1C[0] = arg0->unk28;
sp1C[0] = arg0->actor_specific_1_f;
sp1C[1] = 0.0f;
sp1C[2] = 0.0f;
ml_vec3f_yaw_rotate_copy(sp1C, sp1C, arg0->yaw - 90.0);
@@ -249,7 +272,7 @@ bool func_8032C4AC(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
if (arg0->unk138_8) {
arg0->position[1] = mapModel_getFloorY(arg0->position);
}
else{
else {
sp30 = func_8033229C(arg0->marker) / 3.0;
sp4C[0] = arg0->position[0];
sp4C[1] = arg0->position[1];
@@ -260,13 +283,14 @@ bool func_8032C4AC(Actor *arg0, f32 arg1[3], s32 arg2, s32 arg3) {
sp40[2] = arg0->position[2];
sp40[1] += arg0->unk170;
arg0->unk170 = (-sp30 < time_getDelta() * (arg0->unk170 * 40.0)) ? time_getDelta() * (arg0->unk170 * 40.0)
: -sp30;
: -sp30;
if (func_80309B48(sp4C, sp40, sp34, 0x5E0000)) {
arg0->unk170 = -10.0f;
arg0->position[0] = sp40[0];
arg0->position[1] = sp40[1];
arg0->position[2] = sp40[2];
} else {
}
else {
arg0->position[1] = MAX(-100000.0f, arg0->position[1] + arg0->unk170);
}
}
@@ -328,7 +352,7 @@ bool func_8032C850(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3, bool nonactor)
actor->marker->collidable = TRUE;
func_80320ED8(actor->marker, temp_f0 / 2, 2);
actor->marker->collidable = stored_collidability;
for(var_v1 = func_8032F528(); var_v1 != NULL; var_v1 = func_8032F528()) {
for (var_v1 = func_8032F528(); var_v1 != NULL; var_v1 = func_8032F528()) {
if (nonactor || (var_v1->markerFlag && (var_v1->actorProp.marker->id == actor->marker->id))) {
D_803833D0 = var_v1;
actor->position[0] = (f32) arg1[0];
@@ -341,12 +365,12 @@ bool func_8032C850(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3, bool nonactor)
return FALSE;
}
bool func_8032C99C(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3){
bool func_8032C99C(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3) {
return func_8032C850(actor, arg1, arg2, arg3, 1);
}
bool func_8032C9C0(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3){
bool func_8032C9C0(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3) {
return func_8032C850(actor, arg1, arg2, arg3, 0);
}
@@ -358,13 +382,13 @@ void func_8032C9E0(f32 arg0[3]) {
}
}
bool func_8032CA40(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3){
bool var_v1 = (arg3 & 8) ? TRUE : FALSE;
if(var_v1){
actor->position[0] = arg1[0];
actor->position[1] = arg1[1];
actor->position[2] = arg1[2];
bool func_8032CA40(Actor *actor, f32 arg1[3], s32 arg2, s32 arg3) {
bool var_v1 = BOOL(arg3 & 8);
if (var_v1) {
TUPLE_COPY(actor->position, arg1)
}
return var_v1;
}
@@ -378,8 +402,8 @@ s32 func_8032CA80(Actor *actor, s32 arg1) {
sp40[1] = actor->position[1];
sp40[2] = actor->position[2];
var_s1 = 0;
for(var_s0 = 0; var_s0 < 6; var_s0++){
if(D_8036E5D0[arg1][var_s0] != NULL){
for (var_s0 = 0; var_s0 < 6; var_s0++) {
if (D_8036E5D0[arg1][var_s0] != NULL) {
temp_v0_2 = D_8036E5D0[arg1][var_s0](actor, sp40, arg1, var_s1);
if (temp_v0_2 != 0) {
var_s1 |= temp_v0_2 << var_s0;

2
src/core2/code_AD5B0.c
View File

@@ -302,7 +302,7 @@ s32 func_80334ECC(void) {
func_80356734();
func_802D5628();
itemPrint_update();
if (getGameMode() != 4) {
if (getGameMode() != GAME_MODE_4_PAUSED) {
func_802F7E54();
}
if (D_803835DC == 0) {

6
src/core2/code_BEF20.c
View File

@@ -392,15 +392,15 @@ void func_80346DB4(s32 note_count) {
if (D_80385FF0[level_id] < note_count) {
D_80385FF0[level_id] = note_count;
if ((level_get() == LEVEL_1_MUMBOS_MOUNTAIN) && (note_count == 50)) {
func_80311480(0xF74, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(0xF74, 4, NULL, NULL, NULL, NULL);
}
if (note_count == 100) {
func_80311480(0xF78, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(0xF78, 4, NULL, NULL, NULL, NULL);
}
if (note_count == 1) {
levelSpecificFlags_set(0x34, TRUE);
}
if (!levelSpecificFlags_get(0x34) && (func_80311480(0xF76, 0, NULL, NULL, NULL, NULL))) {
if (!levelSpecificFlags_get(0x34) && (gcdialog_showText(0xF76, 0, NULL, NULL, NULL, NULL))) {
levelSpecificFlags_set(0x34, TRUE);
}
if (volatileFlag_get(VOLATILE_FLAG_17) == 0) {

4
src/core2/code_CF3E0.c
View File

@@ -83,7 +83,7 @@ s32 func_803563B8(enum file_progress_e progress_flag, s32 arg1) {
} else {
index = __findIndex(fileProgressDialogMap, progress_flag);
if (index != -1) {
if (func_80311480(fileProgressDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) {
if (gcdialog_showText(fileProgressDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) {
fileProgressFlag_set(progress_flag, 1);
}
return fileProgressFlag_get(progress_flag);
@@ -109,7 +109,7 @@ s32 volatileFlag_setAndTriggerDialog(enum volatile_flags_e id, s32 arg1) {
} else {
index = __findIndex(gVolatileFlagDialogMap, id);
if (index != -1) {
if (func_80311480(gVolatileFlagDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) {
if (gcdialog_showText(gVolatileFlagDialogMap[index].value, arg1, 0, 0, 0, 0) != 0) {
volatileFlag_set(id, 1);
}
return volatileFlag_get(id);

18
src/core2/code_D6600.c
View File

@@ -63,14 +63,14 @@ void func_8035D65C(Actor *this) {
return;
}
if (func_80329530(this, 500) && func_8028B470() && func_8035D608(this)) {
this->unk28 = 2.0f;
this->actor_specific_1_f = 2.0f;
subaddie_set_state_with_direction(this, 4, 0.0f, -1);
}
}
void func_8035D6FC(Actor *this) {
subaddie_set_state_with_direction(this, 3, 0.0f, -1);
this->unk28 = 2.0f;
this->actor_specific_1_f = 2.0f;
subaddie_set_ideal_yaw(this, (s32) (randf2(-45.0f, 45.0f) + (this->yaw + 180.0f)));
func_80328CA8(this, (s32) func_8035D590(randf2(-45.0f, 45.0f) + (360.0f - this->pitch)));
this->unk38_31 = 0x78;
@@ -78,7 +78,7 @@ void func_8035D6FC(Actor *this) {
void func_8035D7CC(Actor *this) {
subaddie_set_state_with_direction(this, 3, 0.0f, -1);
this->unk28 = 2.0f;
this->actor_specific_1_f = 2.0f;
subaddie_set_ideal_yaw(this, (s32) (randf2(-45.0f, 45.0f) + (this->yaw + 180.0f)));
func_80328CA8(this, (s32) func_8035D590(randf2(-45.0f, 45.0f) + (360.0f - this->pitch)));
}
@@ -128,10 +128,10 @@ void func_8035DA1C(Actor *this) {
if (!this->initialized) {
this->initialized = TRUE;
this->unk138_25 = TRUE;
this->unk28 = 4.0f;
this->actor_specific_1_f = 4.0f;
LOCAL_D6600(this)->unk4 =(map_get() == MAP_71_GL_STATUE_ROOM) ? 8 : 0xf;
if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) {
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
subaddie_set_state_with_direction(this, 1, 0.0f, 1);
}
func_8032CA80(this, LOCAL_D6600(this)->unk4);
@@ -152,7 +152,7 @@ void func_8035DA1C(Actor *this) {
func_80328FF0(this, 0.5f);
func_8032CA80(this, LOCAL_D6600(this)->unk4);
if (subaddie_maybe_set_state(this, 2, 0.05f) && !volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)) {
this->unk28 = 4.0f;
this->actor_specific_1_f = 4.0f;
}
func_8035D65C(this);
break;
@@ -174,7 +174,7 @@ void func_8035DA1C(Actor *this) {
func_80328CA8(this, 0);
}
if (subaddie_maybe_set_state_position_direction(this, 1, 0.0f, 1, 0.005f)) {
this->unk28 = 2.0f;
this->actor_specific_1_f = 2.0f;
}
func_8035D65C(this);
break;
@@ -185,7 +185,7 @@ void func_8035DA1C(Actor *this) {
func_8032CA80(this, LOCAL_D6600(this)->unk4);
if (func_80329480(this) && func_8032944C(this)) {
subaddie_set_state_with_direction(this, 2, 0.0f, -1);
this->unk28 = 4.0f;
this->actor_specific_1_f = 4.0f;
}
break;
@@ -198,7 +198,7 @@ void func_8035DA1C(Actor *this) {
func_8032CA80(this, LOCAL_D6600(this)->unk4);
if (func_80329480(this) && func_8032944C(this)) {
subaddie_set_state_with_direction(this, 5, 0.0f, -1);
this->unk28 = 10.5f;
this->actor_specific_1_f = 10.5f;
}
break;

24
src/core2/code_D89E0.c
View File

@@ -43,7 +43,7 @@ void func_8035F99C(Actor *this){
if(!volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
actor_playAnimationOnce(this);
this->unk28 = 5.0f;
this->actor_specific_1_f = 5.0f;
FUNC_8030E8B4(SFX_419_UNKNOWN, 1.0f, 28000, this->position, 0x4e2, 0x9c4);
}
}
@@ -51,7 +51,7 @@ void func_8035F99C(Actor *this){
void func_8035FA0C(Actor *this){
subaddie_set_state(this, 3);
actor_loopAnimation(this);
this->unk28 = 5.0f;
this->actor_specific_1_f = 5.0f;
}
void func_8035FA48(Actor *this){
@@ -75,7 +75,7 @@ void func_8035FAE0(Actor *this){
subaddie_set_state_with_direction(this, 7, 0.01f, 1);
actor_loopAnimation(this);
this->yaw += 180.0f;
this->unk28 = 20.0f;
this->actor_specific_1_f = 20.0f;
this->velocity_x = 300.0f;
}
@@ -181,7 +181,7 @@ bool func_8035FEDC(Actor *this){
}
if(func_80329480(this)){
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
return FALSE;
}
}
@@ -190,7 +190,7 @@ bool func_8035FEDC(Actor *this){
bool func_8035FF5C(Actor *this){
if(func_8032CA80(this, 5) && func_80329480(this)){
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
return FALSE;
}
return TRUE;
@@ -241,12 +241,12 @@ bool func_80360198(Actor *this) {
func_80328FB0(this, 5.0f);
func_80360044(this);
this->unk28 += (this->velocity[1] * 0.45) - (0.001 * this->unk28);
if (this->unk28 > 13.0) {
this->unk28 = 13.0f;
this->actor_specific_1_f += (this->velocity[1] * 0.45) - (0.001 * this->actor_specific_1_f);
if (this->actor_specific_1_f > 13.0) {
this->actor_specific_1_f = 13.0f;
}
if (this->unk28 < -13.0) {
this->unk28 = -13.0f;
if (this->actor_specific_1_f < -13.0) {
this->actor_specific_1_f = -13.0f;
}
this->velocity[0] += ((this->velocity[1] * 0.9) - 0.6);
@@ -302,7 +302,7 @@ f32 func_803603AC(Actor *this, s32 arg1, u8 arg2){
return 0.0f;
phi_f2 = -(this->unk28*(dy))/(D1 + D2);
phi_f2 = -(this->actor_specific_1_f*(dy))/(D1 + D2);
if (phi_f2 >= 4.0f) {
phi_f2 = 4.0f;
} else if (phi_f2 <= -4.0f) {
@@ -395,7 +395,7 @@ void func_80360828(Actor *this){
this->initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_803607FC, func_80360790);
this->unk38_0 = FALSE;
this->unk28 = 0.0f;
this->actor_specific_1_f = 0.0f;
this->velocity_x = 0.0f;
this->unk1C_x = this->position_x;
this->unk1C_y = this->position_y;

12
src/core2/code_DA760.c
View File

@@ -46,21 +46,21 @@ void func_80361870(Actor *this){
this->volatile_initialized = TRUE;
}
if(!this->is_first_encounter && func_80329530(this, 400) && !func_80329530(this, 50)){
if(!this->has_met_before && func_80329530(this, 400) && !func_80329530(this, 50)){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_31_MM_OPEN) && level_get() == LEVEL_6_LAIR){
text_id = fileProgressFlag_get(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT)? 0xF80 : 0xF7F;
if(func_80311480(text_id, 0, 0, 0, 0, 0)){
this->is_first_encounter = TRUE;
if(gcdialog_showText(text_id, 0, 0, 0, 0, 0)){
this->has_met_before = TRUE;
}
}
else if(func_803616F0(this)){
sp28 = (volatileFlag_get(VOLATILE_FLAG_16)?0xf6e:0xf68) + this->unkF4_8 - 1;
if(!volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
else{
if(func_80311480(sp28, 0, 0, 0, 0, 0)){
this->is_first_encounter = TRUE;
if(gcdialog_showText(sp28, 0, 0, 0, 0, 0)){
this->has_met_before = TRUE;
volatileFlag_set(VOLATILE_FLAG_16, 0);
}
}

2
src/core2/fx/honeycarrierscore.c
View File

@@ -233,7 +233,7 @@ void fxhoneycarrierscore_update(s32 arg0, struct8s *arg1){
timedFunc_set_2(0.25f, (GenFunction_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
timedFunc_set_1(1.25f, (GenFunction_1)item_inc, ITEM_15_HEALTH_TOTAL);
timedFunc_set_1(1.25f, (GenFunction_1)func_8030E484, SFX_3EA_UNKNOWN);
timedFunc_set_1(1.25f, (GenFunction_1)sfxsource_playHighPriority, SFX_3EA_UNKNOWN);
timedFunc_set_2(1.25f, (GenFunction_2)item_set, ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)+1);
timedFunc_set_1(1.5f, (GenFunction_1)gcpausemenu_80314AC8, 1);
}

2
src/core2/gc/dialog.c
View File

@@ -942,7 +942,7 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca
return 0;
}
bool func_80311480(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){
bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){
return func_80311174(text_id, arg1, pos, marker, callback, arg5, 0);
}

4
src/core2/gc/pauseMenu.c
View File

@@ -786,7 +786,7 @@ s32 gcpausemenu_80312D78(struct1As *arg0, s32 arg1) {
for (var_s2 = 0; var_s2 < arg1; var_s2++) {
if (arg0[var_s2].delay <= D_80383010.unkC) {
if (!arg0[var_s2].unkF) {
var_v0 = func_803183A4(D_80383010.zoombox[var_s2], arg0[var_s2].str) ? TRUE : FALSE;
var_v0 = BOOL(func_803183A4(D_80383010.zoombox[var_s2], arg0[var_s2].str));
arg0[var_s2].unkF = var_v0;
if (arg0[var_s2].unkF) {
gczoombox_open(D_80383010.zoombox[var_s2]);
@@ -898,7 +898,7 @@ void gcpausemenu_updateBButtonAndJoystickSprites(void) {
}
D_80383010.unk20 -= var_f0;
}
D_80383010.left_joystick_visible = (D_80383010.selection != 0) ? TRUE : FALSE;
D_80383010.left_joystick_visible = BOOL(D_80383010.selection != 0);
D_80383010.right_joystick_visible = (gcpausemenu_getMaxPage() == D_80383010.selection) ? FALSE : TRUE;
D_80383010.unk28 += time_getDelta();

6
src/core2/gc/zoombox.c
View File

@@ -1567,8 +1567,8 @@ void func_803184C8(GcZoombox *this, f32 arg1, s32 arg2, s32 arg3, f32 arg4, bool
if (this->anim_ctrl != NULL) {
animctrl_setDuration(this->anim_ctrl, arg4);
}
this->unk1A4_12 = arg5 ? TRUE : FALSE;
this->unk1A4_10 = arg6 ? TRUE : FALSE;
this->unk1A4_12 = BOOL(arg5);
this->unk1A4_10 = BOOL(arg6);
}
}
@@ -1617,7 +1617,7 @@ void func_80318640(GcZoombox *this, s32 arg1, f32 arg2, f32 arg3, s32 arg4) {
}
this->unk198 = arg2;
this->unk194 = arg3;
this->unk1A4_15 = (arg4) ? TRUE : FALSE;
this->unk1A4_15 = BOOL(arg4);
}
}

4
src/core2/mapspecificflags.c
View File

@@ -92,8 +92,8 @@ void bitfield_setBit(s32 *arg0, s32 arg1, bool arg2){
}
}
bool bitfield_isBitSet(s32 *arg0, s32 arg1){
return (arg0[(arg1 >> 5) + 1] & (1 << (arg1 & 0x1F))) ? TRUE : FALSE;
bool bitfield_isBitSet(s32 *arg0, s32 arg1) {
return BOOL(arg0[(arg1 >> 5) + 1] & (1 << (arg1 & 0x1F)));
}
void bitfield_setAll(s32 *arg0, bool arg1) {

2
src/core2/modelRender.c
View File

@@ -1403,7 +1403,7 @@ f32 func_8033A244(f32 arg0){
}
void func_8033A25C(bool arg0){
D_80383704 = arg0 ? TRUE : FALSE;
D_80383704 = BOOL(arg0);
}
void func_8033A280(f32 arg0){

2
src/core2/particle.c
View File

@@ -866,7 +866,7 @@ void partEmitMgr_defrag(void){
}
void func_802F0E80(void* arg0, s32 arg1){
partEmitMgrEnable = (arg1 == 2) ? TRUE : FALSE;
partEmitMgrEnable = BOOL(arg1 == 2);
}
void func_802F0EAC(ParticleEmitter *this, f32 arg1){

10
src/core2/snackerctl.c
View File

@@ -83,7 +83,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){
return 0;
if(func_8034BB48() && chBottlesBonus_getPuzzleIndex() != 7){
func_80311480(SNACKER_BB_DIALOG_0 + (chBottlesBonus_getPuzzleIndex() << 1), 6, D_80363610, NULL, NULL, NULL);
gcdialog_showText(SNACKER_BB_DIALOG_0 + (chBottlesBonus_getPuzzleIndex() << 1), 6, D_80363610, NULL, NULL, NULL);
}
if(!func_8028F25C() && func_80321960() == 3)
func_803219F4(1);
@@ -93,12 +93,12 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){
if(chBottlesBonus_getPuzzleIndex() == 6){
if(!D_8037DCCC){
func_8028F94C(4, &D_80363610);
func_80311480(SNACKER_BB_DIALOG_1, 0x6, D_80363610, NULL, func_8028A584, NULL);
gcdialog_showText(SNACKER_BB_DIALOG_1, 0x6, D_80363610, NULL, func_8028A584, NULL);
}
}//L8028A70C
else if(chBottlesBonus_getPuzzleIndex() == 7){
func_8028F94C(4, &D_80363610);
func_80311480(ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER, 0x6, D_80363610, NULL, func_8028A558, NULL);
gcdialog_showText(ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER, 0x6, D_80363610, NULL, func_8028A558, NULL);
D_8037DCCC = 1;
}//L8028A764
else if(jiggyscore_isCollected(0x10)){
@@ -108,7 +108,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){
){
if(!D_8037DCCA){
func_8028F94C(4, &D_80363610);
func_80311480(ASSET_E21_DIALOG_BOTTLES_BONUS_DISCOVERED, 6, D_80363610, 0, func_8028A584, NULL);
gcdialog_showText(ASSET_E21_DIALOG_BOTTLES_BONUS_DISCOVERED, 6, D_80363610, 0, func_8028A584, NULL);
D_8037DCCA = 1;
}else{
func_8028A584(0,0,0);
@@ -118,7 +118,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){
else{
if(!D_8037DCCB){
func_8028F94C(4, &D_80363610);
func_80311480(ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY, 6, D_80363610, 0, func_8028A558, NULL);
gcdialog_showText(ASSET_E20_DIALOG_BOTTLES_BONUS_NOT_READY, 6, D_80363610, 0, func_8028A558, NULL);
D_8037DCCB = 1;
}
}

31
src/core2/timedfuncqueue.c
View File

@@ -127,25 +127,28 @@ void func_80324AA4(timefuncqueue_Struct2 *arg0){
void func_80324AEC(DelayedTextCallback *arg0) {
if ((arg0->position[0] == 0.0f) && (arg0->position[1] == 0.0f) && (arg0->position[2] == 0.0f)) {
func_80311480(arg0->text_id, arg0->unk4, NULL, arg0->caller, arg0->callback_method_1, arg0->callback_method_2);
gcdialog_showText(arg0->text_id, arg0->unk4, NULL, arg0->caller, arg0->callback_method_1, arg0->callback_method_2);
}
else{
func_80311480(arg0->text_id, arg0->unk4, arg0->position, arg0->caller, arg0->callback_method_1, arg0->callback_method_2);
gcdialog_showText(arg0->text_id, arg0->unk4, arg0->position, arg0->caller, arg0->callback_method_1, arg0->callback_method_2);
}
}
void func_80324BA0(s32 arg0){
if(arg0 == 1)
if (arg0 == 1) {
func_8028F918(1);
else if(arg0 == 2)
}
else if (arg0 == 2) {
func_8028F918(3);
else if(arg0 == 3)
}
else if (arg0 == 3) {
func_8028F918(2);
else{
if(arg0 == 0)
func_8028F918(0);
else if (arg0 == 4)
func_802D6114();
}
else if (arg0 == 0) {
func_8028F918(0);
}
else if (arg0 == 4) {
func_802D6114();
}
}
@@ -319,10 +322,10 @@ void timedFuncQueue_defrag(void){
D_80383380.ptr = vector_defrag(D_80383380.ptr);
}
void func_803252B0(s32 arg0){
mapSpecificFlags_set(arg0, 1);
void mapSpecificFlags_setTrue(s32 flag){
mapSpecificFlags_set(flag, TRUE);
}
void func_803252D0(f32 time, s32 arg0){
timedFunc_set_1(time, func_803252B0, arg0);
void timed_mapSpecificFlags_setTrue(f32 time, s32 flag){
timedFunc_set_1(time, mapSpecificFlags_setTrue, flag);
}