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
|
|
@ -5,6 +5,7 @@
|
|||
*/
|
||||
|
||||
#include "z_en_mag.h"
|
||||
#include "objects/object_mag/object_mag.h"
|
||||
|
||||
#define FLAGS 0x00000030
|
||||
|
||||
|
|
@ -15,13 +16,6 @@ void EnMag_Destroy(Actor* thisx, GlobalContext* globalCtx);
|
|||
void EnMag_Update(Actor* thisx, GlobalContext* globalCtx);
|
||||
void EnMag_Draw(Actor* thisx, GlobalContext* globalCtx);
|
||||
|
||||
extern u8 D_06000000[]; // Main Logo
|
||||
extern u8 D_06019A00[]; // Copyright Notice
|
||||
extern u8 D_0601A400[]; // Master Quest Sub Title
|
||||
extern u8 D_06024800[]; // Logo Flame Effect
|
||||
extern u8 D_06024C00[]; // "The Legend of"
|
||||
extern u8 D_06024E40[]; // "Ocarina of Time"
|
||||
|
||||
const ActorInit En_Mag_InitVars = {
|
||||
ACTOR_EN_MAG,
|
||||
ACTORCAT_PROP,
|
||||
|
|
@ -389,8 +383,10 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) {
|
|||
static u8 pressStartFontIndexes[] = {
|
||||
0x19, 0x1B, 0x0E, 0x1C, 0x1C, 0x1C, 0x1D, 0x0A, 0x1B, 0x1D,
|
||||
};
|
||||
static u8* effectMaskTextures[] = {
|
||||
0x06020000, 0x06020800, 0x06021000, 0x06021800, 0x06022000, 0x06022800, 0x06023000, 0x06023800, 0x06024000,
|
||||
static void* effectMaskTextures[] = {
|
||||
gTitleEffectMask00Tex, gTitleEffectMask01Tex, gTitleEffectMask02Tex,
|
||||
gTitleEffectMask10Tex, gTitleEffectMask11Tex, gTitleEffectMask12Tex,
|
||||
gTitleEffectMask20Tex, gTitleEffectMask21Tex, gTitleEffectMask22Tex,
|
||||
};
|
||||
EnMag* this = THIS;
|
||||
Font* font = &this->font;
|
||||
|
|
@ -420,8 +416,8 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) {
|
|||
if ((s16)this->effectPrimLodFrac != 0) {
|
||||
for (k = 0, i = 0, rectTop = 0; i < 3; i++, rectTop += 64) {
|
||||
for (j = 0, rectLeft = 56; j < 3; j++, k++, rectLeft += 64) {
|
||||
EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], D_06024800, 64, 64, 32, 32, rectLeft, rectTop, 64,
|
||||
64, 1024, 1024, 1, 1, k, this);
|
||||
EnMag_DrawEffectTextures(&gfx, effectMaskTextures[k], gTitleFlameEffectTex, 64, 64, 32, 32, rectLeft,
|
||||
rectTop, 64, 64, 1024, 1024, 1, 1, k, this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -429,7 +425,7 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) {
|
|||
gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->mainAlpha);
|
||||
|
||||
if ((s16)this->mainAlpha != 0) {
|
||||
EnMag_DrawImageRGBA32(&gfx, 152, 100, D_06000000, 160, 160);
|
||||
EnMag_DrawImageRGBA32(&gfx, 152, 100, (u8*)gTitleZeldaShieldLogoMQTex, 160, 160);
|
||||
}
|
||||
|
||||
func_8009457C(&gfx);
|
||||
|
|
@ -449,20 +445,20 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) {
|
|||
gDPSetEnvColor(gfx++, 0, 0, 100, 255);
|
||||
|
||||
if ((s16)this->mainAlpha != 0) {
|
||||
EnMag_DrawTextureI8(&gfx, D_06024C00, 72, 8, 146, 73, 72, 8, 1024, 1024);
|
||||
EnMag_DrawTextureI8(&gfx, D_06024E40, 96, 8, 144, 127, 96, 8, 1024, 1024);
|
||||
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 146, 73, 72, 8, 1024, 1024);
|
||||
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 144, 127, 96, 8, 1024, 1024);
|
||||
|
||||
gDPPipeSync(gfx++);
|
||||
gDPSetPrimColor(gfx++, 0, 0, 100, 150, 255, (s16)this->mainAlpha);
|
||||
gDPSetEnvColor(gfx++, 20, 80, 160, 255);
|
||||
|
||||
EnMag_DrawTextureI8(&gfx, D_06024C00, 72, 8, 145, 72, 72, 8, 1024, 1024);
|
||||
EnMag_DrawTextureI8(&gfx, D_06024E40, 96, 8, 143, 126, 96, 8, 1024, 1024);
|
||||
EnMag_DrawTextureI8(&gfx, gTitleTheLegendOfTextTex, 72, 8, 145, 72, 72, 8, 1024, 1024);
|
||||
EnMag_DrawTextureI8(&gfx, gTitleOcarinaOfTimeTMTextTex, 96, 8, 143, 126, 96, 8, 1024, 1024);
|
||||
|
||||
gDPPipeSync(gfx++);
|
||||
gDPSetPrimColor(gfx++, 0, 0, 255, 255, 255, (s16)this->subAlpha);
|
||||
|
||||
EnMag_DrawImageRGBA32(&gfx, 174, 145, D_0601A400, 128, 32);
|
||||
EnMag_DrawImageRGBA32(&gfx, 174, 145, (u8*)gTitleMasterQuestSubtitleTex, 128, 32);
|
||||
}
|
||||
|
||||
func_8009457C(&gfx);
|
||||
|
|
@ -474,8 +470,9 @@ void EnMag_DrawInner(Actor* thisx, GlobalContext* globalCtx, Gfx** gfxp) {
|
|||
(s16)this->copyrightAlpha);
|
||||
|
||||
if ((s16)this->copyrightAlpha != 0) {
|
||||
gDPLoadTextureBlock(gfx++, D_06019A00, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0, G_TX_NOMIRROR | G_TX_CLAMP,
|
||||
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK, G_TX_NOLOD, G_TX_NOLOD);
|
||||
gDPLoadTextureBlock(gfx++, gTitleCopyright19982003Tex, G_IM_FMT_IA, G_IM_SIZ_8b, 160, 16, 0,
|
||||
G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMIRROR | G_TX_CLAMP, G_TX_NOMASK, G_TX_NOMASK,
|
||||
G_TX_NOLOD, G_TX_NOLOD);
|
||||
|
||||
gSPTextureRectangle(gfx++, 312, 792, 952, 856, G_TX_RENDERTILE, 0, 0, 1 << 10, 1 << 10);
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue