mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-10 19:20:13 +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
Show stats Download patch file Download diff file Expand all files Collapse all files

19
assets/xml/overlays/ovl_En_Ganon_Organ.xml Normal file
View file

@ -0,0 +1,19 @@
<Root>
<File Name="ovl_En_Ganon_Organ" BaseAddress="0x80A28000" RangeStart="0x3E0" RangeEnd="0x6F70" Segment="128">
<Texture Name="gGanondorfRoomCarpetTex" OutName="ganondorf_room_carpet" Format="rgba16" Width="64" Height="16" Offset="0x3E8"/>
<Texture Name="gGanondorfRoomOrganPipeTex" OutName="ganondorf_room_organ_pipe" Format="i4" Width="16" Height="64" Offset="0xBE8"/>
<Texture Name="gGanondorfRoomOrganCorbelsTex" OutName="ganondorf_room_organ_corbels" Format="i4" Width="16" Height="16" Offset="0xDE8"/>
<Texture Name="gGanondorfRoomOrganGrillTex" OutName="ganondorf_room_organ_grill" Format="rgba16" Width="16" Height="16" Offset="0xE68"/>
<Texture Name="gGanondorfRoomCrestFriezeTex" OutName="ganondorf_room_crest_frieze" Format="i4" Width="32" Height="32" Offset="0x1068"/>
<Texture Name="gGanondorfRoomColumnFriezeAndCanopyTex" OutName="ganondorf_room_column_frieze_and_canopy" Format="i4" Width="16" Height="16" Offset="0x1268"/>
<Texture Name="gGanondorfRoomColumnMetalEdgingTex" OutName="ganondorf_room_metal_edging" Format="rgba16" Width="16" Height="16" Offset="0x12E8"/>
<Texture Name="gGanondorfRoomStatueWingTex" OutName="ganondorf_room_statue_wing" Format="rgba16" Width="16" Height="16" Offset="0x14E8"/>
<Texture Name="gGanondorfRoomPillarTex" OutName="ganondorf_room_pillar" Format="i8" Width="8" Height="32" Offset="0x16E8"/>
<Texture Name="gGanondorfRoomOrganKeyboardTex" OutName="ganondorf_room_organ_keyboard" Format="rgba16" Width="32" Height="8" Offset="0x17E8"/>
<Texture Name="gGanondorfRoomOrganKeyEndTex" OutName="ganondorf_room_organ_key_end" Format="rgba16" Width="4" Height="8" Offset="0x19E8"/>
<Texture Name="gGanondorfRoomStepTex" OutName="ganondorf_room_step" Format="i4" Width="16" Height="16" Offset="0x1A28"/>
<DList Name="gGanondorfRoomOrganAndFloorDL" Offset="0x4CA8"/>
<DList Name="gGanondorfRoomStatuesDL" Offset="0x6AB0"/>
</File>
</Root>

252
data/overlays/actors/z_en_ganon_organ.data.s
View file

File diff suppressed because one or more lines are too long

13
data/overlays/actors/z_en_ganon_organ.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80A2F000
.incbin "baserom/ovl_En_Ganon_Organ", 0x7000, 0x00000180

3
spec
View file

@ -2241,8 +2241,7 @@ endseg
beginseg beginseg
name "ovl_En_Ganon_Organ" name "ovl_En_Ganon_Organ"
include "build/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.o" include "build/src/overlays/actors/ovl_En_Ganon_Organ/z_en_ganon_organ.o"
include "build/data/overlays/actors/z_en_ganon_organ.data.o" include "build/src/overlays/actors/ovl_En_Ganon_Organ/ovl_En_Ganon_Organ_reloc.o"
include "build/data/overlays/actors/z_en_ganon_organ.reloc.o"
endseg endseg
beginseg beginseg

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