mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-25 09:45:02 +00:00
Code Issues Projects Releases Wiki Activity

Match demo_6k (#756)

Browse source
This commit is contained in:
Roman971 2021-04-05 22:15:03 +02:00 committed by GitHub
parent 03b81c71c2
commit b72ba754a2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 344 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

302
asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s
View file

@ -1,302 +0,0 @@
.rdata
glabel D_80969528
.asciz "../z_demo_6k.c"
.balign 4
glabel D_80969538
.asciz "../z_demo_6k.c"
.balign 4
glabel D_80969548
.asciz "../z_demo_6k.c"
.balign 4
.late_rodata
glabel D_80969654
.float 1.57079637051
.text
glabel func_80968B70
/* 02220 80968B70 27BDFF78 */ addiu $sp, $sp, 0xFF78 ## $sp = FFFFFF78
/* 02224 80968B74 AFBF003C */ sw $ra, 0x003C($sp)
/* 02228 80968B78 AFB10038 */ sw $s1, 0x0038($sp)
/* 0222C 80968B7C AFB00034 */ sw $s0, 0x0034($sp)
/* 02230 80968B80 AFA5008C */ sw $a1, 0x008C($sp)
/* 02234 80968B84 948E0290 */ lhu $t6, 0x0290($a0) ## 00000290
/* 02238 80968B88 00808825 */ or $s1, $a0, $zero ## $s1 = 00000000
/* 0223C 80968B8C 3C068097 */ lui $a2, %hi(D_80969528) ## $a2 = 80970000
/* 02240 80968B90 AFAE007C */ sw $t6, 0x007C($sp)
/* 02244 80968B94 8CA50000 */ lw $a1, 0x0000($a1) ## 00000000
/* 02248 80968B98 24C69528 */ addiu $a2, $a2, %lo(D_80969528) ## $a2 = 80969528
/* 0224C 80968B9C 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8
/* 02250 80968BA0 24070524 */ addiu $a3, $zero, 0x0524 ## $a3 = 00000524
/* 02254 80968BA4 0C031AB1 */ jal Graph_OpenDisps
/* 02258 80968BA8 00A08025 */ or $s0, $a1, $zero ## $s0 = 00000000
/* 0225C 80968BAC 8FB8008C */ lw $t8, 0x008C($sp)
/* 02260 80968BB0 0C024F61 */ jal func_80093D84
/* 02264 80968BB4 8F040000 */ lw $a0, 0x0000($t8) ## 00000000
/* 02268 80968BB8 8FA4008C */ lw $a0, 0x008C($sp)
/* 0226C 80968BBC 3C010001 */ lui $at, 0x0001 ## $at = 00010000
/* 02270 80968BC0 34211DA0 */ ori $at, $at, 0x1DA0 ## $at = 00011DA0
/* 02274 80968BC4 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001
/* 02278 80968BC8 0C03424C */ jal Matrix_Mult
/* 0227C 80968BCC 00812021 */ addu $a0, $a0, $at
/* 02280 80968BD0 3C018097 */ lui $at, %hi(D_80969654) ## $at = 80970000
/* 02284 80968BD4 C42C9654 */ lwc1 $f12, %lo(D_80969654)($at)
/* 02288 80968BD8 0C0342DC */ jal Matrix_RotateX
/* 0228C 80968BDC 24050001 */ addiu $a1, $zero, 0x0001 ## $a1 = 00000001
/* 02290 80968BE0 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 02294 80968BE4 3C09DA38 */ lui $t1, 0xDA38 ## $t1 = DA380000
/* 02298 80968BE8 35290003 */ ori $t1, $t1, 0x0003 ## $t1 = DA380003
/* 0229C 80968BEC 24590008 */ addiu $t9, $v0, 0x0008 ## $t9 = 00000008
/* 022A0 80968BF0 AE1902D0 */ sw $t9, 0x02D0($s0) ## 000002D0
/* 022A4 80968BF4 AC490000 */ sw $t1, 0x0000($v0) ## 00000000
/* 022A8 80968BF8 8FAA008C */ lw $t2, 0x008C($sp)
/* 022AC 80968BFC 3C058097 */ lui $a1, %hi(D_80969538) ## $a1 = 80970000
/* 022B0 80968C00 24A59538 */ addiu $a1, $a1, %lo(D_80969538) ## $a1 = 80969538
/* 022B4 80968C04 8D440000 */ lw $a0, 0x0000($t2) ## 00000000
/* 022B8 80968C08 2406052A */ addiu $a2, $zero, 0x052A ## $a2 = 0000052A
/* 022BC 80968C0C 0C0346A2 */ jal Matrix_NewMtx
/* 022C0 80968C10 AFA2005C */ sw $v0, 0x005C($sp)
/* 022C4 80968C14 8FA3005C */ lw $v1, 0x005C($sp)
/* 022C8 80968C18 3C0CDB06 */ lui $t4, 0xDB06 ## $t4 = DB060000
/* 022CC 80968C1C 358C0020 */ ori $t4, $t4, 0x0020 ## $t4 = DB060020
/* 022D0 80968C20 AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 022D4 80968C24 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 022D8 80968C28 8FA8007C */ lw $t0, 0x007C($sp)
/* 022DC 80968C2C 241800FF */ addiu $t8, $zero, 0x00FF ## $t8 = 000000FF
/* 022E0 80968C30 244B0008 */ addiu $t3, $v0, 0x0008 ## $t3 = 00000008
/* 022E4 80968C34 AE0B02D0 */ sw $t3, 0x02D0($s0) ## 000002D0
/* 022E8 80968C38 AC4C0000 */ sw $t4, 0x0000($v0) ## 00000000
/* 022EC 80968C3C 8FAD008C */ lw $t5, 0x008C($sp)
/* 022F0 80968C40 00087040 */ sll $t6, $t0, 1
/* 022F4 80968C44 31CF00FF */ andi $t7, $t6, 0x00FF ## $t7 = 00000000
/* 022F8 80968C48 8DA40000 */ lw $a0, 0x0000($t5) ## 00000000
/* 022FC 80968C4C 00085900 */ sll $t3, $t0, 4
/* 02300 80968C50 01685823 */ subu $t3, $t3, $t0
/* 02304 80968C54 316C03FF */ andi $t4, $t3, 0x03FF ## $t4 = 00000008
/* 02308 80968C58 240D0010 */ addiu $t5, $zero, 0x0010 ## $t5 = 00000010
/* 0230C 80968C5C 030F3023 */ subu $a2, $t8, $t7
/* 02310 80968C60 240E0040 */ addiu $t6, $zero, 0x0040 ## $t6 = 00000040
/* 02314 80968C64 24190020 */ addiu $t9, $zero, 0x0020 ## $t9 = 00000020
/* 02318 80968C68 24090020 */ addiu $t1, $zero, 0x0020 ## $t1 = 00000020
/* 0231C 80968C6C 240A0001 */ addiu $t2, $zero, 0x0001 ## $t2 = 00000001
/* 02320 80968C70 AFAA0018 */ sw $t2, 0x0018($sp)
/* 02324 80968C74 AFA90014 */ sw $t1, 0x0014($sp)
/* 02328 80968C78 AFB90010 */ sw $t9, 0x0010($sp)
/* 0232C 80968C7C AFAE0028 */ sw $t6, 0x0028($sp)
/* 02330 80968C80 AFA6001C */ sw $a2, 0x001C($sp)
/* 02334 80968C84 AFAD0024 */ sw $t5, 0x0024($sp)
/* 02338 80968C88 AFAC0020 */ sw $t4, 0x0020($sp)
/* 0233C 80968C8C 00002825 */ or $a1, $zero, $zero ## $a1 = 00000000
/* 02340 80968C90 00003825 */ or $a3, $zero, $zero ## $a3 = 00000000
/* 02344 80968C94 0C0253D0 */ jal Gfx_TwoTexScroll
/* 02348 80968C98 AFA20058 */ sw $v0, 0x0058($sp)
/* 0234C 80968C9C 8FA30058 */ lw $v1, 0x0058($sp)
/* 02350 80968CA0 3C068097 */ lui $a2, %hi(D_80969548) ## $a2 = 80970000
/* 02354 80968CA4 24190064 */ addiu $t9, $zero, 0x0064 ## $t9 = 00000064
/* 02358 80968CA8 AC620004 */ sw $v0, 0x0004($v1) ## 00000004
/* 0235C 80968CAC 96220290 */ lhu $v0, 0x0290($s1) ## 00000290
/* 02360 80968CB0 24C69548 */ addiu $a2, $a2, %lo(D_80969548) ## $a2 = 80969548
/* 02364 80968CB4 28410028 */ slti $at, $v0, 0x0028
/* 02368 80968CB8 10200066 */ beq $at, $zero, .L80968E54
/* 0236C 80968CBC 00402025 */ or $a0, $v0, $zero ## $a0 = 00000000
/* 02370 80968CC0 44822000 */ mtc1 $v0, $f4 ## $f4 = 0.00
/* 02374 80968CC4 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000
/* 02378 80968CC8 04410004 */ bgez $v0, .L80968CDC
/* 0237C 80968CCC 468021A0 */ cvt.s.w $f6, $f4
/* 02380 80968CD0 44814000 */ mtc1 $at, $f8 ## $f8 = 4294967296.00
/* 02384 80968CD4 00000000 */ nop
/* 02388 80968CD8 46083180 */ add.s $f6, $f6, $f8
.L80968CDC:
/* 0238C 80968CDC 3C014020 */ lui $at, 0x4020 ## $at = 40200000
/* 02390 80968CE0 44815000 */ mtc1 $at, $f10 ## $f10 = 2.50
/* 02394 80968CE4 3C0142C8 */ lui $at, 0x42C8 ## $at = 42C80000
/* 02398 80968CE8 44819000 */ mtc1 $at, $f18 ## $f18 = 100.00
/* 0239C 80968CEC 460A3402 */ mul.s $f16, $f6, $f10
/* 023A0 80968CF0 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001
/* 023A4 80968CF4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000
/* 023A8 80968CF8 46109101 */ sub.s $f4, $f18, $f16
/* 023AC 80968CFC 4458F800 */ cfc1 $t8, $31
/* 023B0 80968D00 44C3F800 */ ctc1 $v1, $31
/* 023B4 80968D04 00000000 */ nop
/* 023B8 80968D08 46002224 */ cvt.w.s $f8, $f4
/* 023BC 80968D0C 4443F800 */ cfc1 $v1, $31
/* 023C0 80968D10 00000000 */ nop
/* 023C4 80968D14 30630078 */ andi $v1, $v1, 0x0078 ## $v1 = 00000000
/* 023C8 80968D18 50600013 */ beql $v1, $zero, .L80968D68
/* 023CC 80968D1C 44034000 */ mfc1 $v1, $f8
/* 023D0 80968D20 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00
/* 023D4 80968D24 24030001 */ addiu $v1, $zero, 0x0001 ## $v1 = 00000001
/* 023D8 80968D28 46082201 */ sub.s $f8, $f4, $f8
/* 023DC 80968D2C 44C3F800 */ ctc1 $v1, $31
/* 023E0 80968D30 00000000 */ nop
/* 023E4 80968D34 46004224 */ cvt.w.s $f8, $f8
/* 023E8 80968D38 4443F800 */ cfc1 $v1, $31
/* 023EC 80968D3C 00000000 */ nop
/* 023F0 80968D40 30630078 */ andi $v1, $v1, 0x0078 ## $v1 = 00000000
/* 023F4 80968D44 14600005 */ bne $v1, $zero, .L80968D5C
/* 023F8 80968D48 00000000 */ nop
/* 023FC 80968D4C 44034000 */ mfc1 $v1, $f8
/* 02400 80968D50 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 02404 80968D54 10000007 */ beq $zero, $zero, .L80968D74
/* 02408 80968D58 00611825 */ or $v1, $v1, $at ## $v1 = 80000000
.L80968D5C:
/* 0240C 80968D5C 10000005 */ beq $zero, $zero, .L80968D74
/* 02410 80968D60 2403FFFF */ addiu $v1, $zero, 0xFFFF ## $v1 = FFFFFFFF
/* 02414 80968D64 44034000 */ mfc1 $v1, $f8
.L80968D68:
/* 02418 80968D68 00000000 */ nop
/* 0241C 80968D6C 0460FFFB */ bltz $v1, .L80968D5C
/* 02420 80968D70 00000000 */ nop
.L80968D74:
/* 02424 80968D74 306F00FF */ andi $t7, $v1, 0x00FF ## $t7 = 000000FF
/* 02428 80968D78 032F4823 */ subu $t1, $t9, $t7
/* 0242C 80968D7C A3A3007A */ sb $v1, 0x007A($sp)
/* 02430 80968D80 A3A30078 */ sb $v1, 0x0078($sp)
/* 02434 80968D84 A3A00075 */ sb $zero, 0x0075($sp)
/* 02438 80968D88 A3A00079 */ sb $zero, 0x0079($sp)
/* 0243C 80968D8C A3A90074 */ sb $t1, 0x0074($sp)
/* 02440 80968D90 962A0290 */ lhu $t2, 0x0290($s1) ## 00000290
/* 02444 80968D94 44D8F800 */ ctc1 $t8, $31
/* 02448 80968D98 3C014F80 */ lui $at, 0x4F80 ## $at = 4F800000
/* 0244C 80968D9C 448A3000 */ mtc1 $t2, $f6 ## $f6 = 0.00
/* 02450 80968DA0 00097040 */ sll $t6, $t1, 1
/* 02454 80968DA4 05410004 */ bgez $t2, .L80968DB8
/* 02458 80968DA8 468032A0 */ cvt.s.w $f10, $f6
/* 0245C 80968DAC 44819000 */ mtc1 $at, $f18 ## $f18 = 4294967296.00
/* 02460 80968DB0 00000000 */ nop
/* 02464 80968DB4 46125280 */ add.s $f10, $f10, $f18
.L80968DB8:
/* 02468 80968DB8 3C0140CC */ lui $at, 0x40CC ## $at = 40CC0000
/* 0246C 80968DBC 44818000 */ mtc1 $at, $f16 ## $f16 = 6.38
/* 02470 80968DC0 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001
/* 02474 80968DC4 3C014F00 */ lui $at, 0x4F00 ## $at = 4F000000
/* 02478 80968DC8 46105102 */ mul.s $f4, $f10, $f16
/* 0247C 80968DCC 444BF800 */ cfc1 $t3, $31
/* 02480 80968DD0 44CCF800 */ ctc1 $t4, $31
/* 02484 80968DD4 00000000 */ nop
/* 02488 80968DD8 46002224 */ cvt.w.s $f8, $f4
/* 0248C 80968DDC 444CF800 */ cfc1 $t4, $31
/* 02490 80968DE0 00000000 */ nop
/* 02494 80968DE4 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000
/* 02498 80968DE8 51800013 */ beql $t4, $zero, .L80968E38
/* 0249C 80968DEC 440C4000 */ mfc1 $t4, $f8
/* 024A0 80968DF0 44814000 */ mtc1 $at, $f8 ## $f8 = 2147483648.00
/* 024A4 80968DF4 240C0001 */ addiu $t4, $zero, 0x0001 ## $t4 = 00000001
/* 024A8 80968DF8 46082201 */ sub.s $f8, $f4, $f8
/* 024AC 80968DFC 44CCF800 */ ctc1 $t4, $31
/* 024B0 80968E00 00000000 */ nop
/* 024B4 80968E04 46004224 */ cvt.w.s $f8, $f8
/* 024B8 80968E08 444CF800 */ cfc1 $t4, $31
/* 024BC 80968E0C 00000000 */ nop
/* 024C0 80968E10 318C0078 */ andi $t4, $t4, 0x0078 ## $t4 = 00000000
/* 024C4 80968E14 15800005 */ bne $t4, $zero, .L80968E2C
/* 024C8 80968E18 00000000 */ nop
/* 024CC 80968E1C 440C4000 */ mfc1 $t4, $f8
/* 024D0 80968E20 3C018000 */ lui $at, 0x8000 ## $at = 80000000
/* 024D4 80968E24 10000007 */ beq $zero, $zero, .L80968E44
/* 024D8 80968E28 01816025 */ or $t4, $t4, $at ## $t4 = 80000000
.L80968E2C:
/* 024DC 80968E2C 10000005 */ beq $zero, $zero, .L80968E44
/* 024E0 80968E30 240CFFFF */ addiu $t4, $zero, 0xFFFF ## $t4 = FFFFFFFF
/* 024E4 80968E34 440C4000 */ mfc1 $t4, $f8
.L80968E38:
/* 024E8 80968E38 00000000 */ nop
/* 024EC 80968E3C 0580FFFB */ bltz $t4, .L80968E2C
/* 024F0 80968E40 00000000 */ nop
.L80968E44:
/* 024F4 80968E44 44CBF800 */ ctc1 $t3, $31
/* 024F8 80968E48 A3AC007B */ sb $t4, 0x007B($sp)
/* 024FC 80968E4C 10000026 */ beq $zero, $zero, .L80968EE8
/* 02500 80968E50 A3AE0076 */ sb $t6, 0x0076($sp)
.L80968E54:
/* 02504 80968E54 28810032 */ slti $at, $a0, 0x0032
/* 02508 80968E58 10200013 */ beq $at, $zero, .L80968EA8
/* 0250C 80968E5C 0004C080 */ sll $t8, $a0, 2
/* 02510 80968E60 0004C080 */ sll $t8, $a0, 2
/* 02514 80968E64 0304C021 */ addu $t8, $t8, $a0
/* 02518 80968E68 2702FF38 */ addiu $v0, $t8, 0xFF38 ## $v0 = FFFFFF38
/* 0251C 80968E6C 240A0064 */ addiu $t2, $zero, 0x0064 ## $t2 = 00000064
/* 02520 80968E70 00024880 */ sll $t1, $v0, 2
/* 02524 80968E74 240D00C8 */ addiu $t5, $zero, 0x00C8 ## $t5 = 000000C8
/* 02528 80968E78 240F00FF */ addiu $t7, $zero, 0x00FF ## $t7 = 000000FF
/* 0252C 80968E7C 01425823 */ subu $t3, $t2, $v0
/* 02530 80968E80 00026040 */ sll $t4, $v0, 1
/* 02534 80968E84 01A97023 */ subu $t6, $t5, $t1
/* 02538 80968E88 A3A20078 */ sb $v0, 0x0078($sp)
/* 0253C 80968E8C A3A0007A */ sb $zero, 0x007A($sp)
/* 02540 80968E90 A3A00079 */ sb $zero, 0x0079($sp)
/* 02544 80968E94 A3AF007B */ sb $t7, 0x007B($sp)
/* 02548 80968E98 A3AB0074 */ sb $t3, 0x0074($sp)
/* 0254C 80968E9C A3AC0075 */ sb $t4, 0x0075($sp)
/* 02550 80968EA0 10000011 */ beq $zero, $zero, .L80968EE8
/* 02554 80968EA4 A3AE0076 */ sb $t6, 0x0076($sp)
.L80968EA8:
/* 02558 80968EA8 0304C021 */ addu $t8, $t8, $a0
/* 0255C 80968EAC 2702FF06 */ addiu $v0, $t8, 0xFF06 ## $v0 = FFFFFF06
/* 02560 80968EB0 00021840 */ sll $v1, $v0, 1
/* 02564 80968EB4 0002C880 */ sll $t9, $v0, 2
/* 02568 80968EB8 24630032 */ addiu $v1, $v1, 0x0032 ## $v1 = 00000031
/* 0256C 80968EBC 240B0064 */ addiu $t3, $zero, 0x0064 ## $t3 = 00000064
/* 02570 80968EC0 0322C823 */ subu $t9, $t9, $v0
/* 02574 80968EC4 240A00FF */ addiu $t2, $zero, 0x00FF ## $t2 = 000000FF
/* 02578 80968EC8 01626023 */ subu $t4, $t3, $v0
/* 0257C 80968ECC A3A2007A */ sb $v0, 0x007A($sp)
/* 02580 80968ED0 A3A00076 */ sb $zero, 0x0076($sp)
/* 02584 80968ED4 A3B90079 */ sb $t9, 0x0079($sp)
/* 02588 80968ED8 A3AA007B */ sb $t2, 0x007B($sp)
/* 0258C 80968EDC A3A30074 */ sb $v1, 0x0074($sp)
/* 02590 80968EE0 A3A30078 */ sb $v1, 0x0078($sp)
/* 02594 80968EE4 A3AC0075 */ sb $t4, 0x0075($sp)
.L80968EE8:
/* 02598 80968EE8 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 0259C 80968EEC 3C09FA00 */ lui $t1, 0xFA00 ## $t1 = FA000000
/* 025A0 80968EF0 35290080 */ ori $t1, $t1, 0x0080 ## $t1 = FA000080
/* 025A4 80968EF4 244D0008 */ addiu $t5, $v0, 0x0008 ## $t5 = FFFFFF0E
/* 025A8 80968EF8 AE0D02D0 */ sw $t5, 0x02D0($s0) ## 000002D0
/* 025AC 80968EFC AC490000 */ sw $t1, 0x0000($v0) ## FFFFFF06
/* 025B0 80968F00 93B90078 */ lbu $t9, 0x0078($sp)
/* 025B4 80968F04 93B8007B */ lbu $t8, 0x007B($sp)
/* 025B8 80968F08 93AD0079 */ lbu $t5, 0x0079($sp)
/* 025BC 80968F0C 00195600 */ sll $t2, $t9, 24
/* 025C0 80968F10 93B9007A */ lbu $t9, 0x007A($sp)
/* 025C4 80968F14 030A5825 */ or $t3, $t8, $t2 ## $t3 = 000000FF
/* 025C8 80968F18 000D4C00 */ sll $t1, $t5, 16
/* 025CC 80968F1C 01697025 */ or $t6, $t3, $t1 ## $t6 = FA0000FF
/* 025D0 80968F20 0019C200 */ sll $t8, $t9, 8
/* 025D4 80968F24 01D85025 */ or $t2, $t6, $t8 ## $t2 = FA0000FF
/* 025D8 80968F28 AC4A0004 */ sw $t2, 0x0004($v0) ## FFFFFF0A
/* 025DC 80968F2C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 025E0 80968F30 3C0DFB00 */ lui $t5, 0xFB00 ## $t5 = FB000000
/* 025E4 80968F34 27A40060 */ addiu $a0, $sp, 0x0060 ## $a0 = FFFFFFD8
/* 025E8 80968F38 244C0008 */ addiu $t4, $v0, 0x0008 ## $t4 = FFFFFF0E
/* 025EC 80968F3C AE0C02D0 */ sw $t4, 0x02D0($s0) ## 000002D0
/* 025F0 80968F40 AC4D0000 */ sw $t5, 0x0000($v0) ## FFFFFF06
/* 025F4 80968F44 93AE0074 */ lbu $t6, 0x0074($sp)
/* 025F8 80968F48 93A90076 */ lbu $t1, 0x0076($sp)
/* 025FC 80968F4C 93AD0075 */ lbu $t5, 0x0075($sp)
/* 02600 80968F50 000EC600 */ sll $t8, $t6, 24
/* 02604 80968F54 00097A00 */ sll $t7, $t1, 8
/* 02608 80968F58 01F85025 */ or $t2, $t7, $t8 ## $t2 = 000000FF
/* 0260C 80968F5C 000D5C00 */ sll $t3, $t5, 16
/* 02610 80968F60 014B4825 */ or $t1, $t2, $t3 ## $t1 = 000000FF
/* 02614 80968F64 35390080 */ ori $t9, $t1, 0x0080 ## $t9 = 000000FF
/* 02618 80968F68 AC590004 */ sw $t9, 0x0004($v0) ## FFFFFF0A
/* 0261C 80968F6C 8E0202D0 */ lw $v0, 0x02D0($s0) ## 000002D0
/* 02620 80968F70 3C180600 */ lui $t8, %hi(D_06001190) ## $t8 = 06000000
/* 02624 80968F74 27181190 */ addiu $t8, $t8, %lo(D_06001190) ## $t8 = 06001190
/* 02628 80968F78 244E0008 */ addiu $t6, $v0, 0x0008 ## $t6 = FFFFFF0E
/* 0262C 80968F7C AE0E02D0 */ sw $t6, 0x02D0($s0) ## 000002D0
/* 02630 80968F80 3C0FDE00 */ lui $t7, 0xDE00 ## $t7 = DE000000
/* 02634 80968F84 AC4F0000 */ sw $t7, 0x0000($v0) ## FFFFFF06
/* 02638 80968F88 AC580004 */ sw $t8, 0x0004($v0) ## FFFFFF0A
/* 0263C 80968F8C 8FAC008C */ lw $t4, 0x008C($sp)
/* 02640 80968F90 24070558 */ addiu $a3, $zero, 0x0558 ## $a3 = 00000558
/* 02644 80968F94 0C031AD5 */ jal Graph_CloseDisps
/* 02648 80968F98 8D850000 */ lw $a1, 0x0000($t4) ## FFFFFF0E
/* 0264C 80968F9C 8FBF003C */ lw $ra, 0x003C($sp)
/* 02650 80968FA0 8FB00034 */ lw $s0, 0x0034($sp)
/* 02654 80968FA4 8FB10038 */ lw $s1, 0x0038($sp)
/* 02658 80968FA8 03E00008 */ jr $ra
/* 0265C 80968FAC 27BD0088 */ addiu $sp, $sp, 0x0088 ## $sp = 00000000

13
data/overlays/actors/z_demo_6k.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_80969660
.incbin "baserom/ovl_Demo_6K", 0x2D10, 0x00000470

4
spec
View file

@ -1454,11 +1454,7 @@ endseg
beginseg
name "ovl_Demo_6K"
include "build/src/overlays/actors/ovl_Demo_6K/z_demo_6k.o"
#if NON_MATCHING
include "build/src/overlays/actors/ovl_Demo_6K/ovl_Demo_6K_reloc.o"
#else
include "build/data/overlays/actors/z_demo_6k.reloc.o"
#endif
endseg
beginseg

39
src/overlays/actors/ovl_Demo_6K/z_demo_6k.c
View file

@ -723,13 +723,10 @@ void func_809688C4(Actor* thisx, GlobalContext* globalCtx) {
}
}
#if NON_MATCHING
// regalloc
void func_80968B70(Actor* thisx, GlobalContext* globalCtx) {
s32 pad;
Demo6K* this = THIS;
u8 temp1;
u8 temp2;
s32 timer2 = this->timer2;
u32 timer2 = this->timer2;
u8 primColor[4];
u8 envColor[3];
@ -744,33 +741,28 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) {
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
gSPSegment(POLY_XLU_DISP++, 0x08,
Gfx_TwoTexScroll(globalCtx->state.gfxCtx, 0, 0xFF - ((timer2 * 2) & 0xFF), 0, 32, 32, 1,
0xFF - ((timer2 * 2) & 0xFF), (timer2 * 0xF) & 0x3FF, 16, 64));
0xFF - ((timer2 * 2) & 0xFF), (timer2 * 15) & 0x3FF, 16, 64));
if (this->timer2 < 40) {
temp1 = 100 - (this->timer2 * 2.5f);
temp2 = 100 - temp1;
primColor[0] = primColor[2] = temp1;
primColor[0] = primColor[2] = 100 - (this->timer2 * 2.5f);
primColor[1] = envColor[1] = 0;
envColor[0] = temp2;
envColor[0] = 100 - primColor[2];
primColor[3] = this->timer2 * 6.375f;
envColor[2] = temp2 * 2;
envColor[2] = envColor[0] * 2;
} else if (this->timer2 < 50) {
temp1 = (this->timer2 * 5) - 200;
primColor[0] = temp1;
primColor[0] = (this->timer2 * 5) - 200;
primColor[1] = primColor[2] = 0;
primColor[3] = 255;
envColor[0] = 100 - temp1;
envColor[1] = temp1 * 2;
envColor[2] = 200 - (temp1 * 4);
envColor[0] = 100 - primColor[0];
envColor[1] = primColor[0] * 2;
envColor[2] = 200 - (primColor[0] * 4);
} else {
temp1 = (this->timer2 * 5) - 250;
temp2 = (temp1 * 2) + 50;
primColor[2] = temp1;
primColor[2] = (this->timer2 * 5) - 250;
envColor[2] = 0;
primColor[1] = temp1 * 3;
primColor[1] = primColor[2] * 3;
primColor[3] = 255;
primColor[0] = envColor[0] = temp2;
envColor[1] = 100 - temp1;
primColor[0] = envColor[0] = (primColor[2] * 2) + 50;
envColor[1] = 100 - primColor[2];
}
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, primColor[0], primColor[1], primColor[2], primColor[3]);
@ -779,9 +771,6 @@ void func_80968B70(Actor* thisx, GlobalContext* globalCtx) {
CLOSE_DISPS(globalCtx->state.gfxCtx, "../z_demo_6k.c", 1368);
}
#else
#pragma GLOBAL_ASM("asm/non_matchings/overlays/actors/ovl_Demo_6K/func_80968B70.s")
#endif
void func_80968FB0(Actor* thisx, GlobalContext* globalCtx) {
static u8 D_809693CC[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 7, 6, 5, 4, 3, 2, 1 };