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

22
src/overlays/actors/ovl_En_Tana/z_en_tana.c
View file

@ -6,19 +6,17 @@
#include "z_en_tana.h"
#define ROOM 0x00
#define FLAGS 0x00000009
static void EnTana_Init(EnTana* this, GlobalContext* globalCtx);
static void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx);
static void EnTana_Update(EnTana* this, GlobalContext* globalCtx);
static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx);
static void func_80B1809C(EnTana* this, GlobalContext* globalCtx);
void EnTana_Init(EnTana* this, GlobalContext* globalCtx);
void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx);
void EnTana_Update(EnTana* this, GlobalContext* globalCtx);
void func_80B17FC4(EnTana* this, GlobalContext* globalCtx);
void func_80B1809C(EnTana* this, GlobalContext* globalCtx);
const ActorInit En_Tana_InitVars = {
ACTOR_EN_TANA,
ACTORTYPE_PROP,
ROOM,
FLAGS,
OBJECT_SHOP_DUNGEN,
sizeof(EnTana),
@ -51,7 +49,7 @@ static Gfx* dListTbl2[] = {
0x06001608,
};
static void EnTana_Init(EnTana* this, GlobalContext* globalCtx) {
void EnTana_Init(EnTana* this, GlobalContext* globalCtx) {
Actor* thisx = &this->actor;
osSyncPrintf("☆☆☆ %s ☆☆☆\n", shelfTypes[thisx->params]);
Actor_SetScale(thisx, 1.0f);
@ -59,13 +57,13 @@ static void EnTana_Init(EnTana* this, GlobalContext* globalCtx) {
thisx->draw = drawFuncs[thisx->params];
}
static void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx) {
void EnTana_Destroy(EnTana* this, GlobalContext* globalCtx) {
}
static void EnTana_Update(EnTana* this, GlobalContext* globalCtx) {
void EnTana_Update(EnTana* this, GlobalContext* globalCtx) {
}
static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) {
void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) {
Actor* thisx = &this->actor;
GraphicsContext* gfxCtx;
@ -80,7 +78,7 @@ static void func_80B17FC4(EnTana* this, GlobalContext* globalCtx) {
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_en_tana.c", 157);
}
static void func_80B1809C(EnTana* this, GlobalContext* globalCtx) {
void func_80B1809C(EnTana* this, GlobalContext* globalCtx) {
Actor* thisx = &this->actor;
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];