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

More actor cleanup Part 3 (#118)

Browse source 
* Add custom types for actor specific functions (like actions)

* Add a forward struct declaration for all other actors
This commit is contained in:
Roman971 2020-05-06 00:53:15 +02:00 • committed by GitHub
parent f114df8929
commit 1425678d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
477 changed files with 1817 additions and 792 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -60,18 +60,18 @@ static u32 D_80AF4118 = 0;
#include "z_en_ru2_cutscene_data.c"
static ActorFunc D_80AF50BC[] = {
(ActorFunc)func_80AF2CB4, (ActorFunc)func_80AF2CD4, (ActorFunc)func_80AF2CF4, (ActorFunc)func_80AF2D2C,
(ActorFunc)func_80AF2D6C, (ActorFunc)func_80AF2DAC, (ActorFunc)func_80AF2DEC, (ActorFunc)func_80AF3144,
(ActorFunc)func_80AF3174, (ActorFunc)func_80AF31C8, (ActorFunc)func_80AF3604, (ActorFunc)func_80AF3624,
(ActorFunc)func_80AF366C, (ActorFunc)func_80AF36AC, (ActorFunc)func_80AF3BC8, (ActorFunc)func_80AF3C04,
(ActorFunc)func_80AF3C64, (ActorFunc)func_80AF3CB8, (ActorFunc)func_80AF3D0C, (ActorFunc)func_80AF3D60,
static EnRu2ActionFunc D_80AF50BC[] = {
func_80AF2CB4, func_80AF2CD4, func_80AF2CF4, func_80AF2D2C,
func_80AF2D6C, func_80AF2DAC, func_80AF2DEC, func_80AF3144,
func_80AF3174, func_80AF31C8, func_80AF3604, func_80AF3624,
func_80AF366C, func_80AF36AC, func_80AF3BC8, func_80AF3C04,
func_80AF3C64, func_80AF3CB8, func_80AF3D0C, func_80AF3D60,
};
static ActorFunc D_80AF510C[] = {
(ActorFunc)func_80AF3F14,
(ActorFunc)func_80AF3F20,
(ActorFunc)func_80AF321C,
static EnRu2DrawFunc D_80AF510C[] = {
func_80AF3F14,
func_80AF3F20,
func_80AF321C,
};
const ActorInit En_Ru2_InitVars = {

7
src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View file

@ -4,7 +4,12 @@
#include <ultra64.h>
#include <global.h>
typedef struct {
struct EnRu2;
typedef void (*EnRu2ActionFunc)(struct EnRu2*, GlobalContext*);
typedef void (*EnRu2DrawFunc)(struct EnRu2*, GlobalContext*);
typedef struct EnRu2 {
/* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ Vec3s limbDrawTable[23];