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

Warps & Misc Documentation

Browse Source
This commit is contained in:
Cyrus Kashef
2024-08-31 18:41:14 -05:00
parent de50021481
commit c6fdd863ed
21 changed files with 793 additions and 626 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
include/enums.h
View File

@@ -3639,6 +3639,7 @@ enum asset_e
ASSET_7D9_SPRITE_NOTE, ASSET_7D9_SPRITE_NOTE,
ASSET_7DD_SPRITE_HEALTH = 0x7dd, ASSET_7DD_SPRITE_HEALTH = 0x7dd,
ASSET_7DE_SPRITE_SHOE_SPARKLES,
ASSET_7E5_SPRITE_WATER_HONEYCOMB = 0x7e5, ASSET_7E5_SPRITE_WATER_HONEYCOMB = 0x7e5,
ASSET_7E6_SPRITE_VILE, ASSET_7E6_SPRITE_VILE,
@@ -3828,6 +3829,22 @@ enum asset_e
ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A, ASSET_C2A_TEXT_BOTTLES_ALL_FP_GV_MOVES_LEARNED = 0xC2A,
ASSET_C63_TEXT_MR_VILE_INTRO = 0xC63,
ASSET_C64_TEXT_MR_VILE_ROUND_1_START,
ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES,
ASSET_C66_TEXT_MR_VILE_WINS_ROUND_1,
ASSET_C67_TEXT_MR_VILE_ROUND_2_START,
ASSET_C68_TEXT_MR_VILE_WINS_ROUND_2,
ASSET_C69_TEXT_MR_VILE_ROUND_3_START,
ASSET_C6A_TEXT_MR_VILE_WINS_ROUND_3,
ASSET_C6B_TEXT_MR_VILE_PLAYER_WINS,
ASSET_C6C_TEXT_MR_VILE_TRY_AGAIN,
ASSET_C6D_TEXT_MR_VILE_LOSE_ROUND_1_REMATCH,
ASSET_C6E_TEXT_MR_VILE_LOSE_ROUND_2_REMATCH,
ASSET_C6F_TEXT_MR_VILE_LOSE_ROUND_3_REMATCH,
ASSET_C70_TEXT_MR_VILE_WIN_ROUND_2_REMATCH,
ASSET_C71_TEXT_MR_VILE_WIN_ROUND_3_REMATCH,
text_flibbits_meet = 0xc81, text_flibbits_meet = 0xc81,
text_flibbits_defeat = 0xc82, text_flibbits_defeat = 0xc82,
text_flibbits_return = 0xc83, text_flibbits_return = 0xc83,
@@ -3836,6 +3853,19 @@ enum asset_e
ASSET_C89_DIALOG_LONGLEG_REFRESHER, ASSET_C89_DIALOG_LONGLEG_REFRESHER,
ASSET_C8A_TEXT_BOTTLES_ALL_BGS_MOVES_LEARNED, ASSET_C8A_TEXT_BOTTLES_ALL_BGS_MOVES_LEARNED,
ASSET_C8D_TEXT_MR_VILE_EXTRA_CHALLENGE_INTRO = 0xC8D,
ASSET_C8E_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_1,
ASSET_C8F_TEXT_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE,
ASSET_C90_TEXT_MR_VILE_EXTRA_CHALLENGE_REMATCH_1,
ASSET_C91_TEXT_MR_VILE_EXTRA_CHALLENGE_REMATCH_2,
ASSET_C92_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_2,
ASSET_C93_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_3,
ASSET_C94_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_4,
ASSET_C95_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_1,
ASSET_C96_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_2,
ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3,
ASSET_C98_TEXT_MR_VILE_GIVES_PRIZE,
ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32, ASSET_D32_DIALOG_MUTANT_CRAB_MEET = 0xD32,
ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT, ASSET_D33_DIALOG_MUTANT_CRAB_DEFEAT,
ASSET_D34_TEXT_GLOOP_MEET, ASSET_D34_TEXT_GLOOP_MEET,

85
src/BGS/code_3420.c
View File

@@ -36,13 +36,80 @@ void func_8038A068(Actor *this, s32 next_state);
void chvilegame_update(Actor *this); void chvilegame_update(Actor *this);
/* .data */ /* .data */
ActorInfo D_80390960 = {MARKER_C6_VILE_GAME_CTRL, ACTOR_138_VILE_GAME_CTRL, 0, 0, NULL, chvilegame_update, NULL, func_80325340, 0, 0, 0.0f, 0}; ActorInfo D_80390960 = {
enum asset_e D_80390984[] = { 0, 0xC66, 0xC68, 0xC6A, 0xC92, 0xC93, 0xC94, 0}; MARKER_C6_VILE_GAME_CTRL, ACTOR_138_VILE_GAME_CTRL, 0,
enum asset_e D_803909A4[] = { 0, 0xC67, 0xC69, 0, 0xC95, 0xC96, 0xC97}; 0, NULL,
enum asset_e D_803909C0[] = { 0, 0xC6E, 0xC6F, 0, 0xC95, 0xC96, 0xC97}; chvilegame_update, NULL, func_80325340,
enum asset_e D_803909DC[] = {0xC65, 0xC65, 0xC65, 0xC8F, 0, 0, 0}; 0, 0, 0.0f, 0
enum asset_e BGS_D_803909F8[] = {0xC64, 0, 0, 0xC8E, 0, 0, 0, 0}; };
enum asset_e D_80390A18[] = {0xC6D, 0xC70, 0xC71, 0xC8E, 0, 0, 0, 0};
// Vile Wins
enum asset_e D_80390984[] = {
0,
ASSET_C66_TEXT_MR_VILE_WINS_ROUND_1,
ASSET_C68_TEXT_MR_VILE_WINS_ROUND_2,
ASSET_C6A_TEXT_MR_VILE_WINS_ROUND_3,
ASSET_C92_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_2,
ASSET_C93_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_3,
ASSET_C94_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_4,
0
};
// Player Wins
enum asset_e D_803909A4[] = {
0,
ASSET_C67_TEXT_MR_VILE_ROUND_2_START,
ASSET_C69_TEXT_MR_VILE_ROUND_3_START,
0,
ASSET_C95_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_1,
ASSET_C96_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_2,
ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3
};
// Player Wins Rematch
enum asset_e D_803909C0[] = {
0,
ASSET_C6E_TEXT_MR_VILE_LOSE_ROUND_2_REMATCH,
ASSET_C6F_TEXT_MR_VILE_LOSE_ROUND_3_REMATCH,
0,
ASSET_C95_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_1,
ASSET_C96_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_2,
ASSET_C97_TEXT_MR_VILE_LOSES_EXTRA_CHALLENGE_3
};
// Player Declines
enum asset_e D_803909DC[] = {
ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES,
ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES,
ASSET_C65_TEXT_MR_VILE_PLAYER_DECLINES,
ASSET_C8F_TEXT_MR_VILE_PLAYER_DECLINES_EXTRA_CHALLENGE,
0,
0,
0
};
// Round 1 Regular & Extra Challenge
enum asset_e BGS_D_803909F8[] = {
ASSET_C64_TEXT_MR_VILE_ROUND_1_START,
0,
0,
ASSET_C8E_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_1,
0,
0,
0,
0
};
enum asset_e D_80390A18[] = {
ASSET_C6D_TEXT_MR_VILE_LOSE_ROUND_1_REMATCH,
ASSET_C70_TEXT_MR_VILE_WIN_ROUND_2_REMATCH,
ASSET_C71_TEXT_MR_VILE_WIN_ROUND_3_REMATCH,
ASSET_C8E_TEXT_MR_VILE_WINS_EXTRA_CHALLENGE_1,
0,
0,
0,
0
};
/* .code */ /* .code */
bool BGS_func_80389810(f32 arg0[3]) { bool BGS_func_80389810(f32 arg0[3]) {
@@ -611,9 +678,9 @@ void chvilegame_update(Actor *this) {
} }
if (local->type_change_timer > 3.5) { if (local->type_change_timer > 3.5) {
if (local->current_type != 0) { if (local->current_type != 0) {
func_803463D4(ITEM_1D_GRUMBLIE, FALSE); item_adjustByDiffWithHud(ITEM_1D_GRUMBLIE, FALSE);
} else { } else {
func_803463D4(ITEM_1E_YUMBLIE, FALSE); item_adjustByDiffWithHud(ITEM_1E_YUMBLIE, FALSE);
} }
} }
} }

2
src/MMM/ch/loggo.c
View File

@@ -116,7 +116,7 @@ void chLoggo_update(Actor *this){
this->unk60 -= sp44; this->unk60 -= sp44;
} }
else{ else{
func_8031F7D4(0, 0); warp_mmmEnterLoggo(0, 0);
} }
break; break;
} }

8
src/TTC/code_3E30.c
View File

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

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

@@ -175,7 +175,7 @@ void __baMarker_resolveMusicNoteCollision(Prop *arg0) {
if (!func_802FADD4(ITEM_1B_VILE_VILE_SCORE)) { if (!func_802FADD4(ITEM_1B_VILE_VILE_SCORE)) {
item_inc(ITEM_C_NOTE); item_inc(ITEM_C_NOTE);
} else { } else {
func_803463F4(ITEM_C_NOTE, 1); item_adjustByDiffWithoutHud(ITEM_C_NOTE, 1);
} }
if (item_getCount(ITEM_C_NOTE) < 100) { if (item_getCount(ITEM_C_NOTE) < 100) {
func_8025A6EC(COMUSIC_9_NOTE_COLLECTED, 16000); func_8025A6EC(COMUSIC_9_NOTE_COLLECTED, 16000);
@@ -532,7 +532,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
|| (func_8028B2E8() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0))) || (func_8028B2E8() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0)))
){ ){
jiggyscore_setCollected(jiggy_id, TRUE); jiggyscore_setCollected(jiggy_id, TRUE);
func_803463F4(ITEM_26_JIGGY_TOTAL, 1); item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, 1);
if(jiggy_id == JIGGY_20_BGS_ELEVATED_WALKWAY || jiggy_id == JIGGY_25_BGS_MAZE){ if(jiggy_id == JIGGY_20_BGS_ELEVATED_WALKWAY || jiggy_id == JIGGY_25_BGS_MAZE){
func_802D6924(); func_802D6924();
} }
@@ -687,7 +687,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_6B_GLOOPBUBBLE: //L8028CD20 case MARKER_6B_GLOOPBUBBLE: //L8028CD20
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){ if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
func_803463D4(ITEM_17_AIR, fxairscore_count_to_time(2)); item_adjustByDiffWithHud(ITEM_17_AIR, fxairscore_count_to_time(2));
} }
break; break;
@@ -1032,10 +1032,10 @@ void baMarker_8028D7B8(s32 arg0, ActorMarker *arg1, struct5Cs *collision_flags){
if(sp20){ if(sp20){
if(func_8033D594(collision_flags) == 3){ if(func_8033D594(collision_flags) == 3){
func_803463D4(ITEM_14_HEALTH, -item_getCount(ITEM_14_HEALTH)); item_adjustByDiffWithHud(ITEM_14_HEALTH, -item_getCount(ITEM_14_HEALTH));
} }
else{//L8028D92C else{//L8028D92C
func_803463D4(ITEM_14_HEALTH, -sp20); item_adjustByDiffWithHud(ITEM_14_HEALTH, -sp20);
} }
}//L8028D948 }//L8028D948

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

@@ -25,7 +25,7 @@ void bssplat_init(void){
baanim_playForDuration_onceSmooth(ASSET_149_ANIM_BSSPLAT, 1.1f); baanim_playForDuration_onceSmooth(ASSET_149_ANIM_BSSPLAT, 1.1f);
func_8029C7F4(1,1,3, BA_PHYSICS_LOCKED_ROTATION); func_8029C7F4(1,1,3, BA_PHYSICS_LOCKED_ROTATION);
bafalldamage_get_damage(&sp1C); bafalldamage_get_damage(&sp1C);
func_803463D4(ITEM_14_HEALTH, -sp1C); item_adjustByDiffWithHud(ITEM_14_HEALTH, -sp1C);
if(func_8029CEB0() == 4){ if(func_8029CEB0() == 4){
FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 32000); FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.7f, 32000);
FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.8f, 32000); FUNC_8030E624(SFX_116_DEAF_RUSTLING, 0.8f, 32000);

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

@@ -82,7 +82,7 @@ bool chCollectible_collectItem(Actor* actor, enum file_progress_e arg1, enum ass
if(!func_802FADD4(0x1b)){ if(!func_802FADD4(0x1b)){
item_inc(itemId); item_inc(itemId);
} else { } else {
func_803463F4(itemId,1); item_adjustByDiffWithoutHud(itemId,1);
} }
if(!actor || !actor->unk38_0) if(!actor || !actor->unk38_0)

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

@@ -20,8 +20,8 @@ void func_802C5740(Actor *this);
extern void func_802C71F0(Actor *); extern void func_802C71F0(Actor *);
extern void func_802C74F4(Actor *, s32, f32 ); extern void func_802C74F4(Actor *, s32, f32 );
extern void func_8031FB14(s32, s32); extern void warp_lairEnterLairFromSMLevel(s32, s32);
extern void func_8031F678(s32, s32); extern void warp_smExitBanjosHouse(s32, s32);
extern void func_80335110(s32); extern void func_80335110(s32);
extern void func_8024E60C(s32, s32[3]); extern void func_8024E60C(s32, s32[3]);
@@ -413,10 +413,10 @@ void func_802C4C14(Actor *this){
if(this->state == 4 && (sp84 == 0 || sp84 == 1)) if(this->state == 4 && (sp84 == 0 || sp84 == 1))
sp44 = 0.25f; sp44 = 0.25f;
if(mole_learnedAllSpiralMountainAbilities() && fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE)){ if(mole_learnedAllSpiralMountainAbilities() && fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE)){
timedFunc_set_2(sp44, (GenFunction_2)func_8031FB14, 0, 0); timedFunc_set_2(sp44, (GenFunction_2)warp_lairEnterLairFromSMLevel, 0, 0);
} }
else{//L802C5188 else{//L802C5188
timedFunc_set_2(sp44, (GenFunction_2)func_8031F678, 0, 0); timedFunc_set_2(sp44, (GenFunction_2)warp_smExitBanjosHouse, 0, 0);
}//L802C51A0 }//L802C51A0
timedFunc_set_1(sp44, (GenFunction_1)func_80335110, 1); timedFunc_set_1(sp44, (GenFunction_1)func_80335110, 1);
}//L802C51B8 }//L802C51B8

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

@@ -51,7 +51,7 @@ void __chJinjo_802CDBA8(ActorMarker *this, ActorMarker *other){
fileProgressFlag_set(FILEPROG_E_JINJO_TEXT, 1); fileProgressFlag_set(FILEPROG_E_JINJO_TEXT, 1);
} }
subaddie_set_state_with_direction(actorPtr, 6, 0.0f , -1); subaddie_set_state_with_direction(actorPtr, 6, 0.0f , -1);
if(func_803463D4(ITEM_12_JINJOS, 1 << (this->unk14_20 + 6) ) == 0x1f) if(item_adjustByDiffWithHud(ITEM_12_JINJOS, 1 << (this->unk14_20 + 6) ) == 0x1f)
localPtr->unk4 = 1; localPtr->unk4 = 1;
actor_loopAnimation(actorPtr); actor_loopAnimation(actorPtr);
this->collidable = 0; this->collidable = 0;

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

@@ -200,13 +200,13 @@ void mole_additionalAbilityLearnActions(ActorMarker *marker, enum asset_e arg1,
mole_setStaticCamera(actor); mole_setStaticCamera(actor);
break; break;
case 5: // Egg Firing case 5: // Egg Firing
func_803463D4(ITEM_D_EGGS, 50); item_adjustByDiffWithHud(ITEM_D_EGGS, 50);
break; break;
case 6: // Flight case 6: // Flight
func_803463D4(ITEM_F_RED_FEATHER, 25); item_adjustByDiffWithHud(ITEM_F_RED_FEATHER, 25);
break; break;
case 7: // Wonderwing case 7: // Wonderwing
func_803463D4(ITEM_10_GOLD_FEATHER, 5); item_adjustByDiffWithHud(ITEM_10_GOLD_FEATHER, 5);
break; break;
case 8: // Refill Health case 8: // Refill Health
item_set(ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)); item_set(ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL));

16
src/core2/code_3EAD0.c
View File

@@ -14,11 +14,23 @@ s32 D_80365F30[] = {
3, 4, 5, 6, 3, 4, 5, 6,
7, 7, 8, 8 7, 7, 8, 8
}; };
ActorInfo D_80365F60 = { 0x58, 0x4E, 0x7DE, 0, NULL, func_802C5A60, func_80326224, func_80325934, 0, 0, 0.0f, 0}; ActorInfo D_80365F60 = {
ActorInfo D_80365F84 = { 0x59, 0x4F, 0x7DE, 0, NULL, func_802C5A60, func_80326224, func_80325934, 0, 0, 0.0f, 0}; 0x58, 0x4E, ASSET_7DE_SPRITE_SHOE_SPARKLES,
0, NULL,
func_802C5A60, func_80326224, func_80325934,
0, 0, 0.0f, 0
};
ActorInfo D_80365F84 = {
0x59, 0x4F, ASSET_7DE_SPRITE_SHOE_SPARKLES,
0, NULL,
func_802C5A60, func_80326224, func_80325934,
0, 0, 0.0f, 0
};
/* .code */ /* .code */
void func_802C5A60(Actor *this){ void func_802C5A60(Actor *this){
// Spawns a sparkle sprite when touching turbo trainers or wading boots
ActorLocal_Core2_3EAD0 *local = (ActorLocal_Core2_3EAD0*)&this->local; ActorLocal_Core2_3EAD0 *local = (ActorLocal_Core2_3EAD0*)&this->local;
if(!this->initialized){ if(!this->initialized){
switch(this->marker->unk14_20){ switch(this->marker->unk14_20){

8
src/core2/code_4A6F0.c
View File

@@ -163,7 +163,7 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
this->unk138_24 = FALSE; this->unk138_24 = FALSE;
if(this->unk38_31 != 0){ if(this->unk38_31 != 0){
func_8025A6EC(COMUSIC_2B_DING_B, 28000); func_8025A6EC(COMUSIC_2B_DING_B, 28000);
func_803463D4(ITEM_1C_MUMBO_TOKEN, -this->unk38_31); item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31);
this->unk38_31 = 0; this->unk38_31 = 0;
} }
subaddie_set_state_with_direction(this, 5, 0.0f, 1); subaddie_set_state_with_direction(this, 5, 0.0f, 1);
@@ -176,7 +176,7 @@ static void __chMumbo_textCallback(ActorMarker *caller, enum asset_e text_id, s3
this->unk10_12 = 1; this->unk10_12 = 1;
if(this->unk38_31){ if(this->unk38_31){
func_8025A6EC(COMUSIC_2B_DING_B, 28000); func_8025A6EC(COMUSIC_2B_DING_B, 28000);
func_803463D4(ITEM_1C_MUMBO_TOKEN, -this->unk38_31); item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31);
} }
case ASSET_DAE_DIALOG_MUMBO_TREX_START: //L802D1B48 case ASSET_DAE_DIALOG_MUMBO_TREX_START: //L802D1B48
@@ -224,7 +224,7 @@ void chMumbo_update(Actor *this) {
if( !func_803203FC(1) if( !func_803203FC(1)
&& !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)
&& map_get() != MAP_7A_GL_CRYPT) { && map_get() != MAP_7A_GL_CRYPT) {
func_803463D4(ITEM_1C_MUMBO_TOKEN, 0); item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, 0);
} }
if(!this->initialized){ if(!this->initialized){
this->initialized = TRUE; this->initialized = TRUE;
@@ -351,7 +351,7 @@ void chMumbo_update(Actor *this) {
} else { } else {
if (this->unk38_31) { if (this->unk38_31) {
func_8025A6EC(SFX_2B_BULL_MOO_1, 28000); func_8025A6EC(SFX_2B_BULL_MOO_1, 28000);
func_803463D4(ITEM_1C_MUMBO_TOKEN, -this->unk38_31); item_adjustByDiffWithHud(ITEM_1C_MUMBO_TOKEN, -this->unk38_31);
} }
subaddie_set_state(this, 5); subaddie_set_state(this, 5);
} }

2
src/core2/code_6B30.c
View File

@@ -165,5 +165,5 @@ void func_8028DF48(enum actor_e actor_id){
} }
void func_8028DFB8(enum actor_e actor_id){ void func_8028DFB8(enum actor_e actor_id){
func_803463D4(carriedobj_actorId2ItemId(actor_id), 0); item_adjustByDiffWithHud(carriedobj_actorId2ItemId(actor_id), 0);
} }

564
src/core2/code_956B0.c
View File

File diff suppressed because it is too large Load Diff

582
src/core2/code_AD110.c
View File

@@ -11,59 +11,59 @@ extern void chOverlayPressStart_spawn(s32, s32);
extern void chOverlayPressStart_func_802DCDC0(s32, s32); extern void chOverlayPressStart_func_802DCDC0(s32, s32);
extern void func_8031D06C(s32, s32); extern void func_8031D06C(s32, s32);
extern void func_8031D09C(s32, s32); extern void func_8031D09C(s32, s32);
extern void func_8031D11C(s32, s32); extern void warp_mmEnterMumbosHut(s32, s32);
extern void func_8031D140(s32, s32); extern void warp_mmExitMumbosHut(s32, s32);
extern void func_8031D164(s32, s32); extern void warp_mmEnterTickersTowerLower(s32, s32);
extern void func_8031D188(s32, s32); extern void warp_mmExitTickersTowerLower(s32, s32);
extern void func_8031D1AC(s32, s32); extern void warp_mmEnterTickersTowerUpper(s32, s32);
extern void func_8031D1D0(s32, s32); extern void warp_mmExitTickersTowerUpper(s32, s32);
extern void func_8031D1F4(s32, s32); extern void warp_csNintendoLogo(s32, s32);
extern void func_8031DD10(s32, s32); extern void warp_bgsEnterTanktupConditional(s32, s32);
extern void func_8031DD44(s32, s32); extern void warp_ttcEnterNippersShell(s32, s32);
extern void func_8031DE2C(s32, s32); extern void warp_gvEnterJinxy(s32, s32);
extern void func_8031DE50(s32, s32); extern void warp_gvExitJinxy(s32, s32);
extern void func_8031E818(s32, s32); extern void warp_bgsExitMumbosHut(s32, s32);
extern void func_8031E83C(s32, s32); extern void warp_bgsEnterMumbosHut(s32, s32);
extern void func_8031E860(s32, s32); extern void warp_ttcEnterLevel(s32, s32);
extern void func_8031E884(s32, s32); extern void warp_ccEnterLevel(s32, s32);
extern void func_8031E8A8(s32, s32); extern void warp_bgsEnterLevel(s32, s32);
extern void func_8031E8CC(s32, s32); extern void warp_gvEnterLevel(s32, s32);
extern void func_8031E8F0(s32, s32); extern void warp_mmmEnterLevel(s32, s32);
extern void func_8031E914(s32, s32); extern void warp_rbbEnterLevel(s32, s32);
extern void func_8031E938(s32, s32); extern void warp_ttcExitNipper(s32, s32);
extern void func_8031EA7C(s32, s32); extern void warp_ccwEnterSpringWhipcrackRoom(s32, s32);
extern void func_8031EAA0(s32, s32); extern void warp_ccwEnterSummerWhipcrackRoom(s32, s32);
extern void func_8031EAC4(s32, s32); extern void warp_ccwEnterAutumnWhipcrackRoom(s32, s32);
extern void func_8031EAE8(s32, s32); extern void warp_ccwEnterWinterWhipcrackRoom(s32, s32);
extern void func_8031EC98(s32, s32); extern void warp_ccwEnterWinterAcornStorage(s32, s32);
extern void func_8031ECBC(s32, s32); extern void warp_ccwEnterAutumnFloodedAttic(s32, s32);
extern void func_8031ECE0(s32, s32); extern void warp_ccwEnterWinterFloodedAttic(s32, s32);
extern void func_8031ED04(s32, s32); extern void warp_ccwExitWinterAcornStorage(s32, s32);
extern void func_8031ED28(s32, s32); extern void warp_ccwExitAutumnFloodedAttic(s32, s32);
extern void func_8031ED4C(s32, s32); extern void warp_ccwExitWinterFloodedAttic(s32, s32);
extern void func_8031ED70(s32, s32); extern void warp_fpEnterMumbosHut(s32, s32);
extern void func_8031ED94(s32, s32); extern void warp_fpEnterBoggyIgloo(s32, s32);
extern void func_8031EDB8(s32, s32); extern void warp_fpEnterXmasTree(s32, s32);
extern void func_8031EDDC(s32, s32); extern void warp_fpExitMumbosHut(s32, s32);
extern void func_8031EE00(s32, s32); extern void warp_fpExitBoggyIgloo(s32, s32);
extern void func_8031EE24(s32, s32); extern void warp_fpExitXmasTree(s32, s32);
extern void func_8031EEFC(s32, s32); extern void warp_lairEnterMMLobbyFromMMLevel(s32, s32);
extern void func_8031EF20(s32, s32); extern void warp_lairEnterMMLobbyFromSMLevel(s32, s32);
extern void func_8031EF44(s32, s32); extern void warp_lairEnterPuzzlesRoomFromMMLobby(s32, s32);
extern void func_8031EF68(s32, s32); extern void warp_lairEnterPointingStatueRoomFromGVLobbyNoteDoor(s32, s32);
extern void func_8031EF8C(s32, s32); extern void warp_lairEnterPuzzlesRoomFromCCWPuzzleRoom(s32, s32);
extern void func_8031EFB0(s32, s32); extern void warp_lairEnterCCWPuzzleRoomFromPuzzlesRoom(s32, s32);
extern void func_8031EFD4(s32, s32); extern void warp_lairEnterCCWPuzzleRoomFromRedCauldronRoom(s32, s32);
extern void func_8031EFF8(s32, s32); extern void warp_lairEnterRedCauldronRoomFromCCWPuzzleRoom(s32, s32);
extern void func_8031F01C(s32, s32); extern void warp_lairEnterCCWPuzzleRoomFromTTCLobby(s32, s32);
extern void func_8031F040(s32, s32); extern void warp_lairEnterTTCLobbyFromCCWPuzzleRoom(s32, s32);
extern void func_8031F064(s32, s32); extern void warp_lairEnterCCWPuzzleRoomFromCCLobby(s32, s32);
extern void func_8031F088(s32, s32); extern void warp_lairEnterCCLobbyFromCCWPuzzleRoom(s32, s32);
extern void func_8031F0AC(s32, s32); extern void warp_lairEnterCCLobbyFromCCLevel(s32, s32);
extern void func_8031F13C(s32, s32); extern void warp_lairEnterCCWPuzzleFromPointingGruntyStatueRoom(s32, s32);
extern void func_8031F160(s32, s32); extern void warp_lairEnterPointingGruntyStatueFromCCWPuzzleRoom(s32, s32);
extern void func_8031F57C(s32, s32); extern void warp_lairEnterRBBLobbyFromRBBPuzzleRoom(s32, s32);
extern void func_8031F5A0(s32, s32); extern void warp_lairEnterRBBLobbyFromMMMPuzzleRoom(s32, s32);
extern void func_80334430(s32, s32); extern void func_80334430(s32, s32);
extern void func_80363388(s32, s32); extern void func_80363388(s32, s32);
extern void func_80386744(s32, s32); extern void func_80386744(s32, s32);
@@ -77,110 +77,110 @@ extern void func_8038A150(s32, s32);
extern void func_8038F10C(s32, s32); extern void func_8038F10C(s32, s32);
extern void func_8038F130(s32, s32); extern void func_8038F130(s32, s32);
extern void func_8031EE48(s32, s32); extern void warp_lairEnterGVLobbyFromPointingStatueRoom(s32, s32);
extern void func_8031EE6C(s32, s32); extern void warp_lairEnterMMLobbyFromPuzzlesRoom(s32, s32);
extern void func_8031EE90(s32, s32); extern void warp_lairEnterFPLobbyFromGVLobby(s32, s32);
extern void func_8031EED8(s32, s32); extern void warp_lairEnterGVLobbyFromGVLevel(s32, s32);
extern void func_8031EEB4(s32, s32); extern void warp_lairEnterGVLobbyFromFPLobby(s32, s32);
extern void func_8031EB0C(s32, s32); extern void warp_ccwExitSpringWhipcrackRoom(s32, s32);
extern void func_8031EB30(s32, s32); extern void warp_ccwExitSummerWhipcrackRoom(s32, s32);
extern void func_8031EB54(s32, s32); extern void warp_ccwExitAutumnWhipcrackRoom(s32, s32);
extern void func_8031EB78(s32, s32); extern void warp_ccwExitWinterWhipcrackRoom(s32, s32);
extern void func_8031D27C(s32, s32); extern void warp_gvEnterMatchingPyramid(s32, s32);
extern void func_8031D2F4(s32, s32); extern void warp_gvEnterMazePyramid(s32, s32);
extern void func_8031D2B4(s32, s32); extern void warp_gvEnterWaterPyramidUpper(s32, s32);
extern void func_8031D218(s32, s32); extern void warp_gvEnterWaterPyramidLower(s32, s32);
extern void func_8031D23C(s32, s32); extern void warp_gvEnterRubeePyramid(s32, s32);
extern void func_8031D334(s32, s32); extern void warp_gvExitMatchingPyramid(s32, s32);
extern void func_8031D358(s32, s32); extern void warp_gvExitMazePyramid(s32, s32);
extern void func_8031D37C(s32, s32); extern void warp_gvExitWaterPyramidLower(s32, s32);
extern void func_8031D3A0(s32, s32); extern void warp_gvExitRubeePyramid(s32, s32);
extern void func_8031D3C4(s32, s32); extern void warp_bgsEnterTanktup(s32, s32);
extern void func_8031DCC8(s32, s32); extern void warp_bgsEnterMrVileRightNostril(s32, s32);
extern void func_8031DCEC(s32, s32); extern void warp_bgsEnterMrVileLeftNostril(s32, s32);
extern void func_8031D3E8(s32, s32); extern void warp_bgsExitTanktup(s32, s32);
extern void func_8031D40C(s32, s32); extern void warp_bgsExitVileRightNostril(s32, s32);
extern void func_8031D430(s32, s32); extern void warp_bgsExitVileLeftNostril(s32, s32);
extern void func_8031D454(s32, s32); extern void warp_ttcEnterSandcastle(s32, s32);
extern void func_8031D478(s32, s32); extern void warp_ttcStairAlcoveDown(s32, s32);
extern void func_8031D49C(s32, s32); extern void warp_ttcStairAlcoveUp(s32, s32);
extern void func_8031D4C0(s32, s32); extern void warp_ttcEnterBlubbersShipUpper(s32, s32);
extern void func_8031D4E4(s32, s32); extern void warp_ttcEnterBlubbersShipSide(s32, s32);
extern void func_8031D628(s32, s32); extern void func_8031D628(s32, s32);
extern void func_8031D508(s32, s32); extern void warp_ttcExitLighthouseTop(s32, s32);
extern void func_8031D52C(s32, s32); extern void warp_ttcExitSandcastle(s32, s32);
extern void func_8031F0D0(s32, s32); extern void warp_fpEnterLevel(s32, s32);
extern void func_8031FAB4(s32, s32); extern void func_8031FAB4(s32, s32);
extern void func_8031D598(s32, s32); extern void warp_ttcExitBlubbersShipUpper(s32, s32);
extern void func_8031D5BC(s32, s32); extern void warp_ttcExitBlubbersShipSide(s32, s32);
extern void func_8031FA6C(s32, s32); extern void warp_lairEnterDingpotRoomFromFurnaceFun(s32, s32);
extern void func_8031FA90(s32, s32); extern void func_8031FA90(s32, s32);
extern void func_8031D670(s32, s32); extern void warp_mmmEnterDiningRoomDoor(s32, s32);
extern void func_8031D694(s32, s32); extern void warp_mmmEnterDiningRoomChimney(s32, s32);
extern void func_8031D6B8(s32, s32); extern void warp_mmmEnterWellTop(s32, s32);
extern void func_8031D6DC(s32, s32); extern void warp_mmmEnterTumblarShed(s32, s32);
extern void func_8031DAE0(s32, s32); extern void func_8031DAE0(s32, s32);
extern void func_8031DA84(s32, s32); extern void warp_mmmEnterChurchSecretRoom(s32, s32);
extern void func_8031DC10(s32, s32); extern void func_8031DC10(s32, s32);
extern void func_8031DC68(s32, s32); extern void warp_mmmEnterRainBarrelBottom(s32, s32);
extern void func_8031D700(s32, s32); extern void warp_mmmEnterCellar(s32, s32);
extern void func_8031D724(s32, s32); extern void warp_mmmEnterRedFeatherRoom(s32, s32);
extern void func_8031D748(s32, s32); extern void warp_mmmEnterBlueEggRoom(s32, s32);
extern void func_8031D76C(s32, s32); extern void warp_mmmEnterNoteRoom(s32, s32);
extern void func_8031D790(s32, s32); extern void warp_mmmEnterBrokenFloorboardRoom(s32, s32);
extern void func_8031D7B4(s32, s32); extern void warp_mmmEnterBedroom(s32, s32);
extern void func_8031D7D8(s32, s32); extern void warp_mmmEnterBathroomWindow(s32, s32);
extern void func_8031D7FC(s32, s32); extern void warp_mmmExitDiningRoomDoor(s32, s32);
extern void func_8031D820(s32, s32); extern void func_8031D820(s32, s32);
extern void func_8031D844(s32, s32); extern void warp_mmmExitWellTop(s32, s32);
extern void func_8031D868(s32, s32); extern void warp_mmmExitTumblarShed(s32, s32);
extern void func_8031D88C(s32, s32); extern void warp_mmmExitChurchFrontDoor(s32, s32);
extern void func_8031D8B0(s32, s32); extern void warp_mmmExitChurchSecretRoom(s32, s32);
extern void func_8031D8D4(s32, s32); extern void func_8031D8D4(s32, s32);
extern void func_8031D8F8(s32, s32); extern void warp_mmmExitRainBarrelBottom(s32, s32);
extern void func_8031D91C(s32, s32); extern void warp_mmmExitCellar(s32, s32);
extern void func_8031D940(s32, s32); extern void warp_mmmExitRedFeatherRoom(s32, s32);
extern void func_8031D964(s32, s32); extern void warp_mmmExitBlueEggRoom(s32, s32);
extern void func_8031D988(s32, s32); extern void warp_mmmExitBathroomWindow(s32, s32);
extern void func_8031D9AC(s32, s32); extern void warp_mmmExitBrokenFloorboardRoom(s32, s32);
extern void func_8031D9D0(s32, s32); extern void warp_mmmExitBedroom(s32, s32);
extern void func_8031D9F4(s32, s32); extern void warp_mmmExitNoteRoom(s32, s32);
extern void func_8031DA18(s32, s32); extern void warp_mmmChurchTowerUp(s32, s32);
extern void func_8031DA3C(s32, s32); extern void warp_mmmChurchTowerDown(s32, s32);
extern void func_8031DA60(s32, s32); extern void warp_mmmExitMumbosHut(s32, s32);
extern void func_8031DB88(s32, s32); extern void warp_mmmEnterMumbosHut(s32, s32);
extern void func_8031DD78(s32, s32); extern void warp_ccExitWonderwingRoom(s32, s32);
extern void func_8031DD9C(s32, s32); extern void warp_ccEnterClankerBelly(s32, s32);
extern void func_8031DDC0(s32, s32); extern void warp_ccEnterClankerMouth(s32, s32);
extern void func_8031DDE4(s32, s32); extern void warp_ccEnterWonderwingRoom(s32, s32);
extern void func_8031DE08(s32, s32); extern void warp_mmEnterLevel(s32, s32);
extern void func_8031DE74(s32, s32); extern void warp_rbbEnterCaptainsRoomWindow(s32, s32);
extern void func_8031DE98(s32, s32); extern void warp_rbbEnterCabinRoomWindow(s32, s32);
extern void func_8031DEBC(s32, s32); extern void warp_rbbEnterEngineRoomPipe(s32, s32);
extern void func_8031DF04(s32, s32); extern void warp_rbbEnterKitchenPipe(s32, s32);
extern void func_8031DF28(s32, s32); extern void warp_rbbEnterNavigationRoomWindow(s32, s32);
extern void func_8031DF4C(s32, s32); extern void warp_rbbEnterBoomBoxPipe(s32, s32);
extern void func_8031DEE0(s32, s32); extern void warp_rbbEnterEngineRoomDoor(s32, s32);
extern void func_8031DF70(s32, s32); extern void warp_rbbEnterChumpWarehouseWindow(s32, s32);
extern void func_8031DF94(s32, s32); extern void warp_rbbEnterBoatRoom(s32, s32);
extern void func_8031DFB8(s32, s32); extern void warp_rbbEnterChompaContainer(s32, s32);
extern void func_8031DFDC(s32, s32); extern void warp_rbbEnterSeamanGrublinContainer(s32, s32);
extern void func_8031E000(s32, s32); extern void warp_rbbEnterBoomBoxContainer(s32, s32);
extern void func_8031E024(s32, s32); extern void warp_rbbExitCaptainsRoomWindow(s32, s32);
extern void func_8031E048(s32, s32); extern void warp_rbbExitCabinRoomWindow(s32, s32);
extern void func_8031E06C(s32, s32); extern void warp_rbbExitEngineRoomPipe(s32, s32);
extern void func_8031E090(s32, s32); extern void warp_rbbExitKitchenPipe(s32, s32);
extern void func_8031E0B4(s32, s32); extern void warp_rbbExitNavigationRoomWindow(s32, s32);
extern void func_8031E0D8(s32, s32); extern void warp_rbbExitBoomBoxPipe(s32, s32);
extern void func_8031E0FC(s32, s32); extern void warp_rbbExitEngineRoomDoor(s32, s32);
extern void func_8031E120(s32, s32); extern void warp_rbbExitBoatRoom(s32, s32);
extern void func_8031E144(s32, s32); extern void warp_rbbExitChompaContainer(s32, s32);
extern void func_8031E168(s32, s32); extern void warp_rbbExitSeamanGrublinContainer(s32, s32);
extern void func_8031E18C(s32, s32); extern void warp_rbbExitBoomBoxContainer(s32, s32);
extern void func_8031E1B0(s32, s32); extern void warp_rbbExitBossBoomBoxRoom(s32, s32);
extern void func_8031E1D4(s32, s32); extern void warp_rbbEnterBossBoomBoxRoom(s32, s32);
extern void func_8031E2B8(s32, s32); extern void warp_rbbEnterChumpWarehouseDoor(s32, s32);
extern void func_8031E2E0(s32, s32); extern void warp_rbbExitChumpWarehouseDoor(s32, s32);
extern void func_8031E308(s32, s32); extern void func_8031E308(s32, s32);
extern void func_8031E32C(s32, s32); extern void func_8031E32C(s32, s32);
extern void func_8031E350(s32, s32); extern void func_8031E350(s32, s32);
@@ -208,86 +208,86 @@ extern void func_8031E644(s32, s32);
extern void func_8031E668(s32, s32); extern void func_8031E668(s32, s32);
extern void func_8031E68C(s32, s32); extern void func_8031E68C(s32, s32);
extern void func_8031E6B0(s32, s32); extern void func_8031E6B0(s32, s32);
extern void func_8031E6D4(s32, s32); extern void warp_ccwExitWinterToHub(s32, s32);
extern void func_8031E6F8(s32, s32); extern void warp_ccwExitSpringToHub(s32, s32);
extern void func_8031E71C(s32, s32); extern void warp_ccwExitSummerToHub(s32, s32);
extern void func_8031E740(s32, s32); extern void warp_ccwExitAutumnToHub(s32, s32);
extern void func_8031E764(s32, s32); extern void warp_ccwEnterWinter(s32, s32);
extern void func_8031E788(s32, s32); extern void warp_ccwEnterSpring(s32, s32);
extern void func_8031E7AC(s32, s32); extern void warp_ccwEnterSummer(s32, s32);
extern void func_8031E7D0(s32, s32); extern void warp_ccwEnterAutumn(s32, s32);
extern void func_8031E7F4(s32, s32); extern void warp_gvExitSandybuttMazeBack(s32, s32);
extern void func_8031E9EC(s32, s32); extern void warp_ttcExitSpringMumbosHut(s32, s32);
extern void func_8031EA10(s32, s32); extern void warp_ttcExitSummerMumbosHut(s32, s32);
extern void func_8031EA34(s32, s32); extern void warp_ttcExitAutumnMumbosHut(s32, s32);
extern void func_8031EA58(s32, s32); extern void warp_ttcExitWinterMumbosHut(s32, s32);
extern void func_8031E95C(s32, s32); extern void warp_ttcEnterSpringMumbosHut(s32, s32);
extern void func_8031E980(s32, s32); extern void warp_ttcEnterSummerMumbosHut(s32, s32);
extern void func_8031E9A4(s32, s32); extern void warp_ttcEnterAutumnMumbosHut(s32, s32);
extern void func_8031E9C8(s32, s32); extern void warp_ttcEnterWinterMumbosHut(s32, s32);
extern void func_8031EB9C(s32, s32); extern void warp_ccwEnterSpringNabnutDoor(s32, s32);
extern void func_8031EBC0(s32, s32); extern void warp_ccwEnterSummerNabnutDoor(s32, s32);
extern void func_8031EBE4(s32, s32); extern void warp_ccwEnterAutumnNabnutDoor(s32, s32);
extern void func_8031EC08(s32, s32); extern void warp_ccwExitSpringNabnutDoor(s32, s32);
extern void func_8031EC2C(s32, s32); extern void warp_ccwExitSummerNabnutDoor(s32, s32);
extern void func_8031EC50(s32, s32); extern void warp_ccwExitAutumnNabnutDoor(s32, s32);
extern void func_8031EC74(s32, s32); extern void warp_ccwExitWinterNabnutDoor(s32, s32);
extern void func_8031F0F4(s32, s32); extern void func_8031F0F4(s32, s32);
extern void func_8031F118(s32, s32); extern void func_8031F118(s32, s32);
extern void func_8031F184(s32, s32); extern void warp_lairEnterGVPuzzleRoomFromMMMLobby(s32, s32);
extern void func_8031FA00(s32, s32); extern void warp_ttcExitSharkfoodIsland(s32, s32);
extern void func_8031F558(s32, s32); extern void warp_lairEnterRBBLobbyFromRBBLevel(s32, s32);
extern void func_8031F314(s32, s32); extern void warp_lairEnterBGSLobbyFromBGSLevel(s32, s32);
extern void func_8031F2CC(s32, s32); extern void warp_fpExitWozzasCave(s32, s32);
extern void func_8031F2F0(s32, s32); extern void warp_fpEnterWozzasCave(s32, s32);
extern void func_8031F25C(s32, s32); extern void warp_lairEnterCryptFromMMMLobby(s32, s32);
extern void func_8031F294(s32, s32); extern void warp_lairEnterMMMLobbyFromCrypt(s32, s32);
extern void func_8031F214(s32, s32); extern void warp_lairEnterPointingGruntyStatueFromBGSLobby(s32, s32);
extern void func_8031F238(s32, s32); extern void warp_lairEnterBGSLobbyFromPointingGruntyStatueRoom(s32, s32);
extern void func_8031F1A8(s32, s32); extern void warp_lairEnterMMMLobbyFromGVPuzzleRoom(s32, s32);
extern void func_8031F1CC(s32, s32); extern void warp_lairEnterGVPuzzleRoomFromFPLobby(s32, s32);
extern void func_8031F1F0(s32, s32); extern void warp_lairFPLobbyFromGVPuzzleRoom(s32, s32);
extern void func_8031F338(s32, s32); extern void warp_lairEnter640NoteDoorRoomFromFPLobby(s32, s32);
extern void func_8031F35C(s32, s32); extern void warp_lairEnter640NoteDoorRoomFromCCWLobbyTokenEntrance(s32, s32);
extern void func_8031F380(s32, s32); extern void warp_lairEnter640NoteDoorRoomFromCCWLobbyDoorEntrance(s32, s32);
extern void func_8031F3A4(s32, s32); extern void warp_lairEnter640NoteDoorRoomFromRBBLobby(s32, s32);
extern void func_8031F3C8(s32, s32); extern void warp_lairRBBLobbyFrom640NoteDoorRoom(s32, s32);
extern void func_8031F3EC(s32, s32); extern void warp_lairCCWLobbyFrom640NoteDoorRoomDoorEntrance(s32, s32);
extern void func_8031F410(s32, s32); extern void warp_lairCCWLobbyFrom640NoteDoorRoomTokenEntrance(s32, s32);
extern void func_8031F520(s32, s32); extern void warp_lairEnterFPLobbyFrom640NoteDoorRoom(s32, s32);
extern void func_8031F4E8(s32, s32); extern void warp_ccwEnterSpringZubbaHive(s32, s32);
extern void func_8031F434(s32, s32); extern void warp_ccwEnterSummerZubbaHive(s32, s32);
extern void func_8031F458(s32, s32); extern void warp_ccwEnterAutumnZubbaHive(s32, s32);
extern void func_8031F47C(s32, s32); extern void warp_ccwExitSpringZubbaHive(s32, s32);
extern void func_8031F4A0(s32, s32); extern void warp_ccwExitSummerZubbaHive(s32, s32);
extern void func_8031F4C4(s32, s32); extern void warp_ccwExitAutumnZubbaHive(s32, s32);
extern void func_8031F5C4(s32, s32); extern void warp_lairEnterMMMPuzzleFromRBBLobby(s32, s32);
extern void func_8031F5E8(s32, s32); extern void warp_lairEnterRBBPuzzleFromRBBLobby(s32, s32);
extern void func_8031FB6C(s32, s32); extern void func_8031FB6C(s32, s32);
extern void func_8031F60C(s32, s32); extern void warp_lairEnterCCWLobbyFromFurnaceFunPath(s32, s32);
extern void func_8031F630(s32, s32); extern void warp_lairEnterFurnaceFunPathFromCCWLobby(s32, s32);
extern void func_8031F654(s32, s32); extern void warp_smEnterBanjosHouse(s32, s32);
extern void func_8031F678(s32, s32); extern void warp_smExitBanjosHouse(s32, s32);
extern void func_8031F69C(s32, s32); extern void warp_lairMMLobbyFromSMLevel(s32, s32);
extern void func_8031F6C0(s32, s32); extern void warp_smExitLair(s32, s32);
extern void func_8031F6E4(s32, s32); extern void warp_rbbExitAnchorRoom(s32, s32);
extern void func_8031F708(s32, s32); extern void warp_rbbEnterAnchorRoom(s32, s32);
extern void func_8031F72C(s32, s32); extern void warp_mmmEnterWellBottom(s32, s32);
extern void func_8031F764(s32, s32); extern void warp_mmmExitWellBottom(s32, s32);
extern void func_8031F79C(s32, s32); extern void warp_mmmEnterBathroomFromLoggo(s32, s32);
extern void func_8031F7D4(s32, s32); extern void warp_mmmEnterLoggo(s32, s32);
extern void func_8031F878(s32, s32); extern void warp_ccwEnterLevel(s32, s32);
extern void func_8031F8C0(s32, s32); extern void warp_ccwEnterSpringNabnutWindow(s32, s32);
extern void func_8031F8E4(s32, s32); extern void warp_ccwEnterSummerNabnutWindow(s32, s32);
extern void func_8031F908(s32, s32); extern void warp_ccwEnterAutumnNabnutWindow(s32, s32);
extern void func_8031F92C(s32, s32); extern void warp_ccwEnterWinterNabnutWindow(s32, s32);
extern void func_8031F950(s32, s32); extern void warp_ccwExitSpringNabnutWindow(s32, s32);
extern void func_8031F974(s32, s32); extern void warp_ccwExitSummerNabnutWindow(s32, s32);
extern void func_8031F998(s32, s32); extern void warp_ccwExitAutumnNabnutWindow(s32, s32);
extern void func_8031F9BC(s32, s32); extern void warp_ccwExitWinterNabnutWindow(s32, s32);
extern void func_8031FA24(s32, s32); extern void warp_gvEnterSNSChamper(s32, s32);
extern void func_8031FA48(s32, s32); extern void warp_gvExitSNSChamper(s32, s32);
extern void func_8031FB14(s32, s32); extern void warp_lairEnterLairFromSMLevel(s32, s32);
extern void func_802C1674(s32, s32); extern void func_802C1674(s32, s32);
extern void func_802C169C(s32, s32); extern void func_802C169C(s32, s32);
@@ -315,81 +315,81 @@ typedef void (*Method_core2_AD110)(s32, s32);
/* .data */ /* .data */
Method_core2_AD110 D_8036F980[] = { Method_core2_AD110 D_8036F980[] = {
func_80388BEC, func_80334430, func_80386744, func_80386744, func_80388BEC, func_80334430, func_80386744, func_80386744,
func_80386744, func_8031DE2C, func_8031DE50, func_8038F10C, func_80386744, warp_gvEnterJinxy, warp_gvExitJinxy, func_8038F10C,
func_8038F130, func_8031E83C, func_8031E818, func_8031E938, func_8038F130, warp_bgsEnterMumbosHut, warp_bgsExitMumbosHut, warp_ttcExitNipper,
func_8031E860, func_8031E884, func_8031E8A8, func_8031E8CC, warp_ttcEnterLevel, warp_ccEnterLevel, warp_bgsEnterLevel, warp_gvEnterLevel,
func_8031E8F0, func_8031E914, func_8031EA7C, func_8031EAA0, warp_mmmEnterLevel, warp_rbbEnterLevel, warp_ccwEnterSpringWhipcrackRoom, warp_ccwEnterSummerWhipcrackRoom,
func_8031EAC4, func_8031EAE8, func_8031D11C, func_8031D140, warp_ccwEnterAutumnWhipcrackRoom, warp_ccwEnterWinterWhipcrackRoom, warp_mmEnterMumbosHut, warp_mmExitMumbosHut,
func_8031D164, func_8031D188, func_8031D1AC, func_8031D1D0, warp_mmEnterTickersTowerLower, warp_mmExitTickersTowerLower, warp_mmEnterTickersTowerUpper, warp_mmExitTickersTowerUpper,
func_8031D1F4, func_8031D09C, func_8031D06C, func_80334430, warp_csNintendoLogo, func_8031D09C, func_8031D06C, func_80334430,
func_80334430, func_80334430, func_8031F13C, func_8031F160, func_80334430, func_80334430, warp_lairEnterCCWPuzzleFromPointingGruntyStatueRoom, warp_lairEnterPointingGruntyStatueFromCCWPuzzleRoom,
func_8031F0AC, func_8031F088, func_8031F064, func_8031F01C, warp_lairEnterCCLobbyFromCCLevel, warp_lairEnterCCLobbyFromCCWPuzzleRoom, warp_lairEnterCCWPuzzleRoomFromCCLobby, warp_lairEnterCCWPuzzleRoomFromTTCLobby,
func_8031F040, func_8031EC98, func_8031ECBC, func_8031ECE0, warp_lairEnterTTCLobbyFromCCWPuzzleRoom, warp_ccwEnterWinterAcornStorage, warp_ccwEnterAutumnFloodedAttic, warp_ccwEnterWinterFloodedAttic,
func_8031ED04, func_8031ED28, func_8031ED4C, func_80388C00, warp_ccwExitWinterAcornStorage, warp_ccwExitAutumnFloodedAttic, warp_ccwExitWinterFloodedAttic, func_80388C00,
func_80388C28, func_80388C50, CC_func_80388C78, func_80334430, func_80388C28, func_80388C50, CC_func_80388C78, func_80334430,
func_80334430, func_80334430, func_802DC748, func_802DC780, func_80334430, func_80334430, func_802DC748, func_802DC780,
func_8031F57C, func_8031F5A0, func_8031EFD4, func_8031EFF8, warp_lairEnterRBBLobbyFromRBBPuzzleRoom, warp_lairEnterRBBLobbyFromMMMPuzzleRoom, warp_lairEnterCCWPuzzleRoomFromRedCauldronRoom, warp_lairEnterRedCauldronRoomFromCCWPuzzleRoom,
func_8031EF8C, func_8031EFB0, func_8031EF68, func_8031EF44, warp_lairEnterPuzzlesRoomFromCCWPuzzleRoom, warp_lairEnterCCWPuzzleRoomFromPuzzlesRoom, warp_lairEnterPointingStatueRoomFromGVLobbyNoteDoor, warp_lairEnterPuzzlesRoomFromMMLobby,
func_8031ED70, func_8031ED94, func_8031EDB8, func_8031EDDC, warp_fpEnterMumbosHut, warp_fpEnterBoggyIgloo, warp_fpEnterXmasTree, warp_fpExitMumbosHut,
func_8031EE00, func_8031EE24, func_8031DD10, func_8031DD44, warp_fpExitBoggyIgloo, warp_fpExitXmasTree, warp_bgsEnterTanktupConditional, warp_ttcEnterNippersShell,
func_80363388, func_8038A0E4, func_8038A150, func_80334430, func_80363388, func_8038A0E4, func_8038A150, func_80334430,
chOverlayPressStart_spawn, chOverlayPressStart_func_802DCDC0, func_802DC528, func_802DC560, chOverlayPressStart_spawn, chOverlayPressStart_func_802DCDC0, func_802DC528, func_802DC560,
func_8031EF20, func_8031EEFC, func_80334430, func_8031EED8, warp_lairEnterMMLobbyFromSMLevel, warp_lairEnterMMLobbyFromMMLevel, func_80334430, warp_lairEnterGVLobbyFromGVLevel,
func_8031EEB4, func_8031EE90, func_8031EE6C, func_8031EE48, warp_lairEnterGVLobbyFromFPLobby, warp_lairEnterFPLobbyFromGVLobby, warp_lairEnterMMLobbyFromPuzzlesRoom, warp_lairEnterGVLobbyFromPointingStatueRoom,
func_8031EB0C, func_8031EB30, func_8031EB54, func_8031EB78, warp_ccwExitSpringWhipcrackRoom, warp_ccwExitSummerWhipcrackRoom, warp_ccwExitAutumnWhipcrackRoom, warp_ccwExitWinterWhipcrackRoom,
func_8031D27C, func_8031D2F4, func_8031D2B4, func_8031D218, warp_gvEnterMatchingPyramid, warp_gvEnterMazePyramid, warp_gvEnterWaterPyramidUpper, warp_gvEnterWaterPyramidLower,
func_8031D23C, func_8031D334, func_8031D358, func_8031D37C, warp_gvEnterRubeePyramid, warp_gvExitMatchingPyramid, warp_gvExitMazePyramid, warp_gvExitWaterPyramidLower,
func_8031D3A0, func_8031D3C4, func_8031DCC8, func_8031DCEC, warp_gvExitRubeePyramid, warp_bgsEnterTanktup, warp_bgsEnterMrVileRightNostril, warp_bgsEnterMrVileLeftNostril,
func_8031D3E8, func_8031D40C, func_8031D430, func_8031D454, warp_bgsExitTanktup, warp_bgsExitVileRightNostril, warp_bgsExitVileLeftNostril, warp_ttcEnterSandcastle,
func_8031D478, func_8031D49C, func_8031D4C0, func_8031D4E4, warp_ttcStairAlcoveDown, warp_ttcStairAlcoveUp, warp_ttcEnterBlubbersShipUpper, warp_ttcEnterBlubbersShipSide,
func_8031D628, func_8031D508, func_8031D52C, func_8031F0D0, func_8031D628, warp_ttcExitLighthouseTop, warp_ttcExitSandcastle, warp_fpEnterLevel,
func_8031FAB4, func_8031D598, func_8031D5BC, func_8031FA6C, func_8031FAB4, warp_ttcExitBlubbersShipUpper, warp_ttcExitBlubbersShipSide, warp_lairEnterDingpotRoomFromFurnaceFun,
func_8031FA90, func_8031D670, func_8031D694, func_8031D6B8, func_8031FA90, warp_mmmEnterDiningRoomDoor, warp_mmmEnterDiningRoomChimney, warp_mmmEnterWellTop,
func_8031D6DC, func_8031DAE0, func_8031DA84, func_8031DC10, warp_mmmEnterTumblarShed, func_8031DAE0, warp_mmmEnterChurchSecretRoom, func_8031DC10,
func_8031DC68, func_8031D700, func_8031D724, func_8031D748, warp_mmmEnterRainBarrelBottom, warp_mmmEnterCellar, warp_mmmEnterRedFeatherRoom, warp_mmmEnterBlueEggRoom,
func_8031D76C, func_8031D790, func_8031D7B4, func_8031D7D8, warp_mmmEnterNoteRoom, warp_mmmEnterBrokenFloorboardRoom, warp_mmmEnterBedroom, warp_mmmEnterBathroomWindow,
func_8031D7FC, func_8031D820, func_8031D844, func_8031D868, warp_mmmExitDiningRoomDoor, func_8031D820, warp_mmmExitWellTop, warp_mmmExitTumblarShed,
func_8031D88C, func_8031D8B0, func_8031D8D4, func_8031D8F8, warp_mmmExitChurchFrontDoor, warp_mmmExitChurchSecretRoom, func_8031D8D4, warp_mmmExitRainBarrelBottom,
func_8031D91C, func_8031D940, func_8031D964, func_8031D988, warp_mmmExitCellar, warp_mmmExitRedFeatherRoom, warp_mmmExitBlueEggRoom, warp_mmmExitBathroomWindow,
func_8031D9AC, func_8031D9D0, func_8031D9F4, func_8031DA18, warp_mmmExitBrokenFloorboardRoom, warp_mmmExitBedroom, warp_mmmExitNoteRoom, warp_mmmChurchTowerUp,
func_8031DA3C, func_8031DA60, func_8031DB88, func_8031DD78, warp_mmmChurchTowerDown, warp_mmmExitMumbosHut, warp_mmmEnterMumbosHut, warp_ccExitWonderwingRoom,
func_8031DD9C, func_8031DDC0, func_8031DDE4, func_8031DE08, warp_ccEnterClankerBelly, warp_ccEnterClankerMouth, warp_ccEnterWonderwingRoom, warp_mmEnterLevel,
func_8031DE74, func_8031DE98, func_8031DEBC, func_8031DF04, warp_rbbEnterCaptainsRoomWindow, warp_rbbEnterCabinRoomWindow, warp_rbbEnterEngineRoomPipe, warp_rbbEnterKitchenPipe,
func_8031DF28, func_8031DF4C, func_8031DEE0, func_8031DF70, warp_rbbEnterNavigationRoomWindow, warp_rbbEnterBoomBoxPipe, warp_rbbEnterEngineRoomDoor, warp_rbbEnterChumpWarehouseWindow,
func_8031DF94, func_8031DFB8, func_8031DFDC, func_8031E000, warp_rbbEnterBoatRoom, warp_rbbEnterChompaContainer, warp_rbbEnterSeamanGrublinContainer, warp_rbbEnterBoomBoxContainer,
func_8031E024, func_8031E048, func_8031E06C, func_8031E090, warp_rbbExitCaptainsRoomWindow, warp_rbbExitCabinRoomWindow, warp_rbbExitEngineRoomPipe, warp_rbbExitKitchenPipe,
func_8031E0B4, func_8031E0D8, func_8031E0FC, func_8031E120, warp_rbbExitNavigationRoomWindow, warp_rbbExitBoomBoxPipe, warp_rbbExitEngineRoomDoor, warp_rbbExitBoatRoom,
func_8031E144, func_8031E168, func_8031E18C, func_8031E1B0, warp_rbbExitChompaContainer, warp_rbbExitSeamanGrublinContainer, warp_rbbExitBoomBoxContainer, warp_rbbExitBossBoomBoxRoom,
func_8031E1D4, func_8031E2B8, func_8031E2E0, func_8031E308, warp_rbbEnterBossBoomBoxRoom, warp_rbbEnterChumpWarehouseDoor, warp_rbbExitChumpWarehouseDoor, func_8031E308,
func_8031E32C, func_8031E350, func_8031E374, func_8031E398, func_8031E32C, func_8031E350, func_8031E374, func_8031E398,
func_8031E3BC, func_8031E3E0, func_8031E404, func_8031E428, func_8031E3BC, func_8031E3E0, func_8031E404, func_8031E428,
func_8031E44C, func_8031E470, func_8031E494, func_8031E4B8, func_8031E44C, func_8031E470, func_8031E494, func_8031E4B8,
func_8031E4DC, func_8031E500, func_8031E524, func_8031E548, func_8031E4DC, func_8031E500, func_8031E524, func_8031E548,
func_8031E56C, func_8031E590, func_8031E5B4, func_8031E5D8, func_8031E56C, func_8031E590, func_8031E5B4, func_8031E5D8,
func_8031E5FC, func_8031E620, func_8031E644, func_8031E668, func_8031E5FC, func_8031E620, func_8031E644, func_8031E668,
func_8031E68C, func_8031E6B0, func_8031E6D4, func_8031E6F8, func_8031E68C, func_8031E6B0, warp_ccwExitWinterToHub, warp_ccwExitSpringToHub,
func_8031E71C, func_8031E740, func_8031E764, func_8031E788, warp_ccwExitSummerToHub, warp_ccwExitAutumnToHub, warp_ccwEnterWinter, warp_ccwEnterSpring,
func_8031E7AC, func_8031E7D0, func_8031E7F4, func_8031E9EC, warp_ccwEnterSummer, warp_ccwEnterAutumn, warp_gvExitSandybuttMazeBack, warp_ttcExitSpringMumbosHut,
func_8031EA10, func_8031EA34, func_8031EA58, func_8031E95C, warp_ttcExitSummerMumbosHut, warp_ttcExitAutumnMumbosHut, warp_ttcExitWinterMumbosHut, warp_ttcEnterSpringMumbosHut,
func_8031E980, func_8031E9A4, func_8031E9C8, func_8031EB9C, warp_ttcEnterSummerMumbosHut, warp_ttcEnterAutumnMumbosHut, warp_ttcEnterWinterMumbosHut, warp_ccwEnterSpringNabnutDoor,
func_8031EBC0, func_8031EBE4, func_80334430, func_8031EC08, warp_ccwEnterSummerNabnutDoor, warp_ccwEnterAutumnNabnutDoor, func_80334430, warp_ccwExitSpringNabnutDoor,
func_8031EC2C, func_8031EC50, func_8031EC74, func_8031F0F4, warp_ccwExitSummerNabnutDoor, warp_ccwExitAutumnNabnutDoor, warp_ccwExitWinterNabnutDoor, func_8031F0F4,
func_8031F118, func_8031F184, func_80334430, func_80334430, func_8031F118, warp_lairEnterGVPuzzleRoomFromMMMLobby, func_80334430, func_80334430,
func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430,
func_80334430, func_8031FA00, func_8031F558, func_8031F314, func_80334430, warp_ttcExitSharkfoodIsland, warp_lairEnterRBBLobbyFromRBBLevel, warp_lairEnterBGSLobbyFromBGSLevel,
func_8031F2CC, func_8031F2F0, func_8031F25C, func_8031F294, warp_fpExitWozzasCave, warp_fpEnterWozzasCave, warp_lairEnterCryptFromMMMLobby, warp_lairEnterMMMLobbyFromCrypt,
func_8031F214, func_8031F238, func_8031F1A8, func_8031F1CC, warp_lairEnterPointingGruntyStatueFromBGSLobby, warp_lairEnterBGSLobbyFromPointingGruntyStatueRoom, warp_lairEnterMMMLobbyFromGVPuzzleRoom, warp_lairEnterGVPuzzleRoomFromFPLobby,
func_8031F1F0, func_8031F338, func_8031F35C, func_8031F380, warp_lairFPLobbyFromGVPuzzleRoom, warp_lairEnter640NoteDoorRoomFromFPLobby, warp_lairEnter640NoteDoorRoomFromCCWLobbyTokenEntrance, warp_lairEnter640NoteDoorRoomFromCCWLobbyDoorEntrance,
func_8031F3A4, func_8031F3C8, func_8031F3EC, func_8031F410, warp_lairEnter640NoteDoorRoomFromRBBLobby, warp_lairRBBLobbyFrom640NoteDoorRoom, warp_lairCCWLobbyFrom640NoteDoorRoomDoorEntrance, warp_lairCCWLobbyFrom640NoteDoorRoomTokenEntrance,
func_8031F520, func_8031F4E8, func_8031F434, func_8031F458, warp_lairEnterFPLobbyFrom640NoteDoorRoom, warp_ccwEnterSpringZubbaHive, warp_ccwEnterSummerZubbaHive, warp_ccwEnterAutumnZubbaHive,
func_8031F47C, func_8031F4A0, func_8031F4C4, func_8031F5C4, warp_ccwExitSpringZubbaHive, warp_ccwExitSummerZubbaHive, warp_ccwExitAutumnZubbaHive, warp_lairEnterMMMPuzzleFromRBBLobby,
func_8031F5E8, func_8031FB6C, func_8031F60C, func_8031F630, warp_lairEnterRBBPuzzleFromRBBLobby, func_8031FB6C, warp_lairEnterCCWLobbyFromFurnaceFunPath, warp_lairEnterFurnaceFunPathFromCCWLobby,
func_8031F654, func_8031F678, func_8031F69C, func_8031F6C0, warp_smEnterBanjosHouse, warp_smExitBanjosHouse, warp_lairMMLobbyFromSMLevel, warp_smExitLair,
func_8031F6E4, func_8031F708, func_8031F72C, func_8031F764, warp_rbbExitAnchorRoom, warp_rbbEnterAnchorRoom, warp_mmmEnterWellBottom, warp_mmmExitWellBottom,
func_8031F79C, func_8031F7D4, func_8031F878, func_8031F8C0, warp_mmmEnterBathroomFromLoggo, warp_mmmEnterLoggo, warp_ccwEnterLevel, warp_ccwEnterSpringNabnutWindow,
func_8031F8E4, func_8031F908, func_8031F92C, func_8031F950, warp_ccwEnterSummerNabnutWindow, warp_ccwEnterAutumnNabnutWindow, warp_ccwEnterWinterNabnutWindow, warp_ccwExitSpringNabnutWindow,
func_8031F974, func_8031F998, func_8031F9BC, func_8031FA24, warp_ccwExitSummerNabnutWindow, warp_ccwExitAutumnNabnutWindow, warp_ccwExitWinterNabnutWindow, warp_gvEnterSNSChamper,
func_8031FA48, func_8031FB14, func_80334430, func_80334430, warp_gvExitSNSChamper, warp_lairEnterLairFromSMLevel, func_80334430, func_80334430,
func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430,
func_80334430, func_80334430, func_80334430, func_80334430, func_80334430, func_80334430,
}; };

56
src/core2/code_BEF20.c
View File

@@ -6,7 +6,7 @@
f32 time_getDelta(void); f32 time_getDelta(void);
void func_80346DB4(s32); void func_80346DB4(s32);
s32 func_803463D4(enum item_e item, s32 diff); s32 item_adjustByDiffWithHud(enum item_e item, s32 diff);
void itemscore_noteScores_clear(void); void itemscore_noteScores_clear(void);
s32 itemscore_noteScores_get(enum level_e lvl_id); s32 itemscore_noteScores_get(enum level_e lvl_id);
void itemscore_timeScores_clear(void); void itemscore_timeScores_clear(void);
@@ -24,19 +24,19 @@ s32 D_80386038;
/* .code */ /* .code */
void func_80345EB0(enum item_e item){ void func_80345EB0(enum item_e item){
if(func_802FAFE8(item)){ if(func_802FAFE8(item)){
func_803463D4(item, (s32)(-time_getDelta()*60.0f * 1.1)); item_adjustByDiffWithHud(item, (s32)(-time_getDelta()*60.0f * 1.1));
}else{ }else{
func_802FACA4(item); func_802FACA4(item);
} }
} }
void item_inc(enum item_e item){ void item_inc(enum item_e item){
func_803463D4(item, 1); item_adjustByDiffWithHud(item, 1);
} }
void item_dec(enum item_e item){ void item_dec(enum item_e item){
if(!func_802E4A08()) if(!func_802E4A08())
func_803463D4(item, -1); item_adjustByDiffWithHud(item, -1);
} }
s32 item_empty(enum item_e item){ s32 item_empty(enum item_e item){
@@ -47,7 +47,10 @@ s32 item_getCount(enum item_e item){
return D_80385F30[item]; return D_80385F30[item];
} }
s32 func_80345FB4(enum item_e item, s32 diff, s32 arg2){ // func_80345FB4
s32 item_adjustByDiff(enum item_e item, s32 diff, s32 no_hud){
// Modifies the count of an item by the diff
// no_hud determines whether the HUD pops up during the adjustment
s32 oldVal; s32 oldVal;
s32 sp40; s32 sp40;
s32 sp3C; s32 sp3C;
@@ -103,7 +106,7 @@ s32 func_80345FB4(enum item_e item, s32 diff, s32 arg2){
if(sp38){ if(sp38){
D_80385F30[item] = MIN(sp38, D_80385F30[item]); D_80385F30[item] = MIN(sp38, D_80385F30[item]);
} }
if(!arg2){ if(!no_hud){
func_802FACA4(item); // displays item on HUD func_802FACA4(item); // displays item on HUD
if(item == ITEM_14_HEALTH || item == ITEM_17_AIR) if(item == ITEM_14_HEALTH || item == ITEM_17_AIR)
func_802FACA4(ITEM_16_LIFE); func_802FACA4(ITEM_16_LIFE);
@@ -149,23 +152,34 @@ s32 func_80345FB4(enum item_e item, s32 diff, s32 arg2){
return D_80385F30[item]; return D_80385F30[item];
} }
s32 func_803463D4(enum item_e item, s32 diff){ // func_803463D4
func_80345FB4(item, diff, 0); s32 item_adjustByDiffWithHud(enum item_e item, s32 diff){
// Modifies the count of an item by the diff
// Displays the HUD during the adjustment
item_adjustByDiff(item, diff, 0);
} }
void func_803463F4(enum item_e item, s32 diff){ // func_803463F4
func_80345FB4(item, diff, 1); void item_adjustByDiffWithoutHud(enum item_e item, s32 diff){
// Modifies the count of an item by the diff
// Does not display the HUD during the adjustment
item_adjustByDiff(item, diff, 1);
} }
void item_set(s32 item, s32 val){ void item_set(s32 item, s32 val){
func_803463D4(item, val - item_getCount(item)); item_adjustByDiffWithHud(item, val - item_getCount(item));
} }
void func_80346448(s32 item){ // func_80346448
func_803463D4(item, 9999999); void item_setMaxCount(s32 item){
// Sets the count of an item to the max
// Used for TTC cheats and Lair refill pillows
item_adjustByDiffWithHud(item, 9999999);
} }
void func_8034646C(void){ // func_8034646C
void item_setItemsStartCounts(void){
// Sets the player initial inventory count
int i; int i;
for(i = 0; i < 0x2C; i++){ for(i = 0; i < 0x2C; i++){
D_80385F30[i] = 0; D_80385F30[i] = 0;
@@ -210,9 +224,11 @@ void itemscore_levelReset(enum level_e level){
} }
void func_803465BC(void){ void func_803465BC(void){
// Calls a function that does nothing?
func_802FBDFC(); func_802FBDFC();
} }
// A function that does nothing?
void func_803465DC(void){} void func_803465DC(void){}
void func_803465E4(void){ void func_803465E4(void){
@@ -257,11 +273,11 @@ void func_803465E4(void){
}//L80346710 }//L80346710
if(sp50){ if(sp50){
func_803463D4(ITEM_14_HEALTH, 0); item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
} }
if(sp54 == BS_24_FLY || sp54 == BS_23_FLY_ENTER){ if(sp54 == BS_24_FLY || sp54 == BS_23_FLY_ENTER){
func_803463D4(ITEM_F_RED_FEATHER, 0); item_adjustByDiffWithHud(ITEM_F_RED_FEATHER, 0);
} }
if(!func_8028EC04() && func_8028F070()){ if(!func_8028EC04() && func_8028F070()){
@@ -276,15 +292,15 @@ void func_803465E4(void){
D_80385FEC = MAX(0.0, D_80385FEC - time_getDelta()); D_80385FEC = MAX(0.0, D_80385FEC - time_getDelta());
}//L80346870 }//L80346870
if( (!is_in_polluted_or_winter_water && is_underwater) || (is_in_polluted_or_winter_water && is_on_water_surface) ){//L80346894 if( (!is_in_polluted_or_winter_water && is_underwater) || (is_in_polluted_or_winter_water && is_on_water_surface) ){//L80346894
func_803463D4(ITEM_17_AIR, (s32)((f64)((-time_getDelta())*60.0f)*1.1)); item_adjustByDiffWithHud(ITEM_17_AIR, (s32)((f64)((-time_getDelta())*60.0f)*1.1));
} }
else{ else{
if(is_in_polluted_or_winter_water && is_underwater){//L803468D8 if(is_in_polluted_or_winter_water && is_underwater){//L803468D8
func_803463D4(ITEM_17_AIR, (s32)(f64)((-time_getDelta()*60.0f)*2.1)); item_adjustByDiffWithHud(ITEM_17_AIR, (s32)(f64)((-time_getDelta()*60.0f)*2.1));
}//L80346930 }//L80346930
if(!is_in_polluted_or_winter_water || D_80385FEC == 0.0f){ if(!is_in_polluted_or_winter_water || D_80385FEC == 0.0f){
if(!D_80385FE4 && D_80385F30[ITEM_17_AIR] < 3600){ if(!D_80385FE4 && D_80385F30[ITEM_17_AIR] < 3600){
func_803463D4(ITEM_17_AIR, (s32)(((time_getDelta()*60.0f)*100.0)*1.1)); item_adjustByDiffWithHud(ITEM_17_AIR, (s32)(((time_getDelta()*60.0f)*100.0)*1.1));
D_80385F30[ITEM_17_AIR] = MIN(D_80385F30[ITEM_17_AIR], 3600); D_80385F30[ITEM_17_AIR] = MIN(D_80385F30[ITEM_17_AIR], 3600);
} }
} }
@@ -321,7 +337,7 @@ void func_803465E4(void){
void func_80346C10(enum bs_e *retVal, enum bs_e fail_state, enum bs_e success_state, enum item_e item_id, int use_item){ void func_80346C10(enum bs_e *retVal, enum bs_e fail_state, enum bs_e success_state, enum item_e item_id, int use_item){
if(item_empty(item_id)){ if(item_empty(item_id)){
func_803463D4(item_id, 0); item_adjustByDiffWithHud(item_id, 0);
func_8025A6EC(COMUSIC_2C_BUZZER, 22000); func_8025A6EC(COMUSIC_2C_BUZZER, 22000);
if(fail_state != -1){ if(fail_state != -1){
*retVal = fail_state; *retVal = fail_state;

4
src/core2/fx/healthscore.c
View File

@@ -137,7 +137,7 @@ bool func_803012B8(f32 arg0, s32 arg1, s32 arg2){
void func_803012F8(void) { void func_803012F8(void) {
D_80381EF0 = 1; D_80381EF0 = 1;
D_80381F28 = 0.0f; D_80381F28 = 0.0f;
func_803463D4(ITEM_14_HEALTH, 0); item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
D_80381F04 = (f32) item_getCount(ITEM_14_HEALTH); D_80381F04 = (f32) item_getCount(ITEM_14_HEALTH);
} }
@@ -170,7 +170,7 @@ void fxhealthscore_update(enum item_e item_id, struct8s *arg1) {
if (D_80381F28 > 2.5) { if (D_80381F28 > 2.5) {
D_80381EF0 = 2; D_80381EF0 = 2;
} }
func_803463D4(ITEM_14_HEALTH, 0); item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
break; break;
case 2: case 2:

6
src/core2/fx/honeycarrierscore.c
View File

@@ -227,9 +227,9 @@ void fxhoneycarrierscore_update(s32 arg0, struct8s *arg1){
D_803815C4 = func_8023DB5C(); D_803815C4 = func_8023DB5C();
D_803815E4 = 0; D_803815E4 = 0;
D_803815E0 = 0.9999f; D_803815E0 = 0.9999f;
func_803463D4(ITEM_13_EMPTY_HONEYCOMB, -6); item_adjustByDiffWithHud(ITEM_13_EMPTY_HONEYCOMB, -6);
timedFunc_set_2(0.25f, (GenFunction_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000); timedFunc_set_2(0.25f, (GenFunction_2)func_8025A6EC, COMUSIC_2B_DING_B, 28000);
func_803463D4(ITEM_14_HEALTH, 0); item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
timedFunc_set_1(1.25f, (GenFunction_1)item_inc, ITEM_15_HEALTH_TOTAL); timedFunc_set_1(1.25f, (GenFunction_1)item_inc, ITEM_15_HEALTH_TOTAL);
timedFunc_set_1(1.25f, (GenFunction_1)func_8030E484, SFX_3EA_UNKNOWN); timedFunc_set_1(1.25f, (GenFunction_1)func_8030E484, SFX_3EA_UNKNOWN);
timedFunc_set_2(1.25f, (GenFunction_2)item_set, ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)+1); timedFunc_set_2(1.25f, (GenFunction_2)item_set, ITEM_14_HEALTH, item_getCount(ITEM_15_HEALTH_TOTAL)+1);
@@ -247,7 +247,7 @@ void fxhoneycarrierscore_update(s32 arg0, struct8s *arg1){
break; break;
} }
if(D_803815C0 == 1) if(D_803815C0 == 1)
func_803463D4(ITEM_13_EMPTY_HONEYCOMB, 0); item_adjustByDiffWithHud(ITEM_13_EMPTY_HONEYCOMB, 0);
break; break;
} }
} }

8
src/lair/code_5ED0.c
View File

@@ -65,7 +65,7 @@ extern void ability_setAllLearned(s32); // set unlocked moves bitfield
extern s32 ability_getAllLearned(void); // get unlocked moves bitfield extern s32 ability_getAllLearned(void); // get unlocked moves bitfield
extern s32 item_getCount(s32); // item count get extern s32 item_getCount(s32); // item count get
extern void func_803463F4(s32, s32); // item count set extern void item_adjustByDiffWithoutHud(s32, s32); // item count set
extern void func_80318614(gczoombox_t *, s32); extern void func_80318614(gczoombox_t *, s32);
extern bool func_803183A4(gczoombox_t *, u8 *); extern bool func_803183A4(gczoombox_t *, u8 *);
@@ -608,7 +608,7 @@ void func_8038CE28(void)
D_8037DCB8->unk3C[i] = 0; D_8037DCB8->unk3C[i] = 0;
// set joker card count to 0 // set joker card count to 0
func_803463F4(ITEM_27_JOKER_CARD, item_getCount(0x27) * -1); item_adjustByDiffWithoutHud(ITEM_27_JOKER_CARD, item_getCount(0x27) * -1);
D_8037DCB8->unk8 = 0; D_8037DCB8->unk8 = 0;
D_8037DCB8->unk4 = NULL; D_8037DCB8->unk4 = NULL;
@@ -642,7 +642,7 @@ void lair_func_8038CF18(void)
D_8037DCB8->unk3C[i] = 0; D_8037DCB8->unk3C[i] = 0;
// set joker card count to 0 // set joker card count to 0
func_803463F4(ITEM_27_JOKER_CARD, item_getCount(ITEM_27_JOKER_CARD) * -1); item_adjustByDiffWithoutHud(ITEM_27_JOKER_CARD, item_getCount(ITEM_27_JOKER_CARD) * -1);
} }
lair_func_8038C6BC(); lair_func_8038C6BC();
@@ -964,7 +964,7 @@ void func_8038D670(enum FF_Action next_state) {
func_8038C2D4(D_8037DCB8->ffQuestionType); func_8038C2D4(D_8037DCB8->ffQuestionType);
} }
if (((s32) D_8037DCB8->unk4->unk8 >= 7) && (quizQuestionAskedBitfield_get(func_8038D60C(D_8037DCB8->unk8)) == 0)) { if (((s32) D_8037DCB8->unk4->unk8 >= 7) && (quizQuestionAskedBitfield_get(func_8038D60C(D_8037DCB8->unk8)) == 0)) {
func_803463D4(ITEM_27_JOKER_CARD, D_8037DCB8->unk4->unk8 - 6); item_adjustByDiffWithHud(ITEM_27_JOKER_CARD, D_8037DCB8->unk4->unk8 - 6);
quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE); quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE);
func_80356540(0xA8); func_80356540(0xA8);
} }

8
src/lair/code_86F0.c
View File

@@ -74,7 +74,7 @@ void func_8038EB94(void){
func_802FAFC0(ITEM_14_HEALTH, COMUSIC_2B_DING_B); func_802FAFC0(ITEM_14_HEALTH, COMUSIC_2B_DING_B);
fileProgressFlag_set(FILEPROG_B9_DOUBLE_HEALTH, TRUE); fileProgressFlag_set(FILEPROG_B9_DOUBLE_HEALTH, TRUE);
func_80347958(); func_80347958();
func_803463D4(ITEM_14_HEALTH, 0); item_adjustByDiffWithHud(ITEM_14_HEALTH, 0);
gcpausemenu_80314AC8(1); gcpausemenu_80314AC8(1);
} }
@@ -318,7 +318,7 @@ void func_8038F350(Actor *this, s32 next_state){
local->unk4--; local->unk4--;
local->unk0 &= ~(1 << temp_s1); local->unk0 &= ~(1 << temp_s1);
fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits); fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits);
func_803463F4(ITEM_26_JIGGY_TOTAL, 1); item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, 1);
} }
break; break;
@@ -331,7 +331,7 @@ void func_8038F350(Actor *this, s32 next_state){
func_8038F1EC(this, temp_s1, 1); func_8038F1EC(this, temp_s1, 1);
local->unk0 |= (1 << temp_s1); local->unk0 |= (1 << temp_s1);
fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits); fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits);
func_803463F4(ITEM_26_JIGGY_TOTAL, -1); item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, -1);
func_8038F250(this); func_8038F250(this);
} }
break; break;
@@ -351,7 +351,7 @@ void func_8038F350(Actor *this, s32 next_state){
temp_s1 = func_8038F0EC(this); temp_s1 = func_8038F0EC(this);
func_8038F1EC(this, temp_s1, 1); func_8038F1EC(this, temp_s1, 1);
local->unk0 |= (1 << temp_s1); local->unk0 |= (1 << temp_s1);
func_803463F4(ITEM_26_JIGGY_TOTAL, -1); item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, -1);
} }
fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits); fileProgressFlag_setN(D_803947F8[this->unkF4_8 - 1].progress_flag, local->unk4, D_803947F8[this->unkF4_8 - 1].size_bits);
func_8038F250(this); func_8038F250(this);

6
src/lair/code_A170.c
View File

@@ -34,17 +34,17 @@ Actor *func_80390560(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
void func_803905CC(ActorMarker *marker, ActorMarker *other_marker){ void func_803905CC(ActorMarker *marker, ActorMarker *other_marker){
switch (marker->unk14_20) { switch (marker->unk14_20) {
case 0x170: case 0x170:
func_80346448(ITEM_D_EGGS); item_setMaxCount(ITEM_D_EGGS);
fxSparkle_giantBlueEgg(&marker->propPtr->x); fxSparkle_giantBlueEgg(&marker->propPtr->x);
func_8025A6EC(SFX_EGG_REFILL, -1); func_8025A6EC(SFX_EGG_REFILL, -1);
break; break;
case 0x171: case 0x171:
func_80346448(ITEM_F_RED_FEATHER); item_setMaxCount(ITEM_F_RED_FEATHER);
fxSparkle_giantRedFeather(&marker->propPtr->x); fxSparkle_giantRedFeather(&marker->propPtr->x);
func_8025A6EC(SFX_RED_FEATHER_REFILL, -1); func_8025A6EC(SFX_RED_FEATHER_REFILL, -1);
break; break;
case 0x172: case 0x172:
func_80346448(ITEM_10_GOLD_FEATHER); item_setMaxCount(ITEM_10_GOLD_FEATHER);
fxSparkle_giantGoldFeather(&marker->propPtr->x); fxSparkle_giantGoldFeather(&marker->propPtr->x);
func_8025A6EC(SFX_GOLD_FEATHER_REFILL, -1); func_8025A6EC(SFX_GOLD_FEATHER_REFILL, -1);
break; break;