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

68
src/overlays/actors/ovl_En_Hy/z_en_hy.c
View file

@ -5,6 +5,8 @@
*/
#include "z_en_hy.h"
#include "objects/object_aob/object_aob.h"
#include "objects/object_os_anime/object_os_anime.h"
#define FLAGS 0x00000019
@ -25,12 +27,6 @@ void func_80A7127C(EnHy* this, GlobalContext* globalCtx);
void func_80A712B4(EnHy* this, GlobalContext* globalCtx);
void func_80A714C4(EnHy* this, GlobalContext* globalCtx);
extern AnimationHeader D_06000BFC;
extern AnimationHeader D_06000FE4;
extern AnimationHeader D_060012E8;
extern AnimationHeader D_06002160;
extern AnimationHeader D_0600265C;
extern AnimationHeader D_060033B4;
extern Gfx D_06005BC8[];
const ActorInit En_Hy_InitVars = {
@ -81,14 +77,14 @@ typedef struct {
} EnHyUnknownStruct1; // size = 0xC
static EnHyUnknownStruct1 D_80A71F50[] = {
{ OBJECT_AOB, 0x06003C88, D_80A71EF8 }, { OBJECT_BOB, 0x06003B78, D_80A71F40 },
{ OBJECT_BOJ, 0x060026F0, D_80A71F30 }, { OBJECT_BOJ, 0x060052E0, NULL },
{ OBJECT_BOJ, 0x06005528, NULL }, { OBJECT_BOJ, 0x06005738, NULL },
{ OBJECT_BOJ, 0x060059B0, NULL }, { OBJECT_AHG, 0x060030F0, D_80A71F08 },
{ OBJECT_AHG, 0x06005508, NULL }, { OBJECT_AHG, 0x06005728, NULL },
{ OBJECT_BBA, 0x06002948, D_80A71F18 }, { OBJECT_CNE, 0x06001300, NULL },
{ OBJECT_CNE, 0x06002860, NULL }, { OBJECT_BJI, 0x06002560, D_80A71F20 },
{ OBJECT_BJI, 0x06003F68, NULL }, { OBJECT_COB, 0x06001300, NULL },
{ OBJECT_AOB, gDogLadyHeadDL, D_80A71EF8 }, { OBJECT_BOB, 0x06003B78, D_80A71F40 },
{ OBJECT_BOJ, 0x060026F0, D_80A71F30 }, { OBJECT_BOJ, 0x060052E0, NULL },
{ OBJECT_BOJ, 0x06005528, NULL }, { OBJECT_BOJ, 0x06005738, NULL },
{ OBJECT_BOJ, 0x060059B0, NULL }, { OBJECT_AHG, 0x060030F0, D_80A71F08 },
{ OBJECT_AHG, 0x06005508, NULL }, { OBJECT_AHG, 0x06005728, NULL },
{ OBJECT_BBA, 0x06002948, D_80A71F18 }, { OBJECT_CNE, 0x06001300, NULL },
{ OBJECT_CNE, 0x06002860, NULL }, { OBJECT_BJI, 0x06002560, D_80A71F20 },
{ OBJECT_BJI, 0x06003F68, NULL }, { OBJECT_COB, 0x06001300, NULL },
};
typedef struct {
@ -97,25 +93,25 @@ typedef struct {
} EnHyUnknownStruct2; // size = 0x8
static EnHyUnknownStruct2 D_80A72010[] = {
{ OBJECT_AOB, 0x060000F0 }, { OBJECT_BOB, 0x060000F0 }, { OBJECT_BOJ, 0x060000F0 }, { OBJECT_AHG, 0x060000F0 },
{ OBJECT_BBA, 0x060000F0 }, { OBJECT_CNE, 0x060000F0 }, { OBJECT_BJI, 0x060000F0 }, { OBJECT_COB, 0x060021F8 },
{ OBJECT_AOB, &gDogLadySkel }, { OBJECT_BOB, 0x060000F0 }, { OBJECT_BOJ, 0x060000F0 }, { OBJECT_AHG, 0x060000F0 },
{ OBJECT_BBA, 0x060000F0 }, { OBJECT_CNE, 0x060000F0 }, { OBJECT_BJI, 0x060000F0 }, { OBJECT_COB, 0x060021F8 },
};
static struct_80034EC0_Entry D_80A72050[] = {
{ 0x0600092C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06000228, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x06004CF4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060016EC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x0600265C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060042AC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x060028DC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06002160, 1.0f, 0.0f, -1.0f, 0x00, -10.0f },
{ 0x0600265C, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, { 0x06004E90, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x06001E7C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06000170, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x060000B4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06003D84, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x060041F8, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x0600300C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x060031B0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060031B0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
{ 0x06002D0C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06002DC0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x06004408, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x06001F18, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ 0x06004F28, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { 0x060033B4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
{ 0x060012E8, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { 0x06000FE4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
{ 0x06000BFC, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
{ &gObjOsAnim_092C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_0228, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_4CF4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_16EC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_265C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_42AC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_28DC, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_2160, 1.0f, 0.0f, -1.0f, 0x00, -10.0f },
{ &gObjOsAnim_265C, 1.0f, 0.0f, -1.0f, 0x00, -10.0f }, { &gObjOsAnim_4E90, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_1E7C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_0170, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_00B4, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_3D84, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_41F8, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_300C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_31B0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_31B0, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
{ &gObjOsAnim_2D0C, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_2DC0, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_4408, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_1F18, 1.0f, 0.0f, -1.0f, 0x00, 0.0f },
{ &gObjOsAnim_4F28, 1.0f, 0.0f, -1.0f, 0x00, 0.0f }, { &gObjOsAnim_33B4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
{ &gObjOsAnim_12E8, 1.0f, 0.0f, -1.0f, 0x00, -8.0f }, { &gObjOsAnim_0FE4, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
{ &gObjOsAnim_0BFC, 1.0f, 0.0f, -1.0f, 0x00, -8.0f },
};
typedef struct {
@ -430,7 +426,7 @@ s16 func_80A70058(GlobalContext* globalCtx, Actor* thisx) {
case 0x70F1:
case 0x70F2:
case 0x70F3:
if (this->skelAnime.animation != &D_060033B4) {
if (this->skelAnime.animation != &gObjOsAnim_33B4) {
func_80034EC0(&this->skelAnime, D_80A72050, 23);
func_800F5C64(0x922);
}
@ -812,14 +808,14 @@ void func_80A70E34(EnHy* this, GlobalContext* globalCtx) {
void func_80A710F8(EnHy* this, GlobalContext* globalCtx) {
if (this->unk_1E8.unk_00 != 0) {
if (this->skelAnime.animation != &D_06000BFC) {
if (this->skelAnime.animation != &gObjOsAnim_0BFC) {
func_80034EC0(&this->skelAnime, D_80A72050, 26);
}
} else if (gSaveContext.eventInf[3] & 1) {
if (this->skelAnime.animation != &D_06000FE4) {
if (this->skelAnime.animation != &gObjOsAnim_0FE4) {
func_80034EC0(&this->skelAnime, D_80A72050, 25);
}
} else if (this->skelAnime.animation != &D_060012E8) {
} else if (this->skelAnime.animation != &gObjOsAnim_12E8) {
func_80034EC0(&this->skelAnime, D_80A72050, 24);
}
}
@ -861,11 +857,11 @@ void func_80A7134C(EnHy* this, GlobalContext* globalCtx) {
s16 yaw;
f32 distSq;
if ((this->skelAnime.animation == &D_06002160) && (this->unk_1E8.unk_00 != 0)) {
if ((this->skelAnime.animation == &gObjOsAnim_2160) && (this->unk_1E8.unk_00 != 0)) {
func_80034EC0(&this->skelAnime, D_80A72050, 8);
}
if ((this->skelAnime.animation == &D_0600265C) && (this->unk_1E8.unk_00 == 0)) {
if ((this->skelAnime.animation == &gObjOsAnim_265C) && (this->unk_1E8.unk_00 == 0)) {
func_80034EC0(&this->skelAnime, D_80A72050, 7);
}