mirror of
https://github.com/zeldaret/oot.git
synced 2025-08-06 06:10:21 +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:
parent
bb4babbe15
commit
0f644b7545
162 changed files with 2973 additions and 1386 deletions
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include "z_en_nwc.h"
|
||||
#include "objects/object_nwc/object_nwc.h"
|
||||
|
||||
#define FLAGS 0x00000030
|
||||
|
||||
|
@ -31,15 +32,6 @@ typedef enum {
|
|||
/* 1 */ CHICK_NORMAL
|
||||
} ChickTypes;
|
||||
|
||||
extern Gfx D_06000840[];
|
||||
extern Gfx D_060008B0[];
|
||||
extern Gfx D_06000BF0[];
|
||||
extern Gfx D_06000C68[];
|
||||
extern Gfx D_06000C88[];
|
||||
extern Gfx D_06000CE0[];
|
||||
extern Gfx D_06000D10[];
|
||||
extern Gfx D_06000D50[];
|
||||
|
||||
const ActorInit En_Nwc_InitVars = {
|
||||
ACTOR_EN_NWC,
|
||||
ACTORCAT_PROP,
|
||||
|
@ -170,9 +162,9 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) {
|
|||
dList2 = dList1 + 3 * this->count + 1;
|
||||
dList3 = dList2 + 2 * this->count + 1;
|
||||
|
||||
gSPDisplayList(dList1++, D_06000840);
|
||||
gSPDisplayList(dList2++, D_06000BF0);
|
||||
gSPDisplayList(dList3++, D_06000C88);
|
||||
gSPDisplayList(dList1++, gCuccoChickSetupBodyDL);
|
||||
gSPDisplayList(dList2++, gCuccoChickSetupEyeDL);
|
||||
gSPDisplayList(dList3++, gCuccoChickSetupBeakDL);
|
||||
|
||||
chick = this->chicks;
|
||||
for (i = 0; i < this->count; i++, chick++) {
|
||||
|
@ -184,18 +176,18 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) {
|
|||
mtx = Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nwc.c", 346);
|
||||
gDPSetEnvColor(dList1++, 0, 100, 255, 255);
|
||||
gSPMatrix(dList1++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(dList1++, D_060008B0);
|
||||
gSPDisplayList(dList1++, gCuccoChickBodyDL);
|
||||
gSPMatrix(dList2++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(dList2++, D_06000C68);
|
||||
gSPDisplayList(dList2++, gCuccoChickEyesDL);
|
||||
gSPMatrix(dList3++, mtx, G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(dList3++, D_06000CE0);
|
||||
gSPDisplayList(dList3++, gCuccoChickBeakDL);
|
||||
}
|
||||
}
|
||||
|
||||
chick = this->chicks;
|
||||
POLY_XLU_DISP = dList3;
|
||||
func_80094044(globalCtx->state.gfxCtx);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06000D10);
|
||||
gSPDisplayList(POLY_XLU_DISP++, gCuccoChickSetupShadowDL);
|
||||
|
||||
for (i = 0; i < this->count; i++, chick++) {
|
||||
if ((chick->type != CHICK_NONE) && (chick->floorPoly != NULL)) {
|
||||
|
@ -205,7 +197,7 @@ void EnNwc_DrawChicks(EnNwc* this, GlobalContext* globalCtx) {
|
|||
Matrix_Scale(1.0f, 1.0f, 1.0f, MTXMODE_APPLY);
|
||||
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_nwc.c", 388),
|
||||
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
|
||||
gSPDisplayList(POLY_XLU_DISP++, D_06000D50);
|
||||
gSPDisplayList(POLY_XLU_DISP++, gCuccoChickShadowDL);
|
||||
}
|
||||
}
|
||||
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_nwc.c", 395);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue