mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-09 00:00:44 +00:00
Code Issues Projects Releases Wiki Activity

Decompiled A LOT of objects (#815)

Browse source 
* .

* remove tools/ZAP2 from origin master

* object_spot04_objects

* remove accidentally added xml

* object_spot00_objects

* object_bombf ok

* object_dy_obj

* object_masterzoora

* object_mastergolon and object_masterkokirihead

* object_aob

* object_gt

* object_gt

* object_geff

* object_mag kinda

* object_gjyo_objects OK

* object_ani OK

* object_door_gerudo

* object_md and object_trap

* object_js OK

* object_goroiwa

* object_gs

* object_nwc

* object_niw

* object_ane

* object_os_anime OK

* object_d_hsblock OK

* object_fz OK

* object_ru2 OK

* fixed object_mag

* object_cow OK

* object_spot01_objects OK

* object_spot15_obj

* object_umajump OK

* object_spot18_obj

* object_spot12_obj

* fix symbols in z_item_b_heart

* object_bdan_objects & object_bowl

* object_ddan_objects

* object_owl OK

* object_spot01_matoyab.xml OK

* object_haka OK

* object_heavy_object

* object_ingate and objet_menkuri_objects

* objet_spot00_break & object_relay_objects OK

* object_spot01_matoya OK

* object_spot06_objects OK

* undefined_syms

* object_spot08_obj OK

* object_efc_doughnut & object_zg

* object_ik OK

* object_vm

* object_ei OK

* object_ds OK

* updated spec

* map_48x85_static OK

* object_zl1 & object_peehat ok

* some z_parameter naming and other undefined symbol stuff, object_yukabyun OK

* object_bubble & object_fw ok

* object_shopnuts

* restore delete file

* object_timeblock OK

* object_d_lift OK

* object_kibako2 OK

* object_mamenoki OK

* matches

* remove unused asm

* object_mag ok now

* fixed object_ani

* done for now, im tired

* object_bdan_objects fixed up

* fix bdan

* object_bombf fixed

* object_bowl fixed up

* object_cow fixed

* did more, im tired

* fixed some stuff in object_ddan_objects

* fix object_ddan_object

* object_door_gerudo fixed

* object_ds fix

* object_dy progress

* fixed great fairy

* some more

* more

* object_haka fix

* progress

* ingo_gate fixed

* object_js

* forgot collision

* object_relay_objects fixed

* object_kibako2

* object_mag fixed

* u64* to void*

* more u64* to void*

* object_mamenoki fix

* object_mastergolon & object_masterkokirihead fix

* mido is weird

* fixed build

* fix object_menkuri_objects

* add missing textures in object_menkuri_objects

* object_ms

* fixed object_peehat

* some cleanup stuff

* object_zg fix

* object_spot00_break fix

* object_niw fix

* object_nwc fixed

* object_ru2 object_rr and some of object_owl fix

* object_spot15_obj fix

* business scrub

* object_spot01_matoya fixed

* object_spot18_obj fix

* object_spot01_objects fix

* object_spot04_objects fix

* object_spot04_objects actually fixed

* object_spot12_obj fix

* object_timeblock fix

* object_spot06_objects fixed

* object_spot08_obj fix

* spot01_matoyab fix

* object_trap fix

* object_umajump fix

* object_vm fix

* z_en_niw_lady fix

* object_yukabyun fix

* object_zl1 fixed

* added offsets to object_os_anime

* object_md fix

* object_ane fix

* object_aob fix

* add palette comment

* object_spot00_objects fix

* spot00 fix

* remove unused asm

* updates

* Add TlutOffset to objects added in https://github.com/zeldaret/oot/pull/815

* Updated object_bdan_objects, ran format.sh

* Change rgb5a1 to rgba16 in my object xmls

* Addressed Anghelo's comments

* review

Co-authored-by: Lucas Shaw <lucas.shaw1123@gmail.com>
Co-authored-by: Dragorn421 <Dragorn421@users.noreply.github.com>
Co-authored-by: Fig02 <fig02srl@gmail.com>
This commit is contained in:
Lucas Shaw 2021-08-05 08:53:58 -07:00 • committed by GitHub
parent bb4babbe15
commit 0f644b7545
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
162 changed files with 2973 additions and 1386 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.c
View file

@ -5,46 +5,44 @@
*/
#include "z_bg_ingate.h"
#include "objects/object_ingate/object_ingate.h"
#define FLAGS 0x00000000
#define THIS ((BgIngate*)thisx)
#define THIS ((BgInGate*)thisx)
void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx);
void BgIngate_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgIngate_Update(Actor* thisx, GlobalContext* globalCtx);
void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx);
void BgInGate_Init(Actor* thisx, GlobalContext* globalCtx);
void BgInGate_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx);
void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx);
void func_80892890(BgIngate* this, GlobalContext* globalCtx);
void BgIngate_DoNothing(BgIngate* this, GlobalContext* globalCtx);
void func_80892890(BgInGate* this, GlobalContext* globalCtx);
void BgInGate_DoNothing(BgInGate* this, GlobalContext* globalCtx);
const ActorInit Bg_Ingate_InitVars = {
ACTOR_BG_INGATE,
ACTORCAT_PROP,
FLAGS,
OBJECT_INGATE,
sizeof(BgIngate),
(ActorFunc)BgIngate_Init,
(ActorFunc)BgIngate_Destroy,
(ActorFunc)BgIngate_Update,
(ActorFunc)BgIngate_Draw,
sizeof(BgInGate),
(ActorFunc)BgInGate_Init,
(ActorFunc)BgInGate_Destroy,
(ActorFunc)BgInGate_Update,
(ActorFunc)BgInGate_Draw,
};
extern CollisionHeader D_060011B8;
extern Gfx D_06001040[];
void BgIngate_SetupAction(BgIngate* this, BgIngateActionFunc actionFunc) {
void BgInGate_SetupAction(BgInGate* this, BgInGateActionFunc actionFunc) {
this->actionFunc = actionFunc;
}
void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx) {
BgIngate* this = THIS;
void BgInGate_Init(Actor* thisx, GlobalContext* globalCtx) {
BgInGate* this = THIS;
s32 pad;
CollisionHeader* colHeader = NULL;
DynaPolyActor_Init(&this->dyna, DPM_UNK);
CollisionHeader_GetVirtual(&D_060011B8, &colHeader);
CollisionHeader_GetVirtual(&gIngoGateCol, &colHeader);
this->dyna.bgId = DynaPoly_SetBgActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
@ -57,19 +55,19 @@ void BgIngate_Init(Actor* thisx, GlobalContext* globalCtx) {
Actor_SetScale(&this->dyna.actor, 0.1f);
if (((this->dyna.actor.params & 1) != 0) && ((gSaveContext.eventInf[0] & 0xF) == 6)) {
globalCtx->csCtx.frames = 0;
BgIngate_SetupAction(this, func_80892890);
BgInGate_SetupAction(this, func_80892890);
} else {
BgIngate_SetupAction(this, BgIngate_DoNothing);
BgInGate_SetupAction(this, BgInGate_DoNothing);
}
}
void BgIngate_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgIngate* this = THIS;
void BgInGate_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgInGate* this = THIS;
DynaPoly_DeleteBgActor(globalCtx, &globalCtx->colCtx.dyna, this->dyna.bgId);
}
void func_80892890(BgIngate* this, GlobalContext* globalCtx) {
void func_80892890(BgInGate* this, GlobalContext* globalCtx) {
s32 phi0;
s16 phi1;
s16 csFrames;
@ -80,7 +78,7 @@ void func_80892890(BgIngate* this, GlobalContext* globalCtx) {
phi0 = -0x4000;
}
this->dyna.actor.shape.rot.y = this->dyna.actor.world.rot.y + phi0;
BgIngate_SetupAction(this, &BgIngate_DoNothing);
BgInGate_SetupAction(this, &BgInGate_DoNothing);
} else if (globalCtx->csCtx.frames >= 10) {
csFrames = globalCtx->csCtx.frames - 10;
csFrames *= 400;
@ -97,16 +95,16 @@ void func_80892890(BgIngate* this, GlobalContext* globalCtx) {
}
}
void BgIngate_DoNothing(BgIngate* this, GlobalContext* globalCtx) {
void BgInGate_DoNothing(BgInGate* this, GlobalContext* globalCtx) {
}
void BgIngate_Update(Actor* thisx, GlobalContext* globalCtx) {
BgIngate* this = THIS;
void BgInGate_Update(Actor* thisx, GlobalContext* globalCtx) {
BgInGate* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx) {
void BgInGate_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 240);
func_80093D18(globalCtx->state.gfxCtx);
@ -114,7 +112,7 @@ void BgIngate_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 245),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_06001040);
gSPDisplayList(POLY_OPA_DISP++, gIngoGateDL);
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_ingate.c", 250);
}

10
src/overlays/actors/ovl_Bg_Ingate/z_bg_ingate.h
View file

@ -4,14 +4,14 @@
#include "ultra64.h"
#include "global.h"
struct BgIngate;
struct BgInGate;
typedef void (*BgIngateActionFunc)(struct BgIngate*, GlobalContext*);
typedef void (*BgInGateActionFunc)(struct BgInGate*, GlobalContext*);
typedef struct BgIngate {
typedef struct BgInGate {
/* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ BgIngateActionFunc actionFunc;
} BgIngate; // size = 0x0168
/* 0x0164 */ BgInGateActionFunc actionFunc;
} BgInGate; // size = 0x0168
extern const ActorInit Bg_Ingate_InitVars;