mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-01-24 17:47:33 +00:00
Code Issues Projects Releases Wiki Activity

z_en_bg_hidan_rsekizou (#282)

Browse source 
* RSekizou 4/5

* func_8088C70C on its way.

* ROM got shifted?

* RSekizou is OK

* Cleanup

* Removed unused ASM. Jenkins!

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

* Tidy Roman-ization. ;)

* UNK_TYPE array instead of illegal UNK_PTR array.

* Update src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>

Co-authored-by: Roman971 <32455037+Roman971@users.noreply.github.com>
This commit is contained in:
Nick 2020-07-22 16:12:47 -05:00 committed by GitHub
parent 4c8ed0e328
commit 3c3cfa6751
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 197 additions and 777 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s
View file

@ -1,20 +0,0 @@
glabel BgHidanRsekizou_Destroy
/* 00104 8088C304 27BDFFE8 */ addiu $sp, $sp, 0xFFE8 ## $sp = FFFFFFE8
/* 00108 8088C308 AFA40018 */ sw $a0, 0x0018($sp)
/* 0010C 8088C30C 8FAE0018 */ lw $t6, 0x0018($sp)
/* 00110 8088C310 AFBF0014 */ sw $ra, 0x0014($sp)
/* 00114 8088C314 00A03825 */ or $a3, $a1, $zero ## $a3 = 00000000
/* 00118 8088C318 00A02025 */ or $a0, $a1, $zero ## $a0 = 00000000
/* 0011C 8088C31C 8DC6014C */ lw $a2, 0x014C($t6) ## 0000014C
/* 00120 8088C320 AFA7001C */ sw $a3, 0x001C($sp)
/* 00124 8088C324 0C00FB56 */ jal DynaPolyInfo_Free
## DynaPolyInfo_delReserve
/* 00128 8088C328 24A50810 */ addiu $a1, $a1, 0x0810 ## $a1 = 00000810
/* 0012C 8088C32C 8FA50018 */ lw $a1, 0x0018($sp)
/* 00130 8088C330 8FA4001C */ lw $a0, 0x001C($sp)
/* 00134 8088C334 0C016F32 */ jal Collider_DestroyJntSph
/* 00138 8088C338 24A50168 */ addiu $a1, $a1, 0x0168 ## $a1 = 00000168
/* 0013C 8088C33C 8FBF0014 */ lw $ra, 0x0014($sp)
/* 00140 8088C340 27BD0018 */ addiu $sp, $sp, 0x0018 ## $sp = 00000000
/* 00144 8088C344 03E00008 */ jr $ra
/* 00148 8088C348 00000000 */ nop

157
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s
View file

@ -1,157 +0,0 @@
.rdata
glabel D_8088CDBC
.asciz "../z_bg_hidan_rsekizou.c"
.balign 4
glabel D_8088CDD8
.asciz "../z_bg_hidan_rsekizou.c"
.balign 4
glabel D_8088CDF4
.asciz "../z_bg_hidan_rsekizou.c"
.balign 4
.text
glabel BgHidanRsekizou_Draw
/* 0083C 8088CA3C 27BDFF58 */ addiu $sp, $sp, 0xFF58 ## $sp = FFFFFF58
/* 00840 8088CA40 AFB50030 */ sw $s5, 0x0030($sp)
/* 00844 8088CA44 00A0A825 */ or $s5, $a1, $zero ## $s5 = 00000000
/* 00848 8088CA48 AFBF0034 */ sw $ra, 0x0034($sp)
/* 0084C 8088CA4C AFB4002C */ sw $s4, 0x002C($sp)
/* 00850 8088CA50 AFB30028 */ sw $s3, 0x0028($sp)
/* 00854 8088CA54 AFB20024 */ sw $s2, 0x0024($sp)
/* 00858 8088CA58 AFB10020 */ sw $s1, 0x0020($sp)
/* 0085C 8088CA5C AFB0001C */ sw $s0, 0x001C($sp)
/* 00860 8088CA60 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000
/* 00864 8088CA64 0080A025 */ or $s4, $a0, $zero ## $s4 = 00000000
/* 00868 8088CA68 3C068089 */ lui $a2, %hi(D_8088CDBC) ## $a2 = 80890000
/* 0086C 8088CA6C 24C6CDBC */ addiu $a2, $a2, %lo(D_8088CDBC) ## $a2 = 8088CDBC
/* 00870 8088CA70 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFA0
/* 00874 8088CA74 24070234 */ addiu $a3, $zero, 0x0234 ## $a3 = 00000234
/* 00878 8088CA78 0C031AB1 */ jal Graph_OpenDisps
/* 0087C 8088CA7C 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000
/* 00880 8088CA80 0C024F46 */ jal func_80093D18
/* 00884 8088CA84 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000
/* 00888 8088CA88 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0
/* 0088C 8088CA8C 3C0FDA38 */ lui $t7, 0xDA38 ## $t7 = DA380000
/* 00890 8088CA90 35EF0003 */ ori $t7, $t7, 0x0003 ## $t7 = DA380003
/* 00894 8088CA94 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = 00000008
/* 00898 8088CA98 AE2E02C0 */ sw $t6, 0x02C0($s1) ## 000002C0
/* 0089C 8088CA9C 3C058089 */ lui $a1, %hi(D_8088CDD8) ## $a1 = 80890000
/* 008A0 8088CAA0 AC4F0000 */ sw $t7, 0x0000($v0) ## 00000000
/* 008A4 8088CAA4 8EA40000 */ lw $a0, 0x0000($s5) ## 00000000
/* 008A8 8088CAA8 24A5CDD8 */ addiu $a1, $a1, %lo(D_8088CDD8) ## $a1 = 8088CDD8
/* 008AC 8088CAAC 24060238 */ addiu $a2, $zero, 0x0238 ## $a2 = 00000238
/* 008B0 8088CAB0 0C0346A2 */ jal Matrix_NewMtx
/* 008B4 8088CAB4 00408025 */ or $s0, $v0, $zero ## $s0 = 00000000
/* 008B8 8088CAB8 AE020004 */ sw $v0, 0x0004($s0) ## 00000004
/* 008BC 8088CABC 8E2202C0 */ lw $v0, 0x02C0($s1) ## 000002C0
/* 008C0 8088CAC0 3C080601 */ lui $t0, 0x0601 ## $t0 = 06010000
/* 008C4 8088CAC4 2508AD00 */ addiu $t0, $t0, 0xAD00 ## $t0 = 0600AD00
/* 008C8 8088CAC8 24580008 */ addiu $t8, $v0, 0x0008 ## $t8 = 00000008
/* 008CC 8088CACC AE3802C0 */ sw $t8, 0x02C0($s1) ## 000002C0
/* 008D0 8088CAD0 3C19DE00 */ lui $t9, 0xDE00 ## $t9 = DE000000
/* 008D4 8088CAD4 27B3005C */ addiu $s3, $sp, 0x005C ## $s3 = FFFFFFB4
/* 008D8 8088CAD8 3C058013 */ lui $a1, %hi(gMtxFClear)
/* 008DC 8088CADC 24A5DB60 */ addiu $a1, %lo(gMtxFClear)
/* 008E0 8088CAE0 02602025 */ or $a0, $s3, $zero ## $a0 = FFFFFFB4
/* 008E4 8088CAE4 AC590000 */ sw $t9, 0x0000($v0) ## 00000000
/* 008E8 8088CAE8 0C0346EA */ jal Matrix_MtxFCopy
/* 008EC 8088CAEC AC480004 */ sw $t0, 0x0004($v0) ## 00000004
/* 008F0 8088CAF0 8E2402D0 */ lw $a0, 0x02D0($s1) ## 000002D0
/* 008F4 8088CAF4 0C024DDD */ jal Gfx_CallSetupDL
/* 008F8 8088CAF8 24050014 */ addiu $a1, $zero, 0x0014 ## $a1 = 00000014
/* 008FC 8088CAFC AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0
/* 00900 8088CB00 86A907A0 */ lh $t1, 0x07A0($s5) ## 000007A0
/* 00904 8088CB04 00095080 */ sll $t2, $t1, 2
/* 00908 8088CB08 02AA5821 */ addu $t3, $s5, $t2
/* 0090C 8088CB0C 0C016A7D */ jal func_8005A9F4
/* 00910 8088CB10 8D640790 */ lw $a0, 0x0790($t3) ## 00000790
/* 00914 8088CB14 868C00B6 */ lh $t4, 0x00B6($s4) ## 000000B6
/* 00918 8088CB18 24100003 */ addiu $s0, $zero, 0x0003 ## $s0 = 00000003
/* 0091C 8088CB1C 004C6823 */ subu $t5, $v0, $t4
/* 00920 8088CB20 25AED194 */ addiu $t6, $t5, 0xD194 ## $t6 = FFFFD194
/* 00924 8088CB24 000E7C00 */ sll $t7, $t6, 16
/* 00928 8088CB28 000FC403 */ sra $t8, $t7, 16
/* 0092C 8088CB2C 0700001F */ bltz $t8, .L8088CBAC
/* 00930 8088CB30 00000000 */ nop
/* 00934 8088CB34 24100003 */ addiu $s0, $zero, 0x0003 ## $s0 = 00000003
.L8088CB38:
/* 00938 8088CB38 AFA00010 */ sw $zero, 0x0010($sp)
/* 0093C 8088CB3C 8E3902D0 */ lw $t9, 0x02D0($s1) ## 000002D0
/* 00940 8088CB40 00103400 */ sll $a2, $s0, 16
/* 00944 8088CB44 00063403 */ sra $a2, $a2, 16
/* 00948 8088CB48 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000
/* 0094C 8088CB4C 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000
/* 00950 8088CB50 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFB4
/* 00954 8088CB54 0C2231C3 */ jal func_8088C70C
/* 00958 8088CB58 AFB90014 */ sw $t9, 0x0014($sp)
/* 0095C 8088CB5C 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000002
/* 00960 8088CB60 0601FFF5 */ bgez $s0, .L8088CB38
/* 00964 8088CB64 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0
/* 00968 8088CB68 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000
/* 0096C 8088CB6C 24120004 */ addiu $s2, $zero, 0x0004 ## $s2 = 00000004
.L8088CB70:
/* 00970 8088CB70 24080001 */ addiu $t0, $zero, 0x0001 ## $t0 = 00000001
/* 00974 8088CB74 AFA80010 */ sw $t0, 0x0010($sp)
/* 00978 8088CB78 8E2902D0 */ lw $t1, 0x02D0($s1) ## 000002D0
/* 0097C 8088CB7C 00103400 */ sll $a2, $s0, 16
/* 00980 8088CB80 00063403 */ sra $a2, $a2, 16
/* 00984 8088CB84 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000
/* 00988 8088CB88 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000
/* 0098C 8088CB8C 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFB4
/* 00990 8088CB90 0C2231C3 */ jal func_8088C70C
/* 00994 8088CB94 AFA90014 */ sw $t1, 0x0014($sp)
/* 00998 8088CB98 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001
/* 0099C 8088CB9C 1612FFF4 */ bne $s0, $s2, .L8088CB70
/* 009A0 8088CBA0 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0
/* 009A4 8088CBA4 1000001C */ beq $zero, $zero, .L8088CC18
/* 009A8 8088CBA8 00000000 */ nop
.L8088CBAC:
/* 009AC 8088CBAC 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001
/* 009B0 8088CBB0 AFAA0010 */ sw $t2, 0x0010($sp)
/* 009B4 8088CBB4 8E2B02D0 */ lw $t3, 0x02D0($s1) ## 000002D0
/* 009B8 8088CBB8 00103400 */ sll $a2, $s0, 16
/* 009BC 8088CBBC 00063403 */ sra $a2, $a2, 16
/* 009C0 8088CBC0 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000
/* 009C4 8088CBC4 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000
/* 009C8 8088CBC8 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFB4
/* 009CC 8088CBCC 0C2231C3 */ jal func_8088C70C
/* 009D0 8088CBD0 AFAB0014 */ sw $t3, 0x0014($sp)
/* 009D4 8088CBD4 2610FFFF */ addiu $s0, $s0, 0xFFFF ## $s0 = 00000000
/* 009D8 8088CBD8 0601FFF4 */ bgez $s0, .L8088CBAC
/* 009DC 8088CBDC AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0
/* 009E0 8088CBE0 00008025 */ or $s0, $zero, $zero ## $s0 = 00000000
/* 009E4 8088CBE4 24120004 */ addiu $s2, $zero, 0x0004 ## $s2 = 00000004
.L8088CBE8:
/* 009E8 8088CBE8 AFA00010 */ sw $zero, 0x0010($sp)
/* 009EC 8088CBEC 8E2C02D0 */ lw $t4, 0x02D0($s1) ## 000002D0
/* 009F0 8088CBF0 00103400 */ sll $a2, $s0, 16
/* 009F4 8088CBF4 00063403 */ sra $a2, $a2, 16
/* 009F8 8088CBF8 02A02025 */ or $a0, $s5, $zero ## $a0 = 00000000
/* 009FC 8088CBFC 02802825 */ or $a1, $s4, $zero ## $a1 = 00000000
/* 00A00 8088CC00 02603825 */ or $a3, $s3, $zero ## $a3 = FFFFFFB4
/* 00A04 8088CC04 0C2231C3 */ jal func_8088C70C
/* 00A08 8088CC08 AFAC0014 */ sw $t4, 0x0014($sp)
/* 00A0C 8088CC0C 26100001 */ addiu $s0, $s0, 0x0001 ## $s0 = 00000001
/* 00A10 8088CC10 1612FFF5 */ bne $s0, $s2, .L8088CBE8
/* 00A14 8088CC14 AE2202D0 */ sw $v0, 0x02D0($s1) ## 000002D0
.L8088CC18:
/* 00A18 8088CC18 3C068089 */ lui $a2, %hi(D_8088CDF4) ## $a2 = 80890000
/* 00A1C 8088CC1C 24C6CDF4 */ addiu $a2, $a2, %lo(D_8088CDF4) ## $a2 = 8088CDF4
/* 00A20 8088CC20 27A40048 */ addiu $a0, $sp, 0x0048 ## $a0 = FFFFFFA0
/* 00A24 8088CC24 8EA50000 */ lw $a1, 0x0000($s5) ## 00000000
/* 00A28 8088CC28 0C031AD5 */ jal Graph_CloseDisps
/* 00A2C 8088CC2C 24070258 */ addiu $a3, $zero, 0x0258 ## $a3 = 00000258
/* 00A30 8088CC30 8FBF0034 */ lw $ra, 0x0034($sp)
/* 00A34 8088CC34 8FB0001C */ lw $s0, 0x001C($sp)
/* 00A38 8088CC38 8FB10020 */ lw $s1, 0x0020($sp)
/* 00A3C 8088CC3C 8FB20024 */ lw $s2, 0x0024($sp)
/* 00A40 8088CC40 8FB30028 */ lw $s3, 0x0028($sp)
/* 00A44 8088CC44 8FB4002C */ lw $s4, 0x002C($sp)
/* 00A48 8088CC48 8FB50030 */ lw $s5, 0x0030($sp)
/* 00A4C 8088CC4C 03E00008 */ jr $ra
/* 00A50 8088CC50 27BD00A8 */ addiu $sp, $sp, 0x00A8 ## $sp = 00000000
/* 00A54 8088CC54 00000000 */ nop
/* 00A58 8088CC58 00000000 */ nop
/* 00A5C 8088CC5C 00000000 */ nop

70
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s
View file

@ -1,70 +0,0 @@
glabel BgHidanRsekizou_Init
/* 00000 8088C200 27BDFFC0 */ addiu $sp, $sp, 0xFFC0 ## $sp = FFFFFFC0
/* 00004 8088C204 AFA50044 */ sw $a1, 0x0044($sp)
/* 00008 8088C208 AFBF0024 */ sw $ra, 0x0024($sp)
/* 0000C 8088C20C AFB00020 */ sw $s0, 0x0020($sp)
/* 00010 8088C210 3C058089 */ lui $a1, %hi(D_8088CD68) ## $a1 = 80890000
/* 00014 8088C214 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 00018 8088C218 AFA00030 */ sw $zero, 0x0030($sp)
/* 0001C 8088C21C 0C01E037 */ jal Actor_ProcessInitChain
/* 00020 8088C220 24A5CD68 */ addiu $a1, $a1, %lo(D_8088CD68) ## $a1 = 8088CD68
/* 00024 8088C224 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 00028 8088C228 0C010D20 */ jal DynaPolyInfo_SetActorMove
/* 0002C 8088C22C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 00030 8088C230 3C040601 */ lui $a0, 0x0601 ## $a0 = 06010000
/* 00034 8088C234 2484D5C0 */ addiu $a0, $a0, 0xD5C0 ## $a0 = 0600D5C0
/* 00038 8088C238 0C010620 */ jal DynaPolyInfo_Alloc
/* 0003C 8088C23C 27A50030 */ addiu $a1, $sp, 0x0030 ## $a1 = FFFFFFF0
/* 00040 8088C240 8FA40044 */ lw $a0, 0x0044($sp)
/* 00044 8088C244 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 00048 8088C248 8FA70030 */ lw $a3, 0x0030($sp)
/* 0004C 8088C24C 0C00FA9D */ jal DynaPolyInfo_RegisterActor
## DynaPolyInfo_setActor
/* 00050 8088C250 24850810 */ addiu $a1, $a0, 0x0810 ## $a1 = 00000810
/* 00054 8088C254 AE02014C */ sw $v0, 0x014C($s0) ## 0000014C
/* 00058 8088C258 26050168 */ addiu $a1, $s0, 0x0168 ## $a1 = 00000168
/* 0005C 8088C25C AFA5002C */ sw $a1, 0x002C($sp)
/* 00060 8088C260 0C016EFE */ jal Collider_InitJntSph
/* 00064 8088C264 8FA40044 */ lw $a0, 0x0044($sp)
/* 00068 8088C268 3C078089 */ lui $a3, %hi(D_8088CD58) ## $a3 = 80890000
/* 0006C 8088C26C 260E0188 */ addiu $t6, $s0, 0x0188 ## $t6 = 00000188
/* 00070 8088C270 8FA5002C */ lw $a1, 0x002C($sp)
/* 00074 8088C274 AFAE0010 */ sw $t6, 0x0010($sp)
/* 00078 8088C278 24E7CD58 */ addiu $a3, $a3, %lo(D_8088CD58) ## $a3 = 8088CD58
/* 0007C 8088C27C 8FA40044 */ lw $a0, 0x0044($sp)
/* 00080 8088C280 0C017014 */ jal Collider_SetJntSph
/* 00084 8088C284 02003025 */ or $a2, $s0, $zero ## $a2 = 00000000
/* 00088 8088C288 8E020184 */ lw $v0, 0x0184($s0) ## 00000184
/* 0008C 8088C28C 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002
/* 00090 8088C290 00041980 */ sll $v1, $a0, 6
/* 00094 8088C294 844F002E */ lh $t7, 0x002E($v0) ## 0000002E
/* 00098 8088C298 A44F0036 */ sh $t7, 0x0036($v0) ## 00000036
/* 0009C 8088C29C 8E020184 */ lw $v0, 0x0184($s0) ## 00000184
/* 000A0 8088C2A0 8458006E */ lh $t8, 0x006E($v0) ## 0000006E
/* 000A4 8088C2A4 A4580076 */ sh $t8, 0x0076($v0) ## 00000076
/* 000A8 8088C2A8 8E190184 */ lw $t9, 0x0184($s0) ## 00000184
/* 000AC 8088C2AC 03231021 */ addu $v0, $t9, $v1
/* 000B0 8088C2B0 8448002E */ lh $t0, 0x002E($v0) ## 0000002E
/* 000B4 8088C2B4 A4480036 */ sh $t0, 0x0036($v0) ## 00000036
/* 000B8 8088C2B8 8E090184 */ lw $t1, 0x0184($s0) ## 00000184
/* 000BC 8088C2BC 01231021 */ addu $v0, $t1, $v1
/* 000C0 8088C2C0 844A006E */ lh $t2, 0x006E($v0) ## 0000006E
/* 000C4 8088C2C4 A44A0076 */ sh $t2, 0x0076($v0) ## 00000076
/* 000C8 8088C2C8 8E0B0184 */ lw $t3, 0x0184($s0) ## 00000184
/* 000CC 8088C2CC 01631021 */ addu $v0, $t3, $v1
/* 000D0 8088C2D0 844C00AE */ lh $t4, 0x00AE($v0) ## 000000AE
/* 000D4 8088C2D4 A44C00B6 */ sh $t4, 0x00B6($v0) ## 000000B6
/* 000D8 8088C2D8 8E0D0184 */ lw $t5, 0x0184($s0) ## 00000184
/* 000DC 8088C2DC 01A31021 */ addu $v0, $t5, $v1
/* 000E0 8088C2E0 844E00EE */ lh $t6, 0x00EE($v0) ## 000000EE
/* 000E4 8088C2E4 A44E00F6 */ sh $t6, 0x00F6($v0) ## 000000F6
/* 000E8 8088C2E8 A6000166 */ sh $zero, 0x0166($s0) ## 00000166
/* 000EC 8088C2EC A6000164 */ sh $zero, 0x0164($s0) ## 00000164
/* 000F0 8088C2F0 8FBF0024 */ lw $ra, 0x0024($sp)
/* 000F4 8088C2F4 8FB00020 */ lw $s0, 0x0020($sp)
/* 000F8 8088C2F8 27BD0040 */ addiu $sp, $sp, 0x0040 ## $sp = 00000000
/* 000FC 8088C2FC 03E00008 */ jr $ra
/* 00100 8088C300 00000000 */ nop

247
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s
View file

@ -1,247 +0,0 @@
glabel BgHidanRsekizou_Update
/* 0014C 8088C34C 27BDFFC8 */ addiu $sp, $sp, 0xFFC8 ## $sp = FFFFFFC8
/* 00150 8088C350 AFBF001C */ sw $ra, 0x001C($sp)
/* 00154 8088C354 AFB00018 */ sw $s0, 0x0018($sp)
/* 00158 8088C358 AFA5003C */ sw $a1, 0x003C($sp)
/* 0015C 8088C35C 848E0166 */ lh $t6, 0x0166($a0) ## 00000166
/* 00160 8088C360 00808025 */ or $s0, $a0, $zero ## $s0 = 00000000
/* 00164 8088C364 86020164 */ lh $v0, 0x0164($s0) ## 00000164
/* 00168 8088C368 25CF0001 */ addiu $t7, $t6, 0x0001 ## $t7 = 00000001
/* 0016C 8088C36C 05E10004 */ bgez $t7, .L8088C380
/* 00170 8088C370 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000001
/* 00174 8088C374 13000002 */ beq $t8, $zero, .L8088C380
/* 00178 8088C378 00000000 */ nop
/* 0017C 8088C37C 2718FFF8 */ addiu $t8, $t8, 0xFFF8 ## $t8 = FFFFFFF9
.L8088C380:
/* 00180 8088C380 10400004 */ beq $v0, $zero, .L8088C394
/* 00184 8088C384 A6180166 */ sh $t8, 0x0166($s0) ## 00000166
/* 00188 8088C388 2459FFFF */ addiu $t9, $v0, 0xFFFF ## $t9 = FFFFFFFF
/* 0018C 8088C38C A6190164 */ sh $t9, 0x0164($s0) ## 00000164
/* 00190 8088C390 86020164 */ lh $v0, 0x0164($s0) ## 00000164
.L8088C394:
/* 00194 8088C394 14400002 */ bne $v0, $zero, .L8088C3A0
/* 00198 8088C398 24080003 */ addiu $t0, $zero, 0x0003 ## $t0 = 00000003
/* 0019C 8088C39C A6080164 */ sh $t0, 0x0164($s0) ## 00000164
.L8088C3A0:
/* 001A0 8088C3A0 860900B6 */ lh $t1, 0x00B6($s0) ## 000000B6
/* 001A4 8088C3A4 252A0180 */ addiu $t2, $t1, 0x0180 ## $t2 = 00000180
/* 001A8 8088C3A8 A60A00B6 */ sh $t2, 0x00B6($s0) ## 000000B6
/* 001AC 8088C3AC 0C01DE1C */ jal Math_Sins
## sins?
/* 001B0 8088C3B0 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6
/* 001B4 8088C3B4 860400B6 */ lh $a0, 0x00B6($s0) ## 000000B6
/* 001B8 8088C3B8 0C01DE0D */ jal Math_Coss
## coss?
/* 001BC 8088C3BC E7A00024 */ swc1 $f0, 0x0024($sp)
/* 001C0 8088C3C0 8E020184 */ lw $v0, 0x0184($s0) ## 00000184
/* 001C4 8088C3C4 C7AE0024 */ lwc1 $f14, 0x0024($sp)
/* 001C8 8088C3C8 C6080008 */ lwc1 $f8, 0x0008($s0) ## 00000008
/* 001CC 8088C3CC 844B0028 */ lh $t3, 0x0028($v0) ## 00000028
/* 001D0 8088C3D0 844C002C */ lh $t4, 0x002C($v0) ## 0000002C
/* 001D4 8088C3D4 8449002A */ lh $t1, 0x002A($v0) ## 0000002A
/* 001D8 8088C3D8 448B2000 */ mtc1 $t3, $f4 ## $f4 = 0.00
/* 001DC 8088C3DC 448C3000 */ mtc1 $t4, $f6 ## $f6 = 0.00
/* 001E0 8088C3E0 24040002 */ addiu $a0, $zero, 0x0002 ## $a0 = 00000002
/* 001E4 8088C3E4 468020A0 */ cvt.s.w $f2, $f4
/* 001E8 8088C3E8 00041980 */ sll $v1, $a0, 6
/* 001EC 8088C3EC 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 001F0 8088C3F0 34211E60 */ ori $at, $at, 0x1E60 ## $at = 00011E60
/* 001F4 8088C3F4 26060168 */ addiu $a2, $s0, 0x0168 ## $a2 = 00000168
/* 001F8 8088C3F8 46803320 */ cvt.s.w $f12, $f6
/* 001FC 8088C3FC 46020282 */ mul.s $f10, $f0, $f2
/* 00200 8088C400 460A4400 */ add.s $f16, $f8, $f10
/* 00204 8088C404 460C7482 */ mul.s $f18, $f14, $f12
/* 00208 8088C408 46128100 */ add.s $f4, $f16, $f18
/* 0020C 8088C40C 46027482 */ mul.s $f18, $f14, $f2
/* 00210 8088C410 4600218D */ trunc.w.s $f6, $f4
/* 00214 8088C414 440E3000 */ mfc1 $t6, $f6
/* 00218 8088C418 460C0182 */ mul.s $f6, $f0, $f12
/* 0021C 8088C41C A44E0030 */ sh $t6, 0x0030($v0) ## 00000030
/* 00220 8088C420 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C
/* 00224 8088C424 4600428D */ trunc.w.s $f10, $f8
/* 00228 8088C428 44085000 */ mfc1 $t0, $f10
/* 0022C 8088C42C 00000000 */ nop
/* 00230 8088C430 01095021 */ addu $t2, $t0, $t1
/* 00234 8088C434 A44A0032 */ sh $t2, 0x0032($v0) ## 00000032
/* 00238 8088C438 C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010
/* 0023C 8088C43C 46128101 */ sub.s $f4, $f16, $f18
/* 00240 8088C440 46062200 */ add.s $f8, $f4, $f6
/* 00244 8088C444 4600428D */ trunc.w.s $f10, $f8
/* 00248 8088C448 440C5000 */ mfc1 $t4, $f10
/* 0024C 8088C44C 00000000 */ nop
/* 00250 8088C450 A44C0034 */ sh $t4, 0x0034($v0) ## 00000034
/* 00254 8088C454 8E020184 */ lw $v0, 0x0184($s0) ## 00000184
/* 00258 8088C458 C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008
/* 0025C 8088C45C 844D0068 */ lh $t5, 0x0068($v0) ## 00000068
/* 00260 8088C460 844E006C */ lh $t6, 0x006C($v0) ## 0000006C
/* 00264 8088C464 844B006A */ lh $t3, 0x006A($v0) ## 0000006A
/* 00268 8088C468 448D8000 */ mtc1 $t5, $f16 ## $f16 = 0.00
/* 0026C 8088C46C 448E9000 */ mtc1 $t6, $f18 ## $f18 = 0.00
/* 00270 8088C470 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000040
/* 00274 8088C474 468080A0 */ cvt.s.w $f2, $f16
/* 00278 8088C478 46809320 */ cvt.s.w $f12, $f18
/* 0027C 8088C47C 46020182 */ mul.s $f6, $f0, $f2
/* 00280 8088C480 46062200 */ add.s $f8, $f4, $f6
/* 00284 8088C484 460C7282 */ mul.s $f10, $f14, $f12
/* 00288 8088C488 460A4400 */ add.s $f16, $f8, $f10
/* 0028C 8088C48C 46027282 */ mul.s $f10, $f14, $f2
/* 00290 8088C490 4600848D */ trunc.w.s $f18, $f16
/* 00294 8088C494 44189000 */ mfc1 $t8, $f18
/* 00298 8088C498 460C0482 */ mul.s $f18, $f0, $f12
/* 0029C 8088C49C A4580030 */ sh $t8, 0x0030($v0) ## 00000070
/* 002A0 8088C4A0 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C
/* 002A4 8088C4A4 4600218D */ trunc.w.s $f6, $f4
/* 002A8 8088C4A8 440A3000 */ mfc1 $t2, $f6
/* 002AC 8088C4AC 00000000 */ nop
/* 002B0 8088C4B0 014B6021 */ addu $t4, $t2, $t3
/* 002B4 8088C4B4 A44C0032 */ sh $t4, 0x0032($v0) ## 00000072
/* 002B8 8088C4B8 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010
/* 002BC 8088C4BC 460A4401 */ sub.s $f16, $f8, $f10
/* 002C0 8088C4C0 46128100 */ add.s $f4, $f16, $f18
/* 002C4 8088C4C4 4600218D */ trunc.w.s $f6, $f4
/* 002C8 8088C4C8 440E3000 */ mfc1 $t6, $f6
/* 002CC 8088C4CC 00000000 */ nop
/* 002D0 8088C4D0 A44E0034 */ sh $t6, 0x0034($v0) ## 00000074
/* 002D4 8088C4D4 8E0F0184 */ lw $t7, 0x0184($s0) ## 00000184
/* 002D8 8088C4D8 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000008
/* 002DC 8088C4DC 01E31021 */ addu $v0, $t7, $v1
/* 002E0 8088C4E0 84580028 */ lh $t8, 0x0028($v0) ## 00000068
/* 002E4 8088C4E4 8459002C */ lh $t9, 0x002C($v0) ## 0000006C
/* 002E8 8088C4E8 844E002A */ lh $t6, 0x002A($v0) ## 0000006A
/* 002EC 8088C4EC 44984000 */ mtc1 $t8, $f8 ## $f8 = 0.00
/* 002F0 8088C4F0 44995000 */ mtc1 $t9, $f10 ## $f10 = 0.00
/* 002F4 8088C4F4 468040A0 */ cvt.s.w $f2, $f8
/* 002F8 8088C4F8 46805320 */ cvt.s.w $f12, $f10
/* 002FC 8088C4FC 46020482 */ mul.s $f18, $f0, $f2
/* 00300 8088C500 46128100 */ add.s $f4, $f16, $f18
/* 00304 8088C504 460C7182 */ mul.s $f6, $f14, $f12
/* 00308 8088C508 46062200 */ add.s $f8, $f4, $f6
/* 0030C 8088C50C 46027182 */ mul.s $f6, $f14, $f2
/* 00310 8088C510 4600428D */ trunc.w.s $f10, $f8
/* 00314 8088C514 44095000 */ mfc1 $t1, $f10
/* 00318 8088C518 460C0282 */ mul.s $f10, $f0, $f12
/* 0031C 8088C51C A4490030 */ sh $t1, 0x0030($v0) ## 00000070
/* 00320 8088C520 C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C
/* 00324 8088C524 4600848D */ trunc.w.s $f18, $f16
/* 00328 8088C528 440D9000 */ mfc1 $t5, $f18
/* 0032C 8088C52C 00000000 */ nop
/* 00330 8088C530 01AE7821 */ addu $t7, $t5, $t6
/* 00334 8088C534 A44F0032 */ sh $t7, 0x0032($v0) ## 00000072
/* 00338 8088C538 C6040010 */ lwc1 $f4, 0x0010($s0) ## 00000010
/* 0033C 8088C53C 46062201 */ sub.s $f8, $f4, $f6
/* 00340 8088C540 460A4400 */ add.s $f16, $f8, $f10
/* 00344 8088C544 4600848D */ trunc.w.s $f18, $f16
/* 00348 8088C548 44199000 */ mfc1 $t9, $f18
/* 0034C 8088C54C 00000000 */ nop
/* 00350 8088C550 A4590034 */ sh $t9, 0x0034($v0) ## 00000074
/* 00354 8088C554 8E080184 */ lw $t0, 0x0184($s0) ## 00000184
/* 00358 8088C558 C6080008 */ lwc1 $f8, 0x0008($s0) ## 00000008
/* 0035C 8088C55C 01031021 */ addu $v0, $t0, $v1
/* 00360 8088C560 84490068 */ lh $t1, 0x0068($v0) ## 000000A8
/* 00364 8088C564 844A006C */ lh $t2, 0x006C($v0) ## 000000AC
/* 00368 8088C568 8459006A */ lh $t9, 0x006A($v0) ## 000000AA
/* 0036C 8088C56C 44892000 */ mtc1 $t1, $f4 ## $f4 = 0.00
/* 00370 8088C570 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00
/* 00374 8088C574 24420040 */ addiu $v0, $v0, 0x0040 ## $v0 = 00000080
/* 00378 8088C578 468020A0 */ cvt.s.w $f2, $f4
/* 0037C 8088C57C 46803320 */ cvt.s.w $f12, $f6
/* 00380 8088C580 46020282 */ mul.s $f10, $f0, $f2
/* 00384 8088C584 460A4400 */ add.s $f16, $f8, $f10
/* 00388 8088C588 460C7482 */ mul.s $f18, $f14, $f12
/* 0038C 8088C58C 46128100 */ add.s $f4, $f16, $f18
/* 00390 8088C590 46027482 */ mul.s $f18, $f14, $f2
/* 00394 8088C594 4600218D */ trunc.w.s $f6, $f4
/* 00398 8088C598 440C3000 */ mfc1 $t4, $f6
/* 0039C 8088C59C 460C0182 */ mul.s $f6, $f0, $f12
/* 003A0 8088C5A0 A44C0030 */ sh $t4, 0x0030($v0) ## 000000B0
/* 003A4 8088C5A4 C608000C */ lwc1 $f8, 0x000C($s0) ## 0000000C
/* 003A8 8088C5A8 4600428D */ trunc.w.s $f10, $f8
/* 003AC 8088C5AC 44185000 */ mfc1 $t8, $f10
/* 003B0 8088C5B0 00000000 */ nop
/* 003B4 8088C5B4 03194021 */ addu $t0, $t8, $t9
/* 003B8 8088C5B8 A4480032 */ sh $t0, 0x0032($v0) ## 000000B2
/* 003BC 8088C5BC C6100010 */ lwc1 $f16, 0x0010($s0) ## 00000010
/* 003C0 8088C5C0 46128101 */ sub.s $f4, $f16, $f18
/* 003C4 8088C5C4 46062200 */ add.s $f8, $f4, $f6
/* 003C8 8088C5C8 4600428D */ trunc.w.s $f10, $f8
/* 003CC 8088C5CC 440A5000 */ mfc1 $t2, $f10
/* 003D0 8088C5D0 00000000 */ nop
/* 003D4 8088C5D4 A44A0034 */ sh $t2, 0x0034($v0) ## 000000B4
/* 003D8 8088C5D8 8E0B0184 */ lw $t3, 0x0184($s0) ## 00000184
/* 003DC 8088C5DC C6040008 */ lwc1 $f4, 0x0008($s0) ## 00000008
/* 003E0 8088C5E0 01631021 */ addu $v0, $t3, $v1
/* 003E4 8088C5E4 844C00A8 */ lh $t4, 0x00A8($v0) ## 00000128
/* 003E8 8088C5E8 844D00AC */ lh $t5, 0x00AC($v0) ## 0000012C
/* 003EC 8088C5EC 844A00AA */ lh $t2, 0x00AA($v0) ## 0000012A
/* 003F0 8088C5F0 448C8000 */ mtc1 $t4, $f16 ## $f16 = 0.00
/* 003F4 8088C5F4 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00
/* 003F8 8088C5F8 24420080 */ addiu $v0, $v0, 0x0080 ## $v0 = 00000100
/* 003FC 8088C5FC 468080A0 */ cvt.s.w $f2, $f16
/* 00400 8088C600 46809320 */ cvt.s.w $f12, $f18
/* 00404 8088C604 46020182 */ mul.s $f6, $f0, $f2
/* 00408 8088C608 46062200 */ add.s $f8, $f4, $f6
/* 0040C 8088C60C 460C7282 */ mul.s $f10, $f14, $f12
/* 00410 8088C610 460A4400 */ add.s $f16, $f8, $f10
/* 00414 8088C614 46027282 */ mul.s $f10, $f14, $f2
/* 00418 8088C618 4600848D */ trunc.w.s $f18, $f16
/* 0041C 8088C61C 440F9000 */ mfc1 $t7, $f18
/* 00420 8088C620 460C0482 */ mul.s $f18, $f0, $f12
/* 00424 8088C624 A44F0030 */ sh $t7, 0x0030($v0) ## 00000130
/* 00428 8088C628 C604000C */ lwc1 $f4, 0x000C($s0) ## 0000000C
/* 0042C 8088C62C 4600218D */ trunc.w.s $f6, $f4
/* 00430 8088C630 44093000 */ mfc1 $t1, $f6
/* 00434 8088C634 00000000 */ nop
/* 00438 8088C638 012A5821 */ addu $t3, $t1, $t2
/* 0043C 8088C63C A44B0032 */ sh $t3, 0x0032($v0) ## 00000132
/* 00440 8088C640 C6080010 */ lwc1 $f8, 0x0010($s0) ## 00000010
/* 00444 8088C644 460A4401 */ sub.s $f16, $f8, $f10
/* 00448 8088C648 46128100 */ add.s $f4, $f16, $f18
/* 0044C 8088C64C 4600218D */ trunc.w.s $f6, $f4
/* 00450 8088C650 440D3000 */ mfc1 $t5, $f6
/* 00454 8088C654 00000000 */ nop
/* 00458 8088C658 A44D0034 */ sh $t5, 0x0034($v0) ## 00000134
/* 0045C 8088C65C 8E0E0184 */ lw $t6, 0x0184($s0) ## 00000184
/* 00460 8088C660 C6100008 */ lwc1 $f16, 0x0008($s0) ## 00000008
/* 00464 8088C664 01C31021 */ addu $v0, $t6, $v1
/* 00468 8088C668 844F00E8 */ lh $t7, 0x00E8($v0) ## 000001E8
/* 0046C 8088C66C 845800EC */ lh $t8, 0x00EC($v0) ## 000001EC
/* 00470 8088C670 844D00EA */ lh $t5, 0x00EA($v0) ## 000001EA
/* 00474 8088C674 448F4000 */ mtc1 $t7, $f8 ## $f8 = 0.00
/* 00478 8088C678 44985000 */ mtc1 $t8, $f10 ## $f10 = 0.00
/* 0047C 8088C67C 244200C0 */ addiu $v0, $v0, 0x00C0 ## $v0 = 000001C0
/* 00480 8088C680 468040A0 */ cvt.s.w $f2, $f8
/* 00484 8088C684 46805320 */ cvt.s.w $f12, $f10
/* 00488 8088C688 46020482 */ mul.s $f18, $f0, $f2
/* 0048C 8088C68C 46128100 */ add.s $f4, $f16, $f18
/* 00490 8088C690 460C7182 */ mul.s $f6, $f14, $f12
/* 00494 8088C694 46062200 */ add.s $f8, $f4, $f6
/* 00498 8088C698 46027182 */ mul.s $f6, $f14, $f2
/* 0049C 8088C69C 4600428D */ trunc.w.s $f10, $f8
/* 004A0 8088C6A0 44085000 */ mfc1 $t0, $f10
/* 004A4 8088C6A4 460C0282 */ mul.s $f10, $f0, $f12
/* 004A8 8088C6A8 A4480030 */ sh $t0, 0x0030($v0) ## 000001F0
/* 004AC 8088C6AC C610000C */ lwc1 $f16, 0x000C($s0) ## 0000000C
/* 004B0 8088C6B0 4600848D */ trunc.w.s $f18, $f16
/* 004B4 8088C6B4 440C9000 */ mfc1 $t4, $f18
/* 004B8 8088C6B8 00000000 */ nop
/* 004BC 8088C6BC 018D7021 */ addu $t6, $t4, $t5
/* 004C0 8088C6C0 A44E0032 */ sh $t6, 0x0032($v0) ## 000001F2
/* 004C4 8088C6C4 C6040010 */ lwc1 $f4, 0x0010($s0) ## 00000010
/* 004C8 8088C6C8 46062201 */ sub.s $f8, $f4, $f6
/* 004CC 8088C6CC 460A4400 */ add.s $f16, $f8, $f10
/* 004D0 8088C6D0 4600848D */ trunc.w.s $f18, $f16
/* 004D4 8088C6D4 44189000 */ mfc1 $t8, $f18
/* 004D8 8088C6D8 00000000 */ nop
/* 004DC 8088C6DC A4580034 */ sh $t8, 0x0034($v0) ## 000001F4
/* 004E0 8088C6E0 8FA4003C */ lw $a0, 0x003C($sp)
/* 004E4 8088C6E4 0C0175E7 */ jal CollisionCheck_SetAT
## CollisionCheck_setAT
/* 004E8 8088C6E8 00812821 */ addu $a1, $a0, $at
/* 004EC 8088C6EC 02002025 */ or $a0, $s0, $zero ## $a0 = 00000000
/* 004F0 8088C6F0 0C00BE5D */ jal func_8002F974
/* 004F4 8088C6F4 24052033 */ addiu $a1, $zero, 0x2033 ## $a1 = 00002033
/* 004F8 8088C6F8 8FBF001C */ lw $ra, 0x001C($sp)
/* 004FC 8088C6FC 8FB00018 */ lw $s0, 0x0018($sp)
/* 00500 8088C700 27BD0038 */ addiu $sp, $sp, 0x0038 ## $sp = 00000000
/* 00504 8088C704 03E00008 */ jr $ra
/* 00508 8088C708 00000000 */ nop

232
asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s
View file

@ -1,232 +0,0 @@
.rdata
glabel D_8088CDA0
.asciz "../z_bg_hidan_rsekizou.c"
.balign 4
.late_rodata
glabel D_8088CE10
.word 0x3E124925
glabel D_8088CE14
.word 0x3EAAAAAB
glabel D_8088CE18
.float 0.7
glabel D_8088CE1C
.float 0.7
.text
glabel func_8088C70C
/* 0050C 8088C70C 27BDFFA0 */ addiu $sp, $sp, 0xFFA0 ## $sp = FFFFFFA0
/* 00510 8088C710 AFBF001C */ sw $ra, 0x001C($sp)
/* 00514 8088C714 AFB10018 */ sw $s1, 0x0018($sp)
/* 00518 8088C718 AFB00014 */ sw $s0, 0x0014($sp)
/* 0051C 8088C71C AFA40060 */ sw $a0, 0x0060($sp)
/* 00520 8088C720 AFA60068 */ sw $a2, 0x0068($sp)
/* 00524 8088C724 84AE0166 */ lh $t6, 0x0166($a1) ## 00000166
/* 00528 8088C728 00063400 */ sll $a2, $a2, 16
/* 0052C 8088C72C 00063403 */ sra $a2, $a2, 16
/* 00530 8088C730 01C67821 */ addu $t7, $t6, $a2
/* 00534 8088C734 3C018089 */ lui $at, %hi(D_8088CE10) ## $at = 80890000
/* 00538 8088C738 C428CE10 */ lwc1 $f8, %lo(D_8088CE10)($at)
/* 0053C 8088C73C 8FB00074 */ lw $s0, 0x0074($sp)
/* 00540 8088C740 3C0ADB06 */ lui $t2, 0xDB06 ## $t2 = DB060000
/* 00544 8088C744 354A0024 */ ori $t2, $t2, 0x0024 ## $t2 = DB060024
/* 00548 8088C748 3C038089 */ lui $v1, %hi(D_8088CD74) ## $v1 = 80890000
/* 0054C 8088C74C 02001025 */ or $v0, $s0, $zero ## $v0 = 00000000
/* 00550 8088C750 AC4A0000 */ sw $t2, 0x0000($v0) ## 00000000
/* 00554 8088C754 3C0100FF */ lui $at, 0x00FF ## $at = 00FF0000
/* 00558 8088C758 3421FFFF */ ori $at, $at, 0xFFFF ## $at = 00FFFFFF
/* 0055C 8088C75C 24C60001 */ addiu $a2, $a2, 0x0001 ## $a2 = 00000001
/* 00560 8088C760 00063400 */ sll $a2, $a2, 16
/* 00564 8088C764 00063403 */ sra $a2, $a2, 16
/* 00568 8088C768 00A08825 */ or $s1, $a1, $zero ## $s1 = 00000000
/* 0056C 8088C76C 05E10004 */ bgez $t7, .L8088C780
/* 00570 8088C770 31F80007 */ andi $t8, $t7, 0x0007 ## $t8 = 00000000
/* 00574 8088C774 13000002 */ beq $t8, $zero, .L8088C780
/* 00578 8088C778 00000000 */ nop
/* 0057C 8088C77C 2718FFF8 */ addiu $t8, $t8, 0xFFF8 ## $t8 = FFFFFFF8
.L8088C780:
/* 00580 8088C780 0018C8C0 */ sll $t9, $t8, 3
/* 00584 8088C784 0338C823 */ subu $t9, $t9, $t8
/* 00588 8088C788 44992000 */ mtc1 $t9, $f4 ## $f4 = 0.00
/* 0058C 8088C78C 3C188016 */ lui $t8, %hi(gSegments)
/* 00590 8088C790 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000008
/* 00594 8088C794 468021A0 */ cvt.s.w $f6, $f4
/* 00598 8088C798 46083282 */ mul.s $f10, $f6, $f8
/* 0059C 8088C79C 4600540D */ trunc.w.s $f16, $f10
/* 005A0 8088C7A0 44088000 */ mfc1 $t0, $f16
/* 005A4 8088C7A4 00000000 */ nop
/* 005A8 8088C7A8 00085880 */ sll $t3, $t0, 2
/* 005AC 8088C7AC 006B1821 */ addu $v1, $v1, $t3
/* 005B0 8088C7B0 8C63CD74 */ lw $v1, %lo(D_8088CD74)($v1)
/* 005B4 8088C7B4 00036900 */ sll $t5, $v1, 4
/* 005B8 8088C7B8 000D7702 */ srl $t6, $t5, 28
/* 005BC 8088C7BC 000E7880 */ sll $t7, $t6, 2
/* 005C0 8088C7C0 030FC021 */ addu $t8, $t8, $t7
/* 005C4 8088C7C4 8F186FA8 */ lw $t8, %lo(gSegments)($t8)
/* 005C8 8088C7C8 00616024 */ and $t4, $v1, $at
/* 005CC 8088C7CC 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 005D0 8088C7D0 0198C821 */ addu $t9, $t4, $t8
/* 005D4 8088C7D4 03214821 */ addu $t1, $t9, $at
/* 005D8 8088C7D8 24010004 */ addiu $at, $zero, 0x0004 ## $at = 00000004
/* 005DC 8088C7DC 10C1000D */ beq $a2, $at, .L8088C814
/* 005E0 8088C7E0 AC490004 */ sw $t1, 0x0004($v0) ## 00000004
/* 005E4 8088C7E4 862A0164 */ lh $t2, 0x0164($s1) ## 00000164
/* 005E8 8088C7E8 240B0003 */ addiu $t3, $zero, 0x0003 ## $t3 = 00000003
/* 005EC 8088C7EC 3C018089 */ lui $at, %hi(D_8088CE14) ## $at = 80890000
/* 005F0 8088C7F0 016A6823 */ subu $t5, $t3, $t2
/* 005F4 8088C7F4 448D9000 */ mtc1 $t5, $f18 ## $f18 = 0.00
/* 005F8 8088C7F8 C426CE14 */ lwc1 $f6, %lo(D_8088CE14)($at)
/* 005FC 8088C7FC 44865000 */ mtc1 $a2, $f10 ## $f10 = 0.00
/* 00600 8088C800 46809120 */ cvt.s.w $f4, $f18
/* 00604 8088C804 46805420 */ cvt.s.w $f16, $f10
/* 00608 8088C808 46062202 */ mul.s $f8, $f4, $f6
/* 0060C 8088C80C 10000004 */ beq $zero, $zero, .L8088C820
/* 00610 8088C810 46088380 */ add.s $f14, $f16, $f8
.L8088C814:
/* 00614 8088C814 44869000 */ mtc1 $a2, $f18 ## $f18 = 0.00
/* 00618 8088C818 00000000 */ nop
/* 0061C 8088C81C 468093A0 */ cvt.s.w $f14, $f18
.L8088C820:
/* 00620 8088C820 02001025 */ or $v0, $s0, $zero ## $v0 = 00000008
/* 00624 8088C824 3C0EFA00 */ lui $t6, 0xFA00 ## $t6 = FA000000
/* 00628 8088C828 3C0FFFFF */ lui $t7, 0xFFFF ## $t7 = FFFF0000
/* 0062C 8088C82C 35EF0096 */ ori $t7, $t7, 0x0096 ## $t7 = FFFF0096
/* 00630 8088C830 35CE0001 */ ori $t6, $t6, 0x0001 ## $t6 = FA000001
/* 00634 8088C834 AC4E0000 */ sw $t6, 0x0000($v0) ## 00000008
/* 00638 8088C838 AC4F0004 */ sw $t7, 0x0004($v0) ## 0000000C
/* 0063C 8088C83C 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000010
/* 00640 8088C840 02001025 */ or $v0, $s0, $zero ## $v0 = 00000010
/* 00644 8088C844 3C18FF00 */ lui $t8, 0xFF00 ## $t8 = FF000000
/* 00648 8088C848 371800FF */ ori $t8, $t8, 0x00FF ## $t8 = FF0000FF
/* 0064C 8088C84C 3C0CFB00 */ lui $t4, 0xFB00 ## $t4 = FB000000
/* 00650 8088C850 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000010
/* 00654 8088C854 AC580004 */ sw $t8, 0x0004($v0) ## 00000014
/* 00658 8088C858 8FB90070 */ lw $t9, 0x0070($sp)
/* 0065C 8088C85C 00061080 */ sll $v0, $a2, 2
/* 00660 8088C860 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000018
/* 00664 8088C864 1720001C */ bne $t9, $zero, .L8088C8D8
/* 00668 8088C868 00461023 */ subu $v0, $v0, $a2
/* 0066C 8088C86C 00061080 */ sll $v0, $a2, 2
/* 00670 8088C870 00461023 */ subu $v0, $v0, $a2
/* 00674 8088C874 00021100 */ sll $v0, $v0, 4
/* 00678 8088C878 00461023 */ subu $v0, $v0, $a2
/* 0067C 8088C87C 862900B6 */ lh $t1, 0x00B6($s1) ## 000000B6
/* 00680 8088C880 000210C0 */ sll $v0, $v0, 3
/* 00684 8088C884 00461023 */ subu $v0, $v0, $a2
/* 00688 8088C888 00021080 */ sll $v0, $v0, 2
/* 0068C 8088C88C 01222023 */ subu $a0, $t1, $v0
/* 00690 8088C890 00042400 */ sll $a0, $a0, 16
/* 00694 8088C894 00042403 */ sra $a0, $a0, 16
/* 00698 8088C898 AFA20024 */ sw $v0, 0x0024($sp)
/* 0069C 8088C89C E7AE0050 */ swc1 $f14, 0x0050($sp)
/* 006A0 8088C8A0 0C01DE1C */ jal Math_Sins
## sins?
/* 006A4 8088C8A4 AFA7006C */ sw $a3, 0x006C($sp)
/* 006A8 8088C8A8 46000107 */ neg.s $f4, $f0
/* 006AC 8088C8AC 8FA20024 */ lw $v0, 0x0024($sp)
/* 006B0 8088C8B0 E7A40058 */ swc1 $f4, 0x0058($sp)
/* 006B4 8088C8B4 862B00B6 */ lh $t3, 0x00B6($s1) ## 000000B6
/* 006B8 8088C8B8 01622023 */ subu $a0, $t3, $v0
/* 006BC 8088C8BC 00042400 */ sll $a0, $a0, 16
/* 006C0 8088C8C0 0C01DE0D */ jal Math_Coss
## coss?
/* 006C4 8088C8C4 00042403 */ sra $a0, $a0, 16
/* 006C8 8088C8C8 8FA7006C */ lw $a3, 0x006C($sp)
/* 006CC 8088C8CC C7AE0050 */ lwc1 $f14, 0x0050($sp)
/* 006D0 8088C8D0 10000018 */ beq $zero, $zero, .L8088C934
/* 006D4 8088C8D4 46000307 */ neg.s $f12, $f0
.L8088C8D8:
/* 006D8 8088C8D8 00021100 */ sll $v0, $v0, 4
/* 006DC 8088C8DC 00461023 */ subu $v0, $v0, $a2
/* 006E0 8088C8E0 862A00B6 */ lh $t2, 0x00B6($s1) ## 000000B6
/* 006E4 8088C8E4 000210C0 */ sll $v0, $v0, 3
/* 006E8 8088C8E8 00461023 */ subu $v0, $v0, $a2
/* 006EC 8088C8EC 00021080 */ sll $v0, $v0, 2
/* 006F0 8088C8F0 01422023 */ subu $a0, $t2, $v0
/* 006F4 8088C8F4 00042400 */ sll $a0, $a0, 16
/* 006F8 8088C8F8 00042403 */ sra $a0, $a0, 16
/* 006FC 8088C8FC AFA20024 */ sw $v0, 0x0024($sp)
/* 00700 8088C900 E7AE0050 */ swc1 $f14, 0x0050($sp)
/* 00704 8088C904 0C01DE1C */ jal Math_Sins
## sins?
/* 00708 8088C908 AFA7006C */ sw $a3, 0x006C($sp)
/* 0070C 8088C90C E7A00058 */ swc1 $f0, 0x0058($sp)
/* 00710 8088C910 8FA20024 */ lw $v0, 0x0024($sp)
/* 00714 8088C914 862D00B6 */ lh $t5, 0x00B6($s1) ## 000000B6
/* 00718 8088C918 01A22023 */ subu $a0, $t5, $v0
/* 0071C 8088C91C 00042400 */ sll $a0, $a0, 16
/* 00720 8088C920 0C01DE0D */ jal Math_Coss
## coss?
/* 00724 8088C924 00042403 */ sra $a0, $a0, 16
/* 00728 8088C928 8FA7006C */ lw $a3, 0x006C($sp)
/* 0072C 8088C92C C7AE0050 */ lwc1 $f14, 0x0050($sp)
/* 00730 8088C930 46000306 */ mov.s $f12, $f0
.L8088C934:
/* 00734 8088C934 3C018089 */ lui $at, %hi(D_8088CE18) ## $at = 80890000
/* 00738 8088C938 C426CE18 */ lwc1 $f6, %lo(D_8088CE18)($at)
/* 0073C 8088C93C 3C013F00 */ lui $at, 0x3F00 ## $at = 3F000000
/* 00740 8088C940 44818000 */ mtc1 $at, $f16 ## $f16 = 0.50
/* 00744 8088C944 460E3282 */ mul.s $f10, $f6, $f14
/* 00748 8088C948 3C014120 */ lui $at, 0x4120 ## $at = 41200000
/* 0074C 8088C94C 44814000 */ mtc1 $at, $f8 ## $f8 = 10.00
/* 00750 8088C950 3C0141A0 */ lui $at, 0x41A0 ## $at = 41A00000
/* 00754 8088C954 44813000 */ mtc1 $at, $f6 ## $f6 = 20.00
/* 00758 8088C958 3C0141F0 */ lui $at, 0x41F0 ## $at = 41F00000
/* 0075C 8088C95C 3C0EDA38 */ lui $t6, 0xDA38 ## $t6 = DA380000
/* 00760 8088C960 46105000 */ add.s $f0, $f10, $f16
/* 00764 8088C964 35CE0003 */ ori $t6, $t6, 0x0003 ## $t6 = DA380003
/* 00768 8088C968 3C058089 */ lui $a1, %hi(D_8088CDA0) ## $a1 = 80890000
/* 0076C 8088C96C 24A5CDA0 */ addiu $a1, $a1, %lo(D_8088CDA0) ## $a1 = 8088CDA0
/* 00770 8088C970 46080482 */ mul.s $f18, $f0, $f8
/* 00774 8088C974 E4E00028 */ swc1 $f0, 0x0028($a3) ## 00000028
/* 00778 8088C978 E4E00014 */ swc1 $f0, 0x0014($a3) ## 00000014
/* 0077C 8088C97C E4E00000 */ swc1 $f0, 0x0000($a3) ## 00000000
/* 00780 8088C980 C7AA0058 */ lwc1 $f10, 0x0058($sp)
/* 00784 8088C984 C6280024 */ lwc1 $f8, 0x0024($s1) ## 00000024
/* 00788 8088C988 00E02025 */ or $a0, $a3, $zero ## $a0 = 00000000
/* 0078C 8088C98C 460E9102 */ mul.s $f4, $f18, $f14
/* 00790 8088C990 2406021F */ addiu $a2, $zero, 0x021F ## $a2 = 0000021F
/* 00794 8088C994 46062080 */ add.s $f2, $f4, $f6
/* 00798 8088C998 44813000 */ mtc1 $at, $f6 ## $f6 = 30.00
/* 0079C 8088C99C 3C018089 */ lui $at, %hi(D_8088CE1C) ## $at = 80890000
/* 007A0 8088C9A0 460A1402 */ mul.s $f16, $f2, $f10
/* 007A4 8088C9A4 46088480 */ add.s $f18, $f16, $f8
/* 007A8 8088C9A8 E4F20030 */ swc1 $f18, 0x0030($a3) ## 00000030
/* 007AC 8088C9AC C430CE1C */ lwc1 $f16, %lo(D_8088CE1C)($at)
/* 007B0 8088C9B0 C6240028 */ lwc1 $f4, 0x0028($s1) ## 00000028
/* 007B4 8088C9B4 460E8202 */ mul.s $f8, $f16, $f14
/* 007B8 8088C9B8 46062280 */ add.s $f10, $f4, $f6
/* 007BC 8088C9BC 460C1102 */ mul.s $f4, $f2, $f12
/* 007C0 8088C9C0 46085480 */ add.s $f18, $f10, $f8
/* 007C4 8088C9C4 E4F20034 */ swc1 $f18, 0x0034($a3) ## 00000034
/* 007C8 8088C9C8 C626002C */ lwc1 $f6, 0x002C($s1) ## 0000002C
/* 007CC 8088C9CC 02008825 */ or $s1, $s0, $zero ## $s1 = 00000018
/* 007D0 8088C9D0 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000020
/* 007D4 8088C9D4 46062400 */ add.s $f16, $f4, $f6
/* 007D8 8088C9D8 E4F00038 */ swc1 $f16, 0x0038($a3) ## 00000038
/* 007DC 8088C9DC 0C034A17 */ jal Matrix_CheckFloats
/* 007E0 8088C9E0 AE2E0000 */ sw $t6, 0x0000($s1) ## 00000018
/* 007E4 8088C9E4 8FAF0060 */ lw $t7, 0x0060($sp)
/* 007E8 8088C9E8 AFA20028 */ sw $v0, 0x0028($sp)
/* 007EC 8088C9EC 24050040 */ addiu $a1, $zero, 0x0040 ## $a1 = 00000040
/* 007F0 8088C9F0 0C031A73 */ jal Graph_Alloc
/* 007F4 8088C9F4 8DE40000 */ lw $a0, 0x0000($t7) ## 00000000
/* 007F8 8088C9F8 8FA40028 */ lw $a0, 0x0028($sp)
/* 007FC 8088C9FC 0C034610 */ jal Matrix_MtxFToMtx
/* 00800 8088CA00 00402825 */ or $a1, $v0, $zero ## $a1 = 00000000
/* 00804 8088CA04 AE220004 */ sw $v0, 0x0004($s1) ## 0000001C
/* 00808 8088CA08 02001025 */ or $v0, $s0, $zero ## $v0 = 00000020
/* 0080C 8088CA0C 3C180601 */ lui $t8, 0x0601 ## $t8 = 06010000
/* 00810 8088CA10 2718DC30 */ addiu $t8, $t8, 0xDC30 ## $t8 = 0600DC30
/* 00814 8088CA14 3C0CDE00 */ lui $t4, 0xDE00 ## $t4 = DE000000
/* 00818 8088CA18 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000020
/* 0081C 8088CA1C AC580004 */ sw $t8, 0x0004($v0) ## 00000024
/* 00820 8088CA20 8FBF001C */ lw $ra, 0x001C($sp)
/* 00824 8088CA24 26100008 */ addiu $s0, $s0, 0x0008 ## $s0 = 00000028
/* 00828 8088CA28 02001025 */ or $v0, $s0, $zero ## $v0 = 00000028
/* 0082C 8088CA2C 8FB00014 */ lw $s0, 0x0014($sp)
/* 00830 8088CA30 8FB10018 */ lw $s1, 0x0018($sp)
/* 00834 8088CA34 03E00008 */ jr $ra
/* 00838 8088CA38 27BD0060 */ addiu $sp, $sp, 0x0060 ## $sp = 00000000

27
data/overlays/actors/z_bg_hidan_rsekizou.data.s
View file

@ -1,27 +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 Bg_Hidan_Rsekizou_InitVars
.word 0x00440100, 0x00000000, 0x002C0000, 0x00000308
.word BgHidanRsekizou_Init
.word BgHidanRsekizou_Destroy
.word BgHidanRsekizou_Update
.word BgHidanRsekizou_Draw
glabel D_8088CC80
.word 0x00000000, 0x20000000, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x01000000, 0x001E0028, 0x00190064, 0x00000000, 0x20000000, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x0100FFDD, 0x0020004D, 0x00200064, 0x00000000, 0x20000000, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x0100FFB0, 0x00230082, 0x002A0064, 0x00000000, 0x20000000, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x01000000, 0x001EFFD8, 0x00190064, 0x00000000, 0x20000000, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x01000023, 0x0020FFB3, 0x00200064, 0x00000000, 0x20000000, 0x01040000, 0x00000000, 0x00000000, 0x19000000, 0x01000050, 0x0023FF7E, 0x002A0064
glabel D_8088CD58
.word 0x0A110000, 0x20000000, 0x00000006
.word D_8088CC80
glabel D_8088CD68
.word 0xC8500064, 0xB0F80190, 0x30F405DC
glabel D_8088CD74
.word 0x06015D20, 0x06016120, 0x06016520, 0x06016920, 0x06016D20, 0x06017120, 0x06017520, 0x06017920, 0x00000000, 0x00000000, 0x00000000

13
data/overlays/actors/z_bg_hidan_rsekizou.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_8088CE20
.incbin "baserom/ovl_Bg_Hidan_Rsekizou", 0xC20, 0x000000A0

3
spec
View file

@ -903,8 +903,7 @@ endseg
beginseg
name "ovl_Bg_Hidan_Rsekizou"
include "build/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.o"
include "build/data/overlays/actors/z_bg_hidan_rsekizou.data.o"
include "build/data/overlays/actors/z_bg_hidan_rsekizou.reloc.o"
include "build/src/overlays/actors/ovl_Bg_Hidan_Rsekizou/ovl_Bg_Hidan_Rsekizou_reloc.o"
endseg
beginseg

193
src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.c
View file

@ -9,7 +9,6 @@ void BgHidanRsekizou_Destroy(Actor* thisx, GlobalContext* globalCtx);
void BgHidanRsekizou_Update(Actor* thisx, GlobalContext* globalCtx);
void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx);
/*
const ActorInit Bg_Hidan_Rsekizou_InitVars = {
ACTOR_BG_HIDAN_RSEKIZOU,
ACTORTYPE_BG,
@ -21,13 +20,193 @@ const ActorInit Bg_Hidan_Rsekizou_InitVars = {
(ActorFunc)BgHidanRsekizou_Update,
(ActorFunc)BgHidanRsekizou_Draw,
};
*/
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Init.s")
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Destroy.s")
static ColliderJntSphItemInit sJntSphItemsInit[6] = {
{
{ 0x00, { 0x20000000, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x19, 0x00, 0x00 },
{ 1, { { 0, 30, 40 }, 25 }, 100 },
},
{
{ 0x00, { 0x20000000, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x19, 0x00, 0x00 },
{ 1, { { -35, 32, 77 }, 32 }, 100 },
},
{
{ 0x00, { 0x20000000, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x19, 0x00, 0x00 },
{ 1, { { -80, 35, 130 }, 42 }, 100 },
},
{
{ 0x00, { 0x20000000, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x19, 0x00, 0x00 },
{ 1, { { 0, 30, -40 }, 25 }, 100 },
},
{
{ 0x00, { 0x20000000, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x19, 0x00, 0x00 },
{ 1, { { 35, 32, -77 }, 32 }, 100 },
},
{
{ 0x00, { 0x20000000, 0x01, 0x04 }, { 0x00000000, 0x00, 0x00 }, 0x19, 0x00, 0x00 },
{ 1, { { 80, 35, -130 }, 42 }, 100 },
},
};
static ColliderJntSphInit sJntSphInit = {
{ COLTYPE_UNK10, 0x11, 0x00, 0x00, 0x20, COLSHAPE_JNTSPH },
6,
sJntSphItemsInit,
};
static InitChainEntry sInitChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneScale, 400, ICHAIN_CONTINUE),
ICHAIN_F32(uncullZoneForward, 1500, ICHAIN_STOP),
};
static UNK_PTR D_8088CD74[] = { 0x06015D20, 0x06016120, 0x06016520, 0x06016920,
0x06016D20, 0x06017120, 0x06017520, 0x06017920 };
extern UNK_TYPE D_0600D5C0; // Dynapoly Data in Object
extern Gfx D_0600AD00[]; // Display List
extern Gfx D_0600DC30[]; // Display List
void BgHidanRsekizou_Init(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
s32 i;
s32 pad;
s32 polyID;
polyID = 0;
Actor_ProcessInitChain(&this->dyna.actor, sInitChain);
DynaPolyInfo_SetActorMove(&this->dyna, 0);
DynaPolyInfo_Alloc(&D_0600D5C0, &polyID);
this->dyna.dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->dyna.actor, polyID);
Collider_InitJntSph(globalCtx, &this->collider);
Collider_SetJntSph(globalCtx, &this->collider, &this->dyna.actor, &sJntSphInit, this->colliderItems);
for (i = 0; i < ARRAY_COUNT(this->colliderItems); i++) {
this->collider.list[i].dim.worldSphere.radius = this->collider.list[i].dim.modelSphere.radius;
}
this->burnFrame = 0;
this->blastFrame = 0;
}
void BgHidanRsekizou_Destroy(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dyna.dynaPolyId);
Collider_DestroyJntSph(globalCtx, &this->collider);
}
void BgHidanRsekizou_Update(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
s32 i;
ColliderJntSphItem* sphere;
s32 pad;
f32 yawSine;
f32 yawCosine;
this->burnFrame = (this->burnFrame + 1) % 8;
if (this->blastFrame != 0) {
this->blastFrame--;
}
if (this->blastFrame == 0) {
this->blastFrame = 3;
}
this->dyna.actor.shape.rot.y += 0x180; // Approximately 2 Degrees per Frame
yawSine = Math_Sins(this->dyna.actor.shape.rot.y);
yawCosine = Math_Coss(this->dyna.actor.shape.rot.y);
for (i = 0; i < ARRAY_COUNT(this->colliderItems); i++) {
sphere = &this->collider.list[i];
sphere->dim.worldSphere.center.x = this->dyna.actor.initPosRot.pos.x +
yawCosine * sphere->dim.modelSphere.center.x +
yawSine * sphere->dim.modelSphere.center.z;
sphere->dim.worldSphere.center.y = (s16)this->dyna.actor.initPosRot.pos.y + sphere->dim.modelSphere.center.y;
sphere->dim.worldSphere.center.z =
(this->dyna.actor.initPosRot.pos.z - yawSine * sphere->dim.modelSphere.center.x) +
yawCosine * sphere->dim.modelSphere.center.z;
}
CollisionCheck_SetAT(globalCtx, &globalCtx->colChkCtx, &this->collider.base);
func_8002F974(&this->dyna.actor, NA_SE_EV_FIRE_PILLAR - SFX_FLAG);
}
Gfx* BgHidanRsekizou_DrawFireball(GlobalContext* globalCtx, BgHidanRsekizou* this, s16 frame, MtxF* mf, s32 a,
Gfx* displayList) {
f32 coss;
f32 sins;
s32 temp;
f32 fVar6;
f32 tmpf7;
temp = (((this->burnFrame + frame) % 8) * 7) * 0.14285715f;
gSPSegment(displayList++, 0x09, SEGMENTED_TO_VIRTUAL(D_8088CD74[temp]));
frame++;
fVar6 = (frame != 4) ? frame + ((3 - this->blastFrame) * 0.33333334f) : frame;
gDPSetPrimColor(displayList++, 0, 1, 255, 255, 0, 150);
gDPSetEnvColor(displayList++, 255, 0, 0, 255);
if (a == 0) {
sins = -Math_Sins(this->dyna.actor.shape.rot.y - (frame * 1500));
coss = -Math_Coss(this->dyna.actor.shape.rot.y - (frame * 1500));
} else {
sins = Math_Sins(this->dyna.actor.shape.rot.y - (frame * 1500));
coss = Math_Coss(this->dyna.actor.shape.rot.y - (frame * 1500));
}
mf->xx = mf->yy = mf->zz = (0.7f * fVar6) + 0.5f;
tmpf7 = (((((0.7f * fVar6) + 0.5f) * 10.0f) * fVar6) + 20.0f);
mf->wx = (tmpf7 * sins) + this->dyna.actor.posRot.pos.x;
mf->wy = (this->dyna.actor.posRot.pos.y + 30.0f) + (0.699999988079f * fVar6);
mf->wz = (tmpf7 * coss) + this->dyna.actor.posRot.pos.z;
gSPMatrix(displayList++,
Matrix_MtxFToMtx(Matrix_CheckFloats(mf, "../z_bg_hidan_rsekizou.c", 543),
Graph_Alloc(globalCtx->state.gfxCtx, sizeof(Mtx))),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(displayList++, D_0600DC30);
return displayList;
}
void BgHidanRsekizou_Draw(Actor* thisx, GlobalContext* globalCtx) {
BgHidanRsekizou* this = THIS;
s32 i;
s32 pad;
MtxF mf;
GraphicsContext* gfxCtx;
Gfx* dispRefs[4];
gfxCtx = globalCtx->state.gfxCtx;
Graph_OpenDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 564);
func_80093D18(globalCtx->state.gfxCtx);
gSPMatrix(gfxCtx->polyOpa.p++, Matrix_NewMtx(globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 568),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPDisplayList(gfxCtx->polyOpa.p++, D_0600AD00);
Matrix_MtxFCopy(&mf, &gMtxFClear);
gfxCtx->polyXlu.p = Gfx_CallSetupDL(gfxCtx->polyXlu.p, 0x14);
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Update.s")
if ((s16)((func_8005A9F4(ACTIVE_CAM) - this->dyna.actor.shape.rot.y) - 0x2E6C) >= 0) {
for (i = 3; i >= 0; i--) {
gfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 0, gfxCtx->polyXlu.p);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/func_8088C70C.s")
for (i = 0; i < 4; i++) {
gfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 1, gfxCtx->polyXlu.p);
}
} else {
for (i = 3; i >= 0; i--) {
gfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 1, gfxCtx->polyXlu.p);
}
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Bg_Hidan_Rsekizou/BgHidanRsekizou_Draw.s")
for (i = 0; i < 4; i++) {
gfxCtx->polyXlu.p = BgHidanRsekizou_DrawFireball(globalCtx, this, i, &mf, 0, gfxCtx->polyXlu.p);
}
}
Graph_CloseDisps(dispRefs, globalCtx->state.gfxCtx, "../z_bg_hidan_rsekizou.c", 600);
}

7
src/overlays/actors/ovl_Bg_Hidan_Rsekizou/z_bg_hidan_rsekizou.h
View file

@ -7,8 +7,11 @@
struct BgHidanRsekizou;
typedef struct BgHidanRsekizou {
/* 0x0000 */ Actor actor;
/* 0x014C */ char unk_14C[0x1BC];
/* 0x0000 */ DynaPolyActor dyna;
/* 0x0164 */ s16 blastFrame;
/* 0x0166 */ s16 burnFrame;
/* 0x0168 */ ColliderJntSph collider;
/* 0x0188 */ ColliderJntSphItem colliderItems[6];
} BgHidanRsekizou; // size = 0x0308
extern const ActorInit Bg_Hidan_Rsekizou_InitVars;

5
undefined_syms.txt
View file

@ -739,6 +739,11 @@ D_0600FCF8 = 0x0600FCF8;
D_060105E0 = 0x060105E0;
D_06012160 = 0x06012160;
// z_en_bg_hidan_rsekizou
D_0600AD00 = 0x0600AD00;
D_0600D5C0 = 0x0600D5C0;
D_0600DC30 = 0x0600DC30;
// z_en_gs
D_0404D4E0 = 0x0404D4E0;
D_06000950 = 0x06000950;