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

Merge branch 'mr-origin-53'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-01 16:26:51 -05:00
parent 35a2c13ea9 892f773f80
commit b26ae6b1f3
32 changed files with 1082 additions and 791 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/TTC/code_3E30.c
View File

@@ -328,15 +328,15 @@ void func_8038AC48(LetterFloorTile *arg0) {
default:
break;
case 0:
func_80346448(ITEM_D_EGGS);
item_setMaxCount(ITEM_D_EGGS);
func_802FAFAC(ITEM_D_EGGS, COMUSIC_C_EGG_COLLECTED);
break;
case 1:
func_80346448(ITEM_F_RED_FEATHER);
item_setMaxCount(ITEM_F_RED_FEATHER);
func_802FAFAC(ITEM_F_RED_FEATHER, COMUSIC_B_RED_FEATHER_COLLECTED);
break;
case 2:
func_80346448(ITEM_10_GOLD_FEATHER);
item_setMaxCount(ITEM_10_GOLD_FEATHER);
func_802FAFAC(ITEM_10_GOLD_FEATHER, COMUSIC_14_GOLD_FEATHER_COLLECTED);
break;
}
@@ -634,7 +634,7 @@ s32 __sandcastleCodes_getNumberEntered(void){
void func_8038B79C(s32 arg0, s32 arg1, s32 arg2, enum item_e item_id, s32 item_diff, s32 item_val) {
if (((arg2 + 0x14) == secretCodesTable[arg1].id) || (arg0 == 1)) {
if (item_diff != 0) {
func_803463D4(item_id, item_diff);
item_adjustByDiffWithHud(item_id, item_diff);
return;
}
item_set(item_id, item_val);