From d4e16bbacf2d729525618802686dc24572eeb10b Mon Sep 17 00:00:00 2001
From: petrie911 <69443847+petrie911@users.noreply.github.com>
Date: Thu, 10 Dec 2020 14:00:17 -0600
Subject: En_GeldB (#516)

* Darkmeiro decompilation

Bg_Gnd_Darkmeiro decompiled, matched, and documented.

* give this a shot

* fix conflict

* one more try

* could be useful

* whoops

* ZAP2 stuff

* ZAP why

* ZAP again

* woo watch out

* data and such

* stuff

* more decomp

* another match

* match and docs

* more docs

* little more cleanup

* SFX macros

* little more

* more attempts to match

* naming things

* I give up on the match

* also spec

* changes

* hex

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_En_GeldB/z_en_geldb.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
---
 src/code/z_actor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/code')

diff --git a/src/code/z_actor.c b/src/code/z_actor.c
index e10b67783..42c96d473 100644
--- a/src/code/z_actor.c
+++ b/src/code/z_actor.c
@@ -3236,7 +3236,7 @@ typedef struct {
     /* 0x210 */ s16 unk_210;
 } Actor_80033780;
 
-Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg2) {
+Actor* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg2) {
     Actor_80033780* itemActor;
     Vec3f spA8;
     f32 deltaX;
@@ -3266,7 +3266,7 @@ Actor_80033780* func_80033780(GlobalContext* globalCtx, Actor* refActor, f32 arg
 
                 if (func_80062ECC(refActor->colChkInfo.unk_10, refActor->colChkInfo.unk_12, 0.0f, &refActor->posRot.pos,
                                   &itemActor->actor.posRot.pos, &spA8, &sp90, &sp84)) {
-                    return itemActor;
+                    return &itemActor->actor;
                 } else {
                     actor = actor->next;
                 }
-- 
cgit v1.2.3