mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 14:20:11 +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

40
src/overlays/actors/ovl_En_It/z_en_it.c
View file

@ -4,22 +4,13 @@
* Description: Dampe's Minigame digging spot hitboxes
*/
#include <ultra64.h>
#include <global.h>
#include <z64.h>
#include "z_en_it.h"
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 unk_14C;
/* 0x0150 */ ColliderCylinderMain cylinderCollider;
} ActorIt; // size = 0x019C
#define ROOM 0x00
#define FLAGS 0x00000000
static void Init(ActorIt* this, GlobalContext* globalCtx);
static void Destroy(ActorIt* this, GlobalContext* globalCtx);
static void Update(ActorIt* this, GlobalContext* globalCtx);
void EnIt_Init(EnIt* this, GlobalContext* globalCtx);
void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx);
void EnIt_Update(EnIt* this, GlobalContext* globalCtx);
static ColliderCylinderInit cylinderInitData = {
0x0A, 0x00, 0x00, 0x05, 0x10, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00000000, 0x00, 0x00,
@ -31,14 +22,19 @@ static u8 damageTblInitData[] = {
};
const ActorInit En_It_InitVars = {
ACTOR_EN_IT, ACTORTYPE_PROP, ROOM,
FLAGS, OBJECT_GAMEPLAY_KEEP, sizeof(ActorIt),
(ActorFunc)Init, (ActorFunc)Destroy, (ActorFunc)Update,
ACTOR_EN_IT,
ACTORTYPE_PROP,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(EnIt),
(ActorFunc)EnIt_Init,
(ActorFunc)EnIt_Destroy,
(ActorFunc)EnIt_Update,
(ActorFunc)NULL,
};
static void Init(ActorIt* this, GlobalContext* globalCtx) {
ActorIt* it = this;
void EnIt_Init(EnIt* this, GlobalContext* globalCtx) {
EnIt* it = this;
it->actor.params = 0x0D05;
ActorCollider_AllocCylinder(globalCtx, &it->cylinderCollider);
@ -46,15 +42,15 @@ static void Init(ActorIt* this, GlobalContext* globalCtx) {
func_80061EFC(&it->actor.sub_98.damageChart, 0, &damageTblInitData); // Init Damage Chart
}
static void Destroy(ActorIt* this, GlobalContext* globalCtx) {
ActorIt* it = this;
void EnIt_Destroy(EnIt* this, GlobalContext* globalCtx) {
EnIt* it = this;
ActorCollider_FreeCylinder(globalCtx, &it->cylinderCollider);
}
static void Update(ActorIt* this, GlobalContext* globalCtx) {
void EnIt_Update(EnIt* this, GlobalContext* globalCtx) {
s32 pad;
ActorIt* it = this;
EnIt* it = this;
ActorCollider_Cylinder_Update(&it->actor, &it->cylinderCollider);
Actor_CollisionCheck_SetOT(globalCtx, &globalCtx->sub_11E60, &it->cylinderCollider);

15
src/overlays/actors/ovl_En_It/z_en_it.h Normal file
View file

@ -0,0 +1,15 @@
#ifndef _Z_EN_IT_H_
#define _Z_EN_IT_H_
#include <ultra64.h>
#include <global.h>
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 unk_14C;
/* 0x0150 */ ColliderCylinderMain cylinderCollider;
} EnIt; // size = 0x019C
extern const ActorInit En_It_InitVars;
#endif