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

src/core1: document code_7090.c and code_CE60.c

Browse Source
This commit is contained in:
mariob92
2024-10-16 21:50:24 +02:00
parent 05fe65d6e8
commit 8a55096c9c
36 changed files with 589 additions and 587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -440,7 +440,7 @@ void bsant_die_update(void){
}
void bsant_die_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);

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

@@ -464,7 +464,7 @@ void func_802A8098(void) {
void func_802A82D4(void) {
func_802906A4(1);
func_80291548();
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baMarker_collisionOn();
if (bs_getNextState() != BS_5A_LOADZONE) {
func_80346CE8();

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

@@ -39,7 +39,7 @@ static void __bsbwhirl_end(void){
func_8029B0C0();
func_8029E070(0);
func_8025A55C(-1, 0xfa0, 0xd);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8025A7DC(COMUSIC_25_USING_GOLD_FEATHERS);
}
baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL);
@@ -86,7 +86,7 @@ void bsbwhirl_enter_init(void){
func_8029B324(1, 1.0f);
func_8029E070(1);
D_8037D3B0 = 0.0f;
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A55C(0, 0xfa0, 0xd);
func_8025A6EC(0x25, 0x6d60);
func_80299BD4();

6
src/core2/bs/beeMain.c
View File

@@ -469,7 +469,7 @@ void func_802A1DD8(void){
}
void func_802A1F2C(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
func_80291548();
func_80292EA4();
@@ -508,7 +508,7 @@ void func_802A2014(void){
void func_802A2054(void){
baMarker_collisionOn();
func_8025A2FC(-1, 0xFA0);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_80291548();
func_80298A64();
}
@@ -519,7 +519,7 @@ void func_802A2098(void){
yaw_setIdeal(func_8029B41C());
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A2FC(0, 0xFA0);
func_8025A6EC(COMUSIC_42_NOTEDOOR_OPENING_FANFARE, -1);
func_8029151C(0xC);

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

@@ -490,7 +490,7 @@ void bscroc_die_update(void){
}
void bscroc_die_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);

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

@@ -124,7 +124,7 @@ void bsdie_update(void){
}
void bsdie_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
func_8029E070(0);
pitch_setIdeal(0.0f);

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

@@ -32,7 +32,7 @@ void bsjig_jiggy_init(void){
yaw_setIdeal(func_8029B41C()); //face camera
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A2FC(0,0xfa0);
tmp = (item_getCount(ITEM_E_JIGGY) == 9);
if(tmp == 0) //weird if...
@@ -106,7 +106,7 @@ void bsjig_jiggy_end(void){
if(bs_getNextState() != BS_34_JIG_NOTEDOOR){
func_8025A2FC(-1, 0xfa0);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
baMarker_collisionOn();
if( jiggyscore_total() == 100
@@ -148,7 +148,7 @@ void bsjig_jiggy_interrupt(void){
void bsjig_notedoor_end(void){
baMarker_collisionOn();
func_8025A2FC(-1, 0xfa0);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8029E070(0);
func_80291548();
if( D_8037D4B2
@@ -174,7 +174,7 @@ void bsjig_notedoor_init(void){
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
if(bs_getPrevState() != BS_44_JIG_JIGGY){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A2FC(0,0xfa0);
}
func_8025A6EC(COMUSIC_42_NOTEDOOR_OPENING_FANFARE,-1);

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

@@ -524,7 +524,7 @@ void bspumpkin_die_update(void){
void bspumpkin_die_end(void) {
func_802B229C();
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);

8
src/core2/bs/timeout.c
View File

@@ -17,7 +17,7 @@ void func_802B6270(void){
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8029E070(1);
baMarker_collisionOff();
}
@@ -42,7 +42,7 @@ void func_802B6314(void){
void func_802B63C8(void){
func_80292EA4();
func_80291548();
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
void func_802B63F8(void){
@@ -58,7 +58,7 @@ void func_802B63F8(void){
ncDynamicCamD_func_802BF2C0(80.0f);
func_8025A58C(0,0xfa0);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);
}
@@ -71,6 +71,6 @@ void func_802B64D0(void){
void func_802B6500(void){
func_8029E070(0);
func_80291548();
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8025A904();
}

6
src/core2/bs/walrus.c
View File

@@ -508,7 +508,7 @@ void bswalrus_die_update(void){
}
void bswalrus_die_end(void){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
@@ -732,7 +732,7 @@ void bswalrus_timeout_init(void) {
ncDynamicCamD_func_802BF2C0(60.0f);
func_8025A58C(0, 4000);
comusic_playTrack(COMUSIC_3C_MINIGAME_LOSS);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
baMarker_collisionOff();
func_8029E3C0(0, 2.9f);
func_802B813C();
@@ -749,7 +749,7 @@ void func_802B9830(void) {
void func_802B9880(void) {
func_80291548();
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
func_8025A904();
func_80292EA4();
func_802B80D0();

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

@@ -173,7 +173,7 @@ void chJinjo_update(Actor * this){
sp40[1] += 50.0f;
jiggy_spawn(10*level_get()-9, sp40);
}//L802CE0CC
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8032BB88(this, 0, 4000);
if(local->unk4){
func_8025A6EC(COMUSIC_30_5TH_JINJO_COLLECTED, 28000);
@@ -248,7 +248,7 @@ void chJinjo_update(Actor * this){
func_80326310(this);
if(local->unk4 == 0){
func_8032BB88(this, -1, 4000);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
}//L802CE518
@@ -263,7 +263,7 @@ void chJinjo_update(Actor * this){
if(local->unk4 && actor_animationIsAt(this,0.95f)){
func_8032BB88(this, -1, 4000);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
}//L802CE598

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

@@ -374,10 +374,10 @@ void chSnacker_spawn(void) {
}
if (volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) == 0) {
func_8032BB88(snacker, 5000, 750);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A6EC(COMUSIC_34_SNACKER_DANGER, 0);
comusic_8025AB44(COMUSIC_34_SNACKER_DANGER, 0x7FFF, 750);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
s_chSnacker_spawnTimer = 0.0f;
func_8032CA80(snacker, s_chSnacker_inRbb ? 15 : 9);

6
src/core2/code_14420.c
View File

@@ -823,7 +823,7 @@ void func_8029C984(void){
func_8025AB00();
func_8025A2FC(0, 4000);
comusic_playTrack(COMUSIC_1A_DEATH);
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
}
s32 func_8029C9C0(s32 arg0){
@@ -885,7 +885,7 @@ void func_8029CB84(void){
void func_8029CBC4(void){
func_8025A55C(-1, 4000, 0xc);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
void func_8029CBF4(void){
@@ -920,7 +920,7 @@ void func_8029CCC4(void){
if(jiggyscore_total() == 100 && fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)){
func_8028F918(2);
}
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A55C(0, 4000, 0xC);
func_8025A6EC(COMUSIC_D_JINGLE_JIGGY_COLLECTED, -1);
timedFunc_set_0(4.0f, func_8029CBF4);

4
src/core2/code_85800.c
View File

@@ -458,7 +458,7 @@ void func_8030D778(void){
void func_8030D86C(void){
func_8030D750();
func_80244AB0();
core1_7090_alloc();
func_8030EDAC(0.0f, 1.0f);
}
@@ -472,7 +472,7 @@ void func_8030D8B4(void){
}
void func_8030D8DC(void){
func_80244B3C();
core1_7090_release();
func_8030D778();
func_8030D8B4();
}

8
src/core2/code_956B0.c
View File

@@ -128,7 +128,7 @@ void func_8031CB50(enum map_e map_id, s32 exit_id, s32 arg2) {
if ((func_803226E8(map_id) != sp1C) && (func_80322914() == 0)) {
func_8025A388(0, 0x4E2);
func_8025AB00();
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
}
if (func_802E4A08()) {
func_802E40D0(map_id, exit_id);
@@ -287,7 +287,7 @@ void warp_gvEnterWaterPyramidLower(s32 arg0, s32 arg1) {
void warp_gvEnterRubeePyramid(s32 arg0, s32 arg1) {
item_set(ITEM_6_HOURGLASS, 0);
func_80244C78(1);
core1_7090_freeSfxSource(1);
func_8031CC8C(arg0, 0x1607);
}
@@ -297,7 +297,7 @@ void warp_gvEnterMatchingPyramid(s32 arg0, s32 arg1) {
}
void warp_gvEnterWaterPyramidUpper(s32 arg0, s32 arg1) {
func_80244C78(0);
core1_7090_freeSfxSource(0);
volatileFlag_set(VOLATILE_FLAG_AC_GV_TRAPDOOR_MISSED, 1);
func_8031CC8C(arg0, 0x1502);
}
@@ -536,7 +536,7 @@ void func_8031DAA8(enum map_e arg0, s32 arg1) {
void func_8031DAE0(s32 arg0, s32 arg1) {
if (mapSpecificFlags_get(2) == 0) {
volatileFlag_set(VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED, 1);
func_80244C78(0);
core1_7090_freeSfxSource(0);
mapSpecificFlags_set(2, 1);
func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 0x6D60);
func_8028F918(1);

12
src/core2/code_9A9D0.c
View File

@@ -34,12 +34,12 @@ void func_803219F4(s32 arg0){
switch(D_80383310){
case 2: //L80321A30
func_8025A55C(-1, 4000, 7);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
comusic_8025AB44(COMUSIC_58_WADING_BOOTS, 0, 4000);
func_8025AABC(COMUSIC_58_WADING_BOOTS);
break;
case 4: //L80321A6C
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
if(D_80383314 == COMUSIC_57_TURBO_TRAINERS){
func_8025A55C(-1, 4000, 7);
}
@@ -48,7 +48,7 @@ void func_803219F4(s32 arg0){
break;
case 3: //L80321AC0
func_8025A55C(-1, 4000, 7);
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
comusic_8025AB44(COMUSIC_95_BBONUS_A, 0, 4000);
func_8025AABC(COMUSIC_95_BBONUS_A);
break;
@@ -60,7 +60,7 @@ void func_803219F4(s32 arg0){
switch(D_80383310){
case 2: //L80321B28
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A55C(0, 4000, 7);
func_8025A6EC(COMUSIC_58_WADING_BOOTS, -1);
func_8025A8B8(COMUSIC_58_WADING_BOOTS, 1);
@@ -72,7 +72,7 @@ void func_803219F4(s32 arg0){
else{
D_80383314 = COMUSIC_57_TURBO_TRAINERS;
}
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
if(D_80383314 == COMUSIC_57_TURBO_TRAINERS){
func_8025A55C(0, 4000, 7);
}
@@ -81,7 +81,7 @@ void func_803219F4(s32 arg0){
break;
case 3: //L80321BDC
func_803228D8();
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A55C(0, 4000, 7);
func_8025A6EC(COMUSIC_95_BBONUS_A, -1);
func_8025A8B8(COMUSIC_95_BBONUS_A, 1);

8
src/core2/code_9B650.c
View File

@@ -233,13 +233,13 @@ void func_8032278C(s32 arg0, s32 arg1) {
D_8036E2B4 = 0;
if (D_80383348 == 0) {
if ((temp_v0 & 1) != 0) {
func_8024ADF0(0);
core1_ce60_func_8024ADF0(FALSE);
} else {
func_8024ADF0(1);
core1_ce60_func_8024ADF0(TRUE);
}
} else {
D_80383348 = 0;
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
}
if ((arg0 == 1) && (arg1 == 2)) {
@@ -253,7 +253,7 @@ void func_8032278C(s32 arg0, s32 arg1) {
void func_803228D8(void){
if(!D_80383348){
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
D_80383348 = TRUE;
}
}

8
src/core2/code_9C170.c
View File

@@ -7,20 +7,20 @@ u8 D_80383370;
/* .code */
void func_80323100(void){
func_8024AED8();
core1_ce60_resetState();
}
void func_80323120(void){
func_8024AE74();
core1_ce60_func_8024AE74();
}
void func_80323140(s32 arg0, s32 arg1){
func_8024BD40(arg0, arg1);
core1_ce60_func_8024BD40(arg0, arg1);
func_8032278C(arg0, arg1);
}
void func_80323170(void){
func_8024AF48();
core1_ce60_func_8024AF48();
}
void func_80323190(void){

4
src/core2/code_ABC00.c
View File

@@ -142,7 +142,7 @@ s32 s_jiggylist_current_index;
/* .code */
void func_80332B90(void){
func_8024BD08(1);
core1_ce60_incOrDecCounter(TRUE);
}
void func_80332BB0(void) {
@@ -245,7 +245,7 @@ void jiggy_spawn(enum jiggy_e jiggy_id, f32 pos[3]) {
temp_v0->init(&temp_v0->unk10);
jiggyscore_setSpawned(jiggy_id, TRUE);
if (!jiggyscore_isCollected(jiggy_id) && (jiggy_id != JIGGY_3E_GV_GRABBA) && (jiggy_id != JIGGY_0B_TTC_JINJO)) {
func_8024BD08(0);
core1_ce60_incOrDecCounter(FALSE);
func_8025A55C(0, 4000, 5);
func_8025A6EC(COMUSIC_3D_JIGGY_SPAWN, 0x7FFF);
timedFunc_set_0(3.5f, func_80332BB0);

4
src/core2/code_AD5B0.c
View File

@@ -181,7 +181,7 @@ void func_80334910(void) {
if (func_80322914() == 0) {
func_8024F7C4(func_803226E8(D_803835D0.map_4));
}
func_80244B3C();
core1_7090_release();
AnimTextureListCache_free();
func_80322FDC();
func_8033BD6C();
@@ -197,7 +197,7 @@ void func_80334B20(enum map_e arg0, s32 arg1, s32 arg2) {
func_80335110(1);
func_80335128(1);
func_802D2CB8();
func_80244AB0();
core1_7090_alloc();
if (map_get() == MAP_8E_GL_FURNACE_FUN) {
func_8038E7C4();
}

1
src/core2/code_B9770.c
View File

@@ -2,7 +2,6 @@
#include "functions.h"
#include "variables.h"
extern void func_80250530(s32, u16, f32);
extern void sfxsource_setSampleRate(u8, s32);
extern bool func_80323240(struct56s *, f32, f32[3]);
extern f32 func_803234FC(struct56s *, f32, f32);