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

Big actor cleanup (fixed) (#69)

Browse source 
* Started doing cleanup

* did more work

* did more migration

* migrated more rodata and worked on some structs

* did more work

* Removal of ROOM field from initvars, some rodata migration, some string decompilation

* General update

* Decompiled vt strings

* Tool work

* Tool improvements

* 270 overlay rodata files remaining

* better float handling

* floats

* Many more floats

* migrated boss_mo

* assorted fixes

* Migrated 10

* tool improvements

* migrated 10

* 10 more

* 1 more

* did a few more

* fixes

* 10 more

* more floats

* Did some more, updated migrate-rodata.py to 'modify' the C file after processing in order to make to compiler process it as if it was changed.

* removed changes made to script by accident

* migrated largest rodata - ovl_fishing

* Did some more

* 114 remaining

* 99 left !

* almost done migrating rodata

* did some more, done for tonight

* almost done, tried add support to the script for z_player

* All possible rodata migrated in actor overlays

* update

* removed static from all overlays, ran format.sh

* Removed unknown actor structs

* converted a few floats

* Added new lines to header files that were missing them. Removed unused asm files

* Removed unused asm files

* Formatting newlines

Further formatting

spacing

.float spacing

More space formatting

More spacing formatting

Removing .balign 4 after floats

Co-authored-by: Ethan Roseman <ethteck@gmail.com>
This commit is contained in:
Lucas Shaw 2020-04-14 11:16:34 -07:00 • committed by GitHub
parent 5aef81071e
commit 045a92d7c3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10327 changed files with 33390 additions and 45661 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/overlays/actors/ovl_En_OE2/z_en_oe2.c
View file

@ -4,49 +4,45 @@
* Description: Blue Navi Target. Probably unused since NPC's are blue and they do not use this actor.
*/
#include <ultra64.h>
#include <global.h>
#include <z64.h>
#include "z_en_oe2.h"
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x44];
/* 0x0190 */ ActorFunc updateFunc;
} ActorEnOE2; // size = 0x0194
#define ROOM 0x00
#define FLAGS 0x00000009
static void func_80ABE6A0(ActorEnOE2* this, ActorFunc func);
static void Init(ActorEnOE2* this, GlobalContext* globalCtx);
static void Destroy(ActorEnOE2* this, GlobalContext* globalCtx);
static void func_80ABE6DC(ActorEnOE2* this, GlobalContext* globalCtx);
static void Update(ActorEnOE2* this, GlobalContext* globalCtx);
static void Draw(ActorEnOE2* this, GlobalContext* globalCtx);
void func_80ABE6A0(EnOE2* this, ActorFunc func);
void EnOE2_Init(EnOE2* this, GlobalContext* globalCtx);
void EnOE2_Destroy(EnOE2* this, GlobalContext* globalCtx);
void func_80ABE6DC(EnOE2* this, GlobalContext* globalCtx);
void EnOE2_Update(EnOE2* this, GlobalContext* globalCtx);
void EnOE2_Draw(EnOE2* this, GlobalContext* globalCtx);
const ActorInit En_OE2_InitVars = {
ACTOR_EN_OE2, ACTORTYPE_NPC, ROOM,
FLAGS, OBJECT_OE2, sizeof(ActorEnOE2),
(ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update,
(ActorFunc)Draw,
ACTOR_EN_OE2,
ACTORTYPE_NPC,
FLAGS,
OBJECT_OE2,
sizeof(EnOE2),
(ActorFunc)EnOE2_Init,
(ActorFunc)EnOE2_Destroy,
(ActorFunc)EnOE2_Update,
(ActorFunc)EnOE2_Draw,
};
static void func_80ABE6A0(ActorEnOE2* this, ActorFunc func) {
this->updateFunc = func;
void EnOE2_SetupAction(EnOE2* this, ActorFunc actionFunc) {
this->updateFunc = actionFunc;
}
static void Init(ActorEnOE2* this, GlobalContext* globalCtx) {
func_80ABE6A0(this, (ActorFunc)func_80ABE6DC);
void EnOE2_Init(EnOE2* this, GlobalContext* globalCtx) {
EnOE2_SetupAction(this, func_80ABE6DC);
}
static void Destroy(ActorEnOE2* this, GlobalContext* globalCtx) {
void EnOE2_Destroy(EnOE2* this, GlobalContext* globalCtx) {
}
static void func_80ABE6DC(ActorEnOE2* this, GlobalContext* globalCtx) {
void func_80ABE6DC(EnOE2* this, GlobalContext* globalCtx) {
}
static void Update(ActorEnOE2* this, GlobalContext* globalCtx) {
void EnOE2_Update(EnOE2* this, GlobalContext* globalCtx) {
}
static void Draw(ActorEnOE2* this, GlobalContext* globalCtx) {
void EnOE2_Draw(EnOE2* this, GlobalContext* globalCtx) {
}

14
src/overlays/actors/ovl_En_OE2/z_en_oe2.h Normal file
View file

@ -0,0 +1,14 @@
#ifndef _Z_EN_OE2_H_
#define _Z_EN_OE2_H_
#include <ultra64.h>
#include <global.h>
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x44];
/* 0x0190 */ ActorFunc updateFunc;
} EnOE2; // size = 0x0194
extern const ActorInit En_OE2_InitVars;
#endif