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

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

38
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
View file

@ -4,35 +4,25 @@
* Description: Hoppable horse fence
*/
#include <ultra64.h>
#include <global.h>
#include <z64.h>
#include "z_bg_umajump.h"
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 dynaPolyId;
/* 0x0150 */ char unk_150[0x14];
} ActorBgUmajump; // size = 0x0164
#define ROOM 0x00
#define FLAGS 0x00000000
static void Init(ActorBgUmajump* this, GlobalContext* globalCtx);
static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx);
static void Update(ActorBgUmajump* this, GlobalContext* globalCtx);
static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx);
void BgUmaJump_Init(BgUmaJump* this, GlobalContext* globalCtx);
void BgUmaJump_Destroy(BgUmaJump* this, GlobalContext* globalCtx);
void BgUmaJump_Update(BgUmaJump* this, GlobalContext* globalCtx);
void BgUmaJump_Draw(BgUmaJump* this, GlobalContext* globalCtx);
const ActorInit Bg_Umajump_InitVars = {
ACTOR_BG_UMAJUMP,
ACTORTYPE_PROP,
ROOM,
FLAGS,
OBJECT_UMAJUMP,
sizeof(ActorBgUmajump),
(ActorFunc)Init,
(ActorFunc)Destroy,
(ActorFunc)Update,
(ActorFunc)Draw,
sizeof(BgUmaJump),
(ActorFunc)BgUmaJump_Init,
(ActorFunc)BgUmaJump_Destroy,
(ActorFunc)BgUmaJump_Update,
(ActorFunc)BgUmaJump_Draw,
};
extern D_06001438; // segmented address: 0x06001438
@ -42,7 +32,7 @@ static InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) {
void BgUmaJump_Init(BgUmaJump* this, GlobalContext* globalCtx) {
s32 pad[2];
u32 sp24 = 0;
@ -60,13 +50,13 @@ static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) {
}
}
static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx) {
void BgUmaJump_Destroy(BgUmaJump* this, GlobalContext* globalCtx) {
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId);
}
static void Update(ActorBgUmajump* this, GlobalContext* globalCtx) {
void BgUmaJump_Update(BgUmaJump* this, GlobalContext* globalCtx) {
}
static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx) {
void BgUmaJump_Draw(BgUmaJump* this, GlobalContext* globalCtx) {
Gfx_DrawDListOpa(globalCtx, &D_06001220);
}

15
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.h Normal file
View file

@ -0,0 +1,15 @@
#ifndef _Z_BG_UMAJUMP_H_
#define _Z_BG_UMAJUMP_H_
#include <ultra64.h>
#include <global.h>
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 dynaPolyId;
/* 0x0150 */ char unk_150[0x14];
} BgUmaJump; // size = 0x0164
extern const ActorInit Bg_Uma_Jump_InitVars;
#endif