document: sandcastle (code_3E30) related code

This commit is contained in:
Bl00D4NGEL 2024-10-05 02:58:17 +02:00
parent 7f41a49ef8
commit c07c907d97
10 changed files with 767 additions and 492 deletions

View File

@ -290,7 +290,7 @@ enum volatile_flags_e {
VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS,
VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS,
VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS,
VOLATILE_FLAG_77, // unused
VOLATILE_FLAG_77_SANDCASTLE_SET_HEALTH_TO_MAX, // unused
VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS,
VOLATILE_FLAG_79, // unused
VOLATILE_FLAG_7A, // unused
@ -4265,7 +4265,7 @@ enum asset_e
ASSET_E35_DIALOG_BOTTLES_BONUS_REMINDER = VER_SELECT(0xE35, 0xa77, 0, 0),
ASSET_E37_TEXT_BOTTLES_STOP_WASTING_TIME_AFTER_FURNACE_FUN = 0xE37, // Talk to bottles after beating furnace fun
ASSET_E38_TEXT_UNKNOWN,
ASSET_E38_CHEATING_ERASE_SAVE_CONFIRMATION,
ASSET_E57_DIALOG_FIRST_JIGGY = VER_SELECT(0xF57, 0xabd, 0, 0),
@ -4282,8 +4282,8 @@ enum asset_e
ASSET_FAD_TEXT_UNKNOWN = 0xfad,
ASSET_FBE_TEXT_UNKNOWN = 0xfbe,
ASSET_FBF_TEXT_UNKNOWN,
ASSET_FBE_TEXT_CHEATING_ERASE_SAVE_WARNING = 0xfbe,
ASSET_FBF_TEXT_ERASED_SAVE,
ASSET_10A1_DIALOG_BRENTILDA_MEET = 0x10A1,
ASSET_10A2_TEXT_UNKNOWN,

View File

@ -1,7 +1,7 @@
sm_func_80386810 = 0x80386810;
mm_func_803888B0 = 0x803888B0;
TTC_resetSpawnableActors = 0x80388AC0;
ttc_func_8038BF8C = 0x8038BF8C;
code_3E30_isSecretCheatCodeRelatedValueEqualToScrambledAddressValue = 0x8038BF8C;
cc_func_803870E0 = 0x803870E0;
cc_func_80387DA0 = 0x80387DA0;
bgs_func_803885DC = 0x803885DC;

File diff suppressed because it is too large Load Diff

View File

@ -39,7 +39,7 @@ void __chCrab_802CB040(Actor *this) {
void __chCrab_802CB078(Actor *this) {
u32 temp_t9;
if ((this->modelCacheIndex != ACTOR_F2_BLACK_SNIPPET) || func_8038B550()) {
if ((this->modelCacheIndex != ACTOR_F2_BLACK_SNIPPET) || code3E30_hasBanjoKazooieCodeBeenEntered()) {
temp_t9 = (u32) this->unk38_31 >> 0x16;
if (this->unk38_31 != 0) {
this->unk38_31--;
@ -159,7 +159,7 @@ bool __chCrab_802CB76C(ActorMarker *marker, ActorMarker *other) {
Actor *this;
this = marker_getActor(marker);
if ((this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET) && !func_8038B550()) {
if ((this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET) && !code3E30_hasBanjoKazooieCodeBeenEntered()) {
return FALSE;
}
return TRUE;

View File

@ -83,7 +83,7 @@ s32 mm_hut_smash_count;
u32 CH_TREASUREHUNT_PUZZLE_CURRENT_STEP;
struct FF_StorageStruct* D_8037DCB8;
s32 D_8037DCBC;
u8 D_8037DCC0[7];
u8 D_8037DCC0[7]; // bottle bonus puzzle?
u8 D_8037DCC7;
u8 D_8037DCC8;
u8 D_8037DCC9;

View File

@ -89,7 +89,7 @@ ItemPrint D_803692F8[0x2C] = {
/* .bss */
s32 D_803810B0;
f32 itemPrintValues[0x2C]; //item_print_value
s32 D_80381168[0x2C]; //comusic_e
s32 D_80381168[0x2C]; // item_e => comusic_e
f32 D_80381218[0x2C]; //item_sfx_volume???
s32 D_803812C8[0x2C]; //comusic_e
s32 D_80381378[0x2C]; //sfx_e

View File

@ -208,15 +208,15 @@ void func_80322B3C(s32 arg0, s32 arg1){ return; }
void __overlay_ttc_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx){ return; }
void __overlay_ttc_release(void){
func_8038B04C();
code3E30_overlayRelease();
}
void overlay_ttc_init(void){
func_8038B094();
code3E30_overlayInit();
}
void __overlay_ttc_update(void){
func_8038B2F0();
code3E30_overlayUpdate();
}
void func_80322BB8(s32 arg0, s32 arg1){ return; }

View File

@ -321,7 +321,7 @@ s32 func_80334ECC(void) {
phi_v1 = 0x1F;
}
if (((phi_v1 & phi_v0) == 3) && (overlayManagergetLoadedId() == OVERLAY_5_BEACH)) {
if ((ttc_func_8038BF8C() == 0) || (D_80370250 != 0)) {
if ((code_3E30_isSecretCheatCodeRelatedValueEqualToScrambledAddressValue() == FALSE) || (D_80370250 != 0)) {
D_80370250 = (u8)1;
for (phi_v0 = 0; phi_v0 != 0x8F0D180; phi_v0++){
}

View File

@ -123,12 +123,12 @@ void volatileFlag_setAndTriggerDialog_0(s32 arg0) {
volatileFlag_setAndTriggerDialog(arg0, 0);
}
// called for FFQ dialogs
// called for FFQ dialogs, gruntilda speaking?
void volatileFlag_setAndTriggerDialog_4(s32 arg0) {
volatileFlag_setAndTriggerDialog(arg0, 4);
}
// called for WISHYWASHYBANJO dialog
// called for WISHYWASHYBANJO dialog, mumbo jumbo speaking?
void volatileFlag_setAndTriggerDialog_E(s32 arg0) {
volatileFlag_setAndTriggerDialog(arg0, 0xE);
}

View File

@ -942,6 +942,11 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca
return 0;
}
// arg1 = "person" that says text?
// 0xC = Bottles
// 0xE = Jumbo?
// 0x4 = Gruntilda?
// 0xF = Mr Vile?
bool gcdialog_showText(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*callback)(ActorMarker *, enum asset_e, s32), void(*arg5)(ActorMarker *, enum asset_e, s32)){
return func_80311174(text_id, arg1, pos, marker, callback, arg5, 0);
}