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

pal progress, rename bs/iFrame to ba/iFrame

Browse Source
This commit is contained in:
Banjo Kazooie
2025-08-17 19:01:23 -05:00
parent 9912785eeb
commit 24c3c06a6a
27 changed files with 621 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,7 +242,7 @@ static void __chClam_playerDropsItem(enum bundle_e bundle_id, enum item_e item_i
static void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){
if(bsiFrame_getState() == 3) return;
if(baiFrame_getState() == 3) return;
if( !mapSpecificFlags_get(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN) && gcdialog_showDialog(ASSET_A14_DIALOG_CLAM_TAUNT, 0, NULL, NULL, NULL, NULL)){
mapSpecificFlags_set(TTC_SPECIFIC_FLAG_5_CLAM_FIRST_MEET_TEXT_SHOWN, TRUE);

20
src/core2/bs/iFrame.c → src/core2/ba/iFrame.c
View File

@@ -8,31 +8,31 @@
u8 iFrameState;
/* .code */
void bsiFrame_setState(s32 state) {
void baiFrame_setState(s32 state) {
iFrameState = state;
}
s32 bsiFrame_getState(void) {
s32 baiFrame_getState(void) {
return iFrameState;
}
void bsiFrame_reset(void) {
void baiFrame_reset(void) {
iFrameState = 0;
bsiFrame_setState(IFRAME_NONE);
baiFrame_setState(IFRAME_NONE);
stateTimer_clear(STATE_TIMER_4_IFRAME);
}
void bsiFrame_start(void) {
bsiFrame_startWithValue(0.6f);
void baiFrame_start(void) {
baiFrame_startWithValue(0.6f);
}
void bsiFrame_startWithValue(f32 val) {
void baiFrame_startWithValue(f32 val) {
stateTimer_set(STATE_TIMER_4_IFRAME, val);
bsiFrame_setState(IFRAME_INVICIBLE);
baiFrame_setState(IFRAME_INVICIBLE);
}
void bsiFrame_update(void) {
void baiFrame_update(void) {
if (stateTimer_isDone(STATE_TIMER_4_IFRAME)) {
bsiFrame_setState(IFRAME_NONE);
baiFrame_setState(IFRAME_NONE);
}
}

0
src/core2/bs/iFrame.h → src/core2/ba/iFrame.h
View File

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

@@ -808,7 +808,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
obj_collision_type = MARKER_COLLISION_FUNC_1;
break;
}//L8028D034
if(bsiFrame_getState() == 3){
if(baiFrame_getState() == 3){
plyr_collision_type = MARKER_COLLISION_FUNC_0;
}
if(obj_collision_type){
@@ -1030,7 +1030,7 @@ void baMarker_8028D7B8(s32 arg0, ActorMarker *arg1, struct5Cs *collision_flags){
if(func_8033D5A4(collision_flags))
baflag_set(BA_FLAG_8);
if((bsiFrame_getState() != 3 && func_8028F1E0()) || !sp20){
if((baiFrame_getState() != 3 && func_8028F1E0()) || !sp20){
if(!func_8028F25C()){
sp24 = func_8033D564(collision_flags);
if(0 < sp24 && sp24 < 6){

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

@@ -337,7 +337,7 @@ static void __bsant_recoil_update(void){
}
static void __bsant_recoil_end(void){
bsiFrame_start();
baiFrame_start();
baphysics_reset_gravity();
baMarker_collisionOn();
baeyes_open();

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

@@ -679,7 +679,7 @@ void func_802A4C34(s32 arg0) {
void func_802A4C88(s32 arg0) {
baphysics_reset();
baMarker_collisionOn();
bsiFrame_start();
baiFrame_start();
func_8029E070(0);
func_80291548();
func_802A34C8();

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

@@ -325,7 +325,7 @@ void func_802A7CA8(void) {
void func_802A7D74(void) {
bsiFrame_start();
baiFrame_start();
baMarker_collisionOn();
baeyes_open();
func_802A75B0();

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

@@ -749,7 +749,7 @@ void bsbtrot_ow_update(void){
}
void bsbtrot_ow_end(void){
bsiFrame_start();
baiFrame_start();
baphysics_reset_gravity();
baMarker_collisionOn();
baeyes_open();

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

@@ -155,8 +155,8 @@ void bsbbuster_update(void){
break;
case 3://802A00F0
D_8037D2B7 = 0;
if(bsiFrame_getState() == 1){
bsiFrame_startWithValue(0.9f);
if(baiFrame_getState() == 1){
baiFrame_startWithValue(0.9f);
}
D_8037D2B0 -= time_getDelta();

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

@@ -360,7 +360,7 @@ void func_802A1A50(void){
}
void func_802A1B28(void){
bsiFrame_start();
baiFrame_start();
baphysics_reset_gravity();
baMarker_collisionOn();
baeyes_open();

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

@@ -384,7 +384,7 @@ static void __bscroc_recoil_update(void){
}
void __bscroc_recoil_end(void){
bsiFrame_start();
baiFrame_start();
baphysics_reset_gravity();
baMarker_collisionOn();
baeyes_open();

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

@@ -66,7 +66,7 @@ void bsow_update(void) {
void bsow_end(void){
func_802B35DC();
func_802B1FD0(0);
bsiFrame_start();
baiFrame_start();
baphysics_reset_gravity();
baMarker_collisionOn();
baeyes_open();

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

@@ -394,7 +394,7 @@ void __bspumpkin_bounce_update(void) {
}
void __bspumpkin_bounce_end(void) {
bsiFrame_start();
baiFrame_start();
baphysics_reset_gravity();
baMarker_collisionOn();
baeyes_open();

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

@@ -85,5 +85,5 @@ void bssplat_update(void){
void bssplat_end(void){
baMarker_collisionOn();
bsiFrame_start();
baiFrame_start();
}

2
src/core2/code_11870.c
View File

@@ -32,7 +32,7 @@ void func_80298890(void){
if(D_8037C670){
D_8037C670--;
if(D_8037C670 == 0){
bsiFrame_startWithValue(1.2f);
baiFrame_startWithValue(1.2f);
D_8037C671 = 0;
}
}

2
src/core2/code_9E370.c
View File

@@ -2254,7 +2254,7 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) {
sp6C = func_8033D584(arg2);
sp68 = func_8033D5A4(arg2);
sp64 = func_8033D574(arg2);
if (((bsiFrame_getState() != 3) && func_8028F1E0()) || (func_8033D594(arg2) == 0)) {
if (((baiFrame_getState() != 3) && func_8028F1E0()) || (func_8033D594(arg2) == 0)) {
if (sp64 == 0) {
if ((sp68 != 0) || (arg1->id == 0)) {
if (sp68 <= 0) {

6
src/core2/code_E910.c
View File

@@ -58,7 +58,7 @@ bsMap D_80363824[] ={
{BS_ROLL, bstwirl_init, bstwirl_update, bstwirl_end, func_802B5350},
{BS_SLIDE, bsslide_init, bsslide_update, bsslide_end, func_802B5350},
{0x33, func_802B9ACC, func_802B9B14, func_802B9AAC, func_802B9D00},
{BS_34_JIG_NOTEDOOR, bsjig_notedoor_init, bsjig_notedoor_update, bsjig_notedoor_end, func_80296590},
{BS_34_JIG_NOTEDOOR, bsjig_notedoor_init, bsjig_notedoor_update, bsjig_notedoor_end, VER_SELECT(func_80296590, 0x802b0cfc, 0, 0)},
{BS_35_ANT_IDLE, bsant_idle_init, bsant_idle_update, bsant_idle_end, func_802B5350},
{BS_ANT_WALK, bsant_walk_init, bsant_walk_update, bsant_walk_end, func_802B5350},
{BS_ANT_JUMP, bsant_jump_init, bsant_jump_update, bsant_jump_end, func_802B5350},
@@ -202,7 +202,7 @@ void func_80295914(void){
func_80295DD0();
func_80296C30();
baphysics_init();
bsiFrame_reset();
baiFrame_reset();
pitch_reset();
climbClear();
func_8029887C();
@@ -309,7 +309,7 @@ void func_80295C14(void){
snackerctl_update();
func_8028B71C();
hazards_update();
bsiFrame_update();
baiFrame_update();
func_80294E60();
cameraMode_update();
func_802919A0();

2
src/core2/code_EE40.c
View File

@@ -26,8 +26,6 @@ void func_80295DD0(void){
D_8037C3C0.unk0[1] += 1000.0f;
D_8037C3C0.unk0[2] += 400.0f;
D_8037C3C0.unk18 = 0;
}
void func_80295E74(void){

15
src/core2/code_EF50.c
View File

@@ -1,7 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "version.h"
#include "core2/ba/physics.h"
extern f32 player_getYaw(void);
@@ -266,10 +266,15 @@ void func_80296590(void){
case 0x13 : //L802965C8
case 0x26 : //L802965C8
case 0x2a : //L802965C8
case 0x2c : //L802965C8
case 0x30 : //L802965C8
#if VERSION == VERSION_USA_1_0
case 0x2c :
#endif
func_80296404(temp_a0);
break;
#if VERSION == VERSION_PAL
case 0x2c :
#endif
case 0x31 : //L802965D8
case 0x32 : //L802965D8
case 0x33 : //L802965D8
@@ -382,7 +387,7 @@ void func_80296608(void){
sp2C = 2;
break;
case BS_INTR_1F_HAZARD: //L80296868
if(bsiFrame_getState() != 3 && baMarker_isCollidable()){
if(baiFrame_getState() != 3 && baMarker_isCollidable()){
case BS_INTR_31: //L8029688C
func_802960C4(2);
item_dec(ITEM_14_HEALTH);
@@ -391,7 +396,7 @@ void func_80296608(void){
}
break;
case BS_INTR_21: //L802968B4
if(bsiFrame_getState() != 3){
if(baiFrame_getState() != 3){
case BS_INTR_33: //L802968C8
func_802960C4(0);
item_dec(ITEM_14_HEALTH);
@@ -400,7 +405,7 @@ void func_80296608(void){
}
break;
case BS_INTR_20: //L802968F0
if(bsiFrame_getState() != 3){
if(baiFrame_getState() != 3){
func_802960C4(1);
item_dec(ITEM_14_HEALTH);
next_state = func_802962BC(0);

4
src/core2/hazards.c
View File

@@ -4,7 +4,7 @@
#include "core2/ba/timer.h"
#include "core2/statetimer.h"
#include "bs/iFrame.h"
#include "ba/iFrame.h"
/* .bss */
u8 hazardSfxId;
@@ -243,7 +243,7 @@ bool canTakeGroundDamage(void) {
&& bs_state != BS_25_LONGLEG_ENTER
&& player_getWaterState() != BSWATERGROUP_2_UNDERWATER
&& func_8028EC04() < 1U
&& bsiFrame_getState() != IFRAME_INVICIBLE
&& baiFrame_getState() != IFRAME_INVICIBLE
&& bs_getState() != BS_3D_FALL_TUMBLING
&& player_isDead() < 1U;
}

8
src/fight/chfinalboss.c
View File

@@ -1328,7 +1328,7 @@ void chfinalboss_phase3_update(ActorMarker *marker) {
}
break;
case 23:
if (chfinalboss_func_80386BEC(this, 9.0f) && (bsiFrame_getState() != 3)) {
if (chfinalboss_func_80386BEC(this, 9.0f) && (baiFrame_getState() != 3)) {
chfinalboss_phase3_setState(this, 0x18);
}
break;
@@ -1575,7 +1575,7 @@ void chfinalboss_phase4_update(ActorMarker *marker) {
break;
case 29:
if ((chfinalboss_func_80386BEC(this, 9.0f)) && (bsiFrame_getState() != 3) && (sFinalBossJinjoStatueActivated == 0)) {
if ((chfinalboss_func_80386BEC(this, 9.0f)) && (baiFrame_getState() != 3) && (sFinalBossJinjoStatueActivated == 0)) {
chfinalboss_phase4_setState(this, 0x1E);
}
break;
@@ -1814,14 +1814,14 @@ void chfinalboss_phase5_update(ActorMarker *marker) {
break;
case 36:
if (chfinalboss_func_80386BEC(this, 9.0f) && (bsiFrame_getState() != 3)) {
if (chfinalboss_func_80386BEC(this, 9.0f) && (baiFrame_getState() != 3)) {
chfinalboss_phase5_setState(this, 0x25);
}
break;
case 37:
chfinalboss_func_80386BEC(this, 3.0f);
if (bsiFrame_getState() == 3) {
if (baiFrame_getState() == 3) {
chfinalboss_phase5_setState(this, 0x24);
break;
}