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

Match even more retail actors (#1720)

Browse source 
* Match even more actors

* Add macro for DebugDisplay_AddObject

* Prefer OOT_DEBUG &&

* Better EnReeba_Stunned match

* Revert "Add macro for DebugDisplay_AddObject"

This reverts commit 8197823abb.

* Prefer OOT_DEBUG && some more

* Reformatting

* Add fake match comment
This commit is contained in:
cadmic 2024-02-13 06:10:28 -08:00 • committed by GitHub
parent 1ba2d6d0f9
commit b32d0a91ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
26 changed files with 217 additions and 179 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/overlays/actors/ovl_En_Wood02/z_en_wood02.c
View file

@ -306,18 +306,13 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
PlayState* play = play2;
EnWood02* this = (EnWood02*)thisx;
f32 wobbleAmplitude;
u8 new_var;
u8 phi_v0;
s32 pad;
Vec3f dropsSpawnPt;
s32 i;
s32 leavesParams;
// Despawn extra trees in a group if out of range
if ((this->spawnType == WOOD_SPAWN_SPAWNED) && (this->actor.parent != NULL)) {
if (!(this->actor.flags & ACTOR_FLAG_6)) {
new_var = this->unk_14E[0];
phi_v0 = 0;
u8 new_var = this->unk_14E[0];
u8 phi_v0 = 0;
s32 pad;
if (this->unk_14C < 0) {
phi_v0 = 0x80;
@ -338,7 +333,8 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
}
if (this->actor.home.rot.y != 0) {
dropsSpawnPt = this->actor.world.pos;
Vec3f dropsSpawnPt = this->actor.world.pos;
dropsSpawnPt.y += 200.0f;
if ((this->unk_14C >= 0) && (this->unk_14C < 0x64)) {
@ -355,7 +351,8 @@ void EnWood02_Update(Actor* thisx, PlayState* play2) {
// Spawn falling leaves
if (this->unk_14C >= -1) {
leavesParams = WOOD_LEAF_GREEN;
s32 i;
s32 leavesParams = WOOD_LEAF_GREEN;
if ((this->actor.params == WOOD_TREE_OVAL_YELLOW_SPAWNER) ||
(this->actor.params == WOOD_TREE_OVAL_YELLOW_SPAWNED)) {