documented volatile flag functions and enums and some Actor struct members
This commit is contained in:
mariob92
117
include/enums.h
117
include/enums.h
@@ -229,59 +229,80 @@ enum file_progress_e{
|
||||
FILEPROG_FD_BANNED_CHEATCODES_ENTERED //2 bit
|
||||
};
|
||||
|
||||
enum volatile_progress_e{
|
||||
VOLAPROG_0_UNKNOWN
|
||||
};
|
||||
enum volatile_flags_e {
|
||||
VOLATILE_FLAG_0, // FFQ
|
||||
VOLATILE_FLAG_1,
|
||||
VOLATILE_FLAG_2,
|
||||
VOLATILE_FLAG_3,
|
||||
VOLATILE_FLAG_4,
|
||||
VOLATILE_FLAG_5,
|
||||
VOLATILE_FLAG_6_HAS_SEEN_BOSS_BOOM_BOX_FF_MINIGAME = 0x6,
|
||||
VOLATILE_FLAG_7_HAS_SEEN_VILE_FF_MINIGAME,
|
||||
VOLATILE_FLAG_8_HAS_SEEN_MATCHING_PYRAMID_FF_MINIGAME,
|
||||
VOLATILE_FLAG_9_HAS_SEEN_ZUBBAS_FF_MINIGAME,
|
||||
VOLATILE_FLAG_A_HAS_SEEN_TIPTUP_FF_MINIGAME,
|
||||
VOLATILE_FLAG_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME,
|
||||
VOLATILE_FLAG_C,
|
||||
VOLATILE_FLAG_D,
|
||||
VOLATILE_FLAG_E,
|
||||
VOLATILE_FLAG_F,
|
||||
VOLATILE_FLAG_10,
|
||||
VOLATILE_FLAG_11,
|
||||
VOLATILE_FLAG_12,
|
||||
VOLATILE_FLAG_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT = 0x13,
|
||||
VOLATILE_FLAG_14,
|
||||
VOLATILE_FLAG_15,
|
||||
VOLATILE_FLAG_16,
|
||||
VOLATILE_FLAG_17,
|
||||
VOLATILE_FLAG_18,
|
||||
VOLATILE_FLAG_19,
|
||||
VOLATILE_FLAG_1A,
|
||||
VOLATILE_FLAG_1B,
|
||||
VOLATILE_FLAG_1C,
|
||||
VOLATILE_FLAG_1D,
|
||||
VOLATILE_FLAG_1E,
|
||||
VOLATILE_FLAG_1F_IN_CHARACTER_PARADE = 0x1F,
|
||||
VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE,
|
||||
|
||||
enum unkflags_1{
|
||||
UNKFLAGS1_6_HAS_SEEN_BOSS_BOOM_BOX_FF_MINIGAME = 0x6,
|
||||
UNKFLAGS1_7_HAS_SEEN_VILE_FF_MINIGAME,
|
||||
UNKFLAGS1_8_HAS_SEEN_MATCHING_PYRAMID_FF_MINIGAME,
|
||||
UNKFLAGS1_9_HAS_SEEN_ZUBBAS_FF_MINIGAME,
|
||||
UNKFLAGS1_A_HAS_SEEN_TIPTUP_FF_MINIGAME,
|
||||
UNKFLAGS1_B_HAS_SEEN_SANDCASTLE_FF_MINIGAME,
|
||||
VOLATILE_FLAG_73_SANDCASTLE_INFINITE_LIVES = 0x73,
|
||||
VOLATILE_FLAG_74_SANDCASTLE_INFINITE_EGGS,
|
||||
VOLATILE_FLAG_75_SANDCASTLE_INFINITE_RED_FEATHERS,
|
||||
VOLATILE_FLAG_76_SANDCASTLE_INFINITE_GOLD_FEATHERS,
|
||||
|
||||
UNKFLAGS1_13_HAS_TRIGGERED_MUMBO_VACATION_TEXT = 0x13,
|
||||
VOLATILE_FLAG_78_SANDCASTLE_NO_BONUS = 0x78,
|
||||
|
||||
UNKFLAGS1_1F_IN_CHARACTER_PARADE = 0x1F,
|
||||
UNKFLAGS1_20_BEGIN_CHARACTER_PARADE,
|
||||
VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC = 0x7F,
|
||||
|
||||
UNKFLAGS1_73_SANDCASTLE_INFINITE_LIVES = 0x73,
|
||||
UNKFLAGS1_74_SANDCASTLE_INFINITE_EGGS,
|
||||
UNKFLAGS1_75_SANDCASTLE_INFINITE_RED_FEATHERS,
|
||||
UNKFLAGS1_76_SANDCASTLE_INFINITE_GOLD_FEATHERS,
|
||||
VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS = 0x84,
|
||||
|
||||
UNKFLAGS1_78_SANDCASTLE_NO_BONUS = 0x78,
|
||||
VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED = 0x86,
|
||||
VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV,// 0X87
|
||||
|
||||
UNKFLAGS1_7F_SANDCASTLE_OPEN_CC = 0x7F,
|
||||
VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED = 0x8A,// 0X8A
|
||||
VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP,// 0X8B
|
||||
VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM,// 0X8C
|
||||
VOLATILE_FLAG_8D_SANDCASTLE_REMOVE_CRYPT_GATE,// 0X8D
|
||||
VOLATILE_FLAG_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID,// 0X8E
|
||||
VOLATILE_FLAG_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH,// 0X8F
|
||||
VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB,
|
||||
|
||||
UNKFLAGS1_84_SANDCASTLE_OPEN_BGS = 0x84,
|
||||
VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW = 0x93,
|
||||
VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH,// 0X94
|
||||
VOLATILE_FLAG_95_SANDCASTLE_INFINTE_MUMBO_TOKENS,// 0X95
|
||||
VOLATILE_FLAG_96_SANDCASTLE_INFINITE_AIR,// 0X96
|
||||
VOLATILE_FLAG_97_SANDCASTLE_BOTTLES_BONUS_1,// 0X97
|
||||
VOLATILE_FLAG_98_SANDCASTLE_BOTTLES_BONUS_2,// 0X98
|
||||
VOLATILE_FLAG_99_SANDCASTLE_BOTTLES_BONUS_3,// 0X99
|
||||
VOLATILE_FLAG_9A_SANDCASTLE_BOTTLES_BONUS_4,// 0X9A
|
||||
VOLATILE_FLAG_9B_SANDCASTLE_BOTTLES_BONUS_5,// 0X9B
|
||||
VOLATILE_FLAG_9C_SANDCASTLE_BOTTLES_BONUS_6,// 0X9C
|
||||
VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY,// 0X9D
|
||||
|
||||
UNKFLAGS1_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED = 0x86,
|
||||
UNKFLAGS1_87_SANDCASTLE_OPEN_GV,// 0X87
|
||||
|
||||
UNKFLAGS1_8A_SANDCASTLE_FLIGHT_UNLOCKED = 0x8A,// 0X8A
|
||||
UNKFLAGS1_8B_SANDCASTLE_OPEN_FP,// 0X8B
|
||||
UNKFLAGS1_8C_SANDCASTLE_OPEN_MMM,// 0X8C
|
||||
UNKFLAGS1_8D_SANDCASTLE_REMOVE_CRYPT_GATE,// 0X8D
|
||||
UNKFLAGS1_8E_SANDCASTLE_REMOVE_CRYPT_COFFIN_LID,// 0X8E
|
||||
UNKFLAGS1_8F_SANDCASTLE_REMOVE_GRATE_NEAR_WATER_SWITCH,// 0X8F
|
||||
UNKFLAGS1_90_SANDCASTLE_OPEN_RBB,
|
||||
|
||||
UNKFLAGS1_93_SANDCASTLE_OPEN_CCW = 0x93,
|
||||
UNKFLAGS1_94_SANDCASTLE_INFINITE_HEALTH,// 0X94
|
||||
UNKFLAGS1_95_SANDCASTLE_INFINTE_MUMBO_TOKENS,// 0X95
|
||||
UNKFLAGS1_96_SANDCASTLE_INFINITE_AIR,// 0X96
|
||||
UNKFLAGS1_97_SANDCASTLE_BOTTLES_BONUS_1,// 0X97
|
||||
UNKFLAGS1_98_SANDCASTLE_BOTTLES_BONUS_2,// 0X98
|
||||
UNKFLAGS1_99_SANDCASTLE_BOTTLES_BONUS_3,// 0X99
|
||||
UNKFLAGS1_9A_SANDCASTLE_BOTTLES_BONUS_4,// 0X9A
|
||||
UNKFLAGS1_9B_SANDCASTLE_BOTTLES_BONUS_5,// 0X9B
|
||||
UNKFLAGS1_9C_SANDCASTLE_BOTTLES_BONUS_6,// 0X9C
|
||||
UNKFLAGS1_9D_SANDCASTLE_WISHY_WASHY,// 0X9D
|
||||
|
||||
UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE = 0xC0,
|
||||
UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE
|
||||
VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE = 0xC0,
|
||||
VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE,
|
||||
VOLATILE_FLAG_C2_UNUSED,
|
||||
VOLATILE_FLAG_C3, // unk
|
||||
VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE
|
||||
};
|
||||
|
||||
enum level_flags_e
|
||||
@@ -4691,4 +4712,10 @@ enum nc_first_person_state{
|
||||
FIRSTPERSON_STATE_4_DONE
|
||||
};
|
||||
|
||||
enum marker_collision_func_type_e {
|
||||
MARKER_COLLISION_FUNC_0, // active?
|
||||
MARKER_COLLISION_FUNC_1, // passive?
|
||||
MARKER_COLLISION_FUNC_2_DIE
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
@@ -20,6 +20,8 @@
|
||||
#include "bsint.h"
|
||||
#include "generic.h"
|
||||
|
||||
#include "enums.h"
|
||||
|
||||
extern f32 fabsf(f32);
|
||||
#pragma intrinsic (fabsf)
|
||||
|
||||
@@ -561,5 +563,8 @@ extern void spawnableActorList_add(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32,
|
||||
extern void spawnableActorList_addIfMapVisited(ActorInfo *arg0, Actor *(*arg1)(s32[3], s32, ActorInfo *, u32), u32 arg2, enum map_e arg3);
|
||||
extern void marker_setActorUpdateFunc(ActorMarker *marker, ActorUpdateFunc method);
|
||||
extern void marker_setActorUpdate2Func(ActorMarker *marker, ActorUpdateFunc method);
|
||||
extern void marker_callCollisionFunc(ActorMarker *, ActorMarker *, enum marker_collision_func_type_e);
|
||||
extern enum marker_collision_func_type_e func_8033D574(struct5Cs *arg0);
|
||||
extern s32 volatileFlag_get(s32); // get volatile flag
|
||||
|
||||
#endif
|
||||
|
||||
@@ -217,7 +217,7 @@ typedef struct actor_s{
|
||||
|
||||
};
|
||||
//u8 padAC[0x44];
|
||||
f32 unkEC; //animCtrl???
|
||||
f32 stored_animctrl_timer; // animCtrlTimer
|
||||
f32 stored_animctrl_duration; //animCtrlDuration
|
||||
u32 unkF4_31:1;
|
||||
u32 unkF4_30:1; // has something to do with vertices
|
||||
@@ -303,7 +303,7 @@ typedef struct actor_info_s{
|
||||
s16 startAnimation;
|
||||
ActorAnimationInfo* animations;
|
||||
void (* update_func)(Actor *);
|
||||
void (* unk10)(Actor *);
|
||||
void (* update2_func)(Actor *);
|
||||
Actor* (* draw_func)(ActorMarker *, Gfx **, Mtx **, Vtx **);
|
||||
u16 unk18;
|
||||
u16 draw_distance;
|
||||
|
||||
Reference in New Issue
Block a user