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

Merge branch 'master' into 'document/level-setup-related-code'

Browse Source 
# Conflicts:
#   src/core2/nc/dynamicCam12.c
This commit is contained in:
Banjo Kazooie
2024-10-20 05:05:12 +00:00
parent c9e87f0363 4c916bdaca
commit 85e682f349
355 changed files with 3866 additions and 3828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/TTC/ch/blubber.c
View File

@@ -37,10 +37,10 @@ ActorAnimationInfo gChBlubberAnimations[6] = {
{ASSET_B8_ANIM_BLUBBER_RUN, 0.8f}
};
ActorInfo gChBlubber = {
ActorInfo gChBlubber = {
MARKER_A3_BLUBBER, ACTOR_115_BLUBBER, ASSET_370_MODEL_BLUBBER,
0x1, gChBlubberAnimations,
__chBlubber_updateFunc, __chBlubber_update2Func, __chBlubber_drawFunc,
0x1, gChBlubberAnimations,
__chBlubber_updateFunc, __chBlubber_update2Func, __chBlubber_drawFunc,
0, 0x399, 1.8f, 0
};
@@ -63,7 +63,7 @@ static void __chBlubber_showTextCallback(ActorMarker *caller, enum asset_e text_
Actor *this = marker_getActor(caller);
ActorLocal_Blubber *local = (ActorLocal_Blubber*)&this->local;
if(text_id == ASSET_A0D_TEXT_BLUBBER_COMPLETE || text_id == ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED){
if(text_id == ASSET_A0D_DIALOG_BLUBBER_COMPLETE || text_id == ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED){
local->unk24 = 0;
}
else{
@@ -89,7 +89,7 @@ static void __chBlubber_showJiggySpawnedText(ActorMarker *marker){
this->actor_specific_1_f = 0.0f;
if(!mapSpecificFlags_get(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN)) {
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_TEXT_BLUBBER_COMPLETE;
text_id = jiggyscore_isCollected(JIGGY_14_TTC_BLUBBER) ? ASSET_A2A_BLUBBER_COMPLETE_JIGGY_COLLECTED : ASSET_A0D_DIALOG_BLUBBER_COMPLETE;
gcdialog_showText(text_id, 0xf, this->position, this->marker, __chBlubber_showTextCallback, __chBlubber_showTextCallback2);
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_2_BLUBBER_JIGGY_SPAWNED_TEXT_SHOWN, TRUE);
}
@@ -157,16 +157,16 @@ static void __chBlubber_updateFunc(Actor *this){
&& !this->has_met_before
&& item_getCount(ITEM_18_GOLD_BULLIONS) == 0
){
gcdialog_showText(ASSET_A0B_TEXT_BLUBBER_FIRST_MEET, 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL);
gcdialog_showText(ASSET_A0B_DIALOG_BLUBBER_FIRST_MEET, 0xe, this->position, this->marker, __chBlubber_showTextCallback, NULL);
this->has_met_before = TRUE;
subaddie_set_state_forward(this, CH_BLUBBER_STATE_3_UNKNOWN);
}
if( mapSpecificFlags_get(TTC_SPECIFIC_FLAG_0_BLUBBER_UNKNOWN)
if( mapSpecificFlags_get(TTC_SPECIFIC_FLAG_0_BLUBBER_UNKNOWN)
&& !this->unk138_23
){
if (item_getCount(ITEM_18_GOLD_BULLIONS) == 0) {
gcdialog_showText(ASSET_A0C_TEXT_BLUBBER_HALF_GOLD, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_A0C_DIALOG_BLUBBER_HALF_GOLD, 4, NULL, NULL, NULL, NULL);
}
this->unk138_23 = TRUE;
@@ -214,7 +214,7 @@ static void __chBlubber_updateFunc(Actor *this){
__chBlubber_checkJiggySpawnedTextAndAdvanceState(this);
break;
case CH_BLUBBER_STATE_3_UNKNOWN:
case CH_BLUBBER_STATE_3_UNKNOWN:
break;
case CH_BLUBBER_STATE_4_UNKNOWN:

3
src/TTC/ch/clam.c
View File

@@ -3,7 +3,6 @@
#include "variables.h"
extern Actor *spawnQueue_bundle_f32(s32, s32, s32, s32);
extern f32 func_80257204(f32, f32, f32, f32);
extern ActorProp * func_80320EB0(ActorMarker *, f32, s32);
static void __chClam_updateFunc(Actor *this);
@@ -245,7 +244,7 @@ static void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_ma
if(func_80297C6C() == 3) return;
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showText(ASSET_A14_TEXT_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showText(ASSET_A14_DIALOG_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN, TRUE);
}

4
src/TTC/ch/leaky.c
View File

@@ -60,7 +60,7 @@ static void __chLeaky_updateFunc(Actor *this) {
&& !this->has_met_before
&& func_80329530(this, 250) && !func_80329530(this, 160)
&& !func_8028ECAC()
&& gcdialog_showText(ASSET_A1A_TEXT_LEAKY_FIRST_MEET, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(ASSET_A1A_DIALOG_LEAKY_FIRST_MEET, 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;
}
@@ -118,6 +118,6 @@ bool chLeaky_eggCollision(ActorMarker *marker){
levelSpecificFlags_set(2, TRUE);
levelSpecificFlags_set(5, TRUE);
gcdialog_showText(ASSET_A28_TEXT_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL);
gcdialog_showText(ASSET_A28_DIALOG_LEAKY_DONE, 0x2a, this->position, this->marker, __chLeaky_showDoneText, NULL);
return TRUE;
}

2
src/TTC/ch/lockup.c
View File

@@ -87,7 +87,7 @@ static void __chLockup_updateFunc(Actor *this){
&& func_80329530(this, 320)
&& !func_80329530(this, 160)
&& !func_8028ECAC()
&& gcdialog_showText(ASSET_A15_TEXT_TTC_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)
&& gcdialog_showText(ASSET_A15_DIALOG_TTC_LOCKUP_SPAWNED, 0, NULL, NULL, NULL, NULL)
){
this->has_met_before = TRUE;
}

8
src/TTC/ch/nipper.c
View File

@@ -156,7 +156,7 @@ static void __chNipper_dieFunc(ActorMarker *this_marker, ActorMarker *other_mark
__chNipper_playDeathAnimation(this);
this->lifetime_value = 80.0f;
gcdialog_showText(ASSET_A10_TEXT_TTC_NIPPER_HURT, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_A10_DIALOG_TTC_NIPPER_HURT, 4, NULL, NULL, NULL, NULL);
return;
}
@@ -213,13 +213,13 @@ static void __chNipper_updateFunc(Actor *this){
if(0.0f == this->velocity_x && xVelocity){
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, -1, 5000);
func_8032BB88(this, 0, 4000);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
}
else if(!xVelocity && 0.0f != this->velocity_x){
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 0, 300);
func_8025AABC(COMUSIC_12_TTC_NIPPER);
func_8032BB88(this, -1, 300);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
this->velocity_x = xVelocity;
}
@@ -243,7 +243,7 @@ static void __chNipper_updateFunc(Actor *this){
&& temp_v0 != 10
){
subaddie_set_state_with_direction(this, CH_NIPPER_STATE_5_SPAWNED, 0.01f, 1);
if(gcdialog_showText(ASSET_A0E_TEXT_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){
if(gcdialog_showText(ASSET_A0E_DIALOG_NIPPER_SPAWNED, 0xf, this->position, this->marker, __chNipper_spawnedShowTextCallback, NULL)){
this->has_met_before = TRUE;
}
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300);

6
src/TTC/ch/treasurehunt.c
View File

@@ -116,10 +116,10 @@ static void __chTreasurehunt_spawnActorForNextStep(void) {
static void __chTreasurehunt_checkStepProgress(s32 currentStep){
if(CH_TREASUREHUNT_PUZZLE_CURRENT_STEP == currentStep && __chTreasurehunt_isActiveHitboxBeakBusterHitbox()){
if(currentStep == 0 && !jiggyscore_isCollected(JIGGY_11_TTC_RED_X)){
gcdialog_showText(ASSET_A18_TEXT_TREASUREHUNT_FOLLOW_CLUES, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_A18_DIALOG_TREASUREHUNT_FOLLOW_CLUES, 4, NULL, NULL, NULL, NULL);
}
else if(currentStep == 4){
gcdialog_showText(ASSET_A19_TEXT_TREASUREHUNT_SECOND_STEP, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_A19_DIALOG_TREASUREHUNT_SECOND_STEP, 4, NULL, NULL, NULL, NULL);
}
CH_TREASUREHUNT_PUZZLE_CURRENT_STEP++;
@@ -170,7 +170,7 @@ void chTreasurehunt_checkStepProgress5(NodeProp *this, ActorMarker *arg1){
gcpausemenu_80314AC8(0);
timedFunc_set_2(0.1f, (GenFunction_2) func_8028F45C, 9, (s32)&particleTargetPosition);
timedFunc_set_1(0.1f, (GenFunction_1) gcpausemenu_80314AC8, 1);
gcdialog_showText(ASSET_A17_TEXT_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
gcdialog_showText(ASSET_A17_DIALOG_BURIED_TREASURE_SPAWNED, 4, NULL, NULL, NULL, NULL);
CH_TREASUREHUNT_PUZZLE_CURRENT_STEP++;
}
}

2
src/TTC/code_26D0.c
View File

@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include "prop.h"
#include "SnS.h"
#include "actor.h"
extern ActorInfo gChClam;

12
src/TTC/code_3E30.c
View File

@@ -1,8 +1,8 @@
#include <ultra64.h>
#include "core1/core1.h"
#include "functions.h"
#include "variables.h"
#include "SnS.h"
/* extern */
extern void func_802D6310(f32, enum map_e, s32, s32, enum file_progress_e);
@@ -501,13 +501,11 @@ static void __code3E30_resetCheatCodeProgress(void)
__code3E30_resetSecretCheatCodeProgress();
}
void code3E30_overlayRelease(void)
{
if (sMapState.model1)
{
void code3E30_overlayRelease(void) {
if (sMapState.model1) {
__code3E30_setupCheatCodeTimer(0);
func_8030DA44(sMapState.doorOpeningSfxSourceIdx);
func_8030DA44(sMapState.dullCannonShotSfxSourceId);
sfxsource_freeSfxsourceByIndex(sMapState.doorOpeningSfxSourceIdx);
sfxsource_freeSfxsourceByIndex(sMapState.dullCannonShotSfxSourceId);
}
}