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

Done

Browse source
This commit is contained in:
Ethan Roseman 2020-03-24 22:24:33 -04:00
parent 735a6c93c5
commit c559068eda
4 changed files with 22 additions and 239 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s
View file

@ -1,109 +0,0 @@
.rdata
glabel D_80AF5140
.asciz "../z_en_ru2_inKenjyanomaDemo02.c"
.balign 4
glabel D_80AF5164
.asciz "../z_en_ru2_inKenjyanomaDemo02.c"
.balign 4
.text
glabel func_80AF321C
/* 00CCC 80AF321C 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88
/* 00CD0 80AF3220 AFBF002C */ sw $ra, 0x002C($sp)
/* 00CD4 80AF3224 AFB00028 */ sw $s0, 0x0028($sp)
/* 00CD8 80AF3228 AFA40078 */ sw $a0, 0x0078($sp)
/* 00CDC 80AF322C AFA5007C */ sw $a1, 0x007C($sp)
/* 00CE0 80AF3230 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4
/* 00CE4 80AF3234 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000
/* 00CE8 80AF3238 3C0680AF */ lui $a2, %hi(D_80AF5140) ## $a2 = 80AF0000
/* 00CEC 80AF323C 00027880 */ sll $t7, $v0, 2
/* 00CF0 80AF3240 030FC021 */ addu $t8, $t8, $t7
/* 00CF4 80AF3244 8F18410C */ lw $t8, %lo(D_80AF410C)($t8)
/* 00CF8 80AF3248 24C65140 */ addiu $a2, $a2, %lo(D_80AF5140) ## $a2 = 80AF5140
/* 00CFC 80AF324C 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8
/* 00D00 80AF3250 AFB80068 */ sw $t8, 0x0068($sp)
/* 00D04 80AF3254 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000
/* 00D08 80AF3258 24070108 */ addiu $a3, $zero, 0x0108 ## $a3 = 00000108
/* 00D0C 80AF325C 0C031AB1 */ jal func_800C6AC4
/* 00D10 80AF3260 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000
/* 00D14 80AF3264 8FA9007C */ lw $t1, 0x007C($sp)
/* 00D18 80AF3268 0C024F61 */ jal func_80093D84
/* 00D1C 80AF326C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000
/* 00D20 80AF3270 8FA70068 */ lw $a3, 0x0068($sp)
/* 00D24 80AF3274 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 00D28 80AF3278 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000
/* 00D2C 80AF327C 00076100 */ sll $t4, $a3, 4
/* 00D30 80AF3280 000C6F02 */ srl $t5, $t4, 28
/* 00D34 80AF3284 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000
/* 00D38 80AF3288 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 00D3C 80AF328C AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0
/* 00D40 80AF3290 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8
/* 00D44 80AF3294 000D7080 */ sll $t6, $t5, 2
/* 00D48 80AF3298 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020
/* 00D4C 80AF329C 01CF2021 */ addu $a0, $t6, $t7
/* 00D50 80AF32A0 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 00D54 80AF32A4 8C980000 */ lw $t8, 0x0000($a0) ## 00000000
/* 00D58 80AF32A8 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 00D5C 80AF32AC 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
/* 00D60 80AF32B0 00E12824 */ and $a1, $a3, $at
/* 00D64 80AF32B4 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000
/* 00D68 80AF32B8 0305C821 */ addu $t9, $t8, $a1
/* 00D6C 80AF32BC 03264821 */ addu $t1, $t9, $a2
/* 00D70 80AF32C0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004
/* 00D74 80AF32C4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 00D78 80AF32C8 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000
/* 00D7C 80AF32CC 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024
/* 00D80 80AF32D0 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 00D84 80AF32D4 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0
/* 00D88 80AF32D8 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 00D8C 80AF32DC 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000
/* 00D90 80AF32E0 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000
/* 00D94 80AF32E4 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000
/* 00D98 80AF32E8 01856821 */ addu $t5, $t4, $a1
/* 00D9C 80AF32EC 01A67021 */ addu $t6, $t5, $a2
/* 00DA0 80AF32F0 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004
/* 00DA4 80AF32F4 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 00DA8 80AF32F8 8FA80078 */ lw $t0, 0x0078($sp)
/* 00DAC 80AF32FC 3C0C8011 */ lui $t4, 0x8011 ## $t4 = 80110000
/* 00DB0 80AF3300 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008
/* 00DB4 80AF3304 AE0F02D0 */ sw $t7, 0x02D0($s0) ## 000002D0
/* 00DB8 80AF3308 AC580000 */ sw $t8, 0x0000($v0) ## 00000000
/* 00DBC 80AF330C 8D1902B4 */ lw $t9, 0x02B4($t0) ## 000002B4
/* 00DC0 80AF3310 258C6280 */ addiu $t4, $t4, 0x6280 ## $t4 = 80116280
/* 00DC4 80AF3314 356B0030 */ ori $t3, $t3, 0x0030 ## $t3 = DB060030
/* 00DC8 80AF3318 332900FF */ andi $t1, $t9, 0x00FF ## $t1 = 00000000
/* 00DCC 80AF331C AC490004 */ sw $t1, 0x0004($v0) ## 00000004
/* 00DD0 80AF3320 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 00DD4 80AF3324 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 00DD8 80AF3328 AE0A02D0 */ sw $t2, 0x02D0($s0) ## 000002D0
/* 00DDC 80AF332C AC4C0004 */ sw $t4, 0x0004($v0) ## 00000004
/* 00DE0 80AF3330 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 00DE4 80AF3334 2502014C */ addiu $v0, $t0, 0x014C ## $v0 = 0000014C
/* 00DE8 80AF3338 8C450004 */ lw $a1, 0x0004($v0) ## 00000150
/* 00DEC 80AF333C 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C
/* 00DF0 80AF3340 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E
/* 00DF4 80AF3344 AFA00018 */ sw $zero, 0x0018($sp)
/* 00DF8 80AF3348 AFA00014 */ sw $zero, 0x0014($sp)
/* 00DFC 80AF334C AFA00010 */ sw $zero, 0x0010($sp)
/* 00E00 80AF3350 8E0D02D0 */ lw $t5, 0x02D0($s0) ## 000002D0
/* 00E04 80AF3354 8FA4007C */ lw $a0, 0x007C($sp)
/* 00E08 80AF3358 0C0289CF */ jal func_800A273C
/* 00E0C 80AF335C AFAD001C */ sw $t5, 0x001C($sp)
/* 00E10 80AF3360 AE0202D0 */ sw $v0, 0x02D0($s0) ## 000002D0
/* 00E14 80AF3364 8FAE007C */ lw $t6, 0x007C($sp)
/* 00E18 80AF3368 3C0680AF */ lui $a2, %hi(D_80AF5164) ## $a2 = 80AF0000
/* 00E1C 80AF336C 24C65164 */ addiu $a2, $a2, %lo(D_80AF5164) ## $a2 = 80AF5164
/* 00E20 80AF3370 27A40050 */ addiu $a0, $sp, 0x0050 ## $a0 = FFFFFFD8
/* 00E24 80AF3374 24070123 */ addiu $a3, $zero, 0x0123 ## $a3 = 00000123
/* 00E28 80AF3378 0C031AD5 */ jal func_800C6B54
/* 00E2C 80AF337C 8DC50000 */ lw $a1, 0x0000($t6) ## 00000000
/* 00E30 80AF3380 8FBF002C */ lw $ra, 0x002C($sp)
/* 00E34 80AF3384 8FB00028 */ lw $s0, 0x0028($sp)
/* 00E38 80AF3388 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000
/* 00E3C 80AF338C 03E00008 */ jr $ra
/* 00E40 80AF3390 00000000 */ nop

104
asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s
View file

@ -1,104 +0,0 @@
.rdata
glabel D_80AF5224
.asciz "../z_en_ru2.c"
.balign 4
glabel D_80AF5234
.asciz "../z_en_ru2.c"
.balign 4
.text
glabel func_80AF3F20
/* 019D0 80AF3F20 27BDFF90 */ addiu $sp, $sp, 0xFF90 ## $sp = FFFFFF90
/* 019D4 80AF3F24 AFBF0024 */ sw $ra, 0x0024($sp)
/* 019D8 80AF3F28 AFA40070 */ sw $a0, 0x0070($sp)
/* 019DC 80AF3F2C AFA50074 */ sw $a1, 0x0074($sp)
/* 019E0 80AF3F30 848202A4 */ lh $v0, 0x02A4($a0) ## 000002A4
/* 019E4 80AF3F34 3C1880AF */ lui $t8, %hi(D_80AF410C) ## $t8 = 80AF0000
/* 019E8 80AF3F38 3C0680AF */ lui $a2, %hi(D_80AF5224) ## $a2 = 80AF0000
/* 019EC 80AF3F3C 00027880 */ sll $t7, $v0, 2
/* 019F0 80AF3F40 030FC021 */ addu $t8, $t8, $t7
/* 019F4 80AF3F44 8F18410C */ lw $t8, %lo(D_80AF410C)($t8)
/* 019F8 80AF3F48 24C65224 */ addiu $a2, $a2, %lo(D_80AF5224) ## $a2 = 80AF5224
/* 019FC 80AF3F4C 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8
/* 01A00 80AF3F50 AFB80060 */ sw $t8, 0x0060($sp)
/* 01A04 80AF3F54 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000
/* 01A08 80AF3F58 24070282 */ addiu $a3, $zero, 0x0282 ## $a3 = 00000282
/* 01A0C 80AF3F5C 0C031AB1 */ jal func_800C6AC4
/* 01A10 80AF3F60 AFA50058 */ sw $a1, 0x0058($sp)
/* 01A14 80AF3F64 8FA90074 */ lw $t1, 0x0074($sp)
/* 01A18 80AF3F68 0C024F46 */ jal func_80093D18
/* 01A1C 80AF3F6C 8D240000 */ lw $a0, 0x0000($t1) ## 00000000
/* 01A20 80AF3F70 8FA80058 */ lw $t0, 0x0058($sp)
/* 01A24 80AF3F74 8FA70060 */ lw $a3, 0x0060($sp)
/* 01A28 80AF3F78 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000
/* 01A2C 80AF3F7C 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0
/* 01A30 80AF3F80 00076100 */ sll $t4, $a3, 4
/* 01A34 80AF3F84 000C6F02 */ srl $t5, $t4, 28
/* 01A38 80AF3F88 3C0F8016 */ lui $t7, 0x8016 ## $t7 = 80160000
/* 01A3C 80AF3F8C 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 01A40 80AF3F90 25EF6FA8 */ addiu $t7, $t7, 0x6FA8 ## $t7 = 80166FA8
/* 01A44 80AF3F94 000D7080 */ sll $t6, $t5, 2
/* 01A48 80AF3F98 356B0020 */ ori $t3, $t3, 0x0020 ## $t3 = DB060020
/* 01A4C 80AF3F9C AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0
/* 01A50 80AF3FA0 01CF2021 */ addu $a0, $t6, $t7
/* 01A54 80AF3FA4 AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 01A58 80AF3FA8 8C980000 */ lw $t8, 0x0000($a0) ## 00000000
/* 01A5C 80AF3FAC 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 01A60 80AF3FB0 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
/* 01A64 80AF3FB4 00E12824 */ and $a1, $a3, $at
/* 01A68 80AF3FB8 3C068000 */ lui $a2, 0x8000 ## $a2 = 80000000
/* 01A6C 80AF3FBC 0305C821 */ addu $t9, $t8, $a1
/* 01A70 80AF3FC0 03264821 */ addu $t1, $t9, $a2
/* 01A74 80AF3FC4 AC490004 */ sw $t1, 0x0004($v0) ## 00000004
/* 01A78 80AF3FC8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0
/* 01A7C 80AF3FCC 3C0BDB06 */ lui $t3, 0xDB06 ## $t3 = DB060000
/* 01A80 80AF3FD0 356B0024 */ ori $t3, $t3, 0x0024 ## $t3 = DB060024
/* 01A84 80AF3FD4 244A0008 */ addiu $t2, $v0, 0x0008 ## $t2 = 00000008
/* 01A88 80AF3FD8 AD0A02C0 */ sw $t2, 0x02C0($t0) ## 000002C0
/* 01A8C 80AF3FDC AC4B0000 */ sw $t3, 0x0000($v0) ## 00000000
/* 01A90 80AF3FE0 8C8C0000 */ lw $t4, 0x0000($a0) ## 00000000
/* 01A94 80AF3FE4 241900FF */ addiu $t9, $zero, 0x00FF ## $t9 = 000000FF
/* 01A98 80AF3FE8 3C18FB00 */ lui $t8, 0xFB00 ## $t8 = FB000000
/* 01A9C 80AF3FEC 01856821 */ addu $t5, $t4, $a1
/* 01AA0 80AF3FF0 01A67021 */ addu $t6, $t5, $a2
/* 01AA4 80AF3FF4 AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004
/* 01AA8 80AF3FF8 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0
/* 01AAC 80AF3FFC 3C0B8011 */ lui $t3, 0x8011 ## $t3 = 80110000
/* 01AB0 80AF4000 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000
/* 01AB4 80AF4004 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008
/* 01AB8 80AF4008 AD0F02C0 */ sw $t7, 0x02C0($t0) ## 000002C0
/* 01ABC 80AF400C AC590004 */ sw $t9, 0x0004($v0) ## 00000004
/* 01AC0 80AF4010 AC580000 */ sw $t8, 0x0000($v0) ## 00000000
/* 01AC4 80AF4014 8D0202C0 */ lw $v0, 0x02C0($t0) ## 000002C0
/* 01AC8 80AF4018 354A0030 */ ori $t2, $t2, 0x0030 ## $t2 = DB060030
/* 01ACC 80AF401C 256B6290 */ addiu $t3, $t3, 0x6290 ## $t3 = 80116290
/* 01AD0 80AF4020 24490008 */ addiu $t1, $v0, 0x0008 ## $t1 = 00000008
/* 01AD4 80AF4024 AD0902C0 */ sw $t1, 0x02C0($t0) ## 000002C0
/* 01AD8 80AF4028 AC4B0004 */ sw $t3, 0x0004($v0) ## 00000004
/* 01ADC 80AF402C AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000
/* 01AE0 80AF4030 8FA30070 */ lw $v1, 0x0070($sp)
/* 01AE4 80AF4034 8FA40074 */ lw $a0, 0x0074($sp)
/* 01AE8 80AF4038 2462014C */ addiu $v0, $v1, 0x014C ## $v0 = 0000014C
/* 01AEC 80AF403C 8C450004 */ lw $a1, 0x0004($v0) ## 00000150
/* 01AF0 80AF4040 8C460020 */ lw $a2, 0x0020($v0) ## 0000016C
/* 01AF4 80AF4044 90470002 */ lbu $a3, 0x0002($v0) ## 0000014E
/* 01AF8 80AF4048 AFA00014 */ sw $zero, 0x0014($sp)
/* 01AFC 80AF404C AFA00010 */ sw $zero, 0x0010($sp)
/* 01B00 80AF4050 0C0286B2 */ jal func_800A1AC8
/* 01B04 80AF4054 AFA30018 */ sw $v1, 0x0018($sp)
/* 01B08 80AF4058 8FAC0074 */ lw $t4, 0x0074($sp)
/* 01B0C 80AF405C 3C0680AF */ lui $a2, %hi(D_80AF5234) ## $a2 = 80AF0000
/* 01B10 80AF4060 24C65234 */ addiu $a2, $a2, %lo(D_80AF5234) ## $a2 = 80AF5234
/* 01B14 80AF4064 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFD8
/* 01B18 80AF4068 24070297 */ addiu $a3, $zero, 0x0297 ## $a3 = 00000297
/* 01B1C 80AF406C 0C031AD5 */ jal func_800C6B54
/* 01B20 80AF4070 8D850000 */ lw $a1, 0x0000($t4) ## 00000000
/* 01B24 80AF4074 8FBF0024 */ lw $ra, 0x0024($sp)
/* 01B28 80AF4078 27BD0070 */ addiu $sp, $sp, 0x0070 ## $sp = 00000000
/* 01B2C 80AF407C 03E00008 */ jr $ra
/* 01B30 80AF4080 00000000 */ nop

44
src/overlays/actors/ovl_En_Ru2/z_en_ru2.c
View file

@ -170,14 +170,14 @@ ActorFunc D_80AF50BC[] =
(ActorFunc)func_80AF3C64, (ActorFunc)func_80AF3C64,
(ActorFunc)func_80AF3CB8, (ActorFunc)func_80AF3CB8,
(ActorFunc)func_80AF3D0C, (ActorFunc)func_80AF3D0C,
(ActorFunc)func_80AF3D60 (ActorFunc)func_80AF3D60,
}; };
ActorFunc D_80AF510C[] = ActorFunc D_80AF510C[] =
{ {
(ActorFunc)func_80AF3F14, (ActorFunc)func_80AF3F14,
(ActorFunc)func_80AF3F20, (ActorFunc)func_80AF3F20,
(ActorFunc)func_80AF321C (ActorFunc)func_80AF321C,
}; };
const ActorInit En_Ru2_InitVars = const ActorInit En_Ru2_InitVars =
@ -261,7 +261,7 @@ void func_80AF26AC(EnRu2* this) {
} }
void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) { void func_80AF26D0(EnRu2* this, GlobalContext* globalCtx) {
s32 one; s32 one; // Needed to match
if (globalCtx->csCtx.state == 0) { if (globalCtx->csCtx.state == 0) {
if (D_80AF4118 != 0) { if (D_80AF4118 != 0) {
if (this->actor.params == 2) { if (this->actor.params == 2) {
@ -574,10 +574,10 @@ void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) {
func_80AF26D0(this, globalCtx); func_80AF26D0(this, globalCtx);
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF321C.s") void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) {
/*void func_80AF321C(EnRu2* this, GlobalContext* globalCtx) { s32 pad[2];
s32 pad[3]; s16 temp = this->unk_2A4;
u32 addr = D_80AF410C[this->unk_2A4]; UNK_PTR addr = D_80AF410C[temp];
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4]; Gfx* gfxArr[4];
@ -594,7 +594,7 @@ void func_80AF31C8(EnRu2* this, GlobalContext* globalCtx) {
0, 0, 0, gfxCtx->polyXlu.p); 0, 0, 0, gfxCtx->polyXlu.p);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2_inKenjyanomaDemo02.c", 291);
}*/ }
void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) { void func_80AF3394(EnRu2* this, GlobalContext* globalCtx) {
func_80AF28E8(this, &D_0600E630, 0, 0.0f, 0); func_80AF28E8(this, &D_0600E630, 0, 0.0f, 0);
@ -614,8 +614,7 @@ void func_80AF33E0(EnRu2* this) {
if (temp_f0 <= *unk_2B0) { if (temp_f0 <= *unk_2B0) {
this->unk_2B4 = 0xFF; this->unk_2B4 = 0xFF;
this->actor.shape.unk_14 = 0xFF; this->actor.shape.unk_14 = 0xFF;
} } else {
else {
temp_f18 = (*unk_2B0/ temp_f0) * 255.0f; temp_f18 = (*unk_2B0/ temp_f0) * 255.0f;
this->unk_2B4 = temp_f18; this->unk_2B4 = temp_f18;
this->actor.shape.unk_14 = temp_f18; this->actor.shape.unk_14 = temp_f18;
@ -629,7 +628,7 @@ void func_80AF346C(EnRu2* this, GlobalContext* globalCtx) {
} }
void func_80AF34A4(EnRu2* this) { void func_80AF34A4(EnRu2* this) {
if (kREG(17) + 10.0f <= this->unk_2B0) { if (this->unk_2B0 >= kREG(17) + 10.0f) {
this->action = 12; this->action = 12;
this->drawConfig = 1; this->drawConfig = 1;
} }
@ -710,11 +709,11 @@ s32 func_80AF3718(EnRu2* this, GlobalContext* globalCtx) {
void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) { void func_80AF3744(EnRu2* this, GlobalContext* globalCtx) {
if (func_80AF3718(this, globalCtx)) { if (func_80AF3718(this, globalCtx)) {
Actor_Kill(&this->actor); Actor_Kill(&this->actor);
return; } else {
func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0);
this->action = 14;
this->drawConfig = 1;
} }
func_80AF28E8(this, &D_06000DE8, 0, 0.0f, 0);
this->action = 14;
this->drawConfig = 1;
} }
void func_80AF37AC() { void func_80AF37AC() {
@ -756,10 +755,7 @@ void func_80AF390C(EnRu2* this, GlobalContext* globalCtx) {
*unk_2C4 += 1.0f; *unk_2C4 += 1.0f;
if (*unk_2C4 == kREG(6) + 40.0f) { if (*unk_2C4 == kREG(6) + 40.0f) {
func_80AF37AC(); func_80AF37AC();
return; } else if (*unk_2C4 > kREG(4) + 50.0f) {
}
if (*unk_2C4 > kREG(4) + 50.0f) {
this->actor.textId = 0x403E; this->actor.textId = 0x403E;
func_8010B680(globalCtx, this->actor.textId, 0); func_8010B680(globalCtx, this->actor.textId, 0);
this->action = 17; this->action = 17;
@ -898,10 +894,10 @@ void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) {
} }
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_En_Ru2/func_80AF3F20.s") void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) {
/*void func_80AF3F20(EnRu2* this, GlobalContext* globalCtx) { s32 pad[2];
s32 pad[3]; s16 temp = this->unk_2A4;
u32 addr = D_80AF410C[this->unk_2A4]; UNK_PTR addr = D_80AF410C[temp];
SkelAnime* skelAnime = &this->skelAnime; SkelAnime* skelAnime = &this->skelAnime;
GraphicsContext* gfxCtx = globalCtx->state.gfxCtx; GraphicsContext* gfxCtx = globalCtx->state.gfxCtx;
Gfx* gfxArr[4]; Gfx* gfxArr[4];
@ -917,7 +913,7 @@ void func_80AF3F14(EnRu2* this, GlobalContext* globalCtx) {
func_800A1AC8(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount, func_800A1AC8(globalCtx, skelAnime->limbIndex, skelAnime->actorDrawTbl, skelAnime->dListCount,
NULL, NULL, &this->actor); NULL, NULL, &this->actor);
func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663); func_800C6B54(gfxArr, globalCtx->state.gfxCtx, "../z_en_ru2.c", 663);
}*/ }
void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) { void EnRu2_Draw(EnRu2* this, GlobalContext* globalCtx) {
if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0) if (this->drawConfig < 0 || this->drawConfig >= 3 || D_80AF510C[this->drawConfig] == 0)

4
src/overlays/actors/ovl_En_Ru2/z_en_ru2.h
View file

@ -7,9 +7,9 @@
typedef struct { typedef struct {
/* 0x0000 */ Actor actor; /* 0x0000 */ Actor actor;
/* 0x014C */ SkelAnime skelAnime; /* 0x014C */ SkelAnime skelAnime;
/* 0x0190 */ s8 unk_190; /* 0x0190 */ s8 unk_190; // likely a struct of length 0x8A
/* 0x0191 */ char unk_191[0x89]; /* 0x0191 */ char unk_191[0x89];
/* 0x021A */ s8 unk_21A; /* 0x021A */ s8 unk_21A; // another of the same struct
/* 0x021B */ char unk_21B[0x89]; /* 0x021B */ char unk_21B[0x89];
/* 0x02A4 */ s16 unk_2A4; /* 0x02A4 */ s16 unk_2A4;
/* 0x02A6 */ s16 unk_2A6; /* 0x02A6 */ s16 unk_2A6;