mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-23 07:21:19 +00:00
Code Issues Projects Releases Wiki Activity

Match entity actors O-T (#1826)

Browse source
This commit is contained in:
cadmic 2024-02-26 18:39:44 -08:00 • committed by GitHub
parent cdd24f2ac6
commit c86bf5011b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
23 changed files with 243 additions and 134 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/overlays/actors/ovl_En_Rr/z_en_rr.c
View file

@ -76,10 +76,12 @@ ActorInit En_Rr_InitVars = {
/**/ EnRr_Draw,
};
#if OOT_DEBUG
static char* sDropNames[] = {
// "type 7", "small magic jar", "arrow", "fairy", "20 rupees", "50 rupees"
"タイプ７ ", "魔法の壷小", "矢 ", "妖精 ", "20ルピー ", "50ルピー ",
};
#endif
static ColliderCylinderInitType1 sCylinderInit1 = {
{
@ -337,8 +339,8 @@ void EnRr_SetupDamage(EnRr* this) {
s32 i;
this->reachState = 0;
this->actionTimer = 20;
this->segMoveRate = 0.0f;
this->actionTimer = 20;
this->segPhaseVelTarget = 2500.0f;
this->pulseSizeTarget = 0.0f;
this->wobbleSizeTarget = 0.0f;