mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-24 16:01:26 +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

30
src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.c
View file

@ -4,35 +4,27 @@
* Description: Stops blocks and sets relevant flags when the block is in position.
*/
#include <ultra64.h>
#include <global.h>
#include <z64.h>
#include "z_obj_blockstop.h"
typedef struct {
/* 0x0000 */ Actor actor;
} ActorObjBlockstop; // size = 0x014C
#define ROOM 0x00
#define FLAGS 0x00000000
static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx);
static void Destroy(ActorObjBlockstop* this, GlobalContext* globalCtx);
static void Update(ActorObjBlockstop* this, GlobalContext* globalCtx);
void ObjBlockstop_Init(ObjBlockstop* this, GlobalContext* globalCtx);
void ObjBlockstop_Destroy(ObjBlockstop* this, GlobalContext* globalCtx);
void ObjBlockstop_Update(ObjBlockstop* this, GlobalContext* globalCtx);
const ActorInit Obj_Blockstop_InitVars = {
ACTOR_OBJ_BLOCKSTOP,
ACTORTYPE_PROP,
ROOM,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(ActorObjBlockstop),
(ActorFunc)Init,
(ActorFunc)Destroy,
(ActorFunc)Update,
sizeof(ObjBlockstop),
(ActorFunc)ObjBlockstop_Init,
(ActorFunc)ObjBlockstop_Destroy,
(ActorFunc)ObjBlockstop_Update,
NULL,
};
static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx) {
void ObjBlockstop_Init(ObjBlockstop* this, GlobalContext* globalCtx) {
if (Flags_GetSwitch(globalCtx, this->actor.params)) {
Actor_Kill(&this->actor);
} else {
@ -40,10 +32,10 @@ static void Init(ActorObjBlockstop* this, GlobalContext* globalCtx) {
}
}
static void Destroy(ActorObjBlockstop* this, GlobalContext* globalCtx) {
void ObjBlockstop_Destroy(ObjBlockstop* this, GlobalContext* globalCtx) {
}
static void Update(ActorObjBlockstop* this, GlobalContext* globalCtx) {
void ObjBlockstop_Update(ObjBlockstop* this, GlobalContext* globalCtx) {
DynaPolyActor* dynaActor;
s32 pad;
Vec3f sp4C;

13
src/overlays/actors/ovl_Obj_Blockstop/z_obj_blockstop.h Normal file
View file

@ -0,0 +1,13 @@
#ifndef _Z_OBJ_BLOCKSTOP_H_
#define _Z_OBJ_BLOCKSTOP_H_
#include <ultra64.h>
#include <global.h>
typedef struct {
/* 0x0000 */ Actor actor;
} ObjBlockstop; // size = 0x014C
extern const ActorInit ObjBlockstop_InitVars;
#endif