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

Ability name corrections.

Browse Source
This commit is contained in:
MaikelChan
2023-08-10 00:26:00 +02:00
parent e0fee1831b
commit c25a349249
20 changed files with 77 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SM/ch/attacktutorial.c
View File

@@ -72,7 +72,7 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){
{
case 5:
if(this->unk10_12 == 0){
ability_unlock(ABILITY_4_BEAR_PUNCH);
ability_unlock(ABILITY_4_CLAW_SWIPE);
func_80311480(0xDFF, 0xE, this->unk1C, this->marker, func_80387288, func_80387258);
}
else{
@@ -102,7 +102,7 @@ void chAttackTutorial_setState(Actor * this, s32 arg1){
}
int func_803874C4(void){
return ability_isUnlocked(ABILITY_4_BEAR_PUNCH)
return ability_isUnlocked(ABILITY_4_CLAW_SWIPE)
&& ability_isUnlocked(ABILITY_C_ROLL)
&& ability_isUnlocked(ABILITY_B_RATATAT_RAP);
}
@@ -123,7 +123,7 @@ void chAttackTutorial_update(Actor *this){
this->unk1C_y = this->position_y;
this->unk1C_z = this->position_z;}
}
this->unk10_12 = (ability_isUnlocked(ABILITY_C_ROLL))? 2 : (ability_isUnlocked(ABILITY_4_BEAR_PUNCH)? 1:0);
this->unk10_12 = (ability_isUnlocked(ABILITY_C_ROLL))? 2 : (ability_isUnlocked(ABILITY_4_CLAW_SWIPE)? 1:0);
this->initialized = 1;
}
@@ -206,7 +206,7 @@ void func_80387764(ActorMarker * marker){
func_8028F94C(2, actor->unk1C);
}
//L80387848
if(!mapSpecificFlags_get(3) && func_802DA498() && temp_a2){
if(!mapSpecificFlags_get(3) && learnedAllTutorialAbilities() && temp_a2){
mapSpecificFlags_set(3, 1);
sp34 = 0xE12;
}//L80387898

26
src/SM/code_2990.c
View File

@@ -43,7 +43,7 @@ SM2900Struct D_8038AFB4[8] = {
{0xdfb, 0xdfe, 5, ABILITY_F_DIVE},
{ -1, 0xe00, 6, ABILITY_B_RATATAT_RAP},
{0xe04, 0xe06, 8, ABILITY_0_BARGE},
{ -1, 0xdfa, 4, ABILITY_8_FLIP},
{ -1, 0xdfa, 4, ABILITY_8_FLAP_FLIP},
{0xe01, 0xe03, 7, ABILITY_5_CLIMB},
{0xe10, 0xe11, 0x11, -1},
};
@@ -54,13 +54,13 @@ s32 D_8038AFE4 = 0;
/* .code */
int func_80388D80(void){
return ability_isUnlocked(ABILITY_F_DIVE)
|| ability_isUnlocked(ABILITY_4_BEAR_PUNCH)
|| ability_isUnlocked(ABILITY_4_CLAW_SWIPE)
|| ability_isUnlocked(ABILITY_C_ROLL)
|| ability_isUnlocked(ABILITY_B_RATATAT_RAP)
|| ability_isUnlocked(ABILITY_0_BARGE)
|| ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER)
|| ability_isUnlocked(ABILITY_7_FLAP)
|| ability_isUnlocked(ABILITY_8_FLIP)
|| ability_isUnlocked(ABILITY_7_FEATHERY_FLAP)
|| ability_isUnlocked(ABILITY_8_FLAP_FLIP)
|| ability_isUnlocked(ABILITY_5_CLIMB);
}
@@ -70,7 +70,7 @@ void func_80388E48(void){
ability_setHasUsed(ABILITY_1_BEAK_BOMB);
ability_setHasUsed(ABILITY_2_BEAK_BUSTER);
ability_setHasUsed(ABILITY_3_CAMERA_CONTROL);
ability_setHasUsed(ABILITY_4_BEAR_PUNCH);
ability_setHasUsed(ABILITY_4_CLAW_SWIPE);
ability_setHasUsed(ABILITY_5_CLIMB);
ability_setHasUsed(ABILITY_B_RATATAT_RAP);
ability_setHasUsed(ABILITY_C_ROLL);
@@ -79,13 +79,13 @@ void func_80388E48(void){
void func_80388EB0(void){
ability_unlock(ABILITY_F_DIVE);
ability_unlock(ABILITY_4_BEAR_PUNCH);
ability_unlock(ABILITY_4_CLAW_SWIPE);
ability_unlock(ABILITY_C_ROLL);
ability_unlock(ABILITY_B_RATATAT_RAP);
ability_unlock(ABILITY_0_BARGE);
ability_unlock(ABILITY_A_HOLD_A_JUMP_HIGHER);
ability_unlock(ABILITY_7_FLAP);
ability_unlock(ABILITY_8_FLIP);
ability_unlock(ABILITY_7_FEATHERY_FLAP);
ability_unlock(ABILITY_8_FLAP_FLIP);
ability_unlock(ABILITY_5_CLIMB);
func_80388E48();
mapSpecificFlags_set(3,1);
@@ -190,7 +190,7 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
Actor *actor;
actor = marker_getActor(marker);
if(!mapSpecificFlags_get(3) && func_802DA498()){
if(!mapSpecificFlags_get(3) && learnedAllTutorialAbilities()){
mapSpecificFlags_set(3, 1);
func_80311480(0xe12, 0xe, actor->position, actor->marker, func_803892C8, NULL);
}//L8038933C
@@ -311,7 +311,7 @@ void SM_func_80389610(Actor * this){
break;
case 4://L80389848
if( !ability_isUnlocked(ABILITY_4_BEAR_PUNCH)
if( !ability_isUnlocked(ABILITY_4_CLAW_SWIPE)
|| !ability_isUnlocked(ABILITY_C_ROLL)
|| !ability_isUnlocked(ABILITY_B_RATATAT_RAP)
){//L803898D4
@@ -324,8 +324,8 @@ void SM_func_80389610(Actor * this){
case 6://L803898A0
if( !ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER)
|| !ability_isUnlocked(ABILITY_7_FLAP)
|| !ability_isUnlocked(ABILITY_8_FLIP)
|| !ability_isUnlocked(ABILITY_7_FEATHERY_FLAP)
|| !ability_isUnlocked(ABILITY_8_FLAP_FLIP)
){//L803898D4
mapSpecificFlags_set(0xE, 1);
}
@@ -397,7 +397,7 @@ void func_803899B0(Actor * this){
if(func_80388D80()){
mapSpecificFlags_set(1,1);
if(func_802DA498()){
if(learnedAllTutorialAbilities()){
mapSpecificFlags_set(3, 1);
mapSpecificFlags_set(2, 1);
mapSpecificFlags_set(0xC, 1);

8
src/SM/code_4070.c
View File

@@ -36,7 +36,7 @@ void func_8038A4DC(Actor *this, s32 arg1){
this->sm_4070.unk0 = 0;
player_getPosition(this->velocity);
func_8028F918(0);
if(ability_isUnlocked(ABILITY_7_FLAP)){
if(ability_isUnlocked(ABILITY_7_FEATHERY_FLAP)){
mapSpecificFlags_set(9,1);
}else if(ability_isUnlocked(ABILITY_A_HOLD_A_JUMP_HIGHER)){//L8038A540
mapSpecificFlags_set(8,1);
@@ -94,7 +94,7 @@ void SM_func_8038A5D8(Actor *this){
if(!func_803114B0()){
if(mapSpecificFlags_get(8)){
func_8038A460(this);
ability_unlock(ABILITY_7_FLAP);
ability_unlock(ABILITY_7_FEATHERY_FLAP);
func_80311480(0xdf7, 0xa, this->unk1C, this->marker, func_8038A488, NULL);
this->sm_4070.unk0 = 0xe1b;
mapSpecificFlags_set(8,0);
@@ -102,7 +102,7 @@ void SM_func_8038A5D8(Actor *this){
if(mapSpecificFlags_get(9)){
func_8038A460(this);
ability_unlock(ABILITY_8_FLIP);
ability_unlock(ABILITY_8_FLAP_FLIP);
func_80311480(0xdf8, 0xa, this->unk1C, this->marker, func_8038A488, NULL);
this->sm_4070.unk0 = 0xe1c;
mapSpecificFlags_set(9,0);
@@ -112,7 +112,7 @@ void SM_func_8038A5D8(Actor *this){
func_8038A460(this);
func_8028F94C(2, this->unk1C);
if(!mapSpecificFlags_get(3) && func_802DA498()){
if(!mapSpecificFlags_get(3) && learnedAllTutorialAbilities()){
mapSpecificFlags_set(3,1);
temp_a0 = 0xe12;
}else{