document: FILEPROG_0_TIPTUP_MINIGAME_PROGRESS, replace FILEPROG_0 usage with NULL where applicable
This commit is contained in:
@@ -391,6 +391,20 @@ void __baMarker_resolveCollision(Prop *other_prop){
|
||||
if(func_802458E0(spAC, actor, 0x87) == 0)
|
||||
return;
|
||||
volatileFlag_set(VOLATILE_FLAG_1E, 1);
|
||||
/**
|
||||
* This should use the following fileprog flags:
|
||||
*
|
||||
* FILEPROG_49_PINK_CAULDRON_1_ACTIVE
|
||||
* FILEPROG_4A_PINK_CAULDRON_2_ACTIVE
|
||||
* FILEPROG_4B_GREEN_CAULDRON_1_ACTIVE
|
||||
* FILEPROG_4C_GREEN_CAULDRON_2_ACTIVE
|
||||
* FILEPROG_4D_RED_CAULDRON_1_ACTIVE
|
||||
* FILEPROG_4E_RED_CAULDRON_2_ACTIVE
|
||||
* FILEPROG_4F_UNUSED_CAULDRON_1_ACTIVE
|
||||
* FILEPROG_50_UNUSED_CAULDRON_2_ACTIVE
|
||||
* FILEPROG_51_YELLOW_CAULDRON_1_ACTIVE
|
||||
* FILEPROG_52_YELLOW_CAULDRON_2_ACTIVE
|
||||
*/
|
||||
if(fileProgressFlag_get(((actor->unkF4_8 - 1) ^ 1) + 0x49)){
|
||||
actor->unk10_12 = 2;
|
||||
}
|
||||
|
@@ -36,7 +36,8 @@ void func_802A0340(void){
|
||||
}
|
||||
}
|
||||
|
||||
// bsBee_inSet
|
||||
// bsBee_inSet
|
||||
// move_idx is probably a bs_e
|
||||
int bsbee_inSet(s32 move_idx){
|
||||
return (move_idx == 0x85)
|
||||
|| (move_idx == 0x86)
|
||||
|
@@ -29,7 +29,7 @@ MapProgressFlagToDialogID fileProgressDialogMap[] = {
|
||||
{ FILEPROG_BE_CHEATO_BLUEEGGS, 0xFA8},
|
||||
{ FILEPROG_BF_CHEATO_REDFEATHERS, 0xFA9},
|
||||
{ FILEPROG_C0_CHEATO_GOLDFEATHERS, 0xFAA},
|
||||
{0x95, 0xB50},
|
||||
{ FILEPROG_95_UNKNOWN, 0xB50},
|
||||
{ FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT, 0xF7B},
|
||||
{ -1, -1}
|
||||
};
|
||||
|
Reference in New Issue
Block a user