mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse source
This commit is contained in:
Sirius902 2020-09-30 17:22:50 -07:00
parent 9fe3cb43ef
commit 33a067a021
13 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74390.s
View file

@ -1,3 +1,3 @@
glabel func_80A74390 glabel EnIk_SetupAction
/* 00080 80A74390 03E00008 */ jr $ra /* 00080 80A74390 03E00008 */ jr $ra
/* 00084 80A74394 AC850304 */ sw $a1, 0x0304($a0) ## 00000304 /* 00084 80A74394 AC850304 */ sw $a1, 0x0304($a0) ## 00000304

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74714.s
View file

@ -39,7 +39,7 @@ glabel func_80A74714
/* 00488 80A74798 A21802F8 */ sb $t8, 0x02F8($s0) ## 000002F8 /* 00488 80A74798 A21802F8 */ sb $t8, 0x02F8($s0) ## 000002F8
/* 0048C 80A7479C 24A547C0 */ addiu $a1, $a1, %lo(func_80A747C0) ## $a1 = 80A747C0 /* 0048C 80A7479C 24A547C0 */ addiu $a1, $a1, %lo(func_80A747C0) ## $a1 = 80A747C0
/* 00490 80A747A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00490 80A747A0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00494 80A747A4 0C29D0E4 */ jal func_80A74390 /* 00494 80A747A4 0C29D0E4 */ jal EnIk_SetupAction
/* 00498 80A747A8 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068 /* 00498 80A747A8 E6080068 */ swc1 $f8, 0x0068($s0) ## 00000068
/* 0049C 80A747AC 8FBF002C */ lw $ra, 0x002C($sp) /* 0049C 80A747AC 8FBF002C */ lw $ra, 0x002C($sp)
/* 004A0 80A747B0 8FB00028 */ lw $s0, 0x0028($sp) /* 004A0 80A747B0 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7489C.s
View file

@ -30,7 +30,7 @@ glabel func_80A7489C
/* 005F4 80A74904 E7A80018 */ swc1 $f8, 0x0018($sp) /* 005F4 80A74904 E7A80018 */ swc1 $f8, 0x0018($sp)
/* 005F8 80A74908 3C0580A7 */ lui $a1, %hi(func_80A7492C) ## $a1 = 80A70000 /* 005F8 80A74908 3C0580A7 */ lui $a1, %hi(func_80A7492C) ## $a1 = 80A70000
/* 005FC 80A7490C 24A5492C */ addiu $a1, $a1, %lo(func_80A7492C) ## $a1 = 80A7492C /* 005FC 80A7490C 24A5492C */ addiu $a1, $a1, %lo(func_80A7492C) ## $a1 = 80A7492C
/* 00600 80A74910 0C29D0E4 */ jal func_80A74390 /* 00600 80A74910 0C29D0E4 */ jal EnIk_SetupAction
/* 00604 80A74914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00604 80A74914 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00608 80A74918 8FBF002C */ lw $ra, 0x002C($sp) /* 00608 80A74918 8FBF002C */ lw $ra, 0x002C($sp)
/* 0060C 80A7491C 8FB00028 */ lw $s0, 0x0028($sp) /* 0060C 80A7491C 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74AAC.s
View file

@ -66,7 +66,7 @@ glabel func_80A74AAC
/* 0086C 80A74B7C 3C0580A7 */ lui $a1, %hi(func_80A74BA4) ## $a1 = 80A70000 /* 0086C 80A74B7C 3C0580A7 */ lui $a1, %hi(func_80A74BA4) ## $a1 = 80A70000
/* 00870 80A74B80 24A54BA4 */ addiu $a1, $a1, %lo(func_80A74BA4) ## $a1 = 80A74BA4 /* 00870 80A74B80 24A54BA4 */ addiu $a1, $a1, %lo(func_80A74BA4) ## $a1 = 80A74BA4
/* 00874 80A74B84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00874 80A74B84 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00878 80A74B88 0C29D0E4 */ jal func_80A74390 /* 00878 80A74B88 0C29D0E4 */ jal EnIk_SetupAction
/* 0087C 80A74B8C A6180032 */ sh $t8, 0x0032($s0) ## 00000032 /* 0087C 80A74B8C A6180032 */ sh $t8, 0x0032($s0) ## 00000032
/* 00880 80A74B90 8FBF002C */ lw $ra, 0x002C($sp) /* 00880 80A74B90 8FBF002C */ lw $ra, 0x002C($sp)
/* 00884 80A74B94 8FB00028 */ lw $s0, 0x0028($sp) /* 00884 80A74B94 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A74E2C.s
View file

@ -30,7 +30,7 @@ glabel func_80A74E2C
/* 00B84 80A74E94 E7A80018 */ swc1 $f8, 0x0018($sp) /* 00B84 80A74E94 E7A80018 */ swc1 $f8, 0x0018($sp)
/* 00B88 80A74E98 3C0580A7 */ lui $a1, %hi(func_80A74EBC) ## $a1 = 80A70000 /* 00B88 80A74E98 3C0580A7 */ lui $a1, %hi(func_80A74EBC) ## $a1 = 80A70000
/* 00B8C 80A74E9C 24A54EBC */ addiu $a1, $a1, %lo(func_80A74EBC) ## $a1 = 80A74EBC /* 00B8C 80A74E9C 24A54EBC */ addiu $a1, $a1, %lo(func_80A74EBC) ## $a1 = 80A74EBC
/* 00B90 80A74EA0 0C29D0E4 */ jal func_80A74390 /* 00B90 80A74EA0 0C29D0E4 */ jal EnIk_SetupAction
/* 00B94 80A74EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00B94 80A74EA4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00B98 80A74EA8 8FBF002C */ lw $ra, 0x002C($sp) /* 00B98 80A74EA8 8FBF002C */ lw $ra, 0x002C($sp)
/* 00B9C 80A74EAC 8FB00028 */ lw $s0, 0x0028($sp) /* 00B9C 80A74EAC 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7506C.s
View file

@ -35,7 +35,7 @@ glabel func_80A7506C
/* 00DD4 80A750E4 240539C1 */ addiu $a1, $zero, 0x39C1 ## $a1 = 000039C1 /* 00DD4 80A750E4 240539C1 */ addiu $a1, $zero, 0x39C1 ## $a1 = 000039C1
/* 00DD8 80A750E8 3C0580A7 */ lui $a1, %hi(func_80A7510C) ## $a1 = 80A70000 /* 00DD8 80A750E8 3C0580A7 */ lui $a1, %hi(func_80A7510C) ## $a1 = 80A70000
/* 00DDC 80A750EC 24A5510C */ addiu $a1, $a1, %lo(func_80A7510C) ## $a1 = 80A7510C /* 00DDC 80A750EC 24A5510C */ addiu $a1, $a1, %lo(func_80A7510C) ## $a1 = 80A7510C
/* 00DE0 80A750F0 0C29D0E4 */ jal func_80A74390 /* 00DE0 80A750F0 0C29D0E4 */ jal EnIk_SetupAction
/* 00DE4 80A750F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00DE4 80A750F4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00DE8 80A750F8 8FBF002C */ lw $ra, 0x002C($sp) /* 00DE8 80A750F8 8FBF002C */ lw $ra, 0x002C($sp)
/* 00DEC 80A750FC 8FB00028 */ lw $s0, 0x0028($sp) /* 00DEC 80A750FC 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A751C8.s
View file

@ -32,7 +32,7 @@ glabel func_80A751C8
/* 00F28 80A75238 3C0580A7 */ lui $a1, %hi(func_80A75260) ## $a1 = 80A70000 /* 00F28 80A75238 3C0580A7 */ lui $a1, %hi(func_80A75260) ## $a1 = 80A70000
/* 00F2C 80A7523C A20002FC */ sb $zero, 0x02FC($s0) ## 000002FC /* 00F2C 80A7523C A20002FC */ sb $zero, 0x02FC($s0) ## 000002FC
/* 00F30 80A75240 24A55260 */ addiu $a1, $a1, %lo(func_80A75260) ## $a1 = 80A75260 /* 00F30 80A75240 24A55260 */ addiu $a1, $a1, %lo(func_80A75260) ## $a1 = 80A75260
/* 00F34 80A75244 0C29D0E4 */ jal func_80A74390 /* 00F34 80A75244 0C29D0E4 */ jal EnIk_SetupAction
/* 00F38 80A75248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 00F38 80A75248 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00F3C 80A7524C 8FBF002C */ lw $ra, 0x002C($sp) /* 00F3C 80A7524C 8FBF002C */ lw $ra, 0x002C($sp)
/* 00F40 80A75250 8FB00028 */ lw $s0, 0x0028($sp) /* 00F40 80A75250 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A753D0.s
View file

@ -29,7 +29,7 @@ glabel func_80A753D0
/* 01124 80A75434 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01124 80A75434 E7A80018 */ swc1 $f8, 0x0018($sp)
/* 01128 80A75438 3C0580A7 */ lui $a1, %hi(func_80A7545C) ## $a1 = 80A70000 /* 01128 80A75438 3C0580A7 */ lui $a1, %hi(func_80A7545C) ## $a1 = 80A70000
/* 0112C 80A7543C 24A5545C */ addiu $a1, $a1, %lo(func_80A7545C) ## $a1 = 80A7545C /* 0112C 80A7543C 24A5545C */ addiu $a1, $a1, %lo(func_80A7545C) ## $a1 = 80A7545C
/* 01130 80A75440 0C29D0E4 */ jal func_80A74390 /* 01130 80A75440 0C29D0E4 */ jal EnIk_SetupAction
/* 01134 80A75444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01134 80A75444 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 01138 80A75448 8FBF002C */ lw $ra, 0x002C($sp) /* 01138 80A75448 8FBF002C */ lw $ra, 0x002C($sp)
/* 0113C 80A7544C 8FB00028 */ lw $s0, 0x0028($sp) /* 0113C 80A7544C 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A754A0.s
View file

@ -30,7 +30,7 @@ glabel func_80A754A0
/* 011F8 80A75508 E7AA0018 */ swc1 $f10, 0x0018($sp) /* 011F8 80A75508 E7AA0018 */ swc1 $f10, 0x0018($sp)
/* 011FC 80A7550C 3C0580A7 */ lui $a1, %hi(func_80A75530) ## $a1 = 80A70000 /* 011FC 80A7550C 3C0580A7 */ lui $a1, %hi(func_80A75530) ## $a1 = 80A70000
/* 01200 80A75510 24A55530 */ addiu $a1, $a1, %lo(func_80A75530) ## $a1 = 80A75530 /* 01200 80A75510 24A55530 */ addiu $a1, $a1, %lo(func_80A75530) ## $a1 = 80A75530
/* 01204 80A75514 0C29D0E4 */ jal func_80A74390 /* 01204 80A75514 0C29D0E4 */ jal EnIk_SetupAction
/* 01208 80A75518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01208 80A75518 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0120C 80A7551C 8FBF002C */ lw $ra, 0x002C($sp) /* 0120C 80A7551C 8FBF002C */ lw $ra, 0x002C($sp)
/* 01210 80A75520 8FB00028 */ lw $s0, 0x0028($sp) /* 01210 80A75520 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A755F0.s
View file

@ -29,7 +29,7 @@ glabel func_80A755F0
/* 01344 80A75654 E7A80018 */ swc1 $f8, 0x0018($sp) /* 01344 80A75654 E7A80018 */ swc1 $f8, 0x0018($sp)
/* 01348 80A75658 3C0580A7 */ lui $a1, %hi(func_80A7567C) ## $a1 = 80A70000 /* 01348 80A75658 3C0580A7 */ lui $a1, %hi(func_80A7567C) ## $a1 = 80A70000
/* 0134C 80A7565C 24A5567C */ addiu $a1, $a1, %lo(func_80A7567C) ## $a1 = 80A7567C /* 0134C 80A7565C 24A5567C */ addiu $a1, $a1, %lo(func_80A7567C) ## $a1 = 80A7567C
/* 01350 80A75660 0C29D0E4 */ jal func_80A74390 /* 01350 80A75660 0C29D0E4 */ jal EnIk_SetupAction
/* 01354 80A75664 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01354 80A75664 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 01358 80A75668 8FBF002C */ lw $ra, 0x002C($sp) /* 01358 80A75668 8FBF002C */ lw $ra, 0x002C($sp)
/* 0135C 80A7566C 8FB00028 */ lw $s0, 0x0028($sp) /* 0135C 80A7566C 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A75790.s
View file

@ -72,7 +72,7 @@ glabel func_80A75790
/* 01578 80A75888 3C0580A7 */ lui $a1, %hi(func_80A758B0) ## $a1 = 80A70000 /* 01578 80A75888 3C0580A7 */ lui $a1, %hi(func_80A758B0) ## $a1 = 80A70000
/* 0157C 80A7588C A20002FE */ sb $zero, 0x02FE($s0) ## 000002FE /* 0157C 80A7588C A20002FE */ sb $zero, 0x02FE($s0) ## 000002FE
/* 01580 80A75890 24A558B0 */ addiu $a1, $a1, %lo(func_80A758B0) ## $a1 = 80A758B0 /* 01580 80A75890 24A558B0 */ addiu $a1, $a1, %lo(func_80A758B0) ## $a1 = 80A758B0
/* 01584 80A75894 0C29D0E4 */ jal func_80A74390 /* 01584 80A75894 0C29D0E4 */ jal EnIk_SetupAction
/* 01588 80A75898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01588 80A75898 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0158C 80A7589C 8FBF002C */ lw $ra, 0x002C($sp) /* 0158C 80A7589C 8FBF002C */ lw $ra, 0x002C($sp)
/* 01590 80A758A0 8FB00028 */ lw $s0, 0x0028($sp) /* 01590 80A758A0 8FB00028 */ lw $s0, 0x0028($sp)

2
asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7598C.s
View file

@ -39,7 +39,7 @@ glabel func_80A7598C
/* 01700 80A75A10 2405393B */ addiu $a1, $zero, 0x393B ## $a1 = 0000393B /* 01700 80A75A10 2405393B */ addiu $a1, $zero, 0x393B ## $a1 = 0000393B
/* 01704 80A75A14 3C0580A7 */ lui $a1, %hi(func_80A75A38) ## $a1 = 80A70000 /* 01704 80A75A14 3C0580A7 */ lui $a1, %hi(func_80A75A38) ## $a1 = 80A70000
/* 01708 80A75A18 24A55A38 */ addiu $a1, $a1, %lo(func_80A75A38) ## $a1 = 80A75A38 /* 01708 80A75A18 24A55A38 */ addiu $a1, $a1, %lo(func_80A75A38) ## $a1 = 80A75A38
/* 0170C 80A75A1C 0C29D0E4 */ jal func_80A74390 /* 0170C 80A75A1C 0C29D0E4 */ jal EnIk_SetupAction
/* 01710 80A75A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000 /* 01710 80A75A20 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 01714 80A75A24 8FBF002C */ lw $ra, 0x002C($sp) /* 01714 80A75A24 8FBF002C */ lw $ra, 0x002C($sp)
/* 01718 80A75A28 8FB00028 */ lw $s0, 0x0028($sp) /* 01718 80A75A28 8FB00028 */ lw $s0, 0x0028($sp)

21
src/overlays/actors/ovl_En_Ik/z_en_ik.c
View file

@ -35,7 +35,6 @@ void func_80A7489C(EnIk* this);
void func_80A7492C(EnIk* this, GlobalContext* globalCtx); void func_80A7492C(EnIk* this, GlobalContext* globalCtx);
void func_80A75FA0(Actor* thisx, GlobalContext* globalCtx); void func_80A75FA0(Actor* thisx, GlobalContext* globalCtx);
void func_80A76798(Actor* thisx, GlobalContext* globalCtx); void func_80A76798(Actor* thisx, GlobalContext* globalCtx);
void func_80A76BF4();
void func_80A780D0(EnIk* this, GlobalContext* globalCtx); void func_80A780D0(EnIk* this, GlobalContext* globalCtx);
void func_80A78160(EnIk* this, GlobalContext* globalCtx); void func_80A78160(EnIk* this, GlobalContext* globalCtx);
@ -43,15 +42,6 @@ extern AnimationHeader D_0600C114;
extern AnimationHeader D_0600DD50; extern AnimationHeader D_0600DD50;
extern SkeletonHeader D_0601E178; extern SkeletonHeader D_0601E178;
extern ColliderCylinderInit D_80A78340;
extern ColliderTrisItemInit D_80A7836C[2];
extern ColliderTrisInit D_80A783E4;
extern ColliderQuadInit D_80A783F4;
extern DamageTable D_80A78444;
extern EnIkActionFunc D_80A78604[6];
extern EnIkDrawFunc D_80A7861C[3];
// sCylinderInit // sCylinderInit
ColliderCylinderInit D_80A78340 = { ColliderCylinderInit D_80A78340 = {
{ COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x20, COLSHAPE_CYLINDER }, { COLTYPE_UNK10, 0x00, 0x09, 0x39, 0x20, COLSHAPE_CYLINDER },
@ -149,8 +139,7 @@ void EnIk_Destroy(Actor* thisx, GlobalContext* globalCtx) {
Collider_DestroyQuad(globalCtx, &this->unk_36C); Collider_DestroyQuad(globalCtx, &this->unk_36C);
} }
// EnIk_SetupAction void EnIk_SetupAction(EnIk* this, EnIkActionFunc actionFunc) {
void func_80A74390(EnIk* this, EnIkActionFunc actionFunc) {
this->actionFunc = actionFunc; this->actionFunc = actionFunc;
} }
@ -227,7 +216,7 @@ void func_80A7489C(EnIk* this) {
this->unk_2F8 = 4; this->unk_2F8 = 4;
this->actor.speedXZ = 0.0f; this->actor.speedXZ = 0.0f;
SkelAnime_ChangeAnim(&this->skelAnime, &D_0600DD50, 0.0f, 0.0f, frames, 0, 4.0f); SkelAnime_ChangeAnim(&this->skelAnime, &D_0600DD50, 0.0f, 0.0f, frames, 0, 4.0f);
func_80A74390(this, func_80A7492C); EnIk_SetupAction(this, func_80A7492C);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7492C.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A7492C.s")
@ -280,9 +269,7 @@ void func_80A7489C(EnIk* this) {
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s") #pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ik/func_80A76798.s")
// starts middle boss bgm void EnIk_StartMusic(void) {
void func_80A76BF4(void) {
// NA_BGM_MIDDLE_BOSS
func_800F5ACC(0x38); func_800F5ACC(0x38);
} }
@ -382,7 +369,7 @@ void func_80A780D0(EnIk* this, GlobalContext* globalCtx) {
Actor_SetScale(&this->actor, 0.01f); Actor_SetScale(&this->actor, 0.01f);
} else { } else {
func_80A78160(this, globalCtx); func_80A78160(this, globalCtx);
func_80A76BF4(); EnIk_StartMusic();
} }
} }
osSyncPrintf("En_Ik_inConfrontion_Init : %d !!!!!!!!!!!!!!!!\n", this->actor.params); osSyncPrintf("En_Ik_inConfrontion_Init : %d !!!!!!!!!!!!!!!!\n", this->actor.params);