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

core2/code_83D70.c done

Browse Source
This commit is contained in:
Banjo Kazooie
2022-08-15 16:45:08 -05:00
parent 46ed2ced3c
commit 91a7ea3cad
66 changed files with 575 additions and 338 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,7 +29,7 @@ void bsbflap_init(void) {
player_setYVelocity(0.0f);
gravity_set(D_80364A14);
func_8029E070(1);
miscflag_set(0x12);
miscflag_set(MISC_FLAG_12_HAS_FLAPPED);
func_8029E3C0(0, 2.5f);
D_8037D30C = func_8030D90C();
func_80299BD4();

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

@@ -779,7 +779,7 @@ void func_802A503C(void){
}
void func_802A505C(void){
if(bs_getInterruptType() == 9){
if(bs_getInterruptType() == BS_INTR_9){
func_8029A86C(2);
miscflag_set(7);
func_8029CCC4();

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

@@ -63,7 +63,7 @@ void func_802A664C(void){
sp1C = 1.32f;
break;
}
miscflag_set(5);
miscflag_set(MISC_FLAG_5_HAS_PECKED);
func_8030E58C(SFX_42_KAZOOIE_RAH, sp1C);
player_setYVelocity(D_80364A64);
D_8037D375++;

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

@@ -66,7 +66,7 @@ bool func_802A73BC(void) {
}
void func_802A744C(void) {
if (func_8028B148() && bs_getState() != BS_4C_LANDING_IN_WATER) {
if (player_isInRBB() && bs_getState() != BS_4C_LANDING_IN_WATER) {
func_8035644C(0xAC);
}
roll_setAngularVelocity(30.0f, 0.9f);

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

@@ -118,7 +118,7 @@ void func_802A8AD8(void){
if(func_802916CC(3)){
if(func_8029DFE0()){
func_8029E0DC(0);
if(miscflag_isFalse(0x14))
if(miscflag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE))
func_8030E484(0x3eb);
func_803219F4(1);
}

9
src/core2/bs/carry.c
View File

@@ -1,6 +1,7 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
#include "bsint.h"
/* .data */
const f32 D_80364AF0 = 30.0f;
@@ -43,7 +44,7 @@ void bscarry_idle_update(void){
if(func_8029B300() > 0)
sp1C = BS_CARRY_WALK;
if(func_802948EC() == 0)
if(carriedobj_getMarker() == NULL)
sp1C = BS_1_IDLE;
bs_setState(sp1C);
@@ -72,7 +73,7 @@ void bscarry_walk_update(void){
if(func_8029B300() == 0 && func_80297C04(1.0f))
sp1C = BS_3A_CARRY_IDLE;
if(!func_802948EC())
if(carriedobj_getMarker() == NULL)
sp1C = BS_1_IDLE;
bs_setState(sp1C);
@@ -94,12 +95,12 @@ void bscarry_interrupt(void){
break;
case 8:
func_8029A86C(2);
bs_setState(0x3C);
bs_setState(BS_3C);
break;
case 0x12:
func_8028DE6C(carriedObject_getActorID());
break;
case 0x16:
case BS_INTR_16_THROW_CARRIED_OBJ:
if(func_802916CC(1)){
bs_setState(BS_CARRY_THROW);
func_8029A86C(2);

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

@@ -213,7 +213,7 @@ void func_802ABD40(void){
//bsclimb_interrupt
void func_802ABD60(void){
s32 next_state = 0;
if(bs_getInterruptType() == 0xC){
if(bs_getInterruptType() == BS_INTR_C_CLIMB){
D_8037D3D8 = TRUE;
}
else{

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

@@ -6,7 +6,7 @@
u8 D_8037D4B0;
u8 D_8037D4B1;
u8 D_8037D4B2;
ActorMarker *D_8037D4B4;
ActorMarker *bsjig_gJiggyMarker;
/* .code */
int bsjig_inJiggyJig(enum bs_e state){
@@ -14,7 +14,7 @@ int bsjig_inJiggyJig(enum bs_e state){
}
void bsjig_setJiggyMarkerPtr(ActorMarker * jiggyMarkerPtr){
D_8037D4B4 = jiggyMarkerPtr;
bsjig_gJiggyMarker = jiggyMarkerPtr;
}
void bsjig_jiggy_init(void){
@@ -43,13 +43,13 @@ void bsjig_jiggy_init(void){
miscflag_clear(7);
miscflag_clear(0xf);
func_8028D5DC();
func_802C82C0(marker_getActor(D_8037D4B4), 1);
func_802C82C0(marker_getActor(bsjig_gJiggyMarker), 1);
D_8037D4B0 = 0;
}
void func_802B0BA8(void){
if(D_8037D4B4){
func_802C82C0(marker_getActor(D_8037D4B4), 4);
if(bsjig_gJiggyMarker){
func_802C82C0(marker_getActor(bsjig_gJiggyMarker), 4);
}
}
@@ -83,9 +83,9 @@ void bsjig_jiggy_update(void){
}
void func_802B0CD8(void){
if(D_8037D4B4){
func_802C82C0(marker_getActor(D_8037D4B4), 5);
D_8037D4B4 = NULL;
if(bsjig_gJiggyMarker){
func_802C82C0(marker_getActor(bsjig_gJiggyMarker), 5);
bsjig_gJiggyMarker = NULL;
}
}
@@ -94,7 +94,7 @@ void bsjig_jiggy_end(void){
s32 sp28 = 4;
int sp24;
sp2C = 0;
sp24 = marker_getActor(D_8037D4B4)->unk38_31;
sp24 = marker_getActor(bsjig_gJiggyMarker)->unk38_31;
if(D_8037D4B0 == 0)
item_inc(ITEM_E_JIGGY);
@@ -139,7 +139,7 @@ void bsjig_jiggy_end(void){
}
void bsjig_jiggy_interrupt(void){
if(bs_getInterruptType() == 0x26)
if(bs_getInterruptType() == BS_INTR_26)
func_80296608();
}

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

@@ -95,7 +95,7 @@ void bsjump_update(void){
}
_get_velocity(&velocity);
if((button_released(BUTTON_A) && 0.0f < velocity[1] && !D_8037D4C2) || !func_8028AB48()){
if((button_released(BUTTON_A) && 0.0f < velocity[1] && !D_8037D4C2) || !can_control_jump_height()){
gravity_reset();
}
@@ -216,7 +216,7 @@ void bsjump_fall_update(void){
if(func_8028B424())
sp2C = BS_3D_FALL_TUMBLING;
if(should_flap() && miscflag_isFalse(5))
if(should_flap() && miscflag_isFalse(MISC_FLAG_5_HAS_PECKED))
sp2C = BS_BFLAP;
if(should_peck())
@@ -230,7 +230,7 @@ void bsjump_fall_update(void){
}
else if(player_inWater()){
func_8029CCC4();
if(miscflag_isTrue(6) || miscflag_isTrue(0x14)){
if(miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)){
sp2C = BS_D_TIMEOUT;
}

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

@@ -159,7 +159,7 @@ void func_802B3E64(void) {
if (func_802B3BB0()) {
next_state = bs_getIdleState();
}
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && miscflag_isTrue(0x14)) {
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
next_state = func_8029CA94(next_state);
}
bs_setState(next_state);

24
src/core2/bs/sled.c
View File

@@ -2,23 +2,23 @@
#include "functions.h"
#include "variables.h"
ActorMarker *D_8037D510;
ActorMarker *bssled_gSledMarker;
/* .code */
void func_802B3F20(void){
Actor *actor;
Actor *sled;
D_8037D510 = func_80296554();
actor = marker_getActor(D_8037D510);
actor->unk138_20 = TRUE;
bssled_gSledMarker = func_80296554();
sled = marker_getActor(bssled_gSledMarker);
sled->unk138_20 = TRUE;
}
void func_802B3F60(void){
Actor *actor;
if(D_8037D510 != NULL){
actor = marker_getActor(D_8037D510);
actor->unk138_20 = FALSE;
D_8037D510 = NULL;
Actor *sled;
if(bssled_gSledMarker != NULL){
sled = marker_getActor(bssled_gSledMarker);
sled->unk138_20 = FALSE;
bssled_gSledMarker = NULL;
}
}
@@ -33,7 +33,7 @@ void bssled_init(void){
void bssled_update(void){
s32 state = 0;
if(D_8037D510 == NULL)
if(bssled_gSledMarker == NULL)
state = BS_2F_FALL;
bs_setState(state);
}
@@ -47,7 +47,7 @@ void bssled_end(void){
}
void bssled_interrupt(void){
if(bs_getInterruptType() == 0x28){
if(bs_getInterruptType() == BS_INTR_28){
func_802B3F60();
func_8029A86C(2);
}

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

@@ -308,7 +308,7 @@ void bsstand_landing_update(void){
///BREAK???
void func_802B5350(void){
s32 sp1C = bs_getInterruptType();
if(sp1C == 0xd){
if(sp1C == BS_INTR_D_SURF){
bs_setState(0x52);
}
if(sp1C == 0x7){
@@ -328,7 +328,7 @@ void func_802B5350(void){
}
else if(sp1C == 0x8){//L802B5438
func_8029A86C(2);
bs_setState(0x3C);
bs_setState(BS_3C);
}else{
func_802948E0();
func_80296608();

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

@@ -40,7 +40,7 @@ void func_802B6064(void) {
void func_802B60D0(void){}
void func_802B60D8(void) {
if (bs_getInterruptType() == 0xD) {
if (bs_getInterruptType() == BS_INTR_D_SURF) {
D_8037D560 = 1;
func_8029A86C(2);
return;

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

@@ -176,7 +176,7 @@ void func_802B5950(void) {
if (func_80294524() && button_pressed(BUTTON_A)) {
next_state = BS_5_JUMP;
}
if (miscflag_isTrue(6) || miscflag_isTrue(0x14)) {
if (miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
next_state = BS_D_TIMEOUT;
}
bs_setState(next_state);
@@ -253,7 +253,7 @@ void func_802B5C40(void) {
if (func_80294524() && button_pressed(BUTTON_A)) {
next_state = BS_5_JUMP;
}
if (miscflag_isTrue(6) || miscflag_isTrue(0x14)) {
if (miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
next_state = BS_D_TIMEOUT;
}
bs_setState(next_state);

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

@@ -30,7 +30,7 @@ void bsthrow_update(void){
f32 sp34[3];
f32 sp28[3];
f32 sp24;
ActorMarker *sp20 = func_802948EC();
ActorMarker *sp20 = carriedobj_getMarker();
if(D_8037D580 == 0 && sp20 != NULL)
func_802948F8(sp20);
@@ -60,7 +60,7 @@ void bsthrow_end(void){
}
void bsthrow_interrupt(void){
if(bs_getInterruptType() == 0x12){
if(bs_getInterruptType() == BS_INTR_12){
if(D_8037D580 == 0){
func_8028DE6C(carriedObject_getActorID());
}

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

@@ -5,7 +5,7 @@
extern void func_8029AD68(f32, s32);
extern f32 ml_vec3f_dot_product(f32[3], f32[3]);
int func_802B81F0(enum bs_e state);
int bswalrus_inSet(enum bs_e state);
/* .data */
f32 D_80364DC0 = 30.0f;
@@ -87,7 +87,7 @@ void func_802B7F28(void) {
}
void func_802B8048(void){
if(!func_802B81F0(bs_getNextState())){
if(!bswalrus_inSet(bs_getNextState())){
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_8029B0C0();
@@ -101,7 +101,7 @@ void func_802B8048(void){
}
void func_802B80D0(void) {
if (func_802B8190(bs_getNextState()) == 0) {
if (bswalrus_inSledSet(bs_getNextState()) == 0) {
func_802B8048();
func_8029E0E8(0);
}
@@ -112,14 +112,14 @@ void func_802B8110(void){
}
void func_802B813C(void) {
if (func_802B8190(bs_getPrevState()) == 0) {
if (!bswalrus_inSledSet(bs_getPrevState())) {
D_8037D5C0 = 0.0f;
func_8029E0E8(1);
func_8029CF48(4, 1, 0.15f);
}
}
int func_802B8190(enum bs_e state){
int bswalrus_inSledSet(enum bs_e state){
return state == 0x81
|| state == BS_7D_WALRUS_SLED
|| state == BS_7E_WALRUS_SLED
@@ -128,7 +128,7 @@ int func_802B8190(enum bs_e state){
|| state == BS_9C_WALRUS_SLED_DRONE;
}
int func_802B81F0(enum bs_e state){
int bswalrus_inSet(enum bs_e state){
return state == BS_67_WALRUS_IDLE
|| state == BS_WALRUS_WALK
|| state == BS_WALRUS_JUMP
@@ -136,7 +136,7 @@ int func_802B81F0(enum bs_e state){
|| state == BS_WALRUS_OW
|| state == BS_WALRUS_DIE
|| state == BS_95_WALRUS_DRONE
|| func_802B8190(state);
|| bswalrus_inSledSet(state);
}
void bswalrus_idle_init(void){
@@ -754,7 +754,7 @@ void func_802B9880(void) {
}
void func_802B98C0(void) {
if (bs_getInterruptType() == 0x2B) {
if (bs_getInterruptType() == BS_INTR_2B) {
func_8029A86C(2);
bs_setState(BS_67_WALRUS_IDLE);
return;