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

26
src/overlays/actors/ovl_En_Boom/z_en_boom.c
View file

@ -6,20 +6,18 @@
#include "z_en_boom.h"
#define ROOM 0x00
#define FLAGS 0x00000030
static void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc);
static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx);
static void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx);
static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx);
static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx);
static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx);
void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc);
void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx);
void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx);
void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx);
void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx);
void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx);
const ActorInit En_Boom_InitVars = {
ACTOR_EN_BOOM,
ACTORTYPE_MISC,
ROOM,
FLAGS,
OBJECT_GAMEPLAY_KEEP,
sizeof(EnBoom),
@ -87,11 +85,11 @@ static Vec3f mtxSrc2 = { 960.0f, 0.0f, 0.0f };
extern D_0400C808;
static void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc) {
void EnBoom_SetupAction(EnBoom* this, ActorFunc* actionFunc) {
this->actionFunc = actionFunc;
}
static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) {
void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) {
u32 pad;
TrailEffect trail;
@ -131,12 +129,12 @@ static void EnBoom_Init(EnBoom* this, GlobalContext* globalCtx) {
EnBoom_SetupAction(this, &EnBoom_Fly);
}
static void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx) {
void EnBoom_Destroy(EnBoom* this, GlobalContext* globalCtx) {
func_8002709C(globalCtx, this->effect);
func_8005D060(globalCtx, &this->collider);
}
static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) {
void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) {
Actor* target;
Player* player;
s32 collided;
@ -268,7 +266,7 @@ static void EnBoom_Fly(EnBoom* this, GlobalContext* globalCtx) {
}
}
static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) {
void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) {
Player* player = PLAYER;
if (!(player->stateFlags1 & 0x20000000)) {
this->actionFunc(this, globalCtx);
@ -277,7 +275,7 @@ static void EnBoom_Update(EnBoom* this, GlobalContext* globalCtx) {
}
}
static void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) {
void EnBoom_Draw(EnBoom* this, GlobalContext* globalCtx) {
s32 pad;
Vec3f mtxDest1;
Vec3f mtxDest2;