falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

En_Raf (Carnivorous Lily Pad) OK and documented, object_raf documented (#794) 

* EnRaf_Init OK

* func_80A17060, func_80A18080, and func_80A180B4 OK

* EnRaf_Destroy, func_80A1712C, func_80A171D8, and func_80A17414 OK

* func_80A17464 and func_80A17530 OK

* EnRaf_Draw OK

* func_80A175E4, func_80A17848, and func_80A178A0 OK

* func_80A18A90 OK

* func_80A179C8 and func_80A17C6C OK

* func_80A1859C OK

* func_80A17D14 and EnRaf_Update OK

* func_80A18B8C and func_80A18DA0 OK, EnRafParticle documented

* func_80A16D40, func_80A16D6C, func_80A17D54, and func_80A17DDC OK

* func_80A17E1C OK

* Use object symbols

* Import data to C and use generated reloc

* Misc cleanup

* Document animations and skeleton

* Finish documenting object_raf

* Some low-hanging fruit

* Some actions I figured out

* Name revival stuff

* Document type stuff

* Bob and player height stuff

* Name a few more things (some of the names are bad but whatever)

* Finally move Vec3f data inline like I've wanted to do for ages

* Some more low-hanging fruit

* limbRot name

* Name the chew stuff

* First pass names on everything, even if they're bad

* Some last-minute stuff before PR

* Respond to Elliptic's review

* Manually specify texture dimensions

* Format

* Add comment about pointless check

* Respond to Elliptic's second review
This commit is contained in:
Tom Overton 2022-04-21 19:22:07 -07:00 committed by GitHub
parent 374c05fda3
commit 81efaf8551
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 1004 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
assets/xml/objects/object_raf.xml
View File

@ -1,42 +1,58 @@
<Root>
<!-- Assets for the Carnivorous Lily Pad-->
<File Name="object_raf" Segment="6">
<Collision Name="object_raf_Colheader_000108" Offset="0x108" />
<DList Name="object_raf_DL_0001C0" Offset="0x1C0" />
<Animation Name="object_raf_Anim_0003FC" Offset="0x3FC" />
<Animation Name="object_raf_Anim_0007A8" Offset="0x7A8" />
<Animation Name="object_raf_Anim_000A64" Offset="0xA64" />
<Animation Name="object_raf_Anim_000B30" Offset="0xB30" />
<Animation Name="object_raf_Anim_000C7C" Offset="0xC7C" />
<DList Name="object_raf_DL_001630" Offset="0x1630" />
<DList Name="object_raf_DL_001790" Offset="0x1790" />
<DList Name="object_raf_DL_001838" Offset="0x1838" />
<DList Name="object_raf_DL_0018D0" Offset="0x18D0" />
<DList Name="object_raf_DL_001990" Offset="0x1990" />
<DList Name="object_raf_DL_001B90" Offset="0x1B90" />
<DList Name="object_raf_DL_001C28" Offset="0x1C28" />
<DList Name="object_raf_DL_001CE8" Offset="0x1CE8" />
<DList Name="object_raf_DL_001EE8" Offset="0x1EE8" />
<DList Name="object_raf_DL_001F80" Offset="0x1F80" />
<DList Name="object_raf_DL_002040" Offset="0x2040" />
<DList Name="object_raf_DL_002340" Offset="0x2340" />
<DList Name="object_raf_DL_002418" Offset="0x2418" />
<DList Name="object_raf_DL_0024E0" Offset="0x24E0" />
<Texture Name="object_raf_Tex_0024F8" OutName="tex_0024F8" Format="rgba16" Width="16" Height="32" Offset="0x24F8" />
<Texture Name="object_raf_Tex_0028F8" OutName="tex_0028F8" Format="rgba16" Width="16" Height="32" Offset="0x28F8" />
<Texture Name="object_raf_Tex_002CF8" OutName="tex_002CF8" Format="rgba16" Width="16" Height="16" Offset="0x2CF8" />
<Texture Name="object_raf_Tex_002EF8" OutName="tex_002EF8" Format="rgba16" Width="16" Height="32" Offset="0x2EF8" />
<Texture Name="object_raf_Tex_0032F8" OutName="tex_0032F8" Format="rgba16" Width="8" Height="8" Offset="0x32F8" />
<Limb Name="object_raf_Standardlimb_003378" Type="Standard" EnumName="OBJECT_RAF_LIMB_01" Offset="0x3378" />
<Limb Name="object_raf_Standardlimb_003384" Type="Standard" EnumName="OBJECT_RAF_LIMB_02" Offset="0x3384" />
<Limb Name="object_raf_Standardlimb_003390" Type="Standard" EnumName="OBJECT_RAF_LIMB_03" Offset="0x3390" />
<Limb Name="object_raf_Standardlimb_00339C" Type="Standard" EnumName="OBJECT_RAF_LIMB_04" Offset="0x339C" />
<Limb Name="object_raf_Standardlimb_0033A8" Type="Standard" EnumName="OBJECT_RAF_LIMB_05" Offset="0x33A8" />
<Limb Name="object_raf_Standardlimb_0033B4" Type="Standard" EnumName="OBJECT_RAF_LIMB_06" Offset="0x33B4" />
<Limb Name="object_raf_Standardlimb_0033C0" Type="Standard" EnumName="OBJECT_RAF_LIMB_07" Offset="0x33C0" />
<Limb Name="object_raf_Standardlimb_0033CC" Type="Standard" EnumName="OBJECT_RAF_LIMB_08" Offset="0x33CC" />
<Limb Name="object_raf_Standardlimb_0033D8" Type="Standard" EnumName="OBJECT_RAF_LIMB_09" Offset="0x33D8" />
<Limb Name="object_raf_Standardlimb_0033E4" Type="Standard" EnumName="OBJECT_RAF_LIMB_0A" Offset="0x33E4" />
<Limb Name="object_raf_Standardlimb_0033F0" Type="Standard" EnumName="OBJECT_RAF_LIMB_0B" Offset="0x33F0" />
<Skeleton Name="object_raf_Skel_003428" Type="Flex" LimbType="Standard" LimbNone="OBJECT_RAF_LIMB_NONE" LimbMax="OBJECT_RAF_LIMB_MAX" EnumName="object_raf_Limbs" Offset="0x3428" />
<!-- Carnivorous Lily Pad Collision -->
<Collision Name="gCarnivorousLilyPadCol" Offset="0x108" />
<!-- Unused Textureless Platform DisplayList. Maybe used for testing collision? -->
<DList Name="gCarnivorousLilyPadTexturelessPlatformDL" Offset="0x1C0" />
<!-- Carnivorous Lily Pad Animations -->
<Animation Name="gCarnivorousLilyPadConvulseAnim" Offset="0x3FC" /> <!-- Original name is "raf_end01" -->
<Animation Name="gCarnivorousLilyPadDeathAnim" Offset="0x7A8" /> <!-- Original name is "raf_end02" -->
<Animation Name="gCarnivorousLilyPadSpitAnim" Offset="0xA64" /> <!-- Original name is "raf_haku" ("to spit up") -->
<Animation Name="gCarnivorousLilyPadChewAnim" Offset="0xB30" /> <!-- Original name is "raf_mogu" ("chew") -->
<Animation Name="gCarnivorousLilyPadCloseAnim" Offset="0xC7C" /> <!-- Original name is "raf_paku" ("devouring")-->
<!-- Carnivorous Lily Pad Limb DisplayLists -->
<DList Name="gCarnivorousLilyPadFlowerDL" Offset="0x1630" />
<DList Name="gCarnivorousLilyPadRootsDL" Offset="0x1790" />
<DList Name="gCarnivorousLilyPadTrap3LowerSegmentDL" Offset="0x1838" />
<DList Name="gCarnivorousLilyPadTrap3MiddleSegmentDL" Offset="0x18D0" />
<DList Name="gCarnivorousLilyPadTrap3UpperSegmentDL" Offset="0x1990" />
<DList Name="gCarnivorousLilyPadTrap2LowerSegmentDL" Offset="0x1B90" />
<DList Name="gCarnivorousLilyPadTrap2MiddleSegmentDL" Offset="0x1C28" />
<DList Name="gCarnivorousLilyPadTrap2UpperSegmentDL" Offset="0x1CE8" />
<DList Name="gCarnivorousLilyPadTrap1LowerSegmentDL" Offset="0x1EE8" />
<DList Name="gCarnivorousLilyPadTrap1MiddleSegmentDL" Offset="0x1F80" />
<DList Name="gCarnivorousLilyPadTrap1UpperSegmentDL" Offset="0x2040" />
<!-- Carnivorous Lily Pad Particle DisplayLists -->
<DList Name="gCarnivorousLilyPadParticlePetalDL" Offset="0x2340" />
<DList Name="gCarnivorousLilyPadParticleTeethDL" Offset="0x2418" />
<DList Name="gCarnivorousLilyPadParticleDL" Offset="0x24E0" />
<!-- Carnivorous Lily Pad Textures -->
<Texture Name="gCarnivorousLilyPadRootsTex" OutName="carnivorous_lily_pad_roots" Format="rgba16" Width="16" Height="32" Offset="0x24F8" />
<Texture Name="gCarnivorousLilyPadFlowerPetalTex" OutName="carnivorous_lily_pad_flower_petal" Format="rgba16" Width="16" Height="32" Offset="0x28F8" />
<Texture Name="gCarnivorousLilyPadFlowerCenterTex" OutName="carnivorous_lily_pad_flower_center" Format="rgba16" Width="16" Height="16" Offset="0x2CF8" />
<Texture Name="gCarnivorousLilyPadTrapPetalTex" OutName="carnivorous_lily_pad_trap_petal" Format="rgba16" Width="16" Height="32" Offset="0x2EF8" />
<Texture Name="gCarnivorousLilyPadTrapTeethTex" OutName="carnivorous_lily_pad_trap_teeth" Format="rgba16" Width="8" Height="8" Offset="0x32F8" />
<!-- Carnivorous Lily Pad Limbs -->
<Limb Name="gCarnivorousLilyPadFlowerLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_FLOWER" Offset="0x3378" />
<Limb Name="gCarnivorousLilyPadTrap1LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT" Offset="0x3384" />
<Limb Name="gCarnivorousLilyPadTrap1MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_MIDDLE_SEGMENT" Offset="0x3390" />
<Limb Name="gCarnivorousLilyPadTrap1UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_UPPER_SEGMENT" Offset="0x339C" />
<Limb Name="gCarnivorousLilyPadTrap2LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_LOWER_SEGMENT" Offset="0x33A8" />
<Limb Name="gCarnivorousLilyPadTrap2MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_MIDDLE_SEGMENT" Offset="0x33B4" />
<Limb Name="gCarnivorousLilyPadTrap2UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_UPPER_SEGMENT" Offset="0x33C0" />
<Limb Name="gCarnivorousLilyPadTrap3LowerSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_LOWER_SEGMENT" Offset="0x33CC" />
<Limb Name="gCarnivorousLilyPadTrap3MiddleSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_MIDDLE_SEGMENT" Offset="0x33D8" />
<Limb Name="gCarnivorousLilyPadTrap3UpperSegmentLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT" Offset="0x33E4" />
<Limb Name="gCarnivorousLilyPadRootsLimb" Type="Standard" EnumName="CARNIVOROUS_LILY_PAD_LIMB_ROOTS" Offset="0x33F0" />
<!-- Carnivorous Lily Pad Skeleton -->
<Skeleton Name="gCarnivorousLilyPadSkel" Type="Flex" LimbType="Standard" LimbNone="CARNIVOROUS_LILY_PAD_LIMB_NONE" LimbMax="CARNIVOROUS_LILY_PAD_LIMB_MAX" EnumName="CarnivorousLilyPadLimbs" Offset="0x3428" />
</File>
</Root>

3
spec
View File

@ -2547,8 +2547,7 @@ beginseg
name "ovl_En_Raf"
compress
include "build/src/overlays/actors/ovl_En_Raf/z_en_raf.o"
include "build/data/ovl_En_Raf/ovl_En_Raf.data.o"
include "build/data/ovl_En_Raf/ovl_En_Raf.reloc.o"
include "build/src/overlays/actors/ovl_En_Raf/ovl_En_Raf_reloc.o"
endseg
beginseg

917
src/overlays/actors/ovl_En_Raf/z_en_raf.c
View File

@ -1,7 +1,7 @@
/*
* File: z_en_raf.c
* Overlay: ovl_En_Raf
* Description: Carnivorous Lilypad
* Description: Carnivorous Lily Pad
*/
#include "z_en_raf.h"
@ -15,16 +15,58 @@ void EnRaf_Destroy(Actor* thisx, GlobalContext* globalCtx);
void EnRaf_Update(Actor* thisx, GlobalContext* globalCtx);
void EnRaf_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80A171D8(EnRaf* this, GlobalContext* globalCtx);
void func_80A17464(EnRaf* this, GlobalContext* globalCtx);
void func_80A175E4(EnRaf* this, GlobalContext* globalCtx);
void func_80A178A0(EnRaf* this, GlobalContext* globalCtx);
void func_80A17C6C(EnRaf* this, GlobalContext* globalCtx);
void func_80A17D54(EnRaf* this, GlobalContext* globalCtx);
void func_80A17E1C(EnRaf* this, GlobalContext* globalCtx);
void func_80A180B4(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_SetupIdle(EnRaf* this);
void EnRaf_Idle(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_SetupGrab(EnRaf* this);
void EnRaf_Grab(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_SetupChew(EnRaf* this);
void EnRaf_Chew(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_SetupThrow(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_Throw(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_Explode(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_PostDetonation(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_Convulse(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_SetupDissolve(EnRaf* this);
void EnRaf_Dissolve(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_SetupDormant(EnRaf* this);
void EnRaf_Dormant(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_InitializeParticle(EnRaf* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale, s16 timer);
void EnRaf_UpdateParticles(EnRaf* this, GlobalContext* globalCtx);
void EnRaf_DrawParticles(EnRaf* this, GlobalContext* globalCtx);
typedef enum {
/* 0 */ EN_RAF_ANIMATION_IDLE,
/* 1 */ EN_RAF_ANIMATION_CLOSE,
/* 2 */ EN_RAF_ANIMATION_CHEW,
/* 3 */ EN_RAF_ANIMATION_SPIT,
/* 4 */ EN_RAF_ANIMATION_CONVULSE,
/* 5 */ EN_RAF_ANIMATION_DEATH,
} EnRafAnimationIndex;
typedef enum {
/* 0 */ EN_RAF_ACTION_IDLE,
/* 1 */ EN_RAF_ACTION_GRAB,
/* 2 */ EN_RAF_ACTION_CHEW,
/* 3 */ EN_RAF_ACTION_THROW,
/* 4 */ EN_RAF_ACTION_EXPLODE,
/* 5 */ EN_RAF_ACTION_CONVULSE,
/* 6 */ EN_RAF_ACTION_DISSOLVE,
/* 7 */ EN_RAF_ACTION_DORMANT,
} EnRafAction;
typedef enum {
/* 0 */ EN_RAF_GRAB_TARGET_PLAYER,
/* 1 */ EN_RAF_GRAB_TARGET_EXPLOSIVE,
/* 2 */ EN_RAF_GRAB_TARGET_GORON_PLAYER
} EnRafGrabTarget;
typedef enum {
/* 0 */ EN_RAF_PETAL_SCALE_TYPE_DEAD,
/* 1 */ EN_RAF_PETAL_SCALE_TYPE_GRAB,
/* 2 */ EN_RAF_PETAL_SCALE_TYPE_CHEW,
/* 3 */ EN_RAF_PETAL_SCALE_TYPE_IDLE_OR_THROW
} EnRafPetalScaleType;
#if 0
const ActorInit En_Raf_InitVars = {
ACTOR_EN_RAF,
ACTORCAT_PROP,
@ -37,15 +79,71 @@ const ActorInit En_Raf_InitVars = {
(ActorFunc)EnRaf_Draw,
};
// static ColliderCylinderInit sCylinderInit = {
static ColliderCylinderInit D_80A18EE0 = {
{ COLTYPE_NONE, AT_ON | AT_TYPE_ENEMY, AC_NONE, OC1_ON | OC1_TYPE_ALL, OC2_TYPE_1, COLSHAPE_CYLINDER, },
{ ELEMTYPE_UNK0, { 0xF7CFFFFF, 0x04, 0x10 }, { 0xF7CFFFFF, 0x00, 0x00 }, TOUCH_ON | TOUCH_SFX_NORMAL, BUMP_NONE, OCELEM_ON, },
static ColliderCylinderInit sCylinderInit = {
{
COLTYPE_NONE,
AT_ON | AT_TYPE_ENEMY,
AC_NONE,
OC1_ON | OC1_TYPE_ALL,
OC2_TYPE_1,
COLSHAPE_CYLINDER,
},
{
ELEMTYPE_UNK0,
{ 0xF7CFFFFF, 0x04, 0x10 },
{ 0xF7CFFFFF, 0x00, 0x00 },
TOUCH_ON | TOUCH_SFX_NORMAL,
BUMP_NONE,
OCELEM_ON,
},
{ 50, 10, -10, { 0, 0, 0 } },
};
// static DamageTable sDamageTable = {
static DamageTable D_80A1939C = {
static u8 sTeethClearPixelTableFirstPass[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1,
1, 0, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 1, 0, 0,
};
static u8 sTeethClearPixelTableSecondPass[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
};
static u8 sPetalClearPixelTableFirstPass[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1,
1, 1, 0, 1, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 0, 1, 1, 1, 0, 0, 0, 0, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 1, 1, 1,
1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 1, 1, 0, 1, 1,
1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 1, 1, 0, 0, 0,
1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 0, 0, 0, 1, 1, 1, 1, 1, 0,
0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1,
1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 1, 1, 0, 1, 1,
1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1,
1, 1, 0, 0, 0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 1, 0,
0, 1, 1, 0, 0, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 1, 1, 0, 0, 1, 1, 1, 1, 0, 0, 1, 1, 1, 1, 1, 0, 1, 1, 0,
0, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 0, 1, 1, 1, 0, 0, 1, 0, 1, 0, 1, 0,
1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0,
0, 1, 1, 0, 0, 0, 1, 0, 1, 1, 1, 0, 0, 0, 1, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 1, 1, 0, 0, 1, 1,
};
static u8 sPetalClearPixelTableSecondPass[] = {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
};
static DamageTable sDamageTable = {
/* Deku Nut */ DMG_ENTRY(0, 0xF),
/* Deku Stick */ DMG_ENTRY(0, 0xF),
/* Horse trample */ DMG_ENTRY(0, 0x0),
@ -80,65 +178,786 @@ static DamageTable D_80A1939C = {
/* Powder Keg */ DMG_ENTRY(0, 0xF),
};
#endif
/**
* Sets the `index`th pixel of the trap teeth texture to 0 (transparent black)
* according to the `clearPixelTable`. Only works if the texture uses 16-bit pixels.
*/
void EnRaf_ClearPixelTeeth(u16* texture, u8* clearPixelTable, s32 index) {
if ((index < (8 * 8)) && (clearPixelTable[index] != 0)) {
texture[index] = 0;
}
}
extern ColliderCylinderInit D_80A18EE0;
extern DamageTable D_80A1939C;
/**
* Sets the `index`th pixel of the trap petal texture to 0 (transparent black)
* according to the `clearPixelTable`. Only works if the texture uses 16-bit pixels.
*/
void EnRaf_ClearPixelPetal(u16* texture, u8* clearPixelTable, s32 index) {
if (clearPixelTable[index] != 0) {
texture[index] = 0;
}
}
extern UNK_TYPE D_06000108;
extern UNK_TYPE D_060024E0;
extern UNK_TYPE D_060032F8;
void EnRaf_Init(Actor* thisx, GlobalContext* globalCtx) {
EnRaf* this = THIS;
Vec3f limbScale = { 1.0f, 1.0f, 1.0f };
s32 pad;
s32 i;
CollisionHeader* colHeader = NULL;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A16D40.s")
DynaPolyActor_Init(&this->dyna, 0);
CollisionHeader_GetVirtual(&gCarnivorousLilyPadCol, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
Collider_InitAndSetCylinder(globalCtx, &this->collider, &this->dyna.actor, &sCylinderInit);
this->dyna.actor.targetMode = 3;
this->dyna.actor.colChkInfo.mass = MASS_IMMOVABLE;
SkelAnime_InitFlex(globalCtx, &this->skelAnime, &gCarnivorousLilyPadSkel, &gCarnivorousLilyPadSpitAnim,
this->jointTable, this->morphTable, CARNIVOROUS_LILY_PAD_LIMB_MAX);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A16D6C.s")
for (i = 0; i < ARRAY_COUNT(this->limbScale); i++) {
Math_Vec3f_Copy(&this->targetLimbScale[i], &limbScale);
Math_Vec3f_Copy(&this->limbScale[i], &limbScale);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/EnRaf_Init.s")
this->dyna.actor.colChkInfo.damageTable = &sDamageTable;
this->dyna.actor.colChkInfo.health = BREG(1) + 2;
this->mainType = EN_RAF_GET_TYPE(&this->dyna.actor);
this->reviveTimer = EN_RAF_GET_REVIVE_TIMER(&this->dyna.actor);
this->switchFlag = EN_RAF_GET_SWITCH_FLAG(&this->dyna.actor);
if (this->switchFlag == 0x7F) {
this->switchFlag = -1;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/EnRaf_Destroy.s")
if (this->reviveTimer == 31) {
this->reviveTimer = -1;
} else {
this->reviveTimer = 30;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17060.s")
if (((this->switchFlag >= 0) || (this->mainType == EN_RAF_TYPE_DORMANT) ||
(gSaveContext.save.weekEventReg[12] & 1)) &&
((Flags_GetSwitch(globalCtx, this->switchFlag)) || (this->mainType == EN_RAF_TYPE_DORMANT))) {
s32 i;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A1712C.s")
for (i = CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT; i <= CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT;
i++) {
Math_Vec3f_Copy(&this->limbScale[i], &gZeroVec3f);
Math_Vec3f_Copy(&this->targetLimbScale[i], &gZeroVec3f);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A171D8.s")
EnRaf_SetupDormant(this);
} else {
this->bobPhase = Rand_ZeroFloat(1.0f) * 20000.0f;
Actor_SetScale(&this->dyna.actor, 0.01f);
EnRaf_SetupIdle(this);
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17414.s")
void EnRaf_Destroy(Actor* thisx, GlobalContext* globalCtx) {
EnRaf* this = THIS;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17464.s")
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
Collider_DestroyCylinder(globalCtx, &this->collider);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17530.s")
void EnRaf_ChangeAnimation(EnRaf* this, s32 index) {
static AnimationHeader* sAnimations[] = {
&gCarnivorousLilyPadSpitAnim, &gCarnivorousLilyPadCloseAnim, &gCarnivorousLilyPadChewAnim,
&gCarnivorousLilyPadSpitAnim, &gCarnivorousLilyPadConvulseAnim, &gCarnivorousLilyPadDeathAnim,
};
static u8 sAnimationModes[] = {
ANIMMODE_ONCE, ANIMMODE_ONCE, ANIMMODE_LOOP, ANIMMODE_ONCE, ANIMMODE_LOOP, ANIMMODE_ONCE,
};
f32 startFrame = 0.0f;
f32 playSpeed = 1.0f;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A175E4.s")
this->endFrame = Animation_GetLastFrame(sAnimations[index]);
if (index == EN_RAF_ANIMATION_IDLE) {
startFrame = this->endFrame;
} else if (index == EN_RAF_ANIMATION_CLOSE) {
playSpeed = 2.0f;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17848.s")
Animation_Change(&this->skelAnime, sAnimations[index], playSpeed, startFrame, this->endFrame,
sAnimationModes[index], -4.0f);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A178A0.s")
void EnRaf_SetupIdle(EnRaf* this) {
Vec3f targetLimbScale = { 1.0f, 1.0f, 1.0f };
s32 i;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A179C8.s")
EnRaf_ChangeAnimation(this, EN_RAF_ANIMATION_IDLE);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17C6C.s")
for (i = CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT; i <= CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT; i++) {
Math_Vec3f_Copy(&this->targetLimbScale[i], &targetLimbScale);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17D14.s")
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_IDLE_OR_THROW;
this->action = EN_RAF_ACTION_IDLE;
this->actionFunc = EnRaf_Idle;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17D54.s")
/**
* Sits around waiting for the player or an explosive to get near in order to grab them.
*/
void EnRaf_Idle(EnRaf* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
Actor* explosive;
f32 xDiff;
f32 yDiff;
f32 zDiff;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17DDC.s")
if (this->timer == 0) {
if ((player->transformation != PLAYER_FORM_DEKU) &&
(this->dyna.actor.xzDistToPlayer < (BREG(48) + 80.0f) && (player->invincibilityTimer == 0) &&
DynaPolyActor_IsInRidingMovingState(&this->dyna) && !(player->stateFlags1 & 0x8000000) &&
globalCtx->grabPlayer(globalCtx, player))) {
player->actor.parent = &this->dyna.actor;
this->grabTarget = EN_RAF_GRAB_TARGET_PLAYER;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A17E1C.s")
if (player->transformation == PLAYER_FORM_GORON) {
this->grabTarget = EN_RAF_GRAB_TARGET_GORON_PLAYER;
} else {
player->unk_AE8 = 50;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A18080.s")
this->playerRotYWhenGrabbed = player->actor.world.rot.y;
EnRaf_SetupGrab(this);
return;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A180B4.s")
if ((globalCtx->gameplayFrames % 2) == 0) {
return;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/EnRaf_Update.s")
explosive = globalCtx->actorCtx.actorLists[ACTORCAT_EXPLOSIVES].first;
while (explosive != NULL) {
// This check is pointless, since EnRaf is never in the explosive category.
if ((EnRaf*)explosive == this) {
explosive = explosive->next;
continue;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A1859C.s")
xDiff = explosive->world.pos.x - this->dyna.actor.world.pos.x;
yDiff = explosive->world.pos.y - this->dyna.actor.world.pos.y;
zDiff = explosive->world.pos.z - this->dyna.actor.world.pos.z;
if ((fabsf(xDiff) < 80.0f) && (fabsf(yDiff) < 30.0f) && (fabsf(zDiff) < 80.0f) &&
(explosive->update != NULL) && (explosive->velocity.y != 0.0f)) {
Actor_MarkForDeath(explosive);
this->grabTarget = EN_RAF_GRAB_TARGET_EXPLOSIVE;
this->collider.dim.radius = 30;
this->collider.dim.height = 90;
this->collider.dim.yShift = -10;
EnRaf_SetupGrab(this);
return;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/EnRaf_Draw.s")
explosive = explosive->next;
}
}
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A18A90.s")
void EnRaf_SetupGrab(EnRaf* this) {
EnRaf_ChangeAnimation(this, EN_RAF_ANIMATION_CLOSE);
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_GRAB;
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_DRINK);
this->action = EN_RAF_ACTION_GRAB;
this->actionFunc = EnRaf_Grab;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A18B8C.s")
/**
* Grabs the player or explosive that entered its range.
*/
void EnRaf_Grab(EnRaf* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
f32 curFrame = this->skelAnime.curFrame;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/ovl_En_Raf/func_80A18DA0.s")
if ((this->grabTarget != EN_RAF_GRAB_TARGET_EXPLOSIVE) && (player->stateFlags2 & 0x80) &&
(&this->dyna.actor == player->actor.parent)) {
Math_ApproachF(&player->actor.world.pos.x, this->dyna.actor.world.pos.x, 0.3f, 10.0f);
Math_ApproachF(&player->actor.world.pos.y, this->dyna.actor.world.pos.y, 0.3f, 10.0f);
Math_ApproachF(&player->actor.world.pos.z, this->dyna.actor.world.pos.z, 0.3f, 10.0f);
}
if (this->endFrame <= curFrame) {
EnRaf_SetupChew(this);
}
}
void EnRaf_SetupChew(EnRaf* this) {
s32 i;
EnRaf_ChangeAnimation(this, EN_RAF_ANIMATION_CHEW);
this->chewCount = 0;
for (i = 0; i < ARRAY_COUNT(this->chewLimbRot); i++) {
this->chewLimbRot[i].x = Rand_S16Offset(8, 8) << 8;
this->chewLimbRot[i].y = Rand_S16Offset(8, 8) << 8;
this->chewLimbRot[i].z = Rand_S16Offset(8, 8) << 8;
}
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_CHEW;
this->action = EN_RAF_ACTION_CHEW;
this->actionFunc = EnRaf_Chew;
}
/**
* Chews the player or explosive that was grabbed. If it grabbed a non-Goron player, it will deal
* damage to them and eventually throw them. If it grabbed a Goron player or explosive, it will
* instead explode after chewing them a bit.
*/
void EnRaf_Chew(EnRaf* this, GlobalContext* globalCtx) {
f32 targetChewScale;
f32 curFrame;
Player* player = GET_PLAYER(globalCtx);
curFrame = this->skelAnime.curFrame;
targetChewScale = (BREG(51) / 100.0f) + 0.2f;
Math_ApproachF(&this->chewScale, targetChewScale, 0.2f, 0.03f);
if ((player->stateFlags2 & 0x80) && (this->grabTarget != EN_RAF_GRAB_TARGET_EXPLOSIVE) &&
(&this->dyna.actor == player->actor.parent)) {
Math_ApproachF(&player->actor.world.pos.x, this->dyna.actor.world.pos.x, 0.3f, 10.0f);
Math_ApproachF(&player->actor.world.pos.y, this->dyna.actor.world.pos.y, 0.3f, 10.0f);
Math_ApproachF(&player->actor.world.pos.z, this->dyna.actor.world.pos.z, 0.3f, 10.0f);
}
if (this->endFrame <= curFrame) {
if (BREG(52) == 0) {
this->chewCount++;
}
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_EAT);
switch (this->grabTarget) {
case EN_RAF_GRAB_TARGET_PLAYER:
globalCtx->damagePlayer(globalCtx, -2);
func_800B8E58((Player*)this, player->ageProperties->unk_92 + NA_SE_VO_LI_DAMAGE_S);
CollisionCheck_GreenBlood(globalCtx, NULL, &player->actor.world.pos);
if ((this->chewCount > (BREG(53) + 5)) || !(player->stateFlags2 & 0x80)) {
player->actor.freezeTimer = 10;
EnRaf_SetupThrow(this, globalCtx);
return;
}
break;
case EN_RAF_GRAB_TARGET_EXPLOSIVE:
Actor_ApplyDamage(&this->dyna.actor);
if (this->chewCount > (BREG(54) + 4)) {
EnRaf_Explode(this, globalCtx);
return;
}
break;
case EN_RAF_GRAB_TARGET_GORON_PLAYER:
if (this->chewCount > (BREG(54) + 4)) {
player->actor.parent = NULL;
player->unk_AE8 = 1000;
EnRaf_Explode(this, globalCtx);
}
break;
}
}
}
void EnRaf_SetupThrow(EnRaf* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
EnRaf_ChangeAnimation(this, EN_RAF_ANIMATION_SPIT);
player->actor.freezeTimer = 10;
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_IDLE_OR_THROW;
this->action = EN_RAF_ACTION_THROW;
this->actionFunc = EnRaf_Throw;
}
/**
* Spits out the grabbed player.
*/
void EnRaf_Throw(EnRaf* this, GlobalContext* globalCtx) {
Player* player = GET_PLAYER(globalCtx);
f32 curFrame = this->skelAnime.curFrame;
if (Animation_OnFrame(&this->skelAnime, 10.0f)) {
player->actor.freezeTimer = 0;
player->actor.parent = NULL;
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_THROW);
func_800B8D50(globalCtx, &this->dyna.actor, BREG(55) + 3.0f, this->playerRotYWhenGrabbed + 0x8000,
BREG(56) + 10.0f, 0);
} else if (curFrame < 10.0f) {
player->actor.freezeTimer = 10;
}
if (this->endFrame <= curFrame) {
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_IDLE_OR_THROW;
this->action = EN_RAF_ACTION_IDLE;
this->timer = 20;
this->actionFunc = EnRaf_Idle;
}
}
/**
* Creates an explosion effect/sound and spawns particles.
*/
void EnRaf_Explode(EnRaf* this, GlobalContext* globalCtx) {
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
Vec3f acceleration = { 0.0f, 0.0f, 0.0f };
Vec3f explosionPos;
s32 i;
s32 pad;
this->action = EN_RAF_ACTION_EXPLODE;
Math_Vec3f_Copy(&explosionPos, &this->dyna.actor.world.pos);
explosionPos.y += 10.0f;
Actor_Spawn(&globalCtx->actorCtx, globalCtx, ACTOR_EN_CLEAR_TAG, explosionPos.x, explosionPos.y, explosionPos.z, 0,
0, 0, CLEAR_TAG_SMALL_EXPLOSION);
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_IT_BOMB_EXPLOSION);
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_SUISEN_DEAD);
if (this->switchFlag >= 0) {
Flags_SetSwitch(globalCtx, this->switchFlag);
}
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_DEAD;
for (i = 0; i < BREG(57) + 30; i++) {
acceleration.x = (Rand_ZeroOne() - 0.5f) * 0.5f;
acceleration.y = -0.3f;
acceleration.z = (Rand_ZeroOne() - 0.5f) * 0.5f;
velocity.x = Rand_ZeroOne() - 0.5f;
velocity.y = Rand_ZeroOne() * 10.0f;
velocity.z = Rand_ZeroOne() - 0.5f;
EnRaf_InitializeParticle(this, &this->dyna.actor.world.pos, &velocity, &acceleration,
(Rand_ZeroFloat(1.0f) / 500.0f) + 0.002f, 90);
}
for (i = CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT; i <= CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT; i++) {
Math_Vec3f_Copy(&this->targetLimbScale[i], &gZeroVec3f);
}
this->timer = 5;
if (this->grabTarget == EN_RAF_GRAB_TARGET_EXPLOSIVE) {
func_800BC154(globalCtx, &globalCtx->actorCtx, &this->dyna.actor, 5);
this->dyna.actor.flags |= (ACTOR_FLAG_1 | ACTOR_FLAG_4);
}
this->actionFunc = EnRaf_PostDetonation;
}
/**
* Switches the lily pad to the "dead" state once the timer reaches 0.
*/
void EnRaf_PostDetonation(EnRaf* this, GlobalContext* globalCtx) {
if (this->timer == 0) {
this->collider.dim.radius = 50;
this->collider.dim.height = 10;
func_800BC154(globalCtx, &globalCtx->actorCtx, &this->dyna.actor, 6);
this->dyna.actor.flags &= ~(ACTOR_FLAG_1 | ACTOR_FLAG_4);
EnRaf_SetupDormant(this);
} else if (this->grabTarget == EN_RAF_GRAB_TARGET_EXPLOSIVE) {
this->collider.dim.radius = 80;
this->collider.dim.height = 50;
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
}
void EnRaf_SetupConvulse(EnRaf* this) {
EnRaf_ChangeAnimation(this, EN_RAF_ANIMATION_CONVULSE);
this->chewCount = 0;
this->action = EN_RAF_ACTION_CONVULSE;
this->actionFunc = EnRaf_Convulse;
}
/**
* Plays the convulsing animation and sets the lily pad's switch flag to prevent it from
* ever coming back to life. When the water in Woodfall Temple is purified, this function
* and EnRaf_Dissolve are jointly responsible for controlling the lily pad's death.
*/
void EnRaf_Convulse(EnRaf* this, GlobalContext* globalCtx) {
f32 curFrame = this->skelAnime.curFrame;
if (this->endFrame <= curFrame) {
this->chewCount++;
if (this->chewCount > (BREG(2) + 2)) {
if (this->switchFlag >= 0) {
Flags_SetSwitch(globalCtx, this->switchFlag);
}
EnRaf_SetupDissolve(this);
}
}
}
void EnRaf_SetupDissolve(EnRaf* this) {
EnRaf_ChangeAnimation(this, EN_RAF_ANIMATION_DEATH);
this->action = EN_RAF_ACTION_DISSOLVE;
this->dissolveTimer = 0;
this->actionFunc = EnRaf_Dissolve;
}
/**
* Makes the trap petals on the lily pad dissolve and switches the lily pad to the "dead" state.
* When the water in Woodfall Temple is purified, this function and EnRaf_Convulse are jointly
* responsible for controlling the lily pad's death.
*/
void EnRaf_Dissolve(EnRaf* this, GlobalContext* globalCtx) {
f32 curFrame = this->skelAnime.curFrame;
s32 i;
if (this->endFrame <= curFrame) {
this->dissolveTimer++;
if (this->dissolveTimer < (BREG(3) + 105)) {
for (i = 0; i < (BREG(4) + 5); i++) {
EnRaf_ClearPixelPetal(Lib_SegmentedToVirtual(&gCarnivorousLilyPadTrapPetalTex),
sPetalClearPixelTableFirstPass, this->petalClearPixelFirstPassIndex);
EnRaf_ClearPixelTeeth(Lib_SegmentedToVirtual(&gCarnivorousLilyPadTrapTeethTex),
sTeethClearPixelTableFirstPass, this->teethClearPixelFirstPassIndex);
if (this->petalClearPixelFirstPassIndex < (16 * 32)) {
this->petalClearPixelFirstPassIndex++;
}
if (this->teethClearPixelFirstPassIndex < (8 * 8)) {
this->teethClearPixelFirstPassIndex++;
}
}
}
}
if (this->dissolveTimer > (BREG(5) + 50)) {
for (i = 0; i < (BREG(6) + 5); i++) {
EnRaf_ClearPixelPetal(Lib_SegmentedToVirtual(&gCarnivorousLilyPadTrapPetalTex),
sPetalClearPixelTableSecondPass, this->petalClearPixelSecondPassIndex);
EnRaf_ClearPixelTeeth(Lib_SegmentedToVirtual(&gCarnivorousLilyPadTrapTeethTex),
sTeethClearPixelTableSecondPass, this->teethClearPixelSecondPassIndex);
if (this->petalClearPixelSecondPassIndex < (16 * 32)) {
this->petalClearPixelSecondPassIndex++;
}
if (this->teethClearPixelSecondPassIndex < (8 * 8)) {
this->teethClearPixelSecondPassIndex++;
}
}
}
if (this->dissolveTimer > (BREG(7) + 160)) {
for (i = CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT; i <= CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT;
i++) {
Math_Vec3f_Copy(&this->limbScale[i], &gZeroVec3f);
Math_Vec3f_Copy(&this->targetLimbScale[i], &gZeroVec3f);
}
EnRaf_SetupDormant(this);
}
}
void EnRaf_SetupDormant(EnRaf* this) {
if (this->action == EN_RAF_ACTION_EXPLODE) {
this->timer = 90;
} else {
this->action = EN_RAF_ACTION_DORMANT;
}
this->actionFunc = EnRaf_Dormant;
}
/**
* Simply sits around doing nothing. If the revive timer is non-zero, then this function
* will decrement the revive timer and revive the trap petals once it reaches 0.
*/
void EnRaf_Dormant(EnRaf* this, GlobalContext* globalCtx) {
Vec3f targetLimbScale = { 1.0f, 1.0f, 1.0f };
s32 i;
if (this->timer == 0) {
this->action = EN_RAF_ACTION_DORMANT;
}
if (this->reviveTimer >= 0) {
DECR(this->reviveTimer);
if (this->reviveTimer == 0) {
EnRaf_ChangeAnimation(this, EN_RAF_ANIMATION_SPIT);
for (i = CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_LOWER_SEGMENT;
i <= CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT; i++) {
Math_Vec3f_Copy(&this->targetLimbScale[i], &targetLimbScale);
}
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_IDLE_OR_THROW;
this->action = EN_RAF_ACTION_IDLE;
this->reviveTimer = EN_RAF_GET_REVIVE_TIMER(&this->dyna.actor);
this->reviveTimer += 30;
this->actionFunc = EnRaf_Idle;
}
}
}
void EnRaf_Update(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
EnRaf* this = THIS;
WaterBox* waterBox;
f32 ySurface;
Vec3f ripplePos;
s32 i;
SkelAnime_Update(&this->skelAnime);
DECR(this->rippleTimer);
DECR(this->timer);
this->actionFunc(this, globalCtx);
if ((this->action == EN_RAF_ACTION_IDLE) && (gSaveContext.save.weekEventReg[12] & 1)) {
this->petalScaleType = EN_RAF_PETAL_SCALE_TYPE_DEAD;
EnRaf_SetupConvulse(this);
return;
}
if (DynaPolyActor_IsInRidingMovingState(&this->dyna)) {
if ((this->heightDiffFromPlayer > -0.1f) && !this->isCurrentlyInRidingMovingState) {
this->heightDiffFromPlayer = -20.0f;
this->isCurrentlyInRidingMovingState = true;
Actor_PlaySfxAtPos(&this->dyna.actor, NA_SE_EN_COMMON_WATER_MID);
}
} else {
this->isCurrentlyInRidingMovingState = false;
}
this->bobPhase += 3000.0f;
this->bobOffset = 2.0f * Math_SinS(this->bobPhase);
if (this->mainType != EN_RAF_TYPE_NO_WATER_INTERACTIONS) {
ySurface = BREG(60) + (this->dyna.actor.world.pos.y - 60.0f);
if (WaterBox_GetSurface1(globalCtx, &globalCtx->colCtx, this->dyna.actor.world.pos.x,
this->dyna.actor.world.pos.z, &ySurface, &waterBox)) {
ySurface -= this->bobOffset + BREG(59);
Math_ApproachF(&this->dyna.actor.world.pos.y, this->heightDiffFromPlayer + ySurface, 0.5f, 40.0f);
if (this->rippleTimer == 0) {
this->rippleTimer = 30;
if (this->petalScaleType == EN_RAF_PETAL_SCALE_TYPE_CHEW) {
this->rippleTimer = 10;
}
Math_Vec3f_Copy(&ripplePos, &this->dyna.actor.world.pos);
ripplePos.y = ySurface;
EffectSsGRipple_Spawn(globalCtx, &ripplePos, 650, 3150, 0);
}
}
} else {
Math_ApproachF(&this->dyna.actor.world.pos.y,
(this->dyna.actor.home.pos.y + this->heightDiffFromPlayer) - this->bobOffset, 0.5f, 40.0f);
}
Math_ApproachZeroF(&this->heightDiffFromPlayer, 0.3f, 2.0f);
if (this->action == EN_RAF_ACTION_EXPLODE) {
EnRaf_UpdateParticles(this, globalCtx);
}
for (i = 0; i < ARRAY_COUNT(this->limbScale); i++) {
if (this->action < EN_RAF_ACTION_EXPLODE) {
Math_ApproachF(&this->limbScale[i].x, this->targetLimbScale[i].x, 0.4f, 0.5f);
Math_ApproachF(&this->limbScale[i].y, this->targetLimbScale[i].y, 0.4f, 0.5f);
Math_ApproachF(&this->limbScale[i].z, this->targetLimbScale[i].z, 0.4f, 0.5f);
} else {
Math_ApproachF(&this->limbScale[i].x, this->targetLimbScale[i].x, 1.0f, 1.0f);
Math_ApproachF(&this->limbScale[i].y, this->targetLimbScale[i].y, 1.0f, 1.0f);
Math_ApproachF(&this->limbScale[i].z, this->targetLimbScale[i].z, 1.0f, 1.0f);
}
}
Collider_UpdateCylinder(&this->dyna.actor, &this->collider);
if (this->action < EN_RAF_ACTION_EXPLODE) {
CollisionCheck_SetOC(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
}
}
static s16 sGrabAnimationCheckFrames[] = { 0, 4, 6 };
static Vec3f sMiddleSegmentTargetScaleDuringGrab[] = {
{ 1.0f, 1.0f, 1.0f },
{ 1.0f, 2.0f, 1.0f },
{ 0.0f, 1.5f, 0.7f },
};
static Vec3f sUpperSegmentTargetScaleDuringGrab[] = {
{ 1.0f, 1.0f, 1.0f },
{ 3.0f, 2.0f, 1.5f },
{ 1.5f, 1.2f, 0.8f },
};
static s16 sSpitAnimationCheckFrames[] = { 0, 7, 9, 13, 19 };
static Vec3f sMiddleSegmentTargetScaleDuringSpit[] = {
{ 1.0f, 1.5f, 0.7f }, { 1.0f, 2.0f, 1.5f }, { 1.0f, 2.0f, 0.5f }, { 1.0f, 2.0f, 0.5f }, { 1.0f, 1.0f, 1.0f },
};
static Vec3f sUpperSegmentTargetScaleDuringSpit[] = {
{ 1.5f, 1.5f, 1.7f }, { 1.5f, 1.5f, 1.3f }, { 3.0f, 1.0f, 0.5f }, { 1.0f, 1.0f, 0.5f }, { 1.0f, 1.0f, 1.0f },
};
void EnRaf_TransformLimbDraw(GlobalContext* globalCtx2, s32 limbIndex, Actor* thisx) {
GlobalContext* globalCtx = globalCtx2;
EnRaf* this = THIS;
s32 i;
switch (this->petalScaleType) {
case EN_RAF_PETAL_SCALE_TYPE_GRAB:
if ((limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_MIDDLE_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_MIDDLE_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_MIDDLE_SEGMENT)) {
for (i = 0; i < ARRAY_COUNT(sGrabAnimationCheckFrames); i++) {
if ((s16)this->skelAnime.curFrame == sGrabAnimationCheckFrames[i]) {
Math_Vec3f_Copy(&this->targetLimbScale[limbIndex], &sMiddleSegmentTargetScaleDuringGrab[i]);
}
}
}
if ((limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_UPPER_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_UPPER_SEGMENT)) {
for (i = 0; i < ARRAY_COUNT(sGrabAnimationCheckFrames); i++) {
if ((s16)this->skelAnime.curFrame == sGrabAnimationCheckFrames[i]) {
Math_Vec3f_Copy(&this->targetLimbScale[limbIndex], &sUpperSegmentTargetScaleDuringGrab[i]);
}
}
}
break;
case EN_RAF_PETAL_SCALE_TYPE_CHEW:
if ((limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_MIDDLE_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_MIDDLE_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_MIDDLE_SEGMENT)) {
Math_Vec3f_Copy(&this->targetLimbScale[limbIndex], &sMiddleSegmentTargetScaleDuringGrab[2]);
} else if ((limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_UPPER_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_UPPER_SEGMENT)) {
Math_Vec3f_Copy(&this->targetLimbScale[limbIndex], &sUpperSegmentTargetScaleDuringGrab[2]);
}
// These matrix operations make the trap petals look a bit more "wobbly" as it chews
// by stretching the limbs in various random directions.
if ((limbIndex > CARNIVOROUS_LILY_PAD_LIMB_FLOWER) && (limbIndex < CARNIVOROUS_LILY_PAD_LIMB_ROOTS)) {
Matrix_RotateY((this->chewLimbRot[limbIndex].y * globalCtx->gameplayFrames), MTXMODE_APPLY);
Matrix_InsertXRotation_s((this->chewLimbRot[limbIndex].x * globalCtx->gameplayFrames), MTXMODE_APPLY);
Matrix_InsertZRotation_s((this->chewLimbRot[limbIndex].z * globalCtx->gameplayFrames), MTXMODE_APPLY);
Matrix_Scale(this->chewScale + 1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
Matrix_InsertZRotation_s(-(this->chewLimbRot[limbIndex].z * globalCtx->gameplayFrames), MTXMODE_APPLY);
Matrix_InsertXRotation_s(-(this->chewLimbRot[limbIndex].x * globalCtx->gameplayFrames), MTXMODE_APPLY);
Matrix_RotateY(-(this->chewLimbRot[limbIndex].y * globalCtx->gameplayFrames), MTXMODE_APPLY);
}
break;
case EN_RAF_PETAL_SCALE_TYPE_IDLE_OR_THROW:
if ((limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_MIDDLE_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_MIDDLE_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_MIDDLE_SEGMENT)) {
for (i = 0; i < ARRAY_COUNT(sSpitAnimationCheckFrames); i++) {
if ((s16)this->skelAnime.curFrame == sSpitAnimationCheckFrames[i]) {
Math_Vec3f_Copy(&this->targetLimbScale[limbIndex], &sMiddleSegmentTargetScaleDuringSpit[i]);
}
}
}
if ((limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_1_UPPER_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_3_UPPER_SEGMENT) ||
(limbIndex == CARNIVOROUS_LILY_PAD_LIMB_TRAP_2_UPPER_SEGMENT)) {
for (i = 0; i < 4; i++) {
if ((s16)this->skelAnime.curFrame == sSpitAnimationCheckFrames[i]) {
Math_Vec3f_Copy(&this->targetLimbScale[limbIndex], &sUpperSegmentTargetScaleDuringSpit[i]);
}
}
}
break;
}
Matrix_Scale(this->limbScale[limbIndex].x, this->limbScale[limbIndex].y, this->limbScale[limbIndex].z,
MTXMODE_APPLY);
}
void EnRaf_Draw(Actor* thisx, GlobalContext* globalCtx) {
EnRaf* this = THIS;
func_8012C28C(globalCtx->state.gfxCtx);
func_8012C2DC(globalCtx->state.gfxCtx);
SkelAnime_DrawTransformFlexOpa(globalCtx, this->skelAnime.skeleton, this->skelAnime.jointTable,
this->skelAnime.dListCount, NULL, NULL, EnRaf_TransformLimbDraw, &this->dyna.actor);
if (this->action == EN_RAF_ACTION_EXPLODE) {
EnRaf_DrawParticles(this, globalCtx);
}
}
void EnRaf_InitializeParticle(EnRaf* this, Vec3f* position, Vec3f* velocity, Vec3f* acceleration, f32 scale,
s16 timer) {
s16 i;
EnRafParticle* particle = this->particles;
for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
if (!particle->isVisible) {
particle->isVisible = true;
particle->position = *position;
particle->velocity = *velocity;
particle->acceleration = *acceleration;
particle->scale = scale;
particle->timer = timer;
particle->rotation.x = randPlusMinusPoint5Scaled(30000.0f);
particle->rotation.y = randPlusMinusPoint5Scaled(30000.0f);
particle->rotation.z = randPlusMinusPoint5Scaled(30000.0f);
return;
}
}
}
void EnRaf_UpdateParticles(EnRaf* this, GlobalContext* globalCtx) {
s32 i;
EnRafParticle* particle = this->particles;
for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
if (particle->isVisible) {
particle->position.x += particle->velocity.x;
particle->position.y += particle->velocity.y;
particle->position.z += particle->velocity.z;
particle->rotation.x += 0xBB8;
particle->rotation.y += 0xBB8;
particle->rotation.z += 0xBB8;
particle->velocity.x += particle->acceleration.x;
particle->velocity.y += particle->acceleration.y;
particle->velocity.z += particle->acceleration.z;
if (this->mainType != EN_RAF_TYPE_NO_WATER_INTERACTIONS) {
if (particle->position.y < (this->dyna.actor.world.pos.y - 10.0f)) {
EffectSsGSplash_Spawn(globalCtx, &particle->position, NULL, NULL, 0, particle->scale * 200000.0f);
SoundSource_PlaySfxAtFixedWorldPos(globalCtx, &particle->position, 50, NA_SE_EV_BOMB_DROP_WATER);
particle->isVisible = false;
}
} else if (particle->position.y < (this->dyna.actor.world.pos.y - 10.0f)) {
Math_ApproachZeroF(&particle->scale, 0.2f, 0.001f);
if (particle->scale <= 0.0001f) {
particle->timer = 0;
}
}
if (particle->timer != 0) {
particle->timer--;
} else {
particle->isVisible = false;
}
}
}
}
void EnRaf_DrawParticles(EnRaf* this, GlobalContext* globalCtx) {
s16 i;
EnRafParticle* particle = this->particles;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
OPEN_DISPS(gfxCtx);
func_8012C28C(globalCtx->state.gfxCtx);
for (i = 0; i < ARRAY_COUNT(this->particles); i++, particle++) {
if (particle->isVisible) {
Matrix_InsertTranslation(particle->position.x, particle->position.y, particle->position.z, MTXMODE_NEW);
Matrix_Scale(particle->scale, particle->scale, particle->scale, MTXMODE_APPLY);
Matrix_InsertXRotation_s(particle->rotation.x, MTXMODE_APPLY);
Matrix_RotateY(particle->rotation.y, MTXMODE_APPLY);
Matrix_InsertZRotation_s(particle->rotation.z, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx), G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, gCarnivorousLilyPadParticleDL);
}
}
CLOSE_DISPS(gfxCtx);
}

56
src/overlays/actors/ovl_En_Raf/z_en_raf.h
View File

@ -2,16 +2,64 @@
#define Z_EN_RAF_H
#include "global.h"
#include "objects/object_raf/object_raf.h"
#define EN_RAF_GET_TYPE(thisx) (((thisx)->params >> 12) & 0xF)
#define EN_RAF_GET_REVIVE_TIMER(thisx) (((thisx)->params >> 7) & 0x1F)
#define EN_RAF_GET_SWITCH_FLAG(thisx) ((thisx)->params & 0x7F)
typedef enum {
/* 0 */ EN_RAF_TYPE_NORMAL,
/* 1 */ EN_RAF_TYPE_DORMANT, // Spawns without trap, so it can't eat bombs/player
/* 2 */ EN_RAF_TYPE_NO_WATER_INTERACTIONS // Won't produce ripples, and particles won't produce splashes
} EnRafType;
struct EnRaf;
typedef void (*EnRafActionFunc)(struct EnRaf*, GlobalContext*);
typedef struct {
/* 0x00 */ u8 isVisible;
/* 0x04 */ Vec3f position;
/* 0x10 */ Vec3f velocity;
/* 0x1C */ Vec3f acceleration;
/* 0x28 */ Vec3s rotation;
/* 0x30 */ f32 scale;
/* 0x34 */ s16 timer;
} EnRafParticle; // size = 0x38
typedef struct EnRaf {
/* 0x0000 */ Actor actor;
/* 0x0144 */ char unk_144[0xEC];
/* 0x0230 */ EnRafActionFunc actionFunc;
/* 0x0234 */ char unk_234[0x8B0];
/* 0x000 */ DynaPolyActor dyna;
/* 0x15C */ SkelAnime skelAnime;
/* 0x1A0 */ Vec3s jointTable[CARNIVOROUS_LILY_PAD_LIMB_MAX];
/* 0x1E8 */ Vec3s morphTable[CARNIVOROUS_LILY_PAD_LIMB_MAX];
/* 0x230 */ EnRafActionFunc actionFunc;
/* 0x234 */ Vec3f limbScale[CARNIVOROUS_LILY_PAD_LIMB_MAX];
/* 0x2C4 */ Vec3f targetLimbScale[CARNIVOROUS_LILY_PAD_LIMB_MAX];
/* 0x354 */ Vec3s chewLimbRot[CARNIVOROUS_LILY_PAD_LIMB_MAX];
/* 0x39C */ s16 grabTarget;
/* 0x39E */ u8 isCurrentlyInRidingMovingState;
/* 0x3A0 */ f32 endFrame;
/* 0x3A4 */ f32 chewScale;
/* 0x3A8 */ f32 bobOffset;
/* 0x3AC */ f32 heightDiffFromPlayer;
/* 0x3B0 */ f32 bobPhase;
/* 0x3B4 */ s16 timer;
/* 0x3B6 */ s16 dissolveTimer;
/* 0x3B8 */ s16 rippleTimer;
/* 0x3BA */ s16 reviveTimer;
/* 0x3BC */ s16 playerRotYWhenGrabbed;
/* 0x3BE */ s16 mainType;
/* 0x3C0 */ s16 switchFlag;
/* 0x3C2 */ s16 petalScaleType;
/* 0x3C4 */ s16 chewCount;
/* 0x3C6 */ s16 action;
/* 0x3C8 */ s16 petalClearPixelFirstPassIndex;
/* 0x3CA */ s16 teethClearPixelFirstPassIndex;
/* 0x3CC */ s16 petalClearPixelSecondPassIndex;
/* 0x3CE */ s16 teethClearPixelSecondPassIndex;
/* 0x3D0 */ ColliderCylinder collider;
/* 0x41C */ EnRafParticle particles[31];
} EnRaf; // size = 0xAE4
extern const ActorInit En_Raf_InitVars;

46
tools/disasm/functions.txt
View File

@ -9745,33 +9745,33 @@
0x80A15D04:("EnGo_OverrideLimbDraw",),
0x80A15E38:("EnGo_TransfromLimbDraw",),
0x80A15FEC:("func_80A15FEC",),
0x80A16D40:("func_80A16D40",),
0x80A16D6C:("func_80A16D6C",),
0x80A16D40:("EnRaf_ClearPixelTeeth",),
0x80A16D6C:("EnRaf_ClearPixelPetal",),
0x80A16D90:("EnRaf_Init",),
0x80A17018:("EnRaf_Destroy",),
0x80A17060:("func_80A17060",),
0x80A1712C:("func_80A1712C",),
0x80A171D8:("func_80A171D8",),
0x80A17414:("func_80A17414",),
0x80A17464:("func_80A17464",),
0x80A17530:("func_80A17530",),
0x80A175E4:("func_80A175E4",),
0x80A17848:("func_80A17848",),
0x80A178A0:("func_80A178A0",),
0x80A179C8:("func_80A179C8",),
0x80A17C6C:("func_80A17C6C",),
0x80A17D14:("func_80A17D14",),
0x80A17D54:("func_80A17D54",),
0x80A17DDC:("func_80A17DDC",),
0x80A17E1C:("func_80A17E1C",),
0x80A18080:("func_80A18080",),
0x80A180B4:("func_80A180B4",),
0x80A17060:("EnRaf_ChangeAnimation",),
0x80A1712C:("EnRaf_SetupIdle",),
0x80A171D8:("EnRaf_Idle",),
0x80A17414:("EnRaf_SetupGrab",),
0x80A17464:("EnRaf_Grab",),
0x80A17530:("EnRaf_SetupChew",),
0x80A175E4:("EnRaf_Chew",),
0x80A17848:("EnRaf_SetupThrow",),
0x80A178A0:("EnRaf_Throw",),
0x80A179C8:("EnRaf_Explode",),
0x80A17C6C:("EnRaf_PostDetonation",),
0x80A17D14:("EnRaf_SetupConvulse",),
0x80A17D54:("EnRaf_Convulse",),
0x80A17DDC:("EnRaf_SetupDissolve",),
0x80A17E1C:("EnRaf_Dissolve",),
0x80A18080:("EnRaf_SetupDormant",),
0x80A180B4:("EnRaf_Dormant",),
0x80A181B4:("EnRaf_Update",),
0x80A1859C:("func_80A1859C",),
0x80A1859C:("EnRaf_TransformLimbDraw",),
0x80A18A08:("EnRaf_Draw",),
0x80A18A90:("func_80A18A90",),
0x80A18B8C:("func_80A18B8C",),
0x80A18DA0:("func_80A18DA0",),
0x80A18A90:("EnRaf_InitializeParticle",),
0x80A18B8C:("EnRaf_UpdateParticles",),
0x80A18DA0:("EnRaf_DrawParticles",),
0x80A19740:("ObjFunen_Init",),
0x80A19778:("ObjFunen_Draw",),
0x80A19910:("ObjRaillift_UpdatePosition",),

14
tools/disasm/variables.txt
View File

@ -10887,10 +10887,10 @@
0x80A16818:("jtbl_80A16818","UNK_PTR","",0x4),
0x80A18EC0:("En_Raf_InitVars","UNK_TYPE1","",0x1),
0x80A18EE0:("D_80A18EE0","UNK_TYPE1","",0x1),
0x80A18F0C:("D_80A18F0C","UNK_TYPE1","",0x1),
0x80A18F4C:("D_80A18F4C","UNK_TYPE1","",0x1),
0x80A18F8C:("D_80A18F8C","UNK_TYPE1","",0x1),
0x80A1918C:("D_80A1918C","UNK_TYPE1","",0x1),
0x80A18F0C:("D_80A18F0C","u8","[0x40]",0x40),
0x80A18F4C:("D_80A18F4C","u8","[0x40]",0x40),
0x80A18F8C:("D_80A18F8C","u8","[0x200]",0x200),
0x80A1918C:("D_80A1918C","u8","[0x200]",0x200),
0x80A1939C:("D_80A1939C","UNK_TYPE1","",0x1),
0x80A193BC:("D_80A193BC","UNK_TYPE4","",0x4),
0x80A193C8:("D_80A193C8","UNK_TYPE1","",0x1),
@ -10900,10 +10900,8 @@
0x80A19400:("D_80A19400","UNK_TYPE4","",0x4),
0x80A1940C:("D_80A1940C","UNK_TYPE4","",0x4),
0x80A19418:("D_80A19418","UNK_TYPE2","",0x2),
0x80A19420:("D_80A19420","UNK_TYPE1","",0x1),
0x80A19438:("D_80A19438","UNK_TYPE1","",0x1),
0x80A19444:("D_80A19444","UNK_TYPE1","",0x1),
0x80A1945C:("D_80A1945C","UNK_TYPE1","",0x1),
0x80A19420:("D_80A19420","Vec3f","[3]",0x24),
0x80A19444:("D_80A19444","Vec3f","[3]",0x24),
0x80A19468:("D_80A19468","UNK_TYPE2","",0x2),
0x80A19474:("D_80A19474","UNK_TYPE1","",0x1),
0x80A194B0:("D_80A194B0","UNK_TYPE1","",0x1),

9
undefined_syms.txt
View File

@ -1441,15 +1441,6 @@ D_06004340 = 0x06004340;
D_06001A80 = 0x06001A80;
// ovl_En_Raf
D_06000108 = 0x06000108;
D_06000A64 = 0x06000A64;
D_060024E0 = 0x060024E0;
D_06002EF8 = 0x06002EF8;
D_060032F8 = 0x060032F8;
D_06003428 = 0x06003428;
// ovl_En_Rat
D_06000174 = 0x06000174;