mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot synced 2026-06-04 02:46:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

another 7 small functions

Browse Source 
Signed-off-by: Anghelo <angheloalf95@gmail.com>
This commit is contained in:
Anghelo
2021-01-25 18:33:27 -03:00
parent 45376279b3
commit 58dd5e3a32
8 changed files with 23 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A320.s
-21
View File
@@ -1,21 +0,0 @@
glabel func_8097A320
/* 019F0 8097A320 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 019F4 8097A324 AFBF0014 */ sw $ra, 0x0014($sp)
/* 019F8 8097A328 AFA40018 */ sw $a0, 0x0018($sp)
/* 019FC 8097A32C 0C25E606 */ jal func_80979818
/* 01A00 8097A330 AFA5001C */ sw $a1, 0x001C($sp)
/* 01A04 8097A334 10400009 */ beq $v0, $zero, .L8097A35C
/* 01A08 8097A338 8FA40018 */ lw $a0, 0x0018($sp)
/* 01A0C 8097A33C 0C25E618 */ jal func_80979860
/* 01A10 8097A340 8FA5001C */ lw $a1, 0x001C($sp)
/* 01A14 8097A344 8FAF0018 */ lw $t7, 0x0018($sp)
/* 01A18 8097A348 240E0009 */ addiu $t6, $zero, 0x0009 ## $t6 = 00000009
/* 01A1C 8097A34C 2418000A */ addiu $t8, $zero, 0x000A ## $t8 = 0000000A
/* 01A20 8097A350 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164
/* 01A24 8097A354 8FB90018 */ lw $t9, 0x0018($sp)
/* 01A28 8097A358 AF380168 */ sw $t8, 0x0168($t9) ## 00000168
.L8097A35C:
/* 01A2C 8097A35C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01A30 8097A360 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01A34 8097A364 03E00008 */ jr $ra
/* 01A38 8097A368 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A4F0.s
-21
View File
@@ -1,21 +0,0 @@
glabel func_8097A4F0
/* 01BC0 8097A4F0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 01BC4 8097A4F4 AFBF0014 */ sw $ra, 0x0014($sp)
/* 01BC8 8097A4F8 AFA40018 */ sw $a0, 0x0018($sp)
/* 01BCC 8097A4FC 0C25E606 */ jal func_80979818
/* 01BD0 8097A500 AFA5001C */ sw $a1, 0x001C($sp)
/* 01BD4 8097A504 10400009 */ beq $v0, $zero, .L8097A52C
/* 01BD8 8097A508 8FA40018 */ lw $a0, 0x0018($sp)
/* 01BDC 8097A50C 0C25E618 */ jal func_80979860
/* 01BE0 8097A510 8FA5001C */ lw $a1, 0x001C($sp)
/* 01BE4 8097A514 8FAF0018 */ lw $t7, 0x0018($sp)
/* 01BE8 8097A518 240E000A */ addiu $t6, $zero, 0x000A ## $t6 = 0000000A
/* 01BEC 8097A51C 2418000B */ addiu $t8, $zero, 0x000B ## $t8 = 0000000B
/* 01BF0 8097A520 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164
/* 01BF4 8097A524 8FB90018 */ lw $t9, 0x0018($sp)
/* 01BF8 8097A528 AF380168 */ sw $t8, 0x0168($t9) ## 00000168
.L8097A52C:
/* 01BFC 8097A52C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01C00 8097A530 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01C04 8097A534 03E00008 */ jr $ra
/* 01C08 8097A538 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A6C0.s
-21
View File
@@ -1,21 +0,0 @@
glabel func_8097A6C0
/* 01D90 8097A6C0 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 01D94 8097A6C4 AFBF0014 */ sw $ra, 0x0014($sp)
/* 01D98 8097A6C8 AFA40018 */ sw $a0, 0x0018($sp)
/* 01D9C 8097A6CC 0C25E606 */ jal func_80979818
/* 01DA0 8097A6D0 AFA5001C */ sw $a1, 0x001C($sp)
/* 01DA4 8097A6D4 10400009 */ beq $v0, $zero, .L8097A6FC
/* 01DA8 8097A6D8 8FA40018 */ lw $a0, 0x0018($sp)
/* 01DAC 8097A6DC 0C25E618 */ jal func_80979860
/* 01DB0 8097A6E0 8FA5001C */ lw $a1, 0x001C($sp)
/* 01DB4 8097A6E4 8FAF0018 */ lw $t7, 0x0018($sp)
/* 01DB8 8097A6E8 240E000B */ addiu $t6, $zero, 0x000B ## $t6 = 0000000B
/* 01DBC 8097A6EC 2418000C */ addiu $t8, $zero, 0x000C ## $t8 = 0000000C
/* 01DC0 8097A6F0 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164
/* 01DC4 8097A6F4 8FB90018 */ lw $t9, 0x0018($sp)
/* 01DC8 8097A6F8 AF380168 */ sw $t8, 0x0168($t9) ## 00000168
.L8097A6FC:
/* 01DCC 8097A6FC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01DD0 8097A700 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01DD4 8097A704 03E00008 */ jr $ra
/* 01DD8 8097A708 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A890.s
-21
View File
@@ -1,21 +0,0 @@
glabel func_8097A890
/* 01F60 8097A890 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 01F64 8097A894 AFBF0014 */ sw $ra, 0x0014($sp)
/* 01F68 8097A898 AFA40018 */ sw $a0, 0x0018($sp)
/* 01F6C 8097A89C 0C25E606 */ jal func_80979818
/* 01F70 8097A8A0 AFA5001C */ sw $a1, 0x001C($sp)
/* 01F74 8097A8A4 10400009 */ beq $v0, $zero, .L8097A8CC
/* 01F78 8097A8A8 8FA40018 */ lw $a0, 0x0018($sp)
/* 01F7C 8097A8AC 0C25E618 */ jal func_80979860
/* 01F80 8097A8B0 8FA5001C */ lw $a1, 0x001C($sp)
/* 01F84 8097A8B4 8FAF0018 */ lw $t7, 0x0018($sp)
/* 01F88 8097A8B8 240E000C */ addiu $t6, $zero, 0x000C ## $t6 = 0000000C
/* 01F8C 8097A8BC 2418000D */ addiu $t8, $zero, 0x000D ## $t8 = 0000000D
/* 01F90 8097A8C0 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164
/* 01F94 8097A8C4 8FB90018 */ lw $t9, 0x0018($sp)
/* 01F98 8097A8C8 AF380168 */ sw $t8, 0x0168($t9) ## 00000168
.L8097A8CC:
/* 01F9C 8097A8CC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 01FA0 8097A8D0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 01FA4 8097A8D4 03E00008 */ jr $ra
/* 01FA8 8097A8D8 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AA60.s
-21
View File
@@ -1,21 +0,0 @@
glabel func_8097AA60
/* 02130 8097AA60 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02134 8097AA64 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02138 8097AA68 AFA40018 */ sw $a0, 0x0018($sp)
/* 0213C 8097AA6C 0C25E606 */ jal func_80979818
/* 02140 8097AA70 AFA5001C */ sw $a1, 0x001C($sp)
/* 02144 8097AA74 10400009 */ beq $v0, $zero, .L8097AA9C
/* 02148 8097AA78 8FA40018 */ lw $a0, 0x0018($sp)
/* 0214C 8097AA7C 0C25E618 */ jal func_80979860
/* 02150 8097AA80 8FA5001C */ lw $a1, 0x001C($sp)
/* 02154 8097AA84 8FAF0018 */ lw $t7, 0x0018($sp)
/* 02158 8097AA88 240E000D */ addiu $t6, $zero, 0x000D ## $t6 = 0000000D
/* 0215C 8097AA8C 2418000E */ addiu $t8, $zero, 0x000E ## $t8 = 0000000E
/* 02160 8097AA90 ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164
/* 02164 8097AA94 8FB90018 */ lw $t9, 0x0018($sp)
/* 02168 8097AA98 AF380168 */ sw $t8, 0x0168($t9) ## 00000168
.L8097AA9C:
/* 0216C 8097AA9C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 02170 8097AAA0 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 02174 8097AAA4 03E00008 */ jr $ra
/* 02178 8097AAA8 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC9C.s
-21
View File
@@ -1,21 +0,0 @@
glabel func_8097AC9C
/* 0236C 8097AC9C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02370 8097ACA0 AFBF0014 */ sw $ra, 0x0014($sp)
/* 02374 8097ACA4 AFA40018 */ sw $a0, 0x0018($sp)
/* 02378 8097ACA8 0C25E606 */ jal func_80979818
/* 0237C 8097ACAC AFA5001C */ sw $a1, 0x001C($sp)
/* 02380 8097ACB0 10400009 */ beq $v0, $zero, .L8097ACD8
/* 02384 8097ACB4 8FA40018 */ lw $a0, 0x0018($sp)
/* 02388 8097ACB8 0C25E618 */ jal func_80979860
/* 0238C 8097ACBC 8FA5001C */ lw $a1, 0x001C($sp)
/* 02390 8097ACC0 8FAF0018 */ lw $t7, 0x0018($sp)
/* 02394 8097ACC4 240E000E */ addiu $t6, $zero, 0x000E ## $t6 = 0000000E
/* 02398 8097ACC8 2418000F */ addiu $t8, $zero, 0x000F ## $t8 = 0000000F
/* 0239C 8097ACCC ADEE0164 */ sw $t6, 0x0164($t7) ## 00000164
/* 023A0 8097ACD0 8FB90018 */ lw $t9, 0x0018($sp)
/* 023A4 8097ACD4 AF380168 */ sw $t8, 0x0168($t9) ## 00000168
.L8097ACD8:
/* 023A8 8097ACD8 8FBF0014 */ lw $ra, 0x0014($sp)
/* 023AC 8097ACDC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 023B0 8097ACE0 03E00008 */ jr $ra
/* 023B4 8097ACE4 00000000 */ nop
asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s
-34
View File
@@ -1,34 +0,0 @@
glabel func_8097B1B4
/* 02884 8097B1B4 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 02888 8097B1B8 AFBF0014 */ sw $ra, 0x0014($sp)
/* 0288C 8097B1BC AFA5001C */ sw $a1, 0x001C($sp)
/* 02890 8097B1C0 AFA40018 */ sw $a0, 0x0018($sp)
/* 02894 8097B1C4 0C25E269 */ jal func_809789A4
/* 02898 8097B1C8 24860184 */ addiu $a2, $a0, 0x0184 ## $a2 = 00000184
/* 0289C 8097B1CC 10400003 */ beq $v0, $zero, .L8097B1DC
/* 028A0 8097B1D0 8FA40018 */ lw $a0, 0x0018($sp)
/* 028A4 8097B1D4 10000011 */ beq $zero, $zero, .L8097B21C
/* 028A8 8097B1D8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001
.L8097B1DC:
/* 028AC 8097B1DC 8FA5001C */ lw $a1, 0x001C($sp)
/* 028B0 8097B1E0 248601D0 */ addiu $a2, $a0, 0x01D0 ## $a2 = 000001D0
/* 028B4 8097B1E4 0C25E269 */ jal func_809789A4
/* 028B8 8097B1E8 AFA40018 */ sw $a0, 0x0018($sp)
/* 028BC 8097B1EC 10400003 */ beq $v0, $zero, .L8097B1FC
/* 028C0 8097B1F0 8FA40018 */ lw $a0, 0x0018($sp)
/* 028C4 8097B1F4 10000009 */ beq $zero, $zero, .L8097B21C
/* 028C8 8097B1F8 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001
.L8097B1FC:
/* 028CC 8097B1FC 8FA5001C */ lw $a1, 0x001C($sp)
/* 028D0 8097B200 0C25E269 */ jal func_809789A4
/* 028D4 8097B204 2486021C */ addiu $a2, $a0, 0x021C ## $a2 = 0000021C
/* 028D8 8097B208 50400004 */ beql $v0, $zero, .L8097B21C
/* 028DC 8097B20C 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000
/* 028E0 8097B210 10000002 */ beq $zero, $zero, .L8097B21C
/* 028E4 8097B214 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001
/* 028E8 8097B218 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000
.L8097B21C:
/* 028EC 8097B21C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 028F0 8097B220 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 028F4 8097B224 03E00008 */ jr $ra
/* 028F8 8097B228 00000000 */ nop
src/overlays/actors/ovl_Demo_Gj/z_demo_gj.c
+23 -36
View File
@@ -238,7 +238,7 @@ void func_8097895C(DemoGj* this, GlobalContext* globalCtx, ColliderCylinder* arg
Collider_SetCylinderType1(globalCtx, arg2, &this->dyna.actor, arg3);
}
s32 func_809789A4(s32 arg0, GlobalContext* globalCtx, Collider* collider) {
s32 func_809789A4(DemoGj* this, GlobalContext* globalCtx, Collider* collider) {
if (Actor_GetCollidedExplosive(globalCtx, collider) != 0) {
return 1;
}
@@ -805,17 +805,13 @@ s32 func_8097A2B4(void *arg0, GlobalContext* globalCtx) {
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A2B4.s")
void func_8097A320(DemoGj* this, GlobalContext* globalCtx);
/*
void func_8097A320(DemoGj* this, GlobalContext* globalCtx) {
if (func_80979818(this, globalCtx) != 0) {
func_80979860(this, arg1);
func_80979860(this, globalCtx);
this->unk_164 = 9;
this->unk_168 = 0xA;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A320.s")
void func_8097A36C(DemoGj* this, GlobalContext* globalCtx) {
if (func_8097983C(this, globalCtx) != 0) {
@@ -858,17 +854,13 @@ void func_8097A474(DemoGj* this, GlobalContext* globalCtx) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A474.s")
#endif
void func_8097A4F0(DemoGj* this, GlobalContext* globalCtx);
/*
void func_8097A4F0(DemoGj* this, s32 arg1) {
if (func_80979818() != 0) {
func_80979860(this, arg1);
void func_8097A4F0(DemoGj* this, GlobalContext* globalCtx) {
if (func_80979818(this, globalCtx) != 0) {
func_80979860(this, globalCtx);
this->unk_164 = 0xA;
this->unk_168 = 0xB;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A4F0.s")
void func_8097A53C(DemoGj* this, GlobalContext* globalCtx) {
if (func_8097983C(this, globalCtx) != 0) {
@@ -911,17 +903,13 @@ void func_8097A644(DemoGj* this, GlobalContext* globalCtx) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A644.s")
#endif
void func_8097A6C0(DemoGj* this, GlobalContext* globalCtx);
/*
void func_8097A6C0(DemoGj* this, s32 arg1) {
if (func_80979818() != 0) {
func_80979860(this, arg1);
void func_8097A6C0(DemoGj* this, GlobalContext* globalCtx) {
if (func_80979818(this, globalCtx) != 0) {
func_80979860(this, globalCtx);
this->unk_164 = 0xB;
this->unk_168 = 0xC;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A6C0.s")
void func_8097A70C(DemoGj* this, GlobalContext* globalCtx) {
if (func_8097983C(this, globalCtx) != 0) {
@@ -964,17 +952,13 @@ void func_8097A814(DemoGj* this, GlobalContext* globalCtx) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A814.s")
#endif
void func_8097A890(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097A890(DemoGj *this, GlobalContext *globalCtx) {
if (func_80979818() != 0) {
if (func_80979818(this, globalCtx) != 0) {
func_80979860(this, globalCtx);
this->unk_164 = 0xC;
this->unk_168 = 0xD;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A890.s")
void func_8097A8DC(DemoGj *this, GlobalContext *globalCtx) {
if (func_8097983C(this, globalCtx) != 0) {
@@ -1016,17 +1000,13 @@ void func_8097A9E4(DemoGj *this, GlobalContext *globalCtx) {
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097A9E4.s")
void func_8097AA60(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097AA60(DemoGj *this, GlobalContext *globalCtx) {
if (func_80979818() != 0) {
if (func_80979818(this, globalCtx) != 0) {
func_80979860(this, globalCtx);
this->unk_164 = 0xD;
this->unk_168 = 0xE;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AA60.s")
void func_8097AAAC(DemoGj *this, GlobalContext *globalCtx) {
if (func_8097983C(this, globalCtx) != 0) {
@@ -1081,17 +1061,13 @@ void func_8097AC30(DemoGj *this, GlobalContext *globalCtx);
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC30.s")
void func_8097AC9C(DemoGj *this, GlobalContext *globalCtx);
/*
void func_8097AC9C(DemoGj *this, GlobalContext *globalCtx) {
if (func_80979818() != 0) {
if (func_80979818(this, globalCtx) != 0) {
func_80979860(this, globalCtx);
this->unk_164 = 0xE;
this->unk_168 = 0xF;
}
}
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097AC9C.s")
void func_8097ACE8(DemoGj *this, GlobalContext *globalCtx) {
if (func_8097983C(this, globalCtx) != 0) {
@@ -1169,7 +1145,18 @@ void func_8097B128(DemoGj *this, GlobalContext *globalCtx) {
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B128.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_Gj/func_8097B1B4.s")
s32 func_8097B1B4(DemoGj *this, GlobalContext *globalCtx) {
if (func_809789A4(this, globalCtx, &this->unk_184.base) != 0) {
return 1;
}
if (func_809789A4(this, globalCtx, &this->unk_1D0.base) != 0) {
return 1;
}
if (func_809789A4(this, globalCtx, &this->unk_21C.base) != 0) {
return 1;
}
return 0;
}
void func_8097B22C(DemoGj *this, GlobalContext *globalCtx);
/*