mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-07-09 21:51:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Slowly Cleanup (#1213)

Browse Source 
* Add slowly.h

* Init and destroy

* File header
This commit is contained in:
Derek Hensley
2023-03-19 06:48:49 -07:00
committed by GitHub
parent 6ff77ab092
commit 03c8d46ed2
8 changed files with 76 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.h
+1 -4
View File
@@ -2684,10 +2684,7 @@ void func_8018450C(PlayState* play, SkeletonInfo* skeleton, Mtx* mtx, OverrideKe
// void func_801850A0(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6, UNK_TYPE4 param_7);
// void func_801853C8(UNK_TYPE1 param_1, UNK_TYPE1 param_2, UNK_TYPE1 param_3, UNK_TYPE1 param_4, UNK_TYPE4 param_5, UNK_TYPE4 param_6);
// void func_80185460(void);
//void Slowly_Main(SlowlyTask* slowly);
//void Slowly_ThreadEntry(SlowlyTask* slowly);
void Slowly_Start(SlowlyTask* slowly, void* stack, void (*callback)(), void* callbackArg0, void* callbackArg1);
void Slowly_Stop(SlowlyTask* slowly);
// void func_801857C0(void);
// char* func_801857D0(void);
// void func_80185864(void);
include/slowly.h
+31
View File
@@ -0,0 +1,31 @@
#ifndef SLOWLY_H
#define SLOWLY_H
#include "ultra64.h"
#define SLOWLY_STATUS_DONE (1 << 0)
#define SLOWLY_STATUS_STARTED (1 << 1)
typedef void (*SlowlyCallbackZero)(void);
typedef void (*SlowlyCallbackOne)(void*);
typedef void (*SlowlyCallbackTwo)(void*, void*);
typedef union {
SlowlyCallbackZero zero;
SlowlyCallbackOne one;
SlowlyCallbackTwo two;
} SlowlyCallback; // size = 0x4
typedef struct {
/* 0x000 */ OSThread thread;
/* 0x1B0 */ u8 argCount;
/* 0x1B1 */ u8 status;
/* 0x1B4 */ SlowlyCallback callback;
/* 0x1B8 */ void* arg0;
/* 0x1BC */ void* arg1;
} SlowlyMgr; // size = 0x1C0
void Slowly_Init(SlowlyMgr* slowly, void* stack, SlowlyCallbackTwo callback, void* arg0, void* arg1);
void Slowly_Destroy(SlowlyMgr* slowly);
#endif
include/z64.h
-19
View File
@@ -219,25 +219,6 @@ typedef struct {
/* 0x10 */ OSTime resetTime;
} NmiBuff; // size >= 0x18
typedef enum {
SLOWLY_CALLBACK_NO_ARGS,
SLOWLY_CALLBACK_ONE_ARG,
SLOWLY_CALLBACK_TWO_ARGS
} SlowlyCallbackArgCount;
typedef struct {
/* 0x000 */ OSThread thread;
/* 0x1B0 */ u8 callbackArgCount;
/* 0x1B1 */ u8 status;
/* 0x1B4 */ union {
void (*callback0)(void);
void (*callback1)(void*);
void (*callback2)(void*, void*);
};
/* 0x1B8 */ void* callbackArg0;
/* 0x1BC */ void* callbackArg1;
} SlowlyTask; // size = 0x1C0
typedef struct {
/* 0x00 */ int unk0;
/* 0x04 */ void* unk4;