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

Merge branch 'master' into 'document/code_91E10'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-10-14 21:30:27 +00:00
parent 2b85cc990a cd753fed3d
commit 370585ebd5
33 changed files with 1651 additions and 1246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core2/ch/gameSelect.c
View File

@@ -333,7 +333,7 @@ void func_802C4C14(Actor *this){
}
else{//L802C4D24
func_8024E60C(0, sp74);
func_8024E55C(0, sp5C);
controller_copyFaceButtons(0, sp5C);
controller_getJoystick(0, &sp54);
switch(this->state){
case 2:

14
src/core2/ch/mole.c
View File

@@ -7,8 +7,8 @@ Actor *func_802D94B4(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void chmole_additionalAbilityLearnActions(ActorMarker *marker, enum asset_e arg1, s32 arg2);
typedef struct{
s16 learn_text;
s16 refresher_text;
s16 teach_text_id;
s16 refresher_text_id;
s8 camera_node;
s8 ability;
} ChMoleDescription;
@@ -154,12 +154,12 @@ void chmole_healthRefill(ActorMarker *marker, enum asset_e arg1, s32 arg2){
// Also releases the camera
Actor *actor = marker_getActor(marker);
if( arg1 == moleTable[actor->unkF4_8-9].learn_text
if( arg1 == moleTable[actor->unkF4_8-9].teach_text_id
&& item_getCount(ITEM_14_HEALTH) < item_getCount(ITEM_15_HEALTH_TOTAL)
){
gcdialog_showText(ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH, 7, 0, actor->marker, chmole_healthRefill, chmole_additionalAbilityLearnActions);
}//L802D9738
else if(arg1 == moleTable[actor->unkF4_8-9].learn_text || arg1 == ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH){
else if(arg1 == moleTable[actor->unkF4_8-9].teach_text_id || arg1 == ASSET_D39_TEXT_BOTTLES_REFILL_HEALTH){
gcdialog_showText(chmole_learnedAllGameAbilities()? 0xa87 : chmole_learnedAllLevelAbilitiesDialog(), 7, 0, actor->marker, chmole_healthRefill, NULL);
}
else{//L802D97BC
@@ -224,13 +224,13 @@ int chmole_learnAbility(Actor *this){
// Known Ability: Refresher Dialog
if(ability_isUnlocked(moleTable[this->unkF4_8-9].ability)){
sp28 = 0xf;
sp2C = moleTable[this->unkF4_8-9].refresher_text;
sp2C = moleTable[this->unkF4_8-9].refresher_text_id;
}//L802D99EC
// New Ability: Learn Dialog & Misc Actions
else{
func_80347A14(0);
this->has_met_before = TRUE;
sp2C = moleTable[this->unkF4_8-9].learn_text;
sp2C = moleTable[this->unkF4_8-9].teach_text_id;
ability_unlock(moleTable[this->unkF4_8-9].ability);
switch(moleTable[this->unkF4_8-9].ability){
case ABILITY_9_FLIGHT:
@@ -376,7 +376,7 @@ void chmole_update(Actor *this){
}
}
}//L802D9F34
func_8024E55C(0, sp50); // get face buttons press counters
controller_copyFaceButtons(0, sp50); // get face buttons press counters
switch(this->state){
case 1://L802D9F70
this->yaw_ideal = func_80329784(this);

2
src/core2/code_4A6F0.c
View File

@@ -314,7 +314,7 @@ void chMumbo_update(Actor *this) {
&& func_8028F20C()
&& func_8028EFC8()
){
func_8024E55C(0, face_buttons);
controller_copyFaceButtons(0, face_buttons);
if(face_buttons[FACE_BUTTON(BUTTON_B)] == 1){
if (D_8037DDF0 == TRANSFORM_7_WISHWASHY) {
this->unk38_31 = 0;

2
src/core2/code_4C020.c
View File

@@ -1013,7 +1013,7 @@ void func_802D5628(void){
D_8037DE08 -= time_getDelta();
}
else{//L802D5B24
func_8024E55C(0, sp50); //get button inputs
controller_copyFaceButtons(0, sp50); //get button inputs
if(sp50[FACE_BUTTON(BUTTON_B)] == 1){
func_80324C58();
func_802D6114();

2
src/core2/code_5C240.c
View File

@@ -138,7 +138,7 @@ void func_802E35D8(void ) {
}
} else if (D_8037E8C0.unk14 == 3) {
sp38 = 0;
func_8024E55C(0, &sp40);
controller_copyFaceButtons(0, &sp40);
for(i = 0; i < 6; i++){
if (sp40[i] == 1) {
sp38++;

2
src/core2/code_91E10.c
View File

@@ -506,7 +506,7 @@ void gcquiz_func_80319EA4(void) {
if(sD_803830E0 == NULL)
return;
func_8024E55C(0, face_button_states);
controller_copyFaceButtons(0, face_button_states);
controller_getJoystick(0, joystick_states);
for(phi_s0 = 0; phi_s0 < 4; phi_s0++){
gczoombox_update(sD_803830E0->zoomboxes[phi_s0]);

2
src/core2/code_DC4B0.c
View File

@@ -6,7 +6,7 @@ void func_80363500(Actor *this);
/* .data */
ActorInfo D_80373DC0= {
0x1EE, ACTOR_3BA_UNKOWN, 0,
0x1EE, ACTOR_3BA_UNKNOWN, 0,
0, NULL,
func_80363500, actor_update_func_80326224, func_80325340,
0, 0, 0.0f, 0

2
src/core2/code_E410.c
View File

@@ -27,7 +27,7 @@ void func_80295448(void){
D_8037C310.unk0[0] = controller_getStartButton(0);
func_8024E60C(0, &D_8037C310.unk0[1]);
func_8024E6E0(0, &D_8037C310.unk0[4]);
func_8024E55C(0, &D_8037C310.unk0[8]);
controller_copyFaceButtons(0, &D_8037C310.unk0[8]);
for(i=0; i<0xE; i++){//L802954A8
D_8037C310.unk7E[i] = D_8037C310.unk70[i];
if(D_8037C310.unk70[i]){

2
src/core2/gc/dialog.c
View File

@@ -376,7 +376,7 @@ void gcdialog_update(void) {
func_8024E5A8(0, controller_face_buttons);
func_8024E640(0, controller_side_buttons);
} else {
func_8024E55C(0, controller_face_buttons);
controller_copyFaceButtons(0, controller_face_buttons);
func_8024E60C(0, controller_side_buttons);
}

2
src/core2/gc/pauseMenu.c
View File

@@ -936,7 +936,7 @@ s32 gcPauseMenu_update(void) {
return 0;
}
func_8024E55C(0, face_button);
controller_copyFaceButtons(0, face_button);
controller_getJoystick(0, joystick);
func_8024E60C(0, sp60);
func_8024E6E0(0, sp50);

4
src/core2/gc/zoombox.c
View File

@@ -881,7 +881,7 @@ void func_80316764(GcZoombox *this, s32 arg1) {
f32 pad0;
if (!this->unk1A4_10 ) {
func_8024E55C(0, sp38);
controller_copyFaceButtons(0, sp38);
func_8024E60C(0, sp2C);
phi_f0 = time_getDelta();
} else {
@@ -1067,7 +1067,7 @@ void gczoombox_update(GcZoombox *this){
return;
if( !this->unk1A4_10 ){
func_8024E55C(0, sp58);
controller_copyFaceButtons(0, sp58);
func_8024E60C(0, sp4C);
tmp_f0 = time_getDelta();
}