mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-09-21 04:24:43 +00:00
Code Issues Projects Releases Wiki Activity

object_gj OK (#698)

Browse Source 
* xml

Signed-off-by: Anghelo <angheloalf95@gmail.com>

* add spec

Signed-off-by: angie <angheloalf95@gmail.com>

* replace all hardcoded pointers in demo_gj

Signed-off-by: angie <angheloalf95@gmail.com>

* add the rest of the unaccounted data as a blob

Signed-off-by: angie <angheloalf95@gmail.com>

* i forgot to erase a undefined_sym

Signed-off-by: angie <angheloalf95@gmail.com>

* name everything in object_gj

Signed-off-by: angie <angheloalf95@gmail.com>

* Categorize by how are ussed each rubble

Signed-off-by: Angie <angheloalf95@gmail.com>

* forgot to erase the externs

Signed-off-by: angie <angheloalf95@gmail.com>

* the cool laser meme is ded

Signed-off-by: angie <angheloalf95@gmail.com>

* delete gitkeep

Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
Anghelo Carvajal 2021-03-17 18:53:05 -03:00 committed by GitHub
parent d3311f9a29
commit 6b9a44e5a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
assets/xml/objects/object_gj.xml Normal file
View File

@ -0,0 +1,35 @@
<Root>
<File Name="object_gj" Segment="6">
<!-- This is the decorative rubble around the fight arena -->
<DList Name="gGanonsCastleRubbleAroundArenaDL" Offset="0xDC0"/>
<Collision Name="gGanonsCastleRubbleAroundArenaCol" Offset="0x1B70"/>
<!-- Those four are used as the pile of rubble from where Ganondorf rises to transform into Ganon -->
<DList Name="gGanonsCastleRubble4DL" Offset="0x2600"/>
<Collision Name="gGanonsCastleRubble4Col" Offset="0x2850"/>
<DList Name="gGanonsCastleRubble5DL" Offset="0x2A40"/>
<Collision Name="gGanonsCastleRubble5Col" Offset="0x2D28"/>
<DList Name="gGanonsCastleRubble6DL" Offset="0x2E80"/>
<Collision Name="gGanonsCastleRubble6Col" Offset="0x2FE4"/>
<DList Name="gGanonsCastleRubble7DL" Offset="0x3190"/>
<Collision Name="gGanonsCastleRubble7Col" Offset="0x33E0"/>
<!-- This three rubbles are the ones that Ganon can destroy during the fight -->
<DList Name="gGanonsCastleRubble2DL" Offset="0x1D20"/>
<Collision Name="gGanonsCastleRubble2Col" Offset="0x1F70"/>
<DList Name="gGanonsCastleRubble3DL" Offset="0x2160"/>
<Collision Name="gGanonsCastleRubble3Col" Offset="0x2448"/>
<DList Name="gGanonsCastleRubbleTallDL" Offset="0x3710"/>
<Collision Name="gGanonsCastleRubbleTallCol" Offset="0x3AF0"/>
<!-- The following are unused -->
<Texture Name="gGanonsCastleUnusedSpikeVariantTex" OutName="ganons_castle_unused_spike_variant" Format="ia16" Width="64" Height="32" Offset="0x8B20"/>
<Texture Name="gGanonsCastleUnusedWallTex" OutName="ganons_castle_unused_wall" Format="rgb5a1" Width="32" Height="32" Offset="0x9B20"/>
<Texture Name="gGanonsCastleUnusedTex_00A320" OutName="ganons_castle_unused_00A320" Format="ia16" Width="16" Height="32" Offset="0xA320"/>
</File>
</Root>

3
spec
View File

@ -5793,7 +5793,8 @@ endseg
beginseg beginseg
name "object_gj" name "object_gj"
romalign 0x1000 romalign 0x1000
include "build/baserom/object_gj.o" include "build/assets/objects/object_gj/object_gj.o"
number 6
endseg endseg
beginseg beginseg

18
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View File

@ -5,6 +5,7 @@
*/ */
#include "z_demo_gj.h" #include "z_demo_gj.h"
#include "objects/object_gj/object_gj.h"
#include "vt.h" #include "vt.h"
#define FLAGS 0x00000030 #define FLAGS 0x00000030
@ -16,23 +17,6 @@ void DemoGj_Destroy(Actor* thisx, GlobalContext* globalCtx);
void DemoGj_Update(Actor* thisx, GlobalContext* globalCtx); void DemoGj_Update(Actor* thisx, GlobalContext* globalCtx);
void DemoGj_Draw(Actor* thisx, GlobalContext* globalCtx); void DemoGj_Draw(Actor* thisx, GlobalContext* globalCtx);
extern Gfx gGanonsCastleRubbleAroundArenaDL[];
extern CollisionHeader gGanonsCastleRubbleAroundArenaCol;
extern Gfx gGanonsCastleRubble2DL[];
extern CollisionHeader gGanonsCastleRubble2Col;
extern Gfx gGanonsCastleRubble3DL[];
extern CollisionHeader gGanonsCastleRubble3Col;
extern Gfx gGanonsCastleRubble4DL[];
extern CollisionHeader gGanonsCastleRubble4Col;
extern Gfx gGanonsCastleRubble5DL[];
extern CollisionHeader gGanonsCastleRubble5Col;
extern Gfx gGanonsCastleRubble6DL[];
extern CollisionHeader gGanonsCastleRubble6Col;
extern Gfx gGanonsCastleRubble7DL[];
extern CollisionHeader gGanonsCastleRubble7Col;
extern Gfx gGanonsCastleRubbleTallDL[];
extern CollisionHeader gGanonsCastleRubbleTallCol;
static ColliderCylinderInitType1 sCylinderInit1 = { static ColliderCylinderInitType1 sCylinderInit1 = {
{ {
COLTYPE_HIT0, COLTYPE_HIT0,

18
undefined_syms.txt
View File

@ -1891,24 +1891,6 @@ D_06012014 = 0x06012014;
// z_demo_ext // z_demo_ext
D_0600FAA0 = 0x0600FAA0; D_0600FAA0 = 0x0600FAA0;
// z_demo_gj
gGanonsCastleRubbleAroundArenaDL = 0x06000DC0;
gGanonsCastleRubbleAroundArenaCol = 0x06001B70;
gGanonsCastleRubble2DL = 0x06001D20;
gGanonsCastleRubble2Col = 0x06001F70;
gGanonsCastleRubble3DL = 0x06002160;
gGanonsCastleRubble3Col = 0x06002448;
gGanonsCastleRubble4DL = 0x06002600;
gGanonsCastleRubble4Col = 0x06002850;
gGanonsCastleRubble5DL = 0x06002A40;
gGanonsCastleRubble5Col = 0x06002D28;
gGanonsCastleRubble6DL = 0x06002E80;
gGanonsCastleRubble6Col = 0x06002FE4;
gGanonsCastleRubble7DL = 0x06003190;
gGanonsCastleRubble7Col = 0x060033E0;
gGanonsCastleRubbleTallDL = 0x06003710;
gGanonsCastleRubbleTallCol = 0x06003AF0;
// z_demo_ik // z_demo_ik
D_0600035C = 0x0600035C; D_0600035C = 0x0600035C;
D_06000380 = 0x06000380; D_06000380 = 0x06000380;