mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-07-03 06:24:30 +00:00
Code Issues Projects Releases Wiki Activity

Fix ganon organ reloc data and extract its assets (#965)

Browse source 
* fix ganon organ reloc data and extract its assets

* Named all textures

* RangeEnd

* static

* Remove D_ comments from XML

* Rename pad to sForceAlignment

Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com>
This commit is contained in:
louist103 2021-09-18 11:40:40 -04:00 • committed by GitHub
parent 672cc6e90d
commit b3814ddc1b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 26 additions and 271 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.c
View file

@ -28,8 +28,9 @@ const ActorInit En_Ganon_Organ_InitVars = {
(ActorFunc)EnGanonOrgan_Draw,
};
extern Gfx D_80A2CCA8[];
extern Gfx D_80A2EAB0[];
static u64 sForceAlignment = 0;
#include "overlays/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ.c"
void EnGanonOrgan_Init(Actor* thisx, GlobalContext* globalCtx) {
thisx->flags &= ~1;
@ -108,8 +109,9 @@ void EnGanonOrgan_Draw(Actor* thisx, GlobalContext* globalCtx) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 221),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(POLY_OPA_DISP++, D_80A2CCA8);
gSPDisplayList(POLY_OPA_DISP++, D_80A2EAB0);
gSPDisplayList(POLY_OPA_DISP++, gGanondorfRoomOrganAndFloorDL);
gSPDisplayList(POLY_OPA_DISP++, gGanondorfRoomStatuesDL);
osSyncPrintf("ORGAN DRAW 2\n");
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_en_ganon_organ.c", 230);