mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-02-03 01:54:37 +00:00
Code Issues Projects Releases Wiki Activity

add functions used by draw

Browse source 
Signed-off-by: angie <angheloalf95@gmail.com>
This commit is contained in:
angie 2021-01-24 23:24:41 -03:00
parent 5cf678e6a3
commit f58b24f91b
No known key found for this signature in database
GPG key ID: E5212BA1B6FEA700
12 changed files with 83 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s
View file

@ -1,10 +0,0 @@
glabel func_8097A96C
/* 0203C 8097A96C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02040 8097A970 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02044 8097A974 3C060600 */ lui $a2, %hi(D_06002E80) ## $a2 = 06000000
/* 02048 8097A978 0C25E40C */ jal func_80979030
/* 0204C 8097A97C 24C62E80 */ addiu $a2, $a2, %lo(D_06002E80) ## $a2 = 06002E80
/* 02050 8097A980 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02054 8097A984 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02058 8097A988 03E00008 */ jr $ra
/* 0205C 8097A98C 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s
View file

@ -1,10 +0,0 @@
glabel func_8097A990
/* 02060 8097A990 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02064 8097A994 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02068 8097A998 3C060600 */ lui $a2, %hi(D_06002E80) ## $a2 = 06000000
/* 0206C 8097A99C 0C25E447 */ jal func_8097911C
/* 02070 8097A9A0 24C62E80 */ addiu $a2, $a2, %lo(D_06002E80) ## $a2 = 06002E80
/* 02074 8097A9A4 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02078 8097A9A8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 0207C 8097A9AC 03E00008 */ jr $ra
/* 02080 8097A9B0 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s
View file

@ -1,10 +0,0 @@
glabel func_8097AB3C
/* 0220C 8097AB3C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02210 8097AB40 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02214 8097AB44 3C060600 */ lui $a2, %hi(D_06003190) ## $a2 = 06000000
/* 02218 8097AB48 0C25E40C */ jal func_80979030
/* 0221C 8097AB4C 24C63190 */ addiu $a2, $a2, %lo(D_06003190) ## $a2 = 06003190
/* 02220 8097AB50 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02224 8097AB54 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02228 8097AB58 03E00008 */ jr $ra
/* 0222C 8097AB5C 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s
View file

@ -1,10 +0,0 @@
glabel func_8097AB60
/* 02230 8097AB60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02234 8097AB64 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02238 8097AB68 3C060600 */ lui $a2, %hi(D_06003190) ## $a2 = 06000000
/* 0223C 8097AB6C 0C25E447 */ jal func_8097911C
/* 02240 8097AB70 24C63190 */ addiu $a2, $a2, %lo(D_06003190) ## $a2 = 06003190
/* 02244 8097AB74 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02248 8097AB78 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 0224C 8097AB7C 03E00008 */ jr $ra
/* 02250 8097AB80 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s
View file

@ -1,10 +0,0 @@
glabel func_8097AD78
/* 02448 8097AD78 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 0244C 8097AD7C AFBF0014 */ sw $ra, 0x0014($sp)
/* 02450 8097AD80 3C060600 */ lui $a2, %hi(D_06003710) ## $a2 = 06000000
/* 02454 8097AD84 0C25E40C */ jal func_80979030
/* 02458 8097AD88 24C63710 */ addiu $a2, $a2, %lo(D_06003710) ## $a2 = 06003710
/* 0245C 8097AD8C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02460 8097AD90 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02464 8097AD94 03E00008 */ jr $ra
/* 02468 8097AD98 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s
View file

@ -1,10 +0,0 @@
glabel func_8097AD9C
/* 0246C 8097AD9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02470 8097ADA0 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02474 8097ADA4 3C060600 */ lui $a2, %hi(D_06003710) ## $a2 = 06000000
/* 02478 8097ADA8 0C25E447 */ jal func_8097911C
/* 0247C 8097ADAC 24C63710 */ addiu $a2, $a2, %lo(D_06003710) ## $a2 = 06003710
/* 02480 8097ADB0 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02484 8097ADB4 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02488 8097ADB8 03E00008 */ jr $ra
/* 0248C 8097ADBC 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s
View file

@ -1,10 +0,0 @@
glabel func_8097AE38
/* 02508 8097AE38 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 0250C 8097AE3C AFBF0014 */ sw $ra, 0x0014($sp)
/* 02510 8097AE40 3C060600 */ lui $a2, %hi(D_06000DC0) ## $a2 = 06000000
/* 02514 8097AE44 0C25E40C */ jal func_80979030
/* 02518 8097AE48 24C60DC0 */ addiu $a2, $a2, %lo(D_06000DC0) ## $a2 = 06000DC0
/* 0251C 8097AE4C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02520 8097AE50 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02524 8097AE54 03E00008 */ jr $ra
/* 02528 8097AE58 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s
View file

@ -1,10 +0,0 @@
glabel func_8097B3A0
/* 02A70 8097B3A0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02A74 8097B3A4 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02A78 8097B3A8 3C060600 */ lui $a2, %hi(D_06001D20) ## $a2 = 06000000
/* 02A7C 8097B3AC 0C25E40C */ jal func_80979030
/* 02A80 8097B3B0 24C61D20 */ addiu $a2, $a2, %lo(D_06001D20) ## $a2 = 06001D20
/* 02A84 8097B3B4 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02A88 8097B3B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02A8C 8097B3BC 03E00008 */ jr $ra
/* 02A90 8097B3C0 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s
View file

@ -1,10 +0,0 @@
glabel func_8097B8C4
/* 02F94 8097B8C4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02F98 8097B8C8 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02F9C 8097B8CC 3C060600 */ lui $a2, %hi(D_06002160) ## $a2 = 06000000
/* 02FA0 8097B8D0 0C25E40C */ jal func_80979030
/* 02FA4 8097B8D4 24C62160 */ addiu $a2, $a2, %lo(D_06002160) ## $a2 = 06002160
/* 02FA8 8097B8D8 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02FAC 8097B8DC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02FB0 8097B8E0 03E00008 */ jr $ra
/* 02FB4 8097B8E4 00000000 */ nop

10
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s
View file

@ -1,10 +0,0 @@
glabel func_8097BBD8
/* 032A8 8097BBD8 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 032AC 8097BBDC AFBF0014 */ sw $ra, 0x0014($sp)
/* 032B0 8097BBE0 3C060600 */ lui $a2, %hi(D_06003710) ## $a2 = 06000000
/* 032B4 8097BBE4 0C25E40C */ jal func_80979030
/* 032B8 8097BBE8 24C63710 */ addiu $a2, $a2, %lo(D_06003710) ## $a2 = 06003710
/* 032BC 8097BBEC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 032C0 8097BBF0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 032C4 8097BBF4 03E00008 */ jr $ra
/* 032C8 8097BBF8 00000000 */ nop

4
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BD70.s
View file

@ -1,4 +0,0 @@
glabel func_8097BD70
/* 03440 8097BD70 AFA40000 */ sw $a0, 0x0000($sp)
/* 03444 8097BD74 03E00008 */ jr $ra
/* 03448 8097BD78 AFA50004 */ sw $a1, 0x0004($sp)

100
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
View file

@ -9,7 +9,7 @@ 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 UNK_TYPE D_06000DC0; extern Gfx D_06000DC0;
extern UNK_TYPE D_06000EA0; extern UNK_TYPE D_06000EA0;
extern UNK_TYPE D_06001B70; extern UNK_TYPE D_06001B70;
extern Gfx D_06001D20; extern Gfx D_06001D20;
@ -20,14 +20,14 @@ extern Gfx D_06002600;
extern CollisionHeader D_06002850; extern CollisionHeader D_06002850;
extern Gfx D_06002A40; extern Gfx D_06002A40;
extern CollisionHeader D_06002D28; extern CollisionHeader D_06002D28;
extern UNK_TYPE D_06002E80; extern Gfx D_06002E80;
extern CollisionHeader D_06002FE4; extern CollisionHeader D_06002FE4;
extern UNK_TYPE D_06003190; extern Gfx D_06003190;
extern UNK_TYPE D_060033E0; extern UNK_TYPE D_060033E0;
extern UNK_TYPE D_06003710; extern Gfx D_06003710;
extern UNK_TYPE D_06003AF0; extern UNK_TYPE D_06003AF0;
typedef void (*DemoGjUpdateFunc)(DemoGj*, GlobalContext*); typedef void (*DemoGjActionFunc)(DemoGj*, GlobalContext*);
void func_8097ADF0(DemoGj* this, GlobalContext* globalCtx); void func_8097ADF0(DemoGj* this, GlobalContext* globalCtx);
void func_8097A160(DemoGj* this, GlobalContext* globalCtx); void func_8097A160(DemoGj* this, GlobalContext* globalCtx);
@ -52,7 +52,7 @@ void func_8097B894(DemoGj* this, GlobalContext* globalCtx);
void func_8097BBA8(DemoGj* this, GlobalContext* globalCtx); void func_8097BBA8(DemoGj* this, GlobalContext* globalCtx);
/* /*
static DemoGjUpdateFunc D_8097BED0[] = { static DemoGjActionFunc D_8097BED0[] = {
func_8097ADF0, func_8097ADF0,
func_8097A160, func_8097A160,
func_8097A39C, func_8097A39C,
@ -77,6 +77,51 @@ static DemoGjUpdateFunc D_8097BED0[] = {
}; };
*/ */
void func_8097BD70(DemoGj* this, GlobalContext* globalCtx);
void func_8097AE38(DemoGj* this, GlobalContext* globalCtx);
void func_8097A1C0(DemoGj* this, GlobalContext* globalCtx);
void func_8097A3FC(DemoGj* this, GlobalContext* globalCtx);
void func_8097A5CC(DemoGj* this, GlobalContext* globalCtx);
void func_8097A79C(DemoGj* this, GlobalContext* globalCtx);
void func_8097A96C(DemoGj* this, GlobalContext* globalCtx);
void func_8097AB3C(DemoGj* this, GlobalContext* globalCtx);
void func_8097AD78(DemoGj* this, GlobalContext* globalCtx);
void func_8097A1E4(DemoGj* this, GlobalContext* globalCtx);
void func_8097A420(DemoGj* this, GlobalContext* globalCtx);
void func_8097A5F0(DemoGj* this, GlobalContext* globalCtx);
void func_8097A7C0(DemoGj* this, GlobalContext* globalCtx);
void func_8097A990(DemoGj* this, GlobalContext* globalCtx);
void func_8097AB60(DemoGj* this, GlobalContext* globalCtx);
void func_8097AD9C(DemoGj* this, GlobalContext* globalCtx);
void func_8097B3A0(DemoGj* this, GlobalContext* globalCtx);
void func_8097B8C4(DemoGj* this, GlobalContext* globalCtx);
void func_8097BBD8(DemoGj* this, GlobalContext* globalCtx);
/*
static DemoGjActionFunc D_8097BF24[] = {
func_8097BD70,
func_8097AE38,
func_8097A1C0,
func_8097A3FC,
func_8097A5CC,
func_8097A79C,
func_8097A96C,
func_8097AB3C,
func_8097AD78,
func_8097A1E4,
func_8097A420,
func_8097A5F0,
func_8097A7C0,
func_8097A990,
func_8097AB60,
func_8097AD9C,
func_8097B3A0,
func_8097B8C4,
func_8097BBD8,
};
*/
/* /*
const ActorInit Demo_Gj_InitVars = { const ActorInit Demo_Gj_InitVars = {
ACTOR_DEMO_GJ, ACTOR_DEMO_GJ,
@ -714,9 +759,13 @@ void func_8097A93C(DemoGj *this, GlobalContext *globalCtx) {
func_8097A8DC(this, globalCtx); func_8097A8DC(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A96C.s") void func_8097A96C(DemoGj *this, GlobalContext *globalCtx) {
func_80979030(this, globalCtx, &D_06002E80);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A990.s") void func_8097A990(DemoGj *this, GlobalContext *globalCtx) {
func_8097911C(this, globalCtx, &D_06002E80);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9B4.s")
@ -737,9 +786,13 @@ void func_8097AB0C(DemoGj *this, GlobalContext *globalCtx) {
func_8097AAAC(this, globalCtx); func_8097AAAC(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB3C.s") void func_8097AB3C(DemoGj *this, GlobalContext *globalCtx) {
func_80979030(this, globalCtx, &D_06003190);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB60.s") void func_8097AB60(DemoGj *this, GlobalContext *globalCtx) {
func_8097911C(this, globalCtx, &D_06003190);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AB84.s")
@ -762,9 +815,13 @@ void func_8097AD48(DemoGj *this, GlobalContext *globalCtx) {
func_8097ACE8(this, globalCtx); func_8097ACE8(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD78.s") void func_8097AD78(DemoGj *this, GlobalContext *globalCtx) {
func_80979030(this, globalCtx, &D_06003710);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AD9C.s") void func_8097AD9C(DemoGj *this, GlobalContext *globalCtx) {
func_8097911C(this, globalCtx, &D_06003710);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097ADC0.s")
@ -775,7 +832,9 @@ void func_8097ADF0(DemoGj *this, GlobalContext *globalCtx) {
func_8097AC30(this, globalCtx); func_8097AC30(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE38.s") void func_8097AE38(DemoGj *this, GlobalContext *globalCtx) {
func_80979030(this, globalCtx, &D_06000DC0);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE5C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AE5C.s")
@ -804,7 +863,9 @@ void func_8097B370(DemoGj *this, GlobalContext *globalCtx) {
func_8097AEDC(this, globalCtx); func_8097AEDC(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3A0.s") void func_8097B3A0(DemoGj *this, GlobalContext *globalCtx) {
func_80979030(this, globalCtx, &D_06001D20);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3C4.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B3C4.s")
@ -833,7 +894,9 @@ void func_8097B894(DemoGj *this, GlobalContext *globalCtx) {
func_8097B444(this, globalCtx); func_8097B444(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8C4.s") void func_8097B8C4(DemoGj *this, GlobalContext *globalCtx) {
func_80979030(this, globalCtx, &D_06002160);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8E8.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B8E8.s")
@ -856,7 +919,9 @@ void func_8097BBA8(DemoGj *this, GlobalContext *globalCtx) {
func_8097B930(this, globalCtx); func_8097B930(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BBD8.s") void func_8097BBD8(DemoGj *this, GlobalContext *globalCtx) {
func_80979030(this, globalCtx, &D_06003710);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Update.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Update.s")
@ -913,6 +978,7 @@ default:
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Init.s")
#endif #endif
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097BD70.s") void func_8097BD70(DemoGj *this, GlobalContext *globalCtx) {
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Draw.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/DemoGj_Draw.s")