mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-05-10 11:03:46 +00:00
Code Issues Projects Releases Wiki Activity

Bg_Hidan_Hamstep OK (#544)

Browse source 
* BgHidanHamstep 7/15

* 9/15 matched

* hamstep 14/15

* cleanup

* fix not OK

* fix ctrl+f mistake

* All functions OK

* cleanup

* Update z_bg_hidan_hamstep.c

* Update z_bg_hidan_hamstep.h

* fix math

Co-authored-by: Zelllll <elijah@DESKTOP-NMP1I89.localdomain>
This commit is contained in:
Zelllll 2020-12-29 21:48:57 -06:00 • committed by GitHub
parent 1facd83c38
commit 257fc54195
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
21 changed files with 373 additions and 1077 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s
View file

@ -1,24 +0,0 @@
glabel BgHidanHamstep_Destroy
/* 00434 80888474 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00438 80888478 00803825 */ or $a3, $a0, $zero ## $a3 = 00000000
/* 0043C 8088847C AFBF0014 */ sw $ra, 0x0014($sp)
/* 00440 80888480 AFA5001C */ sw $a1, 0x001C($sp)
/* 00444 80888484 8CE6014C */ lw $a2, 0x014C($a3) ## 0000014C
/* 00448 80888488 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 0044C 8088848C 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810
/* 00450 80888490 0C00FB56 */ jal DynaPolyInfo_Free
## DynaPolyInfo_delReserve
/* 00454 80888494 AFA70018 */ sw $a3, 0x0018($sp)
/* 00458 80888498 8FA70018 */ lw $a3, 0x0018($sp)
/* 0045C 8088849C 8FA4001C */ lw $a0, 0x001C($sp)
/* 00460 808884A0 84EF001C */ lh $t7, 0x001C($a3) ## 0000001C
/* 00464 808884A4 31F800FF */ andi $t8, $t7, 0x00FF ## $t8 = 00000000
/* 00468 808884A8 57000004 */ bnel $t8, $zero, .L808884BC
/* 0046C 808884AC 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00470 808884B0 0C017232 */ jal Collider_DestroyTris
/* 00474 808884B4 24E50164 */ addiu $a1, $a3, 0x0164 ## $a1 = 00000164
/* 00478 808884B8 8FBF0014 */ lw $ra, 0x0014($sp)
.L808884BC:
/* 0047C 808884BC 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 00480 808884C0 03E00008 */ jr $ra
/* 00484 808884C4 00000000 */ nop

84
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s
View file

@ -1,84 +0,0 @@
.rdata
glabel D_80888F84
.asciz "../z_bg_hidan_hamstep.c"
.balign 4
glabel D_80888F9C
.asciz "../z_bg_hidan_hamstep.c"
.balign 4
glabel D_80888FB4
.asciz "../z_bg_hidan_hamstep.c"
.balign 4
.text
glabel BgHidanHamstep_Draw
/* 00C28 80888C68 27BDFFB8 */ addiu $sp, $sp, 0xFFB8 ## $sp = FFFFFFB8
/* 00C2C 80888C6C AFBF001C */ sw $ra, 0x001C($sp)
/* 00C30 80888C70 AFB00018 */ sw $s0, 0x0018($sp)
/* 00C34 80888C74 AFA40048 */ sw $a0, 0x0048($sp)
/* 00C38 80888C78 AFA5004C */ sw $a1, 0x004C($sp)
/* 00C3C 80888C7C 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000
/* 00C40 80888C80 3C068089 */ lui $a2, %hi(D_80888F84) ## $a2 = 80890000
/* 00C44 80888C84 24C68F84 */ addiu $a2, $a2, %lo(D_80888F84) ## $a2 = 80888F84
/* 00C48 80888C88 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC
/* 00C4C 80888C8C 2407030E */ addiu $a3, $zero, 0x030E ## $a3 = 0000030E
/* 00C50 80888C90 0C031AB1 */ jal Graph_OpenDisps
/* 00C54 80888C94 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000
/* 00C58 80888C98 8FAF004C */ lw $t7, 0x004C($sp)
/* 00C5C 80888C9C 0C024F46 */ jal func_80093D18
/* 00C60 80888CA0 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000
/* 00C64 80888CA4 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0
/* 00C68 80888CA8 3C19DA38 */ lui $t9, 0xDA38 ## $t9 = DA380000
/* 00C6C 80888CAC 37390003 */ ori $t9, $t9, 0x0003 ## $t9 = DA380003
/* 00C70 80888CB0 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008
/* 00C74 80888CB4 AE1802C0 */ sw $t8, 0x02C0($s0) ## 000002C0
/* 00C78 80888CB8 AC590000 */ sw $t9, 0x0000($v0) ## 00000000
/* 00C7C 80888CBC 8FA8004C */ lw $t0, 0x004C($sp)
/* 00C80 80888CC0 3C058089 */ lui $a1, %hi(D_80888F9C) ## $a1 = 80890000
/* 00C84 80888CC4 24A58F9C */ addiu $a1, $a1, %lo(D_80888F9C) ## $a1 = 80888F9C
/* 00C88 80888CC8 8D040000 */ lw $a0, 0x0000($t0) ## 00000000
/* 00C8C 80888CCC 24060313 */ addiu $a2, $zero, 0x0313 ## $a2 = 00000313
/* 00C90 80888CD0 0C0346A2 */ jal Matrix_NewMtx
/* 00C94 80888CD4 AFA20030 */ sw $v0, 0x0030($sp)
/* 00C98 80888CD8 8FA30030 */ lw $v1, 0x0030($sp)
/* 00C9C 80888CDC 3C068089 */ lui $a2, %hi(D_80888FB4) ## $a2 = 80890000
/* 00CA0 80888CE0 3C0DDE00 */ lui $t5, 0xDE00 ## $t5 = DE000000
/* 00CA4 80888CE4 AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 00CA8 80888CE8 8FA90048 */ lw $t1, 0x0048($sp)
/* 00CAC 80888CEC 3C18DE00 */ lui $t8, 0xDE00 ## $t8 = DE000000
/* 00CB0 80888CF0 24C68FB4 */ addiu $a2, $a2, %lo(D_80888FB4) ## $a2 = 80888FB4
/* 00CB4 80888CF4 852A001C */ lh $t2, 0x001C($t1) ## 0000001C
/* 00CB8 80888CF8 27A40034 */ addiu $a0, $sp, 0x0034 ## $a0 = FFFFFFEC
/* 00CBC 80888CFC 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000
/* 00CC0 80888D00 5560000A */ bnel $t3, $zero, .L80888D2C
/* 00CC4 80888D04 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0
/* 00CC8 80888D08 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0
/* 00CCC 80888D0C 3C0E0601 */ lui $t6, %hi(D_0600A668) ## $t6 = 06010000
/* 00CD0 80888D10 25CEA668 */ addiu $t6, $t6, %lo(D_0600A668) ## $t6 = 0600A668
/* 00CD4 80888D14 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = 00000008
/* 00CD8 80888D18 AE0C02C0 */ sw $t4, 0x02C0($s0) ## 000002C0
/* 00CDC 80888D1C AC4E0004 */ sw $t6, 0x0004($v0) ## 00000004
/* 00CE0 80888D20 10000008 */ beq $zero, $zero, .L80888D44
/* 00CE4 80888D24 AC4D0000 */ sw $t5, 0x0000($v0) ## 00000000
/* 00CE8 80888D28 8E0202C0 */ lw $v0, 0x02C0($s0) ## 000002C0
.L80888D2C:
/* 00CEC 80888D2C 3C190601 */ lui $t9, %hi(D_0600A548) ## $t9 = 06010000
/* 00CF0 80888D30 2739A548 */ addiu $t9, $t9, %lo(D_0600A548) ## $t9 = 0600A548
/* 00CF4 80888D34 244F0008 */ addiu $t7, $v0, 0x0008 ## $t7 = 00000008
/* 00CF8 80888D38 AE0F02C0 */ sw $t7, 0x02C0($s0) ## 000002C0
/* 00CFC 80888D3C AC590004 */ sw $t9, 0x0004($v0) ## 00000004
/* 00D00 80888D40 AC580000 */ sw $t8, 0x0000($v0) ## 00000000
.L80888D44:
/* 00D04 80888D44 8FA8004C */ lw $t0, 0x004C($sp)
/* 00D08 80888D48 2407031C */ addiu $a3, $zero, 0x031C ## $a3 = 0000031C
/* 00D0C 80888D4C 0C031AD5 */ jal Graph_CloseDisps
/* 00D10 80888D50 8D050000 */ lw $a1, 0x0000($t0) ## 00000000
/* 00D14 80888D54 8FBF001C */ lw $ra, 0x001C($sp)
/* 00D18 80888D58 8FB00018 */ lw $s0, 0x0018($sp)
/* 00D1C 80888D5C 27BD0048 */ addiu $sp, $sp, 0x0048 ## $sp = 00000000
/* 00D20 80888D60 03E00008 */ jr $ra
/* 00D24 80888D64 00000000 */ nop
/* 00D28 80888D68 00000000 */ nop
.L80888D6C:
/* 00D2C 80888D6C 00000000 */ nop

212
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s
View file

@ -1,212 +0,0 @@
.rdata
glabel D_80888EA0
.asciz "◯◯◯炎の神殿オブジェクト【ハンマーステップ】出現\n"
.balign 4
glabel D_80888ED4
.asciz "【ハンマーステップ】 足場産れない！！\n"
.balign 4
glabel D_80888EFC
.asciz "%s %d\n"
.balign 4
glabel D_80888F04
.asciz "../z_bg_hidan_hamstep.c"
.balign 4
.late_rodata
glabel D_80888FCC
.float -1.2
.text
glabel BgHidanHamstep_Init
/* 00198 808881D8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88
/* 0019C 808881DC AFBF002C */ sw $ra, 0x002C($sp)
/* 001A0 808881E0 AFB00020 */ sw $s0, 0x0020($sp)
/* 001A4 808881E4 AFA5007C */ sw $a1, 0x007C($sp)
/* 001A8 808881E8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 001AC 808881EC AFB20028 */ sw $s2, 0x0028($sp)
/* 001B0 808881F0 AFB10024 */ sw $s1, 0x0024($sp)
/* 001B4 808881F4 AFA0006C */ sw $zero, 0x006C($sp)
/* 001B8 808881F8 0C010D20 */ jal DynaPolyInfo_SetActorMove
/* 001BC 808881FC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001
/* 001C0 80888200 3C058089 */ lui $a1, %hi(D_80888E40) ## $a1 = 80890000
/* 001C4 80888204 24A58E40 */ addiu $a1, $a1, %lo(D_80888E40) ## $a1 = 80888E40
/* 001C8 80888208 0C01E037 */ jal Actor_ProcessInitChain
/* 001CC 8088820C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 001D0 80888210 8602001C */ lh $v0, 0x001C($s0) ## 0000001C
/* 001D4 80888214 8FA4007C */ lw $a0, 0x007C($sp)
/* 001D8 80888218 26120164 */ addiu $s2, $s0, 0x0164 ## $s2 = 00000164
/* 001DC 8088821C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000
/* 001E0 80888220 14400030 */ bne $v0, $zero, .L808882E4
/* 001E4 80888224 00000000 */ nop
/* 001E8 80888228 0C0171F8 */ jal Collider_InitTris
/* 001EC 8088822C 02402825 */ or $a1, $s2, $zero ## $a1 = 00000164
/* 001F0 80888230 3C078089 */ lui $a3, %hi(D_80888DFC) ## $a3 = 80890000
/* 001F4 80888234 260E0184 */ addiu $t6, $s0, 0x0184 ## $t6 = 00000184
/* 001F8 80888238 AFAE0010 */ sw $t6, 0x0010($sp)
/* 001FC 8088823C 24E78DFC */ addiu $a3, $a3, %lo(D_80888DFC) ## $a3 = 80888DFC
/* 00200 80888240 8FA4007C */ lw $a0, 0x007C($sp)
/* 00204 80888244 02402825 */ or $a1, $s2, $zero ## $a1 = 00000164
/* 00208 80888248 0C0172EB */ jal Collider_SetTris
/* 0020C 8088824C 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 00210 80888250 00008825 */ or $s1, $zero, $zero ## $s1 = 00000000
/* 00214 80888254 27A8006C */ addiu $t0, $sp, 0x006C ## $t0 = FFFFFFF4
.L80888258:
/* 00218 80888258 3C0F8089 */ lui $t7, %hi(D_80888E08) ## $t7 = 80890000
/* 0021C 8088825C 8DEF8E08 */ lw $t7, %lo(D_80888E08)($t7)
/* 00220 80888260 0011C100 */ sll $t8, $s1, 4
/* 00224 80888264 0311C023 */ subu $t8, $t8, $s1
/* 00228 80888268 0018C080 */ sll $t8, $t8, 2
/* 0022C 8088826C 27A20048 */ addiu $v0, $sp, 0x0048 ## $v0 = FFFFFFD0
/* 00230 80888270 01F81821 */ addu $v1, $t7, $t8
.L80888274:
/* 00234 80888274 C4640018 */ lwc1 $f4, 0x0018($v1) ## 00000018
/* 00238 80888278 C6060008 */ lwc1 $f6, 0x0008($s0) ## 00000008
/* 0023C 8088827C 2442000C */ addiu $v0, $v0, 0x000C ## $v0 = FFFFFFDC
/* 00240 80888280 2463000C */ addiu $v1, $v1, 0x000C ## $v1 = 0000000C
/* 00244 80888284 46062200 */ add.s $f8, $f4, $f6
/* 00248 80888288 E448FFF4 */ swc1 $f8, -0x000C($v0) ## FFFFFFD0
/* 0024C 8088828C C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C
/* 00250 80888290 C46A0010 */ lwc1 $f10, 0x0010($v1) ## 0000001C
/* 00254 80888294 46105480 */ add.s $f18, $f10, $f16
/* 00258 80888298 E452FFF8 */ swc1 $f18, -0x0008($v0) ## FFFFFFD4
/* 0025C 8088829C C6060010 */ lwc1 $f6, 0x0010($s0) ## 00000010
/* 00260 808882A0 C4640014 */ lwc1 $f4, 0x0014($v1) ## 00000020
/* 00264 808882A4 46062200 */ add.s $f8, $f4, $f6
/* 00268 808882A8 1448FFF2 */ bne $v0, $t0, .L80888274
/* 0026C 808882AC E448FFFC */ swc1 $f8, -0x0004($v0) ## FFFFFFD8
/* 00270 808882B0 27B90060 */ addiu $t9, $sp, 0x0060 ## $t9 = FFFFFFE8
/* 00274 808882B4 AFB90010 */ sw $t9, 0x0010($sp)
/* 00278 808882B8 02402025 */ or $a0, $s2, $zero ## $a0 = 00000164
/* 0027C 808882BC 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 00280 808882C0 27A60048 */ addiu $a2, $sp, 0x0048 ## $a2 = FFFFFFD0
/* 00284 808882C4 0C0189E8 */ jal func_800627A0
/* 00288 808882C8 27A70054 */ addiu $a3, $sp, 0x0054 ## $a3 = FFFFFFDC
/* 0028C 808882CC 26310001 */ addiu $s1, $s1, 0x0001 ## $s1 = 00000001
/* 00290 808882D0 24010002 */ addiu $at, $zero, 0x0002 ## $at = 00000002
/* 00294 808882D4 1621FFE0 */ bne $s1, $at, .L80888258
/* 00298 808882D8 27A8006C */ addiu $t0, $sp, 0x006C ## $t0 = FFFFFFF4
/* 0029C 808882DC 8602001C */ lh $v0, 0x001C($s0) ## 0000001C
/* 002A0 808882E0 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000
.L808882E4:
/* 002A4 808882E4 14400007 */ bne $v0, $zero, .L80888304
/* 002A8 808882E8 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000
/* 002AC 808882EC 3C040601 */ lui $a0, %hi(D_0600DE44) ## $a0 = 06010000
/* 002B0 808882F0 2484DE44 */ addiu $a0, $a0, %lo(D_0600DE44) ## $a0 = 0600DE44
/* 002B4 808882F4 0C010620 */ jal DynaPolyInfo_Alloc
/* 002B8 808882F8 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4
/* 002BC 808882FC 10000005 */ beq $zero, $zero, .L80888314
/* 002C0 80888300 8FA4007C */ lw $a0, 0x007C($sp)
.L80888304:
/* 002C4 80888304 2484DD1C */ addiu $a0, $a0, 0xDD1C ## $a0 = FFFFDD1C
/* 002C8 80888308 0C010620 */ jal DynaPolyInfo_Alloc
/* 002CC 8088830C 27A5006C */ addiu $a1, $sp, 0x006C ## $a1 = FFFFFFF4
/* 002D0 80888310 8FA4007C */ lw $a0, 0x007C($sp)
.L80888314:
/* 002D4 80888314 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 002D8 80888318 8FA7006C */ lw $a3, 0x006C($sp)
/* 002DC 8088831C 0C00FA9D */ jal DynaPolyInfo_RegisterActor
## DynaPolyInfo_setActor
/* 002E0 80888320 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810
/* 002E4 80888324 8605001C */ lh $a1, 0x001C($s0) ## 0000001C
/* 002E8 80888328 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C
/* 002EC 8088832C 8FA4007C */ lw $a0, 0x007C($sp)
/* 002F0 80888330 00052A03 */ sra $a1, $a1, 8
/* 002F4 80888334 0C00B2D0 */ jal Flags_GetSwitch
/* 002F8 80888338 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 00000000
/* 002FC 8088833C 5040001B */ beql $v0, $zero, .L808883AC
/* 00300 80888340 860A001C */ lh $t2, 0x001C($s0) ## 0000001C
/* 00304 80888344 8602001C */ lh $v0, 0x001C($s0) ## 0000001C
/* 00308 80888348 3C018089 */ lui $at, %hi(.L80888D6C) ## $at = 80890000
/* 0030C 8088834C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000
/* 00310 80888350 1440000B */ bne $v0, $zero, .L80888380
/* 00314 80888354 00024880 */ sll $t1, $v0, 2
/* 00318 80888358 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000
/* 0031C 8088835C 44818000 */ mtc1 $at, $f16 ## $f16 = -20.00
/* 00320 80888360 C60A000C */ lwc1 $f10, 0x000C($s0) ## 0000000C
/* 00324 80888364 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00328 80888368 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004
/* 0032C 8088836C 46105480 */ add.s $f18, $f10, $f16
/* 00330 80888370 0C222010 */ jal func_80888040
/* 00334 80888374 E6120028 */ swc1 $f18, 0x0028($s0) ## 00000028
/* 00338 80888378 10000017 */ beq $zero, $zero, .L808883D8
/* 0033C 8088837C 00000000 */ nop
.L80888380:
/* 00340 80888380 00290821 */ addu $at, $at, $t1
/* 00344 80888384 C4248D6C */ lwc1 $f4, %lo(.L80888D6C)($at)
/* 00348 80888388 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C
/* 0034C 8088838C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00350 80888390 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004
/* 00354 80888394 46062200 */ add.s $f8, $f4, $f6
/* 00358 80888398 0C222010 */ jal func_80888040
/* 0035C 8088839C E6080028 */ swc1 $f8, 0x0028($s0) ## 00000028
/* 00360 808883A0 1000000D */ beq $zero, $zero, .L808883D8
/* 00364 808883A4 00000000 */ nop
/* 00368 808883A8 860A001C */ lh $t2, 0x001C($s0) ## 0000001C
.L808883AC:
/* 0036C 808883AC 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 00370 808883B0 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00374 808883B4 314B00FF */ andi $t3, $t2, 0x00FF ## $t3 = 00000000
/* 00378 808883B8 15600005 */ bne $t3, $zero, .L808883D0
/* 0037C 808883BC 00000000 */ nop
/* 00380 808883C0 0C222010 */ jal func_80888040
/* 00384 808883C4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00388 808883C8 10000003 */ beq $zero, $zero, .L808883D8
/* 0038C 808883CC 00000000 */ nop
.L808883D0:
/* 00390 808883D0 0C222010 */ jal func_80888040
/* 00394 808883D4 24050002 */ addiu $a1, $zero, 0x0002 ## $a1 = 00000002
.L808883D8:
/* 00398 808883D8 3C018089 */ lui $at, %hi(D_80888FCC) ## $at = 80890000
/* 0039C 808883DC C42A8FCC */ lwc1 $f10, %lo(D_80888FCC)($at)
/* 003A0 808883E0 860C001C */ lh $t4, 0x001C($s0) ## 0000001C
/* 003A4 808883E4 3C01C140 */ lui $at, 0xC140 ## $at = C1400000
/* 003A8 808883E8 44818000 */ mtc1 $at, $f16 ## $f16 = -12.00
/* 003AC 808883EC 318D00FF */ andi $t5, $t4, 0x00FF ## $t5 = 00000000
/* 003B0 808883F0 E60A006C */ swc1 $f10, 0x006C($s0) ## 0000006C
/* 003B4 808883F4 15A00019 */ bne $t5, $zero, .L8088845C
/* 003B8 808883F8 E6100070 */ swc1 $f16, 0x0070($s0) ## 00000070
/* 003BC 808883FC 3C048089 */ lui $a0, %hi(D_80888EA0) ## $a0 = 80890000
/* 003C0 80888400 0C00084C */ jal osSyncPrintf
/* 003C4 80888404 24848EA0 */ addiu $a0, $a0, %lo(D_80888EA0) ## $a0 = 80888EA0
/* 003C8 80888408 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 003CC 8088840C 0C222017 */ jal func_8088805C
/* 003D0 80888410 8FA5007C */ lw $a1, 0x007C($sp)
/* 003D4 80888414 14400011 */ bne $v0, $zero, .L8088845C
/* 003D8 80888418 02008825 */ or $s1, $s0, $zero ## $s1 = 00000000
/* 003DC 8088841C 3C048089 */ lui $a0, %hi(D_80888ED4) ## $a0 = 80890000
/* 003E0 80888420 0C00084C */ jal osSyncPrintf
/* 003E4 80888424 24848ED4 */ addiu $a0, $a0, %lo(D_80888ED4) ## $a0 = 80888ED4
/* 003E8 80888428 3C048089 */ lui $a0, %hi(D_80888EFC) ## $a0 = 80890000
/* 003EC 8088842C 3C058089 */ lui $a1, %hi(D_80888F04) ## $a1 = 80890000
/* 003F0 80888430 24A58F04 */ addiu $a1, $a1, %lo(D_80888F04) ## $a1 = 80888F04
/* 003F4 80888434 24848EFC */ addiu $a0, $a0, %lo(D_80888EFC) ## $a0 = 80888EFC
/* 003F8 80888438 0C00084C */ jal osSyncPrintf
/* 003FC 8088843C 240601A9 */ addiu $a2, $zero, 0x01A9 ## $a2 = 000001A9
/* 00400 80888440 52000007 */ beql $s0, $zero, .L80888460
/* 00404 80888444 8FBF002C */ lw $ra, 0x002C($sp)
.L80888448:
/* 00408 80888448 0C00B55C */ jal Actor_Kill
/* 0040C 8088844C 02202025 */ or $a0, $s1, $zero ## $a0 = 00000000
/* 00410 80888450 8E31011C */ lw $s1, 0x011C($s1) ## 0000011C
/* 00414 80888454 1620FFFC */ bne $s1, $zero, .L80888448
/* 00418 80888458 00000000 */ nop
.L8088845C:
/* 0041C 8088845C 8FBF002C */ lw $ra, 0x002C($sp)
.L80888460:
/* 00420 80888460 8FB00020 */ lw $s0, 0x0020($sp)
/* 00424 80888464 8FB10024 */ lw $s1, 0x0024($sp)
/* 00428 80888468 8FB20028 */ lw $s2, 0x0028($sp)
/* 0042C 8088846C 03E00008 */ jr $ra
/* 00430 80888470 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000

10
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Update.s
View file

@ -1,10 +0,0 @@
glabel BgHidanHamstep_Update
/* 00C04 80888C44 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00C08 80888C48 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00C0C 80888C4C 8C99023C */ lw $t9, 0x023C($a0) ## 0000023C
/* 00C10 80888C50 0320F809 */ jalr $ra, $t9
/* 00C14 80888C54 00000000 */ nop
/* 00C18 80888C58 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00C1C 80888C5C 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 00C20 80888C60 03E00008 */ jr $ra
/* 00C24 80888C64 00000000 */ nop

8
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888040.s
View file

@ -1,8 +0,0 @@
glabel func_80888040
/* 00000 80888040 00057080 */ sll $t6, $a1, 2
/* 00004 80888044 3C0F8089 */ lui $t7, %hi(D_80888E2C) ## $t7 = 80890000
/* 00008 80888048 AC850240 */ sw $a1, 0x0240($a0) ## 00000240
/* 0000C 8088804C 01EE7821 */ addu $t7, $t7, $t6
/* 00010 80888050 8DEF8E2C */ lw $t7, %lo(D_80888E2C)($t7)
/* 00014 80888054 03E00008 */ jr $ra
/* 00018 80888058 AC8F023C */ sw $t7, 0x023C($a0) ## 0000023C

102
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s
View file

@ -1,102 +0,0 @@
glabel func_8088805C
/* 0001C 8088805C 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78
/* 00020 80888060 AFBF006C */ sw $ra, 0x006C($sp)
/* 00024 80888064 AFB50068 */ sw $s5, 0x0068($sp)
/* 00028 80888068 AFB40064 */ sw $s4, 0x0064($sp)
/* 0002C 8088806C AFB30060 */ sw $s3, 0x0060($sp)
/* 00030 80888070 AFB2005C */ sw $s2, 0x005C($sp)
/* 00034 80888074 AFB10058 */ sw $s1, 0x0058($sp)
/* 00038 80888078 AFB00054 */ sw $s0, 0x0054($sp)
/* 0003C 8088807C F7BA0048 */ sdc1 $f26, 0x0048($sp)
/* 00040 80888080 F7B80040 */ sdc1 $f24, 0x0040($sp)
/* 00044 80888084 F7B60038 */ sdc1 $f22, 0x0038($sp)
/* 00048 80888088 F7B40030 */ sdc1 $f20, 0x0030($sp)
/* 0004C 8088808C 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000
/* 00050 80888090 44813000 */ mtc1 $at, $f6 ## $f6 = 100.00
/* 00054 80888094 C484000C */ lwc1 $f4, 0x000C($a0) ## 0000000C
/* 00058 80888098 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 0005C 8088809C 34118000 */ ori $s1, $zero, 0x8000 ## $s1 = 00008000
/* 00060 808880A0 46062201 */ sub.s $f8, $f4, $f6
/* 00064 808880A4 00809025 */ or $s2, $a0, $zero ## $s2 = 00000000
/* 00068 808880A8 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000
/* 0006C 808880AC E7A80078 */ swc1 $f8, 0x0078($sp)
/* 00070 808880B0 848E00B6 */ lh $t6, 0x00B6($a0) ## 000000B6
/* 00074 808880B4 01D12021 */ addu $a0, $t6, $s1
/* 00078 808880B8 00042400 */ sll $a0, $a0, 16
/* 0007C 808880BC 0C01DE1C */ jal Math_SinS
## sins?
/* 00080 808880C0 00042403 */ sra $a0, $a0, 16
/* 00084 808880C4 860F00B6 */ lh $t7, 0x00B6($s0) ## 000000B6
/* 00088 808880C8 46000506 */ mov.s $f20, $f0
/* 0008C 808880CC 01F12021 */ addu $a0, $t7, $s1
/* 00090 808880D0 00042400 */ sll $a0, $a0, 16
/* 00094 808880D4 0C01DE0D */ jal Math_CosS
## coss?
/* 00098 808880D8 00042403 */ sra $a0, $a0, 16
/* 0009C 808880DC 3C014270 */ lui $at, 0x4270 ## $at = 42700000
/* 000A0 808880E0 4481D000 */ mtc1 $at, $f26 ## $f26 = 60.00
/* 000A4 808880E4 3C014320 */ lui $at, 0x4320 ## $at = 43200000
/* 000A8 808880E8 4481C000 */ mtc1 $at, $f24 ## $f24 = 160.00
/* 000AC 808880EC 46000586 */ mov.s $f22, $f0
/* 000B0 808880F0 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000
/* 000B4 808880F4 26741C24 */ addiu $s4, $s3, 0x1C24 ## $s4 = 00001C24
/* 000B8 808880F8 24150005 */ addiu $s5, $zero, 0x0005 ## $s5 = 00000005
.L808880FC:
/* 000BC 808880FC 44825000 */ mtc1 $v0, $f10 ## $f10 = 0.00
/* 000C0 80888100 C6060008 */ lwc1 $f6, 0x0008($s0) ## 00000008
/* 000C4 80888104 24510001 */ addiu $s1, $v0, 0x0001 ## $s1 = 00000001
/* 000C8 80888108 46805420 */ cvt.s.w $f16, $f10
/* 000CC 8088810C 322800FF */ andi $t0, $s1, 0x00FF ## $t0 = 00000001
/* 000D0 80888110 02802025 */ or $a0, $s4, $zero ## $a0 = 00001C24
/* 000D4 80888114 02402825 */ or $a1, $s2, $zero ## $a1 = 00000000
/* 000D8 80888118 02603025 */ or $a2, $s3, $zero ## $a2 = 00000000
/* 000DC 8088811C 24070071 */ addiu $a3, $zero, 0x0071 ## $a3 = 00000071
/* 000E0 80888120 46188482 */ mul.s $f18, $f16, $f24
/* 000E4 80888124 461A9000 */ add.s $f0, $f18, $f26
/* 000E8 80888128 46140102 */ mul.s $f4, $f0, $f20
/* 000EC 8088812C 46062200 */ add.s $f8, $f4, $f6
/* 000F0 80888130 46160282 */ mul.s $f10, $f0, $f22
/* 000F4 80888134 C7A40078 */ lwc1 $f4, 0x0078($sp)
/* 000F8 80888138 E7A80074 */ swc1 $f8, 0x0074($sp)
/* 000FC 8088813C C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010
/* 00100 80888140 46105480 */ add.s $f18, $f10, $f16
/* 00104 80888144 E7B2007C */ swc1 $f18, 0x007C($sp)
/* 00108 80888148 8609001C */ lh $t1, 0x001C($s0) ## 0000001C
/* 0010C 8088814C E7B20018 */ swc1 $f18, 0x0018($sp)
/* 00110 80888150 E7A80010 */ swc1 $f8, 0x0010($sp)
/* 00114 80888154 E7A40014 */ swc1 $f4, 0x0014($sp)
/* 00118 80888158 860B0030 */ lh $t3, 0x0030($s0) ## 00000030
/* 0011C 8088815C 312AFF00 */ andi $t2, $t1, 0xFF00 ## $t2 = 00000000
/* 00120 80888160 010A1825 */ or $v1, $t0, $t2 ## $v1 = 00000001
/* 00124 80888164 AFAB001C */ sw $t3, 0x001C($sp)
/* 00128 80888168 860C0032 */ lh $t4, 0x0032($s0) ## 00000032
/* 0012C 8088816C 00031C00 */ sll $v1, $v1, 16
/* 00130 80888170 00031C03 */ sra $v1, $v1, 16
/* 00134 80888174 AFAC0020 */ sw $t4, 0x0020($sp)
/* 00138 80888178 860D0034 */ lh $t5, 0x0034($s0) ## 00000034
/* 0013C 8088817C AFA30028 */ sw $v1, 0x0028($sp)
/* 00140 80888180 0C00C916 */ jal Actor_SpawnAsChild
/* 00144 80888184 AFAD0024 */ sw $t5, 0x0024($sp)
/* 00148 80888188 14400003 */ bne $v0, $zero, .L80888198
/* 0014C 8088818C 00409025 */ or $s2, $v0, $zero ## $s2 = 00000000
/* 00150 80888190 10000004 */ beq $zero, $zero, .L808881A4
/* 00154 80888194 00001025 */ or $v0, $zero, $zero ## $v0 = 00000000
.L80888198:
/* 00158 80888198 1635FFD8 */ bne $s1, $s5, .L808880FC
/* 0015C 8088819C 02201025 */ or $v0, $s1, $zero ## $v0 = 00000001
/* 00160 808881A0 24020001 */ addiu $v0, $zero, 0x0001 ## $v0 = 00000001
.L808881A4:
/* 00164 808881A4 8FBF006C */ lw $ra, 0x006C($sp)
/* 00168 808881A8 D7B40030 */ ldc1 $f20, 0x0030($sp)
/* 0016C 808881AC D7B60038 */ ldc1 $f22, 0x0038($sp)
/* 00170 808881B0 D7B80040 */ ldc1 $f24, 0x0040($sp)
/* 00174 808881B4 D7BA0048 */ ldc1 $f26, 0x0048($sp)
/* 00178 808881B8 8FB00054 */ lw $s0, 0x0054($sp)
/* 0017C 808881BC 8FB10058 */ lw $s1, 0x0058($sp)
/* 00180 808881C0 8FB2005C */ lw $s2, 0x005C($sp)
/* 00184 808881C4 8FB30060 */ lw $s3, 0x0060($sp)
/* 00188 808881C8 8FB40064 */ lw $s4, 0x0064($sp)
/* 0018C 808881CC 8FB50068 */ lw $s5, 0x0068($sp)
/* 00190 808881D0 03E00008 */ jr $ra
/* 00194 808881D4 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000

96
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s
View file

@ -1,96 +0,0 @@
glabel func_808884C8
/* 00488 808884C8 27BDFF88 */ addiu $sp, $sp, 0xFF88 ## $sp = FFFFFF88
/* 0048C 808884CC AFBF0054 */ sw $ra, 0x0054($sp)
/* 00490 808884D0 AFB40050 */ sw $s4, 0x0050($sp)
/* 00494 808884D4 AFB3004C */ sw $s3, 0x004C($sp)
/* 00498 808884D8 AFB20048 */ sw $s2, 0x0048($sp)
/* 0049C 808884DC AFB10044 */ sw $s1, 0x0044($sp)
/* 004A0 808884E0 AFB00040 */ sw $s0, 0x0040($sp)
/* 004A4 808884E4 F7B80038 */ sdc1 $f24, 0x0038($sp)
/* 004A8 808884E8 F7B60030 */ sdc1 $f22, 0x0030($sp)
/* 004AC 808884EC F7B40028 */ sdc1 $f20, 0x0028($sp)
/* 004B0 808884F0 8C8F0024 */ lw $t7, 0x0024($a0) ## 00000024
/* 004B4 808884F4 27B4006C */ addiu $s4, $sp, 0x006C ## $s4 = FFFFFFF4
/* 004B8 808884F8 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000
/* 004BC 808884FC AE8F0000 */ sw $t7, 0x0000($s4) ## FFFFFFF4
/* 004C0 80888500 8C8E0028 */ lw $t6, 0x0028($a0) ## 00000028
/* 004C4 80888504 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00
/* 004C8 80888508 4480C000 */ mtc1 $zero, $f24 ## $f24 = 0.00
/* 004CC 8088850C AE8E0004 */ sw $t6, 0x0004($s4) ## FFFFFFF8
/* 004D0 80888510 8C8F002C */ lw $t7, 0x002C($a0) ## 0000002C
/* 004D4 80888514 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000
/* 004D8 80888518 00A09825 */ or $s3, $a1, $zero ## $s3 = 00000000
/* 004DC 8088851C AE8F0008 */ sw $t7, 0x0008($s4) ## FFFFFFFC
/* 004E0 80888520 C7A40070 */ lwc1 $f4, 0x0070($sp)
/* 004E4 80888524 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 004E8 80888528 24180258 */ addiu $t8, $zero, 0x0258 ## $t8 = 00000258
/* 004EC 8088852C 46062201 */ sub.s $f8, $f4, $f6
/* 004F0 80888530 2419012C */ addiu $t9, $zero, 0x012C ## $t9 = 0000012C
/* 004F4 80888534 4406C000 */ mfc1 $a2, $f24
/* 004F8 80888538 AFB90014 */ sw $t9, 0x0014($sp)
/* 004FC 8088853C E7A80070 */ swc1 $f8, 0x0070($sp)
/* 00500 80888540 AFB80010 */ sw $t8, 0x0010($sp)
/* 00504 80888544 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF4
/* 00508 80888548 AFA00018 */ sw $zero, 0x0018($sp)
/* 0050C 8088854C 0C00CD20 */ jal func_80033480
/* 00510 80888550 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000
/* 00514 80888554 862800B6 */ lh $t0, 0x00B6($s1) ## 000000B6
/* 00518 80888558 34108000 */ ori $s0, $zero, 0x8000 ## $s0 = 00008000
/* 0051C 8088855C 01102021 */ addu $a0, $t0, $s0
/* 00520 80888560 00042400 */ sll $a0, $a0, 16
/* 00524 80888564 0C01DE1C */ jal Math_SinS
## sins?
/* 00528 80888568 00042403 */ sra $a0, $a0, 16
/* 0052C 8088856C 862900B6 */ lh $t1, 0x00B6($s1) ## 000000B6
/* 00530 80888570 46000506 */ mov.s $f20, $f0
/* 00534 80888574 01302021 */ addu $a0, $t1, $s0
/* 00538 80888578 00042400 */ sll $a0, $a0, 16
/* 0053C 8088857C 0C01DE0D */ jal Math_CosS
## coss?
/* 00540 80888580 00042403 */ sra $a0, $a0, 16
/* 00544 80888584 C62A0028 */ lwc1 $f10, 0x0028($s1) ## 00000028
/* 00548 80888588 3C108089 */ lui $s0, %hi(D_80888E44) ## $s0 = 80890000
/* 0054C 8088858C 3C128089 */ lui $s2, %hi(D_80888E9C) ## $s2 = 80890000
/* 00550 80888590 46000586 */ mov.s $f22, $f0
/* 00554 80888594 26528E9C */ addiu $s2, $s2, %lo(D_80888E9C) ## $s2 = 80888E9C
/* 00558 80888598 26108E44 */ addiu $s0, $s0, %lo(D_80888E44) ## $s0 = 80888E44
/* 0055C 8088859C E7AA0070 */ swc1 $f10, 0x0070($sp)
/* 00560 808885A0 C6000000 */ lwc1 $f0, 0x0000($s0) ## 80888E44
.L808885A4:
/* 00564 808885A4 C6020004 */ lwc1 $f2, 0x0004($s0) ## 80888E48
/* 00568 808885A8 C6260024 */ lwc1 $f6, 0x0024($s1) ## 00000024
/* 0056C 808885AC 46160402 */ mul.s $f16, $f0, $f22
/* 00570 808885B0 4406C000 */ mfc1 $a2, $f24
/* 00574 808885B4 240A0096 */ addiu $t2, $zero, 0x0096 ## $t2 = 00000096
/* 00578 808885B8 46141482 */ mul.s $f18, $f2, $f20
/* 0057C 808885BC 240B0096 */ addiu $t3, $zero, 0x0096 ## $t3 = 00000096
/* 00580 808885C0 02602025 */ or $a0, $s3, $zero ## $a0 = 00000000
/* 00584 808885C4 46161282 */ mul.s $f10, $f2, $f22
/* 00588 808885C8 02802825 */ or $a1, $s4, $zero ## $a1 = FFFFFFF4
/* 0058C 808885CC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000
/* 00590 808885D0 46128100 */ add.s $f4, $f16, $f18
/* 00594 808885D4 46140402 */ mul.s $f16, $f0, $f20
/* 00598 808885D8 46062200 */ add.s $f8, $f4, $f6
/* 0059C 808885DC 46105481 */ sub.s $f18, $f10, $f16
/* 005A0 808885E0 E7A8006C */ swc1 $f8, 0x006C($sp)
/* 005A4 808885E4 C624002C */ lwc1 $f4, 0x002C($s1) ## 0000002C
/* 005A8 808885E8 AFA00018 */ sw $zero, 0x0018($sp)
/* 005AC 808885EC AFAB0014 */ sw $t3, 0x0014($sp)
/* 005B0 808885F0 46049180 */ add.s $f6, $f18, $f4
/* 005B4 808885F4 AFAA0010 */ sw $t2, 0x0010($sp)
/* 005B8 808885F8 0C00CD20 */ jal func_80033480
/* 005BC 808885FC E7A60074 */ swc1 $f6, 0x0074($sp)
/* 005C0 80888600 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 80888E4C
/* 005C4 80888604 5612FFE7 */ bnel $s0, $s2, .L808885A4
/* 005C8 80888608 C6000000 */ lwc1 $f0, 0x0000($s0) ## 80888E4C
/* 005CC 8088860C 8FBF0054 */ lw $ra, 0x0054($sp)
/* 005D0 80888610 D7B40028 */ ldc1 $f20, 0x0028($sp)
/* 005D4 80888614 D7B60030 */ ldc1 $f22, 0x0030($sp)
/* 005D8 80888618 D7B80038 */ ldc1 $f24, 0x0038($sp)
/* 005DC 8088861C 8FB00040 */ lw $s0, 0x0040($sp)
/* 005E0 80888620 8FB10044 */ lw $s1, 0x0044($sp)
/* 005E4 80888624 8FB20048 */ lw $s2, 0x0048($sp)
/* 005E8 80888628 8FB3004C */ lw $s3, 0x004C($sp)
/* 005EC 8088862C 8FB40050 */ lw $s4, 0x0050($sp)
/* 005F0 80888630 03E00008 */ jr $ra
/* 005F4 80888634 27BD0078 */ addiu $sp, $sp, 0x0078 ## $sp = 00000000

27
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888638.s
View file

@ -1,27 +0,0 @@
glabel func_80888638
/* 005F8 80888638 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0
/* 005FC 8088863C AFBF001C */ sw $ra, 0x001C($sp)
/* 00600 80888640 AFB10018 */ sw $s1, 0x0018($sp)
/* 00604 80888644 AFB00014 */ sw $s0, 0x0014($sp)
/* 00608 80888648 8C90011C */ lw $s0, 0x011C($a0) ## 0000011C
/* 0060C 8088864C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000
/* 00610 80888650 5200000C */ beql $s0, $zero, .L80888684
/* 00614 80888654 8FBF001C */ lw $ra, 0x001C($sp)
/* 00618 80888658 860E001C */ lh $t6, 0x001C($s0) ## 0000001C
.L8088865C:
/* 0061C 8088865C 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00620 80888660 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000
/* 00624 80888664 51E00004 */ beql $t7, $zero, .L80888678
/* 00628 80888668 8E10011C */ lw $s0, 0x011C($s0) ## 0000011C
/* 0062C 8088866C 0C222132 */ jal func_808884C8
/* 00630 80888670 02202825 */ or $a1, $s1, $zero ## $a1 = 00000000
/* 00634 80888674 8E10011C */ lw $s0, 0x011C($s0) ## 0000011C
.L80888678:
/* 00638 80888678 5600FFF8 */ bnel $s0, $zero, .L8088865C
/* 0063C 8088867C 860E001C */ lh $t6, 0x001C($s0) ## 0000001C
/* 00640 80888680 8FBF001C */ lw $ra, 0x001C($sp)
.L80888684:
/* 00644 80888684 8FB00014 */ lw $s0, 0x0014($sp)
/* 00648 80888688 8FB10018 */ lw $s1, 0x0018($sp)
/* 0064C 8088868C 03E00008 */ jr $ra
/* 00650 80888690 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000

47
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888694.s
View file

@ -1,47 +0,0 @@
glabel func_80888694
/* 00654 80888694 848E001C */ lh $t6, 0x001C($a0) ## 0000001C
/* 00658 80888698 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000
/* 0065C 8088869C 29E10002 */ slti $at, $t7, 0x0002
/* 00660 808886A0 54200016 */ bnel $at, $zero, .L808886FC
/* 00664 808886A4 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C
/* 00668 808886A8 C4A00028 */ lwc1 $f0, 0x0028($a1) ## 00000028
/* 0066C 808886AC C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028
/* 00670 808886B0 3C01C2C8 */ lui $at, 0xC2C8 ## $at = C2C80000
/* 00674 808886B4 4602003C */ c.lt.s $f0, $f2
/* 00678 808886B8 00000000 */ nop
/* 0067C 808886BC 45020004 */ bc1fl .L808886D0
/* 00680 808886C0 46001101 */ sub.s $f4, $f2, $f0
/* 00684 808886C4 1000000C */ beq $zero, $zero, .L808886F8
/* 00688 808886C8 E4800028 */ swc1 $f0, 0x0028($a0) ## 00000028
/* 0068C 808886CC 46001101 */ sub.s $f4, $f2, $f0
.L808886D0:
/* 00690 808886D0 44813000 */ mtc1 $at, $f6 ## $f6 = -100.00
/* 00694 808886D4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000
/* 00698 808886D8 4606203C */ c.lt.s $f4, $f6
/* 0069C 808886DC 00000000 */ nop
/* 006A0 808886E0 45020006 */ bc1fl .L808886FC
/* 006A4 808886E4 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C
/* 006A8 808886E8 44814000 */ mtc1 $at, $f8 ## $f8 = 100.00
/* 006AC 808886EC 00000000 */ nop
/* 006B0 808886F0 46080281 */ sub.s $f10, $f0, $f8
/* 006B4 808886F4 E48A0028 */ swc1 $f10, 0x0028($a0) ## 00000028
.L808886F8:
/* 006B8 808886F8 8C82011C */ lw $v0, 0x011C($a0) ## 0000011C
.L808886FC:
/* 006BC 808886FC 1040000B */ beq $v0, $zero, .L8088872C
/* 006C0 80888700 00000000 */ nop
/* 006C4 80888704 C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028
.L80888708:
/* 006C8 80888708 C4500028 */ lwc1 $f16, 0x0028($v0) ## 00000028
/* 006CC 8088870C 4610103C */ c.lt.s $f2, $f16
/* 006D0 80888710 00000000 */ nop
/* 006D4 80888714 45020003 */ bc1fl .L80888724
/* 006D8 80888718 8C42011C */ lw $v0, 0x011C($v0) ## 0000011C
/* 006DC 8088871C E4420028 */ swc1 $f2, 0x0028($v0) ## 00000028
/* 006E0 80888720 8C42011C */ lw $v0, 0x011C($v0) ## 0000011C
.L80888724:
/* 006E4 80888724 5440FFF8 */ bnel $v0, $zero, .L80888708
/* 006E8 80888728 C4820028 */ lwc1 $f2, 0x0028($a0) ## 00000028
.L8088872C:
/* 006EC 8088872C 03E00008 */ jr $ra
/* 006F0 80888730 00000000 */ nop

40
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s
View file

@ -1,40 +0,0 @@
glabel func_80888734
/* 006F4 80888734 3C0E8016 */ lui $t6, %hi(gGameInfo)
/* 006F8 80888738 8DCEFA90 */ lw $t6, %lo(gGameInfo)($t6)
/* 006FC 8088873C 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00700 80888740 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00704 80888744 85CF0110 */ lh $t7, 0x0110($t6) ## 80160110
/* 00708 80888748 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000
/* 0070C 8088874C 44814000 */ mtc1 $at, $f8 ## $f8 = 0.50
/* 00710 80888750 448F2000 */ mtc1 $t7, $f4 ## $f4 = 0.00
/* 00714 80888754 8C850118 */ lw $a1, 0x0118($a0) ## 00000118
/* 00718 80888758 468021A0 */ cvt.s.w $f6, $f4
/* 0071C 8088875C 46083002 */ mul.s $f0, $f6, $f8
/* 00720 80888760 50A00015 */ beql $a1, $zero, .L808887B8
/* 00724 80888764 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00728 80888768 8498001C */ lh $t8, 0x001C($a0) ## 0000001C
/* 0072C 8088876C C4AA0060 */ lwc1 $f10, 0x0060($a1) ## 00000060
/* 00730 80888770 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001
/* 00734 80888774 331900FF */ andi $t9, $t8, 0x00FF ## $t9 = 00000000
/* 00738 80888778 17210007 */ bne $t9, $at, .L80888798
/* 0073C 8088877C E48A0060 */ swc1 $f10, 0x0060($a0) ## 00000060
/* 00740 80888780 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000
/* 00744 80888784 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00
/* 00748 80888788 C4B00028 */ lwc1 $f16, 0x0028($a1) ## 00000028
/* 0074C 8088878C 46128101 */ sub.s $f4, $f16, $f18
/* 00750 80888790 10000006 */ beq $zero, $zero, .L808887AC
/* 00754 80888794 E4840028 */ swc1 $f4, 0x0028($a0) ## 00000028
.L80888798:
/* 00758 80888798 C4880060 */ lwc1 $f8, 0x0060($a0) ## 00000060
/* 0075C 8088879C C4860028 */ lwc1 $f6, 0x0028($a0) ## 00000028
/* 00760 808887A0 46004282 */ mul.s $f10, $f8, $f0
/* 00764 808887A4 460A3400 */ add.s $f16, $f6, $f10
/* 00768 808887A8 E4900028 */ swc1 $f16, 0x0028($a0) ## 00000028
.L808887AC:
/* 0076C 808887AC 0C2221A5 */ jal func_80888694
/* 00770 808887B0 00000000 */ nop
/* 00774 808887B4 8FBF0014 */ lw $ra, 0x0014($sp)
.L808887B8:
/* 00778 808887B8 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 0077C 808887BC 03E00008 */ jr $ra
/* 00780 808887C0 00000000 */ nop

45
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s
View file

@ -1,45 +0,0 @@
glabel func_808887C4
/* 00784 808887C4 27BDFFD8 */ addiu $sp, $sp, 0xFFD8 ## $sp = FFFFFFD8
/* 00788 808887C8 AFBF0024 */ sw $ra, 0x0024($sp)
/* 0078C 808887CC AFB00020 */ sw $s0, 0x0020($sp)
/* 00790 808887D0 AFA5002C */ sw $a1, 0x002C($sp)
/* 00794 808887D4 908E0175 */ lbu $t6, 0x0175($a0) ## 00000175
/* 00798 808887D8 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 0079C 808887DC 8FA4002C */ lw $a0, 0x002C($sp)
/* 007A0 808887E0 31CF0002 */ andi $t7, $t6, 0x0002 ## $t7 = 00000000
/* 007A4 808887E4 11E00015 */ beq $t7, $zero, .L8088883C
/* 007A8 808887E8 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 007AC 808887EC 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 007B0 808887F0 24050CEE */ addiu $a1, $zero, 0x0CEE ## $a1 = 00000CEE
/* 007B4 808887F4 24060064 */ addiu $a2, $zero, 0x0064 ## $a2 = 00000064
/* 007B8 808887F8 02003825 */ or $a3, $s0, $zero ## $a3 = 00000000
/* 007BC 808887FC 0C02003E */ jal func_800800F8
/* 007C0 80888800 AFA00010 */ sw $zero, 0x0010($sp)
/* 007C4 80888804 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 007C8 80888808 0C00BE0A */ jal Audio_PlayActorSound2
/* 007CC 8088880C 2405283A */ addiu $a1, $zero, 0x283A ## $a1 = 0000283A
/* 007D0 80888810 A2000175 */ sb $zero, 0x0175($s0) ## 00000175
/* 007D4 80888814 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 007D8 80888818 0C222010 */ jal func_80888040
/* 007DC 8088881C 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001
/* 007E0 80888820 8605001C */ lh $a1, 0x001C($s0) ## 0000001C
/* 007E4 80888824 8FA4002C */ lw $a0, 0x002C($sp)
/* 007E8 80888828 00052A03 */ sra $a1, $a1, 8
/* 007EC 8088882C 0C00B2DD */ jal Flags_SetSwitch
/* 007F0 80888830 30A500FF */ andi $a1, $a1, 0x00FF ## $a1 = 00000000
/* 007F4 80888834 10000006 */ beq $zero, $zero, .L80888850
/* 007F8 80888838 8FBF0024 */ lw $ra, 0x0024($sp)
.L8088883C:
/* 007FC 8088883C 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00001E60
/* 00800 80888840 00812821 */ addu $a1, $a0, $at
/* 00804 80888844 0C01767D */ jal CollisionCheck_SetAC
## CollisionCheck_setAC
/* 00808 80888848 26060164 */ addiu $a2, $s0, 0x0164 ## $a2 = 00000164
/* 0080C 8088884C 8FBF0024 */ lw $ra, 0x0024($sp)
.L80888850:
/* 00810 80888850 8FB00020 */ lw $s0, 0x0020($sp)
/* 00814 80888854 27BD0028 */ addiu $sp, $sp, 0x0028 ## $sp = 00000000
/* 00818 80888858 03E00008 */ jr $ra
/* 0081C 8088885C 00000000 */ nop

103
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s
View file

@ -1,103 +0,0 @@
.rdata
glabel D_80888F1C
.asciz "A(%d)\n"
.balign 4
.late_rodata
glabel D_80888FD0
.word 0xBE75C28F
.text
glabel func_80888860
/* 00820 80888860 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
/* 00824 80888864 AFBF0024 */ sw $ra, 0x0024($sp)
/* 00828 80888868 AFB00020 */ sw $s0, 0x0020($sp)
/* 0082C 8088886C 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 00830 80888870 0C00B638 */ jal Actor_MoveForward
/* 00834 80888874 AFA5003C */ sw $a1, 0x003C($sp)
/* 00838 80888878 3C01C1A0 */ lui $at, 0xC1A0 ## $at = C1A00000
/* 0083C 8088887C 44810000 */ mtc1 $at, $f0 ## $f0 = -20.00
/* 00840 80888880 C6040028 */ lwc1 $f4, 0x0028($s0) ## 00000028
/* 00844 80888884 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C
/* 00848 80888888 C60A0070 */ lwc1 $f10, 0x0070($s0) ## 00000070
/* 0084C 8088888C 46062201 */ sub.s $f8, $f4, $f6
/* 00850 80888890 460A0401 */ sub.s $f16, $f0, $f10
/* 00854 80888894 4610403C */ c.lt.s $f8, $f16
/* 00858 80888898 00000000 */ nop
/* 0085C 8088889C 45020042 */ bc1fl .L808889A8
/* 00860 808888A0 8FBF0024 */ lw $ra, 0x0024($sp)
/* 00864 808888A4 44809000 */ mtc1 $zero, $f18 ## $f18 = 0.00
/* 00868 808888A8 C6040060 */ lwc1 $f4, 0x0060($s0) ## 00000060
/* 0086C 808888AC 4612203E */ c.le.s $f4, $f18
/* 00870 808888B0 00000000 */ nop
/* 00874 808888B4 4502003C */ bc1fl .L808889A8
/* 00878 808888B8 8FBF0024 */ lw $ra, 0x0024($sp)
/* 0087C 808888BC 8E0E0244 */ lw $t6, 0x0244($s0) ## 00000244
/* 00880 808888C0 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001
/* 00884 808888C4 29E10007 */ slti $at, $t7, 0x0007
/* 00888 808888C8 14200009 */ bne $at, $zero, .L808888F0
/* 0088C 808888CC AE0F0244 */ sw $t7, 0x0244($s0) ## 00000244
/* 00890 808888D0 C606000C */ lwc1 $f6, 0x000C($s0) ## 0000000C
/* 00894 808888D4 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00898 808888D8 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004
/* 0089C 808888DC 46003280 */ add.s $f10, $f6, $f0
/* 008A0 808888E0 0C222010 */ jal func_80888040
/* 008A4 808888E4 E60A0028 */ swc1 $f10, 0x0028($s0) ## 00000028
/* 008A8 808888E8 1000002F */ beq $zero, $zero, .L808889A8
/* 008AC 808888EC 8FBF0024 */ lw $ra, 0x0024($sp)
.L808888F0:
/* 008B0 808888F0 3C018089 */ lui $at, %hi(D_80888FD0) ## $at = 80890000
/* 008B4 808888F4 C4308FD0 */ lwc1 $f16, %lo(D_80888FD0)($at)
/* 008B8 808888F8 C6080060 */ lwc1 $f8, 0x0060($s0) ## 00000060
/* 008BC 808888FC 8E190244 */ lw $t9, 0x0244($s0) ## 00000244
/* 008C0 80888900 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001
/* 008C4 80888904 46104482 */ mul.s $f18, $f8, $f16
/* 008C8 80888908 17210026 */ bne $t9, $at, .L808889A4
/* 008CC 8088890C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 008D0 80888910 8FA2003C */ lw $v0, 0x003C($sp)
/* 008D4 80888914 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003
/* 008D8 80888918 844807A0 */ lh $t0, 0x07A0($v0) ## 000007A0
/* 008DC 8088891C 00084880 */ sll $t1, $t0, 2
/* 008E0 80888920 00495021 */ addu $t2, $v0, $t1
/* 008E4 80888924 0C024BE2 */ jal Quake_Add
/* 008E8 80888928 8D440790 */ lw $a0, 0x0790($t2) ## 00000790
/* 008EC 8088892C 00022400 */ sll $a0, $v0, 16
/* 008F0 80888930 AFA2002C */ sw $v0, 0x002C($sp)
/* 008F4 80888934 00042403 */ sra $a0, $a0, 16
/* 008F8 80888938 0C024B6B */ jal Quake_SetSpeed
/* 008FC 8088893C 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350
/* 00900 80888940 87A4002E */ lh $a0, 0x002E($sp)
/* 00904 80888944 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 00908 80888948 00003025 */ or $a2, $zero, $zero ## $a2 = 00000000
/* 0090C 8088894C 240701F4 */ addiu $a3, $zero, 0x01F4 ## $a3 = 000001F4
/* 00910 80888950 AFA00010 */ sw $zero, 0x0010($sp)
/* 00914 80888954 0C024B9C */ jal Quake_SetQuakeValues
/* 00918 80888958 AFA40028 */ sw $a0, 0x0028($sp)
/* 0091C 8088895C 8FA40028 */ lw $a0, 0x0028($sp)
/* 00920 80888960 0C024B7C */ jal Quake_SetCountdown
/* 00924 80888964 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014
/* 00928 80888968 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0092C 8088896C 0C00BE0A */ jal Audio_PlayActorSound2
/* 00930 80888970 24052835 */ addiu $a1, $zero, 0x2835 ## $a1 = 00002835
/* 00934 80888974 C60C008C */ lwc1 $f12, 0x008C($s0) ## 0000008C
/* 00938 80888978 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF
/* 0093C 8088897C 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014
/* 00940 80888980 0C02A800 */ jal func_800AA000
/* 00944 80888984 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096
/* 00948 80888988 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 0094C 8088898C 0C22218E */ jal func_80888638
/* 00950 80888990 8FA5003C */ lw $a1, 0x003C($sp)
/* 00954 80888994 3C048089 */ lui $a0, %hi(D_80888F1C) ## $a0 = 80890000
/* 00958 80888998 24848F1C */ addiu $a0, $a0, %lo(D_80888F1C) ## $a0 = 80888F1C
/* 0095C 8088899C 0C00084C */ jal osSyncPrintf
/* 00960 808889A0 8605001C */ lh $a1, 0x001C($s0) ## 0000001C
.L808889A4:
/* 00964 808889A4 8FBF0024 */ lw $ra, 0x0024($sp)
.L808889A8:
/* 00968 808889A8 8FB00020 */ lw $s0, 0x0020($sp)
/* 0096C 808889AC 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000
/* 00970 808889B0 03E00008 */ jr $ra
/* 00974 808889B4 00000000 */ nop

44
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808889B8.s
View file

@ -1,44 +0,0 @@
glabel func_808889B8
/* 00978 808889B8 27BDFFE0 */ addiu $sp, $sp, 0xFFE0 ## $sp = FFFFFFE0
/* 0097C 808889BC AFBF0014 */ sw $ra, 0x0014($sp)
/* 00980 808889C0 AFA50024 */ sw $a1, 0x0024($sp)
/* 00984 808889C4 8C820118 */ lw $v0, 0x0118($a0) ## 00000118
/* 00988 808889C8 AFA40020 */ sw $a0, 0x0020($sp)
/* 0098C 808889CC 0C2221CD */ jal func_80888734
/* 00990 808889D0 AFA20018 */ sw $v0, 0x0018($sp)
/* 00994 808889D4 8FA20018 */ lw $v0, 0x0018($sp)
/* 00998 808889D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004
/* 0099C 808889DC 8FA40020 */ lw $a0, 0x0020($sp)
/* 009A0 808889E0 8C430240 */ lw $v1, 0x0240($v0) ## 00000240
/* 009A4 808889E4 10610007 */ beq $v1, $at, .L80888A04
/* 009A8 808889E8 24010003 */ addiu $at, $zero, 0x0003 ## $at = 00000003
/* 009AC 808889EC 54610017 */ bnel $v1, $at, .L80888A4C
/* 009B0 808889F0 8FBF0014 */ lw $ra, 0x0014($sp)
/* 009B4 808889F4 8C4E0244 */ lw $t6, 0x0244($v0) ## 00000244
/* 009B8 808889F8 29C10005 */ slti $at, $t6, 0x0005
/* 009BC 808889FC 54200013 */ bnel $at, $zero, .L80888A4C
/* 009C0 80888A00 8FBF0014 */ lw $ra, 0x0014($sp)
.L80888A04:
/* 009C4 80888A04 8482001C */ lh $v0, 0x001C($a0) ## 0000001C
/* 009C8 80888A08 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001
/* 009CC 80888A0C 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000
/* 009D0 80888A10 1441000B */ bne $v0, $at, .L80888A40
/* 009D4 80888A14 00027880 */ sll $t7, $v0, 2
/* 009D8 80888A18 3C018089 */ lui $at, %hi(.L80888D6C) ## $at = 80890000
/* 009DC 80888A1C 002F0821 */ addu $at, $at, $t7
/* 009E0 80888A20 C4248D6C */ lwc1 $f4, %lo(.L80888D6C)($at)
/* 009E4 80888A24 C486000C */ lwc1 $f6, 0x000C($a0) ## 0000000C
/* 009E8 80888A28 24050004 */ addiu $a1, $zero, 0x0004 ## $a1 = 00000004
/* 009EC 80888A2C 46062200 */ add.s $f8, $f4, $f6
/* 009F0 80888A30 0C222010 */ jal func_80888040
/* 009F4 80888A34 E4880028 */ swc1 $f8, 0x0028($a0) ## 00000028
/* 009F8 80888A38 10000004 */ beq $zero, $zero, .L80888A4C
/* 009FC 80888A3C 8FBF0014 */ lw $ra, 0x0014($sp)
.L80888A40:
/* 00A00 80888A40 0C222010 */ jal func_80888040
/* 00A04 80888A44 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003
/* 00A08 80888A48 8FBF0014 */ lw $ra, 0x0014($sp)
.L80888A4C:
/* 00A0C 80888A4C 27BD0020 */ addiu $sp, $sp, 0x0020 ## $sp = 00000000
/* 00A10 80888A50 03E00008 */ jr $ra
/* 00A14 80888A54 00000000 */ nop

156
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s
View file

@ -1,156 +0,0 @@
.rdata
glabel D_80888F24
.asciz "【ハンマーステップ】 arg_data おかしい (arg_data = %d)"
.balign 4
glabel D_80888F5C
.asciz "%s %d\n"
.balign 4
glabel D_80888F64
.asciz "../z_bg_hidan_hamstep.c"
.balign 4
glabel D_80888F7C
.asciz "B(%d)\n"
.balign 4
.late_rodata
glabel D_80888FD4
.word 0xBE75C28F
glabel D_80888FD8
.float 10000.0
.text
glabel func_80888A58
/* 00A18 80888A58 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
/* 00A1C 80888A5C AFBF0024 */ sw $ra, 0x0024($sp)
/* 00A20 80888A60 AFB00020 */ sw $s0, 0x0020($sp)
/* 00A24 80888A64 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 00A28 80888A68 0C00B638 */ jal Actor_MoveForward
/* 00A2C 80888A6C AFA5003C */ sw $a1, 0x003C($sp)
/* 00A30 80888A70 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00A34 80888A74 0C2221A5 */ jal func_80888694
/* 00A38 80888A78 8E050118 */ lw $a1, 0x0118($s0) ## 00000118
/* 00A3C 80888A7C 8605001C */ lh $a1, 0x001C($s0) ## 0000001C
/* 00A40 80888A80 3C048089 */ lui $a0, %hi(D_80888F24) ## $a0 = 80890000
/* 00A44 80888A84 30A200FF */ andi $v0, $a1, 0x00FF ## $v0 = 00000000
/* 00A48 80888A88 18400003 */ blez $v0, .L80888A98
/* 00A4C 80888A8C 28410006 */ slti $at, $v0, 0x0006
/* 00A50 80888A90 5420000C */ bnel $at, $zero, .L80888AC4
/* 00A54 80888A94 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028
.L80888A98:
/* 00A58 80888A98 0C00084C */ jal osSyncPrintf
/* 00A5C 80888A9C 24848F24 */ addiu $a0, $a0, %lo(D_80888F24) ## $a0 = 80888F24
/* 00A60 80888AA0 3C048089 */ lui $a0, %hi(D_80888F5C) ## $a0 = 80890000
/* 00A64 80888AA4 3C058089 */ lui $a1, %hi(D_80888F64) ## $a1 = 80890000
/* 00A68 80888AA8 24A58F64 */ addiu $a1, $a1, %lo(D_80888F64) ## $a1 = 80888F64
/* 00A6C 80888AAC 24848F5C */ addiu $a0, $a0, %lo(D_80888F5C) ## $a0 = 80888F5C
/* 00A70 80888AB0 0C00084C */ jal osSyncPrintf
/* 00A74 80888AB4 240602B8 */ addiu $a2, $zero, 0x02B8 ## $a2 = 000002B8
/* 00A78 80888AB8 8602001C */ lh $v0, 0x001C($s0) ## 0000001C
/* 00A7C 80888ABC 304200FF */ andi $v0, $v0, 0x00FF ## $v0 = 00000000
/* 00A80 80888AC0 C6060028 */ lwc1 $f6, 0x0028($s0) ## 00000028
.L80888AC4:
/* 00A84 80888AC4 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C
/* 00A88 80888AC8 3C038089 */ lui $v1, %hi(D_80888D70) ## $v1 = 80890000
/* 00A8C 80888ACC 24638D70 */ addiu $v1, $v1, %lo(D_80888D70) ## $v1 = 80888D70
/* 00A90 80888AD0 00027080 */ sll $t6, $v0, 2
/* 00A94 80888AD4 46083281 */ sub.s $f10, $f6, $f8
/* 00A98 80888AD8 006E7821 */ addu $t7, $v1, $t6
/* 00A9C 80888ADC C5E4FFFC */ lwc1 $f4, -0x0004($t7) ## FFFFFFFC
/* 00AA0 80888AE0 4604503E */ c.le.s $f10, $f4
/* 00AA4 80888AE4 00000000 */ nop
/* 00AA8 80888AE8 4502004F */ bc1fl .L80888C28
/* 00AAC 80888AEC 8FBF0024 */ lw $ra, 0x0024($sp)
/* 00AB0 80888AF0 44808000 */ mtc1 $zero, $f16 ## $f16 = 0.00
/* 00AB4 80888AF4 C6120060 */ lwc1 $f18, 0x0060($s0) ## 00000060
/* 00AB8 80888AF8 4610903E */ c.le.s $f18, $f16
/* 00ABC 80888AFC 00000000 */ nop
/* 00AC0 80888B00 45020049 */ bc1fl .L80888C28
/* 00AC4 80888B04 8FBF0024 */ lw $ra, 0x0024($sp)
/* 00AC8 80888B08 8E180244 */ lw $t8, 0x0244($s0) ## 00000244
/* 00ACC 80888B0C 27190001 */ addiu $t9, $t8, 0x0001 ## $t9 = 00000001
/* 00AD0 80888B10 2B210007 */ slti $at, $t9, 0x0007
/* 00AD4 80888B14 1420000E */ bne $at, $zero, .L80888B50
/* 00AD8 80888B18 AE190244 */ sw $t9, 0x0244($s0) ## 00000244
/* 00ADC 80888B1C 8609001C */ lh $t1, 0x001C($s0) ## 0000001C
/* 00AE0 80888B20 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C
/* 00AE4 80888B24 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00AE8 80888B28 312A00FF */ andi $t2, $t1, 0x00FF ## $t2 = 00000000
/* 00AEC 80888B2C 000A5880 */ sll $t3, $t2, 2
/* 00AF0 80888B30 006B6021 */ addu $t4, $v1, $t3
/* 00AF4 80888B34 C586FFFC */ lwc1 $f6, -0x0004($t4) ## FFFFFFFC
/* 00AF8 80888B38 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003
/* 00AFC 80888B3C 46083100 */ add.s $f4, $f6, $f8
/* 00B00 80888B40 0C222010 */ jal func_80888040
/* 00B04 80888B44 E6040028 */ swc1 $f4, 0x0028($s0) ## 00000028
/* 00B08 80888B48 10000037 */ beq $zero, $zero, .L80888C28
/* 00B0C 80888B4C 8FBF0024 */ lw $ra, 0x0024($sp)
.L80888B50:
/* 00B10 80888B50 3C018089 */ lui $at, %hi(D_80888FD4) ## $at = 80890000
/* 00B14 80888B54 C4308FD4 */ lwc1 $f16, %lo(D_80888FD4)($at)
/* 00B18 80888B58 C60A0060 */ lwc1 $f10, 0x0060($s0) ## 00000060
/* 00B1C 80888B5C 8E0D0244 */ lw $t5, 0x0244($s0) ## 00000244
/* 00B20 80888B60 24010001 */ addiu $at, $zero, 0x0001 ## $at = 00000001
/* 00B24 80888B64 46105482 */ mul.s $f18, $f10, $f16
/* 00B28 80888B68 15A1002E */ bne $t5, $at, .L80888C24
/* 00B2C 80888B6C E6120060 */ swc1 $f18, 0x0060($s0) ## 00000060
/* 00B30 80888B70 8FA2003C */ lw $v0, 0x003C($sp)
/* 00B34 80888B74 24050003 */ addiu $a1, $zero, 0x0003 ## $a1 = 00000003
/* 00B38 80888B78 844E07A0 */ lh $t6, 0x07A0($v0) ## 000007A0
/* 00B3C 80888B7C 000E7880 */ sll $t7, $t6, 2
/* 00B40 80888B80 004FC021 */ addu $t8, $v0, $t7
/* 00B44 80888B84 0C024BE2 */ jal Quake_Add
/* 00B48 80888B88 8F040790 */ lw $a0, 0x0790($t8) ## 00000790
/* 00B4C 80888B8C 00022400 */ sll $a0, $v0, 16
/* 00B50 80888B90 AFA2002C */ sw $v0, 0x002C($sp)
/* 00B54 80888B94 00042403 */ sra $a0, $a0, 16
/* 00B58 80888B98 0C024B6B */ jal Quake_SetSpeed
/* 00B5C 80888B9C 2405C350 */ addiu $a1, $zero, 0xC350 ## $a1 = FFFFC350
/* 00B60 80888BA0 87A4002E */ lh $a0, 0x002E($sp)
/* 00B64 80888BA4 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014
/* 00B68 80888BA8 24060001 */ addiu $a2, $zero, 0x0001 ## $a2 = 00000001
/* 00B6C 80888BAC 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000
/* 00B70 80888BB0 AFA00010 */ sw $zero, 0x0010($sp)
/* 00B74 80888BB4 0C024B9C */ jal Quake_SetQuakeValues
/* 00B78 80888BB8 AFA40028 */ sw $a0, 0x0028($sp)
/* 00B7C 80888BBC 8FA40028 */ lw $a0, 0x0028($sp)
/* 00B80 80888BC0 0C024B7C */ jal Quake_SetCountdown
/* 00B84 80888BC4 24050007 */ addiu $a1, $zero, 0x0007 ## $a1 = 00000007
/* 00B88 80888BC8 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00B8C 80888BCC 0C00BE0A */ jal Audio_PlayActorSound2
/* 00B90 80888BD0 24052835 */ addiu $a1, $zero, 0x2835 ## $a1 = 00002835
/* 00B94 80888BD4 3C018089 */ lui $at, %hi(D_80888FD8) ## $at = 80890000
/* 00B98 80888BD8 C42C8FD8 */ lwc1 $f12, %lo(D_80888FD8)($at)
/* 00B9C 80888BDC 240500FF */ addiu $a1, $zero, 0x00FF ## $a1 = 000000FF
/* 00BA0 80888BE0 24060014 */ addiu $a2, $zero, 0x0014 ## $a2 = 00000014
/* 00BA4 80888BE4 0C02A800 */ jal func_800AA000
/* 00BA8 80888BE8 24070096 */ addiu $a3, $zero, 0x0096 ## $a3 = 00000096
/* 00BAC 80888BEC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00BB0 80888BF0 0C222132 */ jal func_808884C8
/* 00BB4 80888BF4 8FA5003C */ lw $a1, 0x003C($sp)
/* 00BB8 80888BF8 8605001C */ lh $a1, 0x001C($s0) ## 0000001C
/* 00BBC 80888BFC 24010005 */ addiu $at, $zero, 0x0005 ## $at = 00000005
/* 00BC0 80888C00 30B900FF */ andi $t9, $a1, 0x00FF ## $t9 = 00000000
/* 00BC4 80888C04 17210004 */ bne $t9, $at, .L80888C18
/* 00BC8 80888C08 00000000 */ nop
/* 00BCC 80888C0C 0C01E221 */ jal func_80078884
/* 00BD0 80888C10 24044802 */ addiu $a0, $zero, 0x4802 ## $a0 = 00004802
/* 00BD4 80888C14 8605001C */ lh $a1, 0x001C($s0) ## 0000001C
.L80888C18:
/* 00BD8 80888C18 3C048089 */ lui $a0, %hi(D_80888F7C) ## $a0 = 80890000
/* 00BDC 80888C1C 0C00084C */ jal osSyncPrintf
/* 00BE0 80888C20 24848F7C */ addiu $a0, $a0, %lo(D_80888F7C) ## $a0 = 80888F7C
.L80888C24:
/* 00BE4 80888C24 8FBF0024 */ lw $ra, 0x0024($sp)
.L80888C28:
/* 00BE8 80888C28 8FB00020 */ lw $s0, 0x0020($sp)
/* 00BEC 80888C2C 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000
/* 00BF0 80888C30 03E00008 */ jr $ra
/* 00BF4 80888C34 00000000 */ nop

4
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888C38.s
View file

@ -1,4 +0,0 @@
glabel func_80888C38
/* 00BF8 80888C38 AFA40000 */ sw $a0, 0x0000($sp)
/* 00BFC 80888C3C 03E00008 */ jr $ra
/* 00C00 80888C40 AFA50004 */ sw $a1, 0x0004($sp)

38
data/overlays/actors/z_bg_hidan_hamstep.data.s
View file

@ -1,38 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .data
.balign 16
glabel D_80888D70
.word 0xC1A00000, 0xC2F00000, 0xC35C0000, 0xC3A00000, 0xC3D20000
glabel D_80888D84
.word 0x00000000, 0x00000000, 0x00000000, 0x40000040, 0x00000000, 0x00010000, 0xC1A00000, 0x40400000, 0xC1A00000, 0xC1A00000, 0x40400000, 0x41A00000, 0x41A00000, 0x40400000, 0x41A00000, 0x00000000, 0x00000000, 0x00000000, 0x40000040, 0x00000000, 0x00010000, 0x41A00000, 0x40400000, 0x41A00000, 0x41A00000, 0x40400000, 0xC1A00000, 0xC1A00000, 0x40400000, 0xC1A00000
glabel D_80888DFC
.word 0x0A000900, 0x00020000, 0x00000002
glabel D_80888E08
.word D_80888D84
glabel Bg_Hidan_Hamstep_InitVars
.word 0x00710100, 0x00000000, 0x002C0000, 0x00000248
.word BgHidanHamstep_Init
.word BgHidanHamstep_Destroy
.word BgHidanHamstep_Update
.word BgHidanHamstep_Draw
glabel D_80888E2C
.word func_808887C4
.word func_80888860
.word func_808889B8
.word func_80888A58
.word func_80888C38
glabel D_80888E40
.word 0x48500064
glabel D_80888E44
.word 0xC2C80000, 0x42200000, 0x42C80000, 0x42200000, 0xC2C80000, 0x00000000, 0x42C80000, 0x00000000, 0xC2C80000, 0xC2200000, 0x42C80000, 0x42200000, 0xC2C80000, 0xC2A00000, 0xC2480000, 0xC2A00000, 0x00000000, 0xC2A00000, 0x42480000, 0xC2A00000, 0x42C80000, 0xC2A00000
glabel D_80888E9C
.word 0x00000000

13
data/overlays/actors/z_bg_hidan_hamstep.reloc.s
View file

@ -1,13 +0,0 @@
.include "macro.inc"
# assembler directives
.set noat # allow manual use of $at
.set noreorder # don't insert nops after branches
.set gp=64 # allow use of 64-bit general purpose registers
.section .rodata
.balign 16
glabel D_80888FE0
.incbin "baserom/ovl_Bg_Hidan_Hamstep", 0xFA0, 0x00000150

3
spec
View file

@ -836,8 +836,7 @@ endseg
beginseg
name "ovl_Bg_Hidan_Hamstep"
include "build/src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.o"
include "build/data/overlays/actors/z_bg_hidan_hamstep.data.o"
include "build/data/overlays/actors/z_bg_hidan_hamstep.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Hidan_Hamstep/ovl_Bg_Hidan_Hamstep_reloc.o"
endseg
beginseg

383
src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.c
View file

@ -1,3 +1,9 @@
/*
* File: z_bg_hidan_hamstep.c
* Overlay: ovl_Bg_Hidan_Hamstep
* Description: Stone Steps and Platforms (Fire Temple)
*/
#include "z_bg_hidan_hamstep.h"
#define FLAGS 0x00000000
@ -9,11 +15,38 @@ void BgHidanHamstep_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanHamstep_Update(Actor* thisx, GlobalContext* globalCtx);
void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx);
extern UNK_TYPE D_0600A548;
extern UNK_TYPE D_0600A668;
extern UNK_TYPE D_0600DE44;
void func_808887C4(BgHidanHamstep* this, GlobalContext* globalCtx);
void func_80888860(BgHidanHamstep* this, GlobalContext* globalCtx);
void func_808889B8(BgHidanHamstep* this, GlobalContext* globalCtx);
void func_80888A58(BgHidanHamstep* this, GlobalContext* globalCtx);
void BgHidanHamstep_DoNothing(BgHidanHamstep* this, GlobalContext* globalCtx);
extern Gfx D_0600A548[];
extern Gfx D_0600A668[];
extern ColHeader D_0600DE44;
extern ColHeader D_0600DD1C;
static f32 sYPosOffsets[] = {
-20.0f, -120.0f, -220.0f, -320.0f, -420.0f,
};
static ColliderTrisItemInit sTrisItemsInit[2] = {
{
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x40000040, 0x00, 0x00 }, 0x00, 0x01, 0x00 },
{ { { -20.0f, 3.0f, -20.0f }, { -20.0f, 3.0f, 20.0f }, { 20.0f, 3.0f, 20.0f } } },
},
{
{ 0x00, { 0x00000000, 0x00, 0x00 }, { 0x40000040, 0x00, 0x00 }, 0x00, 0x01, 0x00 },
{ { { 20.0f, 3.0f, 20.0f }, { 20.0f, 3.0f, -20.0f }, { -20.0f, 3.0f, -20.0f } } },
},
};
static ColliderTrisInit sTrisInit = {
{ COLTYPE_UNK10, 0x00, 0x09, 0x00, 0x00, COLSHAPE_TRIS },
ARRAY_COUNT(sTrisItemsInit),
sTrisItemsInit,
};
/*
const ActorInit Bg_Hidan_Hamstep_InitVars = {
ACTOR_BG_HIDAN_HAMSTEP,
ACTORTYPE_BG,
@ -25,33 +58,343 @@ const ActorInit Bg_Hidan_Hamstep_InitVars = {
(ActorFunc)BgHidanHamstep_Update,
(ActorFunc)BgHidanHamstep_Draw,
};
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888040.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_8088805C.s")
static BgHidanHamstepActionFunc sActionFuncs[] = {
func_808887C4, func_80888860, func_808889B8, func_80888A58, BgHidanHamstep_DoNothing,
};
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Init.s")
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Destroy.s")
static f32 sEffectPositions[][2] = {
{ -100.0f, 40.0f }, { 100.0f, 40.0f }, { -100.0f, 0.0f }, { 100.0f, 0.0f },
{ -100.0f, -40.0f }, { 100.0f, 40.0f }, { -100.0f, -80.0f }, { -50.0f, -80.0f },
{ 0.0f, -80.0f }, { 50.0f, -80.0f }, { 100.0f, -80.0f },
};
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808884C8.s")
void BgHidanHamstep_SetupAction(BgHidanHamstep* this, s32 action) {
this->action = action;
this->actionFunc = sActionFuncs[action];
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888638.s")
s32 BgHidanHamstep_SpawnChildren(BgHidanHamstep* this, GlobalContext* globalCtx) {
BgHidanHamstep* step = this;
s32 i;
Vec3f pos;
f32 sin;
f32 cos;
s16 params;
GlobalContext* globalCtx2 = globalCtx;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888694.s")
pos = pos; // Required to match
pos.y = this->dyna.actor.initPosRot.pos.y - 100.0f;
sin = Math_SinS(this->dyna.actor.shape.rot.y + 0x8000);
cos = Math_CosS(this->dyna.actor.shape.rot.y + 0x8000);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888734.s")
for (i = 0; i < 5; i++) {
pos.x = (((i * 160.0f) + 60.0f) * sin) + this->dyna.actor.initPosRot.pos.x;
pos.z = (((i * 160.0f) + 60.0f) * cos) + this->dyna.actor.initPosRot.pos.z;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808887C4.s")
params = ((i + 1) & 0xFF);
params |= (this->dyna.actor.params & 0xFF00);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888860.s")
step = (BgHidanHamstep*)Actor_SpawnAsChild(
&globalCtx2->actorCtx, step, globalCtx2, ACTOR_BG_HIDAN_HAMSTEP, pos.x, pos.y, pos.z,
this->dyna.actor.posRot.rot.x, this->dyna.actor.posRot.rot.y, this->dyna.actor.posRot.rot.z, params);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_808889B8.s")
if (step == NULL) {
return 0;
}
}
return 1;
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888A58.s")
void BgHidanHamstep_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHamstep* this = THIS;
s32 pad;
ColHeader* colHeader = NULL;
Vec3f sp48[3];
s32 i;
s32 i2;
BgHidanHamstep* step;
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/func_80888C38.s")
DynaPolyInfo_SetActorMove(&this->dyna.actor, 1);
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Update.s")
if ((this->dyna.actor.params & 0xFF) == 0) {
Collider_InitTris(globalCtx, &this->collider);
Collider_SetTris(globalCtx, &this->collider, &this->dyna.actor, &sTrisInit, this->colliderItems);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Hamstep/BgHidanHamstep_Draw.s")
for (i = 0; i < 2; i++) {
for (i2 = 0; i2 < 3; i2++) {
sp48[i2].x = sTrisInit.list[i].dim.vtx[i2].x + this->dyna.actor.initPosRot.pos.x;
sp48[i2].y = sTrisInit.list[i].dim.vtx[i2].y + this->dyna.actor.initPosRot.pos.y;
sp48[i2].z = sTrisInit.list[i].dim.vtx[i2].z + this->dyna.actor.initPosRot.pos.z;
}
func_800627A0(&this->collider, i, &sp48[0], &sp48[1], &sp48[2]);
}
}
if ((this->dyna.actor.params & 0xFF) == 0) {
DynaPolyInfo_Alloc(&D_0600DE44, &colHeader);
} else {
DynaPolyInfo_Alloc(&D_0600DD1C, &colHeader);
}
this->dyna.dynaPolyId =
DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, colHeader);
if (Flags_GetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0xFF)) {
if ((this->dyna.actor.params & 0xFF) == 0) {
this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y + (-20.0f);
BgHidanHamstep_SetupAction(this, 4);
} else {
this->dyna.actor.posRot.pos.y =
sYPosOffsets[(this->dyna.actor.params & 0xFF) - 1] + this->dyna.actor.initPosRot.pos.y;
BgHidanHamstep_SetupAction(this, 4);
}
} else if ((this->dyna.actor.params & 0xFF) == 0) {
BgHidanHamstep_SetupAction(this, 0);
} else {
BgHidanHamstep_SetupAction(this, 2);
}
this->dyna.actor.gravity = -1.2f;
this->dyna.actor.minVelocityY = -12.0f;
if ((this->dyna.actor.params & 0xFF) == 0) {
// Translation: Fire Temple Object [Hammer Step] appears
osSyncPrintf("◯◯◯炎の神殿オブジェクト【ハンマーステップ】出現\n");
if (BgHidanHamstep_SpawnChildren(this, globalCtx) == 0) {
step = this;
// Translation: [Hammer Step] I can't create a step!
osSyncPrintf("【ハンマーステップ】 足場産れない！！\n");
osSyncPrintf("%s %d\n", "../z_bg_hidan_hamstep.c", 425);
while (step != NULL) {
Actor_Kill(&step->dyna.actor);
step = step->dyna.actor.child;
}
}
}
}
void BgHidanHamstep_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHamstep* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
if ((this->dyna.actor.params & 0xFF) == 0) {
Collider_DestroyTris(globalCtx, &this->collider);
}
}
void func_808884C8(BgHidanHamstep* step, GlobalContext* globalCtx) {
Vec3f pos = step->dyna.actor.posRot.pos;
s32 i;
f32 sin;
f32 cos;
pos.y -= 20.0f;
func_80033480(globalCtx, &pos, 0.0f, 0, 600, 300, 0);
sin = Math_SinS(step->dyna.actor.shape.rot.y + 0x8000);
cos = Math_CosS(step->dyna.actor.shape.rot.y + 0x8000);
pos.y = step->dyna.actor.posRot.pos.y;
for (i = 0; i < ARRAY_COUNT(sEffectPositions); i++) {
pos.x = (sEffectPositions[i][1] * sin) + (sEffectPositions[i][0] * cos) + step->dyna.actor.posRot.pos.x;
pos.z = ((sEffectPositions[i][1] * cos) - (sEffectPositions[i][0] * sin)) + step->dyna.actor.posRot.pos.z;
func_80033480(globalCtx, &pos, 0.0f, 0, 150, 150, 0);
}
}
void func_80888638(BgHidanHamstep* this, GlobalContext* globalCtx) {
BgHidanHamstep* child = this->dyna.actor.child;
while (child != NULL) {
if ((child->dyna.actor.params & 0xFF) != 0) {
func_808884C8(child, globalCtx);
}
child = child->dyna.actor.child;
}
}
void func_80888694(BgHidanHamstep* this, BgHidanHamstep* parent) {
BgHidanHamstep* child;
if ((this->dyna.actor.params & 0xFF) >= 2) {
if (parent->dyna.actor.posRot.pos.y < this->dyna.actor.posRot.pos.y) {
this->dyna.actor.posRot.pos.y = parent->dyna.actor.posRot.pos.y;
} else if ((this->dyna.actor.posRot.pos.y - parent->dyna.actor.posRot.pos.y) < -100.0f) {
this->dyna.actor.posRot.pos.y = parent->dyna.actor.posRot.pos.y - 100.0f;
}
}
child = this->dyna.actor.child;
while (child != NULL) {
if (this->dyna.actor.posRot.pos.y < child->dyna.actor.posRot.pos.y) {
child->dyna.actor.posRot.pos.y = this->dyna.actor.posRot.pos.y;
}
child = child->dyna.actor.child;
}
}
void func_80888734(BgHidanHamstep* this) {
BgHidanHamstep* parent = this->dyna.actor.parent;
f32 factor = SREG(30) * 0.5f;
if (parent != NULL) {
this->dyna.actor.velocity.y = parent->dyna.actor.velocity.y;
if ((this->dyna.actor.params & 0xFF) == 1) {
this->dyna.actor.posRot.pos.y = parent->dyna.actor.posRot.pos.y - 100.0f;
} else {
this->dyna.actor.posRot.pos.y += (this->dyna.actor.velocity.y * factor);
}
func_80888694(this, parent);
}
}
void func_808887C4(BgHidanHamstep* this, GlobalContext* globalCtx) {
if (this->collider.base.acFlags & 2) {
func_800800F8(globalCtx, 3310, 100, &this->dyna.actor, 0);
Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_HAMMER_SWITCH);
this->collider.base.acFlags = 0;
BgHidanHamstep_SetupAction(this, 1);
Flags_SetSwitch(globalCtx, (this->dyna.actor.params >> 8) & 0xFF);
} else {
CollisionCheck_SetAC(globalCtx, &globalCtx->colChkCtx, &this->collider);
}
}
void func_80888860(BgHidanHamstep* this, GlobalContext* globalCtx) {
s32 pad;
s32 pad2;
s32 quakeIndex;
Actor_MoveForward(&this->dyna.actor);
if (((this->dyna.actor.posRot.pos.y - this->dyna.actor.initPosRot.pos.y) <
(-20.0f - this->dyna.actor.minVelocityY)) &&
(this->dyna.actor.velocity.y <= 0.0f)) {
this->unk_244++;
if (this->unk_244 >= 7) {
this->dyna.actor.posRot.pos.y = this->dyna.actor.initPosRot.pos.y + -20.0f;
BgHidanHamstep_SetupAction(this, 4);
} else {
this->dyna.actor.velocity.y *= -0.24f;
if (1) {}
if (this->unk_244 == 1) {
quakeIndex = Quake_Add(ACTIVE_CAM, 3);
Quake_SetSpeed(quakeIndex, -15536);
Quake_SetQuakeValues(quakeIndex, 0, 0, 500, 0);
Quake_SetCountdown(quakeIndex, 20);
Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND);
func_800AA000(this->dyna.actor.xyzDistFromLinkSq, 255, 20, 150);
func_80888638(&this->dyna.actor, globalCtx);
osSyncPrintf("A(%d)\n", this->dyna.actor.params);
}
}
}
}
void func_808889B8(BgHidanHamstep* this, GlobalContext* globalCtx) {
s32 pad;
BgHidanHamstep* parent = this->dyna.actor.parent;
func_80888734(this);
if ((parent->action == 4) || ((parent->action == 3) && (parent->unk_244 >= 5))) {
if ((this->dyna.actor.params & 0xFF) == 1) {
this->dyna.actor.posRot.pos.y =
sYPosOffsets[(this->dyna.actor.params & 0xFF) - 1] + this->dyna.actor.initPosRot.pos.y;
BgHidanHamstep_SetupAction(this, 4);
} else {
BgHidanHamstep_SetupAction(this, 3);
}
}
}
void func_80888A58(BgHidanHamstep* this, GlobalContext* globalCtx) {
s32 pad;
s32 pad2;
s32 quakeIndex;
Actor_MoveForward(&this->dyna.actor);
func_80888694(this, (BgHidanHamstep*)this->dyna.actor.parent);
if (((this->dyna.actor.params & 0xFF) <= 0) || ((this->dyna.actor.params & 0xFF) >= 6)) {
// Translation: [Hammer Step] arg_data strange (arg_data = %d)
osSyncPrintf("【ハンマーステップ】 arg_data おかしい (arg_data = %d)", this->dyna.actor.params);
osSyncPrintf("%s %d\n", "../z_bg_hidan_hamstep.c", 696);
}
if (((this->dyna.actor.posRot.pos.y - this->dyna.actor.initPosRot.pos.y) <=
sYPosOffsets[(this->dyna.actor.params & 0xFF) - 1]) &&
(this->dyna.actor.velocity.y <= 0.0f)) {
this->unk_244++;
if (this->unk_244 >= 7) {
this->dyna.actor.posRot.pos.y =
sYPosOffsets[(this->dyna.actor.params & 0xFF) - 1] + this->dyna.actor.initPosRot.pos.y;
BgHidanHamstep_SetupAction(this, 3);
} else {
this->dyna.actor.velocity.y *= -0.24f;
if (1) {}
if (this->unk_244 == 1) {
quakeIndex = Quake_Add(ACTIVE_CAM, 3);
Quake_SetSpeed(quakeIndex, -15536);
Quake_SetQuakeValues(quakeIndex, 20, 1, 0, 0);
Quake_SetCountdown(quakeIndex, 7);
Audio_PlayActorSound2(&this->dyna.actor, NA_SE_EV_BLOCK_BOUND);
func_800AA000(10000.0f, 255, 20, 150);
func_808884C8(this, globalCtx);
if ((this->dyna.actor.params & 0xFF) == 5) {
func_80078884(NA_SE_SY_CORRECT_CHIME);
}
osSyncPrintf("B(%d)\n", this->dyna.actor.params);
}
}
}
}
void BgHidanHamstep_DoNothing(BgHidanHamstep* this, GlobalContext* globalCtx) {
}
void BgHidanHamstep_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanHamstep* this = THIS;
this->actionFunc(this, globalCtx);
}
void BgHidanHamstep_Draw(Actor* thisx, GlobalContext* globalCtx) {
OPEN_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_hamstep.c", 782);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_hamstep.c", 787),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if ((thisx->params & 0xFF) == 0) {
gSPDisplayList(POLY_OPA_DISP++, D_0600A668);
} else {
gSPDisplayList(POLY_OPA_DISP++, D_0600A548);
}
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_bg_hidan_hamstep.c", 796);
}

10
src/overlays/actors/ovl_Bg_Hidan_Hamstep/z_bg_hidan_hamstep.h
View file

@ -6,9 +6,15 @@
struct BgHidanHamstep;
typedef void (*BgHidanHamstepActionFunc)(struct BgHidanHamstep*, GlobalContext*);
typedef struct BgHidanHamstep {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0xFC];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ ColliderTris collider;
/* 0x0184 */ ColliderTrisItem colliderItems[2];
/* 0x023C */ BgHidanHamstepActionFunc actionFunc;
/* 0x0240 */ s32 action;
/* 0x0244 */ s32 unk_244;
} BgHidanHamstep; // size = 0x0248
extern const ActorInit Bg_Hidan_Hamstep_InitVars;

1
undefined_syms.txt
View file

@ -1865,6 +1865,7 @@ D_06006F70 = 0x06006F70;
D_0600A548 = 0x0600A548;
D_0600A668 = 0x0600A668;
D_0600DE44 = 0x0600DE44;
D_0600DD1C = 0x0600DD1C;
// z_bg_hidan_hrock
D_0600D054 = 0x0600D054;