mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 14:20:11 +00:00
Decompiled A LOT of objects (#815)
* . * 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
GitHub
parent
bb4babbe15
commit
0f644b7545
162 changed files with 2973 additions and 1386 deletions
|
|
@ -1,4 +1,6 @@
|
|||
#include "z_demo_gt.h"
|
||||
#include "objects/object_gt/object_gt.h"
|
||||
#include "objects/object_geff/object_geff.h"
|
||||
#include "vt.h"
|
||||
#include "overlays/effects/ovl_Effect_Ss_Kakera/z_eff_ss_kakera.h"
|
||||
|
||||
|
|
@ -11,18 +13,6 @@ void DemoGt_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void DemoGt_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void DemoGt_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
extern CollisionHeader D_06005CB8;
|
||||
extern CollisionHeader D_060091E4;
|
||||
|
||||
extern Gfx D_06009970[];
|
||||
extern Gfx D_06007630[];
|
||||
extern Gfx D_06004F90[];
|
||||
extern Gfx D_06009610[];
|
||||
extern Gfx D_06002910[];
|
||||
extern Gfx D_060041A0[];
|
||||
extern Gfx D_06009B08[];
|
||||
extern Gfx D_06000EA0[];
|
||||
|
||||
void DemoGt_Destroy(Actor* thisx, GlobalContext* globalCtx) {
|
||||
DemoGt* this = THIS;
|
||||
|
||||
|
|
@ -140,7 +130,7 @@ void func_8097DAC8(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) {
|
|||
|
||||
EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0,
|
||||
(s32)(Rand_ZeroOne() * 10.0f + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 30,
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0);
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL);
|
||||
angle += 0x1555;
|
||||
}
|
||||
}
|
||||
|
|
@ -181,7 +171,7 @@ void func_8097DD28(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) {
|
|||
|
||||
EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -247, phi_s0, 3, 0, 0,
|
||||
(s32)((Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 0x1E,
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0);
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL);
|
||||
|
||||
angle += 0x2000;
|
||||
}
|
||||
|
|
@ -223,7 +213,7 @@ void func_8097DF70(DemoGt* this, GlobalContext* globalCtx, Vec3f* spawnerPos) {
|
|||
|
||||
EffectSsKakera_Spawn(globalCtx, &pos, &velocity, spawnerPos, -200, phi_s0, 10, 10, 0,
|
||||
Rand_ZeroOne() * 30.0f + 30.0f, 2, 300, (s32)(Rand_ZeroOne() * 30.0f) + 30,
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0);
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL);
|
||||
angle += 0x1555;
|
||||
}
|
||||
}
|
||||
|
|
@ -264,7 +254,7 @@ void func_8097E1D4(GlobalContext* globalCtx, Vec3f* arg1, s16 arg2) {
|
|||
|
||||
EffectSsKakera_Spawn(globalCtx, &pos, &velocity, arg1, -247, phi_s0, 3, 0, 0,
|
||||
(s32)((Rand_ZeroOne() * 10.0f) + 30.0f), 2, 300, (s32)(Rand_ZeroOne() * 0.0f) + 30,
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, D_06000EA0);
|
||||
KAKERA_COLOR_NONE, OBJECT_GEFF, gGanonRubbleDL);
|
||||
|
||||
angle += 0x10000;
|
||||
}
|
||||
|
|
@ -690,14 +680,14 @@ void DemoGt_Draw1(DemoGt* this, GlobalContext* globalCtx) {
|
|||
Gfx_TwoTexScrollEnvColor(gfxCtx, 0, 0, unk198[0], 0x20, 0x40, 1, 0, unk198[1], 0x20, 0x40, unk188[0],
|
||||
unk188[1], unk188[2], 0x80));
|
||||
gSPMatrix(POLY_OPA_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06002910);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsExteriorStructureDL);
|
||||
func_80093D84(gfxCtx);
|
||||
gDPSetEnvColor(POLY_XLU_DISP++, 128, 128, 128, 128);
|
||||
gSPSegment(
|
||||
POLY_XLU_DISP++, 0x09,
|
||||
Gfx_TwoTexScroll(gfxCtx, 0, 0, gameplayFrames * 0x14, 0x10, 0x200, 1, 0, gameplayFrames * 0x1E, 0x10, 0x200));
|
||||
gSPMatrix(POLY_XLU_DISP++, spB4, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_060041A0);
|
||||
gSPDisplayList(POLY_XLU_DISP++, gTowerCollapseCsFlameSmokeDL);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part1.c", 557);
|
||||
}
|
||||
|
|
@ -706,7 +696,7 @@ void func_8097F904_Init1(DemoGt* this, GlobalContext* globalCtx) {
|
|||
this->dyna.actor.scale.x *= 10.0f;
|
||||
this->dyna.actor.scale.y *= 10.0f;
|
||||
this->dyna.actor.scale.z *= 10.0f;
|
||||
func_8097EE44(this, globalCtx, 1, 2, &D_06005CB8);
|
||||
func_8097EE44(this, globalCtx, 1, 2, &gTowerCollapseCsCollapsedStructureInnerCol);
|
||||
}
|
||||
|
||||
void func_8097F960(DemoGt* this, GlobalContext* globalCtx) {
|
||||
|
|
@ -874,7 +864,7 @@ void DemoGt_Draw2(DemoGt* this, GlobalContext* globalCtx) {
|
|||
unk178[1], unk178[2], 128));
|
||||
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part2.c", 485),
|
||||
G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06004F90);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureInnerDL);
|
||||
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part2.c", 489);
|
||||
|
|
@ -884,7 +874,7 @@ void func_80980110_Init2(DemoGt* this, GlobalContext* globalCtx) {
|
|||
this->dyna.actor.scale.x *= 10.0f;
|
||||
this->dyna.actor.scale.y *= 10.0f;
|
||||
this->dyna.actor.scale.z *= 10.0f;
|
||||
func_8097EE44(this, globalCtx, 2, 3, &D_060091E4);
|
||||
func_8097EE44(this, globalCtx, 2, 3, &gTowerCollapseCsCollapsedStructureOuterCol);
|
||||
}
|
||||
|
||||
void func_8098016C(DemoGt* this, GlobalContext* globalCtx) {
|
||||
|
|
@ -1184,7 +1174,7 @@ void DemoGt_Draw3(DemoGt* this, GlobalContext* globalCtx) {
|
|||
func_80093D18(gfxCtx);
|
||||
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(gfxCtx, "../z_demo_gt_part3.c", 1028),
|
||||
G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06007630);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsCollapsedStructureOuterDL);
|
||||
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part3.c", 1032);
|
||||
|
|
@ -1306,7 +1296,7 @@ void DemoGt_Draw4(DemoGt* this, GlobalContext* globalCtx) {
|
|||
|
||||
func_80093D18(gfxCtx);
|
||||
gSPMatrix(POLY_OPA_DISP++, sp60, (G_MTX_PUSH | G_MTX_LOAD) | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06009610);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL);
|
||||
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_1.c", 246);
|
||||
|
|
@ -1425,7 +1415,7 @@ void DemoGt_Draw5(DemoGt* this, GlobalContext* globalCtx) {
|
|||
|
||||
func_80093D18(gfxCtx);
|
||||
gSPMatrix(POLY_OPA_DISP++, sp60, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06009610);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL);
|
||||
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_2.c", 241);
|
||||
|
|
@ -1517,7 +1507,7 @@ void DemoGt_Draw6(DemoGt* this, GlobalContext* globalCtx) {
|
|||
|
||||
func_80093D18(gfxCtx);
|
||||
gSPMatrix(POLY_OPA_DISP++, sp64, G_MTX_PUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06009610);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsStandalonePillarDL);
|
||||
gSPPopMatrix(POLY_OPA_DISP++, G_MTX_MODELVIEW);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part4_3.c", 307);
|
||||
|
|
@ -1609,7 +1599,7 @@ void DemoGt_Draw7(DemoGt* this, GlobalContext* globalCtx) {
|
|||
|
||||
func_80093D18(gfxCtx);
|
||||
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06009970);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsWalkwayDL);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part5.c", 160);
|
||||
}
|
||||
|
|
@ -1700,7 +1690,7 @@ void DemoGt_Draw8(DemoGt* this, GlobalContext* globalCtx) {
|
|||
|
||||
func_80093D18(gfxCtx);
|
||||
gSPMatrix(POLY_OPA_DISP++, sp5C, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_OPA_DISP++, D_06009B08);
|
||||
gSPDisplayList(POLY_OPA_DISP++, gTowerCollapseCsAlternativeWalkwayDL);
|
||||
|
||||
CLOSE_DISPS(gfxCtx, "../z_demo_gt_part6.c", 163);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue