Finished

1 files changed, 28 insertions, 25 deletions

diff --git a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
index 6366df243..86eaa2f14 100644
--- a/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
+++ b/src/overlays/actors/ovl_Demo_Geff/z_demo_geff.c
@@ -11,18 +11,18 @@
 #define ROOM  0x00
 #define FLAGS 0x00000030
 
-void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx);
-void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx);
-void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx);
-void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx);
+static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx);
+static void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx);
+static void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx);
+static void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx);
 
-void DemoGeff_SetScale(DemoGeff* this, GlobalContext* globalCtx);
+static void DemoGeff_SetScale(DemoGeff* this, GlobalContext* globalCtx);
 
-void func_809783D4(DemoGeff* this, GlobalContext* globalCtx);
-void func_80978308(DemoGeff* this, GlobalContext* globalCtx);
+static void func_809783D4(DemoGeff* this, GlobalContext* globalCtx);
+static void func_80978308(DemoGeff* this, GlobalContext* globalCtx);
 
-void func_809784D4(DemoGeff* this, GlobalContext* globalCtx);
-void func_80978344(DemoGeff* this, GlobalContext* globalCtx);
+static void func_809784D4(DemoGeff* this, GlobalContext* globalCtx);
+static void func_80978344(DemoGeff* this, GlobalContext* globalCtx);
 
 s16 objectIds[] = { OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF, OBJECT_GEFF,
                     OBJECT_GEFF, OBJECT_GEFF, OBJECT_UNSET_0, };
@@ -49,11 +49,11 @@ const ActorInit Demo_Geff_InitVars =
 
 extern UNK_TYPE D_06000EA0;
 
-void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx) {
+static void DemoGeff_Destroy(DemoGeff* this, GlobalContext* globalCtx) {
 
 }
 
-void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) {
+static void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) {
     if (this->actor.params < 0 || this->actor.params >= 9) {
         osSyncPrintf(VT_FGCOL(RED) "Demo_Geff_Actor_ct:arg_dataがおかしい!!!!!!!!!!!!\n" VT_RST);
         Actor_Kill(&this->actor);
@@ -63,7 +63,7 @@ void DemoGeff_Init(DemoGeff* this, GlobalContext* globalCtx) {
     this->drawConfig = 0;
 }
 
-void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
+static void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
     s16 pad;
     Gfx* gfxArr[4];
@@ -79,8 +79,7 @@ void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
     func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 188);
 }
 
-#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Geff/func_80977F80.s")
-/*void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_80977F80(DemoGeff* this, GlobalContext* globalCtx) {
     s32 pad[2];
     s32 objBankIndex = this->objBankIndex;
     GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
@@ -92,10 +91,14 @@ void func_80977EA8(GlobalContext* globalCtx, u32 dlist) {
     gSPSegment(gfxCtx->polyOpa.p++, 0x06, globalCtx->objectCtx.status[objBankIndex].segment);
     gSegments[6] = PHYSICAL_TO_VIRTUAL(globalCtx->objectCtx.status[objBankIndex].segment);
 
+    if (!globalCtx) {
+
+    }
+
     func_800C6B54(gfxArr, gfxCtx, "../z_demo_geff.c", 212);
-}*/
+}
 
-void DemoGeff_SetScale(DemoGeff* this, GlobalContext* globalCtx) {
+static void DemoGeff_SetScale(DemoGeff* this, GlobalContext* globalCtx) {
     Vec3f* thisScale = &this->actor.scale;
     this->action = 1;
     this->drawConfig = 1;
@@ -123,7 +126,7 @@ void DemoGeff_SetScale(DemoGeff* this, GlobalContext* globalCtx) {
     }
 }
 
-void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) {
     s32 targetParams = 2;
     Actor* propIt;
 
@@ -146,7 +149,7 @@ void func_809781FC(DemoGeff* this, GlobalContext* globalCtx) {
     }
 }
 
-void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) {
     DemoGt* demoGt = this->demoGt;
     s16 params = this->actor.params;
     if (demoGt != NULL && (params != 6) && (params != 7) && (params != 8)) {
@@ -156,17 +159,17 @@ void func_809782A0(DemoGeff* this, GlobalContext* globalCtx) {
     }
 }
 
-void func_80978308(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_80978308(DemoGeff* this, GlobalContext* globalCtx) {
     func_809781FC(this, globalCtx);
     func_809782A0(this, globalCtx);
     DemoGeff_SetScale(this, globalCtx);
 }
 
-void func_80978344(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_80978344(DemoGeff* this, GlobalContext* globalCtx) {
     func_80977EA8(globalCtx, &D_06000EA0);
 }
 
-void func_80978370(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_80978370(DemoGeff* this, GlobalContext* globalCtx) {
     s16 params = this->actor.params;
     ActorFunc actorFunc = scaleFuncs[params];
     if (actorFunc == NULL) {
@@ -177,7 +180,7 @@ void func_80978370(DemoGeff* this, GlobalContext* globalCtx) {
     actorFunc(this, globalCtx);
 }
 
-void func_809783D4(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_809783D4(DemoGeff* this, GlobalContext* globalCtx) {
     ObjectContext* objCtx = &globalCtx->objectCtx;
     Actor* thisx = &this->actor;
     s32 params = thisx->params;
@@ -196,7 +199,7 @@ void func_809783D4(DemoGeff* this, GlobalContext* globalCtx) {
     }
 }
 
-void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx) {
+static void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx) {
     if (this->action < 0 || this->action >= 2 || actionFuncs[this->action] == NULL) {
         osSyncPrintf(VT_FGCOL(RED) "メインモードがおかしい!!!!!!!!!!!!!!!!!!!!!!!!!\n" VT_RST);
         return;
@@ -204,11 +207,11 @@ void DemoGeff_Update(DemoGeff* this, GlobalContext* globalCtx) {
     actionFuncs[this->action](this, globalCtx);
 }
 
-void func_809784D4(DemoGeff* this, GlobalContext* globalCtx) {
+static void func_809784D4(DemoGeff* this, GlobalContext* globalCtx) {
 
 }
 
-void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx) {
+static void DemoGeff_Draw(DemoGeff* this, GlobalContext* globalCtx) {
     s32 drawConfig = this->drawConfig;
     s16 pad;
     if (drawConfig < 0 || drawConfig >= 2 || drawFuncs[drawConfig] == NULL) {