Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

most actors #1114

Merged
merged 5 commits into from
Aug 31, 2023
Merged

most actors #1114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a98a9d1
common actors
Aug 25, 2023
7507e7e
tubba and huff
Aug 27, 2023
9385b83
chapter 2
Aug 27, 2023
fd54ce1
fix ruff / tuff puff names
Aug 27, 2023
4d48b26
bloopers
Aug 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 12 additions & 28 deletions include/effects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,19 +1463,17 @@ typedef struct StatChangeFXData {
} StatChangeFXData;

typedef struct SnakingStaticFXData {
/* 0x00 */ s32 unk_00;
/* 0x00 */ s32 type;
/* 0x04 */ Vec3f pos;
/* 0x10 */ s32 timeLeft;
/* 0x14 */ s32 lifeTime;
/* 0x18 */ s32 unk_18;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
/* 0x24 */ s32 unk_24;
/* 0x28 */ s32 unk_28;
/* 0x2C */ s32 unk_2C;
/* 0x30 */ s32 unk_30;
/* 0x28 */ Color3i envCol;
/* 0x34 */ f32 unk_34;
/* 0x38 */ f32 unk_38;
/* 0x38 */ f32 scale;
/* 0x3C */ f32 unk_3C;
/* 0x40 */ s32 unk_40;
} SnakingStaticFXData; // size = 0x44
Expand Down Expand Up @@ -1956,14 +1954,8 @@ typedef struct HuffPuffBreathFXData {
/* 0x04 */ Vec3f pos;
/* 0x10 */ s32 timeLeft;
/* 0x14 */ s32 lifeTime;
/* 0x18 */ s32 primR;
/* 0x1C */ s32 primG;
/* 0x20 */ s32 primB;
/* 0x24 */ s32 primA;
/* 0x28 */ s32 envR;
/* 0x2C */ s32 envG;
/* 0x30 */ s32 envB;
/* 0x34 */ s32 envA;
/* 0x18 */ Color4i primCol;
/* 0x28 */ Color4i envCol;
/* 0x38 */ f32 texOffsetX;
/* 0x3C */ f32 speedX;
/* 0x40 */ f32 texOffsetY;
Expand All @@ -1973,23 +1965,15 @@ typedef struct HuffPuffBreathFXData {
} HuffPuffBreathFXData; // size = 0x50

typedef struct ColdBreathFXData {
/* 0x00 */ s32 unk_00;
/* 0x04 */ f32 unk_04;
/* 0x08 */ f32 unk_08;
/* 0x0C */ f32 unk_0C;
/* 0x10 */ s32 unk_10;
/* 0x14 */ s32 unk_14;
/* 0x18 */ s32 unk_18;
/* 0x1C */ s32 unk_1C;
/* 0x20 */ s32 unk_20;
/* 0x24 */ s32 unk_24;
/* 0x28 */ s32 unk_28; // TODO: Vec3i color?
/* 0x2C */ s32 unk_2C;
/* 0x30 */ s32 unk_30;
/* 0x34 */ s32 unk_34;
/* 0x00 */ s32 type;
/* 0x04 */ Vec3f pos;
/* 0x10 */ s32 timeLeft;
/* 0x14 */ s32 lifetime;
/* 0x18 */ Color4i primCol;
/* 0x28 */ Color4i envCol;
/* 0x38 */ f32 unk_38;
/* 0x3C */ f32 unk_3C;
/* 0x40 */ f32 unk_40;
/* 0x40 */ f32 scale;
} ColdBreathFXData; // size = 0x44

typedef struct EmbersFXData {
Expand Down
8 changes: 4 additions & 4 deletions include/enums.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1248,10 +1248,10 @@ enum SoundIDs {
SOUND_ELECTRIC_BUZZ = 0x000003D2,
SOUND_HUFF_N_PUFF_LIGHTNING_BLAST = 0x000003D3,
SOUND_OPEN_SHELL = 0x000003D4,
SOUND_03D5 = 0x000003D5,
SOUND_03D6 = 0x000003D6,
SOUND_RUFF_PUFF_FLY_A = 0x000003D5,
SOUND_RUFF_PUFF_FLY_B = 0x000003D6,
SOUND_03D9 = 0x000003D9,
SOUND_03DB = 0x000003DB,
SOUND_SQUEEZE = 0x000003DB,
SOUND_03DC = 0x000003DC,
SOUND_03DD = 0x000003DD,
SOUND_03DE = 0x000003DE,
Expand Down Expand Up @@ -3275,7 +3275,7 @@ enum ActorFlags {
ACTOR_FLAG_NO_ATTACK = 0x00200000, ///< Skip attack turn.
ACTOR_FLAG_NO_DMG_APPLY = 0x00400000, ///< Damage is not applied to actor HP.
ACTOR_FLAG_800000 = 0x00800000,
ACTOR_FLAG_1000000 = 0x01000000,
ACTOR_FLAG_1000000 = 0x01000000, // Enraged? Only used for Super Blooper.
ACTOR_FLAG_NO_DMG_POPUP = 0x02000000, ///< Hide damage popup.
ACTOR_FLAG_4000000 = 0x04000000,
ACTOR_FLAG_8000000 = 0x08000000,
Expand Down
Loading
Loading